rainbowindex 0.2.2 → 0.3.0

package/CHANGELOG.md

@@ -5,6 +5,33 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.0] - 2026-08-14
+
+### Added — editor tooling API (phase 2)
+
+- **`ClassCandidate.callId`** — helper/safelist candidates now carry the
+  identity of the call they were collected from: candidates from the same
+  call share one id, distinct calls get distinct ids. This is the grouping
+  key merge tooling needs to run `analyzeMerge()` over one `ri(…)` call's
+  classes without mixing neighbouring calls. Feature-detect via the new
+  `"candidate-call-ids"` entry in `editorCapabilities`.
+- **`ri()` joins the scanned class helpers** — the scanner now walks `ri(…)`
+  calls like `clsx`/`cn`/`twMerge`, so their arguments get `helper` origin,
+  a helper name, and a call id (previously they were only caught by the
+  whole-file literal scan as `plain` candidates). `CLASS_HELPER_NAMES`
+  includes `"ri"` accordingly.
+- **Value typos get suggestions** — the class inspector's suggestion corpus
+  now includes the enumerated completion universe, so `validate()` suggests
+  concrete neighbours for functional-value typos (`bg-blu-500` →
+  `bg-blue-500`, `bg-thme-500` → `bg-theme-500`) instead of staying silent.
+
+### Fixed
+
+- **`--optimize` CLI flag** — the README documented `--optimize` but the CLI
+  rejected it with "Unknown option". It is now accepted as an alias of
+  `--minify` (both run the same LightningCSS minification +
+  browser-fallback pass).
+
 ## [0.2.2] - 2026-08-13
 
 ### Added — editor tooling API (phase 1)
@@ -132,20 +159,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   imports rather than relying on tree-shaking. The barrel re-exports the
   model, so existing importers are unaffected.
 
-### Fixed
-
-- **Dep-advertised `safelistSources` were silently dropped in standard
-  install layouts** — auto-discovered safelist patterns resolve to absolute
-  paths inside the consumer's `node_modules`, but were globbed in the pass
-  that carries the default `node_modules/**` exclude, so they matched
-  nothing whenever the dep's real path sat inside the project root — i.e.
-  every plain npm/yarn/pnpm install. They now go through the same relaxed
-  second glob pass as explicit `@source "node_modules/…"` patterns, which
-  drops only that one exclude. (Tests previously passed on macOS only
-  because the symlinked tmpdir placed fixture deps outside the literal cwd,
-  dodging the cwd-relative exclude; fixtures now realpath the tmp root so
-  every platform exercises the real geometry.)
-
 ## [0.2.1] - 2026-07-28
 
 ### Added — diagnostics

package/LICENSE

@@ -19,4 +19,4 @@ Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
 WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -80,8 +80,7 @@ Common flags:
 | --- | --- |
 | `-o`, `--output <file>` | Output CSS file path. Required with `--watch`. |
 | `--watch` | Re-run on source-file changes (chokidar). |
-| `--minify` | Minify output via LightningCSS. |
-| `--optimize` | Minification + browser-fallback passes. |
+| `--minify` | Minification + browser-fallback passes via LightningCSS. `--optimize` is an accepted alias. |
 | `--css <file>` | CSS input with directives. Auto-detected if omitted. |
 | `--strict` | Drop the string escape hatch in generated types. |
 | `--template <name>` | Vite template to scaffold (default: `react-ts`). |

package/dist/{chunk-CUUW2K35.mjs → chunk-AUWGHSTO.mjs}

@@ -3,7 +3,7 @@ import {
   finalizeProjectCompilation,
   resolveGoogleFonts,
   validateGlobPattern
-} from "./chunk-FHATRQMN.mjs";
+} from "./chunk-AZXWJ625.mjs";
 import {
   APPLY_ALIASES,
   DEFAULT_PROPERTY_GROUP,
@@ -23,7 +23,7 @@ import {
   pushWarningsDeduped,
   resolveUtilityDeclarations,
   resolveVariant
-} from "./chunk-W6XIBM4M.mjs";
+} from "./chunk-IE6N76PW.mjs";
 
 // src/integrations/postcss/index.ts
 import postcss from "postcss";

