@trpc/server 10.0.0-alpha.4 → 10.0.0-alpha.40

package/dist/subscription.mjs

@@ -0,0 +1,40 @@
+import { a as getErrorFromUnknown } from './TRPCError-b7fa0c31.mjs';
+import { o as observable } from './observable-cfedfa30.mjs';
+
+function subscriptionPullFactory(opts) {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  let timer;
+  let stopped = false;
+
+  async function _pull(emit) {
+    /* istanbul ignore next */
+    if (stopped) {
+      return;
+    }
+
+    try {
+      await opts.pull(emit);
+    } catch (err
+    /* istanbul ignore next */
+    ) {
+      emit.error(getErrorFromUnknown(err));
+    }
+    /* istanbul ignore else */
+
+
+    if (!stopped) {
+      timer = setTimeout(() => _pull(emit), opts.intervalMs);
+    }
+  }
+
+  return observable(emit => {
+    _pull(emit).catch(err => emit.error(getErrorFromUnknown(err)));
+
+    return () => {
+      clearTimeout(timer);
+      stopped = true;
+    };
+  });
+}
+
+export { subscriptionPullFactory };

package/dist/subscription.ts.js

@@ -0,0 +1 @@
+

package/dist/transformTRPCResponse-0c261655.js

@@ -0,0 +1,29 @@
+'use strict';
+
+function transformTRPCResponseItem(router, item) {
+  if ('error' in item) {
+    return { ...item,
+      error: router._def.transformer.output.serialize(item.error)
+    };
+  }
+
+  if ('data' in item.result) {
+    return { ...item,
+      result: { ...item.result,
+        data: router._def.transformer.output.serialize(item.result.data)
+      }
+    };
+  }
+
+  return item;
+}
+/**
+ * Takes a unserialized `TRPCResponse` and serializes it with the router's transformers
+ **/
+
+
+function transformTRPCResponse(router, itemOrItems) {
+  return Array.isArray(itemOrItems) ? itemOrItems.map(item => transformTRPCResponseItem(router, item)) : transformTRPCResponseItem(router, itemOrItems);
+}
+
+exports.transformTRPCResponse = transformTRPCResponse;

package/dist/transformTRPCResponse-747b9a68.mjs

@@ -0,0 +1,27 @@
+function transformTRPCResponseItem(router, item) {
+  if ('error' in item) {
+    return { ...item,
+      error: router._def.transformer.output.serialize(item.error)
+    };
+  }
+
+  if ('data' in item.result) {
+    return { ...item,
+      result: { ...item.result,
+        data: router._def.transformer.output.serialize(item.result.data)
+      }
+    };
+  }
+
+  return item;
+}
+/**
+ * Takes a unserialized `TRPCResponse` and serializes it with the router's transformers
+ **/
+
+
+function transformTRPCResponse(router, itemOrItems) {
+  return Array.isArray(itemOrItems) ? itemOrItems.map(item => transformTRPCResponseItem(router, item)) : transformTRPCResponseItem(router, itemOrItems);
+}
+
+export { transformTRPCResponse as t };

package/dist/transformer.d.ts

@@ -27,4 +27,18 @@ export declare type DataTransformerOptions = DataTransformer | CombinedDataTrans
  * @public
  */
 export declare type ClientDataTransformerOptions = DataTransformer | CombinedDataTransformerClient;
+/**
+ * @internal
+ */
+export declare function getDataTransformer(transformer: DataTransformerOptions): CombinedDataTransformer;
+/**
+ * @internal
+ */
+export declare type DefaultDataTransformer = CombinedDataTransformer & {
+    _default: true;
+};
+/**
+ * @internal
+ */
+export declare const defaultTransformer: DefaultDataTransformer;
 //# sourceMappingURL=transformer.d.ts.map

