@cedarjs/internal 5.0.0 → 6.0.0-canary.2615

package/dist/build/api-graphql-transforms.d.ts

@@ -0,0 +1,34 @@
+/**
+ * Extracts the options argument from createGraphQLHandler calls and stores
+ * them in an exported variable. Returns the transformed code, or null if no
+ * transformation was needed.
+ *
+ * Transforms:
+ *   export const handler = createGraphQLHandler({ options })
+ * into:
+ *   export const __cedar_graphqlOptions = { options }
+ *   export const handler = createGraphQLHandler(__cedar_graphqlOptions)
+ */
+export declare function applyGraphqlOptionsExtract(code: string): string | null;
+/**
+ * Injects the auto-generated gqlorm backend into graphql.ts at build time.
+ *
+ * When `experimental.gqlorm.enabled = true` and `.cedar/gqlorm/backend.ts`
+ * exists, this function:
+ *
+ * 1. Adds imports at the top of graphql.ts:
+ *      import * as __gqlorm_sdl__ from '../../../.cedar/gqlorm/backend'
+ *      import { db as __gqlorm_db__ } from 'src/lib/db'
+ *
+ * 2. Inserts a statement immediately before the `createGraphQLHandler` call:
+ *      Object.assign(sdls, {
+ *        __gqlorm__: {
+ *          schema: __gqlorm_sdl__.schema,
+ *          resolvers: __gqlorm_sdl__.createGqlormResolvers(__gqlorm_db__),
+ *        },
+ *      })
+ *
+ * Returns the transformed code, or null if no transformation was needed.
+ */
+export declare function applyGqlormInject(code: string, id: string, dbExt?: '.ts' | '.js'): string | null;
+//# sourceMappingURL=api-graphql-transforms.d.ts.map

package/dist/build/api-graphql-transforms.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"api-graphql-transforms.d.ts","sourceRoot":"","sources":["../../src/build/api-graphql-transforms.ts"],"names":[],"mappings":"AAYA;;;;;;;;;;GAUG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA6FtE;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,KAAK,GAAE,KAAK,GAAG,KAAa,GAC3B,MAAM,GAAG,IAAI,CAmFf"}

package/dist/build/api-graphql-transforms.js

