@trpc/server 11.0.0-rc.589 → 11.0.0-rc.590

package/dist/bundle-analysis.json

@@ -1,12 +1,12 @@
 {
-  "bundleSize": 144960,
-  "bundleOrigSize": 191903,
-  "bundleReduction": 24.46,
+  "bundleSize": 147003,
+  "bundleOrigSize": 194022,
+  "bundleReduction": 24.23,
   "modules": [
     {
       "id": "/src/unstable-core-do-not-import/http/resolveResponse.ts",
-      "size": 18439,
-      "origSize": 17070,
+      "size": 19166,
+      "origSize": 17764,
       "renderedExports": [
         "resolveResponse"
       ],
@@ -14,7 +14,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 12.72,
+      "percent": 13.04,
       "reduction": 0
     },
     {
@@ -31,7 +31,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 12.12,
+      "percent": 11.95,
       "reduction": 4.86
     },
     {
@@ -47,13 +47,13 @@
       "dependents": [
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 11.23,
+      "percent": 11.08,
       "reduction": 0
     },
     {
       "id": "/src/unstable-core-do-not-import/stream/sse.ts",
-      "size": 9006,
-      "origSize": 10511,
+      "size": 9093,
+      "origSize": 10673,
       "renderedExports": [
         "sseStreamProducer",
         "sseStreamConsumer",
@@ -64,8 +64,8 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 6.21,
-      "reduction": 14.32
+      "percent": 6.19,
+      "reduction": 14.8
     },
     {
       "id": "/src/unstable-core-do-not-import/http/contentType.ts",
@@ -79,7 +79,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 5.3,
+      "percent": 5.23,
       "reduction": 0
     },
     {
@@ -97,7 +97,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 4.43,
+      "percent": 4.37,
       "reduction": 40.09
     },
     {
@@ -112,7 +112,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 4,
+      "percent": 3.94,
       "reduction": 64.74
     },
     {
@@ -126,7 +126,7 @@
       "dependents": [
         "/src/adapters/aws-lambda/index.ts"
       ],
-      "percent": 3.74,
+      "percent": 3.69,
       "reduction": 11.38
     },
     {
@@ -145,7 +145,7 @@
         "/src/unstable-core-do-not-import/http/resolveResponse.ts",
         "/src/observable/operators.ts"
       ],
-      "percent": 3.09,
+      "percent": 3.05,
       "reduction": 0
     },
     {
@@ -160,7 +160,7 @@
       "dependents": [
         "/src/adapters/node-http/index.ts"
       ],
-      "percent": 3.08,
+      "percent": 3.04,
       "reduction": 2.49
     },
     {
@@ -174,7 +174,7 @@
       "dependents": [
         "/src/adapters/next-app-dir.ts"
       ],
-      "percent": 2.22,
+      "percent": 2.19,
       "reduction": 22.57
     },
     {
@@ -190,7 +190,7 @@
       "dependents": [
         "/src/observable/index.ts"
       ],
-      "percent": 1.9,
+      "percent": 1.87,
       "reduction": 0
     },
     {
@@ -210,7 +210,7 @@
         "/src/unstable-core-do-not-import/router.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 1.89,
+      "percent": 1.87,
       "reduction": 45.94
     },
     {
@@ -224,7 +224,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 1.86,
+      "percent": 1.83,
       "reduction": 40.98
     },
     {
@@ -244,9 +244,47 @@
         "/src/unstable-core-do-not-import/initTRPC.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 1.81,
+      "percent": 1.79,
       "reduction": 55.78
     },
+    {
+      "id": "/src/unstable-core-do-not-import/utils.ts",
+      "size": 2494,
+      "origSize": 3008,
+      "renderedExports": [
+        "unsetMarker",
+        "mergeWithoutOverrides",
+        "isObject",
+        "isFunction",
+        "omitPrototype",
+        "isAsyncIterable",
+        "run",
+        "noop",
+        "identity",
+        "assert",
+        "sleep",
+        "abortSignalsAnyPonyfill"
+      ],
+      "removedExports": [],
+      "dependents": [
+        "/src/unstable-core-do-not-import.ts",
+        "/src/unstable-core-do-not-import/error/TRPCError.ts",
+        "/src/unstable-core-do-not-import/transformer.ts",
+        "/src/unstable-core-do-not-import/middleware.ts",
+        "/src/unstable-core-do-not-import/router.ts",
+        "/src/unstable-core-do-not-import/http/getHTTPStatusCode.ts",
+        "/src/unstable-core-do-not-import/http/parseConnectionParams.ts",
+        "/src/unstable-core-do-not-import/http/resolveResponse.ts",
+        "/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts",
+        "/src/unstable-core-do-not-import/http/contentType.ts",
+        "/src/unstable-core-do-not-import/procedureBuilder.ts",
+        "/src/unstable-core-do-not-import/stream/jsonl.ts",
+        "/src/unstable-core-do-not-import/stream/sse.ts",
+        "/src/unstable-core-do-not-import/stream/utils/asyncIterable.ts"
+      ],
+      "percent": 1.7,
+      "reduction": 17.09
+    },
     {
       "id": "/src/unstable-core-do-not-import/createProxy.ts",
       "size": 2329,
@@ -260,7 +298,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/router.ts"
       ],
-      "percent": 1.61,
+      "percent": 1.58,
       "reduction": 0
     },
     {
@@ -274,7 +312,7 @@
       "dependents": [
         "/src/adapters/fetch/index.ts"
       ],
-      "percent": 1.56,
+      "percent": 1.53,
       "reduction": 2.17
     },
     {
@@ -289,7 +327,7 @@
         "/src/adapters/node-http/index.ts",
         "/src/adapters/node-http/nodeHTTPRequestHandler.ts"
       ],
-      "percent": 1.52,
+      "percent": 1.5,
       "reduction": 14.72
     },
     {
@@ -303,7 +341,7 @@
       "dependents": [
         "/src/adapters/next-app-dir/nextAppDirCaller.ts"
       ],
-      "percent": 1.41,
+      "percent": 1.39,
       "reduction": 5.79
     },
     {
@@ -317,7 +355,7 @@
       "dependents": [
         "/src/adapters/fastify/index.ts"
       ],
-      "percent": 1.23,
+      "percent": 1.21,
       "reduction": 29.88
     },
     {
@@ -342,7 +380,7 @@
         "/src/unstable-core-do-not-import/stream/jsonl.ts",
         "/src/unstable-core-do-not-import/stream/sse.ts"
       ],
-      "percent": 1.2,
+      "percent": 1.18,
       "reduction": 19.47
     },
     {
@@ -354,9 +392,24 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.17,
+      "percent": 1.16,
       "reduction": 19.29
     },
