@trpc/server 11.0.0-rc.340 → 11.0.0-rc.345

package/dist/adapters/fastify/fastifyRequestHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fastifyRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/fastify/fastifyRequestHandler.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EACV,sBAAsB,EAKvB,MAAM,yBAAyB,CAAC;AAKjC,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAEhE,MAAM,MAAM,qBAAqB,CAC/B,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,IAC5B,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAC3C,2BAA2B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAE5D,KAAK,4BAA4B,CAC/B,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,IAC5B,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG;IACxD,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAsB,qBAAqB,CACzC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,EAC9B,IAAI,EAAE,4BAA4B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,kBAsFjE"}
+{"version":3,"file":"fastifyRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/fastify/fastifyRequestHandler.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAapD,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,SAAS,CAAC;AAE5D,wBAAsB,qBAAqB,CACzC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,EAC9B,IAAI,EAAE,4BAA4B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,kBAgGjE"}

package/dist/adapters/fastify/fastifyRequestHandler.js

@@ -4,6 +4,8 @@ var node_stream = require('node:stream');
 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 = require('./content-type/json/index.js');
 
 async function fastifyRequestHandler(opts) {
     const createContext = async (innerOpts)=>{
@@ -16,8 +18,7 @@ async function fastifyRequestHandler(opts) {
     const req = {
         query,
         method: opts.req.method,
-        headers: opts.req.headers,
-        body: opts.req.body ?? 'null'
+        headers: opts.req.headers
     };
     let resolve;
     const promise = new Promise((r)=>resolve = r);
@@ -52,9 +53,16 @@ async function fastifyRequestHandler(opts) {
             stream.push(formatter(index, string));
         }
     };
+    const [contentTypeHandler, unsupportedMediaTypeError] = selectContentHandlerOrUnsupportedMediaType.selectContentHandlerOrUnsupportedMediaType([
+        index.getFastifyHTTPJSONContentTypeHandler()
+    ], opts);
     resolveHTTPResponse.resolveHTTPResponse({
         ...opts,
         req,
+        error: unsupportedMediaTypeError,
+        async getInput (info) {
+            return await contentTypeHandler?.getInputs(opts, info);
+        },
         createContext,
         onError (o) {
             opts?.onError?.({

package/dist/adapters/fastify/fastifyRequestHandler.mjs

@@ -2,6 +2,8 @@ import { Readable } from 'node:stream';
 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 { getFastifyHTTPJSONContentTypeHandler } from './content-type/json/index.mjs';
 
 async function fastifyRequestHandler(opts) {
     const createContext = async (innerOpts)=>{
@@ -14,8 +16,7 @@ async function fastifyRequestHandler(opts) {
     const req = {
         query,
         method: opts.req.method,
-        headers: opts.req.headers,
-        body: opts.req.body ?? 'null'
+        headers: opts.req.headers
     };
     let resolve;
     const promise = new Promise((r)=>resolve = r);
@@ -50,9 +51,16 @@ async function fastifyRequestHandler(opts) {
             stream.push(formatter(index, string));
         }
     };
+    const [contentTypeHandler, unsupportedMediaTypeError] = selectContentHandlerOrUnsupportedMediaType([
+        getFastifyHTTPJSONContentTypeHandler()
+    ], opts);
     resolveHTTPResponse({
         ...opts,
         req,
+        error: unsupportedMediaTypeError,
+        async getInput (info) {
+            return await contentTypeHandler?.getInputs(opts, info);
+        },
         createContext,
         onError (o) {
             opts?.onError?.({

package/dist/adapters/fastify/fastifyTRPCPlugin.d.ts

@@ -8,9 +8,9 @@
  * ```
  */
 import type { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
-import type { FastifyHandlerOptions } from '.';
 import type { AnyRouter } from '../../@trpc/server';
 import type { NodeHTTPCreateContextFnOptions } from '../node-http';
+import type { FastifyHandlerOptions } from './types';
 export interface FastifyTRPCPluginOptions<TRouter extends AnyRouter> {
     prefix?: string;
     useWSS?: boolean;

package/dist/adapters/fastify/fastifyTRPCPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fastifyTRPCPlugin.d.ts","sourceRoot":"","sources":["../../../src/adapters/fastify/fastifyTRPCPlugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,GAAG,CAAC;AAE/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAC;AAKnE,MAAM,WAAW,wBAAwB,CAAC,OAAO,SAAS,SAAS;IACjE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,qBAAqB,CAAC,OAAO,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;CAC3E;AAED,MAAM,MAAM,2BAA2B,GAAG,8BAA8B,CACtE,cAAc,EACd,YAAY,CACb,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,OAAO,SAAS,SAAS,EACzD,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,EACvC,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,QAmC5B"}
+{"version":3,"file":"fastifyTRPCPlugin.d.ts","sourceRoot":"","sources":["../../../src/adapters/fastify/fastifyTRPCPlugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE7E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAC;AAInE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAErD,MAAM,WAAW,wBAAwB,CAAC,OAAO,SAAS,SAAS;IACjE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,qBAAqB,CAAC,OAAO,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;CAC3E;AAED,MAAM,MAAM,2BAA2B,GAAG,8BAA8B,CACtE,cAAc,EACd,YAAY,CACb,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,OAAO,SAAS,SAAS,EACzD,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,EACvC,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,QAmC5B"}

package/dist/adapters/fastify/types.d.ts

@@ -0,0 +1,11 @@
+import type { FastifyReply, FastifyRequest } from 'fastify';
+import type { AnyRouter } from '../../@trpc/server';
+import type { HTTPBaseHandlerOptions } from '../../@trpc/server/http';
+import type { NodeHTTPConditionCreateContextOption } from '../node-http';
+export type FastifyHandlerOptions<TRouter extends AnyRouter, TRequest extends FastifyRequest, TResponse extends FastifyReply> = HTTPBaseHandlerOptions<TRouter, TRequest> & NodeHTTPConditionCreateContextOption<TRouter, TRequest, TResponse>;
+export type FastifyRequestHandlerOptions<TRouter extends AnyRouter, TRequest extends FastifyRequest, TResponse extends FastifyReply> = FastifyHandlerOptions<TRouter, TRequest, TResponse> & {
+    req: TRequest;
+    res: TResponse;
+    path: string;
+};
+//# sourceMappingURL=types.d.ts.map

package/dist/adapters/fastify/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/adapters/fastify/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,cAAc,CAAC;AAEzE,MAAM,MAAM,qBAAqB,CAC/B,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,IAC5B,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAC3C,oCAAoC,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAErE,MAAM,MAAM,4BAA4B,CACtC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,cAAc,EAC/B,SAAS,SAAS,YAAY,IAC5B,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG;IACxD,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC"}

package/dist/adapters/fetch/content-type/json/index.d.ts

@@ -0,0 +1,9 @@
+import type { AnyRouter } from '../../../../@trpc/server';
+import type { BaseContentTypeHandler } from '../../../../@trpc/server/http';
+import type { FetchHandlerRequestOptions } from '../../types';
+export interface FetchHTTPContentTypeHandler<TRouter extends AnyRouter> extends BaseContentTypeHandler<FetchHandlerRequestOptions<TRouter> & {
+    url: URL;
+}> {
+}
+export declare const getFetchHTTPJSONContentTypeHandler: <TRouter extends AnyRouter>() => FetchHTTPContentTypeHandler<TRouter>;
+//# sourceMappingURL=index.d.ts.map

package/dist/adapters/fetch/content-type/json/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/fetch/content-type/json/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,SAAS,EAEV,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAE9D,MAAM,WAAW,2BAA2B,CAAC,OAAO,SAAS,SAAS,CACpE,SAAQ,sBAAsB,CAC5B,0BAA0B,CAAC,OAAO,CAAC,GAAG;IACpC,GAAG,EAAE,GAAG,CAAC;CACV,CACF;CAAG;AAEN,eAAO,MAAM,kCAAkC,EAAE,CAC/C,OAAO,SAAS,SAAS,OACpB,2BAA2B,CAAC,OAAO,CA6ExC,CAAC"}

package/dist/adapters/fetch/content-type/json/index.js

@@ -0,0 +1,58 @@
+'use strict';
+
+var TRPCError = require('../../../../unstable-core-do-not-import/error/TRPCError.js');
+require('../../../../unstable-core-do-not-import/rootConfig.js');
+
+// @trpc/server
+const getFetchHTTPJSONContentTypeHandler = ()=>({
+        name: 'fetch-json',
+        isMatch (opts) {
+            return !!opts.req.headers.get('content-type')?.startsWith('application/json');
+        },
+        getInputs: async (opts, info)=>{
+            async function getRawProcedureInputOrThrow() {
+                const { req  } = opts;
+                try {
+                    if (req.method === 'GET') {
+                        const input = opts.url.searchParams.get('input');
+                        if (!input) {
+                            return undefined;
+                        }
+                        return JSON.parse(input);
+                    }
+                    const body = opts.req.headers.get('content-type')?.startsWith('application/json') ? await opts.req.text() : '';
+                    if (typeof body === 'string') {
+                        // A mutation with no inputs will have req.body === ''
+                        return body.length === 0 ? undefined : JSON.parse(body);
+                    }
+                    return body;
+                } catch (cause) {
+                    throw new TRPCError.TRPCError({
+                        code: 'PARSE_ERROR',
+                        cause
+                    });
+                }
+            }
+            const deserializeInputValue = (rawValue, transformer)=>{
+                return typeof rawValue !== 'undefined' ? transformer.input.deserialize(rawValue) : rawValue;
+            };
+            const rawInput = await 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.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);
+        }
+    });
+
+exports.getFetchHTTPJSONContentTypeHandler = getFetchHTTPJSONContentTypeHandler;

package/dist/adapters/fetch/content-type/json/index.mjs

@@ -0,0 +1,56 @@
+import { TRPCError } from '../../../../unstable-core-do-not-import/error/TRPCError.mjs';
+import '../../../../unstable-core-do-not-import/rootConfig.mjs';
+
+// @trpc/server
+const getFetchHTTPJSONContentTypeHandler = ()=>({
+        name: 'fetch-json',
+        isMatch (opts) {
+            return !!opts.req.headers.get('content-type')?.startsWith('application/json');
+        },
+        getInputs: async (opts, info)=>{
+            async function getRawProcedureInputOrThrow() {
+                const { req  } = opts;
+                try {
+                    if (req.method === 'GET') {
+                        const input = opts.url.searchParams.get('input');
+                        if (!input) {
+                            return undefined;
+                        }
+                        return JSON.parse(input);
+                    }
+                    const body = opts.req.headers.get('content-type')?.startsWith('application/json') ? await opts.req.text() : '';
+                    if (typeof body === 'string') {
+                        // A mutation with no inputs will have req.body === ''
+                        return body.length === 0 ? undefined : JSON.parse(body);
+                    }
+                    return 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 = await 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);
+        }
+    });
+
+export { getFetchHTTPJSONContentTypeHandler };

package/dist/adapters/fetch/fetchRequestHandler.d.ts

@@ -9,9 +9,5 @@
  */
 import type { AnyRouter } from '../../@trpc/server';
 import type { FetchHandlerOptions } from './types';
-export type FetchHandlerRequestOptions<TRouter extends AnyRouter> = FetchHandlerOptions<TRouter> & {
-    req: Request;
-    endpoint: string;
-};
-export declare function fetchRequestHandler<TRouter extends AnyRouter>(opts: FetchHandlerRequestOptions<TRouter>): Promise<Response>;
+export declare function fetchRequestHandler<TRouter extends AnyRouter>(opts: FetchHandlerOptions<TRouter>): Promise<Response>;
 //# sourceMappingURL=fetchRequestHandler.d.ts.map

package/dist/adapters/fetch/fetchRequestHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/fetch/fetchRequestHandler.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAYpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAEnD,MAAM,MAAM,0BAA0B,CAAC,OAAO,SAAS,SAAS,IAC9D,mBAAmB,CAAC,OAAO,CAAC,GAAG;IAC7B,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AASJ,wBAAsB,mBAAmB,CAAC,OAAO,SAAS,SAAS,EACjE,IAAI,EAAE,0BAA0B,CAAC,OAAO,CAAC,GACxC,OAAO,CAAC,QAAQ,CAAC,CAuGnB"}
+{"version":3,"file":"fetchRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/fetch/fetchRequestHandler.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAcpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AASnD,wBAAsB,mBAAmB,CAAC,OAAO,SAAS,SAAS,EACjE,IAAI,EAAE,mBAAmB,CAAC,OAAO,CAAC,GACjC,OAAO,CAAC,QAAQ,CAAC,CAuHnB"}

package/dist/adapters/fetch/fetchRequestHandler.js

@@ -4,6 +4,8 @@ var resolveHTTPResponse = require('../../unstable-core-do-not-import/http/resolv
 var batchStreamFormatter = require('../../unstable-core-do-not-import/http/batchStreamFormatter.js');
 var toURL = require('../../unstable-core-do-not-import/http/toURL.js');
 require('../../unstable-core-do-not-import/rootConfig.js');
+var selectContentHandlerOrUnsupportedMediaType = require('../content-handlers/selectContentHandlerOrUnsupportedMediaType.js');
+var index = require('./content-type/json/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`
@@ -35,8 +37,7 @@ async function fetchRequestHandler(opts) {
     const req = {
         query: url.searchParams,
         method: opts.req.method,
-        headers: Object.fromEntries(opts.req.headers),
-        body: opts.req.headers.get('content-type')?.startsWith('application/json') ? await opts.req.text() : ''
+        headers: Object.fromEntries(opts.req.headers)
     };
     let resolve;
     const promise = new Promise((r)=>resolve = r);
@@ -89,11 +90,24 @@ async function fetchRequestHandler(opts) {
             controller.enqueue(encoder.encode(formatter(index, string)));
         }
     };
+    const [contentTypeHandler, unsupportedMediaTypeError] = selectContentHandlerOrUnsupportedMediaType.selectContentHandlerOrUnsupportedMediaType([
+        index.getFetchHTTPJSONContentTypeHandler()
+    ], {
+        ...opts,
+        url
+    });
     resolveHTTPResponse.resolveHTTPResponse({
         ...opts,
         req,
         createContext,
         path,
+        error: unsupportedMediaTypeError,
+        async getInput (info) {
+            return await contentTypeHandler?.getInputs({
+                ...opts,
+                url
+            }, info);
+        },
         onError (o) {
             opts?.onError?.({
                 ...o,

package/dist/adapters/fetch/fetchRequestHandler.mjs

@@ -2,6 +2,8 @@ import { resolveHTTPResponse } from '../../unstable-core-do-not-import/http/reso
 import { getBatchStreamFormatter } from '../../unstable-core-do-not-import/http/batchStreamFormatter.mjs';
 import { toURL } from '../../unstable-core-do-not-import/http/toURL.mjs';
 import '../../unstable-core-do-not-import/rootConfig.mjs';
+import { selectContentHandlerOrUnsupportedMediaType } from '../content-handlers/selectContentHandlerOrUnsupportedMediaType.mjs';
+import { getFetchHTTPJSONContentTypeHandler } 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`
@@ -33,8 +35,7 @@ async function fetchRequestHandler(opts) {
     const req = {
         query: url.searchParams,
         method: opts.req.method,
-        headers: Object.fromEntries(opts.req.headers),
-        body: opts.req.headers.get('content-type')?.startsWith('application/json') ? await opts.req.text() : ''
+        headers: Object.fromEntries(opts.req.headers)
     };
     let resolve;
     const promise = new Promise((r)=>resolve = r);
@@ -87,11 +88,24 @@ async function fetchRequestHandler(opts) {
             controller.enqueue(encoder.encode(formatter(index, string)));
         }
     };
+    const [contentTypeHandler, unsupportedMediaTypeError] = selectContentHandlerOrUnsupportedMediaType([
+        getFetchHTTPJSONContentTypeHandler()
+    ], {
+        ...opts,
+        url
+    });
     resolveHTTPResponse({
         ...opts,
         req,
         createContext,
         path,
+        error: unsupportedMediaTypeError,
+        async getInput (info) {
+            return await contentTypeHandler?.getInputs({
+                ...opts,
+                url
+            }, info);
+        },
         onError (o) {
             opts?.onError?.({
                 ...o,

package/dist/adapters/fetch/types.d.ts

@@ -7,7 +7,7 @@
  * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
  * ```
  */
-import type { AnyRouter, inferRouterContext } from '../../@trpc/server';
+import type { AnyRouter, CreateContextCallback, inferRouterContext, WrapCreateContext } from '../../@trpc/server';
 import type { HTTPBaseHandlerOptions, TRPCRequestInfo } from '../../@trpc/server/http';
 export type FetchCreateContextFnOptions = {
     req: Request;
@@ -15,16 +15,13 @@ export type FetchCreateContextFnOptions = {
     info: TRPCRequestInfo;
 };
 export type FetchCreateContextFn<TRouter extends AnyRouter> = (opts: FetchCreateContextFnOptions) => inferRouterContext<TRouter> | Promise<inferRouterContext<TRouter>>;
-export type FetchCreateContextOption<TRouter extends AnyRouter> = unknown extends inferRouterContext<TRouter> ? {
-    /**
-     * @link https://trpc.io/docs/v11/context
-     **/
-    createContext?: FetchCreateContextFn<TRouter>;
-} : {
-    /**
-     * @link https://trpc.io/docs/v11/context
-     **/
-    createContext: FetchCreateContextFn<TRouter>;
+export type FetchCreateContextOption<TRouter extends AnyRouter> = CreateContextCallback<inferRouterContext<TRouter>, FetchCreateContextFn<TRouter>>;
+export type FetchHandlerOptions<TRouter extends AnyRouter> = FetchCreateContextOption<TRouter> & HTTPBaseHandlerOptions<TRouter, Request> & {
+    req: Request;
+    endpoint: string;
+};
+export type FetchHandlerRequestOptions<TRouter extends AnyRouter> = HTTPBaseHandlerOptions<TRouter, Request> & WrapCreateContext<FetchCreateContextFn<TRouter>> & {
+    req: Request;
+    endpoint: string;
 };
-export type FetchHandlerOptions<TRouter extends AnyRouter> = FetchCreateContextOption<TRouter> & HTTPBaseHandlerOptions<TRouter, Request>;
 //# sourceMappingURL=types.d.ts.map

package/dist/adapters/fetch/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/adapters/fetch/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAExE,OAAO,KAAK,EACV,sBAAsB,EACtB,eAAe,EAChB,MAAM,yBAAyB,CAAC;AAEjC,MAAM,MAAM,2BAA2B,GAAG;IACxC,GAAG,EAAE,OAAO,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,eAAe,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,SAAS,IAAI,CAC5D,IAAI,EAAE,2BAA2B,KAC9B,kBAAkB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAExE,MAAM,MAAM,wBAAwB,CAAC,OAAO,SAAS,SAAS,IAC5D,OAAO,SAAS,kBAAkB,CAAC,OAAO,CAAC,GACvC;IACE;;QAEI;IACJ,aAAa,CAAC,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;CAC/C,GACD;IACE;;QAEI;IACJ,aAAa,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;CAC9C,CAAC;AAER,MAAM,MAAM,mBAAmB,CAAC,OAAO,SAAS,SAAS,IACvD,wBAAwB,CAAC,OAAO,CAAC,GAAG,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/adapters/fetch/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,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,MAAM,MAAM,2BAA2B,GAAG;IACxC,GAAG,EAAE,OAAO,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,eAAe,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,SAAS,IAAI,CAC5D,IAAI,EAAE,2BAA2B,KAC9B,kBAAkB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAExE,MAAM,MAAM,wBAAwB,CAAC,OAAO,SAAS,SAAS,IAC5D,qBAAqB,CACnB,kBAAkB,CAAC,OAAO,CAAC,EAC3B,oBAAoB,CAAC,OAAO,CAAC,CAC9B,CAAC;AAEJ,MAAM,MAAM,mBAAmB,CAAC,OAAO,SAAS,SAAS,IACvD,wBAAwB,CAAC,OAAO,CAAC,GAC/B,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG;IACzC,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEN,MAAM,MAAM,0BAA0B,CAAC,OAAO,SAAS,SAAS,IAC9D,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC,GACtC,iBAAiB,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,GAAG;IACjD,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC"}

package/dist/adapters/next-app-dir/nextAppDirCaller.d.ts

@@ -1,11 +1,7 @@
+import type { CreateContextCallback } from '../../@trpc/server';
 import type { ErrorHandlerOptions } from '../../unstable-core-do-not-import/procedure';
 import type { CallerOverride } from '../../unstable-core-do-not-import/procedureBuilder';
 import type { MaybePromise, Simplify } from '../../unstable-core-do-not-import/types';
-type ContextCallback<TContext> = object extends TContext ? {
-    createContext?: () => MaybePromise<TContext>;
-} : {
-    createContext: () => MaybePromise<TContext>;
-};
 /**
  * Create a caller that works with Next.js React Server Components & Server Actions
  */
@@ -19,6 +15,5 @@ export declare function nextAppDirCaller<TContext>(config: Simplify<{
      * Called when an error occurs in the handler
      */
     onError?: (opts: ErrorHandlerOptions<TContext>) => void;
-} & ContextCallback<TContext>>): CallerOverride<TContext>;
-export {};
+} & CreateContextCallback<TContext, () => MaybePromise<TContext>>>): CallerOverride<TContext>;
 //# sourceMappingURL=nextAppDirCaller.d.ts.map

package/dist/adapters/next-app-dir/nextAppDirCaller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nextAppDirCaller.d.ts","sourceRoot":"","sources":["../../../src/adapters/next-app-dir/nextAppDirCaller.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAGvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AAGzF,OAAO,KAAK,EACV,YAAY,EACZ,QAAQ,EACT,MAAM,yCAAyC,CAAC;AAKjD,KAAK,eAAe,CAAC,QAAQ,IAAI,MAAM,SAAS,QAAQ,GACpD;IACE,aAAa,CAAC,EAAE,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;CAC9C,GACD;IACE,aAAa,EAAE,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;CAC7C,CAAC;AAEN;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EACvC,MAAM,EAAE,QAAQ,CACd;IACE;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,mBAAmB,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC;CACzD,GAAG,eAAe,CAAC,QAAQ,CAAC,CAC9B,GACA,cAAc,CAAC,QAAQ,CAAC,CAsF1B"}
+{"version":3,"file":"nextAppDirCaller.d.ts","sourceRoot":"","sources":["../../../src/adapters/next-app-dir/nextAppDirCaller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAIhE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAGvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AAGzF,OAAO,KAAK,EACV,YAAY,EACZ,QAAQ,EACT,MAAM,yCAAyC,CAAC;AAKjD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EACvC,MAAM,EAAE,QAAQ,CACd;IACE;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,mBAAmB,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC;CACzD,GAAG,qBAAqB,CAAC,QAAQ,EAAE,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC,CAClE,GACA,cAAc,CAAC,QAAQ,CAAC,CAsF1B"}

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

@@ -1 +1 @@
-{"version":3,"file":"next.d.ts","sourceRoot":"","sources":["../../src/adapters/next.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAE5E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGjD,OAAO,KAAK,EACV,8BAA8B,EAC9B,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAGrB,MAAM,MAAM,wBAAwB,GAAG,8BAA8B,CACnE,cAAc,EACd,eAAe,CAChB,CAAC;AAEF;;GAEG;AACH,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAE5E,wBAAgB,oBAAoB,CAAC,OAAO,SAAS,SAAS,EAC5D,IAAI,EAAE,sBAAsB,CAAC,OAAO,EAAE,cAAc,EAAE,eAAe,CAAC,GACrE,cAAc,CA8ChB"}
+{"version":3,"file":"next.d.ts","sourceRoot":"","sources":["../../src/adapters/next.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAE5E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGjD,OAAO,KAAK,EACV,8BAA8B,EAC9B,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAGrB,MAAM,MAAM,wBAAwB,GAAG,8BAA8B,CACnE,cAAc,EACd,eAAe,CAChB,CAAC;AAEF;;GAEG;AACH,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAE5E,wBAAgB,oBAAoB,CAAC,OAAO,SAAS,SAAS,EAC5D,IAAI,EAAE,sBAAsB,CAAC,OAAO,EAAE,cAAc,EAAE,eAAe,CAAC,GACrE,cAAc,CAyChB"}

package/dist/adapters/next.js

@@ -46,7 +46,6 @@ function createNextApiHandler(opts) {
             return;
         }
         await nodeHTTPRequestHandler.nodeHTTPRequestHandler({
-            // FIXME: no typecasting should be needed here
             ...opts,
             req,
             res,

package/dist/adapters/next.mjs

@@ -44,7 +44,6 @@ function createNextApiHandler(opts) {
             return;
         }
         await nodeHTTPRequestHandler({
-            // FIXME: no typecasting should be needed here
             ...opts,
             req,
             res,

package/dist/adapters/node-http/content-type/form-data/fileUploadHandler.js

@@ -1,14 +1,10 @@
 'use strict';
 
-var node_crypto = require('node:crypto');
 var node_fs = require('node:fs');
 var fs = require('node:fs/promises');
-var node_os = require('node:os');
 var node_path = require('node:path');
 var node_stream = require('node:stream');
-var node_util = require('node:util');
 var streamSlice = require('./streamSlice.js');
-var uploadHandler = require('./uploadHandler.js');
 
 async function readableStreamToString(stream, encoding) {
     const reader = stream.getReader();
@@ -25,73 +21,6 @@ async function readableStreamToString(stream, encoding) {
     await read();
     return Buffer.concat(chunks).toString(encoding);
 }
-const defaultFilePathResolver = ({ filename ,  })=>{
-    const ext = filename ? node_path.extname(filename) : '';
-    return 'upload_' + node_crypto.randomBytes(4).readUInt32LE(0) + ext;
-};
-async function uniqueFile(filepath) {
-    const ext = node_path.extname(filepath);
-    let uniqueFilepath = filepath;
-    for(let i = 1; await fs.stat(uniqueFilepath).then(()=>true).catch(()=>false); i++){
-        uniqueFilepath = (ext ? filepath.slice(0, -ext.length) : filepath) + `-${new Date().getTime()}${ext}`;
-    }
-    return uniqueFilepath;
-}
-function createFileUploadHandler({ directory =node_os.tmpdir() , avoidFileConflicts =true , file =defaultFilePathResolver , filter , maxPartSize =3000000  } = {}) {
-    return async ({ name , filename , contentType , data  })=>{
-        if (!filename || filter && !await filter({
-            name,
-            filename,
-            contentType
-        })) {
-            return undefined;
-        }
-        const dir = typeof directory === 'string' ? directory : directory({
-            name,
-            filename,
-            contentType
-        });
-        if (!dir) {
-            return undefined;
-        }
-        const filedir = node_path.resolve(dir);
-        const path = typeof file === 'string' ? file : file({
-            name,
-            filename,
-            contentType
-        });
-        if (!path) {
-            return undefined;
-        }
-        let filepath = node_path.resolve(filedir, path);
-        if (avoidFileConflicts) {
-            filepath = await uniqueFile(filepath);
-        }
-        await fs.mkdir(node_path.dirname(filepath), {
-            recursive: true
-        }).catch(()=>{});
-        const writeFileStream = node_fs.createWriteStream(filepath);
-        let size = 0;
-        let deleteFile = false;
-        try {
-            for await (const chunk of data){
-                size += chunk.byteLength;
-                if (size > maxPartSize) {
-                    deleteFile = true;
-                    throw new uploadHandler.MaxPartSizeExceededError(name, maxPartSize);
-                }
-                writeFileStream.write(chunk);
-            }
-        } finally{
-            writeFileStream.end();
-            await node_util.promisify(node_stream.finished)(writeFileStream);
-            if (deleteFile) {
-                await fs.rm(filepath).catch(()=>{});
-            }
-        }
-        return new NodeOnDiskFile(filepath, contentType);
-    };
-}
 let _toStringTag = Symbol.toStringTag;
 class NodeOnDiskFile {
     get size() {
@@ -157,5 +86,4 @@ class NodeOnDiskFile {
 }
 
 exports.NodeOnDiskFile = NodeOnDiskFile;
-exports.createFileUploadHandler = createFileUploadHandler;
 exports.readableStreamToString = readableStreamToString;

package/dist/adapters/node-http/content-type/form-data/fileUploadHandler.mjs

@@ -1,12 +1,8 @@
-import { randomBytes } from 'node:crypto';
-import { createWriteStream, statSync, createReadStream } from 'node:fs';
-import { mkdir, rm, unlink, stat } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
-import { resolve, dirname, basename, extname } from 'node:path';
-import { finished, Readable } from 'node:stream';
-import { promisify } from 'node:util';
+import { statSync, createReadStream } from 'node:fs';
+import { unlink } from 'node:fs/promises';
+import { basename } from 'node:path';
+import { Readable } from 'node:stream';
 import { streamSlice } from './streamSlice.mjs';
-import { MaxPartSizeExceededError } from './uploadHandler.mjs';
 
 async function readableStreamToString(stream, encoding) {
     const reader = stream.getReader();
@@ -23,73 +19,6 @@ async function readableStreamToString(stream, encoding) {
     await read();
     return Buffer.concat(chunks).toString(encoding);
 }
-const defaultFilePathResolver = ({ filename ,  })=>{
-    const ext = filename ? extname(filename) : '';
-    return 'upload_' + randomBytes(4).readUInt32LE(0) + ext;
-};
-async function uniqueFile(filepath) {
-    const ext = extname(filepath);
-    let uniqueFilepath = filepath;
-    for(let i = 1; await stat(uniqueFilepath).then(()=>true).catch(()=>false); i++){
-        uniqueFilepath = (ext ? filepath.slice(0, -ext.length) : filepath) + `-${new Date().getTime()}${ext}`;
-    }
-    return uniqueFilepath;
-}
-function createFileUploadHandler({ directory =tmpdir() , avoidFileConflicts =true , file =defaultFilePathResolver , filter , maxPartSize =3000000  } = {}) {
-    return async ({ name , filename , contentType , data  })=>{
-        if (!filename || filter && !await filter({
-            name,
-            filename,
-            contentType
-        })) {
-            return undefined;
-        }
-        const dir = typeof directory === 'string' ? directory : directory({
-            name,
-            filename,
-            contentType
-        });
-        if (!dir) {
-            return undefined;
-        }
-        const filedir = resolve(dir);
-        const path = typeof file === 'string' ? file : file({
-            name,
-            filename,
-            contentType
-        });
-        if (!path) {
-            return undefined;
-        }
-        let filepath = resolve(filedir, path);
-        if (avoidFileConflicts) {
-            filepath = await uniqueFile(filepath);
-        }
-        await mkdir(dirname(filepath), {
-            recursive: true
-        }).catch(()=>{});
-        const writeFileStream = createWriteStream(filepath);
-        let size = 0;
-        let deleteFile = false;
-        try {
-            for await (const chunk of data){
-                size += chunk.byteLength;
-                if (size > maxPartSize) {
-                    deleteFile = true;
-                    throw new MaxPartSizeExceededError(name, maxPartSize);
-                }
-                writeFileStream.write(chunk);
-            }
-        } finally{
-            writeFileStream.end();
-            await promisify(finished)(writeFileStream);
-            if (deleteFile) {
-                await rm(filepath).catch(()=>{});
-            }
-        }
-        return new NodeOnDiskFile(filepath, contentType);
-    };
-}
 let _toStringTag = Symbol.toStringTag;
 class NodeOnDiskFile {
     get size() {
@@ -154,4 +83,4 @@ class NodeOnDiskFile {
     }
 }
 
-export { NodeOnDiskFile, createFileUploadHandler, readableStreamToString };
+export { NodeOnDiskFile, readableStreamToString };