@@ -0,0 +1,119 @@
+import fs from "node:fs";
+import path from "node:path";
+import { parseSync, Visitor } from "oxc-parser";
+import {
+  getConfig,
+  getPaths,
+  importStatementPath
+} from "@cedarjs/project-config";
+function applyGraphqlOptionsExtract(code) {
+  if (code.includes("__cedar_graphqlOptions")) {
+    return null;
+  }
+  const { program } = parseSync("graphql.ts", code, {
+    // lang is only a parse hint; 'ts' also parses JS (the graphql handler can
+    // be graphql.js in JS projects), so this is safe for both file types.
+    lang: "ts",
+    sourceType: "module"
+  });
+  const importNames = /* @__PURE__ */ new Set();
+  for (const node of program.body) {
+    if (node.type === "ImportDeclaration") {
+      if (node.source.value !== "@cedarjs/graphql-server") {
+        continue;
+      }
+      for (const specifier of node.specifiers) {
+        if (specifier.type === "ImportSpecifier" && specifier.imported.type === "Identifier" && specifier.imported.name === "createGraphQLHandler") {
+          importNames.add(specifier.local.name);
+        }
+      }
+    }
+  }
+  if (importNames.size === 0) {
+    return null;
+  }
+  const callExpressionPaths = [];
+  new Visitor({
+    CallExpression(node) {
+      if (node.callee.type === "Identifier" && importNames.has(node.callee.name)) {
+        callExpressionPaths.push(node);
+      }
+    }
+  }).visit(program);
+  if (callExpressionPaths.length > 1) {
+    return null;
+  }
+  const callExpression = callExpressionPaths[0];
+  if (!callExpression) {
+    return null;
+  }
+  const options = callExpression.arguments[0];
+  if (!options) {
+    return null;
+  }
+  if (options.type !== "Identifier" && options.type !== "ObjectExpression" && options.type !== "CallExpression" && options.type !== "ConditionalExpression") {
+    return null;
+  }
+  const optionsStart = options.start;
+  const optionsEnd = options.end;
+  const lineStart = code.lastIndexOf("\n", callExpression.start) + 1;
+  const indentMatch = /^[ \t]*/.exec(code.slice(lineStart));
+  const indent = indentMatch ? indentMatch[0] : "";
+  const optionsConst = `${indent}export const __cedar_graphqlOptions = ${code.slice(
+    optionsStart,
+    optionsEnd
+  )}
+`;
+  const before = code.slice(0, lineStart);
+  const between = code.slice(lineStart, optionsStart);
+  const after = code.slice(optionsEnd);
+  return before + optionsConst + between + "__cedar_graphqlOptions" + after;
+}
+function applyGqlormInject(code, id, dbExt = ".ts") {
+  if (code.includes("__gqlorm_sdl__")) {
+    return null;
+  }
+  if (!code.includes("createGraphQLHandler")) {
+    return null;
+  }
+  if (!getConfig().experimental?.gqlorm?.enabled) {
+    return null;
+  }
+  const backendPathWithoutExt = path.join(
+    getPaths().generated.base,
+    "gqlorm",
+    "backend"
+  );
+  if (!fs.existsSync(backendPathWithoutExt + ".ts")) {
+    return null;
+  }
+  const handlerPattern = /^export\s+const\s+(\w+)\s*=\s*createGraphQLHandler\s*\(/m;
+  const handlerMatch = handlerPattern.exec(code);
+  if (!handlerMatch) {
+    return null;
+  }
+  const handlerLineStart = code.lastIndexOf("\n", handlerMatch.index) + 1;
+  const relPath = importStatementPath(
+    path.relative(path.dirname(id), backendPathWithoutExt)
+  ) + ".ts";
+  const dbSrcPath = path.join(getPaths().api.src, "lib", "db");
+  const relDbPath = importStatementPath(path.relative(path.dirname(id), dbSrcPath)) + dbExt;
+  const importDb = `import { db as __gqlorm_db__ } from '${relDbPath}'`;
+  const importSdl = `import * as __gqlorm_sdl__ from '${relPath}'`;
+  const importsToAdd = `${importDb}
+${importSdl}
+`;
+  const sdlsMutation = `Object.assign(sdls, {
+    __gqlorm__: {
+      schema: __gqlorm_sdl__.schema,
+      resolvers: __gqlorm_sdl__.createGqlormResolvers(__gqlorm_db__),
+    },
+  })
+  `;
+  const transformed = importsToAdd + code.slice(0, handlerLineStart) + sdlsMutation + code.slice(handlerLineStart);
+  return transformed;
+}
+export {
+  applyGqlormInject,
+  applyGraphqlOptionsExtract
+};

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;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"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/build/api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,YAAY,EAAe,MAAM,SAAS,CAAA;AAsBtE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AA8HD,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,7 +8,12 @@ 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";
+import {
+  applyGqlormInject,
+  applyGraphqlOptionsExtract
+} from "./api-graphql-transforms.js";
+import { cedarApiGraphqlPlugin } from "./esbuild-plugin-api-graphql.js";
+import { applyHandlerAlsWrapping } from "./esbuild-plugin-handler-als-wrapping.js";
 let BUILD_CTX = null;
 const buildApi = async () => {
   BUILD_CTX?.dispose();
@@ -44,12 +49,16 @@ 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;
+        let code = transformedCode.code;
+        const normalizedPath = normalizePath(args.path);
+        const cedarPaths = getPaths();
+        const isEsm = projectSideIsEsm("api");
+        const functionsDir = normalizePath(cedarPaths.api.functions);
+        if (normalizedPath.startsWith(functionsDir + "/")) {
+          code = applyHandlerAlsWrapping(code, {
+            projectIsEsm: isEsm
+          }) ?? code;
+        }
         return {
           contents: code,
           loader: "js"
@@ -76,8 +85,14 @@ function createCedarViteApiPlugin() {
       if (!normalizePath(id).startsWith(normalizePath(cedarPaths.api.base))) {
         return null;
       }
+      let sourceCode = code;
+      const normalizedId = normalizePath(id);
+      if (normalizedId.endsWith("/graphql.ts") || normalizedId.endsWith("/graphql.js")) {
+        sourceCode = applyGraphqlOptionsExtract(sourceCode) ?? sourceCode;
+        sourceCode = applyGqlormInject(sourceCode, id) ?? sourceCode;
+      }
       const transformedCode = await transformWithBabel(
-        code,
+        sourceCode,
         id,
         getApiSideBabelPlugins({
           openTelemetry: cedarConfig.experimental.opentelemetry.enabled && cedarConfig.experimental.opentelemetry.wrapApi,
@@ -86,12 +101,13 @@ 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;
+        let code2 = transformedCode.code;
+        const functionsDir = normalizePath(cedarPaths.api.functions);
+        if (normalizedId.startsWith(functionsDir + "/")) {
+          code2 = applyHandlerAlsWrapping(code2, {
+            projectIsEsm: isEsm
+          }) ?? code2;
+        }
         return {
           code: code2,
           map: transformedCode.map ?? null
@@ -199,7 +215,10 @@ function getEsbuildOptions(files) {
     format,
     allowOverwrite: true,
     bundle: false,
-    plugins: [runCedarBabelTransformsPlugin],
+    // Registration order matters: cedarApiGraphqlPlugin (narrow filter) must
+    // come first so it claims graphql.ts before runCedarBabelTransformsPlugin
+    // (broad filter) can. See the NOTE on cedarApiGraphqlPlugin.
+    plugins: [cedarApiGraphqlPlugin, runCedarBabelTransformsPlugin],
     outdir: cedarPaths.api.dist,
     // setting this to 'true' will generate an external sourcemap x.js.map
     // AND set the sourceMappingURL comment

package/dist/build/esbuild-plugin-api-graphql.d.ts

@@ -0,0 +1,6 @@
+import type { PluginBuild } from 'esbuild';
+export declare const cedarApiGraphqlPlugin: {
+    name: string;
+    setup(build: PluginBuild): void;
+};
+//# sourceMappingURL=esbuild-plugin-api-graphql.d.ts.map

package/dist/build/esbuild-plugin-api-graphql.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"esbuild-plugin-api-graphql.d.ts","sourceRoot":"","sources":["../../src/build/esbuild-plugin-api-graphql.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAc1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CAmDzB,CAAA"}

package/dist/build/esbuild-plugin-api-graphql.js

@@ -0,0 +1,44 @@
+import fs from "node:fs";
+import {
+  getApiSideBabelPlugins,
+  transformWithBabel
+} from "@cedarjs/babel-config";
+import { getConfig, projectSideIsEsm } from "@cedarjs/project-config";
+import {
+  applyGqlormInject,
+  applyGraphqlOptionsExtract
+} from "./api-graphql-transforms.js";
+import { applyHandlerAlsWrapping } from "./esbuild-plugin-handler-als-wrapping.js";
+const cedarApiGraphqlPlugin = {
+  name: "cedar-api-graphql",
+  setup(build) {
+    build.onLoad({ filter: /[/\\]graphql\.(ts|js)$/ }, async (args) => {
+      const cedarConfig = getConfig();
+      let fileContents = await fs.promises.readFile(args.path, "utf-8");
+      fileContents = applyGraphqlOptionsExtract(fileContents) ?? fileContents;
+      fileContents = applyGqlormInject(fileContents, args.path, ".js") ?? fileContents;
+      const transformedCode = await transformWithBabel(
+        fileContents,
+        args.path,
+        getApiSideBabelPlugins({
+          openTelemetry: cedarConfig.experimental.opentelemetry.enabled && cedarConfig.experimental.opentelemetry.wrapApi,
+          projectIsEsm: projectSideIsEsm("api")
+        })
+      );
+      if (!transformedCode?.code) {
+        throw new Error(`Could not transform file: ${args.path}`);
+      }
+      let code = transformedCode.code;
+      code = applyHandlerAlsWrapping(code, {
+        projectIsEsm: projectSideIsEsm("api")
+      }) ?? code;
+      return {
+        contents: code,
+        loader: "js"
+      };
+    });
+  }
+};
+export {
+  cedarApiGraphqlPlugin
+};

package/dist/build/esbuild-plugin-handler-als-wrapping.d.ts

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

package/dist/build/esbuild-plugin-handler-als-wrapping.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"esbuild-plugin-handler-als-wrapping.d.ts","sourceRoot":"","sources":["../../src/build/esbuild-plugin-handler-als-wrapping.ts"],"names":[],"mappings":"AAOA,wBAAgB,uBAAuB,CACrC,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 → esbuild-plugin-handler-als-wrapping.js}

@@ -1,4 +1,4 @@
-function applyContextWrapping(code, { projectIsEsm = false } = {}) {
+function applyHandlerAlsWrapping(code, { projectIsEsm = false } = {}) {
   const handlerRe = /^export\s+(?:const|let|var)\s+handler(?:[^=]|=>)*?=(?![>=])/m;
   const handlerMatch = handlerRe.exec(code);
   if (!handlerMatch) {
@@ -31,5 +31,5 @@ export const handler = ${isAsync ? "async " : ""}(__rw_event, __rw__context) =>
   return before + importStatement + renamed + wrappedHandler;
 }
 export {
-  applyContextWrapping
+  applyHandlerAlsWrapping
 };

package/dist/cjs/build/api-graphql-transforms.d.ts

@@ -0,0 +1,34 @@
+/**
+ * Extracts the options argument from createGraphQLHandler calls and stores
+ * them in an exported variable. Returns the transformed code, or null if no
+ * transformation was needed.
+ *
+ * Transforms:
+ *   export const handler = createGraphQLHandler({ options })
+ * into:
+ *   export const __cedar_graphqlOptions = { options }
+ *   export const handler = createGraphQLHandler(__cedar_graphqlOptions)
+ */
+export declare function applyGraphqlOptionsExtract(code: string): string | null;
+/**
+ * Injects the auto-generated gqlorm backend into graphql.ts at build time.
+ *
+ * When `experimental.gqlorm.enabled = true` and `.cedar/gqlorm/backend.ts`
+ * exists, this function:
+ *
+ * 1. Adds imports at the top of graphql.ts:
+ *      import * as __gqlorm_sdl__ from '../../../.cedar/gqlorm/backend'
+ *      import { db as __gqlorm_db__ } from 'src/lib/db'
+ *
+ * 2. Inserts a statement immediately before the `createGraphQLHandler` call:
+ *      Object.assign(sdls, {
+ *        __gqlorm__: {
+ *          schema: __gqlorm_sdl__.schema,
+ *          resolvers: __gqlorm_sdl__.createGqlormResolvers(__gqlorm_db__),
+ *        },
+ *      })
+ *
+ * Returns the transformed code, or null if no transformation was needed.
+ */
+export declare function applyGqlormInject(code: string, id: string, dbExt?: '.ts' | '.js'): string | null;
+//# sourceMappingURL=api-graphql-transforms.d.ts.map

package/dist/cjs/build/api-graphql-transforms.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"api-graphql-transforms.d.ts","sourceRoot":"","sources":["../../../src/build/api-graphql-transforms.ts"],"names":[],"mappings":"AAYA;;;;;;;;;;GAUG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA6FtE;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,KAAK,GAAE,KAAK,GAAG,KAAa,GAC3B,MAAM,GAAG,IAAI,CAmFf"}

package/dist/cjs/build/api-graphql-transforms.js

@@ -0,0 +1,150 @@
+"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 api_graphql_transforms_exports = {};
+__export(api_graphql_transforms_exports, {
+  applyGqlormInject: () => applyGqlormInject,
+  applyGraphqlOptionsExtract: () => applyGraphqlOptionsExtract
+});
+module.exports = __toCommonJS(api_graphql_transforms_exports);
+var import_node_fs = __toESM(require("node:fs"), 1);
+var import_node_path = __toESM(require("node:path"), 1);
+var import_oxc_parser = require("oxc-parser");
+var import_project_config = require("@cedarjs/project-config");
+function applyGraphqlOptionsExtract(code) {
+  if (code.includes("__cedar_graphqlOptions")) {
+    return null;
+  }
+  const { program } = (0, import_oxc_parser.parseSync)("graphql.ts", code, {
+    // lang is only a parse hint; 'ts' also parses JS (the graphql handler can
+    // be graphql.js in JS projects), so this is safe for both file types.
+    lang: "ts",
+    sourceType: "module"
+  });
+  const importNames = /* @__PURE__ */ new Set();
+  for (const node of program.body) {
+    if (node.type === "ImportDeclaration") {
+      if (node.source.value !== "@cedarjs/graphql-server") {
+        continue;
+      }
+      for (const specifier of node.specifiers) {
+        if (specifier.type === "ImportSpecifier" && specifier.imported.type === "Identifier" && specifier.imported.name === "createGraphQLHandler") {
+          importNames.add(specifier.local.name);
+        }
+      }
+    }
+  }
+  if (importNames.size === 0) {
+    return null;
+  }
+  const callExpressionPaths = [];
+  new import_oxc_parser.Visitor({
+    CallExpression(node) {
+      if (node.callee.type === "Identifier" && importNames.has(node.callee.name)) {
+        callExpressionPaths.push(node);
+      }
+    }
+  }).visit(program);
+  if (callExpressionPaths.length > 1) {
+    return null;
+  }
+  const callExpression = callExpressionPaths[0];
+  if (!callExpression) {
+    return null;
+  }
+  const options = callExpression.arguments[0];
+  if (!options) {
+    return null;
+  }
+  if (options.type !== "Identifier" && options.type !== "ObjectExpression" && options.type !== "CallExpression" && options.type !== "ConditionalExpression") {
+    return null;
+  }
+  const optionsStart = options.start;
+  const optionsEnd = options.end;
+  const lineStart = code.lastIndexOf("\n", callExpression.start) + 1;
+  const indentMatch = /^[ \t]*/.exec(code.slice(lineStart));
+  const indent = indentMatch ? indentMatch[0] : "";
+  const optionsConst = `${indent}export const __cedar_graphqlOptions = ${code.slice(
+    optionsStart,
+    optionsEnd
+  )}
+`;
+  const before = code.slice(0, lineStart);
+  const between = code.slice(lineStart, optionsStart);
+  const after = code.slice(optionsEnd);
+  return before + optionsConst + between + "__cedar_graphqlOptions" + after;
+}
+function applyGqlormInject(code, id, dbExt = ".ts") {
+  if (code.includes("__gqlorm_sdl__")) {
+    return null;
+  }
+  if (!code.includes("createGraphQLHandler")) {
+    return null;
+  }
+  if (!(0, import_project_config.getConfig)().experimental?.gqlorm?.enabled) {
+    return null;
+  }
+  const backendPathWithoutExt = import_node_path.default.join(
+    (0, import_project_config.getPaths)().generated.base,
+    "gqlorm",
+    "backend"
+  );
+  if (!import_node_fs.default.existsSync(backendPathWithoutExt + ".ts")) {
+    return null;
+  }
+  const handlerPattern = /^export\s+const\s+(\w+)\s*=\s*createGraphQLHandler\s*\(/m;
+  const handlerMatch = handlerPattern.exec(code);
+  if (!handlerMatch) {
+    return null;
+  }
+  const handlerLineStart = code.lastIndexOf("\n", handlerMatch.index) + 1;
+  const relPath = (0, import_project_config.importStatementPath)(
+    import_node_path.default.relative(import_node_path.default.dirname(id), backendPathWithoutExt)
+  ) + ".ts";
+  const dbSrcPath = import_node_path.default.join((0, import_project_config.getPaths)().api.src, "lib", "db");
+  const relDbPath = (0, import_project_config.importStatementPath)(import_node_path.default.relative(import_node_path.default.dirname(id), dbSrcPath)) + dbExt;
+  const importDb = `import { db as __gqlorm_db__ } from '${relDbPath}'`;
+  const importSdl = `import * as __gqlorm_sdl__ from '${relPath}'`;
+  const importsToAdd = `${importDb}
+${importSdl}
+`;
+  const sdlsMutation = `Object.assign(sdls, {
+    __gqlorm__: {
+      schema: __gqlorm_sdl__.schema,
+      resolvers: __gqlorm_sdl__.createGqlormResolvers(__gqlorm_db__),
+    },
+  })
+  `;
+  const transformed = importsToAdd + code.slice(0, handlerLineStart) + sdlsMutation + code.slice(handlerLineStart);
+  return transformed;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  applyGqlormInject,
+  applyGraphqlOptionsExtract
+});

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;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"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/build/api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,YAAY,EAAe,MAAM,SAAS,CAAA;AAsBtE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AA8HD,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,7 +42,9 @@ 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");
+var import_api_graphql_transforms = require("./api-graphql-transforms.js");
+var import_esbuild_plugin_api_graphql = require("./esbuild-plugin-api-graphql.js");
+var import_esbuild_plugin_handler_als_wrapping = require("./esbuild-plugin-handler-als-wrapping.js");
 let BUILD_CTX = null;
 const buildApi = async () => {
   BUILD_CTX?.dispose();
@@ -78,12 +80,16 @@ 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;
+        let code = transformedCode.code;
+        const normalizedPath = (0, import_vite.normalizePath)(args.path);
+        const cedarPaths = (0, import_project_config.getPaths)();
+        const isEsm = (0, import_project_config.projectSideIsEsm)("api");
+        const functionsDir = (0, import_vite.normalizePath)(cedarPaths.api.functions);
+        if (normalizedPath.startsWith(functionsDir + "/")) {
+          code = (0, import_esbuild_plugin_handler_als_wrapping.applyHandlerAlsWrapping)(code, {
+            projectIsEsm: isEsm
+          }) ?? code;
+        }
         return {
           contents: code,
           loader: "js"
@@ -110,8 +116,14 @@ function createCedarViteApiPlugin() {
       if (!(0, import_vite.normalizePath)(id).startsWith((0, import_vite.normalizePath)(cedarPaths.api.base))) {
         return null;
       }
+      let sourceCode = code;
+      const normalizedId = (0, import_vite.normalizePath)(id);
+      if (normalizedId.endsWith("/graphql.ts") || normalizedId.endsWith("/graphql.js")) {
+        sourceCode = (0, import_api_graphql_transforms.applyGraphqlOptionsExtract)(sourceCode) ?? sourceCode;
+        sourceCode = (0, import_api_graphql_transforms.applyGqlormInject)(sourceCode, id) ?? sourceCode;
+      }
       const transformedCode = await (0, import_babel_config.transformWithBabel)(
-        code,
+        sourceCode,
         id,
         (0, import_babel_config.getApiSideBabelPlugins)({
           openTelemetry: cedarConfig.experimental.opentelemetry.enabled && cedarConfig.experimental.opentelemetry.wrapApi,
@@ -120,12 +132,13 @@ 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;
+        let code2 = transformedCode.code;
+        const functionsDir = (0, import_vite.normalizePath)(cedarPaths.api.functions);
+        if (normalizedId.startsWith(functionsDir + "/")) {
+          code2 = (0, import_esbuild_plugin_handler_als_wrapping.applyHandlerAlsWrapping)(code2, {
+            projectIsEsm: isEsm
+          }) ?? code2;
+        }
         return {
           code: code2,
           map: transformedCode.map ?? null
@@ -233,7 +246,10 @@ function getEsbuildOptions(files) {
     format,
     allowOverwrite: true,
     bundle: false,
-    plugins: [runCedarBabelTransformsPlugin],
+    // Registration order matters: cedarApiGraphqlPlugin (narrow filter) must
+    // come first so it claims graphql.ts before runCedarBabelTransformsPlugin
+    // (broad filter) can. See the NOTE on cedarApiGraphqlPlugin.
+    plugins: [import_esbuild_plugin_api_graphql.cedarApiGraphqlPlugin, runCedarBabelTransformsPlugin],
     outdir: cedarPaths.api.dist,
     // setting this to 'true' will generate an external sourcemap x.js.map
     // AND set the sourceMappingURL comment

package/dist/cjs/build/esbuild-plugin-api-graphql.d.ts

@@ -0,0 +1,6 @@
+import type { PluginBuild } from 'esbuild';
+export declare const cedarApiGraphqlPlugin: {
+    name: string;
+    setup(build: PluginBuild): void;
+};
+//# sourceMappingURL=esbuild-plugin-api-graphql.d.ts.map

package/dist/cjs/build/esbuild-plugin-api-graphql.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"esbuild-plugin-api-graphql.d.ts","sourceRoot":"","sources":["../../../src/build/esbuild-plugin-api-graphql.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAc1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CAmDzB,CAAA"}

package/dist/cjs/build/esbuild-plugin-api-graphql.js

@@ -0,0 +1,72 @@
+"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 esbuild_plugin_api_graphql_exports = {};
+__export(esbuild_plugin_api_graphql_exports, {
+  cedarApiGraphqlPlugin: () => cedarApiGraphqlPlugin
+});
+module.exports = __toCommonJS(esbuild_plugin_api_graphql_exports);
+var import_node_fs = __toESM(require("node:fs"), 1);
+var import_babel_config = require("@cedarjs/babel-config");
+var import_project_config = require("@cedarjs/project-config");
+var import_api_graphql_transforms = require("./api-graphql-transforms.js");
+var import_esbuild_plugin_handler_als_wrapping = require("./esbuild-plugin-handler-als-wrapping.js");
+const cedarApiGraphqlPlugin = {
+  name: "cedar-api-graphql",
+  setup(build) {
+    build.onLoad({ filter: /[/\\]graphql\.(ts|js)$/ }, async (args) => {
+      const cedarConfig = (0, import_project_config.getConfig)();
+      let fileContents = await import_node_fs.default.promises.readFile(args.path, "utf-8");
+      fileContents = (0, import_api_graphql_transforms.applyGraphqlOptionsExtract)(fileContents) ?? fileContents;
+      fileContents = (0, import_api_graphql_transforms.applyGqlormInject)(fileContents, args.path, ".js") ?? fileContents;
+      const transformedCode = await (0, import_babel_config.transformWithBabel)(
+        fileContents,
+        args.path,
+        (0, import_babel_config.getApiSideBabelPlugins)({
+          openTelemetry: cedarConfig.experimental.opentelemetry.enabled && cedarConfig.experimental.opentelemetry.wrapApi,
+          projectIsEsm: (0, import_project_config.projectSideIsEsm)("api")
+        })
+      );
+      if (!transformedCode?.code) {
+        throw new Error(`Could not transform file: ${args.path}`);
+      }
+      let code = transformedCode.code;
+      code = (0, import_esbuild_plugin_handler_als_wrapping.applyHandlerAlsWrapping)(code, {
+        projectIsEsm: (0, import_project_config.projectSideIsEsm)("api")
+      }) ?? code;
+      return {
+        contents: code,
+        loader: "js"
+      };
+    });
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  cedarApiGraphqlPlugin
+});

package/dist/cjs/build/esbuild-plugin-handler-als-wrapping.d.ts

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

package/dist/cjs/build/esbuild-plugin-handler-als-wrapping.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"esbuild-plugin-handler-als-wrapping.d.ts","sourceRoot":"","sources":["../../../src/build/esbuild-plugin-handler-als-wrapping.ts"],"names":[],"mappings":"AAOA,wBAAgB,uBAAuB,CACrC,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 → esbuild-plugin-handler-als-wrapping.js}

@@ -16,12 +16,12 @@ var __copyProps = (to, from, except, desc) => {
   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
+var esbuild_plugin_handler_als_wrapping_exports = {};
+__export(esbuild_plugin_handler_als_wrapping_exports, {
+  applyHandlerAlsWrapping: () => applyHandlerAlsWrapping
 });
-module.exports = __toCommonJS(esbuild_plugin_cedar_context_wrapping_exports);
-function applyContextWrapping(code, { projectIsEsm = false } = {}) {
+module.exports = __toCommonJS(esbuild_plugin_handler_als_wrapping_exports);
+function applyHandlerAlsWrapping(code, { projectIsEsm = false } = {}) {
   const handlerRe = /^export\s+(?:const|let|var)\s+handler(?:[^=]|=>)*?=(?![>=])/m;
   const handlerMatch = handlerRe.exec(code);
   if (!handlerMatch) {
@@ -55,5 +55,5 @@ export const handler = ${isAsync ? "async " : ""}(__rw_event, __rw__context) =>
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  applyContextWrapping
+  applyHandlerAlsWrapping
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/internal",
-  "version": "5.0.0",
+  "version": "6.0.0-canary.2615",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -110,6 +110,16 @@
         "default": "./dist/cjs/build/api.js"
       }
     },
+    "./dist/build/api-graphql-transforms.js": {
+      "import": {
+        "types": "./dist/build/api-graphql-transforms.d.ts",
+        "default": "./dist/build/api-graphql-transforms.js"
+      },
+      "require": {
+        "types": "./dist/cjs/build/api-graphql-transforms.d.ts",
+        "default": "./dist/cjs/build/api-graphql-transforms.js"
+      }
+    },
     "./dist/generate/generate": {
       "import": {
         "types": "./dist/generate/generate.d.ts",
@@ -159,13 +169,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",
-    "@cedarjs/cli-helpers": "5.0.0",
-    "@cedarjs/graphql-server": "5.0.0",
-    "@cedarjs/project-config": "5.0.0",
-    "@cedarjs/router": "5.0.0",
-    "@cedarjs/structure": "5.0.0",
-    "@cedarjs/utils": "5.0.0",
+    "@cedarjs/babel-config": "6.0.0-canary.2615",
+    "@cedarjs/cli-helpers": "6.0.0-canary.2615",
+    "@cedarjs/graphql-server": "6.0.0-canary.2615",
+    "@cedarjs/project-config": "6.0.0-canary.2615",
+    "@cedarjs/router": "6.0.0-canary.2615",
+    "@cedarjs/structure": "6.0.0-canary.2615",
+    "@cedarjs/utils": "6.0.0-canary.2615",
     "@graphql-codegen/add": "6.0.1",
     "@graphql-codegen/cli": "6.3.1",
     "@graphql-codegen/client-preset": "5.3.0",
@@ -194,6 +204,7 @@
     "fast-glob": "3.3.3",
     "graphql": "16.14.2",
     "kill-port": "1.6.1",
+    "oxc-parser": "0.137.0",
     "prettier": "3.8.4",
     "rimraf": "6.1.3",
     "source-map": "0.7.6",
@@ -206,10 +217,11 @@
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.4",
-    "@cedarjs/framework-tools": "5.0.0",
+    "@cedarjs/framework-tools": "6.0.0-canary.2615",
     "concurrently": "9.2.1",
     "graphql-tag": "2.12.6",
     "publint": "0.3.21",
+    "ts-dedent": "2.3.0",
     "vitest": "3.2.6"
   },
   "engines": {

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

@@ -1,4 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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.d.ts

@@ -1,4 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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"}