@trpc/server 11.0.0-alpha-tmp-issues-5851-take-two.457 → 11.0.0-alpha-tmp-issues-5851-take-two.461

package/dist/bundle-analysis.json

@@ -1,12 +1,12 @@
 {
-  "bundleSize": 131878,
-  "bundleOrigSize": 181211,
-  "bundleReduction": 27.22,
+  "bundleSize": 131425,
+  "bundleOrigSize": 180861,
+  "bundleReduction": 27.33,
   "modules": [
     {
       "id": "/src/unstable-core-do-not-import/stream/jsonl.ts",
-      "size": 17766,
-      "origSize": 18448,
+      "size": 17313,
+      "origSize": 18098,
       "renderedExports": [
         "isPromise",
         "jsonlStreamProducer",
@@ -17,8 +17,8 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 13.47,
-      "reduction": 3.7
+      "percent": 13.17,
+      "reduction": 4.34
     },
     {
       "id": "/src/unstable-core-do-not-import/http/resolveResponse.ts",
@@ -31,7 +31,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 12.95,
+      "percent": 12.99,
       "reduction": 0
     },
     {
@@ -46,7 +46,7 @@
       "dependents": [
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 10.82,
+      "percent": 10.86,
       "reduction": 0
     },
     {
@@ -61,7 +61,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 5.76,
+      "percent": 5.78,
       "reduction": 0
     },
     {
@@ -79,7 +79,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 4.84,
+      "percent": 4.86,
       "reduction": 39.77
     },
     {
@@ -94,7 +94,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 4.8,
+      "percent": 4.81,
       "reduction": 60.06
     },
     {
@@ -113,7 +113,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 4.27,
+      "percent": 4.29,
       "reduction": 24.48
     },
     {
@@ -127,7 +127,7 @@
       "dependents": [
         "/src/adapters/aws-lambda/index.ts"
       ],
-      "percent": 4.11,
+      "percent": 4.12,
       "reduction": 11.38
     },
     {
@@ -147,7 +147,7 @@
         "/src/unstable-core-do-not-import/http/resolveResponse.ts",
         "/src/observable/operators.ts"
       ],
-      "percent": 3.4,
+      "percent": 3.41,
       "reduction": 0
     },
     {
@@ -161,7 +161,7 @@
       "dependents": [
         "/src/adapters/next-app-dir.ts"
       ],
-      "percent": 2.38,
+      "percent": 2.39,
       "reduction": 23.5
     },
     {
@@ -177,7 +177,7 @@
       "dependents": [
         "/src/observable/index.ts"
       ],
-      "percent": 2.09,
+      "percent": 2.1,
       "reduction": 0
     },
     {
@@ -197,7 +197,7 @@
         "/src/unstable-core-do-not-import/initTRPC.ts",
         "/src/unstable-core-do-not-import/router.ts"
       ],
-      "percent": 2.08,
+      "percent": 2.09,
       "reduction": 45.94
     },
     {
@@ -211,7 +211,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 2.05,
+      "percent": 2.06,
       "reduction": 40.91
     },
     {
@@ -225,7 +225,7 @@
       "dependents": [
         "/src/adapters/node-http/index.ts"
       ],
-      "percent": 2.04,
+      "percent": 2.05,
       "reduction": 7.31
     },
     {
@@ -245,7 +245,7 @@
         "/src/unstable-core-do-not-import/initTRPC.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 1.99,
+      "percent": 2,
       "reduction": 55.5
     },
     {
@@ -275,7 +275,7 @@
       "dependents": [
         "/src/adapters/fetch/index.ts"
       ],
-      "percent": 1.71,
+      "percent": 1.72,
       "reduction": 2.17
     },
     {
@@ -290,7 +290,7 @@
         "/src/adapters/node-http/index.ts",
         "/src/adapters/node-http/nodeHTTPRequestHandler.ts"
       ],
-      "percent": 1.66,
+      "percent": 1.67,
       "reduction": 13.79
     },
     {
@@ -304,7 +304,7 @@
       "dependents": [
         "/src/adapters/next-app-dir/nextAppDirCaller.ts"
       ],
-      "percent": 1.55,
+      "percent": 1.56,
       "reduction": 5.79
     },
     {
@@ -328,7 +328,7 @@
         "/src/unstable-core-do-not-import/procedureBuilder.ts",
         "/src/unstable-core-do-not-import/stream/jsonl.ts"
       ],
-      "percent": 1.31,
+      "percent": 1.32,
       "reduction": 19.47
     },
     {
@@ -473,7 +473,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 0.8,
+      "percent": 0.81,
       "reduction": 0
     },
     {
@@ -488,7 +488,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts"
       ],
