V2: Update makeAnyClient signature to carry type information to narro…

…w down method kinds (#1292)
connectrpc · Oct 31, 2024 · af47285 · af47285
1 parent 0323619
commit af47285
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/packages/connect/src/any-client.ts b/packages/connect/src/any-client.ts
@@ -12,7 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import type { DescMethod, DescService } from "@bufbuild/protobuf";
+import type {
+  DescService,
+  DescMethodUnary,
+  DescMethodStreaming,
+} from "@bufbuild/protobuf";
 
 /**
  * AnyClient is an arbitrary service client with any method signature.
@@ -24,7 +28,9 @@ export type AnyClient = Record<string, AnyClientMethod>;
 
 type AnyClientMethod = (...args: any[]) => any; // eslint-disable-line @typescript-eslint/no-explicit-any
 
-type CreateAnyClientMethod = (method: DescMethod) => AnyClientMethod | null;
+type CreateAnyClientMethod = (
+  method: DescMethodUnary | DescMethodStreaming,
+) => AnyClientMethod | null;
 
 /**
  * Create any client for the given service.

diff --git a/packages/connect/src/promise-client.ts b/packages/connect/src/promise-client.ts
@@ -20,7 +20,6 @@ import type {
   DescMethodBiDiStreaming,
   DescMethodClientStreaming,
   DescMethodServerStreaming,
-  DescMethodStreaming,
   DescMethodUnary,
 } from "@bufbuild/protobuf";
 import type { Transport } from "./transport.js";
@@ -54,23 +53,20 @@ export function createClient<T extends DescService>(
   service: T,
   transport: Transport,
 ) {
-  return makeAnyClient(
-    service,
-    (method: DescMethodUnary | DescMethodStreaming) => {
-      switch (method.methodKind) {
-        case "unary":
-          return createUnaryFn(transport, method);
-        case "server_streaming":
-          return createServerStreamingFn(transport, method);
-        case "client_streaming":
-          return createClientStreamingFn(transport, method);
-        case "bidi_streaming":
-          return createBiDiStreamingFn(transport, method);
-        default:
-          return null;
-      }
-    },
-  ) as Client<T>;
+  return makeAnyClient(service, (method) => {
+    switch (method.methodKind) {
+      case "unary":
+        return createUnaryFn(transport, method);
+      case "server_streaming":
+        return createServerStreamingFn(transport, method);
+      case "client_streaming":
+        return createClientStreamingFn(transport, method);
+      case "bidi_streaming":
+        return createBiDiStreamingFn(transport, method);
+      default:
+        return null;
+    }
+  }) as Client<T>;
 }
 
 /**