@trpc/client 11.0.0-alpha-tmp-subscription-connection-state.489 → 11.0.0-alpha-tmp-12-06-react.667

package/dist/internals/TRPCUntypedClient.js

@@ -4,6 +4,19 @@ var observable = require('@trpc/server/observable');
 var createChain = require('../links/internals/createChain.js');
 var TRPCClientError = require('../TRPCClientError.js');
 
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
 class TRPCUntypedClient {
     $request(opts) {
         const chain$ = createChain.createChain({
@@ -49,21 +62,35 @@ class TRPCUntypedClient {
             type: 'subscription',
             path,
             input,
-            context: opts?.context,
-            signal: null
+            context: opts.context,
+            signal: opts.signal
         });
         return observable$.subscribe({
             next (envelope) {
-                if (envelope.result.type === 'started') {
-                    opts.onStarted?.({
-                        context: envelope.context
-                    });
-                } else if (envelope.result.type === 'stopped') {
-                    opts.onStopped?.();
-                } else if (envelope.result.type === 'state') {
-                    opts.onStateChange?.(envelope.result);
-                } else {
-                    opts.onData?.(envelope.result.data);
+                switch(envelope.result.type){
+                    case 'state':
+                        {
+                            opts.onConnectionStateChange?.(envelope.result);
+                            break;
+                        }
+                    case 'started':
+                        {
+                            opts.onStarted?.({
+                                context: envelope.context
+                            });
+                            break;
+                        }
+                    case 'stopped':
+                        {
+                            opts.onStopped?.();
+                            break;
+                        }
+                    case 'data':
+                    case undefined:
+                        {
+                            opts.onData?.(envelope.result.data);
+                            break;
+                        }
                 }
             },
             error (err) {
@@ -75,6 +102,9 @@ class TRPCUntypedClient {
         });
     }
     constructor(opts){
+        _define_property(this, "links", void 0);
+        _define_property(this, "runtime", void 0);
+        _define_property(this, "requestId", void 0);
         this.requestId = 0;
         this.runtime = {};
         // Initialize the links

package/dist/internals/TRPCUntypedClient.mjs

@@ -2,6 +2,19 @@ import { share, observableToPromise } from '@trpc/server/observable';
 import { createChain } from '../links/internals/createChain.mjs';
 import { TRPCClientError } from '../TRPCClientError.mjs';
 
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
 class TRPCUntypedClient {
     $request(opts) {
         const chain$ = createChain({
@@ -47,21 +60,35 @@ class TRPCUntypedClient {
             type: 'subscription',
             path,
             input,
-            context: opts?.context,
-            signal: null
+            context: opts.context,
+            signal: opts.signal
         });
         return observable$.subscribe({
             next (envelope) {
-                if (envelope.result.type === 'started') {
-                    opts.onStarted?.({
-                        context: envelope.context
-                    });
-                } else if (envelope.result.type === 'stopped') {
-                    opts.onStopped?.();
-                } else if (envelope.result.type === 'state') {
-                    opts.onStateChange?.(envelope.result);
-                } else {
-                    opts.onData?.(envelope.result.data);
+                switch(envelope.result.type){
+                    case 'state':
+                        {
+                            opts.onConnectionStateChange?.(envelope.result);
+                            break;
+                        }
+                    case 'started':
+                        {
+                            opts.onStarted?.({
+                                context: envelope.context
+                            });
+                            break;
+                        }
+                    case 'stopped':
+                        {
+                            opts.onStopped?.();
+                            break;
+                        }
+                    case 'data':
+                    case undefined:
+                        {
+                            opts.onData?.(envelope.result.data);
+                            break;
+                        }
                 }
             },
             error (err) {
@@ -73,6 +100,9 @@ class TRPCUntypedClient {
         });
     }
     constructor(opts){
+        _define_property(this, "links", void 0);
+        _define_property(this, "runtime", void 0);
+        _define_property(this, "requestId", void 0);
         this.requestId = 0;
         this.runtime = {};
         // Initialize the links

package/dist/internals/inputWithTrackedEventId.d.ts

@@ -0,0 +1,2 @@
+export declare function inputWithTrackedEventId(input: unknown, lastEventId: string | undefined): unknown;
+//# sourceMappingURL=inputWithTrackedEventId.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"inputWithTrackedEventId.d.ts","sourceRoot":"","sources":["../../src/internals/inputWithTrackedEventId.ts"],"names":[],"mappings":"AAAA,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,OAAO,EACd,WAAW,EAAE,MAAM,GAAG,SAAS,WAYhC"}

package/dist/internals/inputWithTrackedEventId.js

@@ -0,0 +1,16 @@
+'use strict';
+
+function inputWithTrackedEventId(input, lastEventId) {
+    if (!lastEventId) {
+        return input;
+    }
+    if (input != null && typeof input !== 'object') {
+        return input;
+    }
+    return {
+        ...input ?? {},
+        lastEventId
+    };
+}
+
+exports.inputWithTrackedEventId = inputWithTrackedEventId;

package/dist/internals/inputWithTrackedEventId.mjs

@@ -0,0 +1,14 @@
+function inputWithTrackedEventId(input, lastEventId) {
+    if (!lastEventId) {
+        return input;
+    }
+    if (input != null && typeof input !== 'object') {
+        return input;
+    }
+    return {
+        ...input ?? {},
+        lastEventId
+    };
+}
+
+export { inputWithTrackedEventId };

package/dist/internals/signals.d.ts

@@ -0,0 +1,15 @@
+import type { Maybe } from '@trpc/server/unstable-core-do-not-import';
+/**
+ * Like `Promise.all()` but for abort signals
+ * - When all signals have been aborted, the merged signal will be aborted
+ * - If one signal is `null`, no signal will be aborted
+ */
+export declare function allAbortSignals(...signals: Maybe<AbortSignal>[]): AbortSignal;
+/**
+ * Like `Promise.race` but for abort signals
+ *
+ * Basically, a ponyfill for
+ * [`AbortSignal.any`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/any_static).
+ */
+export declare function raceAbortSignals(...signals: Maybe<AbortSignal>[]): AbortSignal;
+//# sourceMappingURL=signals.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"signals.d.ts","sourceRoot":"","sources":["../../src/internals/signals.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAEtE;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,EAAE,GAAG,WAAW,CAwB7E;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,EAAE,GAC/B,WAAW,CAYb"}

package/dist/internals/signals.js

@@ -0,0 +1,47 @@
+'use strict';
+
+/**
+ * Like `Promise.all()` but for abort signals
+ * - When all signals have been aborted, the merged signal will be aborted
+ * - If one signal is `null`, no signal will be aborted
+ */ function allAbortSignals(...signals) {
+    const ac = new AbortController();
+    const count = signals.length;
+    let abortedCount = 0;
+    const onAbort = ()=>{
+        if (++abortedCount === count) {
+            ac.abort();
+        }
+    };
+    for (const signal of signals){
+        if (signal?.aborted) {
+            onAbort();
+        } else {
+            signal?.addEventListener('abort', onAbort, {
+                once: true
+            });
+        }
+    }
+    return ac.signal;
+}
+/**
+ * Like `Promise.race` but for abort signals
+ *
+ * Basically, a ponyfill for
+ * [`AbortSignal.any`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/any_static).
+ */ function raceAbortSignals(...signals) {
+    const ac = new AbortController();
+    for (const signal of signals){
+        if (signal?.aborted) {
+            ac.abort();
+        } else {
+            signal?.addEventListener('abort', ()=>ac.abort(), {
+                once: true
+            });
+        }
+    }
+    return ac.signal;
+}
+
+exports.allAbortSignals = allAbortSignals;
+exports.raceAbortSignals = raceAbortSignals;

package/dist/internals/signals.mjs

@@ -0,0 +1,44 @@
+/**
+ * Like `Promise.all()` but for abort signals
+ * - When all signals have been aborted, the merged signal will be aborted
+ * - If one signal is `null`, no signal will be aborted
+ */ function allAbortSignals(...signals) {
+    const ac = new AbortController();
+    const count = signals.length;
+    let abortedCount = 0;
+    const onAbort = ()=>{
+        if (++abortedCount === count) {
+            ac.abort();
+        }
+    };
+    for (const signal of signals){
+        if (signal?.aborted) {
+            onAbort();
+        } else {
+            signal?.addEventListener('abort', onAbort, {
+                once: true
+            });
+        }
+    }
+    return ac.signal;
+}
+/**
+ * Like `Promise.race` but for abort signals
+ *
+ * Basically, a ponyfill for
+ * [`AbortSignal.any`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/any_static).
+ */ function raceAbortSignals(...signals) {
+    const ac = new AbortController();
+    for (const signal of signals){
+        if (signal?.aborted) {
+            ac.abort();
+        } else {
+            signal?.addEventListener('abort', ()=>ac.abort(), {
+                once: true
+            });
+        }
+    }
+    return ac.signal;
+}
+
+export { allAbortSignals, raceAbortSignals };

package/dist/internals/transformer.d.ts

@@ -10,7 +10,7 @@ type TransformerOptionYes = {
      * Data transformer
      *
      * You must use the same transformer on the backend and frontend
-     * @link https://trpc.io/docs/v11/data-transformers
+     * @see https://trpc.io/docs/v11/data-transformers
      **/
     transformer: DataTransformerOptions;
 };
@@ -19,7 +19,7 @@ type TransformerOptionNo = {
      * Data transformer
      *
      * You must use the same transformer on the backend and frontend
-     * @link https://trpc.io/docs/v11/data-transformers
+     * @see https://trpc.io/docs/v11/data-transformers
      **/
     transformer?: TypeError<'You must define a transformer on your your `initTRPC`-object first'>;
 };

package/dist/internals/types.d.ts

@@ -37,7 +37,7 @@ export interface RequestInitEsque {
     /**
      * Sets the request's signal.
      */
-    signal?: AbortSignal | null;
+    signal?: AbortSignal | undefined;
 }
 /**
  * A subset of the standard ReadableStream properties needed by tRPC internally.

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/internals/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,GAAG,CACvB,KAAK,EAAE,WAAW,GAAG,GAAG,GAAG,MAAM,EACjC,IAAI,CAAC,EAAE,WAAW,GAAG,gBAAgB,KAClC,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAC7B,GAAG,EAAE,GAAG,GAAG,MAAM,EACjB,IAAI,CAAC,EAAE,yBAAyB,KAC7B,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B,MAAM,WAAW,yBAAyB;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,IAAI,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,GAAG,UAAU,GAAG,IAAI,GAAG,IAAI,CAAC;IAE3D;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEtD;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,MAAM,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;CAC7B;AAED;;;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;AAEF;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,yBAAyB,GAAG,sBAAsB,GAAG,IAAI,CAAC;IAC1E;;;;;OAKG;IACH,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,KAAK,IAAI,CAAC,KAAK,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/internals/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,GAAG,CACvB,KAAK,EAAE,WAAW,GAAG,GAAG,GAAG,MAAM,EACjC,IAAI,CAAC,EAAE,WAAW,GAAG,gBAAgB,KAClC,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAC7B,GAAG,EAAE,GAAG,GAAG,MAAM,EACjB,IAAI,CAAC,EAAE,yBAAyB,KAC7B,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B,MAAM,WAAW,yBAAyB;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,IAAI,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,GAAG,UAAU,GAAG,IAAI,GAAG,IAAI,CAAC;IAE3D;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEtD;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CAClC;AAED;;;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;AAEF;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,yBAAyB,GAAG,sBAAsB,GAAG,IAAI,CAAC;IAC1E;;;;;OAKG;IACH,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,KAAK,IAAI,CAAC,KAAK,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC"}

package/dist/links/HTTPBatchLinkOptions.d.ts

@@ -6,7 +6,7 @@ export type HTTPBatchLinkOptions<TRoot extends AnyClientTypes> = HTTPLinkBaseOpt
     maxURLLength?: number;
     /**
      * Headers to be set on outgoing requests or a callback that of said headers
-     * @link http://trpc.io/docs/client/headers
+     * @see http://trpc.io/docs/client/headers
      */
     headers?: HTTPHeaders | ((opts: {
         opList: NonEmptyArray<Operation>;

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

@@ -1 +1 @@
-{"version":3,"file":"httpBatchLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAO7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAQnE,OAAO,KAAK,EAAa,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnD;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,SAAS,SAAS,EACrD,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,GAC/D,QAAQ,CAAC,OAAO,CAAC,CAkHnB"}
+{"version":3,"file":"httpBatchLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAQ7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAOnE,OAAO,KAAK,EAAa,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnD;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,SAAS,SAAS,EACrD,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,GAC/D,QAAQ,CAAC,OAAO,CAAC,CAkHnB"}

package/dist/links/httpBatchLink.js

@@ -3,6 +3,7 @@
 var observable = require('@trpc/server/observable');
 var unstableCoreDoNotImport = require('@trpc/server/unstable-core-do-not-import');
 var dataLoader = require('../internals/dataLoader.js');
+var signals = require('../internals/signals.js');
 var TRPCClientError = require('../TRPCClientError.js');
 var httpUtils = require('./internals/httpUtils.js');
 
@@ -33,7 +34,7 @@ var httpUtils = require('./internals/httpUtils.js');
                 async fetch (batchOps) {
                     const path = batchOps.map((op)=>op.path).join(',');
                     const inputs = batchOps.map((op)=>op.input);
-                    const ac = httpUtils.mergeAbortSignals(batchOps);
+                    const signal = signals.allAbortSignals(...batchOps.map((op)=>op.signal));
                     const res = await httpUtils.jsonHttpRequester({
                         ...resolvedOpts,
                         path,
@@ -50,7 +51,7 @@ var httpUtils = require('./internals/httpUtils.js');
                             }
                             return opts.headers;
                         },
-                        signal: ac.signal
+                        signal
                     });
                     const resJSON = Array.isArray(res.json) ? res.json : batchOps.map(()=>res.json);
                     const result = resJSON.map((item)=>({
@@ -67,7 +68,7 @@ var httpUtils = require('./internals/httpUtils.js');
             query,
             mutation
         };
-        return ({ op  })=>{
+        return ({ op })=>{
             return observable.observable((observer)=>{
                 /* istanbul ignore if -- @preserve */ if (op.type === 'subscription') {
                     throw new Error('Subscriptions are unsupported by `httpLink` - use `httpSubscriptionLink` or `wsLink`');

package/dist/links/httpBatchLink.mjs

@@ -1,8 +1,9 @@
 import { observable } from '@trpc/server/observable';
 import { transformResult } from '@trpc/server/unstable-core-do-not-import';
 import { dataLoader } from '../internals/dataLoader.mjs';
+import { allAbortSignals } from '../internals/signals.mjs';
 import { TRPCClientError } from '../TRPCClientError.mjs';
-import { resolveHTTPLinkOptions, getUrl, mergeAbortSignals, jsonHttpRequester } from './internals/httpUtils.mjs';
+import { resolveHTTPLinkOptions, getUrl, jsonHttpRequester } from './internals/httpUtils.mjs';
 
 /**
  * @see https://trpc.io/docs/client/links/httpBatchLink
@@ -31,7 +32,7 @@ import { resolveHTTPLinkOptions, getUrl, mergeAbortSignals, jsonHttpRequester }
                 async fetch (batchOps) {
                     const path = batchOps.map((op)=>op.path).join(',');
                     const inputs = batchOps.map((op)=>op.input);
-                    const ac = mergeAbortSignals(batchOps);
+                    const signal = allAbortSignals(...batchOps.map((op)=>op.signal));
                     const res = await jsonHttpRequester({
                         ...resolvedOpts,
                         path,
@@ -48,7 +49,7 @@ import { resolveHTTPLinkOptions, getUrl, mergeAbortSignals, jsonHttpRequester }
                             }
                             return opts.headers;
                         },
-                        signal: ac.signal
+                        signal
                     });
                     const resJSON = Array.isArray(res.json) ? res.json : batchOps.map(()=>res.json);
                     const result = resJSON.map((item)=>({
@@ -65,7 +66,7 @@ import { resolveHTTPLinkOptions, getUrl, mergeAbortSignals, jsonHttpRequester }
             query,
             mutation
         };
-        return ({ op  })=>{
+        return ({ op })=>{
             return observable((observer)=>{
                 /* istanbul ignore if -- @preserve */ if (op.type === 'subscription') {
                     throw new Error('Subscriptions are unsupported by `httpLink` - use `httpSubscriptionLink` or `wsLink`');

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;AASnE,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,CA6JnB"}
+{"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;AAO7E,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,CAgKnB"}

package/dist/links/httpBatchStreamLink.js

@@ -3,6 +3,7 @@
 var observable = require('@trpc/server/observable');
 var unstableCoreDoNotImport = require('@trpc/server/unstable-core-do-not-import');
 var dataLoader = require('../internals/dataLoader.js');
+var signals = require('../internals/signals.js');
 var TRPCClientError = require('../TRPCClientError.js');
 var httpUtils = require('./internals/httpUtils.js');
 
@@ -37,10 +38,11 @@ var httpUtils = require('./internals/httpUtils.js');
                 async fetch (batchOps) {
                     const path = batchOps.map((op)=>op.path).join(',');
                     const inputs = batchOps.map((op)=>op.input);
-                    const ac = httpUtils.mergeAbortSignals(batchOps);
+                    const batchSignals = signals.allAbortSignals(...batchOps.map((op)=>op.signal));
+                    const abortController = new AbortController();
                     const responsePromise = httpUtils.fetchHTTPResponse({
                         ...resolvedOpts,
-                        signal: ac.signal,
+                        signal: signals.raceAbortSignals(batchSignals, abortController.signal),
                         type,
                         contentTypeHeader: 'application/json',
                         trpcAcceptHeader: 'application/jsonl',
@@ -72,7 +74,7 @@ var httpUtils = require('./internals/httpUtils.js');
                                 error
                             });
                         },
-                        abortController: ac
+                        abortController
                     });
                     const promises = Object.keys(batchOps).map(async (key)=>{
                         let json = await Promise.resolve(head[key]);
@@ -104,7 +106,7 @@ var httpUtils = require('./internals/httpUtils.js');
             query,
             mutation
         };
-        return ({ op  })=>{
+        return ({ op })=>{
             return observable.observable((observer)=>{
                 /* istanbul ignore if -- @preserve */ if (op.type === 'subscription') {
                     throw new Error('Subscriptions are unsupported by `httpLink` - use `httpSubscriptionLink` or `wsLink`');

package/dist/links/httpBatchStreamLink.mjs

@@ -1,8 +1,9 @@
 import { observable } from '@trpc/server/observable';
 import { jsonlStreamConsumer } from '@trpc/server/unstable-core-do-not-import';
 import { dataLoader } from '../internals/dataLoader.mjs';
+import { allAbortSignals, raceAbortSignals } from '../internals/signals.mjs';
 import { TRPCClientError } from '../TRPCClientError.mjs';
-import { resolveHTTPLinkOptions, getUrl, mergeAbortSignals, fetchHTTPResponse, getBody } from './internals/httpUtils.mjs';
+import { resolveHTTPLinkOptions, getUrl, fetchHTTPResponse, getBody } from './internals/httpUtils.mjs';
 
 /**
  * @see https://trpc.io/docs/client/links/httpBatchStreamLink
@@ -35,10 +36,11 @@ import { resolveHTTPLinkOptions, getUrl, mergeAbortSignals, fetchHTTPResponse, g
                 async fetch (batchOps) {
                     const path = batchOps.map((op)=>op.path).join(',');
                     const inputs = batchOps.map((op)=>op.input);
-                    const ac = mergeAbortSignals(batchOps);
+                    const batchSignals = allAbortSignals(...batchOps.map((op)=>op.signal));
+                    const abortController = new AbortController();
                     const responsePromise = fetchHTTPResponse({
                         ...resolvedOpts,
-                        signal: ac.signal,
+                        signal: raceAbortSignals(batchSignals, abortController.signal),
                         type,
                         contentTypeHeader: 'application/json',
                         trpcAcceptHeader: 'application/jsonl',
@@ -70,7 +72,7 @@ import { resolveHTTPLinkOptions, getUrl, mergeAbortSignals, fetchHTTPResponse, g
                                 error
                             });
                         },
-                        abortController: ac
+                        abortController
                     });
                     const promises = Object.keys(batchOps).map(async (key)=>{
                         let json = await Promise.resolve(head[key]);
@@ -102,7 +104,7 @@ import { resolveHTTPLinkOptions, getUrl, mergeAbortSignals, fetchHTTPResponse, g
             query,
             mutation
         };
-        return ({ op  })=>{
+        return ({ op })=>{
             return observable((observer)=>{
                 /* istanbul ignore if -- @preserve */ if (op.type === 'subscription') {
                     throw new Error('Subscriptions are unsupported by `httpLink` - use `httpSubscriptionLink` or `wsLink`');

package/dist/links/httpLink.d.ts

@@ -4,14 +4,14 @@ import { type HTTPHeaders, type Operation, type TRPCLink } from './types';
 export type HTTPLinkOptions<TRoot extends AnyClientTypes> = HTTPLinkBaseOptions<TRoot> & {
     /**
      * Headers to be set on outgoing requests or a callback that of said headers
-     * @link http://trpc.io/docs/client/headers
+     * @see http://trpc.io/docs/client/headers
      */
     headers?: HTTPHeaders | ((opts: {
         op: Operation;
     }) => HTTPHeaders | Promise<HTTPHeaders>);
 };
 /**
- * @link https://trpc.io/docs/client/links/httpLink
+ * @see https://trpc.io/docs/client/links/httpLink
  */
 export declare function httpLink<TRouter extends AnyRouter = AnyRouter>(opts: HTTPLinkOptions<TRouter['_def']['_config']['$types']>): TRPCLink<TRouter>;
 //# sourceMappingURL=httpLink.d.ts.map

package/dist/links/httpLink.js

@@ -34,13 +34,13 @@ const universalRequester = (opts)=>{
     return httpUtils.jsonHttpRequester(opts);
 };
 /**
- * @link https://trpc.io/docs/client/links/httpLink
+ * @see https://trpc.io/docs/client/links/httpLink
  */ function httpLink(opts) {
     const resolvedOpts = httpUtils.resolveHTTPLinkOptions(opts);
     return ()=>{
-        return ({ op  })=>{
+        return ({ op })=>{
             return observable.observable((observer)=>{
-                const { path , input , type  } = op;
+                const { path, input, type } = op;
                 /* istanbul ignore if -- @preserve */ if (type === 'subscription') {
                     throw new Error('Subscriptions are unsupported by `httpLink` - use `httpSubscriptionLink` or `wsLink`');
                 }

package/dist/links/httpLink.mjs

@@ -32,13 +32,13 @@ const universalRequester = (opts)=>{
     return jsonHttpRequester(opts);
 };
 /**
- * @link https://trpc.io/docs/client/links/httpLink
+ * @see https://trpc.io/docs/client/links/httpLink
  */ function httpLink(opts) {
     const resolvedOpts = resolveHTTPLinkOptions(opts);
     return ()=>{
-        return ({ op  })=>{
+        return ({ op })=>{
             return observable((observer)=>{
-                const { path , input , type  } = op;
+                const { path, input, type } = op;
                 /* istanbul ignore if -- @preserve */ if (type === 'subscription') {
                     throw new Error('Subscriptions are unsupported by `httpLink` - use `httpSubscriptionLink` or `wsLink`');
                 }

package/dist/links/httpSubscriptionLink.d.ts

@@ -1,17 +1,22 @@
-import type { AnyClientTypes, inferClientTypes, InferrableClientTypes } from '@trpc/server/unstable-core-do-not-import';
+import type { AnyClientTypes, EventSourceLike, inferClientTypes, InferrableClientTypes } from '@trpc/server/unstable-core-do-not-import';
 import { type TransformerOptions } from '../unstable-internals';
-import type { CallbackOrValue } from './internals/urlWithConnectionParams';
 import { type UrlOptionsWithConnectionParams } from './internals/urlWithConnectionParams';
-import type { TRPCLink } from './types';
-type HTTPSubscriptionLinkOptions<TRoot extends AnyClientTypes> = {
+import type { Operation, TRPCLink } from './types';
+type HTTPSubscriptionLinkOptions<TRoot extends AnyClientTypes, TEventSource extends EventSourceLike.AnyConstructor = typeof EventSource> = {
+    /**
+     * EventSource ponyfill
+     */
+    EventSource?: TEventSource;
     /**
      * EventSource options or a callback that returns them
      */
-    eventSourceOptions?: CallbackOrValue<EventSourceInit>;
+    eventSourceOptions?: EventSourceLike.InitDictOf<TEventSource> | ((opts: {
+        op: Operation;
+    }) => EventSourceLike.InitDictOf<TEventSource> | Promise<EventSourceLike.InitDictOf<TEventSource>>);
 } & TransformerOptions<TRoot> & UrlOptionsWithConnectionParams;
 /**
  * @see https://trpc.io/docs/client/links/httpSubscriptionLink
  */
-export declare function unstable_httpSubscriptionLink<TInferrable extends InferrableClientTypes>(opts: HTTPSubscriptionLinkOptions<inferClientTypes<TInferrable>>): TRPCLink<TInferrable>;
+export declare function unstable_httpSubscriptionLink<TInferrable extends InferrableClientTypes, TEventSource extends EventSourceLike.AnyConstructor>(opts: HTTPSubscriptionLinkOptions<inferClientTypes<TInferrable>, TEventSource>): TRPCLink<TInferrable>;
 export {};
 //# sourceMappingURL=httpSubscriptionLink.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"httpSubscriptionLink.d.ts","sourceRoot":"","sources":["../../src/links/httpSubscriptionLink.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EACd,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,0CAA0C,CAAC;AAMlD,OAAO,EAAkB,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAEL,KAAK,8BAA8B,EACpC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAiBxC,KAAK,2BAA2B,CAAC,KAAK,SAAS,cAAc,IAAI;IAC/D;;OAEG;IACH,kBAAkB,CAAC,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC;CACvD,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAC3B,8BAA8B,CAAC;AAEjC;;GAEG;AACH,wBAAgB,6BAA6B,CAC3C,WAAW,SAAS,qBAAqB,EAEzC,IAAI,EAAE,2BAA2B,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,GAC/D,QAAQ,CAAC,WAAW,CAAC,CAuJvB"}
+{"version":3,"file":"httpSubscriptionLink.d.ts","sourceRoot":"","sources":["../../src/links/httpSubscriptionLink.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,0CAA0C,CAAC;AASlD,OAAO,EAAkB,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhF,OAAO,EAEL,KAAK,8BAA8B,EACpC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAiBnD,KAAK,2BAA2B,CAC9B,KAAK,SAAS,cAAc,EAC5B,YAAY,SAAS,eAAe,CAAC,cAAc,GAAG,OAAO,WAAW,IACtE;IACF;;OAEG;IACH,WAAW,CAAC,EAAE,YAAY,CAAC;IAC3B;;OAEG;IACH,kBAAkB,CAAC,EACf,eAAe,CAAC,UAAU,CAAC,YAAY,CAAC,GACxC,CAAC,CAAC,IAAI,EAAE;QACN,EAAE,EAAE,SAAS,CAAC;KACf,KACG,eAAe,CAAC,UAAU,CAAC,YAAY,CAAC,GACxC,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;CAC5D,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAC3B,8BAA8B,CAAC;AAajC;;GAEG;AACH,wBAAgB,6BAA6B,CAC3C,WAAW,SAAS,qBAAqB,EACzC,YAAY,SAAS,eAAe,CAAC,cAAc,EAEnD,IAAI,EAAE,2BAA2B,CAC/B,gBAAgB,CAAC,WAAW,CAAC,EAC7B,YAAY,CACb,GACA,QAAQ,CAAC,WAAW,CAAC,CAmKvB"}