@hemia/lume 0.0.5 → 0.0.6

package/dist/index.js

@@ -477,102 +477,123 @@ ${result}`;
   }
   return result;
 }
-function extractColors(templateConfig) {
+function parseTailwindTheme(config) {
   const colors = /* @__PURE__ */ new Map();
-  const colorsMatch = templateConfig.match(/colors:\s*\{([\s\S]*?)\n\s*\}/);
-  if (!colorsMatch) return colors;
-  const colorsBlock = colorsMatch[1];
-  const colorRegex = /([a-zA-Z0-9-]+):\s*\{([^}]+)\}/g;
-  let match;
-  while ((match = colorRegex.exec(colorsBlock)) !== null) {
-    const colorName = match[1];
-    const colorValue = match[2].trim();
-    colors.set(colorName, colorValue);
-  }
-  return colors;
-}
-function extractBorderRadius(templateConfig) {
-  const radius = /* @__PURE__ */ new Map();
-  const radiusMatch = templateConfig.match(/borderRadius:\s*\{([\s\S]*?)\n\s*\}/);
-  if (!radiusMatch) return radius;
-  const radiusBlock = radiusMatch[1];
-  const radiusRegex = /([a-zA-Z0-9-]+):\s*['"`]([^'"`]+)['"`]/g;
-  let match;
-  while ((match = radiusRegex.exec(radiusBlock)) !== null) {
-    radius.set(match[1], match[2]);
+  const borderRadius = /* @__PURE__ */ new Map();
+  let darkMode = null;
+  const darkModeMatch = config.match(/darkMode:\s*([^\n,]+)/);
+  if (darkModeMatch) {
+    darkMode = darkModeMatch[1].trim();
+  }
+  const colorsMatch = config.match(/colors:\s*\{([^}]+(?:\{[^}]+\})?[^}]*)\}/);
+  if (colorsMatch) {
+    const colorsBlock = colorsMatch[1];
+    const simpleColorRegex = /([a-zA-Z0-9-]+):\s*["']([^"']+)["']/g;
+    let match;
+    while ((match = simpleColorRegex.exec(colorsBlock)) !== null) {
+      colors.set(match[1], `"${match[2]}"`);
+    }
+    const nestedColorRegex = /([a-zA-Z0-9-]+):\s*\{[^}]*DEFAULT:\s*["']([^"']+)["']/g;
+    while ((match = nestedColorRegex.exec(colorsBlock)) !== null) {
+      colors.set(match[1], `{ DEFAULT: "${match[2]}" }`);
+    }
+  }
+  const radiusMatch = config.match(/borderRadius:\s*\{([^}]+)\}/);
+  if (radiusMatch) {
+    const radiusBlock = radiusMatch[1];
+    const radiusRegex = /([a-zA-Z0-9-]+):\s*["']([^"']+)["']/g;
+    let match;
+    while ((match = radiusRegex.exec(radiusBlock)) !== null) {
+      borderRadius.set(match[1], `"${match[2]}"`);
+    }
+  }
+  return { colors, borderRadius, darkMode };
+}
+function rebuildThemeExtend(existingConfig, mergedColors, mergedRadius) {
+  let result = existingConfig;
+  const colorsEntries = Array.from(mergedColors.entries()).map(([name, value]) => {
+    const needsQuotes = name.includes("-");
+    return needsQuotes ? `    "${name}": ${value},` : `    ${name}: ${value},`;
+  }).join("\n");
+  const radiusEntries = Array.from(mergedRadius.entries()).map(([name, value]) => `    ${name}: ${value},`).join("\n");
+  const hasColors = result.includes("colors:");
+  const hasRadius = result.includes("borderRadius:");
+  const hasExtend = result.includes("extend:");
+  if (!hasExtend) {
+    const extendBlock = `theme: {
+  extend: {
+    colors: {
+${colorsEntries}
+    },
+    borderRadius: {
+${radiusEntries}
+    },
+  },
+}`;
+    return result.replace(/theme:\s*\{/, extendBlock);
+  }
+  if (hasColors) {
+    result = result.replace(
+      /colors:\s*\{[\s\S]*?\n\s{4}\}/,
+      `colors: {
+${colorsEntries}
+  }`
+    );
+  } else {
+    result = result.replace(
+      /extend:\s*\{/,
+      `extend: {
+    colors: {
+${colorsEntries}
+    },`
+    );
+  }
+  if (hasRadius) {
+    result = result.replace(
+      /borderRadius:\s*\{[\s\S]*?\n\s{4}\}/,
+      `borderRadius: {
+${radiusEntries}
+  }`
+    );
+  } else {
+    result = result.replace(
+      /extend:\s*\{/,
+      `extend: {
+    borderRadius: {
+${radiusEntries}
+    },`
+    );
   }
-  return radius;
+  return result;
 }
 function mergeTailwindConfig(existingConfig, templateConfig) {
-  const templateColors = extractColors(templateConfig);
-  const templateRadius = extractBorderRadius(templateConfig);
+  const existing = parseTailwindTheme(existingConfig);
+  const template = parseTailwindTheme(templateConfig);
   let result = existingConfig;
   if (!result.includes("theme:")) {
     return templateConfig;
   }
-  if (templateColors.size > 0) {
-    for (const [colorName, colorValue] of templateColors) {
-      if (!result.includes(`${colorName}:`)) {
-        const themeMatch = result.match(/theme:\s*\{/);
-        if (themeMatch) {
-          if (result.includes("extend:")) {
-            result = result.replace(
-              /extend:\s*\{/,
-              `extend: {
-      colors: {
-        ${colorName}: ${colorValue},
-      },`
-            );
-          } else {
-            result = result.replace(
-              /theme:\s*\{/,
-              `theme: {
-    extend: {
-      colors: {
-        ${colorName}: ${colorValue},
-      },`
-            );
-          }
-        }
-      }
-    }
+  const mergedColors = /* @__PURE__ */ new Map();
+  for (const [name, value] of existing.colors) {
+    mergedColors.set(name, value);
   }
-  if (templateRadius.size > 0) {
-    for (const [radiusName, radiusValue] of templateRadius) {
-      if (!result.includes(`${radiusName}:`)) {
-        const themeMatch = result.match(/theme:\s*\{/);
-        if (themeMatch) {
-          if (result.includes("extend:")) {
-            result = result.replace(
-              /extend:\s*\{/,
-              `extend: {
-      borderRadius: {
-        ${radiusName}: '${radiusValue}',
-      },`
-            );
-          } else {
-            result = result.replace(
-              /theme:\s*\{/,
-              `theme: {
-    extend: {
-      borderRadius: {
-        ${radiusName}: '${radiusValue}',
-      },`
-            );
-          }
-        }
-      }
-    }
+  for (const [name, value] of template.colors) {
+    mergedColors.set(name, value);
   }
-  if (!result.includes("darkMode:") && templateConfig.includes("darkMode:")) {
-    const darkModeMatch = templateConfig.match(/darkMode:\s*\[[^\]]+\]/);
-    if (darkModeMatch) {
-      result = result.replace(
-        /export default \{/,
-        `export default {
-  ${darkModeMatch[0]},`
-      );
-    }
+  const mergedRadius = /* @__PURE__ */ new Map();
+  for (const [name, value] of existing.borderRadius) {
+    mergedRadius.set(name, value);
+  }
+  for (const [name, value] of template.borderRadius) {
+    mergedRadius.set(name, value);
+  }
+  result = rebuildThemeExtend(result, mergedColors, mergedRadius);
+  if (!result.includes("darkMode:") && template.darkMode) {
+    result = result.replace(
+      /export default \{/,
+      `export default {
+  darkMode: ${template.darkMode},`
+    );
   }
   return result;
 }
@@ -644,7 +665,6 @@ Options:
     process.exit(1);
   }
   const framework = detectFramework(cwd);
-  const templateConfig = getTemplateConfig(framework);
   const cssPath = path4.resolve(cwd, configPaths.globalsCssPath);
   const tailwindPath = path4.resolve(cwd, configPaths.tailwindConfigPath);
   const cssExists = await fs4.pathExists(cssPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hemia/lume",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "type": "module",
   "files": ["dist"],
   "bin": {