@unocss/preset-mini 0.55.7 → 0.56.0

package/dist/utils.cjs

@@ -1,111 +1,30 @@
 'use strict';
 
-const colors = require('./shared/preset-mini.b4ad509c.cjs');
-const core = require('@unocss/core');
+const utils = require('./shared/preset-mini.3a376028.cjs');
+const ruleUtils = require('@unocss/rule-utils');
+require('@unocss/core');
 
-function variantMatcher(name, handler) {
-  let re;
-  return {
-    name,
-    match(input, ctx) {
-      if (!re)
-        re = new RegExp(`^${core.escapeRegExp(name)}(?:${ctx.generator.config.separators.join("|")})`);
-      const match = input.match(re);
-      if (match) {
-        return {
-          matcher: input.slice(match[0].length),
-          handle: (input2, next) => next({
-            ...input2,
-            ...handler(input2)
-          })
-        };
-      }
-    },
-    autocomplete: `${name}:`
-  };
-}
-function variantParentMatcher(name, parent) {
-  let re;
-  return {
-    name,
-    match(input, ctx) {
-      if (!re)
-        re = new RegExp(`^${core.escapeRegExp(name)}(?:${ctx.generator.config.separators.join("|")})`);
-      const match = input.match(re);
-      if (match) {
-        return {
-          matcher: input.slice(match[0].length),
-          handle: (input2, next) => next({
-            ...input2,
-            parent: `${input2.parent ? `${input2.parent} $$ ` : ""}${parent}`
-          })
-        };
-      }
-    },
-    autocomplete: `${name}:`
-  };
-}
-function variantGetBracket(prefix, matcher, separators) {
-  if (matcher.startsWith(`${prefix}[`)) {
-    const [match, rest] = colors.getBracket(matcher.slice(prefix.length), "[", "]") ?? [];
-    if (match && rest) {
-      for (const separator of separators) {
-        if (rest.startsWith(separator))
-          return [match, rest.slice(separator.length), separator];
-      }
-      return [match, rest, ""];
-    }
-  }
-}
-function variantGetParameter(prefix, matcher, separators) {
-  if (matcher.startsWith(prefix)) {
-    const body = variantGetBracket(prefix, matcher, separators);
-    if (body) {
-      const [label = "", rest = body[1]] = variantGetParameter("/", body[1], separators) ?? [];
-      return [body[0], rest, label];
-    }
-    for (const separator of separators.filter((x) => x !== "/")) {
-      const pos = matcher.indexOf(separator, prefix.length);
-      if (pos !== -1) {
-        const labelPos = matcher.indexOf("/", prefix.length);
-        const unlabelled = labelPos === -1 || pos <= labelPos;
-        return [
-          matcher.slice(prefix.length, unlabelled ? pos : labelPos),
-          matcher.slice(pos + separator.length),
-          unlabelled ? "" : matcher.slice(labelPos + 1, pos)
-        ];
-      }
-    }
-  }
-}
 
-exports.CONTROL_MINI_NO_NEGATIVE = colors.CONTROL_MINI_NO_NEGATIVE;
-exports.colorOpacityToString = colors.colorOpacityToString;
-exports.colorResolver = colors.colorResolver;
-exports.colorToString = colors.colorToString;
-exports.colorableShadows = colors.colorableShadows;
-exports.cornerMap = colors.cornerMap;
-exports.directionMap = colors.directionMap;
-exports.directionSize = colors.directionSize;
-exports.getBracket = colors.getBracket;
-exports.getComponent = colors.getComponent;
-exports.getComponents = colors.getComponents;
-exports.globalKeywords = colors.globalKeywords;
-exports.h = colors.h;
-exports.handler = colors.handler;
-exports.hasParseableColor = colors.hasParseableColor;
-exports.hex2rgba = colors.hex2rgba;
-exports.insetMap = colors.insetMap;
-exports.makeGlobalStaticRules = colors.makeGlobalStaticRules;
-exports.parseColor = colors.parseColor;
-exports.parseCssColor = colors.parseCssColor;
-exports.positionMap = colors.positionMap;
-exports.resolveBreakpoints = colors.resolveBreakpoints;
-exports.resolveVerticalBreakpoints = colors.resolveVerticalBreakpoints;
-exports.splitShorthand = colors.splitShorthand;
-exports.valueHandlers = colors.valueHandlers;
-exports.xyzMap = colors.xyzMap;
-exports.variantGetBracket = variantGetBracket;
-exports.variantGetParameter = variantGetParameter;
-exports.variantMatcher = variantMatcher;
-exports.variantParentMatcher = variantParentMatcher;
+
+exports.CONTROL_MINI_NO_NEGATIVE = utils.CONTROL_MINI_NO_NEGATIVE;
+exports.colorResolver = utils.colorResolver;
+exports.colorableShadows = utils.colorableShadows;
+exports.cornerMap = utils.cornerMap;
+exports.directionMap = utils.directionMap;
+exports.directionSize = utils.directionSize;
+exports.globalKeywords = utils.globalKeywords;
+exports.h = utils.h;
+exports.handler = utils.handler;
+exports.hasParseableColor = utils.hasParseableColor;
+exports.insetMap = utils.insetMap;
+exports.makeGlobalStaticRules = utils.makeGlobalStaticRules;
+exports.parseColor = utils.parseColor;
+exports.positionMap = utils.positionMap;
+exports.resolveBreakpoints = utils.resolveBreakpoints;
+exports.resolveVerticalBreakpoints = utils.resolveVerticalBreakpoints;
+exports.splitShorthand = utils.splitShorthand;
+exports.valueHandlers = utils.valueHandlers;
+exports.xyzMap = utils.xyzMap;
+Object.keys(ruleUtils).forEach(function (k) {
+	if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = ruleUtils[k];
+});

