rainbowindex 0.5.0 → 0.5.1

package/dist/{chunk-ZI5ZYNSU.mjs → chunk-PDORZSQX.mjs}

@@ -12,8 +12,6 @@ import {
   DEFAULT_EASING,
   DEFAULT_FLUID,
   DEFAULT_LEADING,
-  DEFAULT_ROUNDED,
-  DEFAULT_ROUNDED_ROOF,
   DEFAULT_SHADOWS,
   DEFAULT_SUPERELLIPSE_SCALE,
   DEFAULT_TEXT,
@@ -42,7 +40,7 @@ import {
   registerCustomTextSizes,
   registerCustomUtility,
   snapshotCompilationContext
-} from "./chunk-KRZL4IDK.mjs";
+} from "./chunk-4UKFK2GE.mjs";
 
 // src/shared.ts
 function isRIDebug() {
@@ -1743,8 +1741,6 @@ function resolveDirectives(directives, attribution) {
     text: { ...DEFAULT_TEXT },
     spacing: { base: "0.25rem" },
     breakpoints: { ...DEFAULT_BREAKPOINTS },
-    rounded: { ...DEFAULT_ROUNDED },
-    roundedRoof: DEFAULT_ROUNDED_ROOF,
     roundedShape: null,
     roundedShapeScale: 1,
     shadows: { ...DEFAULT_SHADOWS },
@@ -1866,20 +1862,15 @@ function resolveDirectives(directives, attribution) {
           theme.roundedShapeScale = defaultScaleForShape(shape);
         }
         if (directive.body) {
-          const { entries, removals } = parseKeyValueBody(
-            directive.body,
-            theme.warnings,
-            "rounded"
-          );
-          let roofValue;
+          const { entries } = parseKeyValueBody(directive.body, theme.warnings, "rounded");
           let scaleValue;
-          const overrides = {};
           for (const [k, v] of entries) {
-            if (k === "--roof") roofValue = v;
-            else if (k === "--corner-scale") scaleValue = v;
-            else overrides[k] = v;
+            if (k === "--corner-scale") scaleValue = v;
+            else
+              theme.warnings.push(
+                `[RI-1122] Unknown @rounded option "${k}" \u2014 supported: --corner-scale. Radii are numeric: rounded-{n} is n * --spacing.`
+              );
           }
-          if (roofValue !== void 0) theme.roundedRoof = roofValue;
           if (scaleValue !== void 0) {
             const n = Number.parseFloat(scaleValue);
             if (!Number.isNaN(n) && n > 0) {
@@ -1890,13 +1881,6 @@ function resolveDirectives(directives, attribution) {
               );
             }
           }
-          theme.rounded = mergeWithRemovals(
-            theme.rounded,
-            overrides,
-            removals,
-            theme.warnings,
-            "rounded"
-          );
         }
         break;
       }
@@ -3101,21 +3085,80 @@ function findClosest(input, candidates, maxDistance) {
   return best;
 }
 
+// src/utilities/helpers.ts
+var INTEGER_RE = /^\d+$/;
+var DECIMAL_RE = /^\d+(?:[._]\d+)?$/;
+function single(property, value) {
+  return { declarations: [{ property, value }] };
+}
+function multi(...pairs) {
+  return {
+    declarations: pairs.map(([property, value]) => ({ property, value }))
+  };
+}
+function extractArbitrary(value) {
+  if (!value) return null;
+  return value.startsWith("[") && value.endsWith("]") ? decodeArbitraryValue(value.slice(1, -1)) : null;
+}
+function normalizeDecimalToken(value) {
+  return value.replaceAll("_", ".");
+}
+function spacingLookup(value, negative = false) {
+  if (value === "px") return negative ? "-1px" : "1px";
+  if (!DECIMAL_RE.test(value)) return null;
+  const normalized = normalizeDecimalToken(value);
+  const num = Number(normalized);
+  if (!Number.isFinite(num) || num < 0) return null;
+  if (num === 0) return "0px";
+  const expr = `calc(${normalized} * var(--spacing))`;
+  return negative ? `calc(${normalized} * var(--spacing) * -1)` : expr;
+}
+function deepFreezeUtilityMap(map) {
+  for (const value of Object.values(map)) {
+    Object.freeze(value.declarations);
+    Object.freeze(value);
+  }
+  return Object.freeze(map);
+}
+
 // src/utilities/custom.ts
-var customUtilityMapCache = /* @__PURE__ */ new WeakMap();
-function getCustomUtility(theme, name) {
-  return getCustomUtilityMap(theme).get(name);
-}
-function getCustomUtilityMap(theme) {
-  let map = customUtilityMapCache.get(theme);
-  if (!map) {
-    map = /* @__PURE__ */ new Map();
+var customUtilityIndexCache = /* @__PURE__ */ new WeakMap();
+function getCustomUtilityIndex(theme) {
+  let index = customUtilityIndexCache.get(theme);
+  if (!index) {
+    const statics = /* @__PURE__ */ new Map();
+    const functional = /* @__PURE__ */ new Map();
     for (const cu of theme.customUtilities) {
-      map.set(cu.name, cu);
+      (cu.functional ? functional : statics).set(cu.name, cu);
     }
-    customUtilityMapCache.set(theme, map);
+    index = {
+      statics,
+      functional: [...functional.values()].sort((a, b) => b.name.length - a.name.length)
+    };
+    customUtilityIndexCache.set(theme, index);
   }
-  return map;
+  return index;
+}
+var VALUE_PLACEHOLDER = "var(--value)";
+var UNSAFE_SUFFIX_RE = /[;{}]/;
+function functionalValue(suffix) {
+  const arbitrary = extractArbitrary(suffix);
+  if (arbitrary !== null) return arbitrary;
+  return UNSAFE_SUFFIX_RE.test(suffix) ? null : suffix;
+}
+function matchCustomUtility(utility, value, negative, theme) {
+  const index = getCustomUtilityIndex(theme);
+  const full = value === null ? utility : `${utility}-${value}`;
+  const exact = index.statics.get(full);
+  if (exact) return { cu: exact, substitution: null };
+  if (negative || value === null) return null;
+  for (const cu of index.functional) {
+    if (full.length <= cu.name.length + 1) continue;
+    if (!full.startsWith(cu.name) || full.charCodeAt(cu.name.length) !== 45) continue;
+    const substitution = functionalValue(full.slice(cu.name.length + 1));
+    return substitution === null ? null : { cu, substitution };
+  }
+  return null;
 }
 var SELECTOR_WS_COLLAPSE_RE = /\s+/g;
 function parseCustomUtilityBody(body) {
@@ -3247,10 +3290,10 @@ function buildNestedBlock(node, theme, expansion, resolve) {
   if (declarations.length === 0 && nested.length === 0) return null;
   return { selector: node.selector, declarations, nested };
 }
-function resolveCustomUtility(utility, value, theme, resolve, visiting) {
-  const map = getCustomUtilityMap(theme);
-  const cu = value === null ? map.get(utility) : map.get(`${utility}-${value}`);
-  if (!cu || cu.functional) return null;
+function resolveCustomUtility(utility, value, negative, theme, resolve, visiting) {
+  const match = matchCustomUtility(utility, value, negative, theme);
+  if (!match) return null;
+  const { cu, substitution } = match;
   const tree = getParsedBody(cu.body);
   let expansion = null;
   if (hasApplyLikeDirective(cu.body)) {
@@ -3270,10 +3313,23 @@ function resolveCustomUtility(utility, value, theme, resolve, visiting) {
     if (block) nested.push(block);
   }
   if (expansion) expansion.delete(cu.name);
+  if (substitution !== null) substituteValue(declarations, nested, substitution);
   if (declarations.length === 0 && nested.length === 0) return null;
   if (nested.length === 0) return { declarations };
   return { declarations, nested };
 }
+function substituteValue(declarations, nested, value) {
+  for (let i = 0; i < declarations.length; i++) {
+    const d = declarations[i];
+    if (d.value.includes(VALUE_PLACEHOLDER)) {
+      declarations[i] = {
+        property: d.property,
+        value: d.value.replaceAll(VALUE_PLACEHOLDER, value)
+      };
+    }
+  }
+  for (const block of nested) substituteValue(block.declarations, block.nested, value);
+}
 function extractCustomUtilityRootInfo(body) {
   const tree = getParsedBody(body);
   const seen = /* @__PURE__ */ new Set();
@@ -3287,42 +3343,6 @@ function extractCustomUtilityRootInfo(body) {
   return { properties, applyClasses: [...tree.applyClasses] };
 }
 
-// src/utilities/helpers.ts
-var INTEGER_RE = /^\d+$/;
-var DECIMAL_RE = /^\d+(?:[._]\d+)?$/;
-function single(property, value) {
-  return { declarations: [{ property, value }] };
-}
-function multi(...pairs) {
-  return {
-    declarations: pairs.map(([property, value]) => ({ property, value }))
-  };
-}
-function extractArbitrary(value) {
-  if (!value) return null;
-  return value.startsWith("[") && value.endsWith("]") ? decodeArbitraryValue(value.slice(1, -1)) : null;
-}
-function normalizeDecimalToken(value) {
-  return value.replaceAll("_", ".");
-}
-function spacingLookup(value, negative = false) {
-  if (value === "px") return negative ? "-1px" : "1px";
-  if (!DECIMAL_RE.test(value)) return null;
-  const normalized = normalizeDecimalToken(value);
-  const num = Number(normalized);
-  if (!Number.isFinite(num) || num < 0) return null;
-  if (num === 0) return "0px";
-  const expr = `calc(${normalized} * var(--spacing))`;
-  return negative ? `calc(${normalized} * var(--spacing) * -1)` : expr;
-}
-function deepFreezeUtilityMap(map) {
-  for (const value of Object.values(map)) {
-    Object.freeze(value.declarations);
-    Object.freeze(value);
-  }
-  return Object.freeze(map);
-}
-
 // src/utilities/spacing.ts
 function resolveSpacing(val, negative, warnings, allowAuto = true) {
   if (val === null) return null;
@@ -5243,13 +5263,9 @@ var ROUNDED_CORNER = Object.freeze({
 var ROUNDED_CORNER_ENTRIES = Object.entries(ROUNDED_CORNER);
 var ROUNDED_SIDE_NAMES = Object.freeze(Object.keys(ROUNDED_SIDE));
 var ROUNDED_CORNER_NAMES = Object.freeze(Object.keys(ROUNDED_CORNER));
-function resolveRadius(name, theme) {
+function resolveRadius(name) {
   if (name === "none") return "0px";
   if (name === "full") return "calc(infinity * 1px)";
-  if (Object.hasOwn(theme.rounded, name)) {
-    const base = `var(--rounded-${name})`;
-    return `calc(${base} * var(--ri-rounded-scale, 1))`;
-  }
   if (DECIMAL_RE.test(name)) {
     const n = Number.parseFloat(normalizeDecimalToken(name));
     if (n === 0) return "0px";
@@ -5296,7 +5312,7 @@ function resolveDivide(full, axis) {
 var BORDER_DIR_PROPS_ENTRIES = Object.entries(
   BORDER_DIR_PROPS
 ).map(([prefix, props]) => [`${prefix}-`, props[0]]);
-function borderGenerator(_utility, _value, full, negative, theme, _warnings, dataType) {
+function borderGenerator(_utility, _value, full, negative, _theme, _warnings, dataType) {
   if (dataType === "color") return null;
   if (Object.hasOwn(STATIC_BORDER, full)) return STATIC_BORDER[full];
   if (full.startsWith("corner-")) {
@@ -5305,31 +5321,19 @@ function borderGenerator(_utility, _value, full, negative, theme, _warnings, dat
       return multi(["corner-shape", arb], ["--ri-rounded-scale", "1"]);
     }
   }
-  if (full === "rounded") {
-    const r = resolveRadius("sm", theme) ?? "0.25rem";
-    return single("border-radius", r);
-  }
   if (full.startsWith("rounded-")) {
     const rest = full.slice(8);
     for (const [suffix, prop] of ROUNDED_CORNER_ENTRIES) {
-      if (rest === suffix) {
-        const r2 = resolveRadius("sm", theme);
-        if (r2) return single(prop, r2);
-      }
       if (rest.startsWith(suffix) && rest.charCodeAt(suffix.length) === 45) {
         const size = rest.slice(suffix.length + 1);
-        const r2 = resolveRadius(size, theme);
+        const r2 = resolveRadius(size);
         if (r2) return single(prop, r2);
       }
     }
     for (const [suffix, props] of ROUNDED_SIDE_ENTRIES) {
-      if (rest === suffix) {
-        const r2 = resolveRadius("sm", theme);
-        if (r2) return multi(...props.map((p) => [p, r2]));
-      }
       if (rest.startsWith(suffix) && rest.charCodeAt(suffix.length) === 45) {
         const size = rest.slice(suffix.length + 1);
-        const r2 = resolveRadius(size, theme);
+        const r2 = resolveRadius(size);
         if (r2) return multi(...props.map((p) => [p, r2]));
       }
     }
@@ -5343,7 +5347,7 @@ function borderGenerator(_utility, _value, full, negative, theme, _warnings, dat
       }
       return null;
     }
-    const r = resolveRadius(rest, theme);
+    const r = resolveRadius(rest);
     if (r) return single("border-radius", r);
   }
   if (full.startsWith("border-")) {
@@ -7338,7 +7342,14 @@ function resolveUtility(utility, value, negative, theme, warnings, visiting, dat
       if (result) return result;
     }
   }
-  const customResult = resolveCustomUtility(utility, value, theme, resolveUtility, visiting);
+  const customResult = resolveCustomUtility(
+    utility,
+    value,
+    negative,
+    theme,
+    resolveUtility,
+    visiting
+  );
   if (customResult) return customResult;
   return null;
 }
@@ -8004,7 +8015,6 @@ var COLOR_STOP_REF_RE = /var\(--color-([a-z][a-z0-9]*(?:-[a-z][a-z0-9]*)*)(?:-(\
 var SHADOW_VAR_REF_RE = /var\(--shadow-([a-z0-9]+(?:-[a-z0-9]+)*)\)/g;
 var TEXT_VAR_REF_RE = /var\(--text-([a-z0-9]+(?:-[a-z0-9]+)*?)(?:-leading)?\)/g;
 var FONT_VAR_REF_RE = /var\(--font-([a-z][a-z0-9]*(?:-[a-z0-9]+)*)\)/g;
-var ROUNDED_VAR_REF_RE = /var\(--rounded-([a-z0-9]+(?:-[a-z0-9]+)*)\)/g;
 var ANIMATE_VAR_REF_RE = /var\(--animate-([a-z0-9]+(?:-[a-z0-9]+)*)\)/g;
 
 // src/engine/support-blocks.ts
@@ -8312,7 +8322,6 @@ var RE_COLOR_SINGLE = /^color-([\w-]+)$/;
 var RE_ANIMATE = /^animate-([\w-]+)$/;
 var RE_TEXT = /^text-([\w-]+)$/;
 var RE_TEXT_LEADING = /^text-([\w-]+)-leading$/;
-var RE_ROUNDED = /^rounded-([\w-]+)$/;
 var RE_SHADOW = /^shadow-([\w-]+)$/;
 var RE_BREAKPOINT = /^breakpoint-([\w-]+)$/;
 var RE_FONT_SUB_VAR = /--(?:features|variations)$/;
@@ -8358,10 +8367,6 @@ function lookupThemeValue(varName, theme, inline = false) {
     if (getFontSlots(theme).has(baseSlot)) return inline ? null : `var(${varName})`;
     return null;
   }
-  if (name === "rounded-roof") return theme.roundedRoof;
-  const roundedMatch = name.startsWith("rounded-") ? name.match(RE_ROUNDED) : null;
-  if (roundedMatch && Object.hasOwn(theme.rounded, roundedMatch[1]))
-    return theme.rounded[roundedMatch[1]];
   const shadowMatch = name.startsWith("shadow-") ? name.match(RE_SHADOW) : null;
   if (shadowMatch && Object.hasOwn(theme.shadows, shadowMatch[1]))
     return theme.shadows[shadowMatch[1]];
@@ -8410,10 +8415,6 @@ function collectThemeVariableNames(theme) {
     names.push(`--text-${size}`);
     names.push(`--text-${size}-leading`);
   }
-  names.push("--rounded-roof");
-  for (const name of Object.keys(theme.rounded)) {
-    names.push(`--rounded-${name}`);
-  }
   for (const name of Object.keys(theme.shadows)) {
     names.push(`--shadow-${name}`);
   }
@@ -8574,11 +8575,6 @@ function scanStringForTokenUsage(str, result) {
       result.usedFonts.add(m[1]);
     }
   }
-  if (str.includes("var(--rounded-")) {
-    for (const m of str.matchAll(ROUNDED_VAR_REF_RE)) {
-      result.usedRounded.add(m[1]);
-    }
-  }
   if (str.includes("var(--shadow-")) {
     for (const m of str.matchAll(SHADOW_VAR_REF_RE)) {
       result.usedShadows.add(m[1]);
@@ -8630,13 +8626,13 @@ function createEmptyCompilationResult() {
     usedColorStops: /* @__PURE__ */ new Map(),
     usedTextSizes: /* @__PURE__ */ new Set(),
     usedFonts: /* @__PURE__ */ new Set(),
-    usedRounded: /* @__PURE__ */ new Set(),
     usedShadows: /* @__PURE__ */ new Set(),
     usedAnimations: /* @__PURE__ */ new Set(),
     warnings: []
   };
 }
 var classCompileMemo = /* @__PURE__ */ new WeakMap();
+var CLASS_COMPILE_MEMO_CAP = 5e4;
 function compileClassEntry(raw, theme, customVariantMap, breakpointWeights, variantMemo) {
   const scratch = createEmptyCompilationResult();
   const parsed = parseUtility(raw);
@@ -8650,6 +8646,7 @@ function compileClassEntry(raw, theme, customVariantMap, breakpointWeights, vari
     variantMemo
   );
   const support = new Array(SUPPORT_BLOCKS.length).fill(false);
+  let arbitraryWarning = null;
   if (rule) {
     for (let i = 0; i < SUPPORT_BLOCKS.length; i++) {
       const block = SUPPORT_BLOCKS[i];
@@ -8661,18 +8658,16 @@ function compileClassEntry(raw, theme, customVariantMap, breakpointWeights, vari
     const bracketContent = parsed.value.replace(/^\[|\]$/g, "");
     if (shouldWarnUnresolvedArbitrary(bracketContent)) {
       const truncated = parsed.raw.length > 100 ? `${parsed.raw.slice(0, 100)}...` : parsed.raw;
-      scratch.warnings.push(
-        `[RI-1002] Could not resolve arbitrary utility "${truncated}". Arbitrary utilities use \`[property:value]\` syntax \u2014 e.g. \`[padding:1rem]\` or \`[mask-type:luminance]\`. Check that the property name is a known CSS property and the value is well-formed (no stray spaces, quoted strings escaped). If you meant to set a CSS variable, use \`[--my-var:value]\`.`
-      );
+      arbitraryWarning = `[RI-1002] Could not resolve arbitrary utility "${truncated}". Arbitrary utilities use \`[property:value]\` syntax \u2014 e.g. \`[padding:1rem]\` or \`[mask-type:luminance]\`. Check that the property name is a known CSS property and the value is well-formed (no stray spaces, quoted strings escaped). If you meant to set a CSS variable, use \`[--my-var:value]\`.`;
     }
   }
   return {
     rule,
     warnings: scratch.warnings,
+    arbitraryWarning,
     usedColorStops: scratch.usedColorStops,
     usedTextSizes: scratch.usedTextSizes,
     usedFonts: scratch.usedFonts,
-    usedRounded: scratch.usedRounded,
     usedShadows: scratch.usedShadows,
     usedAnimations: scratch.usedAnimations,
     support
@@ -8707,7 +8702,7 @@ function registerThemeOnContext(ctx, theme) {
       }
     }
     if (properties.length > 0) {
-      registerCustomUtility(ctx, cu.name, properties);
+      registerCustomUtility(ctx, cu.name, properties, cu.functional);
     }
   }
 }
@@ -8716,7 +8711,7 @@ function createThemeSnapshot(theme) {
   registerThemeOnContext(ctx, theme);
   return snapshotCompilationContext(ctx);
 }
-function compileInternal(classNames, theme, variantMapCache) {
+function compileInternal(classNames, theme, variantMapCache, authored) {
   const ctx = createCompilationContext();
   registerThemeOnContext(ctx, theme);
   const customVariantMap = theme.customVariants.length === 0 ? _emptyVariantMap : variantMapCache.get(theme) ?? (() => {
@@ -8740,12 +8735,16 @@ function compileInternal(classNames, theme, variantMapCache) {
     seen.add(raw);
     let entry = classMemo.get(raw);
     if (!entry) {
+      if (classMemo.size >= CLASS_COMPILE_MEMO_CAP) classMemo.clear();
       entry = compileClassEntry(raw, theme, customVariantMap, breakpointWeights, variantMemo);
       classMemo.set(raw, entry);
     }
     if (entry.warnings.length > 0) {
       pushWarningsDeduped(result.warnings, entry.warnings, warnSeen);
     }
+    if (entry.arbitraryWarning !== null && (authored === void 0 || authored.has(raw))) {
+      pushWarningsDeduped(result.warnings, [entry.arbitraryWarning], warnSeen);
+    }
     for (const [hue, stops] of entry.usedColorStops) {
       let set = result.usedColorStops.get(hue);
       if (!set) {
@@ -8756,7 +8755,6 @@ function compileInternal(classNames, theme, variantMapCache) {
     }
     for (const v of entry.usedTextSizes) result.usedTextSizes.add(v);
     for (const v of entry.usedFonts) result.usedFonts.add(v);
-    for (const v of entry.usedRounded) result.usedRounded.add(v);
     for (const v of entry.usedShadows) result.usedShadows.add(v);
     for (const v of entry.usedAnimations) result.usedAnimations.add(v);
     if (!entry.rule) continue;
@@ -8813,7 +8811,7 @@ function createCompiler() {
   const variantMapCache = /* @__PURE__ */ new WeakMap();
   return {
     fontOutputCache,
-    compile(classNames, theme) {
+    compile(classNames, theme, authored) {
       const list = typeof classNames === "string" ? classNames.split(WS_RE3).filter(Boolean) : classNames;
       if (list == null || typeof list[Symbol.iterator] !== "function") {
         throw new TypeError(
@@ -8825,7 +8823,7 @@ function createCompiler() {
           `[RI-2007] compile() expected theme to be a ResolvedTheme object, got ${typeof theme}.`
         );
       }
-      const { result, ctx } = compileInternal(list, theme, variantMapCache);
+      const { result, ctx } = compileInternal(list, theme, variantMapCache, authored);
       latestSnapshot = snapshotCompilationContext(ctx);
       fontOutputCache.clear();
       return result;
@@ -9213,7 +9211,8 @@ function readAssignedValue(source, start) {
       value: source.slice(i + 1, end2),
       end: end2,
       valueStart: i + 1,
-      quoted: true
+      quoted: true,
+      bare: false
     };
   }
   if (ch === "`") {
@@ -9222,7 +9221,8 @@ function readAssignedValue(source, start) {
       value: source.slice(i + 1, end2),
       end: end2,
       valueStart: i + 1,
-      quoted: false
+      quoted: false,
+      bare: false
     };
   }
   if (ch in BRACKET_PAIRS) {
@@ -9232,7 +9232,8 @@ function readAssignedValue(source, start) {
       value: source.slice(i + 1, end2),
       end: end2,
       valueStart: i + 1,
-      quoted: false
+      quoted: false,
+      bare: false
     };
   }
   let end = i;
@@ -9241,7 +9242,8 @@ function readAssignedValue(source, start) {
     value: source.slice(i, end),
     end: end - 1,
     valueStart: i,
-    quoted: false
+    quoted: false,
+    bare: true
   };
 }
 function splitTopLevelArgs(source) {
@@ -9324,12 +9326,22 @@ function collectTokensInLiteral(source, start, quoteCode, out) {
 }
 
 // src/scanner/sinks.ts
+function isClassListOrigin(origin) {
+  return origin !== "plain" && origin !== "expression";
+}
 var SetSink = class {
   constructor(classes) {
     this.classes = classes;
   }
   classes;
   wantsPositions = false;
+  origin = "plain";
+  get inClassList() {
+    return isClassListOrigin(this.origin);
+  }
+  setOrigin(origin) {
+    this.origin = origin;
+  }
   add(value) {
     this.classes.add(value);
   }
@@ -9345,6 +9357,12 @@ var CandidateCollector = class {
   /** value -> byCandidate keys, so delete() is O(occurrences of the value). */
   keysByValue = /* @__PURE__ */ new Map();
   contexts = [];
+  /** Candidates a context-aware collector tokenized itself — the only ones
+   *  eligible to inherit a context's origin (see finish()). */
+  contextual = /* @__PURE__ */ new WeakSet();
+  get inClassList() {
+    return isClassListOrigin(this.origin);
+  }
   setOrigin(origin) {
     this.origin = origin;
     this.helperName = null;
@@ -9362,10 +9380,26 @@ var CandidateCollector = class {
       id: this.contexts.length
     });
   }
+  markExpression(start, end) {
+    if (end <= start) return;
+    this.contexts.push({
+      start,
+      end,
+      origin: "expression",
+      helper: null,
+      id: this.contexts.length
+    });
+  }
   add(value, start, end, prefixStart, prefixEnd) {
     const key = `${start}:${end}:${value}`;
-    if (this.byCandidate.has(key)) return;
+    const contextual = this.origin !== "plain";
+    const existing = this.byCandidate.get(key);
+    if (existing) {
+      if (contextual) this.contextual.add(existing);
+      return;
+    }
     const candidate = { value, start, end, origin: "plain" };
+    if (contextual) this.contextual.add(candidate);
     if (prefixStart >= 0) candidate.groupPrefix = { start: prefixStart, end: prefixEnd };
     this.byCandidate.set(key, candidate);
     let keys = this.keysByValue.get(value);
@@ -9411,7 +9445,7 @@ var CandidateCollector = class {
             }
           }
         }
-        if (best) {
+        if (best && this.contextual.has(candidate)) {
           candidate.origin = best.origin;
           if (best.helper) candidate.helperName = best.helper;
           if (best.origin === "helper" || best.origin === "safelist") {
@@ -9459,6 +9493,10 @@ var HAS_UPPERCASE_RE = /[A-Z]/;
 var BRACKET_WHITESPACE_RE = /\[[^\]]*\s+[^\]]*\]/;
 var INDEX_ACCESS_RE = /\[\d*\]$/;
 var PROPERTY_ACCESS_RE = /^[\w.@]+\[[^\]]+\]$/;
+function warnBracketWhitespace(warnings, cls) {
+  const message = `[RI-1412] Class "${cls}" has whitespace inside its arbitrary value, so it can never match an element \u2014 class attributes, @a/@apply, and safelist() all split on whitespace. Use "_" for a space (\`bg-[url('a_b')]\` emits \`url('a b')\`) and "\\_" for a literal underscore. The class was skipped.`;
+  if (!warnings.includes(message)) warnings.push(message);
+}
 function scanClassTokens(sink, source, baseOffset, warnings) {
   const wantsPositions = sink.wantsPositions;
   let filteredSource = source;
@@ -9514,10 +9552,17 @@ function scanClassTokens(sink, source, baseOffset, warnings) {
     if (!cls) continue;
     const unbanged = cls.endsWith("!") ? cls.slice(0, -1) : cls;
     const base = unbanged.replace(VARIANT_STRIP_RE, "");
-    if (HAS_UPPERCASE_RE.test(base.replace(BRACKET_SPAN_RE, ""))) continue;
-    if (BRACKET_WHITESPACE_RE.test(base)) continue;
-    if (INDEX_ACCESS_RE.test(base)) continue;
-    if (PROPERTY_ACCESS_RE.test(base)) continue;
+    if (!base.includes("[")) {
+      if (HAS_UPPERCASE_RE.test(base)) continue;
+    } else {
+      if (HAS_UPPERCASE_RE.test(base.replace(BRACKET_SPAN_RE, ""))) continue;
+      if (INDEX_ACCESS_RE.test(base)) continue;
+      if (PROPERTY_ACCESS_RE.test(base)) continue;
+      if (BRACKET_WHITESPACE_RE.test(base)) {
+        if (warnings && sink.inClassList) warnBracketWhitespace(warnings, cls);
+        continue;
+      }
+    }
     if (!wantsPositions) {
       sink.add(cls, 0, 0, -1, -1);
       continue;
@@ -9602,6 +9647,16 @@ function collectTemplateLiteralClasses(sink, source, start, base, warnings) {
     }
   });
 }
+function isEqualityOperand(source, open, close) {
+  let before = open - 1;
+  while (before >= 0 && /\s/.test(source[before])) before--;
+  if (before >= 1 && source[before] === "=" && (source[before - 1] === "=" || source[before - 1] === "!")) {
+    return true;
+  }
+  let after = close + 1;
+  while (after < source.length && /\s/.test(source[after])) after++;
+  return (source[after] === "=" || source[after] === "!") && source[after + 1] === "=";
+}
 function collectStringLiteralClasses(sink, source, base, warnings) {
   let i = 0;
   while (i < source.length) {
@@ -9611,6 +9666,7 @@ function collectStringLiteralClasses(sink, source, base, warnings) {
       const raw = source.slice(i + 1, end);
       const value = raw.trim();
       if (value) {
+        if (isEqualityOperand(source, i, end)) sink.markExpression?.(base + i, base + end + 1);
         scanClassTokens(
           sink,
           value,
@@ -9640,7 +9696,7 @@ function collectAssignedValues(sink, source, regex, visitor = scanClassTokens, b
     if (!value) continue;
     sink.markContext?.(base + parsed.valueStart, base + parsed.valueStart + raw.length);
     const valueOffset = base + parsed.valueStart + (raw.length - raw.trimStart().length);
-    if (parsed.quoted && visitor !== scanClassTokens) {
+    if ((parsed.quoted || parsed.bare) && visitor !== scanClassTokens) {
       scanClassTokens(sink, value, valueOffset, warnings);
     }
     visitor(sink, value, valueOffset, warnings);
@@ -9896,6 +9952,13 @@ var EXTRACTORS = [
     extract: extractJSXTSX
   }
 ];
+var SVG_GEOMETRY_VALUE_RE = /((?<![\w-])(?:d|points)\s*=\s*["'])([^"']*)/g;
+function blankSvgGeometry(content) {
+  return content.replace(
+    SVG_GEOMETRY_VALUE_RE,
+    (_match, head, value) => head + " ".repeat(value.length)
+  );
+}
 function warnOverLongLines(input, warnings) {
   const content = input.content;
   if (!warnings || content.length <= MAX_LINE_LENGTH) return;
@@ -9916,23 +9979,27 @@ function warnOverLongLines(input, warnings) {
 }
 function extractInto(sink, input, warnings) {
   warnOverLongLines(input, warnings);
+  const scanned = {
+    path: input.path,
+    content: blankSvgGeometry(input.content)
+  };
   let handled = false;
   for (const extractor of EXTRACTORS) {
-    if (extractor.test(input)) {
-      extractor.extract(sink, input, warnings);
+    if (extractor.test(scanned)) {
+      extractor.extract(sink, scanned, warnings);
       handled = true;
       break;
     }
   }
   if (!handled) {
     sink.setOrigin?.("plain");
-    scanClassTokens(sink, input.content, 0, warnings);
+    scanClassTokens(sink, scanned.content, 0, warnings);
   }
-  if (input.content.includes("safelist")) {
+  if (scanned.content.includes("safelist")) {
     sink.setOrigin?.("safelist");
     collectCallArguments(
       sink,
-      input.content,
+      scanned.content,
       SAFELIST_CALL_RE,
       collectStringLiteralClasses,
       0,
@@ -10025,7 +10092,7 @@ export {
   MAX_DIRECTIVE_INPUT_SIZE,
   extractDirectives,
   parseUtility,
-  getCustomUtility,
+  matchCustomUtility,
   forEachApplyClass,
   BACKGROUND_STATIC_NAMES,
   TYPOGRAPHY_STATIC_NAMES,