rainbowindex 0.2.1 → 0.3.0

package/dist/{chunk-5N4GPK26.mjs → chunk-SOMDX7V6.mjs}

@@ -282,6 +282,21 @@ function computeStop(def, suffix) {
     h: roundedH
   };
 }
+function computeDarkStop(def, suffix, darkConfig, darkOverride) {
+  const lightStop = generateStop(def, suffix);
+  const darkL = generateStop(def, 1e3 - suffix).l;
+  let extraChroma = 0;
+  let extraHue = 0;
+  if (darkOverride?.strategy === "shift") {
+    extraChroma = darkOverride.chromaDelta;
+    extraHue = darkOverride.hueDelta;
+  }
+  const darkH = lightStop.h + darkConfig.hueShift + extraHue;
+  const globalChromaBoost = def.chromaBoost !== false ? darkConfig.chromaBoost : 0;
+  const requestedChroma = lightStop.c + globalChromaBoost + extraChroma;
+  const darkC = Math.floor(gamutSafeChroma(darkL, requestedChroma, darkH) * 1e4) / 1e4;
+  return { stop: suffix, l: darkL, c: darkC, h: darkH };
+}
 function formatOklch(l, c, h) {
   return `oklch(${l} ${c} ${h})`;
 }
@@ -298,18 +313,8 @@ function generateColorVariables(name, def, suffixes, darkConfig = DEFAULT_DARK_C
         vars.push(`--color-${name}-${suffix}: light-dark(${lightValue}, ${lightValue});`);
       }
     } else {
-      const darkL = generateStop(def, 1e3 - suffix).l;
-      let extraChroma = 0;
-      let extraHue = 0;
-      if (darkOverride?.strategy === "shift") {
-        extraChroma = darkOverride.chromaDelta;
-        extraHue = darkOverride.hueDelta;
-      }
-      const darkH = lightStop.h + darkConfig.hueShift + extraHue;
-      const globalChromaBoost = def.chromaBoost !== false ? darkConfig.chromaBoost : 0;
-      const requestedChroma = lightStop.c + globalChromaBoost + extraChroma;
-      const darkC = Math.floor(gamutSafeChroma(darkL, requestedChroma, darkH) * 1e4) / 1e4;
-      const darkValue = formatOklch(darkL, darkC, darkH);
+      const darkStop = computeDarkStop(def, suffix, darkConfig, darkOverride);
+      const darkValue = formatOklch(darkStop.l, darkStop.c, darkStop.h);
       vars.push(`--color-${name}-${suffix}: light-dark(${lightValue}, ${darkValue});`);
     }
   }
@@ -2330,7 +2335,7 @@ function canonicalVariantPrefix(variantPrefix) {
   segments.sort();
   return `${segments.join(":")}:`;
 }