+    {
+      "id": "/src/unstable-core-do-not-import/stream/utils/asyncIterable.ts",
+      "size": 1655,
+      "origSize": 1735,
+      "renderedExports": [
+        "withCancel",
+        "takeWithGrace"
+      ],
+      "removedExports": [],
+      "dependents": [
+        "/src/unstable-core-do-not-import/stream/sse.ts"
+      ],
+      "percent": 1.13,
+      "reduction": 4.61
+    },
     {
       "id": "/src/unstable-core-do-not-import/rpc/codes.ts",
       "size": 1611,
@@ -367,24 +420,9 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.11,
+      "percent": 1.1,
       "reduction": 27.47
     },
-    {
-      "id": "/src/unstable-core-do-not-import/stream/utils/asyncIterable.ts",
-      "size": 1609,
-      "origSize": 1671,
-      "renderedExports": [
-        "withCancel",
-        "takeWithGrace"
-      ],
-      "removedExports": [],
-      "dependents": [
-        "/src/unstable-core-do-not-import/stream/sse.ts"
-      ],
-      "percent": 1.11,
-      "reduction": 3.71
-    },
     {
       "id": "/src/unstable-core-do-not-import/http/getHTTPStatusCode.ts",
       "size": 1438,
@@ -399,7 +437,7 @@
         "/src/unstable-core-do-not-import/error/getErrorShape.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 0.99,
+      "percent": 0.98,
       "reduction": 16.73
     },
     {
@@ -411,43 +449,8 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.91,
-      "reduction": 35.1
-    },
-    {
-      "id": "/src/unstable-core-do-not-import/utils.ts",
-      "size": 1311,
-      "origSize": 1809,
-      "renderedExports": [
-        "unsetMarker",
-        "mergeWithoutOverrides",
-        "isObject",
-        "isFunction",
-        "omitPrototype",
-        "isAsyncIterable",
-        "run",
-        "noop",
-        "identity"
-      ],
-      "removedExports": [],
-      "dependents": [
-        "/src/unstable-core-do-not-import.ts",
-        "/src/unstable-core-do-not-import/error/TRPCError.ts",
-        "/src/unstable-core-do-not-import/transformer.ts",
-        "/src/unstable-core-do-not-import/middleware.ts",
-        "/src/unstable-core-do-not-import/router.ts",
-        "/src/unstable-core-do-not-import/http/getHTTPStatusCode.ts",
-        "/src/unstable-core-do-not-import/http/parseConnectionParams.ts",
-        "/src/unstable-core-do-not-import/http/resolveResponse.ts",
-        "/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts",
-        "/src/unstable-core-do-not-import/http/contentType.ts",
-        "/src/unstable-core-do-not-import/procedureBuilder.ts",
-        "/src/unstable-core-do-not-import/stream/jsonl.ts",
-        "/src/unstable-core-do-not-import/stream/sse.ts",
-        "/src/unstable-core-do-not-import/stream/utils/asyncIterable.ts"
-      ],
       "percent": 0.9,
-      "reduction": 27.53
+      "reduction": 35.1
     },
     {
       "id": "/src/unstable-core-do-not-import/parser.ts",
@@ -461,7 +464,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 0.89,
+      "percent": 0.88,
       "reduction": 55.21
     },
     {
@@ -476,7 +479,7 @@
         "/src/adapters/fastify/index.ts",
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 0.78,
+      "percent": 0.77,
       "reduction": 47.59
     },
     {
@@ -492,7 +495,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/contentType.ts"
       ],
