restrict types accepted

Author: edmundhung

src/workerd/api/http.h

@@ -436,10 +436,16 @@ class Fetcher: public JsRpcClientProvider {
       });
     }
     JSG_TS_DEFINE(
-      type Service<T = undefined> = Fetcher<
-          T extends new (...args: any[]) => infer EntrypointClass
-              ? EntrypointClass extends Rpc.WorkerEntrypointBranded ? EntrypointClass : undefined
-              : T extends Rpc.WorkerEntrypointBranded ? T : undefined
+      type Service<
+        T extends
+          | (new (...args: any[]) => Rpc.WorkerEntrypointBranded)
+          | Rpc.WorkerEntrypointBranded
+          | ExportedHandler<any, any, any>
+          | undefined = undefined,
+      > = Fetcher<
+        T extends new (...args: any[]) => infer EntrypointClass ? EntrypointClass
+        : T extends Rpc.WorkerEntrypointBranded ? T
+        : undefined
       >;
     );
 

types/generated-snapshot/experimental/index.d.ts

@@ -1761,11 +1761,15 @@ interface RequestInit<Cf = CfProperties> {
   signal?: AbortSignal | null;
   encodeResponseBody?: "automatic" | "manual";
 }
-type Service<T = undefined> = Fetcher<
+type Service<
+  T extends
+    | (new (...args: any[]) => Rpc.WorkerEntrypointBranded)
+    | Rpc.WorkerEntrypointBranded
+    | ExportedHandler<any, any, any>
+    | undefined = undefined,
+> = Fetcher<
   T extends new (...args: any[]) => infer EntrypointClass
-    ? EntrypointClass extends Rpc.WorkerEntrypointBranded
-      ? EntrypointClass
-      : undefined
+    ? EntrypointClass
     : T extends Rpc.WorkerEntrypointBranded
       ? T
       : undefined

types/generated-snapshot/experimental/index.ts

@@ -1769,11 +1769,15 @@ export interface RequestInit<Cf = CfProperties> {
   signal?: AbortSignal | null;
   encodeResponseBody?: "automatic" | "manual";
 }
-export type Service<T = undefined> = Fetcher<
+export type Service<
+  T extends
+    | (new (...args: any[]) => Rpc.WorkerEntrypointBranded)
+    | Rpc.WorkerEntrypointBranded
+    | ExportedHandler<any, any, any>
+    | undefined = undefined,
+> = Fetcher<
   T extends new (...args: any[]) => infer EntrypointClass
-    ? EntrypointClass extends Rpc.WorkerEntrypointBranded
-      ? EntrypointClass
-      : undefined
+    ? EntrypointClass
     : T extends Rpc.WorkerEntrypointBranded
       ? T
       : undefined

types/generated-snapshot/latest/index.d.ts

@@ -1727,11 +1727,15 @@ interface RequestInit<Cf = CfProperties> {
   signal?: AbortSignal | null;
   encodeResponseBody?: "automatic" | "manual";
 }
-type Service<T = undefined> = Fetcher<
+type Service<
+  T extends
+    | (new (...args: any[]) => Rpc.WorkerEntrypointBranded)
+    | Rpc.WorkerEntrypointBranded
+    | ExportedHandler<any, any, any>
+    | undefined = undefined,
+> = Fetcher<
   T extends new (...args: any[]) => infer EntrypointClass
-    ? EntrypointClass extends Rpc.WorkerEntrypointBranded
-      ? EntrypointClass
-      : undefined
+    ? EntrypointClass
     : T extends Rpc.WorkerEntrypointBranded
       ? T
       : undefined

types/generated-snapshot/latest/index.ts

@@ -1735,11 +1735,15 @@ export interface RequestInit<Cf = CfProperties> {
   signal?: AbortSignal | null;
   encodeResponseBody?: "automatic" | "manual";
 }
-export type Service<T = undefined> = Fetcher<
+export type Service<
+  T extends
+    | (new (...args: any[]) => Rpc.WorkerEntrypointBranded)
+    | Rpc.WorkerEntrypointBranded
+    | ExportedHandler<any, any, any>
+    | undefined = undefined,
+> = Fetcher<
   T extends new (...args: any[]) => infer EntrypointClass
-    ? EntrypointClass extends Rpc.WorkerEntrypointBranded
-      ? EntrypointClass
-      : undefined
+    ? EntrypointClass
     : T extends Rpc.WorkerEntrypointBranded
       ? T
       : undefined