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

package/dist/@trpc/server/http.d.ts

@@ -1,8 +1,9 @@
-export { getHTTPStatusCode, getHTTPStatusCodeFromError, } from '../../unstable-core-do-not-import';
-export { resolveHTTPResponse } from '../../unstable-core-do-not-import';
-export type { BaseHandlerOptions, HTTPBaseHandlerOptions, HTTPHeaders, HTTPRequest, HTTPResponse, OnErrorFunction, ProcedureCall, ResolveHTTPRequestOptionsContextFn, ResponseChunk, ResponseMeta, ResponseMetaFn, TRPCRequestInfo, } from '../../unstable-core-do-not-import';
+export { getHTTPStatusCode, getHTTPStatusCodeFromError, resolveResponse, } from '../../unstable-core-do-not-import';
+export type { BaseHandlerOptions, HTTPBaseHandlerOptions, HTTPErrorHandler, 
+/**
+ * @deprecated Use `HTTPErrorHandler` instead
+ */
+HTTPErrorHandler as OnErrorFunction, ResolveHTTPRequestOptionsContextFn, ResponseMeta, ResponseMetaFn, TRPCRequestInfo, } from '../../unstable-core-do-not-import';
 export { getBatchStreamFormatter } from '../../unstable-core-do-not-import';
-export type { BaseContentTypeHandler, BodyResult, } from '../../unstable-core-do-not-import';
-export { getJsonContentTypeInputs } from '../../unstable-core-do-not-import';
-export { toURL } from '../../unstable-core-do-not-import';
+export { octetInputParser, toURL } from '../../unstable-core-do-not-import';
 //# sourceMappingURL=http.d.ts.map

package/dist/@trpc/server/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../src/@trpc/server/http.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,0BAA0B,GAC3B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,YAAY,EACV,kBAAkB,EAClB,sBAAsB,EACtB,WAAW,EACX,WAAW,EACX,YAAY,EACZ,eAAe,EACf,aAAa,EACb,kCAAkC,EAClC,aAAa,EACb,YAAY,EACZ,cAAc,EACd,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,YAAY,EACV,sBAAsB,EACtB,UAAU,GACX,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../src/@trpc/server/http.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,0BAA0B,EAC1B,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAC3C,YAAY,EACV,kBAAkB,EAClB,sBAAsB,EACtB,gBAAgB;AAChB;;GAEG;AACH,gBAAgB,IAAI,eAAe,EACnC,kCAAkC,EAClC,YAAY,EACZ,cAAc,EACd,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC"}

package/dist/@trpc/server/index.d.ts

