@unocss/preset-mini 0.29.2 → 0.29.3

package/dist/chunks/default2.cjs

@@ -63,7 +63,7 @@ const borders = [
   [/^(?:border|b)-([rltbse])-op(?:acity)?-?(.+)$/, handlerBorderOpacity],
   [/^(?:border|b)-(block|inline)-op(?:acity)?-?(.+)$/, handlerBorderOpacity],
   [/^(?:border|b)-([bi][se])-op(?:acity)?-?(.+)$/, handlerBorderOpacity],
-  [/^(?:border-|b-)?(?:rounded|rd)()(?:-(.+))?$/, handlerRounded, { autocomplete: ["(border|b)-(rounded-|rd-)<num>", "(rounded-|rd-)<num>"] }],
+  [/^(?:border-|b-)?(?:rounded|rd)()(?:-(.+))?$/, handlerRounded, { autocomplete: ["(border|b)-(rounded|rd)", "(border|b)-(rounded|rd)-<num>", "(rounded|rd)", "(rounded|rd)-<num>"] }],
   [/^(?:border-|b-)?(?:rounded|rd)-([rltb])(?:-(.+))?$/, handlerRounded],
   [/^(?:border-|b-)?(?:rounded|rd)-([rltb]{2})(?:-(.+))?$/, handlerRounded],
   [/^(?:border-|b-)?(?:rounded|rd)-([bi][se])(?:-(.+))?$/, handlerRounded],

package/dist/chunks/default2.mjs

@@ -61,7 +61,7 @@ const borders = [
   [/^(?:border|b)-([rltbse])-op(?:acity)?-?(.+)$/, handlerBorderOpacity],
   [/^(?:border|b)-(block|inline)-op(?:acity)?-?(.+)$/, handlerBorderOpacity],
   [/^(?:border|b)-([bi][se])-op(?:acity)?-?(.+)$/, handlerBorderOpacity],
-  [/^(?:border-|b-)?(?:rounded|rd)()(?:-(.+))?$/, handlerRounded, { autocomplete: ["(border|b)-(rounded-|rd-)<num>", "(rounded-|rd-)<num>"] }],
+  [/^(?:border-|b-)?(?:rounded|rd)()(?:-(.+))?$/, handlerRounded, { autocomplete: ["(border|b)-(rounded|rd)", "(border|b)-(rounded|rd)-<num>", "(rounded|rd)", "(rounded|rd)-<num>"] }],
   [/^(?:border-|b-)?(?:rounded|rd)-([rltb])(?:-(.+))?$/, handlerRounded],
   [/^(?:border-|b-)?(?:rounded|rd)-([rltb]{2})(?:-(.+))?$/, handlerRounded],
   [/^(?:border-|b-)?(?:rounded|rd)-([bi][se])(?:-(.+))?$/, handlerRounded],

package/dist/chunks/default3.cjs

@@ -10,40 +10,43 @@ const calcMaxWidthBySize = (size) => {
   const maxWidth = parseFloat(value) - 0.1;
   return Number.isNaN(maxWidth) ? size : `${maxWidth}${unit}`;
 };
-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(`^((?:[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;
-    const isLtPrefix = pre.startsWith("lt-");
-    const isAtPrefix = pre.startsWith("at-");
-    let order = 1e3;
-    if (isLtPrefix) {
-      order -= idx + 1;
+const variantBreakpoints = {
+  match(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(`^((?:[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;
+      const isLtPrefix = pre.startsWith("lt-");
+      const isAtPrefix = pre.startsWith("at-");
+      let order = 1e3;
+      if (isLtPrefix) {
+        order -= idx + 1;
+        return {
+          matcher: m,
+          parent: [`@media (max-width: ${calcMaxWidthBySize(size)})`, order]
+        };
+      }
+      order += idx + 1;
+      if (isAtPrefix && idx < variantEntries.length - 1) {
+        return {
+          matcher: m,
+          parent: [`@media (min-width: ${size}) and (max-width: ${calcMaxWidthBySize(variantEntries[idx + 1][1])})`, order]
+        };
+      }
       return {
         matcher: m,
-        parent: [`@media (max-width: ${calcMaxWidthBySize(size)})`, order]
+        parent: [`@media (min-width: ${size})`, order]
       };
     }
-    order += idx + 1;
-    if (isAtPrefix && idx < variantEntries.length - 1) {
-      return {
-        matcher: m,
-        parent: [`@media (min-width: ${size}) and (max-width: ${calcMaxWidthBySize(variantEntries[idx + 1][1])})`, order]
-      };
-    }
-    return {
-      matcher: m,
-      parent: [`@media (min-width: ${size})`, order]
-    };
-  }
+  },
+  autocomplete: "(at-|lt-|)$breakpoints:"
 };
 
 const scopeMatcher = (strict, name, template) => {
@@ -250,15 +253,18 @@ 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[0].length),
-      selector: (s) => `${s}${pseudo}`
-    };
-  }
+const variantPseudoElements = {
+  match: (input) => {
+    const match = input.match(PseudoElementsRE);
+    if (match) {
+      const pseudo = PseudoElements[match[1]] || `::${match[1]}`;
+      return {
+        matcher: input.slice(match[0].length),
+        selector: (s) => `${s}${pseudo}`
+      };
+    }
+  },
+  autocomplete: `(${PseudoElementsStr}):`
 };
 const variantPseudoClasses = {
   match: (input) => {
@@ -272,7 +278,8 @@ const variantPseudoClasses = {
       };
     }
   },
