@scloud/lambda-api 0.3.7 → 1.0.0

package/README.md

@@ -6,6 +6,7 @@ This is a piece of useful boilerplate to handle the mechanics of routing, header
 
 ## Releae notes
 
+ * `0.3.8`: Optinoal generic type on `Request`
  * `0.3.7`: Fix cookie setting to use `Set-Cookie`
  * `0.3.6`: Enable parsing body as `application/x-www-form-urlencoded` as well as JSON
  * `0.3.5`: `actions/setup-node@v4` and Node `lts`

package/dist/handler.d.ts

@@ -1,6 +1,6 @@
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
-import { ContextBuilder, Handler, Request, Response, Routes } from './types';
+import { Request, Response, Handler, Routes } from './types';
 /**
  * API route handler
  */
-export declare function apiHandler(event: APIGatewayProxyEvent, context: Context, routes?: Routes, errorHandler?: (request: Request, e: Error) => Promise<Response>, catchAll?: Handler, contextBuilder?: ContextBuilder): Promise<APIGatewayProxyResult>;
+export declare function apiHandler(event: APIGatewayProxyEvent, context: Context, routes?: Routes, errorHandler?: ((request: Request, e: Error) => Promise<Response>) | undefined, catchAll?: Handler | undefined): Promise<APIGatewayProxyResult>;

package/dist/handler.js

@@ -1,61 +1,86 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apiHandler = apiHandler;
+const types_1 = require("./types");
 const helpers_1 = require("./helpers");
