@trpc/server 10.0.0-alpha.36 → 10.0.0-alpha.39

package/src/core/router.ts

@@ -9,21 +9,21 @@ import {
 } from '../error/formatter';
 import { getHTTPStatusCodeFromError } from '../http/internals/getHTTPStatusCode';
 import { TRPCErrorShape, TRPC_ERROR_CODES_BY_KEY } from '../rpc';
+import { createProxy } from '../shared';
 import { CombinedDataTransformer, defaultTransformer } from '../transformer';
 import { RootConfig } from './internals/config';
-import {
-  InternalProcedure,
-  InternalProcedureCallOptions,
-} from './internals/internalProcedure';
 import { mergeWithoutOverrides } from './internals/mergeWithoutOverrides';
 import { omitPrototype } from './internals/omitPrototype';
+import { ProcedureCallOptions } from './internals/procedureBuilder';
 import {
+  AnyProcedure,
   MutationProcedure,
   Procedure,
+  ProcedureArgs,
   QueryProcedure,
   SubscriptionProcedure,
 } from './procedure';
-import { ProcedureType } from './types';
+import { ProcedureType, procedureTypes } from './types';
 
 type ProcedureRecord = Record<string, Procedure<any>>;
 
@@ -122,11 +122,24 @@ type inferHandlerFn<TProcedures extends Record<string, Procedure<any>>> = <
   ...args: inferHandlerInput<TProcedure>
 ) => Promise<inferProcedureOutput<TProcedure>>;
 
+type DecorateProcedure<TProcedure extends Procedure<any>> = (
+  input: ProcedureArgs<TProcedure['_def']>[0],
+) => Promise<TProcedure['_def']['_output_out']>;
+
+type assertProcedure<T> = T extends Procedure<any> ? T : never;
+
 /**
- * This only exists b/c of interop mode
  * @internal
  */
