@trpc/server 11.0.0-rc.345 → 11.0.0-rc.347

package/dist/bundle-analysis.json

@@ -1,7 +1,7 @@
 {
-  "bundleSize": 105383,
-  "bundleOrigSize": 166794,
-  "bundleReduction": 36.82,
+  "bundleSize": 97925,
+  "bundleOrigSize": 148868,
+  "bundleReduction": 34.22,
   "modules": [
     {
       "id": "/src/adapters/ws.ts",
@@ -15,7 +15,7 @@
       "dependents": [
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 9.65,
+      "percent": 10.39,
       "reduction": 0
     },
     {
@@ -27,7 +27,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 9.29,
+      "percent": 10,
       "reduction": 19.08
     },
     {
@@ -43,7 +43,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 6.06,
+      "percent": 6.52,
       "reduction": 59.29
     },
     {
@@ -62,23 +62,9 @@
         "/src/unstable-core-do-not-import/http/resolveHTTPResponse.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 5.68,
+      "percent": 6.11,
       "reduction": 41.05
     },
-    {
-      "id": "/src/adapters/node-http/content-type/form-data/index.ts",
-      "size": 3927,
-      "origSize": 5856,
-      "renderedExports": [
-        "getFormDataContentTypeHandler"
-      ],
-      "removedExports": [],
-      "dependents": [
-        "/src/adapters/node-http/nodeHTTPRequestHandler.ts"
-      ],
-      "percent": 3.73,
-      "reduction": 32.94
-    },
     {
       "id": "/src/adapters/fetch/fetchRequestHandler.ts",
       "size": 3809,
@@ -90,7 +76,7 @@
       "dependents": [
         "/src/adapters/fetch/index.ts"
       ],
-      "percent": 3.61,
+      "percent": 3.89,
       "reduction": 9.03
     },
     {
@@ -104,7 +90,7 @@
       "dependents": [
         "/src/adapters/node-http/index.ts"
       ],
-      "percent": 3.42,
+      "percent": 3.68,
       "reduction": 16.83
     },
     {
@@ -125,7 +111,7 @@
         "/src/adapters/aws-lambda/index.ts",
         "/src/adapters/aws-lambda/content-type/json/index.ts"
       ],
-      "percent": 3.38,
+      "percent": 3.64,
       "reduction": 30.57
     },
     {
@@ -142,7 +128,7 @@
         "/src/observable/index.ts",
         "/src/observable/operators.ts"
       ],
-      "percent": 2.97,
+      "percent": 3.2,
       "reduction": 0.67
     },
     {
@@ -156,7 +142,7 @@
       "dependents": [
         "/src/adapters/next-app-dir.ts"
       ],
-      "percent": 2.89,
+      "percent": 3.11,
       "reduction": 20.12
     },
     {
@@ -171,7 +157,7 @@
         "/src/adapters/fastify/index.ts",
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 2.66,
+      "percent": 2.87,
       "reduction": 27.72
     },
     {
@@ -183,7 +169,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 2.64,
+      "percent": 2.84,
       "reduction": 32.14
     },
     {
@@ -199,7 +185,7 @@
       "dependents": [
         "/src/observable/index.ts"
       ],
-      "percent": 2.62,
+      "percent": 2.81,
       "reduction": 0
     },
     {
@@ -219,7 +205,7 @@
         "/src/unstable-core-do-not-import/router.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 2.6,
+      "percent": 2.8,
       "reduction": 45.94
     },
     {
@@ -233,7 +219,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 2.52,
+      "percent": 2.71,
       "reduction": 41.08
     },
     {
@@ -253,30 +239,13 @@
         "/src/unstable-core-do-not-import/initTRPC.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 2.49,
+      "percent": 2.68,
       "reduction": 55.5
     },
-    {
-      "id": "/src/adapters/node-http/content-type/form-data/fileUploadHandler.ts",
-      "size": 2540,
-      "origSize": 7992,
-      "renderedExports": [
-        "readableStreamToString",
-        "NodeOnDiskFile"
-      ],
-      "removedExports": [
-        "createFileUploadHandler"
-      ],
-      "dependents": [
-        "/src/adapters/node-http/content-type/form-data/index.ts"
-      ],
-      "percent": 2.41,
-      "reduction": 68.22
-    },
     {
       "id": "/src/adapters/node-http/content-type/json/index.ts",
       "size": 2464,
-      "origSize": 2497,
+      "origSize": 2500,
       "renderedExports": [
         "getNodeHTTPJSONContentTypeHandler"
       ],
@@ -284,13 +253,13 @@
       "dependents": [
         "/src/adapters/node-http/nodeHTTPRequestHandler.ts"
       ],
-      "percent": 2.34,
-      "reduction": 1.32
+      "percent": 2.52,
+      "reduction": 1.44
     },
     {
       "id": "/src/adapters/fastify/content-type/json/index.ts",
       "size": 2355,
-      "origSize": 2750,
+      "origSize": 2753,
       "renderedExports": [
         "getFastifyHTTPJSONContentTypeHandler"
       ],
@@ -298,13 +267,13 @@
       "dependents": [
         "/src/adapters/fastify/fastifyRequestHandler.ts"
       ],
-      "percent": 2.23,
-      "reduction": 14.36
+      "percent": 2.4,
+      "reduction": 14.46
     },
     {
       "id": "/src/adapters/fetch/content-type/json/index.ts",
-      "size": 2303,
-      "origSize": 2511,
+      "size": 2299,
+      "origSize": 2496,
       "renderedExports": [
         "getFetchHTTPJSONContentTypeHandler"
       ],
@@ -312,13 +281,13 @@
       "dependents": [
         "/src/adapters/fetch/fetchRequestHandler.ts"
       ],
-      "percent": 2.19,
-      "reduction": 8.28
+      "percent": 2.35,
+      "reduction": 7.89
     },
     {
       "id": "/src/adapters/aws-lambda/content-type/json/index.ts",
-      "size": 2235,
-      "origSize": 2546,
+      "size": 2233,
+      "origSize": 2547,
       "renderedExports": [
         "getLambdaHTTPJSONContentTypeHandler"
       ],
@@ -326,8 +295,8 @@
       "dependents": [
         "/src/adapters/aws-lambda/index.ts"
       ],
-      "percent": 2.12,
-      "reduction": 12.22
+      "percent": 2.28,
+      "reduction": 12.33
     },
     {
       "id": "/src/unstable-core-do-not-import/createProxy.ts",
@@ -342,7 +311,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/router.ts"
       ],
-      "percent": 1.9,
+      "percent": 2.04,
       "reduction": 0
     },
     {
@@ -363,7 +332,7 @@
         "/src/unstable-core-do-not-import/contentTypeParsers.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 1.64,
+      "percent": 1.77,
       "reduction": 19.47
     },
     {
@@ -375,7 +344,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.5,
+      "percent": 1.61,
       "reduction": 21.04
     },
     {
@@ -387,7 +356,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.46,
+      "percent": 1.58,
       "reduction": 26.63
     },
     {
@@ -400,7 +369,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.45,
+      "percent": 1.56,
       "reduction": 27.6
     },
     {
@@ -414,23 +383,9 @@
       "dependents": [
         "/src/adapters/fastify/index.ts"
       ],
-      "percent": 1.41,
+      "percent": 1.51,
       "reduction": 34.61
     },
