@trpc/server 11.0.0-rc.359 → 11.0.0-rc.362

package/dist/adapters/node-http/incomingMessageToRequest.js

@@ -0,0 +1,71 @@
+'use strict';
+
+var TRPCError = require('../../unstable-core-do-not-import/error/TRPCError.js');
+require('../../unstable-core-do-not-import/rootConfig.js');
+
+/**
+ * Convert an incoming message to a body stream with a max size
+ */ function incomingMessageToBodyStream(req, opts) {
+    let size = 0;
+    const maxBodySize = opts.maxBodySize;
+    let controller = null;
+    const stream = new ReadableStream({
+        start (c) {
+            controller = c;
+        },
+        async pull (c) {
+            const chunk = req.read();
+            if (chunk) {
+                size += chunk.length;
+            }
+            if (maxBodySize !== null && size > maxBodySize) {
+                controller.error(new TRPCError.TRPCError({
+                    code: 'PAYLOAD_TOO_LARGE'
+                }));
+                return;
+            }
+            if (chunk === null) {
+                c.close();
+                return;
+            }
+            controller.enqueue(chunk);
+        },
+        cancel () {
+            req.destroy();
+        }
+    });
+    return stream;
+}
+const bodyMethods = [
+    'POST',
+    'PUT',
+    'PATCH'
+];
+/**
+ * Convert an [`IncomingMessage`](https://nodejs.org/api/http.html#class-httpincomingmessage) to a [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request)
+ */ function incomingMessageToRequest(req, opts) {
+    const ac = new AbortController();
+    const headers = new Headers(req.headers);
+    const url = `http://${headers.get('host')}${req.url}`;
+    req.once('aborted', ()=>ac.abort());
+    const init = {
+        headers,
+        method: req.method,
+        signal: ac.signal,
+        // @ts-expect-error this is fine
+        duplex: 'half'
+    };
+    if (req.method && bodyMethods.includes(req.method)) {
+        if (!('body' in req)) {
+            init.body = incomingMessageToBodyStream(req, opts);
+        } else if (typeof req.body === 'string') {
+            init.body = req.body;
+        } else if (req.body !== undefined) {
+            init.body = JSON.stringify(req.body);
+        }
+    }
+    const request = new Request(url, init);
+    return request;
+}
+
+exports.incomingMessageToRequest = incomingMessageToRequest;

package/dist/adapters/node-http/incomingMessageToRequest.mjs

@@ -0,0 +1,69 @@
+import { TRPCError } from '../../unstable-core-do-not-import/error/TRPCError.mjs';
+import '../../unstable-core-do-not-import/rootConfig.mjs';
+
+/**
+ * Convert an incoming message to a body stream with a max size
+ */ function incomingMessageToBodyStream(req, opts) {
+    let size = 0;
+    const maxBodySize = opts.maxBodySize;
+    let controller = null;
+    const stream = new ReadableStream({
+        start (c) {
+            controller = c;
+        },
+        async pull (c) {
+            const chunk = req.read();
+            if (chunk) {
+                size += chunk.length;
+            }
+            if (maxBodySize !== null && size > maxBodySize) {
+                controller.error(new TRPCError({
+                    code: 'PAYLOAD_TOO_LARGE'
+                }));
+                return;
+            }
+            if (chunk === null) {
+                c.close();
+                return;
+            }
+            controller.enqueue(chunk);
+        },
+        cancel () {
+            req.destroy();
+        }
+    });
+    return stream;
+}
+const bodyMethods = [
+    'POST',
+    'PUT',
+    'PATCH'
+];
+/**
+ * Convert an [`IncomingMessage`](https://nodejs.org/api/http.html#class-httpincomingmessage) to a [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request)
+ */ function incomingMessageToRequest(req, opts) {
+    const ac = new AbortController();
+    const headers = new Headers(req.headers);
+    const url = `http://${headers.get('host')}${req.url}`;
+    req.once('aborted', ()=>ac.abort());
+    const init = {
+        headers,
+        method: req.method,
+        signal: ac.signal,
+        // @ts-expect-error this is fine
+        duplex: 'half'
+    };
+    if (req.method && bodyMethods.includes(req.method)) {
+        if (!('body' in req)) {
+            init.body = incomingMessageToBodyStream(req, opts);
+        } else if (typeof req.body === 'string') {
+            init.body = req.body;
+        } else if (req.body !== undefined) {
+            init.body = JSON.stringify(req.body);
+        }
+    }
+    const request = new Request(url, init);
+    return request;
+}
+
+export { incomingMessageToRequest };

