@unocss/preset-mini 0.48.5 → 0.49.1

package/dist/shared/{preset-mini.0d510914.mjs → preset-mini.aabbbe8d.mjs}

@@ -1,14 +1,14 @@
-import { h as handler, l as resolveBreakpoints, q as getBracket, C as CONTROL_MINI_NO_NEGATIVE, t as getComponent } from './preset-mini.ca595ab5.mjs';
+import { h as handler, l as resolveBreakpoints, q as getBracket, C as CONTROL_MINI_NO_NEGATIVE, t as getComponent } from './preset-mini.d9489281.mjs';
 import { warnOnce, escapeRegExp, escapeSelector } from '@unocss/core';
-import { v as variantGetParameter, a as variantGetBracket, b as variantParentMatcher, c as variantMatcher } from './preset-mini.bd4c0c0c.mjs';
+import { v as variantGetParameter, a as variantGetBracket, b as variantParentMatcher, c as variantMatcher } from './preset-mini.816a9399.mjs';
 
 const variantAria = {
   name: "aria",
-  match(matcher, { theme }) {
-    const variant = variantGetParameter("aria-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variantGetParameter("aria-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
-      const aria = handler.bracket(match) ?? theme.aria?.[match] ?? "";
+      const aria = handler.bracket(match) ?? ctx.theme.aria?.[match] ?? "";
       if (aria) {
         return {
           matcher: rest,
@@ -19,74 +19,77 @@ const variantAria = {
   }
 };
 
-const regexCache = {};
 const calcMaxWidthBySize = (size) => {
   const value = size.match(/^-?[0-9]+\.?[0-9]*/)?.[0] || "";
   const unit = size.slice(value.length);
   const maxWidth = parseFloat(value) - 0.1;
   return Number.isNaN(maxWidth) ? size : `${maxWidth}${unit}`;
 };
-const variantBreakpoints = {
-  name: "breakpoints",
-  match(matcher, context) {
-    const variantEntries = Object.entries(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-)?${point}[:-])`);
-      const match = matcher.match(regexCache[point]);
-      if (!match)
-        continue;
-      const [, pre] = match;
-      const m = matcher.slice(pre.length);
-      if (m === "container")
-        continue;
-      const isLtPrefix = pre.startsWith("lt-");
-      const isAtPrefix = pre.startsWith("at-");
-      let order = 1e3;
-      if (isLtPrefix) {
-        order -= idx + 1;
-        return {
-          matcher: m,
-          handle: (input, next) => next({
-            ...input,
-            parent: `${input.parent ? `${input.parent} $$ ` : ""}@media (max-width: ${calcMaxWidthBySize(size)})`,
-            parentOrder: order
-          })
-        };
-      }
-      order += idx + 1;
-      if (isAtPrefix && idx < variantEntries.length - 1) {
+const variantBreakpoints = () => {
+  const regexCache = {};
+  return {
+    name: "breakpoints",
+    match(matcher, context) {
+      const variantEntries = Object.entries(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-)?${point}(?:${context.generator.config.separators.join("|")}))`);
+        const match = matcher.match(regexCache[point]);
+        if (!match)
+          continue;
+        const [, pre] = match;
+        const m = matcher.slice(pre.length);
+        if (m === "container")
+          continue;
+        const isLtPrefix = pre.startsWith("lt-");
+        const isAtPrefix = pre.startsWith("at-");
+        let order = 1e3;
+        if (isLtPrefix) {
+          order -= idx + 1;
+          return {
+            matcher: m,
+            handle: (input, next) => next({
+              ...input,
+              parent: `${input.parent ? `${input.parent} $$ ` : ""}@media (max-width: ${calcMaxWidthBySize(size)})`,
+              parentOrder: order
+            })
+          };
+        }
+        order += idx + 1;
+        if (isAtPrefix && idx < variantEntries.length - 1) {
+          return {
+            matcher: m,
+            handle: (input, next) => next({
+              ...input,
+              parent: `${input.parent ? `${input.parent} $$ ` : ""}@media (min-width: ${size}) and (max-width: ${calcMaxWidthBySize(variantEntries[idx + 1][1])})`,
+              parentOrder: order
+            })
+          };
+        }
         return {
           matcher: m,
           handle: (input, next) => next({
             ...input,
-            parent: `${input.parent ? `${input.parent} $$ ` : ""}@media (min-width: ${size}) and (max-width: ${calcMaxWidthBySize(variantEntries[idx + 1][1])})`,
+            parent: `${input.parent ? `${input.parent} $$ ` : ""}@media (min-width: ${size})`,
             parentOrder: order
           })
         };
       }
-      return {
-        matcher: m,
-        handle: (input, next) => next({
-          ...input,
-          parent: `${input.parent ? `${input.parent} $$ ` : ""}@media (min-width: ${size})`,
-          parentOrder: order
-        })
-      };
-    }
-  },
-  multiPass: true,
-  autocomplete: "(at-|lt-|)$breakpoints:"
+    },
+    multiPass: true,
+    autocomplete: "(at-|lt-|)$breakpoints:"
+  };
 };
 
 const scopeMatcher = (name, combinator) => ({
   name: `combinator:${name}`,
-  match(matcher) {
+  match(matcher, ctx) {
     if (!matcher.startsWith(name))
       return;
-    let body = variantGetBracket(`${name}-`, matcher, [":", "-"]);
+    const separators = ctx.generator.config.separators;
+    let body = variantGetBracket(`${name}-`, matcher, separators);
     if (!body) {
-      for (const separator of [":", "-"]) {
+      for (const separator of separators) {
         if (matcher.startsWith(`${name}${separator}`)) {
           body = ["", matcher.slice(name.length + separator.length)];
           break;
@@ -115,10 +118,10 @@ const variantCombinators = [
 
 const variantContainerQuery = {
   name: "@",
-  match(matcher, { theme }) {
+  match(matcher, ctx) {
     if (matcher.startsWith("@container"))
       return;
-    const variant = variantGetParameter("@", matcher, [":", "-"]);
+    const variant = variantGetParameter("@", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest, label] = variant;
       const unbracket = handler.bracket(match);
@@ -128,7 +131,7 @@ const variantContainerQuery = {
         if (minWidth)
           container = `(min-width: ${minWidth})`;
       } else {
-        container = theme.containers?.[match] ?? "";
+        container = ctx.theme.containers?.[match] ?? "";
       }
       if (container) {
         warnOnce("The container query variant is experimental and may not follow semver.");
@@ -147,11 +150,11 @@ const variantContainerQuery = {
 
 const variantDataAttribute = {
   name: "data",
-  match(matcher, { theme }) {
-    const variant = variantGetParameter("data-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variantGetParameter("data-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
-      const dataAttribute = handler.bracket(match) ?? theme.data?.[match] ?? "";
+      const dataAttribute = handler.bracket(match) ?? ctx.theme.data?.[match] ?? "";
       if (dataAttribute) {
         return {
           matcher: rest,
@@ -165,13 +168,13 @@ const variantDataAttribute = {
 const variantPrint = variantParentMatcher("print", "@media print");
 const variantCustomMedia = {
   name: "media",
-  match(matcher, { theme }) {
-    const variant = variantGetParameter("media-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variantGetParameter("media-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
       let media = handler.bracket(match) ?? "";
       if (media === "")
-        media = theme.media?.[match] ?? "";
+        media = ctx.theme.media?.[match] ?? "";
       if (media) {
         return {
           matcher: rest,
@@ -188,13 +191,13 @@ const variantCustomMedia = {
 
 const variantSupports = {
   name: "supports",
-  match(matcher, { theme }) {
-    const variant = variantGetParameter("supports-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variantGetParameter("supports-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
       let supports = handler.bracket(match) ?? "";
       if (supports === "")
-        supports = theme.supports?.[match] ?? "";
+        supports = ctx.theme.supports?.[match] ?? "";
       if (supports) {
         return {
           matcher: rest,
@@ -230,8 +233,8 @@ const variantLanguageDirections = [
 
 const variantSelector = {
   name: "selector",
-  match(matcher) {
-    const variant = variantGetBracket("selector-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variantGetBracket("selector-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
       const selector = handler.bracket(match);
@@ -246,8 +249,8 @@ const variantSelector = {
 };
 const variantCssLayer = {
   name: "layer",
-  match(matcher) {
-    const variant = variantGetParameter("layer-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variantGetParameter("layer-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
       const layer = handler.bracket(match) ?? match;
@@ -265,8 +268,8 @@ const variantCssLayer = {
 };
 const variantInternalLayer = {
   name: "uno-layer",
-  match(matcher) {
-    const variant = variantGetParameter("uno-layer-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variantGetParameter("uno-layer-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
       const layer = handler.bracket(match) ?? match;
@@ -281,8 +284,8 @@ const variantInternalLayer = {
 };
 const variantScope = {
   name: "scope",
-  match(matcher) {
-    const variant = variantGetBracket("scope-", matcher, [":", "-"]);
+  match(matcher, ctx) {
+    const variant = variantGetBracket("scope-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
       const scope = handler.bracket(match);
@@ -297,14 +300,14 @@ const variantScope = {
 };
 const variantVariables = {
   name: "variables",
-  match(matcher) {
+  match(matcher, ctx) {
     if (!matcher.startsWith("["))
       return;
     const [match, rest] = getBracket(matcher, "[", "]") ?? [];
     if (!(match && rest))
       return;
     let newMatcher;
-    for (const separator of [":", "-"]) {
+    for (const separator of ctx.generator.config.separators) {
       if (rest.startsWith(separator)) {
         newMatcher = rest.slice(separator.length);
         break;
@@ -380,28 +383,33 @@ const variantNegative = {
   }
 };
 
-const variantImportant = {
-  name: "important",
-  match(matcher) {
-    let base;
-    const match = matcher.match(/^(important[:-]|!)/);
-    if (match)
-      base = matcher.slice(match[0].length);
-    else if (matcher.endsWith("!"))
-      base = matcher.slice(0, -1);
-    if (base) {
-      return {
-        matcher: base,
-        body: (body) => {
-          body.forEach((v) => {
-            if (v[1])
-              v[1] += " !important";
-          });
-          return body;
-        }
-      };
+const variantImportant = () => {
+  let re;
+  return {
+    name: "important",
+    match(matcher, ctx) {
+      if (!re)
+        re = new RegExp(`^(important(?:${ctx.generator.config.separators.join("|")})|!)`);
+      let base;
+      const match = matcher.match(re);
+      if (match)
+        base = matcher.slice(match[0].length);
+      else if (matcher.endsWith("!"))
+        base = matcher.slice(0, -1);
+      if (base) {
+        return {
+          matcher: base,
+          body: (body) => {
+            body.forEach((v) => {
+              if (v[1])
+                v[1] += " !important";
+            });
+            return body;
+          }
+        };
+      }
     }
-  }
+  };
 };
 
 const PseudoClasses = Object.fromEntries([
@@ -469,8 +477,9 @@ const sortValue = (pseudo) => {
 };
 const taggedPseudoClassMatcher = (tag, parent, combinator) => {
   const rawRE = new RegExp(`^(${escapeRegExp(parent)}:)(\\S+)${escapeRegExp(combinator)}\\1`);
-  const pseudoRE = new RegExp(`^${tag}-(?:(?:(${PseudoClassFunctionsStr})-)?(${PseudoClassesStr}))(?:(/\\w+))?[:-]`);
-  const pseudoColonRE = new RegExp(`^${tag}-(?:(?:(${PseudoClassFunctionsStr})-)?(${PseudoClassesColonStr}))(?:(/\\w+))?[:]`);
+  let splitRE;
+  let pseudoRE;
+  let pseudoColonRE;
   const matchBracket = (input) => {
     const body = variantGetBracket(`${tag}-`, input, []);
     if (!body)
@@ -479,7 +488,7 @@ const taggedPseudoClassMatcher = (tag, parent, combinator) => {
     const bracketValue = handler.bracket(match);
     if (bracketValue == null)
       return;
-    const label = rest.split(/[:-]/, 1)?.[0] ?? "";
+    const label = rest.split(splitRE, 1)?.[0] ?? "";
     const prefix = `${parent}${escapeSelector(label)}`;
     return [
       label,
@@ -505,7 +514,12 @@ const taggedPseudoClassMatcher = (tag, parent, combinator) => {
   };
   return {
     name: `pseudo:${tag}`,
-    match(input) {
+    match(input, ctx) {
+      if (!(splitRE && pseudoRE && pseudoColonRE)) {
+        splitRE = new RegExp(`(?:${ctx.generator.config.separators.join("|")})`);
+        pseudoRE = new RegExp(`^${tag}-(?:(?:(${PseudoClassFunctionsStr})-)?(${PseudoClassesStr}))(?:(/\\w+))?(?:${ctx.generator.config.separators.join("|")})`);
+        pseudoColonRE = new RegExp(`^${tag}-(?:(?:(${PseudoClassFunctionsStr})-)?(${PseudoClassesColonStr}))(?:(/\\w+))?(?:${ctx.generator.config.separators.filter((x) => x !== "-").join("|")})`);
+      }
       if (!input.startsWith(tag))
         return;
       const result = matchBracket(input) || matchPseudo(input);
@@ -528,50 +542,62 @@ const taggedPseudoClassMatcher = (tag, parent, combinator) => {
 };
 const PseudoClassesAndElementsStr = Object.entries(PseudoClasses).map(([key]) => key).join("|");
 const PseudoClassesAndElementsColonStr = Object.entries(PseudoClassesColon).map(([key]) => key).join("|");
-const PseudoClassesAndElementsRE = new RegExp(`^(${PseudoClassesAndElementsStr})[:-]`);
-const PseudoClassesAndElementsColonRE = new RegExp(`^(${PseudoClassesAndElementsColonStr})[:]`);
-const variantPseudoClassesAndElements = {
-  name: "pseudo",
-  match(input) {
-    const match = input.match(PseudoClassesAndElementsRE) || input.match(PseudoClassesAndElementsColonRE);
-    if (match) {
-      const pseudo = PseudoClasses[match[1]] || PseudoClassesColon[match[1]] || `:${match[1]}`;
-      return {
-        matcher: input.slice(match[0].length),
-        handle: (input2, next) => {
-          const selectors = pseudo.startsWith("::") ? {
-            pseudo: `${input2.pseudo}${pseudo}`
-          } : {
-            selector: `${input2.selector}${pseudo}`
-          };
-          return next({
-            ...input2,
-            ...selectors,
-            sort: sortValue(match[1])
-          });
-        }
-      };
-    }
-  },
-  multiPass: true,
-  autocomplete: `(${PseudoClassesAndElementsStr}):`
+const variantPseudoClassesAndElements = () => {
+  let PseudoClassesAndElementsRE;
+  let PseudoClassesAndElementsColonRE;
+  return {
+    name: "pseudo",
+    match(input, ctx) {
+      if (!(PseudoClassesAndElementsRE && PseudoClassesAndElementsRE)) {
+        PseudoClassesAndElementsRE = new RegExp(`^(${PseudoClassesAndElementsStr})(?:${ctx.generator.config.separators.join("|")})`);
+        PseudoClassesAndElementsColonRE = new RegExp(`^(${PseudoClassesAndElementsColonStr})(?:${ctx.generator.config.separators.filter((x) => x !== "-").join("|")})`);
+      }
+      const match = input.match(PseudoClassesAndElementsRE) || input.match(PseudoClassesAndElementsColonRE);
+      if (match) {
+        const pseudo = PseudoClasses[match[1]] || PseudoClassesColon[match[1]] || `:${match[1]}`;
+        return {
+          matcher: input.slice(match[0].length),
+          handle: (input2, next) => {
+            const selectors = pseudo.startsWith("::") ? {
+              pseudo: `${input2.pseudo}${pseudo}`
+            } : {
+              selector: `${input2.selector}${pseudo}`
+            };
+            return next({
+              ...input2,
+              ...selectors,
+              sort: sortValue(match[1])
+            });
+          }
+        };
+      }
+    },
+    multiPass: true,
+    autocomplete: `(${PseudoClassesAndElementsStr}|${PseudoClassesAndElementsColonStr}):`
+  };
 };
-const PseudoClassFunctionsRE = new RegExp(`^(${PseudoClassFunctionsStr})-(${PseudoClassesStr})[:-]`);
-const PseudoClassColonFunctionsRE = new RegExp(`^(${PseudoClassFunctionsStr})-(${PseudoClassesColonStr})[:]`);
-const variantPseudoClassFunctions = {
-  match(input) {
-    const match = input.match(PseudoClassFunctionsRE) || input.match(PseudoClassColonFunctionsRE);
-    if (match) {
-      const fn = match[1];
-      const pseudo = PseudoClasses[match[2]] || PseudoClassesColon[match[2]] || `:${match[2]}`;
-      return {
-        matcher: input.slice(match[0].length),
-        selector: (s) => `${s}:${fn}(${pseudo})`
-      };
-    }
-  },
-  multiPass: true,
-  autocomplete: `(${PseudoClassFunctionsStr})-(${PseudoClassesStr}|${PseudoClassesColonStr}):`
+const variantPseudoClassFunctions = () => {
+  let PseudoClassFunctionsRE;
+  let PseudoClassColonFunctionsRE;
+  return {
+    match(input, ctx) {
+      if (!(PseudoClassFunctionsRE && PseudoClassColonFunctionsRE)) {
+        PseudoClassFunctionsRE = new RegExp(`^(${PseudoClassFunctionsStr})-(${PseudoClassesStr})(?:${ctx.generator.config.separators.join("|")})`);
+        PseudoClassColonFunctionsRE = new RegExp(`^(${PseudoClassFunctionsStr})-(${PseudoClassesColonStr})(?:${ctx.generator.config.separators.filter((x) => x !== "-").join("|")})`);
+      }
+      const match = input.match(PseudoClassFunctionsRE) || input.match(PseudoClassColonFunctionsRE);
+      if (match) {
+        const fn = match[1];
+        const pseudo = PseudoClasses[match[2]] || PseudoClassesColon[match[2]] || `:${match[2]}`;
+        return {
+          matcher: input.slice(match[0].length),
+          selector: (s) => `${s}:${fn}(${pseudo})`
+        };
+      }
+    },
+    multiPass: true,
+    autocomplete: `(${PseudoClassFunctionsStr})-(${PseudoClassesStr}|${PseudoClassesColonStr}):`
+  };
 };
 const variantTaggedPseudoClasses = (options = {}) => {
   const attributify = !!options?.attributifyPseudo;
@@ -604,14 +630,14 @@ const variants = (options) => [
   variantSelector,
   variantInternalLayer,
   variantNegative,
-  variantImportant,
+  variantImportant(),
   variantSupports,
   variantPrint,
   variantCustomMedia,
-  variantBreakpoints,
+  variantBreakpoints(),
   ...variantCombinators,
-  variantPseudoClassesAndElements,
-  variantPseudoClassFunctions,
+  variantPseudoClassesAndElements(),
+  variantPseudoClassFunctions(),
   ...variantTaggedPseudoClasses(options),
   partClasses,
   ...variantColorsMediaOrClass(options),

package/dist/shared/{preset-mini.6b96b995.mjs → preset-mini.c2430d65.mjs}

@@ -1,5 +1,5 @@
-import { d as displays, b as borders, c as contentVisibility, a as contents, f as fonts, t as tabSizes, e as textIndents, g as textOverflows, h as textDecorations, i as textStrokes, j as textShadows, k as textTransforms, l as textAligns, m as fontStyles, n as fontSmoothings, o as boxShadows, r as rings, p as positions, q as cursors, s as appearances, u as pointerEvents, v as resizes, w as verticalAligns, x as userSelects, y as whitespaces, z as breaks, A as overflows, B as outline, C as appearance, D as orders, E as justifies, F as alignments, G as placements, H as insets, I as floats, J as zIndexes, K as boxSizing, L as transitions, M as transforms, N as willChange, O as contains } from './preset-mini.a6daaf18.mjs';
-import { h as handler, c as colorResolver, n as numberWithUnitRE, r as resolveVerticalBreakpoints, l as resolveBreakpoints, o as directionSize } from './preset-mini.ca595ab5.mjs';
+import { d as displays, b as borders, c as contentVisibility, a as contents, f as fonts, t as tabSizes, e as textIndents, g as textOverflows, h as textDecorations, i as textStrokes, j as textShadows, k as textTransforms, l as textAligns, m as fontStyles, n as fontSmoothings, o as boxShadows, r as rings, p as positions, q as cursors, s as appearances, u as pointerEvents, v as resizes, w as verticalAligns, x as userSelects, y as whitespaces, z as breaks, A as overflows, B as outline, C as appearance, D as orders, E as justifies, F as alignments, G as placements, H as insets, I as floats, J as zIndexes, K as boxSizing, L as transitions, M as transforms, N as willChange, O as contains } from './preset-mini.8c7d231d.mjs';
+import { h as handler, c as colorResolver, n as numberWithUnitRE, r as resolveVerticalBreakpoints, l as resolveBreakpoints, o as directionSize } from './preset-mini.d9489281.mjs';
 import { warnOnce } from '@unocss/core';
 
 const opacity = [
@@ -212,7 +212,7 @@ const cssVariables = [
   }]
 ];
 const cssProperty = [
-  [/^\[(--(\w|\\\W)+|[\w-]+):(.+)\]$/, ([match, prop, , value]) => {
+  [/^\[(--(\w|\\\W)+|[\w-]+):([^:].*)\]$/, ([match, prop, , value]) => {
     if (!isURI(match.slice(1, -1)))
       return { [prop]: handler.bracket(`[${value}]`) };
   }]

package/dist/shared/{preset-mini.ca595ab5.mjs → preset-mini.d9489281.mjs}

@@ -20,7 +20,9 @@ const directionMap = {
 const insetMap = {
   ...directionMap,
   s: ["-inset-inline-start"],
+  start: ["-inset-inline-start"],
   e: ["-inset-inline-end"],
+  end: ["-inset-inline-end"],
   bs: ["-inset-block-start"],
   be: ["-inset-block-end"],
   is: ["-inset-inline-start"],
@@ -44,14 +46,20 @@ const cornerMap = {
   "": [""],
   "bs": ["-start-start", "-start-end"],
   "be": ["-end-start", "-end-end"],
+  "s": ["-end-start", "-start-start"],
   "is": ["-end-start", "-start-start"],
+  "e": ["-start-end", "-end-end"],
   "ie": ["-start-end", "-end-end"],
+  "ss": ["-start-start"],
   "bs-is": ["-start-start"],
   "is-bs": ["-start-start"],
+  "se": ["-start-end"],
   "bs-ie": ["-start-end"],
   "ie-bs": ["-start-end"],
+  "es": ["-end-start"],
   "be-is": ["-end-start"],
   "is-be": ["-end-start"],
+  "ee": ["-end-end"],
   "be-ie": ["-end-end"],
   "ie-be": ["-end-end"]
 };
@@ -248,8 +256,12 @@ function bracketWithType(str, requiredType) {
       case "quoted":
         return base.replace(/(^|[^\\])_/g, "$1 ").replace(/\\_/g, "_").replace(/(["\\])/g, "\\$1").replace(/^(.+)$/, '"$1"');
     }
-    return base.replace(/(url\(.*?\))/g, (v) => v.replace(/_/g, "\\_")).replace(/(^|[^\\])_/g, "$1 ").replace(/\\_/g, "_").replace(/(?:calc|clamp|max|min)\((.*)/g, (v) => {
-      return v.replace(/(-?\d*\.?\d(?!\b-.+[,)](?![^+\-/*])\D)(?:%|[a-z]+)?|\))([+\-/*])/g, "$1 $2 ");
+    return base.replace(/(url\(.*?\))/g, (v) => v.replace(/_/g, "\\_")).replace(/(^|[^\\])_/g, "$1 ").replace(/\\_/g, "_").replace(/(?:calc|clamp|max|min)\((.*)/g, (match2) => {
+      const vars = [];
+      return match2.replace(/var\((--.+?)[,)]/g, (match3, g1) => {
+        vars.push(g1);
+        return match3.replace(g1, "--v");
+      }).replace(/(-?\d*\.?\d(?!\b-\d.+[,)](?![^+\-/*])\D)(?:%|[a-z]+)?|\))([+\-/*])/g, "$1 $2 ").replace("--v", () => vars.shift());
     });
   }
 }

package/dist/theme.cjs

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const colors = require('./shared/preset-mini.30606736.cjs');
-const _default = require('./shared/preset-mini.43dfafb9.cjs');
-require('./shared/preset-mini.8953ff1a.cjs');
-require('./shared/preset-mini.e54ce13d.cjs');
+const _default = require('./shared/preset-mini.3a9c563b.cjs');
+require('./shared/preset-mini.5d6b20c4.cjs');
+require('./shared/preset-mini.65179802.cjs');
 require('@unocss/core');
 
 

package/dist/theme.mjs

@@ -1,5 +1,5 @@
 export { c as colors } from './shared/preset-mini.65ac75be.mjs';
-export { p as baseSize, b as blur, m as borderRadius, n as boxShadow, i as breakpoints, z as containers, d as dropShadow, k as duration, o as easing, f as fontFamily, a as fontSize, x as height, h as letterSpacing, l as lineHeight, j as lineWidth, y as maxHeight, u as maxWidth, A as preflightBase, r as ringWidth, s as spacing, c as textIndent, g as textShadow, e as textStrokeWidth, t as theme, v as verticalBreakpoints, q as width, w as wordSpacing } from './shared/preset-mini.0a36abfc.mjs';
-import './shared/preset-mini.a6daaf18.mjs';
-import './shared/preset-mini.ca595ab5.mjs';
+export { p as baseSize, b as blur, m as borderRadius, n as boxShadow, i as breakpoints, z as containers, d as dropShadow, k as duration, o as easing, f as fontFamily, a as fontSize, x as height, h as letterSpacing, l as lineHeight, j as lineWidth, y as maxHeight, u as maxWidth, A as preflightBase, r as ringWidth, s as spacing, c as textIndent, g as textShadow, e as textStrokeWidth, t as theme, v as verticalBreakpoints, q as width, w as wordSpacing } from './shared/preset-mini.708f19ca.mjs';
+import './shared/preset-mini.8c7d231d.mjs';
+import './shared/preset-mini.d9489281.mjs';
 import '@unocss/core';

package/dist/utils.cjs

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const colors = require('./shared/preset-mini.e54ce13d.cjs');
-const variants = require('./shared/preset-mini.28b1d01c.cjs');
+const colors = require('./shared/preset-mini.65179802.cjs');
+const variants = require('./shared/preset-mini.77e00c7b.cjs');
 require('@unocss/core');
 
 

package/dist/utils.mjs

@@ -1,3 +1,3 @@
-export { C as CONTROL_MINI_NO_NEGATIVE, f as colorOpacityToString, c as colorResolver, e as colorToString, i as colorableShadows, b as cornerMap, d as directionMap, o as directionSize, q as getBracket, t as getComponent, z as getComponents, g as globalKeywords, w as h, h as handler, a as hasParseableColor, u as hex2rgba, j as insetMap, m as makeGlobalStaticRules, p as parseColor, v as parseCssColor, k as positionMap, l as resolveBreakpoints, r as resolveVerticalBreakpoints, s as splitShorthand, y as valueHandlers, x as xyzMap } from './shared/preset-mini.ca595ab5.mjs';
-export { a as variantGetBracket, v as variantGetParameter, c as variantMatcher, b as variantParentMatcher } from './shared/preset-mini.bd4c0c0c.mjs';
+export { C as CONTROL_MINI_NO_NEGATIVE, f as colorOpacityToString, c as colorResolver, e as colorToString, i as colorableShadows, b as cornerMap, d as directionMap, o as directionSize, q as getBracket, t as getComponent, z as getComponents, g as globalKeywords, w as h, h as handler, a as hasParseableColor, u as hex2rgba, j as insetMap, m as makeGlobalStaticRules, p as parseColor, v as parseCssColor, k as positionMap, l as resolveBreakpoints, r as resolveVerticalBreakpoints, s as splitShorthand, y as valueHandlers, x as xyzMap } from './shared/preset-mini.d9489281.mjs';
+export { a as variantGetBracket, v as variantGetParameter, c as variantMatcher, b as variantParentMatcher } from './shared/preset-mini.816a9399.mjs';
 import '@unocss/core';

package/dist/variants.cjs

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const _default = require('./shared/preset-mini.89cb41ec.cjs');
-require('./shared/preset-mini.e54ce13d.cjs');
+const _default = require('./shared/preset-mini.6f1356df.cjs');
+require('./shared/preset-mini.65179802.cjs');
 require('@unocss/core');
-require('./shared/preset-mini.28b1d01c.cjs');
+require('./shared/preset-mini.77e00c7b.cjs');