@cedarjs/internal 5.0.0-rc.261 → 5.0.0-rc.280

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

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/build/api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,YAAY,EAAe,MAAM,SAAS,CAAA;AAetE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AA0ED,eAAO,MAAM,gBAAgB,iHAqD5B,CAAA;AAcD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAoDf"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/build/api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,YAAY,EAAe,MAAM,SAAS,CAAA;AAiBtE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AA8FD,eAAO,MAAM,gBAAgB,iHAqD5B,CAAA;AAcD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAoDf"}

package/dist/build/api.js

@@ -8,6 +8,7 @@ import {
 } from "@cedarjs/babel-config";
 import { getConfig, getPaths, projectSideIsEsm } from "@cedarjs/project-config";
 import { findApiFiles } from "../files.js";
+import { applyContextWrapping } from "./esbuild-plugin-cedar-context-wrapping.js";
 let BUILD_CTX = null;
 const buildApi = async () => {
   BUILD_CTX?.dispose();
@@ -43,8 +44,14 @@ const runCedarBabelTransformsPlugin = {
         })
       );
       if (transformedCode?.code) {
+        const functionsDir = normalizePath(
+          path.join(getPaths().api.src, "functions")
+        );
+        const code = normalizePath(args.path).startsWith(functionsDir + "/") ? applyContextWrapping(transformedCode.code, {
+          projectIsEsm: projectSideIsEsm("api")
+        }) ?? transformedCode.code : transformedCode.code;
         return {
-          contents: transformedCode.code,
+          contents: code,
           loader: "js"
         };
       }
@@ -79,8 +86,14 @@ function createCedarViteApiPlugin() {
         true
       );
       if (transformedCode?.code) {
+        const functionsDir = normalizePath(
+          path.join(cedarPaths.api.src, "functions")
+        );
+        const code2 = normalizePath(id).startsWith(functionsDir + "/") ? applyContextWrapping(transformedCode.code, {
+          projectIsEsm: isEsm
+        }) ?? transformedCode.code : transformedCode.code;
         return {
-          code: transformedCode.code,
+          code: code2,
           map: transformedCode.map ?? null
         };
       }

package/dist/build/esbuild-plugin-cedar-context-wrapping.d.ts

@@ -0,0 +1,4 @@
+export declare function applyContextWrapping(code: string, { projectIsEsm }?: {
+    projectIsEsm?: boolean;
+}): string | null;
+//# sourceMappingURL=esbuild-plugin-cedar-context-wrapping.d.ts.map

package/dist/build/esbuild-plugin-cedar-context-wrapping.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"esbuild-plugin-cedar-context-wrapping.d.ts","sourceRoot":"","sources":["../../src/build/esbuild-plugin-cedar-context-wrapping.ts"],"names":[],"mappings":"AAOA,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,EAAE,YAAoB,EAAE,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAO,GACxD,MAAM,GAAG,IAAI,CA0Cf"}

package/dist/build/esbuild-plugin-cedar-context-wrapping.js

@@ -0,0 +1,35 @@
+function applyContextWrapping(code, { projectIsEsm = false } = {}) {
+  const handlerRe = /^export\s+(?:const|let|var)\s+handler(?:[^=]|=>)*?=(?![>=])/m;
+  const handlerMatch = handlerRe.exec(code);
+  if (!handlerMatch) {
+    return null;
+  }
+  const afterEquals = code.slice(handlerMatch.index + handlerMatch[0].length).trimStart();
+  const isAsync = /^async(?:\s*[\(\*]|\s+function)/.test(afterEquals);
+  const storePath = projectIsEsm ? "@cedarjs/context/dist/store.js" : "@cedarjs/context/dist/store";
+  const importStatement = `import { getAsyncStoreInstance as __rw_getAsyncStoreInstance } from '${storePath}'
+`;
+  const handlerStart = handlerMatch.index;
+  const before = code.slice(0, handlerStart);
+  const after = code.slice(handlerStart);
+  const renamed = after.replace(handlerRe, "const __rw_handler =");
+  const wrappedHandler = `
+export const handler = ${isAsync ? "async " : ""}(__rw_event, __rw__context) => {
+  // The store will be undefined if no context isolation has been performed yet
+  const __rw_contextStore = __rw_getAsyncStoreInstance().getStore()
+  if (__rw_contextStore === undefined) {
+    return __rw_getAsyncStoreInstance().run(
+      new Map(),
+      __rw_handler,
+      __rw_event,
+      __rw__context
+    )
+  }
+  return __rw_handler(__rw_event, __rw__context)
+}
+`;
+  return before + importStatement + renamed + wrappedHandler;
+}
+export {
+  applyContextWrapping
+};

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

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/build/api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,YAAY,EAAe,MAAM,SAAS,CAAA;AAetE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AA0ED,eAAO,MAAM,gBAAgB,iHAqD5B,CAAA;AAcD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAoDf"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/build/api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,YAAY,EAAe,MAAM,SAAS,CAAA;AAiBtE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AA8FD,eAAO,MAAM,gBAAgB,iHAqD5B,CAAA;AAcD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAoDf"}

