@cedarjs/internal 6.0.0-canary.2626 → 6.0.0-canary.2628

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;AAwBtE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AAqJD,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;AAyBtE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AA0JD,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

@@ -12,6 +12,7 @@ import {
   applyGqlormInject,
   applyGraphqlOptionsExtract
 } from "./api-graphql-transforms.js";
+import { applyAutoImports } from "./auto-import.js";
 import { cedarApiGraphqlPlugin } from "./esbuild-plugin-api-graphql.js";
 import { applyOtelWrapping } from "./esbuild-plugin-cedar-otel-wrapping.js";
 import { applyHandlerAlsWrapping } from "./esbuild-plugin-handler-als-wrapping.js";
@@ -47,10 +48,12 @@ const runCedarBabelTransformsPlugin = {
           path.relative(build2.initialOptions.absWorkingDir + "/src", args.path)
         )
       );
+      fileContents = applyAutoImports(fileContents);
       const transformedCode = await transformWithBabel(
         fileContents,
         args.path,
         getApiSideBabelPlugins({
+          forVite: true,
           projectIsEsm: projectSideIsEsm("api")
         })
       );
@@ -100,6 +103,7 @@ function createCedarViteApiPlugin() {
         sourceCode,
         path.dirname(path.relative(cedarPaths.api.src, id))
       );
