@unocss/preset-mini 0.20.2 → 0.21.2

package/dist/chunks/default3.mjs

@@ -44,24 +44,18 @@ const variantCombinators = [
   variantMatcher("svg", (input) => `${input} svg *`)
 ];
 
-const variantColorsMediaOrClass = [
-  (v, { options: { dark } }) => {
-    if (dark === "class")
-      return variantMatcher("dark", (input) => `.dark $$ ${input}`)(v);
-  },
-  (v, { options: { dark } }) => {
-    if (dark === "class")
-      return variantMatcher("light", (input) => `.light $$ ${input}`)(v);
-  },
-  (v, { options: { dark } }) => {
-    if (dark === "media")
-      return variantParentMatcher("dark", "@media (prefers-color-scheme: dark)")(v);
-  },
-  (v, { options: { dark } }) => {
-    if (dark === "media")
-      return variantParentMatcher("light", "@media (prefers-color-scheme: light)")(v);
+const variantColorsMediaOrClass = (options = {}) => {
+  if (options?.dark === "class") {
+    return [
+      variantMatcher("dark", (input) => `.dark $$ ${input}`),
+      variantMatcher("light", (input) => `.light $$ ${input}`)
+    ];
   }
-];
+  return [
+    variantParentMatcher("dark", "@media (prefers-color-scheme: dark)"),
+    variantParentMatcher("light", "@media (prefers-color-scheme: light)")
+  ];
+};
 
 const variantLanguageDirections = [
   variantMatcher("rtl", (input) => `[dir="rtl"] $$ ${input}`),
@@ -101,16 +95,6 @@ const variantNegative = {
     }
   }
 };