package/dist/utils.d.cts

@@ -1,13 +1,9 @@
-import * as _unocss_core from '@unocss/core';
-import { RGBAColorValue, CSSColorValue, VariantHandlerContext, VariantObject } from '@unocss/core';
-export { C as CONTROL_MINI_NO_NEGATIVE, c as colorResolver, a as colorableShadows, d as directionSize, g as getBracket, e as getComponent, f as getComponents, h as hasParseableColor, m as makeGlobalStaticRules, p as parseColor, r as resolveBreakpoints, b as resolveVerticalBreakpoints, s as splitShorthand } from './shared/preset-mini.f9bfbfc9.cjs';
+import * as _unocss_rule_utils from '@unocss/rule-utils';
+export * from '@unocss/rule-utils';
+export { C as CONTROL_MINI_NO_NEGATIVE, c as colorResolver, a as colorableShadows, d as directionSize, h as hasParseableColor, m as makeGlobalStaticRules, p as parseColor, r as resolveBreakpoints, b as resolveVerticalBreakpoints, s as splitShorthand } from './shared/preset-mini.d62ae954.cjs';
+import '@unocss/core';
 import './shared/preset-mini.bc674518.cjs';
 
-declare function hex2rgba(hex?: string): RGBAColorValue | undefined;
-declare function parseCssColor(str?: string): CSSColorValue | undefined;
-declare function colorOpacityToString(color: CSSColorValue): string | number;
-declare function colorToString(color: CSSColorValue | string, alphaOverride?: string | number): string;
-
 declare const directionMap: Record<string, string[]>;
 declare const insetMap: Record<string, string[]>;
 declare const cornerMap: Record<string, string[]>;
@@ -54,12 +50,7 @@ declare namespace handlers {
   export { handlers_auto as auto, handlers_bracket as bracket, handlers_bracketOfColor as bracketOfColor, handlers_bracketOfLength as bracketOfLength, handlers_bracketOfPosition as bracketOfPosition, handlers_cssvar as cssvar, handlers_degree as degree, handlers_fraction as fraction, handlers_global as global, handlers_number as number, handlers_numberWithUnit as numberWithUnit, handlers_percent as percent, handlers_position as position, handlers_properties as properties, handlers_px as px, handlers_rem as rem, handlers_time as time };
 }
 
-declare const handler: _unocss_core.ValueHandler<"number" | "auto" | "position" | "global" | "numberWithUnit" | "rem" | "px" | "percent" | "fraction" | "bracket" | "bracketOfColor" | "bracketOfLength" | "bracketOfPosition" | "cssvar" | "time" | "degree" | "properties">;
-declare const h: _unocss_core.ValueHandler<"number" | "auto" | "position" | "global" | "numberWithUnit" | "rem" | "px" | "percent" | "fraction" | "bracket" | "bracketOfColor" | "bracketOfLength" | "bracketOfPosition" | "cssvar" | "time" | "degree" | "properties">;
-
-declare function variantMatcher(name: string, handler: (input: VariantHandlerContext) => Record<string, any>): VariantObject;
-declare function variantParentMatcher(name: string, parent: string): VariantObject;
-declare function variantGetBracket(prefix: string, matcher: string, separators: string[]): string[] | undefined;
-declare function variantGetParameter(prefix: string, matcher: string, separators: string[]): string[] | undefined;
+declare const handler: _unocss_rule_utils.ValueHandler<"number" | "auto" | "position" | "global" | "numberWithUnit" | "rem" | "px" | "percent" | "fraction" | "bracket" | "bracketOfColor" | "bracketOfLength" | "bracketOfPosition" | "cssvar" | "time" | "degree" | "properties">;
+declare const h: _unocss_rule_utils.ValueHandler<"number" | "auto" | "position" | "global" | "numberWithUnit" | "rem" | "px" | "percent" | "fraction" | "bracket" | "bracketOfColor" | "bracketOfLength" | "bracketOfPosition" | "cssvar" | "time" | "degree" | "properties">;
 