-    {
-      "id": "/src/adapters/node-http/content-type/form-data/streamSlice.ts",
-      "size": 1393,
-      "origSize": 1360,
-      "renderedExports": [
-        "streamSlice"
-      ],
-      "removedExports": [],
-      "dependents": [
-        "/src/adapters/node-http/content-type/form-data/fileUploadHandler.ts"
-      ],
-      "percent": 1.32,
-      "reduction": 0
-    },
     {
       "id": "/src/unstable-core-do-not-import/http/getHTTPStatusCode.ts",
       "size": 1266,
@@ -444,7 +399,7 @@
         "/src/unstable-core-do-not-import/http/resolveHTTPResponse.ts",
         "/src/unstable-core-do-not-import/error/getErrorShape.ts"
       ],
-      "percent": 1.2,
+      "percent": 1.29,
       "reduction": 22.76
     },
     {
@@ -458,9 +413,23 @@
       "dependents": [
         "/src/adapters/node-http/content-type/json/index.ts"
       ],
-      "percent": 1.12,
+      "percent": 1.21,
       "reduction": 2.48
     },
+    {
+      "id": "/src/adapters/node-http/content-type/form-data/index.ts",
+      "size": 1043,
+      "origSize": 1254,
+      "renderedExports": [
+        "getFormDataContentTypeHandler"
+      ],
+      "removedExports": [],
+      "dependents": [
+        "/src/adapters/node-http/nodeHTTPRequestHandler.ts"
+      ],
+      "percent": 1.07,
+      "reduction": 16.83
+    },
     {
       "id": "/src/unstable-core-do-not-import/parser.ts",
       "size": 992,
@@ -473,7 +442,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 0.94,
+      "percent": 1.01,
       "reduction": 56.22
     },
     {
@@ -490,9 +459,26 @@
         "/src/adapters/next-app-dir/nextAppDirCaller.ts",
         "/src/adapters/next-app-dir/rethrowNextErrors.ts"
       ],