package/dist/adapters/node-http/index.d.ts

@@ -1,3 +1,4 @@
 export * from './nodeHTTPRequestHandler';
 export * from './types';
+export * from './incomingMessageToRequest';
 //# sourceMappingURL=index.d.ts.map

package/dist/adapters/node-http/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,SAAS,CAAC;AACxB,cAAc,4BAA4B,CAAC"}

package/dist/adapters/node-http/index.js

@@ -1,7 +1,9 @@
 'use strict';
 
 var nodeHTTPRequestHandler = require('./nodeHTTPRequestHandler.js');
+var incomingMessageToRequest = require('./incomingMessageToRequest.js');
 
 
 
 exports.nodeHTTPRequestHandler = nodeHTTPRequestHandler.nodeHTTPRequestHandler;
+exports.incomingMessageToRequest = incomingMessageToRequest.incomingMessageToRequest;

package/dist/adapters/node-http/index.mjs

@@ -1 +1,2 @@
 export { nodeHTTPRequestHandler } from './nodeHTTPRequestHandler.mjs';
+export { incomingMessageToRequest } from './incomingMessageToRequest.mjs';

package/dist/adapters/node-http/nodeHTTPRequestHandler.d.ts

@@ -7,7 +7,7 @@
  * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
  * ```
  */
-import type { AnyRouter } from '../../@trpc/server';
+import { type AnyRouter } from '../../@trpc/server';
 import type { NodeHTTPRequest, NodeHTTPRequestHandlerOptions, NodeHTTPResponse } from './types';
 export declare function nodeHTTPRequestHandler<TRouter extends AnyRouter, TRequest extends NodeHTTPRequest, TResponse extends NodeHTTPResponse>(opts: NodeHTTPRequestHandlerOptions<TRouter, TRequest, TResponse>): Promise<void>;
 //# sourceMappingURL=nodeHTTPRequestHandler.d.ts.map

package/dist/adapters/node-http/nodeHTTPRequestHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nodeHTTPRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/nodeHTTPRequestHandler.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAapD,OAAO,KAAK,EACV,eAAe,EACf,6BAA6B,EAC7B,gBAAgB,EACjB,MAAM,SAAS,CAAC;AAIjB,wBAAsB,sBAAsB,CAC1C,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,EAClC,IAAI,EAAE,6BAA6B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,iBA2HlE"}
+{"version":3,"file":"nodeHTTPRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/nodeHTTPRequestHandler.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,EAA2B,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAI7E,OAAO,KAAK,EACV,eAAe,EACf,6BAA6B,EAC7B,gBAAgB,EACjB,MAAM,SAAS,CAAC;AAUjB,wBAAsB,sBAAsB,CAC1C,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,EAClC,IAAI,EAAE,6BAA6B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,iBA8ClE"}

package/dist/adapters/node-http/nodeHTTPRequestHandler.js

@@ -1,9 +1,9 @@
 'use strict';
 
+var TRPCError = require('../../unstable-core-do-not-import/error/TRPCError.js');
 var resolveHTTPResponse = require('../../unstable-core-do-not-import/http/resolveHTTPResponse.js');
-var batchStreamFormatter = require('../../unstable-core-do-not-import/http/batchStreamFormatter.js');
 require('../../unstable-core-do-not-import/rootConfig.js');
-var index = require('./content-type/json/index.js');
+var incomingMessageToRequest = require('./incomingMessageToRequest.js');
 
 /**
  * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
@@ -13,13 +13,18 @@ var index = require('./content-type/json/index.js');
  * import type { AnyTRPCRouter } from '@trpc/server'
  * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
  * ```