-      "percent": 0.78,
+      "percent": 0.79,
       "reduction": 58.57
     },
     {
@@ -564,7 +564,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 0.47,
+      "percent": 0.48,
       "reduction": 43.49
     },
     {
@@ -592,7 +592,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.39,
+      "percent": 0.4,
       "reduction": 67.09
     },
     {

package/dist/unstable-core-do-not-import/stream/jsonl.d.ts

@@ -93,12 +93,12 @@ export declare function jsonlStreamConsumer<THead>(opts: {
     formatError?: (opts: {
         error: unknown;
     }) => Error;
+    abortController: AbortController | null;
 }): Promise<readonly [Awaited<THead>, {
     readonly controllers: Map<ChunkIndex, {
         controller: ReadableStreamDefaultController<ChunkData | StreamInterruptedError>;
         returned: boolean;
     }>;
-    readonly streamAbortController: AbortController;
 }]>;
 export {};
 //# sourceMappingURL=jsonl.d.ts.map

package/dist/unstable-core-do-not-import/stream/jsonl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsonl.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/jsonl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"jsonl.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/jsonl.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,2BAA2B,CAAC,UAAU,CAAC,CAAC;CAC1D,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,EAAE,CACA,SAAS,EAAE,MAAM,GAAG,MAAM,EAC1B,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,GACjC,yBAAyB,CAAC;CAC9B,CAAC;AAGF,QAAA,MAAM,wBAAwB,IAAI,CAAC;AACnC,KAAK,wBAAwB,GAAG,OAAO,wBAAwB,CAAC;AAChE,QAAA,MAAM,+BAA+B,IAAI,CAAC;AAC1C,KAAK,+BAA+B,GAAG,OAAO,+BAA+B,CAAC;AAE9E,QAAA,MAAM,wBAAwB,IAAI,CAAC;AACnC,KAAK,wBAAwB,GAAG,OAAO,wBAAwB,CAAC;AAChE,QAAA,MAAM,uBAAuB,IAAI,CAAC;AAClC,KAAK,uBAAuB,GAAG,OAAO,uBAAuB,CAAC;AAE9D,QAAA,MAAM,0BAA0B,IAAI,CAAC;AACrC,KAAK,0BAA0B,GAAG,OAAO,0BAA0B,CAAC;AACpE,QAAA,MAAM,2BAA2B,IAAI,CAAC;AACtC,KAAK,2BAA2B,GAAG,OAAO,2BAA2B,CAAC;AACtE,QAAA,MAAM,2BAA2B,IAAI,CAAC;AACtC,KAAK,2BAA2B,GAAG,OAAO,2BAA2B,CAAC;AAEtE,KAAK,kBAAkB,GAEnB,IAAI,GAEJ,MAAM,GAEN,MAAM,CAAC;AAEX,KAAK,UAAU,GAAG,MAAM,GAAG;IAAE,YAAY,EAAE,IAAI,CAAA;CAAE,CAAC;AAClD,KAAK,cAAc,GACf,wBAAwB,GACxB,+BAA+B,CAAC;AACpC,KAAK,eAAe,GAAG;IACrB,GAAG,EAAE,kBAAkB;IACvB,IAAI,EAAE,cAAc;IACpB,OAAO,EAAE,UAAU;CACpB,CAAC;AACF,KAAK,eAAe,GAAG;IAErB;QAAC,OAAO;KAAC;IAET,GAAG,eAAe,EAAE;CACrB,CAAC;AAGF,KAAK,YAAY,GACb;IACE,UAAU,EAAE,UAAU;IACtB,MAAM,EAAE,wBAAwB;IAChC,KAAK,EAAE,eAAe;CACvB,GACD,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,uBAAuB,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AAC9E,KAAK,aAAa,GACd,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,0BAA0B,CAAC,GAC5D;IACE,UAAU,EAAE,UAAU;IACtB,MAAM,EAAE,2BAA2B;IACnC,KAAK,EAAE,eAAe;CACvB,GACD;IACE,UAAU,EAAE,UAAU;IACtB,MAAM,EAAE,2BAA2B;IACnC,KAAK,EAAE,OAAO;CACf,CAAC;AACN,KAAK,SAAS,GAAG,YAAY,GAAG,aAAa,CAAC;AAE9C,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC,CAMnE;AAED,KAAK,SAAS,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AACrC,KAAK,WAAW,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AAEvC,KAAK,SAAS,GAAG,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;AAC9C,MAAM,MAAM,eAAe,GAAG,CAAC,IAAI,EAAE;IACnC,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,SAAS,CAAC;CACjB,KAAK,IAAI,CAAC;AACX,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,EAAE,CAAC;IAC1C,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,SAAS,CAAA;KAAE,KAAK,OAAO,CAAC;IACrE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAuLD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,eAAe,8BA2BxD;AAED,cAAM,sBAAuB,SAAQ,KAAK;gBAC5B,KAAK,CAAC,EAAE,OAAO;CAK5B;AAMD,MAAM,MAAM,eAAe,GAAG,CAAC,IAAI,EAAE;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,KAAK,IAAI,CAAC;AAgFjE;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,KAAK,EAAE,IAAI,EAAE;IACrD,IAAI,EAAE,yBAAyB,GAAG,sBAAsB,CAAC;IACzD,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,OAAO,CAAA;KAAE,KAAK,KAAK,CAAC;IAClD,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC;CACzC;;;kBAmBa,OAAO;;IA4MpB"}