-      "percent": 0.76,
+      "percent": 0.75,
       "reduction": 15.08
     },
     {
@@ -506,7 +509,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 0.73,
+      "percent": 0.72,
       "reduction": 0
     },
     {
@@ -523,7 +526,7 @@
         "/src/adapters/next-app-dir/nextAppDirCaller.ts",
         "/src/adapters/next-app-dir/rethrowNextErrors.ts"
       ],
-      "percent": 0.68,
+      "percent": 0.67,
       "reduction": 13.65
     },
     {
@@ -538,7 +541,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import/stream/sse.ts"
       ],
-      "percent": 0.63,
+      "percent": 0.62,
       "reduction": 10.89
     },
     {
@@ -550,7 +553,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.59,
+      "percent": 0.58,
       "reduction": 34.73
     },
     {
@@ -567,7 +570,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/stream/sse.ts"
       ],
-      "percent": 0.54,
+      "percent": 0.53,
       "reduction": 44.37
     },
     {
@@ -595,7 +598,7 @@
         "/src/unstable-core-do-not-import/stream/utils/asyncIterable.ts",
         "/src/unstable-core-do-not-import/stream/utils/withPing.ts"
       ],
-      "percent": 0.52,
+      "percent": 0.51,
       "reduction": 10.56
     },
     {
@@ -624,7 +627,7 @@
         "/src/unstable-core-do-not-import/stream/jsonl.ts",
         "/src/unstable-core-do-not-import/stream/sse.ts"
       ],
