rename some thigns

pkgs/json_rpc_2/lib/src/client.dart

@@ -19,7 +19,7 @@ class Client {
   final StreamChannel<dynamic> _channel;
 
   /// A function to generate the next request id.
-  Object Function() _generateId;
+  Object Function() _idGenerator;
 
   /// The current batch of requests to be sent together.
   ///
@@ -52,13 +52,13 @@ class Client {
   /// Note that the client won't begin listening to [channel] until
   /// [Client.listen] is called.
   ///
-  /// If [generateId] is passed, it will be called to generate an ID for each
+  /// If [idGenerator] is passed, it will be called to generate an ID for each
   /// request. Defaults to an auto-incrementing `int`. The value returned must
   /// be either an `int` or `String`.
-  Client(StreamChannel<String> channel, {Object Function()? generateId})
+  Client(StreamChannel<String> channel, {Object Function()? idGenerator})
       : this.withoutJson(
             jsonDocument.bind(channel).transformStream(ignoreFormatExceptions),
-            generateId: generateId);
+            idGenerator: idGenerator);
 
   /// Creates a [Client] that communicates using decoded messages over
   /// [_channel].
@@ -69,11 +69,11 @@ class Client {
   /// Note that the client won't begin listening to [_channel] until
   /// [Client.listen] is called.
   ///
-  /// If [generateId] is passed, it will be called to generate an ID for each
+  /// If [_idGenerator] is passed, it will be called to generate an ID for each
   /// request. Defaults to an auto-incrementing `int`. The value returned must
   /// be either an `int` or `String`.
-  Client.withoutJson(this._channel, {Object Function()? generateId})
-      : _generateId = generateId ?? _incrementingIdGenerator {
+  Client.withoutJson(this._channel, {Object Function()? idGenerator})
+      : _idGenerator = idGenerator ?? _createIncrementingIdGenerator {
     done.whenComplete(() {
       for (var request in _pendingRequests.values) {
         request.completer.completeError(StateError(
@@ -127,7 +127,7 @@ class Client {
   /// Throws a [StateError] if the client is closed while the request is in
   /// flight, or if the client is closed when this method is called.
   Future<Object?> sendRequest(String method, [Object? parameters]) {
-    var id = _generateId();
+    var id = _idGenerator();
     _send(method, parameters, id);
 
     var completer = Completer<Object?>.sync();
@@ -255,8 +255,10 @@ class _Request {
   _Request(this.method, this.completer, this.chain);
 }
 
-/// The default ID generator, returns an auto incrementing integer.
-int Function() get _incrementingIdGenerator {
+/// The default ID generator, uses an auto incrementing integer.
+///
+/// Each call returns a new function which starts back a `0`.
+int Function() _createIncrementingIdGenerator() {
   var nextId = 0;
   return () => nextId++;
 }

pkgs/json_rpc_2/lib/src/peer.dart

@@ -60,19 +60,19 @@ class Peer implements Client, Server {
   /// specification. In particular, requests missing the `jsonrpc` parameter
   /// will be accepted.
   ///
-  /// If [generateId] is passed, it will be called to generate an ID for each
+  /// If [idGenerator] is passed, it will be called to generate an ID for each
   /// request. Defaults to an auto-incrementing `int`.  The value returned must
   /// be either an `int` or `String`.
   Peer(
     StreamChannel<String> channel, {
     ErrorCallback? onUnhandledError,
     bool strictProtocolChecks = true,
-    Object Function()? generateId,
+    Object Function()? idGenerator,
   }) : this.withoutJson(
             jsonDocument.bind(channel).transform(respondToFormatExceptions),
             onUnhandledError: onUnhandledError,
             strictProtocolChecks: strictProtocolChecks,
-            generateId: generateId);
+            idGenerator: idGenerator);
 
   /// Creates a [Peer] that communicates using decoded messages over [_channel].
   ///
@@ -90,13 +90,13 @@ class Peer implements Client, Server {
   /// specification. In particular, requests missing the `jsonrpc` parameter
   /// will be accepted.
   ///
-  /// If [generateId] is passed, it will be called to generate an ID for each
+  /// If [idGenerator] is passed, it will be called to generate an ID for each
   /// request. Defaults to an auto-incrementing `int`. The value returned must
   /// be either an `int` or `String`.
   Peer.withoutJson(this._channel,
       {ErrorCallback? onUnhandledError,
       bool strictProtocolChecks = true,
-      Object Function()? generateId}) {
+      Object Function()? idGenerator}) {
     _server = Server.withoutJson(
         StreamChannel(_serverIncomingForwarder.stream, _channel.sink),
         onUnhandledError: onUnhandledError,
@@ -106,7 +106,7 @@ class Peer implements Client, Server {
           _clientIncomingForwarder.stream,
           _channel.sink,
         ),
-        generateId: generateId);
+        idGenerator: idGenerator);
   }
 
   // Client methods.

pkgs/json_rpc_2/test/client/client_test.dart

@@ -208,7 +208,7 @@ void main() {
 
   test('with custom String ids', () {
     var id = 0;
-    controller = ClientController(generateId: () => 'ID-${id++}');
+    controller = ClientController(idGenerator: () => 'ID-${id++}');
     controller.expectRequest((request) {
       expect(
           request,
@@ -228,7 +228,7 @@ void main() {
 
   test('String ids are not parsed as ints', () {
     var id = 0;
-    controller = ClientController(generateId: () => '${id++}');
+    controller = ClientController(idGenerator: () => '${id++}');
     controller.expectRequest((request) {
       expect(
           request,

pkgs/json_rpc_2/test/client/utils.dart

@@ -20,10 +20,10 @@ class ClientController {
   /// The client.
   late final json_rpc.Client client;
 
-  ClientController({Object Function()? generateId}) {
+  ClientController({Object Function()? idGenerator}) {
     client = json_rpc.Client(
         StreamChannel(_responseController.stream, _requestController.sink),
-        generateId: generateId);
+        idGenerator: idGenerator);
     client.listen();
   }