rainbowindex 0.4.0 → 0.4.1

package/dist/{chunk-TLR6RP5L.mjs → chunk-IYIUS7AE.mjs}

@@ -1,6 +1,6 @@
 import {
   compileScannedProject
-} from "./chunk-4SVFFDS2.mjs";
+} from "./chunk-53WD6U2X.mjs";
 import {
   APPLY_ALIASES,
   DIRECTIVE_NAMES_SET,
@@ -20,7 +20,7 @@ import {
   resolveUtilityDeclarations,
   resolveVariant,
   splitSelectorList
-} from "./chunk-6DAHUFNU.mjs";
+} from "./chunk-6GTG5SZJ.mjs";
 
 // src/integrations/postcss/index.ts
 import postcss2 from "postcss";
@@ -102,6 +102,7 @@ function processApply(root, theme, warnings) {
   }
   const customVariantMap = new Map(theme.customVariants.map((cv) => [cv.name, cv]));
   const checkedApplyRoots = /* @__PURE__ */ new Set();
+  const resolveCache = /* @__PURE__ */ new Map();
   for (let depth = 0; depth < MAX_APPLY_DEPTH; depth++) {
     const applyNodes = [];
     const classListByNode = /* @__PURE__ */ new Map();
@@ -127,7 +128,8 @@ function processApply(root, theme, warnings) {
         warnings,
         customVariantMap,
         groupRoots,
-        checkedApplyRoots
+        checkedApplyRoots,
+        resolveCache
       );
     }
   }
@@ -144,7 +146,7 @@ function processApply(root, theme, warnings) {
     }
   }
 }