-  multiPass: true
+  multiPass: true,
+  autocomplete: `(${PseudoClassesStr}):`
 };
 const variantPseudoClassFunctions = {
   match: (input) => {
@@ -286,7 +293,8 @@ const variantPseudoClassFunctions = {
       };
     }
   },
-  multiPass: true
+  multiPass: true,
+  autocomplete: `(${PseudoClassFunctionsStr})-(${PseudoClassesStr}):`
 };
 const variantTaggedPseudoClasses = (options = {}) => {
   const attributify = !!options?.attributifyPseudo;

package/dist/chunks/default3.mjs

@@ -8,40 +8,43 @@ const calcMaxWidthBySize = (size) => {
   const maxWidth = parseFloat(value) - 0.1;
   return Number.isNaN(maxWidth) ? size : `${maxWidth}${unit}`;
 };
-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(`^((?:[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;
-    const isLtPrefix = pre.startsWith("lt-");
-    const isAtPrefix = pre.startsWith("at-");
-    let order = 1e3;
-    if (isLtPrefix) {
-      order -= idx + 1;
+const variantBreakpoints = {
+  match(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(`^((?:[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;
+      const isLtPrefix = pre.startsWith("lt-");
+      const isAtPrefix = pre.startsWith("at-");
+      let order = 1e3;
+      if (isLtPrefix) {
+        order -= idx + 1;
+        return {
+          matcher: m,
+          parent: [`@media (max-width: ${calcMaxWidthBySize(size)})`, order]
+        };
+      }
+      order += idx + 1;
+      if (isAtPrefix && idx < variantEntries.length - 1) {
+        return {
+          matcher: m,
+          parent: [`@media (min-width: ${size}) and (max-width: ${calcMaxWidthBySize(variantEntries[idx + 1][1])})`, order]
+        };
+      }
       return {
         matcher: m,
-        parent: [`@media (max-width: ${calcMaxWidthBySize(size)})`, order]
+        parent: [`@media (min-width: ${size})`, order]
       };
     }
-    order += idx + 1;
-    if (isAtPrefix && idx < variantEntries.length - 1) {
-      return {
-        matcher: m,
-        parent: [`@media (min-width: ${size}) and (max-width: ${calcMaxWidthBySize(variantEntries[idx + 1][1])})`, order]
-      };
-    }
-    return {
-      matcher: m,
-      parent: [`@media (min-width: ${size})`, order]
-    };
-  }
+  },
+  autocomplete: "(at-|lt-|)$breakpoints:"
 };
 
 const scopeMatcher = (strict, name, template) => {
@@ -248,15 +251,18 @@ 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[0].length),
-      selector: (s) => `${s}${pseudo}`
-    };
-  }
+const variantPseudoElements = {
+  match: (input) => {
+    const match = input.match(PseudoElementsRE);
+    if (match) {
+      const pseudo = PseudoElements[match[1]] || `::${match[1]}`;
+      return {
+        matcher: input.slice(match[0].length),
+        selector: (s) => `${s}${pseudo}`
+      };
+    }
+  },
+  autocomplete: `(${PseudoElementsStr}):`
 };
 const variantPseudoClasses = {
   match: (input) => {
@@ -270,7 +276,8 @@ const variantPseudoClasses = {
       };
     }
   },
-  multiPass: true
+  multiPass: true,
+  autocomplete: `(${PseudoClassesStr}):`
 };
 const variantPseudoClassFunctions = {
   match: (input) => {
@@ -284,7 +291,8 @@ const variantPseudoClassFunctions = {
       };
     }
   },
