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

package/dist/index.js

@@ -3,11 +3,12 @@
 var createProxy = require('./unstable-core-do-not-import/createProxy.js');
 var TRPCError = require('./unstable-core-do-not-import/error/TRPCError.js');
 var getErrorShape = require('./unstable-core-do-not-import/error/getErrorShape.js');
-var router = require('./unstable-core-do-not-import/router.js');
+var sse = require('./unstable-core-do-not-import/stream/sse.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');
 require('./unstable-core-do-not-import/rootConfig.js');
+var router = require('./unstable-core-do-not-import/router.js');
 
 
 
@@ -15,9 +16,10 @@ exports.createTRPCFlatProxy = createProxy.createFlatProxy;
 exports.TRPCError = TRPCError.TRPCError;
 exports.getTRPCErrorFromUnknown = TRPCError.getTRPCErrorFromUnknown;
 exports.getErrorShape = getErrorShape.getErrorShape;
-exports.callProcedure = router.callProcedure;
-exports.callTRPCProcedure = router.callProcedure;
+exports.sse = sse.sse;
 exports.transformTRPCResponse = transformer.transformTRPCResponse;
 exports.initTRPC = initTRPC.initTRPC;
 exports.experimental_standaloneMiddleware = middleware.experimental_standaloneMiddleware;
 exports.experimental_trpcMiddleware = middleware.experimental_standaloneMiddleware;
+exports.callProcedure = router.callProcedure;
+exports.callTRPCProcedure = router.callProcedure;

package/dist/index.mjs

@@ -1,8 +1,9 @@
 export { createFlatProxy as createTRPCFlatProxy } from './unstable-core-do-not-import/createProxy.mjs';
 export { TRPCError, getTRPCErrorFromUnknown } from './unstable-core-do-not-import/error/TRPCError.mjs';
 export { getErrorShape } from './unstable-core-do-not-import/error/getErrorShape.mjs';
-export { callProcedure, callProcedure as callTRPCProcedure } from './unstable-core-do-not-import/router.mjs';
+export { sse } from './unstable-core-do-not-import/stream/sse.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';
 import './unstable-core-do-not-import/rootConfig.mjs';
+export { callProcedure, callProcedure as callTRPCProcedure } from './unstable-core-do-not-import/router.mjs';

package/dist/observable/observable.d.ts

@@ -10,4 +10,5 @@ export declare function observableToPromise<TValue>(observable: Observable<TValu
     promise: Promise<TValue>;
     abort: () => void;
 };
+export declare function observableToAsyncIterable<TValue>(observable: Observable<TValue, unknown>): 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":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,QAAQ,EAER,aAAa,EAEd,MAAM,SAAS,CAAC;AAEjB,cAAc;AACd,MAAM,MAAM,oBAAoB,CAAC,WAAW,IAAI,WAAW,SAAS,UAAU,CAC5E,MAAM,MAAM,EACZ,OAAO,CACR,GACG,MAAM,GACN,KAAK,CAAC;AAEV,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;AAcD,gBAAgB;AAChB,wBAAgB,mBAAmB,CAAC,MAAM,EACxC,UAAU,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC;;iBAEtB,IAAI;EAkCtB"}
+{"version":3,"file":"observable.d.ts","sourceRoot":"","sources":["../../src/observable/observable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,QAAQ,EAER,aAAa,EAGd,MAAM,SAAS,CAAC;AAEjB,cAAc;AACd,MAAM,MAAM,oBAAoB,CAAC,WAAW,IAAI,WAAW,SAAS,UAAU,CAC5E,MAAM,MAAM,EACZ,OAAO,CACR,GACG,MAAM,GACN,KAAK,CAAC;AAEV,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;AAcD,gBAAgB;AAChB,wBAAgB,mBAAmB,CAAC,MAAM,EACxC,UAAU,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC;;iBAEtB,IAAI;EAkCtB;AA6BD,wBAAgB,yBAAyB,CAAC,MAAM,EAC9C,UAAU,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,GACtC,aAAa,CAAC,MAAM,CAAC,CA+BvB"}

package/dist/observable/observable.js

@@ -108,7 +108,62 @@ class ObservableAbortError extends Error {
         abort: abort
     };
 }