-const variantSpace = (matcher) => {
-  if (/^space-?([xy])-?(-?.+)$/.test(matcher) || /^divide-/.test(matcher)) {
-    return {
-      matcher,
-      selector: (input) => {
-        return `${input}>:not([hidden])~:not([hidden])`;
-      }
-    };
-  }
-};
 
 const variantMotions = [
   variantParentMatcher("motion-reduce", "@media (prefers-reduced-motion: reduce)"),
@@ -124,8 +108,7 @@ const variantOrientations = [
 
 const variantPrint = variantParentMatcher("print", "@media print");
 
-const variants = [
-  variantSpace,
+const variants = (options) => [
   variantNegative,
   variantImportant,
   variantPrint,
@@ -135,11 +118,11 @@ const variants = [
   ...variantCombinators,
   variantPseudoClasses,
   variantPseudoClassFunctions,
-  variantTaggedPseudoClasses,
+  ...variantTaggedPseudoClasses(options),
   variantPseudoElements,
   partClasses,
-  ...variantColorsMediaOrClass,
+  ...variantColorsMediaOrClass(options),
   ...variantLanguageDirections
 ];
 
-export { variantBreakpoints as a, variantCombinators as b, variantColorsMediaOrClass as c, variantLanguageDirections as d, variantImportant as e, variantNegative as f, variantSpace as g, variantMotions as h, variantOrientations as i, variantPrint as j, variants as v };
+export { variantBreakpoints as a, variantCombinators as b, variantColorsMediaOrClass as c, variantLanguageDirections as d, variantImportant as e, variantNegative as f, variantMotions as g, variantOrientations as h, variantPrint as i, variants as v };

package/dist/chunks/pseudo.cjs

@@ -42,25 +42,27 @@ const PseudoClasses = Object.fromEntries([
   "only-child",
   "only-of-type"
 ].map(core.toArray));
-const PseudoElements = [
+const PseudoElements = Object.fromEntries([
   "placeholder",
   "before",
   "after",
   "first-letter",
   "first-line",
   "selection",
-  "marker"
-];
+  "marker",
+  ["file", "::file-selector-button"]
+].map(core.toArray));
 const PseudoClassFunctions = [
   "not",
   "is",
   "where",
   "has"
 ];
-const PartClassesRE = /(part-\[(.+)]:)(.+)/;
-const PseudoElementsRE = new RegExp(`^(${PseudoElements.join("|")})[:-]`);
+const PseudoElementsStr = Object.keys(PseudoElements).join("|");
 const PseudoClassesStr = Object.keys(PseudoClasses).join("|");
 const PseudoClassFunctionsStr = PseudoClassFunctions.join("|");
+const PartClassesRE = /(part-\[(.+)]:)(.+)/;
+const PseudoElementsRE = new RegExp(`^(${PseudoElementsStr})[:-]`);
 const PseudoClassesRE = new RegExp(`^(${PseudoClassesStr})[:-]`);
 const PseudoClassFunctionsRE = new RegExp(`^(${PseudoClassFunctionsStr})-(${PseudoClassesStr})[:-]`);
 function shouldAdd(entires) {
@@ -87,9 +89,10 @@ const taggedPseudoClassMatcher = (tag, parent, combinator) => {
 const variantPseudoElements = (input) => {
   const match = input.match(PseudoElementsRE);
   if (match) {
+    const pseudo = PseudoElements[match[1]] || `::${match[1]}`;
     return {
       matcher: input.slice(match[1].length + 1),
-      selector: (s) => `${s}::${match[1]}`
+      selector: (s) => `${s}${pseudo}`
     };
   }
 };
@@ -120,16 +123,18 @@ const variantPseudoClassFunctions = {
   },
   multiPass: true
 };
-const variantTaggedPseudoClasses = {
-  match: (input, { options: { attributifyPseudo } }) => {
-    const g = taggedPseudoClassMatcher("group", attributifyPseudo ? '[group=""]' : ".group", " ")(input);
-    if (g)
-      return g;
-    const p = taggedPseudoClassMatcher("peer", attributifyPseudo ? '[peer=""]' : ".peer", "~")(input);
-    if (p)
-      return p;
-  },
-  multiPass: true
+const variantTaggedPseudoClasses = (options = {}) => {
+  const attributify = !!options?.attributifyPseudo;
+  return [
+    {
+      match: taggedPseudoClassMatcher("group", attributify ? '[group=""]' : ".group", " "),
+      multiPass: true
+    },
+    {
+      match: taggedPseudoClassMatcher("peer", attributify ? '[peer=""]' : ".peer", "~"),
+      multiPass: true
+    }
+  ];
 };
 const partClasses = {
   match: (input) => {

package/dist/chunks/pseudo.mjs

@@ -40,25 +40,27 @@ const PseudoClasses = Object.fromEntries([
   "only-child",
   "only-of-type"
 ].map(toArray));
-const PseudoElements = [
+const PseudoElements = Object.fromEntries([
   "placeholder",
   "before",
   "after",
   "first-letter",
   "first-line",
   "selection",
-  "marker"
-];
+  "marker",
+  ["file", "::file-selector-button"]
+].map(toArray));
 const PseudoClassFunctions = [
   "not",
   "is",
   "where",
   "has"
 ];
-const PartClassesRE = /(part-\[(.+)]:)(.+)/;
-const PseudoElementsRE = new RegExp(`^(${PseudoElements.join("|")})[:-]`);
+const PseudoElementsStr = Object.keys(PseudoElements).join("|");
 const PseudoClassesStr = Object.keys(PseudoClasses).join("|");
 const PseudoClassFunctionsStr = PseudoClassFunctions.join("|");
+const PartClassesRE = /(part-\[(.+)]:)(.+)/;
+const PseudoElementsRE = new RegExp(`^(${PseudoElementsStr})[:-]`);
 const PseudoClassesRE = new RegExp(`^(${PseudoClassesStr})[:-]`);
 const PseudoClassFunctionsRE = new RegExp(`^(${PseudoClassFunctionsStr})-(${PseudoClassesStr})[:-]`);
 function shouldAdd(entires) {
@@ -85,9 +87,10 @@ const taggedPseudoClassMatcher = (tag, parent, combinator) => {
 const variantPseudoElements = (input) => {
   const match = input.match(PseudoElementsRE);
   if (match) {
+    const pseudo = PseudoElements[match[1]] || `::${match[1]}`;
     return {
       matcher: input.slice(match[1].length + 1),
-      selector: (s) => `${s}::${match[1]}`
+      selector: (s) => `${s}${pseudo}`
     };
   }
 };
@@ -118,16 +121,18 @@ const variantPseudoClassFunctions = {
   },
   multiPass: true
 };
-const variantTaggedPseudoClasses = {
-  match: (input, { options: { attributifyPseudo } }) => {
-    const g = taggedPseudoClassMatcher("group", attributifyPseudo ? '[group=""]' : ".group", " ")(input);
-    if (g)
-      return g;
-    const p = taggedPseudoClassMatcher("peer", attributifyPseudo ? '[peer=""]' : ".peer", "~")(input);
-    if (p)
-      return p;
-  },
-  multiPass: true
+const variantTaggedPseudoClasses = (options = {}) => {
+  const attributify = !!options?.attributifyPseudo;
+  return [
+    {
+      match: taggedPseudoClassMatcher("group", attributify ? '[group=""]' : ".group", " "),
+      multiPass: true
+    },
+    {
+      match: taggedPseudoClassMatcher("peer", attributify ? '[peer=""]' : ".peer", "~"),
+      multiPass: true
+    }
+  ];
 };
 const partClasses = {
   match: (input) => {

package/dist/chunks/utilities.cjs

@@ -35,8 +35,33 @@ const xyzMap = {
   "z": ["-z"],
   "": ["-x", "-y"]
 };
+const basePositionMap = [
+  "top",
+  "top center",
+  "top left",
+  "top right",
+  "bottom",
+  "bottom center",
+  "bottom left",
+  "bottom right",
+  "left",
+  "left center",
+  "left top",
+  "left bottom",
+  "right",
+  "right center",
+  "right top",
+  "right bottom",
+  "center",
+  "center top",
+  "center bottom",
+  "center left",
+  "center right",
+  "center center"
+];
+const positionMap = Object.assign({}, ...basePositionMap.map((p) => ({ [p.replace(/ /, "-")]: p })), ...basePositionMap.map((p) => ({ [p.replace(/\b(\w)\w+/g, "$1").replace(/ /, "")]: p })));
 
-const cssBasicProps = [
+const cssProps = [
   "color",
   "border-color",
   "background-color",
@@ -53,17 +78,13 @@ const cssBasicProps = [
   "zoom",
   "text-shadow",
   "transform",
-  "box-shadow"
-];
-const cssPositionProps = [
+  "box-shadow",
   "backround-position",
   "left",
   "right",
   "top",
   "bottom",
-  "object-position"
-];
-const cssSizeProps = [
+  "object-position",
   "max-height",
   "min-height",
   "max-width",
@@ -81,25 +102,31 @@ const cssSizeProps = [
   "vertical-align",
   "border-spacing",
   "letter-spacing",
-  "word-spacing"
-];
-const cssEnhanceProps = ["stroke", "filter", "backdrop-filter", "fill", "mask", "mask-size", "mask-border", "clip-path", "clip"];
-const cssProps = [
-  ...cssBasicProps,
-  ...cssPositionProps,
-  ...cssSizeProps,
-  ...cssEnhanceProps
+  "word-spacing",
+  "stroke",
+  "filter",
+  "backdrop-filter",
+  "fill",
+  "mask",
+  "mask-size",
+  "mask-border",
+  "clip-path",
+  "clip"
 ];
 const numberWithUnitRE = /^(-?[0-9.]+)(px|pt|pc|rem|em|%|vh|vw|in|cm|mm|ex|ch|vmin|vmax)?$/i;
 const numberRE = /^(-?[0-9.]+)$/i;
 const unitOnlyRE = /^(px)$/i;
+function round(n) {
+  return n.toFixed(10).replace(/\.0+$/, "").replace(/(\.\d+?)0+$/, "$1");
+}
 function numberWithUnit(str) {
   const match = str.match(numberWithUnitRE);
   if (!match)
     return;
-  const [, , unit] = match;
-  if (unit)
-    return str;
+  const [, n, unit] = match;
+  const num = parseFloat(n);
+  if (unit && !Number.isNaN(num))
+    return `${round(num)}${unit}`;
 }
 function auto(str) {
   if (str === "auto" || str === "a")
@@ -112,11 +139,9 @@ function rem(str) {
   if (!match)
     return;
   const [, n, unit] = match;
-  if (unit)
-    return str;
   const num = parseFloat(n);
   if (!Number.isNaN(num))
-    return `${num / 4}rem`;
+    return unit ? `${round(num)}${unit}` : `${round(num / 4)}rem`;
 }
 function px(str) {
   if (str.match(unitOnlyRE))
@@ -125,25 +150,23 @@ function px(str) {
   if (!match)
     return;
   const [, n, unit] = match;
-  if (unit)
-    return str;
   const num = parseFloat(n);
   if (!Number.isNaN(num))
-    return `${num}px`;
+    return unit ? `${round(num)}${unit}` : `${round(num)}px`;
 }
 function number(str) {
   if (!numberRE.test(str))
     return;
   const num = parseFloat(str);
   if (!Number.isNaN(num))
-    return num;
+    return round(num);
 }
 function percent(str) {
   if (str.endsWith("%"))
     str = str.slice(0, -1);
   const num = parseFloat(str);
   if (!Number.isNaN(num))
-    return `${num / 100}`;
+    return `${round(num / 100)}`;
 }
 function fraction(str) {
   if (str === "full")
@@ -151,7 +174,7 @@ function fraction(str) {
   const [left, right] = str.split("/");
   const num = parseFloat(left) / parseFloat(right);
   if (!Number.isNaN(num))
-    return `${num * 100}%`;
+    return `${round(num * 100)}%`;
 }
 function bracket(str) {
   if (str && str[0] === "[" && str[str.length - 1] === "]") {
@@ -165,20 +188,28 @@ function cssvar(str) {
     return `var(--${str.slice(1)})`;
 }
 function time(str) {
-  const duration = Number(str.replace(/(s|ms)$/, ""));
-  if (isNaN(duration))
+  const match = str.match(/^(-?[0-9.]+)(s|ms)?$/i);
+  if (!match)
     return;
-  if (/(s|ms)$/.test(str))
-    return str;
-  return `${str}ms`;
+  const [, n, unit] = match;
+  const num = parseFloat(n);
+  if (!Number.isNaN(num))
+    return unit ? `${round(num)}${unit}` : `${round(num)}ms`;
+}
+function degree(str) {
+  const match = str.match(/^(-?[0-9.]+)(deg)?$/i);
+  if (!match)
+    return;
+  const [, n, unit] = match;
+  const num = parseFloat(n);
+  if (!Number.isNaN(num))
+    return unit ? `${round(num)}${unit}` : `${round(num)}deg`;
 }
 function global(str) {
   if (["inherit", "initial", "revert", "unset"].includes(str))
     return str;
 }
 function properties(str) {
-  if (str === void 0)
-    return;
   for (const prop of str.split(",")) {
     if (!cssProps.includes(prop))
       return;
@@ -198,6 +229,7 @@ const valueHandlers = {
   bracket: bracket,
   cssvar: cssvar,
   time: time,
+  degree: degree,
   global: global,
   properties: properties
 };
@@ -301,5 +333,6 @@ exports.directionSize = directionSize;
 exports.h = h;
 exports.handler = handler;
 exports.parseColor = parseColor;
+exports.positionMap = positionMap;
 exports.valueHandlers = valueHandlers;
 exports.xyzMap = xyzMap;

package/dist/chunks/utilities.mjs

@@ -33,8 +33,33 @@ const xyzMap = {
   "z": ["-z"],
   "": ["-x", "-y"]
 };
+const basePositionMap = [
+  "top",
+  "top center",
+  "top left",
+  "top right",
+  "bottom",
+  "bottom center",
+  "bottom left",
+  "bottom right",
+  "left",
+  "left center",
+  "left top",
+  "left bottom",
+  "right",
+  "right center",
+  "right top",
+  "right bottom",
+  "center",
+  "center top",
+  "center bottom",
+  "center left",
+  "center right",
+  "center center"
+];
+const positionMap = Object.assign({}, ...basePositionMap.map((p) => ({ [p.replace(/ /, "-")]: p })), ...basePositionMap.map((p) => ({ [p.replace(/\b(\w)\w+/g, "$1").replace(/ /, "")]: p })));
 
-const cssBasicProps = [
+const cssProps = [
   "color",
   "border-color",
   "background-color",
@@ -51,17 +76,13 @@ const cssBasicProps = [
   "zoom",
   "text-shadow",
   "transform",
-  "box-shadow"
-];
-const cssPositionProps = [
+  "box-shadow",
   "backround-position",
   "left",
   "right",
   "top",
   "bottom",
-  "object-position"
-];
-const cssSizeProps = [
+  "object-position",
   "max-height",
   "min-height",
   "max-width",
@@ -79,25 +100,31 @@ const cssSizeProps = [
   "vertical-align",
   "border-spacing",
   "letter-spacing",
-  "word-spacing"
-];
-const cssEnhanceProps = ["stroke", "filter", "backdrop-filter", "fill", "mask", "mask-size", "mask-border", "clip-path", "clip"];
-const cssProps = [
-  ...cssBasicProps,
-  ...cssPositionProps,
-  ...cssSizeProps,
-  ...cssEnhanceProps
+  "word-spacing",
+  "stroke",
+  "filter",
+  "backdrop-filter",
+  "fill",
+  "mask",
+  "mask-size",
+  "mask-border",
+  "clip-path",
+  "clip"
 ];
 const numberWithUnitRE = /^(-?[0-9.]+)(px|pt|pc|rem|em|%|vh|vw|in|cm|mm|ex|ch|vmin|vmax)?$/i;
 const numberRE = /^(-?[0-9.]+)$/i;
 const unitOnlyRE = /^(px)$/i;
+function round(n) {
+  return n.toFixed(10).replace(/\.0+$/, "").replace(/(\.\d+?)0+$/, "$1");
+}
 function numberWithUnit(str) {
   const match = str.match(numberWithUnitRE);
   if (!match)
     return;
-  const [, , unit] = match;
-  if (unit)
-    return str;
+  const [, n, unit] = match;
+  const num = parseFloat(n);
+  if (unit && !Number.isNaN(num))
+    return `${round(num)}${unit}`;
 }
 function auto(str) {
   if (str === "auto" || str === "a")
@@ -110,11 +137,9 @@ function rem(str) {
   if (!match)
     return;
   const [, n, unit] = match;
-  if (unit)
-    return str;
   const num = parseFloat(n);
   if (!Number.isNaN(num))
-    return `${num / 4}rem`;
+    return unit ? `${round(num)}${unit}` : `${round(num / 4)}rem`;
 }
 function px(str) {
   if (str.match(unitOnlyRE))
@@ -123,25 +148,23 @@ function px(str) {
   if (!match)
     return;
   const [, n, unit] = match;
-  if (unit)
-    return str;
   const num = parseFloat(n);
   if (!Number.isNaN(num))
-    return `${num}px`;
+    return unit ? `${round(num)}${unit}` : `${round(num)}px`;
 }
 function number(str) {
   if (!numberRE.test(str))
     return;
   const num = parseFloat(str);
   if (!Number.isNaN(num))
-    return num;
+    return round(num);
 }
 function percent(str) {
   if (str.endsWith("%"))
     str = str.slice(0, -1);
   const num = parseFloat(str);
   if (!Number.isNaN(num))
-    return `${num / 100}`;
+    return `${round(num / 100)}`;
 }
 function fraction(str) {
   if (str === "full")
@@ -149,7 +172,7 @@ function fraction(str) {
   const [left, right] = str.split("/");
   const num = parseFloat(left) / parseFloat(right);
   if (!Number.isNaN(num))
-    return `${num * 100}%`;
+    return `${round(num * 100)}%`;
 }
 function bracket(str) {
   if (str && str[0] === "[" && str[str.length - 1] === "]") {
@@ -163,20 +186,28 @@ function cssvar(str) {
     return `var(--${str.slice(1)})`;
 }
 function time(str) {
-  const duration = Number(str.replace(/(s|ms)$/, ""));
-  if (isNaN(duration))
+  const match = str.match(/^(-?[0-9.]+)(s|ms)?$/i);
+  if (!match)
     return;
-  if (/(s|ms)$/.test(str))
-    return str;
-  return `${str}ms`;
+  const [, n, unit] = match;
+  const num = parseFloat(n);
+  if (!Number.isNaN(num))
+    return unit ? `${round(num)}${unit}` : `${round(num)}ms`;
+}
+function degree(str) {
+  const match = str.match(/^(-?[0-9.]+)(deg)?$/i);
+  if (!match)
+    return;
+  const [, n, unit] = match;
+  const num = parseFloat(n);
+  if (!Number.isNaN(num))
+    return unit ? `${round(num)}${unit}` : `${round(num)}deg`;
 }
 function global(str) {
   if (["inherit", "initial", "revert", "unset"].includes(str))
     return str;
 }
 function properties(str) {
-  if (str === void 0)
-    return;
   for (const prop of str.split(",")) {
     if (!cssProps.includes(prop))
       return;
@@ -196,6 +227,7 @@ const valueHandlers = {
   bracket: bracket,
   cssvar: cssvar,
   time: time,
+  degree: degree,
   global: global,
   properties: properties
 };
@@ -291,4 +323,4 @@ const colorResolver = (property, varName) => ([, body], { theme }) => {
   }
 };
 
-export { cornerMap as a, capitalize as b, colorResolver as c, directionMap as d, directionSize as e, h as f, handler as h, parseColor as p, valueHandlers as v, xyzMap as x };
+export { cornerMap as a, capitalize as b, colorResolver as c, directionMap as d, directionSize as e, positionMap as f, h as g, handler as h, parseColor as p, valueHandlers as v, xyzMap as x };

package/dist/index.cjs

@@ -18,7 +18,7 @@ const presetMini = (options = {}) => {
     name: "@unocss/preset-mini",
     theme: _default.theme,
     rules: _default$1.rules,
-    variants: _default$2.variants,
+    variants: _default$2.variants(options),
     options,
     postprocess: options.variablePrefix && options.variablePrefix !== "un-" ? VarPrefixPostprocessor(options.variablePrefix) : void 0
   };

package/dist/index.mjs

@@ -15,7 +15,7 @@ const presetMini = (options = {}) => {
     name: "@unocss/preset-mini",
     theme,
     rules,
-    variants,
+    variants: variants(options),
     options,
     postprocess: options.variablePrefix && options.variablePrefix !== "un-" ? VarPrefixPostprocessor(options.variablePrefix) : void 0
   };

package/dist/theme.d.ts

@@ -77,8 +77,6 @@ declare const baseSize: {
     '5xl': string;
     '6xl': string;
     '7xl': string;
-    min: string;
-    max: string;
     prose: string;
 };
 declare const width: {
@@ -94,8 +92,6 @@ declare const width: {
     '5xl': string;
     '6xl': string;
     '7xl': string;
-    min: string;
-    max: string;
     prose: string;
     auto: string;
 };
@@ -112,8 +108,6 @@ declare const maxWidth: {
     '5xl': string;
     '6xl': string;
     '7xl': string;
-    min: string;
-    max: string;
     prose: string;
     none: string;
 };
@@ -130,8 +124,6 @@ declare const height: {
     '5xl': string;
     '6xl': string;
     '7xl': string;
-    min: string;
-    max: string;
     prose: string;
     auto: string;
 };
@@ -148,8 +140,6 @@ declare const maxHeight: {
     '5xl': string;
     '6xl': string;
     '7xl': string;
-    min: string;
-    max: string;
     prose: string;
     none: string;
 };