package/dist/{chunk-FHATRQMN.mjs → chunk-AZXWJ625.mjs}

@@ -18,7 +18,7 @@ import {
   renderCSS,
   scanCSSForTokenUsage,
   withTimeout
-} from "./chunk-W6XIBM4M.mjs";
+} from "./chunk-IE6N76PW.mjs";
 import {
   checkPaletteContrast,
   generateAllColorVariables,

package/dist/{chunk-W6XIBM4M.mjs → chunk-IE6N76PW.mjs}

@@ -2138,6 +2138,7 @@ var CLASS_HELPERS = [
   "classnames",
   "classNames",
   "cx",
+  "ri",
   "twJoin",
   "twMerge"
 ];
@@ -2183,7 +2184,13 @@ var CandidateCollector = class {
   }
   markContext(start, end) {
     if (this.origin === "plain" || end <= start) return;
-    this.contexts.push({ start, end, origin: this.origin, helper: this.helperName });
+    this.contexts.push({
+      start,
+      end,
+      origin: this.origin,
+      helper: this.helperName,
+      id: this.contexts.length
+    });
   }
   add(value, start, end, prefixStart, prefixEnd) {
     const key = `${start}:${end}:${value}`;
@@ -2214,6 +2221,9 @@ var CandidateCollector = class {
         if (best) {
           candidate.origin = best.origin;
           if (best.helper) candidate.helperName = best.helper;
+          if (best.origin === "helper" || best.origin === "safelist") {
+            candidate.callId = best.id;
+          }
         }
       }
     }

package/dist/{chunk-KYDEHYIE.mjs → chunk-RHOQSN2B.mjs}

@@ -13,7 +13,7 @@ import {
   codepointCompare,
   parseUtility,
   resolveUtilityDeclarations
-} from "./chunk-W6XIBM4M.mjs";
+} from "./chunk-IE6N76PW.mjs";
 import {
   SPECIAL_COLORS
 } from "./chunk-SOMDX7V6.mjs";

package/dist/cli.mjs

@@ -2,7 +2,7 @@
 import {
   CSS_ENTRY_CANDIDATES,
   enumerateClassNames
-} from "./chunk-KYDEHYIE.mjs";
+} from "./chunk-RHOQSN2B.mjs";
 import {
   DEFAULT_EXCLUDES,
   DEFAULT_PATTERNS,
@@ -11,7 +11,7 @@ import {
   getFontPreloadLinks,
   resolveGoogleFonts,
   validateGlobPattern
-} from "./chunk-FHATRQMN.mjs";
+} from "./chunk-AZXWJ625.mjs";
 import {
   MAX_DIRECTIVE_INPUT_SIZE,
   analyzeProjectCSS,
@@ -20,7 +20,7 @@ import {
   hasRIActivation,
   listVariants,
   resolveDirectives
-} from "./chunk-W6XIBM4M.mjs";
+} from "./chunk-IE6N76PW.mjs";
 import {
   devWarn
 } from "./chunk-SOMDX7V6.mjs";
@@ -109,7 +109,7 @@ function parseArgs(argv, callbacks) {
       i++;
       continue;
     }