+/**
+ * @internal
+ */ function observableToReadableStream(observable) {
+    let unsub = null;
+    return new ReadableStream({
+        start (controller) {
+            unsub = observable.subscribe({
+                next (data) {
+                    controller.enqueue(data);
+                },
+                error (err) {
+                    controller.error(err);
+                },
+                complete () {
+                    controller.close();
+                }
+            });
+        },
+        cancel () {
+            unsub?.unsubscribe();
+        }
+    });
+}
+function observableToAsyncIterable(observable) {
+    const stream = observableToReadableStream(observable);
+    const reader = stream.getReader();
+    const iterator = {
+        async next () {
+            const value = await reader.read();
+            if (value.done) {
+                return {
+                    value: undefined,
+                    done: true
+                };
+            }
+            return {
+                value: value.value,
+                done: false
+            };
+        },
+        async return () {
+            await reader.cancel();
+            return {
+                value: undefined,
+                done: true
+            };
+        }
+    };
+    return {
+        [Symbol.asyncIterator] () {
+            return iterator;
+        }
+    };
+}
 
 exports.isObservable = isObservable;
 exports.observable = observable;
+exports.observableToAsyncIterable = observableToAsyncIterable;
 exports.observableToPromise = observableToPromise;

package/dist/observable/observable.mjs

@@ -106,5 +106,59 @@ class ObservableAbortError extends Error {
         abort: abort
     };
 }
+/**
+ * @internal
+ */ function observableToReadableStream(observable) {
+    let unsub = null;
+    return new ReadableStream({
+        start (controller) {
+            unsub = observable.subscribe({
+                next (data) {
+                    controller.enqueue(data);
+                },
+                error (err) {
+                    controller.error(err);
+                },
+                complete () {
+                    controller.close();
+                }
+            });
+        },
+        cancel () {
+            unsub?.unsubscribe();
+        }
+    });
+}
+function observableToAsyncIterable(observable) {
+    const stream = observableToReadableStream(observable);
+    const reader = stream.getReader();
+    const iterator = {
+        async next () {
+            const value = await reader.read();
+            if (value.done) {
+                return {
+                    value: undefined,
+                    done: true
+                };
+            }
+            return {
+                value: value.value,
+                done: false
+            };
+        },
+        async return () {
+            await reader.cancel();
+            return {
+                value: undefined,
+                done: true
+            };
+        }
+    };
+    return {
+        [Symbol.asyncIterator] () {
+            return iterator;
+        }
+    };
+}
 
-export { isObservable, observable, observableToPromise };
+export { isObservable, observable, observableToAsyncIterable, observableToPromise };

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

@@ -1 +1 @@
-{"version":3,"file":"createProxy.d.ts","sourceRoot":"","sources":["../../src/unstable-core-do-not-import/createProxy.ts"],"names":[],"mappings":"AAAA,UAAU,oBAAoB;IAC5B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,OAAO,EAAE,CAAC;CACjB;AACD,KAAK,aAAa,GAAG,CAAC,IAAI,EAAE,oBAAoB,KAAK,OAAO,CAAC;AA6C7D;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,8BACrB,aAAa,KACtB,KAAqE,CAAC;AAEzE;;;;GAIG;AACH,eAAO,MAAM,eAAe,2BACT,MAAM,GAAG,MAAM,KAAK,KAAK,GAAG,KAC5C,KAWF,CAAC"}
+{"version":3,"file":"createProxy.d.ts","sourceRoot":"","sources":["../../src/unstable-core-do-not-import/createProxy.ts"],"names":[],"mappings":"AAAA,UAAU,oBAAoB;IAC5B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,OAAO,EAAE,CAAC;CACjB;AACD,KAAK,aAAa,GAAG,CAAC,IAAI,EAAE,oBAAoB,KAAK,OAAO,CAAC;AA6C7D;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAAI,KAAK,sBAC9B,aAAa,KACtB,KAAqE,CAAC;AAEzE;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,KAAK,YACzB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,KAAK,KAAK,GAAG,KAC5C,KAWF,CAAC"}

package/dist/unstable-core-do-not-import/http/contentType.d.ts

@@ -1,9 +1,12 @@
-import type { RootConfig } from '../rootConfig';
+import type { AnyRouter } from '../router';
 import type { TRPCRequestInfo } from './types';
-export declare function getRequestInfo(opts: {
+type GetRequestInfoOptions = {
     path: string;
     req: Request;
     searchParams: URLSearchParams;
-    config: RootConfig<any>;
-}): TRPCRequestInfo;
+    headers: Headers;
+    router: AnyRouter;
+};
+export declare function getRequestInfo(opts: GetRequestInfoOptions): TRPCRequestInfo;
+export {};
 //# sourceMappingURL=contentType.d.ts.map

