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

package/dist/api/vite-plugin-cedar-vitest-api-preset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-cedar-vitest-api-preset.d.ts","sourceRoot":"","sources":["../../src/api/vite-plugin-cedar-vitest-api-preset.ts"],"names":[],"mappings":"AASA,wBAAgB,iBAAiB,kEAQhC"}
+{"version":3,"file":"vite-plugin-cedar-vitest-api-preset.d.ts","sourceRoot":"","sources":["../../src/api/vite-plugin-cedar-vitest-api-preset.ts"],"names":[],"mappings":"AAUA,wBAAgB,iBAAiB,kEAShC"}

package/dist/api/vite-plugin-cedar-vitest-api-preset.js

@@ -3,10 +3,12 @@ import {
   cedarVitestApiConfigPlugin,
   trackDbImportsPlugin
 } from "@cedarjs/testing/api/vitest";
+import { cedarImportDirPlugin } from "../plugins/vite-plugin-cedar-import-dir.js";
 import { cedarjsJobPathInjectorPlugin } from "../plugins/vite-plugin-cedarjs-job-path-injector.js";
 import { cedarjsResolveCedarStyleImportsPlugin } from "../plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js";
 function cedarVitestPreset() {
   return [
+    cedarImportDirPlugin(),
     cedarjsJobPathInjectorPlugin(),
     cedarVitestApiConfigPlugin(),
     autoImportsPlugin(),

package/dist/apiDevMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiDevMiddleware.d.ts","sourceRoot":"","sources":["../src/apiDevMiddleware.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAsB,aAAa,EAAE,MAAM,MAAM,CAAA;AAiC7D,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,iBAe/D;AA+GD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CAgHlE;AA0BD,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,aAAa,GAAG,IAAI,CA0EhE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,KAIrB,SAAS,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CAoFnD;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC;IACrD,UAAU,EAAE,aAAa,CAAA;IACzB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;CACjD,CAAC,CAcD"}
+{"version":3,"file":"apiDevMiddleware.d.ts","sourceRoot":"","sources":["../src/apiDevMiddleware.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAsB,aAAa,EAAE,MAAM,MAAM,CAAA;AAkC7D,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,iBAe/D;AA+GD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CAiHlE;AA0BD,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,aAAa,GAAG,IAAI,CA0EhE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,KAIrB,SAAS,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CAoFnD;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC;IACrD,UAAU,EAAE,aAAa,CAAA;IACzB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;CACjD,CAAC,CAcD"}

package/dist/apiDevMiddleware.js

@@ -16,6 +16,7 @@ import { getConfig, getPaths, projectSideIsEsm } from "@cedarjs/project-config";
 import { getWorkspacePackageAliases } from "./lib/workspacePackageAliases.js";
 import { cedarAutoImportsPlugin } from "./plugins/vite-plugin-cedar-auto-import.js";
 import { applyGraphqlOptionsExtract } from "./plugins/vite-plugin-cedar-graphql-options-extract.js";
+import { cedarImportDirPlugin } from "./plugins/vite-plugin-cedar-import-dir.js";
 import { applyOtelWrapping } from "./plugins/vite-plugin-cedar-otel-wrapping.js";
 import { cedarjsJobPathInjectorPlugin } from "./plugins/vite-plugin-cedarjs-job-path-injector.js";
 const LAMBDA_FUNCTIONS = {};
@@ -146,6 +147,7 @@ async function createApiViteServer() {
       alias: workspacePkgSourceMap
     },
     plugins: [
+      cedarImportDirPlugin(),
       cedarAutoImportsPlugin(),
       cedarjsJobPathInjectorPlugin(),
       (() => {

package/dist/buildApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AAgDA,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,EAAE,CAAC,EAAE,OAAO,CAAA;CACb;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,EAClC,OAAe,EACf,SAA0B,EAC1B,EAAU,GACX,GAAE,oBAAyB,iBA0V3B"}
+{"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AAiDA,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,EAAE,CAAC,EAAE,OAAO,CAAA;CACb;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,EAClC,OAAe,EACf,SAA0B,EAC1B,EAAU,GACX,GAAE,oBAAyB,iBA2V3B"}

package/dist/buildApp.js

@@ -20,6 +20,7 @@ import { getWorkspacePackageAliases } from "./lib/workspacePackageAliases.js";
 import { cedarAutoImportsPlugin } from "./plugins/vite-plugin-cedar-auto-import.js";
 import { cedarGqlormInjectPlugin } from "./plugins/vite-plugin-cedar-gqlorm-inject.js";
 import { cedarGraphqlOptionsExtractPlugin } from "./plugins/vite-plugin-cedar-graphql-options-extract.js";
+import { cedarImportDirPlugin } from "./plugins/vite-plugin-cedar-import-dir.js";
 import { cedarMockCellDataPlugin } from "./plugins/vite-plugin-cedar-mock-cell-data.js";
 import { cedarOtelWrappingPlugin } from "./plugins/vite-plugin-cedar-otel-wrapping.js";
 import { cedarjsJobPathInjectorPlugin } from "./plugins/vite-plugin-cedarjs-job-path-injector.js";
@@ -246,6 +247,7 @@ async function buildCedarApp({
   if (workspace.includes("api")) {
     plugins.push(cedarGraphqlOptionsExtractPlugin());
     plugins.push(cedarGqlormInjectPlugin());
+    plugins.push(cedarImportDirPlugin());
     plugins.push(cedarOtelWrappingPlugin());
     plugins.push(cedarjsJobPathInjectorPlugin());
     plugins.push(

package/dist/cjs/api/vite-plugin-cedar-vitest-api-preset.js

@@ -22,10 +22,12 @@ __export(vite_plugin_cedar_vitest_api_preset_exports, {
 });
 module.exports = __toCommonJS(vite_plugin_cedar_vitest_api_preset_exports);
 var import_vitest = require("@cedarjs/testing/api/vitest");
+var import_vite_plugin_cedar_import_dir = require("../plugins/vite-plugin-cedar-import-dir.js");
 var import_vite_plugin_cedarjs_job_path_injector = require("../plugins/vite-plugin-cedarjs-job-path-injector.js");
 var import_vite_plugin_cedarjs_resolve_cedar_style_imports = require("../plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js");
 function cedarVitestPreset() {
   return [
+    (0, import_vite_plugin_cedar_import_dir.cedarImportDirPlugin)(),
     (0, import_vite_plugin_cedarjs_job_path_injector.cedarjsJobPathInjectorPlugin)(),
     (0, import_vitest.cedarVitestApiConfigPlugin)(),
     (0, import_vitest.autoImportsPlugin)(),

package/dist/cjs/apiDevMiddleware.js

@@ -50,6 +50,7 @@ var import_project_config = require("@cedarjs/project-config");
 var import_workspacePackageAliases = require("./lib/workspacePackageAliases.js");
 var import_vite_plugin_cedar_auto_import = require("./plugins/vite-plugin-cedar-auto-import.js");
 var import_vite_plugin_cedar_graphql_options_extract = require("./plugins/vite-plugin-cedar-graphql-options-extract.js");
+var import_vite_plugin_cedar_import_dir = require("./plugins/vite-plugin-cedar-import-dir.js");
 var import_vite_plugin_cedar_otel_wrapping = require("./plugins/vite-plugin-cedar-otel-wrapping.js");
 var import_vite_plugin_cedarjs_job_path_injector = require("./plugins/vite-plugin-cedarjs-job-path-injector.js");
 const LAMBDA_FUNCTIONS = {};
@@ -180,6 +181,7 @@ async function createApiViteServer() {
       alias: workspacePkgSourceMap
     },
     plugins: [
+      (0, import_vite_plugin_cedar_import_dir.cedarImportDirPlugin)(),
       (0, import_vite_plugin_cedar_auto_import.cedarAutoImportsPlugin)(),
       (0, import_vite_plugin_cedarjs_job_path_injector.cedarjsJobPathInjectorPlugin)(),
       (() => {

package/dist/cjs/buildApp.js

@@ -45,6 +45,7 @@ var import_workspacePackageAliases = require("./lib/workspacePackageAliases.js")
 var import_vite_plugin_cedar_auto_import = require("./plugins/vite-plugin-cedar-auto-import.js");
 var import_vite_plugin_cedar_gqlorm_inject = require("./plugins/vite-plugin-cedar-gqlorm-inject.js");
 var import_vite_plugin_cedar_graphql_options_extract = require("./plugins/vite-plugin-cedar-graphql-options-extract.js");
+var import_vite_plugin_cedar_import_dir = require("./plugins/vite-plugin-cedar-import-dir.js");
 var import_vite_plugin_cedar_mock_cell_data = require("./plugins/vite-plugin-cedar-mock-cell-data.js");
 var import_vite_plugin_cedar_otel_wrapping = require("./plugins/vite-plugin-cedar-otel-wrapping.js");
 var import_vite_plugin_cedarjs_job_path_injector = require("./plugins/vite-plugin-cedarjs-job-path-injector.js");
@@ -276,6 +277,7 @@ async function buildCedarApp({
   if (workspace.includes("api")) {
     plugins.push((0, import_vite_plugin_cedar_graphql_options_extract.cedarGraphqlOptionsExtractPlugin)());
     plugins.push((0, import_vite_plugin_cedar_gqlorm_inject.cedarGqlormInjectPlugin)());
+    plugins.push((0, import_vite_plugin_cedar_import_dir.cedarImportDirPlugin)());
     plugins.push((0, import_vite_plugin_cedar_otel_wrapping.cedarOtelWrappingPlugin)());
     plugins.push((0, import_vite_plugin_cedarjs_job_path_injector.cedarjsJobPathInjectorPlugin)());
     plugins.push(

package/dist/cjs/plugins/vite-plugin-cedar-import-dir.js

@@ -31,9 +31,11 @@ __export(vite_plugin_cedar_import_dir_exports, {
   cedarImportDirPlugin: () => cedarImportDirPlugin
 });
 module.exports = __toCommonJS(vite_plugin_cedar_import_dir_exports);
+var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_path = __toESM(require("node:path"), 1);
 var import_napi = require("@ast-grep/napi");
-var import_fast_glob = __toESM(require("fast-glob"), 1);
+var import_magic_string = __toESM(require("magic-string"), 1);
+var import_vite = require("vite");
 var import_project_config = require("@cedarjs/project-config");
 function cedarImportDirPlugin() {
   return {
@@ -55,7 +57,7 @@ function cedarImportDirPlugin() {
       }
       const root = ast.root();
       let hasTransformations = false;
-      const edits = [];
+      const s = new import_magic_string.default(code);
       const globImports = root.findAll({
         rule: {
           pattern: "import $DEFAULT_IMPORT from $SOURCE"
@@ -74,20 +76,37 @@ function cedarImportDirPlugin() {
         hasTransformations = true;
         const importName = defaultImportNode.text();
         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(id);
+        let cwd = import_node_path.default.dirname(id);
+        if (importGlob.startsWith("src/")) {
+          const normalizedId = (0, import_vite.normalizePath)(id);
+          const apiBase = (0, import_vite.normalizePath)((0, import_project_config.getPaths)().api.base);
+          const webBase = (0, import_vite.normalizePath)((0, import_project_config.getPaths)().web.base);
+          if (normalizedId.startsWith(apiBase)) {
+            cwd = (0, import_project_config.getPaths)().api.base;
+          } else if (normalizedId.startsWith(webBase)) {
+            cwd = (0, import_project_config.getPaths)().web.base;
+          } else {
+            throw new Error(`Unexpected file location: ${id}`);
+          }
+        }
         try {
-          const dirFiles = import_fast_glob.default.sync(importGlob, { cwd }).filter(
-            (n) => !n.includes(".test.") && !n.includes(".scenarios.") && !n.includes(".d.ts")
-          );
+          const dirFiles = import_node_fs.default.globSync(importGlob, {
+            cwd,
+            exclude: (n) => n.includes(".test.") || n.includes(".scenarios.") || n.includes(".d.ts")
+          });
           const staticGlob = importGlob.split("*")[0];
           const filePathToVarName = (filePath) => {
-            return filePath.replace(staticGlob, "").replace(/\.(js|ts)$/, "").replace(/[^a-zA-Z0-9]/g, "_");
+            const normalizedPath = (0, import_vite.normalizePath)(filePath);
+            return normalizedPath.replace(staticGlob, "").replace(/\.(js|ts)$/, "").replace(/[^a-zA-Z0-9]/g, "_");
           };
           let replacement = `let ${importName} = {};
 `;
           for (const filePath of dirFiles) {
-            const { dir: fileDir, name: fileName } = import_node_path.default.parse(filePath);
-            const fileImportPath = fileDir + "/" + fileName;
+            const normalizedPath = (0, import_vite.normalizePath)(filePath);
+            const lastSlash = normalizedPath.lastIndexOf("/");
+            const fileDir = lastSlash >= 0 ? normalizedPath.slice(0, lastSlash) : "";
+            const fileName = normalizedPath.slice(lastSlash + 1).replace(/\.\w+$/, "");
+            const fileImportPath = fileDir ? fileDir + "/" + fileName : fileName;
             const filePathVarName = filePathToVarName(filePath);
             const namespaceImportName = `${importName}_${filePathVarName}`;
             replacement += `import * as ${namespaceImportName} from '${fileImportPath}';
@@ -95,17 +114,16 @@ function cedarImportDirPlugin() {
             replacement += `${importName}.${filePathVarName} = ${namespaceImportName};
 `;
           }
-          edits.push(importNode.replace(replacement.trim()));
+          const range = importNode.range();
+          s.overwrite(range.start.index, range.end.index, replacement.trim());
         } catch (error) {
           console.warn(`Failed to process glob import: ${sourceValue}`, error);
         }
       }
-      if (hasTransformations && edits.length > 0) {
-        const transformedCode = root.commitEdits(edits);
+      if (hasTransformations) {
         return {
-          code: transformedCode,
-          map: null
-          // For simplicity, not generating source maps
+          code: s.toString(),
+          map: s.generateMap({ hires: true })
         };
       }
       return null;

package/dist/plugins/vite-plugin-cedar-import-dir.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-cedar-import-dir.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-import-dir.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAIlC;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAgH7C"}
+{"version":3,"file":"vite-plugin-cedar-import-dir.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-import-dir.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAIlC;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAqI7C"}

package/dist/plugins/vite-plugin-cedar-import-dir.js

@@ -1,6 +1,8 @@
+import fs from "node:fs";
 import path from "node:path";
 import { parse, Lang } from "@ast-grep/napi";
-import fg from "fast-glob";
+import MagicString from "magic-string";
+import { normalizePath } from "vite";
 import { importStatementPath, getPaths } from "@cedarjs/project-config";
 function cedarImportDirPlugin() {
   return {
@@ -22,7 +24,7 @@ function cedarImportDirPlugin() {
       }
       const root = ast.root();
       let hasTransformations = false;
-      const edits = [];
+      const s = new MagicString(code);
       const globImports = root.findAll({
         rule: {
           pattern: "import $DEFAULT_IMPORT from $SOURCE"
@@ -41,20 +43,37 @@ function cedarImportDirPlugin() {
         hasTransformations = true;
         const importName = defaultImportNode.text();
         const importGlob = importStatementPath(sourceValue);
-        const cwd = importGlob.startsWith("src/") ? getPaths().api.base : path.dirname(id);
+        let cwd = path.dirname(id);
+        if (importGlob.startsWith("src/")) {
+          const normalizedId = normalizePath(id);
+          const apiBase = normalizePath(getPaths().api.base);
+          const webBase = normalizePath(getPaths().web.base);
+          if (normalizedId.startsWith(apiBase)) {
+            cwd = getPaths().api.base;
+          } else if (normalizedId.startsWith(webBase)) {
+            cwd = getPaths().web.base;
+          } else {
+            throw new Error(`Unexpected file location: ${id}`);
+          }
+        }
         try {
-          const dirFiles = fg.sync(importGlob, { cwd }).filter(
-            (n) => !n.includes(".test.") && !n.includes(".scenarios.") && !n.includes(".d.ts")
-          );
+          const dirFiles = fs.globSync(importGlob, {
+            cwd,
+            exclude: (n) => n.includes(".test.") || n.includes(".scenarios.") || n.includes(".d.ts")
+          });
           const staticGlob = importGlob.split("*")[0];
           const filePathToVarName = (filePath) => {
-            return filePath.replace(staticGlob, "").replace(/\.(js|ts)$/, "").replace(/[^a-zA-Z0-9]/g, "_");
+            const normalizedPath = normalizePath(filePath);
+            return normalizedPath.replace(staticGlob, "").replace(/\.(js|ts)$/, "").replace(/[^a-zA-Z0-9]/g, "_");
           };
           let replacement = `let ${importName} = {};
 `;
           for (const filePath of dirFiles) {
-            const { dir: fileDir, name: fileName } = path.parse(filePath);
-            const fileImportPath = fileDir + "/" + fileName;
+            const normalizedPath = normalizePath(filePath);
+            const lastSlash = normalizedPath.lastIndexOf("/");
+            const fileDir = lastSlash >= 0 ? normalizedPath.slice(0, lastSlash) : "";
+            const fileName = normalizedPath.slice(lastSlash + 1).replace(/\.\w+$/, "");
+            const fileImportPath = fileDir ? fileDir + "/" + fileName : fileName;
             const filePathVarName = filePathToVarName(filePath);
             const namespaceImportName = `${importName}_${filePathVarName}`;
             replacement += `import * as ${namespaceImportName} from '${fileImportPath}';
@@ -62,17 +81,16 @@ function cedarImportDirPlugin() {
             replacement += `${importName}.${filePathVarName} = ${namespaceImportName};
 `;
           }
-          edits.push(importNode.replace(replacement.trim()));
+          const range = importNode.range();
+          s.overwrite(range.start.index, range.end.index, replacement.trim());
         } catch (error) {
           console.warn(`Failed to process glob import: ${sourceValue}`, error);
         }
       }
-      if (hasTransformations && edits.length > 0) {
-        const transformedCode = root.commitEdits(edits);
+      if (hasTransformations) {
         return {
-          code: transformedCode,
-          map: null
-          // For simplicity, not generating source maps
+          code: s.toString(),
+          map: s.generateMap({ hires: true })
         };
       }
       return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/vite",
-  "version": "6.0.0-canary.2641",
+  "version": "6.0.0-canary.2644",
   "description": "Vite configuration package for CedarJS",
   "repository": {
     "type": "git",
@@ -63,15 +63,15 @@
     "@babel/parser": "7.29.7",
     "@babel/traverse": "7.29.7",
     "@babel/types": "7.29.7",
-    "@cedarjs/api": "6.0.0-canary.2641",
-    "@cedarjs/babel-config": "6.0.0-canary.2641",
-    "@cedarjs/context": "6.0.0-canary.2641",
-    "@cedarjs/cookie-jar": "6.0.0-canary.2641",
-    "@cedarjs/graphql-server": "6.0.0-canary.2641",
-    "@cedarjs/internal": "6.0.0-canary.2641",
-    "@cedarjs/project-config": "6.0.0-canary.2641",
-    "@cedarjs/server-store": "6.0.0-canary.2641",
-    "@cedarjs/testing": "6.0.0-canary.2641",
+    "@cedarjs/api": "6.0.0-canary.2644",
+    "@cedarjs/babel-config": "6.0.0-canary.2644",
+    "@cedarjs/context": "6.0.0-canary.2644",
+    "@cedarjs/cookie-jar": "6.0.0-canary.2644",
+    "@cedarjs/graphql-server": "6.0.0-canary.2644",
+    "@cedarjs/internal": "6.0.0-canary.2644",
+    "@cedarjs/project-config": "6.0.0-canary.2644",
+    "@cedarjs/server-store": "6.0.0-canary.2644",
+    "@cedarjs/testing": "6.0.0-canary.2644",
     "@fastify/url-data": "6.0.3",
     "@swc/core": "1.15.41",
     "@universal-deploy/store": "^0.2.1",
@@ -87,6 +87,7 @@
     "dotenv-defaults": "5.0.2",
     "execa": "5.1.1",
     "express": "4.22.2",
+    "fast-glob": "3.3.3",
     "fastify": "5.8.5",
     "fastify-raw-body": "5.0.0",
     "find-my-way": "8.2.2",
@@ -107,9 +108,9 @@
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.5",
-    "@cedarjs/auth": "6.0.0-canary.2641",
-    "@cedarjs/router": "6.0.0-canary.2641",
-    "@cedarjs/web": "6.0.0-canary.2641",
+    "@cedarjs/auth": "6.0.0-canary.2644",
+    "@cedarjs/router": "6.0.0-canary.2644",
+    "@cedarjs/web": "6.0.0-canary.2644",
     "@hyrious/esbuild-plugin-commonjs": "0.2.6",
     "@jridgewell/trace-mapping": "0.3.31",
     "@types/aws-lambda": "8.10.162",