@getcoherent/cli 0.3.2 → 0.3.4

package/dist/index.js

@@ -4483,11 +4483,17 @@ Format:
 LAYOUT CONTRACT (CRITICAL \u2014 prevents duplicate navigation and footer):
 - The app has a root layout (app/layout.tsx) that renders a shared Header and Footer.
 - Pages are rendered INSIDE this layout, between the Header and Footer.
-- NEVER include <header>, <nav>, or <footer> elements in pageCode.
+- NEVER include <header>, <nav>, or <footer> elements in pageCode. Also do NOT add a footer-like section at the bottom (no "\xA9 2024", no site links, no logo + nav links at the bottom).
 - Start page content with <main> or a wrapper <div>. The first visible element should be the page title or hero section.
 - If the page needs sub-navigation (tabs, breadcrumbs, sidebar nav), use elements like <div role="tablist"> or <aside> \u2014 NOT <header>, <nav>, or <footer>.
 - Do NOT add any navigation bars, logo headers, site-wide menus, or site footers to pages. The layout provides all of these.
 
+WIDTH CONSISTENCY (CRITICAL \u2014 prevents visual mismatch between header and content):
+- The shared Header and Footer use "mx-auto max-w-7xl px-4 sm:px-6 lg:px-8" for inner content.
+- ALL page content MUST use the same width constraint: wrap the outermost element content in "mx-auto max-w-7xl px-4 sm:px-6 lg:px-8" or use the same constraint on the <main> element.
+- Example: <main className="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8 py-6"> or a nested <div> with this class.
+- NEVER have page content at full width while header/footer are constrained \u2014 this looks broken.
+
 pageCode rules (shadcn/ui blocks quality):
 - Full Next.js App Router page. Imports from '@/components/ui/...' for registry components.
 - Follow ALL design constraints above: text-sm base, semantic colors only, restricted spacing, weight-based hierarchy.
@@ -6279,8 +6285,8 @@ async function autoFixCode(code) {
   fixed = fixed.replace(/&lt;=/g, "<=");
   fixed = fixed.replace(/&gt;=/g, ">=");
   fixed = fixed.replace(/&amp;&amp;/g, "&&");
-  fixed = fixed.replace(/(\w)\s*&lt;\s*(\d)/g, "$1 < $2");
-  fixed = fixed.replace(/(\w)\s*&gt;\s*(\d)/g, "$1 > $2");
+  fixed = fixed.replace(/([\w)\]])\s*&lt;\s*([\w(])/g, "$1 < $2");
+  fixed = fixed.replace(/([\w)\]])\s*&gt;\s*([\w(])/g, "$1 > $2");
   if (fixed !== beforeEntityFix) {
     fixes.push("Fixed syntax issues");
   }
@@ -6711,33 +6717,27 @@ async function regenerateLayout(config2, projectRoot) {
   }
   const hasSharedHeader = manifest?.shared.some((c) => c.type === "layout" && /header|nav/i.test(c.name)) ?? false;
   const hasSharedFooter = manifest?.shared.some((c) => c.type === "layout" && /footer/i.test(c.name)) ?? false;
-  if (hasSharedHeader) {
-    const code = await generator.generateLayout(layout, appType, { skipNav: true });
-    const layoutPath = resolve6(projectRoot, "app", "layout.tsx");
-    await writeFile(layoutPath, code);
-  } else {
-    const code = await generator.generateLayout(layout, appType, { skipNav: true });
-    const layoutPath = resolve6(projectRoot, "app", "layout.tsx");
-    await writeFile(layoutPath, code);
-    if (config2.navigation?.enabled && appType === "multi-page") {
-      const headerCode = generator.generateSharedHeaderCode();
+  const code = await generator.generateLayout(layout, appType, { skipNav: true });
+  const layoutPath = resolve6(projectRoot, "app", "layout.tsx");
+  await writeFile(layoutPath, code);
+  if (config2.navigation?.enabled && appType === "multi-page") {
+    const headerCode = generator.generateSharedHeaderCode();
+    await generateSharedComponent2(projectRoot, {
+      name: "Header",
+      type: "layout",
+      code: headerCode,
+      description: "Main site header with navigation and theme toggle",
+      usedIn: ["app/layout.tsx"]
+    });
+    if (!hasSharedFooter) {
+      const footerCode = generator.generateSharedFooterCode();
       await generateSharedComponent2(projectRoot, {
-        name: "Header",
+        name: "Footer",
         type: "layout",
-        code: headerCode,
-        description: "Main site header with navigation and theme toggle",
+        code: footerCode,
+        description: "Site footer",
         usedIn: ["app/layout.tsx"]
       });
-      if (!hasSharedFooter) {
-        const footerCode = generator.generateSharedFooterCode();
-        await generateSharedComponent2(projectRoot, {
-          name: "Footer",
-          type: "layout",
-          code: footerCode,
-          description: "Site footer",
-          usedIn: ["app/layout.tsx"]
-        });
-      }
     }
   }
   try {
@@ -7057,11 +7057,26 @@ function stripInlineLayoutElements(code) {
     result = result.replace(headerBlock, "");
     stripped.push("header");
   }
+  const navBlock = extractBalancedTag(result, "nav");
+  if (navBlock) {
+    result = result.replace(navBlock, "");
+    stripped.push("nav");
+  }
   const footerBlock = extractBalancedTag(result, "footer");
   if (footerBlock) {
     result = result.replace(footerBlock, "");
     stripped.push("footer");
   }
+  const commentFooterRe = /\s*\{\/\*\s*Footer\s*\*\/\}\s*\n/i;
+  const commentMatch = result.match(commentFooterRe);
+  if (commentMatch && commentMatch.index != null) {
+    const afterComment = result.slice(commentMatch.index + commentMatch[0].length);
+    const divBlock = extractBalancedTag(afterComment, "div");
+    if (divBlock) {
+      result = result.replace(commentMatch[0] + divBlock, "");
+      stripped.push("footer (div)");
+    }
+  }
   if (stripped.length > 0) {
     result = result.replace(/\n{3,}/g, "\n\n");
   }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "CLI interface for Coherent Design Method",
   "type": "module",
   "main": "./dist/index.js",