@cedarjs/prerender 1.0.0-canary.12535 → 1.0.0-canary.12537

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

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-cedar-import-dir.d.ts","sourceRoot":"","sources":["../../src/graphql/vite-plugin-cedar-import-dir.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAIlC;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CA8L7C"}
+{"version":3,"file":"vite-plugin-cedar-import-dir.d.ts","sourceRoot":"","sources":["../../src/graphql/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"}

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

@@ -1,30 +1,8 @@
 import path from "node:path";
-import * as swc from "@swc/core";
+import { parse, Lang } from "@ast-grep/napi";
 import fg from "fast-glob";
 import { importStatementPath, getPaths } from "@cedarjs/project-config";
 function cedarImportDirPlugin() {
-  const createSpan = () => ({
-    start: 0,
-    end: 0,
-    // ctxt is not actually used, I just have to add it because of broken swc
-    // types, see https://github.com/Menci/vite-plugin-top-level-await/issues/52
-    ctxt: 0
-  });
-  const createIdentifier = (value, ctxt) => ({
-    type: "Identifier",
-    span: createSpan(),
-    // @ts-expect-error - See https://github.com/Menci/vite-plugin-top-level-await/issues/52
-    ctxt,
-    value,
-    optional: false,
-    typeAnnotation: null
-  });
-  const createStringLiteral = (value) => ({
-    type: "StringLiteral",
-    span: createSpan(),
-    value,
-    raw: `'${value}'`
-  });
   return {
     name: "vite-plugin-cedar-import-dir",
     enforce: "pre",
@@ -33,109 +11,66 @@ function cedarImportDirPlugin() {
         return null;
       }
       const ext = path.extname(id);
-      const ast = await swc.parse(code, {
-        syntax: ext === ".ts" || ext === ".tsx" ? "typescript" : "ecmascript",
-        tsx: ext === ".tsx"
-      });
+      const language = ext === ".ts" || ext === ".tsx" ? Lang.TypeScript : Lang.JavaScript;
+      let ast;
+      try {
+        ast = parse(language, code);
+      } catch (error) {
+        console.warn("Failed to parse file:", id);
+        console.warn(error);
+        return null;
+      }
+      const root = ast.root();
       let hasTransformations = false;
-      const newBody = [];
-      const ctxt = ast.body.length > 0 ? ast.body[0].ctxt || 0 : 0;
-      for (const item of ast.body) {
-        if (item.type === "ImportDeclaration" && item.source.value.includes("/**/")) {
-          hasTransformations = true;
-          const defaultSpecifier = item.specifiers.find(
-            (spec) => spec.type === "ImportDefaultSpecifier"
+      const edits = [];
+      const globImports = root.findAll({
+        rule: {
+          pattern: "import $DEFAULT_IMPORT from $SOURCE"
+        }
+      });
+      for (const importNode of globImports) {
+        const sourceNode = importNode.getMatch("SOURCE");
+        const defaultImportNode = importNode.getMatch("DEFAULT_IMPORT");
+        if (!sourceNode || !defaultImportNode) {
+          continue;
+        }
+        const sourceValue = sourceNode.text().slice(1, -1);
+        if (!sourceValue.includes("/**/")) {
+          continue;
+        }
+        hasTransformations = true;
+        const importName = defaultImportNode.text();
+        const importGlob = importStatementPath(sourceValue);
+        const cwd = importGlob.startsWith("src/") ? getPaths().api.base : path.dirname(id);
+        try {
+          const dirFiles = fg.sync(importGlob, { cwd }).filter(
+            (n) => !n.includes(".test.") && !n.includes(".scenarios.") && !n.includes(".d.ts")
           );
-          if (!defaultSpecifier) {
-            newBody.push(item);
-            continue;
+          const staticGlob = importGlob.split("*")[0];
+          const filePathToVarName = (filePath) => {
+            return filePath.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 filePathVarName = filePathToVarName(filePath);
+            const namespaceImportName = `${importName}_${filePathVarName}`;
+            replacement += `import * as ${namespaceImportName} from '${fileImportPath}';
+`;
+            replacement += `${importName}.${filePathVarName} = ${namespaceImportName};
+`;
           }
-          const importName = defaultSpecifier.local.value;
-          const importPath = item.source.value;
-          const importGlob = importStatementPath(importPath);
-          const cwd = importGlob.startsWith("src/") ? getPaths().api.base : path.dirname(id);
-          try {
-            const dirFiles = fg.sync(importGlob, { cwd }).filter(
-              (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, "_");
-            };
-            newBody.push({
-              type: "VariableDeclaration",
-              span: createSpan(),
-              // @ts-expect-error - See https://github.com/Menci/vite-plugin-top-level-await/issues/52
-              ctxt,
-              kind: "let",
-              declare: false,
-              declarations: [
-                {
-                  type: "VariableDeclarator",
-                  span: createSpan(),
-                  id: createIdentifier(importName, ctxt),
-                  init: {
-                    type: "ObjectExpression",
-                    span: createSpan(),
-                    properties: []
-                  },
-                  definite: false
-                }
-              ]
-            });
-            for (const filePath of dirFiles) {
-              const { dir: fileDir, name: fileName } = path.parse(filePath);
-              const fileImportPath = fileDir + "/" + fileName;
-              const filePathVarName = filePathToVarName(filePath);
-              const namespaceImportName = `${importName}_${filePathVarName}`;
-              newBody.push({
-                type: "ImportDeclaration",
-                span: createSpan(),
-                specifiers: [
-                  {
-                    type: "ImportNamespaceSpecifier",
-                    span: createSpan(),
-                    local: createIdentifier(namespaceImportName, ctxt)
-                  }
-                ],
-                source: createStringLiteral(fileImportPath),
-                typeOnly: false
-              });
-              newBody.push({
-                type: "ExpressionStatement",
-                span: createSpan(),
-                expression: {
-                  type: "AssignmentExpression",
-                  span: createSpan(),
-                  operator: "=",
-                  left: {
-                    type: "MemberExpression",
-                    span: createSpan(),
-                    object: createIdentifier(importName, ctxt),
-                    property: createIdentifier(filePathVarName, ctxt)
-                  },
-                  right: createIdentifier(namespaceImportName, ctxt)
-                }
-              });
-            }
-          } catch (error) {
-            console.warn(`Failed to process glob import: ${importPath}`, error);
-            newBody.push(item);
-          }
-        } else {
-          newBody.push(item);
+          edits.push(importNode.replace(replacement.trim()));
+        } catch (error) {
+          console.warn(`Failed to process glob import: ${sourceValue}`, error);
         }
       }
-      if (hasTransformations) {
-        const transformedAst = {
-          ...ast,
-          body: newBody
-        };
-        const output = await swc.print(transformedAst, {
-          minify: false
-        });
+      if (hasTransformations && edits.length > 0) {
+        const transformedCode = root.commitEdits(edits);
         return {
-          code: output.code,
+          code: transformedCode,
           map: null
           // For simplicity, not generating source maps
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/prerender",
-  "version": "1.0.0-canary.12535+8272baddd",
+  "version": "1.0.0-canary.12537+62d58ab28",
   "description": "RedwoodJS prerender",
   "repository": {
     "type": "git",
@@ -40,15 +40,16 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
+    "@ast-grep/napi": "0.39.3",
     "@babel/generator": "7.27.5",
     "@babel/parser": "7.27.5",
     "@babel/traverse": "7.27.4",
-    "@cedarjs/babel-config": "1.0.0-canary.12535",
-    "@cedarjs/project-config": "1.0.0-canary.12535",
-    "@cedarjs/router": "1.0.0-canary.12535",
-    "@cedarjs/structure": "1.0.0-canary.12535",
-    "@cedarjs/vite": "1.0.0-canary.12535",
-    "@cedarjs/web": "1.0.0-canary.12535",
+    "@cedarjs/babel-config": "1.0.0-canary.12537",
+    "@cedarjs/project-config": "1.0.0-canary.12537",
+    "@cedarjs/router": "1.0.0-canary.12537",
+    "@cedarjs/structure": "1.0.0-canary.12537",
+    "@cedarjs/vite": "1.0.0-canary.12537",
+    "@cedarjs/web": "1.0.0-canary.12537",
     "@rollup/plugin-alias": "5.1.1",
     "@rollup/plugin-commonjs": "28.0.6",
     "@rollup/plugin-node-resolve": "16.0.1",
@@ -67,7 +68,7 @@
     "vite-node": "3.2.4"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "1.0.0-canary.12535",
+    "@cedarjs/framework-tools": "1.0.0-canary.12537",
     "@types/mime-types": "2.1.4",
     "@types/react": "^18.2.55",
     "babel-plugin-tester": "11.0.4",
@@ -85,5 +86,5 @@
     "react": "react",
     "react-dom": "react-dom"
   },
-  "gitHead": "8272baddd291bbdfc78994649d4bf0651cc8d15e"
+  "gitHead": "62d58ab286ec0e460bc11a601fca078c92e78718"
 }