-export { colorOpacityToString, colorToString, cornerMap, directionMap, globalKeywords, h, handler, hex2rgba, insetMap, parseCssColor, positionMap, handlers as valueHandlers, variantGetBracket, variantGetParameter, variantMatcher, variantParentMatcher, xyzMap };
+export { cornerMap, directionMap, globalKeywords, h, handler, insetMap, positionMap, handlers as valueHandlers, xyzMap };

package/dist/utils.d.mts

@@ -1,13 +1,9 @@
-import * as _unocss_core from '@unocss/core';
-import { RGBAColorValue, CSSColorValue, VariantHandlerContext, VariantObject } from '@unocss/core';
-export { C as CONTROL_MINI_NO_NEGATIVE, c as colorResolver, a as colorableShadows, d as directionSize, g as getBracket, e as getComponent, f as getComponents, h as hasParseableColor, m as makeGlobalStaticRules, p as parseColor, r as resolveBreakpoints, b as resolveVerticalBreakpoints, s as splitShorthand } from './shared/preset-mini.8ff442ab.mjs';
+import * as _unocss_rule_utils from '@unocss/rule-utils';
+export * from '@unocss/rule-utils';
+export { C as CONTROL_MINI_NO_NEGATIVE, c as colorResolver, a as colorableShadows, d as directionSize, h as hasParseableColor, m as makeGlobalStaticRules, p as parseColor, r as resolveBreakpoints, b as resolveVerticalBreakpoints, s as splitShorthand } from './shared/preset-mini.97d1ec1e.mjs';
+import '@unocss/core';
 import './shared/preset-mini.bc674518.mjs';
 
-declare function hex2rgba(hex?: string): RGBAColorValue | undefined;
-declare function parseCssColor(str?: string): CSSColorValue | undefined;
-declare function colorOpacityToString(color: CSSColorValue): string | number;
-declare function colorToString(color: CSSColorValue | string, alphaOverride?: string | number): string;
-
 declare const directionMap: Record<string, string[]>;
 declare const insetMap: Record<string, string[]>;
 declare const cornerMap: Record<string, string[]>;
@@ -54,12 +50,7 @@ declare namespace handlers {
   export { handlers_auto as auto, handlers_bracket as bracket, handlers_bracketOfColor as bracketOfColor, handlers_bracketOfLength as bracketOfLength, handlers_bracketOfPosition as bracketOfPosition, handlers_cssvar as cssvar, handlers_degree as degree, handlers_fraction as fraction, handlers_global as global, handlers_number as number, handlers_numberWithUnit as numberWithUnit, handlers_percent as percent, handlers_position as position, handlers_properties as properties, handlers_px as px, handlers_rem as rem, handlers_time as time };
 }
 
-declare const handler: _unocss_core.ValueHandler<"number" | "auto" | "position" | "global" | "numberWithUnit" | "rem" | "px" | "percent" | "fraction" | "bracket" | "bracketOfColor" | "bracketOfLength" | "bracketOfPosition" | "cssvar" | "time" | "degree" | "properties">;
-declare const h: _unocss_core.ValueHandler<"number" | "auto" | "position" | "global" | "numberWithUnit" | "rem" | "px" | "percent" | "fraction" | "bracket" | "bracketOfColor" | "bracketOfLength" | "bracketOfPosition" | "cssvar" | "time" | "degree" | "properties">;
-
-declare function variantMatcher(name: string, handler: (input: VariantHandlerContext) => Record<string, any>): VariantObject;
-declare function variantParentMatcher(name: string, parent: string): VariantObject;
-declare function variantGetBracket(prefix: string, matcher: string, separators: string[]): string[] | undefined;
-declare function variantGetParameter(prefix: string, matcher: string, separators: string[]): string[] | undefined;
+declare const handler: _unocss_rule_utils.ValueHandler<"number" | "auto" | "position" | "global" | "numberWithUnit" | "rem" | "px" | "percent" | "fraction" | "bracket" | "bracketOfColor" | "bracketOfLength" | "bracketOfPosition" | "cssvar" | "time" | "degree" | "properties">;
+declare const h: _unocss_rule_utils.ValueHandler<"number" | "auto" | "position" | "global" | "numberWithUnit" | "rem" | "px" | "percent" | "fraction" | "bracket" | "bracketOfColor" | "bracketOfLength" | "bracketOfPosition" | "cssvar" | "time" | "degree" | "properties">;
 