-  multiPass: true
+  multiPass: true,
+  autocomplete: `(${PseudoClassFunctionsStr})-(${PseudoClassesStr}):`
 };
 const variantTaggedPseudoClasses = (options = {}) => {
   const attributify = !!options?.attributifyPseudo;

package/dist/chunks/variants.cjs

@@ -4,26 +4,32 @@ const core = require('@unocss/core');
 
 const variantMatcher = (name, selector) => {
   const re = new RegExp(`^${core.escapeRegExp(name)}[:-]`);
-  return (input) => {
-    const match = input.match(re);
-    if (match) {
-      return {
-        matcher: input.slice(match[0].length),
-        selector
-      };
-    }
+  return {
+    match: (input) => {
+      const match = input.match(re);
+      if (match) {
+        return {
+          matcher: input.slice(match[0].length),
+          selector
+        };
+      }
+    },
+    autocomplete: `${name}:`
   };
 };
 const variantParentMatcher = (name, parent) => {
   const re = new RegExp(`^${core.escapeRegExp(name)}[:-]`);
-  return (input) => {
-    const match = input.match(re);
-    if (match) {
-      return {
-        matcher: input.slice(match[0].length),
-        parent
-      };
-    }
+  return {
+    match: (input) => {
+      const match = input.match(re);
+      if (match) {
+        return {
+          matcher: input.slice(match[0].length),
+          parent
+        };
+      }
+    },
+    autocomplete: `${name}:`
   };
 };
 

package/dist/chunks/variants.mjs

@@ -2,26 +2,32 @@ import { escapeRegExp } from '@unocss/core';
 
 const variantMatcher = (name, selector) => {
   const re = new RegExp(`^${escapeRegExp(name)}[:-]`);
-  return (input) => {
-    const match = input.match(re);
-    if (match) {
-      return {
-        matcher: input.slice(match[0].length),
-        selector
-      };
-    }
+  return {
+    match: (input) => {
+      const match = input.match(re);
+      if (match) {
+        return {
+          matcher: input.slice(match[0].length),
+          selector
+        };
+      }
+    },
+    autocomplete: `${name}:`
   };
 };
 const variantParentMatcher = (name, parent) => {
   const re = new RegExp(`^${escapeRegExp(name)}[:-]`);
-  return (input) => {
-    const match = input.match(re);
-    if (match) {
-      return {
-        matcher: input.slice(match[0].length),
-        parent
-      };
-    }
+  return {
+    match: (input) => {
+      const match = input.match(re);
+      if (match) {
+        return {
+          matcher: input.slice(match[0].length),
+          parent
+        };
+      }
+    },
+    autocomplete: `${name}:`
   };
 };
 

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
 import * as _unocss_core from '@unocss/core';
-import { RGBAColorValue, CSSColorValue, VariantHandler } from '@unocss/core';
+import { RGBAColorValue, CSSColorValue, VariantObject } from '@unocss/core';
 export { c as colorResolver, a as colorableShadows, d as directionSize, h as hasParseableColor, p as parseColor } from './utilities-820bcff8.js';
 import './types-f7b2c653.js';
 
@@ -68,7 +68,7 @@ declare namespace handlers {
 declare const handler: _unocss_core.ValueHandler<"number" | "global" | "auto" | "numberWithUnit" | "rem" | "px" | "percent" | "fraction" | "bracket" | "bracketOfColor" | "bracketOfLength" | "cssvar" | "time" | "degree" | "properties">;
 declare const h: _unocss_core.ValueHandler<"number" | "global" | "auto" | "numberWithUnit" | "rem" | "px" | "percent" | "fraction" | "bracket" | "bracketOfColor" | "bracketOfLength" | "cssvar" | "time" | "degree" | "properties">;
 
-declare const variantMatcher: (name: string, selector?: ((input: string) => string | undefined) | undefined) => (input: string) => VariantHandler | undefined;
-declare const variantParentMatcher: (name: string, parent: string) => (input: string) => VariantHandler | undefined;
+declare const variantMatcher: (name: string, selector?: ((input: string) => string | undefined) | undefined) => VariantObject;
+declare const variantParentMatcher: (name: string, parent: string) => VariantObject;
 
 export { colorToString, cornerMap, directionMap, getComponents, h, handler, hex2rgba, insetMap, parseCssColor, positionMap, handlers as valueHandlers, variantMatcher, variantParentMatcher, xyzMap };

package/dist/variants.d.ts

@@ -9,10 +9,10 @@ declare const variantBreakpoints: Variant<Theme>;
 
 declare const variantCombinators: Variant[];
 
-declare const variantPrint: VariantFunction;
+declare const variantPrint: Variant;
 declare const variantCustomMedia: VariantFunction;
 
-declare const variantColorsMediaOrClass: (options?: PresetMiniOptions) => VariantFunction[];
+declare const variantColorsMediaOrClass: (options?: PresetMiniOptions) => Variant[];
 
 declare const variants: (options: PresetMiniOptions) => Variant<Theme>[];
 
@@ -24,7 +24,7 @@ declare const variantScope: Variant;
 declare const variantImportant: Variant;
 declare const variantNegative: Variant;
 
-declare const variantPseudoElements: VariantFunction;
+declare const variantPseudoElements: VariantObject;
 declare const variantPseudoClasses: VariantObject;
 declare const variantPseudoClassFunctions: VariantObject;
 declare const variantTaggedPseudoClasses: (options?: PresetMiniOptions) => VariantObject[];

package/package.json

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