+      sourceCode = applyAutoImports(sourceCode);
       if (normalizedId.endsWith("/graphql.ts") || normalizedId.endsWith("/graphql.js")) {
         sourceCode = applyGraphqlOptionsExtract(sourceCode) ?? sourceCode;
         sourceCode = applyGqlormInject(sourceCode, id) ?? sourceCode;
@@ -108,6 +112,7 @@ function createCedarViteApiPlugin() {
         sourceCode,
         id,
         getApiSideBabelPlugins({
+          forVite: true,
           projectIsEsm: isEsm
         }),
         true

package/dist/build/auto-import.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Injects imports for `gql` and `context` into API source files that reference
+ * them without importing them. Uses an oxc-parser AST walk to check bindings,
+ * so local declarations never receive a conflicting import.
+ *
+ * This replaces `babel-plugin-auto-import` for the esbuild API build path,
+ * matching the behavior of `cedarAutoImportsPlugin` in Vite builds.
+ */
+export declare function applyAutoImports(code: string): string;
+//# sourceMappingURL=auto-import.d.ts.map

package/dist/build/auto-import.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auto-import.d.ts","sourceRoot":"","sources":["../../src/build/auto-import.ts"],"names":[],"mappings":"AAGA;;;;;;;GAOG;AAEH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAoBrD"}

package/dist/build/auto-import.js

@@ -0,0 +1,120 @@
+import { parseSync, Visitor } from "oxc-parser";
+function applyAutoImports(code) {
+  const result = parseSync("temp.ts", code, {
+    lang: "ts",
+    sourceType: "module"
+  });
+  const needsGql = checkNeeds("gql", result.program, code);
+  const needsContext = checkNeeds("context", result.program, code);
+  let resultCode = code;
+  if (needsGql) {
+    resultCode = "import gql from 'graphql-tag'\n" + resultCode;
+  }
+  if (needsContext) {
+    resultCode = "import { context } from '@cedarjs/context'\n" + resultCode;
+  }
+  return resultCode;
+}
+function bindingInDeclarators(name, declarations) {
+  for (const decl of declarations) {
+    if (bindingPatternContains(decl.id, name)) {
+      return true;
+    }
+  }
+  return false;
+}
+function bindingPatternContains(pattern, name) {
+  if (pattern.type === "Identifier") {
+    return pattern.name === name;
+  }
+  if (pattern.type === "ObjectPattern") {
+    for (const prop of pattern.properties) {
+      if (prop.type === "RestElement") {
+        if (bindingPatternContains(prop.argument, name)) {
+          return true;
+        }
+      } else {
+        if (bindingPatternContains(prop.value, name)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+  if (pattern.type === "ArrayPattern") {
+    for (const el of pattern.elements) {
+      if (el) {
+        if (el.type === "RestElement") {
+          if (bindingPatternContains(el.argument, name)) {
+            return true;
+          }
+        } else if (bindingPatternContains(el, name)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+  if (pattern.type === "AssignmentPattern") {
+    return bindingPatternContains(pattern.left, name);
+  }
+  return false;
+}
+function checkNeeds(name, program, code) {
+  if (!code.includes(name)) {
+    return false;
+  }
+  let isBound = false;
+  let hasUsage = false;
+  for (const node of program.body) {
+    if (node.type === "ImportDeclaration") {
+      for (const specifier of node.specifiers) {
+        if (specifier.type === "ImportSpecifier") {
+          if (specifier.imported.type === "Identifier" && specifier.imported.name === name || specifier.local.name === name) {
+            isBound = true;
+            break;
+          }
+        } else if (specifier.type === "ImportDefaultSpecifier") {
+          if (specifier.local.name === name) {
+            isBound = true;
+            break;
+          }
+        } else if (specifier.type === "ImportNamespaceSpecifier") {
+          if (specifier.local.name === name) {
+            isBound = true;
+            break;
+          }
+        }
+      }
+    }
+    if (node.type === "VariableDeclaration") {
+      if (bindingInDeclarators(name, node.declarations)) {
+        isBound = true;
+      }
+    }
+    if (node.type === "FunctionDeclaration" && node.id?.name === name) {
+      isBound = true;
+    }
+    if (node.type === "ExportNamedDeclaration" && node.declaration) {
+      if (node.declaration.type === "VariableDeclaration") {
+        if (bindingInDeclarators(name, node.declaration.declarations)) {
+          isBound = true;
+        }
+      }
+    }
+  }
+  if (isBound) {
+    return false;
+  }
+  new Visitor({
+    Identifier(node) {
+      if (node.name === name) {
+        hasUsage = true;
+      }
+    }
+  }).visit(program);
+  return hasUsage;
+}
+export {
+  applyAutoImports
+};

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

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

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

@@ -9,6 +9,7 @@ import {
   applyGqlormInject,
   applyGraphqlOptionsExtract
 } from "./api-graphql-transforms.js";
+import { applyAutoImports } from "./auto-import.js";
 import { applyOtelWrapping } from "./esbuild-plugin-cedar-otel-wrapping.js";
 import { applyHandlerAlsWrapping } from "./esbuild-plugin-handler-als-wrapping.js";
 import { applySrcAlias } from "./src-alias.js";
@@ -26,10 +27,12 @@ const cedarApiGraphqlPlugin = {
       );
       fileContents = applyGraphqlOptionsExtract(fileContents) ?? fileContents;
       fileContents = applyGqlormInject(fileContents, args.path, ".js") ?? fileContents;
+      fileContents = applyAutoImports(fileContents);
       const transformedCode = await transformWithBabel(
         fileContents,
         args.path,
         getApiSideBabelPlugins({
+          forVite: true,
           projectIsEsm: projectSideIsEsm("api")
         })
       );

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;AAwBtE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AAqJD,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;AAyBtE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AA0JD,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

@@ -43,6 +43,7 @@ var import_babel_config = require("@cedarjs/babel-config");
 var import_project_config = require("@cedarjs/project-config");
 var import_files = require("../files.js");
 var import_api_graphql_transforms = require("./api-graphql-transforms.js");
+var import_auto_import = require("./auto-import.js");
 var import_esbuild_plugin_api_graphql = require("./esbuild-plugin-api-graphql.js");
 var import_esbuild_plugin_cedar_otel_wrapping = require("./esbuild-plugin-cedar-otel-wrapping.js");
 var import_esbuild_plugin_handler_als_wrapping = require("./esbuild-plugin-handler-als-wrapping.js");
@@ -78,10 +79,12 @@ const runCedarBabelTransformsPlugin = {
           import_node_path.default.relative(build2.initialOptions.absWorkingDir + "/src", args.path)
         )
       );
+      fileContents = (0, import_auto_import.applyAutoImports)(fileContents);
       const transformedCode = await (0, import_babel_config.transformWithBabel)(
         fileContents,
         args.path,
         (0, import_babel_config.getApiSideBabelPlugins)({
+          forVite: true,
           projectIsEsm: (0, import_project_config.projectSideIsEsm)("api")
         })
       );
@@ -131,6 +134,7 @@ function createCedarViteApiPlugin() {
         sourceCode,
         import_node_path.default.dirname(import_node_path.default.relative(cedarPaths.api.src, id))
       );
+      sourceCode = (0, import_auto_import.applyAutoImports)(sourceCode);
       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;
@@ -139,6 +143,7 @@ function createCedarViteApiPlugin() {
         sourceCode,
         id,
         (0, import_babel_config.getApiSideBabelPlugins)({
+          forVite: true,
           projectIsEsm: isEsm
         }),
         true

package/dist/cjs/build/auto-import.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Injects imports for `gql` and `context` into API source files that reference
+ * them without importing them. Uses an oxc-parser AST walk to check bindings,
+ * so local declarations never receive a conflicting import.
+ *
+ * This replaces `babel-plugin-auto-import` for the esbuild API build path,
+ * matching the behavior of `cedarAutoImportsPlugin` in Vite builds.
+ */
+export declare function applyAutoImports(code: string): string;
+//# sourceMappingURL=auto-import.d.ts.map

package/dist/cjs/build/auto-import.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auto-import.d.ts","sourceRoot":"","sources":["../../../src/build/auto-import.ts"],"names":[],"mappings":"AAGA;;;;;;;GAOG;AAEH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAoBrD"}

package/dist/cjs/build/auto-import.js

@@ -0,0 +1,144 @@
+"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 auto_import_exports = {};
+__export(auto_import_exports, {
+  applyAutoImports: () => applyAutoImports
+});
+module.exports = __toCommonJS(auto_import_exports);
+var import_oxc_parser = require("oxc-parser");
+function applyAutoImports(code) {
+  const result = (0, import_oxc_parser.parseSync)("temp.ts", code, {
+    lang: "ts",
+    sourceType: "module"
+  });
+  const needsGql = checkNeeds("gql", result.program, code);
+  const needsContext = checkNeeds("context", result.program, code);
+  let resultCode = code;
+  if (needsGql) {
+    resultCode = "import gql from 'graphql-tag'\n" + resultCode;
+  }
+  if (needsContext) {
+    resultCode = "import { context } from '@cedarjs/context'\n" + resultCode;
+  }
+  return resultCode;
+}
+function bindingInDeclarators(name, declarations) {
+  for (const decl of declarations) {
+    if (bindingPatternContains(decl.id, name)) {
+      return true;
+    }
+  }
+  return false;
+}
+function bindingPatternContains(pattern, name) {
+  if (pattern.type === "Identifier") {
+    return pattern.name === name;
+  }
+  if (pattern.type === "ObjectPattern") {
+    for (const prop of pattern.properties) {
+      if (prop.type === "RestElement") {
+        if (bindingPatternContains(prop.argument, name)) {
+          return true;
+        }
+      } else {
+        if (bindingPatternContains(prop.value, name)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+  if (pattern.type === "ArrayPattern") {
+    for (const el of pattern.elements) {
+      if (el) {
+        if (el.type === "RestElement") {
+          if (bindingPatternContains(el.argument, name)) {
+            return true;
+          }
+        } else if (bindingPatternContains(el, name)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+  if (pattern.type === "AssignmentPattern") {
+    return bindingPatternContains(pattern.left, name);
+  }
+  return false;
+}
+function checkNeeds(name, program, code) {
+  if (!code.includes(name)) {
+    return false;
+  }
+  let isBound = false;
+  let hasUsage = false;
+  for (const node of program.body) {
+    if (node.type === "ImportDeclaration") {
+      for (const specifier of node.specifiers) {
+        if (specifier.type === "ImportSpecifier") {
+          if (specifier.imported.type === "Identifier" && specifier.imported.name === name || specifier.local.name === name) {
+            isBound = true;
+            break;
+          }
+        } else if (specifier.type === "ImportDefaultSpecifier") {
+          if (specifier.local.name === name) {
+            isBound = true;
+            break;
+          }
+        } else if (specifier.type === "ImportNamespaceSpecifier") {
+          if (specifier.local.name === name) {
+            isBound = true;
+            break;
+          }
+        }
+      }
+    }
+    if (node.type === "VariableDeclaration") {
+      if (bindingInDeclarators(name, node.declarations)) {
+        isBound = true;
+      }
+    }
+    if (node.type === "FunctionDeclaration" && node.id?.name === name) {
+      isBound = true;
+    }
+    if (node.type === "ExportNamedDeclaration" && node.declaration) {
+      if (node.declaration.type === "VariableDeclaration") {
+        if (bindingInDeclarators(name, node.declaration.declarations)) {
+          isBound = true;
+        }
+      }
+    }
+  }
+  if (isBound) {
+    return false;
+  }
+  new import_oxc_parser.Visitor({
+    Identifier(node) {
+      if (node.name === name) {
+        hasUsage = true;
+      }
+    }
+  }).visit(program);
+  return hasUsage;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  applyAutoImports
+});

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

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

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

@@ -36,6 +36,7 @@ var import_node_path = __toESM(require("node:path"), 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_auto_import = require("./auto-import.js");
 var import_esbuild_plugin_cedar_otel_wrapping = require("./esbuild-plugin-cedar-otel-wrapping.js");
 var import_esbuild_plugin_handler_als_wrapping = require("./esbuild-plugin-handler-als-wrapping.js");
 var import_src_alias = require("./src-alias.js");
@@ -53,10 +54,12 @@ const cedarApiGraphqlPlugin = {
       );
       fileContents = (0, import_api_graphql_transforms.applyGraphqlOptionsExtract)(fileContents) ?? fileContents;
       fileContents = (0, import_api_graphql_transforms.applyGqlormInject)(fileContents, args.path, ".js") ?? fileContents;
+      fileContents = (0, import_auto_import.applyAutoImports)(fileContents);
       const transformedCode = await (0, import_babel_config.transformWithBabel)(
         fileContents,
         args.path,
         (0, import_babel_config.getApiSideBabelPlugins)({
+          forVite: true,
           projectIsEsm: (0, import_project_config.projectSideIsEsm)("api")
         })
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/internal",
-  "version": "6.0.0-canary.2626",
+  "version": "6.0.0-canary.2628",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -169,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": "6.0.0-canary.2626",
-    "@cedarjs/cli-helpers": "6.0.0-canary.2626",
-    "@cedarjs/graphql-server": "6.0.0-canary.2626",
-    "@cedarjs/project-config": "6.0.0-canary.2626",
-    "@cedarjs/router": "6.0.0-canary.2626",
-    "@cedarjs/structure": "6.0.0-canary.2626",
-    "@cedarjs/utils": "6.0.0-canary.2626",
+    "@cedarjs/babel-config": "6.0.0-canary.2628",
+    "@cedarjs/cli-helpers": "6.0.0-canary.2628",
+    "@cedarjs/graphql-server": "6.0.0-canary.2628",
+    "@cedarjs/project-config": "6.0.0-canary.2628",
+    "@cedarjs/router": "6.0.0-canary.2628",
+    "@cedarjs/structure": "6.0.0-canary.2628",
+    "@cedarjs/utils": "6.0.0-canary.2628",
     "@graphql-codegen/add": "6.0.1",
     "@graphql-codegen/cli": "6.3.1",
     "@graphql-codegen/client-preset": "5.3.0",
@@ -217,7 +217,7 @@
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.4",
-    "@cedarjs/framework-tools": "6.0.0-canary.2626",
+    "@cedarjs/framework-tools": "6.0.0-canary.2628",
     "concurrently": "9.2.1",
     "graphql-tag": "2.12.6",
     "publint": "0.3.21",