@unocss/preset-mini 0.18.0 → 0.20.1

package/dist/chunks/default2.mjs

@@ -1,4 +1,4 @@
-import { h as handler, c as colorResolver$1, d as directionMap, p as parseColor, a as cornerMap, b as capitalize, e as directionSize, x as xyzMap } from './utilities.mjs';
+import { h as handler, c as colorResolver, d as directionMap, p as parseColor, a as cornerMap, b as capitalize, e as directionSize, x as xyzMap } from './utilities.mjs';
 import { toArray } from '@unocss/core';
 import { C as CONTROL_BYPASS_PSEUDO_CLASS } from './pseudo.mjs';
 
@@ -19,7 +19,7 @@ const textAligns = [
 
 const outline = [
   [/^outline-(?:width-|size-)?(.+)$/, ([, d]) => ({ "outline-width": handler.bracket.fraction.auto.rem(d) })],
-  [/^outline-(?:color-)?(.+)$/, colorResolver$1("outline-color", "outline-color")],
+  [/^outline-(?:color-)?(.+)$/, colorResolver("outline-color", "outline-color")],
   [/^outline-offset-(.+)$/, ([, d]) => ({ "outline-offset": handler.bracket.fraction.auto.rem(d) })],
   ["outline", { "outline-style": "solid" }],
   [/^outline-(auto|dotted|dashed|solid|double|groove|ridge|inset|outset|inherit|initial|revert|unset)$/, ([, c]) => ({ "outline-style": c })],
@@ -79,12 +79,12 @@ const borderColorResolver = (direction) => ([, body], { theme }) => {
     } else {
       if (direction === "") {
         return {
-          "--un-border-opacity": 1,
+          "--un-border-opacity": (opacity && handler.cssvar(opacity)) ?? 1,
           [`border${direction}-color`]: `rgba(${rgba.slice(0, 3).join(",")},var(--un-border${direction}-opacity))`
         };
       } else {
         return {
-          "--un-border-opacity": 1,
+          "--un-border-opacity": (opacity && handler.cssvar(opacity)) ?? 1,
           [`--un-border${direction}-opacity`]: "var(--un-border-opacity)",
           [`border${direction}-color`]: `rgba(${rgba.slice(0, 3).join(",")},var(--un-border${direction}-opacity))`
         };
@@ -127,11 +127,11 @@ const opacity = [
   [/^op(?:acity)?-?(.+)$/, ([, d]) => ({ opacity: handler.bracket.percent.cssvar(d) })]
 ];
 const textColors = [
-  [/^(?:text|color|c)-(.+)$/, colorResolver$1("color", "text")],
+  [/^(?:text|color|c)-(.+)$/, colorResolver("color", "text")],
   [/^(?:text|color|c)-op(?:acity)?-?(.+)$/, ([, opacity2]) => ({ "--un-text-opacity": handler.bracket.percent.cssvar(opacity2) })]
 ];
 const bgColors = [
-  [/^bg-(.+)$/, colorResolver$1("background-color", "bg")],
+  [/^bg-(.+)$/, colorResolver("background-color", "bg")],
   [/^bg-op(?:acity)?-?(.+)$/, ([, opacity2]) => ({ "--un-bg-opacity": handler.bracket.percent(opacity2) })]
 ];
 
@@ -171,7 +171,7 @@ const flex = [
   ["flex-auto", { flex: "1 1 auto" }],
   ["flex-initial", { flex: "0 1 auto" }],
   ["flex-none", { flex: "none" }],
-  [/^flex-\[(.+)\]$/, ([, d]) => ({ flex: d })],
+  [/^flex-(\[.+\])$/, ([, d]) => ({ flex: handler.bracket(d).replace(/\d+\/\d+/, ($1) => handler.fraction($1)) })],
   ["flex-shrink", { "flex-shrink": 1 }],
   ["flex-shrink-0", { "flex-shrink": 0 }],
   ["flex-grow", { "flex-grow": 1 }],
@@ -197,14 +197,7 @@ const weightMap = {
   black: "900"
 };
 const fonts = [
-  [/^font-(\w+)$/, ([, d], { theme }) => {
-    const font = theme.fontFamily?.[d];
-    if (font) {
-      return {
-        "font-family": font
-      };
-    }
-  }],
+  [/^font-(\w+)$/, ([, d], { theme }) => ({ "font-family": theme.fontFamily?.[d] })],
   [/^text-(.+)$/, ([, s = "base"], { theme }) => {
     const size = handler.bracket.auto.rem(s);
     if (size)
@@ -218,37 +211,16 @@ const fonts = [
       };
     }
   }],
-  [/^text-size-(.+)$/, ([, s]) => {
-    const raw = handler.bracket.auto.rem(s);
-    if (raw)
-      return { "font-size": raw };
-  }],
-  [/^(?:font|fw)-?([^-]+)$/, ([, s]) => {
-    const v = weightMap[s] || handler.number(s);
-    if (v)
-      return { "font-weight": v };
-  }],
-  [/^(?:leading|lh)-([^-]+)$/, ([, s], { theme }) => {
-    const v = theme.lineHeight?.[s] || handler.bracket.auto.rem(s);
-    if (v !== null)
-      return { "line-height": v };
-  }],
-  [/^tracking-([^-]+)$/, ([, s], { theme }) => {
-    const v = theme.letterSpacing?.[s] || handler.bracket.auto.rem(s);
-    if (v !== null)
-      return { "letter-spacing": v };
-  }],
-  [/^word-spacing-([^-]+)$/, ([, s], { theme }) => {
-    const v = theme.wordSpacing?.[s] || handler.bracket.auto.rem(s);
-    if (v !== null)
-      return { "word-spacing": v };
-  }]
+  [/^text-size-(.+)$/, ([, s]) => ({ "font-size": handler.bracket.auto.rem(s) })],
+  [/^(?:font|fw)-?([^-]+)$/, ([, s]) => ({ "font-weight": weightMap[s] || handler.number(s) })],
+  [/^(?:leading|lh)-([^-]+)$/, ([, s], { theme }) => ({ "line-height": theme.lineHeight?.[s] || handler.bracket.auto.rem(s) })],
+  [/^tracking-([^-]+)$/, ([, s], { theme }) => ({ "letter-spacing": theme.letterSpacing?.[s] || handler.bracket.auto.rem(s) })],
+  [/^word-spacing-([^-]+)$/, ([, s], { theme }) => ({ "word-spacing": theme.wordSpacing?.[s] || handler.bracket.auto.rem(s) })]
 ];
 const tabSizes = [
   [/^tab-?([^-]*)$/, ([, s]) => {
-    s = s || "4";
-    const v = handler.bracket.global.number(s);
-    if (v !== null) {
+    const v = handler.bracket.global.number(s || "4");
+    if (v != null) {
       return {
         "-moz-tab-size": v,
         "-o-tab-size": v,
@@ -258,41 +230,29 @@ const tabSizes = [
   }]
 ];
 const textIndents = [
-  [/^indent(?:-(.+))?$/, ([, s], { theme }) => {
-    const v = theme.textIndent?.[s || "DEFAULT"] || handler.bracket.cssvar.fraction.auto.rem(s);
-    if (v != null)
-      return { "text-indent": v };
-  }]
+  [/^indent(?:-(.+))?$/, ([, s], { theme }) => ({ "text-indent": theme.textIndent?.[s || "DEFAULT"] || handler.bracket.cssvar.fraction.auto.rem(s) })]
 ];
 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(?:-(.+))?$/, ([, s], { theme }) => ({ "-webkit-text-stroke-width": theme.textStrokeWidth?.[s || "DEFAULT"] || handler.bracket.cssvar.px(s) })],
+  [/^text-stroke-(.+)$/, colorResolver("-webkit-text-stroke-color", "text-stroke")],
   [/^text-stroke-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-text-stroke-opacity": handler.bracket.percent(opacity) })]
 ];
 const textShadows = [
-  [/^text-shadow(?:-(.+))?$/, ([, s], { theme }) => {
-    const v = theme.textShadow?.[s || "DEFAULT"] || handler.bracket.cssvar(s);
-    if (v != null)
-      return { "text-shadow": v };
-  }]
+  [/^text-shadow(?:-(.+))?$/, ([, s], { theme }) => ({ "text-shadow": theme.textShadow?.[s || "DEFAULT"] || handler.bracket.cssvar(s) })]
 ];
 
+const directions = {
+  "": "",
+  "x-": "column-",
+  "y-": "row-"
+};
 const gaps = [
   [/^(?:flex-|grid-)?gap-(x-|y-)?([^-]+)$/, ([, d = "", s]) => {
     const v = handler.bracket.auto.rem(s);
     if (v != null) {
-      const direction = {
-        "": "",
-        "x-": "column-",
-        "y-": "row-"
-      }[d];
       return {
-        [`grid-${direction}gap`]: v,
-        [`${direction}gap`]: v
+        [`grid-${directions[d]}gap`]: v,
+        [`${directions[d]}gap`]: v
       };
     }
   }]
@@ -334,12 +294,12 @@ const grids = [
   [/^(?: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-)?auto-rows-([\w.-]+)$/, ([, v], { theme }) => ({ "grid-auto-rows": autoDirection(v, theme) })],
+  [/^grid-cols-(.+)$/, ([, v]) => ({ "grid-template-columns": handler.bracket(v) })],
+  [/^grid-rows-(.+)$/, ([, v]) => ({ "grid-template-rows": handler.bracket(v) })],
   [/^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-rows-(\d+)$/, ([, d]) => ({ "grid-template-rows": `repeat(${d},minmax(0,1fr))` })]
 ];
 
 const overflowValues = [
@@ -355,11 +315,8 @@ const overflows = [
 
 const basicSet = ["auto", "start", "end", "center", "stretch"];
 const positions = [
-  ["relative", { position: "relative" }],
-  ["absolute", { position: "absolute" }],
-  ["fixed", { position: "fixed" }],
-  ["sticky", { position: "sticky" }],
-  ["static", { position: "static" }]
+  [/^(?:position-|pos-)?(relative|absolute|fixed|sticky)$/, ([, v]) => ({ position: v })],
+  [/^(?:position-|pos-)?(static)$/, ([, v]) => ({ position: v })]
 ];
 const justifies = [
   ["justify-start", { "justify-content": "flex-start" }],
@@ -410,8 +367,8 @@ function handleInsetValue(v) {
   return { auto: "auto", full: "100%" }[v] ?? handler.bracket.fraction.cssvar.auto.rem(v);
 }
 const insets = [
-  [/^(top|left|right|bottom|inset)-(.+)$/, ([, d, v]) => ({ [d]: handleInsetValue(v) })],
-  [/^inset-([xy])-(.+)$/, ([, d, v]) => {
+  [/^(?:position-|pos-)?(top|left|right|bottom|inset)-(.+)$/, ([, d, v]) => ({ [d]: handleInsetValue(v) })],
+  [/^(?:position-|pos-)?inset-([xy])-(.+)$/, ([, d, v]) => {
     const r = handleInsetValue(v);
     if (r != null && d in directionMap)
       return directionMap[d].map((i) => [i.slice(1), r]);
@@ -520,25 +477,20 @@ const rings = [
         "--un-ring-color": "rgba(59, 130, 246, .5)",
         "--un-ring-offset-shadow": "var(--un-ring-inset) 0 0 0 var(--un-ring-offset-width) var(--un-ring-offset-color)",
         "--un-ring-shadow": `var(--un-ring-inset) 0 0 0 calc(${value} + var(--un-ring-offset-width)) var(--un-ring-color)`,
-        "-webkit-box-shadow": "var(--un-ring-offset-shadow), var(--un-ring-shadow), var(--un-shadow, 0 0 #0000)",
         "box-shadow": "var(--un-ring-offset-shadow), var(--un-ring-shadow), var(--un-shadow, 0 0 #0000)"
       };
     }
   }],
   ["ring-offset", { "--un-ring-offset-width": "1px" }],
-  [/^ring-offset-(.+)$/, ([, d]) => {
-    const value = handler.px(d || "1");
-    if (value)
-      return { "--un-ring-offset-width": value };
-  }],
-  [/^ring-(.+)$/, colorResolver$1("--un-ring-color", "ring")],
+  [/^ring-offset-(.+)$/, ([, d]) => ({ "--un-ring-offset-width": handler.px(d || "1") })],
+  [/^ring-(.+)$/, colorResolver("--un-ring-color", "ring")],
   [/^ring-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-ring-opacity": handler.bracket.percent(opacity) })],
-  [/^ring-offset-(.+)$/, colorResolver$1("--un-ring-offset-color", "ring-offset")],
+  [/^ring-offset-(.+)$/, colorResolver("--un-ring-offset-color", "ring-offset")],
   [/^ring-offset-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-ring-offset-opacity": handler.bracket.percent(opacity) })],
   ["ring-inset", { "--un-ring-inset": "inset" }]
 ];
 
-const colorResolver = (body, theme) => {
+const shadowColorResolver = (body, theme) => {
   const data = parseColor(body, theme);
   if (!data)
     return;
@@ -560,13 +512,15 @@ const boxShadows = [
     const value = theme.boxShadow?.[d || "DEFAULT"];
     if (value) {
       return {
+        "--un-shadow-inset": varEmpty,
         "--un-shadow-color": "0,0,0",
         "--un-shadow": value,
         "box-shadow": "var(--un-ring-offset-shadow, 0 0 #0000), var(--un-ring-shadow, 0 0 #0000), var(--un-shadow)"
       };
     }
   }],
-  [/^shadow-(.+)$/, ([, d], { theme }) => colorResolver(d, theme)]
+  [/^shadow-(.+)$/, ([, d], { theme }) => shadowColorResolver(d, theme)],
+  ["shadow-inset", { "--un-shadow-inset": "inset" }]
 ];
 
 function getPropName(minmax, hw) {
@@ -592,11 +546,7 @@ const sizes = [
 ];
 const aspectRatio = [
   ["aspect-ratio-auto", { "aspect-ratio": "auto" }],
-  [/^aspect-ratio-(.+)$/, ([, d]) => {
-    const v = (/^\d+\/\d+$/.test(d) ? d : null) || handler.bracket.cssvar.number(d);
-    if (v != null)
-      return { "aspect-ratio": v };
-  }]
+  [/^aspect-ratio-(.+)$/, ([, d]) => ({ "aspect-ratio": (/^\d+\/\d+$/.test(d) ? d : null) || handler.bracket.cssvar.number(d) })]
 ];
 
 const paddings = [
@@ -659,9 +609,7 @@ function handleTranslate([, d, b]) {
   if (v != null) {
     return [
       transformBase,
-      [
-        ...xyzMap[d].map((i) => [`--un-translate${i}`, v])
-      ]
+      xyzMap[d].map((i) => [`--un-translate${i}`, v])
     ];
   }
 }
@@ -670,9 +618,7 @@ function handleScale([, d, b]) {
   if (v != null) {
     return [
       transformBase,
-      [
-        ...xyzMap[d].map((i) => [`--un-scale${i}`, v])
-      ]
+      xyzMap[d].map((i) => [`--un-scale${i}`, v])
     ];
   }
 }
@@ -720,17 +666,12 @@ const variablesAbbrMap = {
   "backface": "backface-visibility",
   "whitespace": "white-space",
   "break": "word-break",
-  "b": "border-color",
-  "border": "border-color",
-  "color": "color",
   "case": "text-transform",
   "origin": "transform-origin",
-  "bg": "background-color",
   "bg-opacity": "background-opacity",
   "tab": "tab-size",
   "underline": "text-decoration-thickness",
   "underline-offset": "text-underline-offset",
-  "text": "color",
   "grid-cols": "grid-template-columns",
   "grid-rows": "grid-template-rows",
   "auto-flow": "grid-auto-flow",
@@ -745,15 +686,8 @@ const variablesAbbrMap = {
 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})`]);
+    if (prop)
+      return { [prop]: `var(--${varname})` };
   }]
 ];
 
@@ -776,7 +710,7 @@ const textDecorations = [
   [/^(?:underline|decoration)-(?:size-)?(.+)$/, ([, s]) => ({ "text-decoration-thickness": handler.bracket.px(s) })],
   [/^(?:underline|decoration)-(auto|from-font)$/, ([, s]) => ({ "text-decoration-thickness": s })],
   [/^(?:underline|decoration)-(.+)$/, (match, ctx) => {
-    const result = colorResolver$1("text-decoration-color", "line")(match, ctx);
+    const result = colorResolver("text-decoration-color", "line")(match, ctx);
     if (result) {
       return {
         "-webkit-text-decoration-color": result["text-decoration-color"],
@@ -792,15 +726,11 @@ const textDecorations = [
 ];
 
 const svgUtilities = [
-  [/^fill-(.+)$/, colorResolver$1("fill", "fill")],
+  [/^fill-(.+)$/, colorResolver("fill", "fill")],
   [/^fill-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-fill-opacity": handler.bracket.percent(opacity) })],
   ["fill-none", { fill: "none" }],
-  [/^stroke-(?:size-|width-)?(.+)$/, ([, s]) => {
-    const v = handler.bracket.fraction.px.number(s);
-    if (v)
-      return { "stroke-width": v };
-  }],
-  [/^stroke-(.+)$/, colorResolver$1("stroke", "stroke")],
+  [/^stroke-(?:size-|width-)?(.+)$/, ([, s]) => ({ "stroke-width": handler.bracket.fraction.px.number(s) })],
+  [/^stroke-(.+)$/, colorResolver("stroke", "stroke")],
   [/^stroke-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-stroke-opacity": handler.bracket.percent(opacity) })],
   ["stroke-none", { stroke: "none" }]
 ];

package/dist/chunks/default3.cjs

@@ -4,7 +4,7 @@ const variants$1 = require('./variants.cjs');
 const pseudo = require('./pseudo.cjs');
 
 const regexCache = {};
-const variantBreakpoints = (matcher, _, theme) => {
+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])
@@ -46,26 +46,22 @@ const variantCombinators = [
   variants$1.variantMatcher("svg", (input) => `${input} svg *`)
 ];
 
-const variantColorsClass = [
-  variants$1.variantMatcher("dark", (input) => `.dark $$ ${input}`),
-  variants$1.variantMatcher("light", (input) => `.light $$ ${input}`)
-];
-const variantColorsMedia = [
-  (v) => {
-    const dark = variants$1.variantMatcher("dark")(v);
-    if (dark) {
-      return {
-        ...dark,
-        parent: "@media (prefers-color-scheme: dark)"
-      };
-    }
-    const light = variants$1.variantMatcher("light")(v);
-    if (light) {
-      return {
-        ...light,
-        parent: "@media (prefers-color-scheme: light)"
-      };
-    }
+const variantColorsMediaOrClass = [
+  (v, { options: { dark } }) => {
+    if (dark === "class")
+      return variants$1.variantMatcher("dark", (input) => `.dark $$ ${input}`)(v);
+  },
+  (v, { options: { dark } }) => {
+    if (dark === "class")
+      return variants$1.variantMatcher("light", (input) => `.light $$ ${input}`)(v);
+  },
+  (v, { options: { dark } }) => {
+    if (dark === "media")
+      return variants$1.variantParentMatcher("dark", "@media (prefers-color-scheme: dark)")(v);
+  },
+  (v, { options: { dark } }) => {
+    if (dark === "media")
+      return variants$1.variantParentMatcher("light", "@media (prefers-color-scheme: light)")(v);
   }
 ];
 
@@ -113,24 +109,28 @@ const variantSpace = (matcher) => {
   }
 };
 
-const variants = (options) => [
+const variantPrint = variants$1.variantParentMatcher("print", "@media print");
+
+const variants = [
   variantSpace,
   variantNegative,
   variantImportant,
+  variantPrint,
   variantBreakpoints,
   ...variantCombinators,
   pseudo.variantPseudoClasses,
-  pseudo.variantTaggedPseudoClasses(options),
+  pseudo.variantPseudoClassFunctions,
+  pseudo.variantTaggedPseudoClasses,
   pseudo.variantPseudoElements,
   pseudo.partClasses,
-  ...options.dark === "media" ? variantColorsMedia : variantColorsClass
+  ...variantColorsMediaOrClass
 ];
 
 exports.variantBreakpoints = variantBreakpoints;
-exports.variantColorsClass = variantColorsClass;
-exports.variantColorsMedia = variantColorsMedia;
+exports.variantColorsMediaOrClass = variantColorsMediaOrClass;
 exports.variantCombinators = variantCombinators;
 exports.variantImportant = variantImportant;
 exports.variantNegative = variantNegative;
+exports.variantPrint = variantPrint;
 exports.variantSpace = variantSpace;
 exports.variants = variants;

package/dist/chunks/default3.mjs

@@ -1,8 +1,8 @@
-import { v as variantMatcher } from './variants.mjs';
-import { v as variantPseudoClasses, a as variantTaggedPseudoClasses, b as variantPseudoElements, p as partClasses } from './pseudo.mjs';
+import { v as variantMatcher, a as variantParentMatcher } from './variants.mjs';
+import { v as variantPseudoClasses, a as variantPseudoClassFunctions, b as variantTaggedPseudoClasses, c as variantPseudoElements, p as partClasses } from './pseudo.mjs';
 
 const regexCache = {};
-const variantBreakpoints = (matcher, _, theme) => {
+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])
@@ -44,26 +44,22 @@ const variantCombinators = [
   variantMatcher("svg", (input) => `${input} svg *`)
 ];
 
-const variantColorsClass = [
-  variantMatcher("dark", (input) => `.dark $$ ${input}`),
-  variantMatcher("light", (input) => `.light $$ ${input}`)
-];
-const variantColorsMedia = [
-  (v) => {
-    const dark = variantMatcher("dark")(v);
-    if (dark) {
-      return {
-        ...dark,
-        parent: "@media (prefers-color-scheme: dark)"
-      };
-    }
-    const light = variantMatcher("light")(v);
-    if (light) {
-      return {
-        ...light,
-        parent: "@media (prefers-color-scheme: light)"
-      };
-    }
+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);
   }
 ];
 
@@ -111,17 +107,21 @@ const variantSpace = (matcher) => {
   }
 };
 
-const variants = (options) => [
+const variantPrint = variantParentMatcher("print", "@media print");
+
+const variants = [
   variantSpace,
   variantNegative,
   variantImportant,
+  variantPrint,
   variantBreakpoints,
   ...variantCombinators,
   variantPseudoClasses,
-  variantTaggedPseudoClasses(options),
+  variantPseudoClassFunctions,
+  variantTaggedPseudoClasses,
   variantPseudoElements,
   partClasses,
-  ...options.dark === "media" ? variantColorsMedia : variantColorsClass
+  ...variantColorsMediaOrClass
 ];
 
-export { variantBreakpoints as a, variantCombinators as b, variantColorsClass as c, variantColorsMedia as d, variantImportant as e, variantNegative as f, variantSpace as g, variants as v };
+export { variantBreakpoints as a, variantCombinators as b, variantColorsMediaOrClass as c, variantImportant as d, variantNegative as e, variantSpace as f, variantPrint as g, variants as v };

package/dist/chunks/pseudo.cjs

@@ -47,23 +47,30 @@ const PseudoElements = [
   "first-line",
   "selection"
 ];
+const PseudoClassFunctions = [
+  "not",
+  "is",
+  "where",
+  "has"
+];
 const PartClassesRE = /(part-\[(.+)]:)(.+)/;
 const PseudoElementsRE = new RegExp(`^(${PseudoElements.join("|")})[:-]`);
 const PseudoClassesStr = Object.keys(PseudoClasses).join("|");
+const PseudoClassFunctionsStr = PseudoClassFunctions.join("|");
 const PseudoClassesRE = new RegExp(`^(${PseudoClassesStr})[:-]`);
-const PseudoClassesNotRE = new RegExp(`^not-(${PseudoClassesStr})[:-]`);
+const PseudoClassFunctionsRE = new RegExp(`^(${PseudoClassFunctionsStr})-(${PseudoClassesStr})[:-]`);
 function shouldAdd(entires) {
   return !entires.find((i) => i[0] === CONTROL_BYPASS_PSEUDO_CLASS) || void 0;
 }
-function taggedPseudoClassMatcher(tag, parent, combinator) {
-  const re = new RegExp(`^${tag}-((not-)?(${PseudoClassesStr}))[:-]`);
+const taggedPseudoClassMatcher = (tag, parent, combinator) => {
+  const re = new RegExp(`^${tag}-((?:(${PseudoClassFunctionsStr})-)?(${PseudoClassesStr}))[:-]`);
   const rawRe = new RegExp(`^${core.escapeRegExp(parent)}:`);
   return (input) => {
     const match = input.match(re);
     if (match) {
       let pseudo = PseudoClasses[match[3]] || match[3];
       if (match[2])
-        pseudo = `not(:${pseudo})`;
+        pseudo = `${match[2]}(:${pseudo})`;
       return {
         matcher: input.slice(match[1].length + tag.length + 2),
         selector: (s, body) => {
@@ -72,7 +79,7 @@ function taggedPseudoClassMatcher(tag, parent, combinator) {
       };
     }
   };
-}
+};
 const variantPseudoElements = (input) => {
   const match = input.match(PseudoElementsRE);
   if (match) {
@@ -84,7 +91,7 @@ const variantPseudoElements = (input) => {
 };
 const variantPseudoClasses = {
   match: (input) => {
-    let match = input.match(PseudoClassesRE);
+    const match = input.match(PseudoClassesRE);
     if (match) {
       const pseudo = PseudoClasses[match[1]] || match[1];
       return {
@@ -92,29 +99,34 @@ const variantPseudoClasses = {
         selector: (s, body) => shouldAdd(body) && `${s}:${pseudo}`
       };
     }
-    match = input.match(PseudoClassesNotRE);
+  },
+  multiPass: true
+};
+const variantPseudoClassFunctions = {
+  match: (input) => {
+    const match = input.match(PseudoClassFunctionsRE);
     if (match) {
-      const pseudo = PseudoClasses[match[1]] || match[1];
+      const fn = match[1];
+      const pseudo = PseudoClasses[match[2]] || match[2];
       return {
-        matcher: input.slice(match[1].length + 5),
-        selector: (s, body) => shouldAdd(body) && `${s}:not(:${pseudo})`
+        matcher: input.slice(match[1].length + match[2].length + 2),
+        selector: (s, body) => shouldAdd(body) && `${s}:${fn}(:${pseudo})`
       };
     }
   },
   multiPass: true
 };
-const variantTaggedPseudoClasses = (options = {}) => ({
-  match: (input) => {
-    const attributify = !!options?.attributifyPseudo;
-    const g = taggedPseudoClassMatcher("group", attributify ? '[group=""]' : ".group", " ")(input);
+const variantTaggedPseudoClasses = {
+  match: (input, { options: { attributifyPseudo } }) => {
+    const g = taggedPseudoClassMatcher("group", attributifyPseudo ? '[group=""]' : ".group", " ")(input);
     if (g)
       return g;
-    const p = taggedPseudoClassMatcher("peer", attributify ? '[peer=""]' : ".peer", "~")(input);
+    const p = taggedPseudoClassMatcher("peer", attributifyPseudo ? '[peer=""]' : ".peer", "~")(input);
     if (p)
       return p;
   },
   multiPass: true
-});
+};
 const partClasses = {
   match: (input) => {
     const match = input.match(PartClassesRE);
@@ -132,8 +144,8 @@ const partClasses = {
 };
 
 exports.CONTROL_BYPASS_PSEUDO_CLASS = CONTROL_BYPASS_PSEUDO_CLASS;
-exports.PseudoClasses = PseudoClasses;
 exports.partClasses = partClasses;
+exports.variantPseudoClassFunctions = variantPseudoClassFunctions;
 exports.variantPseudoClasses = variantPseudoClasses;
 exports.variantPseudoElements = variantPseudoElements;
 exports.variantTaggedPseudoClasses = variantTaggedPseudoClasses;