fix(server): implementer exceeds the maximum length... (#112)

...the compiler will serialize
unnoq · Feb 1, 2025 · c099c92 · c099c92
1 parent bc564a6
commit c099c92
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 53 deletions.
diff --git a/packages/server/src/implementer-variants.ts b/packages/server/src/implementer-variants.ts
@@ -1,10 +1,34 @@
-import type { AnyContractRouter, ContractProcedure, ContractRouter, ContractRouterToErrorMap, ORPCErrorConstructorMap } from '@orpc/contract'
+import type { AnyContractRouter, ContractProcedure, ContractRouterToErrorMap, ContractRouterToMeta, ORPCErrorConstructorMap } from '@orpc/contract'
 import type { ConflictContextGuard, Context, MergedContext } from './context'
 import type { ProcedureImplementer } from './implementer-procedure'
 import type { FlattenLazy } from './lazy-utils'
 import type { Middleware } from './middleware'
 import type { AdaptedRouter, Router } from './router'
 
+export interface RouterImplementerWithMiddlewares<
+  TContract extends AnyContractRouter,
+  TInitialContext extends Context,
+  TCurrentContext extends Context,
+> {
+  use<U extends Context>(
+    middleware: Middleware<
+      TCurrentContext,
+      U,
+      unknown,
+      unknown,
+      ORPCErrorConstructorMap<ContractRouterToErrorMap<TContract>>,
+      ContractRouterToMeta<TContract>
+    >,
+  ): ConflictContextGuard<MergedContext<TCurrentContext, U>>
+    & ImplementerInternalWithMiddlewares<TContract, TInitialContext, MergedContext<TCurrentContext, U>>
+
+  router<U extends Router<TCurrentContext, TContract>>(router: U): AdaptedRouter<U, TInitialContext, Record<never, never>>
+
+  lazy<U extends Router<TInitialContext, TContract>>(
+    loader: () => Promise<{ default: U }>
+  ): AdaptedRouter<FlattenLazy<U>, TInitialContext, Record<never, never>>
+}
+
 export type ImplementerInternalWithMiddlewares<
   TContract extends AnyContractRouter,
   TInitialContext extends Context,
@@ -13,27 +37,9 @@ export type ImplementerInternalWithMiddlewares<
   &(
     TContract extends ContractProcedure<infer UInputSchema, infer UOutputSchema, infer UErrorMap, infer UMeta>
       ? ProcedureImplementer<TInitialContext, TCurrentContext, UInputSchema, UOutputSchema, UErrorMap, UMeta>
-      : TContract extends ContractRouter<infer UMeta> ? {
-        use<U extends Context>(
-          middleware: Middleware<
-            TCurrentContext,
-            U,
-            unknown,
-            unknown,
-            ORPCErrorConstructorMap<ContractRouterToErrorMap<TContract>>,
-            UMeta
-          >,
-        ): ConflictContextGuard<MergedContext<TCurrentContext, U>>
-          & ImplementerInternalWithMiddlewares<TContract, TInitialContext, MergedContext<TCurrentContext, U>>
-
-        router<U extends Router<TCurrentContext, TContract>>(router: U): AdaptedRouter<U, TInitialContext, Record<never, never>>
-
-        lazy<U extends Router<TInitialContext, TContract>>(
-          loader: () => Promise<{ default: U }>
-        ): AdaptedRouter<FlattenLazy<U>, TInitialContext, Record<never, never>>
-      } & {
+      : RouterImplementerWithMiddlewares<TContract, TInitialContext, TCurrentContext> & {
         [K in keyof TContract]: TContract[K] extends AnyContractRouter
           ? ImplementerInternalWithMiddlewares<TContract[K], TInitialContext, TCurrentContext>
           : never
-      } : never
+      }
    )
diff --git a/packages/server/src/implementer.ts b/packages/server/src/implementer.ts
@@ -1,4 +1,4 @@
-import type { AnyContractRouter, ContractProcedure, ContractRouter, ContractRouterToErrorMap, ContractRouterToMeta, ORPCErrorConstructorMap } from '@orpc/contract'
+import type { AnyContractRouter, ContractProcedure, ContractRouterToErrorMap, ContractRouterToMeta, ORPCErrorConstructorMap } from '@orpc/contract'
 import type { ConflictContextGuard, Context, MergedContext } from './context'
 import type { ProcedureImplementer } from './implementer-procedure'
 import type { ImplementerInternalWithMiddlewares } from './implementer-variants'
@@ -13,6 +13,41 @@ import { type DecoratedMiddleware, decorateMiddleware } from './middleware-decor
 import { addMiddleware } from './middleware-utils'
 import { type AdaptedRouter, adaptRouter, type Router } from './router'
 
+export interface RouterImplementer<
+  TContract extends AnyContractRouter,
+  TInitialContext extends Context,
+  TCurrentContext extends Context,
+> {
+  middleware<UOutContext extends Context, TInput, TOutput = any>( // = any here is important to make middleware can be used in any output by default
+    middleware: Middleware<
+      TCurrentContext,
+      UOutContext,
+      TInput,
+      TOutput,
+      ORPCErrorConstructorMap<ContractRouterToErrorMap<TContract>>,
+      ContractRouterToMeta<TContract>
+    >,
+  ): DecoratedMiddleware<TCurrentContext, UOutContext, TInput, TOutput, ORPCErrorConstructorMap<any>, ContractRouterToMeta<TContract>> // ORPCErrorConstructorMap<any> ensures middleware can used in any procedure
+
+  use<U extends Context>(
+    middleware: Middleware<
+      TCurrentContext,
+      U,
+      unknown,
+      unknown,
+      ORPCErrorConstructorMap<ContractRouterToErrorMap<TContract>>,
+      ContractRouterToMeta<TContract>
+    >,
+  ): ConflictContextGuard<MergedContext<TCurrentContext, U>>
+    & ImplementerInternalWithMiddlewares<TContract, TInitialContext, MergedContext<TCurrentContext, U>>
+
+  router<U extends Router<TCurrentContext, TContract>>(router: U): AdaptedRouter<U, TInitialContext, Record<never, never>>
+
+  lazy<U extends Router<TCurrentContext, TContract>>(
+    loader: () => Promise<{ default: U }>
+  ): AdaptedRouter<FlattenLazy<U>, TInitialContext, Record<never, never>>
+}
+
 export type ImplementerInternal<
   TContract extends AnyContractRouter,
   TInitialContext extends Context,
@@ -21,40 +56,11 @@ export type ImplementerInternal<
   &(
     TContract extends ContractProcedure<infer UInputSchema, infer UOutputSchema, infer UErrorMap, infer UMeta>
       ? ProcedureImplementer<TInitialContext, TCurrentContext, UInputSchema, UOutputSchema, UErrorMap, UMeta>
-      : TContract extends ContractRouter<infer UMeta> ? {
-        middleware<UOutContext extends Context, TInput, TOutput = any>( // = any here is important to make middleware can be used in any output by default
-          middleware: Middleware<
-            TCurrentContext,
-            UOutContext,
-            TInput,
-            TOutput,
-            ORPCErrorConstructorMap<ContractRouterToErrorMap<TContract>>,
-            ContractRouterToMeta<TContract>
-          >,
-        ): DecoratedMiddleware<TCurrentContext, UOutContext, TInput, TOutput, ORPCErrorConstructorMap<any>, UMeta> // ORPCErrorConstructorMap<any> ensures middleware can used in any procedure
-
-        use<U extends Context>(
-          middleware: Middleware<
-            TCurrentContext,
-            U,
-            unknown,
-            unknown,
-            ORPCErrorConstructorMap<ContractRouterToErrorMap<TContract>>,
-            UMeta
-          >,
-        ): ConflictContextGuard<MergedContext<TCurrentContext, U>>
-          & ImplementerInternalWithMiddlewares<TContract, TInitialContext, MergedContext<TCurrentContext, U>>
-
-        router<U extends Router<TCurrentContext, TContract>>(router: U): AdaptedRouter<U, TInitialContext, Record<never, never>>
-
-        lazy<U extends Router<TCurrentContext, TContract>>(
-          loader: () => Promise<{ default: U }>
-        ): AdaptedRouter<FlattenLazy<U>, TInitialContext, Record<never, never>>
-      } & {
+      : RouterImplementer<TContract, TInitialContext, TCurrentContext> & {
         [K in keyof TContract]: TContract[K] extends AnyContractRouter
           ? ImplementerInternal<TContract[K], TInitialContext, TCurrentContext>
           : never
-      } : never
+      }
    )
 
 export function implementerInternal<