@trpc/client 11.0.0-alpha-tmp-issues-5851-take-two.451 → 11.0.0-alpha-tmp-issues-5851-take-two.454

package/dist/bundle-analysis.json

@@ -1,7 +1,7 @@
 {
-  "bundleSize": 52206,
-  "bundleOrigSize": 69751,
-  "bundleReduction": 25.15,
+  "bundleSize": 52610,
+  "bundleOrigSize": 70270,
+  "bundleReduction": 25.13,
   "modules": [
     {
       "id": "/src/links/wsLink.ts",
@@ -13,20 +13,20 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 24.97,
+      "percent": 24.78,
       "reduction": 10.36
     },
     {
       "id": "/src/links/httpBatchStreamLink.ts",
       "size": 6237,
-      "origSize": 6400,
+      "origSize": 6454,
       "renderedExports": [
         "unstable_httpBatchStreamLink"
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 11.95,
-      "reduction": 2.55
+      "percent": 11.86,
+      "reduction": 3.36
     },
     {
       "id": "/src/links/loggerLink.ts",
@@ -37,7 +37,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 10.45,
+      "percent": 10.37,
       "reduction": 18.48
     },
     {
@@ -52,7 +52,7 @@
         "/src/links/httpBatchLink.ts",
         "/src/links/httpBatchStreamLink.ts"
       ],
-      "percent": 8.63,
+      "percent": 8.56,
       "reduction": 6.34
     },
     {
@@ -64,7 +64,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 7.72,
+      "percent": 7.66,
       "reduction": 3.43
     },
     {
@@ -87,7 +87,7 @@
         "/src/links/httpBatchStreamLink.ts",
         "/src/links/httpSubscriptionLink.ts"
       ],
-      "percent": 6.79,
+      "percent": 6.73,
       "reduction": 41.03
     },
     {
@@ -99,7 +99,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 6.76,
+      "percent": 6.71,
       "reduction": 6.12
     },
     {
@@ -111,13 +111,13 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 6.07,
+      "percent": 6.02,
       "reduction": 14.36
     },
     {
       "id": "/src/internals/TRPCUntypedClient.ts",
-      "size": 2372,
-      "origSize": 4306,
+      "size": 2776,
+      "origSize": 4771,
       "renderedExports": [
         "TRPCUntypedClient"
       ],
@@ -126,8 +126,8 @@
         "/src/createTRPCUntypedClient.ts",
         "/src/createTRPCClient.ts"
       ],
-      "percent": 4.54,
-      "reduction": 44.91
+      "percent": 5.28,
+      "reduction": 41.82
     },
     {
       "id": "/src/TRPCClientError.ts",
@@ -147,7 +147,7 @@
         "/src/internals/TRPCUntypedClient.ts",
         "/src/links/internals/httpUtils.ts"
       ],
-      "percent": 3.57,
+      "percent": 3.55,
       "reduction": 45.71
     },
     {
@@ -164,7 +164,7 @@
       "dependents": [
         "/src/index.ts"
       ],
-      "percent": 2.27,
+      "percent": 2.26,
       "reduction": 73.19
     },
     {
@@ -179,7 +179,7 @@
         "/src/links/splitLink.ts",
         "/src/internals/TRPCUntypedClient.ts"
       ],
-      "percent": 1.32,
+      "percent": 1.31,
       "reduction": 32.75
     },
     {
@@ -191,7 +191,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.17,
+      "percent": 1.16,
       "reduction": 44.95
     },
     {
@@ -205,7 +205,7 @@
       "dependents": [
         "/src/unstable-internals.ts"
       ],
-      "percent": 1.08,
+      "percent": 1.07,
       "reduction": 66.75
     },
     {
@@ -220,7 +220,7 @@
         "/src/index.ts",
         "/src/links/internals/httpUtils.ts"
       ],
