@unocss/preset-mini 0.15.6 → 0.16.3

package/dist/chunks/default2.cjs

@@ -80,22 +80,6 @@ const textColors = [
   [/^(?:text|color|c)-(.+)$/, colorResolver$1("color", "text")],
   [/^(?:text|color|c)-op(?:acity)?-?(.+)$/m, ([, opacity2]) => ({ "--un-text-opacity": index.handler.bracket.percent.cssvar(opacity2) })]
 ];
-const textDecorationColors = [
-  [/^underline-(.+)$/, (match, ctx) => {
-    const result = colorResolver$1("text-decoration-color", "line")(match, ctx);
-    if (result) {
-      return {
-        "-webkit-text-decoration-color": result["text-decoration-color"],
-        ...result
-      };
-    }
-  }],
-  [/^underline-op(?:acity)?-?(.+)$/m, ([, opacity2]) => ({ "--un-line-opacity": index.handler.bracket.percent(opacity2) })]
-];
-const textStrokeColors = [
-  [/^text-stroke-(.+)$/, colorResolver$1("-webkit-text-stroke-color", "text-stroke")],
-  [/^text-stroke-op(?:acity)?-?(.+)$/m, ([, opacity2]) => ({ "--un-text-stroke-opacity": index.handler.bracket.percent(opacity2) })]
-];
 const bgColors = [
   [/^bg-(.+)$/, colorResolver$1("background-color", "bg")],
   [/^bg-op(?:acity)?-?(.+)$/m, ([, opacity2]) => ({ "--un-bg-opacity": index.handler.bracket.percent(opacity2) })]
@@ -180,39 +164,53 @@ const placeholder = [
   ]
 ];
 
-const borderSizes = [
+const borders = [
   [/^border$/, handlerBorder],
-  [/^(?:border|b)(?:-([^-]+))?$/, handlerBorder],
-  [/^(?:border|b)(?:-([^-]+))?(?:-([^-]+))?$/, handlerBorder]
-];
-const borderRadius = [
-  [/^(?:border-)?(?:rounded|rd)$/, handlerRounded],
-  [/^(?:border-)?(?:rounded|rd)(?:-([^-]+))?$/, handlerRounded],
-  [/^(?:border-)?(?:rounded|rd)(?:-([^-]+))?(?:-([^-]+))?$/, handlerRounded]
-];
-const borderStyles = [
+  [/^(?:border|b)()-(.+)$/, handlerBorder],
+  [/^(?:border|b)-([^-]+)(?:-(.+))?$/, handlerBorder],
+  [/^(?:border|b)()-size-(.+)$/, handlerBorderSize],
+  [/^(?:border|b)-([^-]+)-size-(.+)$/, handlerBorderSize],
+  [/^(?:border|b)()-(.+)$/, handlerBorderColor],
+  [/^(?:border|b)-([^-]+)(?:-(.+))?$/, handlerBorderColor],
+  [/^(?:border|b)-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-border-opacity": index.handler.bracket.percent(opacity) })],
   ["border-solid", { "border-style": "solid" }],
   ["border-dashed", { "border-style": "dashed" }],
   ["border-dotted", { "border-style": "dotted" }],
   ["border-double", { "border-style": "double" }],
-  ["border-none", { "border-style": "none" }]
+  ["border-none", { "border-style": "none" }],
+  [/^(?:border-)?(?:rounded|rd)$/, handlerRounded],
+  [/^(?:border-)?(?:rounded|rd)(?:-([^-]+))?$/, handlerRounded],
+  [/^(?:border-)?(?:rounded|rd)(?:-([^-]+))?(?:-([^-]+))?$/, handlerRounded]
 ];
-const borders = [
-  borderSizes,
-  borderColors,
-  borderStyles,
-  borderRadius
-].flat(1);
-function handlerBorder([, a, b]) {
+function handlerBorder(m) {
+  const borderSizes = handlerBorderSize(m);
+  if (borderSizes) {
+    return [
+      ...borderSizes,
+      ["border-style", "solid"]
+    ];
+  }
+}
+function handlerBorderSize([, a, b]) {
   const [d, s = "1"] = index.directionMap[a] ? [a, b] : ["", a];
   const v = index.handler.bracket.px(s);
   if (v != null) {
     return [
-      ...index.directionMap[d].map((i) => [`border${i}-width`, v]),
-      ["border-style", "solid"]
+      ...index.directionMap[d].map((i) => [`border${i}-width`, v])
     ];
   }
 }
+function handlerBorderColor([, a, c], ctx) {
+  if (c !== void 0) {
+    const ofColor = colorResolver$1("border-color", "border")(["", c], ctx);
+    if (ofColor) {
+      const borders2 = index.directionMap[index.directionMap[a] ? a : ""].map((i) => colorResolver$1(`border${i}-color`, "border")(["", c], ctx));
+      const borderObject = {};
+      Object.assign(borderObject, ...borders2);
+      return borderObject;
+    }
+  }
+}
 function handlerRounded([, a, b], { theme }) {
   const [d, s = "DEFAULT"] = index.cornerMap[a] ? [a, b] : ["", a];
   const v = theme.borderRadius?.[s] || index.handler.bracket.fraction.rem(s);
@@ -311,37 +309,27 @@ const transitions = [
 ];
 
 const flex = [
-  ["flex-col", { "flex-direction": "column" }],
-  ["flex-col-reverse", { "flex-direction": "column-reverse" }],
-  ["flex-row", { "flex-direction": "row" }],
-  ["flex-row-reverse", { "flex-direction": "row-reverse" }],
-  ["flex-wrap", { "flex-wrap": "wrap" }],
-  ["flex-wrap-reverse", { "flex-wrap": "wrap-reverse" }],
-  ["flex-nowrap", { "flex-wrap": "nowrap" }],
+  ["flex", { display: "flex" }],
+  ["inline-flex", { display: "inline-flex" }],
+  ["flex-inline", { display: "inline-flex" }],
   ["flex-1", { flex: "1 1 0%" }],
   ["flex-auto", { flex: "1 1 auto" }],
   ["flex-initial", { flex: "0 1 auto" }],
   ["flex-none", { flex: "none" }],
   [/^flex-\[(.+)\]$/, ([, d]) => ({ flex: d })],
-  ["flex-grow", { "flex-grow": 1 }],
-  ["flex-grow-0", { "flex-grow": 0 }],
   ["flex-shrink", { "flex-shrink": 1 }],
   ["flex-shrink-0", { "flex-shrink": 0 }],
-  ["flex", { display: "flex" }],
-  ["inline-flex", { display: "inline-flex" }],
-  ["flex-inline", { display: "inline-flex" }]
+  ["flex-grow", { "flex-grow": 1 }],
+  ["flex-grow-0", { "flex-grow": 0 }],
+  ["flex-row", { "flex-direction": "row" }],
+  ["flex-row-reverse", { "flex-direction": "row-reverse" }],
+  ["flex-col", { "flex-direction": "column" }],
+  ["flex-col-reverse", { "flex-direction": "column-reverse" }],
+  ["flex-wrap", { "flex-wrap": "wrap" }],
+  ["flex-wrap-reverse", { "flex-wrap": "wrap-reverse" }],
+  ["flex-nowrap", { "flex-wrap": "nowrap" }]
 ];
 
-const fontsFamilies = [
-  [/^font-(\w+)$/, ([, d], { theme }) => {
-    const font = theme.fontFamily?.[d];
-    if (font) {
-      return {
-        "font-family": font
-      };
-    }
-  }]
-];
 const weightMap = {
   thin: "100",
   extralight: "200",
@@ -353,7 +341,15 @@ const weightMap = {
   extrabold: "800",
   black: "900"
 };
-const fontSizes = [
+const fonts = [
+  [/^font-(\w+)$/, ([, d], { theme }) => {
+    const font = theme.fontFamily?.[d];
+    if (font) {
+      return {
+        "font-family": font
+      };
+    }
+  }],
   [/^text-(.+)$/, ([, s = "base"], { theme }) => {
     const size = index.handler.bracket.rem(s);
     if (size)
@@ -371,30 +367,22 @@ const fontSizes = [
     const raw = index.handler.bracket.rem(s);
     if (raw)
       return { "font-size": raw };
-  }]
-];
-const fontWeights = [
+  }],
   [/^(?:font|fw)-?([^-]+)$/, ([, s]) => {
     const v = weightMap[s] || index.handler.number(s);
     if (v)
       return { "font-weight": v };
-  }]
-];
-const leadings = [
+  }],
   [/^(?:leading|lh)-([^-]+)$/, ([, s], { theme }) => {
     const v = theme.lineHeight?.[s] || index.handler.bracket.rem(s);
     if (v !== null)
       return { "line-height": v };
-  }]
-];
-const trackings = [
+  }],
   [/^tracking-([^-]+)$/, ([, s], { theme }) => {
     const v = theme.letterSpacing?.[s] || index.handler.bracket.rem(s);
     if (v !== null)
       return { "letter-spacing": v };
-  }]
-];
-const wordSpacings = [
+  }],
   [/^word-spacing-([^-]+)$/, ([, s], { theme }) => {
     const v = theme.wordSpacing?.[s] || index.handler.bracket.rem(s);
     if (v !== null)
@@ -414,20 +402,6 @@ const tabSizes = [
     }
   }]
 ];
