@hemia/lume 0.0.4 → 0.0.6

package/dist/index.js

@@ -477,37 +477,123 @@ ${result}`;
   }
   return result;
 }
+function parseTailwindTheme(config) {
+  const colors = /* @__PURE__ */ new Map();
+  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 result;
+}
 function mergeTailwindConfig(existingConfig, templateConfig) {
-  const colorMatches = templateConfig.match(/colors:\s*\{([\s\S]*?)\}/);
-  const radiusMatches = templateConfig.match(/borderRadius:\s*\{([\s\S]*?)\}/);
+  const existing = parseTailwindTheme(existingConfig);
+  const template = parseTailwindTheme(templateConfig);
   let result = existingConfig;
   if (!result.includes("theme:")) {
     return templateConfig;
   }
-  if (colorMatches) {
-    const colorsBlock = colorMatches[0];
-    if (!result.includes("colors:")) {
-      result = result.replace(
-        /theme:\s*\{/,
-        `theme: {
-    extend: {
-      colors: {${colorsBlock.replace("colors:", "")}`
-      );
-    }
+  const mergedColors = /* @__PURE__ */ new Map();
+  for (const [name, value] of existing.colors) {
+    mergedColors.set(name, value);
   }
-  if (radiusMatches) {
-    const radiusBlock = radiusMatches[0];
-    if (!result.includes("borderRadius:")) {
-      result = result.replace(
-        /theme:\s*\{/,
-        `theme: {
-    extend: {
-      borderRadius: {${radiusBlock.replace("borderRadius:", "")}`
-      );
-    }
+  for (const [name, value] of template.colors) {
+    mergedColors.set(name, value);
   }
-  if (!result.includes("colors:") && colorMatches) {
-    return templateConfig;
+  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;
 }
@@ -530,6 +616,15 @@ function detectFramework(cwd) {
     return "vue";
   }
 }
+function detectTailwindConfigExtension(cwd) {
+  const extensions = ["js", "ts", "mjs", "cjs"];
+  for (const ext of extensions) {
+    if (fs4.existsSync(path4.resolve(cwd, `tailwind.config.${ext}`))) {
+      return ext;
+    }
+  }
+  return "js";
+}
 async function addStyles(_args = [], options = {}) {
   if (options.silent === void 0 && process.argv.includes("--help") || process.argv.includes("-h")) {
     console.log(`
@@ -548,15 +643,8 @@ Options:
     return;
   }
   const cwd = options.cwd ? path4.resolve(options.cwd) : process.cwd();
-  function detectTailwindConfigExtension(cwd2) {
-    const extensions = ["js", "ts", "mjs", "cjs"];
-    for (const ext of extensions) {
-      if (fs4.existsSync(path4.resolve(cwd2, `tailwind.config.${ext}`))) {
-        return ext;
-      }
-    }
-    return "js";
-  }
+  const tailwindExt = detectTailwindConfigExtension(cwd);
+  const tailwindTemplate = tailwindExt === "js" ? TAILWIND_CONFIG_TEMPLATE_JS : TAILWIND_CONFIG_TEMPLATE;
   const configPath = path4.resolve(cwd, "lume.config.json");
   if (!await fs4.pathExists(configPath)) {
     const cssPath2 = path4.resolve(cwd, "src/assets/globals.css");
@@ -577,9 +665,6 @@ Options:
     process.exit(1);
   }
   const framework = detectFramework(cwd);
-  const templateConfig = getTemplateConfig(framework);
-  const tailwindExt = detectTailwindConfigExtension(cwd);
-  const tailwindTemplate = tailwindExt === "js" ? TAILWIND_CONFIG_TEMPLATE_JS : tailwindTemplate;
   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.4",
+  "version": "0.0.6",
   "type": "module",
   "files": ["dist"],
   "bin": {