@cedarjs/api-server 4.0.0-canary.13817 → 4.0.0-canary.13821

package/dist/bin.js

@@ -141,6 +141,9 @@ async function loadFastifyConfig() {
   if (!fs.existsSync(serverConfigPath)) {
     return serverConfigFile;
   }
+  if (loadedServerConfigPath !== serverConfigPath) {
+    isServerConfigLoaded = false;
+  }
   if (!isServerConfigLoaded) {
     console.log(`Loading server config from ${serverConfigPath}`);
     console.log(`Loading server config from URL file://${serverConfigPath}`);
@@ -149,11 +152,12 @@ async function loadFastifyConfig() {
     );
     const config3 = await import(pathToFileURL(serverConfigPath).href);
     serverConfigFile = { ...config3.default };
+    loadedServerConfigPath = serverConfigPath;
     isServerConfigLoaded = true;
   }
   return serverConfigFile;
 }
-var DEFAULT_OPTIONS, isServerConfigLoaded, serverConfigFile, createFastifyInstance;
+var DEFAULT_OPTIONS, isServerConfigLoaded, loadedServerConfigPath, serverConfigFile, createFastifyInstance;
 var init_fastify = __esm({
   "src/fastify.ts"() {
     "use strict";
@@ -320,20 +324,26 @@ import path2 from "node:path";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
 import ansis from "ansis";
 import fg from "fast-glob";
+import { buildCedarContext, wrapLegacyHandler } from "@cedarjs/api/runtime";
 import { getPaths as getPaths2 } from "@cedarjs/project-config";
-var LAMBDA_FUNCTIONS, setLambdaFunctions, loadFunctionsFromDist, findApiDistFunctions, lambdaRequestHandler;
+var LAMBDA_FUNCTIONS, CEDAR_HANDLERS, cedarRouteManifest, setLambdaFunctions, loadFunctionsFromDist, findApiDistFunctions, lambdaRequestHandler;
 var init_lambdaLoader = __esm({
   "src/plugins/lambdaLoader.ts"() {
     "use strict";
     init_awsLambdaFastify();
     init_utils2();
     LAMBDA_FUNCTIONS = {};
+    CEDAR_HANDLERS = /* @__PURE__ */ new Map();
+    cedarRouteManifest = [];
     setLambdaFunctions = async (foundFunctions) => {
       const tsImport = Date.now();
       console.log(ansis.dim.italic("Importing Server Functions... "));
+      cedarRouteManifest.length = 0;
+      CEDAR_HANDLERS.clear();
       const imports = foundFunctions.map(async (fnPath) => {
         const ts = Date.now();
         const routeName = path2.basename(fnPath).replace(".js", "");
+        const routePath = routeName === "graphql" ? "/graphql" : `/${routeName}`;
         const fnImport = await import(pathToFileURL2(fnPath).href);
         const handler3 = (() => {
           if ("handler" in fnImport) {
@@ -346,15 +356,35 @@ var init_lambdaLoader = __esm({
           }
           return void 0;
         })();
+        const cedarHandler = (() => {
+          if ("handle" in fnImport && typeof fnImport.handle === "function") {
+            return fnImport.handle;
+          }
+          if ("default" in fnImport && fnImport.default && "handle" in fnImport.default && typeof fnImport.default.handle === "function") {
+            return fnImport.default.handle;
+          }
+          return void 0;
+        })();
         LAMBDA_FUNCTIONS[routeName] = handler3;
-        if (!handler3) {
+        if (cedarHandler) {
+          CEDAR_HANDLERS.set(routeName, cedarHandler);
+        } else if (handler3) {
+          CEDAR_HANDLERS.set(routeName, wrapLegacyHandler(handler3));
+        }
+        if (!handler3 && !cedarHandler) {
           console.warn(
             routeName,
             "at",
             fnPath,
-            "does not have a function called handler defined."
+            "does not have a function called handler or handle defined."
           );
         }
+        cedarRouteManifest.push({
+          path: routePath,
+          methods: routeName === "graphql" ? ["GET", "POST", "OPTIONS"] : ["GET", "POST"],
+          type: routeName === "graphql" ? "graphql" : routeName === "health" ? "health" : routeName.toLowerCase().includes("auth") ? "auth" : "function",
+          entry: fnPath
+        });
         console.log(
           ansis.magenta("/" + routeName),
           ansis.dim.italic(Date.now() - ts + " ms")
@@ -395,6 +425,30 @@ var init_lambdaLoader = __esm({
     };
     lambdaRequestHandler = async (req, reply) => {
       const { routeName } = req.params;
+      const cedarHandlerCandidate = CEDAR_HANDLERS.get(routeName);
+      const cedarHandler = typeof cedarHandlerCandidate === "function" ? cedarHandlerCandidate : void 0;
+      if (cedarHandler) {
+        const requestBody = req.method === "GET" || req.method === "HEAD" ? void 0 : typeof req.rawBody === "string" ? req.rawBody : req.rawBody ? Buffer.from(req.rawBody).toString() : void 0;
+        const href = `${req.protocol}://${req.hostname}${req.raw.url ?? "/"}`;
+        const request = new Request(href, {
+          method: req.method,
+          headers: req.headers,
+          body: requestBody
+        });
+        const ctx = await buildCedarContext(request, {
+          params: {
+            routeName
+          }
+        });
+        const response = await cedarHandler(request, ctx);
+        reply.status(response.status);
+        response.headers.forEach((value, name) => {
+          reply.header(name, value);
+        });
+        const body = await response.arrayBuffer();
+        reply.send(Buffer.from(body));
+        return;
+      }
       if (!LAMBDA_FUNCTIONS[routeName]) {
         const errorMessage = `Function "${routeName}" was not found.`;
         req.log.error(errorMessage);
@@ -402,7 +456,12 @@ var init_lambdaLoader = __esm({
         if (process.env.NODE_ENV === "development") {
           const devError = {
             error: errorMessage,
-            availableFunctions: Object.keys(LAMBDA_FUNCTIONS)
+            availableFunctions: [
+              .../* @__PURE__ */ new Set([
+                ...Object.keys(LAMBDA_FUNCTIONS),
+                ...CEDAR_HANDLERS.keys()
+              ])
+            ]
           };
           reply.send(devError);
         } else {
@@ -472,6 +531,7 @@ import { pathToFileURL as pathToFileURL3 } from "node:url";
 import fastifyMultiPart from "@fastify/multipart";
 import fastifyUrlData2 from "@fastify/url-data";
 import fg2 from "fast-glob";
+import { buildCedarContext as buildCedarContext2 } from "@cedarjs/api/runtime";
 import { getAsyncStoreInstance as getAsyncStoreInstance3 } from "@cedarjs/context/dist/store";
 import { coerceRootPath as coerceRootPath3 } from "@cedarjs/fastify-web/dist/helpers.js";
 import { createGraphQLYoga } from "@cedarjs/graphql-server";
@@ -522,11 +582,18 @@ async function redwoodFastifyGraphQLServer(fastify2, options) {
       fastify2.route({
         url: `${redwoodOptions.apiRootPath}${graphqlEndpoint}${routePath}`,
         method,
-        handler: (req, reply) => yoga.handleNodeRequestAndResponse(req, reply, {
-          req,
-          reply,
-          event: lambdaEventForFastifyRequest(req)
-        })
+        handler: async (req, _reply) => {
+          const request = createFetchRequest(req);
+          const cedarContext = await buildCedarContext2(request, {
+            authDecoder: graphqlOptions.authDecoder
+          });
+          return yoga.handle(request, {
+            request,
+            cedarContext,
+            event: lambdaEventForFastifyRequest(req),
+            requestContext: void 0
+          });
+        }
       });
     }
     fastify2.addHook("onReady", (done) => {
@@ -546,6 +613,15 @@ async function redwoodFastifyGraphQLServer(fastify2, options) {
 function trimSlashes(path5) {
   return path5.replace(/^\/|\/$/g, "");
 }
+function createFetchRequest(req) {
+  const requestBody = req.method === "GET" || req.method === "HEAD" ? void 0 : typeof req.body === "string" ? req.body : req.body ? JSON.stringify(req.body) : void 0;
+  const href = `${req.protocol}://${req.hostname}${req.raw.url ?? "/"}`;
+  return new Request(href, {
+    method: req.method,
+    headers: req.headers,
+    body: requestBody
+  });
+}
 var init_graphql = __esm({
   "src/plugins/graphql.ts"() {
     "use strict";

package/dist/cjs/bin.js

@@ -157,6 +157,9 @@ async function loadFastifyConfig() {
   if (!import_node_fs.default.existsSync(serverConfigPath)) {
     return serverConfigFile;
   }
+  if (loadedServerConfigPath !== serverConfigPath) {
+    isServerConfigLoaded = false;
+  }
   if (!isServerConfigLoaded) {
     console.log(`Loading server config from ${serverConfigPath}`);
     console.log(`Loading server config from URL file://${serverConfigPath}`);
@@ -165,11 +168,12 @@ async function loadFastifyConfig() {
     );
     const config3 = await import((0, import_url.pathToFileURL)(serverConfigPath).href);
     serverConfigFile = { ...config3.default };
+    loadedServerConfigPath = serverConfigPath;
     isServerConfigLoaded = true;
   }
   return serverConfigFile;
 }
-var import_node_fs, import_path, import_url, import_fastify, import_store, import_project_config2, DEFAULT_OPTIONS, isServerConfigLoaded, serverConfigFile, createFastifyInstance;
+var import_node_fs, import_path, import_url, import_fastify, import_store, import_project_config2, DEFAULT_OPTIONS, isServerConfigLoaded, loadedServerConfigPath, serverConfigFile, createFastifyInstance;
 var init_fastify = __esm({
   "src/fastify.ts"() {
     "use strict";
@@ -338,7 +342,7 @@ var init_utils2 = __esm({
 });
 
 // src/plugins/lambdaLoader.ts
-var import_node_path, import_node_url, import_ansis, import_fast_glob, import_project_config3, LAMBDA_FUNCTIONS, setLambdaFunctions, loadFunctionsFromDist, findApiDistFunctions, lambdaRequestHandler;
+var import_node_path, import_node_url, import_ansis, import_fast_glob, import_runtime, import_project_config3, LAMBDA_FUNCTIONS, CEDAR_HANDLERS, cedarRouteManifest, setLambdaFunctions, loadFunctionsFromDist, findApiDistFunctions, lambdaRequestHandler;
 var init_lambdaLoader = __esm({
   "src/plugins/lambdaLoader.ts"() {
     "use strict";
@@ -346,16 +350,22 @@ var init_lambdaLoader = __esm({
     import_node_url = require("node:url");
     import_ansis = __toESM(require("ansis"), 1);
     import_fast_glob = __toESM(require("fast-glob"), 1);
+    import_runtime = require("@cedarjs/api/runtime");
     import_project_config3 = require("@cedarjs/project-config");
     init_awsLambdaFastify();
     init_utils2();
     LAMBDA_FUNCTIONS = {};
+    CEDAR_HANDLERS = /* @__PURE__ */ new Map();
+    cedarRouteManifest = [];
     setLambdaFunctions = async (foundFunctions) => {
       const tsImport = Date.now();
       console.log(import_ansis.default.dim.italic("Importing Server Functions... "));
+      cedarRouteManifest.length = 0;
+      CEDAR_HANDLERS.clear();
       const imports = foundFunctions.map(async (fnPath) => {
         const ts = Date.now();
         const routeName = import_node_path.default.basename(fnPath).replace(".js", "");
+        const routePath = routeName === "graphql" ? "/graphql" : `/${routeName}`;
         const fnImport = await import((0, import_node_url.pathToFileURL)(fnPath).href);
         const handler3 = (() => {
           if ("handler" in fnImport) {
@@ -368,15 +378,35 @@ var init_lambdaLoader = __esm({
           }
           return void 0;
         })();
+        const cedarHandler = (() => {
+          if ("handle" in fnImport && typeof fnImport.handle === "function") {
+            return fnImport.handle;
+          }
+          if ("default" in fnImport && fnImport.default && "handle" in fnImport.default && typeof fnImport.default.handle === "function") {
+            return fnImport.default.handle;
+          }
+          return void 0;
+        })();
         LAMBDA_FUNCTIONS[routeName] = handler3;
-        if (!handler3) {
+        if (cedarHandler) {
+          CEDAR_HANDLERS.set(routeName, cedarHandler);
+        } else if (handler3) {
+          CEDAR_HANDLERS.set(routeName, (0, import_runtime.wrapLegacyHandler)(handler3));
+        }
+        if (!handler3 && !cedarHandler) {
           console.warn(
             routeName,
             "at",
             fnPath,
-            "does not have a function called handler defined."
+            "does not have a function called handler or handle defined."
           );
         }
+        cedarRouteManifest.push({
+          path: routePath,
+          methods: routeName === "graphql" ? ["GET", "POST", "OPTIONS"] : ["GET", "POST"],
+          type: routeName === "graphql" ? "graphql" : routeName === "health" ? "health" : routeName.toLowerCase().includes("auth") ? "auth" : "function",
+          entry: fnPath
+        });
         console.log(
           import_ansis.default.magenta("/" + routeName),
           import_ansis.default.dim.italic(Date.now() - ts + " ms")
@@ -417,6 +447,30 @@ var init_lambdaLoader = __esm({
     };
     lambdaRequestHandler = async (req, reply) => {
       const { routeName } = req.params;
+      const cedarHandlerCandidate = CEDAR_HANDLERS.get(routeName);
+      const cedarHandler = typeof cedarHandlerCandidate === "function" ? cedarHandlerCandidate : void 0;
+      if (cedarHandler) {
+        const requestBody = req.method === "GET" || req.method === "HEAD" ? void 0 : typeof req.rawBody === "string" ? req.rawBody : req.rawBody ? Buffer.from(req.rawBody).toString() : void 0;
+        const href = `${req.protocol}://${req.hostname}${req.raw.url ?? "/"}`;
+        const request = new Request(href, {
+          method: req.method,
+          headers: req.headers,
+          body: requestBody
+        });
+        const ctx = await (0, import_runtime.buildCedarContext)(request, {
+          params: {
+            routeName
+          }
+        });
+        const response = await cedarHandler(request, ctx);
+        reply.status(response.status);
+        response.headers.forEach((value, name) => {
+          reply.header(name, value);
+        });
+        const body = await response.arrayBuffer();
+        reply.send(Buffer.from(body));
+        return;
+      }
       if (!LAMBDA_FUNCTIONS[routeName]) {
         const errorMessage = `Function "${routeName}" was not found.`;
         req.log.error(errorMessage);
@@ -424,7 +478,12 @@ var init_lambdaLoader = __esm({
         if (process.env.NODE_ENV === "development") {
           const devError = {
             error: errorMessage,
-            availableFunctions: Object.keys(LAMBDA_FUNCTIONS)
+            availableFunctions: [
+              .../* @__PURE__ */ new Set([
+                ...Object.keys(LAMBDA_FUNCTIONS),
+                ...CEDAR_HANDLERS.keys()
+              ])
+            ]
           };
           reply.send(devError);
         } else {
@@ -537,11 +596,18 @@ async function redwoodFastifyGraphQLServer(fastify2, options) {
       fastify2.route({
         url: `${redwoodOptions.apiRootPath}${graphqlEndpoint}${routePath}`,
         method,
-        handler: (req, reply) => yoga.handleNodeRequestAndResponse(req, reply, {
-          req,
-          reply,
-          event: lambdaEventForFastifyRequest(req)
-        })
+        handler: async (req, _reply) => {
+          const request = createFetchRequest(req);
+          const cedarContext = await (0, import_runtime2.buildCedarContext)(request, {
+            authDecoder: graphqlOptions.authDecoder
+          });
+          return yoga.handle(request, {
+            request,
+            cedarContext,
+            event: lambdaEventForFastifyRequest(req),
+            requestContext: void 0
+          });
+        }
       });
     }
     fastify2.addHook("onReady", (done) => {
@@ -561,7 +627,16 @@ async function redwoodFastifyGraphQLServer(fastify2, options) {
 function trimSlashes(path5) {
   return path5.replace(/^\/|\/$/g, "");
 }
-var import_node_url2, import_multipart, import_url_data2, import_fast_glob2, import_store3, import_helpers3, import_graphql_server, import_project_config4;
+function createFetchRequest(req) {
+  const requestBody = req.method === "GET" || req.method === "HEAD" ? void 0 : typeof req.body === "string" ? req.body : req.body ? JSON.stringify(req.body) : void 0;
+  const href = `${req.protocol}://${req.hostname}${req.raw.url ?? "/"}`;
+  return new Request(href, {
+    method: req.method,
+    headers: req.headers,
+    body: requestBody
+  });
+}
+var import_node_url2, import_multipart, import_url_data2, import_fast_glob2, import_runtime2, import_store3, import_helpers3, import_graphql_server, import_project_config4;
 var init_graphql = __esm({
   "src/plugins/graphql.ts"() {
     "use strict";
@@ -569,6 +644,7 @@ var init_graphql = __esm({
     import_multipart = __toESM(require("@fastify/multipart"), 1);
     import_url_data2 = __toESM(require("@fastify/url-data"), 1);
     import_fast_glob2 = __toESM(require("fast-glob"), 1);
+    import_runtime2 = require("@cedarjs/api/runtime");
     import_store3 = require("@cedarjs/context/dist/store");
     import_helpers3 = require("@cedarjs/fastify-web/dist/helpers.js");
     import_graphql_server = require("@cedarjs/graphql-server");

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

@@ -1 +1 @@
-{"version":3,"file":"fastify.d.ts","sourceRoot":"","sources":["../../src/fastify.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAOpE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAGrD,eAAO,MAAM,eAAe;;;;CAI3B,CAAA;AAiBD,wBAAsB,iBAAiB;YAb7B,oBAAoB;sBACV,mBAAmB;GAsCtC;AAED,eAAO,MAAM,qBAAqB,GAChC,UAAU,oBAAoB,KAC7B,OAAO,CAAC,eAAe,CAWzB,CAAA"}
+{"version":3,"file":"fastify.d.ts","sourceRoot":"","sources":["../../src/fastify.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAOpE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAGrD,eAAO,MAAM,eAAe;;;;CAI3B,CAAA;AAkBD,wBAAsB,iBAAiB;YAb7B,oBAAoB;sBACV,mBAAmB;GA2CtC;AAED,eAAO,MAAM,qBAAqB,GAChC,UAAU,oBAAoB,KAC7B,OAAO,CAAC,eAAe,CAWzB,CAAA"}

package/dist/cjs/fastify.js

@@ -45,6 +45,7 @@ const DEFAULT_OPTIONS = {
   }
 };
 let isServerConfigLoaded = false;
+let loadedServerConfigPath;
 let serverConfigFile = {
   config: DEFAULT_OPTIONS,
   configureFastify: async (fastify, options) => {
@@ -63,6 +64,9 @@ async function loadFastifyConfig() {
   if (!import_node_fs.default.existsSync(serverConfigPath)) {
     return serverConfigFile;
   }
+  if (loadedServerConfigPath !== serverConfigPath) {
+    isServerConfigLoaded = false;
+  }
   if (!isServerConfigLoaded) {
     console.log(`Loading server config from ${serverConfigPath}`);
     console.log(`Loading server config from URL file://${serverConfigPath}`);
@@ -71,6 +75,7 @@ async function loadFastifyConfig() {
     );
     const config = await import((0, import_url.pathToFileURL)(serverConfigPath).href);
     serverConfigFile = { ...config.default };
+    loadedServerConfigPath = serverConfigPath;
     isServerConfigLoaded = true;
   }
   return serverConfigFile;

package/dist/cjs/plugins/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/plugins/api.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAO9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAKvD,MAAM,WAAW,sBAAsB;IAErC,OAAO,EAAE;QACP,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,eAAe,CAAC,EAAE,eAAe,CAAA;QACjC,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;QACzC,cAAc,CAAC,EAAE,OAAO,CAAA;QACxB,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;KAC3D,CAAA;CACF;AAED,wBAAsB,eAAe,CACnC,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,sBAAsB,iBA4C7B"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/plugins/api.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAO9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAKvD,MAAM,WAAW,sBAAsB;IAErC,OAAO,EAAE;QACP,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,eAAe,CAAC,EAAE,eAAe,CAAA;QACjC,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;QACzC,cAAc,CAAC,EAAE,OAAO,CAAA;QACxB,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;KAI3D,CAAA;CACF;AAED,wBAAsB,eAAe,CACnC,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,sBAAsB,iBA4C7B"}

package/dist/cjs/plugins/graphql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../../src/plugins/graphql.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,SAAS,CAAA;AAO3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAKjE,MAAM,WAAW,4BAA4B;IAC3C,OAAO,EAAE;QACP,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,OAAO,CAAC,EAAE,kBAAkB,CAAA;KAC7B,CAAA;CACF;AAED,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,4BAA4B,iBAmGtC"}
+{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../../src/plugins/graphql.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAA+B,MAAM,SAAS,CAAA;AAQ3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAKjE,MAAM,WAAW,4BAA4B;IAC3C,OAAO,EAAE;QACP,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,OAAO,CAAC,EAAE,kBAAkB,CAAA;KAC7B,CAAA;CACF;AAED,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,4BAA4B,iBA0HtC"}

package/dist/cjs/plugins/graphql.js

@@ -35,6 +35,7 @@ var import_node_url = require("node:url");
 var import_multipart = __toESM(require("@fastify/multipart"), 1);
 var import_url_data = __toESM(require("@fastify/url-data"), 1);
 var import_fast_glob = __toESM(require("fast-glob"), 1);
+var import_runtime = require("@cedarjs/api/runtime");
 var import_store = require("@cedarjs/context/dist/store");
 var import_helpers = require("@cedarjs/fastify-web/dist/helpers.js");
 var import_graphql_server = require("@cedarjs/graphql-server");
@@ -86,11 +87,18 @@ async function redwoodFastifyGraphQLServer(fastify, options) {
       fastify.route({
         url: `${redwoodOptions.apiRootPath}${graphqlEndpoint}${routePath}`,
         method,
-        handler: (req, reply) => yoga.handleNodeRequestAndResponse(req, reply, {
-          req,
-          reply,
-          event: (0, import_awsLambdaFastify.lambdaEventForFastifyRequest)(req)
-        })
+        handler: async (req, _reply) => {
+          const request = createFetchRequest(req);
+          const cedarContext = await (0, import_runtime.buildCedarContext)(request, {
+            authDecoder: graphqlOptions.authDecoder
+          });
+          return yoga.handle(request, {
+            request,
+            cedarContext,
+            event: (0, import_awsLambdaFastify.lambdaEventForFastifyRequest)(req),
+            requestContext: void 0
+          });
+        }
       });
     }
     fastify.addHook("onReady", (done) => {
@@ -110,6 +118,15 @@ async function redwoodFastifyGraphQLServer(fastify, options) {
 function trimSlashes(path) {
   return path.replace(/^\/|\/$/g, "");
 }
+function createFetchRequest(req) {
+  const requestBody = req.method === "GET" || req.method === "HEAD" ? void 0 : typeof req.body === "string" ? req.body : req.body ? JSON.stringify(req.body) : void 0;
+  const href = `${req.protocol}://${req.hostname}${req.raw.url ?? "/"}`;
+  return new Request(href, {
+    method: req.method,
+    headers: req.headers,
+    body: requestBody
+  });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   redwoodFastifyGraphQLServer

package/dist/cjs/plugins/lambdaLoader.d.ts

@@ -1,8 +1,17 @@
 import type { Handler } from 'aws-lambda';
 import type { Options as FastGlobOptions } from 'fast-glob';
 import type { FastifyReply, FastifyRequest, RequestGenericInterface } from 'fastify';
+import type { CedarHandler, CedarRouteRecord } from '@cedarjs/api/runtime';
 export type Lambdas = Record<string, Handler>;
 export declare const LAMBDA_FUNCTIONS: Lambdas;
+export declare const CEDAR_HANDLERS: Map<string, CedarHandler>;
+/**
+ * Exports a copy of the Cedar route manifest.
+ *
+ * This is intended to be used to later build WinterTC compatible `fetch`
+ * exports
+ */
+export declare const getCedarRouteManifest: () => CedarRouteRecord[];
 export declare const setLambdaFunctions: (foundFunctions: string[]) => Promise<void>;
 type LoadFunctionsFromDistOptions = {
     fastGlobOptions?: FastGlobOptions;

package/dist/cjs/plugins/lambdaLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lambdaLoader.d.ts","sourceRoot":"","sources":["../../../src/plugins/lambdaLoader.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEzC,OAAO,KAAK,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAA;AAC3D,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EACd,uBAAuB,EACxB,MAAM,SAAS,CAAA;AAOhB,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAC7C,eAAO,MAAM,gBAAgB,EAAE,OAAY,CAAA;AAI3C,eAAO,MAAM,kBAAkB,GAAU,gBAAgB,MAAM,EAAE,kBAsDhE,CAAA;AAED,KAAK,4BAA4B,GAAG;IAClC,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAC1C,CAAA;AAGD,eAAO,MAAM,qBAAqB,GAChC,UAAS,4BAAiC,kBAe3C,CAAA;AA0BD,UAAU,oBAAqB,SAAQ,uBAAuB;IAC5D,MAAM,EAAE;QACN,SAAS,EAAE,MAAM,CAAA;KAClB,CAAA;CACF;AAED;;;;IAII;AACJ,eAAO,MAAM,oBAAoB,GAC/B,KAAK,cAAc,CAAC,oBAAoB,CAAC,EACzC,OAAO,YAAY,kBAsBpB,CAAA"}
+{"version":3,"file":"lambdaLoader.d.ts","sourceRoot":"","sources":["../../../src/plugins/lambdaLoader.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEzC,OAAO,KAAK,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAA;AAC3D,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EACd,uBAAuB,EACxB,MAAM,SAAS,CAAA;AAEhB,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAEjB,MAAM,sBAAsB,CAAA;AAO7B,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAC7C,eAAO,MAAM,gBAAgB,EAAE,OAAY,CAAA;AAC3C,eAAO,MAAM,cAAc,2BAAkC,CAAA;AAG7D;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,0BAAgC,CAAA;AAIlE,eAAO,MAAM,kBAAkB,GAAU,gBAAgB,MAAM,EAAE,kBAkGhE,CAAA;AAED,KAAK,4BAA4B,GAAG;IAClC,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAC1C,CAAA;AAGD,eAAO,MAAM,qBAAqB,GAChC,UAAS,4BAAiC,kBAe3C,CAAA;AA0BD,UAAU,oBAAqB,SAAQ,uBAAuB;IAC5D,MAAM,EAAE;QACN,SAAS,EAAE,MAAM,CAAA;KAClB,CAAA;CACF;AAED;;;;IAII;AACJ,eAAO,MAAM,oBAAoB,GAC/B,KAAK,cAAc,CAAC,oBAAoB,CAAC,EACzC,OAAO,YAAY,kBAsEpB,CAAA"}

package/dist/cjs/plugins/lambdaLoader.js

@@ -28,7 +28,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var lambdaLoader_exports = {};
 __export(lambdaLoader_exports, {
+  CEDAR_HANDLERS: () => CEDAR_HANDLERS,
   LAMBDA_FUNCTIONS: () => LAMBDA_FUNCTIONS,
+  getCedarRouteManifest: () => getCedarRouteManifest,
   lambdaRequestHandler: () => lambdaRequestHandler,
   loadFunctionsFromDist: () => loadFunctionsFromDist,
   setLambdaFunctions: () => setLambdaFunctions
@@ -38,16 +40,23 @@ var import_node_path = __toESM(require("node:path"), 1);
 var import_node_url = require("node:url");
 var import_ansis = __toESM(require("ansis"), 1);
 var import_fast_glob = __toESM(require("fast-glob"), 1);
+var import_runtime = require("@cedarjs/api/runtime");
 var import_project_config = require("@cedarjs/project-config");
 var import_awsLambdaFastify = require("../requestHandlers/awsLambdaFastify.js");
 var import_utils = require("../utils.js");
 const LAMBDA_FUNCTIONS = {};
+const CEDAR_HANDLERS = /* @__PURE__ */ new Map();
+const cedarRouteManifest = [];
+const getCedarRouteManifest = () => [...cedarRouteManifest];
 const setLambdaFunctions = async (foundFunctions) => {
   const tsImport = Date.now();
   console.log(import_ansis.default.dim.italic("Importing Server Functions... "));
+  cedarRouteManifest.length = 0;
+  CEDAR_HANDLERS.clear();
   const imports = foundFunctions.map(async (fnPath) => {
     const ts = Date.now();
     const routeName = import_node_path.default.basename(fnPath).replace(".js", "");
+    const routePath = routeName === "graphql" ? "/graphql" : `/${routeName}`;
     const fnImport = await import((0, import_node_url.pathToFileURL)(fnPath).href);
     const handler = (() => {
       if ("handler" in fnImport) {
@@ -60,15 +69,35 @@ const setLambdaFunctions = async (foundFunctions) => {
       }
       return void 0;
     })();
+    const cedarHandler = (() => {
+      if ("handle" in fnImport && typeof fnImport.handle === "function") {
+        return fnImport.handle;
+      }
+      if ("default" in fnImport && fnImport.default && "handle" in fnImport.default && typeof fnImport.default.handle === "function") {
+        return fnImport.default.handle;
+      }
+      return void 0;
+    })();
     LAMBDA_FUNCTIONS[routeName] = handler;
-    if (!handler) {
+    if (cedarHandler) {
+      CEDAR_HANDLERS.set(routeName, cedarHandler);
+    } else if (handler) {
+      CEDAR_HANDLERS.set(routeName, (0, import_runtime.wrapLegacyHandler)(handler));
+    }
+    if (!handler && !cedarHandler) {
       console.warn(
         routeName,
         "at",
         fnPath,
-        "does not have a function called handler defined."
+        "does not have a function called handler or handle defined."
       );
     }
+    cedarRouteManifest.push({
+      path: routePath,
+      methods: routeName === "graphql" ? ["GET", "POST", "OPTIONS"] : ["GET", "POST"],
+      type: routeName === "graphql" ? "graphql" : routeName === "health" ? "health" : routeName.toLowerCase().includes("auth") ? "auth" : "function",
+      entry: fnPath
+    });
     console.log(
       import_ansis.default.magenta("/" + routeName),
       import_ansis.default.dim.italic(Date.now() - ts + " ms")
@@ -109,6 +138,30 @@ const findApiDistFunctions = (params) => {
 };
 const lambdaRequestHandler = async (req, reply) => {
   const { routeName } = req.params;
+  const cedarHandlerCandidate = CEDAR_HANDLERS.get(routeName);
+  const cedarHandler = typeof cedarHandlerCandidate === "function" ? cedarHandlerCandidate : void 0;
+  if (cedarHandler) {
+    const requestBody = req.method === "GET" || req.method === "HEAD" ? void 0 : typeof req.rawBody === "string" ? req.rawBody : req.rawBody ? Buffer.from(req.rawBody).toString() : void 0;
+    const href = `${req.protocol}://${req.hostname}${req.raw.url ?? "/"}`;
+    const request = new Request(href, {
+      method: req.method,
+      headers: req.headers,
+      body: requestBody
+    });
+    const ctx = await (0, import_runtime.buildCedarContext)(request, {
+      params: {
+        routeName
+      }
+    });
+    const response = await cedarHandler(request, ctx);
+    reply.status(response.status);
+    response.headers.forEach((value, name) => {
+      reply.header(name, value);
+    });
+    const body = await response.arrayBuffer();
+    reply.send(Buffer.from(body));
+    return;
+  }
   if (!LAMBDA_FUNCTIONS[routeName]) {
     const errorMessage = `Function "${routeName}" was not found.`;
     req.log.error(errorMessage);
@@ -116,7 +169,12 @@ const lambdaRequestHandler = async (req, reply) => {
     if (process.env.NODE_ENV === "development") {
       const devError = {
         error: errorMessage,
-        availableFunctions: Object.keys(LAMBDA_FUNCTIONS)
+        availableFunctions: [
+          .../* @__PURE__ */ new Set([
+            ...Object.keys(LAMBDA_FUNCTIONS),
+            ...CEDAR_HANDLERS.keys()
+          ])
+        ]
       };
       reply.send(devError);
     } else {
@@ -128,7 +186,9 @@ const lambdaRequestHandler = async (req, reply) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  CEDAR_HANDLERS,
   LAMBDA_FUNCTIONS,
+  getCedarRouteManifest,
   lambdaRequestHandler,
   loadFunctionsFromDist,
   setLambdaFunctions

package/dist/fastify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fastify.d.ts","sourceRoot":"","sources":["../src/fastify.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAOpE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAGrD,eAAO,MAAM,eAAe;;;;CAI3B,CAAA;AAiBD,wBAAsB,iBAAiB;YAb7B,oBAAoB;sBACV,mBAAmB;GAsCtC;AAED,eAAO,MAAM,qBAAqB,GAChC,UAAU,oBAAoB,KAC7B,OAAO,CAAC,eAAe,CAWzB,CAAA"}
+{"version":3,"file":"fastify.d.ts","sourceRoot":"","sources":["../src/fastify.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAOpE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAGrD,eAAO,MAAM,eAAe;;;;CAI3B,CAAA;AAkBD,wBAAsB,iBAAiB;YAb7B,oBAAoB;sBACV,mBAAmB;GA2CtC;AAED,eAAO,MAAM,qBAAqB,GAChC,UAAU,oBAAoB,KAC7B,OAAO,CAAC,eAAe,CAWzB,CAAA"}

package/dist/fastify.js

@@ -10,6 +10,7 @@ const DEFAULT_OPTIONS = {
   }
 };
 let isServerConfigLoaded = false;
+let loadedServerConfigPath;
 let serverConfigFile = {
   config: DEFAULT_OPTIONS,
   configureFastify: async (fastify, options) => {
@@ -28,6 +29,9 @@ async function loadFastifyConfig() {
   if (!fs.existsSync(serverConfigPath)) {
     return serverConfigFile;
   }
+  if (loadedServerConfigPath !== serverConfigPath) {
+    isServerConfigLoaded = false;
+  }
   if (!isServerConfigLoaded) {
     console.log(`Loading server config from ${serverConfigPath}`);
     console.log(`Loading server config from URL file://${serverConfigPath}`);
@@ -36,6 +40,7 @@ async function loadFastifyConfig() {
     );
     const config = await import(pathToFileURL(serverConfigPath).href);
     serverConfigFile = { ...config.default };
+    loadedServerConfigPath = serverConfigPath;
     isServerConfigLoaded = true;
   }
   return serverConfigFile;

package/dist/plugins/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/plugins/api.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAO9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAKvD,MAAM,WAAW,sBAAsB;IAErC,OAAO,EAAE;QACP,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,eAAe,CAAC,EAAE,eAAe,CAAA;QACjC,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;QACzC,cAAc,CAAC,EAAE,OAAO,CAAA;QACxB,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;KAC3D,CAAA;CACF;AAED,wBAAsB,eAAe,CACnC,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,sBAAsB,iBA4C7B"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/plugins/api.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAO9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAKvD,MAAM,WAAW,sBAAsB;IAErC,OAAO,EAAE;QACP,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,eAAe,CAAC,EAAE,eAAe,CAAA;QACjC,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;QACzC,cAAc,CAAC,EAAE,OAAO,CAAA;QACxB,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;KAI3D,CAAA;CACF;AAED,wBAAsB,eAAe,CACnC,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,sBAAsB,iBA4C7B"}

package/dist/plugins/graphql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/plugins/graphql.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,SAAS,CAAA;AAO3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAKjE,MAAM,WAAW,4BAA4B;IAC3C,OAAO,EAAE;QACP,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,OAAO,CAAC,EAAE,kBAAkB,CAAA;KAC7B,CAAA;CACF;AAED,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,4BAA4B,iBAmGtC"}
+{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/plugins/graphql.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAA+B,MAAM,SAAS,CAAA;AAQ3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAKjE,MAAM,WAAW,4BAA4B;IAC3C,OAAO,EAAE;QACP,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,OAAO,CAAC,EAAE,kBAAkB,CAAA;KAC7B,CAAA;CACF;AAED,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,4BAA4B,iBA0HtC"}

package/dist/plugins/graphql.js

@@ -2,6 +2,7 @@ import { pathToFileURL } from "node:url";
 import fastifyMultiPart from "@fastify/multipart";
 import fastifyUrlData from "@fastify/url-data";
 import fg from "fast-glob";
+import { buildCedarContext } from "@cedarjs/api/runtime";
 import { getAsyncStoreInstance } from "@cedarjs/context/dist/store";
 import { coerceRootPath } from "@cedarjs/fastify-web/dist/helpers.js";
 import { createGraphQLYoga } from "@cedarjs/graphql-server";
@@ -53,11 +54,18 @@ async function redwoodFastifyGraphQLServer(fastify, options) {
       fastify.route({
         url: `${redwoodOptions.apiRootPath}${graphqlEndpoint}${routePath}`,
         method,
-        handler: (req, reply) => yoga.handleNodeRequestAndResponse(req, reply, {
-          req,
-          reply,
-          event: lambdaEventForFastifyRequest(req)
-        })
+        handler: async (req, _reply) => {
+          const request = createFetchRequest(req);
+          const cedarContext = await buildCedarContext(request, {
+            authDecoder: graphqlOptions.authDecoder
+          });
+          return yoga.handle(request, {
+            request,
+            cedarContext,
+            event: lambdaEventForFastifyRequest(req),
+            requestContext: void 0
+          });
+        }
       });
     }
     fastify.addHook("onReady", (done) => {
@@ -77,6 +85,15 @@ async function redwoodFastifyGraphQLServer(fastify, options) {
 function trimSlashes(path) {
   return path.replace(/^\/|\/$/g, "");
 }
+function createFetchRequest(req) {
+  const requestBody = req.method === "GET" || req.method === "HEAD" ? void 0 : typeof req.body === "string" ? req.body : req.body ? JSON.stringify(req.body) : void 0;
+  const href = `${req.protocol}://${req.hostname}${req.raw.url ?? "/"}`;
+  return new Request(href, {
+    method: req.method,
+    headers: req.headers,
+    body: requestBody
+  });
+}
 export {
   redwoodFastifyGraphQLServer
 };

package/dist/plugins/lambdaLoader.d.ts

@@ -1,8 +1,17 @@
 import type { Handler } from 'aws-lambda';
 import type { Options as FastGlobOptions } from 'fast-glob';
 import type { FastifyReply, FastifyRequest, RequestGenericInterface } from 'fastify';
+import type { CedarHandler, CedarRouteRecord } from '@cedarjs/api/runtime';
 export type Lambdas = Record<string, Handler>;
 export declare const LAMBDA_FUNCTIONS: Lambdas;
+export declare const CEDAR_HANDLERS: Map<string, CedarHandler>;
+/**
+ * Exports a copy of the Cedar route manifest.
+ *
+ * This is intended to be used to later build WinterTC compatible `fetch`
+ * exports
+ */
+export declare const getCedarRouteManifest: () => CedarRouteRecord[];
 export declare const setLambdaFunctions: (foundFunctions: string[]) => Promise<void>;
 type LoadFunctionsFromDistOptions = {
     fastGlobOptions?: FastGlobOptions;

package/dist/plugins/lambdaLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lambdaLoader.d.ts","sourceRoot":"","sources":["../../src/plugins/lambdaLoader.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEzC,OAAO,KAAK,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAA;AAC3D,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EACd,uBAAuB,EACxB,MAAM,SAAS,CAAA;AAOhB,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAC7C,eAAO,MAAM,gBAAgB,EAAE,OAAY,CAAA;AAI3C,eAAO,MAAM,kBAAkB,GAAU,gBAAgB,MAAM,EAAE,kBAsDhE,CAAA;AAED,KAAK,4BAA4B,GAAG;IAClC,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAC1C,CAAA;AAGD,eAAO,MAAM,qBAAqB,GAChC,UAAS,4BAAiC,kBAe3C,CAAA;AA0BD,UAAU,oBAAqB,SAAQ,uBAAuB;IAC5D,MAAM,EAAE;QACN,SAAS,EAAE,MAAM,CAAA;KAClB,CAAA;CACF;AAED;;;;IAII;AACJ,eAAO,MAAM,oBAAoB,GAC/B,KAAK,cAAc,CAAC,oBAAoB,CAAC,EACzC,OAAO,YAAY,kBAsBpB,CAAA"}
+{"version":3,"file":"lambdaLoader.d.ts","sourceRoot":"","sources":["../../src/plugins/lambdaLoader.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEzC,OAAO,KAAK,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAA;AAC3D,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EACd,uBAAuB,EACxB,MAAM,SAAS,CAAA;AAEhB,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAEjB,MAAM,sBAAsB,CAAA;AAO7B,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAC7C,eAAO,MAAM,gBAAgB,EAAE,OAAY,CAAA;AAC3C,eAAO,MAAM,cAAc,2BAAkC,CAAA;AAG7D;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,0BAAgC,CAAA;AAIlE,eAAO,MAAM,kBAAkB,GAAU,gBAAgB,MAAM,EAAE,kBAkGhE,CAAA;AAED,KAAK,4BAA4B,GAAG;IAClC,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAC1C,CAAA;AAGD,eAAO,MAAM,qBAAqB,GAChC,UAAS,4BAAiC,kBAe3C,CAAA;AA0BD,UAAU,oBAAqB,SAAQ,uBAAuB;IAC5D,MAAM,EAAE;QACN,SAAS,EAAE,MAAM,CAAA;KAClB,CAAA;CACF;AAED;;;;IAII;AACJ,eAAO,MAAM,oBAAoB,GAC/B,KAAK,cAAc,CAAC,oBAAoB,CAAC,EACzC,OAAO,YAAY,kBAsEpB,CAAA"}

package/dist/plugins/lambdaLoader.js

@@ -2,16 +2,23 @@ import path from "node:path";
 import { pathToFileURL } from "node:url";
 import ansis from "ansis";
 import fg from "fast-glob";
+import { buildCedarContext, wrapLegacyHandler } from "@cedarjs/api/runtime";
 import { getPaths } from "@cedarjs/project-config";
 import { requestHandler } from "../requestHandlers/awsLambdaFastify.js";
 import { escape } from "../utils.js";
 const LAMBDA_FUNCTIONS = {};
+const CEDAR_HANDLERS = /* @__PURE__ */ new Map();
+const cedarRouteManifest = [];
+const getCedarRouteManifest = () => [...cedarRouteManifest];
 const setLambdaFunctions = async (foundFunctions) => {
   const tsImport = Date.now();
   console.log(ansis.dim.italic("Importing Server Functions... "));
+  cedarRouteManifest.length = 0;
+  CEDAR_HANDLERS.clear();
   const imports = foundFunctions.map(async (fnPath) => {
     const ts = Date.now();
     const routeName = path.basename(fnPath).replace(".js", "");
+    const routePath = routeName === "graphql" ? "/graphql" : `/${routeName}`;
     const fnImport = await import(pathToFileURL(fnPath).href);
     const handler = (() => {
       if ("handler" in fnImport) {
@@ -24,15 +31,35 @@ const setLambdaFunctions = async (foundFunctions) => {
       }
       return void 0;
     })();
+    const cedarHandler = (() => {
+      if ("handle" in fnImport && typeof fnImport.handle === "function") {
+        return fnImport.handle;
+      }
+      if ("default" in fnImport && fnImport.default && "handle" in fnImport.default && typeof fnImport.default.handle === "function") {
+        return fnImport.default.handle;
+      }
+      return void 0;
+    })();
     LAMBDA_FUNCTIONS[routeName] = handler;
-    if (!handler) {
+    if (cedarHandler) {
+      CEDAR_HANDLERS.set(routeName, cedarHandler);
+    } else if (handler) {
+      CEDAR_HANDLERS.set(routeName, wrapLegacyHandler(handler));
+    }
+    if (!handler && !cedarHandler) {
       console.warn(
         routeName,
         "at",
         fnPath,
-        "does not have a function called handler defined."
+        "does not have a function called handler or handle defined."
       );
     }
+    cedarRouteManifest.push({
+      path: routePath,
+      methods: routeName === "graphql" ? ["GET", "POST", "OPTIONS"] : ["GET", "POST"],
+      type: routeName === "graphql" ? "graphql" : routeName === "health" ? "health" : routeName.toLowerCase().includes("auth") ? "auth" : "function",
+      entry: fnPath
+    });
     console.log(
       ansis.magenta("/" + routeName),
       ansis.dim.italic(Date.now() - ts + " ms")
@@ -73,6 +100,30 @@ const findApiDistFunctions = (params) => {
 };
 const lambdaRequestHandler = async (req, reply) => {
   const { routeName } = req.params;
+  const cedarHandlerCandidate = CEDAR_HANDLERS.get(routeName);
+  const cedarHandler = typeof cedarHandlerCandidate === "function" ? cedarHandlerCandidate : void 0;
+  if (cedarHandler) {
+    const requestBody = req.method === "GET" || req.method === "HEAD" ? void 0 : typeof req.rawBody === "string" ? req.rawBody : req.rawBody ? Buffer.from(req.rawBody).toString() : void 0;
+    const href = `${req.protocol}://${req.hostname}${req.raw.url ?? "/"}`;
+    const request = new Request(href, {
+      method: req.method,
+      headers: req.headers,
+      body: requestBody
+    });
+    const ctx = await buildCedarContext(request, {
+      params: {
+        routeName
+      }
+    });
+    const response = await cedarHandler(request, ctx);
+    reply.status(response.status);
+    response.headers.forEach((value, name) => {
+      reply.header(name, value);
+    });
+    const body = await response.arrayBuffer();
+    reply.send(Buffer.from(body));
+    return;
+  }
   if (!LAMBDA_FUNCTIONS[routeName]) {
     const errorMessage = `Function "${routeName}" was not found.`;
     req.log.error(errorMessage);
@@ -80,7 +131,12 @@ const lambdaRequestHandler = async (req, reply) => {
     if (process.env.NODE_ENV === "development") {
       const devError = {
         error: errorMessage,
-        availableFunctions: Object.keys(LAMBDA_FUNCTIONS)
+        availableFunctions: [
+          .../* @__PURE__ */ new Set([
+            ...Object.keys(LAMBDA_FUNCTIONS),
+            ...CEDAR_HANDLERS.keys()
+          ])
+        ]
       };
       reply.send(devError);
     } else {
@@ -91,7 +147,9 @@ const lambdaRequestHandler = async (req, reply) => {
   return requestHandler(req, reply, LAMBDA_FUNCTIONS[routeName]);
 };
 export {
+  CEDAR_HANDLERS,
   LAMBDA_FUNCTIONS,
+  getCedarRouteManifest,
   lambdaRequestHandler,
   loadFunctionsFromDist,
   setLambdaFunctions

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/api-server",
-  "version": "4.0.0-canary.13817+443ccf6432",
+  "version": "4.0.0-canary.13821+c50dad5fb2",
   "description": "CedarJS's HTTP server for Serverless Functions",
   "repository": {
     "type": "git",
@@ -111,11 +111,11 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/context": "4.0.0-canary.13817",
-    "@cedarjs/fastify-web": "4.0.0-canary.13817",
-    "@cedarjs/internal": "4.0.0-canary.13817",
-    "@cedarjs/project-config": "4.0.0-canary.13817",
-    "@cedarjs/web-server": "4.0.0-canary.13817",
+    "@cedarjs/context": "4.0.0-canary.13821",
+    "@cedarjs/fastify-web": "4.0.0-canary.13821",
+    "@cedarjs/internal": "4.0.0-canary.13821",
+    "@cedarjs/project-config": "4.0.0-canary.13821",
+    "@cedarjs/web-server": "4.0.0-canary.13821",
     "@fastify/multipart": "9.4.0",
     "@fastify/url-data": "6.0.3",
     "ansis": "4.2.0",
@@ -132,7 +132,7 @@
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "4.0.0-canary.13817",
+    "@cedarjs/framework-tools": "4.0.0-canary.13821",
     "@types/aws-lambda": "8.10.161",
     "@types/dotenv-defaults": "^5.0.0",
     "@types/split2": "4.2.3",
@@ -145,7 +145,7 @@
     "vitest": "3.2.4"
   },
   "peerDependencies": {
-    "@cedarjs/graphql-server": "4.0.0-canary.13817"
+    "@cedarjs/graphql-server": "4.0.0-canary.13821"
   },
   "peerDependenciesMeta": {
     "@cedarjs/graphql-server": {
@@ -155,5 +155,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "443ccf6432c587392e3cd2ef01e9732ee47f65fa"
+  "gitHead": "c50dad5fb2c3d3571a8151f7a5af200a5a077104"
 }