-      "percent": 0.94,
+      "percent": 1.01,
       "reduction": 13.65
     },
+    {
+      "id": "/src/adapters/content-handlers/selectContentHandlerOrUnsupportedMediaType.ts",
+      "size": 974,
+      "origSize": 1402,
+      "renderedExports": [
+        "selectContentHandlerOrUnsupportedMediaType"
+      ],
+      "removedExports": [],
+      "dependents": [
+        "/src/adapters/aws-lambda/index.ts",
+        "/src/adapters/node-http/nodeHTTPRequestHandler.ts",
+        "/src/adapters/fastify/fastifyRequestHandler.ts",
+        "/src/adapters/fetch/fetchRequestHandler.ts"
+      ],
+      "percent": 0.99,
+      "reduction": 30.53
+    },
     {
       "id": "/src/unstable-core-do-not-import/utils.ts",
       "size": 880,
@@ -513,7 +499,7 @@
         "/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 0.84,
+      "percent": 0.9,
       "reduction": 23.54
     },
     {
@@ -527,23 +513,9 @@
       "dependents": [
         "/src/adapters/next-app-dir/nextAppDirCaller.ts"
       ],
-      "percent": 0.78,
+      "percent": 0.84,
       "reduction": 0.97
     },
-    {
-      "id": "/src/adapters/node-http/content-type/form-data/memoryUploadHandler.ts",
-      "size": 699,
-      "origSize": 2428,
-      "renderedExports": [
-        "createMemoryUploadHandler"
-      ],
-      "removedExports": [],
-      "dependents": [
-        "/src/adapters/node-http/content-type/form-data/index.ts"
-      ],
-      "percent": 0.66,
-      "reduction": 71.21
-    },
     {
       "id": "/src/unstable-core-do-not-import/http/batchStreamFormatter.ts",
       "size": 667,
@@ -553,7 +525,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.63,
+      "percent": 0.68,
       "reduction": 0.6
     },
     {
@@ -568,7 +540,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveHTTPResponse.ts"
       ],
-      "percent": 0.59,
+      "percent": 0.64,
       "reduction": 43.49
     },
     {
@@ -580,7 +552,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.59,
+      "percent": 0.64,
       "reduction": 48.73
     },
     {
@@ -593,13 +565,13 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.49,
+      "percent": 0.53,
       "reduction": 66.9
     },
     {
       "id": "/src/adapters/node-http/content-type/octet/index.ts",
-      "size": 507,
-      "origSize": 862,
+      "size": 500,
+      "origSize": 841,
       "renderedExports": [
         "getOctetContentTypeHandler"
       ],
@@ -607,25 +579,8 @@
       "dependents": [
         "/src/adapters/node-http/nodeHTTPRequestHandler.ts"
       ],
-      "percent": 0.48,
-      "reduction": 41.18
-    },
-    {
-      "id": "/src/adapters/content-handlers/selectContentHandlerOrUnsupportedMediaType.ts",
-      "size": 493,
-      "origSize": 682,
-      "renderedExports": [
-        "selectContentHandlerOrUnsupportedMediaType"
-      ],
-      "removedExports": [],
-      "dependents": [
-        "/src/adapters/aws-lambda/index.ts",
-        "/src/adapters/node-http/nodeHTTPRequestHandler.ts",
-        "/src/adapters/fastify/fastifyRequestHandler.ts",
-        "/src/adapters/fetch/fetchRequestHandler.ts"
-      ],
-      "percent": 0.47,
-      "reduction": 27.71
+      "percent": 0.51,
+      "reduction": 40.55
     },
     {
       "id": "/src/adapters/next-app-dir/rethrowNextErrors.ts",
@@ -638,29 +593,9 @@
       "dependents": [
         "/src/adapters/next-app-dir/nextAppDirCaller.ts"
       ],
-      "percent": 0.4,
+      "percent": 0.43,
       "reduction": 40.06
     },