-      "percent": 0.49,
+      "percent": 0.48,
       "reduction": 21.32
     },
     {
@@ -638,7 +641,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 0.46,
+      "percent": 0.45,
       "reduction": 0.6
     },
     {
@@ -668,7 +671,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 0.24,
+      "percent": 0.23,
       "reduction": 89.5
     },
     {
@@ -682,7 +685,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 0.24,
+      "percent": 0.23,
       "reduction": 9.02
     },
     {
@@ -813,11 +816,11 @@
       "removedExports": [],
       "dependents": [
         "/src/adapters/express.ts",
-        "/src/adapters/ws.ts",
-        "/src/adapters/standalone.ts",
         "/src/adapters/next.ts",
-        "/src/adapters/node-http/nodeHTTPRequestHandler.ts",
-        "/src/adapters/next-app-dir/nextAppDirCaller.ts"
+        "/src/adapters/standalone.ts",
+        "/src/adapters/ws.ts",
+        "/src/adapters/next-app-dir/nextAppDirCaller.ts",
+        "/src/adapters/node-http/nodeHTTPRequestHandler.ts"
       ],
       "percent": 0,
       "reduction": 100
@@ -855,27 +858,27 @@
       "reduction": 100
     },
     {
-      "id": "/src/adapters/node-http/index.ts",
+      "id": "/src/adapters/fetch/index.ts",
       "size": 0,
-      "origSize": 111,
+      "origSize": 64,
       "renderedExports": [],
       "removedExports": [],
-      "dependents": [
-        "/src/adapters/express.ts",
-        "/src/adapters/standalone.ts",
-        "/src/adapters/next.ts",
-        "/src/adapters/fastify/fastifyRequestHandler.ts"
-      ],
+      "dependents": [],
       "percent": 0,
       "reduction": 100
     },
     {
-      "id": "/src/adapters/fetch/index.ts",
+      "id": "/src/adapters/node-http/index.ts",
       "size": 0,
-      "origSize": 64,
+      "origSize": 111,
       "renderedExports": [],
       "removedExports": [],
-      "dependents": [],
+      "dependents": [
+        "/src/adapters/express.ts",
+        "/src/adapters/next.ts",
+        "/src/adapters/standalone.ts",
+        "/src/adapters/fastify/fastifyRequestHandler.ts"
+      ],
       "percent": 0,
       "reduction": 100
     }

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

@@ -1 +1 @@
-{"version":3,"file":"resolveResponse.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/http/resolveResponse.ts"],"names":[],"mappings":"AAMA,OAAO,EAA2B,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAExE,OAAO,EACL,KAAK,SAAS,EAGf,MAAM,WAAW,CAAC;AAQnB,OAAO,KAAK,EACV,sBAAsB,EACtB,kCAAkC,EAEnC,MAAM,SAAS,CAAC;AA0BjB,UAAU,yBAAyB,CAAC,OAAO,SAAS,SAAS,CAC3D,SAAQ,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC;IAChD,aAAa,EAAE,kCAAkC,CAAC,OAAO,CAAC,CAAC;IAC3D,GAAG,EAAE,OAAO,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;CACzB;AAyID,wBAAsB,eAAe,CAAC,OAAO,SAAS,SAAS,EAC7D,IAAI,EAAE,yBAAyB,CAAC,OAAO,CAAC,GACvC,OAAO,CAAC,QAAQ,CAAC,CAibnB"}
+{"version":3,"file":"resolveResponse.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/http/resolveResponse.ts"],"names":[],"mappings":"AAMA,OAAO,EAA2B,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAExE,OAAO,EACL,KAAK,SAAS,EAGf,MAAM,WAAW,CAAC;AAQnB,OAAO,KAAK,EACV,sBAAsB,EACtB,kCAAkC,EAEnC,MAAM,SAAS,CAAC;AA0BjB,UAAU,yBAAyB,CAAC,OAAO,SAAS,SAAS,CAC3D,SAAQ,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC;IAChD,aAAa,EAAE,kCAAkC,CAAC,OAAO,CAAC,CAAC;IAC3D,GAAG,EAAE,OAAO,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;CACzB;AAyID,wBAAsB,eAAe,CAAC,OAAO,SAAS,SAAS,EAC7D,IAAI,EAAE,yBAAyB,CAAC,OAAO,CAAC,GACvC,OAAO,CAAC,QAAQ,CAAC,CAmcnB"}

package/dist/unstable-core-do-not-import/http/resolveResponse.js

@@ -187,21 +187,31 @@ async function resolveResponse(opts) {
                         message: `Unsupported ${req.method}-request to ${proc._def.type} procedure at path "${call.path}"`
                     });
                 }