package/dist/cjs/build/api.js

@@ -42,6 +42,7 @@ var import_vite = require("vite");
 var import_babel_config = require("@cedarjs/babel-config");
 var import_project_config = require("@cedarjs/project-config");
 var import_files = require("../files.js");
+var import_esbuild_plugin_cedar_context_wrapping = require("./esbuild-plugin-cedar-context-wrapping.js");
 let BUILD_CTX = null;
 const buildApi = async () => {
   BUILD_CTX?.dispose();
@@ -77,8 +78,14 @@ const runCedarBabelTransformsPlugin = {
         })
       );
       if (transformedCode?.code) {
+        const functionsDir = (0, import_vite.normalizePath)(
+          import_node_path.default.join((0, import_project_config.getPaths)().api.src, "functions")
+        );
+        const code = (0, import_vite.normalizePath)(args.path).startsWith(functionsDir + "/") ? (0, import_esbuild_plugin_cedar_context_wrapping.applyContextWrapping)(transformedCode.code, {
+          projectIsEsm: (0, import_project_config.projectSideIsEsm)("api")
+        }) ?? transformedCode.code : transformedCode.code;
         return {
-          contents: transformedCode.code,
+          contents: code,
           loader: "js"
         };
       }
@@ -113,8 +120,14 @@ function createCedarViteApiPlugin() {
         true
       );
       if (transformedCode?.code) {
+        const functionsDir = (0, import_vite.normalizePath)(
+          import_node_path.default.join(cedarPaths.api.src, "functions")
+        );
+        const code2 = (0, import_vite.normalizePath)(id).startsWith(functionsDir + "/") ? (0, import_esbuild_plugin_cedar_context_wrapping.applyContextWrapping)(transformedCode.code, {
+          projectIsEsm: isEsm
+        }) ?? transformedCode.code : transformedCode.code;
         return {
-          code: transformedCode.code,
+          code: code2,
           map: transformedCode.map ?? null
         };
       }

package/dist/cjs/build/esbuild-plugin-cedar-context-wrapping.d.ts

@@ -0,0 +1,4 @@
+export declare function applyContextWrapping(code: string, { projectIsEsm }?: {
+    projectIsEsm?: boolean;
+}): string | null;
+//# sourceMappingURL=esbuild-plugin-cedar-context-wrapping.d.ts.map

package/dist/cjs/build/esbuild-plugin-cedar-context-wrapping.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"esbuild-plugin-cedar-context-wrapping.d.ts","sourceRoot":"","sources":["../../../src/build/esbuild-plugin-cedar-context-wrapping.ts"],"names":[],"mappings":"AAOA,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,EAAE,YAAoB,EAAE,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAO,GACxD,MAAM,GAAG,IAAI,CA0Cf"}

package/dist/cjs/build/esbuild-plugin-cedar-context-wrapping.js

