@cedarjs/api-server 5.0.0-canary.13896 → 5.0.0-canary.13898

package/dist/bin.js

@@ -388,8 +388,9 @@ var init_lambdaLoader = __esm({
           );
         }
         cedarRouteManifest.push({
+          id: routePath,
           path: routePath,
-          methods: routeName === "graphql" ? ["GET", "POST", "OPTIONS"] : ["GET", "POST"],
+          methods: routeName === "graphql" ? ["GET", "POST", "OPTIONS"] : [],
           type: routeName === "graphql" ? "graphql" : routeName === "health" ? "health" : routeName.toLowerCase().includes("auth") ? "auth" : "function",
           entry: fnPath
         });

package/dist/cjs/bin.js

@@ -410,8 +410,9 @@ var init_lambdaLoader = __esm({
           );
         }
         cedarRouteManifest.push({
+          id: routePath,
           path: routePath,
-          methods: routeName === "graphql" ? ["GET", "POST", "OPTIONS"] : ["GET", "POST"],
+          methods: routeName === "graphql" ? ["GET", "POST", "OPTIONS"] : [],
           type: routeName === "graphql" ? "graphql" : routeName === "health" ? "health" : routeName.toLowerCase().includes("auth") ? "auth" : "function",
           entry: fnPath
         });

package/dist/cjs/plugins/lambdaLoader.js

@@ -97,8 +97,9 @@ const setLambdaFunctions = async (foundFunctions) => {
       );
     }
     cedarRouteManifest.push({
+      id: routePath,
       path: routePath,
-      methods: routeName === "graphql" ? ["GET", "POST", "OPTIONS"] : ["GET", "POST"],
+      methods: routeName === "graphql" ? ["GET", "POST", "OPTIONS"] : [],
       type: routeName === "graphql" ? "graphql" : routeName === "health" ? "health" : routeName.toLowerCase().includes("auth") ? "auth" : "function",
       entry: fnPath
     });

package/dist/plugins/lambdaLoader.js