- */ /* eslint-disable @typescript-eslint/no-non-null-assertion */ // @trpc/server
-const defaultJSONContentTypeHandler = index.nodeHTTPJSONContentTypeHandler();
+ */ // @trpc/server
+function assertAsyncIterable(value) {
+    if (!(Symbol.asyncIterator in value)) {
+        throw new Error('Expected AsyncIterable - are you using Node >= 18.0.0?');
+    }
+}
 async function nodeHTTPRequestHandler(opts) {
     const handleViaMiddleware = opts.middleware ?? ((_req, _res, next)=>next());
     return handleViaMiddleware(opts.req, opts.res, async (err)=>{
-        if (err) throw err;
-        //
+        const req = incomingMessageToRequest.incomingMessageToRequest(opts.req, {
+            maxBodySize: opts.maxBodySize ?? null
+        });
         // Build tRPC dependencies
         const createContext = async (innerOpts)=>{
             return await opts.createContext?.({
@@ -27,82 +32,32 @@ async function nodeHTTPRequestHandler(opts) {
                 ...innerOpts
             });
         };
-        const query = opts.req.query ? new URLSearchParams(opts.req.query) : new URLSearchParams(opts.req.url.split('?')[1]);
-        const jsonContentTypeHandler = defaultJSONContentTypeHandler;
-        const contentTypeHandlers = opts.experimental_contentTypeHandlers ?? [
-            jsonContentTypeHandler
-        ];
-        const contentTypeHandler = contentTypeHandlers.find((handler)=>handler.isMatch({
-                // FIXME: no typecasting should be needed here
-                ...opts,
-                query
-            })) ?? // fallback to json
-        jsonContentTypeHandler;
-        const bodyResult = await contentTypeHandler.getBody({
-            // FIXME: no typecasting should be needed here
-            ...opts,
-            query
-        });
-        const req = {
-            method: opts.req.method,
-            headers: opts.req.headers,
-            query,
-            body: bodyResult.ok ? bodyResult.data : undefined
-        };
-        let isStream = false;
-        let formatter;
-        const unstable_onHead = (head, isStreaming)=>{
-            if ('status' in head && (!opts.res.statusCode || opts.res.statusCode === 200)) {
-                opts.res.statusCode = head.status;
-            }
-            for (const [key, value] of Object.entries(head.headers ?? {})){
-                /* istanbul ignore if -- @preserve */ if (typeof value === 'undefined') {
-                    continue;
-                }
-                opts.res.setHeader(key, value);
-            }
-            if (isStreaming) {
-                opts.res.setHeader('Transfer-Encoding', 'chunked');
-                const vary = opts.res.getHeader('Vary');
-                opts.res.setHeader('Vary', vary ? 'trpc-batch-mode, ' + vary : 'trpc-batch-mode');
-                isStream = true;
-                formatter = batchStreamFormatter.getBatchStreamFormatter();
-                opts.res.flushHeaders();
-            }
-        };
-        const unstable_onChunk = ([index, string])=>{
-            if (index === -1) {
-                /**
-         * Full response, no streaming. This can happen
-         * - if the response is an error
-         * - if response is empty (HEAD request)
-         */ opts.res.end(string);
-            } else {
-                opts.res.write(formatter(index, string));
-                opts.res.flush?.();
-            }
-        };
-        await resolveHTTPResponse.resolveHTTPResponse({
+        const response = await resolveHTTPResponse.resolveResponse({
             ...opts,
             req,
+            error: err ? TRPCError.getTRPCErrorFromUnknown(err) : null,
             createContext,
-            error: bodyResult.ok ? null : bodyResult.error,
-            preprocessedBody: bodyResult.ok ? bodyResult.preprocessed : false,
             onError (o) {
                 opts?.onError?.({
                     ...o,
                     req: opts.req
                 });
-            },
-            contentTypeHandler,
-            unstable_onHead,
-            unstable_onChunk
+            }
         });
-        if (isStream) {
-            opts.res.write(formatter.end());
-            opts.res.end();
+        if (opts.res.statusCode === 200) {
+            // if the status code is set, we assume that it's been manually overridden
+            opts.res.statusCode = response.status;
+        }
+        for (const [key, value] of response.headers){
+            opts.res.setHeader(key, value);
+        }
+        if (response.body) {
+            assertAsyncIterable(response.body);
+            for await (const chunk of response.body){
+                opts.res.write(chunk);
+            }
         }
-        return opts.res;
+        opts.res.end();
     });
 }
 

package/dist/adapters/node-http/nodeHTTPRequestHandler.mjs

@@ -1,7 +1,7 @@
-import { resolveHTTPResponse } from '../../unstable-core-do-not-import/http/resolveHTTPResponse.mjs';
-import { getBatchStreamFormatter } from '../../unstable-core-do-not-import/http/batchStreamFormatter.mjs';
+import { getTRPCErrorFromUnknown } from '../../unstable-core-do-not-import/error/TRPCError.mjs';
+import { resolveResponse } from '../../unstable-core-do-not-import/http/resolveHTTPResponse.mjs';
 import '../../unstable-core-do-not-import/rootConfig.mjs';
-import { nodeHTTPJSONContentTypeHandler } from './content-type/json/index.mjs';
+import { incomingMessageToRequest } from './incomingMessageToRequest.mjs';
 
 /**
  * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
@@ -11,13 +11,18 @@ import { nodeHTTPJSONContentTypeHandler } from './content-type/json/index.mjs';
  * import type { AnyTRPCRouter } from '@trpc/server'
  * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
  * ```
- */ /* eslint-disable @typescript-eslint/no-non-null-assertion */ // @trpc/server
-const defaultJSONContentTypeHandler = nodeHTTPJSONContentTypeHandler();
+ */ // @trpc/server
+function assertAsyncIterable(value) {
+    if (!(Symbol.asyncIterator in value)) {
+        throw new Error('Expected AsyncIterable - are you using Node >= 18.0.0?');
+    }
+}
 async function nodeHTTPRequestHandler(opts) {
     const handleViaMiddleware = opts.middleware ?? ((_req, _res, next)=>next());
     return handleViaMiddleware(opts.req, opts.res, async (err)=>{
-        if (err) throw err;
-        //
+        const req = incomingMessageToRequest(opts.req, {
+            maxBodySize: opts.maxBodySize ?? null
+        });
         // Build tRPC dependencies
         const createContext = async (innerOpts)=>{
             return await opts.createContext?.({
@@ -25,82 +30,32 @@ async function nodeHTTPRequestHandler(opts) {
                 ...innerOpts
             });
         };
-        const query = opts.req.query ? new URLSearchParams(opts.req.query) : new URLSearchParams(opts.req.url.split('?')[1]);
-        const jsonContentTypeHandler = defaultJSONContentTypeHandler;
-        const contentTypeHandlers = opts.experimental_contentTypeHandlers ?? [
-            jsonContentTypeHandler
-        ];
-        const contentTypeHandler = contentTypeHandlers.find((handler)=>handler.isMatch({
-                // FIXME: no typecasting should be needed here
-                ...opts,
-                query
-            })) ?? // fallback to json
-        jsonContentTypeHandler;
-        const bodyResult = await contentTypeHandler.getBody({
-            // FIXME: no typecasting should be needed here
-            ...opts,
-            query
-        });
-        const req = {
-            method: opts.req.method,
-            headers: opts.req.headers,
-            query,
-            body: bodyResult.ok ? bodyResult.data : undefined
-        };
-        let isStream = false;
-        let formatter;
-        const unstable_onHead = (head, isStreaming)=>{
-            if ('status' in head && (!opts.res.statusCode || opts.res.statusCode === 200)) {
-                opts.res.statusCode = head.status;
-            }
-            for (const [key, value] of Object.entries(head.headers ?? {})){
-                /* istanbul ignore if -- @preserve */ if (typeof value === 'undefined') {
-                    continue;
-                }
-                opts.res.setHeader(key, value);
-            }
-            if (isStreaming) {
-                opts.res.setHeader('Transfer-Encoding', 'chunked');
-                const vary = opts.res.getHeader('Vary');
-                opts.res.setHeader('Vary', vary ? 'trpc-batch-mode, ' + vary : 'trpc-batch-mode');
-                isStream = true;
-                formatter = getBatchStreamFormatter();
-                opts.res.flushHeaders();
-            }
-        };
-        const unstable_onChunk = ([index, string])=>{
-            if (index === -1) {
-                /**
-         * Full response, no streaming. This can happen
-         * - if the response is an error
-         * - if response is empty (HEAD request)
-         */ opts.res.end(string);
-            } else {
-                opts.res.write(formatter(index, string));
-                opts.res.flush?.();
-            }
-        };
-        await resolveHTTPResponse({
+        const response = await resolveResponse({
             ...opts,
             req,
+            error: err ? getTRPCErrorFromUnknown(err) : null,
             createContext,
-            error: bodyResult.ok ? null : bodyResult.error,
-            preprocessedBody: bodyResult.ok ? bodyResult.preprocessed : false,
             onError (o) {
                 opts?.onError?.({
                     ...o,
                     req: opts.req
                 });
-            },
-            contentTypeHandler,
-            unstable_onHead,
-            unstable_onChunk
+            }
         });
-        if (isStream) {
-            opts.res.write(formatter.end());
-            opts.res.end();
+        if (opts.res.statusCode === 200) {
+            // if the status code is set, we assume that it's been manually overridden
+            opts.res.statusCode = response.status;
+        }
+        for (const [key, value] of response.headers){
+            opts.res.setHeader(key, value);
+        }
+        if (response.body) {
+            assertAsyncIterable(response.body);
+            for await (const chunk of response.body){
+                opts.res.write(chunk);
+            }
         }
-        return opts.res;
+        opts.res.end();
     });
 }
 

package/dist/adapters/node-http/types.d.ts

@@ -9,10 +9,9 @@
  * ```
  */
 import type * as http from 'http';
-import type { AnyRouter, inferRouterContext } from '../../@trpc/server';
+import type { AnyRouter, CreateContextCallback, inferRouterContext } from '../../@trpc/server';
 import type { HTTPBaseHandlerOptions, TRPCRequestInfo } from '../../@trpc/server/http';
 import type { MaybePromise } from '../../unstable-core-do-not-import';
-import type { NodeHTTPContentTypeHandler } from './internals/contentType';
 interface ParsedQs {
     [key: string]: ParsedQs | ParsedQs[] | string[] | string | undefined;
 }
@@ -31,17 +30,7 @@ export type NodeHTTPResponse = http.ServerResponse & {
      */
     flush?: () => void;
 };
-export type NodeHTTPCreateContextOption<TRouter extends AnyRouter, TRequest, TResponse> = object extends inferRouterContext<TRouter> ? {
-    /**
-     * @link https://trpc.io/docs/v11/context
-     **/
-    createContext?: NodeHTTPCreateContextFn<TRouter, TRequest, TResponse>;
-} : {
-    /**
-     * @link https://trpc.io/docs/v11/context
-     **/
-    createContext: NodeHTTPCreateContextFn<TRouter, TRequest, TResponse>;
-};
+export type NodeHTTPCreateContextOption<TRouter extends AnyRouter, TRequest, TResponse> = CreateContextCallback<inferRouterContext<TRouter>, NodeHTTPCreateContextFn<TRouter, TRequest, TResponse>>;
 /**
  * @internal
  */
@@ -65,7 +54,6 @@ export type NodeHTTPHandlerOptions<TRouter extends AnyRouter, TRequest extends N
      */
     middleware?: ConnectMiddleware;
     maxBodySize?: number;
-    experimental_contentTypeHandlers?: NodeHTTPContentTypeHandler<TRequest, TResponse>[];
 };
 export type NodeHTTPRequestHandlerOptions<TRouter extends AnyRouter, TRequest extends NodeHTTPRequest, TResponse extends NodeHTTPResponse> = {
     req: TRequest;

package/dist/adapters/node-http/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/types.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,KAAK,IAAI,MAAM,MAAM,CAAC;AAElC,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAExE,OAAO,KAAK,EACV,sBAAsB,EACtB,eAAe,EAChB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAE1E,UAAU,QAAQ;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,EAAE,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAAC;CACtE;AAED,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,GAAG;IACnD,KAAK,CAAC,EAAE,QAAQ,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AACF,MAAM,MAAM,gBAAgB,GAAG,IAAI,CAAC,cAAc,GAAG;IACnD;;;;;;;OAOG;IACH,KAAK,CAAC,EAAE,MAAM,IAAI,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,2BAA2B,CACrC,OAAO,SAAS,SAAS,EACzB,QAAQ,EACR,SAAS,IACP,MAAM,SAAS,kBAAkB,CAAC,OAAO,CAAC,GAC1C;IACE;;QAEI;IACJ,aAAa,CAAC,EAAE,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;CACvE,GACD;IACE;;QAEI;IACJ,aAAa,EAAE,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;CACtE,CAAC;AAEN;;GAEG;AACH,KAAK,iBAAiB,CACpB,QAAQ,SAAS,eAAe,GAAG,eAAe,EAClD,SAAS,SAAS,gBAAgB,GAAG,gBAAgB,IACnD,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,GAAG,KAAK,IAAI,CAAC;AAEtE,MAAM,MAAM,sBAAsB,CAChC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,IAChC,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAC3C,2BAA2B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG;IAC1D;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gCAAgC,CAAC,EAAE,0BAA0B,CAC3D,QAAQ,EACR,SAAS,CACV,EAAE,CAAC;CACL,CAAC;AAEJ,MAAM,MAAM,6BAA6B,CACvC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,IAChC;IACF,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,sBAAsB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAEzD,MAAM,MAAM,8BAA8B,CAAC,QAAQ,EAAE,SAAS,IAAI;IAChE,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,eAAe,CAAC;CACvB,CAAC;AACF,MAAM,MAAM,uBAAuB,CACjC,OAAO,SAAS,SAAS,EACzB,QAAQ,EACR,SAAS,IACP,CACF,IAAI,EAAE,8BAA8B,CAAC,QAAQ,EAAE,SAAS,CAAC,KACtD,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/types.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,KAAK,IAAI,MAAM,MAAM,CAAC;AAElC,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EACV,sBAAsB,EACtB,eAAe,EAChB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAEtE,UAAU,QAAQ;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,EAAE,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAAC;CACtE;AAED,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,GAAG;IACnD,KAAK,CAAC,EAAE,QAAQ,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AACF,MAAM,MAAM,gBAAgB,GAAG,IAAI,CAAC,cAAc,GAAG;IACnD;;;;;;;OAOG;IACH,KAAK,CAAC,EAAE,MAAM,IAAI,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,2BAA2B,CACrC,OAAO,SAAS,SAAS,EACzB,QAAQ,EACR,SAAS,IACP,qBAAqB,CACvB,kBAAkB,CAAC,OAAO,CAAC,EAC3B,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CACtD,CAAC;AAEF;;GAEG;AACH,KAAK,iBAAiB,CACpB,QAAQ,SAAS,eAAe,GAAG,eAAe,EAClD,SAAS,SAAS,gBAAgB,GAAG,gBAAgB,IACnD,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,GAAG,KAAK,IAAI,CAAC;AAEtE,MAAM,MAAM,sBAAsB,CAChC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,IAChC,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAC3C,2BAA2B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG;IAC1D;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEJ,MAAM,MAAM,6BAA6B,CACvC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,IAChC;IACF,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,sBAAsB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAEzD,MAAM,MAAM,8BAA8B,CAAC,QAAQ,EAAE,SAAS,IAAI;IAChE,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,eAAe,CAAC;CACvB,CAAC;AACF,MAAM,MAAM,uBAAuB,CACjC,OAAO,SAAS,SAAS,EACzB,QAAQ,EACR,SAAS,IACP,CACF,IAAI,EAAE,8BAA8B,CAAC,QAAQ,EAAE,SAAS,CAAC,KACtD,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC"}

package/dist/adapters/standalone.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"standalone.d.ts","sourceRoot":"","sources":["../../src/adapters/standalone.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;AAEH,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EACV,8BAA8B,EAC9B,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAGrB,MAAM,MAAM,wBAAwB,CAAC,OAAO,SAAS,SAAS,IAC5D,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;AAE7E,MAAM,MAAM,wBAAwB,GAAG,8BAA8B,CACnE,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,cAAc,CACpB,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,OAAO,SAAS,SAAS,EACzD,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,SAEpB,KAAK,eAAe,OAAO,KAAK,cAAc,mBAelE;AAED,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,wEAIxC"}
+{"version":3,"file":"standalone.d.ts","sourceRoot":"","sources":["../../src/adapters/standalone.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;AAEH,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EACV,8BAA8B,EAC9B,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAGrB,MAAM,MAAM,wBAAwB,CAAC,OAAO,SAAS,SAAS,IAC5D,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;AAE7E,MAAM,MAAM,wBAAwB,GAAG,8BAA8B,CACnE,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,cAAc,CACpB,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,OAAO,SAAS,SAAS,EACzD,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,SAEpB,KAAK,eAAe,OAAO,KAAK,cAAc,mBAclE;AAED,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,wEAIxC"}

package/dist/adapters/standalone.js

@@ -12,7 +12,6 @@ function createHTTPHandler(opts) {
         // /procedure -> procedure
         const path = url.pathname.slice(1);
         await nodeHTTPRequestHandler.nodeHTTPRequestHandler({
-            // FIXME: no typecasting should be needed here
             ...opts,
             req,
             res,

package/dist/adapters/standalone.mjs

@@ -10,7 +10,6 @@ function createHTTPHandler(opts) {
         // /procedure -> procedure
         const path = url.pathname.slice(1);
         await nodeHTTPRequestHandler({
-            // FIXME: no typecasting should be needed here
             ...opts,
             req,
             res,

package/dist/adapters/ws.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import type { IncomingMessage } from 'http';
 import type ws from 'ws';
-import type { AnyRouter, inferRouterContext } from '../@trpc/server';
+import type { AnyRouter, CreateContextCallback, inferRouterContext } from '../@trpc/server';
 import type { BaseHandlerOptions } from '../@trpc/server/http';
 import type { MaybePromise } from '../unstable-core-do-not-import';
 import type { NodeHTTPCreateContextFnOptions } from './node-http';
@@ -13,17 +13,7 @@ export type CreateWSSContextFnOptions = Omit<NodeHTTPCreateContextFnOptions<Inco
  * @public
  */
 export type CreateWSSContextFn<TRouter extends AnyRouter> = (opts: CreateWSSContextFnOptions) => MaybePromise<inferRouterContext<TRouter>>;
-export type WSConnectionHandlerOptions<TRouter extends AnyRouter> = BaseHandlerOptions<TRouter, IncomingMessage> & (object extends inferRouterContext<TRouter> ? {
-    /**
-     * @link https://trpc.io/docs/v11/context
-     **/
-    createContext?: CreateWSSContextFn<TRouter>;
-} : {
-    /**
-     * @link https://trpc.io/docs/v11/context
-     **/
-    createContext: CreateWSSContextFn<TRouter>;
-});
+export type WSConnectionHandlerOptions<TRouter extends AnyRouter> = BaseHandlerOptions<TRouter, IncomingMessage> & CreateContextCallback<inferRouterContext<TRouter>, CreateWSSContextFn<TRouter>>;
 /**
  * Web socket server handler
  */

package/dist/adapters/ws.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/adapters/ws.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAQrE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAY/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAQlE;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAC1C,8BAA8B,CAAC,eAAe,EAAE,EAAE,CAAC,SAAS,CAAC,EAC7D,MAAM,CACP,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1D,IAAI,EAAE,yBAAyB,KAC5B,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAE/C,MAAM,MAAM,0BAA0B,CAAC,OAAO,SAAS,SAAS,IAC9D,kBAAkB,CAAC,OAAO,EAAE,eAAe,CAAC,GAC1C,CAAC,MAAM,SAAS,kBAAkB,CAAC,OAAO,CAAC,GACvC;IACE;;QAEI;IACJ,aAAa,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;CAC7C,GACD;IACE;;QAEI;IACJ,aAAa,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;CAC5C,CAAC,CAAC;AAEX;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,OAAO,SAAS,SAAS,IACrD,0BAA0B,CAAC,OAAO,CAAC,GAAG;IACpC,GAAG,EAAE,EAAE,CAAC,eAAe,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEJ,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAC9D,IAAI,EAAE,0BAA0B,CAAC,OAAO,CAAC,YAKnB,YAAY,OAAO,eAAe,mBAoPzD;AAED,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EA2BjC"}
+{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/adapters/ws.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,iBAAiB,CAAC;AAQzB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAY/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAQlE;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAC1C,8BAA8B,CAAC,eAAe,EAAE,EAAE,CAAC,SAAS,CAAC,EAC7D,MAAM,CACP,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1D,IAAI,EAAE,yBAAyB,KAC5B,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAE/C,MAAM,MAAM,0BAA0B,CAAC,OAAO,SAAS,SAAS,IAC9D,kBAAkB,CAAC,OAAO,EAAE,eAAe,CAAC,GAC1C,qBAAqB,CACnB,kBAAkB,CAAC,OAAO,CAAC,EAC3B,kBAAkB,CAAC,OAAO,CAAC,CAC5B,CAAC;AAEN;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,OAAO,SAAS,SAAS,IACrD,0BAA0B,CAAC,OAAO,CAAC,GAAG;IACpC,GAAG,EAAE,EAAE,CAAC,eAAe,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEJ,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAC9D,IAAI,EAAE,0BAA0B,CAAC,OAAO,CAAC,YAKnB,YAAY,OAAO,eAAe,mBAoPzD;AAED,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EA2BjC"}

package/dist/adapters/ws.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var getErrorShape = require('../unstable-core-do-not-import/error/getErrorShape.js');
 var TRPCError = require('../unstable-core-do-not-import/error/TRPCError.js');
+var getErrorShape = require('../unstable-core-do-not-import/error/getErrorShape.js');
 var parseTRPCMessage = require('../unstable-core-do-not-import/rpc/parseTRPCMessage.js');
 var router = require('../unstable-core-do-not-import/router.js');
 var transformer = require('../unstable-core-do-not-import/transformer.js');

package/dist/adapters/ws.mjs

@@ -1,5 +1,5 @@
-import { getErrorShape } from '../unstable-core-do-not-import/error/getErrorShape.mjs';
 import { TRPCError, getTRPCErrorFromUnknown } from '../unstable-core-do-not-import/error/TRPCError.mjs';
+import { getErrorShape } from '../unstable-core-do-not-import/error/getErrorShape.mjs';
 import { parseTRPCMessage } from '../unstable-core-do-not-import/rpc/parseTRPCMessage.mjs';
 import { callProcedure } from '../unstable-core-do-not-import/router.mjs';
 import { transformTRPCResponse } from '../unstable-core-do-not-import/transformer.mjs';