@trpc/server 11.0.0-rc.643 → 11.0.0-rc.648

package/dist/http.js

@@ -6,7 +6,7 @@ var contentTypeParsers = require('./unstable-core-do-not-import/http/contentType
 var resolveResponse = require('./unstable-core-do-not-import/http/resolveResponse.js');
 require('./unstable-core-do-not-import/rootConfig.js');
 require('./vendor/unpromise/unpromise.js');
-require('./unstable-core-do-not-import/stream/utils/timerResource.js');
+require('./unstable-core-do-not-import/stream/utils/disposable.js');
 
 
 

package/dist/http.mjs

@@ -4,4 +4,4 @@ export { octetInputParser } from './unstable-core-do-not-import/http/contentType
 export { resolveResponse } from './unstable-core-do-not-import/http/resolveResponse.mjs';
 import './unstable-core-do-not-import/rootConfig.mjs';
 import './vendor/unpromise/unpromise.mjs';
-import './unstable-core-do-not-import/stream/utils/timerResource.mjs';
+import './unstable-core-do-not-import/stream/utils/disposable.mjs';

package/dist/index.js

@@ -4,8 +4,8 @@ var createProxy = require('./unstable-core-do-not-import/createProxy.js');
 var getErrorShape = require('./unstable-core-do-not-import/error/getErrorShape.js');
 var TRPCError = require('./unstable-core-do-not-import/error/TRPCError.js');
 require('./vendor/unpromise/unpromise.js');
+require('./unstable-core-do-not-import/stream/utils/disposable.js');
 var tracked = require('./unstable-core-do-not-import/stream/tracked.js');
-require('./unstable-core-do-not-import/stream/utils/timerResource.js');
 var transformer = require('./unstable-core-do-not-import/transformer.js');
 var initTRPC = require('./unstable-core-do-not-import/initTRPC.js');
 var middleware = require('./unstable-core-do-not-import/middleware.js');

package/dist/index.mjs

@@ -2,8 +2,8 @@ export { createFlatProxy as createTRPCFlatProxy } from './unstable-core-do-not-i
 export { getErrorShape } from './unstable-core-do-not-import/error/getErrorShape.mjs';
 export { TRPCError, getTRPCErrorFromUnknown } from './unstable-core-do-not-import/error/TRPCError.mjs';
 import './vendor/unpromise/unpromise.mjs';
+import './unstable-core-do-not-import/stream/utils/disposable.mjs';
 export { isTrackedEnvelope, sse, tracked } from './unstable-core-do-not-import/stream/tracked.mjs';
-import './unstable-core-do-not-import/stream/utils/timerResource.mjs';
 export { transformTRPCResponse } from './unstable-core-do-not-import/transformer.mjs';
 export { initTRPC } from './unstable-core-do-not-import/initTRPC.mjs';
 export { experimental_standaloneMiddleware, experimental_standaloneMiddleware as experimental_trpcMiddleware } from './unstable-core-do-not-import/middleware.mjs';

package/dist/node_modules/.pnpm/@rollup_plugin-typescript@12.1.1_rollup@4.27.4_tslib@2.8.1_typescript@5.6.2/node_modules/tslib/tslib.es6.js

@@ -0,0 +1,73 @@
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
+
+
+function __addDisposableResource(env, value, async) {
+    if (value !== null && value !== void 0) {
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+        var dispose, inner;
+        if (async) {
+            if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+            dispose = value[Symbol.asyncDispose];
+        }
+        if (dispose === void 0) {
+            if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+            dispose = value[Symbol.dispose];
+            if (async) inner = dispose;
+        }
+        if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+        if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
+        env.stack.push({ value: value, dispose: dispose, async: async });
+    }
+    else if (async) {
+        env.stack.push({ async: true });
+    }
+    return value;
+
+}
+
+var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+
+function __disposeResources(env) {
+    function fail(e) {
+        env.error = env.hasError ? new _SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
+        env.hasError = true;
+    }
+    var r, s = 0;
+    function next() {
+        while (r = env.stack.pop()) {
+            try {
+                if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
+                if (r.dispose) {
+                    var result = r.dispose.call(r.value);
+                    if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+                }
+                else s |= 1;
+            }
+            catch (e) {
+                fail(e);
+            }
+        }
+        if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
+        if (env.hasError) throw env.error;
+    }
+    return next();
+}
+
+export { __addDisposableResource, __disposeResources };

package/dist/observable/observable.d.ts

@@ -8,5 +8,5 @@ export declare function observable<TValue, TError = unknown>(subscribe: (observe
 /** @internal */
 export declare function observableToPromise<TValue>(observable: Observable<TValue, unknown>): Promise<TValue>;
 /** @internal */
-export declare function observableToAsyncIterable<TValue>(observable: Observable<TValue, unknown>): AsyncIterable<TValue>;
+export declare function observableToAsyncIterable<TValue>(observable: Observable<TValue, unknown>, signal: AbortSignal): AsyncIterable<TValue>;
 //# sourceMappingURL=observable.d.ts.map

package/dist/observable/observable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"observable.d.ts","sourceRoot":"","sources":["../../src/observable/observable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EACV,QAAQ,EAER,aAAa,EAGd,MAAM,SAAS,CAAC;AAEjB,cAAc;AACd,MAAM,MAAM,oBAAoB,CAAC,WAAW,IAC1C,WAAW,SAAS,UAAU,CAAC,MAAM,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC;AAEzE,cAAc;AACd,wBAAgB,YAAY,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAE1E;AAED,cAAc;AACd,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,EACjD,SAAS,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,aAAa,GAC/D,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CA6D5B;AAMD,gBAAgB;AAChB,wBAAgB,mBAAmB,CAAC,MAAM,EACxC,UAAU,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,mBA+BxC;AA8BD,gBAAgB;AAChB,wBAAgB,yBAAyB,CAAC,MAAM,EAC9C,UAAU,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,GACtC,aAAa,CAAC,MAAM,CAAC,CAmCvB"}
+{"version":3,"file":"observable.d.ts","sourceRoot":"","sources":["../../src/observable/observable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EACV,QAAQ,EAER,aAAa,EAGd,MAAM,SAAS,CAAC;AAEjB,cAAc;AACd,MAAM,MAAM,oBAAoB,CAAC,WAAW,IAC1C,WAAW,SAAS,UAAU,CAAC,MAAM,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC;AAEzE,cAAc;AACd,wBAAgB,YAAY,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAE1E;AAED,cAAc;AACd,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,EACjD,SAAS,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,aAAa,GAC/D,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CA6D5B;AAMD,gBAAgB;AAChB,wBAAgB,mBAAmB,CAAC,MAAM,EACxC,UAAU,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,mBA+BxC;AA4CD,gBAAgB;AAChB,wBAAgB,yBAAyB,CAAC,MAAM,EAC9C,UAAU,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,EACvC,MAAM,EAAE,WAAW,GAClB,aAAa,CAAC,MAAM,CAAC,CAmCvB"}

package/dist/observable/observable.js

@@ -98,8 +98,13 @@ function pipeReducer(prev, fn) {
 }
 /**
  * @internal
- */ function observableToReadableStream(observable) {
+ */ function observableToReadableStream(observable, signal) {
     let unsub = null;
+    const onAbort = ()=>{
+        unsub?.unsubscribe();
+        unsub = null;
+        signal.removeEventListener('abort', onAbort);
+    };
     return new ReadableStream({
         start (controller) {
             unsub = observable.subscribe({
@@ -120,14 +125,21 @@ function pipeReducer(prev, fn) {
                     controller.close();
                 }
             });
+            if (signal.aborted) {
+                onAbort();
+            } else {
+                signal.addEventListener('abort', onAbort, {
+                    once: true
+                });
+            }
         },
         cancel () {
-            unsub?.unsubscribe();
+            onAbort();
         }
     });
 }
-/** @internal */ function observableToAsyncIterable(observable) {
-    const stream = observableToReadableStream(observable);
+/** @internal */ function observableToAsyncIterable(observable, signal) {
+    const stream = observableToReadableStream(observable, signal);
     const reader = stream.getReader();
     const iterator = {
         async next () {

package/dist/observable/observable.mjs

@@ -96,8 +96,13 @@ function pipeReducer(prev, fn) {
 }
 /**
  * @internal
- */ function observableToReadableStream(observable) {
+ */ function observableToReadableStream(observable, signal) {
     let unsub = null;
+    const onAbort = ()=>{
+        unsub?.unsubscribe();
+        unsub = null;
+        signal.removeEventListener('abort', onAbort);
+    };
     return new ReadableStream({
         start (controller) {
             unsub = observable.subscribe({
@@ -118,14 +123,21 @@ function pipeReducer(prev, fn) {
                     controller.close();
                 }
             });
+            if (signal.aborted) {
+                onAbort();
+            } else {
+                signal.addEventListener('abort', onAbort, {
+                    once: true
+                });
+            }
         },
         cancel () {
-            unsub?.unsubscribe();
+            onAbort();
         }
     });
 }
-/** @internal */ function observableToAsyncIterable(observable) {
-    const stream = observableToReadableStream(observable);
+/** @internal */ function observableToAsyncIterable(observable, signal) {
+    const stream = observableToReadableStream(observable, signal);
     const reader = stream.getReader();
     const iterator = {
         async next () {

package/dist/rpc.js

@@ -3,7 +3,7 @@
 var codes = require('./unstable-core-do-not-import/rpc/codes.js');
 var parseTRPCMessage = require('./unstable-core-do-not-import/rpc/parseTRPCMessage.js');
 require('./vendor/unpromise/unpromise.js');
-require('./unstable-core-do-not-import/stream/utils/timerResource.js');
+require('./unstable-core-do-not-import/stream/utils/disposable.js');
 require('./unstable-core-do-not-import/rootConfig.js');
 
 

package/dist/rpc.mjs

@@ -1,5 +1,5 @@
 export { TRPC_ERROR_CODES_BY_KEY, TRPC_ERROR_CODES_BY_NUMBER } from './unstable-core-do-not-import/rpc/codes.mjs';
 export { parseTRPCMessage } from './unstable-core-do-not-import/rpc/parseTRPCMessage.mjs';
 import './vendor/unpromise/unpromise.mjs';
-import './unstable-core-do-not-import/stream/utils/timerResource.mjs';
+import './unstable-core-do-not-import/stream/utils/disposable.mjs';
 import './unstable-core-do-not-import/rootConfig.mjs';

package/dist/shared.js

@@ -3,7 +3,7 @@
 var createProxy = require('./unstable-core-do-not-import/createProxy.js');
 var getErrorShape = require('./unstable-core-do-not-import/error/getErrorShape.js');
 require('./vendor/unpromise/unpromise.js');
-require('./unstable-core-do-not-import/stream/utils/timerResource.js');
+require('./unstable-core-do-not-import/stream/utils/disposable.js');
 require('./unstable-core-do-not-import/rootConfig.js');
 
 

package/dist/shared.mjs

@@ -1,5 +1,5 @@
 export { createFlatProxy } from './unstable-core-do-not-import/createProxy.mjs';
 export { getErrorShape } from './unstable-core-do-not-import/error/getErrorShape.mjs';
 import './vendor/unpromise/unpromise.mjs';
-import './unstable-core-do-not-import/stream/utils/timerResource.mjs';
+import './unstable-core-do-not-import/stream/utils/disposable.mjs';
 import './unstable-core-do-not-import/rootConfig.mjs';

package/dist/unstable-core-do-not-import/error/TRPCError.d.ts

@@ -3,7 +3,7 @@ export declare function getCauseFromUnknown(cause: unknown): Error | undefined;
 export declare function getTRPCErrorFromUnknown(cause: unknown): TRPCError;
 export declare class TRPCError extends Error {
     readonly cause?: Error;
-    readonly code: "INTERNAL_SERVER_ERROR" | "PARSE_ERROR" | "BAD_REQUEST" | "NOT_IMPLEMENTED" | "BAD_GATEWAY" | "SERVICE_UNAVAILABLE" | "GATEWAY_TIMEOUT" | "UNAUTHORIZED" | "FORBIDDEN" | "NOT_FOUND" | "METHOD_NOT_SUPPORTED" | "TIMEOUT" | "CONFLICT" | "PRECONDITION_FAILED" | "PAYLOAD_TOO_LARGE" | "UNSUPPORTED_MEDIA_TYPE" | "UNPROCESSABLE_CONTENT" | "TOO_MANY_REQUESTS" | "CLIENT_CLOSED_REQUEST";
+    readonly code: "PARSE_ERROR" | "BAD_REQUEST" | "INTERNAL_SERVER_ERROR" | "NOT_IMPLEMENTED" | "BAD_GATEWAY" | "SERVICE_UNAVAILABLE" | "GATEWAY_TIMEOUT" | "UNAUTHORIZED" | "FORBIDDEN" | "NOT_FOUND" | "METHOD_NOT_SUPPORTED" | "TIMEOUT" | "CONFLICT" | "PRECONDITION_FAILED" | "PAYLOAD_TOO_LARGE" | "UNSUPPORTED_MEDIA_TYPE" | "UNPROCESSABLE_CONTENT" | "TOO_MANY_REQUESTS" | "CLIENT_CLOSED_REQUEST";
     constructor(opts: {
         message?: string;
         code: TRPC_ERROR_CODE_KEY;

package/dist/unstable-core-do-not-import/error/TRPCError.js

@@ -1,8 +1,20 @@
 'use strict';
 
-var _define_property = require('../../node_modules/.pnpm/@swc_helpers@0.5.13/node_modules/@swc/helpers/esm/_define_property.js');
 var utils = require('../utils.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 UnknownCauseError extends Error {
 }
 function getCauseFromUnknown(cause) {
@@ -55,7 +67,7 @@ class TRPCError extends Error {
             cause
         }), // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore override doesn't work in all environments due to "This member cannot have an 'override' modifier because it is not declared in the base class 'Error'"
-        _define_property._(this, "cause", void 0), _define_property._(this, "code", void 0);
+        _define_property(this, "cause", void 0), _define_property(this, "code", void 0);
         this.code = opts.code;
         this.name = 'TRPCError';
         if (!this.cause) {

package/dist/unstable-core-do-not-import/error/TRPCError.mjs

@@ -1,6 +1,18 @@
-import { _ as _define_property } from '../../node_modules/.pnpm/@swc_helpers@0.5.13/node_modules/@swc/helpers/esm/_define_property.mjs';
 import { isObject } from '../utils.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 UnknownCauseError extends Error {
 }
 function getCauseFromUnknown(cause) {

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;AAanB,OAAO,KAAK,EACV,sBAAsB,EACtB,kCAAkC,EAEnC,MAAM,SAAS,CAAC;AAqCjB,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;AA2ID,wBAAsB,eAAe,CAAC,OAAO,SAAS,SAAS,EAC7D,IAAI,EAAE,yBAAyB,CAAC,OAAO,CAAC,GACvC,OAAO,CAAC,QAAQ,CAAC,CAufnB"}
+{"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;AA+BjB,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;AA2ID,wBAAsB,eAAe,CAAC,OAAO,SAAS,SAAS,EAC7D,IAAI,EAAE,yBAAyB,CAAC,OAAO,CAAC,GACvC,OAAO,CAAC,QAAQ,CAAC,CAqfnB"}

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

@@ -11,15 +11,9 @@ var contentType = require('./contentType.js');
 var getHTTPStatusCode = require('./getHTTPStatusCode.js');
 
 function errorToAsyncIterable(err) {
-    return {
-        [Symbol.asyncIterator]: ()=>{
-            return {
-                next () {
-                    throw err;
-                }
-            };
-        }
-    };
+    return utils.run(async function*() {
+        throw err;
+    });
 }
 const TYPE_ACCEPTED_METHOD_MAP = {
     mutation: [
@@ -254,22 +248,17 @@ async function resolveResponse(opts) {
                         });
                     }
                 }
-                const abortCtrl = new AbortController();
                 const data = await proc({
                     path: call.path,
                     getRawInput: call.getRawInput,
                     ctx: ctxManager.value(),
                     type: proc._def.type,
-                    signal: utils.abortSignalsAnyPonyfill([
-                        opts.req.signal,
-                        abortCtrl.signal
-                    ])
+                    signal: opts.req.signal
                 });
                 return [
                     undefined,
                     {
-                        data,
-                        abortCtrl
+                        data
                     }
                 ];
             } catch (cause) {
@@ -356,7 +345,7 @@ async function resolveResponse(opts) {
                                     code: 'INTERNAL_SERVER_ERROR'
                                 }));
                             }
-                            const dataAsIterable = observable.isObservable(result.data) ? observable.observableToAsyncIterable(result.data) : result.data;
+                            const dataAsIterable = observable.isObservable(result.data) ? observable.observableToAsyncIterable(result.data, opts.req.signal) : result.data;
                             return dataAsIterable;
                         });
                         const stream = sse.sseStreamProducer({
@@ -450,7 +439,7 @@ async function resolveResponse(opts) {
                     /**
            * 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 iterable = observable.isObservable(result.data) ? observable.observableToAsyncIterable(result.data) : Promise.resolve(result.data);
+           */ const iterable = observable.isObservable(result.data) ? observable.observableToAsyncIterable(result.data, opts.req.signal) : Promise.resolve(result.data);
                     return {
                         result: Promise.resolve({
                             data: iterable

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

@@ -4,20 +4,14 @@ import { getTRPCErrorFromUnknown, TRPCError } from '../error/TRPCError.mjs';
 import { jsonlStreamProducer, isPromise } from '../stream/jsonl.mjs';
 import { sseStreamProducer, sseHeaders } from '../stream/sse.mjs';
 import { transformTRPCResponse } from '../transformer.mjs';
-import { run, abortSignalsAnyPonyfill, isAsyncIterable, isObject } from '../utils.mjs';
+import { run, isAsyncIterable, isObject } from '../utils.mjs';
 import { getRequestInfo } from './contentType.mjs';
 import { getHTTPStatusCode } from './getHTTPStatusCode.mjs';
 
 function errorToAsyncIterable(err) {
-    return {
-        [Symbol.asyncIterator]: ()=>{
-            return {
-                next () {
-                    throw err;
-                }
-            };
-        }
-    };
+    return run(async function*() {
+        throw err;
+    });
 }
 const TYPE_ACCEPTED_METHOD_MAP = {
     mutation: [
@@ -252,22 +246,17 @@ async function resolveResponse(opts) {
                         });
                     }
                 }
-                const abortCtrl = new AbortController();
                 const data = await proc({
                     path: call.path,
                     getRawInput: call.getRawInput,
                     ctx: ctxManager.value(),
                     type: proc._def.type,
-                    signal: abortSignalsAnyPonyfill([
-                        opts.req.signal,
-                        abortCtrl.signal
-                    ])
+                    signal: opts.req.signal
                 });
                 return [
                     undefined,
                     {
-                        data,
-                        abortCtrl
+                        data
                     }
                 ];
             } catch (cause) {
@@ -354,7 +343,7 @@ async function resolveResponse(opts) {
                                     code: 'INTERNAL_SERVER_ERROR'
                                 }));
                             }
-                            const dataAsIterable = isObservable(result.data) ? observableToAsyncIterable(result.data) : result.data;
+                            const dataAsIterable = isObservable(result.data) ? observableToAsyncIterable(result.data, opts.req.signal) : result.data;
                             return dataAsIterable;
                         });
                         const stream = sseStreamProducer({
@@ -448,7 +437,7 @@ async function resolveResponse(opts) {
                     /**
            * 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 iterable = isObservable(result.data) ? observableToAsyncIterable(result.data) : Promise.resolve(result.data);
+           */ const iterable = isObservable(result.data) ? observableToAsyncIterable(result.data, opts.req.signal) : Promise.resolve(result.data);
                     return {
                         result: Promise.resolve({
                             data: iterable

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

@@ -18,8 +18,8 @@ declare const PROMISE_STATUS_REJECTED = 1;
 type PROMISE_STATUS_REJECTED = typeof PROMISE_STATUS_REJECTED;
 declare const ASYNC_ITERABLE_STATUS_RETURN = 0;
 type ASYNC_ITERABLE_STATUS_RETURN = typeof ASYNC_ITERABLE_STATUS_RETURN;
-declare const ASYNC_ITERABLE_STATUS_VALUE = 1;
-type ASYNC_ITERABLE_STATUS_VALUE = typeof ASYNC_ITERABLE_STATUS_VALUE;
+declare const ASYNC_ITERABLE_STATUS_YIELD = 1;
+type ASYNC_ITERABLE_STATUS_YIELD = typeof ASYNC_ITERABLE_STATUS_YIELD;
 declare const ASYNC_ITERABLE_STATUS_ERROR = 2;
 type ASYNC_ITERABLE_STATUS_ERROR = typeof ASYNC_ITERABLE_STATUS_ERROR;
 type ChunkDefinitionKey = null | number | string;
@@ -49,7 +49,7 @@ type IterableChunk = [
     value: EncodedValue
 ] | [
     chunkIndex: ChunkIndex,
-    status: ASYNC_ITERABLE_STATUS_VALUE,
+    status: ASYNC_ITERABLE_STATUS_YIELD,
     value: EncodedValue
 ] | [
     chunkIndex: ChunkIndex,
@@ -86,6 +86,10 @@ declare class StreamInterruptedError extends Error {
 export type ConsumerOnError = (opts: {
     error: unknown;
 }) => void;
+/**
+ * Represents a chunk of data or stream interruption error that can be enqueued to a controller
+ */
+type ControllerChunk = ChunkData | StreamInterruptedError;
 /**
  * JSON Lines stream consumer
  * @see https://jsonlines.org/
@@ -102,7 +106,14 @@ export declare function jsonlStreamConsumer<THead>(opts: {
      */
     abortController: AbortController;
 }): Promise<readonly [Awaited<THead>, {
-    readonly controllers: Map<ChunkIndex, ReadableStreamDefaultController<ChunkData | StreamInterruptedError>>;
+    getOrCreate: (chunkId: ChunkIndex) => {
+        enqueue: (v: ControllerChunk) => void;
+        close: () => void;
+        closed: boolean;
+        getReaderResource: () => ReadableStreamDefaultReader<ControllerChunk> & Disposable;
+    };
+    isEmpty: () => boolean;
+    cancelAll: (reason: unknown) => void;
 }]>;
 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":"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"}