@trpc/server 11.0.0-rc.347 → 11.0.0-rc.351

package/dist/adapters/node-http/content-type/json/index.mjs

@@ -1,63 +1,14 @@
-import { TRPCError } from '../../../../unstable-core-do-not-import/error/TRPCError.mjs';
+import { getJsonContentTypeInputs } from '../../../../unstable-core-do-not-import/http/contentType.mjs';
 import '../../../../unstable-core-do-not-import/rootConfig.mjs';
+import { createNodeHTTPContentTypeHandler } from '../../internals/contentType.mjs';
 import { getPostBody } from './getPostBody.mjs';
 
-// @trpc/server
-const getNodeHTTPJSONContentTypeHandler = ()=>({
-        name: 'node-http-json',
-        isMatch: (headers)=>{
-            return !!headers.get('content-type')?.startsWith('application/json');
-        },
-        getInputs: async (opts, info)=>{
-            const bodyResult = await getPostBody(opts);
-            if (!bodyResult.ok) {
-                throw bodyResult.error;
-            }
-            const preprocessedBody = bodyResult.preprocessed;
-            const body = bodyResult.data;
-            function getRawProcedureInputOrThrow() {
-                try {
-                    if (opts.req.method === 'GET') {
-                        const input = opts.query.get('input');
-                        if (!input) {
-                            return undefined;
-                        }
-                        return JSON.parse(input);
-                    }
-                    if (preprocessedBody || typeof body !== 'string') {
-                        // Some tools like nextjs may parse json
-                        // requests before they reach us. So we just use them as is
-                        return body;
-                    } else {
-                        return JSON.parse(body);
-                    }
-                } catch (cause) {
-                    throw new TRPCError({
-                        code: 'PARSE_ERROR',
-                        cause
-                    });
-                }
-            }
-            const deserializeInputValue = (rawValue, transformer)=>{
-                return typeof rawValue !== 'undefined' ? transformer.input.deserialize(rawValue) : rawValue;
-            };
-            const rawInput = getRawProcedureInputOrThrow();
-            if (rawInput === undefined) {
-                return undefined;
-            }
-            const transformer = opts.router._def._config.transformer;
-            if (!info.isBatchCall) {
-                return deserializeInputValue(rawInput, transformer);
-            }
-            /* istanbul ignore if  */ if (rawInput == null || typeof rawInput !== 'object' || Array.isArray(rawInput)) {
-                throw new TRPCError({
-                    code: 'BAD_REQUEST',
-                    message: '"input" needs to be an object when doing a batch call'
-                });
-            }
-            const rawValue = rawInput[info.batch];
-            return deserializeInputValue(rawValue, transformer);
-        }
-    });
+const nodeHTTPJSONContentTypeHandler = createNodeHTTPContentTypeHandler({
+    isMatch (opts) {
+        return !!opts.req.headers['content-type']?.startsWith('application/json');
+    },
+    getBody: getPostBody,
+    getInputs: getJsonContentTypeInputs
+});
 
-export { getNodeHTTPJSONContentTypeHandler };
+export { nodeHTTPJSONContentTypeHandler };

package/dist/adapters/node-http/internals/contentType.d.ts

@@ -0,0 +1,9 @@
+import type { AnyRouter } from '../../../@trpc/server';
+import type { BaseContentTypeHandler } from '../../../@trpc/server/http';
+import type { NodeHTTPRequest, NodeHTTPRequestHandlerOptions, NodeHTTPResponse } from '../types';
+export interface NodeHTTPContentTypeHandler<TRequest extends NodeHTTPRequest, TResponse extends NodeHTTPResponse> extends BaseContentTypeHandler<NodeHTTPRequestHandlerOptions<AnyRouter, TRequest, TResponse> & {
+    query: URLSearchParams;
+}> {
+}
+export declare function createNodeHTTPContentTypeHandler(contentTypeHandler: NodeHTTPContentTypeHandler<NodeHTTPRequest, NodeHTTPResponse>): <TRequest extends NodeHTTPRequest, TResponse extends NodeHTTPResponse>() => NodeHTTPContentTypeHandler<TRequest, TResponse>;
+//# sourceMappingURL=contentType.d.ts.map

package/dist/adapters/node-http/internals/contentType.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"contentType.d.ts","sourceRoot":"","sources":["../../../../src/adapters/node-http/internals/contentType.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,KAAK,EACV,eAAe,EACf,6BAA6B,EAC7B,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAElB,MAAM,WAAW,0BAA0B,CACzC,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,CAClC,SAAQ,sBAAsB,CAC5B,6BAA6B,CAAC,SAAS,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG;IAC9D,KAAK,EAAE,eAAe,CAAC;CACxB,CACF;CAAG;AAEN,wBAAgB,gCAAgC,CAC9C,kBAAkB,EAAE,0BAA0B,CAC5C,eAAe,EACf,gBAAgB,CACjB,+EAKI,2BAA2B,QAAQ,EAAE,SAAS,CAAC,CAErD"}

package/dist/adapters/node-http/internals/contentType.js

