@trpc/server 10.32.0 → 10.33.1

package/src/adapters/node-http/content-type/form-data/uploadHandler.ts

@@ -12,7 +12,7 @@ export type UploadHandlerPart = {
 
 export type UploadHandler = (
   part: UploadHandlerPart,
-) => Promise<NodeOnDiskFile | File | string | null | undefined>;
+) => Promise<File | NodeOnDiskFile | string | null | undefined>;
 
 export function composeUploadHandlers(
   ...handlers: UploadHandler[]
@@ -53,7 +53,7 @@ export type MemoryUploadHandlerOptions = {
    * @param mimetype
    * @param encoding
    */
-  filter?(args: MemoryUploadHandlerFilterArgs): boolean | Promise<boolean>;
+  filter?(args: MemoryUploadHandlerFilterArgs): Promise<boolean> | boolean;
 };
 
 /**

package/src/adapters/node-http/nodeHTTPRequestHandler.ts

@@ -21,6 +21,7 @@ export async function nodeHTTPRequestHandler<
 >(opts: NodeHTTPRequestHandlerOptions<TRouter, TRequest, TResponse>) {
   const handleViaMiddleware = opts.middleware ?? ((_req, _res, next) => next());
 
+  // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
   return handleViaMiddleware(opts.req, opts.res, async (err) => {
     if (err) throw err;
 

package/src/adapters/node-http/types.ts

@@ -5,7 +5,7 @@ import { MaybePromise } from '../../types';
 import { NodeHTTPContentTypeHandler } from './internals/contentType';
 
 interface ParsedQs {
-  [key: string]: undefined | string | string[] | ParsedQs | ParsedQs[];
+  [key: string]: ParsedQs | ParsedQs[] | string[] | string | undefined;
 }
 
 export type NodeHTTPRequest = IncomingMessage & {
@@ -45,46 +45,46 @@ export type NodeHTTPCreateContextOption<
 /**
  * @internal
  */
-interface ConnectMiddleware<
+type ConnectMiddleware<
   TRequest extends NodeHTTPRequest = NodeHTTPRequest,
   TResponse extends NodeHTTPResponse = NodeHTTPResponse,
-> {
-  (req: TRequest, res: TResponse, next: (err?: any) => any): void;
-}
+> = (req: TRequest, res: TResponse, next: (err?: any) => any) => void;
 
 export type NodeHTTPHandlerOptions<
   TRouter extends AnyRouter,
   TRequest extends NodeHTTPRequest,
   TResponse extends NodeHTTPResponse,
-> = HTTPBaseHandlerOptions<TRouter, TRequest> & {
-  /**
-   * By default, http `OPTIONS` requests are not handled, and CORS headers are not returned.
-   *
-   * This can be used to handle them manually or via the `cors` npm package: https://www.npmjs.com/package/cors
-   *
-   * ```ts
-   * import cors from 'cors'
-   *
-   * nodeHTTPRequestHandler({
-   *   cors: cors()
-   * })
-   * ```
-   *
-   * You can also use it for other needs which a connect/node.js compatible middleware can solve,
-   *  though you might wish to consider an alternative solution like the Express adapter if your needs are complex.
-   */
-  middleware?: ConnectMiddleware;
-  maxBodySize?: number;
-  experimental_contentTypeHandlers?: NodeHTTPContentTypeHandler<
-    TRequest,
-    TResponse
-  >[];
-} & NodeHTTPCreateContextOption<TRouter, TRequest, TResponse>;
+> = HTTPBaseHandlerOptions<TRouter, TRequest> &
+  NodeHTTPCreateContextOption<TRouter, TRequest, TResponse> & {
+    /**
+     * By default, http `OPTIONS` requests are not handled, and CORS headers are not returned.
+     *
+     * This can be used to handle them manually or via the `cors` npm package: https://www.npmjs.com/package/cors
+     *
+     * ```ts
+     * import cors from 'cors'
+     *
+     * nodeHTTPRequestHandler({
+     *   cors: cors()
+     * })
+     * ```
+     *
+     * You can also use it for other needs which a connect/node.js compatible middleware can solve,
+     *  though you might wish to consider an alternative solution like the Express adapter if your needs are complex.
+     */
+    middleware?: ConnectMiddleware;
+    maxBodySize?: number;
+    experimental_contentTypeHandlers?: NodeHTTPContentTypeHandler<
+      TRequest,
+      TResponse
+    >[];
+  };
 
 export type NodeHTTPRequestHandlerOptions<
   TRouter extends AnyRouter,
   TRequest extends NodeHTTPRequest,
   TResponse extends NodeHTTPResponse,
+  // eslint-disable-next-line @typescript-eslint/sort-type-constituents
 > = {
   req: TRequest;
   res: TResponse;

package/src/adapters/ws.ts

@@ -7,7 +7,6 @@ import {
   ProcedureType,
 } from '../core';
 import { getTRPCErrorFromUnknown, TRPCError } from '../error/TRPCError';
-import { getCauseFromUnknown } from '../error/utils';
 import { BaseHandlerOptions } from '../internals/types';
 import { isObservable, Unsubscribable } from '../observable';
 import {
@@ -101,10 +100,11 @@ export function parseMessage(
 export type WSSHandlerOptions<TRouter extends AnyRouter> = BaseHandlerOptions<
   TRouter,
   IncomingMessage
-> & {
-  wss: ws.Server;
-  process?: NodeJS.Process;
-} & NodeHTTPCreateContextOption<TRouter, IncomingMessage, ws>;
+> &
+  NodeHTTPCreateContextOption<TRouter, IncomingMessage, ws> & {
+    wss: ws.Server;
+    process?: NodeJS.Process;
+  };
 
 export type CreateWSSContextFnOptions = NodeHTTPCreateContextFnOptions<
   IncomingMessage,
@@ -130,7 +130,7 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
 
     function stopSubscription(
       subscription: Unsubscribable,
-      { id, jsonrpc }: { id: JSONRPC2.RequestId } & JSONRPC2.BaseEnvelope,
+      { id, jsonrpc }: JSONRPC2.BaseEnvelope & { id: JSONRPC2.RequestId },
     ) {
       subscription.unsubscribe();
 
@@ -280,6 +280,7 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
     }
     client.on('message', async (message) => {
       try {
+        // eslint-disable-next-line @typescript-eslint/no-base-to-string
         const msgJSON: unknown = JSON.parse(message.toString());
         const msgs: unknown[] = Array.isArray(msgJSON) ? msgJSON : [msgJSON];
         const promises = msgs
@@ -289,7 +290,7 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
       } catch (cause) {
         const error = new TRPCError({
           code: 'PARSE_ERROR',
-          cause: getCauseFromUnknown(cause),
+          cause,
         });
 
         respond({

package/src/core/internals/getParseFn.ts

@@ -1,6 +1,6 @@
 import { Parser } from '../parser';
 
-export type ParseFn<TType> = (value: unknown) => TType | Promise<TType>;
+export type ParseFn<TType> = (value: unknown) => Promise<TType> | TType;
 
 export function getParseFn<TType>(procedureParser: Parser): ParseFn<TType> {
   const parser = procedureParser as any;

package/src/core/internals/mergeRouters.ts

@@ -28,12 +28,12 @@ export type MergeRouters<
       {
         _config: TRouterDef['_config'];
         router: true;
-        procedures: TRouterDef['procedures'] & Head['_def']['procedures'];
-        record: TRouterDef['record'] & Head['_def']['record'];
-        queries: TRouterDef['queries'] & Head['_def']['queries'];
-        mutations: TRouterDef['mutations'] & Head['_def']['mutations'];
-        subscriptions: TRouterDef['subscriptions'] &
-          Head['_def']['subscriptions'];
+        procedures: Head['_def']['procedures'] & TRouterDef['procedures'];
+        record: Head['_def']['record'] & TRouterDef['record'];
+        queries: Head['_def']['queries'] & TRouterDef['queries'];
+        mutations: Head['_def']['mutations'] & TRouterDef['mutations'];
+        subscriptions: Head['_def']['subscriptions'] &
+          TRouterDef['subscriptions'];
       }
     >
   : Router<TRouterDef> & TRouterDef['record'];

package/src/core/middleware.ts

@@ -1,5 +1,4 @@
 import { TRPCError } from '../error/TRPCError';
-import { getCauseFromUnknown } from '../error/utils';
 import { Simplify } from '../types';
 import { AnyRootConfig } from './internals/config';
 import { ParseFn } from './internals/getParseFn';
@@ -46,8 +45,8 @@ interface MiddlewareErrorResult<_TParams extends ProcedureParams>
  * @internal
  */
 export type MiddlewareResult<TParams extends ProcedureParams> =
-  | MiddlewareOKResult<TParams>
-  | MiddlewareErrorResult<TParams>;
+  | MiddlewareErrorResult<TParams>
+  | MiddlewareOKResult<TParams>;
 
 /**
  * @internal
@@ -209,7 +208,7 @@ export function createInputMiddleware<TInput>(parse: ParseFn<TInput>) {
     } catch (cause) {
       throw new TRPCError({
         code: 'BAD_REQUEST',
-        cause: getCauseFromUnknown(cause),
+        cause,
       });
     }
 
@@ -249,7 +248,7 @@ export function createOutputMiddleware<TOutput>(parse: ParseFn<TOutput>) {
       throw new TRPCError({
         message: 'Output validation failed',
         code: 'INTERNAL_SERVER_ERROR',
-        cause: getCauseFromUnknown(cause),
+        cause,
       });
     }
   };

package/src/core/parser.ts

@@ -13,7 +13,7 @@ export type ParserSuperstructEsque<TInput> = {
 
 export type ParserCustomValidatorEsque<TInput> = (
   input: unknown,
-) => TInput | Promise<TInput>;
+) => Promise<TInput> | TInput;
 
 export type ParserYupEsque<TInput> = {
   validateSync: (input: unknown) => TInput;
@@ -24,18 +24,18 @@ export type ParserScaleEsque<TInput> = {
 };
 
 export type ParserWithoutInput<TInput> =
-  | ParserYupEsque<TInput>
-  | ParserSuperstructEsque<TInput>
   | ParserCustomValidatorEsque<TInput>
   | ParserMyZodEsque<TInput>
-  | ParserScaleEsque<TInput>;
+  | ParserScaleEsque<TInput>
+  | ParserSuperstructEsque<TInput>
+  | ParserYupEsque<TInput>;
 
 export type ParserWithInputOutput<TInput, TParsedInput> = ParserZodEsque<
   TInput,
   TParsedInput
 >;
 
-export type Parser = ParserWithoutInput<any> | ParserWithInputOutput<any, any>;
+export type Parser = ParserWithInputOutput<any, any> | ParserWithoutInput<any>;
 
 export type inferParser<TParser extends Parser> =
   TParser extends ParserWithInputOutput<infer $TIn, infer $TOut>

package/src/core/procedure.ts

@@ -78,7 +78,7 @@ export interface Procedure<
   TParams extends ProcedureParams,
 > {
   _type: TType;
-  _def: TParams & ProcedureBuilderDef<TParams>;
+  _def: ProcedureBuilderDef<TParams> & TParams;
   /**
    * @deprecated use `._def.meta` instead
    */

package/src/core/router.ts

@@ -83,7 +83,7 @@ export type AnyRouterDef<
  */
 type inferHandlerFn<TProcedures extends ProcedureRecord> = <
   TProcedure extends TProcedures[TPath],
-  TPath extends keyof TProcedures & string,
+  TPath extends string & keyof TProcedures,
 >(
   path: TPath,
   ...args: inferHandlerInput<TProcedure>
@@ -109,7 +109,7 @@ type DecoratedProcedureRecord<TProcedures extends ProcedureRouterRecord> = {
  */
 type RouterCaller<TDef extends AnyRouterDef> = (
   ctx: TDef['_config']['$types']['ctx'],
-) => {
+) => DecoratedProcedureRecord<TDef['record']> & {
   /**
    * @deprecated
    */
@@ -122,7 +122,7 @@ type RouterCaller<TDef extends AnyRouterDef> = (
    * @deprecated
    */
   subscription: inferHandlerFn<TDef['subscriptions']>;
-} & DecoratedProcedureRecord<TDef['record']>;
+};
 
 export interface Router<TDef extends AnyRouterDef> {
   _def: TDef;
@@ -137,7 +137,7 @@ export interface Router<TDef extends AnyRouterDef> {
     type: ProcedureType | 'unknown';
     path: string | undefined;
     input: unknown;
-    ctx: undefined | TDef['_config']['$types']['ctx'];
+    ctx: TDef['_config']['$types']['ctx'] | undefined;
   }): TDef['_config']['$types']['errorShape'];
 }
 

package/src/core/types.ts

@@ -42,7 +42,7 @@ export type inferProcedureOutput<TProcedure> =
  */
 export type inferSubscriptionOutput<
   TRouter extends AnyRouter,
-  TPath extends keyof TRouter['_def']['subscriptions'] & string,
+  TPath extends string & keyof TRouter['_def']['subscriptions'],
 > = inferObservableValue<
   inferProcedureOutput<TRouter['_def']['subscriptions'][TPath]>
 >;

package/src/deprecated/internals/middlewares.ts

@@ -40,8 +40,8 @@ interface MiddlewareErrorResult<TContext>
  * @deprecated
  */
 export type MiddlewareResult<TContext> =
-  | MiddlewareOKResult<TContext>
-  | MiddlewareErrorResult<TContext>;
+  | MiddlewareErrorResult<TContext>
+  | MiddlewareOKResult<TContext>;
 
 /**
  * @deprecated

package/src/deprecated/internals/procedure.ts

@@ -1,5 +1,4 @@
 import { getTRPCErrorFromUnknown, TRPCError } from '../../error/TRPCError';
-import { getCauseFromUnknown } from '../../error/utils';
 import { InferLast } from '../../types';
 import { ProcedureType } from '../router';
 import {
@@ -23,7 +22,7 @@ export type ProcedureParserSuperstructEsque<TType> = {
 
 export type ProcedureParserCustomValidatorEsque<TType> = (
   input: unknown,
-) => TType | Promise<TType>;
+) => Promise<TType> | TType;
 
 export type ProcedureParserYupEsque<TType> = {
   validateSync: (input: unknown) => TType;
@@ -33,10 +32,10 @@ export type ProcedureParserWithInputOutput<TInput, TOutput> =
   ProcedureParserZodEsque<TInput, TOutput>;
 
 export type ProcedureParser<TType> =
-  | ProcedureParserYupEsque<TType>
-  | ProcedureParserSuperstructEsque<TType>
   | ProcedureParserCustomValidatorEsque<TType>
-  | ProcedureParserMyZodEsque<TType>;
+  | ProcedureParserMyZodEsque<TType>
+  | ProcedureParserSuperstructEsque<TType>
+  | ProcedureParserYupEsque<TType>;
 
 export type ProcedureResolver<TContext, TInput, TOutput> = (opts: {
   ctx: TContext;
@@ -45,7 +44,7 @@ export type ProcedureResolver<TContext, TInput, TOutput> = (opts: {
 }) => Promise<TOutput> | TOutput;
 
 interface ProcedureOptions<TContext, TMeta, TInput, TOutput, TParsedOutput> {
-  middlewares: Array<MiddlewareFunction<any, any, any>>;
+  middlewares: MiddlewareFunction<any, any, any>[];
   resolver: ProcedureResolver<TContext, TInput, TOutput>;
   inputParser: ProcedureParser<TInput>;
   outputParser: ProcedureParser<TParsedOutput>;
@@ -63,7 +62,7 @@ export interface ProcedureCallOptions<TContext> {
   type: ProcedureType;
 }
 
-type ParseFn<TType> = (value: unknown) => TType | Promise<TType>;
+type ParseFn<TType> = (value: unknown) => Promise<TType> | TType;
 
 function getParseFn<TType>(
   procedureParser: ProcedureParser<TType>,
@@ -112,7 +111,7 @@ export class Procedure<
   TParsedOutput,
   TFinalOutput = unknown extends TParsedOutput ? TOutput : TParsedOutput,
 > {
-  private middlewares: Readonly<Array<MiddlewareFunction<any, any, any>>>;
+  private middlewares: Readonly<MiddlewareFunction<any, any, any>[]>;
   private resolver: ProcedureResolver<TContext, TParsedInput, TOutput>;
   private readonly inputParser: ProcedureParser<TParsedInput>;
   private parseInputFn: ParseFn<TParsedInput>;
@@ -154,7 +153,7 @@ export class Procedure<
     } catch (cause) {
       throw new TRPCError({
         code: 'BAD_REQUEST',
-        cause: getCauseFromUnknown(cause),
+        cause,
       });
     }
   }
@@ -165,7 +164,7 @@ export class Procedure<
     } catch (cause) {
       throw new TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
-        cause: getCauseFromUnknown(cause),
+        cause,
         message: 'Output validation failed',
       });
     }
@@ -254,25 +253,23 @@ export class Procedure<
   public inheritMiddlewares(
     middlewares: MiddlewareFunction<TInputContext, TContext, TMeta>[],
   ): this {
-    const Constructor: {
-      new (
-        opts: ProcedureOptions<
-          TContext,
-          TMeta,
-          TParsedInput,
-          TOutput,
-          TFinalOutput
-        >,
-      ): Procedure<
-        TInputContext,
+    const Constructor: new (
+      opts: ProcedureOptions<
         TContext,
         TMeta,
-        TInput,
         TParsedInput,
         TOutput,
-        TParsedOutput
-      >;
-    } = (this as any).constructor;
+        TFinalOutput
+      >,
+    ) => Procedure<
+      TInputContext,
+      TContext,
+      TMeta,
+      TInput,
+      TParsedInput,
+      TOutput,
+      TParsedOutput
+    > = (this as any).constructor;
 
     const instance = new Constructor({
       middlewares: [...middlewares, ...this.middlewares],
@@ -314,8 +311,8 @@ export type CreateProcedureWithoutInput<
   TParsedOutput,
 > = {
   output?:
-    | ProcedureParserWithInputOutput<TOutput, TParsedOutput>
-    | ProcedureParser<TOutput>;
+    | ProcedureParser<TOutput>
+    | ProcedureParserWithInputOutput<TOutput, TParsedOutput>;
   meta?: TMeta;
   resolve: ProcedureResolver<TContext, undefined, InferLast<TOutput>>;
 };
@@ -328,6 +325,7 @@ export type CreateProcedureOptions<
   TOutput = undefined,
   TParsedOutput = undefined,
 > =
+  | CreateProcedureWithInput<TContext, TMeta, TInput, TOutput>
   | CreateProcedureWithInputOutputParser<
       TContext,
       TMeta,
@@ -336,7 +334,6 @@ export type CreateProcedureOptions<
       TOutput,
       TParsedOutput
     >
-  | CreateProcedureWithInput<TContext, TMeta, TInput, TOutput>
   | CreateProcedureWithoutInput<TContext, TMeta, TOutput, TParsedOutput>;
 
 export function createProcedure<

package/src/deprecated/router.ts

@@ -43,14 +43,14 @@ type Prefix<
  * @internal
  */
 type Prefixer<TObj extends Record<string, any>, TPrefix extends string> = {
-  [P in keyof TObj as Prefix<TPrefix, string & P>]: TObj[P];
+  [P in keyof TObj as Prefix<TPrefix, P & string>]: TObj[P];
 };
 
 /**
  * @public
  * @deprecated
  */
-export type ProcedureType = 'query' | 'mutation' | 'subscription';
+export type ProcedureType = 'mutation' | 'query' | 'subscription';
 
 /**
  * @internal
@@ -138,11 +138,11 @@ export type inferHandlerInput<
       ? [(null | undefined)?] // -> there is no input
       : [(TInput | null | undefined)?] // -> there is optional input
     : [TInput] // -> input is required
-  : [(undefined | null)?]; // -> there is no input
+  : [(null | undefined)?]; // -> there is no input
 
 type inferHandlerFn<TProcedures extends ProcedureRecord> = <
   TProcedure extends TProcedures[TPath],
-  TPath extends keyof TProcedures & string,
+  TPath extends string & keyof TProcedures,
 >(
   path: TPath,
   ...args: inferHandlerInput<TProcedure>
@@ -198,7 +198,7 @@ export type inferRouterError<TRouter extends AnyRouter> = ReturnType<
 >;
 const PROCEDURE_DEFINITION_MAP: Record<
   ProcedureType,
-  'queries' | 'mutations' | 'subscriptions'
+  'mutations' | 'queries' | 'subscriptions'
 > = {
   query: 'queries',
   mutation: 'mutations',
@@ -216,7 +216,7 @@ export type ErrorFormatter<TContext, TShape extends TRPCErrorShape<number>> = ({
   type: ProcedureType | 'unknown';
   path: string | undefined;
   input: unknown;
-  ctx: undefined | TContext;
+  ctx: TContext | undefined;
   shape: DefaultErrorShape;
 }) => TShape;
 
@@ -380,8 +380,8 @@ export class Router<
     TInputContext,
     TContext,
     TMeta,
-    TQueries &
-      Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>>,
+    Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>> &
+      TQueries,
     TMutations,
     TSubscriptions,
     TErrorShape,
@@ -395,8 +395,8 @@ export class Router<
     TInputContext,
     TContext,
     TMeta,
-    TQueries &
-      Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>>,
+    Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>> &
+      TQueries,
     TMutations,
     TSubscriptions,
     TErrorShape,
@@ -415,8 +415,8 @@ export class Router<
     TInputContext,
     TContext,
     TMeta,
-    TQueries &
-      Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>>,
+    Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>> &
+      TQueries,
     TMutations,
     TSubscriptions,
     TErrorShape,
@@ -459,8 +459,8 @@ export class Router<
     TContext,
     TMeta,
     TQueries,
-    TMutations &
-      Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>>,
+    Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>> &
+      TMutations,
     TSubscriptions,
     TErrorShape,
     TTransformer
@@ -474,8 +474,8 @@ export class Router<
     TContext,
     TMeta,
     TQueries,
-    TMutations &
-      Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>>,
+    Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>> &
+      TMutations,
     TSubscriptions,
     TErrorShape,
     TTransformer
@@ -494,8 +494,8 @@ export class Router<
     TContext,
     TMeta,
     TQueries,
-    TMutations &
-      Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>>,
+    Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>> &
+      TMutations,
     TSubscriptions,
     TErrorShape,
     TTransformer
@@ -543,8 +543,8 @@ export class Router<
     TMeta,
     TQueries,
     TMutations,
-    TSubscriptions &
-      Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>>,
+    Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>> &
+      TSubscriptions,
     TErrorShape,
     TTransformer
   >;
@@ -568,8 +568,8 @@ export class Router<
     TMeta,
     TQueries,
     TMutations,
-    TSubscriptions &
-      Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>>,
+    Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>> &
+      TSubscriptions,
     TErrorShape,
     TTransformer
   >;
@@ -592,8 +592,8 @@ export class Router<
     TMeta,
     TQueries,
     TMutations,
-    TSubscriptions &
-      Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>>,
+    Record<TPath, inferProcedureFromOptions<TInputContext, typeof procedure>> &
+      TSubscriptions,
     TErrorShape,
     TTransformer
   >;
@@ -628,9 +628,9 @@ export class Router<
     TInputContext,
     inferRouterContext<TChildRouter>,
     TMeta,
-    TQueries & TChildRouter['_def']['queries'],
-    TMutations & TChildRouter['_def']['mutations'],
-    TSubscriptions & TChildRouter['_def']['subscriptions'],
+    TChildRouter['_def']['queries'] & TQueries,
+    TChildRouter['_def']['mutations'] & TMutations,
+    TChildRouter['_def']['subscriptions'] & TSubscriptions,
     TErrorShape,
     TTransformer
   >;
@@ -650,10 +650,10 @@ export class Router<
     TInputContext,
     inferRouterContext<TChildRouter>,
     TMeta,
-    TQueries & Prefixer<TChildRouter['_def']['queries'], `${TPath}`>,
-    TMutations & Prefixer<TChildRouter['_def']['mutations'], `${TPath}`>,
-    TSubscriptions &
-      Prefixer<TChildRouter['_def']['subscriptions'], `${TPath}`>,
+    Prefixer<TChildRouter['_def']['queries'], `${TPath}`> & TQueries,
+    Prefixer<TChildRouter['_def']['mutations'], `${TPath}`> & TMutations,
+    Prefixer<TChildRouter['_def']['subscriptions'], `${TPath}`> &
+      TSubscriptions,
     TErrorShape,
     TTransformer
   >;
@@ -672,14 +672,14 @@ export class Router<
     }
 
     const duplicateQueries = Object.keys(childRouter._def.queries).filter(
-      (key) => !!this._def['queries'][prefix + key],
+      (key) => !!this._def.queries[prefix + key],
     );
     const duplicateMutations = Object.keys(childRouter._def.mutations).filter(
-      (key) => !!this._def['mutations'][prefix + key],
+      (key) => !!this._def.mutations[prefix + key],
     );
     const duplicateSubscriptions = Object.keys(
       childRouter._def.subscriptions,
-    ).filter((key) => !!this._def['subscriptions'][prefix + key]);
+    ).filter((key) => !!this._def.subscriptions[prefix + key]);
 
     const duplicates = [
       ...duplicateQueries,
@@ -838,7 +838,7 @@ export class Router<
     type: ProcedureType | 'unknown';
     path: string | undefined;
     input: unknown;
-    ctx: undefined | TContext;
+    ctx: TContext | undefined;
   }): TErrorShape {
     const { path, error } = opts;
     const { code } = opts.error;