@unocss/preset-mini 0.22.4 → 0.23.0

package/dist/chunks/default.cjs

@@ -124,6 +124,13 @@ const boxShadow = {
   "inner": "inset 0 2px 4px 0 rgba(0,0,0,0.05)",
   "none": "0 0 #0000"
 };
+const easing = {
+  "DEFAULT": "cubic-bezier(0.4, 0, 0.2, 1)",
+  "linear": "linear",
+  "in": "cubic-bezier(0.4, 0, 1, 1)",
+  "out": "cubic-bezier(0, 0, 0.2, 1)",
+  "in-out": "cubic-bezier(0.4, 0, 0.2, 1)"
+};
 
 const blur = {
   "DEFAULT": "8px",
@@ -206,7 +213,8 @@ const theme = {
   textShadow,
   textStrokeWidth,
   blur,
-  dropShadow
+  dropShadow,
+  easing
 };
 
 exports.baseSize = baseSize;
@@ -215,6 +223,7 @@ exports.borderRadius = borderRadius;
 exports.boxShadow = boxShadow;
 exports.breakpoints = breakpoints;
 exports.dropShadow = dropShadow;
+exports.easing = easing;
 exports.fontFamily = fontFamily;
 exports.fontSize = fontSize;
 exports.height = height;

package/dist/chunks/default.mjs

@@ -122,6 +122,13 @@ const boxShadow = {
   "inner": "inset 0 2px 4px 0 rgba(0,0,0,0.05)",
   "none": "0 0 #0000"
 };
+const easing = {
+  "DEFAULT": "cubic-bezier(0.4, 0, 0.2, 1)",
+  "linear": "linear",
+  "in": "cubic-bezier(0.4, 0, 1, 1)",
+  "out": "cubic-bezier(0, 0, 0.2, 1)",
+  "in-out": "cubic-bezier(0.4, 0, 0.2, 1)"
+};
 
 const blur = {
   "DEFAULT": "8px",
@@ -204,7 +211,8 @@ const theme = {
   textShadow,
   textStrokeWidth,
   blur,
-  dropShadow
+  dropShadow,
+  easing
 };
 
-export { fontSize as a, blur as b, textIndent as c, dropShadow as d, textStrokeWidth as e, fontFamily as f, textShadow as g, letterSpacing as h, breakpoints as i, borderRadius as j, boxShadow as k, lineHeight as l, baseSize as m, width as n, maxWidth as o, height as p, maxHeight as q, theme as t, wordSpacing as w };
+export { fontSize as a, blur as b, textIndent as c, dropShadow as d, textStrokeWidth as e, fontFamily as f, textShadow as g, letterSpacing as h, breakpoints as i, borderRadius as j, boxShadow as k, lineHeight as l, easing as m, baseSize as n, width as o, maxWidth as p, height as q, maxHeight as r, theme as t, wordSpacing as w };

package/dist/chunks/default2.cjs

@@ -19,9 +19,9 @@ const textAligns = [
 ];
 
 const outline = [
-  [/^outline-(?:width-|size-)?(.+)$/, ([, d]) => ({ "outline-width": utilities.handler.bracket.cssvar.fraction.rem(d) })],
+  [/^outline-(?:width-|size-)?(.+)$/, ([, d]) => ({ "outline-width": utilities.handler.bracket.cssvar.px(d) })],
   [/^outline-(?:color-)?(.+)$/, utilities.colorResolver("outline-color", "outline-color")],
-  [/^outline-offset-(.+)$/, ([, d]) => ({ "outline-offset": utilities.handler.bracket.cssvar.fraction.rem(d) })],
+  [/^outline-offset-(.+)$/, ([, d]) => ({ "outline-offset": utilities.handler.bracket.cssvar.px(d) })],
   ["outline", { "outline-style": "solid" }],
   [/^outline-(auto|dashed|dotted|double|hidden|solid|groove|ridge|inset|outset|inherit|initial|revert|unset)$/, ([, c]) => ({ "outline-style": c })],
   ["outline-none", { "outline": "2px solid transparent", "outline-offset": "2px" }]
@@ -155,6 +155,7 @@ const bgColors = [
 const transitionPropertyGroup = {
   all: "all",
   colors: ["color", "background-color", "border-color", "text-decoration-color", "fill", "stroke"].join(","),
+  none: "none",
   opacity: "opacity",
   shadow: "box-shadow",
   transform: "transform"
@@ -168,22 +169,15 @@ const transitions = [
     if (p) {
       return {
         "transition-property": p,
-        "transition-timing-function": "cubic-bezier(0.4,0,0.2,1)",
+        "transition-timing-function": "cubic-bezier(0.4, 0, 0.2, 1)",
         "transition-duration": `${duration}ms`
       };
     }
   }],
   [/^(?:transition-)?duration-(.+)$/, ([, d]) => ({ "transition-duration": utilities.handler.bracket.cssvar.time(d) })],
   [/^(?:transition-)?delay-(.+)$/, ([, d]) => ({ "transition-delay": utilities.handler.bracket.cssvar.time(d) })],
-  [/^ease-(.+)$/, ([, d]) => ({ "transition-timing-function": utilities.handler.bracket.cssvar(d) })],
-  ["ease", { "transition-timing-function": "cubic-bezier(0.4, 0, 0.2, 1)" }],
-  ["ease-linear", { "transition-timing-function": "linear" }],
-  ["ease-in", { "transition-timing-function": "cubic-bezier(0.4, 0, 1, 1)" }],
-  ["ease-out", { "transition-timing-function": "cubic-bezier(0, 0, 0.2, 1)" }],
-  ["ease-in-out", { "transition-timing-function": "cubic-bezier(0.4, 0, 0.2, 1)" }],
+  [/^(?:transition-)?ease(?:-(.+))?$/, ([, d], { theme }) => ({ "transition-timing-function": theme.easing?.[d || "DEFAULT"] ?? utilities.handler.bracket.cssvar(d) })],
   [/^(?:transition-)?property-(.+)$/, ([, v]) => ({ "transition-property": utilities.handler.global(v) || transitionProperty(v) })],
-  ["transition-property-none", { "transition-property": "none" }],
-  ["property-none", { "transition-property": "none" }],
   ["transition-none", { transition: "none" }]
 ];
 
@@ -218,7 +212,8 @@ const displays = [
   ["contents", { display: "contents" }],
   ["flow-root", { display: "flow-root" }],
   ["list-item", { display: "list-item" }],
-  ["hidden", { display: "none" }]
+  ["hidden", { display: "none" }],
+  [/^display-(.+)$/, ([, c]) => ({ display: utilities.handler.bracket.cssvar(c) || c })]
 ];
 const appearances = [
   ["visible", { visibility: "visible" }],
@@ -347,9 +342,9 @@ const fonts = [
   }],
   [/^text-size-(.+)$/, ([, s]) => ({ "font-size": utilities.handler.bracket.cssvar.rem(s) })],
   [/^(?:font|fw)-?([^-]+)$/, ([, s]) => ({ "font-weight": weightMap[s] || utilities.handler.number(s) })],
-  [/^(?:leading|lh)-([^-]+)$/, ([, s], { theme }) => ({ "line-height": theme.lineHeight?.[s] || utilities.handler.bracket.rem(s) })],
-  [/^tracking-([^-]+)$/, ([, s], { theme }) => ({ "letter-spacing": theme.letterSpacing?.[s] || utilities.handler.bracket.rem(s) })],
-  [/^word-spacing-([^-]+)$/, ([, s], { theme }) => ({ "word-spacing": theme.wordSpacing?.[s] || utilities.handler.bracket.rem(s) })]
+  [/^(?:leading|lh)-(.+)$/, ([, s], { theme }) => ({ "line-height": theme.lineHeight?.[s] || utilities.handler.bracket.cssvar.rem(s) })],
+  [/^tracking-(.+)$/, ([, s], { theme }) => ({ "letter-spacing": theme.letterSpacing?.[s] || utilities.handler.bracket.cssvar.rem(s) })],
+  [/^word-spacing-(.+)$/, ([, s], { theme }) => ({ "word-spacing": theme.wordSpacing?.[s] || utilities.handler.bracket.cssvar.rem(s) })]
 ];
 const tabSizes = [
   [/^tab(?:-(.+))?$/, ([, s]) => {
@@ -545,8 +540,7 @@ const floats = [
   ["clear-none", { clear: "none" }]
 ];
 const zIndexes = [
-  [/^z-(.+)$/, ([, v]) => ({ "z-index": utilities.handler.bracket.cssvar.number(v) })],
-  ["z-auto", { "z-index": "auto" }]
+  [/^z-(.+)$/, ([, v]) => ({ "z-index": utilities.handler.bracket.cssvar.auto.number(v) })]
 ];
 const boxSizing = [
   ["box-border", { "box-sizing": "border-box" }],
@@ -554,11 +548,12 @@ const boxSizing = [
 ];
 
 const ringBase = {
+  ...shadowBase,
   "--un-ring-inset": varEmpty,
   "--un-ring-offset-width": "0px",
   "--un-ring-offset-color": "#fff",
-  "--un-ring-color": "rgba(147,197,253,0.5)",
-  ...shadowBase
+  "--un-ring-width": "0px",
+  "--un-ring-color": "rgba(147,197,253,0.5)"
 };
 const rings = [
   [/^ring(?:-(.+))?$/, ([, d]) => {
@@ -567,13 +562,15 @@ const rings = [
       return [
         ringBase,
         {
+          "--un-ring-width": value,
           "--un-ring-offset-shadow": "var(--un-ring-inset) 0 0 0 var(--un-ring-offset-width) var(--un-ring-offset-color)",
-          "--un-ring-shadow": `var(--un-ring-inset) 0 0 0 calc(${value} + var(--un-ring-offset-width)) var(--un-ring-color)`,
+          "--un-ring-shadow": "var(--un-ring-inset) 0 0 0 calc(var(--un-ring-width) + var(--un-ring-offset-width)) var(--un-ring-color)",
           "box-shadow": "var(--un-ring-offset-shadow), var(--un-ring-shadow), var(--un-shadow, 0 0 #0000)"
         }
       ];
     }
   }],
+  [/^ring-(?:width-|size-)(.+)$/, ([, d]) => ({ "--un-ring-width": utilities.handler.bracket.cssvar.px(d) })],
   ["ring-offset", { "--un-ring-offset-width": "1px" }],
   [/^ring-offset-(?:width-|size-)?(.+)$/, ([, d]) => ({ "--un-ring-offset-width": utilities.handler.bracket.cssvar.px(d) })],
   [/^ring-(.+)$/, utilities.colorResolver("--un-ring-color", "ring")],
@@ -687,8 +684,8 @@ const transformBase = {
   [core.CONTROL_SHORTCUT_NO_MERGE]: ""
 };
 const transforms = [
-  [/^origin-(.+)$/, ([, s]) => ({ "transform-origin": utilities.positionMap[s] ?? utilities.handler.bracket.cssvar(s) })],
-  [/^perspect-(.+)$/, ([, s]) => {
+  [/^(?:transform-)?origin-(.+)$/, ([, s]) => ({ "transform-origin": utilities.positionMap[s] ?? utilities.handler.bracket.cssvar(s) })],
+  [/^(?:transform-)?perspect(?:ive)?-(.+)$/, ([, s]) => {
     const v = utilities.handler.bracket.cssvar.px.numberWithUnit(s);
     if (v != null) {
       return {
@@ -697,7 +694,7 @@ const transforms = [
       };
     }
   }],
-  [/^perspect-origin-(.+)$/, ([, s]) => {
+  [/^(?:transform-)?perspect(?:ive)?-origin-(.+)$/, ([, s]) => {
     const v = utilities.handler.bracket.cssvar(s) ?? (s.length >= 3 ? utilities.positionMap[s] : void 0);
     if (v != null) {
       return {
@@ -706,15 +703,15 @@ const transforms = [
       };
     }
   }],
-  [/^translate-()(.+)$/, handleTranslate],
-  [/^translate-([xyz])-(.+)$/, handleTranslate],
-  [/^rotate-()(.+)$/, handleRotate],
-  [/^rotate-([xyz])-(.+)$/, handleRotate],
-  [/^skew-([xy])-(.+)$/, handleSkew],
-  [/^scale-()(.+)$/, handleScale],
-  [/^scale-([xyz])-(.+)$/, handleScale],
-  ["preserve-3d", { "transform-style": "preserve-3d" }],
-  ["preserve-flat", { "transform-style": "flat" }],
+  [/^(?:transform-)?translate-()(.+)$/, handleTranslate],
+  [/^(?:transform-)?translate-([xyz])-(.+)$/, handleTranslate],
+  [/^(?:transform-)?rotate-()(.+)$/, handleRotate],
+  [/^(?:transform-)?rotate-([xyz])-(.+)$/, handleRotate],
+  [/^(?:transform-)?skew-([xy])-(.+)$/, handleSkew],
+  [/^(?:transform-)?scale-()(.+)$/, handleScale],
+  [/^(?:transform-)?scale-([xyz])-(.+)$/, handleScale],
+  [/^(?:transform-)?preserve-3d$/, () => ({ "transform-style": "preserve-3d" })],
+  [/^(?:transform-)?preserve-flat$/, () => ({ "transform-style": "flat" })],
   [/^transform$/, () => [
     transformBase,
     { transform: "var(--un-transform)" }
@@ -787,30 +784,26 @@ function handleSkew([, d, b]) {
 }
 
 const variablesAbbrMap = {
-  "backface": "backface-visibility",
-  "break": "word-break",
-  "case": "text-transform",
-  "content": "align-content",
-  "flex": "flex",
-  "fw": "font-weight",
-  "items": "align-items",
-  "justify": "justify-content",
-  "leading": "line-height",
-  "lh": "line-height",
-  "select": "user-select",
-  "self": "align-self",
-  "tracking": "letter-spacing",
-  "vertical": "vertical-align",
-  "visible": "visibility",
-  "whitespace": "white-space",
-  "word-spacing": "word-spacing",
-  "ws": "white-space"
+  backface: "backface-visibility",
+  break: "word-break",
+  case: "text-transform",
+  content: "align-content",
+  flex: "flex",
+  fw: "font-weight",
+  items: "align-items",
+  justify: "justify-content",
+  select: "user-select",
+  self: "align-self",
+  vertical: "vertical-align",
+  visible: "visibility",
+  whitespace: "white-space",
+  ws: "white-space"
 };
 const cssVariables = [
-  [/^([^$]+)(?<=-)\$(.+)$/, ([, name, varname]) => {
-    const prop = variablesAbbrMap[name.slice(0, -1)];
+  [/^(.+?)-(\$.+)$/, ([, name, varname]) => {
+    const prop = variablesAbbrMap[name];
     if (prop)
-      return { [prop]: `var(--${varname})` };
+      return { [prop]: utilities.handler.cssvar(varname) };
   }]
 ];
 const cssProperty = [
@@ -829,11 +822,7 @@ ${constructCSS({ animation: "__un_qm 0.5s ease-in-out alternate infinite" })}`;
 ];
 
 const textDecorations = [
-  ["underline", { "text-decoration-line": "underline" }],
-  ["overline", { "text-decoration-line": "overline" }],
-  ["line-through", { "text-decoration-line": "line-through" }],
-  ["decoration-underline", { "text-decoration-line": "underline" }],
-  ["decoration-line-through", { "text-decoration-line": "line-through" }],
+  [/^(?:decoration-)?(underline|overline|line-through)$/, ([, s]) => ({ "text-decoration-line": s })],
   [/^(?:underline|decoration)-(?:size-)?(.+)$/, ([, s]) => ({ "text-decoration-thickness": utilities.handler.bracket.cssvar.px(s) })],
   [/^(?:underline|decoration)-(auto|from-font)$/, ([, s]) => ({ "text-decoration-thickness": s })],
   [/^(?:underline|decoration)-(.+)$/, (match, ctx) => {
@@ -856,7 +845,7 @@ const svgUtilities = [
   [/^fill-(.+)$/, utilities.colorResolver("fill", "fill")],
   [/^fill-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-fill-opacity": utilities.handler.bracket.percent(opacity) })],
   ["fill-none", { fill: "none" }],
-  [/^stroke-(?:width-|size-)?(.+)$/, ([, s]) => ({ "stroke-width": utilities.handler.bracket.fraction.px.number(s) })],
+  [/^stroke-(?:width-|size-)?(.+)$/, ([, s]) => ({ "stroke-width": utilities.handler.bracket.cssvar.fraction.px.number(s) })],
   [/^stroke-dash-(.+)$/, ([, s]) => ({ "stroke-dasharray": utilities.handler.bracket.cssvar.number(s) })],
   [/^stroke-offset-(.+)$/, ([, s]) => ({ "stroke-dashoffset": utilities.handler.bracket.cssvar.px.numberWithUnit(s) })],
   [/^stroke-(.+)$/, utilities.colorResolver("stroke", "stroke")],

package/dist/chunks/default2.mjs

@@ -17,9 +17,9 @@ const textAligns = [
 ];
 
 const outline = [
-  [/^outline-(?:width-|size-)?(.+)$/, ([, d]) => ({ "outline-width": handler.bracket.cssvar.fraction.rem(d) })],
+  [/^outline-(?:width-|size-)?(.+)$/, ([, d]) => ({ "outline-width": handler.bracket.cssvar.px(d) })],
   [/^outline-(?:color-)?(.+)$/, colorResolver("outline-color", "outline-color")],
-  [/^outline-offset-(.+)$/, ([, d]) => ({ "outline-offset": handler.bracket.cssvar.fraction.rem(d) })],
+  [/^outline-offset-(.+)$/, ([, d]) => ({ "outline-offset": handler.bracket.cssvar.px(d) })],
   ["outline", { "outline-style": "solid" }],
   [/^outline-(auto|dashed|dotted|double|hidden|solid|groove|ridge|inset|outset|inherit|initial|revert|unset)$/, ([, c]) => ({ "outline-style": c })],
   ["outline-none", { "outline": "2px solid transparent", "outline-offset": "2px" }]
@@ -153,6 +153,7 @@ const bgColors = [
 const transitionPropertyGroup = {
   all: "all",
   colors: ["color", "background-color", "border-color", "text-decoration-color", "fill", "stroke"].join(","),
+  none: "none",
   opacity: "opacity",
   shadow: "box-shadow",
   transform: "transform"
@@ -166,22 +167,15 @@ const transitions = [
     if (p) {
       return {
         "transition-property": p,
-        "transition-timing-function": "cubic-bezier(0.4,0,0.2,1)",
+        "transition-timing-function": "cubic-bezier(0.4, 0, 0.2, 1)",
         "transition-duration": `${duration}ms`
       };
     }
   }],
   [/^(?:transition-)?duration-(.+)$/, ([, d]) => ({ "transition-duration": handler.bracket.cssvar.time(d) })],
   [/^(?:transition-)?delay-(.+)$/, ([, d]) => ({ "transition-delay": handler.bracket.cssvar.time(d) })],
-  [/^ease-(.+)$/, ([, d]) => ({ "transition-timing-function": handler.bracket.cssvar(d) })],
-  ["ease", { "transition-timing-function": "cubic-bezier(0.4, 0, 0.2, 1)" }],
-  ["ease-linear", { "transition-timing-function": "linear" }],
-  ["ease-in", { "transition-timing-function": "cubic-bezier(0.4, 0, 1, 1)" }],
-  ["ease-out", { "transition-timing-function": "cubic-bezier(0, 0, 0.2, 1)" }],
-  ["ease-in-out", { "transition-timing-function": "cubic-bezier(0.4, 0, 0.2, 1)" }],
+  [/^(?:transition-)?ease(?:-(.+))?$/, ([, d], { theme }) => ({ "transition-timing-function": theme.easing?.[d || "DEFAULT"] ?? handler.bracket.cssvar(d) })],
   [/^(?:transition-)?property-(.+)$/, ([, v]) => ({ "transition-property": handler.global(v) || transitionProperty(v) })],
-  ["transition-property-none", { "transition-property": "none" }],
-  ["property-none", { "transition-property": "none" }],
   ["transition-none", { transition: "none" }]
 ];
 
@@ -216,7 +210,8 @@ const displays = [
   ["contents", { display: "contents" }],
   ["flow-root", { display: "flow-root" }],
   ["list-item", { display: "list-item" }],
-  ["hidden", { display: "none" }]
+  ["hidden", { display: "none" }],
+  [/^display-(.+)$/, ([, c]) => ({ display: handler.bracket.cssvar(c) || c })]
 ];
 const appearances = [
   ["visible", { visibility: "visible" }],
@@ -345,9 +340,9 @@ const fonts = [
   }],
   [/^text-size-(.+)$/, ([, s]) => ({ "font-size": handler.bracket.cssvar.rem(s) })],
   [/^(?:font|fw)-?([^-]+)$/, ([, s]) => ({ "font-weight": weightMap[s] || handler.number(s) })],
-  [/^(?:leading|lh)-([^-]+)$/, ([, s], { theme }) => ({ "line-height": theme.lineHeight?.[s] || handler.bracket.rem(s) })],
-  [/^tracking-([^-]+)$/, ([, s], { theme }) => ({ "letter-spacing": theme.letterSpacing?.[s] || handler.bracket.rem(s) })],
-  [/^word-spacing-([^-]+)$/, ([, s], { theme }) => ({ "word-spacing": theme.wordSpacing?.[s] || handler.bracket.rem(s) })]
+  [/^(?:leading|lh)-(.+)$/, ([, s], { theme }) => ({ "line-height": theme.lineHeight?.[s] || handler.bracket.cssvar.rem(s) })],
+  [/^tracking-(.+)$/, ([, s], { theme }) => ({ "letter-spacing": theme.letterSpacing?.[s] || handler.bracket.cssvar.rem(s) })],
+  [/^word-spacing-(.+)$/, ([, s], { theme }) => ({ "word-spacing": theme.wordSpacing?.[s] || handler.bracket.cssvar.rem(s) })]
 ];
 const tabSizes = [
   [/^tab(?:-(.+))?$/, ([, s]) => {
@@ -543,8 +538,7 @@ const floats = [
   ["clear-none", { clear: "none" }]
 ];
 const zIndexes = [
-  [/^z-(.+)$/, ([, v]) => ({ "z-index": handler.bracket.cssvar.number(v) })],
-  ["z-auto", { "z-index": "auto" }]
+  [/^z-(.+)$/, ([, v]) => ({ "z-index": handler.bracket.cssvar.auto.number(v) })]
 ];
 const boxSizing = [
   ["box-border", { "box-sizing": "border-box" }],
@@ -552,11 +546,12 @@ const boxSizing = [
 ];
 
 const ringBase = {
+  ...shadowBase,
   "--un-ring-inset": varEmpty,
   "--un-ring-offset-width": "0px",
   "--un-ring-offset-color": "#fff",
-  "--un-ring-color": "rgba(147,197,253,0.5)",
-  ...shadowBase
+  "--un-ring-width": "0px",
+  "--un-ring-color": "rgba(147,197,253,0.5)"
 };
 const rings = [
   [/^ring(?:-(.+))?$/, ([, d]) => {
@@ -565,13 +560,15 @@ const rings = [
       return [
         ringBase,
         {
+          "--un-ring-width": value,
           "--un-ring-offset-shadow": "var(--un-ring-inset) 0 0 0 var(--un-ring-offset-width) var(--un-ring-offset-color)",
-          "--un-ring-shadow": `var(--un-ring-inset) 0 0 0 calc(${value} + var(--un-ring-offset-width)) var(--un-ring-color)`,
+          "--un-ring-shadow": "var(--un-ring-inset) 0 0 0 calc(var(--un-ring-width) + var(--un-ring-offset-width)) var(--un-ring-color)",
           "box-shadow": "var(--un-ring-offset-shadow), var(--un-ring-shadow), var(--un-shadow, 0 0 #0000)"
         }
       ];
     }
   }],
+  [/^ring-(?:width-|size-)(.+)$/, ([, d]) => ({ "--un-ring-width": handler.bracket.cssvar.px(d) })],
   ["ring-offset", { "--un-ring-offset-width": "1px" }],
   [/^ring-offset-(?:width-|size-)?(.+)$/, ([, d]) => ({ "--un-ring-offset-width": handler.bracket.cssvar.px(d) })],
   [/^ring-(.+)$/, colorResolver("--un-ring-color", "ring")],
@@ -685,8 +682,8 @@ const transformBase = {
   [CONTROL_SHORTCUT_NO_MERGE]: ""
 };
 const transforms = [
-  [/^origin-(.+)$/, ([, s]) => ({ "transform-origin": positionMap[s] ?? handler.bracket.cssvar(s) })],
-  [/^perspect-(.+)$/, ([, s]) => {
+  [/^(?:transform-)?origin-(.+)$/, ([, s]) => ({ "transform-origin": positionMap[s] ?? handler.bracket.cssvar(s) })],
+  [/^(?:transform-)?perspect(?:ive)?-(.+)$/, ([, s]) => {
     const v = handler.bracket.cssvar.px.numberWithUnit(s);
     if (v != null) {
       return {
@@ -695,7 +692,7 @@ const transforms = [
       };
     }
   }],
-  [/^perspect-origin-(.+)$/, ([, s]) => {
+  [/^(?:transform-)?perspect(?:ive)?-origin-(.+)$/, ([, s]) => {
     const v = handler.bracket.cssvar(s) ?? (s.length >= 3 ? positionMap[s] : void 0);
     if (v != null) {
       return {
@@ -704,15 +701,15 @@ const transforms = [
       };
     }
   }],
-  [/^translate-()(.+)$/, handleTranslate],
-  [/^translate-([xyz])-(.+)$/, handleTranslate],
-  [/^rotate-()(.+)$/, handleRotate],
-  [/^rotate-([xyz])-(.+)$/, handleRotate],
-  [/^skew-([xy])-(.+)$/, handleSkew],
-  [/^scale-()(.+)$/, handleScale],
-  [/^scale-([xyz])-(.+)$/, handleScale],
-  ["preserve-3d", { "transform-style": "preserve-3d" }],
-  ["preserve-flat", { "transform-style": "flat" }],
+  [/^(?:transform-)?translate-()(.+)$/, handleTranslate],
+  [/^(?:transform-)?translate-([xyz])-(.+)$/, handleTranslate],
+  [/^(?:transform-)?rotate-()(.+)$/, handleRotate],
+  [/^(?:transform-)?rotate-([xyz])-(.+)$/, handleRotate],
+  [/^(?:transform-)?skew-([xy])-(.+)$/, handleSkew],
+  [/^(?:transform-)?scale-()(.+)$/, handleScale],
+  [/^(?:transform-)?scale-([xyz])-(.+)$/, handleScale],
+  [/^(?:transform-)?preserve-3d$/, () => ({ "transform-style": "preserve-3d" })],
+  [/^(?:transform-)?preserve-flat$/, () => ({ "transform-style": "flat" })],
   [/^transform$/, () => [
     transformBase,
     { transform: "var(--un-transform)" }
@@ -785,30 +782,26 @@ function handleSkew([, d, b]) {
 }
 
 const variablesAbbrMap = {
-  "backface": "backface-visibility",
-  "break": "word-break",
-  "case": "text-transform",
-  "content": "align-content",
-  "flex": "flex",
-  "fw": "font-weight",
-  "items": "align-items",
-  "justify": "justify-content",
-  "leading": "line-height",
-  "lh": "line-height",
-  "select": "user-select",
-  "self": "align-self",
-  "tracking": "letter-spacing",
-  "vertical": "vertical-align",
-  "visible": "visibility",
-  "whitespace": "white-space",
-  "word-spacing": "word-spacing",
-  "ws": "white-space"
+  backface: "backface-visibility",
+  break: "word-break",
+  case: "text-transform",
+  content: "align-content",
+  flex: "flex",
+  fw: "font-weight",
+  items: "align-items",
+  justify: "justify-content",
+  select: "user-select",
+  self: "align-self",
+  vertical: "vertical-align",
+  visible: "visibility",
+  whitespace: "white-space",
+  ws: "white-space"
 };
 const cssVariables = [
-  [/^([^$]+)(?<=-)\$(.+)$/, ([, name, varname]) => {
-    const prop = variablesAbbrMap[name.slice(0, -1)];
+  [/^(.+?)-(\$.+)$/, ([, name, varname]) => {
+    const prop = variablesAbbrMap[name];
     if (prop)
-      return { [prop]: `var(--${varname})` };
+      return { [prop]: handler.cssvar(varname) };
   }]
 ];
 const cssProperty = [
@@ -827,11 +820,7 @@ ${constructCSS({ animation: "__un_qm 0.5s ease-in-out alternate infinite" })}`;
 ];
 
 const textDecorations = [
-  ["underline", { "text-decoration-line": "underline" }],
-  ["overline", { "text-decoration-line": "overline" }],
-  ["line-through", { "text-decoration-line": "line-through" }],
-  ["decoration-underline", { "text-decoration-line": "underline" }],
-  ["decoration-line-through", { "text-decoration-line": "line-through" }],
+  [/^(?:decoration-)?(underline|overline|line-through)$/, ([, s]) => ({ "text-decoration-line": s })],
   [/^(?:underline|decoration)-(?:size-)?(.+)$/, ([, s]) => ({ "text-decoration-thickness": handler.bracket.cssvar.px(s) })],
   [/^(?:underline|decoration)-(auto|from-font)$/, ([, s]) => ({ "text-decoration-thickness": s })],
   [/^(?:underline|decoration)-(.+)$/, (match, ctx) => {
@@ -854,7 +843,7 @@ const svgUtilities = [
   [/^fill-(.+)$/, colorResolver("fill", "fill")],
   [/^fill-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-fill-opacity": handler.bracket.percent(opacity) })],
   ["fill-none", { fill: "none" }],
-  [/^stroke-(?:width-|size-)?(.+)$/, ([, s]) => ({ "stroke-width": handler.bracket.fraction.px.number(s) })],
+  [/^stroke-(?:width-|size-)?(.+)$/, ([, s]) => ({ "stroke-width": handler.bracket.cssvar.fraction.px.number(s) })],
   [/^stroke-dash-(.+)$/, ([, s]) => ({ "stroke-dasharray": handler.bracket.cssvar.number(s) })],
   [/^stroke-offset-(.+)$/, ([, s]) => ({ "stroke-dashoffset": handler.bracket.cssvar.px.numberWithUnit(s) })],
   [/^stroke-(.+)$/, colorResolver("stroke", "stroke")],

package/dist/chunks/default3.cjs

@@ -37,12 +37,28 @@ const variantBreakpoints = (matcher, { theme }) => {
   }
 };
 
+const scopeMatcher = (strict, name, template) => {
+  const re = strict ? new RegExp(`^${name}(?:-\\[(.+?)\\])[:-]`) : new RegExp(`^${name}(?:-\\[(.+?)\\])?[:-]`);
+  return (matcher) => {
+    const match = matcher.match(re);
+    if (match) {
+      return {
+        matcher: matcher.slice(match[0].length),
+        selector: (s) => template.replace("&&-s", s).replace("&&-c", match[1] ?? "*")
+      };
+    }
+  };
+};
 const variantCombinators = [
-  variants$1.variantMatcher("all", (input) => `${input} *`),
-  variants$1.variantMatcher("children", (input) => `${input}>*`),
-  variants$1.variantMatcher("next", (input) => `${input}+*`),
-  variants$1.variantMatcher("sibling", (input) => `${input}+*`),
-  variants$1.variantMatcher("siblings", (input) => `${input}~*`),
+  scopeMatcher(false, "all", "&&-s &&-c"),
+  scopeMatcher(false, "children", "&&-s>&&-c"),
+  scopeMatcher(false, "next", "&&-s+&&-c"),
+  scopeMatcher(false, "sibling", "&&-s+&&-c"),
+  scopeMatcher(false, "siblings", "&&-s~&&-c"),
+  scopeMatcher(true, "group", "&&-c &&-s"),
+  scopeMatcher(true, "parent", "&&-c>&&-s"),
+  scopeMatcher(true, "previous", "&&-c+&&-s"),
+  scopeMatcher(true, "peer", "&&-c~&&-s"),
   variants$1.variantMatcher("svg", (input) => `${input} svg`)
 ];
 
@@ -74,6 +90,17 @@ const variantLanguageDirections = [
   variants$1.variantMatcher("ltr", (input) => `[dir="ltr"] $$ ${input}`)
 ];
 
+const variantLayer = {
+  match(matcher) {
+    const match = matcher.match(/layer-([\d\w]+)[:-]/);
+    if (match) {
+      return {
+        matcher: matcher.slice(match[0].length),
+        layer: match[1]
+      };
+    }
+  }
+};
 const variantImportant = {
   match(matcher) {
     if (matcher.startsWith("!")) {
@@ -180,7 +207,7 @@ const taggedPseudoClassMatcher = (tag, parent, combinator) => {
       if (match[2])
         pseudo = `:${match[2]}(${pseudo})`;
       return {
-        matcher: input.slice(match[1].length + tag.length + 2),
+        matcher: input.slice(match[0].length),
         selector: (s) => rawRe.test(s) ? s.replace(rawRe, `${parent}${pseudo}:`) : `${parent}${pseudo}${combinator}${s}`
       };
     }
@@ -191,7 +218,7 @@ const variantPseudoElements = (input) => {
   if (match) {
     const pseudo = PseudoElements[match[1]] || `::${match[1]}`;
     return {
-      matcher: input.slice(match[1].length + 1),
+      matcher: input.slice(match[0].length),
       selector: (s) => `${s}${pseudo}`
     };
   }
@@ -202,7 +229,7 @@ const variantPseudoClasses = {
     if (match) {
       const pseudo = PseudoClasses[match[1]] || `:${match[1]}`;
       return {
-        matcher: input.slice(match[1].length + 1),
+        matcher: input.slice(match[0].length),
         selector: (s) => `${s}${pseudo}`
       };
     }
@@ -216,7 +243,7 @@ const variantPseudoClassFunctions = {
       const fn = match[1];
       const pseudo = PseudoClasses[match[2]] || `:${match[2]}`;
       return {
-        matcher: input.slice(match[1].length + match[2].length + 2),
+        matcher: input.slice(match[0].length),
         selector: (s) => `${s}:${fn}(${pseudo})`
       };
     }
@@ -233,6 +260,14 @@ const variantTaggedPseudoClasses = (options = {}) => {
     {
       match: taggedPseudoClassMatcher("peer", attributify ? '[peer=""]' : ".peer", "~"),
       multiPass: true
+    },
+    {
+      match: taggedPseudoClassMatcher("parent", attributify ? '[parent=""]' : ".parent", ">"),
+      multiPass: true
+    },
+    {
+      match: taggedPseudoClassMatcher("previous", attributify ? '[previous=""]' : ".previous", "+"),
+      multiPass: true
     }
   ];
 };
@@ -251,6 +286,7 @@ const partClasses = {
 };
 
 const variants = (options) => [
+  variantLayer,
   variantNegative,
   variantImportant,
   variantPrint,
@@ -273,6 +309,7 @@ exports.variantColorsMediaOrClass = variantColorsMediaOrClass;
 exports.variantCombinators = variantCombinators;
 exports.variantImportant = variantImportant;
 exports.variantLanguageDirections = variantLanguageDirections;
+exports.variantLayer = variantLayer;
 exports.variantMotions = variantMotions;
 exports.variantNegative = variantNegative;
 exports.variantOrientations = variantOrientations;