@trpc/server 9.25.0 → 9.25.3

package/src/adapters/{lambda → aws-lambda}/utils.ts

@@ -13,17 +13,17 @@ export type APIGatewayResult =
   | APIGatewayProxyResult
   | APIGatewayProxyStructuredResultV2;
 
-export type CreateLambdaContextOptions<T extends APIGatewayEvent> = {
+export type CreateAWSLambdaContextOptions<T extends APIGatewayEvent> = {
   event: T;
   context: APIGWContext;
 };
-export type LambdaCreateContextFn<
+export type AWSLambdaCreateContextFn<
   TRouter extends AnyRouter,
   TEvent extends APIGatewayEvent,
 > = ({
   event,
   context,
-}: CreateLambdaContextOptions<TEvent>) =>
+}: CreateAWSLambdaContextOptions<TEvent>) =>
   | inferRouterContext<TRouter>
   | Promise<inferRouterContext<TRouter>>;
 
@@ -43,13 +43,13 @@ export type AWSLambdaOptions<
           /**
            * @link https://trpc.io/docs/context
            **/
-          createContext: LambdaCreateContextFn<TRouter, TEvent>;
+          createContext: AWSLambdaCreateContextFn<TRouter, TEvent>;
         }
       | {
           /**
            * @link https://trpc.io/docs/context
            **/
-          createContext?: LambdaCreateContextFn<TRouter, TEvent>;
+          createContext?: AWSLambdaCreateContextFn<TRouter, TEvent>;
         }
     );
 

package/src/adapters/lambda/index.ts

@@ -1,156 +1,18 @@
-import type {
-  Context as APIGWContext,
-  APIGatewayProxyEvent,
-  APIGatewayProxyEventV2,
-  APIGatewayProxyResult,
-  APIGatewayProxyStructuredResultV2,
-} from 'aws-lambda';
-import { TRPCError, resolveHTTPResponse } from '../..';
-import { HTTPHeaders, HTTPRequest } from '../../http/internals/types';
-import type { HTTPResponse } from '../../http/internals/types';
-import { AnyRouter, inferRouterContext } from '../../router';
 import {
-  APIGatewayEvent,
-  APIGatewayResult,
-  AWSLambdaOptions,
-  UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE,
-  isPayloadV1,
-  isPayloadV2,
-} from './utils';
-
-export type { CreateLambdaContextOptions, AWSLambdaOptions } from './utils';
-
-function lambdaEventToHTTPRequest(event: APIGatewayEvent): HTTPRequest {
-  const query = new URLSearchParams();
-  for (const [key, value] of Object.entries(
-    event.queryStringParameters ?? {},
-  )) {
-    if (typeof value !== 'undefined') {
-      query.append(key, value);
-    }
-  }
-
-  return {
-    method: getHTTPMethod(event),
-    query: query,
-    headers: event.headers,
-    body: event.body,
-  };
-}
-
-function getHTTPMethod(event: APIGatewayEvent) {
-  if (isPayloadV1(event)) {
-    return event.httpMethod;
-  }
-  if (isPayloadV2(event)) {
-    return event.requestContext.http.method;
-  }
-  throw new TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE,
-  });
-}
-function getPath(event: APIGatewayEvent) {
-  if (isPayloadV1(event)) {
-    return event.path.slice(1);
-  }
-  if (isPayloadV2(event)) {
-    return event.rawPath.slice(1);
-  }
-  throw new TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE,
-  });
-}
-function transformHeaders(headers: HTTPHeaders): APIGatewayResult['headers'] {
-  const obj: APIGatewayResult['headers'] = {};
-
-  for (const [key, value] of Object.entries(headers)) {
-    if (typeof value === 'undefined') {
-      continue;
-    }
-    obj[key] = Array.isArray(value) ? value.join(',') : value;
-  }
-  return obj;
-}
-function tRPCOutputToAPIGatewayOutput<
-  TEvent extends APIGatewayEvent,
-  TResult extends APIGatewayResult,
->(event: TEvent, response: HTTPResponse): TResult {
-  if (isPayloadV1(event)) {
-    const resp: APIGatewayProxyResult = {
-      statusCode: response.status,
-      body: response.body ?? '',
-      headers: transformHeaders(response.headers ?? {}),
-    };
-    return resp as TResult;
-  } else if (isPayloadV2(event)) {
-    const resp: APIGatewayProxyStructuredResultV2 = {
-      statusCode: response.status,
-      body: response.body ?? undefined,
-      headers: transformHeaders(response.headers ?? {}),
-    };
-    return resp as TResult;
-  } else {
-    throw new TRPCError({
-      code: 'INTERNAL_SERVER_ERROR',
-      message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE,
-    });
-  }
-}
-
-/** Will check the createContext of the TRouter and get the parameter of event.
- * @internal
- **/
-type inferAPIGWEvent<
-  TRouter extends AnyRouter,
-  TEvent extends APIGatewayEvent,
-> = AWSLambdaOptions<TRouter, TEvent>['createContext'] extends NonNullable<
-  AWSLambdaOptions<TRouter, TEvent>['createContext']
->
-  ? Parameters<AWSLambdaOptions<TRouter, TEvent>['createContext']>[0]['event']
-  : APIGatewayEvent;
-
-/** 1:1 mapping of v1 or v2 input events, deduces which is which.
- * @internal
- **/
-type inferAPIGWReturn<T> = T extends APIGatewayProxyEvent
-  ? APIGatewayProxyResult
-  : T extends APIGatewayProxyEventV2
-  ? APIGatewayProxyStructuredResultV2
-  : never;
-export function lambdaRequestHandler<
-  TRouter extends AnyRouter,
-  TEvent extends inferAPIGWEvent<TRouter, TEvent>,
-  TResult extends inferAPIGWReturn<TEvent>,
->(
-  opts: AWSLambdaOptions<TRouter, TEvent>,
-): (event: TEvent, context: APIGWContext) => Promise<TResult> {
-  return async (event, context) => {
-    const req = lambdaEventToHTTPRequest(event);
-    const path = getPath(event);
-    const createContext = async function _createContext(): Promise<
-      inferRouterContext<TRouter>
-    > {
-      return await opts.createContext?.({ event, context });
-    };
-
-    const response = await resolveHTTPResponse({
-      router: opts.router,
-      batching: opts.batching,
-      responseMeta: opts?.responseMeta,
-      createContext,
-      req,
-      path,
-      error: null,
-      onError(o) {
-        opts?.onError?.({
-          ...o,
-          req: event,
-        });
-      },
-    });
-
-    return tRPCOutputToAPIGatewayOutput<TEvent, TResult>(event, response);
-  };
-}
+  CreateAWSLambdaContextOptions,
+  awsLambdaRequestHandler,
+} from '../aws-lambda';
+import { APIGatewayEvent } from '../aws-lambda/utils';
+
+export * from '../aws-lambda';
+
+/**
+ * @deprecated use `aws-lambda` instead
+ */
+export type CreateLambdaContextOptions<T extends APIGatewayEvent> =
+  CreateAWSLambdaContextOptions<T>;
+
+/**
+ * @deprecated use `aws-lambda` instead
+ */
+export const lambdaRequestHandler = awsLambdaRequestHandler;