+type DecoratedProcedureRecord<TProcedures extends ProcedureRouterRecord> = {
+  [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter
+    ? DecoratedProcedureRecord<TProcedures[TKey]['_def']['record']>
+    : DecorateProcedure<assertProcedure<TProcedures[TKey]>>;
+};
 
+/**
+ * @internal
+ */
 type RouterCaller<TDef extends AnyRouterDef> = (ctx: TDef['_ctx']) => {
   /**
    * @deprecated
@@ -140,7 +153,7 @@ type RouterCaller<TDef extends AnyRouterDef> = (ctx: TDef['_ctx']) => {
    * @deprecated
    */
   subscription: inferHandlerFn<TDef['subscriptions']>;
-};
+} & DecoratedProcedureRecord<TDef['record']>;
 
 export interface Router<TDef extends AnyRouterDef> {
   _def: RouterDef<
@@ -153,8 +166,6 @@ export interface Router<TDef extends AnyRouterDef> {
   errorFormatter: TDef['errorFormatter'];
   /** @deprecated **/
   transformer: TDef['transformer'];
-
-  // FIXME rename me and deprecate
   createCaller: RouterCaller<TDef>;
   // FIXME rename me and deprecate
   getErrorShape(opts: {
@@ -183,13 +194,12 @@ export type RouterBuildOptions<TContext> = Partial<
 
 export type AnyRouter = Router<any>;
 
-function createRouterProxy(callback: (...args: [string, ...unknown[]]) => any) {
-  return new Proxy({} as any, {
-    get(_, path: string) {
-      return (...args: unknown[]) => callback(path, ...args);
-    },
-  });
+function isRouter(
+  procedureOrRouter: AnyProcedure | AnyRouter,
+): procedureOrRouter is AnyRouter {
+  return 'router' in procedureOrRouter._def;
 }
+
 const emptyRouter = {
   _ctx: null as any,
   _errorShape: null as any,
@@ -226,9 +236,8 @@ export function createRouterFactory<TConfig extends RootConfig>(
       for (const [key, procedureOrRouter] of Object.entries(procedures ?? {})) {
         const newPath = `${path}${key}`;
 
-        if (typeof procedureOrRouter === 'object') {
-          const router = procedureOrRouter as AnyRouter;
-          recursiveGetPaths(router._def.procedures, `${newPath}.`);
+        if (isRouter(procedureOrRouter)) {
+          recursiveGetPaths(procedureOrRouter._def.procedures, `${newPath}.`);
           continue;
         }
 
@@ -268,74 +277,46 @@ export function createRouterFactory<TConfig extends RootConfig>(
         .reduce((acc, [key, val]) => ({ ...acc, [key]: val }), {}),
     };
 
-    function callProcedure(opts: InternalProcedureCallOptions) {
-      const { type, path } = opts;
-
-      if (!(path in _def.procedures) || !_def.procedures[path]['_def'][type]) {
-        throw new TRPCError({
-          code: 'NOT_FOUND',
-          message: `No "${type}"-procedure on path "${path}"`,
-        });
-      }
-
-      const procedure = _def.procedures[path] as InternalProcedure;
-
-      return procedure(opts);
-    }
     const router: AnyRouter = {
       ...opts,
       _def,
       transformer: _def.transformer,
       errorFormatter: _def.errorFormatter,
       createCaller(ctx) {
-        return {
-          query: (path, ...args) =>
-            callProcedure({
-              path,
-              rawInput: args[0],
-              ctx,
-              type: 'query',
-            }) as any,
-          mutation: (path, ...args) =>
-            callProcedure({
-              path,
-              rawInput: args[0],
+        const proxy = createProxy(({ path, args }) => {
+          // interop mode
+          if (
+            path.length === 1 &&
+            procedureTypes.includes(path[0] as ProcedureType)
+          ) {
+            return callProcedure({
+              procedures: _def.procedures,
+              path: args[0] as string,
+              rawInput: args[1],
               ctx,
-              type: 'mutation',
-            }) as any,
-          subscription: (path, ...args) =>
-            callProcedure({
-              path,
-              rawInput: args[0],
-              ctx,
-              type: 'subscription',
-            }) as any,
+              type: path[0] as ProcedureType,
+            });
+          }
 
-          queries: createRouterProxy((path, rawInput) =>
-            callProcedure({
-              path,
-              rawInput,
-              ctx,
-              type: 'query',
-            }),
-          ),
-          mutations: createRouterProxy((path, rawInput) =>
-            callProcedure({
-              path,
-              rawInput,
-              ctx,
-              type: 'mutation',
-            }),
-          ),
-          subscriptions: createRouterProxy((path, rawInput) =>
-            callProcedure({
-              path,
-              rawInput,
-              ctx,
-              type: 'subscription',
-            }),
-          ),
-        };
+          const fullPath = path.join('.');
+          const procedure = _def.procedures[fullPath] as AnyProcedure;
+
+          let type: ProcedureType = 'query';
+          if (procedure._def.mutation) {
+            type = 'mutation';
+          } else if (procedure._def.subscription) {
+            type = 'subscription';
+          }
+
+          return procedure({
+            path: fullPath,
+            rawInput: args[0],
+            ctx,
+            type,
+          });
+        });
+
+        return proxy as ReturnType<RouterCaller<any>>;
       },
       getErrorShape(opts) {
         const { path, error } = opts;
@@ -363,3 +344,23 @@ export function createRouterFactory<TConfig extends RootConfig>(
     return router as any;
   };
 }
+
+/**
+ * @internal
+ */
+export function callProcedure(
+  opts: ProcedureCallOptions & { procedures: ProcedureRouterRecord },
+) {
+  const { type, path } = opts;
+
+  if (!(path in opts.procedures) || !opts.procedures[path]?._def[type]) {
+    throw new TRPCError({
+      code: 'NOT_FOUND',
+      message: `No "${type}"-procedure on path "${path}"`,
+    });
+  }
+
+  const procedure = opts.procedures[path] as AnyProcedure;
+
+  return procedure(opts);
+}

package/src/core/types.ts

@@ -17,10 +17,11 @@ export type inferRouterError<TRouter extends AnyRouter> =
 export type inferRouterMeta<TRouter extends AnyRouter> =
   inferRouterDef<TRouter>['_meta'];
 
+export const procedureTypes = ['query', 'mutation', 'subscription'] as const;
 /**
  * @public
  */
-export type ProcedureType = 'query' | 'mutation' | 'subscription';
+export type ProcedureType = typeof procedureTypes[number];
 
 export type inferHandlerInput<TProcedure extends Procedure<any>> =
   ProcedureArgs<inferProcedureParams<TProcedure>>;
@@ -52,3 +53,6 @@ export type inferSubscriptionOutput<
 > = inferObservableValue<
   inferProcedureOutput<TRouter['_def']['subscriptions'][TPath]>
 >;
+
+export type inferProcedureClientError<T extends Procedure<any>> =
+  inferProcedureParams<T>['_config']['errorShape'];

package/src/deprecated/internals/procedure.ts

@@ -207,7 +207,7 @@ export class Procedure<
       },
     ): Promise<MiddlewareResult<any>> => {
       try {
-        const result = await middlewaresWithResolver[callOpts.index]({
+        const result = await middlewaresWithResolver[callOpts.index]!({
           ctx: callOpts.ctx,
           type: opts.type,
           path: opts.path,

package/src/deprecated/interop.ts

@@ -1,12 +1,12 @@
 import { CombinedDataTransformer, ProcedureParams, ProcedureType } from '..';
 import { CreateRootConfig, RootConfig } from '../core/internals/config';
 import { getParseFnOrPassThrough } from '../core/internals/getParseFn';
+import { mergeWithoutOverrides } from '../core/internals/mergeWithoutOverrides';
 import {
+  createBuilder,
   createInputMiddleware,
-  createInternalBuilder,
   createOutputMiddleware,
-} from '../core/internals/internalProcedure';
-import { mergeWithoutOverrides } from '../core/internals/mergeWithoutOverrides';
+} from '../core/internals/procedureBuilder';
 import {
   MutationProcedure,
   Procedure as NewProcedure,
@@ -175,7 +175,7 @@ function migrateProcedure<
 
   const inputMiddleware = createInputMiddleware(inputParser);
 
-  const builder = createInternalBuilder({
+  const builder = createBuilder({
     input: def.inputParser,
     middlewares: [
       ...(def.middlewares as any),

package/src/deprecated/router.ts

@@ -337,8 +337,8 @@ export class Router<
     TPrefix extends string,
   >(procedures: TProcedures, prefix: TPrefix): Prefixer<TProcedures, TPrefix> {
     const eps: ProcedureRecord = safeObject();
-    for (const key in procedures) {
-      eps[prefix + key] = procedures[key];
+    for (const [key, procedure] of Object.entries(procedures)) {
+      eps[prefix + key] = procedure;
     }
     return eps as any;
   }
@@ -658,8 +658,7 @@ export class Router<
 
     const mergeProcedures = (defs: ProcedureRecord) => {
       const newDefs = safeObject() as typeof defs;
-      for (const key in defs) {
-        const procedure = defs[key];
+      for (const [key, procedure] of Object.entries(defs)) {
         const newProcedure = procedure.inheritMiddlewares(
           this._def.middlewares,
         );

package/src/http/resolveHTTPResponse.ts

@@ -213,7 +213,7 @@ export async function resolveHTTPResponse<
       }
     });
 
-    const result = isBatchCall ? resultEnvelopes : resultEnvelopes[0];
+    const result = isBatchCall ? resultEnvelopes : resultEnvelopes[0]!;
     return endResponse(result, errors);
   } catch (cause) {
     // we get here if

package/src/index.ts

@@ -5,3 +5,4 @@ export * from './error/TRPCError';
 export * from './types';
 export { router } from './deprecated/router';
 export * from './core';
+export * from './internals';

package/src/internals.ts

@@ -0,0 +1,14 @@
+/**
+ * These types have to be exported so users can generate their own types definitions files
+ */
+export type { DefaultErrorShape } from './error/formatter';
+export type { mergeRoutersGeneric } from './core/internals/__generated__/mergeRoutersGeneric';
+export type { ProcedureBuilder } from './core/internals/procedureBuilder';
+export type { Overwrite, unsetMarker } from './core/internals/utils';
+export type { MiddlewareFunction } from './core/middleware';
+export type { Router, RouterDef } from './core/router';
+export type {
+  MutationProcedure,
+  QueryProcedure,
+  SubscriptionProcedure,
+} from './core/procedure';

package/src/observable/internals/pipe.ts

@@ -10,7 +10,8 @@ export function pipeFromArray<T, R>(
   }
 
   if (fns.length === 1) {
-    return fns[0];
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    return fns[0]!;
   }
 
   return function piped(input: T): R {

package/src/observable/observable.test.ts

@@ -18,7 +18,7 @@ test('vanilla observable - complete()', () => {
   expect(next.mock.calls).toHaveLength(1);
   expect(complete.mock.calls).toHaveLength(1);
   expect(error.mock.calls).toHaveLength(0);
-  expect(next.mock.calls[0][0]).toBe(1);
+  expect(next.mock.calls[0]![0]!).toBe(1);
 });
 
 test('vanilla observable - unsubscribe()', () => {
@@ -38,7 +38,7 @@ test('vanilla observable - unsubscribe()', () => {
   expect(next.mock.calls).toHaveLength(1);
   expect(complete.mock.calls).toHaveLength(0);
   expect(error.mock.calls).toHaveLength(0);
-  expect(next.mock.calls[0][0]).toBe(1);
+  expect(next.mock.calls[0]![0]!).toBe(1);
 });
 
 test('pipe - combine operators', () => {
@@ -66,7 +66,7 @@ test('pipe - combine operators', () => {
     expect(next.mock.calls).toHaveLength(1);
     expect(complete.mock.calls).toHaveLength(0);
     expect(error.mock.calls).toHaveLength(0);
-    expect(next.mock.calls[0][0]).toBe(1);
+    expect(next.mock.calls[0]![0]!).toBe(1);
   }
 
   {

package/src/observable/operators/share.test.ts

@@ -21,7 +21,7 @@ test('share', () => {
     expect(next.mock.calls).toHaveLength(1);
     expect(complete.mock.calls).toHaveLength(0);
     expect(error.mock.calls).toHaveLength(0);
-    expect(next.mock.calls[0][0]).toBe(1);
+    expect(next.mock.calls[0]![0]!).toBe(1);
   }
 
   {
@@ -54,7 +54,7 @@ test('share', () => {
     expect(next.mock.calls).toHaveLength(1);
     expect(complete.mock.calls).toHaveLength(0);
     expect(error.mock.calls).toHaveLength(0);
-    expect(next.mock.calls[0][0]).toBe(1);
+    expect(next.mock.calls[0]![0]!).toBe(1);
     subscription3.unsubscribe();
   }
 });

package/src/types.ts

@@ -74,3 +74,15 @@ type FilterKeys<T extends object, K> = {
  * @internal
  */
 export type Filter<T extends object, K> = Pick<T, FilterKeys<T, K>>;
+
+/**
+ * @internal
+ */
+export type NeverKeys<T> = {
+  [TKey in keyof T]: T[TKey] extends never ? TKey : never;
+}[keyof T];
+
+/**
+ * @internal
+ */
+export type OmitNeverKeys<T> = Omit<T, NeverKeys<T>>;

package/dist/core/internals/internalProcedure.d.ts

@@ -1,78 +0,0 @@
-import { MaybePromise } from '../../types';
-import { MiddlewareFunction } from '../middleware';
-import { Parser } from '../parser';
-import { ProcedureType } from '../types';
-import { ParseFn } from './getParseFn';
-import { ResolveOptions } from './utils';
-export interface InternalProcedureCallOptions {
-    ctx: unknown;
-    rawInput: unknown;
-    input?: unknown;
-    path: string;
-    type: ProcedureType;
-}
-export interface InternalProcedure {
-    _def: ProcedureBuilderInternal['_def'];
-    /**
-     * @deprecated use `._def.meta` instead
-     */
-    meta: ProcedureBuilderInternal['_def']['meta'];
-    mutation?: boolean;
-    query?: boolean;
-    subscription?: boolean;
-    (opts: InternalProcedureCallOptions): Promise<unknown>;
-}
-declare type ProcedureBuilderInternalResolver = (opts: ResolveOptions<any>) => Promise<unknown>;
-export declare type ProcedureBuilderInternalMiddleware = MiddlewareFunction<any, any>;
-declare type TResolver = (opts: ResolveOptions<any>) => MaybePromise<any>;
-interface ProcedureBuilderInternal {
-    _def: {
-        input?: Parser;
-        output?: Parser;
-        meta?: Record<string, unknown>;
-        resolver?: ProcedureBuilderInternalResolver;
-        middlewares: ProcedureBuilderInternalMiddleware[];
-        mutation?: boolean;
-        query?: boolean;
-        subscription?: boolean;
-    };
-    /**
-     * @internal
-     */
-    input: (parser: Parser) => ProcedureBuilderInternal;
-    /**
-     * @internal
-     */
-    output: (parser: Parser) => ProcedureBuilderInternal;
-    /**
-     * @internal
-     */
-    unstable_concat: (proc: ProcedureBuilderInternal) => ProcedureBuilderInternal;
-    /**
-     * @internal
-     */
-    use: (fn: MiddlewareFunction<any, any>) => ProcedureBuilderInternal;
-    /**
-     * @internal
-     */
-    meta: (meta: Record<string, unknown>) => ProcedureBuilderInternal;
-    /** @deprecated **/
-    resolve: (resolver: TResolver) => InternalProcedure;
-    /**
-     * @internal
-     */
-    query: (resolver: TResolver) => InternalProcedure;
-    /**
-     * @internal
-     */
-    mutation: (resolver: TResolver) => InternalProcedure;
-    /**
-     * @internal
-     */
-    subscription: (resolver: TResolver) => InternalProcedure;
-}
-export declare function createInputMiddleware<T>(parse: ParseFn<T>): ProcedureBuilderInternalMiddleware;
-export declare function createOutputMiddleware<T>(parse: ParseFn<T>): ProcedureBuilderInternalMiddleware;
-export declare function createInternalBuilder(initDef?: ProcedureBuilderInternal['_def']): ProcedureBuilderInternal;
-export {};
-//# sourceMappingURL=internalProcedure.d.ts.map

package/dist/core/internals/internalProcedure.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"internalProcedure.d.ts","sourceRoot":"","sources":["../../../src/core/internals/internalProcedure.ts"],"names":[],"mappings":"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"}