@getcoherent/cli 0.6.26 → 0.6.28

package/dist/{chunk-H644LLXJ.js → chunk-NP2CGABX.js}

@@ -715,9 +715,10 @@ async function autoFixCode(code, context) {
   if (fixed !== beforeEntityFix) {
     fixes.push("Fixed syntax issues");
   }
+  const isJsExpr = (text) => /[().;=&|!?]/.test(text);
   const beforeLtFix = fixed;
-  fixed = fixed.replace(/>([^<{}\n]*)<(\d)/g, ">$1&lt;$2");
-  fixed = fixed.replace(/>([^<{}\n]*)<([^/a-zA-Z!{>\n])/g, ">$1&lt;$2");
+  fixed = fixed.replace(/>([^<{}\n]*)<(\d)/g, (m, text, d) => isJsExpr(text) ? m : `>${text}&lt;${d}`);
+  fixed = fixed.replace(/>([^<{}\n]*)<([^/a-zA-Z!{>\n])/g, (m, text, ch) => isJsExpr(text) ? m : `>${text}&lt;${ch}`);
   if (fixed !== beforeLtFix) {
     fixes.push("escaped < in JSX text content");
   }
@@ -1049,7 +1050,25 @@ ${selectImport}`
       for (const m of fixed.matchAll(/import\s*\{([^}]+)\}\s*from\s*["'](?!lucide-react)([^"']+)["']/g)) {
         m[1].split(",").map((s) => s.trim()).filter(Boolean).forEach((n) => nonLucideImports.add(n));
       }
-      const rawIconEntries = lucideImportMatch[1].split(",").map((s) => s.trim()).filter(Boolean);
+      let rawIconEntries = lucideImportMatch[1].split(",").map((s) => s.trim()).filter(Boolean);
+      const seenLocals = /* @__PURE__ */ new Map();
+      for (let i = 0; i < rawIconEntries.length; i++) {
+        const local = rawIconEntries[i].split(/\s+as\s+/).pop().trim();
+        if (seenLocals.has(local)) {
+          const prevIdx = seenLocals.get(local);
+          const prevHasAlias = rawIconEntries[prevIdx].includes(" as ");
+          const curHasAlias = rawIconEntries[i].includes(" as ");
+          if (curHasAlias && !prevHasAlias) {
+            rawIconEntries[prevIdx] = "";
+          } else {
+            rawIconEntries[i] = "";
+          }
+          fixes.push(`removed duplicate import ${local}`);
+        } else {
+          seenLocals.set(local, i);
+        }
+      }
+      rawIconEntries = rawIconEntries.filter(Boolean);
       const iconNames = rawIconEntries.map((entry) => {
         const parts = entry.split(/\s+as\s+/);
         return parts[0].trim();
@@ -1058,7 +1077,7 @@ ${selectImport}`
         const alias = entry.split(/\s+as\s+/).pop().trim();
         return nonLucideImports.has(alias);
       });
-      let newImport = lucideImportMatch[1];
+      let newImport = rawIconEntries.join(", ");
       for (const dup of duplicates) {
         const escaped = dup.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
         newImport = newImport.replace(new RegExp(`${escaped},?\\s*`), "");
@@ -1106,7 +1125,8 @@ ${selectImport}`
         }
         fixes.push(`invalid lucide icons: ${replacements.join(", ")}`);
       }
-      if (duplicates.length > 0 || invalid.length > 0) {
+      const dedupHappened = seenLocals.size < lucideImportMatch[1].split(",").filter((s) => s.trim()).length;
+      if (duplicates.length > 0 || invalid.length > 0 || dedupHappened) {
         const importedNames = [
           ...new Set(
             newImport.split(",").map((s) => s.trim()).filter(Boolean)
@@ -1132,7 +1152,10 @@ ${selectImport}`
     if (lucideExports2) {
       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));
+        m[1].split(",").map((s) => s.trim()).filter(Boolean).forEach((n) => {
+          const alias = n.split(/\s+as\s+/).pop().trim();
+          allImportedNames.add(alias);
+        });
       }
       for (const m of fixed.matchAll(/import\s+([A-Z]\w+)\s+from/g)) {
         allImportedNames.add(m[1]);

package/dist/{chunk-CC3ARMGS.js → chunk-RKXLSNDV.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-5AHG4NNX.js";
 import {
   autoFixCode
-} from "./chunk-H644LLXJ.js";
+} from "./chunk-NP2CGABX.js";
 
 // src/commands/chat/plan-generator.ts
 import { z } from "zod";

package/dist/code-generator-LTS6F77G.js

@@ -0,0 +1,30 @@
+import {
+  buildAppLayoutCode,
+  buildGroupLayoutCode,
+  ensureAppRouteGroupLayout,
+  ensureComponentsInstalled,
+  ensurePlanGroupLayouts,
+  regenerateComponent,
+  regenerateFiles,
+  regenerateLayout,
+  regeneratePage,
+  scanAndInstallSharedDeps,
+  validateAndFixGeneratedCode
+} from "./chunk-KUXMS2EF.js";
+import "./chunk-RKXLSNDV.js";
+import "./chunk-5AHG4NNX.js";
+import "./chunk-NP2CGABX.js";
+import "./chunk-3RG5ZIWI.js";
+export {
+  buildAppLayoutCode,
+  buildGroupLayoutCode,
+  ensureAppRouteGroupLayout,
+  ensureComponentsInstalled,
+  ensurePlanGroupLayouts,
+  regenerateComponent,
+  regenerateFiles,
+  regenerateLayout,
+  regeneratePage,
+  scanAndInstallSharedDeps,
+  validateAndFixGeneratedCode
+};