-export { colorOpacityToString, colorToString, cornerMap, directionMap, globalKeywords, h, handler, hex2rgba, insetMap, parseCssColor, positionMap, handlers as valueHandlers, variantGetBracket, variantGetParameter, variantMatcher, variantParentMatcher, xyzMap };
+export { cornerMap, directionMap, globalKeywords, h, handler, insetMap, positionMap, handlers as valueHandlers, xyzMap };

package/dist/utils.d.ts

@@ -1,13 +1,9 @@
-import * as _unocss_core from '@unocss/core';
-import { RGBAColorValue, CSSColorValue, VariantHandlerContext, VariantObject } from '@unocss/core';
-export { C as CONTROL_MINI_NO_NEGATIVE, c as colorResolver, a as colorableShadows, d as directionSize, g as getBracket, e as getComponent, f as getComponents, h as hasParseableColor, m as makeGlobalStaticRules, p as parseColor, r as resolveBreakpoints, b as resolveVerticalBreakpoints, s as splitShorthand } from './shared/preset-mini.c0e4a0cc.js';
+import * as _unocss_rule_utils from '@unocss/rule-utils';
+export * from '@unocss/rule-utils';
+export { C as CONTROL_MINI_NO_NEGATIVE, c as colorResolver, a as colorableShadows, d as directionSize, h as hasParseableColor, m as makeGlobalStaticRules, p as parseColor, r as resolveBreakpoints, b as resolveVerticalBreakpoints, s as splitShorthand } from './shared/preset-mini.79297e15.js';
+import '@unocss/core';
 import './shared/preset-mini.bc674518.js';
 
-declare function hex2rgba(hex?: string): RGBAColorValue | undefined;
-declare function parseCssColor(str?: string): CSSColorValue | undefined;
-declare function colorOpacityToString(color: CSSColorValue): string | number;
-declare function colorToString(color: CSSColorValue | string, alphaOverride?: string | number): string;
-
 declare const directionMap: Record<string, string[]>;
 declare const insetMap: Record<string, string[]>;
 declare const cornerMap: Record<string, string[]>;
@@ -54,12 +50,7 @@ declare namespace handlers {
   export { handlers_auto as auto, handlers_bracket as bracket, handlers_bracketOfColor as bracketOfColor, handlers_bracketOfLength as bracketOfLength, handlers_bracketOfPosition as bracketOfPosition, handlers_cssvar as cssvar, handlers_degree as degree, handlers_fraction as fraction, handlers_global as global, handlers_number as number, handlers_numberWithUnit as numberWithUnit, handlers_percent as percent, handlers_position as position, handlers_properties as properties, handlers_px as px, handlers_rem as rem, handlers_time as time };
 }
 
-declare const handler: _unocss_core.ValueHandler<"number" | "auto" | "position" | "global" | "numberWithUnit" | "rem" | "px" | "percent" | "fraction" | "bracket" | "bracketOfColor" | "bracketOfLength" | "bracketOfPosition" | "cssvar" | "time" | "degree" | "properties">;
-declare const h: _unocss_core.ValueHandler<"number" | "auto" | "position" | "global" | "numberWithUnit" | "rem" | "px" | "percent" | "fraction" | "bracket" | "bracketOfColor" | "bracketOfLength" | "bracketOfPosition" | "cssvar" | "time" | "degree" | "properties">;
-
-declare function variantMatcher(name: string, handler: (input: VariantHandlerContext) => Record<string, any>): VariantObject;
-declare function variantParentMatcher(name: string, parent: string): VariantObject;
-declare function variantGetBracket(prefix: string, matcher: string, separators: string[]): string[] | undefined;
-declare function variantGetParameter(prefix: string, matcher: string, separators: string[]): string[] | undefined;
+declare const handler: _unocss_rule_utils.ValueHandler<"number" | "auto" | "position" | "global" | "numberWithUnit" | "rem" | "px" | "percent" | "fraction" | "bracket" | "bracketOfColor" | "bracketOfLength" | "bracketOfPosition" | "cssvar" | "time" | "degree" | "properties">;
+declare const h: _unocss_rule_utils.ValueHandler<"number" | "auto" | "position" | "global" | "numberWithUnit" | "rem" | "px" | "percent" | "fraction" | "bracket" | "bracketOfColor" | "bracketOfLength" | "bracketOfPosition" | "cssvar" | "time" | "degree" | "properties">;
 
-export { colorOpacityToString, colorToString, cornerMap, directionMap, globalKeywords, h, handler, hex2rgba, insetMap, parseCssColor, positionMap, handlers as valueHandlers, variantGetBracket, variantGetParameter, variantMatcher, variantParentMatcher, xyzMap };
+export { cornerMap, directionMap, globalKeywords, h, handler, insetMap, positionMap, handlers as valueHandlers, xyzMap };

