@ng-shangjc/cli 1.0.5-beta → 1.0.7-beta

package/dist/commands/init.js

@@ -170,13 +170,13 @@ async function setupTailwind() {
     if (fs.existsSync(stylesPath)) {
         existingContent = await fs.readFile(stylesPath, 'utf8');
     }
-    // Check if Tailwind import already exists
-    const hasTailwindImport = existingContent.includes("@import 'tailwindcss';");
-    let newContent = '';
-    // Add Tailwind import if not present
-    if (!hasTailwindImport) {
-        newContent += "@import 'tailwindcss';\n";
-    }
+    // Remove existing Tailwind import and clean up extra blank lines
+    const cleanedContent = existingContent
+        .replace(/@import\s+['"]tailwindcss['"];?\s*\n?/gi, '')
+        .replace(/\n\s*\n\s*\n/g, '\n\n')
+        .trim();
+    // Always start with Tailwind import
+    let newContent = "@import 'tailwindcss';\n";
     // Add dark mode custom variant if user wants dark mode
     const config = await fs.readJson('shangjc.config.json');
     if (config.theme === 'dark' || config.theme === 'both') {
@@ -278,42 +278,44 @@ async function setupTailwind() {
 }
 `;
     // Preserve existing styles after the theme
-    if (existingContent && !hasTailwindImport) {
-        // If file existed but didn't have tailwind import, keep existing content
-        const existingWithoutTailwind = existingContent;
-        if (existingWithoutTailwind.trim()) {
-            newContent += '\n\n' + existingWithoutTailwind;
-        }
-    }
-    else if (existingContent && hasTailwindImport) {
-        // If file had tailwind import, remove the old theme and keep other styles
-        const lines = existingContent.split('\n');
-        const afterThemeLines = [];
-        let inThemeBlock = false;
-        let foundTheme = false;
-        for (const line of lines) {
-            if (line.includes('@theme {') || line.includes(':root {') || line.includes('.dark {') || line.includes('@layer base {')) {
-                inThemeBlock = true;
-                foundTheme = true;
+    if (cleanedContent) {
+        // Remove any existing theme blocks from the preserved content
+        const lines = cleanedContent.split('\n');
+        const preservedLines = [];
+        let inThemeSection = false;
+        for (let i = 0; i < lines.length; i++) {
+            const line = lines[i];
+            const trimmedLine = line.trim();
+            // Skip theme-related blocks but preserve everything else
+            if (trimmedLine.startsWith('@theme {') ||
+                trimmedLine.startsWith(':root {') ||
+                trimmedLine.startsWith('.dark {') ||
+                trimmedLine.startsWith('@custom-variant dark')) {
+                inThemeSection = true;
                 continue;
             }
-            if (inThemeBlock && line.includes('}') && !line.includes('@layer')) {
-                inThemeBlock = false;
+            if (inThemeSection && trimmedLine === '}' &&
+                !lines[i + 1]?.trim().startsWith('@layer')) {
+                inThemeSection = false;
                 continue;
             }
-            if (inThemeBlock && line.includes('@layer base {')) {
-                // Skip the old @layer base content
+            if (trimmedLine.startsWith('@layer base {')) {
+                inThemeSection = true;
                 continue;
             }
-            if (inThemeBlock) {
+            if (inThemeSection && trimmedLine === '}' &&
+                lines[i - 1]?.trim().startsWith('@layer base')) {
+                inThemeSection = false;
                 continue;
             }
-            if (foundTheme && line.trim()) {
-                afterThemeLines.push(line);
+            if (inThemeSection) {
+                continue;
             }
+            // Preserve this line
+            preservedLines.push(line);
         }
-        if (afterThemeLines.length > 0) {
-            newContent += '\n\n' + afterThemeLines.join('\n');
+        if (preservedLines.length > 0) {
+            newContent += '\n\n' + preservedLines.join('\n');
         }
     }
     // Write the updated content

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ng-shangjc/cli",
-  "version": "1.0.5-beta",
+  "version": "1.0.7-beta",
   "bin": {
     "ng-shangjc": "./dist/index.js"
   },

package/src/commands/init.ts

@@ -143,15 +143,14 @@ async function setupTailwind() {
     existingContent = await fs.readFile(stylesPath, 'utf8');
   }
 
-  // Check if Tailwind import already exists
-  const hasTailwindImport = existingContent.includes("@import 'tailwindcss';");
-  
-  let newContent = '';
-  
-  // Add Tailwind import if not present
-  if (!hasTailwindImport) {
-    newContent += "@import 'tailwindcss';\n";
-  }
+  // Remove existing Tailwind import and clean up extra blank lines
+  const cleanedContent = existingContent
+    .replace(/@import\s+['"]tailwindcss['"];?\s*\n?/gi, '')
+    .replace(/\n\s*\n\s*\n/g, '\n\n')
+    .trim();
+
+  // Always start with Tailwind import
+  let newContent = "@import 'tailwindcss';\n";
   
   // Add dark mode custom variant if user wants dark mode
   const config = await fs.readJson('shangjc.config.json');
@@ -256,43 +255,52 @@ async function setupTailwind() {
 `;
 
   // Preserve existing styles after the theme
-  if (existingContent && !hasTailwindImport) {
-    // If file existed but didn't have tailwind import, keep existing content
-    const existingWithoutTailwind = existingContent;
-    if (existingWithoutTailwind.trim()) {
-      newContent += '\n\n' + existingWithoutTailwind;
-    }
-  } else if (existingContent && hasTailwindImport) {
-    // If file had tailwind import, remove the old theme and keep other styles
-    const lines = existingContent.split('\n');
-    const afterThemeLines = [];
-    let inThemeBlock = false;
-    let foundTheme = false;
+  if (cleanedContent) {
+    // Remove any existing theme blocks from the preserved content
+    const lines = cleanedContent.split('\n');
+    const preservedLines = [];
+    let inThemeSection = false;
     
-    for (const line of lines) {
-      if (line.includes('@theme {') || line.includes(':root {') || line.includes('.dark {') || line.includes('@layer base {')) {
-        inThemeBlock = true;
-        foundTheme = true;
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
+      const trimmedLine = line.trim();
+      
+      // Skip theme-related blocks but preserve everything else
+      if (trimmedLine.startsWith('@theme {') || 
+          trimmedLine.startsWith(':root {') || 
+          trimmedLine.startsWith('.dark {') ||
+          trimmedLine.startsWith('@custom-variant dark')) {
+        inThemeSection = true;
         continue;
       }
-      if (inThemeBlock && line.includes('}') && !line.includes('@layer')) {
-        inThemeBlock = false;
+      
+      if (inThemeSection && trimmedLine === '}' && 
+          !lines[i + 1]?.trim().startsWith('@layer')) {
+        inThemeSection = false;
         continue;
       }
-      if (inThemeBlock && line.includes('@layer base {')) {
-        // Skip the old @layer base content
+      
+      if (trimmedLine.startsWith('@layer base {')) {
+        inThemeSection = true;
         continue;
       }
-      if (inThemeBlock) {
+      
+      if (inThemeSection && trimmedLine === '}' && 
+          lines[i - 1]?.trim().startsWith('@layer base')) {
+        inThemeSection = false;
         continue;
       }
-      if (foundTheme && line.trim()) {
-        afterThemeLines.push(line);
+      
+      if (inThemeSection) {
+        continue;
       }
+      
+      // Preserve this line
+      preservedLines.push(line);
     }
     
-    if (afterThemeLines.length > 0) {
-      newContent += '\n\n' + afterThemeLines.join('\n');
+    if (preservedLines.length > 0) {
+      newContent += '\n\n' + preservedLines.join('\n');
     }
   }