@trpc/server 10.0.0-alpha.26 → 10.0.0-alpha.27

package/src/core/internals/procedureBuilder.ts

@@ -59,9 +59,10 @@ export interface ProcedureBuilder<TParams extends ProcedureParams> {
     fn: MiddlewareFunction<TParams, $TParams>,
   ): CreateProcedureReturnInput<TParams, $TParams>;
   /**
-   * Extend the procedure with another procedure
+   * Extend the procedure with another procedure.
+   * @warning The TypeScript inference fails when chaining concatenated procedures.
    */
-  concat<$ProcedureReturnInput extends ProcedureBuilder<any>>(
+  unstable_concat<$ProcedureReturnInput extends ProcedureBuilder<any>>(
     proc: $ProcedureReturnInput,
   ): $ProcedureReturnInput extends ProcedureBuilder<infer $TParams>
     ? CreateProcedureReturnInput<TParams, $TParams>

package/src/core/router.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/ban-types */
-import { TRPCError } from '../TRPCError';
+import { TRPCError } from '../error/TRPCError';
 import {
   DefaultErrorShape,
   ErrorFormatter,
@@ -94,9 +94,22 @@ type inferHandlerFn<TProcedures extends ProcedureRecord<any>> = <
  */
 
 type RouterCaller<TParams extends AnyRouterParams> = (ctx: TParams['_ctx']) => {
+  /**
+   * @deprecated
+   */
   query: inferHandlerFn<TParams['queries']>;
+  /**
+   * @deprecated
+   */
   mutation: inferHandlerFn<TParams['mutations']>;
+  /**
+   * @deprecated
+   */
   subscription: inferHandlerFn<TParams['subscriptions']>;
+
+  queries: TParams['queries'];
+  mutations: TParams['mutations'];
+  subscriptions: TParams['subscriptions'];
 };
 
 export interface Router<TParams extends AnyRouterParams>
@@ -148,6 +161,13 @@ type RouterBuildOptions<TContext> = Pick<
 
 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);
+    },
+  });
+}
 const emptyRouter = {
   _ctx: null as any,
   _errorShape: null as any,
@@ -256,6 +276,31 @@ export function createRouterFactory<TSettings extends RootConfig>(
               ctx,
               type: 'subscription',
             }) as any,
