@getcoherent/cli 0.2.2 → 0.2.4

package/dist/index.js

@@ -6530,36 +6530,41 @@ ${fixed}`;
     } catch {
     }
     if (lucideExports2) {
-      const importedNames = new Set(
+      const allImportedNames = /* @__PURE__ */ new Set();
+      for (const m of fixed.matchAll(/import\s*\{([^}]+)\}\s*from/g)) {
+        m[1].split(",").map((s) => s.trim()).filter(Boolean).forEach((n) => allImportedNames.add(n));
+      }
+      for (const m of fixed.matchAll(/import\s+([A-Z]\w+)\s+from/g)) {
+        allImportedNames.add(m[1]);
+      }
+      const lucideImported = new Set(
         lucideImportMatch2[1].split(",").map((s) => s.trim()).filter(Boolean)
       );
-      const jsxIconRefs = [...fixed.matchAll(/<([A-Z][a-zA-Z]*(?:Icon)?)\s/g)].map((m) => m[1]);
-      const htmlElements = /* @__PURE__ */ new Set(["Link", "Fragment", "Suspense", "Image"]);
+      const jsxIconRefs = [...new Set([...fixed.matchAll(/<([A-Z][a-zA-Z]*Icon)\s/g)].map((m) => m[1]))];
       const missing = [];
       for (const ref of jsxIconRefs) {
-        if (importedNames.has(ref) || htmlElements.has(ref)) continue;
+        if (allImportedNames.has(ref)) continue;
         if (fixed.includes(`function ${ref}`) || fixed.includes(`const ${ref}`)) continue;
-        if (/^import\s.*\b${ref}\b/m.test(fixed)) continue;
         const baseName = ref.replace(/Icon$/, "");
         if (lucideExports2.has(ref)) {
           missing.push(ref);
-          importedNames.add(ref);
+          lucideImported.add(ref);
         } else if (lucideExports2.has(baseName)) {
           const re = new RegExp(`\\b${ref}\\b`, "g");
           fixed = fixed.replace(re, baseName);
           missing.push(baseName);
-          importedNames.add(baseName);
+          lucideImported.add(baseName);
           fixes.push(`renamed ${ref} \u2192 ${baseName} (lucide-react)`);
         } else {
           const fallback = "Circle";
           const re = new RegExp(`\\b${ref}\\b`, "g");
           fixed = fixed.replace(re, fallback);
-          importedNames.add(fallback);
+          lucideImported.add(fallback);
           fixes.push(`unknown icon ${ref} \u2192 ${fallback}`);
         }
       }
       if (missing.length > 0) {
-        const allNames = [...importedNames];
+        const allNames = [...lucideImported];
         const origLine = lucideImportMatch2[0];
         fixed = fixed.replace(origLine, `import { ${allNames.join(", ")} } from "lucide-react"`);
         fixes.push(`added missing lucide imports: ${missing.join(", ")}`);
@@ -7790,10 +7795,7 @@ ${stateBlock}${returnIndent}return (
   if (!extracted) return false;
   await integrateSharedLayoutIntoRootLayout3(projectRoot);
   await ensureAuthRouteGroup(projectRoot);
-  const allPageFiles = /* @__PURE__ */ new Set([
-    ...generatedPageFiles,
-    ...findAllPageFiles(resolve8(projectRoot, "app"))
-  ]);
+  const allPageFiles = /* @__PURE__ */ new Set([...generatedPageFiles, ...findAllPageFiles(resolve8(projectRoot, "app"))]);
   for (const file of allPageFiles) {
     try {
       let code = await readFile(file);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "CLI interface for Coherent Design Method",
   "type": "module",
   "main": "./dist/index.js",
@@ -43,7 +43,7 @@
     "ora": "^7.0.1",
     "prompts": "^2.4.2",
     "zod": "^3.22.4",
-    "@getcoherent/core": "0.2.2"
+    "@getcoherent/core": "0.2.4"
   },
   "devDependencies": {
     "@types/node": "^20.11.0",