@unocss/preset-mini 0.22.2 → 0.22.6

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.fraction.auto.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.fraction.auto.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" }]
@@ -120,7 +120,7 @@ function handlerBorder(m) {
   }
 }
 function handlerBorderSize([, a = "", b = "1"]) {
-  const v = utilities.handler.bracket.px(b);
+  const v = utilities.handler.bracket.cssvar.px(b);
   if (a in utilities.directionMap && v != null)
     return utilities.directionMap[a].map((i) => [`border${i}-width`, v]);
 }
@@ -135,7 +135,7 @@ function handlerBorderOpacity([, a = "", opacity]) {
     return utilities.directionMap[a].map((i) => [`--un-border${i}-opacity`, v]);
 }
 function handlerRounded([, a = "", s = "DEFAULT"], { theme }) {
-  const v = theme.borderRadius?.[s] || utilities.handler.auto.rem.fraction.bracket.cssvar(s);
+  const v = theme.borderRadius?.[s] || utilities.handler.bracket.cssvar.fraction.rem(s);
   if (a in utilities.cornerMap && v != null)
     return utilities.cornerMap[a].map((i) => [`border${i}-radius`, v]);
 }
@@ -145,7 +145,7 @@ const opacity = [
 ];
 const textColors = [
   [/^(?:text|color|c)-(.+)$/, utilities.colorResolver("color", "text")],
-  [/^(?:text|color|c)-op(?:acity)?-?(.+)$/, ([, opacity2]) => ({ "--un-text-opacity": utilities.handler.bracket.percent.cssvar(opacity2) })]
+  [/^(?:text|color|c)-op(?:acity)?-?(.+)$/, ([, opacity2]) => ({ "--un-text-opacity": utilities.handler.bracket.percent(opacity2) })]
 ];
 const bgColors = [
   [/^bg-(.+)$/, utilities.colorResolver("background-color", "bg")],
@@ -168,19 +168,14 @@ 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-)?delay-(.+)(?:s|ms)?$/, ([, d]) => ({ "transition-delay": utilities.handler.bracket.time(d) })],
-  [/^(?:transition-)?duration-(.+)(?:s|ms)?$/, ([, d]) => ({ "transition-duration": utilities.handler.bracket.time(d) })],
-  [/^ease-(.+)$/, ([, d]) => ({ "transition-timing-function": utilities.handler.bracket(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-)?duration-(.+)$/, ([, d]) => ({ "transition-duration": utilities.handler.bracket.cssvar.time(d) })],
+  [/^(?:transition-)?delay-(.+)$/, ([, d]) => ({ "transition-delay": utilities.handler.bracket.cssvar.time(d) })],
+  [/^(?: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" }],
@@ -200,7 +195,7 @@ const flex = [
   [/^(?:flex-)?shrink-0$/, () => ({ "flex-shrink": 0 })],
   [/^(?:flex-)?grow$/, () => ({ "flex-grow": 1 })],
   [/^(?:flex-)?grow-0$/, () => ({ "flex-grow": 0 })],
-  [/^(?:flex-)?basis-(.+)$/, ([, d]) => ({ "flex-basis": utilities.handler.bracket.fraction.auto.rem(d) })],
+  [/^(?:flex-)?basis-(.+)$/, ([, d]) => ({ "flex-basis": utilities.handler.bracket.cssvar.auto.fraction.rem(d) })],
   ["flex-row", { "flex-direction": "row" }],
   ["flex-row-reverse", { "flex-direction": "row-reverse" }],
   ["flex-col", { "flex-direction": "column" }],
@@ -227,7 +222,7 @@ const appearances = [
   ["backface-hidden", { "backface-visibility": "hidden" }]
 ];
 const cursors = [
-  [/^cursor-(.+)$/, ([, c]) => ({ cursor: c })]
+  [/^cursor-(.+)$/, ([, c]) => ({ cursor: utilities.handler.bracket.cssvar(c) || c })]
 ];
 const pointerEvents = [
   ["pointer-events-auto", { "pointer-events": "auto" }],
@@ -317,7 +312,7 @@ const boxShadows = [
     }
   }],
   [/^shadow-(.+)$/, utilities.colorResolver("--un-shadow-color", "shadow")],
-  [/^shadow-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-shadow-opacity": utilities.handler.bracket.percent.cssvar(opacity) })],
+  [/^shadow-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-shadow-opacity": utilities.handler.bracket.percent(opacity) })],
   ["shadow-inset", { "--un-shadow-inset": "inset" }]
 ];
 
@@ -343,17 +338,17 @@ const fonts = [
         "line-height": height
       };
     }
-    return { "font-size": utilities.handler.bracket.auto.rem(s) };
+    return { "font-size": utilities.handler.bracket.rem(s) };
   }],
-  [/^text-size-(.+)$/, ([, s]) => ({ "font-size": utilities.handler.bracket.auto.rem(s) })],
+  [/^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.auto.rem(s) })],
-  [/^tracking-([^-]+)$/, ([, s], { theme }) => ({ "letter-spacing": theme.letterSpacing?.[s] || utilities.handler.bracket.auto.rem(s) })],
-  [/^word-spacing-([^-]+)$/, ([, s], { theme }) => ({ "word-spacing": theme.wordSpacing?.[s] || utilities.handler.bracket.auto.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]) => {
-    const v = utilities.handler.bracket.global.number(s || "4");
+  [/^tab(?:-(.+))?$/, ([, s]) => {
+    const v = utilities.handler.bracket.cssvar.global.number(s || "4");
     if (v != null) {
       return {
         "-moz-tab-size": v,
@@ -364,7 +359,7 @@ const tabSizes = [
   }]
 ];
 const textIndents = [
-  [/^indent(?:-(.+))?$/, ([, s], { theme }) => ({ "text-indent": theme.textIndent?.[s || "DEFAULT"] || utilities.handler.bracket.cssvar.fraction.auto.rem(s) })]
+  [/^indent(?:-(.+))?$/, ([, s], { theme }) => ({ "text-indent": theme.textIndent?.[s || "DEFAULT"] || utilities.handler.bracket.cssvar.fraction.rem(s) })]
 ];
 const textStrokes = [
   [/^text-stroke(?:-(.+))?$/, ([, s], { theme }) => ({ "-webkit-text-stroke-width": theme.textStrokeWidth?.[s || "DEFAULT"] || utilities.handler.bracket.cssvar.px(s) })],
@@ -392,7 +387,7 @@ const directions = {
   "y": "row-"
 };
 const handleGap = ([, d = "", s]) => {
-  const v = utilities.handler.bracket.auto.rem(s);
+  const v = utilities.handler.bracket.cssvar.rem(s);
   if (v != null) {
     return {
       [`grid-${directions[d]}gap`]: v,
@@ -418,12 +413,12 @@ const autoDirection = (selector, theme) => {
     case "fr":
       return "minmax(0,1fr)";
   }
-  return utilities.handler.bracket.auto.rem(selector);
+  return utilities.handler.bracket.cssvar.auto.rem(selector);
 };
 const grids = [
   ["grid", { display: "grid" }],
   ["inline-grid", { display: "inline-grid" }],
-  [/^(?:grid-)?(row|col)-(.+)$/, ([, c, v]) => ({ [`grid-${rowCol(c)}`]: utilities.handler.bracket.auto(v) })],
+  [/^(?:grid-)?(row|col)-(.+)$/, ([, c, v]) => ({ [`grid-${rowCol(c)}`]: utilities.handler.bracket.cssvar.auto(v) })],
   [/^(?:grid-)?(row|col)-span-(.+)$/, ([, c, s]) => {
     if (s === "full")
       return { [`grid-${rowCol(c)}`]: "1/-1" };
@@ -431,11 +426,12 @@ const grids = [
     if (v != null)
       return { [`grid-${rowCol(c)}`]: `span ${v}/span ${v}` };
   }],
-  [/^(?:grid-)?(row|col)-start-([\w.-]+)$/, ([, c, v]) => ({ [`grid-${rowCol(c)}-start`]: v })],
-  [/^(?:grid-)?(row|col)-end-([\w.-]+)$/, ([, c, v]) => ({ [`grid-${rowCol(c)}-end`]: v })],
-  [/^(?:grid-)?auto-(rows|cols)-([\w.-]+)$/, ([, c, v], { theme }) => ({ [`grid-auto-${rowCol(c)}`]: autoDirection(v, theme) })],
+  [/^(?:grid-)?(row|col)-start-(.+)$/, ([, c, v]) => ({ [`grid-${rowCol(c)}-start`]: utilities.handler.bracket.cssvar(v) ?? v })],
+  [/^(?:grid-)?(row|col)-end-(.+)$/, ([, c, v]) => ({ [`grid-${rowCol(c)}-end`]: utilities.handler.bracket.cssvar(v) ?? v })],
+  [/^(?:grid-)?auto-(rows|cols)-(.+)$/, ([, c, v], { theme }) => ({ [`grid-auto-${rowCol(c)}`]: autoDirection(v, theme) })],
+  [/^(?:grid-auto-flow|auto-flow|grid-flow)-(.+)$/, ([, v]) => ({ "grid-auto-flow": utilities.handler.bracket.cssvar(v) })],
   [/^(?:grid-auto-flow|auto-flow|grid-flow)-((?:row|col)(?:-dense)?)$/, ([, v]) => ({ "grid-auto-flow": rowCol(v).replace("-", " ") })],
-  [/^grid-(rows|cols)-(\[.+\])$/, ([, c, v]) => ({ [`grid-template-${rowCol(c)}`]: utilities.handler.bracket(v) })],
+  [/^grid-(rows|cols)-(.+)$/, ([, c, v]) => ({ [`grid-template-${rowCol(c)}`]: utilities.handler.bracket.cssvar(v) })],
   [/^grid-(rows|cols)-minmax-([\w.-]+)$/, ([, c, d]) => ({ [`grid-template-${rowCol(c)}`]: `repeat(auto-fill,minmax(${d},1fr))` })],
   [/^grid-(rows|cols)-(\d+)$/, ([, c, d]) => ({ [`grid-template-${rowCol(c)}`]: `repeat(${d},minmax(0,1fr))` })],
   ["grid-rows-none", { "grid-template-rows": "none" }],
@@ -476,7 +472,7 @@ const justifies = [
   ["justify-self-stretch", { "justify-self": "stretch" }]
 ];
 const orders = [
-  [/^order-(.+)$/, ([, v]) => ({ order: utilities.handler.bracket.number(v) })],
+  [/^order-(.+)$/, ([, v]) => ({ order: utilities.handler.bracket.cssvar.number(v) })],
   ["order-first", { order: "-9999" }],
   ["order-last", { order: "9999" }],
   ["order-none", { order: "0" }]
@@ -519,7 +515,7 @@ const placements = [
   ["place-self-stretch", { "place-self": "stretch" }]
 ];
 function handleInsetValue(v) {
-  return utilities.handler.bracket.fraction.cssvar.auto.rem(v);
+  return utilities.handler.bracket.cssvar.auto.fraction.rem(v);
 }
 function handleInsetValues([, d, v]) {
   const r = handleInsetValue(v);
@@ -544,8 +540,8 @@ const floats = [
   ["clear-none", { clear: "none" }]
 ];
 const zIndexes = [
-  ["z-auto", { "z-index": "auto" }],
-  [/^z-([^-]+)$/, ([, v]) => ({ "z-index": utilities.handler.number(v) })]
+  [/^z-(.+)$/, ([, v]) => ({ "z-index": utilities.handler.bracket.cssvar.number(v) })],
+  ["z-auto", { "z-index": "auto" }]
 ];
 const boxSizing = [
   ["box-border", { "box-sizing": "border-box" }],
@@ -553,11 +549,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]) => {
@@ -566,15 +563,17 @@ 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-(.+)$/, ([, d]) => ({ "--un-ring-offset-width": utilities.handler.px(d || "1") })],
+  [/^ring-offset-(?:width-|size-)?(.+)$/, ([, d]) => ({ "--un-ring-offset-width": utilities.handler.bracket.cssvar.px(d) })],
   [/^ring-(.+)$/, utilities.colorResolver("--un-ring-color", "ring")],
   [/^ring-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-ring-opacity": utilities.handler.bracket.percent(opacity) })],
   [/^ring-offset-(.+)$/, utilities.colorResolver("--un-ring-offset-color", "ring-offset")],
@@ -602,7 +601,7 @@ function getSizeValue(minmax, hw, theme, prop) {
     case "min":
       return `${prop}-content`;
   }
-  return utilities.handler.bracket.cssvar.fraction.auto.rem(prop);
+  return utilities.handler.bracket.cssvar.auto.fraction.rem(prop);
 }
 const sizes = [
   [/^(min-|max-)?([wh])-(.+)$/, ([, m, w, s], { theme }) => ({ [getPropName(m, w)]: getSizeValue(m, w, theme, s) })],
@@ -628,14 +627,14 @@ const paddings = [
   [/^pa?()-?(-?.+)$/, utilities.directionSize("padding")],
   [/^p-?([xy])-?(-?.+)$/, utilities.directionSize("padding")],
   [/^p-?([rltbse])-?(-?.+)$/, utilities.directionSize("padding")],
-  [/^p-(inline|block)-(-?.+)$/, utilities.directionSize("padding")],
+  [/^p-(block|inline)-(-?.+)$/, utilities.directionSize("padding")],
   [/^p-?([bi][se])-?(-?.+)$/, utilities.directionSize("padding")]
 ];
 const margins = [
   [/^ma?()-?(-?.+)$/, utilities.directionSize("margin")],
   [/^m-?([xy])-?(-?.+)$/, utilities.directionSize("margin")],
   [/^m-?([rltbse])-?(-?.+)$/, utilities.directionSize("margin")],
-  [/^m-(inline|block)-(-?.+)$/, utilities.directionSize("margin")],
+  [/^m-(block|inline)-(-?.+)$/, utilities.directionSize("margin")],
   [/^m-?([bi][se])-?(-?.+)$/, utilities.directionSize("margin")]
 ];
 
@@ -686,9 +685,9 @@ const transformBase = {
   [core.CONTROL_SHORTCUT_NO_MERGE]: ""
 };
 const transforms = [
-  [/^origin-([-\w]{3,})$/, ([, s]) => ({ "transform-origin": utilities.positionMap[s] })],
-  [/^perspect-(.+)$/, ([, s]) => {
-    const v = utilities.handler.px.numberWithUnit(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 {
         "-webkit-perspective": v,
@@ -696,8 +695,8 @@ const transforms = [
       };
     }
   }],
-  [/^perspect-origin-(.+)$/, ([, s]) => {
-    const v = utilities.handler.bracket(s) ?? (s.length >= 3 ? utilities.positionMap[s] : void 0);
+  [/^(?:transform-)?perspect(?:ive)?-origin-(.+)$/, ([, s]) => {
+    const v = utilities.handler.bracket.cssvar(s) ?? (s.length >= 3 ? utilities.positionMap[s] : void 0);
     if (v != null) {
       return {
         "-webkit-perspective-origin": v,
@@ -705,16 +704,15 @@ const transforms = [
       };
     }
   }],
-  [/^translate-()(.+)$/, handleTranslate],
-  [/^translate-([xyz])-(.+)$/, handleTranslate],
-  [/^rotate-()(.+)$/, handleRotate],
-  [/^rotate(-[xyz])-(.+)$/, handleRotate],
-  [/^skew-()(.+)$/, handleSkew],
-  [/^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)" }
@@ -724,7 +722,7 @@ const transforms = [
   ["transform-none", { transform: "none" }]
 ];
 function handleTranslate([, d, b]) {
-  const v = utilities.handler.bracket.fraction.auto.rem(b);
+  const v = utilities.handler.bracket.cssvar.fraction.rem(b);
   if (v != null) {
     return [
       transformBase,
@@ -736,7 +734,7 @@ function handleTranslate([, d, b]) {
   }
 }
 function handleScale([, d, b]) {
-  const v = utilities.handler.bracket.fraction.percent(b);
+  const v = utilities.handler.bracket.cssvar.fraction.percent(b);
   if (v != null) {
     return [
       transformBase,
@@ -747,20 +745,34 @@ function handleScale([, d, b]) {
     ];
   }
 }
-function handleRotate([, d, b]) {
-  const v = utilities.handler.bracket.degree(b);
+function handleRotate([, d = "", b]) {
+  const v = utilities.handler.bracket.cssvar.degree(b);
   if (v != null) {
-    return [
-      transformBase,
-      {
-        [`--un-rotate${d || ""}`]: v,
-        transform: "var(--un-transform)"
-      }
-    ];
+    if (d) {
+      return [
+        transformBase,
+        {
+          "--un-rotate": 0,
+          [`--un-rotate-${d}`]: v,
+          "transform": "var(--un-transform)"
+        }
+      ];
+    } else {
+      return [
+        transformBase,
+        {
+          "--un-rotate-x": 0,
+          "--un-rotate-y": 0,
+          "--un-rotate-z": 0,
+          "--un-rotate": v,
+          "transform": "var(--un-transform)"
+        }
+      ];
+    }
   }
 }
 function handleSkew([, d, b]) {
-  const v = utilities.handler.bracket.degree(b);
+  const v = utilities.handler.bracket.cssvar.degree(b);
   if (v != null) {
     return [
       transformBase,
@@ -773,38 +785,30 @@ function handleSkew([, d, b]) {
 }
 
 const variablesAbbrMap = {
-  "visible": "visibility",
-  "select": "user-select",
-  "vertical": "vertical-align",
-  "backface": "backface-visibility",
-  "whitespace": "white-space",
-  "break": "word-break",
-  "case": "text-transform",
-  "origin": "transform-origin",
-  "bg-opacity": "background-opacity",
-  "tab": "tab-size",
-  "underline": "text-decoration-thickness",
-  "underline-offset": "text-underline-offset",
-  "grid-cols": "grid-template-columns",
-  "grid-rows": "grid-template-rows",
-  "auto-flow": "grid-auto-flow",
-  "row-start": "grid-row-start",
-  "row-end": "grid-row-end",
-  "justify": "justify-content",
-  "content": "align-content",
-  "items": "align-items",
-  "self": "align-self",
-  "object": "object-fit"
+  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]) => {
+  [/^(.+?)-(\$.+)$/, ([, name, varname]) => {
     const prop = variablesAbbrMap[name];
     if (prop)
-      return { [prop]: `var(--${varname})` };
+      return { [prop]: utilities.handler.cssvar(varname) };
   }]
 ];
 const cssProperty = [
-  [/^\[(.+):(.+)\]$/, ([, prop, value]) => ({ [prop]: utilities.handler.bracket(`[${value}]`) })]
+  [/^\[([^:]+):(.+)\]$/, ([, prop, value]) => ({ [prop]: utilities.handler.bracket(`[${value}]`) })]
 ];
 
 const questionMark = [
@@ -824,7 +828,7 @@ const textDecorations = [
   ["line-through", { "text-decoration-line": "line-through" }],
   ["decoration-underline", { "text-decoration-line": "underline" }],
   ["decoration-line-through", { "text-decoration-line": "line-through" }],
-  [/^(?:underline|decoration)-(?:size-)?(.+)$/, ([, s]) => ({ "text-decoration-thickness": utilities.handler.bracket.px(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) => {
     const result = utilities.colorResolver("text-decoration-color", "line")(match, ctx);
@@ -836,7 +840,7 @@ const textDecorations = [
     }
   }],
   [/^(?:underline|decoration)-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-line-opacity": utilities.handler.bracket.percent(opacity) })],
-  [/^underline-offset-(.+)$/, ([, s]) => ({ "text-underline-offset": utilities.handler.auto.bracket.px(s) })],
+  [/^(?:underline|decoration)-offset-(.+)$/, ([, s]) => ({ "text-underline-offset": utilities.handler.auto.bracket.cssvar.px(s) })],
   [/^(?:underline|decoration)-(solid|double|dotted|dashed|wavy|inherit|initial|revert|unset)$/, ([, d]) => ({ "text-decoration-style": d })],
   ["no-underline", { "text-decoration": "none" }],
   ["decoration-none", { "text-decoration": "none" }]
@@ -846,9 +850,9 @@ 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-dash-(.+)$/, ([, s]) => ({ "stroke-dasharray": utilities.handler.bracket.number(s) })],
-  [/^stroke-offset-(.+)$/, ([, s]) => ({ "stroke-dashoffset": utilities.handler.bracket.px.numberWithUnit(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")],
   [/^stroke-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-stroke-opacity": utilities.handler.bracket.percent(opacity) })],
   ["stroke-cap-square", { "stroke-linecap": "square" }],