sst-http 0.7.0 → 1.3.0

package/dist/chunk-5MOJ3SW6.js

@@ -0,0 +1,13 @@
+// src/paths.ts
+var API_GATEWAY_PARAM_RE = /(^|\/):([A-Za-z0-9_]+(?:[+*])?)(?=\/|$)/g;
+function normalizeRouterPath(path) {
+  return path.replace(/\{([^/{}]+)\}/g, ":$1");
+}
+function normalizeApiGatewayPath(path) {
+  return path.replace(API_GATEWAY_PARAM_RE, (_match, prefix, name) => `${prefix}{${name}}`);
+}
+
+export {
+  normalizeRouterPath,
+  normalizeApiGatewayPath
+};

package/dist/cli.cjs

@@ -6,6 +6,14 @@ var import_node_fs = require("fs");
 var import_node_path = require("path");
 var import_node_process = require("process");
 var import_ts_morph = require("ts-morph");
+
+// src/paths.ts
+var API_GATEWAY_PARAM_RE = /(^|\/):([A-Za-z0-9_]+(?:[+*])?)(?=\/|$)/g;
+function normalizeApiGatewayPath(path) {
+  return path.replace(API_GATEWAY_PARAM_RE, (_match, prefix, name) => `${prefix}{${name}}`);
+}
+
+// src/cli.ts
 var METHOD_DECORATORS = {
   Get: "GET",
   Post: "POST",
@@ -150,7 +158,7 @@ function extractRoute(fn, inferName) {
   const auth = firebaseDecorator ? readFirebaseAuth(firebaseDecorator) : { type: "none" };
   return {
     method,
-    path,
+    path: normalizeApiGatewayPath(path),
     auth
   };
 }

package/dist/cli.js

@@ -1,4 +1,7 @@
 #!/usr/bin/env node
+import {
+  normalizeApiGatewayPath
+} from "./chunk-5MOJ3SW6.js";
 
 // src/cli.ts
 import { writeFileSync } from "fs";
@@ -153,7 +156,7 @@ function extractRoute(fn, inferName) {
   const auth = firebaseDecorator ? readFirebaseAuth(firebaseDecorator) : { type: "none" };
   return {
     method,
-    path,
+    path: normalizeApiGatewayPath(path),
     auth
   };
 }

package/dist/index.cjs

@@ -26,6 +26,7 @@ __export(index_exports, {
   FirebaseAuth: () => FirebaseAuth,
   Get: () => Get,
   Head: () => Head,
+  Header: () => Header,
   Headers: () => Headers,
   HttpError: () => HttpError,
   Options: () => Options,
@@ -121,12 +122,19 @@ function inferPath(handler) {
 
 // src/router.ts
 var import_path_to_regexp = require("path-to-regexp");
+
+// src/paths.ts
+function normalizeRouterPath(path) {
+  return path.replace(/\{([^/{}]+)\}/g, ":$1");
+}
+
+// src/router.ts
 var Router = class {
   routes;
   constructor(entries) {
     this.routes = entries.map((entry) => ({
       entry,
-      matcher: (0, import_path_to_regexp.match)(normalizeRoutePath(entry.path), { decode: decodeURIComponent })
+      matcher: (0, import_path_to_regexp.match)(normalizeRouterPath(entry.path), { decode: decodeURIComponent })
     }));
   }
   find(method, pathname) {
@@ -161,9 +169,6 @@ function normalizeParams(params) {
   }
   return normalized;
 }
-function normalizeRoutePath(path) {
-  return path.replace(/\{([^/{}]+)\}/g, ":$1");
-}
 
 // src/runtime.ts
 var HTTP_ERROR_MARKER = Symbol.for("sst-http.HttpError");
@@ -301,17 +306,21 @@ function buildHandlerArguments(entry, ctx, getBody) {
         break;
       }
       case "query": {
-        args[meta.index] = ctx.query;
+        args[meta.index] = meta.name ? ctx.query[meta.name] : ctx.query;
         break;
       }
       case "param": {
-        args[meta.index] = ctx.params;
+        args[meta.index] = meta.name ? ctx.params[meta.name] : ctx.params;
         break;
       }
       case "headers": {
         args[meta.index] = ctx.headers;
         break;
       }
+      case "header": {
+        args[meta.index] = meta.name ? ctx.headers[meta.name.toLowerCase()] : ctx.headers;
+        break;
+      }
       case "req": {
         args[meta.index] = ctx.event;
         break;
@@ -509,13 +518,14 @@ function createRouteDecorator(method) {
     registerRoute(handler, method, path);
   };
 }
-function createParameterDecorator(type, schema) {
+function createParameterDecorator(type, options2) {
   return (target, propertyKey, parameterIndex) => {
     const handler = resolveHandler(target, propertyKey);
     registerParameter(handler, {
       index: parameterIndex,
       type,
-      schema
+      schema: options2?.schema,
+      name: options2?.name
     });
   };
 }
@@ -536,17 +546,20 @@ function Auth() {
   return createParameterDecorator("auth");
 }
 function Body(schema) {
-  return createParameterDecorator("body", schema);
+  return createParameterDecorator("body", { schema });
 }
-function Query() {
-  return createParameterDecorator("query");
+function Query(name) {
+  return createParameterDecorator("query", { name });
 }
-function Param() {
-  return createParameterDecorator("param");
+function Param(name) {
+  return createParameterDecorator("param", { name });
 }
 function Headers() {
   return createParameterDecorator("headers");
 }
+function Header(name) {
+  return createParameterDecorator("header", { name });
+}
 function Req() {
   return createParameterDecorator("req");
 }
@@ -561,6 +574,7 @@ function Res() {
   FirebaseAuth,
   Get,
   Head,
+  Header,
   Headers,
   HttpError,
   Options,

package/dist/index.d.cts

@@ -33,12 +33,13 @@ declare const Options: (path?: string) => LegacyDecorator;
 declare function FirebaseAuth(options?: FirebaseAuthOptions): LegacyDecorator;
 declare function Auth(): LegacyParameterDecorator;
 declare function Body(schema?: ZodTypeAny): LegacyParameterDecorator;
-declare function Query(): LegacyParameterDecorator;
-declare function Param(): LegacyParameterDecorator;
+declare function Query(name?: string): LegacyParameterDecorator;
+declare function Param(name?: string): LegacyParameterDecorator;
 declare function Headers(): LegacyParameterDecorator;
+declare function Header(name: string): LegacyParameterDecorator;
 declare function Req(): LegacyParameterDecorator;
 declare function Res(): LegacyParameterDecorator;
 
 declare function configureRoutes(next?: RouteOptions): void;
 
-export { Auth, Body, Delete, FirebaseAuth, FirebaseAuthOptions, Get, Head, Headers, HttpError, Options, Param, Patch, Post, Put, Query, Req, Res, ResponseLike, RouteOptions, configureRoutes, createHandler, handleError, json, noContent, text };
+export { Auth, Body, Delete, FirebaseAuth, FirebaseAuthOptions, Get, Head, Header, Headers, HttpError, Options, Param, Patch, Post, Put, Query, Req, Res, ResponseLike, RouteOptions, configureRoutes, createHandler, handleError, json, noContent, text };

package/dist/index.d.ts

@@ -33,12 +33,13 @@ declare const Options: (path?: string) => LegacyDecorator;
 declare function FirebaseAuth(options?: FirebaseAuthOptions): LegacyDecorator;
 declare function Auth(): LegacyParameterDecorator;
 declare function Body(schema?: ZodTypeAny): LegacyParameterDecorator;
-declare function Query(): LegacyParameterDecorator;
-declare function Param(): LegacyParameterDecorator;
+declare function Query(name?: string): LegacyParameterDecorator;
+declare function Param(name?: string): LegacyParameterDecorator;
 declare function Headers(): LegacyParameterDecorator;
+declare function Header(name: string): LegacyParameterDecorator;
 declare function Req(): LegacyParameterDecorator;
 declare function Res(): LegacyParameterDecorator;
 
 declare function configureRoutes(next?: RouteOptions): void;
 
-export { Auth, Body, Delete, FirebaseAuth, FirebaseAuthOptions, Get, Head, Headers, HttpError, Options, Param, Patch, Post, Put, Query, Req, Res, ResponseLike, RouteOptions, configureRoutes, createHandler, handleError, json, noContent, text };
+export { Auth, Body, Delete, FirebaseAuth, FirebaseAuthOptions, Get, Head, Header, Headers, HttpError, Options, Param, Patch, Post, Put, Query, Req, Res, ResponseLike, RouteOptions, configureRoutes, createHandler, handleError, json, noContent, text };

package/dist/index.js

@@ -1,3 +1,7 @@
+import {
+  normalizeRouterPath
+} from "./chunk-5MOJ3SW6.js";
+
 // src/registry.ts
 var routeMeta = /* @__PURE__ */ new Map();
 var parameterMeta = /* @__PURE__ */ new Map();
@@ -79,7 +83,7 @@ var Router = class {
   constructor(entries) {
     this.routes = entries.map((entry) => ({
       entry,
-      matcher: match(normalizeRoutePath(entry.path), { decode: decodeURIComponent })
+      matcher: match(normalizeRouterPath(entry.path), { decode: decodeURIComponent })
     }));
   }
   find(method, pathname) {
@@ -114,9 +118,6 @@ function normalizeParams(params) {
   }
   return normalized;
 }
-function normalizeRoutePath(path) {
-  return path.replace(/\{([^/{}]+)\}/g, ":$1");
-}
 
 // src/runtime.ts
 var HTTP_ERROR_MARKER = Symbol.for("sst-http.HttpError");
@@ -254,17 +255,21 @@ function buildHandlerArguments(entry, ctx, getBody) {
         break;
       }
       case "query": {
-        args[meta.index] = ctx.query;
+        args[meta.index] = meta.name ? ctx.query[meta.name] : ctx.query;
         break;
       }
       case "param": {
-        args[meta.index] = ctx.params;
+        args[meta.index] = meta.name ? ctx.params[meta.name] : ctx.params;
         break;
       }
       case "headers": {
         args[meta.index] = ctx.headers;
         break;
       }
+      case "header": {
+        args[meta.index] = meta.name ? ctx.headers[meta.name.toLowerCase()] : ctx.headers;
+        break;
+      }
       case "req": {
         args[meta.index] = ctx.event;
         break;
@@ -462,13 +467,14 @@ function createRouteDecorator(method) {
     registerRoute(handler, method, path);
   };
 }
-function createParameterDecorator(type, schema) {
+function createParameterDecorator(type, options2) {
   return (target, propertyKey, parameterIndex) => {
     const handler = resolveHandler(target, propertyKey);
     registerParameter(handler, {
       index: parameterIndex,
       type,
-      schema
+      schema: options2?.schema,
+      name: options2?.name
     });
   };
 }
@@ -489,17 +495,20 @@ function Auth() {
   return createParameterDecorator("auth");
 }
 function Body(schema) {
-  return createParameterDecorator("body", schema);
+  return createParameterDecorator("body", { schema });
 }
-function Query() {
-  return createParameterDecorator("query");
+function Query(name) {
+  return createParameterDecorator("query", { name });
 }
-function Param() {
-  return createParameterDecorator("param");
+function Param(name) {
+  return createParameterDecorator("param", { name });
 }
 function Headers() {
   return createParameterDecorator("headers");
 }
+function Header(name) {
+  return createParameterDecorator("header", { name });
+}
 function Req() {
   return createParameterDecorator("req");
 }
@@ -513,6 +522,7 @@ export {
   FirebaseAuth,
   Get,
   Head,
+  Header,
   Headers,
   HttpError,
   Options,

package/dist/infra.cjs

@@ -28,6 +28,14 @@ __export(infra_exports, {
 module.exports = __toCommonJS(infra_exports);
 var import_node_fs = require("fs");
 var import_node_path = require("path");
+
+// src/paths.ts
+var API_GATEWAY_PARAM_RE = /(^|\/):([A-Za-z0-9_]+(?:[+*])?)(?=\/|$)/g;
+function normalizeApiGatewayPath(path) {
+  return path.replace(API_GATEWAY_PARAM_RE, (_match, prefix, name) => `${prefix}{${name}}`);
+}
+
+// src/infra.ts
 function ensureSstAws(source) {
   if (source?.sst?.aws) {
     return source.sst.aws;
@@ -58,7 +66,8 @@ function wireApiFromManifest(manifest, opts) {
   }
   for (const route of manifest.routes) {
     const isProtected = route.auth.type === "firebase";
-    const path = route.path.startsWith("/") ? route.path : `/${route.path}`;
+    const rawPath = route.path.startsWith("/") ? route.path : `/${route.path}`;
+    const path = normalizeApiGatewayPath(rawPath);
     const authConfig = isProtected && route.auth.type === "firebase" ? {
       name: "firebase",
       optional: route.auth.optional,
@@ -124,7 +133,8 @@ function httpApiAdapter(args) {
   };
   const registerRoute = (method, path, config) => {
     const apiAny = api;
-    const routeKey = `${method} ${path}`;
+    const normalizedPath = normalizeApiGatewayPath(path);
+    const routeKey = `${method} ${normalizedPath}`;
     const asAny = config.handler;
     const handlerInput = typeof asAny === "string" ? asAny : asAny && typeof asAny.arn !== "undefined" ? asAny.arn : asAny && typeof asAny.handler === "string" ? asAny.handler : asAny === void 0 ? void 0 : (() => {
       throw new Error("Unsupported handler type: provide a handler string, FunctionArgs, or a Function ARN/output");
@@ -197,7 +207,8 @@ function restApiAdapter(args) {
   };
   const registerRoute = (method, path, config) => {
     const apiAny = api;
-    const routeKey = `${method} ${path}`;
+    const normalizedPath = normalizeApiGatewayPath(path);
+    const routeKey = `${method} ${normalizedPath}`;
     const asAny = config.handler;
     const handlerInput = typeof asAny === "string" ? asAny : asAny && typeof asAny.arn !== "undefined" ? asAny.arn : asAny && typeof asAny.handler === "string" ? asAny.handler : asAny === void 0 ? void 0 : (() => {
       throw new Error("Unsupported handler type: provide a handler string, FunctionArgs, or a Function ARN/output");

package/dist/infra.js

@@ -1,3 +1,7 @@
+import {
+  normalizeApiGatewayPath
+} from "./chunk-5MOJ3SW6.js";
+
 // src/infra.ts
 import { readFileSync } from "fs";
 import { resolve } from "path";
@@ -31,7 +35,8 @@ function wireApiFromManifest(manifest, opts) {
   }
   for (const route of manifest.routes) {
     const isProtected = route.auth.type === "firebase";
-    const path = route.path.startsWith("/") ? route.path : `/${route.path}`;
+    const rawPath = route.path.startsWith("/") ? route.path : `/${route.path}`;
+    const path = normalizeApiGatewayPath(rawPath);
     const authConfig = isProtected && route.auth.type === "firebase" ? {
       name: "firebase",
       optional: route.auth.optional,
@@ -97,7 +102,8 @@ function httpApiAdapter(args) {
   };
   const registerRoute = (method, path, config) => {
     const apiAny = api;
-    const routeKey = `${method} ${path}`;
+    const normalizedPath = normalizeApiGatewayPath(path);
+    const routeKey = `${method} ${normalizedPath}`;
     const asAny = config.handler;
     const handlerInput = typeof asAny === "string" ? asAny : asAny && typeof asAny.arn !== "undefined" ? asAny.arn : asAny && typeof asAny.handler === "string" ? asAny.handler : asAny === void 0 ? void 0 : (() => {
       throw new Error("Unsupported handler type: provide a handler string, FunctionArgs, or a Function ARN/output");
@@ -170,7 +176,8 @@ function restApiAdapter(args) {
   };
   const registerRoute = (method, path, config) => {
     const apiAny = api;
-    const routeKey = `${method} ${path}`;
+    const normalizedPath = normalizeApiGatewayPath(path);
+    const routeKey = `${method} ${normalizedPath}`;
     const asAny = config.handler;
     const handlerInput = typeof asAny === "string" ? asAny : asAny && typeof asAny.arn !== "undefined" ? asAny.arn : asAny && typeof asAny.handler === "string" ? asAny.handler : asAny === void 0 ? void 0 : (() => {
       throw new Error("Unsupported handler type: provide a handler string, FunctionArgs, or a Function ARN/output");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst-http",
-  "version": "0.7.0",
+  "version": "1.3.0",
   "description": "Decorator-based routing for SST v3 with a single Lambda and Firebase JWT authorizer.",
   "license": "MIT",
   "author": "",