@trpc/server 10.0.0-proxy-beta.14 → 10.0.0-proxy-beta.16

package/dist/{resolveHTTPResponse-bf4c6ceb.js → resolveHTTPResponse-92daf326.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var transformTRPCResponse = require('./transformTRPCResponse-05aa84c1.js');
+var transformTRPCResponse = require('./transformTRPCResponse-92c79c47.js');
 var TRPCError = require('./TRPCError-fe9113e5.js');
 
 const HTTP_METHOD_PROCEDURE_TYPE_MAP = {
@@ -94,7 +94,7 @@ async function resolveHTTPResponse(opts) {
         ];
         ctx = await createContext();
         const deserializeInputValue = (rawValue)=>{
-            return typeof rawValue !== 'undefined' ? router._def.transformer.input.deserialize(rawValue) : rawValue;
+            return typeof rawValue !== 'undefined' ? router._def._config.transformer.input.deserialize(rawValue) : rawValue;
         };
         const getInputs = ()=>{
             if (!isBatchCall) {

package/dist/{resolveHTTPResponse-4ceb1785.mjs → resolveHTTPResponse-9dff3dcc.mjs}

@@ -1,4 +1,4 @@
-import { e as callProcedure, f as getHTTPStatusCode, t as transformTRPCResponse } from './transformTRPCResponse-959de787.mjs';
+import { e as callProcedure, f as getHTTPStatusCode, t as transformTRPCResponse } from './transformTRPCResponse-23e99f82.mjs';
 import { T as TRPCError, a as getTRPCErrorFromUnknown, g as getCauseFromUnknown } from './TRPCError-e99e7cbe.mjs';
 
 const HTTP_METHOD_PROCEDURE_TYPE_MAP = {
@@ -92,7 +92,7 @@ async function resolveHTTPResponse(opts) {
         ];
         ctx = await createContext();
         const deserializeInputValue = (rawValue)=>{
-            return typeof rawValue !== 'undefined' ? router._def.transformer.input.deserialize(rawValue) : rawValue;
+            return typeof rawValue !== 'undefined' ? router._def._config.transformer.input.deserialize(rawValue) : rawValue;
         };
         const getInputs = ()=>{
             if (!isBatchCall) {

package/dist/shared/index.mjs

@@ -1 +1 @@
-export { a as createFlatProxy, c as createRecursiveProxy } from '../index-5a6a2e91.mjs';
+export { c as createFlatProxy, a as createRecursiveProxy } from '../index-0332d528.mjs';

package/dist/{transformTRPCResponse-959de787.mjs → transformTRPCResponse-23e99f82.mjs}

@@ -1,6 +1,6 @@
 import { T as TRPCError } from './TRPCError-e99e7cbe.mjs';
 import { i as invert, T as TRPC_ERROR_CODES_BY_KEY } from './codes-7d21f749.mjs';
-import { c as createRecursiveProxy } from './index-5a6a2e91.mjs';
+import { a as createRecursiveProxy } from './index-0332d528.mjs';
 
 const defaultFormatter = ({ shape  })=>{
     return shape;
@@ -78,21 +78,6 @@ function getHTTPStatusCodeFromError(error) {
     }
 };
 
-/**
- * Ensures there are no duplicate keys when building a procedure.
- */ function mergeWithoutOverrides(obj1, ...objs) {
-    const newObj = Object.assign(Object.create(null), obj1);
-    for (const overrides of objs){
-        for(const key in overrides){
-            if (key in newObj && newObj[key] !== overrides[key]) {
-                throw new Error(`Duplicate key ${key}`);
-            }
-            newObj[key] = overrides[key];
-        }
-    }
-    return newObj;
-}
-
 /**
  * Create an object without inheriting anything from `Object.prototype`
  * @internal
@@ -129,9 +114,9 @@ const emptyRouter = {
 ];
 /**
  * @internal
- */ function createRouterFactory(defaults) {
-    return function createRouterInner(opts) {
-        const reservedWordsUsed = new Set(Object.keys(opts).filter((v)=>reservedWords.includes(v)));
+ */ function createRouterFactory(config) {
+    return function createRouterInner(procedures) {
+        const reservedWordsUsed = new Set(Object.keys(procedures).filter((v)=>reservedWords.includes(v)));
         if (reservedWordsUsed.size > 0) {
             throw new Error('Reserved words used in `router({})` call: ' + Array.from(reservedWordsUsed).join(', '));
         }
@@ -143,40 +128,35 @@ const emptyRouter = {
                     recursiveGetPaths(procedureOrRouter._def.procedures, `${newPath}.`);
                     continue;
                 }
+                if (routerProcedures[newPath]) {
+                    throw new Error(`Duplicate key: ${newPath}`);
+                }
                 routerProcedures[newPath] = procedureOrRouter;
             }
         }
-        recursiveGetPaths(opts);
-        const result = mergeWithoutOverrides({
-            transformer: defaults?.transformer ?? defaultTransformer,
-            errorFormatter: defaults?.errorFormatter ?? defaultFormatter
-        }, {
-            procedures: routerProcedures
-        });
+        recursiveGetPaths(procedures);
         const _def = {
+            _config: config,
             router: true,
-            procedures: {},
+            procedures: routerProcedures,
             ...emptyRouter,
-            ...result,
-            record: opts,
-            queries: Object.entries(result.procedures || {}).filter((pair)=>pair[1]._def.query).reduce((acc, [key, val])=>({
+            record: procedures,
+            queries: Object.entries(routerProcedures || {}).filter((pair)=>pair[1]._def.query).reduce((acc, [key, val])=>({
                     ...acc,
                     [key]: val
                 }), {}),
-            mutations: Object.entries(result.procedures || {}).filter((pair)=>pair[1]._def.mutation).reduce((acc, [key, val])=>({
+            mutations: Object.entries(routerProcedures || {}).filter((pair)=>pair[1]._def.mutation).reduce((acc, [key, val])=>({
                     ...acc,
                     [key]: val
                 }), {}),
-            subscriptions: Object.entries(result.procedures || {}).filter((pair)=>pair[1]._def.subscription).reduce((acc, [key, val])=>({
+            subscriptions: Object.entries(routerProcedures || {}).filter((pair)=>pair[1]._def.subscription).reduce((acc, [key, val])=>({
                     ...acc,
                     [key]: val
                 }), {})
         };
         const router = {
-            ...opts,
+            ...procedures,
             _def,
-            transformer: _def.transformer,
-            errorFormatter: _def.errorFormatter,
             createCaller (ctx) {
                 const proxy = createRecursiveProxy(({ path , args  })=>{
                     // interop mode
@@ -217,13 +197,13 @@ const emptyRouter = {
                         httpStatus: getHTTPStatusCodeFromError(error)
                     }
                 };
-                if (process.env.NODE_ENV !== 'production' && typeof opts.error.stack === 'string') {
+                if (config.isDev && typeof opts.error.stack === 'string') {
                     shape.data.stack = opts.error.stack;
                 }
                 if (typeof path === 'string') {
                     shape.data.path = path;
                 }
-                return this._def.errorFormatter({
+                return this._def._config.errorFormatter({
                     ...opts,
                     shape
                 });
@@ -254,7 +234,7 @@ function transformTRPCResponseItem(router, item) {
     if ('error' in item) {
         return {
             ...item,
-            error: router._def.transformer.output.serialize(item.error)
+            error: router._def._config.transformer.output.serialize(item.error)
         };
     }
     if ('data' in item.result) {
@@ -262,7 +242,7 @@ function transformTRPCResponseItem(router, item) {
             ...item,
             result: {
                 ...item.result,
-                data: router._def.transformer.output.serialize(item.result.data)
+                data: router._def._config.transformer.output.serialize(item.result.data)
             }
         };
     }
@@ -274,4 +254,4 @@ function transformTRPCResponseItem(router, item) {
     return Array.isArray(itemOrItems) ? itemOrItems.map((item)=>transformTRPCResponseItem(router, item)) : transformTRPCResponseItem(router, itemOrItems);
 }
 
-export { defaultTransformer as a, getHTTPStatusCodeFromError as b, createRouterFactory as c, defaultFormatter as d, callProcedure as e, getHTTPStatusCode as f, getDataTransformer as g, isServerDefault as i, mergeWithoutOverrides as m, procedureTypes as p, transformTRPCResponse as t };
+export { defaultTransformer as a, getHTTPStatusCodeFromError as b, createRouterFactory as c, defaultFormatter as d, callProcedure as e, getHTTPStatusCode as f, getDataTransformer as g, isServerDefault as i, procedureTypes as p, transformTRPCResponse as t };

package/dist/{transformTRPCResponse-05aa84c1.js → transformTRPCResponse-92c79c47.js}

@@ -80,21 +80,6 @@ function getHTTPStatusCodeFromError(error) {
     }
 };
 
-/**
- * Ensures there are no duplicate keys when building a procedure.
- */ function mergeWithoutOverrides(obj1, ...objs) {
-    const newObj = Object.assign(Object.create(null), obj1);
-    for (const overrides of objs){
-        for(const key in overrides){
-            if (key in newObj && newObj[key] !== overrides[key]) {
-                throw new Error(`Duplicate key ${key}`);
-            }
-            newObj[key] = overrides[key];
-        }
-    }
-    return newObj;
-}
-
 /**
  * Create an object without inheriting anything from `Object.prototype`
  * @internal
@@ -131,9 +116,9 @@ const emptyRouter = {
 ];
 /**
  * @internal
- */ function createRouterFactory(defaults) {
-    return function createRouterInner(opts) {
-        const reservedWordsUsed = new Set(Object.keys(opts).filter((v)=>reservedWords.includes(v)));
+ */ function createRouterFactory(config) {
+    return function createRouterInner(procedures) {
+        const reservedWordsUsed = new Set(Object.keys(procedures).filter((v)=>reservedWords.includes(v)));
         if (reservedWordsUsed.size > 0) {
             throw new Error('Reserved words used in `router({})` call: ' + Array.from(reservedWordsUsed).join(', '));
         }
@@ -145,40 +130,35 @@ const emptyRouter = {
                     recursiveGetPaths(procedureOrRouter._def.procedures, `${newPath}.`);
                     continue;
                 }
+                if (routerProcedures[newPath]) {
+                    throw new Error(`Duplicate key: ${newPath}`);
+                }
                 routerProcedures[newPath] = procedureOrRouter;
             }
         }
-        recursiveGetPaths(opts);
-        const result = mergeWithoutOverrides({
-            transformer: defaults?.transformer ?? defaultTransformer,
-            errorFormatter: defaults?.errorFormatter ?? defaultFormatter
-        }, {
-            procedures: routerProcedures
-        });
+        recursiveGetPaths(procedures);
         const _def = {
+            _config: config,
             router: true,
-            procedures: {},
+            procedures: routerProcedures,
             ...emptyRouter,
-            ...result,
-            record: opts,
-            queries: Object.entries(result.procedures || {}).filter((pair)=>pair[1]._def.query).reduce((acc, [key, val])=>({
+            record: procedures,
+            queries: Object.entries(routerProcedures || {}).filter((pair)=>pair[1]._def.query).reduce((acc, [key, val])=>({
                     ...acc,
                     [key]: val
                 }), {}),
-            mutations: Object.entries(result.procedures || {}).filter((pair)=>pair[1]._def.mutation).reduce((acc, [key, val])=>({
+            mutations: Object.entries(routerProcedures || {}).filter((pair)=>pair[1]._def.mutation).reduce((acc, [key, val])=>({
                     ...acc,
                     [key]: val
                 }), {}),
-            subscriptions: Object.entries(result.procedures || {}).filter((pair)=>pair[1]._def.subscription).reduce((acc, [key, val])=>({
+            subscriptions: Object.entries(routerProcedures || {}).filter((pair)=>pair[1]._def.subscription).reduce((acc, [key, val])=>({
                     ...acc,
                     [key]: val
                 }), {})
         };
         const router = {
-            ...opts,
+            ...procedures,
             _def,
-            transformer: _def.transformer,
-            errorFormatter: _def.errorFormatter,
             createCaller (ctx) {
                 const proxy = index.createRecursiveProxy(({ path , args  })=>{
                     // interop mode
@@ -219,13 +199,13 @@ const emptyRouter = {
                         httpStatus: getHTTPStatusCodeFromError(error)
                     }
                 };
-                if (process.env.NODE_ENV !== 'production' && typeof opts.error.stack === 'string') {
+                if (config.isDev && typeof opts.error.stack === 'string') {
                     shape.data.stack = opts.error.stack;
                 }
                 if (typeof path === 'string') {
                     shape.data.path = path;
                 }
-                return this._def.errorFormatter({
+                return this._def._config.errorFormatter({
                     ...opts,
                     shape
                 });
@@ -256,7 +236,7 @@ function transformTRPCResponseItem(router, item) {
     if ('error' in item) {
         return {
             ...item,
-            error: router._def.transformer.output.serialize(item.error)
+            error: router._def._config.transformer.output.serialize(item.error)
         };
     }
     if ('data' in item.result) {
@@ -264,7 +244,7 @@ function transformTRPCResponseItem(router, item) {
             ...item,
             result: {
                 ...item.result,
-                data: router._def.transformer.output.serialize(item.result.data)
+                data: router._def._config.transformer.output.serialize(item.result.data)
             }
         };
     }
@@ -284,6 +264,5 @@ exports.getDataTransformer = getDataTransformer;
 exports.getHTTPStatusCode = getHTTPStatusCode;
 exports.getHTTPStatusCodeFromError = getHTTPStatusCodeFromError;
 exports.isServerDefault = isServerDefault;
-exports.mergeWithoutOverrides = mergeWithoutOverrides;
 exports.procedureTypes = procedureTypes;
 exports.transformTRPCResponse = transformTRPCResponse;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "10.0.0-proxy-beta.14",
+  "version": "10.0.0-proxy-beta.16",
   "description": "tRPC Server",
   "author": "KATT",
   "license": "MIT",
@@ -122,10 +122,10 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^14.4.3",
-    "@trpc/client": "10.0.0-proxy-beta.14",
-    "@trpc/next": "10.0.0-proxy-beta.14",
-    "@trpc/react": "10.0.0-proxy-beta.14",
-    "@trpc/server": "10.0.0-proxy-beta.14",
+    "@trpc/client": "10.0.0-proxy-beta.16",
+    "@trpc/next": "10.0.0-proxy-beta.16",
+    "@trpc/react": "10.0.0-proxy-beta.16",
+    "@trpc/server": "10.0.0-proxy-beta.16",
     "@types/aws-lambda": "^8.10.97",
     "@types/express": "^4.17.12",
     "@types/hash-sum": "^1.0.0",
@@ -154,12 +154,12 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "superjson": "^1.7.4",
-    "superstruct": "^0.15.2",
+    "superstruct": "^0.16.0",
     "ts-jest": "^27.0.5",
     "typescript": "^4.8.3",
     "ws": "^8.0.0",
     "yup": "^0.32.8",
     "zod": "^3.0.0"
   },
-  "gitHead": "55d4775d90e8620889a6828a4a3d3373c1bdd5f5"
+  "gitHead": "4e001688fbdd7de848beb431a343a08c9659618a"
 }

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

@@ -7,18 +7,21 @@ import type {
 } from 'aws-lambda';
 import { TRPCError, resolveHTTPResponse } from '../..';
 import { AnyRouter, inferRouterContext } from '../../core';
-import { HTTPHeaders, HTTPRequest } from '../../http/internals/types';
+import { HTTPRequest } from '../../http/internals/types';
 import type { HTTPResponse } from '../../http/internals/types';
 import {
   APIGatewayEvent,
   APIGatewayResult,
   AWSLambdaOptions,
   UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE,
+  getHTTPMethod,
+  getPath,
   isPayloadV1,
   isPayloadV2,
+  transformHeaders,
 } from './utils';
 
-export type { CreateAWSLambdaContextOptions, AWSLambdaOptions } from './utils';
+export * from './utils';
 
 function lambdaEventToHTTPRequest(event: APIGatewayEvent): HTTPRequest {
   const query = new URLSearchParams();
@@ -38,58 +41,6 @@ function lambdaEventToHTTPRequest(event: APIGatewayEvent): HTTPRequest {
   };
 }
 
-function getHTTPMethod(event: APIGatewayEvent) {
-  if (isPayloadV1(event)) {
-    return event.httpMethod;
-  }
-  if (isPayloadV2(event)) {
-    return event.requestContext.http.method;
-  }
-  throw new TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE,
-  });
-}
-
-function getPath(event: APIGatewayEvent) {
-  if (isPayloadV1(event)) {
-    const matches = event.resource.matchAll(/\{(.*?)\}/g);
-    for (const match of matches) {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      const group = match[1]!;
-      if (group.includes('+') && event.pathParameters) {
-        return event.pathParameters[group.replace('+', '')] || '';
-      }
-    }
-    return event.path.slice(1);
-  }
-  if (isPayloadV2(event)) {
-    const matches = event.routeKey.matchAll(/\{(.*?)\}/g);
-    for (const match of matches) {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      const group = match[1]!;
-      if (group.includes('+') && event.pathParameters) {
-        return event.pathParameters[group.replace('+', '')] || '';
-      }
-    }
-    return event.rawPath.slice(1);
-  }
-  throw new TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE,
-  });
-}
-function transformHeaders(headers: HTTPHeaders): APIGatewayResult['headers'] {
-  const obj: APIGatewayResult['headers'] = {};
-
-  for (const [key, value] of Object.entries(headers)) {
-    if (typeof value === 'undefined') {
-      continue;
-    }
-    obj[key] = Array.isArray(value) ? value.join(',') : value;
-  }
-  return obj;
-}
 function tRPCOutputToAPIGatewayOutput<
   TEvent extends APIGatewayEvent,
   TResult extends APIGatewayResult,

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

@@ -6,7 +6,8 @@ import type {
   APIGatewayProxyStructuredResultV2,
 } from 'aws-lambda';
 import type { AnyRouter, inferRouterContext } from '../../core';
-import type { ResponseMetaFn } from '../../http/internals/types';
+import { TRPCError } from '../../error/TRPCError';
+import type { HTTPHeaders, ResponseMetaFn } from '../../http/internals/types';
 import { OnErrorFunction } from '../../internals/types';
 
 export type APIGatewayEvent = APIGatewayProxyEvent | APIGatewayProxyEventV2;
@@ -82,6 +83,63 @@ function determinePayloadFormat(
     }
   }
 }
+
+export function getHTTPMethod(event: APIGatewayEvent) {
+  if (isPayloadV1(event)) {
+    return event.httpMethod;
+  }
+  if (isPayloadV2(event)) {
+    return event.requestContext.http.method;
+  }
+  throw new TRPCError({
+    code: 'INTERNAL_SERVER_ERROR',
+    message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE,
+  });
+}
+
+export function getPath(event: APIGatewayEvent) {
+  if (isPayloadV1(event)) {
+    const matches = event.resource.matchAll(/\{(.*?)\}/g);
+    for (const match of matches) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const group = match[1]!;
+      if (group.includes('+') && event.pathParameters) {
+        return event.pathParameters[group.replace('+', '')] || '';
+      }
+    }
+    return event.path.slice(1);
+  }
+  if (isPayloadV2(event)) {
+    const matches = event.routeKey.matchAll(/\{(.*?)\}/g);
+    for (const match of matches) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const group = match[1]!;
+      if (group.includes('+') && event.pathParameters) {
+        return event.pathParameters[group.replace('+', '')] || '';
+      }
+    }
+    return event.rawPath.slice(1);
+  }
+  throw new TRPCError({
+    code: 'INTERNAL_SERVER_ERROR',
+    message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE,
+  });
+}
+
+export function transformHeaders(
+  headers: HTTPHeaders,
+): APIGatewayResult['headers'] {
+  const obj: APIGatewayResult['headers'] = {};
+
+  for (const [key, value] of Object.entries(headers)) {
+    if (typeof value === 'undefined') {
+      continue;
+    }
+    obj[key] = Array.isArray(value) ? value.join(',') : value;
+  }
+  return obj;
+}
+
 export type DefinedAPIGatewayPayloadFormats = '1.0' | '2.0';
 export type APIGatewayPayloadFormatVersion =
   | DefinedAPIGatewayPayloadFormats

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

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { AnyRouter } from '../../core';
-import { inferRouterDef } from '../../core/types';
+import { inferRouterContext } from '../../core/types';
 import { HTTPRequest } from '../../http/internals/types';
 import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
 import { getPostBody } from './internals/getPostBody';
@@ -26,7 +26,7 @@ export async function nodeHTTPRequestHandler<
   TResponse extends NodeHTTPResponse,
 >(opts: NodeHTTPRequestHandlerOptions<TRouter, TRequest, TResponse>) {
   const createContext = async function _createContext(): Promise<
-    inferRouterDef<TRouter>['_ctx']
+    inferRouterContext<TRouter>
   > {
     return await opts.createContext?.(opts);
   };

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

@@ -1,6 +1,7 @@
 import { IncomingMessage, ServerResponse } from 'http';
-import { AnyRouter, inferRouterContext, inferRouterDef } from '../../core';
+import { AnyRouter, inferRouterContext } from '../../core';
 import { HTTPBaseHandlerOptions } from '../../http/internals/types';
+import { MaybePromise } from '../../types';
 
 interface ParsedQs {
   [key: string]: undefined | string | string[] | ParsedQs | ParsedQs[];
@@ -48,4 +49,4 @@ export type NodeHTTPCreateContextFn<
   TResponse,
 > = (
   opts: NodeHTTPCreateContextFnOptions<TRequest, TResponse>,
-) => inferRouterDef<TRouter>['_ctx'] | Promise<inferRouterDef<TRouter>['_ctx']>;
+) => MaybePromise<inferRouterContext<TRouter>>;

package/src/adapters/ws.ts

@@ -115,7 +115,7 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
 ) {
   const { wss, createContext, router } = opts;
 
-  const { transformer } = router._def;
+  const { transformer } = router._def._config;
   wss.on('connection', async (client, req) => {
     const clientSubscriptions = new Map<number | string, Unsubscribable>();