@cedarjs/internal 6.0.0-canary.2641 → 6.0.0-canary.2644

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;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"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/build/api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,YAAY,EAAe,MAAM,SAAS,CAAA;AA0BtE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AAkMD,eAAO,MAAM,gBAAgB,iHAyD5B,CAAA;AAcD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAoDf"}

package/dist/build/api.js

@@ -16,6 +16,7 @@ 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";
+import { applyImportDir } from "./import-dir.js";
 import { applySrcAlias } from "./src-alias.js";
 let BUILD_CTX = null;
 const buildApi = async () => {
@@ -49,6 +50,7 @@ const runCedarBabelTransformsPlugin = {
         )
       );
       fileContents = applyAutoImports(fileContents);
+      fileContents = applyImportDir(fileContents, args.path)?.code ?? fileContents;
       const transformedCode = await transformWithBabel(
         fileContents,
         args.path,
@@ -80,6 +82,25 @@ const runCedarBabelTransformsPlugin = {
     });
   }
 };
+function createImportDirVitePlugin() {
+  return {
+    name: "cedar-internal-import-dir",
+    enforce: "pre",
+    transform(code, id) {
+      if (!/\.(js|ts|tsx|jsx)$/.test(id)) {
+        return null;
+      }
+      if (id.includes("node_modules")) {
+        return null;
+      }
+      const result = applyImportDir(code, id);
+      if (!result) {
+        return null;
+      }
+      return { code: result.code, map: result.map };
+    }
+  };
+}
 function createCedarViteApiPlugin() {
   const cedarConfig = getConfig();
   const isEsm = projectSideIsEsm("api");
@@ -177,7 +198,11 @@ const buildApiWithVite = async () => {
         }
       }
     },