@@ -2,7 +2,7 @@ export { TRPCError,
 /**
  * @deprecated use `experimental_trpcMiddleware` instead
  */
-experimental_standaloneMiddleware, experimental_standaloneMiddleware as experimental_trpcMiddleware, initTRPC, callProcedure as callTRPCProcedure, getTRPCErrorFromUnknown, transformTRPCResponse, createFlatProxy as createTRPCFlatProxy, type inferProcedureInput, type inferProcedureOutput, type inferProcedureBuilderResolverOptions, type inferRouterError, type inferRouterInputs, type inferRouterOutputs, type inferRouterContext, type inferClientTypes as inferTRPCClientTypes, type AnyClientTypes as AnyTRPCClientTypes, type inferTransformedProcedureOutput, type inferTransformedSubscriptionOutput, type AnyProcedure as AnyTRPCProcedure, type AnyRouter as AnyTRPCRouter, type AnyMiddlewareFunction as AnyTRPCMiddlewareFunction, type CombinedDataTransformer as TRPCCombinedDataTransformer, type ProcedureType as TRPCProcedureType, type AnyMutationProcedure as AnyTRPCMutationProcedure, type AnyQueryProcedure as AnyTRPCQueryProcedure, type RouterRecord as TRPCRouterRecord, type AnySubscriptionProcedure as AnyTRPCSubscriptionProcedure, type ProcedureOptions as TRPCProcedureOptions, type MutationProcedure as TRPCMutationProcedure, type QueryProcedure as TRPCQueryProcedure, type SubscriptionProcedure as TRPCSubscriptionProcedure, type TRPCBuilder, } from '../../unstable-core-do-not-import';
+experimental_standaloneMiddleware, experimental_standaloneMiddleware as experimental_trpcMiddleware, initTRPC, callProcedure as callTRPCProcedure, getTRPCErrorFromUnknown, transformTRPCResponse, createFlatProxy as createTRPCFlatProxy, type inferProcedureInput, type inferProcedureOutput, type inferProcedureBuilderResolverOptions, type inferRouterError, type inferRouterInputs, type inferRouterOutputs, type inferRouterContext, type inferClientTypes as inferTRPCClientTypes, type AnyClientTypes as AnyTRPCClientTypes, type inferTransformedProcedureOutput, type inferTransformedSubscriptionOutput, type AnyProcedure as AnyTRPCProcedure, type AnyRouter as AnyTRPCRouter, type AnyMiddlewareFunction as AnyTRPCMiddlewareFunction, type CombinedDataTransformer as TRPCCombinedDataTransformer, type ProcedureType as TRPCProcedureType, type AnyMutationProcedure as AnyTRPCMutationProcedure, type AnyQueryProcedure as AnyTRPCQueryProcedure, type RouterRecord as TRPCRouterRecord, type AnySubscriptionProcedure as AnyTRPCSubscriptionProcedure, type ProcedureOptions as TRPCProcedureOptions, type CreateContextCallback, type MutationProcedure as TRPCMutationProcedure, type QueryProcedure as TRPCQueryProcedure, type SubscriptionProcedure as TRPCSubscriptionProcedure, type TRPCBuilder, } from '../../unstable-core-do-not-import';
 export type { 
 /**
  * @deprecated use `AnyTRPCProcedure` instead

package/dist/@trpc/server/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/@trpc/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS;AACT;;GAEG;AACH,iCAAiC,EACjC,iCAAiC,IAAI,2BAA2B,EAChE,QAAQ,EAER,aAAa,IAAI,iBAAiB,EAClC,uBAAuB,EACvB,qBAAqB,EACrB,eAAe,IAAI,mBAAmB,EACtC,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,oCAAoC,EACzC,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,IAAI,oBAAoB,EAC7C,KAAK,cAAc,IAAI,kBAAkB,EACzC,KAAK,+BAA+B,EACpC,KAAK,kCAAkC,EACvC,KAAK,YAAY,IAAI,gBAAgB,EACrC,KAAK,SAAS,IAAI,aAAa,EAC/B,KAAK,qBAAqB,IAAI,yBAAyB,EACvD,KAAK,uBAAuB,IAAI,2BAA2B,EAC3D,KAAK,aAAa,IAAI,iBAAiB,EACvC,KAAK,oBAAoB,IAAI,wBAAwB,EACrD,KAAK,iBAAiB,IAAI,qBAAqB,EAC/C,KAAK,YAAY,IAAI,gBAAgB,EACrC,KAAK,wBAAwB,IAAI,4BAA4B,EAC7D,KAAK,gBAAgB,IAAI,oBAAoB,EAC7C,KAAK,iBAAiB,IAAI,qBAAqB,EAC/C,KAAK,cAAc,IAAI,kBAAkB,EACzC,KAAK,qBAAqB,IAAI,yBAAyB,EACvD,KAAK,WAAW,GACjB,MAAM,mCAAmC,CAAC;AAE3C,YAAY;AACV;;GAEG;AACH,YAAY;AACZ;;GAEG;AACH,SAAS;AACT;;GAEG;AACH,qBAAqB;AACrB;;GAEG;AACH,uBAAuB;AAEvB;;GAEG;AACH,IAAI;AAEJ;;GAEG;AACH,WAAW;AACX;;GAEG;AACH,aAAa;AACb;;GAEG;AACH,oBAAoB;AAEpB;;GAEG;AACH,iBAAiB;AACjB;;GAEG;AACH,wBAAwB,GACzB,MAAM,mCAAmC,CAAC;AAE3C,OAAO;AACL;;GAEG;AACH,aAAa;AAEb;;GAEG;AACH,aAAa,GACd,MAAM,mCAAmC,CAAC;AAE3C;;;GAGG;AACH,MAAM,MAAM,oBAAoB,CAAC,SAAS,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,IACxE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/@trpc/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS;AACT;;GAEG;AACH,iCAAiC,EACjC,iCAAiC,IAAI,2BAA2B,EAChE,QAAQ,EAER,aAAa,IAAI,iBAAiB,EAClC,uBAAuB,EACvB,qBAAqB,EACrB,eAAe,IAAI,mBAAmB,EACtC,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,oCAAoC,EACzC,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,IAAI,oBAAoB,EAC7C,KAAK,cAAc,IAAI,kBAAkB,EACzC,KAAK,+BAA+B,EACpC,KAAK,kCAAkC,EACvC,KAAK,YAAY,IAAI,gBAAgB,EACrC,KAAK,SAAS,IAAI,aAAa,EAC/B,KAAK,qBAAqB,IAAI,yBAAyB,EACvD,KAAK,uBAAuB,IAAI,2BAA2B,EAC3D,KAAK,aAAa,IAAI,iBAAiB,EACvC,KAAK,oBAAoB,IAAI,wBAAwB,EACrD,KAAK,iBAAiB,IAAI,qBAAqB,EAC/C,KAAK,YAAY,IAAI,gBAAgB,EACrC,KAAK,wBAAwB,IAAI,4BAA4B,EAC7D,KAAK,gBAAgB,IAAI,oBAAoB,EAC7C,KAAK,qBAAqB,EAC1B,KAAK,iBAAiB,IAAI,qBAAqB,EAC/C,KAAK,cAAc,IAAI,kBAAkB,EACzC,KAAK,qBAAqB,IAAI,yBAAyB,EACvD,KAAK,WAAW,GACjB,MAAM,mCAAmC,CAAC;AAE3C,YAAY;AACV;;GAEG;AACH,YAAY;AACZ;;GAEG;AACH,SAAS;AACT;;GAEG;AACH,qBAAqB;AACrB;;GAEG;AACH,uBAAuB;AAEvB;;GAEG;AACH,IAAI;AAEJ;;GAEG;AACH,WAAW;AACX;;GAEG;AACH,aAAa;AACb;;GAEG;AACH,oBAAoB;AAEpB;;GAEG;AACH,iBAAiB;AACjB;;GAEG;AACH,wBAAwB,GACzB,MAAM,mCAAmC,CAAC;AAE3C,OAAO;AACL;;GAEG;AACH,aAAa;AAEb;;GAEG;AACH,aAAa,GACd,MAAM,mCAAmC,CAAC;AAE3C;;;GAGG;AACH,MAAM,MAAM,oBAAoB,CAAC,SAAS,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,IACxE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC"}

package/dist/adapters/aws-lambda/getPlanner.d.ts

@@ -0,0 +1,13 @@
+import type { APIGatewayProxyEvent, APIGatewayProxyEventV2, APIGatewayProxyResult, APIGatewayProxyStructuredResultV2 } from 'aws-lambda';
+export type LambdaEvent = APIGatewayProxyEvent | APIGatewayProxyEventV2;
+export type APIGatewayResult = APIGatewayProxyResult | APIGatewayProxyStructuredResultV2;
+/** 1:1 mapping of v1 or v2 input events, deduces which is which.
+ * @internal
+ **/
+export type inferAPIGWReturn<TEvent> = TEvent extends APIGatewayProxyEvent ? APIGatewayProxyResult : TEvent extends APIGatewayProxyEventV2 ? APIGatewayProxyStructuredResultV2 : never;
+export declare function getPlanner<TEvent extends LambdaEvent>(event: TEvent): {
+    path: string;
+    request: Request;
+    toResult: (response: Response) => Promise<inferAPIGWReturn<TEvent>>;
+};
+//# sourceMappingURL=getPlanner.d.ts.map

package/dist/adapters/aws-lambda/getPlanner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getPlanner.d.ts","sourceRoot":"","sources":["../../../src/adapters/aws-lambda/getPlanner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,sBAAsB,EACtB,qBAAqB,EACrB,iCAAiC,EAClC,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,WAAW,GAAG,oBAAoB,GAAG,sBAAsB,CAAC;AAExE,MAAM,MAAM,gBAAgB,GACxB,qBAAqB,GACrB,iCAAiC,CAAC;AActC;;IAEI;AACJ,MAAM,MAAM,gBAAgB,CAAC,MAAM,IAAI,MAAM,SAAS,oBAAoB,GACtE,qBAAqB,GACrB,MAAM,SAAS,sBAAsB,GACrC,iCAAiC,GACjC,KAAK,CAAC;AA0HV,wBAAgB,UAAU,CAAC,MAAM,SAAS,WAAW,EAAE,KAAK,EAAE,MAAM;;;;EAoCnE"}

package/dist/adapters/aws-lambda/getPlanner.js

@@ -0,0 +1,143 @@
+'use strict';
+
+function determinePayloadFormat(event) {
+    // https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html
+    // According to AWS support, version is is extracted from the version property in the event.
+    // If there is no version property, then the version is implied as 1.0
+    const unknownEvent = event;
+    if (typeof unknownEvent.version === 'undefined') {
+        return '1.0';
+    } else {
+        return unknownEvent.version;
+    }
+}
+const v1Processor = {
+    // same as getPath above
+    getTRPCPath: (event)=>{
+        if (!event.pathParameters) {
+            // Then this event was not triggered by a resource denoted with {proxy+}
+            return event.path.split('/').pop() ?? '';
+        }
+        const matches = event.resource.matchAll(/\{(.*?)\}/g);
+        for (const match of matches){
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const group = match[1];
+            if (group.includes('+') && event.pathParameters) {
+                return event.pathParameters[group.replace('+', '')] ?? '';
+            }
+        }
+        return event.path.slice(1);
+    },
+    url (event) {
+        const hostname = event.requestContext.domainName ?? event.headers['host'] ?? event.multiValueHeaders?.['host']?.[0] ?? 'localhost';
+        const searchParams = new URLSearchParams();
+        for (const [key, value] of Object.entries(event.queryStringParameters ?? {})){
+            if (value !== undefined) {
+                searchParams.append(key, value);
+            }
+        }
+        const qs = searchParams.toString();
+        return {
+            hostname,
+            pathname: event.path,
+            search: qs && `?${qs}`
+        };
+    },
+    getHeaders: (event)=>{
+        const headers = new Headers();
+        for (const [key, value] of Object.entries(event.headers ?? {})){
+            if (value !== undefined) {
+                headers.append(key, value);
+            }
+        }
+        for (const [k, values] of Object.entries(event.multiValueHeaders ?? {})){
+            if (values) {
+                values.forEach((v)=>headers.append(k, v));
+            }
+        }
+        return headers;
+    },
+    getMethod: (event)=>event.httpMethod,
+    toResult: async (response)=>{
+        const result = {
+            statusCode: response.status,
+            body: await response.text(),
+            headers: Object.fromEntries(response.headers.entries())
+        };
+        return result;
+    }
+};
+const v2Processor = {
+    getTRPCPath: (event)=>{
+        const matches = event.routeKey.matchAll(/\{(.*?)\}/g);
+        for (const match of matches){
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const group = match[1];
+            if (group.includes('+') && event.pathParameters) {
+                return event.pathParameters[group.replace('+', '')] ?? '';
+            }
+        }
+        return event.rawPath.slice(1);
+    },
+    url (event) {
+        return {
+            hostname: event.requestContext.domainName,
+            pathname: event.rawPath,
+            search: event.rawQueryString && `?${event.rawQueryString}`
+        };
+    },
+    getHeaders: (event)=>{
+        const headers = new Headers();
+        for (const [key, value] of Object.entries(event.headers ?? {})){
+            if (value !== undefined) {
+                headers.append(key, value);
+            }
+        }
+        if (event.cookies) {
+            headers.append('cookie', event.cookies.join('; '));
+        }
+        return headers;
+    },
+    getMethod: (event)=>event.requestContext.http.method,
+    toResult: async (response)=>{
+        const result = {
+            statusCode: response.status,
+            body: await response.text(),
+            headers: Object.fromEntries(response.headers.entries())
+        };
+        return result;
+    }
+};
+function getPlanner(event) {
+    const version = determinePayloadFormat(event);
+    let processor;
+    switch(version){
+        case '1.0':
+            processor = v1Processor;
+            break;
+        case '2.0':
+            processor = v2Processor;
+            break;
+        default:
+            throw new Error(`Unsupported version: ${version}`);
+    }
+    const urlParts = processor.url(event);
+    const url = `https://${urlParts.hostname}${urlParts.pathname}${urlParts.search}`;
+    const init = {
+        headers: processor.getHeaders(event),
+        method: processor.getMethod(event),
+        // @ts-expect-error this is fine
+        duplex: 'half'
+    };
+    if (event.body) {
+        init.body = event.isBase64Encoded ? Buffer.from(event.body, 'base64') : event.body;
+    }
+    const request = new Request(url, init);
+    return {
+        path: processor.getTRPCPath(event),
+        request,
+        toResult: processor.toResult
+    };
+}
+
+exports.getPlanner = getPlanner;

package/dist/adapters/aws-lambda/getPlanner.mjs

@@ -0,0 +1,141 @@
+function determinePayloadFormat(event) {
+    // https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html
+    // According to AWS support, version is is extracted from the version property in the event.
+    // If there is no version property, then the version is implied as 1.0
+    const unknownEvent = event;
+    if (typeof unknownEvent.version === 'undefined') {
+        return '1.0';
+    } else {
+        return unknownEvent.version;
+    }
+}
+const v1Processor = {
+    // same as getPath above
+    getTRPCPath: (event)=>{
+        if (!event.pathParameters) {
+            // Then this event was not triggered by a resource denoted with {proxy+}
+            return event.path.split('/').pop() ?? '';
+        }
+        const matches = event.resource.matchAll(/\{(.*?)\}/g);
+        for (const match of matches){
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const group = match[1];
+            if (group.includes('+') && event.pathParameters) {
+                return event.pathParameters[group.replace('+', '')] ?? '';
+            }
+        }
+        return event.path.slice(1);
+    },
+    url (event) {
+        const hostname = event.requestContext.domainName ?? event.headers['host'] ?? event.multiValueHeaders?.['host']?.[0] ?? 'localhost';
+        const searchParams = new URLSearchParams();
+        for (const [key, value] of Object.entries(event.queryStringParameters ?? {})){
+            if (value !== undefined) {
+                searchParams.append(key, value);
+            }
+        }
+        const qs = searchParams.toString();
+        return {
+            hostname,
+            pathname: event.path,
+            search: qs && `?${qs}`
+        };
+    },
+    getHeaders: (event)=>{
+        const headers = new Headers();
+        for (const [key, value] of Object.entries(event.headers ?? {})){
+            if (value !== undefined) {
+                headers.append(key, value);
+            }
+        }
+        for (const [k, values] of Object.entries(event.multiValueHeaders ?? {})){
+            if (values) {
+                values.forEach((v)=>headers.append(k, v));
+            }
+        }
+        return headers;
+    },
+    getMethod: (event)=>event.httpMethod,
+    toResult: async (response)=>{
+        const result = {
+            statusCode: response.status,
+            body: await response.text(),
+            headers: Object.fromEntries(response.headers.entries())
+        };
+        return result;
+    }
+};
+const v2Processor = {
+    getTRPCPath: (event)=>{
+        const matches = event.routeKey.matchAll(/\{(.*?)\}/g);
+        for (const match of matches){
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const group = match[1];
+            if (group.includes('+') && event.pathParameters) {
+                return event.pathParameters[group.replace('+', '')] ?? '';
+            }
+        }
+        return event.rawPath.slice(1);
+    },
+    url (event) {
+        return {
+            hostname: event.requestContext.domainName,
+            pathname: event.rawPath,
+            search: event.rawQueryString && `?${event.rawQueryString}`
+        };
+    },
+    getHeaders: (event)=>{
+        const headers = new Headers();
+        for (const [key, value] of Object.entries(event.headers ?? {})){
+            if (value !== undefined) {
+                headers.append(key, value);
+            }
+        }
+        if (event.cookies) {
+            headers.append('cookie', event.cookies.join('; '));
+        }
+        return headers;
+    },
+    getMethod: (event)=>event.requestContext.http.method,
+    toResult: async (response)=>{
+        const result = {
+            statusCode: response.status,
+            body: await response.text(),
+            headers: Object.fromEntries(response.headers.entries())
+        };
+        return result;
+    }
+};
+function getPlanner(event) {
+    const version = determinePayloadFormat(event);
+    let processor;
+    switch(version){
+        case '1.0':
+            processor = v1Processor;
+            break;
+        case '2.0':
+            processor = v2Processor;
+            break;
+        default:
+            throw new Error(`Unsupported version: ${version}`);
+    }
+    const urlParts = processor.url(event);
+    const url = `https://${urlParts.hostname}${urlParts.pathname}${urlParts.search}`;
+    const init = {
+        headers: processor.getHeaders(event),
+        method: processor.getMethod(event),
+        // @ts-expect-error this is fine
+        duplex: 'half'
+    };
+    if (event.body) {
+        init.body = event.isBase64Encoded ? Buffer.from(event.body, 'base64') : event.body;
+    }
+    const request = new Request(url, init);
+    return {
+        path: processor.getTRPCPath(event),
+        request,
+        toResult: processor.toResult
+    };
+}
+
+export { getPlanner };

package/dist/adapters/aws-lambda/index.d.ts

@@ -7,13 +7,16 @@
  * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
  * ```
  */
-import type { APIGatewayProxyEvent, APIGatewayProxyEventV2, APIGatewayProxyResult, APIGatewayProxyStructuredResultV2, Context as APIGWContext } from 'aws-lambda';
-import type { AnyRouter } from '../../@trpc/server';
-import type { APIGatewayEvent, AWSLambdaOptions } from './utils';
-export * from './utils';
-/** 1:1 mapping of v1 or v2 input events, deduces which is which.
- * @internal
- **/
-type inferAPIGWReturn<TType> = TType extends APIGatewayProxyEvent ? APIGatewayProxyResult : TType extends APIGatewayProxyEventV2 ? APIGatewayProxyStructuredResultV2 : never;
-export declare function awsLambdaRequestHandler<TRouter extends AnyRouter, TEvent extends APIGatewayEvent, TResult extends inferAPIGWReturn<TEvent>>(opts: AWSLambdaOptions<TRouter, TEvent>): (event: TEvent, context: APIGWContext) => Promise<TResult>;
+import type { Context as APIGWContext } from 'aws-lambda';
+import type { AnyRouter, CreateContextCallback, inferRouterContext } from '../../@trpc/server';
+import type { HTTPBaseHandlerOptions, TRPCRequestInfo } from '../../@trpc/server/http';
+import type { inferAPIGWReturn, LambdaEvent } from './getPlanner';
+export type CreateAWSLambdaContextOptions<TEvent extends LambdaEvent> = {
+    event: TEvent;
+    context: APIGWContext;
+    info: TRPCRequestInfo;
+};
+export type AWSLambdaOptions<TRouter extends AnyRouter, TEvent extends LambdaEvent> = HTTPBaseHandlerOptions<TRouter, TEvent> & CreateContextCallback<inferRouterContext<AnyRouter>, AWSLambdaCreateContextFn<TRouter, TEvent>>;
+export type AWSLambdaCreateContextFn<TRouter extends AnyRouter, TEvent extends LambdaEvent> = ({ event, context, info, }: CreateAWSLambdaContextOptions<TEvent>) => inferRouterContext<TRouter> | Promise<inferRouterContext<TRouter>>;
+export declare function awsLambdaRequestHandler<TRouter extends AnyRouter, TEvent extends LambdaEvent>(opts: AWSLambdaOptions<TRouter, TEvent>): (event: TEvent, context: APIGWContext) => Promise<inferAPIGWReturn<TEvent>>;
 //# sourceMappingURL=index.d.ts.map

package/dist/adapters/aws-lambda/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/aws-lambda/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EACV,oBAAoB,EACpB,sBAAsB,EACtB,qBAAqB,EACrB,iCAAiC,EACjC,OAAO,IAAI,YAAY,EACxB,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AASpD,OAAO,KAAK,EACV,eAAe,EAEf,gBAAgB,EACjB,MAAM,SAAS,CAAC;AAUjB,cAAc,SAAS,CAAC;AAqDxB;;IAEI;AACJ,KAAK,gBAAgB,CAAC,KAAK,IAAI,KAAK,SAAS,oBAAoB,GAC7D,qBAAqB,GACrB,KAAK,SAAS,sBAAsB,GACpC,iCAAiC,GACjC,KAAK,CAAC;AACV,wBAAgB,uBAAuB,CACrC,OAAO,SAAS,SAAS,EACzB,MAAM,SAAS,eAAe,EAC9B,OAAO,SAAS,gBAAgB,CAAC,MAAM,CAAC,EAExC,IAAI,EAAE,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,GACtC,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,OAAO,CAAC,CA0B5D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/aws-lambda/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1D,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EACV,sBAAsB,EAEtB,eAAe,EAChB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGlE,MAAM,MAAM,6BAA6B,CAAC,MAAM,SAAS,WAAW,IAAI;IACtE,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,YAAY,CAAC;IACtB,IAAI,EAAE,eAAe,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAC1B,OAAO,SAAS,SAAS,EACzB,MAAM,SAAS,WAAW,IAExB,sBAAsB,CAAC,OAAO,EAAE,MAAM,CAAC,GACrC,qBAAqB,CACnB,kBAAkB,CAAC,SAAS,CAAC,EAC7B,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAC1C,CAAC;AAER,MAAM,MAAM,wBAAwB,CAClC,OAAO,SAAS,SAAS,EACzB,MAAM,SAAS,WAAW,IACxB,CAAC,EACH,KAAK,EACL,OAAO,EACP,IAAI,GACL,EAAE,6BAA6B,CAAC,MAAM,CAAC,KACpC,kBAAkB,CAAC,OAAO,CAAC,GAC3B,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAEzC,wBAAgB,uBAAuB,CACrC,OAAO,SAAS,SAAS,EACzB,MAAM,SAAS,WAAW,EAE1B,IAAI,EAAE,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,GACtC,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CA0B7E"}

package/dist/adapters/aws-lambda/index.js

@@ -1,65 +1,12 @@
 'use strict';
 
-var TRPCError = require('../../unstable-core-do-not-import/error/TRPCError.js');
 var resolveHTTPResponse = require('../../unstable-core-do-not-import/http/resolveHTTPResponse.js');
 require('../../unstable-core-do-not-import/rootConfig.js');
-var utils = require('./utils.js');
+var getPlanner = require('./getPlanner.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`
- *
- * @example
- * ```ts
- * import type { AnyTRPCRouter } from '@trpc/server'
- * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
- * ```
- */ // @trpc/server
-function lambdaEventToHTTPRequest(event) {
-    const query = new URLSearchParams();
-    for (const [key, value] of Object.entries(event.queryStringParameters ?? {})){
-        if (typeof value !== 'undefined') {
-            query.append(key, value);
-        }
-    }
-    let body;
-    if (event.body && event.isBase64Encoded) {
-        body = Buffer.from(event.body, 'base64').toString('utf8');
-    } else {
-        body = event.body;
-    }
-    return {
-        method: utils.getHTTPMethod(event),
-        query: query,
-        headers: event.headers,
-        body: body
-    };
-}
-function tRPCOutputToAPIGatewayOutput(event, response) {
-    if (utils.isPayloadV1(event)) {
-        const resp = {
-            statusCode: response.status,
-            body: response.body ?? '',
-            headers: utils.transformHeaders(response.headers ?? {})
-        };
-        return resp;
-    } else if (utils.isPayloadV2(event)) {
-        const resp1 = {
-            statusCode: response.status,
-            body: response.body ?? undefined,
-            headers: utils.transformHeaders(response.headers ?? {})
-        };
-        return resp1;
-    } else {
-        throw new TRPCError.TRPCError({
-            code: 'INTERNAL_SERVER_ERROR',
-            message: utils.UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
-        });
-    }
-}
 function awsLambdaRequestHandler(opts) {
     return async (event, context)=>{
-        const req = lambdaEventToHTTPRequest(event);
-        const path = utils.getPath(event);
+        const planner = getPlanner.getPlanner(event);
         const createContext = async (innerOpts)=>{
             return await opts.createContext?.({
                 event,
@@ -67,11 +14,11 @@ function awsLambdaRequestHandler(opts) {
                 ...innerOpts
             });
         };
-        const response = await resolveHTTPResponse.resolveHTTPResponse({
+        const response = await resolveHTTPResponse.resolveResponse({
             ...opts,
             createContext,
-            req,
-            path,
+            req: planner.request,
+            path: planner.path,
             error: null,
             onError (o) {
                 opts?.onError?.({
@@ -80,14 +27,8 @@ function awsLambdaRequestHandler(opts) {
                 });
             }
         });
-        return tRPCOutputToAPIGatewayOutput(event, response);
+        return await planner.toResult(response);
     };
 }
 
-exports.UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE = utils.UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE;
-exports.getHTTPMethod = utils.getHTTPMethod;
-exports.getPath = utils.getPath;
-exports.isPayloadV1 = utils.isPayloadV1;
-exports.isPayloadV2 = utils.isPayloadV2;
-exports.transformHeaders = utils.transformHeaders;
 exports.awsLambdaRequestHandler = awsLambdaRequestHandler;

package/dist/adapters/aws-lambda/index.mjs

@@ -1,63 +1,10 @@
-import { TRPCError } from '../../unstable-core-do-not-import/error/TRPCError.mjs';
-import { resolveHTTPResponse } from '../../unstable-core-do-not-import/http/resolveHTTPResponse.mjs';
+import { resolveResponse } from '../../unstable-core-do-not-import/http/resolveHTTPResponse.mjs';
 import '../../unstable-core-do-not-import/rootConfig.mjs';
-import { getPath, getHTTPMethod, isPayloadV1, transformHeaders, isPayloadV2, UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE } from './utils.mjs';
+import { getPlanner } from './getPlanner.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`
- *
- * @example
- * ```ts
- * import type { AnyTRPCRouter } from '@trpc/server'
- * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
- * ```
- */ // @trpc/server
-function lambdaEventToHTTPRequest(event) {
-    const query = new URLSearchParams();
-    for (const [key, value] of Object.entries(event.queryStringParameters ?? {})){
-        if (typeof value !== 'undefined') {
-            query.append(key, value);
-        }
-    }
-    let body;
-    if (event.body && event.isBase64Encoded) {
-        body = Buffer.from(event.body, 'base64').toString('utf8');
-    } else {
-        body = event.body;
-    }
-    return {
-        method: getHTTPMethod(event),
-        query: query,
-        headers: event.headers,
-        body: body
-    };
-}
-function tRPCOutputToAPIGatewayOutput(event, response) {
-    if (isPayloadV1(event)) {
-        const resp = {
-            statusCode: response.status,
-            body: response.body ?? '',
-            headers: transformHeaders(response.headers ?? {})
-        };
-        return resp;
-    } else if (isPayloadV2(event)) {
-        const resp1 = {
-            statusCode: response.status,
-            body: response.body ?? undefined,
-            headers: transformHeaders(response.headers ?? {})
-        };
-        return resp1;
-    } else {
-        throw new TRPCError({
-            code: 'INTERNAL_SERVER_ERROR',
-            message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
-        });
-    }
-}
 function awsLambdaRequestHandler(opts) {
     return async (event, context)=>{
-        const req = lambdaEventToHTTPRequest(event);
-        const path = getPath(event);
+        const planner = getPlanner(event);
         const createContext = async (innerOpts)=>{
             return await opts.createContext?.({
                 event,
@@ -65,11 +12,11 @@ function awsLambdaRequestHandler(opts) {
                 ...innerOpts
             });
         };
-        const response = await resolveHTTPResponse({
+        const response = await resolveResponse({
             ...opts,
             createContext,
-            req,
-            path,
+            req: planner.request,
+            path: planner.path,
             error: null,
             onError (o) {
                 opts?.onError?.({
@@ -78,8 +25,8 @@ function awsLambdaRequestHandler(opts) {
                 });
             }
         });
-        return tRPCOutputToAPIGatewayOutput(event, response);
+        return await planner.toResult(response);
     };
 }
 
-export { UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE, awsLambdaRequestHandler, getHTTPMethod, getPath, isPayloadV1, isPayloadV2, transformHeaders };
+export { awsLambdaRequestHandler };

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

@@ -1 +1 @@
-{"version":3,"file":"express.d.ts","sourceRoot":"","sources":["../../src/adapters/express.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,KAAK,OAAO,MAAM,SAAS,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EACV,8BAA8B,EAC9B,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAGrB,MAAM,MAAM,2BAA2B,GAAG,8BAA8B,CACtE,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,QAAQ,CACjB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,OAAO,SAAS,SAAS,EAC/D,IAAI,EAAE,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,GACvE,OAAO,CAAC,OAAO,CAgBjB"}
+{"version":3,"file":"express.d.ts","sourceRoot":"","sources":["../../src/adapters/express.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,KAAK,OAAO,MAAM,SAAS,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EACV,8BAA8B,EAC9B,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAGrB,MAAM,MAAM,2BAA2B,GAAG,8BAA8B,CACtE,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,QAAQ,CACjB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,OAAO,SAAS,SAAS,EAC/D,IAAI,EAAE,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,GACvE,OAAO,CAAC,OAAO,CAWjB"}

package/dist/adapters/express.js

@@ -1,12 +1,12 @@
 'use strict';
 
 var nodeHTTPRequestHandler = require('./node-http/nodeHTTPRequestHandler.js');
+require('../unstable-core-do-not-import/rootConfig.js');
 
 function createExpressMiddleware(opts) {
     return async (req, res)=>{
         const endpoint = req.path.slice(1);
         await nodeHTTPRequestHandler.nodeHTTPRequestHandler({
-            // FIXME: no typecasting should be needed here
             ...opts,
             req,
             res,

package/dist/adapters/express.mjs

@@ -1,10 +1,10 @@
 import { nodeHTTPRequestHandler } from './node-http/nodeHTTPRequestHandler.mjs';
+import '../unstable-core-do-not-import/rootConfig.mjs';
 
 function createExpressMiddleware(opts) {
     return async (req, res)=>{
         const endpoint = req.path.slice(1);
         await nodeHTTPRequestHandler({
-            // FIXME: no typecasting should be needed here
             ...opts,
             req,
             res,

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

@@ -1,3 +1,12 @@
+/**
+ * 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`
+ *
+ * @example
+ * ```ts
+ * import type { AnyTRPCRouter } from '@trpc/server'
+ * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
+ * ```
+ */
 import type { FastifyReply, FastifyRequest } from 'fastify';
 import type { AnyRouter } from '../../@trpc/server';
 import type { HTTPBaseHandlerOptions } from '../../@trpc/server/http';
@@ -8,6 +17,6 @@ type FastifyRequestHandlerOptions<TRouter extends AnyRouter, TRequest extends Fa
     res: TResponse;
     path: string;
 };
-export declare function fastifyRequestHandler<TRouter extends AnyRouter, TRequest extends FastifyRequest, TResponse extends FastifyReply>(opts: FastifyRequestHandlerOptions<TRouter, TRequest, TResponse>): Promise<never>;
+export declare function fastifyRequestHandler<TRouter extends AnyRouter, TRequest extends FastifyRequest, TResponse extends FastifyReply>(opts: FastifyRequestHandlerOptions<TRouter, TRequest, TResponse>): Promise<void>;
 export {};
 //# sourceMappingURL=fastifyRequestHandler.d.ts.map

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":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EACV,sBAAsB,EAEvB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAEV,2BAA2B,EAC5B,MAAM,cAAc,CAAC;AAGtB,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,iBAkCjE"}