-      "percent": 0.82,
+      "percent": 0.81,
       "reduction": 33.54
     },
     {
@@ -234,7 +234,7 @@
       "dependents": [
         "/src/links/internals/httpUtils.ts"
       ],
-      "percent": 0.76,
+      "percent": 0.75,
       "reduction": 30.4
     },
     {
@@ -281,26 +281,26 @@
       "reduction": 82.58
     },
     {
-      "id": "/src/unstable-internals.ts",
+      "id": "/src/index.ts",
       "size": 0,
-      "origSize": 41,
+      "origSize": 588,
       "renderedExports": [],
       "removedExports": [],
-      "dependents": [
-        "/src/links/wsLink.ts",
-        "/src/links/httpSubscriptionLink.ts",
-        "/src/links/internals/httpUtils.ts"
-      ],
+      "dependents": [],
       "percent": 0,
       "reduction": 100
     },
     {
-      "id": "/src/index.ts",
+      "id": "/src/unstable-internals.ts",
       "size": 0,
-      "origSize": 588,
+      "origSize": 41,
       "renderedExports": [],
       "removedExports": [],
-      "dependents": [],
+      "dependents": [
+        "/src/links/wsLink.ts",
+        "/src/links/httpSubscriptionLink.ts",
+        "/src/links/internals/httpUtils.ts"
+      ],
       "percent": 0,
       "reduction": 100
     }