@@ -0,0 +1,59 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var esbuild_plugin_cedar_context_wrapping_exports = {};
+__export(esbuild_plugin_cedar_context_wrapping_exports, {
+  applyContextWrapping: () => applyContextWrapping
+});
+module.exports = __toCommonJS(esbuild_plugin_cedar_context_wrapping_exports);
+function applyContextWrapping(code, { projectIsEsm = false } = {}) {
+  const handlerRe = /^export\s+(?:const|let|var)\s+handler(?:[^=]|=>)*?=(?![>=])/m;
+  const handlerMatch = handlerRe.exec(code);
+  if (!handlerMatch) {
+    return null;
+  }
+  const afterEquals = code.slice(handlerMatch.index + handlerMatch[0].length).trimStart();
+  const isAsync = /^async(?:\s*[\(\*]|\s+function)/.test(afterEquals);
+  const storePath = projectIsEsm ? "@cedarjs/context/dist/store.js" : "@cedarjs/context/dist/store";
+  const importStatement = `import { getAsyncStoreInstance as __rw_getAsyncStoreInstance } from '${storePath}'
+`;
+  const handlerStart = handlerMatch.index;
+  const before = code.slice(0, handlerStart);
+  const after = code.slice(handlerStart);
+  const renamed = after.replace(handlerRe, "const __rw_handler =");
+  const wrappedHandler = `
+export const handler = ${isAsync ? "async " : ""}(__rw_event, __rw__context) => {
+  // The store will be undefined if no context isolation has been performed yet
+  const __rw_contextStore = __rw_getAsyncStoreInstance().getStore()
+  if (__rw_contextStore === undefined) {
+    return __rw_getAsyncStoreInstance().run(
+      new Map(),
+      __rw_handler,
+      __rw_event,
+      __rw__context
+    )
+  }
+  return __rw_handler(__rw_event, __rw__context)
+}
+`;
+  return before + importStatement + renamed + wrappedHandler;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  applyContextWrapping
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/internal",
-  "version": "5.0.0-rc.261",
+  "version": "5.0.0-rc.280",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -140,7 +140,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsx ./build.mts",
+    "build": "node ./build.mts",
     "build:clean-dist": "rimraf 'dist/**/*/__tests__' --glob",
     "build:pack": "yarn pack -o cedarjs-internal.tgz",
     "build:types": "tsc --build --verbose ./tsconfig.build.json",
@@ -159,13 +159,13 @@
     "@babel/plugin-transform-react-jsx": "7.29.7",
     "@babel/plugin-transform-typescript": "^7.26.8",
     "@babel/traverse": "7.29.7",
-    "@cedarjs/babel-config": "5.0.0-rc.261",
-    "@cedarjs/cli-helpers": "5.0.0-rc.261",
-    "@cedarjs/graphql-server": "5.0.0-rc.261",
-    "@cedarjs/project-config": "5.0.0-rc.261",
-    "@cedarjs/router": "5.0.0-rc.261",
-    "@cedarjs/structure": "5.0.0-rc.261",
-    "@cedarjs/utils": "5.0.0-rc.261",
+    "@cedarjs/babel-config": "5.0.0-rc.280",
+    "@cedarjs/cli-helpers": "5.0.0-rc.280",
+    "@cedarjs/graphql-server": "5.0.0-rc.280",
+    "@cedarjs/project-config": "5.0.0-rc.280",
+    "@cedarjs/router": "5.0.0-rc.280",
+    "@cedarjs/structure": "5.0.0-rc.280",
+    "@cedarjs/utils": "5.0.0-rc.280",
     "@graphql-codegen/add": "6.0.1",
     "@graphql-codegen/cli": "6.3.1",
     "@graphql-codegen/client-preset": "5.3.0",
@@ -192,7 +192,7 @@
     "esbuild": "0.27.7",
     "execa": "5.1.1",
     "fast-glob": "3.3.3",
-    "graphql": "16.13.2",
+    "graphql": "16.14.2",
     "kill-port": "1.6.1",
     "prettier": "3.8.4",
     "rimraf": "6.1.3",
@@ -206,11 +206,10 @@
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.4",
-    "@cedarjs/framework-tools": "5.0.0-rc.261",
+    "@cedarjs/framework-tools": "5.0.0-rc.280",
     "concurrently": "9.2.1",
     "graphql-tag": "2.12.6",
     "publint": "0.3.21",
-    "tsx": "4.22.4",
     "vitest": "3.2.6"
   },
   "engines": {