-    {
-      "id": "/src/adapters/node-http/content-type/form-data/uploadHandler.ts",
-      "size": 410,
-      "origSize": 2235,
-      "renderedExports": [
-        "MaxPartSizeExceededError",
-        "MaxBodySizeExceededError"
-      ],
-      "removedExports": [
-        "composeUploadHandlers",
-        "createMemoryUploadHandler"
-      ],
-      "dependents": [
-        "/src/adapters/node-http/content-type/form-data/index.ts",
-        "/src/adapters/node-http/content-type/form-data/fileUploadHandler.ts",
-        "/src/adapters/node-http/content-type/form-data/memoryUploadHandler.ts"
-      ],
-      "percent": 0.39,
-      "reduction": 81.66
-    },
     {
       "id": "/src/unstable-core-do-not-import/rootConfig.ts",
       "size": 343,
@@ -673,7 +608,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 0.33,
+      "percent": 0.35,
       "reduction": 87.93
     },
     {
@@ -685,7 +620,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.27,
+      "percent": 0.29,
       "reduction": 72.68
     },
     {
@@ -699,7 +634,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 0.21,
+      "percent": 0.23,
       "reduction": 94.55
     },
     {
@@ -713,7 +648,7 @@
       "dependents": [
         "/src/adapters/next-app-dir.ts"
       ],
-      "percent": 0.21,
+      "percent": 0.22,
       "reduction": 36.26
     },
     {
@@ -725,7 +660,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.15,
+      "percent": 0.16,
       "reduction": 14.13
     },
     {
@@ -740,7 +675,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts"
       ],
-      "percent": 0.07,
+      "percent": 0.08,
       "reduction": 96.87
     },
     {
@@ -790,9 +725,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/shared.ts",
+      "id": "/src/unstable-core-do-not-import.ts",
       "size": 0,
-      "origSize": 653,
+      "origSize": 1498,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -800,9 +735,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/unstable-core-do-not-import.ts",
+      "id": "/src/shared.ts",
       "size": 0,
-      "origSize": 1498,
+      "origSize": 653,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -866,5 +801,5 @@
       "reduction": 100
     }
   ],
-  "moduleCount": 60
+  "moduleCount": 56
 }

package/dist/unstable-core-do-not-import/http/contentType.d.ts

