@trpc/server 10.14.0 → 10.15.0

package/dist/error/TRPCError.d.ts

@@ -1,7 +1,7 @@
 import { TRPC_ERROR_CODE_KEY } from '../rpc/codes';
 export declare function getTRPCErrorFromUnknown(cause: unknown): TRPCError;
 export declare class TRPCError extends Error {
-    readonly cause?: Error | undefined;
+    readonly cause?: Error;
     readonly code: "INTERNAL_SERVER_ERROR" | "PARSE_ERROR" | "BAD_REQUEST" | "UNAUTHORIZED" | "FORBIDDEN" | "NOT_FOUND" | "METHOD_NOT_SUPPORTED" | "TIMEOUT" | "CONFLICT" | "PRECONDITION_FAILED" | "PAYLOAD_TOO_LARGE" | "TOO_MANY_REQUESTS" | "CLIENT_CLOSED_REQUEST";
     constructor(opts: {
         message?: string;

package/dist/error/TRPCError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TRPCError.d.ts","sourceRoot":"","sources":["../../src/error/TRPCError.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,CAkBjE;AAED,qBAAa,SAAU,SAAQ,KAAK;IAClC,SAAgB,KAAK,CAAC,oBAAC;IACvB,SAAgB,IAAI,uPAAC;gBAET,IAAI,EAAE;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,mBAAmB,CAAC;QAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB;CAiBF"}
+{"version":3,"file":"TRPCError.d.ts","sourceRoot":"","sources":["../../src/error/TRPCError.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,CAiBjE;AAED,qBAAa,SAAU,SAAQ,KAAK;IAClC,SAAgB,KAAK,CAAC,EAAE,KAAK,CAAC;IAC9B,SAAgB,IAAI,uPAAC;gBAET,IAAI,EAAE;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,mBAAmB,CAAC;QAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB;CAaF"}

package/dist/http/index.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var config = require('../config-bd759464.js');
-var resolveHTTPResponse = require('../resolveHTTPResponse-cbfdc43d.js');
-require('../TRPCError-4cbab0d0.js');
+var config = require('../config-055ae8e4.js');
+var resolveHTTPResponse = require('../resolveHTTPResponse-94b380d2.js');
+require('../TRPCError-98f26ad6.js');
 require('../codes-e0ea0f4c.js');
 require('../index-4d2d31b6.js');
 require('../transformTRPCResponse-d2700b72.js');

package/dist/http/index.mjs

@@ -1,6 +1,6 @@
-export { T as TRPC_ERROR_CODES_BY_NUMBER, f as getHTTPStatusCode, g as getHTTPStatusCodeFromError } from '../config-fb5f49a1.mjs';
-export { r as resolveHTTPResponse } from '../resolveHTTPResponse-8e9dd846.mjs';
-import '../TRPCError-e7333eae.mjs';
+export { T as TRPC_ERROR_CODES_BY_NUMBER, f as getHTTPStatusCode, g as getHTTPStatusCodeFromError } from '../config-6e96a9bc.mjs';
+export { r as resolveHTTPResponse } from '../resolveHTTPResponse-edf72fc7.mjs';
+import '../TRPCError-226f5343.mjs';
 import '../codes-52c11119.mjs';
 import '../index-972002da.mjs';
 import '../transformTRPCResponse-7a73a2df.mjs';

package/dist/index.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var config = require('./config-bd759464.js');
-var TRPCError = require('./TRPCError-4cbab0d0.js');
+var config = require('./config-055ae8e4.js');
+var TRPCError = require('./TRPCError-98f26ad6.js');
 var codes = require('./codes-e0ea0f4c.js');
 var index = require('./index-4d2d31b6.js');
 

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { c as createRouterFactory, d as defaultFormatter, g as getHTTPStatusCodeFromError, a as defaultTransformer, b as getDataTransformer$1, i as isServerDefault } from './config-fb5f49a1.mjs';
-export { e as callProcedure, a as defaultTransformer, b as getDataTransformer, p as procedureTypes } from './config-fb5f49a1.mjs';
-import { T as TRPCError, g as getCauseFromUnknown, a as getTRPCErrorFromUnknown } from './TRPCError-e7333eae.mjs';
-export { T as TRPCError, a as getTRPCErrorFromUnknown } from './TRPCError-e7333eae.mjs';
+import { c as createRouterFactory, d as defaultFormatter, g as getHTTPStatusCodeFromError, a as defaultTransformer, b as getDataTransformer$1, i as isServerDefault } from './config-6e96a9bc.mjs';
+export { e as callProcedure, a as defaultTransformer, b as getDataTransformer, p as procedureTypes } from './config-6e96a9bc.mjs';
+import { T as TRPCError, g as getCauseFromUnknown, a as getTRPCErrorFromUnknown } from './TRPCError-226f5343.mjs';
+export { T as TRPCError, a as getTRPCErrorFromUnknown } from './TRPCError-226f5343.mjs';
 import { T as TRPC_ERROR_CODES_BY_KEY } from './codes-52c11119.mjs';
 import { c as createFlatProxy } from './index-972002da.mjs';
 

package/dist/{nodeHTTPRequestHandler-7ebe1e44.js → nodeHTTPRequestHandler-11f3df04.js}

@@ -1,7 +1,7 @@
 'use strict';
 
-var resolveHTTPResponse = require('./resolveHTTPResponse-cbfdc43d.js');
-var TRPCError = require('./TRPCError-4cbab0d0.js');
+var resolveHTTPResponse = require('./resolveHTTPResponse-94b380d2.js');
+var TRPCError = require('./TRPCError-98f26ad6.js');
 
 async function getPostBody(opts) {
     const { req , maxBodySize =Infinity  } = opts;

package/dist/{nodeHTTPRequestHandler-5a5141c3.js → nodeHTTPRequestHandler-16d7c6df.js}

@@ -1,5 +1,5 @@
-import { r as resolveHTTPResponse } from './resolveHTTPResponse-39258d19.js';
-import { T as TRPCError } from './TRPCError-ed16b3b7.js';
+import { r as resolveHTTPResponse } from './resolveHTTPResponse-15c18b7a.js';
+import { T as TRPCError } from './TRPCError-92d93cfd.js';
 
 async function getPostBody(opts) {
     const { req, maxBodySize = Infinity } = opts;

package/dist/{nodeHTTPRequestHandler-8c27f394.mjs → nodeHTTPRequestHandler-c9ddbeeb.mjs}

@@ -1,5 +1,5 @@
-import { r as resolveHTTPResponse } from './resolveHTTPResponse-8e9dd846.mjs';
-import { T as TRPCError } from './TRPCError-e7333eae.mjs';
+import { r as resolveHTTPResponse } from './resolveHTTPResponse-edf72fc7.mjs';
+import { T as TRPCError } from './TRPCError-226f5343.mjs';
 
 async function getPostBody(opts) {
     const { req , maxBodySize =Infinity  } = opts;

package/dist/{resolveHTTPResponse-39258d19.js → resolveHTTPResponse-15c18b7a.js}

@@ -1,5 +1,5 @@
-import { e as callProcedure, f as getHTTPStatusCode } from './config-69ee2314.js';
-import { T as TRPCError, a as getTRPCErrorFromUnknown, g as getCauseFromUnknown } from './TRPCError-ed16b3b7.js';
+import { e as callProcedure, f as getHTTPStatusCode } from './config-163772ca.js';
+import { T as TRPCError, a as getTRPCErrorFromUnknown, g as getCauseFromUnknown } from './TRPCError-92d93cfd.js';
 import { t as transformTRPCResponse } from './transformTRPCResponse-896669e0.js';
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */

package/dist/{resolveHTTPResponse-cbfdc43d.js → resolveHTTPResponse-94b380d2.js}

@@ -1,7 +1,7 @@
 'use strict';
 
-var config = require('./config-bd759464.js');
-var TRPCError = require('./TRPCError-4cbab0d0.js');
+var config = require('./config-055ae8e4.js');
+var TRPCError = require('./TRPCError-98f26ad6.js');
 var transformTRPCResponse = require('./transformTRPCResponse-d2700b72.js');
 
 const HTTP_METHOD_PROCEDURE_TYPE_MAP = {

package/dist/{resolveHTTPResponse-8e9dd846.mjs → resolveHTTPResponse-edf72fc7.mjs}

@@ -1,5 +1,5 @@
-import { e as callProcedure, f as getHTTPStatusCode } from './config-fb5f49a1.mjs';
-import { T as TRPCError, a as getTRPCErrorFromUnknown, g as getCauseFromUnknown } from './TRPCError-e7333eae.mjs';
+import { e as callProcedure, f as getHTTPStatusCode } from './config-6e96a9bc.mjs';
+import { T as TRPCError, a as getTRPCErrorFromUnknown, g as getCauseFromUnknown } from './TRPCError-226f5343.mjs';
 import { t as transformTRPCResponse } from './transformTRPCResponse-7a73a2df.mjs';
 
 const HTTP_METHOD_PROCEDURE_TYPE_MAP = {

package/dist/shared/index.d.ts

@@ -1,3 +1,4 @@
 export * from './createProxy';
 export * from './jsonify';
+export type { SerializeObject } from './internal/serialize';
 //# sourceMappingURL=index.d.ts.map

package/dist/shared/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/shared/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/shared/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAG1B,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC"}

package/dist/shared/internal/serialize.d.ts

@@ -12,8 +12,11 @@ export declare type Serialize<T> = IsAny<T> extends true ? any : T extends JsonP
 declare type SerializeTuple<T extends [unknown, ...unknown[]]> = {
     [k in keyof T]: T[k] extends NonJsonPrimitive ? null : Serialize<T[k]>;
 };
-/** JSON serialize objects (not including arrays) and classes */
-declare type SerializeObject<T extends object> = {
+/**
+ * JSON serialize objects (not including arrays) and classes
+ * @internal
+ **/
+export declare type SerializeObject<T extends object> = {
     [k in keyof Omit<T, FilterKeys<T, NonJsonPrimitive>>]: Serialize<T[k]>;
 };
 declare type FilterDefinedKeys<TObj extends object> = Exclude<{

package/dist/shared/internal/serialize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../../src/shared/internal/serialize.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC;;GAEG;AACH,aAAK,aAAa,GACd,MAAM,GACN,MAAM,GACN,OAAO,GAEP,MAAM,GAEN,MAAM,GAEN,OAAO,GACP,IAAI,CAAC;AAET,aAAK,gBAAgB,GAAG,SAAS,GAAG,QAAQ,GAAG,MAAM,CAAC;AAMtD,aAAK,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC;AAG/C,oBAAY,SAAS,CAAC,CAAC,IACtB,KAAK,CAAC,CAAC,CAAC,SAAS,IAAI,GAAG,GAAG,GAC3B,CAAC,SAAS,aAAa,GAAG,CAAC,GAC3B,CAAC,SAAS,GAAG,CAAC,GAAG,EAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,GAC1C,CAAC,SAAS,gBAAgB,GAAG,KAAK,GAClC,CAAC,SAAS;IAAE,MAAM,IAAI,MAAM,CAAC,CAAA;CAAE,GAAG,CAAC,GACnC,CAAC,SAAS,EAAE,GAAG,EAAE,GACjB,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,GACrD,CAAC,SAAS,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,gBAAgB,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,GACvF,CAAC,SAAS,MAAM,GAAG,eAAe,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,GAC1D,KAAK,CAAC;AAEP,uGAAuG;AACvG,aAAK,cAAc,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC,IAAI;KACtD,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,gBAAgB,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACvE,CAAC;AAEF,gEAAgE;AAChE,aAAK,eAAe,CAAC,CAAC,SAAS,MAAM,IAAI;KACtC,CAAC,IAAI,MAAM,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACvE,CAAC;AAEF,aAAK,iBAAiB,CAAC,IAAI,SAAS,MAAM,IAAI,OAAO,CACnD;KACG,IAAI,IAAI,MAAM,IAAI,GAAG,SAAS,SAAS,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,GAAG,IAAI;CAClE,CAAC,MAAM,IAAI,CAAC,EACb,SAAS,CACV,CAAC;AAQF,aAAK,mBAAmB,CAAC,CAAC,SAAS,MAAM,IAEvC,IAAI,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,GAAG;KAE7B,CAAC,IAAI,MAAM,IAAI,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC;CACtE,CAAC"}
+{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../../src/shared/internal/serialize.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC;;GAEG;AACH,aAAK,aAAa,GACd,MAAM,GACN,MAAM,GACN,OAAO,GAEP,MAAM,GAEN,MAAM,GAEN,OAAO,GACP,IAAI,CAAC;AAET,aAAK,gBAAgB,GAAG,SAAS,GAAG,QAAQ,GAAG,MAAM,CAAC;AAMtD,aAAK,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC;AAG/C,oBAAY,SAAS,CAAC,CAAC,IACtB,KAAK,CAAC,CAAC,CAAC,SAAS,IAAI,GAAG,GAAG,GAC3B,CAAC,SAAS,aAAa,GAAG,CAAC,GAC3B,CAAC,SAAS,GAAG,CAAC,GAAG,EAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,GAC1C,CAAC,SAAS,gBAAgB,GAAG,KAAK,GAClC,CAAC,SAAS;IAAE,MAAM,IAAI,MAAM,CAAC,CAAA;CAAE,GAAG,CAAC,GACnC,CAAC,SAAS,EAAE,GAAG,EAAE,GACjB,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,GACrD,CAAC,SAAS,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,gBAAgB,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,GACvF,CAAC,SAAS,MAAM,GAAG,eAAe,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,GAC1D,KAAK,CAAC;AAEP,uGAAuG;AACvG,aAAK,cAAc,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC,IAAI;KACtD,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,gBAAgB,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACvE,CAAC;AAEF;;;IAGI;AACJ,oBAAY,eAAe,CAAC,CAAC,SAAS,MAAM,IAAI;KAC7C,CAAC,IAAI,MAAM,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACvE,CAAC;AAEF,aAAK,iBAAiB,CAAC,IAAI,SAAS,MAAM,IAAI,OAAO,CACnD;KACG,IAAI,IAAI,MAAM,IAAI,GAAG,SAAS,SAAS,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,GAAG,IAAI;CAClE,CAAC,MAAM,IAAI,CAAC,EACb,SAAS,CACV,CAAC;AAQF,aAAK,mBAAmB,CAAC,CAAC,SAAS,MAAM,IAEvC,IAAI,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,GAAG;KAE7B,CAAC,IAAI,MAAM,IAAI,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC;CACtE,CAAC"}

package/dist/subscription.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var TRPCError = require('./TRPCError-4cbab0d0.js');
+var TRPCError = require('./TRPCError-98f26ad6.js');
 var observable = require('./observable-464116ac.js');
 
 /**

package/dist/subscription.mjs

@@ -1,4 +1,4 @@
-import { a as getTRPCErrorFromUnknown } from './TRPCError-e7333eae.mjs';
+import { a as getTRPCErrorFromUnknown } from './TRPCError-226f5343.mjs';
 import { o as observable } from './observable-ade1bad8.mjs';
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "10.14.0",
+  "version": "10.15.0",
   "description": "tRPC Server",
   "author": "KATT",
   "license": "MIT",
@@ -133,6 +133,7 @@
     "@types/hash-sum": "^1.0.0",
     "@types/node": "^18.7.20",
     "@types/react": "^18.0.9",
+    "@types/react-dom": "^18.0.5",
     "@types/ws": "^8.2.0",
     "aws-lambda": "^1.0.7",
     "devalue": "^4.0.0",
@@ -156,5 +157,5 @@
     "yup": "^1.0.0",
     "zod": "^3.0.0"
   },
-  "gitHead": "452b679c1ba5ad52dc5fd8a1779cdb98544cdd30"
+  "gitHead": "47e6fc5cb80807d4b38f9841e04a1f3a3324831e"
 }

package/src/adapters/aws-lambda/utils.ts

@@ -99,6 +99,10 @@ export function getHTTPMethod(event: APIGatewayEvent) {
 
 export function getPath(event: APIGatewayEvent) {
   if (isPayloadV1(event)) {
+    if (!event.pathParameters) {
+      // Then this event was not triggered by a resource denoted with {proxy+}
+      return event.path.split('/').pop() || '';
+    }
     const matches = event.resource.matchAll(/\{(.*?)\}/g);
     for (const match of matches) {
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

package/src/core/router.ts

@@ -25,7 +25,7 @@ import {
 export type ProcedureRecord = Record<string, AnyProcedure>;
 
 export interface ProcedureRouterRecord {
-  [key: string]: AnyProcedure | AnyRouter;
+  [key: string]: AnyProcedure | AnyRouter | ProcedureRouterRecord;
 }
 
 /**
@@ -97,7 +97,9 @@ type DecorateProcedure<TProcedure extends AnyProcedure> = (
  * @internal
  */
 type DecoratedProcedureRecord<TProcedures extends ProcedureRouterRecord> = {
-  [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter
+  [TKey in keyof TProcedures]: TProcedures[TKey] extends ProcedureRouterRecord
+    ? DecoratedProcedureRecord<TProcedures[TKey]>
+    : TProcedures[TKey] extends AnyRouter
     ? DecoratedProcedureRecord<TProcedures[TKey]['_def']['record']>
     : TProcedures[TKey] extends AnyProcedure
     ? DecorateProcedure<TProcedures[TKey]>
@@ -140,11 +142,17 @@ export interface Router<TDef extends AnyRouterDef> {
 export type AnyRouter = Router<AnyRouterDef>;
 
 function isRouter(
-  procedureOrRouter: AnyProcedure | AnyRouter,
+  procedureOrRouter: AnyProcedure | AnyRouter | ProcedureRouterRecord,
 ): procedureOrRouter is AnyRouter {
   return 'router' in procedureOrRouter._def;
 }
 
+function isNestedRouter(
+  procedureOrRouter: AnyProcedure | AnyRouter | ProcedureRouterRecord,
+): procedureOrRouter is ProcedureRouterRecord {
+  return !('_def' in procedureOrRouter);
+}
+
 const emptyRouter = {
   _ctx: null as any,
   _errorShape: null as any,
@@ -165,6 +173,10 @@ const reservedWords = [
    * since JS will think that `.then` is something that exists
    */
   'then',
+  /**
+   * `_def` is a reserved word because it's used internally a lot
+   */
+  '_def',
 ];
 
 /**
@@ -200,11 +212,33 @@ export function createRouterFactory<TConfig extends AnyRootConfig>(
       );
     }
 
+    const newProcedures: ProcedureRouterRecord = {};
+    for (const [key, procedureOrRouter] of Object.entries(procedures ?? {})) {
+      const value = procedures[key] ?? {};
+
+      if (isNestedRouter(value)) {
+        newProcedures[key] = createRouterInner(value);
+        continue;
+      }
+
+      if (isRouter(value)) {
+        newProcedures[key] = procedureOrRouter;
+        continue;
+      }
+
+      newProcedures[key] = procedureOrRouter;
+    }
+
     const routerProcedures: ProcedureRecord = omitPrototype({});
     function recursiveGetPaths(procedures: ProcedureRouterRecord, path = '') {
       for (const [key, procedureOrRouter] of Object.entries(procedures ?? {})) {
         const newPath = `${path}${key}`;
 
+        if (isNestedRouter(procedureOrRouter)) {
+          recursiveGetPaths(procedureOrRouter, `${newPath}.`);
+          continue;
+        }
+
         if (isRouter(procedureOrRouter)) {
           recursiveGetPaths(procedureOrRouter._def.procedures, `${newPath}.`);
           continue;
@@ -217,14 +251,14 @@ export function createRouterFactory<TConfig extends AnyRootConfig>(
         routerProcedures[newPath] = procedureOrRouter;
       }
     }
-    recursiveGetPaths(procedures);
+    recursiveGetPaths(newProcedures);
 
     const _def: AnyRouterDef<TConfig> = {
       _config: config,
       router: true,
       procedures: routerProcedures,
       ...emptyRouter,
-      record: procedures,
+      record: newProcedures,
       queries: Object.entries(routerProcedures)
         .filter((pair) => (pair[1] as any)._def.query)
         .reduce((acc, [key, val]) => ({ ...acc, [key]: val }), {}),
@@ -237,7 +271,7 @@ export function createRouterFactory<TConfig extends AnyRootConfig>(
     };
 
     const router: AnyRouter = {
-      ...procedures,
+      ...newProcedures,
       _def,
       createCaller(ctx) {
         const proxy = createRecursiveProxy(({ path, args }) => {
@@ -295,6 +329,7 @@ export function createRouterFactory<TConfig extends AnyRootConfig>(
         return this._def._config.errorFormatter({ ...opts, shape });
       },
     };
+
     return router as any;
   };
 }

package/src/error/TRPCError.ts

@@ -6,10 +6,9 @@ import { TRPC_ERROR_CODE_KEY } from '../rpc/codes';
 
 export function getTRPCErrorFromUnknown(cause: unknown): TRPCError {
   const error = getErrorFromUnknown(cause);
-  // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
-  // ref https://github.com/trpc/trpc/issues/331
-  if (error.name === 'TRPCError') {
-    return cause as TRPCError;
+
+  if (error instanceof TRPCError) {
+    return error;
   }
 
   const trpcError = new TRPCError({
@@ -25,7 +24,7 @@ export function getTRPCErrorFromUnknown(cause: unknown): TRPCError {
 }
 
 export class TRPCError extends Error {
-  public readonly cause?;
+  public readonly cause?: Error;
   public readonly code;
 
   constructor(opts: {
@@ -33,20 +32,16 @@ export class TRPCError extends Error {
     code: TRPC_ERROR_CODE_KEY;
     cause?: unknown;
   }) {
-    const code = opts.code;
     const message =
-      opts.message ?? getMessageFromUnknownError(opts.cause, code);
-    const cause: Error | undefined =
+      opts.message ?? getMessageFromUnknownError(opts.cause, opts.code);
+    const cause =
       opts.cause !== undefined ? getErrorFromUnknown(opts.cause) : undefined;
 
     // 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);
+    this.code = opts.code;
+    this.name = this.constructor.name;
   }
 }

package/src/shared/index.ts

@@ -1,2 +1,5 @@
 export * from './createProxy';
 export * from './jsonify';
+
+// For `.d.ts` files https://github.com/trpc/trpc/issues/3943
+export type { SerializeObject } from './internal/serialize';

package/src/shared/internal/serialize.ts

@@ -42,8 +42,11 @@ type SerializeTuple<T extends [unknown, ...unknown[]]> = {
   [k in keyof T]: T[k] extends NonJsonPrimitive ? null : Serialize<T[k]>;
 };
 
-/** JSON serialize objects (not including arrays) and classes */
-type SerializeObject<T extends object> = {
+/**
+ * JSON serialize objects (not including arrays) and classes
+ * @internal
+ **/
+export type SerializeObject<T extends object> = {
   [k in keyof Omit<T, FilterKeys<T, NonJsonPrimitive>>]: Serialize<T[k]>;
 };
 

package/adapters/express/dist/trpc-server-adapters-express.cjs.d.ts

@@ -1 +0,0 @@
-export * from "../../../dist/declarations/src/adapters/express";

package/adapters/express/dist/trpc-server-adapters-express.cjs.dev.js

@@ -1,23 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var nodeHTTPRequestHandler = require('../../../dist/nodeHTTPRequestHandler-9a93c255.cjs.dev.js');
-require('url');
-require('../../../dist/resolveHTTPResponse-ab01e4b9.cjs.dev.js');
-require('../../../dist/transformTRPCResponse-36a41418.cjs.dev.js');
-require('../../../dist/codes-130e62df.cjs.dev.js');
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-function createExpressMiddleware(opts) {
-  return async (req, res) => {
-    const endpoint = req.path.slice(1);
-    await nodeHTTPRequestHandler.nodeHTTPRequestHandler({ ...opts,
-      req,
-      res,
-      path: endpoint
-    });
-  };
-}
-
-exports.createExpressMiddleware = createExpressMiddleware;

package/adapters/express/dist/trpc-server-adapters-express.cjs.js

@@ -1,7 +0,0 @@
-'use strict';
-
-if (process.env.NODE_ENV === "production") {
-  module.exports = require("./trpc-server-adapters-express.cjs.prod.js");
-} else {
-  module.exports = require("./trpc-server-adapters-express.cjs.dev.js");
-}

package/adapters/express/dist/trpc-server-adapters-express.cjs.prod.js

@@ -1,23 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var nodeHTTPRequestHandler = require('../../../dist/nodeHTTPRequestHandler-21707788.cjs.prod.js');
-require('url');
-require('../../../dist/resolveHTTPResponse-9812e803.cjs.prod.js');
-require('../../../dist/transformTRPCResponse-077b7539.cjs.prod.js');
-require('../../../dist/codes-aff770a3.cjs.prod.js');
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-function createExpressMiddleware(opts) {
-  return async (req, res) => {
-    const endpoint = req.path.slice(1);
-    await nodeHTTPRequestHandler.nodeHTTPRequestHandler({ ...opts,
-      req,
-      res,
-      path: endpoint
-    });
-  };
-}
-
-exports.createExpressMiddleware = createExpressMiddleware;

package/adapters/express/dist/trpc-server-adapters-express.esm.js

@@ -1,19 +0,0 @@
-import { n as nodeHTTPRequestHandler } from '../../../dist/nodeHTTPRequestHandler-4e09fc4c.esm.js';
-import 'url';
-import '../../../dist/resolveHTTPResponse-fcf14f5a.esm.js';
-import '../../../dist/transformTRPCResponse-56464e52.esm.js';
-import '../../../dist/codes-5678cc97.esm.js';
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-function createExpressMiddleware(opts) {
-  return async (req, res) => {
-    const endpoint = req.path.slice(1);
-    await nodeHTTPRequestHandler({ ...opts,
-      req,
-      res,
-      path: endpoint
-    });
-  };
-}
-
-export { createExpressMiddleware };

package/adapters/lambda/dist/trpc-server-adapters-lambda.cjs.d.ts

@@ -1 +0,0 @@
-export * from "../../../dist/declarations/src/adapters/lambda/index";

package/adapters/lambda/dist/trpc-server-adapters-lambda.cjs.dev.js

@@ -1,25 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var adapters_awsLambda_dist_trpcServerAdaptersAwsLambda = require('../../aws-lambda/dist/trpc-server-adapters-aws-lambda.cjs.dev.js');
-require('../../../dist/transformTRPCResponse-36a41418.cjs.dev.js');
-require('../../../dist/router-ee876044.cjs.dev.js');
-require('../../../dist/resolveHTTPResponse-ab01e4b9.cjs.dev.js');
-require('../../../dist/codes-130e62df.cjs.dev.js');
-require('events');
-require('http');
-require('url');
-require('../../../dist/nodeHTTPRequestHandler-9a93c255.cjs.dev.js');
-
-/**
- * @deprecated use `aws-lambda` instead
- */
-
-/**
- * @deprecated use `aws-lambda` instead
- */
-const lambdaRequestHandler = adapters_awsLambda_dist_trpcServerAdaptersAwsLambda.awsLambdaRequestHandler;
-
-exports.awsLambdaRequestHandler = adapters_awsLambda_dist_trpcServerAdaptersAwsLambda.awsLambdaRequestHandler;
-exports.lambdaRequestHandler = lambdaRequestHandler;

package/adapters/lambda/dist/trpc-server-adapters-lambda.cjs.js

@@ -1,7 +0,0 @@
-'use strict';
-
-if (process.env.NODE_ENV === "production") {
-  module.exports = require("./trpc-server-adapters-lambda.cjs.prod.js");
-} else {
-  module.exports = require("./trpc-server-adapters-lambda.cjs.dev.js");
-}

package/adapters/lambda/dist/trpc-server-adapters-lambda.cjs.prod.js

@@ -1,25 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var adapters_awsLambda_dist_trpcServerAdaptersAwsLambda = require('../../aws-lambda/dist/trpc-server-adapters-aws-lambda.cjs.prod.js');
-require('../../../dist/transformTRPCResponse-077b7539.cjs.prod.js');
-require('../../../dist/router-aaecbe82.cjs.prod.js');
-require('../../../dist/resolveHTTPResponse-9812e803.cjs.prod.js');
-require('../../../dist/codes-aff770a3.cjs.prod.js');
-require('events');
-require('http');
-require('url');
-require('../../../dist/nodeHTTPRequestHandler-21707788.cjs.prod.js');
-
-/**
- * @deprecated use `aws-lambda` instead
- */
-
-/**
- * @deprecated use `aws-lambda` instead
- */
-const lambdaRequestHandler = adapters_awsLambda_dist_trpcServerAdaptersAwsLambda.awsLambdaRequestHandler;
-
-exports.awsLambdaRequestHandler = adapters_awsLambda_dist_trpcServerAdaptersAwsLambda.awsLambdaRequestHandler;
-exports.lambdaRequestHandler = lambdaRequestHandler;

package/adapters/lambda/dist/trpc-server-adapters-lambda.esm.js

@@ -1,21 +0,0 @@
-import { awsLambdaRequestHandler } from '../../aws-lambda/dist/trpc-server-adapters-aws-lambda.esm.js';
-export { awsLambdaRequestHandler } from '../../aws-lambda/dist/trpc-server-adapters-aws-lambda.esm.js';
-import '../../../dist/transformTRPCResponse-56464e52.esm.js';
-import '../../../dist/router-a3fe3182.esm.js';
-import '../../../dist/resolveHTTPResponse-fcf14f5a.esm.js';
-import '../../../dist/codes-5678cc97.esm.js';
-import 'events';
-import 'http';
-import 'url';
-import '../../../dist/nodeHTTPRequestHandler-4e09fc4c.esm.js';
-
-/**
- * @deprecated use `aws-lambda` instead
- */
-
-/**
- * @deprecated use `aws-lambda` instead
- */
-const lambdaRequestHandler = awsLambdaRequestHandler;
-
-export { lambdaRequestHandler };

package/adapters/next/dist/trpc-server-adapters-next.cjs.d.ts

@@ -1 +0,0 @@
-export * from "../../../dist/declarations/src/adapters/next";

package/adapters/next/dist/trpc-server-adapters-next.cjs.dev.js

@@ -1,56 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var transformTRPCResponse = require('../../../dist/transformTRPCResponse-36a41418.cjs.dev.js');
-var nodeHTTPRequestHandler = require('../../../dist/nodeHTTPRequestHandler-9a93c255.cjs.dev.js');
-require('url');
-require('../../../dist/resolveHTTPResponse-ab01e4b9.cjs.dev.js');
-require('../../../dist/codes-130e62df.cjs.dev.js');
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-function createNextApiHandler(opts) {
-  return async (req, res) => {
-    function getPath() {
-      if (typeof req.query.trpc === 'string') {
-        return req.query.trpc;
-      }
-
-      if (Array.isArray(req.query.trpc)) {
-        return req.query.trpc.join('/');
-      }
-
-      return null;
-    }
-
-    const path = getPath();
-
-    if (path === null) {
-      const error = opts.router.getErrorShape({
-        error: new transformTRPCResponse.TRPCError({
-          message: 'Query "trpc" not found - is the file named `[trpc]`.ts or `[...trpc].ts`?',
-          code: 'INTERNAL_SERVER_ERROR'
-        }),
-        type: 'unknown',
-        ctx: undefined,
-        path: undefined,
-        input: undefined
-      });
-      const json = {
-        id: -1,
-        error
-      };
-      res.statusCode = 500;
-      res.json(json);
-      return;
-    }
-
-    await nodeHTTPRequestHandler.nodeHTTPRequestHandler({ ...opts,
-      req,
-      res,
-      path
-    });
-  };
-}
-
-exports.createNextApiHandler = createNextApiHandler;

package/adapters/next/dist/trpc-server-adapters-next.cjs.js

@@ -1,7 +0,0 @@
-'use strict';
-
-if (process.env.NODE_ENV === "production") {
-  module.exports = require("./trpc-server-adapters-next.cjs.prod.js");
-} else {
-  module.exports = require("./trpc-server-adapters-next.cjs.dev.js");
-}