-function mergeUncached(classes, resolve) {
+function mergeUncached(classes, resolve, trace) {
   const claimed = /* @__PURE__ */ new Set();
   const result = [];
   for (let i = classes.length - 1; i >= 0; i--) {
@@ -2353,13 +2358,27 @@ function mergeUncached(classes, resolve) {
         break;
       }
     }
-    if (dominated) continue;
+    if (dominated) {
+      if (trace) {
+        const by = /* @__PURE__ */ new Set();
+        for (const prop of props) {
+          const claimer = trace.claimers.get(ns + prop);
+          if (claimer !== void 0) by.add(claimer);
+        }
+        trace.dropped.push({ index: i, overriddenBy: [...by].sort((a, b) => a - b) });
+      }
+      continue;
+    }
     for (const prop of props) {
-      claimed.add(ns + prop);
+      const key = ns + prop;
+      if (trace && !claimed.has(key)) trace.claimers.set(key, i);
+      claimed.add(key);
       const longhands = OVERRIDES[prop];
       if (longhands !== void 0) {
         for (const lh of longhands) {
-          claimed.add(ns + lh);
+          const longhandKey = ns + lh;
+          if (trace && !claimed.has(longhandKey)) trace.claimers.set(longhandKey, i);
+          claimed.add(longhandKey);
         }
       }
     }
@@ -2465,6 +2484,38 @@ function createRi(snapshot) {
     return mergeFrom(inputs, resolve, cache);
   };
 }
+function analyzeMerge(classes, snapshot) {
+  const snap = snapshot ?? _latestSnapshot ?? {
+    customStaticProps: _customStaticProps,
+    textSizes: _textSizes,
+    fontFamilies: _fontFamilies,
+    colorNames: _colorNames
+  };
+  const resolve = (utility) => resolvePropsWith(
+    utility,
+    snap.customStaticProps,
+    snap.textSizes,
+    snap.fontFamilies,
+    snap.colorNames
+  );
+  const trace = { claimers: /* @__PURE__ */ new Map(), dropped: [] };
+  const output = mergeUncached(classes, resolve, trace);
+  trace.dropped.sort((a, b) => a.index - b.index);
+  const droppedIndexes = new Set(trace.dropped.map((d) => d.index));
+  const kept = [];
+  for (let i = 0; i < classes.length; i++) {
+    if (!droppedIndexes.has(i)) kept.push(i);
+  }
+  return {
+    output,
+    kept,
+    dropped: trace.dropped.map((d) => ({
+      index: d.index,
+      className: classes[d.index],
+      overriddenBy: d.overriddenBy
+    }))
+  };
+}
 var MAX_FLATTEN_DEPTH = 10;
 var MAX_CLASS_NAME_LENGTH = 500;
 var MAX_TOTAL_CLASSES = 1e4;
@@ -2622,6 +2673,12 @@ export {
   isValidColorSuffix,
   DEFAULT_COLORS,
   DEFAULT_DARK_CONFIG,
+  oklchToOklab,
+  oklabToLinearSrgb,
+  linearToSrgb,
+  generateStop,
+  computeDarkStop,
+  formatOklch,
   checkPaletteContrast,
   generateAllColorVariables,
   generateThemeOverrides,
@@ -2654,6 +2711,7 @@ export {
   DEFAULT_TEXT_SIZES,
   ri,
   createRi,
+  analyzeMerge,
   createCompilationContext,
   registerCustomUtility,
   registerCustomTextSizes,

package/dist/cli.mjs

@@ -1,22 +1,29 @@
 #!/usr/bin/env node
+import {
+  CSS_ENTRY_CANDIDATES,
+  enumerateClassNames
+} from "./chunk-RHOQSN2B.mjs";
 import {
   DEFAULT_EXCLUDES,
   DEFAULT_PATTERNS,
-  MAX_DIRECTIVE_INPUT_SIZE,
-  analyzeProjectCSS,
   collectProjectClasses,
-  extractDirectives,
   finalizeProjectCompilation,
   getFontPreloadLinks,
-  hasApplyLikeDirective,
-  hasRIActivation,
-  resolveDirectives,
   resolveGoogleFonts,
   validateGlobPattern
-} from "./chunk-RPXZ3O6R.mjs";
+} from "./chunk-AZXWJ625.mjs";
+import {
+  MAX_DIRECTIVE_INPUT_SIZE,
+  analyzeProjectCSS,
+  extractDirectives,
+  hasApplyLikeDirective,
+  hasRIActivation,
+  listVariants,
+  resolveDirectives
+} from "./chunk-IE6N76PW.mjs";
 import {
   devWarn
-} from "./chunk-5N4GPK26.mjs";
+} from "./chunk-SOMDX7V6.mjs";
 
 // src/entries/cli.ts
 import { realpathSync } from "fs";
@@ -102,7 +109,7 @@ function parseArgs(argv, callbacks) {
       i++;
       continue;
     }
-    if (arg === "--minify") {
+    if (arg === "--minify" || arg === "--optimize") {
       opts.minify = true;
       i++;
       continue;
@@ -169,7 +176,7 @@ Usage:
 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
+  --minify               Minify + browser fallbacks via LightningCSS (alias: --optimize)
   --css <file>           CSS input with directives (auto-detected if omitted)
   -h, --help             Show this help
 
@@ -284,7 +291,7 @@ 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
+  --minify               Minify + browser fallbacks via LightningCSS (alias: --optimize)
   --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
@@ -314,21 +321,9 @@ Examples:
 import { existsSync } from "fs";
 import { readFile, stat } from "fs/promises";
 import { resolve as resolve2 } from "path";
-var CSS_CANDIDATES = Object.freeze([
-  "src/index.css",
-  "src/style.css",
-  "src/styles.css",
-  "src/app.css",
-  "src/global.css",
-  "index.css",
-  "style.css",
-  "styles.css",
-  "app.css",
-  "global.css"
-]);
 var MAX_CSS_FILE_SIZE = MAX_DIRECTIVE_INPUT_SIZE;
 async function findCSSFileAsync(cwd) {
-  const candidates = CSS_CANDIDATES;
+  const candidates = CSS_ENTRY_CANDIDATES;
   const results = await Promise.all(
     candidates.map(async (candidate) => {
       const full = resolve2(cwd, candidate);
@@ -452,19 +447,37 @@ async function generateTypes(opts, cwd) {
       return false;
     });
   };
+  const literalSafe = (names) => names.filter((n) => !n.includes('"') && !n.includes("\\"));
+  const enumeration = enumerateClassNames(theme);
+  const variants = listVariants(theme);
   const colorNames = validateNames(Object.keys(theme.colors), "color");
   const textSizes = validateNames(Object.keys(theme.text), "text");
-  const breakpoints = validateNames(Object.keys(theme.breakpoints), "breakpoint");
   const weightNames = validateNames(Object.keys(theme.weights), "weight");
-  const staticCustomUtilities = validateNames(
-    theme.customUtilities.filter((u) => !u.functional).map((u) => u.name),
-    "utility"
+  const variantNames = literalSafe(variants.filter((v) => v.kind !== "pattern").map((v) => v.name));
+  const finiteClasses = literalSafe(enumeration.classes.map((c) => c.name));
+  const spacingRoots = validateNames(
+    enumeration.templates.filter((t) => t.kind === "spacing").map((t) => t.root),
+    "spacing root"
+  );
+  const numericRoots = validateNames(
+    enumeration.templates.filter((t) => t.kind === "number").map((t) => t.root),
+    "numeric root"
   );
   const functionalCustomUtilities = validateNames(
-    theme.customUtilities.filter((u) => u.functional).map((u) => u.name),
+    enumeration.templates.filter((t) => t.kind === "custom").map((t) => t.root),
     "utility"
   );
   const union = (names) => names.length > 0 ? names.map((n) => `"${n}"`).join(" | ") : "never";
+  const unionLines = (names, perLine) => {
+    if (names.length === 0) return ["  | never"];
+    const lines2 = [];
+    for (let i = 0; i < names.length; i += perLine) {
+      lines2.push(
+        `  | ${names.slice(i, i + perLine).map((n) => `"${n}"`).join(" | ")}`
+      );
+    }
+    return lines2;
+  };
   const lines = [
     "// rainbowindex-env.d.ts (auto-generated \u2014 do not edit)",
     "",
@@ -472,25 +485,44 @@ async function generateTypes(opts, cwd) {
     `type ColorStop = "50" | "100" | "150" | "200" | "250" | "300" | "350" | "400" | "450" | "500" | "550" | "600" | "650" | "700" | "750" | "800" | "850" | "900" | "950";`,
     "type SpacingToken = `${number}` | `${number}_${number}`;",
     `type TextSize = ${union(textSizes)};`,
-    `type Variant = ${union(breakpoints)} | "hover" | "focus" | "focus-visible" | "active" | "disabled" | "dark" | "first" | "last" | "odd" | "even";`,
     `type WeightName = ${union(weightNames)};`,
     "",
-    "type RainbowClass =",
-    '  | `${"bg" | "text" | "border" | "outline" | "accent" | "caret" | "fill" | "stroke"}-${ColorName}-${ColorStop}`',
-    '  | `${"p" | "px" | "py" | "pt" | "pb" | "pl" | "pr" | "ps" | "pe" | "pbs" | "pbe" | "m" | "mx" | "my" | "mt" | "mb" | "ml" | "mr" | "ms" | "me" | "mbs" | "mbe" | "gap" | "gap-x" | "gap-y"}-${SpacingToken}`',
-    "  | `text-${TextSize}`",
-    "  | `text-fluid-${TextSize}`",
-    '  | `font-${"sans" | "serif" | "mono"}`',
-    "  | `font-${WeightName}`",
-    "  | `w-${SpacingToken}` | `h-${SpacingToken}` | `size-${SpacingToken}`"
+    "type Variant =",
+    ...unionLines(variantNames, 8),
+    "  ;",
+    "",
+    "// Every finite class the compiler resolves for this theme \u2014 statics plus",
+    "// theme-token expansions, enumerated and probe-verified.",
+    "type RainbowStatic =",
+    ...unionLines(finiteClasses, 6),
+    "  ;"
   ];
-  if (staticCustomUtilities.length > 0) {
-    lines.push(`  | ${staticCustomUtilities.map((n) => `"${n}"`).join(" | ")}`);
+  if (spacingRoots.length > 0) {
+    lines.push("", `type SpacingRoot = ${union(spacingRoots)};`);
+  }
+  if (numericRoots.length > 0) {
+    lines.push(`type NumericRoot = ${union(numericRoots)};`);
+  }
+  lines.push("", "type RainbowBase =", "  | RainbowStatic");
+  if (spacingRoots.length > 0) {
+    lines.push("  | `${SpacingRoot}-${SpacingToken}`");
+  }
+  if (numericRoots.length > 0) {
+    lines.push("  | `${NumericRoot}-${number}`");
   }
   if (functionalCustomUtilities.length > 0) {
     lines.push(`  | ${functionalCustomUtilities.map((n) => `\`${n}-\${string}\``).join(" | ")}`);
   }
-  lines.push("  | `${Variant}:${Exclude<RainbowClass, `${string}:${string}`>}`");
+  lines.push("  ;");
+  lines.push(
+    "",
+    "type RainbowClass =",
+    "  | RainbowBase",
+    "  // Variant-prefixed classes validate the variant name (chained prefixes",
+    "  // match through the open remainder). Expanding Variant \xD7 RainbowBase",
+    "  // eagerly would exceed TypeScript's union-size limits.",
+    "  | `${Variant}:${string}`"
+  );
   if (!opts.strict) {
     lines.push("  | (string & {});");
   } else {
@@ -1054,7 +1086,7 @@ async function resolveStylesheetPath(cwd, cssFile) {
   if (cssFile) return resolve5(cwd, cssFile);
   const importedCSS = await findImportedStylesheet(cwd);
   if (importedCSS) return importedCSS;
-  for (const candidate of CSS_CANDIDATES) {
+  for (const candidate of CSS_ENTRY_CANDIDATES) {
     const fullPath = resolve5(cwd, candidate);
     if (existsSync3(fullPath)) return fullPath;
   }
@@ -1201,7 +1233,7 @@ function readPackageJSONSync(cwd) {
 
 // src/entries/cli.ts
 function getVersion() {
-  return true ? "0.2.1" : "unknown";
+  return true ? "0.3.0" : "unknown";
 }
 async function main() {
   const args = process.argv.slice(2);