-    plugins: [createCedarViteApiPlugin()]
+    // cedarImportDirPlugin must run before the Babel transform so glob imports
+    // are expanded before Babel sees the code.  The Babel import-dir plugin is
+    // disabled for forVite:true builds; this inline Vite plugin is its
+    // replacement for this code path (both CJS and ESM output via Rollup).
+    plugins: [createImportDirVitePlugin(), createCedarViteApiPlugin()]
   });
 };
 const transpileApi = async (files) => {

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;AAiB1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CAsEzB,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;AAkB1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CA4EzB,CAAA"}

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

@@ -12,6 +12,7 @@ import {
 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 { applyImportDir } from "./import-dir.js";
 import { applySrcAlias } from "./src-alias.js";
 const cedarApiGraphqlPlugin = {
   name: "cedar-api-graphql",
@@ -28,6 +29,7 @@ const cedarApiGraphqlPlugin = {
       fileContents = applyGraphqlOptionsExtract(fileContents) ?? fileContents;
       fileContents = applyGqlormInject(fileContents, args.path, ".js") ?? fileContents;
       fileContents = applyAutoImports(fileContents);
+      fileContents = applyImportDir(fileContents, args.path)?.code ?? fileContents;
       const transformedCode = await transformWithBabel(
         fileContents,
         args.path,

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

@@ -0,0 +1,22 @@
+import type { SourceMap } from 'magic-string';
+/**
+ * Expands glob directory imports such as:
+ *   import services from 'src/services/**\/*.{js,ts}'
+ * into individual namespace imports:
+ *   let services = {}
+ *   import * as services_a from 'src/services/a'
+ *   services.a = services_a
+ *
+ * This is the esbuild-path equivalent of:
+ *   - babel-plugin-redwood-import-dir  (kept for Jest / console / data-migrate)
+ *   - cedarImportDirPlugin             (Vite plugin, for Vite build paths)
+ *
+ * Code duplication between the two non-Babel plugins is intentional.
+ *
+ * Returns the transformed source code, or null if no glob imports were found.
+ */
+export declare function applyImportDir(code: string, filePath: string): {
+    code: string;
+    map?: SourceMap;
+} | null;
+//# sourceMappingURL=import-dir.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"import-dir.d.ts","sourceRoot":"","sources":["../../src/build/import-dir.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAI7C;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,SAAS,CAAA;CAAE,GAAG,IAAI,CAyE1C"}

package/dist/build/import-dir.js

@@ -0,0 +1,54 @@
+import fs from "node:fs";
+import path from "node:path";
+import MagicString from "magic-string";
+import { getPaths, importStatementPath } from "@cedarjs/project-config";
+function applyImportDir(code, filePath) {
+  if (!code.includes("**")) {
+    return null;
+  }
+  const GLOB_IMPORT_RE = /^import\s+(\w+)\s+from\s+['"]([^'"]+)['"]\s*;?/gm;
+  const s = new MagicString(code);
+  let hasTransformations = false;
+  for (const match of code.matchAll(GLOB_IMPORT_RE)) {
+    const importName = match[1];
+    const sourceValue = match[2];
+    if (!sourceValue.includes("**")) {
+      continue;
+    }
+    const importGlob = importStatementPath(sourceValue);
+    const cwd = importGlob.startsWith("src/") ? getPaths().api.base : path.dirname(filePath);
+    let dirFiles;
+    try {
+      dirFiles = fs.globSync(importGlob, {
+        cwd,
+        exclude: (n) => n.includes(".test.") || n.includes(".scenarios.") || n.includes(".d.ts")
+      });
+    } catch {
+      continue;
+    }
+    const staticGlob = importGlob.split("*")[0];
+    const filePathToVarName = (fp) => fp.replace(staticGlob, "").replace(/\.(js|ts)$/, "").replace(/[^a-zA-Z0-9]/g, "_");
+    hasTransformations = true;
+    let replacement = `let ${importName} = {};
+`;
+    for (const fp of dirFiles) {
+      const { dir: fileDir, name: fileName } = path.parse(fp);
+      const normalizedDir = importStatementPath(fileDir);
+      const varName = filePathToVarName(fp);
+      const nsImport = `${importName}_${varName}`;
+      replacement += `import * as ${nsImport} from '${normalizedDir}/${fileName}';
+`;
+      replacement += `${importName}.${varName} = ${nsImport};
+`;
+    }
+    s.overwrite(
+      match.index,
+      match.index + match[0].length,
+      replacement.trimEnd()
+    );
+  }
+  return hasTransformations ? { code: s.toString(), map: s.generateMap({ hires: true }) } : null;
+}
+export {
+  applyImportDir
+};

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;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"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/build/api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,YAAY,EAAe,MAAM,SAAS,CAAA;AA0BtE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AAkMD,eAAO,MAAM,gBAAgB,iHAyD5B,CAAA;AAcD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAoDf"}

package/dist/cjs/build/api.js

@@ -47,6 +47,7 @@ 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");
+var import_import_dir = require("./import-dir.js");
 var import_src_alias = require("./src-alias.js");
 let BUILD_CTX = null;
 const buildApi = async () => {
@@ -80,6 +81,7 @@ const runCedarBabelTransformsPlugin = {
         )
       );
       fileContents = (0, import_auto_import.applyAutoImports)(fileContents);
+      fileContents = (0, import_import_dir.applyImportDir)(fileContents, args.path)?.code ?? fileContents;
       const transformedCode = await (0, import_babel_config.transformWithBabel)(
         fileContents,
         args.path,
@@ -111,6 +113,25 @@ const runCedarBabelTransformsPlugin = {
     });
   }
 };
+function createImportDirVitePlugin() {
+  return {
+    name: "cedar-internal-import-dir",
+    enforce: "pre",
+    transform(code, id) {
+      if (!/\.(js|ts|tsx|jsx)$/.test(id)) {
+        return null;
+      }
+      if (id.includes("node_modules")) {
+        return null;
+      }
+      const result = (0, import_import_dir.applyImportDir)(code, id);
+      if (!result) {
+        return null;
+      }
+      return { code: result.code, map: result.map };
+    }
+  };
+}
 function createCedarViteApiPlugin() {
   const cedarConfig = (0, import_project_config.getConfig)();
   const isEsm = (0, import_project_config.projectSideIsEsm)("api");
@@ -208,7 +229,11 @@ const buildApiWithVite = async () => {
         }
       }
     },
-    plugins: [createCedarViteApiPlugin()]
+    // cedarImportDirPlugin must run before the Babel transform so glob imports
+    // are expanded before Babel sees the code.  The Babel import-dir plugin is
+    // disabled for forVite:true builds; this inline Vite plugin is its
+    // replacement for this code path (both CJS and ESM output via Rollup).
+    plugins: [createImportDirVitePlugin(), createCedarViteApiPlugin()]
   });
 };
 const transpileApi = async (files) => {

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;AAiB1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CAsEzB,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;AAkB1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CA4EzB,CAAA"}

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

@@ -39,6 +39,7 @@ 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_import_dir = require("./import-dir.js");
 var import_src_alias = require("./src-alias.js");
 const cedarApiGraphqlPlugin = {
   name: "cedar-api-graphql",
@@ -55,6 +56,7 @@ 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);
+      fileContents = (0, import_import_dir.applyImportDir)(fileContents, args.path)?.code ?? fileContents;
       const transformedCode = await (0, import_babel_config.transformWithBabel)(
         fileContents,
         args.path,

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

@@ -0,0 +1,22 @@
+import type { SourceMap } from 'magic-string';
+/**
+ * Expands glob directory imports such as:
+ *   import services from 'src/services/**\/*.{js,ts}'
+ * into individual namespace imports:
+ *   let services = {}
+ *   import * as services_a from 'src/services/a'
+ *   services.a = services_a
+ *
+ * This is the esbuild-path equivalent of:
+ *   - babel-plugin-redwood-import-dir  (kept for Jest / console / data-migrate)
+ *   - cedarImportDirPlugin             (Vite plugin, for Vite build paths)
+ *
+ * Code duplication between the two non-Babel plugins is intentional.
+ *
+ * Returns the transformed source code, or null if no glob imports were found.
+ */
+export declare function applyImportDir(code: string, filePath: string): {
+    code: string;
+    map?: SourceMap;
+} | null;
+//# sourceMappingURL=import-dir.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"import-dir.d.ts","sourceRoot":"","sources":["../../../src/build/import-dir.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAI7C;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,SAAS,CAAA;CAAE,GAAG,IAAI,CAyE1C"}

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

@@ -0,0 +1,88 @@
+"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 import_dir_exports = {};
+__export(import_dir_exports, {
+  applyImportDir: () => applyImportDir
+});
+module.exports = __toCommonJS(import_dir_exports);
+var import_node_fs = __toESM(require("node:fs"), 1);
+var import_node_path = __toESM(require("node:path"), 1);
+var import_magic_string = __toESM(require("magic-string"), 1);
+var import_project_config = require("@cedarjs/project-config");
+function applyImportDir(code, filePath) {
+  if (!code.includes("**")) {
+    return null;
+  }
+  const GLOB_IMPORT_RE = /^import\s+(\w+)\s+from\s+['"]([^'"]+)['"]\s*;?/gm;
+  const s = new import_magic_string.default(code);
+  let hasTransformations = false;
+  for (const match of code.matchAll(GLOB_IMPORT_RE)) {
+    const importName = match[1];
+    const sourceValue = match[2];
+    if (!sourceValue.includes("**")) {
+      continue;
+    }
+    const importGlob = (0, import_project_config.importStatementPath)(sourceValue);
+    const cwd = importGlob.startsWith("src/") ? (0, import_project_config.getPaths)().api.base : import_node_path.default.dirname(filePath);
+    let dirFiles;
+    try {
+      dirFiles = import_node_fs.default.globSync(importGlob, {
+        cwd,
+        exclude: (n) => n.includes(".test.") || n.includes(".scenarios.") || n.includes(".d.ts")
+      });
+    } catch {
+      continue;
+    }
+    const staticGlob = importGlob.split("*")[0];
+    const filePathToVarName = (fp) => fp.replace(staticGlob, "").replace(/\.(js|ts)$/, "").replace(/[^a-zA-Z0-9]/g, "_");
+    hasTransformations = true;
+    let replacement = `let ${importName} = {};
+`;
+    for (const fp of dirFiles) {
+      const { dir: fileDir, name: fileName } = import_node_path.default.parse(fp);
+      const normalizedDir = (0, import_project_config.importStatementPath)(fileDir);
+      const varName = filePathToVarName(fp);
+      const nsImport = `${importName}_${varName}`;
+      replacement += `import * as ${nsImport} from '${normalizedDir}/${fileName}';
+`;
+      replacement += `${importName}.${varName} = ${nsImport};
+`;
+    }
+    s.overwrite(
+      match.index,
+      match.index + match[0].length,
+      replacement.trimEnd()
+    );
+  }
+  return hasTransformations ? { code: s.toString(), map: s.generateMap({ hires: true }) } : null;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  applyImportDir
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/internal",
-  "version": "6.0.0-canary.2641",
+  "version": "6.0.0-canary.2644",
   "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.2641",
-    "@cedarjs/cli-helpers": "6.0.0-canary.2641",
-    "@cedarjs/graphql-server": "6.0.0-canary.2641",
-    "@cedarjs/project-config": "6.0.0-canary.2641",
-    "@cedarjs/router": "6.0.0-canary.2641",
-    "@cedarjs/structure": "6.0.0-canary.2641",
-    "@cedarjs/utils": "6.0.0-canary.2641",
+    "@cedarjs/babel-config": "6.0.0-canary.2644",
+    "@cedarjs/cli-helpers": "6.0.0-canary.2644",
+    "@cedarjs/graphql-server": "6.0.0-canary.2644",
+    "@cedarjs/project-config": "6.0.0-canary.2644",
+    "@cedarjs/router": "6.0.0-canary.2644",
+    "@cedarjs/structure": "6.0.0-canary.2644",
+    "@cedarjs/utils": "6.0.0-canary.2644",
     "@graphql-codegen/add": "6.0.1",
     "@graphql-codegen/cli": "6.3.1",
     "@graphql-codegen/client-preset": "5.3.0",
@@ -204,6 +204,7 @@
     "fast-glob": "3.3.3",
     "graphql": "16.14.2",
     "kill-port": "1.6.1",
+    "magic-string": "0.30.21",
     "oxc-parser": "0.137.0",
     "prettier": "3.8.4",
     "rimraf": "6.1.3",
@@ -217,7 +218,7 @@
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.5",
-    "@cedarjs/framework-tools": "6.0.0-canary.2641",
+    "@cedarjs/framework-tools": "6.0.0-canary.2644",
     "concurrently": "9.2.1",
     "graphql-tag": "2.12.6",
     "publint": "0.3.21",