@cedarjs/vite 6.0.0-canary.2799 → 6.0.0-canary.2800

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":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAIlC;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAqI7C"}
+{"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,CA4H7C"}

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

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
-import { parse, Lang } from "@ast-grep/napi";
 import MagicString from "magic-string";
+import { parseSync } from "oxc-parser";
 import { normalizePath } from "vite";
 import { importStatementPath, getPaths } from "@cedarjs/project-config";
 function cedarImportDirPlugin() {
@@ -12,36 +12,32 @@ function cedarImportDirPlugin() {
       if (!code.includes("/**/")) {
         return null;
       }
-      const ext = path.extname(id);
-      const language = ext === ".ts" || ext === ".tsx" ? Lang.TypeScript : Lang.JavaScript;
-      let ast;
+      let program;
       try {
-        ast = parse(language, code);
+        program = parseSync(id, code).program;
       } catch (error) {
         console.warn("Failed to parse file:", id);
         console.warn(error);
         return null;
       }
-      const root = ast.root();
       let hasTransformations = false;
       const s = new MagicString(code);
-      const globImports = root.findAll({
-        rule: {
-          pattern: "import $DEFAULT_IMPORT from $SOURCE"
+      for (const node of program.body) {
+        if (node.type !== "ImportDeclaration") {
+          continue;
         }
-      });
-      for (const importNode of globImports) {
-        const sourceNode = importNode.getMatch("SOURCE");
-        const defaultImportNode = importNode.getMatch("DEFAULT_IMPORT");
-        if (!sourceNode || !defaultImportNode) {
+        const defaultSpecifier = node.specifiers.find(
+          (specifier) => specifier.type === "ImportDefaultSpecifier"
+        );
+        if (!defaultSpecifier) {
           continue;
         }
-        const sourceValue = sourceNode.text().slice(1, -1);
+        const sourceValue = node.source.value;
         if (!sourceValue.includes("/**/")) {
           continue;
         }
         hasTransformations = true;
-        const importName = defaultImportNode.text();
+        const importName = defaultSpecifier.local.name;
         const importGlob = importStatementPath(sourceValue);
         let cwd = path.dirname(id);
         if (importGlob.startsWith("src/")) {
@@ -81,8 +77,7 @@ function cedarImportDirPlugin() {
             replacement += `${importName}.${filePathVarName} = ${namespaceImportName};
 `;
           }
-          const range = importNode.range();
-          s.overwrite(range.start.index, range.end.index, replacement.trim());
+          s.overwrite(node.start, node.end, replacement.trim());
         } catch (error) {
           console.warn(`Failed to process glob import: ${sourceValue}`, error);
         }

package/dist/plugins/vite-plugin-cedarjs-job-path-injector.d.ts

@@ -1,3 +1,32 @@
+import type { SourceMap } from 'magic-string';
 import type { Plugin } from 'vite';
+/**
+ * Vite plugin that injects `path` and `name` properties into `createJob()`
+ * definitions so the jobs runner can locate and identify the job's module at
+ * runtime.
+ *
+ * Transforms:
+ *   export const myJob = jobs.createJob({ perform: ... })
+ * into:
+ *   export const myJob = jobs.createJob({ perform: ..., path: "...", name: "myJob" })
+ *
+ * The extraction uses an oxc-parser AST walk so the transform is robust
+ * against nested object properties, aliased imports, and TypeScript syntax.
+ * The same logic is duplicated in `@cedarjs/internal`
+ * (`applyJobPathInjector`) for the standalone esbuild API build.
+ */
 export declare function cedarjsJobPathInjectorPlugin(): Plugin;
+/**
+ * Injects `path` and `name` properties into `createJob()` definitions.
+ * Returns the transformed code with a sourcemap, or null if no
+ * transformation was needed.
+ *
+ * Duplicate of `@cedarjs/internal`'s `applyJobPathInjector` so this logic can
+ * run inside the Vite plugin pipeline without depending on internal's build
+ * output.
+ */
+export declare function applyJobPathInjector(code: string, filePath: string, jobsDir: string): {
+    code: string;
+    map: SourceMap;
+} | null;
 //# sourceMappingURL=vite-plugin-cedarjs-job-path-injector.d.ts.map

package/dist/plugins/vite-plugin-cedarjs-job-path-injector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-cedarjs-job-path-injector.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedarjs-job-path-injector.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAIlC,wBAAgB,4BAA4B,IAAI,MAAM,CAqHrD"}
+{"version":3,"file":"vite-plugin-cedarjs-job-path-injector.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedarjs-job-path-injector.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAE7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAIlC;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,4BAA4B,IAAI,MAAM,CAoBrD;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,SAAS,CAAA;CAAE,GAAG,IAAI,CAiFzC"}

package/dist/plugins/vite-plugin-cedarjs-job-path-injector.js

@@ -1,5 +1,6 @@
 import path from "node:path";
-import { parse, Lang } from "@ast-grep/napi";
+import MagicString from "magic-string";
+import { parseSync } from "oxc-parser";
 import { getPaths } from "@cedarjs/project-config";
 function cedarjsJobPathInjectorPlugin() {
   return {
@@ -8,93 +9,74 @@ function cedarjsJobPathInjectorPlugin() {
       if (!code.includes("createJob")) {
         return null;
       }
-      const isTypescript = id.endsWith(".ts") || id.endsWith(".tsx");
-      const language = isTypescript ? Lang.TypeScript : Lang.JavaScript;
-      let ast;
-      try {
-        ast = parse(language, code);
-      } catch (error) {
-        console.warn("Failed to parse file:", id);
-        console.warn(error);
+      const result = applyJobPathInjector(code, id, getPaths().api.jobs);
+      if (!result) {
         return null;
       }
-      const paths = getPaths();
-      const edits = [];
-      const root = ast.root();
-      const createJobCalls = root.findAll({
-        rule: {
-          pattern: "export const $VAR_NAME = $OBJ.createJob({ $$$PROPS })"
-        }
-      });
-      for (const callNode of createJobCalls) {
-        const varNameNode = callNode.getMatch("VAR_NAME");
-        const propsNodes = callNode.getMultipleMatches("PROPS");
-        if (!varNameNode) {
-          continue;
-        }
-        const importName = varNameNode.text();
-        const importPath = path.relative(paths.api.jobs, id);
-        const importPathWithoutExtension = importPath.replace(/\.[^/.]+$/, "");
-        const pathProperty = `path: ${JSON.stringify(importPathWithoutExtension)}`;
-        const nameProperty = `name: ${JSON.stringify(importName)}`;
-        let insertText = "";
-        if (propsNodes.length > 0) {
-          const objectLiteral = callNode.find({
-            rule: {
-              kind: "object",
-              inside: {
-                kind: "arguments"
-              }
-            }
-          });
-          if (objectLiteral) {
-            insertText = `, ${pathProperty}, ${nameProperty}`;
-            const objectText = objectLiteral.text();
-            const closeBraceIndex = objectText.lastIndexOf("}");
-            if (closeBraceIndex !== -1) {
-              const range = objectLiteral.range();
-              edits.push({
-                startPos: range.start.index + closeBraceIndex,
-                endPos: range.start.index + closeBraceIndex,
-                insertedText: insertText
-              });
-            }
-          }
-        } else {
-          const objectLiteral = callNode.find({
-            rule: {
-              kind: "object",
-              inside: {
-                kind: "arguments"
-              }
-            }
-          });
-          if (objectLiteral) {
-            insertText = `${pathProperty}, ${nameProperty}`;
-            const objectText = objectLiteral.text();
-            const openBraceIndex = objectText.indexOf("{");
-            if (openBraceIndex !== -1) {
-              const range = objectLiteral.range();
-              edits.push({
-                startPos: range.start.index + openBraceIndex + 1,
-                endPos: range.start.index + openBraceIndex + 1,
-                insertedText: insertText
-              });
-            }
-          }
-        }
-      }
-      if (edits.length === 0) {
-        return null;
-      }
-      const modifiedCode = root.commitEdits(edits);
       return {
-        code: modifiedCode,
-        map: null
+        code: result.code,
+        map: result.map
       };
     }
   };
 }
+function applyJobPathInjector(code, filePath, jobsDir) {
+  let program;
+  try {
+    program = parseSync(filePath, code, { sourceType: "module" }).program;
+  } catch (error) {
+    console.warn("Failed to parse file:", filePath);
+    console.warn(error);
+    return null;
+  }
+  const importPath = path.relative(jobsDir, filePath);
+  const importPathWithoutExtension = importPath.replace(/\.[^/.]+$/, "");
+  const s = new MagicString(code);
+  let hasTransformations = false;
+  for (const node of program.body) {
+    if (node.type !== "ExportNamedDeclaration") {
+      continue;
+    }
+    const decl = node.declaration;
+    if (decl?.type !== "VariableDeclaration") {
+      continue;
+    }
+    for (const declarator of decl.declarations) {
+      if (declarator.id.type !== "Identifier") {
+        continue;
+      }
+      const init = declarator.init;
+      if (init?.type !== "CallExpression") {
+        continue;
+      }
+      const callee = init.callee;
+      if (callee.type !== "MemberExpression" || callee.computed || callee.property.type !== "Identifier" || callee.property.name !== "createJob") {
+        continue;
+      }
+      const configArg = init.arguments[0];
+      if (configArg?.type !== "ObjectExpression") {
+        continue;
+      }
+      hasTransformations = true;
+      const pathProperty = `path: ${JSON.stringify(importPathWithoutExtension)}`;
+      const nameProperty = `name: ${JSON.stringify(declarator.id.name)}`;
+      const lastProperty = configArg.properties.at(-1);
+      if (lastProperty) {
+        s.appendLeft(lastProperty.end, `, ${pathProperty}, ${nameProperty}`);
+      } else {
+        s.appendLeft(configArg.start + 1, `${pathProperty}, ${nameProperty}`);
+      }
+    }
+  }
+  if (!hasTransformations) {
+    return null;
+  }
+  return {
+    code: s.toString(),
+    map: s.generateMap({ hires: true })
+  };
+}
 export {
+  applyJobPathInjector,
   cedarjsJobPathInjectorPlugin
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/vite",
-  "version": "6.0.0-canary.2799",
+  "version": "6.0.0-canary.2800",
   "description": "Vite configuration package for CedarJS",
   "repository": {
     "type": "git",
@@ -48,21 +48,20 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@ast-grep/napi": "0.45.0",
     "@babel/generator": "7.29.7",
     "@babel/parser": "7.29.7",
     "@babel/traverse": "7.29.7",
     "@babel/types": "7.29.7",
-    "@cedarjs/api": "6.0.0-canary.2799",
-    "@cedarjs/api-server": "6.0.0-canary.2799",
-    "@cedarjs/babel-config": "6.0.0-canary.2799",
-    "@cedarjs/context": "6.0.0-canary.2799",
-    "@cedarjs/graphql-server": "6.0.0-canary.2799",
-    "@cedarjs/internal": "6.0.0-canary.2799",
-    "@cedarjs/project-config": "6.0.0-canary.2799",
-    "@cedarjs/server-store": "6.0.0-canary.2799",
-    "@cedarjs/structure": "6.0.0-canary.2799",
-    "@cedarjs/testing": "6.0.0-canary.2799",
+    "@cedarjs/api": "6.0.0-canary.2800",
+    "@cedarjs/api-server": "6.0.0-canary.2800",
+    "@cedarjs/babel-config": "6.0.0-canary.2800",
+    "@cedarjs/context": "6.0.0-canary.2800",
+    "@cedarjs/graphql-server": "6.0.0-canary.2800",
+    "@cedarjs/internal": "6.0.0-canary.2800",
+    "@cedarjs/project-config": "6.0.0-canary.2800",
+    "@cedarjs/server-store": "6.0.0-canary.2800",
+    "@cedarjs/structure": "6.0.0-canary.2800",
+    "@cedarjs/testing": "6.0.0-canary.2800",
     "@swc/core": "1.15.46",
     "@universal-deploy/store": "^0.2.1",
     "@universal-deploy/vite": "^0.1.9",
@@ -93,10 +92,10 @@
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@cedarjs/auth": "6.0.0-canary.2799",
-    "@cedarjs/framework-tools": "6.0.0-canary.2799",
-    "@cedarjs/router": "6.0.0-canary.2799",
-    "@cedarjs/web": "6.0.0-canary.2799",
+    "@cedarjs/auth": "6.0.0-canary.2800",
+    "@cedarjs/framework-tools": "6.0.0-canary.2800",
+    "@cedarjs/router": "6.0.0-canary.2800",
+    "@cedarjs/web": "6.0.0-canary.2800",
     "@dr.pogodin/react-helmet": "2.0.4",
     "@hyrious/esbuild-plugin-commonjs": "0.2.6",
     "@jridgewell/trace-mapping": "0.3.31",
@@ -116,9 +115,9 @@
     "vitest": "4.1.10"
   },
   "peerDependencies": {
-    "@cedarjs/auth": "6.0.0-canary.2799",
-    "@cedarjs/router": "6.0.0-canary.2799",
-    "@cedarjs/web": "6.0.0-canary.2799"
+    "@cedarjs/auth": "6.0.0-canary.2800",
+    "@cedarjs/router": "6.0.0-canary.2800",
+    "@cedarjs/web": "6.0.0-canary.2800"
   },
   "engines": {
     "node": ">=24"