+
+          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',
+            }),
+          ),
         };
       },
       getErrorShape(opts) {

package/src/deprecated/internals/middlewares.ts

@@ -1,4 +1,4 @@
-import { TRPCError } from '../../TRPCError';
+import { TRPCError } from '../../error/TRPCError';
 import { ProcedureType } from '../router';
 
 /**

package/src/deprecated/internals/procedure.ts

@@ -1,10 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { TRPCError } from '../../TRPCError';
 import { assertNotBrowser } from '../../assertNotBrowser';
-import {
-  getCauseFromUnknown,
-  getErrorFromUnknown,
-} from '../../internals/errors';
+import { TRPCError } from '../../error/TRPCError';
+import { getCauseFromUnknown, getErrorFromUnknown } from '../../error/utils';
 import { InferLast } from '../../types';
 import { ProcedureType } from '../router';
 import {

package/src/deprecated/router.ts

@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/ban-types */
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { TRPCError } from '../TRPCError';
 import { assertNotBrowser } from '../assertNotBrowser';
+import { TRPCError } from '../error/TRPCError';
+import { defaultFormatter } from '../error/formatter';
 import { getHTTPStatusCodeFromError } from '../http/internals/getHTTPStatusCode';
 import { Observable, inferObservableValue } from '../observable';
 import {
@@ -14,6 +15,7 @@ import {
 import {
   CombinedDataTransformer,
   DataTransformerOptions,
+  defaultTransformer,
 } from '../transformer';
 import { Prefixer, ThenArg, flatten } from '../types';
 import { MiddlewareFunction } from './internals/middlewares';
@@ -235,18 +237,6 @@ function safeObject<TObj1, TObj2>(obj1: TObj1, obj2: TObj2): TObj1 & TObj2;
 function safeObject(...args: unknown[]) {
   return Object.assign(Object.create(null), ...args);
 }
-const defaultFormatter: ErrorFormatter<any, any> = ({
-  shape,
-}: {
-  shape: DefaultErrorShape;
-}) => {
-  return shape;
-};
-const defaultTransformer: CombinedDataTransformer = {
-  input: { serialize: (obj) => obj, deserialize: (obj) => obj },
-  output: { serialize: (obj) => obj, deserialize: (obj) => obj },
-};
-
 type SwapProcedureContext<
   TProcedure extends Procedure<any, any, any, any, any, any, any>,
   TNewContext,

package/src/error/TRPCError.ts

@@ -1,8 +1,8 @@
+import { getMessageFromUnkownError } from '../error/utils';
 import { TRPC_ERROR_CODE_KEY } from '../rpc/codes';
-import { getMessageFromUnkownError } from './utils';
 
 export class TRPCError extends Error {
-  public readonly cause?: Error | undefined;
+  public readonly cause?;
   public readonly code;
 
   constructor(opts: {

package/src/http/internals/getHTTPStatusCode.ts

@@ -1,4 +1,4 @@
-import { TRPCError } from '../../TRPCError';
+import { TRPCError } from '../../error/TRPCError';
 import { invert } from '../../internals/invert';
 import { TRPCResponse, TRPC_ERROR_CODES_BY_KEY } from '../../rpc';
 

package/src/http/internals/types.ts

@@ -1,5 +1,5 @@
-import { TRPCError } from '../../TRPCError';
 import { AnyRouter, ProcedureType, inferRouterParams } from '../../core';
+import { TRPCError } from '../../error/TRPCError';
 import { BaseHandlerOptions } from '../../internals/types';
 import { TRPCResponse } from '../../rpc';
 import { Dict } from '../../types';

package/src/http/resolveHTTPResponse.ts

@@ -1,12 +1,12 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-import { TRPCError } from '../TRPCError';
 import {
   AnyRouter,
   ProcedureType,
   inferRouterContext,
   inferRouterError,
 } from '../core';
-import { getCauseFromUnknown, getErrorFromUnknown } from '../internals/errors';
+import { TRPCError } from '../error/TRPCError';
+import { getCauseFromUnknown, getErrorFromUnknown } from '../error/utils';
 import { transformTRPCResponse } from '../internals/transformTRPCResponse';
 import { TRPCResponse } from '../rpc';
 import { Maybe } from '../types';

package/src/index.ts

@@ -1,7 +1,7 @@
 export * from './assertNotBrowser';
 export * from './http';
 export * from './transformer';
-export * from './TRPCError';
+export * from './error/TRPCError';
 export * from './types';
 export { router } from './deprecated/router';
 export * from './core';

package/src/internals/types.ts

@@ -1,7 +1,7 @@
-import { TRPCError } from '../TRPCError';
 import { inferRouterParams } from '../core';
 import { ProcedureType } from '../core';
 import { AnyRouter } from '../core/router';
+import { TRPCError } from '../error/TRPCError';
 
 /**
  * Base interface for any response handler

package/src/subscription.ts

@@ -1,4 +1,4 @@
-import { getErrorFromUnknown } from './internals/errors';
+import { getErrorFromUnknown } from './error/utils';
 import { Observable, Observer, observable } from './observable';
 
 export function subscriptionPullFactory<TOutput>(opts: {

package/dist/TRPCError.d.ts

@@ -1,11 +0,0 @@
-import { TRPC_ERROR_CODE_KEY } from './rpc/codes';
-export declare class TRPCError extends Error {
-    readonly cause?: Error | undefined;
-    readonly code: "PARSE_ERROR" | "BAD_REQUEST" | "INTERNAL_SERVER_ERROR" | "UNAUTHORIZED" | "FORBIDDEN" | "NOT_FOUND" | "METHOD_NOT_SUPPORTED" | "TIMEOUT" | "CONFLICT" | "PRECONDITION_FAILED" | "PAYLOAD_TOO_LARGE" | "CLIENT_CLOSED_REQUEST";
-    constructor(opts: {
-        message?: string;
-        code: TRPC_ERROR_CODE_KEY;
-        cause?: Error;
-    });
-}
-//# sourceMappingURL=TRPCError.d.ts.map

package/dist/TRPCError.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"TRPCError.d.ts","sourceRoot":"","sources":["../src/TRPCError.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,qBAAa,SAAU,SAAQ,KAAK;IAClC,SAAgB,KAAK,CAAC,oBAAC;IACvB,SAAgB,IAAI,iOAAC;gBAET,IAAI,EAAE;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,mBAAmB,CAAC;QAC1B,KAAK,CAAC,EAAE,KAAK,CAAC;KACf;CAeF"}

package/dist/internals/errors.d.ts

@@ -1,5 +0,0 @@
-import { TRPCError } from '../TRPCError';
-export declare function getMessageFromUnkownError(err: unknown, fallback: string): string;
-export declare function getErrorFromUnknown(cause: unknown): TRPCError;
-export declare function getCauseFromUnknown(cause: unknown): Error | undefined;
-//# sourceMappingURL=errors.d.ts.map

package/dist/internals/errors.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/internals/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,GACf,MAAM,CASR;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,CAwB7D;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,qBAMjD"}

package/src/TRPCError.ts

@@ -1,27 +0,0 @@
-import { getMessageFromUnkownError } from './internals/errors';
-import { TRPC_ERROR_CODE_KEY } from './rpc/codes';
-
-export class TRPCError extends Error {
-  public readonly cause?;
-  public readonly code;
-
-  constructor(opts: {
-    message?: string;
-    code: TRPC_ERROR_CODE_KEY;
-    cause?: Error;
-  }) {
-    const cause = opts.cause;
-    const code = opts.code;
-    const message = opts.message ?? getMessageFromUnkownError(cause, code);
-
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore https://github.com/tc39/proposal-error-cause
-    super(message, { cause });
-
-    this.code = code;
-    this.cause = cause;
-    this.name = 'TRPCError';
-
-    Object.setPrototypeOf(this, new.target.prototype);
-  }
-}

package/src/internals/errors.ts

@@ -1,49 +0,0 @@
-import { TRPCError } from '../TRPCError';
-
-export function getMessageFromUnkownError(
-  err: unknown,
-  fallback: string,
-): string {
-  if (typeof err === 'string') {
-    return err;
-  }
-
-  if (err instanceof Error && typeof err.message === 'string') {
-    return err.message;
-  }
-  return fallback;
-}
-
-export function getErrorFromUnknown(cause: unknown): TRPCError {
-  // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
-  // ref https://github.com/trpc/trpc/issues/331
-  if (cause instanceof Error && cause.name === 'TRPCError') {
-    return cause as TRPCError;
-  }
-
-  let errorCause: Error | undefined = undefined;
-  let stack: string | undefined = undefined;
-
-  if (cause instanceof Error) {
-    errorCause = cause;
-    // take stack trace from cause
-    stack = cause.stack;
-  }
-
-  const err = new TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    cause: errorCause,
-  });
-
-  err.stack = stack;
-
-  return err;
-}
-
-export function getCauseFromUnknown(cause: unknown) {
-  if (cause instanceof Error) {
-    return cause;
-  }
-
-  return undefined;
-}