package/dist/utils.mjs

@@ -1,81 +1,3 @@
-import { e as getBracket } from './shared/preset-mini.f1fe435e.mjs';
-export { C as CONTROL_MINI_NO_NEGATIVE, j as colorOpacityToString, c as colorResolver, k as colorToString, b as colorableShadows, o as cornerMap, l as directionMap, r as directionSize, w as getComponent, y as getComponents, g as globalKeywords, h, q as handler, a as hasParseableColor, f as hex2rgba, n as insetMap, m as makeGlobalStaticRules, p as parseColor, i as parseCssColor, d as positionMap, t as resolveBreakpoints, u as resolveVerticalBreakpoints, s as splitShorthand, v as valueHandlers, x as xyzMap } from './shared/preset-mini.f1fe435e.mjs';
-import { escapeRegExp } from '@unocss/core';
-
-function variantMatcher(name, handler) {
-  let re;
-  return {
-    name,
-    match(input, ctx) {
-      if (!re)
-        re = new RegExp(`^${escapeRegExp(name)}(?:${ctx.generator.config.separators.join("|")})`);
-      const match = input.match(re);
-      if (match) {
-        return {
-          matcher: input.slice(match[0].length),
-          handle: (input2, next) => next({
-            ...input2,
-            ...handler(input2)
-          })
-        };
-      }
-    },
-    autocomplete: `${name}:`
-  };
-}
-function variantParentMatcher(name, parent) {
-  let re;
-  return {
-    name,
-    match(input, ctx) {
-      if (!re)
-        re = new RegExp(`^${escapeRegExp(name)}(?:${ctx.generator.config.separators.join("|")})`);
-      const match = input.match(re);
-      if (match) {
-        return {
-          matcher: input.slice(match[0].length),
-          handle: (input2, next) => next({
-            ...input2,
-            parent: `${input2.parent ? `${input2.parent} $$ ` : ""}${parent}`
-          })
-        };
-      }
-    },
-    autocomplete: `${name}:`
-  };
-}
-function variantGetBracket(prefix, matcher, separators) {
-  if (matcher.startsWith(`${prefix}[`)) {
-    const [match, rest] = getBracket(matcher.slice(prefix.length), "[", "]") ?? [];
-    if (match && rest) {
-      for (const separator of separators) {
-        if (rest.startsWith(separator))
-          return [match, rest.slice(separator.length), separator];
-      }
-      return [match, rest, ""];
-    }
-  }
-}
-function variantGetParameter(prefix, matcher, separators) {
-  if (matcher.startsWith(prefix)) {
-    const body = variantGetBracket(prefix, matcher, separators);
-    if (body) {
-      const [label = "", rest = body[1]] = variantGetParameter("/", body[1], separators) ?? [];
-      return [body[0], rest, label];
-    }
-    for (const separator of separators.filter((x) => x !== "/")) {
-      const pos = matcher.indexOf(separator, prefix.length);
-      if (pos !== -1) {
-        const labelPos = matcher.indexOf("/", prefix.length);
-        const unlabelled = labelPos === -1 || pos <= labelPos;
-        return [
-          matcher.slice(prefix.length, unlabelled ? pos : labelPos),
-          matcher.slice(pos + separator.length),
-          unlabelled ? "" : matcher.slice(labelPos + 1, pos)
-        ];
-      }
-    }
-  }
-}
-
-export { getBracket, variantGetBracket, variantGetParameter, variantMatcher, variantParentMatcher };
+export { C as CONTROL_MINI_NO_NEGATIVE, c as colorResolver, b as colorableShadows, f as cornerMap, e as directionMap, k as directionSize, g as globalKeywords, h, l as handler, a as hasParseableColor, i as insetMap, m as makeGlobalStaticRules, p as parseColor, d as positionMap, j as resolveBreakpoints, r as resolveVerticalBreakpoints, s as splitShorthand, v as valueHandlers, x as xyzMap } from './shared/preset-mini.8929b018.mjs';
+export * from '@unocss/rule-utils';
+import '@unocss/core';

package/dist/variants.cjs

@@ -1,16 +1,16 @@
 'use strict';
 