@@ -12,7 +12,7 @@ export type BodyResult = {
 };
 export type BaseContentTypeHandler<TOptions> = {
     name: string;
-    isMatch(opts: TOptions): boolean;
+    isMatch(headers: Headers): boolean;
     getInputs: (opts: TOptions, info: {
         isBatchCall: boolean;
         batch: number;

package/dist/unstable-core-do-not-import/http/contentType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contentType.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/http/contentType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,MAAM,UAAU,GAClB;IACE,EAAE,EAAE,IAAI,CAAC;IACT,IAAI,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,YAAY,EAAE,OAAO,CAAC;CACvB,GACD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,SAAS,CAAA;CAAE,CAAC;AAEpC,MAAM,MAAM,sBAAsB,CAAC,QAAQ,IAAI;IAC7C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC;IACjC,SAAS,EAAE,CACT,IAAI,EAAE,QAAQ,EACd,IAAI,EAAE;QACJ,WAAW,EAAE,OAAO,CAAC;QACrB,KAAK,EAAE,MAAM,CAAC;KACf,KACE,OAAO,CAAC,OAAO,CAAC,CAAC;CACvB,CAAC"}
+{"version":3,"file":"contentType.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/http/contentType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,MAAM,UAAU,GAClB;IACE,EAAE,EAAE,IAAI,CAAC;IACT,IAAI,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,YAAY,EAAE,OAAO,CAAC;CACvB,GACD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,SAAS,CAAA;CAAE,CAAC;AAEpC,MAAM,MAAM,sBAAsB,CAAC,QAAQ,IAAI;IAC7C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC;IACnC,SAAS,EAAE,CACT,IAAI,EAAE,QAAQ,EACd,IAAI,EAAE;QACJ,WAAW,EAAE,OAAO,CAAC;QACrB,KAAK,EAAE,MAAM,CAAC;KACf,KACE,OAAO,CAAC,OAAO,CAAC,CAAC;CACvB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-rc.345+6e01a29cf",
+  "version": "11.0.0-rc.347+a1d4e1478",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -135,7 +135,6 @@
     "@types/react": "^18.2.33",
     "@types/react-dom": "^18.2.14",
     "@types/ws": "^8.2.0",
-    "@web3-storage/multipart-parser": "^1.0.0",
     "devalue": "^5.0.0",
     "eslint": "^8.56.0",
     "express": "^4.17.1",
@@ -160,5 +159,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "6e01a29cf4343cc2a303c62753df3fd70d489123"
+  "gitHead": "a1d4e14780d66ca8e9fa970302ecd1e699030ecd"
 }

package/src/adapters/aws-lambda/content-type/json/index.ts

@@ -29,8 +29,8 @@ export const getLambdaHTTPJSONContentTypeHandler: <
   TEvent extends APIGatewayEvent,
 >() => LambdaHTTPContentTypeHandler<TRouter, TEvent> = () => ({
   name: 'lambda-json',
-  isMatch(opts) {
-    return !!opts.event.headers['Content-Type']?.startsWith('application/json');
+  isMatch: (headers) => {
+    return !!headers.get('content-type')?.startsWith('application/json');
   },
   getInputs: async (opts, info) => {
     function getRawProcedureInputOrThrow() {

package/src/adapters/content-handlers/selectContentHandlerOrUnsupportedMediaType.ts

@@ -1,18 +1,42 @@
 import { TRPCError } from '../../@trpc/server';
-import type { BaseContentTypeHandler } from '../../@trpc/server/http';
+import type {
+  BaseContentTypeHandler,
+  HTTPHeaders,
+} from '../../@trpc/server/http';
+
+interface MinimalHandlerOpts {
+  req: {
+    // TODO: This could probably only take Headers and do the conversion higher up,
+    //       but that's a bigger refactor for another day
+    headers: HTTPHeaders | Headers;
+  };
+}
 
 export function selectContentHandlerOrUnsupportedMediaType<
-  THandlerOpts,
+  THandlerOpts extends MinimalHandlerOpts,
   THandler extends BaseContentTypeHandler<THandlerOpts>,
 >(handlers: THandler[], opts: THandlerOpts) {
-  const handler = handlers.find((handler) => handler.isMatch(opts));
-  if (!handler) {
+  const headers = new Headers(opts.req.headers as HeadersInit);
+  const contentType = headers.get('content-type');
+
+  if (contentType === null) {
     return [
       undefined,
       new TRPCError({
         code: 'UNSUPPORTED_MEDIA_TYPE',
         message:
-          'Invalid Content-Type header. This request may not be supported by your tRPC Adapter, or possibly by tRPC at all',
+          'No Content-Type header detected on the incoming request. This request may not be supported by your tRPC Adapter, or possibly by tRPC at all',
+      }),
+    ] as const;
+  }
+
+  const handler = handlers.find((handler) => handler.isMatch(headers));
+  if (!handler) {
+    return [
+      undefined,
+      new TRPCError({
+        code: 'UNSUPPORTED_MEDIA_TYPE',
+        message: `Invalid Content-Type header '${contentType}'. This request may not be supported by your tRPC Adapter, or possibly by tRPC at all`,
       }),
     ] as const;
   }