package/dist/transformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transformer.d.ts","sourceRoot":"","sources":["../src/transformer.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,oBAAY,eAAe,GAAG;IAC5B,SAAS,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC;IAC5B,WAAW,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC;CAC/B,CAAC;AAEF;;GAEG;AACH,oBAAY,uBAAuB,GAAG;IACpC,KAAK,EAAE,eAAe,CAAC;IACvB,MAAM,EAAE,eAAe,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,oBAAY,6BAA6B,GAAG;IAC1C,KAAK,EAAE,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IAC1C,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;CAC9C,CAAC;AAEF;;GAEG;AACH,oBAAY,sBAAsB,GAAG,eAAe,GAAG,uBAAuB,CAAC;AAE/E;;GAEG;AACH,oBAAY,4BAA4B,GACpC,eAAe,GACf,6BAA6B,CAAC"}
+{"version":3,"file":"transformer.d.ts","sourceRoot":"","sources":["../src/transformer.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,oBAAY,eAAe,GAAG;IAC5B,SAAS,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC;IAC5B,WAAW,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC;CAC/B,CAAC;AAEF;;GAEG;AACH,oBAAY,uBAAuB,GAAG;IACpC,KAAK,EAAE,eAAe,CAAC;IACvB,MAAM,EAAE,eAAe,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,oBAAY,6BAA6B,GAAG;IAC1C,KAAK,EAAE,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IAC1C,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;CAC9C,CAAC;AAEF;;GAEG;AACH,oBAAY,sBAAsB,GAAG,eAAe,GAAG,uBAAuB,CAAC;AAE/E;;GAEG;AACH,oBAAY,4BAA4B,GACpC,eAAe,GACf,6BAA6B,CAAC;AAElC;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,WAAW,EAAE,sBAAsB,GAClC,uBAAuB,CAKzB;AAED;;GAEG;AACH,oBAAY,sBAAsB,GAAG,uBAAuB,GAAG;IAC7D,QAAQ,EAAE,IAAI,CAAC;CAChB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,sBAIhC,CAAC"}

package/dist/types.d.ts

@@ -4,16 +4,8 @@
 export declare type Prefix<K extends string, T extends string> = `${K}${T}`;
 /**
  * @internal
- * @deprecated will be removed in next major
  */
 export declare type identity<T> = T;
-/**
- * @internal
- * @deprecated will be removed in next major
- */
-export declare type format<T> = {
-    [k in keyof T]: T[k];
-};
 /**
  * @internal
  */
@@ -38,4 +30,39 @@ export declare type ThenArg<T> = T extends PromiseLike<infer U> ? ThenArg<U> : T
  * @public
  */
 export declare type Dict<T> = Record<string, T | undefined>;
+/**
+ * @public
+ */
+export declare type MaybePromise<T> = T | Promise<T>;
+/**
+ * @internal
+ *
+ * Creates a "lower-priority" type inference.
+ * https://github.com/microsoft/TypeScript/issues/14829#issuecomment-322267089
+ */
+export declare type InferLast<T> = T & {
+    [K in keyof T]: T[K];
+};
+/**
+ * @public
+ */
+export declare type inferAsyncReturnType<TFunction extends (...args: any) => any> = ThenArg<ReturnType<TFunction>>;
+declare type FilterKeys<T extends object, K> = {
+    [TKey in keyof T]: T[TKey] extends K ? TKey : never;
+}[keyof T];
+/**
+ * @internal
+ */
+export declare type Filter<T extends object, K> = Pick<T, FilterKeys<T, K>>;
+/**
+ * @internal
+ */
+export declare type NeverKeys<T> = {
+    [TKey in keyof T]: T[TKey] extends never ? TKey : never;
+}[keyof T];
+/**
+ * @internal
+ */
+export declare type OmitNeverKeys<T> = Omit<T, NeverKeys<T>>;
+export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,oBAAY,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;AAEpE;;;GAGG;AACH,oBAAY,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;AAE5B;;;GAGG;AACH,oBAAY,MAAM,CAAC,CAAC,IAAI;KACrB,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,oBAAY,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC;KAClC,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GACvC,CAAC,CAAC,CAAC,CAAC,GACJ,CAAC,SAAS,MAAM,CAAC,GACjB,CAAC,CAAC,CAAC,CAAC,GACJ,KAAK;CACV,CAAC,CAAC;AAEH;;GAEG;AACH,oBAAY,QAAQ,CAClB,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,OAAO,SAAS,MAAM,IACpB;KACD,CAAC,IAAI,MAAM,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;CAC1D,CAAC;AAEF;;GAEG;AACH,oBAAY,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;AAE5C;;GAEG;AACH,oBAAY,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEzE;;GAEG;AACH,oBAAY,IAAI,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,oBAAY,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;AAEpE;;GAEG;AACH,oBAAY,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;AAE5B;;GAEG;AACH,oBAAY,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC;KAClC,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GACvC,CAAC,CAAC,CAAC,CAAC,GACJ,CAAC,SAAS,MAAM,CAAC,GACjB,CAAC,CAAC,CAAC,CAAC,GACJ,KAAK;CACV,CAAC,CAAC;AAEH;;GAEG;AACH,oBAAY,QAAQ,CAClB,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,OAAO,SAAS,MAAM,IACpB;KACD,CAAC,IAAI,MAAM,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;CAC1D,CAAC;AAEF;;GAEG;AACH,oBAAY,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;AAE5C;;GAEG;AACH,oBAAY,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEzE;;GAEG;AACH,oBAAY,IAAI,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;AAEpD;;GAEG;AACH,oBAAY,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAE7C;;;;;GAKG;AACH,oBAAY,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAExD;;GAEG;AACH,oBAAY,oBAAoB,CAAC,SAAS,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,IACtE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;AAEjC,aAAK,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,IAAI;KACpC,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,GAAG,KAAK;CACpD,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX;;GAEG;AACH,oBAAY,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAEpE;;GAEG;AACH,oBAAY,SAAS,CAAC,CAAC,IAAI;KACxB,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,GAAG,IAAI,GAAG,KAAK;CACxD,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX;;GAEG;AACH,oBAAY,aAAa,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC"}

package/observable/index.d.ts

@@ -0,0 +1 @@
+export * from '../dist/observable';

package/observable/index.js

@@ -0,0 +1 @@
+module.exports = require('../dist/observable/index');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "10.0.0-alpha.4",
+  "version": "10.0.0-alpha.40",
   "description": "tRPC Server",
   "author": "KATT",
   "license": "MIT",
@@ -12,12 +12,18 @@
   },
   "eslintConfig": {
     "rules": {
-      "explicit-module-boundary-types": "off"
+      "explicit-module-boundary-types": "off",
+      "no-restricted-imports": [
+        "error",
+        "@trpc/server"
+      ]
     }
   },
   "scripts": {
     "test": "jest",
-    "build": "rollup -c"
+    "build": "rollup -c",
+    "benchmark": "yarn tsc --project tsconfig.benchmark.json",
+    "ts-watch": "tsc --project tsconfig.watch.json"
   },
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -28,6 +34,11 @@
       "require": "./dist/index.js",
       "default": "./dist/index.js"
     },