@@ -59,8 +59,9 @@ const setLambdaFunctions = async (foundFunctions) => {
       );
     }
     cedarRouteManifest.push({
+      id: routePath,
       path: routePath,
-      methods: routeName === "graphql" ? ["GET", "POST", "OPTIONS"] : ["GET", "POST"],
+      methods: routeName === "graphql" ? ["GET", "POST", "OPTIONS"] : [],
       type: routeName === "graphql" ? "graphql" : routeName === "health" ? "health" : routeName.toLowerCase().includes("auth") ? "auth" : "function",
       entry: fnPath
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/api-server",
-  "version": "5.0.0-canary.13896+e93dd02322",
+  "version": "5.0.0-canary.13898+5df5497f7c",
   "description": "CedarJS's HTTP server for Serverless Functions",
   "repository": {
     "type": "git",
@@ -73,12 +73,6 @@
       "types": "./dist/cjs/bothCLIConfigHandler.d.ts",
       "default": "./dist/cjs/bothCLIConfigHandler.js"
     },
-    "./udDispatcher": {
-      "import": {
-        "types": "./dist/udDispatcher.d.ts",
-        "default": "./dist/udDispatcher.js"
-      }
-    },
     "./udFetchable": {
       "import": {
         "types": "./dist/udFetchable.d.ts",
@@ -135,15 +129,14 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/context": "5.0.0-canary.13896",
-    "@cedarjs/fastify-web": "5.0.0-canary.13896",
-    "@cedarjs/internal": "5.0.0-canary.13896",
-    "@cedarjs/project-config": "5.0.0-canary.13896",
-    "@cedarjs/web-server": "5.0.0-canary.13896",
+    "@cedarjs/context": "5.0.0-canary.13898",
+    "@cedarjs/fastify-web": "5.0.0-canary.13898",
+    "@cedarjs/internal": "5.0.0-canary.13898",
+    "@cedarjs/project-config": "5.0.0-canary.13898",
+    "@cedarjs/web-server": "5.0.0-canary.13898",
     "@fastify/multipart": "9.4.0",
     "@fastify/url-data": "6.0.3",
     "@universal-deploy/node": "^0.1.6",
-    "@universal-deploy/store": "^0.2.1",
     "ansis": "4.2.0",
     "chokidar": "3.6.0",
     "dotenv-defaults": "5.0.2",
@@ -154,14 +147,12 @@
     "picoquery": "2.5.0",
     "pretty-bytes": "5.6.0",
     "pretty-ms": "7.0.1",
-    "rou3": "^0.8.1",
     "split2": "4.2.0",
-    "srvx": "^0.11.9",
     "termi-link": "1.1.0",
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "5.0.0-canary.13896",
+    "@cedarjs/framework-tools": "5.0.0-canary.13898",
     "@types/aws-lambda": "8.10.161",
     "@types/dotenv-defaults": "^5.0.0",
     "@types/split2": "4.2.3",
@@ -174,7 +165,7 @@
     "vitest": "3.2.4"
   },
   "peerDependencies": {
-    "@cedarjs/graphql-server": "5.0.0-canary.13896"
+    "@cedarjs/graphql-server": "5.0.0-canary.13898"
   },
   "peerDependenciesMeta": {
     "@cedarjs/graphql-server": {
@@ -184,5 +175,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e93dd023221e3d5d634558031790b57cbb7b4f92"
+  "gitHead": "5df5497f7c5573beeae75a44ec04659171c16999"
 }

package/dist/cjs/udDispatcher.d.ts

@@ -1,28 +0,0 @@
-import type { EntryMeta } from '@universal-deploy/store';
-import type { Fetchable } from './udFetchable.js';
-export interface CedarDispatcherOptions {
-    apiRootPath?: string;
-    discoverFunctionsGlob?: string | string[];
-    /**
-     * Cache-bust token appended to dynamic ESM imports. Use this in dev to
-     * bypass Node.js's ESM module cache after a rebuild. Production builds
-     * should omit this.
-     */
-    cacheBust?: string | number;
-}
-export interface CedarDispatcherResult {
-    fetchable: Fetchable;
-    registrations: EntryMeta[];
-}
-/**
- * Shared aggregate Cedar API dispatcher used by
- * `cedarUniversalDeployPlugin` (via `virtual:cedar-api`).
- *
- * Discovers Cedar API functions in `api/dist/functions/`, builds a rou3 router
- * and a map of route names to Fetchables, then returns a single Fetchable that
- * routes incoming Fetch-API requests to the correct per-function handler.
- * Also returns the list of `EntryMeta` registrations so callers can forward
- * them to `@universal-deploy/store` via `addEntry()`.
- */
-export declare function buildCedarDispatcher(options?: CedarDispatcherOptions): Promise<CedarDispatcherResult>;
-//# sourceMappingURL=udDispatcher.d.ts.map

package/dist/cjs/udDispatcher.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"udDispatcher.d.ts","sourceRoot":"","sources":["../../src/udDispatcher.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAUxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAgBjD,MAAM,WAAW,sBAAsB;IACrC,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACzC;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAC5B;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,SAAS,CAAA;IACpB,aAAa,EAAE,SAAS,EAAE,CAAA;CAC3B;AA6BD;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,qBAAqB,CAAC,CAmNhC"}

package/dist/cjs/udDispatcher.js

@@ -1,192 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var udDispatcher_exports = {};
-__export(udDispatcher_exports, {
-  buildCedarDispatcher: () => buildCedarDispatcher
-});
-module.exports = __toCommonJS(udDispatcher_exports);
-var import_node_path = __toESM(require("node:path"), 1);
-var import_node_url = require("node:url");
-var import_fast_glob = __toESM(require("fast-glob"), 1);
-var import_rou3 = require("rou3");
-var import_runtime = require("@cedarjs/api/runtime");
-var import_store = require("@cedarjs/context/dist/store");
-var import_project_config = require("@cedarjs/project-config");
-var import_udFetchable = require("./udFetchable.js");
-const ALL_HTTP_METHODS = [
-  "GET",
-  "HEAD",
-  "POST",
-  "PUT",
-  "DELETE",
-  "PATCH",
-  "OPTIONS",
-  "CONNECT",
-  "TRACE"
-];
-const GRAPHQL_METHODS = ["GET", "POST", "OPTIONS"];
-function normalizeApiRootPath(rootPath) {
-  let normalized = rootPath;
-  if (!normalized.startsWith("/")) {
-    normalized = "/" + normalized;
-  }
-  if (!normalized.endsWith("/")) {
-    normalized = normalized + "/";
-  }
-  return normalized;
-}
-async function buildCedarDispatcher(options) {
-  const normalizedApiRootPath = normalizeApiRootPath(
-    options?.apiRootPath ?? "/"
-  );
-  const discoverFunctionsGlob = options?.discoverFunctionsGlob ?? "dist/functions/**/*.{ts,js}";
-  const serverFunctions = import_fast_glob.default.sync(discoverFunctionsGlob, {
-    cwd: (0, import_project_config.getPaths)().api.base,
-    deep: 2,
-    absolute: true
-  });
-  const graphqlIdx = serverFunctions.findIndex(
-    (x) => import_node_path.default.basename(x, import_node_path.default.extname(x)) === "graphql"
-  );
-  if (graphqlIdx >= 0) {
-    const [graphqlFn] = serverFunctions.splice(graphqlIdx, 1);
-    serverFunctions.unshift(graphqlFn);
-  }
-  const fetchableMap = /* @__PURE__ */ new Map();
-  const router = (0, import_rou3.createRouter)();
-  const registrations = [];
-  for (const fnPath of serverFunctions) {
-    const routeName = import_node_path.default.basename(fnPath, import_node_path.default.extname(fnPath));
-    const routePath = routeName === "graphql" ? "/graphql" : `/${routeName}`;
-    const importUrl = options?.cacheBust ? `${(0, import_node_url.pathToFileURL)(fnPath).href}?t=${options.cacheBust}` : (0, import_node_url.pathToFileURL)(fnPath).href;
-    const fnImport = await import(importUrl);
-    if ("__rw_graphqlOptions" in fnImport && fnImport.__rw_graphqlOptions != null) {
-      const { createGraphQLYoga } = await import("@cedarjs/graphql-server");
-      const graphqlOptions = fnImport.__rw_graphqlOptions;
-      const { yoga } = await createGraphQLYoga(graphqlOptions);
-      const graphqlFetchable = {
-        async fetch(request) {
-          const cedarContext = await (0, import_runtime.buildCedarContext)(request, {
-            authDecoder: graphqlOptions.authDecoder
-          });
-          const event = await (0, import_runtime.requestToLegacyEvent)(request, cedarContext);
-          return yoga.handle(request, {
-            request,
-            cedarContext,
-            event,
-            requestContext: void 0
-          });
-        }
-      };
-      fetchableMap.set(routeName, graphqlFetchable);
-      registrations.push({
-        id: routePath,
-        route: routePath,
-        method: [...GRAPHQL_METHODS]
-      });
-      for (const method of GRAPHQL_METHODS) {
-        (0, import_rou3.addRoute)(router, method, routePath, routeName);
-        (0, import_rou3.addRoute)(router, method, `${routePath}/**`, routeName);
-      }
-      continue;
-    }
-    const cedarHandler = (() => {
-      if ("handle" in fnImport && typeof fnImport.handle === "function") {
-        return fnImport.handle;
-      }
-      if ("default" in fnImport && fnImport.default != null && "handle" in fnImport.default && typeof fnImport.default.handle === "function") {
-        return fnImport.default.handle;
-      }
-      return void 0;
-    })();
-    if (!cedarHandler) {
-      console.warn(
-        routeName,
-        "at",
-        fnPath,
-        "does not export a Fetch-native `handle` function and will not be served by the Universal Deploy server. Migrate to `export async function handle(request, ctx)` or use `yarn cedar serve` for legacy Lambda-shaped handler support."
-      );
-      continue;
-    }
-    const handler = cedarHandler;
-    fetchableMap.set(routeName, (0, import_udFetchable.createCedarFetchable)(handler));
-    registrations.push({
-      id: routePath,
-      route: routePath
-      // method omitted → matches all HTTP methods per @universal-deploy/store docs
-    });
-    for (const method of ALL_HTTP_METHODS) {
-      (0, import_rou3.addRoute)(router, method, routePath, routeName);
-      (0, import_rou3.addRoute)(router, method, `${routePath}/**`, routeName);
-    }
-  }
-  const fetchable = {
-    fetch(request) {
-      return (0, import_store.getAsyncStoreInstance)().run(
-        /* @__PURE__ */ new Map(),
-        async () => {
-          const url = new URL(request.url);
-          let routePathname = url.pathname;
-          if (normalizedApiRootPath !== "/" && routePathname.startsWith(normalizedApiRootPath)) {
-            routePathname = routePathname.slice(
-              normalizedApiRootPath.length - 1
-            );
-          }
-          if (!routePathname.startsWith("/")) {
-            routePathname = "/" + routePathname;
-          }
-          const match = (0, import_rou3.findRoute)(router, request.method, routePathname);
-          if (!match) {
-            return new Response("Not Found", { status: 404 });
-          }
-          const matchedRouteName = match.data;
-          const fnFetchable = fetchableMap.get(matchedRouteName);
-          if (!fnFetchable) {
-            return new Response("Not Found", { status: 404 });
-          }
-          try {
-            return await fnFetchable.fetch(request);
-          } catch (err) {
-            console.error(
-              "Unhandled error in fetch handler for route",
-              matchedRouteName,
-              err
-            );
-            return new Response("Internal Server Error", { status: 500 });
-          }
-        }
-      );
-    }
-  };
-  return { fetchable, registrations };
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  buildCedarDispatcher
-});

package/dist/udDispatcher.d.ts

@@ -1,28 +0,0 @@
-import type { EntryMeta } from '@universal-deploy/store';
-import type { Fetchable } from './udFetchable.js';
-export interface CedarDispatcherOptions {
-    apiRootPath?: string;
-    discoverFunctionsGlob?: string | string[];
-    /**
-     * Cache-bust token appended to dynamic ESM imports. Use this in dev to
-     * bypass Node.js's ESM module cache after a rebuild. Production builds
-     * should omit this.
-     */
-    cacheBust?: string | number;
-}
-export interface CedarDispatcherResult {
-    fetchable: Fetchable;
-    registrations: EntryMeta[];
-}
-/**
- * Shared aggregate Cedar API dispatcher used by
- * `cedarUniversalDeployPlugin` (via `virtual:cedar-api`).
- *
- * Discovers Cedar API functions in `api/dist/functions/`, builds a rou3 router
- * and a map of route names to Fetchables, then returns a single Fetchable that
- * routes incoming Fetch-API requests to the correct per-function handler.
- * Also returns the list of `EntryMeta` registrations so callers can forward
- * them to `@universal-deploy/store` via `addEntry()`.
- */
-export declare function buildCedarDispatcher(options?: CedarDispatcherOptions): Promise<CedarDispatcherResult>;
-//# sourceMappingURL=udDispatcher.d.ts.map

package/dist/udDispatcher.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"udDispatcher.d.ts","sourceRoot":"","sources":["../src/udDispatcher.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAUxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAgBjD,MAAM,WAAW,sBAAsB;IACrC,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACzC;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAC5B;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,SAAS,CAAA;IACpB,aAAa,EAAE,SAAS,EAAE,CAAA;CAC3B;AA6BD;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,qBAAqB,CAAC,CAmNhC"}

package/dist/udDispatcher.js

@@ -1,158 +0,0 @@
-import path from "node:path";
-import { pathToFileURL } from "node:url";
-import fg from "fast-glob";
-import { addRoute, createRouter, findRoute } from "rou3";
-import { buildCedarContext, requestToLegacyEvent } from "@cedarjs/api/runtime";
-import { getAsyncStoreInstance } from "@cedarjs/context/dist/store";
-import { getPaths } from "@cedarjs/project-config";
-import { createCedarFetchable } from "./udFetchable.js";
-const ALL_HTTP_METHODS = [
-  "GET",
-  "HEAD",
-  "POST",
-  "PUT",
-  "DELETE",
-  "PATCH",
-  "OPTIONS",
-  "CONNECT",
-  "TRACE"
-];
-const GRAPHQL_METHODS = ["GET", "POST", "OPTIONS"];
-function normalizeApiRootPath(rootPath) {
-  let normalized = rootPath;
-  if (!normalized.startsWith("/")) {
-    normalized = "/" + normalized;
-  }
-  if (!normalized.endsWith("/")) {
-    normalized = normalized + "/";
-  }
-  return normalized;
-}
-async function buildCedarDispatcher(options) {
-  const normalizedApiRootPath = normalizeApiRootPath(
-    options?.apiRootPath ?? "/"
-  );
-  const discoverFunctionsGlob = options?.discoverFunctionsGlob ?? "dist/functions/**/*.{ts,js}";
-  const serverFunctions = fg.sync(discoverFunctionsGlob, {
-    cwd: getPaths().api.base,
-    deep: 2,
-    absolute: true
-  });
-  const graphqlIdx = serverFunctions.findIndex(
-    (x) => path.basename(x, path.extname(x)) === "graphql"
-  );
-  if (graphqlIdx >= 0) {
-    const [graphqlFn] = serverFunctions.splice(graphqlIdx, 1);
-    serverFunctions.unshift(graphqlFn);
-  }
-  const fetchableMap = /* @__PURE__ */ new Map();
-  const router = createRouter();
-  const registrations = [];
-  for (const fnPath of serverFunctions) {
-    const routeName = path.basename(fnPath, path.extname(fnPath));
-    const routePath = routeName === "graphql" ? "/graphql" : `/${routeName}`;
-    const importUrl = options?.cacheBust ? `${pathToFileURL(fnPath).href}?t=${options.cacheBust}` : pathToFileURL(fnPath).href;
-    const fnImport = await import(importUrl);
-    if ("__rw_graphqlOptions" in fnImport && fnImport.__rw_graphqlOptions != null) {
-      const { createGraphQLYoga } = await import("@cedarjs/graphql-server");
-      const graphqlOptions = fnImport.__rw_graphqlOptions;
-      const { yoga } = await createGraphQLYoga(graphqlOptions);
-      const graphqlFetchable = {
-        async fetch(request) {
-          const cedarContext = await buildCedarContext(request, {
-            authDecoder: graphqlOptions.authDecoder
-          });
-          const event = await requestToLegacyEvent(request, cedarContext);
-          return yoga.handle(request, {
-            request,
-            cedarContext,
-            event,
-            requestContext: void 0
-          });
-        }
-      };
-      fetchableMap.set(routeName, graphqlFetchable);
-      registrations.push({
-        id: routePath,
-        route: routePath,
-        method: [...GRAPHQL_METHODS]
-      });
-      for (const method of GRAPHQL_METHODS) {
-        addRoute(router, method, routePath, routeName);
-        addRoute(router, method, `${routePath}/**`, routeName);
-      }
-      continue;
-    }
-    const cedarHandler = (() => {
-      if ("handle" in fnImport && typeof fnImport.handle === "function") {
-        return fnImport.handle;
-      }
-      if ("default" in fnImport && fnImport.default != null && "handle" in fnImport.default && typeof fnImport.default.handle === "function") {
-        return fnImport.default.handle;
-      }
-      return void 0;
-    })();
-    if (!cedarHandler) {
-      console.warn(
-        routeName,
-        "at",
-        fnPath,
-        "does not export a Fetch-native `handle` function and will not be served by the Universal Deploy server. Migrate to `export async function handle(request, ctx)` or use `yarn cedar serve` for legacy Lambda-shaped handler support."
-      );
-      continue;
-    }
-    const handler = cedarHandler;
-    fetchableMap.set(routeName, createCedarFetchable(handler));
-    registrations.push({
-      id: routePath,
-      route: routePath
-      // method omitted → matches all HTTP methods per @universal-deploy/store docs
-    });
-    for (const method of ALL_HTTP_METHODS) {
-      addRoute(router, method, routePath, routeName);
-      addRoute(router, method, `${routePath}/**`, routeName);
-    }
-  }
-  const fetchable = {
-    fetch(request) {
-      return getAsyncStoreInstance().run(
-        /* @__PURE__ */ new Map(),
-        async () => {
-          const url = new URL(request.url);
-          let routePathname = url.pathname;
-          if (normalizedApiRootPath !== "/" && routePathname.startsWith(normalizedApiRootPath)) {
-            routePathname = routePathname.slice(
-              normalizedApiRootPath.length - 1
-            );
-          }
-          if (!routePathname.startsWith("/")) {
-            routePathname = "/" + routePathname;
-          }
-          const match = findRoute(router, request.method, routePathname);
-          if (!match) {
-            return new Response("Not Found", { status: 404 });
-          }
-          const matchedRouteName = match.data;
-          const fnFetchable = fetchableMap.get(matchedRouteName);
-          if (!fnFetchable) {
-            return new Response("Not Found", { status: 404 });
-          }
-          try {
-            return await fnFetchable.fetch(request);
-          } catch (err) {
-            console.error(
-              "Unhandled error in fetch handler for route",
-              matchedRouteName,
-              err
-            );
-            return new Response("Internal Server Error", { status: 500 });
-          }
-        }
-      );
-    }
-  };
-  return { fetchable, registrations };
-}
-export {
-  buildCedarDispatcher
-};