-                /* istanbul ignore if -- @preserve */ if (proc._def.type === 'subscription' && info.isBatchCall) {
-                    throw new TRPCError.TRPCError({
-                        code: 'BAD_REQUEST',
-                        message: `Cannot batch subscription calls`
-                    });
+                let abortCtrl;
+                if (proc._def.type === 'subscription') {
+                    /* istanbul ignore if -- @preserve */ if (info.isBatchCall) {
+                        throw new TRPCError.TRPCError({
+                            code: 'BAD_REQUEST',
+                            message: `Cannot batch subscription calls`
+                        });
+                    }
+                    abortCtrl = new AbortController();
                 }
                 const data = await proc({
                     path: call.path,
                     getRawInput: call.getRawInput,
                     ctx,
                     type: proc._def.type,
-                    signal: opts.req.signal
+                    signal: abortCtrl ? utils.abortSignalsAnyPonyfill([
+                        opts.req.signal,
+                        abortCtrl.signal
+                    ]) : opts.req.signal
                 });
                 return [
-                    data
+                    {
+                        data,
+                        abortCtrl
+                    }
                 ];
             } catch (cause) {
                 const error = TRPCError.getTRPCErrorFromUnknown(cause);
@@ -223,7 +233,7 @@ async function resolveResponse(opts) {
         // ----------- response handlers -----------
         if (!info.isBatchCall) {
             const [call] = info.calls;
-            const [data, error] = await rpcCalls[0];
+            const [result, error] = await rpcCalls[0];
             switch(info.type){
                 case 'unknown':
                 case 'mutation':
@@ -231,7 +241,7 @@ async function resolveResponse(opts) {
                     {
                         // httpLink
                         headers.set('content-type', 'application/json');
-                        if (isDataStream(data)) {
+                        if (isDataStream(result?.data)) {
                             throw new TRPCError.TRPCError({
                                 code: 'UNSUPPORTED_MEDIA_TYPE',
                                 message: 'Cannot use stream-like response in non-streaming request - use httpBatchStreamLink'
@@ -248,7 +258,7 @@ async function resolveResponse(opts) {
                             })
                         } : {
                             result: {
-                                data
+                                data: result.data
                             }
                         };
                         const headResponse = initResponse({
@@ -280,6 +290,8 @@ async function resolveResponse(opts) {
                         if (error) {
                             throw error;
                         }
+                        const { data , abortCtrl  } = result;
+                        utils.assert(abortCtrl !== undefined, 'subscription type must have an AbortController');
                         if (!observable.isObservable(data) && !utils.isAsyncIterable(data)) {
                             throw new TRPCError.TRPCError({
                                 message: `Subscription ${call.path} did not return an observable or a AsyncGenerator`,
@@ -290,6 +302,7 @@ async function resolveResponse(opts) {
                         const stream = sse.sseStreamProducer({
                             ...config.experimental?.sseSubscriptions,
                             data: dataAsIterable,
+                            abortCtrl,
                             serialize: (v)=>config.transformer.output.serialize(v),
                             formatError (errorOpts) {
                                 const error = TRPCError.getTRPCErrorFromUnknown(errorOpts.error);
@@ -375,13 +388,14 @@ async function resolveResponse(opts) {
                             })
                         };
                     }
+                    const { data  } = result;
                     /**
            * Not very pretty, but we need to wrap nested data in promises
            * Our stream producer will only resolve top-level async values or async values that are directly nested in another async value
-           */ const data = observable.isObservable(result) ? observable.observableToAsyncIterable(result) : Promise.resolve(result);
+           */ const dataAsPromiseOrIterable = observable.isObservable(data) ? observable.observableToAsyncIterable(data) : Promise.resolve(data);
                     return {
                         result: Promise.resolve({
-                            data
+                            data: dataAsPromiseOrIterable
                         })
                     };
                 }),
@@ -422,11 +436,11 @@ async function resolveResponse(opts) {
      * - return a complete HTTPResponse
      */ headers.set('content-type', 'application/json');
         const results = (await Promise.all(rpcCalls)).map((res)=>{
-            const [data, error] = res;
+            const [result, error] = res;
             if (error) {
                 return res;
             }
-            if (isDataStream(data)) {
+            if (isDataStream(result.data)) {
                 return [
                     null,
                     new TRPCError.TRPCError({
@@ -437,7 +451,7 @@ async function resolveResponse(opts) {
             }
             return res;
         });
-        const resultAsRPCResponse = results.map(([data, error], index)=>{
+        const resultAsRPCResponse = results.map(([result, error], index)=>{
             const call = info.calls[index];
             if (error) {
                 return {
@@ -453,7 +467,7 @@ async function resolveResponse(opts) {
             }
             return {
                 result: {
-                    data
+                    data: result.data
                 }
             };
         });