@hemia/lume 0.0.4 → 0.0.5

package/dist/index.js

@@ -477,37 +477,102 @@ ${result}`;
   }
   return result;
 }
+function extractColors(templateConfig) {
+  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]);
+  }
+  return radius;
+}
 function mergeTailwindConfig(existingConfig, templateConfig) {
-  const colorMatches = templateConfig.match(/colors:\s*\{([\s\S]*?)\}/);
-  const radiusMatches = templateConfig.match(/borderRadius:\s*\{([\s\S]*?)\}/);
+  const templateColors = extractColors(templateConfig);
+  const templateRadius = extractBorderRadius(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: {
+  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: {${colorsBlock.replace("colors:", "")}`
-      );
+      colors: {
+        ${colorName}: ${colorValue},
+      },`
+            );
+          }
+        }
+      }
     }
   }
-  if (radiusMatches) {
-    const radiusBlock = radiusMatches[0];
-    if (!result.includes("borderRadius:")) {
-      result = result.replace(
-        /theme:\s*\{/,
-        `theme: {
+  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: {${radiusBlock.replace("borderRadius:", "")}`
-      );
+      borderRadius: {
+        ${radiusName}: '${radiusValue}',
+      },`
+            );
+          }
+        }
+      }
     }
   }
-  if (!result.includes("colors:") && colorMatches) {
-    return templateConfig;
+  if (!result.includes("darkMode:") && templateConfig.includes("darkMode:")) {
+    const darkModeMatch = templateConfig.match(/darkMode:\s*\[[^\]]+\]/);
+    if (darkModeMatch) {
+      result = result.replace(
+        /export default \{/,
+        `export default {
+  ${darkModeMatch[0]},`
+      );
+    }
   }
   return result;
 }
@@ -530,6 +595,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 +622,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");
@@ -578,8 +645,6 @@ Options:
   }
   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.5",
   "type": "module",
   "files": ["dist"],
   "bin": {