package/dist/unstable-core-do-not-import/http/contentType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contentType.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/http/contentType.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AA4M/C,wBAAgB,cAAc,CAAC,IAAI,EAAE;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,OAAO,CAAC;IACb,YAAY,EAAE,eAAe,CAAC;IAC9B,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;CACzB,GAAG,eAAe,CAGlB"}
+{"version":3,"file":"contentType.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/http/contentType.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,KAAK,EAEV,eAAe,EAEhB,MAAM,SAAS,CAAC;AAEjB,KAAK,qBAAqB,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,OAAO,CAAC;IACb,YAAY,EAAE,eAAe,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC;AA6PF,wBAAgB,cAAc,CAAC,IAAI,EAAE,qBAAqB,GAAG,eAAe,CAG3E"}

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

@@ -65,7 +65,7 @@ const jsonContentTypeHandler = {
             }
             if (!isBatchCall) {
                 return {
-                    0: opts.config.transformer.input.deserialize(inputs)
+                    0: opts.router._def._config.transformer.input.deserialize(inputs)
                 };
             }
             if (!utils.isObject(inputs)) {
@@ -78,24 +78,56 @@ const jsonContentTypeHandler = {
             for (const index of paths.keys()){
                 const input = inputs[index];
                 if (input !== undefined) {
-                    acc[index] = opts.config.transformer.input.deserialize(input);
+                    acc[index] = opts.router._def._config.transformer.input.deserialize(input);
                 }
             }
             return acc;
         });
-        return {
-            isBatchCall,
-            calls: paths.map((path, index)=>({
-                    path,
-                    getRawInput: async ()=>{
-                        const inputs = await getInputs.read();
-                        return inputs[index];
-                    },
-                    result: ()=>{
-                        return getInputs.result()?.[index];
+        const calls = paths.map((path, index)=>{
+            const procedure = opts.router._def.procedures[path] ?? null;
+            return {
+                path,
+                procedure,
+                getRawInput: async ()=>{
+                    const inputs = await getInputs.read();
+                    let input = inputs[index];
+                    if (procedure?._def.type === 'subscription') {
+                        const lastEventId = opts.headers.get('last-event-id') ?? opts.searchParams.get('lastEventId') ?? opts.searchParams.get('Last-Event-Id');
+                        if (lastEventId) {
+                            if (utils.isObject(input)) {
+                                input = {
+                                    ...input,
+                                    lastEventId: lastEventId
+                                };
+                            } else {
+                                input ?? (input = {
+                                    lastEventId: lastEventId
+                                });
+                            }
+                        }
                     }
-                }))
+                    return input;
+                },
+                result: ()=>{
+                    return getInputs.result()?.[index];
+                }
+            };
+        });
+        const types = new Set(calls.map((call)=>call.procedure?._def.type).filter(Boolean));
+        /* istanbul ignore if -- @preserve */ if (types.size > 1) {
+            throw new TRPCError.TRPCError({
+                code: 'BAD_REQUEST',
+                message: `Cannot mix procedure types in call: ${Array.from(types).join(', ')}`
+            });
+        }
+        const type = types.values().next().value ?? 'unknown';
+        const info = {
+            isBatchCall,
+            accept: req.headers.get('trpc-accept'),
+            calls,
+            type
         };
+        return info;
     }
 };
 const formDataContentTypeHandler = {
@@ -115,14 +147,17 @@ const formDataContentTypeHandler = {
             return fd;
         });
         return {
+            accept: null,
             calls: [
                 {
                     path: opts.path,
                     getRawInput: getInputs.read,
-                    result: getInputs.result
+                    result: getInputs.result,
+                    procedure: opts.router._def.procedures[opts.path] ?? null
                 }
             ],
-            isBatchCall: false
+            isBatchCall: false,
+            type: 'mutation'
         };
     }
 };
@@ -146,10 +181,13 @@ const octetStreamContentTypeHandler = {
                 {
                     path: opts.path,
                     getRawInput: getInputs.read,
-                    result: getInputs.result
+                    result: getInputs.result,
+                    procedure: opts.router._def.procedures[opts.path] ?? null
                 }
             ],
-            isBatchCall: false
+            isBatchCall: false,
+            accept: null,
+            type: 'mutation'
         };
     }
 };

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

@@ -1,5 +1,5 @@
 import { TRPCError } from '../error/TRPCError.mjs';