+    "./adapters/aws-lambda": {
+      "import": "./dist/adapters/aws-lambda.mjs",
+      "require": "./dist/adapters/aws-lambda.js",
+      "default": "./dist/adapters/aws-lambda.js"
+    },
     "./adapters/express": {
       "import": "./dist/adapters/express.mjs",
       "require": "./dist/adapters/express.js",
@@ -48,56 +59,85 @@
       "require": "./dist/adapters/standalone.js",
       "default": "./dist/adapters/standalone.js"
     },
+    "./adapters/fastify": {
+      "import": "./dist/adapters/fastify/index.mjs",
+      "require": "./dist/adapters/fastify/index.js",
+      "default": "./dist/adapters/fastify/index.js"
+    },
     "./adapters/ws": {
       "import": "./dist/adapters/ws.mjs",
       "require": "./dist/adapters/ws.js",
       "default": "./dist/adapters/ws.js"
     },
-    "./ws": {
-      "import": "./dist/ws/index.mjs",
-      "require": "./dist/ws/index.js",
-      "default": "./dist/ws/index.js"
+    "./adapters/fetch": {
+      "import": "./dist/adapters/fetch/index.mjs",
+      "require": "./dist/adapters/fetch/index.js",
+      "default": "./dist/adapters/fetch/index.js"
     },
     "./rpc": {
       "import": "./dist/rpc/index.mjs",
       "require": "./dist/rpc/index.js",
       "default": "./dist/rpc/index.js"
+    },
+    "./observable": {
+      "import": "./dist/observable/index.mjs",
+      "require": "./dist/observable/index.js",
+      "default": "./dist/observable/index.js"
+    },
+    "./subscription": {
+      "import": "./dist/subscription.mjs",
+      "require": "./dist/subscription.js",
+      "default": "./dist/subscription.js"
+    },
+    "./shared": {
+      "import": "./dist/shared/index.mjs",
+      "require": "./dist/shared/index.js",
+      "default": "./dist/shared/index.js"
     }
   },
   "files": [
     "README.md",
     "dist",
     "adapters",
-    "ws",
     "rpc",
+    "observable",
+    "shared",
     "src"
   ],
   "publishConfig": {
     "access": "public"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^12.0.0",
-    "@testing-library/user-event": "^13.2.1",
+    "@cloudflare/workers-types": "^3.14.1",
+    "@fastify/websocket": "^5.0.0",
+    "@miniflare/core": "^2.4.0",
+    "@types/aws-lambda": "^8.10.97",
     "@types/express": "^4.17.12",
     "@types/hash-sum": "^1.0.0",
     "@types/ws": "^8.2.0",
+    "abort-controller": "^3.0.0",
     "devalue": "^2.0.1",
+    "esbuild": "^0.14.38",
     "express": "^4.17.1",
-    "fastify": "^3.17.0",
+    "fastify": "^3.27.1",
+    "fastify-plugin": "^3.0.1",
+    "fastify-websocket": "^4.0.0",
     "hash-sum": "^2.0.0",
     "jest": "^27.1.0",
+    "jest-environment-miniflare": "^2.4.0",
     "konn": "^0.7.0",
+    "miniflare": "^2.4.0",
     "myzod": "^1.3.1",
-    "next": "^12.0.1",
+    "next": "^12.1.6",
+    "node-fetch": "^2.6.1",
     "superstruct": "^0.15.2",
-    "typescript": "4.4.4",
+    "typescript": "4.7.4",
     "ws": "^8.0.0",
     "yup": "^0.32.8",
     "zod": "^3.0.0"
   },