-function expandApply(atRule, classNames, theme, warnings, customVariantMap, groupRoots, checkedApplyRoots) {
+function expandApply(atRule, classNames, theme, warnings, customVariantMap, groupRoots, checkedApplyRoots, resolveCache) {
   const parentRule = atRule.parent;
   if (parentRule?.type !== "rule") {
     warnings.push("[RI-1006] @apply must be used inside a CSS rule, not at the top level.");
@@ -166,8 +168,23 @@ function expandApply(atRule, classNames, theme, warnings, customVariantMap, grou
   }
   const resolved = [];
   for (const className of classNames) {
-    const r = resolveClassName(className, theme, warnings, customVariantMap, checkedApplyRoots);
-    if (r) resolved.push(r);
+    let entry = resolveCache.get(className);
+    if (!entry) {
+      const entryWarnings = [];
+      entry = {
+        result: resolveClassName(
+          className,
+          theme,
+          entryWarnings,
+          customVariantMap,
+          checkedApplyRoots
+        ),
+        warnings: entryWarnings
+      };
+      resolveCache.set(className, entry);
+    }
+    warnings.push(...entry.warnings);
+    if (entry.result) resolved.push(entry.result);
   }
   const baseGroups = [];
   const baseNestedBlocks = [];
@@ -556,16 +573,16 @@ var rainbowindex = (options = {}) => {
         const compilationWarnings = compiled.warnings;
         const from = root.source?.input?.file ?? root.source?.input?.id ?? root.source?.input?.from ?? "<rainbowindex>";
         stripRIDirectiveNodes(root);
-        if (compiled.sections.length > 0) {
-          const generatedRoot = postcss2.parse(compiled.sections.join("\n\n"), { from });
-          root.prepend(generatedRoot.nodes);
-        }
         const slotWarnings = [];
         warnStandaloneSlots(root, slotWarnings);
         pushWarningsDeduped(compilationWarnings, slotWarnings, warningSeen);
         const applyWarnings = [];
         processApply(root, compiled.theme, applyWarnings);
         pushWarningsDeduped(compilationWarnings, applyWarnings, warningSeen);
+        if (compiled.sections.length > 0) {
+          const generatedRoot = postcss2.parse(compiled.sections.join("\n\n"), { from });
+          root.prepend(generatedRoot.nodes);
+        }
         const cssFnWarnings = [];
         processCSSFunctions(root, compiled.theme, cssFnWarnings);
         pushWarningsDeduped(compilationWarnings, cssFnWarnings, warningSeen);

package/dist/{chunk-5Y7EXXLS.mjs → chunk-KRZL4IDK.mjs}

@@ -2101,6 +2101,7 @@ var FONT_FAMILY_PROPS = Object.freeze([
   "font-variation-settings"
 ]);
 var MASK_RADIAL_SIZE_PROPS = Object.freeze(["--ri-mask-radial-size"]);
+var STROKE_WIDTH_PROPS = Object.freeze(["stroke-width"]);
 var BG_IMAGE_PROPS = Object.freeze(["background-image"]);
 var BORDER_COLOR_PROPS = Object.freeze(["border-color"]);
 var OUTLINE_COLOR_PROPS = Object.freeze(["outline-color"]);
@@ -2108,6 +2109,7 @@ var OUTLINE_STYLE_PROPS = Object.freeze(["outline-style"]);
 var DECORATION_COLOR_PROPS = Object.freeze(["text-decoration-color"]);
 var RE_SIGNED_INT = /^-?\d+$/;
 var RE_UNSIGNED_INT = /^\d+$/;
+var RE_DECIMAL = /^\d+(?:[._]\d+)?$/;
 function colorOrDefault(prefix, colorProps) {
   const defaultProps = PREFIX_PROPS[prefix];
   return (value, _textSizes2, _fontFamilies2, colorNames) => isColorValue(value, void 0, colorNames) ? colorProps : defaultProps;
@@ -2134,6 +2136,14 @@ var DUAL_MODE_PREFIXES = {
       return PREFIX_PROPS.outline;
     return OUTLINE_STYLE_PROPS;
   },
+  // Width-vs-color, mirroring svg.ts's generate-side dispatch: decimals
+  // (stroke-2, stroke-1.5) and non-color arbitraries (stroke-[3px]) emit
+  // stroke-width; every color-shaped value emits the `stroke` paint property.
+  stroke: (value, _textSizes2, _fontFamilies2, colorNames) => {
+    if (RE_DECIMAL.test(value) || value.startsWith("[") && !isColorValue(value, void 0, colorNames))
+      return STROKE_WIDTH_PROPS;
+    return PREFIX_PROPS.stroke;
+  },
   decoration: (value, _textSizes2, _fontFamilies2, colorNames) => {
     if (value.startsWith("(length:") || value.startsWith("[length:"))
       return PREFIX_PROPS.decoration;
@@ -2410,16 +2420,19 @@ function mergeClasses(classes, resolve, cache) {
   return output;
 }
 function mergeFrom(inputs, resolve, cache) {
-  let allStrings = inputs.length > 0;
+  let fastPath = true;
+  let rawKey = "";
   for (let i = 0; i < inputs.length; i++) {
     const input = inputs[i];
-    if (typeof input !== "string" || input === "") {
-      allStrings = false;
+    if (typeof input === "string") {
+      if (input !== "") rawKey = rawKey === "" ? input : `${rawKey}\0${input}`;
+    } else if (input) {
+      fastPath = false;
       break;
     }
   }
-  if (allStrings) {
-    const rawKey = inputs.join("\0");
+  if (fastPath) {
+    if (rawKey === "") return "";
     if (rawKey.length <= RI_CACHE_KEY_MAX_LEN) {
       const cached = lruGet(cache, rawKey);
       if (cached !== void 0) return cached;

package/dist/{chunk-YLB6FGIG.mjs → chunk-WYMCN5OC.mjs}

@@ -15,10 +15,10 @@ import {
   codepointCompare,
   parseUtility,
   resolveUtilityDeclarations
-} from "./chunk-6DAHUFNU.mjs";
+} from "./chunk-6GTG5SZJ.mjs";
 import {
   SPECIAL_COLORS
-} from "./chunk-5Y7EXXLS.mjs";
+} from "./chunk-KRZL4IDK.mjs";
 
 // src/project/css-entry.ts
 var CSS_ENTRY_CANDIDATES = Object.freeze([

package/dist/cli.mjs

@@ -2,13 +2,13 @@
 import {
   CSS_ENTRY_CANDIDATES,
   enumerateClassNames
-} from "./chunk-YLB6FGIG.mjs";
+} from "./chunk-WYMCN5OC.mjs";
 import {
   DEFAULT_EXCLUDES,
   DEFAULT_PATTERNS,
   compileScannedProject,
   getFontPreloadLinks
-} from "./chunk-4SVFFDS2.mjs";
+} from "./chunk-53WD6U2X.mjs";
 import {
   MAX_DIRECTIVE_INPUT_SIZE,
   extractDirectives,
@@ -16,10 +16,10 @@ import {
   hasRIActivation,
   listVariants,
   resolveDirectives
-} from "./chunk-6DAHUFNU.mjs";
+} from "./chunk-6GTG5SZJ.mjs";
 import {
   devWarn
-} from "./chunk-5Y7EXXLS.mjs";
+} from "./chunk-KRZL4IDK.mjs";
 
 // src/entries/cli.ts
 import { realpathSync } from "fs";
@@ -1236,7 +1236,7 @@ function readPackageJSONSync(cwd) {
 
 // src/entries/cli.ts
 function getVersion() {
-  return true ? "0.4.0" : "unknown";
+  return true ? "0.4.1" : "unknown";
 }
 async function main() {
   const args = process.argv.slice(2);

package/dist/editor.d.ts

@@ -1,5 +1,5 @@
-import { P as ParsedDirective, R as ResolvedTheme } from './index-BB2HoeMj.js';
-export { b as createThemeSnapshot } from './index-BB2HoeMj.js';
+import { P as ParsedDirective, R as ResolvedTheme } from './index-Dp6i5TSv.js';
+export { b as createThemeSnapshot } from './index-Dp6i5TSv.js';
 import { b as CompilationSnapshot, C as ColorDefinition } from './context-ruu2x_jR.js';
 export { e as defaultTheme } from './context-ruu2x_jR.js';
 

package/dist/editor.mjs

@@ -2,7 +2,7 @@ import {
   CSS_ENTRY_CANDIDATES,
   UTILITY_VALUE_SPACES,
   enumerateClassNames
-} from "./chunk-YLB6FGIG.mjs";
+} from "./chunk-WYMCN5OC.mjs";
 import {
   isSourceFile
 } from "./chunk-3HRMFZGE.mjs";
@@ -27,7 +27,7 @@ import {
   parseUtility,
   severityForCode,
   warningCode
-} from "./chunk-6DAHUFNU.mjs";
+} from "./chunk-6GTG5SZJ.mjs";
 import {
   computeDarkStop,
   defaultTheme,
@@ -38,7 +38,7 @@ import {
   oklabToLinearSrgb,
   oklchToOklab,
   resolverFor
-} from "./chunk-5Y7EXXLS.mjs";
+} from "./chunk-KRZL4IDK.mjs";
 
 // src/engine/inspector.ts
 var RESOLUTION_CACHE_CAP = 1e4;
@@ -383,7 +383,7 @@ function createEditorSession(options = {}) {
 }
 
 // src/entries/editor.ts
-var version = true ? "0.4.0" : "0.0.0-dev";
+var version = true ? "0.4.1" : "0.0.0-dev";
 var EDITOR_API_VERSION = 1;
 var editorCapabilities = Object.freeze([
   "class-candidates",

package/dist/{index-BB2HoeMj.d.ts → index-Dp6i5TSv.d.ts}

@@ -12,11 +12,9 @@ interface FontFace {
     style: string;
     /** font-display strategy. */
     display: string;
-    /** Unicode subsets — used as a Google Fonts URL hint. */
-    subset: string;
     /** Optional unicode-range descriptor emitted into the @font-face (local subsetting). */
     unicodeRange?: string;
-    /** Per-face preload override; when undefined the slot-level default applies. */
+    /** Whether to emit a preload link for this face's font file. */
     preload?: boolean;
     /** Whether the weight was explicitly set by the user (not a default).
      *  Used by refreshFontWeightDefaults() to avoid overriding user intent. */
@@ -38,19 +36,25 @@ interface FontSlot {
     features: string | null;
     /** Font variation settings — applied via the font-<slot> utility. */
     variation: string | null;
-    /** Slot-level preload default for faces that don't set their own. */
-    preload: boolean;
     /** One or more faces — each emits an @font-face for local providers. */
     faces: FontFace[];
-    /** User-specified fallback font for metrics-adjusted @font-face. */
-    metricsFallback?: string;
-    /** User-specified size-adjust percentage. */
+    /**
+     * CLS-fallback metrics config from the `metrics:` key. Absent = automatic
+     * (from the built-in table when the family is known); `null` = disabled via
+     * `metrics: none`; an object overrides the fallback font and/or the numbers.
+     */
+    metrics?: FontMetricsConfig | null;
+}
+/**
+ * Parsed `metrics:` value. `fallback` picks the local font to metric-match.
+ * The four override percentages are all-present or all-absent (the parser
+ * enforces arity); when absent they are computed from the built-in table.
+ */
+interface FontMetricsConfig {
+    fallback?: string;
     sizeAdjust?: number;
-    /** User-specified ascent-override percentage. */
     ascent?: number;
-    /** User-specified descent-override percentage. */
     descent?: number;
-    /** User-specified line-gap-override percentage. */
     lineGap?: number;
 }
 

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import { PluginCreator } from 'postcss';
 export { C as ColorDefinition, a as CompilationContext, b as CompilationSnapshot, F as FluidConfig, T as TextSize, c as Theme, d as createCompilationContext, e as defaultTheme, f as finalizeCompilationContext, r as registerColorNames, g as registerCustomFontFamilies, h as registerCustomTextSizes, i as registerCustomUtility } from './context-ruu2x_jR.js';
 export { D as DEFAULT_TEXT_SIZES, c as createRi, r as ri, s as safelist } from './safelist-D9-Plqta.js';
-import { R as ResolvedTheme, P as ParsedDirective } from './index-BB2HoeMj.js';
-export { C as CompilationResult, a as CompiledRule, c as createCompiler } from './index-BB2HoeMj.js';
+import { R as ResolvedTheme, P as ParsedDirective } from './index-Dp6i5TSv.js';
+export { C as CompilationResult, a as CompiledRule, c as createCompiler } from './index-Dp6i5TSv.js';
 
 interface RainbowIndexOptions {
     sources?: string[];

package/dist/index.mjs

@@ -3,17 +3,17 @@ import {
 } from "./chunk-PD4ZXGJ6.mjs";
 import {
   postcss_default
-} from "./chunk-TLR6RP5L.mjs";
+} from "./chunk-IYIUS7AE.mjs";
 import {
   finalizeProjectCompilation,
   resolveGoogleFonts
-} from "./chunk-4SVFFDS2.mjs";
+} from "./chunk-53WD6U2X.mjs";
 import {
   analyzeProjectCSS,
   createCompiler,
   extractClassesFromSource,
   pushWarningsDeduped
-} from "./chunk-6DAHUFNU.mjs";
+} from "./chunk-6GTG5SZJ.mjs";
 import {
   DEFAULT_TEXT_SIZES,
   createCompilationContext,
@@ -25,7 +25,7 @@ import {
   registerCustomTextSizes,
   registerCustomUtility,
   ri
-} from "./chunk-5Y7EXXLS.mjs";
+} from "./chunk-KRZL4IDK.mjs";
 
 // src/project/index.ts
 async function compileProject(options) {

package/dist/vite.mjs

@@ -1,7 +1,7 @@
 import {
   postcss_default
-} from "./chunk-TLR6RP5L.mjs";
-import "./chunk-4SVFFDS2.mjs";
+} from "./chunk-IYIUS7AE.mjs";
+import "./chunk-53WD6U2X.mjs";
 import {
   isSourceFile
 } from "./chunk-3HRMFZGE.mjs";
@@ -12,10 +12,10 @@ import {
   hasRIActivation,
   isAtRuleBoundary,
   isAtRuleNameChar
-} from "./chunk-6DAHUFNU.mjs";
+} from "./chunk-6GTG5SZJ.mjs";
 import {
   devWarn
-} from "./chunk-5Y7EXXLS.mjs";
+} from "./chunk-KRZL4IDK.mjs";
 
 // src/integrations/vite.ts
 import { existsSync } from "fs";
@@ -57,61 +57,33 @@ var KEYWORD_BODY_DIRECTIVES = new Set(
 var REMOVAL_RE = /!([\w][\w-]*)\s*;/g;
 var FLUID_KEYWORD_RE = /\b(no-parabolic|parabolic|no-shift|shift)\s*;?/g;
 var COLOR_FLAG_RE = /(?<=[{;\s]|^)(inline|no-parabolic|parabolic)\s*(?:;|(?=}))/g;
-function rewriteTopLevel(body, rewrite) {
-  if (!body.includes("{")) return rewrite(body);
+function mapTopLevelSpans(body, mapOutside, mapBlock) {
+  let brace = body.indexOf("{");
+  if (brace === -1) return mapOutside(body);
   let out = "";
   let segStart = 0;
-  let depth = 0;
-  for (let i = 0; i < body.length; i++) {
-    const ch = body[i];
-    if (ch === "{") {
-      if (depth === 0) {
-        out += rewrite(body.slice(segStart, i));
-        segStart = i;
-      }
-      depth++;
-    } else if (ch === "}") {
-      if (depth > 0) depth--;
-      if (depth === 0) {
-        out += body.slice(segStart, i + 1);
-        segStart = i + 1;
-      }
-    }
+  while (brace !== -1) {
+    out += mapOutside(body.slice(segStart, brace));
+    const close = findClosingBrace(body, brace);
+    if (close === -1) return out + body.slice(brace);
+    out += `{${mapBlock(body.slice(brace + 1, close))}}`;
+    segStart = close + 1;
+    brace = body.indexOf("{", segStart);
   }
-  out += depth === 0 ? rewrite(body.slice(segStart)) : body.slice(segStart);
-  return out;
+  return out + mapOutside(body.slice(segStart));
 }
+var keepSpan = (span) => span;
 function rewriteColorOptionFlag(_match, keyword) {
   if (keyword === "inline") return "--ri-inline: true;";
   const negated = keyword.startsWith("no-");
   return `--ri-${negated ? keyword.slice(3) : keyword}: ${negated ? "false" : "true"};`;
 }
 function rewriteColorOptionFlags(body) {
-  if (!body.includes("{")) return body;
-  let out = "";
-  let segStart = 0;
-  let depth = 0;
-  let blockStart = -1;
-  for (let i = 0; i < body.length; i++) {
-    const ch = body[i];
-    if (ch === "{") {
-      if (depth === 0) {
-        out += body.slice(segStart, i + 1);
-        blockStart = i + 1;
-      }
-      depth++;
-    } else if (ch === "}") {
-      if (depth > 0) depth--;
-      if (depth === 0 && blockStart !== -1) {
-        out += body.slice(blockStart, i).replace(COLOR_FLAG_RE, rewriteColorOptionFlag);
-        out += "}";
-        segStart = i + 1;
-        blockStart = -1;
-      }
-    }
-  }
-  out += body.slice(segStart);
-  return out;
+  return mapTopLevelSpans(
+    body,
+    keepSpan,
+    (interior) => interior.replace(COLOR_FLAG_RE, rewriteColorOptionFlag)
+  );
 }
 function rewriteDirectiveBodies(code) {
   let out = "";
@@ -146,17 +118,21 @@ function rewriteDirectiveBodies(code) {
     const close = findClosingBrace(code, braceIdx);
     const bodyStart = braceIdx + 1;
     const bodyEnd = close === -1 ? code.length : close;
-    let rewritten = rewriteTopLevel(code.slice(bodyStart, bodyEnd), (span) => {
-      let s = span;
-      if (removals) s = s.replace(REMOVAL_RE, "--ri-rm: $1;");
-      if (keywords) {
-        s = s.replace(FLUID_KEYWORD_RE, (_, kw) => {
-          const negated = kw.startsWith("no-");
-          return `--ri-${negated ? kw.slice(3) : kw}: ${negated ? "false" : "true"};`;
-        });
-      }
-      return s;
-    });
+    let rewritten = mapTopLevelSpans(
+      code.slice(bodyStart, bodyEnd),
+      (span) => {
+        let s = span;
+        if (removals) s = s.replace(REMOVAL_RE, "--ri-rm: $1;");
+        if (keywords) {
+          s = s.replace(FLUID_KEYWORD_RE, (_, kw) => {
+            const negated = kw.startsWith("no-");
+            return `--ri-${negated ? kw.slice(3) : kw}: ${negated ? "false" : "true"};`;
+          });
+        }
+        return s;
+      },
+      keepSpan
+    );
     if (name === "color") rewritten = rewriteColorOptionFlags(rewritten);
     out += code.slice(last, bodyStart) + rewritten;
     last = bodyEnd;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rainbowindex",
-	"version": "0.4.0",
+	"version": "0.4.1",
 	"description": "CSS-first system for building and maintaining consistent user interfaces",
 	"keywords": [
 		"css",
@@ -97,6 +97,7 @@
 	},
 	"devDependencies": {
 		"@biomejs/biome": "^2.4.16",
+		"@capsizecss/metrics": "^4.2.0",
 		"@types/node": "^25.9.1",
 		"@vitest/coverage-v8": "^4.1.0",
 		"postcss": "^8.5.8",