rainbowindex 0.2.2 → 0.4.0

package/dist/cli.mjs

@@ -2,28 +2,24 @@
 import {
   CSS_ENTRY_CANDIDATES,
   enumerateClassNames
-} from "./chunk-KYDEHYIE.mjs";
+} from "./chunk-YLB6FGIG.mjs";
 import {
   DEFAULT_EXCLUDES,
   DEFAULT_PATTERNS,
-  collectProjectClasses,
-  finalizeProjectCompilation,
-  getFontPreloadLinks,
-  resolveGoogleFonts,
-  validateGlobPattern
-} from "./chunk-FHATRQMN.mjs";
+  compileScannedProject,
+  getFontPreloadLinks
+} from "./chunk-4SVFFDS2.mjs";
 import {
   MAX_DIRECTIVE_INPUT_SIZE,
-  analyzeProjectCSS,
   extractDirectives,
   hasApplyLikeDirective,
   hasRIActivation,
   listVariants,
   resolveDirectives
-} from "./chunk-W6XIBM4M.mjs";
+} from "./chunk-6DAHUFNU.mjs";
 import {
   devWarn
-} from "./chunk-SOMDX7V6.mjs";
+} from "./chunk-5Y7EXXLS.mjs";
 
 // src/entries/cli.ts
 import { realpathSync } from "fs";
@@ -32,6 +28,153 @@ import { pathToFileURL } from "url";
 
 // src/cli/args.ts
 import { relative, resolve } from "path";