-import { unsetMarker, isObject } from '../utils.mjs';
+import { isObject, unsetMarker } from '../utils.mjs';
 
 /**
  * Memoize a function that takes no arguments
@@ -63,7 +63,7 @@ const jsonContentTypeHandler = {
             }
             if (!isBatchCall) {
                 return {
-                    0: opts.config.transformer.input.deserialize(inputs)
+                    0: opts.router._def._config.transformer.input.deserialize(inputs)
                 };
             }
             if (!isObject(inputs)) {
@@ -76,24 +76,56 @@ const jsonContentTypeHandler = {
             for (const index of paths.keys()){
                 const input = inputs[index];
                 if (input !== undefined) {
-                    acc[index] = opts.config.transformer.input.deserialize(input);
+                    acc[index] = opts.router._def._config.transformer.input.deserialize(input);
                 }
             }
             return acc;
         });
-        return {
-            isBatchCall,
-            calls: paths.map((path, index)=>({
-                    path,
-                    getRawInput: async ()=>{
-                        const inputs = await getInputs.read();
-                        return inputs[index];
-                    },
-                    result: ()=>{
-                        return getInputs.result()?.[index];
+        const calls = paths.map((path, index)=>{
+            const procedure = opts.router._def.procedures[path] ?? null;
+            return {
+                path,
+                procedure,
+                getRawInput: async ()=>{
+                    const inputs = await getInputs.read();
+                    let input = inputs[index];
+                    if (procedure?._def.type === 'subscription') {
+                        const lastEventId = opts.headers.get('last-event-id') ?? opts.searchParams.get('lastEventId') ?? opts.searchParams.get('Last-Event-Id');
+                        if (lastEventId) {
+                            if (isObject(input)) {
+                                input = {
+                                    ...input,
+                                    lastEventId: lastEventId
+                                };
+                            } else {
+                                input ?? (input = {
+                                    lastEventId: lastEventId
+                                });
+                            }
+                        }
                     }
-                }))
+                    return input;
+                },
+                result: ()=>{
+                    return getInputs.result()?.[index];
+                }
+            };
+        });
+        const types = new Set(calls.map((call)=>call.procedure?._def.type).filter(Boolean));
+        /* istanbul ignore if -- @preserve */ if (types.size > 1) {
+            throw new TRPCError({
+                code: 'BAD_REQUEST',
+                message: `Cannot mix procedure types in call: ${Array.from(types).join(', ')}`
+            });
+        }
+        const type = types.values().next().value ?? 'unknown';
+        const info = {
+            isBatchCall,
+            accept: req.headers.get('trpc-accept'),
+            calls,
+            type
         };
+        return info;
     }
 };
 const formDataContentTypeHandler = {
@@ -113,14 +145,17 @@ const formDataContentTypeHandler = {
             return fd;
         });
         return {
+            accept: null,
             calls: [
                 {
                     path: opts.path,
                     getRawInput: getInputs.read,
-                    result: getInputs.result
+                    result: getInputs.result,
+                    procedure: opts.router._def.procedures[opts.path] ?? null
                 }
             ],
-            isBatchCall: false
+            isBatchCall: false,
+            type: 'mutation'
         };
     }
 };
@@ -144,10 +179,13 @@ const octetStreamContentTypeHandler = {
                 {
                     path: opts.path,
                     getRawInput: getInputs.read,
-                    result: getInputs.result
+                    result: getInputs.result,
+                    procedure: opts.router._def.procedures[opts.path] ?? null
                 }
             ],
-            isBatchCall: false
+            isBatchCall: false,
+            accept: null,
+            type: 'mutation'
         };
     }
 };

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":"AAEA,OAAO,EAA2B,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAExE,OAAO,EAEL,KAAK,SAAS,EAGf,MAAM,WAAW,CAAC;AAOnB,OAAO,KAAK,EACV,sBAAsB,EACtB,kCAAkC,EAEnC,MAAM,SAAS,CAAC;AAUjB,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;AAsHD,wBAAsB,eAAe,CAAC,OAAO,SAAS,SAAS,EAC7D,IAAI,EAAE,yBAAyB,CAAC,OAAO,CAAC,GACvC,OAAO,CAAC,QAAQ,CAAC,CA8QnB"}
+{"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;AA0BjB,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;AAyID,wBAAsB,eAAe,CAAC,OAAO,SAAS,SAAS,EAC7D,IAAI,EAAE,yBAAyB,CAAC,OAAO,CAAC,GACvC,OAAO,CAAC,QAAQ,CAAC,CA8YnB"}