@trpc/server 11.0.0-rc.417 → 11.0.0-rc.421

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

@@ -1,20 +1,10 @@
 'use strict';
 
+var TRPCError = require('../error/TRPCError.js');
 var utils = require('../utils.js');
+var createDeferred = require('./utils/createDeferred.js');
+var createReadableStream = require('./utils/createReadableStream.js');
 
-// ---------- utils
-function createReadableStream() {
-    let controller = null;
-    const stream = new ReadableStream({
-        start (c) {
-            controller = c;
-        }
-    });
-    return [
-        stream,
-        controller
-    ];
-}
 // ---------- types
 const CHUNK_VALUE_TYPE_PROMISE = 0;
 const CHUNK_VALUE_TYPE_ASYNC_ITERABLE = 1;
@@ -36,14 +26,14 @@ function createBatchStreamProducer(opts) {
     const { data  } = opts;
     let counter = 0;
     const placeholder = 0;
-    const [stream, controller] = createReadableStream();
+    const stream = createReadableStream.createReadableStream();
     const pending = new Set();
     function maybeClose() {
-        if (pending.size === 0) {
-            controller.close();
+        if (pending.size === 0 && !stream.cancelled()) {
+            stream.controller.close();
         }
     }
-    function hydratePromise(promise, path) {
+    function dehydratePromise(promise, path) {
         //
         const error = checkMaxDepth(path);
         if (error) {
@@ -54,25 +44,28 @@ function createBatchStreamProducer(opts) {
         }
         const idx = counter++;
         pending.add(idx);
-        const enqueue = (value)=>{
-            controller.enqueue(value);
-        };
-        promise.then((it)=>{
-            enqueue([
+        Promise.race([
+            promise,
+            stream.cancelledPromise
+        ]).then((it)=>{
+            if (it === null) {
+                return;
+            }
+            stream.controller.enqueue([
                 idx,
                 PROMISE_STATUS_FULFILLED,
-                hydrate(it, path)
+                dehydrate(it, path)
             ]);
-        }).catch((error)=>{
+        }).catch((cause)=>{
             opts.onError?.({
-                error,
+                error: cause,
                 path
             });
-            enqueue([
+            stream.controller.enqueue([
                 idx,
                 PROMISE_STATUS_REJECTED,
                 opts.formatError?.({
-                    error,
+                    error: cause,
                     path
                 })
             ]);
@@ -82,7 +75,7 @@ function createBatchStreamProducer(opts) {
         });
         return idx;
     }
-    function hydrateAsyncIterable(iterable, path) {
+    function dehydrateAsyncIterable(iterable, path) {
         const error = checkMaxDepth(path);
         if (error) {
             iterable = {
@@ -93,37 +86,58 @@ function createBatchStreamProducer(opts) {
         }
         const idx = counter++;
         pending.add(idx);
-        void (async ()=>{
-            try {
-                for await (const item of iterable){
-                    controller.enqueue([
+        utils.run(async ()=>{
+            const iterator = iterable[Symbol.asyncIterator]();
+            while(true){
+                const next = await Promise.race([
+                    iterator.next().catch(TRPCError.getTRPCErrorFromUnknown),
+                    stream.cancelledPromise
+                ]);
+                if (next instanceof Error) {
+                    opts.onError?.({
+                        error: next,
+                        path
+                    });
+                    stream.controller.enqueue([
                         idx,
-                        ASYNC_ITERABLE_STATUS_VALUE,
-                        hydrate(item, path)
+                        ASYNC_ITERABLE_STATUS_ERROR,
+                        opts.formatError?.({
+                            error: next,
+                            path
+                        })
                     ]);
+                    return;
                 }
-                controller.enqueue([
-                    idx,
-                    ASYNC_ITERABLE_STATUS_DONE
-                ]);
-            } catch (error) {
-                opts.onError?.({
-                    error,
-                    path
-                });
-                controller.enqueue([
+                if (next === 'cancelled') {
+                    await iterator.return?.();
+                    break;
+                }
+                if (next.done) {
+                    stream.controller.enqueue([
+                        idx,
+                        ASYNC_ITERABLE_STATUS_DONE
+                    ]);
+                    break;
+                }
+                stream.controller.enqueue([
                     idx,
-                    ASYNC_ITERABLE_STATUS_ERROR,
-                    opts.formatError?.({
-                        error,
-                        path
-                    })
+                    ASYNC_ITERABLE_STATUS_VALUE,
+                    dehydrate(next.value, path)
                 ]);
-            } finally{
-                pending.delete(idx);
-                maybeClose();
             }
-        })();
+            pending.delete(idx);
+            maybeClose();
+        }).catch((cause)=>{
+            // this shouldn't happen, but node crashes if we don't catch it
+            opts.onError?.({
+                error: new Error('You found a bug - please report it on https://github.com/trpc/trpc', // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore https://github.com/tc39/proposal-error-cause
+                {
+                    cause
+                }),
+                path
+            });
+        });
         return idx;
     }
     function checkMaxDepth(path) {
@@ -132,11 +146,11 @@ function createBatchStreamProducer(opts) {
         }
         return null;
     }
-    function hydrateChunk(value, path) {
+    function dehydrateChunk(value, path) {
         if (isPromise(value)) {
             return [
                 CHUNK_VALUE_TYPE_PROMISE,
-                hydratePromise(value, path)
+                dehydratePromise(value, path)
             ];
         }
         if (utils.isAsyncIterable(value)) {
@@ -145,13 +159,13 @@ function createBatchStreamProducer(opts) {
             }
             return [
                 CHUNK_VALUE_TYPE_ASYNC_ITERABLE,
-                hydrateAsyncIterable(value, path)
+                dehydrateAsyncIterable(value, path)
             ];
         }
         return null;
     }
-    function hydrate(value, path) {
-        const reg = hydrateChunk(value, path);
+    function dehydrate(value, path) {
+        const reg = dehydrateChunk(value, path);
         if (reg) {
             return [
                 [
@@ -173,7 +187,7 @@ function createBatchStreamProducer(opts) {
         const newObj = {};
         const asyncValues = [];
         for (const [key, item] of Object.entries(value)){
-            const transformed = hydrateChunk(item, [
+            const transformed = dehydrateChunk(item, [
                 ...path,
                 key
             ]);
@@ -196,13 +210,13 @@ function createBatchStreamProducer(opts) {
     }
     const newHead = {};
     for (const [key, item] of Object.entries(data)){
-        newHead[key] = hydrate(item, [
+        newHead[key] = dehydrate(item, [
             key
         ]);
     }
     return [
         newHead,
-        stream
+        stream.readable
     ];
 }
 /**
@@ -246,7 +260,7 @@ class AsyncError extends Error {
 const nodeJsStreamToReaderEsque = (source)=>{
     return {
         getReader () {
-            const [stream, controller] = createReadableStream();
+            const { readable , controller  } = createReadableStream.createReadableStream();
             source.on('data', (chunk)=>{
                 controller.enqueue(chunk);
             });
@@ -256,7 +270,7 @@ const nodeJsStreamToReaderEsque = (source)=>{
             source.on('error', (error)=>{
                 controller.error(error);
             });
-            return stream.getReader();
+            return readable.getReader();
         }
     };
 };
@@ -302,19 +316,6 @@ function createConsumerStream(from) {
         }
     }));
 }
-function createDeferred() {
-    let resolve;
-    let reject;
-    const promise = new Promise((res, rej)=>{
-        resolve = res;
-        reject = rej;
-    });
-    return {
-        promise,
-        resolve: resolve,
-        reject: reject
-    };
-}
 /**
  * JSON Lines stream consumer
  * @see https://jsonlines.org/
@@ -328,12 +329,12 @@ function createDeferred() {
             }
         }));
     }
-    let headDeferred = createDeferred();
+    let headDeferred = createDeferred.createDeferred();
     const chunkDeferred = new Map();
     const controllers = new Map();
-    function dehydrateChunkDefinition(value) {
+    function hydrateChunkDefinition(value) {
         const [_path, type, chunkId] = value;
-        const [stream, controller] = createReadableStream();
+        const { readable , controller  } = createReadableStream.createReadableStream();
         controllers.set(chunkId, controller);
         // resolve chunk deferred if it exists
         const deferred = chunkDeferred.get(chunkId);
@@ -346,7 +347,7 @@ function createDeferred() {
                 {
                     return new Promise((resolve, reject)=>{
                         // listen for next value in the stream
-                        const reader = stream.getReader();
+                        const reader = readable.getReader();
                         reader.read().then((it)=>{
                             if (it.done) {
                                 reject(new Error('Promise chunk ended without value'));
@@ -360,7 +361,7 @@ function createDeferred() {
                             const [_chunkId, status, data] = value;
                             switch(status){
                                 case PROMISE_STATUS_FULFILLED:
-                                    resolve(dehydrate(data));
+                                    resolve(hydrate(data));
                                     break;
                                 case PROMISE_STATUS_REJECTED:
                                     reject(opts.formatError?.({
@@ -378,7 +379,7 @@ function createDeferred() {
                 {
                     return {
                         [Symbol.asyncIterator]: async function*() {
-                            const reader = stream.getReader();
+                            const reader = readable.getReader();
                             while(true){
                                 const { done , value  } = await reader.read();
                                 if (done) {
@@ -390,7 +391,7 @@ function createDeferred() {
                                 const [_chunkId, status, data] = value;
                                 switch(status){
                                     case ASYNC_ITERABLE_STATUS_VALUE:
-                                        yield dehydrate(data);
+                                        yield hydrate(data);
                                         break;
                                     case ASYNC_ITERABLE_STATUS_DONE:
                                         controllers.delete(chunkId);
@@ -407,15 +408,15 @@ function createDeferred() {
                 }
         }
     }
-    function dehydrate(value) {
+    function hydrate(value) {
         const [[data], ...asyncProps] = value;
         for (const value1 of asyncProps){
-            const dehydrated = dehydrateChunkDefinition(value1);
+            const hydrated = hydrateChunkDefinition(value1);
             const [path] = value1;
             if (path === null) {
-                return dehydrated;
+                return hydrated;
             }
-            data[path] = dehydrated;
+            data[path] = hydrated;
         }
         return data;
     }
@@ -437,7 +438,7 @@ function createDeferred() {
             if (headDeferred) {
                 const head = chunkOrHead;
                 for (const [key, value] of Object.entries(chunkOrHead)){
-                    const parsed = dehydrate(value);
+                    const parsed = hydrate(value);
                     head[key] = parsed;
                 }
                 headDeferred.resolve(head);
@@ -450,7 +451,7 @@ function createDeferred() {
             if (!controller) {
                 let deferred = chunkDeferred.get(idx);
                 if (!deferred) {
-                    deferred = createDeferred();
+                    deferred = createDeferred.createDeferred();
                     chunkDeferred.set(idx, deferred);
                 }
                 controller = await deferred.promise;

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

@@ -1,18 +1,8 @@
-import { isObject, isFunction, isAsyncIterable } from '../utils.mjs';
+import { getTRPCErrorFromUnknown } from '../error/TRPCError.mjs';
+import { isObject, isFunction, isAsyncIterable, run } from '../utils.mjs';
+import { createDeferred } from './utils/createDeferred.mjs';
+import { createReadableStream } from './utils/createReadableStream.mjs';
 
-// ---------- utils
-function createReadableStream() {
-    let controller = null;
-    const stream = new ReadableStream({
-        start (c) {
-            controller = c;
-        }
-    });
-    return [
-        stream,
-        controller
-    ];
-}
 // ---------- types
 const CHUNK_VALUE_TYPE_PROMISE = 0;
 const CHUNK_VALUE_TYPE_ASYNC_ITERABLE = 1;
@@ -34,14 +24,14 @@ function createBatchStreamProducer(opts) {
     const { data  } = opts;
     let counter = 0;
     const placeholder = 0;
-    const [stream, controller] = createReadableStream();
+    const stream = createReadableStream();
     const pending = new Set();
     function maybeClose() {
-        if (pending.size === 0) {
-            controller.close();
+        if (pending.size === 0 && !stream.cancelled()) {
+            stream.controller.close();
         }
     }
-    function hydratePromise(promise, path) {
+    function dehydratePromise(promise, path) {
         //
         const error = checkMaxDepth(path);
         if (error) {
@@ -52,25 +42,28 @@ function createBatchStreamProducer(opts) {
         }
         const idx = counter++;
         pending.add(idx);
-        const enqueue = (value)=>{
-            controller.enqueue(value);
-        };
-        promise.then((it)=>{
-            enqueue([
+        Promise.race([
+            promise,
+            stream.cancelledPromise
+        ]).then((it)=>{
+            if (it === null) {
+                return;
+            }
+            stream.controller.enqueue([
                 idx,
                 PROMISE_STATUS_FULFILLED,
-                hydrate(it, path)
+                dehydrate(it, path)
             ]);
-        }).catch((error)=>{
+        }).catch((cause)=>{
             opts.onError?.({
-                error,
+                error: cause,
                 path
             });
-            enqueue([
+            stream.controller.enqueue([
                 idx,
                 PROMISE_STATUS_REJECTED,
                 opts.formatError?.({
-                    error,
+                    error: cause,
                     path
                 })
             ]);
@@ -80,7 +73,7 @@ function createBatchStreamProducer(opts) {
         });
         return idx;
     }
-    function hydrateAsyncIterable(iterable, path) {
+    function dehydrateAsyncIterable(iterable, path) {
         const error = checkMaxDepth(path);
         if (error) {
             iterable = {
@@ -91,37 +84,58 @@ function createBatchStreamProducer(opts) {
         }
         const idx = counter++;
         pending.add(idx);
-        void (async ()=>{
-            try {
-                for await (const item of iterable){
-                    controller.enqueue([
+        run(async ()=>{
+            const iterator = iterable[Symbol.asyncIterator]();
+            while(true){
+                const next = await Promise.race([
+                    iterator.next().catch(getTRPCErrorFromUnknown),
+                    stream.cancelledPromise
+                ]);
+                if (next instanceof Error) {
+                    opts.onError?.({
+                        error: next,
+                        path
+                    });
+                    stream.controller.enqueue([
                         idx,
-                        ASYNC_ITERABLE_STATUS_VALUE,
-                        hydrate(item, path)
+                        ASYNC_ITERABLE_STATUS_ERROR,
+                        opts.formatError?.({
+                            error: next,
+                            path
+                        })
                     ]);
+                    return;
                 }
-                controller.enqueue([
-                    idx,
-                    ASYNC_ITERABLE_STATUS_DONE
-                ]);
-            } catch (error) {
-                opts.onError?.({
-                    error,
-                    path
-                });
-                controller.enqueue([
+                if (next === 'cancelled') {
+                    await iterator.return?.();
+                    break;
+                }
+                if (next.done) {
+                    stream.controller.enqueue([
+                        idx,
+                        ASYNC_ITERABLE_STATUS_DONE
+                    ]);
+                    break;
+                }
+                stream.controller.enqueue([
                     idx,
-                    ASYNC_ITERABLE_STATUS_ERROR,
-                    opts.formatError?.({
-                        error,
-                        path
-                    })
+                    ASYNC_ITERABLE_STATUS_VALUE,
+                    dehydrate(next.value, path)
                 ]);
-            } finally{
-                pending.delete(idx);
-                maybeClose();
             }
-        })();
+            pending.delete(idx);
+            maybeClose();
+        }).catch((cause)=>{
+            // this shouldn't happen, but node crashes if we don't catch it
+            opts.onError?.({
+                error: new Error('You found a bug - please report it on https://github.com/trpc/trpc', // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore https://github.com/tc39/proposal-error-cause
+                {
+                    cause
+                }),
+                path
+            });
+        });
         return idx;
     }
     function checkMaxDepth(path) {
@@ -130,11 +144,11 @@ function createBatchStreamProducer(opts) {
         }
         return null;
     }
-    function hydrateChunk(value, path) {
+    function dehydrateChunk(value, path) {
         if (isPromise(value)) {
             return [
                 CHUNK_VALUE_TYPE_PROMISE,
-                hydratePromise(value, path)
+                dehydratePromise(value, path)
             ];
         }
         if (isAsyncIterable(value)) {
@@ -143,13 +157,13 @@ function createBatchStreamProducer(opts) {
             }
             return [
                 CHUNK_VALUE_TYPE_ASYNC_ITERABLE,
-                hydrateAsyncIterable(value, path)
+                dehydrateAsyncIterable(value, path)
             ];
         }
         return null;
     }
-    function hydrate(value, path) {
-        const reg = hydrateChunk(value, path);
+    function dehydrate(value, path) {
+        const reg = dehydrateChunk(value, path);
         if (reg) {
             return [
                 [
@@ -171,7 +185,7 @@ function createBatchStreamProducer(opts) {
         const newObj = {};
         const asyncValues = [];
         for (const [key, item] of Object.entries(value)){
-            const transformed = hydrateChunk(item, [
+            const transformed = dehydrateChunk(item, [
                 ...path,
                 key
             ]);
@@ -194,13 +208,13 @@ function createBatchStreamProducer(opts) {
     }
     const newHead = {};
     for (const [key, item] of Object.entries(data)){
-        newHead[key] = hydrate(item, [
+        newHead[key] = dehydrate(item, [
             key
         ]);
     }
     return [
         newHead,
-        stream
+        stream.readable
     ];
 }
 /**
@@ -244,7 +258,7 @@ class AsyncError extends Error {
 const nodeJsStreamToReaderEsque = (source)=>{
     return {
         getReader () {
-            const [stream, controller] = createReadableStream();
+            const { readable , controller  } = createReadableStream();
             source.on('data', (chunk)=>{
                 controller.enqueue(chunk);
             });
@@ -254,7 +268,7 @@ const nodeJsStreamToReaderEsque = (source)=>{
             source.on('error', (error)=>{
                 controller.error(error);
             });
-            return stream.getReader();
+            return readable.getReader();
         }
     };
 };
@@ -300,19 +314,6 @@ function createConsumerStream(from) {
         }
     }));
 }
-function createDeferred() {
-    let resolve;
-    let reject;
-    const promise = new Promise((res, rej)=>{
-        resolve = res;
-        reject = rej;
-    });
-    return {
-        promise,
-        resolve: resolve,
-        reject: reject
-    };
-}
 /**
  * JSON Lines stream consumer
  * @see https://jsonlines.org/
@@ -329,9 +330,9 @@ function createDeferred() {
     let headDeferred = createDeferred();
     const chunkDeferred = new Map();
     const controllers = new Map();
-    function dehydrateChunkDefinition(value) {
+    function hydrateChunkDefinition(value) {
         const [_path, type, chunkId] = value;
-        const [stream, controller] = createReadableStream();
+        const { readable , controller  } = createReadableStream();
         controllers.set(chunkId, controller);
         // resolve chunk deferred if it exists
         const deferred = chunkDeferred.get(chunkId);
@@ -344,7 +345,7 @@ function createDeferred() {
                 {
                     return new Promise((resolve, reject)=>{
                         // listen for next value in the stream
-                        const reader = stream.getReader();
+                        const reader = readable.getReader();
                         reader.read().then((it)=>{
                             if (it.done) {
                                 reject(new Error('Promise chunk ended without value'));
@@ -358,7 +359,7 @@ function createDeferred() {
                             const [_chunkId, status, data] = value;
                             switch(status){
                                 case PROMISE_STATUS_FULFILLED:
-                                    resolve(dehydrate(data));
+                                    resolve(hydrate(data));
                                     break;
                                 case PROMISE_STATUS_REJECTED:
                                     reject(opts.formatError?.({
@@ -376,7 +377,7 @@ function createDeferred() {
                 {
                     return {
                         [Symbol.asyncIterator]: async function*() {
-                            const reader = stream.getReader();
+                            const reader = readable.getReader();
                             while(true){
                                 const { done , value  } = await reader.read();
                                 if (done) {
@@ -388,7 +389,7 @@ function createDeferred() {
                                 const [_chunkId, status, data] = value;
                                 switch(status){
                                     case ASYNC_ITERABLE_STATUS_VALUE:
-                                        yield dehydrate(data);
+                                        yield hydrate(data);
                                         break;
                                     case ASYNC_ITERABLE_STATUS_DONE:
                                         controllers.delete(chunkId);
@@ -405,15 +406,15 @@ function createDeferred() {
                 }
         }
     }
-    function dehydrate(value) {
+    function hydrate(value) {
         const [[data], ...asyncProps] = value;
         for (const value1 of asyncProps){
-            const dehydrated = dehydrateChunkDefinition(value1);
+            const hydrated = hydrateChunkDefinition(value1);
             const [path] = value1;
             if (path === null) {
-                return dehydrated;
+                return hydrated;
             }
-            data[path] = dehydrated;
+            data[path] = hydrated;
         }
         return data;
     }
@@ -435,7 +436,7 @@ function createDeferred() {
             if (headDeferred) {
                 const head = chunkOrHead;
                 for (const [key, value] of Object.entries(chunkOrHead)){
-                    const parsed = dehydrate(value);
+                    const parsed = hydrate(value);
                     head[key] = parsed;
                 }
                 headDeferred.resolve(head);