-const utils = require('./utils.cjs');
-const colors = require('./shared/preset-mini.b4ad509c.cjs');
+const ruleUtils = require('@unocss/rule-utils');
+const utils = require('./shared/preset-mini.3a376028.cjs');
 const core = require('@unocss/core');
 
 const variantAria = {
   name: "aria",
   match(matcher, ctx) {
-    const variant = utils.variantGetParameter("aria-", matcher, ctx.generator.config.separators);
+    const variant = ruleUtils.variantGetParameter("aria-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
-      const aria = colors.h.bracket(match) ?? ctx.theme.aria?.[match] ?? "";
+      const aria = utils.h.bracket(match) ?? ctx.theme.aria?.[match] ?? "";
       if (aria) {
         return {
           matcher: rest,
@@ -35,7 +35,7 @@ function variantBreakpoints() {
   return {
     name: "breakpoints",
     match(matcher, context) {
-      const variantEntries = Object.entries(colors.resolveBreakpoints(context) ?? {}).map(([point, size], idx) => [point, size, idx]);
+      const variantEntries = Object.entries(utils.resolveBreakpoints(context) ?? {}).map(([point, size], idx) => [point, size, idx]);
       for (const [point, size, idx] of variantEntries) {
         if (!regexCache[point])
           regexCache[point] = new RegExp(`^((?:([al]t-|[<~]|max-))?${point}(?:${context.generator.config.separators.join("|")}))`);
@@ -93,7 +93,7 @@ function scopeMatcher(name, combinator) {
       if (!matcher.startsWith(name))
         return;
       const separators = ctx.generator.config.separators;
-      let body = utils.variantGetBracket(`${name}-`, matcher, separators);
+      let body = ruleUtils.variantGetBracket(`${name}-`, matcher, separators);
       if (!body) {
         for (const separator of separators) {
           if (matcher.startsWith(`${name}${separator}`)) {
@@ -104,7 +104,7 @@ function scopeMatcher(name, combinator) {
         if (!body)
           return;
       }
-      let bracketValue = colors.h.bracket(body[0]) ?? "";
+      let bracketValue = utils.h.bracket(body[0]) ?? "";
       if (bracketValue === "")
         bracketValue = "*";
       return {
@@ -128,13 +128,13 @@ const variantContainerQuery = {
   match(matcher, ctx) {
     if (matcher.startsWith("@container"))
       return;
-    const variant = utils.variantGetParameter("@", matcher, ctx.generator.config.separators);
+    const variant = ruleUtils.variantGetParameter("@", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest, label] = variant;
-      const unbracket = colors.h.bracket(match);
+      const unbracket = utils.h.bracket(match);
       let container;
       if (unbracket) {
-        const minWidth = colors.h.numberWithUnit(unbracket);
+        const minWidth = utils.h.numberWithUnit(unbracket);
         if (minWidth)
           container = `(min-width: ${minWidth})`;
       } else {
@@ -159,23 +159,23 @@ function variantColorsMediaOrClass(options = {}) {
   if (options?.dark === "class" || typeof options.dark === "object") {
     const { dark = ".dark", light = ".light" } = typeof options.dark === "string" ? {} : options.dark;
     return [
-      utils.variantMatcher("dark", (input) => ({ prefix: `${dark} $$ ${input.prefix}` })),
-      utils.variantMatcher("light", (input) => ({ prefix: `${light} $$ ${input.prefix}` }))
+      ruleUtils.variantMatcher("dark", (input) => ({ prefix: `${dark} $$ ${input.prefix}` })),
+      ruleUtils.variantMatcher("light", (input) => ({ prefix: `${light} $$ ${input.prefix}` }))
     ];
   }
   return [
-    utils.variantParentMatcher("dark", "@media (prefers-color-scheme: dark)"),
-    utils.variantParentMatcher("light", "@media (prefers-color-scheme: light)")
+    ruleUtils.variantParentMatcher("dark", "@media (prefers-color-scheme: dark)"),
+    ruleUtils.variantParentMatcher("light", "@media (prefers-color-scheme: light)")
   ];
 }
 
 const variantDataAttribute = {
   name: "data",
   match(matcher, ctx) {
-    const variant = utils.variantGetParameter("data-", matcher, ctx.generator.config.separators);
+    const variant = ruleUtils.variantGetParameter("data-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
-      const dataAttribute = colors.h.bracket(match) ?? ctx.theme.data?.[match] ?? "";
+      const dataAttribute = utils.h.bracket(match) ?? ctx.theme.data?.[match] ?? "";
       if (dataAttribute) {
         return {
           matcher: rest,
@@ -188,10 +188,10 @@ const variantDataAttribute = {
 const variantGroupDataAttribute = {
   name: "group-data",
   match(matcher, ctx) {
-    const variant = utils.variantGetParameter("group-data-", matcher, ctx.generator.config.separators);
+    const variant = ruleUtils.variantGetParameter("group-data-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
-      const dataAttribute = colors.h.bracket(match) ?? ctx.theme.data?.[match] ?? "";
+      const dataAttribute = utils.h.bracket(match) ?? ctx.theme.data?.[match] ?? "";
       if (dataAttribute) {
         return {
           matcher: `group-[[data-${dataAttribute}]]:${rest}`
@@ -202,17 +202,17 @@ const variantGroupDataAttribute = {
 };
 
 const variantLanguageDirections = [
-  utils.variantMatcher("rtl", (input) => ({ prefix: `[dir="rtl"] $$ ${input.prefix}` })),
-  utils.variantMatcher("ltr", (input) => ({ prefix: `[dir="ltr"] $$ ${input.prefix}` }))
+  ruleUtils.variantMatcher("rtl", (input) => ({ prefix: `[dir="rtl"] $$ ${input.prefix}` })),
+  ruleUtils.variantMatcher("ltr", (input) => ({ prefix: `[dir="ltr"] $$ ${input.prefix}` }))
 ];
 
 const variantSelector = {
   name: "selector",
   match(matcher, ctx) {
-    const variant = utils.variantGetBracket("selector-", matcher, ctx.generator.config.separators);
+    const variant = ruleUtils.variantGetBracket("selector-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
-      const selector = colors.h.bracket(match);
+      const selector = utils.h.bracket(match);
       if (selector) {
         return {
           matcher: rest,
@@ -225,10 +225,10 @@ const variantSelector = {
 const variantCssLayer = {
   name: "layer",
   match(matcher, ctx) {
-    const variant = utils.variantGetParameter("layer-", matcher, ctx.generator.config.separators);
+    const variant = ruleUtils.variantGetParameter("layer-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
-      const layer = colors.h.bracket(match) ?? match;
+      const layer = utils.h.bracket(match) ?? match;
       if (layer) {
         return {
           matcher: rest,
@@ -244,10 +244,10 @@ const variantCssLayer = {
 const variantInternalLayer = {
   name: "uno-layer",
   match(matcher, ctx) {
-    const variant = utils.variantGetParameter("uno-layer-", matcher, ctx.generator.config.separators);
+    const variant = ruleUtils.variantGetParameter("uno-layer-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
-      const layer = colors.h.bracket(match) ?? match;
+      const layer = utils.h.bracket(match) ?? match;
       if (layer) {
         return {
           matcher: rest,
@@ -260,10 +260,10 @@ const variantInternalLayer = {
 const variantScope = {
   name: "scope",
   match(matcher, ctx) {
-    const variant = utils.variantGetBracket("scope-", matcher, ctx.generator.config.separators);
+    const variant = ruleUtils.variantGetBracket("scope-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
-      const scope = colors.h.bracket(match);
+      const scope = utils.h.bracket(match);
       if (scope) {
         return {
           matcher: rest,
@@ -278,7 +278,7 @@ const variantVariables = {
   match(matcher, ctx) {
     if (!matcher.startsWith("["))
       return;
-    const [match, rest] = colors.getBracket(matcher, "[", "]") ?? [];
+    const [match, rest] = ruleUtils.getBracket(matcher, "[", "]") ?? [];
     if (!(match && rest))
       return;
     let newMatcher;
@@ -290,7 +290,7 @@ const variantVariables = {
     }
     if (newMatcher == null)
       return;
-    const variant = colors.h.bracket(match) ?? "";
+    const variant = utils.h.bracket(match) ?? "";
     const useParent = variant.startsWith("@");
     if (!(useParent || variant.includes("&")))
       return;
@@ -319,7 +319,7 @@ const ignoreProps = [
 function negateFunctions(value) {
   const match = value.match(/^(calc|clamp|max|min)\s*(\(.*)/);
   if (match) {
-    const [fnBody, rest] = colors.getComponent(match[2], "(", ")", " ") ?? [];
+    const [fnBody, rest] = ruleUtils.getStringComponent(match[2], "(", ")", " ") ?? [];
     if (fnBody)
       return `calc(${match[1]}${fnBody} * -1)${rest ? ` ${rest}` : ""}`;
   }
@@ -332,7 +332,7 @@ const variantNegative = {
     return {
       matcher: matcher.slice(1),
       body: (body) => {
-        if (body.find((v) => v[0] === colors.CONTROL_MINI_NO_NEGATIVE))
+        if (body.find((v) => v[0] === utils.CONTROL_MINI_NO_NEGATIVE))
           return;
         let changed = false;
         body.forEach((v) => {
@@ -387,14 +387,14 @@ function variantImportant() {
   };
 }
 
-const variantPrint = utils.variantParentMatcher("print", "@media print");
+const variantPrint = ruleUtils.variantParentMatcher("print", "@media print");
 const variantCustomMedia = {
   name: "media",
   match(matcher, ctx) {
-    const variant = utils.variantGetParameter("media-", matcher, ctx.generator.config.separators);
+    const variant = ruleUtils.variantGetParameter("media-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
-      let media = colors.h.bracket(match) ?? "";
+      let media = utils.h.bracket(match) ?? "";
       if (media === "")
         media = ctx.theme.media?.[match] ?? "";
       if (media) {
@@ -414,10 +414,10 @@ const variantCustomMedia = {
 const variantSupports = {
   name: "supports",
   match(matcher, ctx) {
-    const variant = utils.variantGetParameter("supports-", matcher, ctx.generator.config.separators);
+    const variant = ruleUtils.variantGetParameter("supports-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
-      let supports = colors.h.bracket(match) ?? "";
+      let supports = utils.h.bracket(match) ?? "";
       if (supports === "")
         supports = ctx.theme.supports?.[match] ?? "";
       if (supports) {
@@ -511,11 +511,11 @@ function taggedPseudoClassMatcher(tag, parent, combinator) {
   let pseudoColonRE;
   let pseudoVarRE;
   const matchBracket = (input) => {
-    const body = utils.variantGetBracket(`${tag}-`, input, []);
+    const body = ruleUtils.variantGetBracket(`${tag}-`, input, []);
     if (!body)
       return;
     const [match, rest] = body;
-    const bracketValue = colors.h.bracket(match);
+    const bracketValue = utils.h.bracket(match);
     if (bracketValue == null)
       return;
     const label = rest.split(splitRE, 1)?.[0] ?? "";
@@ -650,8 +650,8 @@ function variantPseudoClassFunctions() {
       const match = input.match(PseudoClassFunctionsRE) || input.match(PseudoClassColonFunctionsRE) || input.match(PseudoClassVarFunctionRE);
       if (match) {
         const fn = match[1];
-        const fnVal = colors.getBracket(match[2], "[", "]");
-        const pseudo = fnVal ? colors.h.bracket(match[2]) : PseudoClasses[match[2]] || PseudoClassesColon[match[2]] || `:${match[2]}`;
+        const fnVal = ruleUtils.getBracket(match[2], "[", "]");
+        const pseudo = fnVal ? utils.h.bracket(match[2]) : PseudoClasses[match[2]] || PseudoClassesColon[match[2]] || `:${match[2]}`;
         return {
           matcher: input.slice(match[0].length),
           selector: (s) => `${s}:${fn}(${pseudo})`

package/dist/variants.d.cts

@@ -3,7 +3,7 @@ import { PresetMiniOptions } from './index.cjs';
 import { T as Theme } from './shared/preset-mini.bc674518.cjs';
 import './shared/preset-mini.302bff75.cjs';
 import './colors.cjs';
-import './shared/preset-mini.f9bfbfc9.cjs';
+import './shared/preset-mini.d62ae954.cjs';
 
 declare const variantAria: VariantObject;
 

package/dist/variants.d.mts

@@ -3,7 +3,7 @@ import { PresetMiniOptions } from './index.mjs';
 import { T as Theme } from './shared/preset-mini.bc674518.mjs';
 import './shared/preset-mini.f12010ce.mjs';
 import './colors.mjs';
-import './shared/preset-mini.8ff442ab.mjs';
+import './shared/preset-mini.97d1ec1e.mjs';
 
 declare const variantAria: VariantObject;
 

package/dist/variants.d.ts

@@ -3,7 +3,7 @@ import { PresetMiniOptions } from './index.js';
 import { T as Theme } from './shared/preset-mini.bc674518.js';
 import './shared/preset-mini.0a392a7c.js';
 import './colors.js';
-import './shared/preset-mini.c0e4a0cc.js';
+import './shared/preset-mini.79297e15.js';
 
 declare const variantAria: VariantObject;
 

package/dist/variants.mjs

@@ -1,5 +1,5 @@
-import { variantGetParameter, variantGetBracket, variantMatcher, variantParentMatcher } from './utils.mjs';
-import { h, t as resolveBreakpoints, e as getBracket, C as CONTROL_MINI_NO_NEGATIVE, w as getComponent } from './shared/preset-mini.f1fe435e.mjs';
+import { variantGetParameter, variantGetBracket, variantMatcher, variantParentMatcher, getBracket, getStringComponent } from '@unocss/rule-utils';
+import { h, j as resolveBreakpoints, C as CONTROL_MINI_NO_NEGATIVE } from './shared/preset-mini.8929b018.mjs';
 import { warnOnce, escapeRegExp, escapeSelector } from '@unocss/core';
 
 const variantAria = {
@@ -317,7 +317,7 @@ const ignoreProps = [
 function negateFunctions(value) {
   const match = value.match(/^(calc|clamp|max|min)\s*(\(.*)/);
   if (match) {
-    const [fnBody, rest] = getComponent(match[2], "(", ")", " ") ?? [];
+    const [fnBody, rest] = getStringComponent(match[2], "(", ")", " ") ?? [];
     if (fnBody)
       return `calc(${match[1]}${fnBody} * -1)${rest ? ` ${rest}` : ""}`;
   }