@scloud/lambda-api 1.2.5 → 1.2.8

package/README.md

@@ -6,6 +6,7 @@ This is a piece of useful boilerplate to handle the mechanics of routing, header
 
 ## Releae notes
 
+ * `1.2.8`: Add `apiHandler` overload for `ApiGatewayProxyEventAny` so handlers accepting both v1 and v2 events get correct return types
  * `1.2.3`: Readme update
  * '1.2.0': Restructure so we consumers don't need to include '/dist' in the import path
  * `1.1.8`: Trusted publishing enabled
@@ -41,7 +42,18 @@ const routes: types.Routes = {
 }
 ```
 
-Use `@scloud/lambda-api` in your Lambda handler. `apiHandler` accepts both REST API (v1) and Function URL (v2) events and returns the matching response shape. When the event type is known at compile time, TypeScript infers the result type via overloads; you can also use `ApiGatewayProxyResultFor<E>`:
+Use `@scloud/lambda-api` in your Lambda handler. `apiHandler` accepts both REST API (v1) and Function URL / HTTP API (v2) events and returns the matching response shape. When the event type is known at compile time, TypeScript infers the result type via overloads. For handlers that accept either format, type the event as `ApiGatewayProxyEventAny`:
+
+```
+import { Context } from 'aws-lambda';
+import { apiHandler, ApiGatewayProxyEventAny } from '@scloud/lambda-api';
+
+export async function handler(event: ApiGatewayProxyEventAny, context: Context) {
+  return apiHandler(event, context, routes);
+}
+```
+
+If you need an explicit return type, use `ApiGatewayProxyResultFor<E>`:
 
 ```
 import { APIGatewayProxyEventV2, Context } from 'aws-lambda';

package/dist/handler.d.ts

@@ -1,9 +1,11 @@
 import { APIGatewayProxyEvent, APIGatewayProxyEventV2, APIGatewayProxyResult, APIGatewayProxyStructuredResultV2, Context } from 'aws-lambda';
 import { Request, Response, Handler, Routes } from './types';
+import { ApiGatewayProxyEventAny, ApiGatewayProxyResultFor } from './event';
 type ErrorHandler = (request: Request, e: Error) => Promise<Response | undefined>;
 /**
  * API route handler
  */
 export declare function apiHandler(event: APIGatewayProxyEventV2, context: Context, routes: Routes, errorHandler?: ErrorHandler, catchAll?: Handler): Promise<APIGatewayProxyStructuredResultV2>;
 export declare function apiHandler(event: APIGatewayProxyEvent, context: Context, routes: Routes, errorHandler?: ErrorHandler, catchAll?: Handler): Promise<APIGatewayProxyResult>;
+export declare function apiHandler<E extends ApiGatewayProxyEventAny>(event: E, context: Context, routes: Routes, errorHandler?: ErrorHandler, catchAll?: Handler): Promise<ApiGatewayProxyResultFor<E>>;
 export {};

package/dist/handler.js

