@unocss/preset-mini 0.31.2 → 0.31.6

package/dist/chunks/default2.cjs

@@ -4,27 +4,30 @@ const utilities = require('./utilities.cjs');
 const core = require('@unocss/core');
 
 const verticalAlignAlias = {
-  mid: "middle",
-  base: "baseline",
-  btm: "bottom"
+  "mid": "middle",
+  "base": "baseline",
+  "btm": "bottom",
+  "baseline": "baseline",
+  "top": "top",
+  "middle": "middle",
+  "bottom": "bottom",
+  "text-top": "text-top",
+  "text-bottom": "text-bottom",
+  "sub": "sub",
+  "super": "super"
 };
 const verticalAligns = [
-  [/^(?:vertical|align|v)-(baseline|top|middle|bottom|text-top|text-bottom|sub|super|mid|base|btm)$/, ([, v]) => ({ "vertical-align": verticalAlignAlias[v] || v }), { autocomplete: "(vertical|align|v)-(baseline|top|middle|bottom|text-top|text-bottom|sub|super|mid|base|btm)" }]
-];
-const textAligns = [
-  ["text-center", { "text-align": "center" }],
-  ["text-left", { "text-align": "left" }],
-  ["text-right", { "text-align": "right" }],
-  ["text-justify", { "text-align": "justify" }]
+  [/^(?:vertical|align|v)-(.+)$/, ([, v]) => ({ "vertical-align": verticalAlignAlias[v] }), { autocomplete: `(vertical|align|v)-(${Object.keys(verticalAlignAlias).join("|")})` }]
 ];