@@ -0,0 +1,8 @@
+'use strict';
+
+// @trpc/server
+function createNodeHTTPContentTypeHandler(contentTypeHandler) {
+    return ()=>contentTypeHandler;
+}
+
+exports.createNodeHTTPContentTypeHandler = createNodeHTTPContentTypeHandler;

package/dist/adapters/node-http/internals/contentType.mjs

@@ -0,0 +1,6 @@
+// @trpc/server
+function createNodeHTTPContentTypeHandler(contentTypeHandler) {
+    return ()=>contentTypeHandler;
+}
+
+export { createNodeHTTPContentTypeHandler };

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;AAIH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAepD,OAAO,KAAK,EACV,eAAe,EACf,6BAA6B,EAC7B,gBAAgB,EACjB,MAAM,SAAS,CAAC;AAEjB,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,iBA6GlE"}
+{"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"}

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

@@ -3,10 +3,7 @@
 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 selectContentHandlerOrUnsupportedMediaType = require('../content-handlers/selectContentHandlerOrUnsupportedMediaType.js');
-var index$1 = require('./content-type/form-data/index.js');
 var index = require('./content-type/json/index.js');
-var index$2 = require('./content-type/octet/index.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`
@@ -17,6 +14,7 @@ var index$2 = require('./content-type/octet/index.js');
  * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
  * ```
  */ /* eslint-disable @typescript-eslint/no-non-null-assertion */ // @trpc/server
+const defaultJSONContentTypeHandler = index.nodeHTTPJSONContentTypeHandler();
 async function nodeHTTPRequestHandler(opts) {
     const handleViaMiddleware = opts.middleware ?? ((_req, _res, next)=>next());
     return handleViaMiddleware(opts.req, opts.res, async (err)=>{
@@ -30,10 +28,26 @@ async function nodeHTTPRequestHandler(opts) {
             });
         };
         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
+            query,
+            body: bodyResult.ok ? bodyResult.data : undefined
         };
         let isStream = false;
         let formatter;
@@ -68,31 +82,19 @@ async function nodeHTTPRequestHandler(opts) {
                 opts.res.flush?.();
             }
         };
-        const [contentTypeHandler, unsupportedMediaTypeError] = selectContentHandlerOrUnsupportedMediaType.selectContentHandlerOrUnsupportedMediaType([
-            index.getNodeHTTPJSONContentTypeHandler(),
-            index$1.getFormDataContentTypeHandler(),
-            index$2.getOctetContentTypeHandler()
-        ], {
-            ...opts,
-            query
-        });
         await resolveHTTPResponse.resolveHTTPResponse({
             ...opts,
             req,
             createContext,
-            error: unsupportedMediaTypeError,
+            error: bodyResult.ok ? null : bodyResult.error,
+            preprocessedBody: bodyResult.ok ? bodyResult.preprocessed : false,
             onError (o) {
                 opts?.onError?.({
                     ...o,
                     req: opts.req
                 });
             },
-            async getInput (inputsOpts) {
-                return await contentTypeHandler?.getInputs({
-                    ...opts,
-                    query
-                }, inputsOpts);
-            },
+            contentTypeHandler,
             unstable_onHead,
             unstable_onChunk
         });

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

@@ -1,10 +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 '../../unstable-core-do-not-import/rootConfig.mjs';
-import { selectContentHandlerOrUnsupportedMediaType } from '../content-handlers/selectContentHandlerOrUnsupportedMediaType.mjs';
-import { getFormDataContentTypeHandler } from './content-type/form-data/index.mjs';
-import { getNodeHTTPJSONContentTypeHandler } from './content-type/json/index.mjs';
-import { getOctetContentTypeHandler } from './content-type/octet/index.mjs';
+import { nodeHTTPJSONContentTypeHandler } from './content-type/json/index.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`
@@ -15,6 +12,7 @@ import { getOctetContentTypeHandler } from './content-type/octet/index.mjs';
  * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
  * ```
  */ /* eslint-disable @typescript-eslint/no-non-null-assertion */ // @trpc/server
+const defaultJSONContentTypeHandler = nodeHTTPJSONContentTypeHandler();
 async function nodeHTTPRequestHandler(opts) {
     const handleViaMiddleware = opts.middleware ?? ((_req, _res, next)=>next());
     return handleViaMiddleware(opts.req, opts.res, async (err)=>{
@@ -28,10 +26,26 @@ async function nodeHTTPRequestHandler(opts) {
             });
         };
         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
+            query,
+            body: bodyResult.ok ? bodyResult.data : undefined
         };
         let isStream = false;
         let formatter;
@@ -66,31 +80,19 @@ async function nodeHTTPRequestHandler(opts) {
                 opts.res.flush?.();
             }
         };
-        const [contentTypeHandler, unsupportedMediaTypeError] = selectContentHandlerOrUnsupportedMediaType([
-            getNodeHTTPJSONContentTypeHandler(),
-            getFormDataContentTypeHandler(),
-            getOctetContentTypeHandler()
-        ], {
-            ...opts,
-            query
-        });
         await resolveHTTPResponse({
             ...opts,
             req,
             createContext,
-            error: unsupportedMediaTypeError,
+            error: bodyResult.ok ? null : bodyResult.error,
+            preprocessedBody: bodyResult.ok ? bodyResult.preprocessed : false,
             onError (o) {
                 opts?.onError?.({
                     ...o,
                     req: opts.req
                 });
             },
-            async getInput (inputsOpts) {
-                return await contentTypeHandler?.getInputs({
-                    ...opts,
-                    query
-                }, inputsOpts);
-            },
+            contentTypeHandler,
             unstable_onHead,
             unstable_onChunk
         });

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

@@ -9,9 +9,10 @@
  * ```
  */
 import type * as http from 'http';
-import type { AnyRouter, CreateContextCallback, inferRouterContext, WrapCreateContext } from '../../@trpc/server';
+import type { AnyRouter, 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;
 }
@@ -30,12 +31,22 @@ export type NodeHTTPResponse = http.ServerResponse & {
      */
     flush?: () => void;
 };
-export type NodeHTTPConditionCreateContextOption<TRouter extends AnyRouter, TRequest, TResponse> = CreateContextCallback<inferRouterContext<TRouter>, NodeHTTPCreateContextFn<TRouter, TRequest, TResponse>>;
+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>;
+};
 /**
  * @internal
  */
 type ConnectMiddleware<TRequest extends NodeHTTPRequest = NodeHTTPRequest, TResponse extends NodeHTTPResponse = NodeHTTPResponse> = (req: TRequest, res: TResponse, next: (err?: any) => any) => void;