@@ -79,4 +79,4 @@ async function apiHandler(event, context, routes, errorHandler, catchAll) {
         ? (0, result_1.toApiGatewayResultV2)(response)
         : (0, result_1.toApiGatewayResultV1)(response);
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"handler.js","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  APIGatewayProxyEvent,\n  APIGatewayProxyEventV2,\n  APIGatewayProxyResult,\n  APIGatewayProxyStructuredResultV2,\n  Context,\n} from 'aws-lambda';\nimport {\n  Request, Response, Handler, Route, Routes,\n  ApiError,\n} from './types';\nimport { ApiGatewayProxyEventAny, isApiGatewayEventV2 } from './event';\nimport { matchRoute, parseRequest } from './helpers';\nimport { toApiGatewayResultV1, toApiGatewayResultV2 } from './result';\nimport z from 'zod/v4';\n\ntype ErrorHandler = (request: Request, e: Error) => Promise<Response | undefined>;\n\nfunction apiErrorResponse(e?: unknown): Response {\n  if (e instanceof ApiError) {\n    return {\n      headers: e.headers,\n      statusCode: e.statusCode,\n      body: e.body,\n    };\n  }\n\n  if (e) console.error(e);\n  return {\n    statusCode: 500,\n    body: 'Internal server error',\n  };\n}\n\nasync function handleRequest(\n  event: ApiGatewayProxyEventAny,\n  routes: Routes,\n  errorHandler: ErrorHandler | undefined,\n  catchAll: Handler | undefined,\n): Promise<Response> {\n  const request = parseRequest(event);\n\n  let response: Response | undefined;\n  try {\n    const match = matchRoute(routes, request.path);\n    if (match.params) request.pathParameters = match.params;\n\n    if (match.methods) {\n      const route = match.methods[request.method as keyof Route];\n      if (!route) throw new ApiError(405, 'Method not allowed');\n\n      if (route.request?.body) {\n        const parsed = route.request.body.safeParse(request.body);\n        if (!parsed.success) {\n          throw new ApiError(400, z.treeifyError(parsed.error));\n        }\n        request.body = parsed.data;\n      }\n\n      response = await route.handler(request);\n\n      if (route.response?.body) {\n        const parsed = route.response.body.safeParse(response.body);\n        if (!parsed.success) {\n          console.error('Invalid response body:', request.method, request.path, JSON.stringify(z.treeifyError(parsed.error), null, 2));\n          response = undefined;\n          throw new ApiError(500, 'Internal server error');\n        }\n        response.body = parsed.data;\n      }\n    } else if (catchAll) {\n      response = await catchAll.handler(request);\n    } else {\n      throw new ApiError(404, 'Not found');\n    }\n  } catch (e) {\n    if (errorHandler) {\n      try {\n        response = await errorHandler(request, e as Error);\n      } catch (ee) {\n        response = apiErrorResponse(ee);\n      }\n    }\n\n    response = response ?? apiErrorResponse(e);\n  }\n\n  return response;\n}\n\n/**\n * API route handler\n */\nexport async function apiHandler(\n  event: APIGatewayProxyEventV2,\n  context: Context,\n  routes: Routes,\n  errorHandler?: ErrorHandler,\n  catchAll?: Handler,\n): Promise<APIGatewayProxyStructuredResultV2>;\nexport async function apiHandler(\n  event: APIGatewayProxyEvent,\n  context: Context,\n  routes: Routes,\n  errorHandler?: ErrorHandler,\n  catchAll?: Handler,\n): Promise<APIGatewayProxyResult>;\nexport async function apiHandler(\n  event: ApiGatewayProxyEventAny,\n  context: Context,\n  routes: Routes,\n  errorHandler?: ErrorHandler,\n  catchAll?: Handler,\n): Promise<APIGatewayProxyResult | APIGatewayProxyStructuredResultV2> {\n  const response = await handleRequest(event, routes, errorHandler, catchAll);\n  return isApiGatewayEventV2(event)\n    ? toApiGatewayResultV2(response)\n    : toApiGatewayResultV1(response);\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"handler.js","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  APIGatewayProxyEvent,\n  APIGatewayProxyEventV2,\n  APIGatewayProxyResult,\n  APIGatewayProxyStructuredResultV2,\n  Context,\n} from 'aws-lambda';\nimport {\n  Request, Response, Handler, Route, Routes,\n  ApiError,\n} from './types';\nimport { ApiGatewayProxyEventAny, ApiGatewayProxyResultFor, isApiGatewayEventV2 } from './event';\nimport { matchRoute, parseRequest } from './helpers';\nimport { toApiGatewayResultV1, toApiGatewayResultV2 } from './result';\nimport z from 'zod/v4';\n\ntype ErrorHandler = (request: Request, e: Error) => Promise<Response | undefined>;\n\nfunction apiErrorResponse(e?: unknown): Response {\n  if (e instanceof ApiError) {\n    return {\n      headers: e.headers,\n      statusCode: e.statusCode,\n      body: e.body,\n    };\n  }\n\n  if (e) console.error(e);\n  return {\n    statusCode: 500,\n    body: 'Internal server error',\n  };\n}\n\nasync function handleRequest(\n  event: ApiGatewayProxyEventAny,\n  routes: Routes,\n  errorHandler: ErrorHandler | undefined,\n  catchAll: Handler | undefined,\n): Promise<Response> {\n  const request = parseRequest(event);\n\n  let response: Response | undefined;\n  try {\n    const match = matchRoute(routes, request.path);\n    if (match.params) request.pathParameters = match.params;\n\n    if (match.methods) {\n      const route = match.methods[request.method as keyof Route];\n      if (!route) throw new ApiError(405, 'Method not allowed');\n\n      if (route.request?.body) {\n        const parsed = route.request.body.safeParse(request.body);\n        if (!parsed.success) {\n          throw new ApiError(400, z.treeifyError(parsed.error));\n        }\n        request.body = parsed.data;\n      }\n\n      response = await route.handler(request);\n\n      if (route.response?.body) {\n        const parsed = route.response.body.safeParse(response.body);\n        if (!parsed.success) {\n          console.error('Invalid response body:', request.method, request.path, JSON.stringify(z.treeifyError(parsed.error), null, 2));\n          response = undefined;\n          throw new ApiError(500, 'Internal server error');\n        }\n        response.body = parsed.data;\n      }\n    } else if (catchAll) {\n      response = await catchAll.handler(request);\n    } else {\n      throw new ApiError(404, 'Not found');\n    }\n  } catch (e) {\n    if (errorHandler) {\n      try {\n        response = await errorHandler(request, e as Error);\n      } catch (ee) {\n        response = apiErrorResponse(ee);\n      }\n    }\n\n    response = response ?? apiErrorResponse(e);\n  }\n\n  return response;\n}\n\n/**\n * API route handler\n */\nexport async function apiHandler(\n  event: APIGatewayProxyEventV2,\n  context: Context,\n  routes: Routes,\n  errorHandler?: ErrorHandler,\n  catchAll?: Handler,\n): Promise<APIGatewayProxyStructuredResultV2>;\nexport async function apiHandler(\n  event: APIGatewayProxyEvent,\n  context: Context,\n  routes: Routes,\n  errorHandler?: ErrorHandler,\n  catchAll?: Handler,\n): Promise<APIGatewayProxyResult>;\nexport async function apiHandler<E extends ApiGatewayProxyEventAny>(\n  event: E,\n  context: Context,\n  routes: Routes,\n  errorHandler?: ErrorHandler,\n  catchAll?: Handler,\n): Promise<ApiGatewayProxyResultFor<E>>;\nexport async function apiHandler(\n  event: ApiGatewayProxyEventAny,\n  context: Context,\n  routes: Routes,\n  errorHandler?: ErrorHandler,\n  catchAll?: Handler,\n): Promise<APIGatewayProxyResult | APIGatewayProxyStructuredResultV2> {\n  const response = await handleRequest(event, routes, errorHandler, catchAll);\n  return isApiGatewayEventV2(event)\n    ? toApiGatewayResultV2(response)\n    : toApiGatewayResultV1(response);\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scloud/lambda-api",
-  "version": "1.2.5",
+  "version": "1.2.8",
   "description": "Lambda handler for API Gateway proxy requests",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -23,7 +23,7 @@
     "lint": "eslint --fix src/**/*",
     "test": "mocha --import=tsx -r tsconfig-paths/register 'test/**/*.spec.ts' # tsconfig-paths/register helps resolve imports in tests",
     "compile": "tsc",
-    "package": "yarn compile"
+    "package": "npm run compile"
   },
   "repository": {
     "type": "git",