effortless-aws 0.32.0 → 0.32.1

package/README.md

@@ -13,15 +13,8 @@ npm install effortless-aws
 ```typescript
 import { defineApi } from "effortless-aws";
 
-export const hello = defineApi({
-  basePath: "/hello",
-  get: {
-    "/": async () => ({
-      status: 200,
-      body: { message: "Hello!" },
-    }),
-  },
-});
+export const hello = defineApi({ basePath: "/hello" })
+  .get("/", async ({ ok }) => ok({ message: "Hello!" }));
 ```
 
 ## Handlers
@@ -39,9 +32,9 @@ export const hello = defineApi({
 ## Features
 
 - **Infrastructure from code** — export a handler, get the AWS resources
-- **Typed everything** — `defineTable<Order>` gives you typed `put()`, typed `deps.orders.get()`, typed `record.new`
-- **Cross-handler deps** — `deps: { orders }` auto-wires IAM and injects a typed `TableClient`
-- **SSM params** — `param("stripe-key")` fetches from Parameter Store at cold start
+- **Typed everything** — `defineTable<Order>()` gives you typed `put()`, typed `deps.orders.get()`, typed `record.new`
+- **Cross-handler deps** — `.deps(() => ({ orders }))` auto-wires IAM and injects a typed `TableClient`
+- **SSM params** — `.config(({ defineSecret }) => ...)` fetches secrets from Parameter Store at cold start
 - **Static files** — `static: ["templates/*.ejs"]` bundles files into the Lambda ZIP
 - **Cold start caching** — `setup` factory runs once per cold start, cached across invocations
 

package/dist/runtime/wrap-api.js

@@ -48,9 +48,37 @@ var unauthorized = () => ({
   headers: { "Content-Type": "application/json" },
   body: JSON.stringify({ error: "Unauthorized" })
 });
-var findRoute = (routes, method, relativePath) => routes.find(
-  (r) => r.path === relativePath && (r.method === method || r.method === "GET" && method === "HEAD")
-);
+var extractParamNames = (pattern) => {
+  const names = [];
+  pattern.replace(/\{(\w+)\}/g, (_, name) => {
+    names.push(name);
+    return "";
+  });
+  return names;
+};
+var patternToRegex = (pattern) => {
+  const escaped = pattern.replace(
+    /[.*+?^${}()|[\]\\]/g,
+    (ch) => ch === "{" || ch === "}" ? ch : `\\${ch}`
+  );
+  const withParams = escaped.replace(/\{(\w+)\}/g, "([^/]+)");
+  return new RegExp(`^${withParams}$`);
+};
+var findRoute = (routes, method, relativePath) => {
+  for (const r of routes) {
+    if (!(r.method === method || r.method === "GET" && method === "HEAD")) continue;
+    if (r.path === relativePath) return { entry: r, params: {} };
+    const regex = patternToRegex(r.path);
+    const match = relativePath.match(regex);
+    if (match) {
+      const names = extractParamNames(r.path);
+      const params = {};
+      for (let i = 0; i < names.length; i++) params[names[i]] = decodeURIComponent(match[i + 1]);
+      return { entry: r, params };
+    }
+  }
+  return void 0;
+};
 var wrapApi = (handler) => {
   const rt = createHandlerRuntime(handler, "api", handler.__spec.lambda?.logLevel ?? "info", () => ({ ok, fail }));
   const basePath = handler.__spec.basePath;
@@ -85,9 +113,21 @@ var wrapApi = (handler) => {
       const method = event.requestContext?.http?.method ?? event.httpMethod ?? "GET";
       const path = event.requestContext?.http?.path ?? event.path ?? "/";
       const headers = event.headers ?? {};
-      const query = event.queryStringParameters ?? {};
-      const params = event.pathParameters ?? {};
       const body = parseBody(event.body, event.isBase64Encoded ?? false);
+      const logInput = { method, path, query: event.queryStringParameters ?? {}, body };
+      const relativePath = extractRelativePath(path);
+      if (!relativePath) {
+        rt.logExecution(startTime, logInput, { status: 404 });
+        return notFound();
+      }
+      const routeMatch = findRoute(routes, method, relativePath);
+      if (!routeMatch) {
+        rt.logExecution(startTime, logInput, { status: 404 });
+        return notFound();
+      }
+      const { entry, params: routeParams } = routeMatch;
+      const query = event.queryStringParameters ?? {};
+      const params = { ...event.pathParameters ?? {}, ...routeParams };
       const merged = {
         ...query,
         ...typeof body === "object" && body !== null ? body : {},
@@ -102,17 +142,6 @@ var wrapApi = (handler) => {
         body,
         rawBody: event.body
       };
-      const logInput = { method, path, query, body };
-      const relativePath = extractRelativePath(req.path);
-      if (!relativePath) {
-        rt.logExecution(startTime, logInput, { status: 404 });
-        return notFound();
-      }
-      const entry = findRoute(routes, req.method, relativePath);
-      if (!entry) {
-        rt.logExecution(startTime, logInput, { status: 404 });
-        return notFound();
-      }
       const cookieHeader = req.headers["cookie"] ?? req.headers["Cookie"] ?? "";
       let authCookie;
       if (cookieHeader) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effortless-aws",
-  "version": "0.32.0",
+  "version": "0.32.1",
   "license": "MIT",
   "type": "module",
   "description": "Code-first AWS Lambda framework. Export handlers, deploy with one command.",