-  "gitHead": "ef9f7f1d36a26339b96069bba001ea0fe5768bb3",
   "dependencies": {
     "tslib": "^2.1.0"
-  }
+  },
+  "gitHead": "2af7a0070f3bc01b81fe6f14f591e77c549520a7"
 }

package/rpc/dist/trpc-server-rpc.cjs.dev.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var codes = require('../../dist/codes-33cef953.cjs.dev.js');
+var codes = require('../../dist/codes-130e62df.cjs.dev.js');
 
 
 

package/rpc/dist/trpc-server-rpc.cjs.prod.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var codes = require('../../dist/codes-e0df67c4.cjs.prod.js');
+var codes = require('../../dist/codes-aff770a3.cjs.prod.js');
 
 
 

package/rpc/dist/trpc-server-rpc.esm.js

@@ -1 +1 @@
-export { T as TRPC_ERROR_CODES_BY_KEY, a as TRPC_ERROR_CODES_BY_NUMBER } from '../../dist/codes-fe07bf82.esm.js';
+export { T as TRPC_ERROR_CODES_BY_KEY, a as TRPC_ERROR_CODES_BY_NUMBER } from '../../dist/codes-5678cc97.esm.js';

package/shared/index.d.ts

@@ -0,0 +1 @@
+export * from '../dist/shared';

package/shared/index.js

@@ -0,0 +1 @@
+module.exports = require('../dist/shared/index');

package/src/adapters/aws-lambda/index.ts

@@ -0,0 +1,173 @@
+import type {
+  Context as APIGWContext,
+  APIGatewayProxyEvent,
+  APIGatewayProxyEventV2,
+  APIGatewayProxyResult,
+  APIGatewayProxyStructuredResultV2,
+} from 'aws-lambda';
+import { TRPCError, resolveHTTPResponse } from '../..';
+import { AnyRouter, inferRouterContext } from '../../core';
+import { HTTPHeaders, HTTPRequest } from '../../http/internals/types';
+import type { HTTPResponse } from '../../http/internals/types';
+import {
+  APIGatewayEvent,
+  APIGatewayResult,
+  AWSLambdaOptions,
+  UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE,
+  isPayloadV1,
+  isPayloadV2,
+} from './utils';
+
+export type { CreateAWSLambdaContextOptions, 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)) {
+    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);
+  }
+  if (isPayloadV2(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);
+  }
+  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 awsLambdaRequestHandler<
+  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);
+  };
+}

