create-z3 0.0.10 → 0.0.13

package/dist/index.js

@@ -72,7 +72,10 @@ async function copyTemplate(framework, targetPath) {
   const __filename2 = fileURLToPath(import.meta.url);
   const __dirname2 = dirname(__filename2);
   const templateDir = framework === "tanstack" ? "tanstack-start" : "nextjs";
-  const templatePath = join(__dirname2, "../templates", templateDir);
+  let templatePath = join(__dirname2, "../../templates", templateDir);
+  if (!fs2.existsSync(templatePath)) {
+    templatePath = join(__dirname2, "../templates", templateDir);
+  }
   await fs2.copy(templatePath, targetPath, {
     overwrite: false,
     errorOnExist: false
@@ -1725,25 +1728,25 @@ function getAdditionalProviders() {
 
 // src/installers/string-utils.ts
 import fs3 from "fs-extra";
-var DEFAULT_THEME = `--background: 0 0% 100%;
---foreground: 240 10% 3.9%;
---card: 0 0% 100%;
---card-foreground: 240 10% 3.9%;
---popover: 0 0% 100%;
---popover-foreground: 240 10% 3.9%;
---primary: 240 5.9% 10%;
---primary-foreground: 0 0% 98%;
---secondary: 240 4.8% 95.9%;
---secondary-foreground: 240 5.9% 10%;
---muted: 240 4.8% 95.9%;
---muted-foreground: 240 3.8% 46.1%;
---accent: 240 4.8% 95.9%;
---accent-foreground: 240 5.9% 10%;
---destructive: 0 84.2% 60.2%;
---destructive-foreground: 0 0% 98%;
---border: 240 5.9% 90%;
---input: 240 5.9% 90%;
---ring: 240 5.9% 10%;
+var DEFAULT_THEME = `--background: 100% 0.000 0;
+--foreground: 3.9% 0.006 240;
+--card: 100% 0.000 0;
+--card-foreground: 3.9% 0.006 240;
+--popover: 100% 0.000 0;
+--popover-foreground: 3.9% 0.006 240;
+--primary: 10% 0.003 240;
+--primary-foreground: 98% 0.000 0;
+--secondary: 95.9% 0.002 240;
+--secondary-foreground: 10% 0.003 240;
+--muted: 95.9% 0.002 240;
+--muted-foreground: 46.1% 0.002 240;
+--accent: 95.9% 0.002 240;
+--accent-foreground: 10% 0.003 240;
+--destructive: 60.2% 0.168 0;
+--destructive-foreground: 98% 0.000 0;
+--border: 90% 0.003 240;
+--input: 90% 0.003 240;
+--ring: 10% 0.003 240;
 --radius: 0.5rem;`;
 function detectIndentation(line) {
   const match = line.match(/^(\s*)/);
@@ -1927,6 +1930,129 @@ import { join as join2 } from "path";
 import { execa } from "execa";
 import ora from "ora";
 import crypto from "crypto";
+
+// src/utils/tweakcn-converter.ts
+import fs4 from "fs-extra";
+import convert from "color-convert";
+async function convertTweakCNToOKLCH(options) {
+  const { source, format = "oklch" } = options;
+  const cssContent = await fetchOrReadCSS(source);
+  const colors = parseColorsFromCSS(cssContent);
+  const convertedColors = colors.map((color) => ({
+    ...color,
+    oklch: convertColorToOKLCH(color.value)
+  }));
+  return generateCSSOutput(convertedColors, format);
+}
+async function fetchOrReadCSS(source) {
+  if (source.startsWith("http://") || source.startsWith("https://")) {
+    try {
+      const response = await fetch(source);
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+      }
+      return await response.text();
+    } catch (error) {
+      throw new Error(
+        `Failed to fetch CSS from URL: ${error instanceof Error ? error.message : "Unknown error"}`
+      );
+    }
+  }
+  try {
+    return await fs4.readFile(source, "utf-8");
+  } catch (error) {
+    throw new Error(
+      `Failed to read CSS from file: ${error instanceof Error ? error.message : "Unknown error"}`
+    );
+  }
+}
+function parseColorsFromCSS(css) {
+  const colors = [];
+  const cssVarRegex = /--([\w-]+)\s*:\s*([^;]+);/g;
+  let match;
+  while ((match = cssVarRegex.exec(css)) !== null) {
+    const name = `--${match[1]}`;
+    const value = match[2].trim();
+    if (isColorValue(value)) {
+      colors.push({ name, value });
+    }
+  }
+  return colors;
+}
+function isColorValue(value) {
+  if (value.startsWith("#")) {
+    return true;
+  }
+  if (value.startsWith("rgb(") || value.startsWith("rgba(")) {
+    return true;
+  }
+  if (value.startsWith("hsl(") || value.startsWith("hsla(")) {
+    return true;
+  }
+  if (value.startsWith("oklch(")) {
+    return true;
+  }
+  if (/^\d+(\.\d+)?\s+\d+(\.\d+)?%\s+\d+(\.\d+)?%$/.test(value)) {
+    return true;
+  }
+  return false;
+}
+function convertColorToOKLCH(colorValue) {
+  const trimmed = colorValue.trim();
+  if (trimmed.startsWith("oklch(")) {
+    const match = trimmed.match(/oklch\(([\d.]+%?)\s+([\d.]+)\s+([\d.]+)\)/);
+    if (match) {
+      return `${match[1]} ${match[2]} ${match[3]}`;
+    }
+  }
+  let rgb;
+  try {
+    if (trimmed.startsWith("#")) {
+      rgb = convert.hex.rgb(trimmed.slice(1));
+    } else if (trimmed.startsWith("rgb(") || trimmed.startsWith("rgba(")) {
+      const match = trimmed.match(/rgba?\((\d+),?\s*(\d+),?\s*(\d+)/);
+      if (!match) throw new Error("Invalid RGB format");
+      rgb = [parseInt(match[1]), parseInt(match[2]), parseInt(match[3])];
+    } else if (trimmed.startsWith("hsl(") || trimmed.startsWith("hsla(")) {
+      const match = trimmed.match(/hsla?\((\d+),?\s*(\d+)%?,?\s*(\d+)%?/);
+      if (!match) throw new Error("Invalid HSL format");
+      const hsl2 = [
+        parseInt(match[1]),
+        parseInt(match[2]),
+        parseInt(match[3])
+      ];
+      rgb = convert.hsl.rgb(hsl2);
+    } else if (/^\d+(\.\d+)?\s+\d+(\.\d+)?%\s+\d+(\.\d+)?%$/.test(trimmed)) {
+      const parts = trimmed.split(/\s+/);
+      const h2 = parseFloat(parts[0]);
+      const s = parseFloat(parts[1].replace("%", ""));
+      const l2 = parseFloat(parts[2].replace("%", ""));
+      rgb = convert.hsl.rgb([h2, s, l2]);
+    } else {
+      return trimmed;
+    }
+    const hsl = convert.rgb.hsl(rgb);
+    const l = hsl[2];
+    const c = hsl[1] / 100 * 0.4;
+    const h = hsl[0];
+    return `${l}% ${c.toFixed(3)} ${h}`;
+  } catch (error) {
+    console.warn(`Failed to convert color "${colorValue}": ${error instanceof Error ? error.message : "Unknown error"}`);
+    return trimmed;
+  }
+}
+function generateCSSOutput(colors, format) {
+  if (colors.length === 0) {
+    return "";
+  }
+  const declarations = colors.map((color) => {
+    const value = format === "oklch" && color.oklch ? color.oklch : color.value;
+    return `${color.name}: ${value};`;
+  }).join("\n");
+  return declarations;
+}
+
+// src/installers/base.ts
 var FrameworkInstaller = class {
   /**
    * Constructor for FrameworkInstaller
@@ -1947,24 +2073,22 @@ var FrameworkInstaller = class {
   }
   /**
    * Detect the package manager used to invoke the CLI
-   * Checks npm_config_user_agent environment variable
+   * Checks environment variables set by package managers
    *
-   * @returns Detected package manager, defaults to 'npm'
+   * @returns Detected package manager ('npm', 'yarn', 'pnpm', or 'bun')
    */
   detectPackageManager() {
-    const userAgent = process.env.npm_config_user_agent || "";
-    if (userAgent.includes("pnpm")) {
-      return "pnpm";
-    } else if (userAgent.includes("yarn")) {
-      return "yarn";
-    } else if (userAgent.includes("bun")) {
-      return "bun";
+    const userAgent = process.env.npm_config_user_agent;
+    if (userAgent) {
+      if (userAgent.includes("pnpm")) return "pnpm";
+      if (userAgent.includes("yarn")) return "yarn";
+      if (userAgent.includes("bun")) return "bun";
     }
     return "npm";
   }
   /**
    * Install project dependencies using detected package manager
-   * Shows progress with ora spinner
+   * Shows progress spinner during installation
    */
   async installDependencies() {
     const packageManager = this.detectPackageManager();
@@ -1974,21 +2098,21 @@ var FrameworkInstaller = class {
         cwd: this.targetPath,
         stdio: "pipe"
       });
-      spinner.succeed(`Dependencies installed with ${packageManager}`);
+      spinner.succeed("Dependencies installed successfully");
     } catch (error) {
-      spinner.fail(`Failed to install dependencies with ${packageManager}`);
+      spinner.fail("Failed to install dependencies");
       throw new Error(
         `Dependency installation failed: ${error instanceof Error ? error.message : "Unknown error"}`
       );
     }
   }
   /**
-   * Format generated files using the project's format command
-   * Runs after all file modifications to ensure consistent code style
+   * Format code using project's formatter (Prettier via package.json script)
+   * Non-blocking - continues even if formatting fails
    */
   async formatCode() {
     const packageManager = this.detectPackageManager();
-    const spinner = ora("Formatting generated files...").start();
+    const spinner = ora("Formatting code...").start();
     try {
       await execa(packageManager, ["run", "format"], {
         cwd: this.targetPath,
@@ -2072,13 +2196,15 @@ Make sure you are authenticated with GitHub CLI (run "gh auth login")`
     return crypto.randomBytes(32).toString("hex");
   }
   /**
-   * Fetch TweakCN theme CSS from URL
+   * Fetch TweakCN theme CSS from URL and convert to OKLCH format
    * Handles network errors and provides retry suggestions
+   * Optionally converts fetched theme through OKLCH converter for consistent color format
    *
    * @param url - URL to fetch theme from
-   * @returns Theme CSS content
+   * @param convertToOklch - Whether to convert theme colors to OKLCH format (default: true)
+   * @returns Theme CSS content in OKLCH format (if conversion enabled)
    */
-  async fetchThemeFromUrl(url) {
+  async fetchThemeFromUrl(url, convertToOklch = true) {
     const spinner = ora("Fetching TweakCN theme...").start();
     try {
       const response = await fetch(url);
@@ -2087,6 +2213,23 @@ Make sure you are authenticated with GitHub CLI (run "gh auth login")`
       }
       const content = await response.text();
       spinner.succeed("TweakCN theme fetched");
+      if (convertToOklch) {
+        const convertSpinner = ora("Converting theme to OKLCH format...").start();
+        try {
+          const convertedContent = await convertTweakCNToOKLCH({
+            source: url,
+            format: "oklch"
+          });
+          convertSpinner.succeed("Theme converted to OKLCH format");
+          return convertedContent;
+        } catch (convertError) {
+          convertSpinner.warn("OKLCH conversion failed, using raw theme CSS");
+          console.warn(
+            `Warning: Failed to convert theme to OKLCH: ${convertError instanceof Error ? convertError.message : "Unknown error"}`
+          );
+          return content;
+        }
+      }
       return content;
     } catch (error) {
       spinner.fail("Failed to fetch TweakCN theme");
@@ -2111,55 +2254,65 @@ Please check the URL and your internet connection, then try again.`
       copySpinner.fail("Failed to copy template files");
       throw error;
     }
-    if (options.emailPasswordAuth || options.oauthProviders.length > 0) {
-      const authSpinner = ora("Configuring authentication...").start();
-      try {
-        await this.updateOAuthConfig(options.oauthProviders, options.emailPasswordAuth);
+    const authSpinner = ora("Configuring authentication...").start();
+    try {
+      await this.updateOAuthConfig(options.oauthProviders, options.emailPasswordAuth);
+      if (options.emailPasswordAuth || options.oauthProviders.length > 0) {
         authSpinner.succeed("Authentication configuration updated");
-      } catch (error) {
-        authSpinner.fail("Failed to configure authentication");
-        throw error;
+      } else {
+        authSpinner.succeed("Authentication placeholders cleaned up");
       }
+    } catch (error) {
+      authSpinner.fail("Failed to configure authentication");
+      throw error;
     }
-    if (options.oauthProviders.length > 0) {
-      const oauthUISpinner = ora("Configuring OAuth UI...").start();
-      try {
-        await this.updateOAuthUIConfig(options.oauthProviders);
+    const oauthUISpinner = ora("Configuring OAuth UI...").start();
+    try {
+      await this.updateOAuthUIConfig(options.oauthProviders);
+      if (options.oauthProviders.length > 0) {
         oauthUISpinner.succeed("OAuth UI configuration updated");
-      } catch (error) {
-        oauthUISpinner.fail("Failed to configure OAuth UI");
-        throw error;
+      } else {
+        oauthUISpinner.succeed("OAuth UI placeholders cleaned up");
       }
+    } catch (error) {
+      oauthUISpinner.fail("Failed to configure OAuth UI");
+      throw error;
     }
-    if (options.oauthProviders.length > 0) {
-      const envSpinner = ora("Updating .env.example...").start();
-      try {
-        await this.updateEnvExample(options.oauthProviders);
+    const envSpinner = ora("Updating .env.example...").start();
+    try {
+      await this.updateEnvExample(options.oauthProviders);
+      if (options.oauthProviders.length > 0) {
         envSpinner.succeed(".env.example updated");
-      } catch (error) {
-        envSpinner.fail("Failed to update .env.example");
-        throw error;
+      } else {
+        envSpinner.succeed(".env.example placeholders cleaned up");
       }
+    } catch (error) {
+      envSpinner.fail("Failed to update .env.example");
+      throw error;
     }
-    if (options.oauthProviders.length > 0) {
-      const envTsSpinner = ora("Updating typed env configuration...").start();
-      try {
-        await this.updateEnvTs(options.oauthProviders);
+    const envTsSpinner = ora("Updating typed env configuration...").start();
+    try {
+      await this.updateEnvTs(options.oauthProviders);
+      if (options.oauthProviders.length > 0) {
         envTsSpinner.succeed("Typed env configuration updated");
-      } catch (error) {
-        envTsSpinner.fail("Failed to update typed env configuration");
-        throw error;
+      } else {
+        envTsSpinner.succeed("Typed env placeholders cleaned up");
       }
+    } catch (error) {
+      envTsSpinner.fail("Failed to update typed env configuration");
+      throw error;
     }
-    if (options.oauthProviders.length > 0) {
-      const readmeSpinner = ora("Updating README...").start();
-      try {
-        await this.updateReadme(options.oauthProviders);
+    const readmeSpinner = ora("Updating README...").start();
+    try {
+      await this.updateReadme(options.oauthProviders);
+      if (options.oauthProviders.length > 0) {
         readmeSpinner.succeed("README updated");
-      } catch (error) {
-        readmeSpinner.fail("Failed to update README");
-        throw error;
+      } else {
+        readmeSpinner.succeed("README placeholders cleaned up");
       }
+    } catch (error) {
+      readmeSpinner.fail("Failed to update README");
+      throw error;
     }
     const themeSpinner = ora("Applying theme...").start();
     try {
@@ -2167,16 +2320,17 @@ Please check the URL and your internet connection, then try again.`
       if (options.tweakcnTheme) {
         if (options.tweakcnTheme.type === "url") {
           themeContent = await this.fetchThemeFromUrl(options.tweakcnTheme.content);
+        } else if (options.tweakcnTheme.type === "css") {
+          themeContent = options.tweakcnTheme.content;
         } else {
           themeContent = options.tweakcnTheme.content;
         }
+        await this.applyTweakCNTheme(themeContent);
+        themeSpinner.succeed("TweakCN theme applied");
       } else {
-        themeContent = DEFAULT_THEME;
+        await this.applyTweakCNTheme(DEFAULT_THEME);
+        themeSpinner.succeed("Default theme applied");
       }
-      await this.applyTweakCNTheme(themeContent);
-      themeSpinner.succeed(
-        options.tweakcnTheme ? "TweakCN theme applied" : "Default theme applied"
-      );
     } catch (error) {
       themeSpinner.fail("Failed to apply theme");
       throw error;
@@ -2186,7 +2340,6 @@ Please check the URL and your internet connection, then try again.`
     }
     if (options.installDependencies) {
       await this.installDependencies();
-      await this.formatCode();
     }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-z3",
-  "version": "0.0.10",
+  "version": "0.0.13",
   "type": "module",
   "description": "CLI for scaffolding Z3 Stack applications (TanStack/Next.js + Convex + Better Auth)",
   "bin": {
@@ -25,7 +25,8 @@
     "ora": "^8.1.0",
     "execa": "^9.5.2",
     "sort-package-json": "^2.10.0",
-    "validate-npm-package-name": "^5.0.0"
+    "validate-npm-package-name": "^5.0.0",
+    "color-convert": "^2.0.1"
   },
   "devDependencies": {
     "typescript": "^5.7.0",
@@ -33,6 +34,7 @@
     "@types/node": "^22.0.0",
     "@types/fs-extra": "^11.0.0",
     "@types/validate-npm-package-name": "^4.0.0",
+    "@types/color-convert": "^2.0.3",
     "vitest": "^2.0.0"
   },
   "engines": {