+var OUTPUT = {
+  names: ["-o", "--output"],
+  valueName: "<file>",
+  describe: "Output CSS file path (omit to write to stdout)",
+  apply(opts, value) {
+    opts.output = value;
+  }
+};
+var WATCH = {
+  names: ["--watch"],
+  describe: "Re-run on source-file changes (requires --output)",
+  apply(opts) {
+    opts.watch = true;
+  }
+};
+var MINIFY = {
+  names: ["--minify", "--optimize"],
+  helpLabel: "--minify",
+  describe: "Minify + browser fallbacks via LightningCSS (alias: --optimize)",
+  apply(opts) {
+    opts.minify = true;
+  }
+};
+var STRICT = {
+  names: ["--strict"],
+  describe: "Drop the `string & {}` escape hatch from the union",
+  apply(opts) {
+    opts.strict = true;
+  }
+};
+var TEMPLATE = {
+  names: ["--template"],
+  valueName: "<name>",
+  describe: "Vite template (default: react-ts)\nExamples: vanilla, vanilla-ts, react, react-ts, vue, vue-ts, svelte, svelte-ts",
+  apply(opts, value) {
+    opts.template = value;
+  }
+};
+var applyCSSFile = (opts, value) => {
+  opts.cssFile = value;
+};
+var CSS_INPUT = {
+  names: ["--css"],
+  valueName: "<file>",
+  describe: "CSS input with directives (auto-detected if omitted)",
+  apply: applyCSSFile
+};
+var CSS_INPUT_TYPES = {
+  names: ["--css"],
+  valueName: "<file>",
+  describe: "CSS input with @color/@text/@utility/etc directives",
+  apply: applyCSSFile
+};
+var CSS_INPUT_FONTS = {
+  names: ["--css"],
+  valueName: "<file>",
+  describe: "CSS input with @font directives",
+  apply: applyCSSFile
+};
+var CSS_TARGET = {
+  names: ["--css"],
+  valueName: "<file>",
+  describe: "Stylesheet path to create/patch (default: src/index.css)",
+  apply: applyCSSFile
+};
+var COMMANDS = {
+  build: {
+    summary: "Generate CSS from source files",
+    usage: "  rainbowindex <glob...> [options]\n  rainbowindex --css <file> [options]",
+    flags: [OUTPUT, WATCH, MINIFY, CSS_INPUT],
+    positionals: "globs",
+    body: `Inputs:
+  Pass one or more globs to scan for class names. If no globs are passed and
+  a CSS file with @source directives is found, those are used instead.
+
+Examples:
+  rainbowindex "src/**/*.tsx" -o dist/styles.css
+  rainbowindex "src/**/*.tsx" --watch -o dist/styles.css
+  rainbowindex --css src/styles.css -o dist/styles.css --minify`
+  },
+  init: {
+    summary: "Wire Rainbow Index into the current Vite app",
+    usage: "  rainbowindex init [options]",
+    intro: `What this does:
+  1. Installs rainbowindex as a dev dependency (if not already installed).
+  2. Creates or patches vite.config.* to register the Vite plugin.
+  3. Creates or updates a CSS entry file with @import "rainbowindex".
+  4. Adds the CSS import to your entry file (src/main.tsx, src/main.ts, \u2026).`,
+    flags: [CSS_TARGET],
+    positionals: "none",
+    body: `Notes:
+  Detects pnpm / yarn / bun / npm from lockfiles, package.json#packageManager,
+  and npm_config_user_agent. Requires an existing Vite project \u2014 if you do not
+  have one yet, use \`rainbowindex create <dir>\`.
+
+Examples:
+  rainbowindex init
+  rainbowindex init --css src/styles.css`
+  },
+  create: {
+    summary: "Scaffold a Vite app with Rainbow Index ready",
+    usage: "  rainbowindex create <dir> [options]",
+    flags: [TEMPLATE, CSS_TARGET],
+    positionals: "targetDir",
+    body: `What this does:
+  1. Runs \`create vite\` for the given template.
+  2. Runs \`rainbowindex init\` inside the new directory.
+
+Examples:
+  rainbowindex create my-app
+  rainbowindex create my-app --template vue-ts`
+  },
+  "generate-types": {
+    summary: "Generate TypeScript types for ri() autocomplete",
+    usage: "  rainbowindex generate-types [options]",
+    flags: [CSS_INPUT_TYPES, STRICT],
+    positionals: "none",
+    body: `Output:
+  Writes \`rainbowindex-env.d.ts\` to the current working directory. Include it
+  in tsconfig.json#include (or the equivalent) so the editor picks it up.
+
+Examples:
+  rainbowindex generate-types
+  rainbowindex generate-types --strict --css src/styles.css`
+  },
+  "preload-fonts": {
+    summary: 'Generate <link rel="preload"> tags',
+    usage: "  rainbowindex preload-fonts [options]",
+    flags: [CSS_INPUT_FONTS],
+    positionals: "none",
+    body: `Output:
+  Prints <link rel="preload"> tags to stdout for fonts declared in the @font
+  block (faces marked preload), or via @font-face.
+
+Examples:
+  rainbowindex preload-fonts --css src/styles.css > preload.html`
+  }
+};
+var FLAG_TAKES_VALUE = /* @__PURE__ */ new Map();
+for (const spec of Object.values(COMMANDS).flatMap((command) => command.flags)) {
+  for (const name of spec.names) {
+    FLAG_TAKES_VALUE.set(name, spec.valueName !== void 0);
+  }
+}
+function asSubcommand(token) {
+  return Object.hasOwn(COMMANDS, token) ? token : null;
+}
 function parseArgs(argv, callbacks) {
   if (argv[0] === "framework") {
     throw new Error(
@@ -47,104 +190,73 @@ function parseArgs(argv, callbacks) {
     subcommandExplicit: false,
     earlyExit: false
   };
-  let i = 0;
-  while (i < argv.length) {
-    const arg = argv[i];
-    if (arg === "build" && !opts.subcommandExplicit && opts.globs.length === 0) {
-      opts.command = "build";
-      opts.subcommandExplicit = true;
-      i++;
-      continue;
-    }
-    if (arg === "generate-types") {
-      opts.command = "generate-types";
-      opts.subcommandExplicit = true;
-      i++;
-      continue;
-    }
-    if (arg === "init" || arg === "--init") {
-      opts.command = "init";
+  let keywordIndex = -1;
+  for (let j = 0; j < argv.length; j++) {
+    const token = argv[j];
+    if (token === "--init" || token === "--create") {
+      opts.command = token.slice(2);
       opts.subcommandExplicit = true;
-      i++;
-      continue;
+      keywordIndex = j;
+      break;
     }
-    if (arg === "create" || arg === "--create") {
-      opts.command = "create";
-      opts.subcommandExplicit = true;
-      i++;
+    if (token.startsWith("-")) {
+      if (FLAG_TAKES_VALUE.get(token)) j++;
       continue;
     }
-    if (arg === "preload-fonts") {
-      opts.command = "preload-fonts";
+    const command = asSubcommand(token);
+    if (command) {
+      opts.command = command;
       opts.subcommandExplicit = true;
-      i++;
-      continue;
-    }
-    if (arg === "-o" || arg === "--output") {
-      if (i + 1 >= argv.length) {
-        throw new Error(`Missing value for ${arg}`);
-      }
-      opts.output = argv[++i];
-      i++;
-      continue;
+      keywordIndex = j;
     }
-    if (arg === "--css") {
-      if (i + 1 >= argv.length) {
-        throw new Error("Missing value for --css");
+    break;
+  }
+  const spec = COMMANDS[opts.command];
+  for (let i = 0; i < argv.length; i++) {
+    if (i === keywordIndex) continue;
+    const arg = argv[i];
+    if (arg === "--version" || arg === "-v" || arg === "--help" || arg === "-h") {
+      if (keywordIndex > i) {
+        opts.command = "build";
+        opts.subcommandExplicit = false;
       }
-      opts.cssFile = argv[++i];
-      i++;
-      continue;
-    }
-    if (arg === "--template") {
-      if (i + 1 >= argv.length) {
-        throw new Error("Missing value for --template");
+      if (arg === "--version" || arg === "-v") {
+        console.log(callbacks.getVersion());
+      } else {
+        callbacks.printHelp(opts.subcommandExplicit ? opts.command : void 0);
       }
-      opts.template = argv[++i];
-      i++;
-      continue;
-    }
-    if (arg === "--watch") {
-      opts.watch = true;
-      i++;
-      continue;
-    }
-    if (arg === "--minify") {
-      opts.minify = true;
-      i++;
-      continue;
-    }
-    if (arg === "--strict") {
-      opts.strict = true;
-      i++;
-      continue;
-    }
-    if (arg === "--version" || arg === "-v") {
-      console.log(callbacks.getVersion());
-      opts.earlyExit = true;
-      return opts;
-    }
-    if (arg === "--help" || arg === "-h") {
-      callbacks.printHelp(opts.subcommandExplicit ? opts.command : void 0);
       opts.earlyExit = true;
       return opts;
     }
     if (arg.startsWith("-")) {
+      const flag = spec.flags.find((f) => f.names.includes(arg));
+      if (flag) {
+        if (flag.valueName !== void 0) {
+          if (i + 1 >= argv.length) {
+            throw new Error(`Missing value for ${arg}`);
+          }
+          flag.apply(opts, argv[++i]);
+        } else {
+          flag.apply(opts);
+        }
+        continue;
+      }
+      if (FLAG_TAKES_VALUE.has(arg)) {
+        throw new Error(
+          `${arg} is not supported by ${opts.command}. Run rainbowindex ${opts.command} --help for usage.`
+        );
+      }
       throw new Error(`Unknown option "${arg}". Run rainbowindex --help for usage.`);
     }
-    if (opts.command === "create") {
-      if (opts.targetDir) {
-        throw new Error(`Unexpected extra argument "${arg}" for create.`);
-      }
-      opts.targetDir = arg;
-      i++;
+    if (spec.positionals === "globs") {
+      opts.globs.push(arg);
       continue;
     }
-    if (opts.command === "init") {
-      throw new Error(`Unexpected extra argument "${arg}" for init.`);
+    if (spec.positionals === "targetDir" && !opts.targetDir) {
+      opts.targetDir = arg;
+      continue;
     }
-    opts.globs.push(arg);
-    i++;
+    throw new Error(`Unexpected extra argument "${arg}" for ${opts.command}.`);
   }
   if (opts.command === "create" && !opts.targetDir) {
     throw new Error("create requires a project directory. Example: rainbowindex create my-app");
@@ -165,115 +277,39 @@ function parseArgs(argv, callbacks) {
   }
   return opts;
 }
-var SUBCOMMAND_HELP = {
-  build: `
-\u{1F308} rainbowindex build \u2014 Generate CSS from source files
-
-Usage:
-  rainbowindex <glob...> [options]
-  rainbowindex --css <file> [options]
-
-Options:
-  -o, --output <file>    Output CSS file path (omit to write to stdout)
-  --watch                Re-run on source-file changes (requires --output)
-  --minify               Minify output via LightningCSS
-  --css <file>           CSS input with directives (auto-detected if omitted)
-  -h, --help             Show this help
-
-Inputs:
-  Pass one or more globs to scan for class names. If no globs are passed and
-  a CSS file with @source directives is found, those are used instead.
-
-Examples:
-  rainbowindex "src/**/*.tsx" -o dist/styles.css
-  rainbowindex "src/**/*.tsx" --watch -o dist/styles.css
-  rainbowindex --css src/styles.css -o dist/styles.css --minify
-`,
-  init: `
-\u{1F308} rainbowindex init \u2014 Wire Rainbow Index into the current Vite app
-
-Usage:
-  rainbowindex init [options]
-
-What this does:
-  1. Installs rainbowindex as a dev dependency (if not already installed).
-  2. Creates or patches vite.config.* to register the Vite plugin.
-  3. Creates or updates a CSS entry file with @import "rainbowindex".
-  4. Adds the CSS import to your entry file (src/main.tsx, src/main.ts, \u2026).
-
-Options:
-  --css <file>           Stylesheet path to create/patch (default: src/index.css)
-  -h, --help             Show this help
-
-Notes:
-  Detects pnpm / yarn / bun / npm from lockfiles, package.json#packageManager,
-  and npm_config_user_agent. Requires an existing Vite project \u2014 if you do not
-  have one yet, use \`rainbowindex create <dir>\`.
-
-Examples:
-  rainbowindex init
-  rainbowindex init --css src/styles.css
-`,
-  create: `
-\u{1F308} rainbowindex create \u2014 Scaffold a Vite app with Rainbow Index ready
-
-Usage:
-  rainbowindex create <dir> [options]
-
-Options:
-  --template <name>      Vite template (default: react-ts)
-                         Examples: vanilla, vanilla-ts, react, react-ts, vue, vue-ts, svelte, svelte-ts
-  --css <file>           Stylesheet path inside the new app (default: src/index.css)
-  -h, --help             Show this help
-
-What this does:
-  1. Runs \`create vite\` for the given template.
-  2. Runs \`rainbowindex init\` inside the new directory.
-
-Examples:
-  rainbowindex create my-app
-  rainbowindex create my-app --template vue-ts
-`,
-  "generate-types": `
-\u{1F308} rainbowindex generate-types \u2014 Generate TypeScript types for ri() autocomplete
-
-Usage:
-  rainbowindex generate-types [options]
-
-Options:
-  --css <file>           CSS input with @color/@text/@utility/etc directives
-  --strict               Drop the \`string & {}\` escape hatch from the union
-  -h, --help             Show this help
-
-Output:
-  Writes \`rainbowindex-env.d.ts\` to the current working directory. Include it
-  in tsconfig.json#include (or the equivalent) so the editor picks it up.
-
-Examples:
-  rainbowindex generate-types
-  rainbowindex generate-types --strict --css src/styles.css
-`,
-  "preload-fonts": `
-\u{1F308} rainbowindex preload-fonts \u2014 Generate <link rel="preload"> tags
-
-Usage:
-  rainbowindex preload-fonts [options]
-
-Options:
-  --css <file>           CSS input with @font directives
-  -h, --help             Show this help
-
-Output:
-  Prints <link rel="preload"> tags to stdout for fonts declared in the @font
-  block (faces marked preload), or via @font-face.
-
-Examples:
-  rainbowindex preload-fonts --css src/styles.css > preload.html
-`
-};
+var HELP_DESCRIBE_COLUMN = 25;
+function renderFlagLines(flags) {
+  const lines = [];
+  for (const flag of flags) {
+    const label = flag.helpLabel ?? flag.names.join(", ");
+    const heading = `  ${label}${flag.valueName ? ` ${flag.valueName}` : ""}`;
+    const [first, ...rest] = flag.describe.split("\n");
+    lines.push(`${heading.padEnd(HELP_DESCRIBE_COLUMN)}${first}`);
+    for (const continuation of rest) {
+      lines.push(`${" ".repeat(HELP_DESCRIBE_COLUMN)}${continuation}`);
+    }
+  }
+  return lines.join("\n");
+}
+var HELP_LINE = `${"  -h, --help".padEnd(HELP_DESCRIBE_COLUMN)}Show this help`;
+var VERSION_LINE = `${"  -v, --version".padEnd(HELP_DESCRIBE_COLUMN)}Show version`;
+var GLOBAL_HELP_FLAGS = [OUTPUT, WATCH, MINIFY, CSS_INPUT, TEMPLATE, STRICT];
 function printHelp(subcommand) {
   if (subcommand) {
-    console.log(SUBCOMMAND_HELP[subcommand]);
+    const spec = COMMANDS[subcommand];
+    const sections = [
+      `\u{1F308} rainbowindex ${subcommand} \u2014 ${spec.summary}`,
+      `Usage:
+${spec.usage}`,
+      ...spec.intro ? [spec.intro] : [],
+      `Options:
+${renderFlagLines(spec.flags)}
+${HELP_LINE}`,
+      spec.body
+    ];
+    console.log(`
+${sections.join("\n\n")}
+`);
     return;
   }
   console.log(`
@@ -289,14 +325,9 @@ Usage:
 Run \`rainbowindex <subcommand> --help\` for subcommand-specific options.
 
 Options:
-  -o, --output <file>    Output CSS file path
-  --watch                Watch for changes
-  --minify               Minify output via LightningCSS
-  --css <file>           CSS file with directives (default: auto-detect)
-  --template <name>      Vite template for create (default: react-ts)
-  --strict               No string escape hatch in generated types
-  -v, --version          Show version
-  -h, --help             Show this help
+${renderFlagLines(GLOBAL_HELP_FLAGS)}
+${VERSION_LINE}
+${HELP_LINE}
 
 Environment Variables:
   RI_CACHE_DIR           Override font metadata cache directory (default: node_modules/.cache/rainbowindex)
@@ -377,40 +408,24 @@ async function loadProjectTheme(opts, cwd) {
 // src/cli/build.ts
 async function buildCSS(opts, cwd) {
   const { css: cssSource, cssFile } = await loadProjectCSS(opts, cwd);
-  const analysis = analyzeProjectCSS(cssSource);
-  const { theme, warnings, warningSeen } = analysis;
-  const validGlobs = [];
-  for (const g of opts.globs) {
-    const err = validateGlobPattern(g);
-    if (err) {
+  const { compiled } = await compileScannedProject({
+    css: cssSource,
+    cwd,
+    surfacePatterns: opts.globs,
+    onInvalidPattern: (err) => {
       console.error(`[RI-1404] CLI glob pattern rejected: ${err}`);
-    } else {
-      validGlobs.push(g);
+      return void 0;
     }
-  }
-  const cliSources = validGlobs.map((g) => ({ pattern: g, negated: false, inline: false }));
-  const scannedClasses = await collectProjectClasses(
-    theme.sources,
-    cliSources,
-    cwd,
-    warnings,
-    warningSeen
-  );
+  });
   const buildWarnings = [];
   if (hasApplyLikeDirective(cssSource)) {
     buildWarnings.push(
       '[RI-1009] @apply is only supported via the PostCSS plugin. To expand @apply: (1) add `postcss.config.js` with `import rainbowindex from "rainbowindex"; export default { plugins: [rainbowindex()] };`, or (2) use the Vite plugin (`import rainbowindex from "rainbowindex/vite"`), which wires PostCSS automatically. The CLI does not run PostCSS so it cannot expand @apply.'
     );
   }
-  const compiled = await finalizeProjectCompilation({
-    css: cssSource,
-    classNames: scannedClasses,
-    analysis,
-    resolveFonts: resolveGoogleFonts
-  });
   if (compiled.classNames.length === 0) {
     const hadAnyGlob = opts.globs.length > 0;
-    const hadAnySource = theme.sources.length > 0;
+    const hadAnySource = compiled.theme.sources.length > 0;
     if (!hadAnyGlob && !hadAnySource) {
       buildWarnings.push(
         '[RI-1603] No source files were scanned and no utility classes were compiled. Either pass a glob (`rainbowindex "src/**/*.{ts,tsx}" -o out.css`) or add `@source "src/**/*.{ts,tsx}";` to your CSS input.'
@@ -654,10 +669,8 @@ async function watchMode(opts, cwd) {
     awaitWriteFinish: { stabilityThreshold: 50 }
   });
   let debounceTimer = null;
-  let building = false;
-  let pendingRebuild = false;
-  let buildDoneResolve = null;
-  let buildDonePromise = null;
+  let currentBuild = null;
+  let dirty = false;
   let consecutiveErrors = 0;
   let errorsPaused = false;
   const MAX_CONSECUTIVE_ERRORS = 5;
@@ -688,11 +701,31 @@ async function watchMode(opts, cwd) {
     }
   };
   syncSourceWatchPaths(initialBuild.theme);
-  const rebuild = () => {
+  const runBuild = async () => {
+    lastBuildStart = Date.now();
+    try {
+      const result = await buildAndWrite(opts, cwd, outputFile);
+      console.log(`[rainbowindex] Rebuilt: ${outputFile}`);
+      consecutiveErrors = 0;
+      errorsPaused = false;
+      syncSourceWatchPaths(result.theme);
+    } catch (err) {
+      consecutiveErrors++;
+      console.error("[rainbowindex] Build error:", err);
+    } finally {
+      currentBuild = null;
+      if (dirty) {
+        dirty = false;
+        scheduleRebuild();
+      }
+    }
+  };
+  const scheduleRebuild = () => {
     if (debounceTimer) clearTimeout(debounceTimer);
-    debounceTimer = setTimeout(async () => {
-      if (building) {
-        pendingRebuild = true;
+    const delay = Math.max(100, MIN_REBUILD_INTERVAL_MS - (Date.now() - lastBuildStart));
+    debounceTimer = setTimeout(() => {
+      if (currentBuild) {
+        dirty = true;
         return;
       }
       if (errorsPaused) {
@@ -705,42 +738,12 @@ async function watchMode(opts, cwd) {
         errorsPaused = true;
         return;
       }
-      const now = Date.now();
-      const elapsed = now - lastBuildStart;
-      if (lastBuildStart > 0 && elapsed < MIN_REBUILD_INTERVAL_MS) {
-        pendingRebuild = true;
-        setTimeout(rebuild, MIN_REBUILD_INTERVAL_MS - elapsed);
-        return;
-      }
-      lastBuildStart = now;
-      building = true;
-      buildDonePromise = new Promise((resolveBuild) => {
-        buildDoneResolve = resolveBuild;
-      });
-      try {
-        const result = await buildAndWrite(opts, cwd, outputFile);
-        console.log(`[rainbowindex] Rebuilt: ${outputFile}`);
-        consecutiveErrors = 0;
-        errorsPaused = false;
-        syncSourceWatchPaths(result.theme);
-      } catch (err) {
-        consecutiveErrors++;
-        console.error("[rainbowindex] Build error:", err);
-      } finally {
-        building = false;
-        buildDoneResolve?.();
-        buildDoneResolve = null;
-        buildDonePromise = null;
-        if (pendingRebuild) {
-          pendingRebuild = false;
-          rebuild();
-        }
-      }
-    }, 100);
+      currentBuild = runBuild();
+    }, delay);
   };
-  watcher.on("change", rebuild);
-  watcher.on("add", rebuild);
-  watcher.on("unlink", rebuild);
+  watcher.on("change", scheduleRebuild);
+  watcher.on("add", scheduleRebuild);
+  watcher.on("unlink", scheduleRebuild);
   watcher.on("error", (err) => {
     console.error("[rainbowindex] Watcher error:", err);
   });
@@ -749,7 +752,7 @@ async function watchMode(opts, cwd) {
     if (cleanupCalled) return;
     cleanupCalled = true;
     if (debounceTimer) clearTimeout(debounceTimer);
-    pendingRebuild = false;
+    dirty = false;
     const doExit = () => {
       watcher.close().then(() => {
         console.log("\n[rainbowindex] Watcher stopped.");
@@ -758,9 +761,9 @@ async function watchMode(opts, cwd) {
         process.exit(1);
       });
     };
-    if (building && buildDonePromise) {
+    if (currentBuild) {
       const timeout = new Promise((r) => setTimeout(r, 5e3));
-      Promise.race([buildDonePromise, timeout]).then(doExit);
+      Promise.race([currentBuild, timeout]).then(doExit);
     } else {
       doExit();
     }
@@ -1233,7 +1236,7 @@ function readPackageJSONSync(cwd) {
 
 // src/entries/cli.ts
 function getVersion() {
-  return true ? "0.2.2" : "unknown";
+  return true ? "0.4.0" : "unknown";
 }
 async function main() {
   const args = process.argv.slice(2);