-interface CoreNodeHTTPHandlerOptions<TRouter extends AnyRouter, TRequest extends NodeHTTPRequest, TResponse extends NodeHTTPResponse> extends HTTPBaseHandlerOptions<TRouter, TRequest> {
+export type NodeHTTPHandlerOptions<TRouter extends AnyRouter, TRequest extends NodeHTTPRequest, TResponse extends NodeHTTPResponse> = HTTPBaseHandlerOptions<TRouter, TRequest> & NodeHTTPCreateContextOption<TRouter, TRequest, TResponse> & {
     /**
      * By default, http `OPTIONS` requests are not handled, and CORS headers are not returned.
      *
@@ -52,15 +63,15 @@ interface CoreNodeHTTPHandlerOptions<TRouter extends AnyRouter, TRequest extends
      * You can also use it for other needs which a connect/node.js compatible middleware can solve,
      *  though you might wish to consider an alternative solution like the Express adapter if your needs are complex.
      */
-    middleware?: ConnectMiddleware<TRequest, TResponse>;
+    middleware?: ConnectMiddleware;
     maxBodySize?: number;
-}
-export type NodeHTTPHandlerOptions<TRouter extends AnyRouter, TRequest extends NodeHTTPRequest, TResponse extends NodeHTTPResponse> = CoreNodeHTTPHandlerOptions<TRouter, TRequest, TResponse> & NodeHTTPConditionCreateContextOption<TRouter, TRequest, TResponse>;
-export type NodeHTTPRequestHandlerOptions<TRouter extends AnyRouter, TRequest extends NodeHTTPRequest, TResponse extends NodeHTTPResponse> = CoreNodeHTTPHandlerOptions<TRouter, TRequest, TResponse> & WrapCreateContext<NodeHTTPCreateContextFn<TRouter, TRequest, TResponse>> & {
+    experimental_contentTypeHandlers?: NodeHTTPContentTypeHandler<TRequest, TResponse>[];
+};
+export type NodeHTTPRequestHandlerOptions<TRouter extends AnyRouter, TRequest extends NodeHTTPRequest, TResponse extends NodeHTTPResponse> = {
     req: TRequest;
     res: TResponse;
     path: string;
-};
+} & NodeHTTPHandlerOptions<TRouter, TRequest, TResponse>;
 export type NodeHTTPCreateContextFnOptions<TRequest, TResponse> = {
     req: TRequest;
     res: TResponse;

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,EACV,SAAS,EACT,qBAAqB,EACrB,kBAAkB,EAClB,iBAAiB,EAClB,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,oCAAoC,CAC9C,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,UAAU,0BAA0B,CAClC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,CAClC,SAAQ,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC;IACjD;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,iBAAiB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACpD,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAGD,MAAM,MAAM,sBAAsB,CAChC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,IAChC,0BAA0B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,GAC1D,oCAAoC,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAGrE,MAAM,MAAM,6BAA6B,CACvC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,IAChC,0BAA0B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,GAC1D,iBAAiB,CAAC,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,GAAG;IACzE,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEJ,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,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"}

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,mBAclE;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,mBAelE;AAED,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,wEAIxC"}

package/dist/adapters/standalone.js

@@ -12,6 +12,7 @@ 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,6 +10,7 @@ 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, CreateContextCallback, inferRouterContext } from '../@trpc/server';
+import type { AnyRouter, 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,7 +13,17 @@ 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> & CreateContextCallback<inferRouterContext<TRouter>, CreateWSSContextFn<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>;
+});
 /**
  * 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,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"}
+{"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"}