package/dist/unstable-core-do-not-import/stream/jsonl.js

@@ -321,7 +321,6 @@ function createConsumerStream(from) {
  * @see https://jsonlines.org/
  */ async function jsonlStreamConsumer(opts) {
     const { deserialize =(v)=>v  } = opts;
-    const streamAbortController = new AbortController();
     let source = createConsumerStream(opts.from);
     if (deserialize) {
         source = source.pipeThrough(new TransformStream({
@@ -336,10 +335,10 @@ function createConsumerStream(from) {
     const maybeAbortStream = ()=>{
         if (chunkDeferred.size === 0 && Array.from(controllers.values()).every((it)=>it.returned)) {
             // nothing is listening to the stream anymore
-            streamAbortController.abort();
+            opts.abortController?.abort();
         }
     };
-    function hydrateChunkDefinition(value, path) {
+    function hydrateChunkDefinition(value) {
         const [_path, type, chunkId] = value;
         const { readable , controller  } = createReadableStream.createReadableStream();
         const wrapper = {
@@ -372,7 +371,7 @@ function createConsumerStream(from) {
                             const [_chunkId, status, data] = value;
                             switch(status){
                                 case PROMISE_STATUS_FULFILLED:
-                                    resolve(hydrate(data, path));
+                                    resolve(hydrate(data));
                                     break;
                                 case PROMISE_STATUS_REJECTED:
                                     reject(opts.formatError?.({
@@ -410,7 +409,7 @@ function createConsumerStream(from) {
                                         case ASYNC_ITERABLE_STATUS_VALUE:
                                             return {
                                                 done: false,
-                                                value: hydrate(data, path)
+                                                value: hydrate(data)
                                             };
                                         case ASYNC_ITERABLE_STATUS_DONE:
                                             controllers.delete(chunkId);
@@ -442,14 +441,11 @@ function createConsumerStream(from) {
                 }
         }
     }
-    function hydrate(value, path) {
+    function hydrate(value) {
         const [[data], ...asyncProps] = value;
         for (const value1 of asyncProps){
             const [key] = value1;
-            const hydrated = hydrateChunkDefinition(value1, key === null ? path : [
-                ...path,
-                key
-            ]);
+            const hydrated = hydrateChunkDefinition(value1);
             if (key === null) {
                 return hydrated;
             }
@@ -471,18 +467,11 @@ function createConsumerStream(from) {
         controllers.clear();
     };
     source.pipeTo(new WritableStream({
-        start (controller) {
-            streamAbortController.signal.addEventListener('abort', ()=>{
-                controller.error(streamAbortController.signal.reason);
-            });
-        },
         async write (chunkOrHead) {
             if (headDeferred) {
                 const head = chunkOrHead;
                 for (const [key, value] of Object.entries(chunkOrHead)){
-                    const parsed = hydrate(value, [
-                        key
-                    ]);
+                    const parsed = hydrate(value);
                     head[key] = parsed;
                 }
                 headDeferred.resolve(head);
@@ -513,8 +502,7 @@ function createConsumerStream(from) {
     return [
         await headDeferred.promise,
         {
-            controllers,
-            streamAbortController
+            controllers
         }
     ];
 }

package/dist/unstable-core-do-not-import/stream/jsonl.mjs

@@ -319,7 +319,6 @@ function createConsumerStream(from) {
  * @see https://jsonlines.org/
  */ async function jsonlStreamConsumer(opts) {
     const { deserialize =(v)=>v  } = opts;
-    const streamAbortController = new AbortController();
     let source = createConsumerStream(opts.from);
     if (deserialize) {
         source = source.pipeThrough(new TransformStream({
@@ -334,10 +333,10 @@ function createConsumerStream(from) {
     const maybeAbortStream = ()=>{
         if (chunkDeferred.size === 0 && Array.from(controllers.values()).every((it)=>it.returned)) {
             // nothing is listening to the stream anymore
-            streamAbortController.abort();
+            opts.abortController?.abort();
         }
     };
-    function hydrateChunkDefinition(value, path) {
+    function hydrateChunkDefinition(value) {
         const [_path, type, chunkId] = value;
         const { readable , controller  } = createReadableStream();
         const wrapper = {
@@ -370,7 +369,7 @@ function createConsumerStream(from) {
                             const [_chunkId, status, data] = value;
                             switch(status){
                                 case PROMISE_STATUS_FULFILLED:
-                                    resolve(hydrate(data, path));
+                                    resolve(hydrate(data));
                                     break;
                                 case PROMISE_STATUS_REJECTED:
                                     reject(opts.formatError?.({
@@ -408,7 +407,7 @@ function createConsumerStream(from) {
                                         case ASYNC_ITERABLE_STATUS_VALUE:
                                             return {
                                                 done: false,
-                                                value: hydrate(data, path)
+                                                value: hydrate(data)
                                             };
                                         case ASYNC_ITERABLE_STATUS_DONE:
                                             controllers.delete(chunkId);
@@ -440,14 +439,11 @@ function createConsumerStream(from) {
                 }
         }
     }
-    function hydrate(value, path) {
+    function hydrate(value) {
         const [[data], ...asyncProps] = value;
         for (const value1 of asyncProps){
             const [key] = value1;
-            const hydrated = hydrateChunkDefinition(value1, key === null ? path : [
-                ...path,
-                key
-            ]);
+            const hydrated = hydrateChunkDefinition(value1);
             if (key === null) {
                 return hydrated;
             }
@@ -469,18 +465,11 @@ function createConsumerStream(from) {
         controllers.clear();
     };
     source.pipeTo(new WritableStream({
-        start (controller) {
-            streamAbortController.signal.addEventListener('abort', ()=>{
-                controller.error(streamAbortController.signal.reason);
-            });
-        },
         async write (chunkOrHead) {
             if (headDeferred) {
                 const head = chunkOrHead;
                 for (const [key, value] of Object.entries(chunkOrHead)){
-                    const parsed = hydrate(value, [
-                        key
-                    ]);
+                    const parsed = hydrate(value);
                     head[key] = parsed;
                 }
                 headDeferred.resolve(head);
@@ -511,8 +500,7 @@ function createConsumerStream(from) {
     return [
         await headDeferred.promise,
         {
-            controllers,
-            streamAbortController
+            controllers
         }
     ];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-alpha-tmp-issues-5851-take-two.457+d001d20ed",
+  "version": "11.0.0-alpha-tmp-issues-5851-take-two.461+40cd3d0aa",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -149,5 +149,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "d001d20ed0a9cda4a71c3a32276c1914bf0c2214"
+  "gitHead": "40cd3d0aa3e88e87a5ed7093f4bed7cc7632e023"
 }

package/src/unstable-core-do-not-import/stream/jsonl.ts

@@ -422,9 +422,9 @@ export async function jsonlStreamConsumer<THead>(opts: {
   deserialize?: Deserialize;
   onError?: ConsumerOnError;
   formatError?: (opts: { error: unknown }) => Error;
+  abortController: AbortController | null;
 }) {
   const { deserialize = (v) => v } = opts;
-  const streamAbortController = new AbortController();
 
   let source = createConsumerStream<Head>(opts.from);
   if (deserialize) {
@@ -453,11 +453,11 @@ export async function jsonlStreamConsumer<THead>(opts: {
       Array.from(controllers.values()).every((it) => it.returned)
     ) {
       // nothing is listening to the stream anymore
-      streamAbortController.abort();
+      opts.abortController?.abort();
     }
   };
 
-  function hydrateChunkDefinition(value: ChunkDefinition, path: PathArray) {
+  function hydrateChunkDefinition(value: ChunkDefinition) {
     const [_path, type, chunkId] = value;
 
     const { readable, controller } = createReadableStream<ChunkData>();
@@ -495,7 +495,7 @@ export async function jsonlStreamConsumer<THead>(opts: {
               const [_chunkId, status, data] = value as PromiseChunk;
               switch (status) {
                 case PROMISE_STATUS_FULFILLED:
-                  resolve(hydrate(data, path));
+                  resolve(hydrate(data));
 
                   break;
                 case PROMISE_STATUS_REJECTED:
@@ -538,7 +538,7 @@ export async function jsonlStreamConsumer<THead>(opts: {
                   case ASYNC_ITERABLE_STATUS_VALUE:
                     return {
                       done: false,
-                      value: hydrate(data, path),
+                      value: hydrate(data),
                     };
                   case ASYNC_ITERABLE_STATUS_DONE:
                     controllers.delete(chunkId);
@@ -572,15 +572,12 @@ export async function jsonlStreamConsumer<THead>(opts: {
     }
   }
 
-  function hydrate(value: DehydratedValue, path: PathArray): unknown {
+  function hydrate(value: DehydratedValue): unknown {
     const [[data], ...asyncProps] = value;
 
     for (const value of asyncProps) {
       const [key] = value;
-      const hydrated = hydrateChunkDefinition(
-        value,
-        key === null ? path : [...path, key],
-      );
+      const hydrated = hydrateChunkDefinition(value);
 
       if (key === null) {
         return hydrated;
@@ -608,17 +605,12 @@ export async function jsonlStreamConsumer<THead>(opts: {
   source
     .pipeTo(
       new WritableStream({
-        start(controller) {
-          streamAbortController.signal.addEventListener('abort', () => {
-            controller.error(streamAbortController.signal.reason);
-          });
-        },
         async write(chunkOrHead) {
           if (headDeferred) {
             const head = chunkOrHead as Record<number | string, unknown>;
 
             for (const [key, value] of Object.entries(chunkOrHead)) {
-              const parsed = hydrate(value as any, [key]);
+              const parsed = hydrate(value as any);
               head[key] = parsed;
             }
             headDeferred.resolve(head as THead);
@@ -652,7 +644,6 @@ export async function jsonlStreamConsumer<THead>(opts: {
     await headDeferred.promise,
     {
       controllers,
-      streamAbortController,
     },
   ] as const;
 }