-const textDecorationLengths = [
-  [/^underline-([^-]+)$/, ([, s]) => {
-    const v = s === "auto" ? s : index.handler.bracket.px(s);
-    if (v != null)
-      return { "text-decoration-thickness": v };
-  }]
-];
-const textDecorationOffsets = [
-  [/^underline-offset-([^-]+)$/, ([, s]) => {
-    const v = s === "auto" ? s : index.handler.bracket.px(s);
-    if (v != null)
-      return { "text-underline-offset": v };
-  }]
-];
 const textIndents = [
   [/^indent(?:-(.+))?$/, ([, s], { theme }) => {
     const v = theme.textIndent?.[s || "DEFAULT"] || index.handler.bracket.cssvar.fraction.rem(s);
@@ -435,12 +409,14 @@ const textIndents = [
       return { "text-indent": v };
   }]
 ];
-const textStrokeWidths = [
+const textStrokes = [
   [/^text-stroke(?:-(.+))?$/, ([, s], { theme }) => {
     const v = theme.textStrokeWidth?.[s || "DEFAULT"] || index.handler.bracket.cssvar.px(s);
     if (v != null)
       return { "-webkit-text-stroke-width": v };
-  }]
+  }],
+  [/^text-stroke-(.+)$/, colorResolver$1("-webkit-text-stroke-color", "text-stroke")],
+  [/^text-stroke-op(?:acity)?-?(.+)$/m, ([, opacity]) => ({ "--un-text-stroke-opacity": index.handler.bracket.percent(opacity) })]
 ];
 const textShadows = [
   [/^text-shadow(?:-(.+))?$/, ([, s], { theme }) => {
@@ -449,11 +425,6 @@ const textShadows = [
       return { "text-shadow": v };
   }]
 ];
-const fonts = [
-  fontsFamilies,
-  fontSizes,
-  fontWeights
-].flat(1);
 
 const gaps = [
   [/^(?:flex-|grid-)?gap-([^-]+)$/, ([, s]) => {
@@ -498,12 +469,10 @@ const autoDirection = (selector, theme) => {
 const grids = [
   ["grid", { display: "grid" }],
   ["inline-grid", { display: "inline-grid" }],
-  [/^grid-cols-minmax-([\w.-]+)$/, ([, d]) => ({ "grid-template-columns": `repeat(auto-fill, minmax(${d}, 1fr))` })],
-  [/^grid-rows-minmax-([\w.-]+)$/, ([, d]) => ({ "grid-template-rows": `repeat(auto-fill, minmax(${d}, 1fr))` })],
-  [/^grid-cols-(\d+)$/, ([, d]) => ({ "grid-template-columns": `repeat(${d},minmax(0,1fr))` })],
-  [/^grid-rows-(\d+)$/, ([, d]) => ({ "grid-template-rows": `repeat(${d},minmax(0,1fr))` })],
-  [/^grid-cols-\[(.+)\]$/, ([, v]) => ({ "grid-template-columns": v.replace(/,/g, " ") })],
-  [/^grid-rows-\[(.+)\]$/, ([, v]) => ({ "grid-template-rows": v.replace(/,/g, " ") })],
+  [/^(?:grid-)?col-start-([\w.-]+)$/, ([, v]) => ({ "grid-column-start": `${v}` })],
+  [/^(?:grid-)?col-end-([\w.]+)$/, ([, v]) => ({ "grid-column-end": `${v}` })],
+  [/^(?:grid-)?row-start-([\w.-]+)$/, ([, v]) => ({ "grid-row-start": `${v}` })],
+  [/^(?:grid-)?row-end-([\w.-]+)$/, ([, v]) => ({ "grid-row-end": `${v}` })],
   [/^(?:grid-)?(row|col)-(.+)$/, ([, d, v]) => {
     const key = d === "row" ? "grid-row" : "grid-column";
     let raw = index.handler.bracket(v);
@@ -520,13 +489,15 @@ const grids = [
         return { [key]: `span ${raw}/span ${raw}` };
     }
   }],
+  [/^(?:grid-)?auto-cols-([\w.-]+)$/, ([, v], { theme }) => ({ "grid-auto-columns": `${autoDirection(v, theme)}` })],
   [/^(?:grid-)?auto-flow-([\w.-]+)$/, ([, v]) => ({ "grid-auto-flow": `${v.replace("col", "column").split("-").join(" ")}` })],
-  [/^(?:grid-)?row-start-([\w.-]+)$/, ([, v]) => ({ "grid-row-start": `${v}` })],
-  [/^(?:grid-)?row-end-([\w.-]+)$/, ([, v]) => ({ "grid-row-end": `${v}` })],
-  [/^(?:grid-)?col-start-([\w.-]+)$/, ([, v]) => ({ "grid-column-start": `${v}` })],
-  [/^(?:grid-)?col-end-([\w.]+)$/, ([, v]) => ({ "grid-column-end": `${v}` })],
   [/^(?:grid-)?auto-rows-([\w.-]+)$/, ([, v], { theme }) => ({ "grid-auto-rows": `${autoDirection(v, theme)}` })],
-  [/^(?:grid-)?auto-cols-([\w.-]+)$/, ([, v], { theme }) => ({ "grid-auto-columns": `${autoDirection(v, theme)}` })]
+  [/^grid-cols-minmax-([\w.-]+)$/, ([, d]) => ({ "grid-template-columns": `repeat(auto-fill, minmax(${d}, 1fr))` })],
+  [/^grid-rows-minmax-([\w.-]+)$/, ([, d]) => ({ "grid-template-rows": `repeat(auto-fill, minmax(${d}, 1fr))` })],
+  [/^grid-cols-(\d+)$/, ([, d]) => ({ "grid-template-columns": `repeat(${d},minmax(0,1fr))` })],
+  [/^grid-rows-(\d+)$/, ([, d]) => ({ "grid-template-rows": `repeat(${d},minmax(0,1fr))` })],
+  [/^grid-cols-\[(.+)\]$/, ([, v]) => ({ "grid-template-columns": v.replace(/,/g, " ") })],
+  [/^grid-rows-\[(.+)\]$/, ([, v]) => ({ "grid-template-rows": v.replace(/,/g, " ") })]
 ];
 
 const overflowValues = [
@@ -540,6 +511,7 @@ const overflows = [
   [/^(?:overflow|of)-([xy])-(.+)$/, ([, d, v]) => overflowValues.includes(v) ? { [`overflow-${d}`]: v } : void 0]
 ];
 
+const basicSet = ["auto", "start", "end", "center", "stretch"];
 const positions = [
   ["relative", { position: "relative" }],
   ["absolute", { position: "absolute" }],
@@ -553,47 +525,42 @@ const justifies = [
   ["justify-center", { "justify-content": "center" }],
   ["justify-between", { "justify-content": "space-between" }],
   ["justify-around", { "justify-content": "space-around" }],
-  ["justify-evenly", { "justify-content": "space-evenly" }]
+  ["justify-evenly", { "justify-content": "space-evenly" }],
+  ...basicSet.map((i) => [`justify-items-${i}`, { "justify-items": i }]),
+  ...basicSet.map((i) => [`justify-self-${i}`, { "justify-self": i }])
 ];
 const orders = [
   [/^order-(.+)$/, ([, v]) => ({ order: { first: "-9999", last: "9999", none: "0" }[v] || index.handler.bracket.number(v) })]
 ];
-const basicSet = ["auto", "start", "end", "center", "stretch"];
-const justifyItems = basicSet.map((i) => [`justify-items-${i}`, { "justify-items": i }]);
-const justifySelfs = basicSet.map((i) => [`justify-self-${i}`, { "justify-self": i }]);
-const alignContents = [
+const alignments = [
   ["content-start", { "align-content": "flex-start" }],
   ["content-end", { "align-content": "flex-end" }],
   ["content-center", { "align-content": "center" }],
   ["content-between", { "align-content": "space-between" }],
   ["content-around", { "align-content": "space-around" }],
-  ["content-evenly", { "align-content": "space-evenly" }]
-];
-const alignItems = [
+  ["content-evenly", { "align-content": "space-evenly" }],
   ["items-start", { "align-items": "flex-start" }],
   ["items-end", { "align-items": "flex-end" }],
   ["items-center", { "align-items": "center" }],
   ["items-baseline", { "align-items": "baseline" }],
-  ["items-stretch", { "align-items": "stretch" }]
-];
-const alignSelfs = [
+  ["items-stretch", { "align-items": "stretch" }],
   ["self-auto", { "align-self": "auto" }],
   ["self-start", { "align-self": "flex-start" }],
   ["self-end", { "align-self": "flex-end" }],
   ["self-center", { "align-self": "center" }],
   ["self-stretch", { "align-items": "stretch" }]
 ];
-const placeContents = [
+const placements = [
   ["place-content-start", { "place-content": "start" }],
   ["place-content-end", { "place-content": "end" }],
   ["place-content-center", { "place-content": "center" }],
   ["place-content-between", { "place-content": "space-between" }],
   ["place-content-around", { "place-content": "space-around" }],
   ["place-content-evenly", { "place-content": "space-evenly" }],
-  ["place-content-stretch", { "place-content": "stretch" }]
+  ["place-content-stretch", { "place-content": "stretch" }],
+  ...basicSet.map((i) => [`place-items-${i}`, { "place-items": i }]),
+  ...basicSet.map((i) => [`place-self-${i}`, { "place-self": i }])
 ];
-const placeItems = basicSet.map((i) => [`place-items-${i}`, { "place-items": i }]);
-const placeSelfs = basicSet.map((i) => [`place-self-${i}`, { "place-self": i }]);
 function handleInsetValue(v) {
   return { auto: "auto", full: "100%" }[v] ?? index.handler.bracket.fraction.cssvar.rem(v);
 }
@@ -784,17 +751,6 @@ const textTransforms = [
   ["case-capital", { "text-transform": "capitalize" }],
   ["case-normal", { "text-transform": "none" }]
 ];
-const textDecorations = [
-  ["underline", { "text-decoration": "underline" }],
-  ["line-through", { "text-decoration": "line-through" }],
-  ["no-underline", { "text-decoration": "none" }]
-];
-const textDecorationStyles = [
-  ["underline-solid", { "text-decoration-style": "solid" }],
-  ["underline-double", { "text-decoration-style": "double" }],
-  ["underline-dotted", { "text-decoration-style": "dotted" }],
-  ["underline-dashed", { "text-decoration-style": "dashed" }]
-];
 const fontStyles = [
   ["italic", { "font-style": "italic" }],
   ["not-italic", { "font-style": "normal" }]
@@ -892,19 +848,12 @@ const variablesAbbrMap = {
   "backface": "backface-visibility",
   "whitespace": "white-space",
   "break": "word-break",
+  "b": "border-color",
+  "border": "border-color",
   "color": "color",
   "case": "text-transform",
-  "write": "writing-mode",
-  "write-orient": "text-orientation",
   "origin": "transform-origin",
   "bg": "background-color",
-  "bg-blend": "background-blend-mode",
-  "bg-clip": "-webkit-background-clip",
-  "bg-gradient": "linear-gradient",
-  "bg-origin-border": "background-origin",
-  "bg-position": "background-position",
-  "bg-repeat": "background-repeat",
-  "bg-size": "background-size",
   "bg-opacity": "background-opacity",
   "tab": "tab-size",
   "underline": "text-decoration-thickness",
@@ -919,33 +868,61 @@ const variablesAbbrMap = {
   "content": "align-content",
   "items": "align-items",
   "self": "align-self",
-  "object": "object-fit",
-  "mix-blend": "mix-blend-mode",
-  "animate-speed": "animation-speed"
+  "object": "object-fit"
 };
-const cssVariables = [[
-  /^(.+)-\$(.+)$/,
-  ([, name, varname]) => {
+const cssVariables = [
+  [/^(.+)-\$(.+)$/, ([, name, varname]) => {
     const prop = variablesAbbrMap[name];
     if (prop) {
       return {
         [prop]: `var(--${varname})`
       };
     }
-  }
-]];
+  }],
+  [/^(?:border|b)-([^-]+)-\$(.+)$/, ([, a, v]) => {
+    if (a in index.directionMap)
+      return index.directionMap[a].map((i) => [`border${i}-color`, `var(--${v})`]);
+  }]
+];
 
 const questionMark = [
   [
     /^(where|\?)$/,
     (_, { constructCSS, generator }) => {
-      if (generator.config.envMode === "dev")
+      if (generator.userConfig.envMode === "dev")
         return `@keyframes __un_qm{0%{box-shadow:inset 4px 4px #ff1e90, inset -4px -4px #ff1e90}100%{box-shadow:inset 8px 8px #3399ff, inset -8px -8px #3399ff}}
 ${constructCSS({ animation: "__un_qm 0.5s ease-in-out alternate infinite" })}`;
     }
   ]
 ];
 
+const textDecorations = [
+  ["underline", { "text-decoration": "underline" }],
+  ["line-through", { "text-decoration": "line-through" }],
+  ["no-underline", { "text-decoration": "none" }],
+  ["decoration-underline", { "text-decoration": "underline" }],
+  ["decoration-line-through", { "text-decoration": "line-through" }],
+  ["decoration-none", { "text-decoration": "none" }],
+  [/^(?:underline|decoration)-(solid|double|dotted|dashed|wavy)$/, ([, d]) => ({ "text-decoration-style": d })],
+  [/^(?:underline|decoration)-([^-]+)$/, ([, s]) => ({ "text-decoration-thickness": ["auto", "from-font"].includes(s) ? s : index.handler.bracket.px(s) })],
+  [/^decoration-(.*)$/, ([, d]) => ({ "text-decoration-thickness": index.handler.bracket.px(d) })],
+  [/^underline-offset-([^-]+)$/, ([, s]) => {
+    const v = s === "auto" ? s : index.handler.bracket.px(s);
+    if (v != null)
+      return { "text-underline-offset": v };
+  }],
+  [/^(?:underline|decoration)-(.+)$/, (match, ctx) => {
+    const result = colorResolver$1("text-decoration-color", "line")(match, ctx);
+    if (result) {
+      return {
+        "-webkit-text-decoration-color": result["text-decoration-color"],
+        ...result
+      };
+    }
+  }],
+  [/^(?:underline|decoration)-op(?:acity)?-?(.+)$/m, ([, opacity]) => ({ "--un-line-opacity": index.handler.bracket.percent(opacity) })]
+];
+
 const rules = [
   cssVariables,
   paddings,
@@ -961,12 +938,7 @@ const rules = [
   textIndents,
   textOverflows,
   textDecorations,
-  textDecorationStyles,
-  textDecorationColors,
-  textDecorationLengths,
-  textDecorationOffsets,
-  textStrokeWidths,
-  textStrokeColors,
+  textStrokes,
   textShadows,
   textTransforms,
   textAligns,
@@ -989,9 +961,6 @@ const rules = [
   userSelects,
   whitespaces,
   breaks,
-  trackings,
-  wordSpacings,
-  leadings,
   overflows,
   outline,
   appearance,
@@ -999,14 +968,8 @@ const rules = [
   positions,
   orders,
   justifies,
-  justifyItems,
-  justifySelfs,
-  alignContents,
-  alignItems,
-  alignSelfs,
-  placeContents,
-  placeItems,
-  placeSelfs,
+  alignments,
+  placements,
   insets,
   floats,
   zIndexes,
@@ -1016,17 +979,12 @@ const rules = [
   questionMark
 ].flat(1);
 
-exports.alignContents = alignContents;
-exports.alignItems = alignItems;
-exports.alignSelfs = alignSelfs;
+exports.alignments = alignments;
 exports.appearance = appearance;
 exports.appearances = appearances;
 exports.aspectRatio = aspectRatio;
 exports.bgColors = bgColors;
 exports.borderColors = borderColors;
-exports.borderRadius = borderRadius;
-exports.borderSizes = borderSizes;
-exports.borderStyles = borderStyles;
 exports.borders = borders;
 exports.boxShadows = boxShadows;
 exports.boxSizing = boxSizing;
@@ -1039,19 +997,13 @@ exports.displays = displays;
 exports.fillColors = fillColors;
 exports.flex = flex;
 exports.floats = floats;
-exports.fontSizes = fontSizes;
 exports.fontSmoothings = fontSmoothings;
 exports.fontStyles = fontStyles;
-exports.fontWeights = fontWeights;
 exports.fonts = fonts;
-exports.fontsFamilies = fontsFamilies;
 exports.gaps = gaps;
 exports.grids = grids;
 exports.insets = insets;
 exports.justifies = justifies;
-exports.justifyItems = justifyItems;
-exports.justifySelfs = justifySelfs;
-exports.leadings = leadings;
 exports.margins = margins;
 exports.opacity = opacity;
 exports.orders = orders;
@@ -1059,10 +1011,8 @@ exports.outline = outline;
 exports.overflows = overflows;
 exports.paddings = paddings;
 exports.parseColorUtil = parseColorUtil;
-exports.placeContents = placeContents;
-exports.placeItems = placeItems;
-exports.placeSelfs = placeSelfs;
 exports.placeholder = placeholder;
+exports.placements = placements;
 exports.pointerEvents = pointerEvents;
 exports.positions = positions;
 exports.questionMark = questionMark;
@@ -1075,23 +1025,16 @@ exports.sizes = sizes;
 exports.tabSizes = tabSizes;
 exports.textAligns = textAligns;
 exports.textColors = textColors;
-exports.textDecorationColors = textDecorationColors;
-exports.textDecorationLengths = textDecorationLengths;
-exports.textDecorationOffsets = textDecorationOffsets;
-exports.textDecorationStyles = textDecorationStyles;
 exports.textDecorations = textDecorations;
 exports.textIndents = textIndents;
 exports.textOverflows = textOverflows;
 exports.textShadows = textShadows;
-exports.textStrokeColors = textStrokeColors;
-exports.textStrokeWidths = textStrokeWidths;
+exports.textStrokes = textStrokes;
 exports.textTransforms = textTransforms;
-exports.trackings = trackings;
 exports.transforms = transforms;
 exports.transitions = transitions;
 exports.userSelects = userSelects;
 exports.varEmpty = varEmpty;
 exports.verticalAligns = verticalAligns;
 exports.whitespaces = whitespaces;
-exports.wordSpacings = wordSpacings;
 exports.zIndexes = zIndexes;

package/dist/chunks/default2.mjs

@@ -78,22 +78,6 @@ const textColors = [
   [/^(?:text|color|c)-(.+)$/, colorResolver$1("color", "text")],
   [/^(?:text|color|c)-op(?:acity)?-?(.+)$/m, ([, opacity2]) => ({ "--un-text-opacity": handler.bracket.percent.cssvar(opacity2) })]
 ];
-const textDecorationColors = [
-  [/^underline-(.+)$/, (match, ctx) => {
-    const result = colorResolver$1("text-decoration-color", "line")(match, ctx);
-    if (result) {
-      return {
-        "-webkit-text-decoration-color": result["text-decoration-color"],
-        ...result
-      };
-    }
-  }],
-  [/^underline-op(?:acity)?-?(.+)$/m, ([, opacity2]) => ({ "--un-line-opacity": handler.bracket.percent(opacity2) })]
-];
-const textStrokeColors = [
-  [/^text-stroke-(.+)$/, colorResolver$1("-webkit-text-stroke-color", "text-stroke")],
-  [/^text-stroke-op(?:acity)?-?(.+)$/m, ([, opacity2]) => ({ "--un-text-stroke-opacity": handler.bracket.percent(opacity2) })]
-];
 const bgColors = [
   [/^bg-(.+)$/, colorResolver$1("background-color", "bg")],
   [/^bg-op(?:acity)?-?(.+)$/m, ([, opacity2]) => ({ "--un-bg-opacity": handler.bracket.percent(opacity2) })]
@@ -178,39 +162,53 @@ const placeholder = [
   ]
 ];
 
-const borderSizes = [
+const borders = [
   [/^border$/, handlerBorder],
-  [/^(?:border|b)(?:-([^-]+))?$/, handlerBorder],
-  [/^(?:border|b)(?:-([^-]+))?(?:-([^-]+))?$/, handlerBorder]
-];
-const borderRadius = [
-  [/^(?:border-)?(?:rounded|rd)$/, handlerRounded],
-  [/^(?:border-)?(?:rounded|rd)(?:-([^-]+))?$/, handlerRounded],
-  [/^(?:border-)?(?:rounded|rd)(?:-([^-]+))?(?:-([^-]+))?$/, handlerRounded]
-];
-const borderStyles = [
+  [/^(?:border|b)()-(.+)$/, handlerBorder],
+  [/^(?:border|b)-([^-]+)(?:-(.+))?$/, handlerBorder],
+  [/^(?:border|b)()-size-(.+)$/, handlerBorderSize],
+  [/^(?:border|b)-([^-]+)-size-(.+)$/, handlerBorderSize],
+  [/^(?:border|b)()-(.+)$/, handlerBorderColor],
+  [/^(?:border|b)-([^-]+)(?:-(.+))?$/, handlerBorderColor],
+  [/^(?:border|b)-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-border-opacity": handler.bracket.percent(opacity) })],
   ["border-solid", { "border-style": "solid" }],
   ["border-dashed", { "border-style": "dashed" }],
   ["border-dotted", { "border-style": "dotted" }],
   ["border-double", { "border-style": "double" }],
-  ["border-none", { "border-style": "none" }]
+  ["border-none", { "border-style": "none" }],
+  [/^(?:border-)?(?:rounded|rd)$/, handlerRounded],
+  [/^(?:border-)?(?:rounded|rd)(?:-([^-]+))?$/, handlerRounded],
+  [/^(?:border-)?(?:rounded|rd)(?:-([^-]+))?(?:-([^-]+))?$/, handlerRounded]
 ];
-const borders = [
-  borderSizes,
-  borderColors,
-  borderStyles,
-  borderRadius
-].flat(1);
-function handlerBorder([, a, b]) {
+function handlerBorder(m) {
+  const borderSizes = handlerBorderSize(m);
+  if (borderSizes) {
+    return [
+      ...borderSizes,
+      ["border-style", "solid"]
+    ];
+  }
+}
+function handlerBorderSize([, a, b]) {
   const [d, s = "1"] = directionMap[a] ? [a, b] : ["", a];
   const v = handler.bracket.px(s);
   if (v != null) {
     return [
-      ...directionMap[d].map((i) => [`border${i}-width`, v]),
-      ["border-style", "solid"]
+      ...directionMap[d].map((i) => [`border${i}-width`, v])
     ];
   }
 }
+function handlerBorderColor([, a, c], ctx) {
+  if (c !== void 0) {
+    const ofColor = colorResolver$1("border-color", "border")(["", c], ctx);
+    if (ofColor) {
+      const borders2 = directionMap[directionMap[a] ? a : ""].map((i) => colorResolver$1(`border${i}-color`, "border")(["", c], ctx));
+      const borderObject = {};
+      Object.assign(borderObject, ...borders2);
+      return borderObject;
+    }
+  }
+}
 function handlerRounded([, a, b], { theme }) {
   const [d, s = "DEFAULT"] = cornerMap[a] ? [a, b] : ["", a];
   const v = theme.borderRadius?.[s] || handler.bracket.fraction.rem(s);
@@ -309,37 +307,27 @@ const transitions = [
 ];
 
 const flex = [
-  ["flex-col", { "flex-direction": "column" }],
-  ["flex-col-reverse", { "flex-direction": "column-reverse" }],
-  ["flex-row", { "flex-direction": "row" }],
-  ["flex-row-reverse", { "flex-direction": "row-reverse" }],
-  ["flex-wrap", { "flex-wrap": "wrap" }],
-  ["flex-wrap-reverse", { "flex-wrap": "wrap-reverse" }],
-  ["flex-nowrap", { "flex-wrap": "nowrap" }],
+  ["flex", { display: "flex" }],
+  ["inline-flex", { display: "inline-flex" }],
+  ["flex-inline", { display: "inline-flex" }],
   ["flex-1", { flex: "1 1 0%" }],
   ["flex-auto", { flex: "1 1 auto" }],
   ["flex-initial", { flex: "0 1 auto" }],
   ["flex-none", { flex: "none" }],
   [/^flex-\[(.+)\]$/, ([, d]) => ({ flex: d })],
-  ["flex-grow", { "flex-grow": 1 }],
-  ["flex-grow-0", { "flex-grow": 0 }],
   ["flex-shrink", { "flex-shrink": 1 }],
   ["flex-shrink-0", { "flex-shrink": 0 }],
-  ["flex", { display: "flex" }],
-  ["inline-flex", { display: "inline-flex" }],
-  ["flex-inline", { display: "inline-flex" }]
+  ["flex-grow", { "flex-grow": 1 }],
+  ["flex-grow-0", { "flex-grow": 0 }],
+  ["flex-row", { "flex-direction": "row" }],
+  ["flex-row-reverse", { "flex-direction": "row-reverse" }],
+  ["flex-col", { "flex-direction": "column" }],
+  ["flex-col-reverse", { "flex-direction": "column-reverse" }],
+  ["flex-wrap", { "flex-wrap": "wrap" }],
+  ["flex-wrap-reverse", { "flex-wrap": "wrap-reverse" }],
+  ["flex-nowrap", { "flex-wrap": "nowrap" }]
 ];
 
-const fontsFamilies = [
-  [/^font-(\w+)$/, ([, d], { theme }) => {
-    const font = theme.fontFamily?.[d];
-    if (font) {
-      return {
-        "font-family": font
-      };
-    }
-  }]
-];
 const weightMap = {
   thin: "100",
   extralight: "200",
@@ -351,7 +339,15 @@ const weightMap = {
   extrabold: "800",
   black: "900"
 };
-const fontSizes = [
+const fonts = [
+  [/^font-(\w+)$/, ([, d], { theme }) => {
+    const font = theme.fontFamily?.[d];
+    if (font) {
+      return {
+        "font-family": font
+      };
+    }
+  }],
   [/^text-(.+)$/, ([, s = "base"], { theme }) => {
     const size = handler.bracket.rem(s);
     if (size)
@@ -369,30 +365,22 @@ const fontSizes = [
     const raw = handler.bracket.rem(s);
     if (raw)
       return { "font-size": raw };
-  }]
-];
-const fontWeights = [
+  }],
   [/^(?:font|fw)-?([^-]+)$/, ([, s]) => {
     const v = weightMap[s] || handler.number(s);
     if (v)
       return { "font-weight": v };
-  }]
-];
-const leadings = [
+  }],
   [/^(?:leading|lh)-([^-]+)$/, ([, s], { theme }) => {
     const v = theme.lineHeight?.[s] || handler.bracket.rem(s);
     if (v !== null)
       return { "line-height": v };
-  }]
-];
-const trackings = [
+  }],
   [/^tracking-([^-]+)$/, ([, s], { theme }) => {
     const v = theme.letterSpacing?.[s] || handler.bracket.rem(s);
     if (v !== null)
       return { "letter-spacing": v };
-  }]
-];
-const wordSpacings = [
+  }],
   [/^word-spacing-([^-]+)$/, ([, s], { theme }) => {
     const v = theme.wordSpacing?.[s] || handler.bracket.rem(s);
     if (v !== null)
@@ -412,20 +400,6 @@ const tabSizes = [
     }
   }]
 ];
-const textDecorationLengths = [
-  [/^underline-([^-]+)$/, ([, s]) => {
-    const v = s === "auto" ? s : handler.bracket.px(s);
-    if (v != null)
-      return { "text-decoration-thickness": v };
-  }]
-];
-const textDecorationOffsets = [
-  [/^underline-offset-([^-]+)$/, ([, s]) => {
-    const v = s === "auto" ? s : handler.bracket.px(s);
-    if (v != null)
-      return { "text-underline-offset": v };
-  }]
-];
 const textIndents = [
   [/^indent(?:-(.+))?$/, ([, s], { theme }) => {
     const v = theme.textIndent?.[s || "DEFAULT"] || handler.bracket.cssvar.fraction.rem(s);
@@ -433,12 +407,14 @@ const textIndents = [
       return { "text-indent": v };
   }]
 ];
-const textStrokeWidths = [
+const textStrokes = [
   [/^text-stroke(?:-(.+))?$/, ([, s], { theme }) => {
     const v = theme.textStrokeWidth?.[s || "DEFAULT"] || handler.bracket.cssvar.px(s);
     if (v != null)
       return { "-webkit-text-stroke-width": v };
-  }]
+  }],
+  [/^text-stroke-(.+)$/, colorResolver$1("-webkit-text-stroke-color", "text-stroke")],
+  [/^text-stroke-op(?:acity)?-?(.+)$/m, ([, opacity]) => ({ "--un-text-stroke-opacity": handler.bracket.percent(opacity) })]
 ];
 const textShadows = [
   [/^text-shadow(?:-(.+))?$/, ([, s], { theme }) => {
@@ -447,11 +423,6 @@ const textShadows = [
       return { "text-shadow": v };
   }]
 ];
-const fonts = [
-  fontsFamilies,
-  fontSizes,
-  fontWeights
-].flat(1);
 
 const gaps = [
   [/^(?:flex-|grid-)?gap-([^-]+)$/, ([, s]) => {
@@ -496,12 +467,10 @@ const autoDirection = (selector, theme) => {
 const grids = [
   ["grid", { display: "grid" }],
   ["inline-grid", { display: "inline-grid" }],
-  [/^grid-cols-minmax-([\w.-]+)$/, ([, d]) => ({ "grid-template-columns": `repeat(auto-fill, minmax(${d}, 1fr))` })],
-  [/^grid-rows-minmax-([\w.-]+)$/, ([, d]) => ({ "grid-template-rows": `repeat(auto-fill, minmax(${d}, 1fr))` })],
-  [/^grid-cols-(\d+)$/, ([, d]) => ({ "grid-template-columns": `repeat(${d},minmax(0,1fr))` })],
-  [/^grid-rows-(\d+)$/, ([, d]) => ({ "grid-template-rows": `repeat(${d},minmax(0,1fr))` })],
-  [/^grid-cols-\[(.+)\]$/, ([, v]) => ({ "grid-template-columns": v.replace(/,/g, " ") })],
-  [/^grid-rows-\[(.+)\]$/, ([, v]) => ({ "grid-template-rows": v.replace(/,/g, " ") })],
+  [/^(?:grid-)?col-start-([\w.-]+)$/, ([, v]) => ({ "grid-column-start": `${v}` })],
+  [/^(?:grid-)?col-end-([\w.]+)$/, ([, v]) => ({ "grid-column-end": `${v}` })],
+  [/^(?:grid-)?row-start-([\w.-]+)$/, ([, v]) => ({ "grid-row-start": `${v}` })],
+  [/^(?:grid-)?row-end-([\w.-]+)$/, ([, v]) => ({ "grid-row-end": `${v}` })],
   [/^(?:grid-)?(row|col)-(.+)$/, ([, d, v]) => {
     const key = d === "row" ? "grid-row" : "grid-column";
     let raw = handler.bracket(v);
@@ -518,13 +487,15 @@ const grids = [
         return { [key]: `span ${raw}/span ${raw}` };
     }
   }],
+  [/^(?:grid-)?auto-cols-([\w.-]+)$/, ([, v], { theme }) => ({ "grid-auto-columns": `${autoDirection(v, theme)}` })],
   [/^(?:grid-)?auto-flow-([\w.-]+)$/, ([, v]) => ({ "grid-auto-flow": `${v.replace("col", "column").split("-").join(" ")}` })],
-  [/^(?:grid-)?row-start-([\w.-]+)$/, ([, v]) => ({ "grid-row-start": `${v}` })],
-  [/^(?:grid-)?row-end-([\w.-]+)$/, ([, v]) => ({ "grid-row-end": `${v}` })],
-  [/^(?:grid-)?col-start-([\w.-]+)$/, ([, v]) => ({ "grid-column-start": `${v}` })],
-  [/^(?:grid-)?col-end-([\w.]+)$/, ([, v]) => ({ "grid-column-end": `${v}` })],
   [/^(?:grid-)?auto-rows-([\w.-]+)$/, ([, v], { theme }) => ({ "grid-auto-rows": `${autoDirection(v, theme)}` })],
-  [/^(?:grid-)?auto-cols-([\w.-]+)$/, ([, v], { theme }) => ({ "grid-auto-columns": `${autoDirection(v, theme)}` })]
+  [/^grid-cols-minmax-([\w.-]+)$/, ([, d]) => ({ "grid-template-columns": `repeat(auto-fill, minmax(${d}, 1fr))` })],
+  [/^grid-rows-minmax-([\w.-]+)$/, ([, d]) => ({ "grid-template-rows": `repeat(auto-fill, minmax(${d}, 1fr))` })],
+  [/^grid-cols-(\d+)$/, ([, d]) => ({ "grid-template-columns": `repeat(${d},minmax(0,1fr))` })],
+  [/^grid-rows-(\d+)$/, ([, d]) => ({ "grid-template-rows": `repeat(${d},minmax(0,1fr))` })],
+  [/^grid-cols-\[(.+)\]$/, ([, v]) => ({ "grid-template-columns": v.replace(/,/g, " ") })],
+  [/^grid-rows-\[(.+)\]$/, ([, v]) => ({ "grid-template-rows": v.replace(/,/g, " ") })]
 ];
 
 const overflowValues = [
@@ -538,6 +509,7 @@ const overflows = [
   [/^(?:overflow|of)-([xy])-(.+)$/, ([, d, v]) => overflowValues.includes(v) ? { [`overflow-${d}`]: v } : void 0]
 ];
 
+const basicSet = ["auto", "start", "end", "center", "stretch"];
 const positions = [
   ["relative", { position: "relative" }],
   ["absolute", { position: "absolute" }],
@@ -551,47 +523,42 @@ const justifies = [
   ["justify-center", { "justify-content": "center" }],
   ["justify-between", { "justify-content": "space-between" }],
   ["justify-around", { "justify-content": "space-around" }],
-  ["justify-evenly", { "justify-content": "space-evenly" }]
+  ["justify-evenly", { "justify-content": "space-evenly" }],
+  ...basicSet.map((i) => [`justify-items-${i}`, { "justify-items": i }]),
+  ...basicSet.map((i) => [`justify-self-${i}`, { "justify-self": i }])
 ];
 const orders = [
   [/^order-(.+)$/, ([, v]) => ({ order: { first: "-9999", last: "9999", none: "0" }[v] || handler.bracket.number(v) })]
 ];
-const basicSet = ["auto", "start", "end", "center", "stretch"];
-const justifyItems = basicSet.map((i) => [`justify-items-${i}`, { "justify-items": i }]);
-const justifySelfs = basicSet.map((i) => [`justify-self-${i}`, { "justify-self": i }]);
-const alignContents = [
+const alignments = [
   ["content-start", { "align-content": "flex-start" }],
   ["content-end", { "align-content": "flex-end" }],
   ["content-center", { "align-content": "center" }],
   ["content-between", { "align-content": "space-between" }],
   ["content-around", { "align-content": "space-around" }],
-  ["content-evenly", { "align-content": "space-evenly" }]
-];
-const alignItems = [
+  ["content-evenly", { "align-content": "space-evenly" }],
   ["items-start", { "align-items": "flex-start" }],
   ["items-end", { "align-items": "flex-end" }],
   ["items-center", { "align-items": "center" }],
   ["items-baseline", { "align-items": "baseline" }],
-  ["items-stretch", { "align-items": "stretch" }]
-];
-const alignSelfs = [
+  ["items-stretch", { "align-items": "stretch" }],
   ["self-auto", { "align-self": "auto" }],
   ["self-start", { "align-self": "flex-start" }],
   ["self-end", { "align-self": "flex-end" }],
   ["self-center", { "align-self": "center" }],
   ["self-stretch", { "align-items": "stretch" }]
 ];
-const placeContents = [
+const placements = [
   ["place-content-start", { "place-content": "start" }],
   ["place-content-end", { "place-content": "end" }],
   ["place-content-center", { "place-content": "center" }],
   ["place-content-between", { "place-content": "space-between" }],
   ["place-content-around", { "place-content": "space-around" }],
   ["place-content-evenly", { "place-content": "space-evenly" }],
-  ["place-content-stretch", { "place-content": "stretch" }]
+  ["place-content-stretch", { "place-content": "stretch" }],
+  ...basicSet.map((i) => [`place-items-${i}`, { "place-items": i }]),
+  ...basicSet.map((i) => [`place-self-${i}`, { "place-self": i }])
 ];
-const placeItems = basicSet.map((i) => [`place-items-${i}`, { "place-items": i }]);
-const placeSelfs = basicSet.map((i) => [`place-self-${i}`, { "place-self": i }]);
 function handleInsetValue(v) {
   return { auto: "auto", full: "100%" }[v] ?? handler.bracket.fraction.cssvar.rem(v);
 }
@@ -782,17 +749,6 @@ const textTransforms = [
   ["case-capital", { "text-transform": "capitalize" }],
   ["case-normal", { "text-transform": "none" }]
 ];
-const textDecorations = [
-  ["underline", { "text-decoration": "underline" }],
-  ["line-through", { "text-decoration": "line-through" }],
-  ["no-underline", { "text-decoration": "none" }]
-];
-const textDecorationStyles = [
-  ["underline-solid", { "text-decoration-style": "solid" }],
-  ["underline-double", { "text-decoration-style": "double" }],
-  ["underline-dotted", { "text-decoration-style": "dotted" }],
-  ["underline-dashed", { "text-decoration-style": "dashed" }]
-];
 const fontStyles = [
   ["italic", { "font-style": "italic" }],
   ["not-italic", { "font-style": "normal" }]
@@ -890,19 +846,12 @@ const variablesAbbrMap = {
   "backface": "backface-visibility",
   "whitespace": "white-space",
   "break": "word-break",
+  "b": "border-color",
+  "border": "border-color",
   "color": "color",
   "case": "text-transform",
-  "write": "writing-mode",
-  "write-orient": "text-orientation",
   "origin": "transform-origin",
   "bg": "background-color",
-  "bg-blend": "background-blend-mode",
-  "bg-clip": "-webkit-background-clip",
-  "bg-gradient": "linear-gradient",
-  "bg-origin-border": "background-origin",
-  "bg-position": "background-position",
-  "bg-repeat": "background-repeat",
-  "bg-size": "background-size",
   "bg-opacity": "background-opacity",
   "tab": "tab-size",
   "underline": "text-decoration-thickness",
@@ -917,33 +866,61 @@ const variablesAbbrMap = {
   "content": "align-content",
   "items": "align-items",
   "self": "align-self",
-  "object": "object-fit",
-  "mix-blend": "mix-blend-mode",
-  "animate-speed": "animation-speed"
+  "object": "object-fit"
 };
-const cssVariables = [[
-  /^(.+)-\$(.+)$/,
-  ([, name, varname]) => {
+const cssVariables = [
+  [/^(.+)-\$(.+)$/, ([, name, varname]) => {
     const prop = variablesAbbrMap[name];
     if (prop) {
       return {
         [prop]: `var(--${varname})`
       };
     }
-  }
-]];
+  }],
+  [/^(?:border|b)-([^-]+)-\$(.+)$/, ([, a, v]) => {
+    if (a in directionMap)
+      return directionMap[a].map((i) => [`border${i}-color`, `var(--${v})`]);
+  }]
+];
 
 const questionMark = [
   [
     /^(where|\?)$/,
     (_, { constructCSS, generator }) => {
-      if (generator.config.envMode === "dev")
+      if (generator.userConfig.envMode === "dev")
         return `@keyframes __un_qm{0%{box-shadow:inset 4px 4px #ff1e90, inset -4px -4px #ff1e90}100%{box-shadow:inset 8px 8px #3399ff, inset -8px -8px #3399ff}}
 ${constructCSS({ animation: "__un_qm 0.5s ease-in-out alternate infinite" })}`;
     }
   ]
 ];
 
+const textDecorations = [
+  ["underline", { "text-decoration": "underline" }],
+  ["line-through", { "text-decoration": "line-through" }],
+  ["no-underline", { "text-decoration": "none" }],
+  ["decoration-underline", { "text-decoration": "underline" }],
+  ["decoration-line-through", { "text-decoration": "line-through" }],
+  ["decoration-none", { "text-decoration": "none" }],
+  [/^(?:underline|decoration)-(solid|double|dotted|dashed|wavy)$/, ([, d]) => ({ "text-decoration-style": d })],
+  [/^(?:underline|decoration)-([^-]+)$/, ([, s]) => ({ "text-decoration-thickness": ["auto", "from-font"].includes(s) ? s : handler.bracket.px(s) })],
+  [/^decoration-(.*)$/, ([, d]) => ({ "text-decoration-thickness": handler.bracket.px(d) })],
+  [/^underline-offset-([^-]+)$/, ([, s]) => {
+    const v = s === "auto" ? s : handler.bracket.px(s);
+    if (v != null)
+      return { "text-underline-offset": v };
+  }],
+  [/^(?:underline|decoration)-(.+)$/, (match, ctx) => {
+    const result = colorResolver$1("text-decoration-color", "line")(match, ctx);
+    if (result) {
+      return {
+        "-webkit-text-decoration-color": result["text-decoration-color"],
+        ...result
+      };
+    }
+  }],
+  [/^(?:underline|decoration)-op(?:acity)?-?(.+)$/m, ([, opacity]) => ({ "--un-line-opacity": handler.bracket.percent(opacity) })]
+];
+
 const rules = [
   cssVariables,
   paddings,
@@ -959,12 +936,7 @@ const rules = [
   textIndents,
   textOverflows,
   textDecorations,
-  textDecorationStyles,
-  textDecorationColors,
-  textDecorationLengths,
-  textDecorationOffsets,
-  textStrokeWidths,
-  textStrokeColors,
+  textStrokes,
   textShadows,
   textTransforms,
   textAligns,
@@ -987,9 +959,6 @@ const rules = [
   userSelects,
   whitespaces,
   breaks,
-  trackings,
-  wordSpacings,
-  leadings,
   overflows,
   outline,
   appearance,
@@ -997,14 +966,8 @@ const rules = [
   positions,
   orders,
   justifies,
-  justifyItems,
-  justifySelfs,
-  alignContents,
-  alignItems,
-  alignSelfs,
-  placeContents,
-  placeItems,
-  placeSelfs,
+  alignments,
+  placements,
   insets,
   floats,
   zIndexes,
@@ -1014,4 +977,4 @@ const rules = [
   questionMark
 ].flat(1);
 
-export { userSelects as $, justifies as A, orders as B, justifyItems as C, justifySelfs as D, alignContents as E, alignItems as F, alignSelfs as G, placeContents as H, placeItems as I, placeSelfs as J, insets as K, floats as L, zIndexes as M, boxSizing as N, questionMark as O, rings as P, boxShadows as Q, sizes as R, aspectRatio as S, paddings as T, margins as U, varEmpty as V, displays as W, appearances as X, cursors as Y, pointerEvents as Z, resizes as _, appearance as a, whitespaces as a0, contents as a1, breaks as a2, textOverflows as a3, textTransforms as a4, textDecorations as a5, textDecorationStyles as a6, fontStyles as a7, fontSmoothings as a8, transforms as a9, transitions as aa, fontsFamilies as ab, fontSizes as ac, fontWeights as ad, leadings as ae, trackings as af, wordSpacings as ag, tabSizes as ah, textDecorationLengths as ai, textDecorationOffsets as aj, textIndents as ak, textStrokeWidths as al, textShadows as am, fonts as an, cssVariables as ao, borderSizes as b, borderRadius as c, borderStyles as d, borders as e, parseColorUtil as f, colorResolver$1 as g, opacity as h, textColors as i, textDecorationColors as j, textStrokeColors as k, bgColors as l, borderColors as m, ringColors as n, outline as o, placeholder as p, ringOffsetColors as q, rules as r, fillColors as s, textAligns as t, flex as u, verticalAligns as v, gaps as w, grids as x, overflows as y, positions as z };
+export { tabSizes as $, floats as A, zIndexes as B, boxSizing as C, questionMark as D, rings as E, boxShadows as F, sizes as G, aspectRatio as H, paddings as I, margins as J, varEmpty as K, displays as L, appearances as M, cursors as N, pointerEvents as O, resizes as P, userSelects as Q, whitespaces as R, contents as S, breaks as T, textOverflows as U, textTransforms as V, fontStyles as W, fontSmoothings as X, transforms as Y, transitions as Z, fonts as _, appearance as a, textIndents as a0, textStrokes as a1, textShadows as a2, cssVariables as a3, textDecorations as a4, borders as b, parseColorUtil as c, colorResolver$1 as d, opacity as e, textColors as f, bgColors as g, borderColors as h, ringColors as i, ringOffsetColors as j, fillColors as k, flex as l, gaps as m, grids as n, outline as o, placeholder as p, overflows as q, rules as r, positions as s, textAligns as t, justifies as u, verticalAligns as v, orders as w, alignments as x, placements as y, insets as z };

package/dist/chunks/default3.cjs

@@ -8,20 +8,22 @@ const variantBreakpoints = (matcher, _, theme) => {
   const variantEntries = Object.entries(theme.breakpoints || {}).map(([point, size], idx) => [point, size, idx]);
   for (const [point, size, idx] of variantEntries) {
     if (!regexCache[point])
-      regexCache[point] = new RegExp(`^((?:[a|l]t-)?${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;
     let direction = "min";
-    let order = parseInt(size);
+    let order = 1e3;
     if (pre.startsWith("lt-")) {
       direction = "max";
-      order = -order;
+      order -= idx + 1;
+    } else {
+      order += idx + 1;
     }
-    const m = matcher.slice(pre.length);
-    if (m === "container")
-      continue;
     if (pre.startsWith("at-") && idx < variantEntries.length - 1) {
       return {
         matcher: m,

package/dist/chunks/default3.mjs

@@ -6,20 +6,22 @@ const variantBreakpoints = (matcher, _, theme) => {
   const variantEntries = Object.entries(theme.breakpoints || {}).map(([point, size], idx) => [point, size, idx]);
   for (const [point, size, idx] of variantEntries) {
     if (!regexCache[point])
-      regexCache[point] = new RegExp(`^((?:[a|l]t-)?${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;
     let direction = "min";
-    let order = parseInt(size);
+    let order = 1e3;
     if (pre.startsWith("lt-")) {
       direction = "max";
-      order = -order;
+      order -= idx + 1;
+    } else {
+      order += idx + 1;
     }
-    const m = matcher.slice(pre.length);
-    if (m === "container")
-      continue;
     if (pre.startsWith("at-") && idx < variantEntries.length - 1) {
       return {
         matcher: m,

package/dist/rules.cjs

@@ -9,17 +9,12 @@ require('./chunks/pseudo.cjs');
 
 
 
-exports.alignContents = _default.alignContents;
-exports.alignItems = _default.alignItems;
-exports.alignSelfs = _default.alignSelfs;
+exports.alignments = _default.alignments;
 exports.appearance = _default.appearance;
 exports.appearances = _default.appearances;
 exports.aspectRatio = _default.aspectRatio;
 exports.bgColors = _default.bgColors;
 exports.borderColors = _default.borderColors;
-exports.borderRadius = _default.borderRadius;
-exports.borderSizes = _default.borderSizes;
-exports.borderStyles = _default.borderStyles;
 exports.borders = _default.borders;
 exports.boxShadows = _default.boxShadows;
 exports.boxSizing = _default.boxSizing;
@@ -32,19 +27,13 @@ exports.displays = _default.displays;
 exports.fillColors = _default.fillColors;
 exports.flex = _default.flex;
 exports.floats = _default.floats;
-exports.fontSizes = _default.fontSizes;
 exports.fontSmoothings = _default.fontSmoothings;
 exports.fontStyles = _default.fontStyles;
-exports.fontWeights = _default.fontWeights;
 exports.fonts = _default.fonts;
-exports.fontsFamilies = _default.fontsFamilies;
 exports.gaps = _default.gaps;
 exports.grids = _default.grids;
 exports.insets = _default.insets;
 exports.justifies = _default.justifies;
-exports.justifyItems = _default.justifyItems;
-exports.justifySelfs = _default.justifySelfs;
-exports.leadings = _default.leadings;
 exports.margins = _default.margins;
 exports.opacity = _default.opacity;
 exports.orders = _default.orders;
@@ -52,10 +41,8 @@ exports.outline = _default.outline;
 exports.overflows = _default.overflows;
 exports.paddings = _default.paddings;
 exports.parseColorUtil = _default.parseColorUtil;
-exports.placeContents = _default.placeContents;
-exports.placeItems = _default.placeItems;
-exports.placeSelfs = _default.placeSelfs;
 exports.placeholder = _default.placeholder;
+exports.placements = _default.placements;
 exports.pointerEvents = _default.pointerEvents;
 exports.positions = _default.positions;
 exports.questionMark = _default.questionMark;
@@ -68,23 +55,16 @@ exports.sizes = _default.sizes;
 exports.tabSizes = _default.tabSizes;
 exports.textAligns = _default.textAligns;
 exports.textColors = _default.textColors;
-exports.textDecorationColors = _default.textDecorationColors;
-exports.textDecorationLengths = _default.textDecorationLengths;
-exports.textDecorationOffsets = _default.textDecorationOffsets;
-exports.textDecorationStyles = _default.textDecorationStyles;
 exports.textDecorations = _default.textDecorations;
 exports.textIndents = _default.textIndents;
 exports.textOverflows = _default.textOverflows;
 exports.textShadows = _default.textShadows;
-exports.textStrokeColors = _default.textStrokeColors;
-exports.textStrokeWidths = _default.textStrokeWidths;
+exports.textStrokes = _default.textStrokes;
 exports.textTransforms = _default.textTransforms;
-exports.trackings = _default.trackings;
 exports.transforms = _default.transforms;
 exports.transitions = _default.transitions;
 exports.userSelects = _default.userSelects;
 exports.varEmpty = _default.varEmpty;
 exports.verticalAligns = _default.verticalAligns;
 exports.whitespaces = _default.whitespaces;
-exports.wordSpacings = _default.wordSpacings;
 exports.zIndexes = _default.zIndexes;

package/dist/rules.d.ts

@@ -8,10 +8,7 @@ declare const outline: Rule[];
 declare const appearance: Rule[];
 declare const placeholder: Rule[];
 
-declare const borderSizes: Rule[];
-declare const borderRadius: Rule[];
-declare const borderStyles: Rule[];
-declare const borders: Rule<{}>[];
+declare const borders: Rule[];
 
 declare const parseColorUtil: (body: string, theme: Theme) => {
     opacity: string;
@@ -31,8 +28,6 @@ declare const opacity: Rule[];
  * @example c-red color-red5 text-red-300
  */
 declare const textColors: Rule[];
-declare const textDecorationColors: Rule[];
-declare const textStrokeColors: Rule[];
 declare const bgColors: Rule[];
 declare const borderColors: Rule[];
 declare const ringColors: Rule[];
@@ -52,14 +47,8 @@ declare const overflows: Rule[];
 declare const positions: Rule[];
 declare const justifies: Rule[];
 declare const orders: Rule[];
-declare const justifyItems: Rule[];
-declare const justifySelfs: Rule[];
-declare const alignContents: Rule[];
-declare const alignItems: Rule[];
-declare const alignSelfs: Rule[];
-declare const placeContents: Rule[];
-declare const placeItems: Rule[];
-declare const placeSelfs: Rule[];
+declare const alignments: Rule[];
+declare const placements: Rule[];
 declare const insets: Rule[];
 declare const floats: Rule[];
 declare const zIndexes: Rule[];
@@ -94,8 +83,6 @@ declare const contents: Rule[];
 declare const breaks: Rule[];
 declare const textOverflows: Rule[];
 declare const textTransforms: Rule[];
-declare const textDecorations: Rule[];
-declare const textDecorationStyles: Rule[];
 declare const fontStyles: Rule[];
 declare const fontSmoothings: Rule[];
 
@@ -103,20 +90,14 @@ declare const transforms: Rule[];
 
 declare const transitions: Rule[];
 
-declare const fontsFamilies: Rule<Theme>[];
-declare const fontSizes: Rule<Theme>[];
-declare const fontWeights: Rule[];
-declare const leadings: Rule<Theme>[];
-declare const trackings: Rule<Theme>[];
-declare const wordSpacings: Rule<Theme>[];
+declare const fonts: Rule<Theme>[];
 declare const tabSizes: Rule<Theme>[];
-declare const textDecorationLengths: Rule<Theme>[];
-declare const textDecorationOffsets: Rule<Theme>[];
 declare const textIndents: Rule<Theme>[];
-declare const textStrokeWidths: Rule<Theme>[];
+declare const textStrokes: Rule<Theme>[];
 declare const textShadows: Rule<Theme>[];
-declare const fonts: Rule<Theme>[];
 
 declare const cssVariables: Rule[];
 
-export { alignContents, alignItems, alignSelfs, appearance, appearances, aspectRatio, bgColors, borderColors, borderRadius, borderSizes, borderStyles, borders, boxShadows, boxSizing, breaks, colorResolver, contents, cssVariables, cursors, displays, fillColors, flex, floats, fontSizes, fontSmoothings, fontStyles, fontWeights, fonts, fontsFamilies, gaps, grids, insets, justifies, justifyItems, justifySelfs, leadings, margins, opacity, orders, outline, overflows, paddings, parseColorUtil, placeContents, placeItems, placeSelfs, placeholder, pointerEvents, positions, questionMark, resizes, ringColors, ringOffsetColors, rings, rules, sizes, tabSizes, textAligns, textColors, textDecorationColors, textDecorationLengths, textDecorationOffsets, textDecorationStyles, textDecorations, textIndents, textOverflows, textShadows, textStrokeColors, textStrokeWidths, textTransforms, trackings, transforms, transitions, userSelects, varEmpty, verticalAligns, whitespaces, wordSpacings, zIndexes };
+declare const textDecorations: Rule[];
+
+export { alignments, appearance, appearances, aspectRatio, bgColors, borderColors, borders, boxShadows, boxSizing, breaks, colorResolver, contents, cssVariables, cursors, displays, fillColors, flex, floats, fontSmoothings, fontStyles, fonts, gaps, grids, insets, justifies, margins, opacity, orders, outline, overflows, paddings, parseColorUtil, placeholder, placements, pointerEvents, positions, questionMark, resizes, ringColors, ringOffsetColors, rings, rules, sizes, tabSizes, textAligns, textColors, textDecorations, textIndents, textOverflows, textShadows, textStrokes, textTransforms, transforms, transitions, userSelects, varEmpty, verticalAligns, whitespaces, zIndexes };

package/dist/rules.mjs

@@ -1,4 +1,4 @@
-export { E as alignContents, F as alignItems, G as alignSelfs, a as appearance, X as appearances, S as aspectRatio, l as bgColors, m as borderColors, c as borderRadius, b as borderSizes, d as borderStyles, e as borders, Q as boxShadows, N as boxSizing, a2 as breaks, g as colorResolver, a1 as contents, ao as cssVariables, Y as cursors, W as displays, s as fillColors, u as flex, L as floats, ac as fontSizes, a8 as fontSmoothings, a7 as fontStyles, ad as fontWeights, an as fonts, ab as fontsFamilies, w as gaps, x as grids, K as insets, A as justifies, C as justifyItems, D as justifySelfs, ae as leadings, U as margins, h as opacity, B as orders, o as outline, y as overflows, T as paddings, f as parseColorUtil, H as placeContents, I as placeItems, J as placeSelfs, p as placeholder, Z as pointerEvents, z as positions, O as questionMark, _ as resizes, n as ringColors, q as ringOffsetColors, P as rings, r as rules, R as sizes, ah as tabSizes, t as textAligns, i as textColors, j as textDecorationColors, ai as textDecorationLengths, aj as textDecorationOffsets, a6 as textDecorationStyles, a5 as textDecorations, ak as textIndents, a3 as textOverflows, am as textShadows, k as textStrokeColors, al as textStrokeWidths, a4 as textTransforms, af as trackings, a9 as transforms, aa as transitions, $ as userSelects, V as varEmpty, v as verticalAligns, a0 as whitespaces, ag as wordSpacings, M as zIndexes } from './chunks/default2.mjs';
+export { x as alignments, a as appearance, M as appearances, H as aspectRatio, g as bgColors, h as borderColors, b as borders, F as boxShadows, C as boxSizing, T as breaks, d as colorResolver, S as contents, a3 as cssVariables, N as cursors, L as displays, k as fillColors, l as flex, A as floats, X as fontSmoothings, W as fontStyles, _ as fonts, m as gaps, n as grids, z as insets, u as justifies, J as margins, e as opacity, w as orders, o as outline, q as overflows, I as paddings, c as parseColorUtil, p as placeholder, y as placements, O as pointerEvents, s as positions, D as questionMark, P as resizes, i as ringColors, j as ringOffsetColors, E as rings, r as rules, G as sizes, $ as tabSizes, t as textAligns, f as textColors, a4 as textDecorations, a0 as textIndents, U as textOverflows, a2 as textShadows, a1 as textStrokes, V as textTransforms, Y as transforms, Z as transitions, Q as userSelects, K as varEmpty, v as verticalAligns, R as whitespaces, B as zIndexes } from './chunks/default2.mjs';
 import '@unocss/core';
 import './chunks/index.mjs';
 import './chunks/pseudo.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/preset-mini",
-  "version": "0.15.6",
+  "version": "0.16.3",
   "description": "The minimal preset for UnoCSS",
   "keywords": [
     "unocss",
@@ -61,7 +61,7 @@
     "*.css"
   ],
   "dependencies": {
-    "@unocss/core": "0.15.6"
+    "@unocss/core": "0.16.3"
   },
   "scripts": {
     "build": "unbuild",