package/dist/declarations/src/adapters/lambda/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"../../../../../src/adapters/lambda","sources":["utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,IAAI,YAAY,EACvB,oBAAoB,EACpB,sBAAsB,EACtB,qBAAqB,EACrB,iCAAiC,EAClC,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAElE,oBAAY,eAAe,GAAG,oBAAoB,GAAG,sBAAsB,CAAC;AAC5E,oBAAY,gBAAgB,GACxB,qBAAqB,GACrB,iCAAiC,CAAC;AAEtC,oBAAY,0BAA0B,CAAC,CAAC,SAAS,eAAe,IAAI;IAClE,KAAK,EAAE,CAAC,CAAC;IACT,OAAO,EAAE,YAAY,CAAC;CACvB,CAAC;AACF,oBAAY,qBAAqB,CAC/B,OAAO,SAAS,SAAS,EACzB,MAAM,SAAS,eAAe,IAC5B,CAAC,EACH,KAAK,EACL,OAAO,GACR,EAAE,0BAA0B,CAAC,MAAM,CAAC,KACjC,kBAAkB,CAAC,OAAO,CAAC,GAC3B,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAEzC,oBAAY,gBAAgB,CAC1B,OAAO,SAAS,SAAS,EACzB,MAAM,SAAS,eAAe,IAE9B,CAAE;IACE,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE;QACT,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;IACF,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IACrD,YAAY,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;CACxC,GAAG,CACA;IACE;;QAEI;IACJ,aAAa,EAAE,qBAAqB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;CACvD,GACD;IACE;;QAEI;IACJ,aAAa,CAAC,EAAE,qBAAqB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;CACxD,CACJ,CAAA,CAAC;AAEN,wBAAgB,WAAW,CACzB,KAAK,EAAE,eAAe,GACrB,KAAK,IAAI,oBAAoB,CAE/B;AACD,wBAAgB,WAAW,CACzB,KAAK,EAAE,eAAe,GACrB,KAAK,IAAI,sBAAsB,CAEjC;AAmBD,oBAAY,+BAA+B,GAAG,KAAK,GAAG,KAAK,CAAC;AAC5D,oBAAY,8BAA8B,GACtC,+BAA+B,GAC/B,QAAQ,CAAC;AAEb,eAAO,MAAM,4CAA4C,QAEiD,CAAC"}