+const textAligns = ["center", "left", "right", "justify", "start", "end", "inherit", "initial", "unset", "revert"].map((v) => [`text-${v}`, { "text-align": v }]);
 
 const outline = [
   [/^outline-(?:width-|size-)?(.+)$/, ([, d], { theme }) => ({ "outline-width": theme.lineWidth?.[d] ?? utilities.handler.bracket.cssvar.px(d) }), { autocomplete: "outline-(width|size)-<num>" }],
   [/^outline-(?:color-)?(.+)$/, utilities.colorResolver("outline-color", "outline-color"), { autocomplete: "outline-$colors" }],
   [/^outline-offset-(.+)$/, ([, d], { theme }) => ({ "outline-offset": theme.lineWidth?.[d] ?? utilities.handler.bracket.cssvar.px(d) }), { autocomplete: "outline-(offset)-<num>" }],
   ["outline", { "outline-style": "solid" }],
-  [/^outline-(auto|dashed|dotted|double|hidden|solid|groove|ridge|inset|outset|inherit|initial|revert|unset)$/, ([, c]) => ({ "outline-style": c }), { autocomplete: "outline-(auto|dashed|dotted|double|hidden|solid|groove|ridge|inset|outset|inherit|initial|revert|unset)" }],
-  ["outline-none", { "outline": "2px solid transparent", "outline-offset": "2px" }]
+  ["outline-none", { "outline": "2px solid transparent", "outline-offset": "2px" }],
+  ...["auto", "dashed", "dotted", "double", "hidden", "solid", "groove", "ridge", "inset", "outset", "inherit", "initial", "revert", "unset"].map((v) => [`outline-${v}`, { "outline-style": v }])
 ];
 const appearance = [
   ["appearance-none", {
@@ -42,6 +45,7 @@ const willChange = [
   [/^will-change-(.+)/, ([, p]) => ({ "will-change": willChangeProperty(p) })]
 ];
 
+const borderStyles = ["solid", "dashed", "dotted", "double", "hidden", "none", "groove", "ridge", "inset", "outset", "initial", "inherit", "revert", "unset"];
 const borders = [
   [/^(?:border|b)()(?:-(.+))?$/, handlerBorder, { autocomplete: "(border|b)-<directions>" }],
   [/^(?:border|b)-([xy])(?:-(.+))?$/, handlerBorder],
@@ -68,12 +72,8 @@ const borders = [
   [/^(?:border-|b-)?(?:rounded|rd)-([rltb]{2})(?:-(.+))?$/, handlerRounded],
   [/^(?:border-|b-)?(?:rounded|rd)-([bi][se])(?:-(.+))?$/, handlerRounded],
   [/^(?:border-|b-)?(?:rounded|rd)-([bi][se]-[bi][se])(?:-(.+))?$/, handlerRounded],
-  ["border-solid", { "border-style": "solid" }],
-  ["border-dashed", { "border-style": "dashed" }],
-  ["border-dotted", { "border-style": "dotted" }],
-  ["border-double", { "border-style": "double" }],
-  ["border-hidden", { "border-style": "hidden" }],
-  ["border-none", { "border-style": "none" }]
+  [/^(?:border|b)-(?:style-)?()(.+)$/, handlerBorderStyle, { autocomplete: ["(border|b)-style", `(border|b)-(${borderStyles.join("|")})`, "(border|b)-<directions>-style", `(border|b)-<directions>-(${borderStyles.join("|")})`, `(border|b)-<directions>-style-(${borderStyles.join("|")})`, `(border|b)-style-(${borderStyles.join("|")})`] }],
+  [/^(?:border|b)-([rltbsexy])-(?:style-)?(.+)$/, handlerBorderStyle]
 ];
 const borderColorResolver = (direction) => ([, body], theme) => {
   const data = utilities.parseColor(body, theme);
@@ -106,10 +106,11 @@ const borderColorResolver = (direction) => ([, body], theme) => {
 };
 function handlerBorder(m, ctx) {
   const borderSizes = handlerBorderSize(m, ctx);
-  if (borderSizes) {
+  const borderStyle = handlerBorderStyle(["", m[1], "solid"]);
+  if (borderSizes && borderStyle) {
     return [
       ...borderSizes,
-      ["border-style", "solid"]
+      ...borderStyle
     ];
   }
 }
@@ -133,6 +134,14 @@ function handlerRounded([, a = "", s], { theme }) {
   if (a in utilities.cornerMap && v != null)
     return utilities.cornerMap[a].map((i) => [`border${i}-radius`, v]);
 }
+function handlerBorderStyle([, a = "", s]) {
+  if (borderStyles.includes(s)) {
+    if (a in utilities.directionMap)
+      return utilities.directionMap[a].map((i) => [`border${i}-style`, s]);
+    else
+      return [["border-style", s]];
+  }
+}
 
 const opacity = [
   [/^op(?:acity)?-?(.+)$/, ([, d]) => ({ opacity: utilities.handler.bracket.percent.cssvar(d) })]

package/dist/chunks/default2.mjs

@@ -2,27 +2,30 @@ import { h as handler, c as colorResolver, d as directionMap, a as hasParseableC
 import { toArray, CONTROL_SHORTCUT_NO_MERGE } from '@unocss/core';
 
 const verticalAlignAlias = {
-  mid: "middle",
-  base: "baseline",
-  btm: "bottom"
+  "mid": "middle",
+  "base": "baseline",
+  "btm": "bottom",
+  "baseline": "baseline",
+  "top": "top",
+  "middle": "middle",
+  "bottom": "bottom",
+  "text-top": "text-top",
+  "text-bottom": "text-bottom",
+  "sub": "sub",
+  "super": "super"
 };
 const verticalAligns = [
-  [/^(?:vertical|align|v)-(baseline|top|middle|bottom|text-top|text-bottom|sub|super|mid|base|btm)$/, ([, v]) => ({ "vertical-align": verticalAlignAlias[v] || v }), { autocomplete: "(vertical|align|v)-(baseline|top|middle|bottom|text-top|text-bottom|sub|super|mid|base|btm)" }]
-];
-const textAligns = [
-  ["text-center", { "text-align": "center" }],
-  ["text-left", { "text-align": "left" }],
-  ["text-right", { "text-align": "right" }],
-  ["text-justify", { "text-align": "justify" }]
+  [/^(?:vertical|align|v)-(.+)$/, ([, v]) => ({ "vertical-align": verticalAlignAlias[v] }), { autocomplete: `(vertical|align|v)-(${Object.keys(verticalAlignAlias).join("|")})` }]
 ];
+const textAligns = ["center", "left", "right", "justify", "start", "end", "inherit", "initial", "unset", "revert"].map((v) => [`text-${v}`, { "text-align": v }]);
 
 const outline = [
   [/^outline-(?:width-|size-)?(.+)$/, ([, d], { theme }) => ({ "outline-width": theme.lineWidth?.[d] ?? handler.bracket.cssvar.px(d) }), { autocomplete: "outline-(width|size)-<num>" }],
   [/^outline-(?:color-)?(.+)$/, colorResolver("outline-color", "outline-color"), { autocomplete: "outline-$colors" }],
   [/^outline-offset-(.+)$/, ([, d], { theme }) => ({ "outline-offset": theme.lineWidth?.[d] ?? handler.bracket.cssvar.px(d) }), { autocomplete: "outline-(offset)-<num>" }],
   ["outline", { "outline-style": "solid" }],
-  [/^outline-(auto|dashed|dotted|double|hidden|solid|groove|ridge|inset|outset|inherit|initial|revert|unset)$/, ([, c]) => ({ "outline-style": c }), { autocomplete: "outline-(auto|dashed|dotted|double|hidden|solid|groove|ridge|inset|outset|inherit|initial|revert|unset)" }],
-  ["outline-none", { "outline": "2px solid transparent", "outline-offset": "2px" }]
+  ["outline-none", { "outline": "2px solid transparent", "outline-offset": "2px" }],
+  ...["auto", "dashed", "dotted", "double", "hidden", "solid", "groove", "ridge", "inset", "outset", "inherit", "initial", "revert", "unset"].map((v) => [`outline-${v}`, { "outline-style": v }])
 ];
 const appearance = [
   ["appearance-none", {
@@ -40,6 +43,7 @@ const willChange = [
   [/^will-change-(.+)/, ([, p]) => ({ "will-change": willChangeProperty(p) })]
 ];
 
+const borderStyles = ["solid", "dashed", "dotted", "double", "hidden", "none", "groove", "ridge", "inset", "outset", "initial", "inherit", "revert", "unset"];
 const borders = [
   [/^(?:border|b)()(?:-(.+))?$/, handlerBorder, { autocomplete: "(border|b)-<directions>" }],
   [/^(?:border|b)-([xy])(?:-(.+))?$/, handlerBorder],
@@ -66,12 +70,8 @@ const borders = [
   [/^(?:border-|b-)?(?:rounded|rd)-([rltb]{2})(?:-(.+))?$/, handlerRounded],
   [/^(?:border-|b-)?(?:rounded|rd)-([bi][se])(?:-(.+))?$/, handlerRounded],
   [/^(?:border-|b-)?(?:rounded|rd)-([bi][se]-[bi][se])(?:-(.+))?$/, handlerRounded],
-  ["border-solid", { "border-style": "solid" }],
-  ["border-dashed", { "border-style": "dashed" }],
-  ["border-dotted", { "border-style": "dotted" }],
-  ["border-double", { "border-style": "double" }],
-  ["border-hidden", { "border-style": "hidden" }],
-  ["border-none", { "border-style": "none" }]
+  [/^(?:border|b)-(?:style-)?()(.+)$/, handlerBorderStyle, { autocomplete: ["(border|b)-style", `(border|b)-(${borderStyles.join("|")})`, "(border|b)-<directions>-style", `(border|b)-<directions>-(${borderStyles.join("|")})`, `(border|b)-<directions>-style-(${borderStyles.join("|")})`, `(border|b)-style-(${borderStyles.join("|")})`] }],
+  [/^(?:border|b)-([rltbsexy])-(?:style-)?(.+)$/, handlerBorderStyle]
 ];
 const borderColorResolver = (direction) => ([, body], theme) => {
   const data = parseColor(body, theme);
@@ -104,10 +104,11 @@ const borderColorResolver = (direction) => ([, body], theme) => {
 };
 function handlerBorder(m, ctx) {
   const borderSizes = handlerBorderSize(m, ctx);
-  if (borderSizes) {
+  const borderStyle = handlerBorderStyle(["", m[1], "solid"]);
+  if (borderSizes && borderStyle) {
     return [
       ...borderSizes,
-      ["border-style", "solid"]
+      ...borderStyle
     ];
   }
 }
@@ -131,6 +132,14 @@ function handlerRounded([, a = "", s], { theme }) {
   if (a in cornerMap && v != null)
     return cornerMap[a].map((i) => [`border${i}-radius`, v]);
 }
+function handlerBorderStyle([, a = "", s]) {
+  if (borderStyles.includes(s)) {
+    if (a in directionMap)
+      return directionMap[a].map((i) => [`border${i}-style`, s]);
+    else
+      return [["border-style", s]];
+  }
+}
 
 const opacity = [
   [/^op(?:acity)?-?(.+)$/, ([, d]) => ({ opacity: handler.bracket.percent.cssvar(d) })]

package/dist/chunks/default3.cjs

@@ -139,9 +139,10 @@ const variantScope = {
 };
 const variantImportant = {
   match(matcher) {
-    if (matcher.startsWith("!")) {
+    const match = matcher.match(/^(important[:-]|!)/);
+    if (match) {
       return {
-        matcher: matcher.slice(1),
+        matcher: matcher.slice(match[0].length),
         body: (body) => {
           body.forEach((v) => {
             if (v[1])
@@ -151,7 +152,8 @@ const variantImportant = {
         }
       };
     }
-  }
+  },
+  autocomplete: "(important)"
 };
 const variantNegative = {
   match(matcher) {

package/dist/chunks/default3.mjs

@@ -137,9 +137,10 @@ const variantScope = {
 };
 const variantImportant = {
   match(matcher) {
-    if (matcher.startsWith("!")) {
+    const match = matcher.match(/^(important[:-]|!)/);
+    if (match) {
       return {
-        matcher: matcher.slice(1),
+        matcher: matcher.slice(match[0].length),
         body: (body) => {
           body.forEach((v) => {
             if (v[1])
@@ -149,7 +150,8 @@ const variantImportant = {
         }
       };
     }
-  }
+  },
+  autocomplete: "(important)"
 };
 const variantNegative = {
   match(matcher) {

package/dist/chunks/utilities.cjs

@@ -475,11 +475,8 @@ function global(str) {
     return str;
 }
 function properties(str) {
-  for (const prop of str.split(",")) {
-    if (!cssProps.includes(prop))
-      return;
-  }
-  return str;
+  if (str.split(",").every((prop) => cssProps.includes(prop)))
+    return str;
 }
 
 const valueHandlers = {

package/dist/chunks/utilities.mjs

@@ -473,11 +473,8 @@ function global(str) {
     return str;
 }
 function properties(str) {
-  for (const prop of str.split(",")) {
-    if (!cssProps.includes(prop))
-      return;
-  }
-  return str;
+  if (str.split(",").every((prop) => cssProps.includes(prop)))
+    return str;
 }
 
 const valueHandlers = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/preset-mini",
-  "version": "0.31.2",
+  "version": "0.31.6",
   "description": "The minimal preset for UnoCSS",
   "keywords": [
     "unocss",
@@ -61,7 +61,7 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@unocss/core": "0.31.2"
+    "@unocss/core": "0.31.6"
   },
   "scripts": {
     "build": "unbuild",