-function textResponse(statusCode, body) {
+function errorResponse(statusCode, body, e) {
+    if (e instanceof types_1.ApiError) {
+        return {
+            statusCode: e.statusCode,
+            body: e.body,
+        };
+    }
+    if (e)
+        console.error(`${e.stack}`);
     return {
-        statusCode,
-        headers: { 'Content-Type': 'text/plain' },
-        body
+        statusCode: statusCode,
+        body: body,
     };
 }
 /**
  * API route handler
  */
 async function apiHandler(event, context, routes = {
-    '/api/ping': { GET: async (request) => ({ statusCode: 200, body: request }) },
-}, errorHandler = async (request) => ({ statusCode: 500, body: { error: `Internal server error: ${request.path}` } }), catchAll = async (request) => textResponse(404, `Not found: ${request.path}`), contextBuilder) {
-    console.log(`Executing ${context.functionName} version: ${process.env.COMMIT_HASH}`);
+    '/ping': { GET: { handler: async (request) => ({ statusCode: 200, body: request }) } },
+}, errorHandler = undefined, catchAll = undefined) {
     const request = (0, helpers_1.parseRequest)(event);
     let response;
     try {
         const match = (0, helpers_1.matchRoute)(routes, request.path);
-        if (!match.route) {
+        if (match.params)
+            request.pathParameters = match.params;
+        if (match.methods) {
+            const route = match.methods[request.method];
+            if (!route)
+                throw new types_1.ApiError(405, 'Method not allowed');
+            // Verify request body
+            if (route.request?.body) {
+                const parsed = route.request.body.safeParse(request.body);
+                if (!parsed.success) {
+                    throw new types_1.ApiError(400, parsed.error);
+                }
+                request.body = parsed.data;
+            }
+            response = await route.handler(request);
+            // Verify response body
+            if (route.response?.body) {
+                const parsed = route.response.body.safeParse(response.body);
+                if (!parsed.success) {
+                    console.error(JSON.stringify(parsed.error, null, 2));
+                    throw new types_1.ApiError(500, 'Internal server error');
+                }
+                response.body = parsed.data;
+            }
+        }
+        else if (catchAll) {
             // Catch-all / 404
-            response = await catchAll(request);
+            response = await catchAll.handler(request);
         }
         else {
-            const handlerFunction = match.route[request.method];
-            // Handle the request:
-            if (handlerFunction) {
-                if (contextBuilder)
-                    await contextBuilder(request);
-                response = await handlerFunction({ ...request, pathParameters: match.params });
-            }
-            else {
-                response = textResponse(405, 'Method not allowed');
-            }
+            throw new types_1.ApiError(404, 'Not found');
         }
     }
     catch (e) {
-        // Fallback error handling
-        console.error(`${e.message}\n${e.stack}`);
-        response = textResponse(500, `Internal server error: ${request.path}`);
-        try {
-            // Error handling
-            if (errorHandler)
+        if (errorHandler) {
+            try {
                 response = await errorHandler(request, e);
+            }
+            catch (ee) {
+                response = errorResponse(500, 'Internal server error', ee);
+            }
         }
-        catch (ee) {
-            console.error(`Error in error handler: ${ee.message}\n${ee.stack}`);
+        else {
+            response = errorResponse(500, 'Internal server error', e);
         }
     }
-    // API Gateway Proxy result
-    let body = '';
+    // Translate the response to an API Gateway Proxy result
+    let body;
+    const headers = response.headers || {};
     if (typeof response.body === 'string') {
         // Use the body as-is
-        // Potentially add a text/plain content type header:
-        response.headers = { 'Content-Type': 'text/plain', ...response.headers };
+        // Add text/plain if no Content-Type header is set:
+        if (!(0, helpers_1.getHeader)('Content-Type', headers))
+            (0, helpers_1.setHeader)('Content-Type', 'text/plain', headers);
         body = response.body;
     }
     else if (response.body) {
@@ -63,13 +88,14 @@ async function apiHandler(event, context, routes = {
         // API Gateway returns application/json by default
         body = JSON.stringify(response.body);
     }
+    // Prepare response
     const result = {
-        statusCode: response.statusCode,
-        body,
-        headers: response.headers,
+        statusCode: response.statusCode ?? 200,
+        headers,
+        body: body || '',
     };
-    // Cookies (if set)
-    const cookieHeaders = (0, helpers_1.buildCookie)(response.cookies);
+    // Add cookie headers
+    const cookieHeaders = (0, helpers_1.buildCookie)(response);
     if (cookieHeaders) {
         result.multiValueHeaders = {
             'Set-Cookie': cookieHeaders,
@@ -77,4 +103,4 @@ async function apiHandler(event, context, routes = {
     }
     return result;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGFuZGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9oYW5kbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBc0JBLGdDQXFFQztBQWxGRCx1Q0FBa0U7QUFFbEUsU0FBUyxZQUFZLENBQUMsVUFBa0IsRUFBRSxJQUFZO0lBQ3BELE9BQU87UUFDTCxVQUFVO1FBQ1YsT0FBTyxFQUFFLEVBQUUsY0FBYyxFQUFFLFlBQVksRUFBRTtRQUN6QyxJQUFJO0tBQ0wsQ0FBQztBQUNKLENBQUM7QUFFRDs7R0FFRztBQUNJLEtBQUssVUFBVSxVQUFVLENBQzlCLEtBQTJCLEVBQzNCLE9BQWdCLEVBQ2hCLFNBQWlCO0lBQ2YsV0FBVyxFQUFFLEVBQUUsR0FBRyxFQUFFLEtBQUssRUFBRSxPQUFnQixFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLENBQUMsRUFBRTtDQUN2RixFQUNELGVBQWtFLEtBQUssRUFBRSxPQUFnQixFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsRUFBRSxLQUFLLEVBQUUsMEJBQTBCLE9BQU8sQ0FBQyxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFDOUssV0FBb0IsS0FBSyxFQUFFLE9BQWdCLEVBQUUsRUFBRSxDQUFDLFlBQVksQ0FBQyxHQUFHLEVBQUUsY0FBYyxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUMsRUFDL0YsY0FBK0I7SUFFL0IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLE9BQU8sQ0FBQyxZQUFZLGFBQWEsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFDO0lBQ3JGLE1BQU0sT0FBTyxHQUFHLElBQUEsc0JBQVksRUFBQyxLQUFLLENBQUMsQ0FBQztJQUVwQyxJQUFJLFFBQWtCLENBQUM7SUFDdkIsSUFBSSxDQUFDO1FBQ0gsTUFBTSxLQUFLLEdBQUcsSUFBQSxvQkFBVSxFQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDL0MsSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUNqQixrQkFBa0I7WUFDbEIsUUFBUSxHQUFHLE1BQU0sUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3JDLENBQUM7YUFBTSxDQUFDO1lBQ04sTUFBTSxlQUFlLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsTUFBcUIsQ0FBQyxDQUFDO1lBRW5FLHNCQUFzQjtZQUN0QixJQUFJLGVBQWUsRUFBRSxDQUFDO2dCQUNwQixJQUFJLGNBQWM7b0JBQUUsTUFBTSxjQUFjLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQ2xELFFBQVEsR0FBRyxNQUFNLGVBQWUsQ0FBQyxFQUFFLEdBQUcsT0FBTyxFQUFFLGNBQWMsRUFBRSxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztZQUNqRixDQUFDO2lCQUFNLENBQUM7Z0JBQ04sUUFBUSxHQUFHLFlBQVksQ0FBQyxHQUFHLEVBQUUsb0JBQW9CLENBQUMsQ0FBQztZQUNyRCxDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1FBQ1gsMEJBQTBCO1FBQzFCLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBSSxDQUFXLENBQUMsT0FBTyxLQUFNLENBQVcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDO1FBQ2hFLFFBQVEsR0FBRyxZQUFZLENBQUMsR0FBRyxFQUFFLDBCQUEwQixPQUFPLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUN2RSxJQUFJLENBQUM7WUFDSCxpQkFBaUI7WUFDakIsSUFBSSxZQUFZO2dCQUFFLFFBQVEsR0FBRyxNQUFNLFlBQVksQ0FBQyxPQUFPLEVBQUUsQ0FBVSxDQUFDLENBQUM7UUFDdkUsQ0FBQztRQUFDLE9BQU8sRUFBRSxFQUFFLENBQUM7WUFDWixPQUFPLENBQUMsS0FBSyxDQUFDLDJCQUE0QixFQUFZLENBQUMsT0FBTyxLQUFNLEVBQVksQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDO1FBQzVGLENBQUM7SUFDSCxDQUFDO0lBRUQsMkJBQTJCO0lBQzNCLElBQUksSUFBSSxHQUFXLEVBQUUsQ0FBQztJQUN0QixJQUFJLE9BQU8sUUFBUSxDQUFDLElBQUksS0FBSyxRQUFRLEVBQUUsQ0FBQztRQUN0QyxxQkFBcUI7UUFDckIsb0RBQW9EO1FBQ3BELFFBQVEsQ0FBQyxPQUFPLEdBQUcsRUFBRSxjQUFjLEVBQUUsWUFBWSxFQUFFLEdBQUcsUUFBUSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ3pFLElBQUksR0FBRyxRQUFRLENBQUMsSUFBSSxDQUFDO0lBQ3ZCLENBQUM7U0FBTSxJQUFJLFFBQVEsQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUN6QixnQ0FBZ0M7UUFDaEMsa0RBQWtEO1FBQ2xELElBQUksR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUN2QyxDQUFDO0lBQ0QsTUFBTSxNQUFNLEdBQTBCO1FBQ3BDLFVBQVUsRUFBRSxRQUFRLENBQUMsVUFBVTtRQUMvQixJQUFJO1FBQ0osT0FBTyxFQUFFLFFBQVEsQ0FBQyxPQUFPO0tBQzFCLENBQUM7SUFFRixtQkFBbUI7SUFDbkIsTUFBTSxhQUFhLEdBQUcsSUFBQSxxQkFBVyxFQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNwRCxJQUFJLGFBQWEsRUFBRSxDQUFDO1FBQ2xCLE1BQU0sQ0FBQyxpQkFBaUIsR0FBRztZQUN6QixZQUFZLEVBQUUsYUFBYTtTQUM1QixDQUFDO0lBQ0osQ0FBQztJQUVELE9BQU8sTUFBTSxDQUFDO0FBQ2hCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBBUElHYXRld2F5UHJveHlFdmVudCxcbiAgQVBJR2F0ZXdheVByb3h5UmVzdWx0LFxuICBDb250ZXh0LFxufSBmcm9tICdhd3MtbGFtYmRhJztcbmltcG9ydCB7XG4gIENvbnRleHRCdWlsZGVyLFxuICBIYW5kbGVyLCBSZXF1ZXN0LCBSZXNwb25zZSwgUm91dGUsIFJvdXRlcyxcbn0gZnJvbSAnLi90eXBlcyc7XG5pbXBvcnQgeyBidWlsZENvb2tpZSwgbWF0Y2hSb3V0ZSwgcGFyc2VSZXF1ZXN0IH0gZnJvbSAnLi9oZWxwZXJzJztcblxuZnVuY3Rpb24gdGV4dFJlc3BvbnNlKHN0YXR1c0NvZGU6IG51bWJlciwgYm9keTogc3RyaW5nKTogUmVzcG9uc2Uge1xuICByZXR1cm4ge1xuICAgIHN0YXR1c0NvZGUsXG4gICAgaGVhZGVyczogeyAnQ29udGVudC1UeXBlJzogJ3RleHQvcGxhaW4nIH0sXG4gICAgYm9keVxuICB9O1xufVxuXG4vKipcbiAqIEFQSSByb3V0ZSBoYW5kbGVyXG4gKi9cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBhcGlIYW5kbGVyKFxuICBldmVudDogQVBJR2F0ZXdheVByb3h5RXZlbnQsXG4gIGNvbnRleHQ6IENvbnRleHQsXG4gIHJvdXRlczogUm91dGVzID0ge1xuICAgICcvYXBpL3BpbmcnOiB7IEdFVDogYXN5bmMgKHJlcXVlc3Q6IFJlcXVlc3QpID0+ICh7IHN0YXR1c0NvZGU6IDIwMCwgYm9keTogcmVxdWVzdCB9KSB9LFxuICB9LFxuICBlcnJvckhhbmRsZXI6IChyZXF1ZXN0OiBSZXF1ZXN0LCBlOiBFcnJvcikgPT4gUHJvbWlzZTxSZXNwb25zZT4gPSBhc3luYyAocmVxdWVzdDogUmVxdWVzdCkgPT4gKHsgc3RhdHVzQ29kZTogNTAwLCBib2R5OiB7IGVycm9yOiBgSW50ZXJuYWwgc2VydmVyIGVycm9yOiAke3JlcXVlc3QucGF0aH1gIH0gfSksXG4gIGNhdGNoQWxsOiBIYW5kbGVyID0gYXN5bmMgKHJlcXVlc3Q6IFJlcXVlc3QpID0+IHRleHRSZXNwb25zZSg0MDQsIGBOb3QgZm91bmQ6ICR7cmVxdWVzdC5wYXRofWApLFxuICBjb250ZXh0QnVpbGRlcj86IENvbnRleHRCdWlsZGVyLFxuKTogUHJvbWlzZTxBUElHYXRld2F5UHJveHlSZXN1bHQ+IHtcbiAgY29uc29sZS5sb2coYEV4ZWN1dGluZyAke2NvbnRleHQuZnVuY3Rpb25OYW1lfSB2ZXJzaW9uOiAke3Byb2Nlc3MuZW52LkNPTU1JVF9IQVNIfWApO1xuICBjb25zdCByZXF1ZXN0ID0gcGFyc2VSZXF1ZXN0KGV2ZW50KTtcblxuICBsZXQgcmVzcG9uc2U6IFJlc3BvbnNlO1xuICB0cnkge1xuICAgIGNvbnN0IG1hdGNoID0gbWF0Y2hSb3V0ZShyb3V0ZXMsIHJlcXVlc3QucGF0aCk7XG4gICAgaWYgKCFtYXRjaC5yb3V0ZSkge1xuICAgICAgLy8gQ2F0Y2gtYWxsIC8gNDA0XG4gICAgICByZXNwb25zZSA9IGF3YWl0IGNhdGNoQWxsKHJlcXVlc3QpO1xuICAgIH0gZWxzZSB7XG4gICAgICBjb25zdCBoYW5kbGVyRnVuY3Rpb24gPSBtYXRjaC5yb3V0ZVtyZXF1ZXN0Lm1ldGhvZCBhcyBrZXlvZiBSb3V0ZV07XG5cbiAgICAgIC8vIEhhbmRsZSB0aGUgcmVxdWVzdDpcbiAgICAgIGlmIChoYW5kbGVyRnVuY3Rpb24pIHtcbiAgICAgICAgaWYgKGNvbnRleHRCdWlsZGVyKSBhd2FpdCBjb250ZXh0QnVpbGRlcihyZXF1ZXN0KTtcbiAgICAgICAgcmVzcG9uc2UgPSBhd2FpdCBoYW5kbGVyRnVuY3Rpb24oeyAuLi5yZXF1ZXN0LCBwYXRoUGFyYW1ldGVyczogbWF0Y2gucGFyYW1zIH0pO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgcmVzcG9uc2UgPSB0ZXh0UmVzcG9uc2UoNDA1LCAnTWV0aG9kIG5vdCBhbGxvd2VkJyk7XG4gICAgICB9XG4gICAgfVxuICB9IGNhdGNoIChlKSB7XG4gICAgLy8gRmFsbGJhY2sgZXJyb3IgaGFuZGxpbmdcbiAgICBjb25zb2xlLmVycm9yKGAkeyhlIGFzIEVycm9yKS5tZXNzYWdlfVxcbiR7KGUgYXMgRXJyb3IpLnN0YWNrfWApO1xuICAgIHJlc3BvbnNlID0gdGV4dFJlc3BvbnNlKDUwMCwgYEludGVybmFsIHNlcnZlciBlcnJvcjogJHtyZXF1ZXN0LnBhdGh9YCk7XG4gICAgdHJ5IHtcbiAgICAgIC8vIEVycm9yIGhhbmRsaW5nXG4gICAgICBpZiAoZXJyb3JIYW5kbGVyKSByZXNwb25zZSA9IGF3YWl0IGVycm9ySGFuZGxlcihyZXF1ZXN0LCBlIGFzIEVycm9yKTtcbiAgICB9IGNhdGNoIChlZSkge1xuICAgICAgY29uc29sZS5lcnJvcihgRXJyb3IgaW4gZXJyb3IgaGFuZGxlcjogJHsoZWUgYXMgRXJyb3IpLm1lc3NhZ2V9XFxuJHsoZWUgYXMgRXJyb3IpLnN0YWNrfWApO1xuICAgIH1cbiAgfVxuXG4gIC8vIEFQSSBHYXRld2F5IFByb3h5IHJlc3VsdFxuICBsZXQgYm9keTogc3RyaW5nID0gJyc7XG4gIGlmICh0eXBlb2YgcmVzcG9uc2UuYm9keSA9PT0gJ3N0cmluZycpIHtcbiAgICAvLyBVc2UgdGhlIGJvZHkgYXMtaXNcbiAgICAvLyBQb3RlbnRpYWxseSBhZGQgYSB0ZXh0L3BsYWluIGNvbnRlbnQgdHlwZSBoZWFkZXI6XG4gICAgcmVzcG9uc2UuaGVhZGVycyA9IHsgJ0NvbnRlbnQtVHlwZSc6ICd0ZXh0L3BsYWluJywgLi4ucmVzcG9uc2UuaGVhZGVycyB9O1xuICAgIGJvZHkgPSByZXNwb25zZS5ib2R5O1xuICB9IGVsc2UgaWYgKHJlc3BvbnNlLmJvZHkpIHtcbiAgICAvLyBTdHJpbmdpZnkgdGhlIHJlc3BvbnNlIG9iamVjdFxuICAgIC8vIEFQSSBHYXRld2F5IHJldHVybnMgYXBwbGljYXRpb24vanNvbiBieSBkZWZhdWx0XG4gICAgYm9keSA9IEpTT04uc3RyaW5naWZ5KHJlc3BvbnNlLmJvZHkpO1xuICB9XG4gIGNvbnN0IHJlc3VsdDogQVBJR2F0ZXdheVByb3h5UmVzdWx0ID0ge1xuICAgIHN0YXR1c0NvZGU6IHJlc3BvbnNlLnN0YXR1c0NvZGUsXG4gICAgYm9keSxcbiAgICBoZWFkZXJzOiByZXNwb25zZS5oZWFkZXJzLFxuICB9O1xuXG4gIC8vIENvb2tpZXMgKGlmIHNldClcbiAgY29uc3QgY29va2llSGVhZGVycyA9IGJ1aWxkQ29va2llKHJlc3BvbnNlLmNvb2tpZXMpO1xuICBpZiAoY29va2llSGVhZGVycykge1xuICAgIHJlc3VsdC5tdWx0aVZhbHVlSGVhZGVycyA9IHtcbiAgICAgICdTZXQtQ29va2llJzogY29va2llSGVhZGVycyxcbiAgICB9O1xuICB9XG5cbiAgcmV0dXJuIHJlc3VsdDtcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/handler.ts"],"names":[],"mappings":";;AA4BA,gCAwFC;AA/GD,mCAGiB;AACjB,uCAAwF;AAExF,SAAS,aAAa,CAAC,UAAkB,EAAE,IAAa,EAAE,CAAW;IACnE,IAAI,CAAC,YAAY,gBAAQ,EAAE,CAAC;QAC1B,OAAO;YACL,UAAU,EAAE,CAAC,CAAC,UAAU;YACxB,IAAI,EAAE,CAAC,CAAC,IAAI;SACb,CAAC;IACJ,CAAC;IACD,IAAI,CAAC;QAAE,OAAO,CAAC,KAAK,CAAC,GAAI,CAAW,CAAC,KAAK,EAAE,CAAC,CAAC;IAC9C,OAAO;QACL,UAAU,EAAE,UAAU;QACtB,IAAI,EAAE,IAAI;KACX,CAAC;AACJ,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,UAAU,CAC9B,KAA2B,EAC3B,OAAgB,EAChB,SAAiB;IACf,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE;CACvF,EACD,eAAgF,SAAS,EACzF,WAAgC,SAAS;IAEzC,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC,KAAK,CAAC,CAAC;IAEpC,IAAI,QAAkB,CAAC;IACvB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAA,oBAAU,EAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,KAAK,CAAC,MAAM;YAAE,OAAO,CAAC,cAAc,GAAG,KAAK,CAAC,MAAM,CAAC;QAExD,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAqB,CAAC,CAAC;YAC3D,IAAI,CAAC,KAAK;gBAAE,MAAM,IAAI,gBAAQ,CAAC,GAAG,EAAE,oBAAoB,CAAC,CAAC;YAE1D,sBAAsB;YACtB,IAAI,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;gBACxB,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC1D,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;oBACpB,MAAM,IAAI,gBAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;gBACxC,CAAC;gBACD,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;YAC7B,CAAC;YAED,QAAQ,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAExC,uBAAuB;YACvB,IAAI,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC;gBACzB,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAC5D,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;oBACpB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;oBACrD,MAAM,IAAI,gBAAQ,CAAC,GAAG,EAAE,uBAAuB,CAAC,CAAC;gBACnD,CAAC;gBACD,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;YAC9B,CAAC;QACH,CAAC;aAAM,IAAI,QAAQ,EAAE,CAAC;YACpB,kBAAkB;YAClB,QAAQ,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,gBAAQ,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,YAAY,EAAE,CAAC;YACjB,IAAI,CAAC;gBACH,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAU,CAAC,CAAC;YACrD,CAAC;YAAC,OAAO,EAAE,EAAE,CAAC;gBACZ,QAAQ,GAAG,aAAa,CAAC,GAAG,EAAE,uBAAuB,EAAE,EAAE,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,aAAa,CAAC,GAAG,EAAE,uBAAuB,EAAE,CAAC,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IAED,wDAAwD;IACxD,IAAI,IAAwB,CAAC;IAC7B,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC;IACvC,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtC,qBAAqB;QACrB,mDAAmD;QACnD,IAAI,CAAC,IAAA,mBAAS,EAAC,cAAc,EAAE,OAAO,CAAC;YAAE,IAAA,mBAAS,EAAC,cAAc,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QAC1F,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IACvB,CAAC;SAAM,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;QACzB,gCAAgC;QAChC,kDAAkD;QAClD,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,mBAAmB;IACnB,MAAM,MAAM,GAA0B;QACpC,UAAU,EAAE,QAAQ,CAAC,UAAU,IAAI,GAAG;QACtC,OAAO;QACP,IAAI,EAAE,IAAI,IAAI,EAAE;KACjB,CAAC;IAEF,qBAAqB;IACrB,MAAM,aAAa,GAAG,IAAA,qBAAW,EAAC,QAAQ,CAAC,CAAC;IAC5C,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,CAAC,iBAAiB,GAAG;YACzB,YAAY,EAAE,aAAa;SAC5B,CAAC;IACJ,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import {\n  APIGatewayProxyEvent,\n  APIGatewayProxyResult,\n  Context,\n} from 'aws-lambda';\nimport {\n  Request, Response, Handler, Route, Routes,\n  ApiError,\n} from './types';\nimport { buildCookie, getHeader, matchRoute, parseRequest, setHeader } from './helpers';\n\nfunction errorResponse(statusCode: number, body: unknown, e?: unknown): Response {\n  if (e instanceof ApiError) {\n    return {\n      statusCode: e.statusCode,\n      body: e.body,\n    };\n  }\n  if (e) console.error(`${(e as Error).stack}`);\n  return {\n    statusCode: statusCode,\n    body: body,\n  };\n}\n\n/**\n * API route handler\n */\nexport async function apiHandler(\n  event: APIGatewayProxyEvent,\n  context: Context,\n  routes: Routes = {\n    '/ping': { GET: { handler: async (request) => ({ statusCode: 200, body: request }) } },\n  },\n  errorHandler: ((request: Request, e: Error) => Promise<Response>) | undefined = undefined,\n  catchAll: Handler | undefined = undefined,\n): Promise<APIGatewayProxyResult> {\n  const request = parseRequest(event);\n\n  let response: Response;\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      // Verify request body\n      if (route.request?.body) {\n        const parsed = route.request.body.safeParse(request.body);\n        if (!parsed.success) {\n          throw new ApiError(400, parsed.error);\n        }\n        request.body = parsed.data;\n      }\n\n      response = await route.handler(request);\n\n      // Verify response body\n      if (route.response?.body) {\n        const parsed = route.response.body.safeParse(response.body);\n        if (!parsed.success) {\n          console.error(JSON.stringify(parsed.error, null, 2));\n          throw new ApiError(500, 'Internal server error');\n        }\n        response.body = parsed.data;\n      }\n    } else if (catchAll) {\n      // Catch-all / 404\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 = errorResponse(500, 'Internal server error', ee);\n      }\n    } else {\n      response = errorResponse(500, 'Internal server error', e);\n    }\n  }\n\n  // Translate the response to an API Gateway Proxy result\n  let body: string | undefined;\n  const headers = response.headers || {};\n  if (typeof response.body === 'string') {\n    // Use the body as-is\n    // Add text/plain if no Content-Type header is set:\n    if (!getHeader('Content-Type', headers)) setHeader('Content-Type', 'text/plain', headers);\n    body = response.body;\n  } else if (response.body) {\n    // Stringify the response object\n    // API Gateway returns application/json by default\n    body = JSON.stringify(response.body);\n  }\n\n  // Prepare response\n  const result: APIGatewayProxyResult = {\n    statusCode: response.statusCode ?? 200,\n    headers,\n    body: body || '',\n  };\n\n  // Add cookie headers\n  const cookieHeaders = buildCookie(response);\n  if (cookieHeaders) {\n    result.multiValueHeaders = {\n      'Set-Cookie': cookieHeaders,\n    };\n  }\n\n  return result;\n}\n"]}

package/dist/helpers.d.ts

@@ -1,5 +1,5 @@
 import { APIGatewayProxyEvent } from 'aws-lambda';
-import { Request, Route, Routes } from './types';
+import { Request, Response, Route, Routes } from './types';
 /**
  * Ensures the path is lowercased, always has a leading slash and never a trailing slash
  * @param path APIGatewayProxyEvent.path
@@ -15,7 +15,7 @@ export declare function standardQueryParameters(query: {
     [name: string]: string;
 };
 /**
- * Ensures all header names are lowercased for ease of access.
+ * Ensures all headers have a value.
  * @param headers APIGatewayProxyEvent.headers
  */
 export declare function standardHeaders(headers: {
@@ -38,12 +38,22 @@ export declare function parseCookie(headers: {
 }): {
     [name: string]: string;
 };
-export declare function buildCookie(values: {
-    [key: string]: string;
-} | undefined): string[] | undefined;
+export declare function buildCookie(response: Response, maxAge?: number | undefined, expires?: Date | undefined, secure?: boolean, httpOnly?: boolean, sameSite?: 'strict' | 'lax' | 'none'): string[] | undefined;
+/**
+ * Case-insensitive header lookup
+ */
+export declare function getHeader(name: string, headers: {
+    [key: string]: string | undefined;
+} | undefined): string | undefined;
+/**
+ * Case-insensitive header setting
+ */
+export declare function setHeader(name: string, value: string, headers: {
+    [key: string]: string | undefined;
+} | undefined): void;
 export declare function parseRequest(event: APIGatewayProxyEvent): Request;
 export declare function matchRoute(routes: Routes, path: string): {
-    route: Route | undefined;
+    methods: Route | undefined;
     params: {
         [name: string]: string;
     };

package/dist/helpers.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.standardPath = standardPath;
 exports.standardQueryParameters = standardQueryParameters;
@@ -29,6 +39,8 @@ exports.standardHeaders = standardHeaders;
 exports.parseBody = parseBody;
 exports.parseCookie = parseCookie;
 exports.buildCookie = buildCookie;
+exports.getHeader = getHeader;
+exports.setHeader = setHeader;
 exports.parseRequest = parseRequest;
 exports.matchRoute = matchRoute;
 const cookie = __importStar(require("cookie"));
@@ -58,19 +70,14 @@ function standardQueryParameters(query) {
     return result;
 }
 /**
- * Ensures all header names are lowercased for ease of access.
+ * Ensures all headers have a value.
  * @param headers APIGatewayProxyEvent.headers
  */
 function standardHeaders(headers) {
     const result = {};
-    Object.keys(headers).forEach((name) => {
-        const value = headers[name];
-        if (value) {
-            // Provide both original-case and lowercased (standardised) header names for ease of access:
-            result[name] = value;
-            result[name.toLowerCase()] = value;
-        }
-    });
+    for (const [name, value] of Object.entries(headers || {})) {
+        result[name] = value ?? '';
+    }
     return result;
 }
 /**
@@ -102,81 +109,121 @@ function parseBody(body, isBase64Encoded, contentType = 'application/json') {
  * @param headers APIGatewayProxyEvent.headers
  */
 function parseCookie(headers) {
-    const header = headers.cookie || headers.Cookie || '';
-    return cookie.parse(header);
+    const header = getHeader('Cookie', headers);
+    const values = header ? cookie.parse(header) : {};
+    // Ensure we don't return any undefined values
+    const result = {};
+    for (const [name, value] of Object.entries(values)) {
+        if (value)
+            result[name] = value;
+    }
+    return result;
 }
-function buildCookie(values) {
-    if (!values)
+function buildCookie(response, maxAge = 60 * 60 * 24 * 365, expires = undefined, secure = true, httpOnly = true, sameSite = 'lax') {
+    if (!response.cookies)
         return undefined;
+    const cookies = {};
+    for (const [key, value] of Object.entries(response.cookies)) {
+        cookies[key] = value;
+    }
     const header = [];
-    const oneYear = 60 * 60 * 24 * 365;
-    Object.keys(values).forEach((key) => {
-        const value = values[key];
+    Object.keys(cookies).forEach((key) => {
+        const value = cookies[key];
         if (value === '') {
             // If explicitly unset, expire the cookie value
             header.push(cookie.serialize(key, '', {
-                expires: new Date(), secure: true, httpOnly: true, sameSite: 'strict',
+                expires: new Date(), secure, httpOnly, sameSite,
             }));
         }
         else if (value) {
             // Otherwise, set it only if a value was given
             header.push(cookie.serialize(key, value, {
-                maxAge: oneYear, secure: true, httpOnly: true, sameSite: 'strict',
+                maxAge, expires, secure, httpOnly, sameSite,
             }));
         }
     });
     return header;
 }
+/**
+ * Case-insensitive header lookup
+ */
+function getHeader(name, headers) {
+    if (!headers)
+        return undefined;
+    // Exact match
+    if (headers[name])
+        return headers[name];
+    // Case-insensitive match
+    const lowercased = {};
+    for (const [key, value] of Object.entries(headers)) {
+        lowercased[key.toLowerCase()] = value;
+    }
+    return lowercased[name.toLowerCase()];
+}
+/**
+ * Case-insensitive header setting
+ */
+function setHeader(name, value, headers) {
+    if (!headers)
+        return;
+    let set = false;
+    for (const key of Object.keys(headers)) {
+        if (name.toLowerCase() === key.toLowerCase()) {
+            headers[key] = value;
+            set = true;
+        }
+    }
+    if (!set)
+        headers[name] = value;
+}
 function parseRequest(event) {
     return {
         method: event.httpMethod,
         path: standardPath(event.path),
         query: standardQueryParameters(event.queryStringParameters),
         headers: standardHeaders(event.headers),
-        body: parseBody(event.body, event.isBase64Encoded, event.headers['content-type']),
+        body: parseBody(event.body, event.isBase64Encoded, getHeader('Content-Type', event.headers)),
         cookies: parseCookie(event.headers),
         pathParameters: {}, // These need to be parsed as part of route matching
-        context: {}, // You can add any custom values you need to the request via this context
+        context: { event }, // You can add any custom values you need to the request via this context
     };
 }
 function matchRoute(routes, path) {
-    // Simple match
+    // Direct match
     if (routes[path])
-        return { route: routes[path], params: {} };
+        return { methods: routes[path], params: {} };
     // List paths to check
     const paths = Object.keys(routes);
     // Case-insensitive match
-    for (let p = 0; p < paths.length; p++) {
-        const candidate = paths[p];
+    for (const candidate of paths) {
         if (candidate.toLowerCase() === path.toLowerCase())
-            return { route: routes[candidate], params: {} };
+            return { methods: routes[candidate], params: {} };
     }
     // Path-parameter matching
     const pathSegments = path.split('/');
-    for (let p = 0; p < paths.length; p++) {
-        const candidate = paths[p];
+    for (const candidate of paths) {
         const candidateSegments = candidate.split('/');
         // First check: length match
         if (pathSegments.length !== candidateSegments.length)
             continue;
         for (let s = 0; s < pathSegments.length; s++) {
             const params = {};
-            const pathSegment = pathSegments[s];
-            const candidateSegment = candidateSegments[s];
+            const pathSegment = pathSegments[s] ?? '';
+            const candidateSegment = candidateSegments[s] ?? '';
             if (candidateSegment.startsWith('{') && candidateSegment.endsWith('}')) {
                 // Path parameter
                 const name = candidateSegment.slice(1, -1);
                 params[name] = pathSegment;
             }
-            else if (pathSegment !== candidateSegment) {
+            else if (pathSegment.toLowerCase() !== candidateSegment.toLowerCase()) {
                 break;
             }
             if (s === pathSegments.length - 1) {
                 // Matched all segments
-                return { route: routes[candidate], params };
+                return { methods: routes[candidate], params };
             }
         }
     }
-    return { route: undefined, params: {} };
+    return { methods: undefined, params: {} };
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/helpers.ts"],"names":[],"mappings":"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","sourcesContent":["import { APIGatewayProxyEvent } from 'aws-lambda';\nimport * as cookie from 'cookie';\nimport { Request, Route, Routes } from './types';\n\n/**\n * Ensures the path is lowercased, always has a leading slash and never a trailing slash\n * @param path APIGatewayProxyEvent.path\n */\nexport function standardPath(path: string): string {\n  // Get path segments, filtering out any blanks\n  const segments = path.split('/').filter((segment) => segment);\n  // Return path\n  return `/${segments.join('/').toLowerCase()}`;\n}\n\n/**\n * Ensures a non-null object containing only query-string parameters that have a value.\n * @param query APIGatewayProxyEvent.query\n */\nexport function standardQueryParameters(query: { [name: string]: string | undefined; } | null): { [name: string]: string; } {\n  if (!query) return {};\n  const result: { [name: string]: string; } = {};\n  Object.keys(query).forEach((parameter) => {\n    const value = query[parameter];\n    if (value) result[parameter] = value;\n  });\n  return result;\n}\n\n/**\n * Ensures all header names are lowercased for ease of access.\n * @param headers APIGatewayProxyEvent.headers\n */\nexport function standardHeaders(headers: { [name: string]: string | undefined; }): { [name: string]: string; } {\n  const result: { [name: string]: string; } = {};\n  Object.keys(headers).forEach((name) => {\n    const value = headers[name];\n    if (value) {\n      // Provide both original-case and lowercased (standardised) header names for ease of access:\n      result[name] = value;\n      result[name.toLowerCase()] = value;\n    }\n  });\n  return result;\n}\n\n/**\n * Parses the body (if present) from application/x-www-form-urlencoded or JSON string.\n * If the body fails to parse as JSOn, the raw body is returned.\n * @param body APIGatewayProxyEvent.body\n */\nexport function parseBody(body: string | null, isBase64Encoded: boolean, contentType: string = 'application/json'): Record<string, unknown> | string {\n  if (!body) return {};\n\n  const content = isBase64Encoded ? Buffer.from(body, 'base64').toString('utf8') : body;\n\n  try {\n    if ((contentType || '').toLowerCase() === 'application/x-www-form-urlencoded') {\n      return Object.fromEntries(new URLSearchParams(content));\n    } else {\n      // Default to parsing as JSON:\n      return JSON.parse(content);\n    }\n  } catch (e) {\n    console.error(`Error parsing request body: ${e}`);\n  }\n\n  // Fallback to returning the raw body\n  return content;\n}\n\n/**\n * Parses the cookie, if any, returning at minimum an empty object.\n * @param headers APIGatewayProxyEvent.headers\n */\nexport function parseCookie(headers: { [name: string]: string | undefined; }): { [name: string]: string; } {\n  const header = headers.cookie || headers.Cookie || '';\n  return cookie.parse(header);\n}\n\nexport function buildCookie(values: { [key: string]: string; } | undefined): string[] | undefined {\n  if (!values) return undefined;\n\n  const header: string[] = [];\n  const oneYear = 60 * 60 * 24 * 365;\n\n  Object.keys(values).forEach((key) => {\n    const value = values[key];\n    if (value === '') {\n      // If explicitly unset, expire the cookie value\n      header.push(cookie.serialize(key, '', {\n        expires: new Date(), secure: true, httpOnly: true, sameSite: 'strict',\n      }));\n    } else if (value) {\n      // Otherwise, set it only if a value was given\n      header.push(cookie.serialize(key, value, {\n        maxAge: oneYear, secure: true, httpOnly: true, sameSite: 'strict',\n      }));\n    }\n  });\n\n  return header;\n}\n\nexport function parseRequest(event: APIGatewayProxyEvent): Request {\n  return {\n    method: event.httpMethod,\n    path: standardPath(event.path),\n    query: standardQueryParameters(event.queryStringParameters),\n    headers: standardHeaders(event.headers),\n    body: parseBody(event.body, event.isBase64Encoded, event.headers['content-type']),\n    cookies: parseCookie(event.headers),\n    pathParameters: {}, // These need to be parsed as part of route matching\n    context: {}, // You can add any custom values you need to the request via this context\n  };\n}\n\nexport function matchRoute(routes: Routes, path: string): { route: Route | undefined, params: { [name: string]: string; }; } {\n  // Simple match\n  if (routes[path]) return { route: routes[path], params: {} };\n\n  // List paths to check\n  const paths = Object.keys(routes);\n\n  // Case-insensitive match\n  for (let p = 0; p < paths.length; p++) {\n    const candidate = paths[p];\n    if (candidate.toLowerCase() === path.toLowerCase()) return { route: routes[candidate], params: {} };\n  }\n\n  // Path-parameter matching\n  const pathSegments = path.split('/');\n\n  for (let p = 0; p < paths.length; p++) {\n    const candidate = paths[p];\n    const candidateSegments = candidate.split('/');\n\n    // First check: length match\n    if (pathSegments.length !== candidateSegments.length) continue;\n\n    for (let s = 0; s < pathSegments.length; s++) {\n      const params: { [name: string]: string; } = {};\n      const pathSegment = pathSegments[s];\n      const candidateSegment = candidateSegments[s];\n      if (candidateSegment.startsWith('{') && candidateSegment.endsWith('}')) {\n        // Path parameter\n        const name = candidateSegment.slice(1, -1);\n        params[name] = pathSegment;\n      } else if (pathSegment !== candidateSegment) {\n        break;\n      }\n\n      if (s === pathSegments.length - 1) {\n        // Matched all segments\n        return { route: routes[candidate], params };\n      }\n    }\n  }\n\n  return { route: undefined, params: {} };\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/helpers.ts"],"names":[],"mappings":"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","sourcesContent":["import { APIGatewayProxyEvent } from 'aws-lambda';\nimport * as cookie from 'cookie';\nimport { Request, Response, Route, Routes } from './types';\n\n/**\n * Ensures the path is lowercased, always has a leading slash and never a trailing slash\n * @param path APIGatewayProxyEvent.path\n */\nexport function standardPath(path: string): string {\n  // Get path segments, filtering out any blanks\n  const segments = path.split('/').filter((segment) => segment);\n  // Return path\n  return `/${segments.join('/').toLowerCase()}`;\n}\n\n/**\n * Ensures a non-null object containing only query-string parameters that have a value.\n * @param query APIGatewayProxyEvent.query\n */\nexport function standardQueryParameters(query: { [name: string]: string | undefined; } | null): { [name: string]: string; } {\n  if (!query) return {};\n  const result: { [name: string]: string; } = {};\n  Object.keys(query).forEach((parameter) => {\n    const value = query[parameter];\n    if (value) result[parameter] = value;\n  });\n  return result;\n}\n\n/**\n * Ensures all headers have a value.\n * @param headers APIGatewayProxyEvent.headers\n */\nexport function standardHeaders(headers: { [name: string]: string | undefined; }): { [name: string]: string; } {\n  const result: { [name: string]: string; } = {};\n  for (const [name, value] of Object.entries(headers || {})) {\n    result[name] = value ?? '';\n  }\n  return result;\n}\n\n/**\n * Parses the body (if present) from application/x-www-form-urlencoded or JSON string.\n * If the body fails to parse as JSOn, the raw body is returned.\n * @param body APIGatewayProxyEvent.body\n */\nexport function parseBody(body: string | null, isBase64Encoded: boolean, contentType: string = 'application/json'): Record<string, unknown> | string {\n  if (!body) return {};\n\n  const content = isBase64Encoded ? Buffer.from(body, 'base64').toString('utf8') : body;\n\n  try {\n    if ((contentType || '').toLowerCase() === 'application/x-www-form-urlencoded') {\n      return Object.fromEntries(new URLSearchParams(content));\n    } else {\n      // Default to parsing as JSON:\n      return JSON.parse(content);\n    }\n  } catch (e) {\n    console.error(`Error parsing request body: ${e}`);\n  }\n\n  // Fallback to returning the raw body\n  return content;\n}\n\n/**\n * Parses the cookie, if any, returning at minimum an empty object.\n * @param headers APIGatewayProxyEvent.headers\n */\nexport function parseCookie(headers: { [name: string]: string | undefined; }): { [name: string]: string; } {\n  const header = getHeader('Cookie', headers);\n  const values = header ? cookie.parse(header) : {};\n\n  // Ensure we don't return any undefined values\n  const result: { [name: string]: string; } = {};\n  for (const [name, value] of Object.entries(values)) {\n    if (value) result[name] = value;\n  }\n  return result;\n}\n\nexport function buildCookie(\n  response: Response,\n  maxAge: number | undefined = 60 * 60 * 24 * 365,\n  expires: Date | undefined = undefined,\n  secure: boolean = true,\n  httpOnly: boolean = true,\n  sameSite: 'strict' | 'lax' | 'none' = 'lax',\n): string[] | undefined {\n  if (!response.cookies) return undefined;\n\n  const cookies: { [key: string]: string; } = {};\n  for (const [key, value] of Object.entries(response.cookies)) {\n    cookies[key] = value;\n  }\n\n  const header: string[] = [];\n\n  Object.keys(cookies).forEach((key) => {\n    const value = cookies[key];\n    if (value === '') {\n      // If explicitly unset, expire the cookie value\n      header.push(cookie.serialize(key, '', {\n        expires: new Date(), secure, httpOnly, sameSite,\n      }));\n    } else if (value) {\n      // Otherwise, set it only if a value was given\n      header.push(cookie.serialize(key, value, {\n        maxAge, expires, secure, httpOnly, sameSite,\n      }));\n    }\n  });\n\n  return header;\n}\n\n/**\n * Case-insensitive header lookup\n */\nexport function getHeader(name: string, headers: { [key: string]: string | undefined; } | undefined): string | undefined {\n  if (!headers) return undefined;\n\n  // Exact match\n  if (headers[name]) return headers[name];\n\n  // Case-insensitive match\n  const lowercased: { [key: string]: string | undefined; } = {};\n  for (const [key, value] of Object.entries(headers)) {\n    lowercased[key.toLowerCase()] = value;\n  }\n  return lowercased[name.toLowerCase()];\n}\n\n/**\n * Case-insensitive header setting\n */\nexport function setHeader(name: string, value: string, headers: { [key: string]: string | undefined; } | undefined): void {\n  if (!headers) return;\n  let set = false;\n  for (const key of Object.keys(headers)) {\n    if (name.toLowerCase() === key.toLowerCase()) {\n      headers[key] = value;\n      set = true;\n    }\n  }\n  if (!set) headers[name] = value;\n}\n\nexport function parseRequest(event: APIGatewayProxyEvent): Request {\n  return {\n    method: event.httpMethod,\n    path: standardPath(event.path),\n    query: standardQueryParameters(event.queryStringParameters),\n    headers: standardHeaders(event.headers),\n    body: parseBody(event.body, event.isBase64Encoded, getHeader('Content-Type', event.headers)),\n    cookies: parseCookie(event.headers),\n    pathParameters: {}, // These need to be parsed as part of route matching\n    context: { event }, // You can add any custom values you need to the request via this context\n  };\n}\n\nexport function matchRoute(routes: Routes, path: string): { methods: Route | undefined, params: { [name: string]: string; }; } {\n  // Direct match\n  if (routes[path]) return { methods: routes[path], params: {} };\n\n  // List paths to check\n  const paths = Object.keys(routes);\n\n  // Case-insensitive match\n  for (const candidate of paths) {\n    if (candidate.toLowerCase() === path.toLowerCase()) return { methods: routes[candidate], params: {} };\n  }\n\n  // Path-parameter matching\n  const pathSegments = path.split('/');\n\n  for (const candidate of paths) {\n    const candidateSegments = candidate.split('/');\n\n    // First check: length match\n    if (pathSegments.length !== candidateSegments.length) continue;\n\n    for (let s = 0; s < pathSegments.length; s++) {\n      const params: { [name: string]: string; } = {};\n      const pathSegment = pathSegments[s] ?? '';\n      const candidateSegment = candidateSegments[s] ?? '';\n      if (candidateSegment.startsWith('{') && candidateSegment.endsWith('}')) {\n        // Path parameter\n        const name = candidateSegment.slice(1, -1);\n        params[name] = pathSegment;\n      } else if (pathSegment.toLowerCase() !== candidateSegment.toLowerCase()) {\n        break;\n      }\n\n      if (s === pathSegments.length - 1) {\n        // Matched all segments\n        return { methods: routes[candidate], params };\n      }\n    }\n  }\n\n  return { methods: undefined, params: {} };\n}\n"]}

package/dist/index.js

@@ -18,16 +18,26 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.types = exports.helpers = void 0;
 __exportStar(require("./handler"), exports);
 exports.helpers = __importStar(require("./helpers"));
 exports.types = __importStar(require("./types"));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw0Q0FBMEI7QUFDMUIscURBQXFDO0FBQ3JDLGlEQUFpQyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCAqIGZyb20gJy4vaGFuZGxlcic7XG5leHBvcnQgKiBhcyBoZWxwZXJzIGZyb20gJy4vaGVscGVycyc7XG5leHBvcnQgKiBhcyB0eXBlcyBmcm9tICcuL3R5cGVzJztcbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsNENBQTBCO0FBQzFCLHFEQUFxQztBQUNyQyxpREFBaUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgKiBmcm9tICcuL2hhbmRsZXInO1xuZXhwb3J0ICogYXMgaGVscGVycyBmcm9tICcuL2hlbHBlcnMnO1xuZXhwb3J0ICogYXMgdHlwZXMgZnJvbSAnLi90eXBlcyc7XG4iXX0=

package/dist/types.d.ts

@@ -1,50 +1,55 @@
-/**
- * Simplified representation of the HTTP Request.
- * The implementation guarantees that you'll always have non-null objects for query, headers, cookies, and body.
- * The method will be the HTTP method from the API Gateway proxt event.
- * The path will be the path from the API Gateway proxy event, which starts with '/'.
- */
-export interface Request {
+import { APIGatewayProxyEvent } from "aws-lambda";
+import z from "zod";
+export interface Request<B = any> {
     method: string;
     path: string;
-    query: {
-        [name: string]: string;
-    };
-    headers: {
-        [name: string]: string;
-    };
-    cookies: {
-        [name: string]: string;
-    };
-    /** Path parameters will be parsed from the route definitions you pass to apiHandler() */
-    pathParameters: {
-        [name: string]: string;
-    };
-    body: any;
-    /** You can add any custom values you need to the request via this context */
+    query: Record<string, string>;
+    headers: Record<string, string>;
+    cookies: Record<string, string>;
+    pathParameters: Record<string, string>;
+    body: B;
     context: {
+        event: APIGatewayProxyEvent;
         [key: string]: any;
     };
 }
-export interface Response {
-    statusCode: number;
-    headers?: {
-        [name: string]: string;
+export interface Response<B = any> {
+    statusCode?: number;
+    headers?: Record<string, string>;
+    cookies?: Record<string, string>;
+    body?: B;
+}
+type AnySchema = z.ZodType<any, any, any>;
+export interface Handler<SReq extends AnySchema = AnySchema, SRes extends AnySchema = AnySchema> {
+    request?: {
+        body?: SReq;
+        headers?: z.ZodObject<any>;
+        cookies?: z.ZodObject<any>;
+        pathParameters?: z.ZodObject<any>;
+        query?: z.ZodObject<any>;
     };
-    cookies?: {
-        [name: string]: string;
+    response?: {
+        body?: SRes;
+        headers?: z.ZodObject<any>;
+        cookies?: z.ZodObject<any>;
     };
-    body?: object | string;
+    handler: (request: Request<z.infer<SReq>>) => Promise<Response<z.infer<SRes>>>;
 }
-export type Handler = (request: Request) => Promise<Response>;
 export interface Route {
     GET?: Handler;
     POST?: Handler;
     PUT?: Handler;
     DELETE?: Handler;
+    PATCH?: Handler;
     OPTIONS?: Handler;
+    HEAD?: Handler;
 }
 export interface Routes {
     [path: string]: Route;
 }
-export type ContextBuilder = (request: Request) => Promise<void>;
+export declare class ApiError extends Error {
+    statusCode: number;
+    body: unknown;
+    constructor(statusCode: number, body: unknown);
+}
+export {};

package/dist/types.js

@@ -1,3 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogU2ltcGxpZmllZCByZXByZXNlbnRhdGlvbiBvZiB0aGUgSFRUUCBSZXF1ZXN0LlxuICogVGhlIGltcGxlbWVudGF0aW9uIGd1YXJhbnRlZXMgdGhhdCB5b3UnbGwgYWx3YXlzIGhhdmUgbm9uLW51bGwgb2JqZWN0cyBmb3IgcXVlcnksIGhlYWRlcnMsIGNvb2tpZXMsIGFuZCBib2R5LlxuICogVGhlIG1ldGhvZCB3aWxsIGJlIHRoZSBIVFRQIG1ldGhvZCBmcm9tIHRoZSBBUEkgR2F0ZXdheSBwcm94dCBldmVudC5cbiAqIFRoZSBwYXRoIHdpbGwgYmUgdGhlIHBhdGggZnJvbSB0aGUgQVBJIEdhdGV3YXkgcHJveHkgZXZlbnQsIHdoaWNoIHN0YXJ0cyB3aXRoICcvJy5cbiAqL1xuZXhwb3J0IGludGVyZmFjZSBSZXF1ZXN0IHtcbiAgbWV0aG9kOiBzdHJpbmcsXG4gIHBhdGg6IHN0cmluZyxcbiAgcXVlcnk6IHsgW25hbWU6IHN0cmluZ106IHN0cmluZzsgfSxcbiAgaGVhZGVyczogeyBbbmFtZTogc3RyaW5nXTogc3RyaW5nOyB9LFxuICBjb29raWVzOiB7IFtuYW1lOiBzdHJpbmddOiBzdHJpbmc7IH0sXG4gIC8qKiBQYXRoIHBhcmFtZXRlcnMgd2lsbCBiZSBwYXJzZWQgZnJvbSB0aGUgcm91dGUgZGVmaW5pdGlvbnMgeW91IHBhc3MgdG8gYXBpSGFuZGxlcigpICovXG4gIHBhdGhQYXJhbWV0ZXJzOiB7IFtuYW1lOiBzdHJpbmddOiBzdHJpbmc7IH0sXG4gIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBAdHlwZXNjcmlwdC1lc2xpbnQvbm8tZXhwbGljaXQtYW55XG4gIGJvZHk6IGFueSxcbiAgLyoqIFlvdSBjYW4gYWRkIGFueSBjdXN0b20gdmFsdWVzIHlvdSBuZWVkIHRvIHRoZSByZXF1ZXN0IHZpYSB0aGlzIGNvbnRleHQgKi9cbiAgLy8gZXNsaW50LWRpc2FibGUtbmV4dC1saW5lIEB0eXBlc2NyaXB0LWVzbGludC9uby1leHBsaWNpdC1hbnlcbiAgY29udGV4dDogeyBba2V5OiBzdHJpbmddOiBhbnk7IH0sXG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgUmVzcG9uc2Uge1xuICBzdGF0dXNDb2RlOiBudW1iZXIsXG4gIGhlYWRlcnM/OiB7IFtuYW1lOiBzdHJpbmddOiBzdHJpbmc7IH0sXG4gIGNvb2tpZXM/OiB7IFtuYW1lOiBzdHJpbmddOiBzdHJpbmc7IH0sXG4gIGJvZHk/OiBvYmplY3QgfCBzdHJpbmcsXG59XG5cbmV4cG9ydCB0eXBlIEhhbmRsZXIgPSAocmVxdWVzdDogUmVxdWVzdCkgPT4gUHJvbWlzZTxSZXNwb25zZT47XG5leHBvcnQgaW50ZXJmYWNlIFJvdXRlIHtcbiAgR0VUPzogSGFuZGxlcixcbiAgUE9TVD86IEhhbmRsZXIsXG4gIFBVVD86IEhhbmRsZXIsXG4gIERFTEVURT86IEhhbmRsZXIsXG4gIE9QVElPTlM/OiBIYW5kbGVyLFxufVxuZXhwb3J0IGludGVyZmFjZSBSb3V0ZXMgeyBbcGF0aDogc3RyaW5nXTogUm91dGU7IH1cblxuXG5leHBvcnQgdHlwZSBDb250ZXh0QnVpbGRlciA9IChyZXF1ZXN0OiBSZXF1ZXN0KSA9PiBQcm9taXNlPHZvaWQ+OyJdfQ==
+exports.ApiError = void 0;
+class ApiError extends Error {
+    statusCode;
+    body;
+    constructor(statusCode, body) {
+        super(typeof body === 'string' ? body : JSON.stringify(body, null, 2));
+        this.statusCode = statusCode;
+        this.body = body;
+        // Required for instanceof to work properly
+        Object.setPrototypeOf(this, ApiError.prototype);
+    }
+}
+exports.ApiError = ApiError;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBd0RBLE1BQWEsUUFBUyxTQUFRLEtBQUs7SUFDakMsVUFBVSxDQUFTO0lBQ25CLElBQUksQ0FBVTtJQUVkLFlBQVksVUFBa0IsRUFBRSxJQUFhO1FBQzNDLEtBQUssQ0FBQyxPQUFPLElBQUksS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDdkUsSUFBSSxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUM7UUFDN0IsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7UUFFakIsMkNBQTJDO1FBQzNDLE1BQU0sQ0FBQyxjQUFjLENBQUMsSUFBSSxFQUFFLFFBQVEsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNsRCxDQUFDO0NBQ0Y7QUFaRCw0QkFZQyIsInNvdXJjZXNDb250ZW50IjpbIi8qIGVzbGludC1kaXNhYmxlIEB0eXBlc2NyaXB0LWVzbGludC9uby1leHBsaWNpdC1hbnkgKi9cbmltcG9ydCB7IEFQSUdhdGV3YXlQcm94eUV2ZW50IH0gZnJvbSBcImF3cy1sYW1iZGFcIjtcbmltcG9ydCB6IGZyb20gXCJ6b2RcIjtcblxuZXhwb3J0IGludGVyZmFjZSBSZXF1ZXN0PEIgPSBhbnk+IHtcbiAgbWV0aG9kOiBzdHJpbmcsXG4gIHBhdGg6IHN0cmluZyxcbiAgcXVlcnk6IFJlY29yZDxzdHJpbmcsIHN0cmluZz47XG4gIGhlYWRlcnM6IFJlY29yZDxzdHJpbmcsIHN0cmluZz47XG4gIGNvb2tpZXM6IFJlY29yZDxzdHJpbmcsIHN0cmluZz47XG4gIHBhdGhQYXJhbWV0ZXJzOiBSZWNvcmQ8c3RyaW5nLCBzdHJpbmc+O1xuICBib2R5OiBCO1xuICBjb250ZXh0OiB7XG4gICAgZXZlbnQ6IEFQSUdhdGV3YXlQcm94eUV2ZW50O1xuICAgIFtrZXk6IHN0cmluZ106IGFueTtcbiAgfSxcbn1cblxuZXhwb3J0IGludGVyZmFjZSBSZXNwb25zZTxCID0gYW55PiB7XG4gIHN0YXR1c0NvZGU/OiBudW1iZXI7XG4gIGhlYWRlcnM/OiBSZWNvcmQ8c3RyaW5nLCBzdHJpbmc+O1xuICBjb29raWVzPzogUmVjb3JkPHN0cmluZywgc3RyaW5nPjtcbiAgYm9keT86IEI7XG59XG5cbnR5cGUgQW55U2NoZW1hID0gei5ab2RUeXBlPGFueSwgYW55LCBhbnk+O1xuZXhwb3J0IGludGVyZmFjZSBIYW5kbGVyPFNSZXEgZXh0ZW5kcyBBbnlTY2hlbWEgPSBBbnlTY2hlbWEsIFNSZXMgZXh0ZW5kcyBBbnlTY2hlbWEgPSBBbnlTY2hlbWE+IHtcbiAgcmVxdWVzdD86IHtcbiAgICBib2R5PzogU1JlcTtcbiAgICBoZWFkZXJzPzogei5ab2RPYmplY3Q8YW55PjtcbiAgICBjb29raWVzPzogei5ab2RPYmplY3Q8YW55PjtcbiAgICBwYXRoUGFyYW1ldGVycz86IHouWm9kT2JqZWN0PGFueT47XG4gICAgcXVlcnk/OiB6LlpvZE9iamVjdDxhbnk+O1xuICB9O1xuICByZXNwb25zZT86IHtcbiAgICBib2R5PzogU1JlcztcbiAgICBoZWFkZXJzPzogei5ab2RPYmplY3Q8YW55PjtcbiAgICBjb29raWVzPzogei5ab2RPYmplY3Q8YW55PjtcbiAgfTtcbiAgaGFuZGxlcjogKHJlcXVlc3Q6IFJlcXVlc3Q8ei5pbmZlcjxTUmVxPj4pID0+IFByb21pc2U8UmVzcG9uc2U8ei5pbmZlcjxTUmVzPj4+O1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFJvdXRlIHtcbiAgR0VUPzogSGFuZGxlcjtcbiAgUE9TVD86IEhhbmRsZXI7XG4gIFBVVD86IEhhbmRsZXI7XG4gIERFTEVURT86IEhhbmRsZXI7XG4gIFBBVENIPzogSGFuZGxlcjtcbiAgT1BUSU9OUz86IEhhbmRsZXI7XG4gIEhFQUQ/OiBIYW5kbGVyO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFJvdXRlcyB7XG4gIFtwYXRoOiBzdHJpbmddOiBSb3V0ZTtcbn1cblxuZXhwb3J0IGNsYXNzIEFwaUVycm9yIGV4dGVuZHMgRXJyb3Ige1xuICBzdGF0dXNDb2RlOiBudW1iZXI7XG4gIGJvZHk6IHVua25vd247XG5cbiAgY29uc3RydWN0b3Ioc3RhdHVzQ29kZTogbnVtYmVyLCBib2R5OiB1bmtub3duKSB7XG4gICAgc3VwZXIodHlwZW9mIGJvZHkgPT09ICdzdHJpbmcnID8gYm9keSA6IEpTT04uc3RyaW5naWZ5KGJvZHksIG51bGwsIDIpKTtcbiAgICB0aGlzLnN0YXR1c0NvZGUgPSBzdGF0dXNDb2RlO1xuICAgIHRoaXMuYm9keSA9IGJvZHk7XG5cbiAgICAvLyBSZXF1aXJlZCBmb3IgaW5zdGFuY2VvZiB0byB3b3JrIHByb3Blcmx5XG4gICAgT2JqZWN0LnNldFByb3RvdHlwZU9mKHRoaXMsIEFwaUVycm9yLnByb3RvdHlwZSk7XG4gIH1cbn1cbiJdfQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scloud/lambda-api",
-  "version": "0.3.7",
+  "version": "1.0.0",
   "description": "Lambda handler for API Gateway proxy requests",
   "main": "dist/index.js",
   "files": [
@@ -34,6 +34,7 @@
   "homepage": "https://github.com/davidcarboni/scloud#readme",
   "devDependencies": {
     "@eslint/js": "*",
+    "@tsconfig/node22": "*",
     "@types/chai": "*",
     "@types/cookie": "*",
     "@types/mocha": "*",
@@ -51,6 +52,7 @@
   },
   "dependencies": {
     "@types/aws-lambda": "*",
-    "cookie": "*"
+    "cookie": "*",
+    "zod": "*"
   }
 }