package/src/adapters/aws-lambda/utils.ts

@@ -0,0 +1,92 @@
+import type {
+  Context as APIGWContext,
+  APIGatewayProxyEvent,
+  APIGatewayProxyEventV2,
+  APIGatewayProxyResult,
+  APIGatewayProxyStructuredResultV2,
+} from 'aws-lambda';
+import type { AnyRouter, inferRouterContext } from '../../core';
+import type { ResponseMetaFn } from '../../http/internals/types';
+import { OnErrorFunction } from '../../internals/types';
+
+export type APIGatewayEvent = APIGatewayProxyEvent | APIGatewayProxyEventV2;
+export type APIGatewayResult =
+  | APIGatewayProxyResult
+  | APIGatewayProxyStructuredResultV2;
+
+export type CreateAWSLambdaContextOptions<T extends APIGatewayEvent> = {
+  event: T;
+  context: APIGWContext;
+};
+export type AWSLambdaCreateContextFn<
+  TRouter extends AnyRouter,
+  TEvent extends APIGatewayEvent,
+> = ({
+  event,
+  context,
+}: CreateAWSLambdaContextOptions<TEvent>) =>
+  | inferRouterContext<TRouter>
+  | Promise<inferRouterContext<TRouter>>;
+
+export type AWSLambdaOptions<
+  TRouter extends AnyRouter,
+  TEvent extends APIGatewayEvent,
+> =
+  | {
+      router: TRouter;
+      batching?: {
+        enabled: boolean;
+      };
+      onError?: OnErrorFunction<TRouter, TEvent>;
+      responseMeta?: ResponseMetaFn<TRouter>;
+    } & (
+      | {
+          /**
+           * @link https://trpc.io/docs/context
+           **/
+          createContext: AWSLambdaCreateContextFn<TRouter, TEvent>;
+        }
+      | {
+          /**
+           * @link https://trpc.io/docs/context
+           **/
+          createContext?: AWSLambdaCreateContextFn<TRouter, TEvent>;
+        }
+    );
+
+export function isPayloadV1(
+  event: APIGatewayEvent,
+): event is APIGatewayProxyEvent {
+  return determinePayloadFormat(event) == '1.0';
+}
+export function isPayloadV2(
+  event: APIGatewayEvent,
+): event is APIGatewayProxyEventV2 {
+  return determinePayloadFormat(event) == '2.0';
+}
+
+function determinePayloadFormat(
+  event: APIGatewayEvent,
+): APIGatewayPayloadFormatVersion {
+  // 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 as { version?: string };
+  if (typeof unknownEvent.version === 'undefined') {
+    return '1.0';
+  } else {
+    if (['1.0', '2.0'].includes(unknownEvent.version)) {
+      return unknownEvent.version as APIGatewayPayloadFormatVersion;
+    } else {
+      return 'custom';
+    }
+  }
+}
+export type DefinedAPIGatewayPayloadFormats = '1.0' | '2.0';
+export type APIGatewayPayloadFormatVersion =
+  | DefinedAPIGatewayPayloadFormats
+  | 'custom';
+
+export const UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE =
+  'Custom payload format version not handled by this adapter. Please use either 1.0 or 2.0. More information here' +
+  'https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html';

package/src/adapters/express.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type * as express from 'express';
-import { AnyRouter } from '../router';
+import { AnyRouter } from '../core';
 import { nodeHTTPRequestHandler } from './node-http';
 import {
   NodeHTTPCreateContextFnOptions,
@@ -15,10 +15,10 @@ export type CreateExpressContextOptions = NodeHTTPCreateContextFnOptions<
 export function createExpressMiddleware<TRouter extends AnyRouter>(
   opts: NodeHTTPHandlerOptions<TRouter, express.Request, express.Response>,
 ): express.Handler {
-  return (req, res) => {
-    const endpoint = req.path.substr(1);
+  return async (req, res) => {
+    const endpoint = req.path.slice(1);
 
-    nodeHTTPRequestHandler({
+    await nodeHTTPRequestHandler({
       ...opts,
       req,
       res,