zerozeeker 2.2.2 → 2.2.4

package/dist/index.js

@@ -5,7 +5,7 @@ import { Command } from "commander";
 import { execSync } from "child_process";
 import { existsSync, mkdirSync, writeFileSync, readFileSync } from "fs";
 import { join, dirname } from "path";
-import readline from "readline";
+import * as readline from "readline/promises";
 import ora from "ora";
 import chalk from "chalk";
 var REGISTRY_URL = "https://www.zerozeeker.com/r";
@@ -18,12 +18,24 @@ var COMPONENTS = [
   "circle-reveal-button",
   "index"
 ];
-async function fetchRegistry(url) {
-  const response = await fetch(url);
-  if (!response.ok) {
-    throw new Error(`Failed to fetch registry: ${response.statusText}`);
+async function fetchRegistry(url, retries = 3) {
+  const controller = new AbortController();
+  const timeoutId = setTimeout(() => controller.abort(), 1e4);
+  try {
+    const response = await fetch(url, { signal: controller.signal });
+    clearTimeout(timeoutId);
+    if (!response.ok) {
+      throw new Error(`Failed to fetch registry: ${response.statusText}`);
+    }
+    return response.json();
+  } catch (error) {
+    clearTimeout(timeoutId);
+    if (retries > 0 && error instanceof Error && error.name !== "AbortError") {
+      await new Promise((resolve) => setTimeout(resolve, 1e3));
+      return fetchRegistry(url, retries - 1);
+    }
+    throw error;
   }
-  return response.json();
 }
 function ensureDir(filePath) {
   const dir = dirname(filePath);
@@ -33,7 +45,8 @@ function ensureDir(filePath) {
 }
 function findProjectRoot() {
   let currentDir = process.cwd();
-  while (currentDir !== dirname(currentDir)) {
+  const root = dirname(currentDir);
+  while (currentDir !== root) {
     if (existsSync(join(currentDir, "package.json"))) {
       return currentDir;
     }
@@ -41,40 +54,73 @@ function findProjectRoot() {
   }
   throw new Error("Could not find project root (no package.json found)");
 }
+function detectPackageManager() {
+  const projectRoot = process.cwd();
+  if (existsSync(join(projectRoot, "bun.lockb"))) return "bun";
+  if (existsSync(join(projectRoot, "pnpm-lock.yaml"))) return "pnpm";
+  if (existsSync(join(projectRoot, "yarn.lock"))) return "yarn";
+  return "npm";
+}
+function getInstallCommand(deps) {
+  const pm = detectPackageManager();
+  const depsStr = deps.join(" ");
+  switch (pm) {
+    case "bun":
+      return `bun add ${depsStr}`;
+    case "pnpm":
+      return `pnpm add ${depsStr}`;
+    case "yarn":
+      return `yarn add ${depsStr}`;
+    default:
+      return `npm install ${depsStr}`;
+  }
+}
 function installDependencies(deps) {
   if (deps.length === 0) return;
+  const command = getInstallCommand(deps);
   console.log(chalk.dim(`  Installing dependencies: ${deps.join(", ")}`));
   try {
-    execSync(`npm install ${deps.join(" ")}`, {
+    execSync(command, {
       stdio: "pipe",
       encoding: "utf-8"
     });
   } catch {
-    console.warn(chalk.yellow(`  [!] Failed to auto-install dependencies. Install manually: npm install ${deps.join(" ")}`));
+    console.warn(chalk.yellow(`  [!] Failed to auto-install dependencies. Install manually: ${command}`));
   }
 }
 async function askYesNo(question, defaultYes = false) {
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  return new Promise((resolve) => {
-    rl.question(`${question} (${defaultYes ? "Y/n" : "y/N"}): `, (answer) => {
-      rl.close();
-      const a = answer.trim().toLowerCase();
-      if (a === "") return resolve(defaultYes);
-      if (["y", "yes"].includes(a)) return resolve(true);
-      return resolve(false);
-    });
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
   });
+  try {
+    const answer = await rl.question(`${question} (${defaultYes ? "Y/n" : "y/N"}): `);
+    const normalized = answer.trim().toLowerCase();
+    if (normalized === "") return defaultYes;
+    return ["y", "yes"].includes(normalized);
+  } finally {
+    rl.close();
+  }
 }
 async function installRegistryDependencies(deps, projectRoot, installed = /* @__PURE__ */ new Set()) {
   const allFiles = [];
   const allNpmDeps = [];
-  for (const dep of deps) {
-    if (installed.has(dep)) continue;
-    installed.add(dep);
-    const url = `${REGISTRY_URL}/${dep}.json`;
-    try {
+  const results = await Promise.allSettled(
+    deps.filter((dep) => !installed.has(dep)).map(async (dep) => {
+      installed.add(dep);
+      const url = `${REGISTRY_URL}/${dep}.json`;
       const registry = await fetchRegistry(url);
-      if (registry.registryDependencies && registry.registryDependencies.length > 0) {
+      return { dep, registry };
+    })
+  );
+  for (const result of results) {
+    if (result.status === "rejected") {
+      console.warn(chalk.yellow(`  [!] Could not fetch registry dependency`));
+      continue;
+    }
+    const { dep, registry } = result.value;
+    try {
+      if (registry.registryDependencies?.length) {
         const nested = await installRegistryDependencies(
           registry.registryDependencies,
           projectRoot,
@@ -83,13 +129,11 @@ async function installRegistryDependencies(deps, projectRoot, installed = /* @__
         allFiles.push(...nested.files);
         allNpmDeps.push(...nested.npmDeps);
       }
-      if (registry.files && registry.files.length > 0) {
+      if (registry.files?.length) {
         for (const file of registry.files) {
           const targetPath = file.target || file.path;
           const fullPath = join(projectRoot, targetPath);
-          if (existsSync(fullPath)) {
-            continue;
-          }
+          if (existsSync(fullPath)) continue;
           ensureDir(fullPath);
           writeFileSync(fullPath, file.content, "utf-8");
           allFiles.push(targetPath);
@@ -104,27 +148,33 @@ async function installRegistryDependencies(deps, projectRoot, installed = /* @__
   }
   return { files: allFiles, npmDeps: allNpmDeps };
 }
+function parseJsonFile(filePath) {
+  try {
+    return JSON.parse(readFileSync(filePath, "utf-8"));
+  } catch {
+    return null;
+  }
+}
 function checkTypeScriptConfig(projectRoot) {
   const tsconfigPath = join(projectRoot, "tsconfig.json");
   if (!existsSync(tsconfigPath)) {
     return { name: "TypeScript", passed: false, message: "tsconfig.json not found" };
   }
-  try {
-    const tsconfig = JSON.parse(readFileSync(tsconfigPath, "utf-8"));
-    const paths = tsconfig.compilerOptions?.paths || {};
-    const hasComponentsAlias = paths["@/components/*"] || paths["@/components"];
-    const hasLibAlias = paths["@/lib/*"] || paths["@/lib"];
-    if (hasComponentsAlias && hasLibAlias) {
-      return { name: "TypeScript paths", passed: true };
-    }
-    return {
-      name: "TypeScript paths",
-      passed: false,
-      message: "Missing @/components or @/lib path aliases"
-    };
-  } catch {
+  const tsconfig = parseJsonFile(tsconfigPath);
+  if (!tsconfig) {
     return { name: "TypeScript config", passed: false, message: "Invalid tsconfig.json" };
   }
+  const paths = tsconfig.compilerOptions?.paths ?? {};
+  const hasComponentsAlias = "@/components/*" in paths || "@/components" in paths;
+  const hasLibAlias = "@/lib/*" in paths || "@/lib" in paths;
+  if (hasComponentsAlias && hasLibAlias) {
+    return { name: "TypeScript paths", passed: true };
+  }
+  return {
+    name: "TypeScript paths",
+    passed: false,
+    message: "Missing @/components or @/lib path aliases"
+  };
 }
 function checkTailwindConfig(projectRoot) {
   const tailwindConfigs = [
@@ -137,63 +187,105 @@ function checkTailwindConfig(projectRoot) {
   return hasTailwind ? { name: "Tailwind CSS", passed: true } : { name: "Tailwind CSS", passed: false, message: "Config file not found" };
 }
 function checkFramework(projectRoot) {
-  const packageJsonPath = join(projectRoot, "package.json");
-  const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-  const deps = { ...packageJson.dependencies, ...packageJson.devDependencies };
-  if (deps.next) {
-    return { name: "Next.js", passed: true };
-  }
-  if (deps.react) {
-    return { name: "React", passed: true };
+  const packageJson = parseJsonFile(join(projectRoot, "package.json"));
+  if (!packageJson) {
+    return { name: "React/Next.js", passed: false, message: "Could not read package.json" };
   }
+  const deps = {
+    ...packageJson.dependencies ?? {},
+    ...packageJson.devDependencies ?? {}
+  };
+  if (deps.next) return { name: "Next.js", passed: true };
+  if (deps.react) return { name: "React", passed: true };
   return { name: "React/Next.js", passed: false, message: "Not found in dependencies" };
 }
 function displaySetupHelp(checks) {
-  const tsCheck = checks.find((c) => c.name === "TypeScript");
+  const tsCheck = checks.find((c) => c.name.startsWith("TypeScript"));
   const tailwindCheck = checks.find((c) => c.name === "Tailwind CSS");
+  const pm = detectPackageManager();
   if (tsCheck && !tsCheck.passed) {
     console.log(chalk.dim("Install TypeScript:"));
-    console.log(chalk.white("  npm install -D typescript @types/node @types/react"));
+    console.log(chalk.white(`  ${pm} ${pm === "npm" ? "install" : "add"} -D typescript @types/node @types/react`));
     console.log(chalk.dim("\nCreate tsconfig.json with path aliases:"));
     console.log(chalk.white("  npx tsc --init"));
   }
   if (tailwindCheck && !tailwindCheck.passed) {
     console.log(chalk.dim("\nInstall Tailwind CSS:"));
-    console.log(chalk.white("  npm install -D tailwindcss postcss autoprefixer"));
+    console.log(chalk.white(`  ${pm} ${pm === "npm" ? "install" : "add"} -D tailwindcss postcss autoprefixer`));
     console.log(chalk.white("  npx tailwindcss init -p"));
   }
   console.log(chalk.dim("\nOr create a new Next.js project:"));
   console.log(chalk.white("  npx create-next-app@latest --typescript --tailwind\n"));
 }
 async function autoFixSetup(projectRoot, needsTypeScript, needsTailwind, spinner) {
+  const pm = detectPackageManager();
+  const installCmd = pm === "npm" ? "install" : "add";
   if (needsTypeScript) {
     spinner.text = "Installing TypeScript and types...";
-    execSync("npm install -D typescript @types/node @types/react", { stdio: "inherit" });
+    execSync(`${pm} ${installCmd} -D typescript @types/node @types/react`, { stdio: "inherit" });
   }
   const tsconfigPath = join(projectRoot, "tsconfig.json");
-  let tsconfig = {};
-  if (existsSync(tsconfigPath)) {
-    try {
-      tsconfig = JSON.parse(readFileSync(tsconfigPath, "utf-8"));
-    } catch {
-      tsconfig = {};
-    }
-  } else {
+  const tsconfig = parseJsonFile(tsconfigPath) ?? { compilerOptions: {} };
+  if (!existsSync(tsconfigPath)) {
     spinner.text = "Creating tsconfig.json...";
-    tsconfig = { compilerOptions: {} };
     writeFileSync(tsconfigPath, JSON.stringify(tsconfig, null, 2), "utf-8");
   }
-  tsconfig.compilerOptions = tsconfig.compilerOptions || {};
-  tsconfig.compilerOptions.baseUrl = tsconfig.compilerOptions.baseUrl || ".";
-  tsconfig.compilerOptions.paths = tsconfig.compilerOptions.paths || {};
+  tsconfig.compilerOptions ??= {};
+  tsconfig.compilerOptions.baseUrl ??= ".";
+  tsconfig.compilerOptions.paths ??= {};
   tsconfig.compilerOptions.paths["@/components/*"] = ["components/*"];
   tsconfig.compilerOptions.paths["@/lib/*"] = ["lib/*"];
   writeFileSync(tsconfigPath, JSON.stringify(tsconfig, null, 2), "utf-8");
   if (needsTailwind) {
     spinner.text = "Installing Tailwind CSS...";
-    execSync("npm install -D tailwindcss postcss autoprefixer", { stdio: "inherit" });
+    execSync(`${pm} ${installCmd} -D tailwindcss postcss autoprefixer`, { stdio: "inherit" });
     spinner.text = "Initializing Tailwind config...";
-    execSync("npx tailwindcss init -p", { stdio: "inherit" });
+    try {
+      execSync("npx tailwindcss init -p", { stdio: "inherit" });
+    } catch {
+      console.warn(chalk.yellow("\nWarning: `npx tailwindcss init -p` failed. Creating default config files instead."));
+      const tailwindConfig = `/** @type {import('tailwindcss').Config} */
+export default {
+  content: [
+    './app/**/*.{js,ts,jsx,tsx,mdx}',
+    './components/**/*.{js,ts,jsx,tsx,mdx}',
+    './pages/**/*.{js,ts,jsx,tsx,mdx}'
+  ],
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+};
+`;
+      const postcssConfig = `export default {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+};
+`;
+      const globalsCssDir = join(projectRoot, "app");
+      const globalsCssPath = join(globalsCssDir, "globals.css");
+      try {
+        writeFileSync(join(projectRoot, "tailwind.config.js"), tailwindConfig, "utf-8");
+        writeFileSync(join(projectRoot, "postcss.config.js"), postcssConfig, "utf-8");
+        if (!existsSync(globalsCssDir)) {
+          mkdirSync(globalsCssDir, { recursive: true });
+        }
+        if (!existsSync(globalsCssPath)) {
+          const globals = `@tailwind base;
+@tailwind components;
+@tailwind utilities;
+`;
+          writeFileSync(globalsCssPath, globals, "utf-8");
+        }
+        console.log(chalk.green("Created tailwind.config.js, postcss.config.js, and app/globals.css"));
+      } catch (writeErr) {
+        const errorMessage = writeErr instanceof Error ? writeErr.message : String(writeErr);
+        console.warn(chalk.yellow(`Failed to write fallback Tailwind files: ${errorMessage}`));
+        throw writeErr;
+      }
+    }
   }
 }
 var COMPONENT_DESCRIPTIONS = {
@@ -205,7 +297,7 @@ var COMPONENT_DESCRIPTIONS = {
   "circle-reveal-button": "Icon to pill expansion - the element of surprise"
 };
 var program = new Command();
-program.name("zerozeeker").description("CLI for installing ZeroZeeker UI components - because life is too short for boring interfaces").version("2.2.0");
+program.name("zerozeeker").description("CLI for installing ZeroZeeker UI components - because life is too short for boring interfaces").version("2.3.0");
 program.command("init").description("Initialize ZeroZeeker in your project").action(async () => {
   const spinner = ora("Checking project setup...").start();
   try {
@@ -236,9 +328,7 @@ program.command("init").description("Initialize ZeroZeeker in your project").act
     }
     console.log(chalk.yellow("\n[!] Some setup issues detected\n"));
     displaySetupHelp(checks);
-    const needsTypeScript = !checks.find(
-      (c) => c.name === "TypeScript" || c.name === "TypeScript paths" || c.name === "TypeScript config"
-    )?.passed;
+    const needsTypeScript = !checks.find((c) => c.name.startsWith("TypeScript"))?.passed;
     const needsTailwind = !checks.find((c) => c.name === "Tailwind CSS")?.passed;
     const doAuto = await askYesNo("Would you like ZeroZeeker to try to automatically fix these issues now?", true);
     if (!doAuto) {
@@ -267,7 +357,7 @@ program.command("init").description("Initialize ZeroZeeker in your project").act
     process.exit(1);
   }
 });
-program.command("add <component>").description("Add a component from ZeroZeeker registry").action(async (component) => {
+program.command("add <component>").description("Add a component from ZeroZeeker registry").option("-f, --force", "Overwrite existing files").action(async (component, options) => {
   if (!COMPONENTS.includes(component)) {
     console.error(chalk.red(`[x] Component "${component}" does not exist in this dimension.`));
     console.log(chalk.dim("\nHere are the components that actually exist:"));
@@ -284,9 +374,9 @@ program.command("add <component>").description("Add a component from ZeroZeeker
     spinner.text = `Fetching ${chalk.cyan(component)} from registry...`;
     const registry = await fetchRegistry(url);
     const filesInstalled = [];
-    const allDependencies = [...registry.dependencies || []];
-    if (registry.registryDependencies && registry.registryDependencies.length > 0) {
-      spinner.text = `Installing registry dependencies...`;
+    const allDependencies = [...registry.dependencies ?? []];
+    if (registry.registryDependencies?.length) {
+      spinner.text = "Installing registry dependencies...";
       const registryResult = await installRegistryDependencies(
         registry.registryDependencies,
         projectRoot
@@ -294,18 +384,18 @@ program.command("add <component>").description("Add a component from ZeroZeeker
       filesInstalled.push(...registryResult.files);
       allDependencies.push(...registryResult.npmDeps);
     }
-    if (registry.files && registry.files.length > 0) {
+    if (registry.files?.length) {
       spinner.text = `Installing ${chalk.cyan(component)} files...`;
       for (const file of registry.files) {
         const targetPath = file.target || file.path;
         const fullPath = join(projectRoot, targetPath);
-        if (existsSync(fullPath)) {
+        if (existsSync(fullPath) && !options.force) {
           spinner.stop();
           console.warn(chalk.yellow(`
 [!] File already exists: ${targetPath}`));
           console.log(chalk.dim("  Skipping to avoid overwriting your changes."));
-          console.log(chalk.dim(`  To force reinstall: delete the file and run the command again.
-`));
+          console.log(chalk.dim("  Use --force flag to overwrite existing files.\n"));
+          spinner.start();
           continue;
         }
         ensureDir(fullPath);
@@ -323,15 +413,15 @@ program.command("add <component>").description("Add a component from ZeroZeeker
 [+] Successfully installed ${component}`));
     if (filesInstalled.length > 0) {
       console.log(chalk.dim("\n  Files added:"));
-      filesInstalled.forEach((f) => {
+      for (const f of filesInstalled) {
         console.log(chalk.cyan(`    ${f}`));
-      });
+      }
     }
     if (uniqueDeps.length > 0) {
       console.log(chalk.dim("\n  Dependencies installed:"));
-      uniqueDeps.forEach((d) => {
+      for (const d of uniqueDeps) {
         console.log(chalk.cyan(`    ${d}`));
-      });
+      }
     }
     console.log(chalk.dim("\n  Now go make something beautiful.\n"));
   } catch (error) {
@@ -341,7 +431,7 @@ program.command("add <component>").description("Add a component from ZeroZeeker
     if (error instanceof Error) {
       if (error.message.includes("package.json")) {
         console.log(chalk.dim("\n  Make sure you're in a React/Next.js project directory."));
-      } else if (error.message.includes("fetch")) {
+      } else if (error.message.includes("fetch") || error.name === "AbortError") {
         console.log(chalk.dim("\n  Check your internet connection and try again."));
       } else {
         console.log(chalk.dim(`
@@ -355,11 +445,12 @@ program.command("add <component>").description("Add a component from ZeroZeeker
 program.command("list").description("List all available components").action(() => {
   console.log(chalk.bold("\nZeroZeeker UI Components\n"));
   console.log(chalk.dim("Modern, polished components that make users actually want to interact.\n"));
-  COMPONENTS.filter((c) => c !== "index").forEach((component) => {
+  for (const component of COMPONENTS) {
+    if (component === "index") continue;
     console.log(chalk.cyan(`  ${component}`));
     console.log(chalk.dim(`    ${COMPONENT_DESCRIPTIONS[component]}
 `));
-  });
+  }
   console.log(chalk.dim("Install any component with: ") + chalk.white("npx zerozeeker add <component>"));
   console.log(chalk.dim("More components coming soon. Ship fast. Look good doing it.\n"));
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zerozeeker",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "description": "Zero-config CLI for installing ZeroZeeker UI components. No shadcn required.",
   "type": "module",
   "bin": {