package/dist/internals/TRPCUntypedClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TRPCUntypedClient.d.ts","sourceRoot":"","sources":["../../src/internals/TRPCUntypedClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,cAAc,EACf,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACrB,SAAS,EACV,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EACV,gBAAgB,EAEhB,iBAAiB,EACjB,QAAQ,EACT,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,wBAAwB,CAAC,MAAM,EAAE,MAAM;IACtD,SAAS,EAAE,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAA;KAAE,KAAK,IAAI,CAAC;IACrE,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB;AAED,gBAAgB;AAChB,MAAM,MAAM,uBAAuB,CAAC,OAAO,SAAS,qBAAqB,IAAI;IAC3E,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,SAAS,CAAC,qEAAqE,CAAC,CAAC;CAChG,CAAC;AAEF,gBAAgB;AAChB,MAAM,MAAM,uBAAuB,GAC/B,UAAU,GACV,OAAO,GACP,UAAU,GACV,OAAO,GACP,kBAAkB,GAClB,WAAW,GACX,SAAS,GACT,cAAc,CAAC;AAEnB,qBAAa,iBAAiB,CAAC,OAAO,SAAS,SAAS;IACtD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA6B;IACnD,SAAgB,OAAO,EAAE,iBAAiB,CAAC;IAC3C,OAAO,CAAC,SAAS,CAAS;gBAEd,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC;IASlD,OAAO,CAAC,QAAQ;IAuBhB,OAAO,CAAC,gBAAgB;IAyBjB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB;IAS9D,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB;IASjE,YAAY,CACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,OAAO,CACX,wBAAwB,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,CAC9D,GACC,kBAAkB,GACnB,cAAc;CA2BlB"}
+{"version":3,"file":"TRPCUntypedClient.d.ts","sourceRoot":"","sources":["../../src/internals/TRPCUntypedClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,cAAc,EACf,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACrB,SAAS,EACV,MAAM,0CAA0C,CAAC;AAGlD,OAAO,KAAK,EACV,gBAAgB,EAEhB,iBAAiB,EACjB,QAAQ,EACT,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,wBAAwB,CAAC,MAAM,EAAE,MAAM;IACtD,SAAS,EAAE,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAA;KAAE,KAAK,IAAI,CAAC;IACrE,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB;AAED,gBAAgB;AAChB,MAAM,MAAM,uBAAuB,CAAC,OAAO,SAAS,qBAAqB,IAAI;IAC3E,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,SAAS,CAAC,qEAAqE,CAAC,CAAC;CAChG,CAAC;AAEF,gBAAgB;AAChB,MAAM,MAAM,uBAAuB,GAC/B,UAAU,GACV,OAAO,GACP,UAAU,GACV,OAAO,GACP,kBAAkB,GAClB,WAAW,GACX,SAAS,GACT,cAAc,CAAC;AAcnB,qBAAa,iBAAiB,CAAC,OAAO,SAAS,SAAS;IACtD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA6B;IACnD,SAAgB,OAAO,EAAE,iBAAiB,CAAC;IAC3C,OAAO,CAAC,SAAS,CAAS;gBAEd,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC;IASlD,OAAO,CAAC,QAAQ;IAwBhB,OAAO,CAAC,gBAAgB;IAgCjB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB;IAS9D,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB;IASjE,YAAY,CACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,OAAO,CACX,wBAAwB,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,CAC9D,GACC,kBAAkB,GACnB,cAAc;CA2BlB"}

package/dist/internals/TRPCUntypedClient.js

@@ -1,9 +1,18 @@
 'use strict';
 
 var observable = require('@trpc/server/observable');
+var unstableCoreDoNotImport = require('@trpc/server/unstable-core-do-not-import');
 var createChain = require('../links/internals/createChain.js');
 var TRPCClientError = require('../TRPCClientError.js');
 
+async function* abortableIterable(from, signal) {
+    for await (const value of from){
+        if (signal?.throwIfAborted()) {
+            return;
+        }
+        yield value;
+    }
+}
 class TRPCUntypedClient {
     $request({ type , input , path , context ={}  }) {
         const chain$ = createChain.createChain({
@@ -24,7 +33,12 @@ class TRPCUntypedClient {
         const abortablePromise = new Promise((resolve, reject)=>{
             opts.signal?.addEventListener('abort', abort);
             promise.then((envelope)=>{
-                resolve(envelope.result.data);
+                const data = envelope.result.data;
+                if (!unstableCoreDoNotImport.isAsyncIterable(data)) {
+                    resolve(data);
+                    return;
+                }
+                resolve(abortableIterable(data, opts.signal));
             }).catch((err)=>{
                 reject(TRPCClientError.TRPCClientError.from(err));
             });

package/dist/internals/TRPCUntypedClient.mjs

@@ -1,7 +1,16 @@
 import { share, observableToPromise } from '@trpc/server/observable';
+import { isAsyncIterable } from '@trpc/server/unstable-core-do-not-import';
 import { createChain } from '../links/internals/createChain.mjs';
 import { TRPCClientError } from '../TRPCClientError.mjs';
 
+async function* abortableIterable(from, signal) {
+    for await (const value of from){
+        if (signal?.throwIfAborted()) {
+            return;
+        }
+        yield value;
+    }
+}
 class TRPCUntypedClient {
     $request({ type , input , path , context ={}  }) {
         const chain$ = createChain({
@@ -22,7 +31,12 @@ class TRPCUntypedClient {
         const abortablePromise = new Promise((resolve, reject)=>{
             opts.signal?.addEventListener('abort', abort);
             promise.then((envelope)=>{
-                resolve(envelope.result.data);
+                const data = envelope.result.data;
+                if (!isAsyncIterable(data)) {
+                    resolve(data);
+                    return;
+                }
+                resolve(abortableIterable(data, opts.signal));
             }).catch((err)=>{
                 reject(TRPCClientError.from(err));
             });

package/dist/links/httpBatchStreamLink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"httpBatchStreamLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchStreamLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAG7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAM7E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAQnE,OAAO,KAAK,EAAa,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnD,MAAM,MAAM,0BAA0B,CAAC,KAAK,SAAS,YAAY,IAC/D,oBAAoB,CAAC,KAAK,CAAC,GAAG;IAC5B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEJ;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,SAAS,SAAS,EACpE,IAAI,EAAE,0BAA0B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,GACrE,QAAQ,CAAC,OAAO,CAAC,CAqKnB"}
+{"version":3,"file":"httpBatchStreamLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchStreamLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAG7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAM7E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAQnE,OAAO,KAAK,EAAa,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnD,MAAM,MAAM,0BAA0B,CAAC,KAAK,SAAS,YAAY,IAC/D,oBAAoB,CAAC,KAAK,CAAC,GAAG;IAC5B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEJ;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,SAAS,SAAS,EACpE,IAAI,EAAE,0BAA0B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,GACrE,QAAQ,CAAC,OAAO,CAAC,CAsKnB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "11.0.0-alpha-tmp-issues-5851-take-two.451+27b7d9bc9",
+  "version": "11.0.0-alpha-tmp-issues-5851-take-two.454+1fa4b0c5f",
   "description": "The tRPC client library",
   "author": "KATT",
   "license": "MIT",
@@ -76,10 +76,10 @@
     "!**/*.test.*"
   ],
   "peerDependencies": {
-    "@trpc/server": "11.0.0-alpha-tmp-issues-5851-take-two.451+27b7d9bc9"
+    "@trpc/server": "11.0.0-alpha-tmp-issues-5851-take-two.454+1fa4b0c5f"
   },
   "devDependencies": {
-    "@trpc/server": "11.0.0-alpha-tmp-issues-5851-take-two.451+27b7d9bc9",
+    "@trpc/server": "11.0.0-alpha-tmp-issues-5851-take-two.454+1fa4b0c5f",
     "@types/isomorphic-fetch": "^0.0.39",
     "@types/node": "^20.10.0",
     "eslint": "^8.56.0",
@@ -96,5 +96,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "27b7d9bc9e6568fe608c8354a147274d0205c5bf"
+  "gitHead": "1fa4b0c5ff4a47b02497c580f464d5aa01356c8d"
 }

package/src/internals/TRPCUntypedClient.ts

@@ -8,6 +8,7 @@ import type {
   InferrableClientTypes,
   TypeError,
 } from '@trpc/server/unstable-core-do-not-import';
+import { isAsyncIterable } from '@trpc/server/unstable-core-do-not-import';
 import { createChain } from '../links/internals/createChain';
 import type {
   OperationContext,
@@ -51,6 +52,18 @@ export type UntypedClientProperties =
   | 'runtime'
   | 'subscription';
 
+async function* abortableIterable<T>(
+  from: AsyncIterable<T>,
+  signal: AbortSignal | undefined,
+) {
+  for await (const value of from) {
+    if (signal?.throwIfAborted()) {
+      return;
+    }
+    yield value;
+  }
+}
+
 export class TRPCUntypedClient<TRouter extends AnyRouter> {
   private readonly links: OperationLink<AnyRouter>[];
   public readonly runtime: TRPCClientRuntime;
@@ -88,6 +101,7 @@ export class TRPCUntypedClient<TRouter extends AnyRouter> {
     });
     return chain$.pipe(share());
   }
+
   private requestAsPromise<TInput = unknown, TOutput = unknown>(opts: {
     type: TRPCType;
     input: TInput;
@@ -104,7 +118,14 @@ export class TRPCUntypedClient<TRouter extends AnyRouter> {
 
       promise
         .then((envelope) => {
-          resolve((envelope.result as any).data);
+          const data = (envelope.result as any).data;
+
+          if (!isAsyncIterable(data)) {
+            resolve(data);
+            return;
+          }
+
+          resolve(abortableIterable(data, opts.signal) as any);
         })
         .catch((err) => {
           reject(TRPCClientError.from(err));

package/src/links/httpBatchStreamLink.ts

@@ -108,6 +108,7 @@ export function unstable_httpBatchStreamLink<TRouter extends AnyRouter>(
                     error,
                   });
                 },
+                // pass in an abort controller here!?
               });
 
               const promises = Object.keys(batchOps).map(