-    if (arg === "--minify") {
+    if (arg === "--minify" || arg === "--optimize") {
       opts.minify = true;
       i++;
       continue;
@@ -176,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
 
@@ -291,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
@@ -1233,7 +1233,7 @@ function readPackageJSONSync(cwd) {
 
 // src/entries/cli.ts
 function getVersion() {
-  return true ? "0.2.2" : "unknown";
+  return true ? "0.3.0" : "unknown";
 }
 async function main() {
   const args = process.argv.slice(2);

package/dist/editor.d.ts

@@ -27,6 +27,14 @@ interface ClassCandidate {
     origin: CandidateOrigin;
     /** The call the class was found in, when origin is "helper"/"safelist". */
     helperName?: string;
+    /** Identity of the innermost scanned helper/safelist call context:
+     *  candidates from the same call share one id, distinct calls get distinct
+     *  ids. A class helper nested inside another class helper's arguments is
+     *  not scanned as its own call — its literals belong to the outer call —
+     *  while a class helper inside a cva/tv config does get its own id. Ids
+     *  are only comparable within one extraction's result. Absent for
+     *  attribute/plain candidates. */
+    callId?: number;
     /** For variant-group members: span of the group's variant prefix (`hover:`). */
     groupPrefix?: {
         start: number;

package/dist/editor.mjs

@@ -2,7 +2,7 @@ import {
   CSS_ENTRY_CANDIDATES,
   UTILITY_VALUE_SPACES,
   enumerateClassNames
-} from "./chunk-KYDEHYIE.mjs";
+} from "./chunk-RHOQSN2B.mjs";
 import {
   CLASS_HELPER_NAMES,
   RI_IMPORT_SPECIFIERS,
@@ -25,7 +25,7 @@ import {
   parseUtility,
   severityForCode,
   warningCode
-} from "./chunk-W6XIBM4M.mjs";
+} from "./chunk-IE6N76PW.mjs";
 import {
   analyzeMerge,
   computeDarkStop,
@@ -63,10 +63,12 @@ function createClassInspector(theme) {
   }
   function utilitySuggestionCorpus() {
     if (!utilityCorpus) {
-      utilityCorpus = [
-        ...STATIC_UTILITIES,
-        ...theme.customUtilities.filter((u) => !u.functional).map((u) => u.name)
-      ];
+      const names = new Set(STATIC_UTILITIES);
+      for (const custom of theme.customUtilities) {
+        if (!custom.functional) names.add(custom.name);
+      }
+      for (const entry of enumerateClassNames(theme).classes) names.add(entry.name);
+      utilityCorpus = [...names];
     }
     return utilityCorpus;
   }
@@ -352,10 +354,11 @@ function createEditorSession(options = {}) {
 }
 
 // src/entries/editor.ts
-var version = true ? "0.2.2" : "0.0.0-dev";
+var version = true ? "0.3.0" : "0.0.0-dev";
 var EDITOR_API_VERSION = 1;
 var editorCapabilities = Object.freeze([
   "class-candidates",
+  "candidate-call-ids",
   "css-entry-detection",
   "theme-analysis",
   "class-inspection",

package/dist/index.mjs

@@ -3,17 +3,17 @@ import {
 } from "./chunk-PD4ZXGJ6.mjs";
 import {
   postcss_default
-} from "./chunk-CUUW2K35.mjs";
+} from "./chunk-AUWGHSTO.mjs";
 import {
   finalizeProjectCompilation,
   resolveGoogleFonts
-} from "./chunk-FHATRQMN.mjs";
+} from "./chunk-AZXWJ625.mjs";
 import {
   analyzeProjectCSS,
   createCompiler,
   extractClassesFromSource,
   pushWarningsDeduped
-} from "./chunk-W6XIBM4M.mjs";
+} from "./chunk-IE6N76PW.mjs";
 import {
   DEFAULT_TEXT_SIZES,
   createCompilationContext,

package/dist/vite.mjs

@@ -1,7 +1,7 @@
 import {
   postcss_default
-} from "./chunk-CUUW2K35.mjs";
-import "./chunk-FHATRQMN.mjs";
+} from "./chunk-AUWGHSTO.mjs";
+import "./chunk-AZXWJ625.mjs";
 import {
   expandApplyGroups,
   findClosingBrace,
@@ -9,7 +9,7 @@ import {
   isAtRuleBoundary,
   isAtRuleNameChar,
   isSourceFile
-} from "./chunk-W6XIBM4M.mjs";
+} from "./chunk-IE6N76PW.mjs";
 import {
   devWarn
 } from "./chunk-SOMDX7V6.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rainbowindex",
-	"version": "0.2.2",
+	"version": "0.3.0",
 	"description": "CSS-first system for building and maintaining consistent user interfaces",
 	"keywords": [
 		"css",