@unocss/preset-wind4 66.7.4-beta.1 → 66.7.5

package/dist/index.d.mts

@@ -1,4 +1,4 @@
 import { C as Theme, E as theme } from "./theme-DFkXSCqq.mjs";
 import { G as preflights, J as postprocessors, U as shorthands, W as shortcuts, i as presetWind4, j as variants, n as PreflightsTheme, r as PresetWind4Options, t as DarkModeSelectors } from "./index-ZwoWjPej.mjs";
-import { bt as rules } from "./rules-UeVNVqAS.mjs";
+import { xt as rules } from "./rules-DRyeJ90q.mjs";
 export { DarkModeSelectors, PreflightsTheme, PresetWind4Options, type Theme, presetWind4 as default, presetWind4, postprocessors, preflights, rules, shortcuts, shorthands, theme, variants };

package/dist/{rules-UeVNVqAS.d.mts → rules-DRyeJ90q.d.mts}

@@ -61,6 +61,7 @@ declare const flex: Rule<Theme$1>[];
 //#endregion
 //#region src/rules/gap.d.ts
 declare const gaps: Rule<Theme$1>[];
+declare const gapRules: Rule<Theme$1>[];
 //#endregion
 //#region src/rules/grid.d.ts
 declare const grids: Rule<Theme$1>[];
@@ -204,4 +205,4 @@ declare const cssProperty: Rule<Theme$1>[];
 //#region src/rules/view-transition.d.ts
 declare const viewTransition: Rule<Theme$1>[];
 //#endregion
-export { rings as $, hyphens as A, borders as At, userSelects as B, willChange as Bt, contents as C, containerParent as Ct, fieldSizing as D, colorScheme as Dt, dynamicViewportHeight as E, bgColors as Et, resizes as F, imageRenderings as Ft, notLastChildSelectorVariant as G, writingModes as H, animations as Ht, screenReadersAccess as I, listStyle as It, aspectRatio as J, paddings as K, textOverflows as L, outline as Lt, mixBlendModes as M, accents as Mt, objectPositions as N, appearance as Nt, fontSmoothings as O, opacity as Ot, pointerEvents as P, carets as Pt, scrolls as Q, textTransforms as R, overscrolls as Rt, contentVisibility as S, container as St, displays as T, columns as Tt, writingOrientations as U, textAligns as Ut, whitespaces as V, backgroundStyles as Vt, margins as W, verticalAligns as Wt, boxShadows as X, sizes as Y, shadowProperties as Z, accessibility as _, flex as _t, fonts as a, insets as at, breaks as b, rules as bt, textIndents as c, placements as ct, transitions as d, placeholders as dt, questionMark as et, transformBase as f, masks as ft, svgUtilities as g, gaps as gt, tables as h, grids as ht, fontVariantNumeric as i, floats as it, isolations as j, handlerBorderStyle as jt, fontStyles as k, borderStyles as kt, textShadows as l, positions as lt, touchActions as m, overflows as mt, cssProperty as n, boxSizing as nt, splitShorthand as o, justifies as ot, transforms as p, lineClamps as pt, spaces as q, cssVariables as r, flexGridJustifiesAlignments as rt, tabSizes as s, orders as st, viewTransition as t, alignments as tt, textStrokes as u, zIndexes as ut, appearances as v, filters as vt, cursors as w, containerShortcuts as wt, contains as x, textDecorations as xt, backgroundBlendModes as y, divides as yt, textWraps as z, scrollBehaviors as zt };
+export { rings as $, hyphens as A, borderStyles as At, userSelects as B, scrollBehaviors as Bt, contents as C, container as Ct, fieldSizing as D, bgColors as Dt, dynamicViewportHeight as E, columns as Et, resizes as F, carets as Ft, notLastChildSelectorVariant as G, verticalAligns as Gt, writingModes as H, backgroundStyles as Ht, screenReadersAccess as I, imageRenderings as It, aspectRatio as J, paddings as K, textOverflows as L, listStyle as Lt, mixBlendModes as M, handlerBorderStyle as Mt, objectPositions as N, accents as Nt, fontSmoothings as O, colorScheme as Ot, pointerEvents as P, appearance as Pt, scrolls as Q, textTransforms as R, outline as Rt, contentVisibility as S, textDecorations as St, displays as T, containerShortcuts as Tt, writingOrientations as U, animations as Ut, whitespaces as V, willChange as Vt, margins as W, textAligns as Wt, boxShadows as X, sizes as Y, shadowProperties as Z, accessibility as _, gaps as _t, fonts as a, insets as at, breaks as b, divides as bt, textIndents as c, placements as ct, transitions as d, placeholders as dt, questionMark as et, transformBase as f, masks as ft, svgUtilities as g, gapRules as gt, tables as h, grids as ht, fontVariantNumeric as i, floats as it, isolations as j, borders as jt, fontStyles as k, opacity as kt, textShadows as l, positions as lt, touchActions as m, overflows as mt, cssProperty as n, boxSizing as nt, splitShorthand as o, justifies as ot, transforms as p, lineClamps as pt, spaces as q, cssVariables as r, flexGridJustifiesAlignments as rt, tabSizes as s, orders as st, viewTransition as t, alignments as tt, textStrokes as u, zIndexes as ut, appearances as v, flex as vt, cursors as w, containerParent as wt, contains as x, rules as xt, backgroundBlendModes as y, filters as yt, textWraps as z, overscrolls as zt };

package/dist/rules.d.mts

@@ -1,2 +1,2 @@
-import { $ as rings, A as hyphens, At as borders, B as userSelects, Bt as willChange, C as contents, Ct as containerParent, D as fieldSizing, Dt as colorScheme, E as dynamicViewportHeight, Et as bgColors, F as resizes, Ft as imageRenderings, G as notLastChildSelectorVariant, H as writingModes, Ht as animations, I as screenReadersAccess, It as listStyle, J as aspectRatio, K as paddings, L as textOverflows, Lt as outline, M as mixBlendModes, Mt as accents, N as objectPositions, Nt as appearance, O as fontSmoothings, Ot as opacity, P as pointerEvents, Pt as carets, Q as scrolls, R as textTransforms, Rt as overscrolls, S as contentVisibility, St as container, T as displays, Tt as columns, U as writingOrientations, Ut as textAligns, V as whitespaces, Vt as backgroundStyles, W as margins, Wt as verticalAligns, X as boxShadows, Y as sizes, Z as shadowProperties, _ as accessibility, _t as flex, a as fonts, at as insets, b as breaks, bt as rules, c as textIndents, ct as placements, d as transitions, dt as placeholders, et as questionMark, f as transformBase, ft as masks, g as svgUtilities, gt as gaps, h as tables, ht as grids, i as fontVariantNumeric, it as floats, j as isolations, jt as handlerBorderStyle, k as fontStyles, kt as borderStyles, l as textShadows, lt as positions, m as touchActions, mt as overflows, n as cssProperty, nt as boxSizing, o as splitShorthand, ot as justifies, p as transforms, pt as lineClamps, q as spaces, r as cssVariables, rt as flexGridJustifiesAlignments, s as tabSizes, st as orders, t as viewTransition, tt as alignments, u as textStrokes, ut as zIndexes, v as appearances, vt as filters, w as cursors, wt as containerShortcuts, x as contains, xt as textDecorations, y as backgroundBlendModes, yt as divides, z as textWraps, zt as scrollBehaviors } from "./rules-UeVNVqAS.mjs";
-export { accents, accessibility, alignments, animations, appearance, appearances, aspectRatio, backgroundBlendModes, backgroundStyles, bgColors, borderStyles, borders, boxShadows, boxSizing, breaks, carets, colorScheme, columns, container, containerParent, containerShortcuts, contains, contentVisibility, contents, cssProperty, cssVariables, cursors, displays, divides, dynamicViewportHeight, fieldSizing, filters, flex, flexGridJustifiesAlignments, floats, fontSmoothings, fontStyles, fontVariantNumeric, fonts, gaps, grids, handlerBorderStyle, hyphens, imageRenderings, insets, isolations, justifies, lineClamps, listStyle, margins, masks, mixBlendModes, notLastChildSelectorVariant, objectPositions, opacity, orders, outline, overflows, overscrolls, paddings, placeholders, placements, pointerEvents, positions, questionMark, resizes, rings, rules, screenReadersAccess, scrollBehaviors, scrolls, shadowProperties, sizes, spaces, splitShorthand, svgUtilities, tabSizes, tables, textAligns, textDecorations, textIndents, textOverflows, textShadows, textStrokes, textTransforms, textWraps, touchActions, transformBase, transforms, transitions, userSelects, verticalAligns, viewTransition, whitespaces, willChange, writingModes, writingOrientations, zIndexes };
+import { $ as rings, A as hyphens, At as borderStyles, B as userSelects, Bt as scrollBehaviors, C as contents, Ct as container, D as fieldSizing, Dt as bgColors, E as dynamicViewportHeight, Et as columns, F as resizes, Ft as carets, G as notLastChildSelectorVariant, Gt as verticalAligns, H as writingModes, Ht as backgroundStyles, I as screenReadersAccess, It as imageRenderings, J as aspectRatio, K as paddings, L as textOverflows, Lt as listStyle, M as mixBlendModes, Mt as handlerBorderStyle, N as objectPositions, Nt as accents, O as fontSmoothings, Ot as colorScheme, P as pointerEvents, Pt as appearance, Q as scrolls, R as textTransforms, Rt as outline, S as contentVisibility, St as textDecorations, T as displays, Tt as containerShortcuts, U as writingOrientations, Ut as animations, V as whitespaces, Vt as willChange, W as margins, Wt as textAligns, X as boxShadows, Y as sizes, Z as shadowProperties, _ as accessibility, _t as gaps, a as fonts, at as insets, b as breaks, bt as divides, c as textIndents, ct as placements, d as transitions, dt as placeholders, et as questionMark, f as transformBase, ft as masks, g as svgUtilities, gt as gapRules, h as tables, ht as grids, i as fontVariantNumeric, it as floats, j as isolations, jt as borders, k as fontStyles, kt as opacity, l as textShadows, lt as positions, m as touchActions, mt as overflows, n as cssProperty, nt as boxSizing, o as splitShorthand, ot as justifies, p as transforms, pt as lineClamps, q as spaces, r as cssVariables, rt as flexGridJustifiesAlignments, s as tabSizes, st as orders, t as viewTransition, tt as alignments, u as textStrokes, ut as zIndexes, v as appearances, vt as flex, w as cursors, wt as containerParent, x as contains, xt as rules, y as backgroundBlendModes, yt as filters, z as textWraps, zt as overscrolls } from "./rules-DRyeJ90q.mjs";
+export { accents, accessibility, alignments, animations, appearance, appearances, aspectRatio, backgroundBlendModes, backgroundStyles, bgColors, borderStyles, borders, boxShadows, boxSizing, breaks, carets, colorScheme, columns, container, containerParent, containerShortcuts, contains, contentVisibility, contents, cssProperty, cssVariables, cursors, displays, divides, dynamicViewportHeight, fieldSizing, filters, flex, flexGridJustifiesAlignments, floats, fontSmoothings, fontStyles, fontVariantNumeric, fonts, gapRules, gaps, grids, handlerBorderStyle, hyphens, imageRenderings, insets, isolations, justifies, lineClamps, listStyle, margins, masks, mixBlendModes, notLastChildSelectorVariant, objectPositions, opacity, orders, outline, overflows, overscrolls, paddings, placeholders, placements, pointerEvents, positions, questionMark, resizes, rings, rules, screenReadersAccess, scrollBehaviors, scrolls, shadowProperties, sizes, spaces, splitShorthand, svgUtilities, tabSizes, tables, textAligns, textDecorations, textIndents, textOverflows, textShadows, textStrokes, textTransforms, textWraps, touchActions, transformBase, transforms, transitions, userSelects, verticalAligns, viewTransition, whitespaces, willChange, writingModes, writingOrientations, zIndexes };

package/dist/rules.mjs

@@ -1150,23 +1150,148 @@ const directions = {
 	"col": ["column-"],
 	"row": ["row-"]
 };
-const gaps = [
+const directionFormatter = (p, i) => `${i}${p}`;
+const gaps = [[
+	/^(?:flex-|grid-)?gap-?()(.+)$/,
+	directionSize("gap", directions, directionFormatter),
+	{ autocomplete: ["gap-$spacing", "gap-<num>"] }
+], [
+	/^(?:flex-|grid-)?gap-(col|row|x|y)-?(.+)$/,
+	directionSize("gap", directions, directionFormatter),
+	{ autocomplete: ["gap-(col|row|x|y)-$spacing", "gap-(col|row|x|y)-<num>"] }
+]];
+const ruleDirections = {
+	"": "",
+	"x": "row-",
+	"y": "column-",
+	"col": "column-",
+	"row": "row-"
+};
+const gapRules = [
 	[
-		/^(?:flex-|grid-)?gap-?()(.+)$/,
-		directionSize("gap", directions, (p, i) => `${i}${p}`),
-		{ autocomplete: ["gap-$spacing", "gap-<num>"] }
+		/^rule(?:-(x|y|col|row))?-(.+)$/,
+		handlerRule,
+		{ autocomplete: [
+			"rule-$spacing",
+			"rule-<num>",
+			"rule-(x|y|col|row)-$spacing",
+			"rule-(x|y|col|row)-<num>"
+		] }
 	],
 	[
-		/^(?:flex-|grid-)?gap-([xy])-?(.+)$/,
-		directionSize("gap", directions, (p, i) => `${i}${p}`),
-		{ autocomplete: ["gap-(x|y)-$spacing", "gap-(x|y)-<num>"] }
+		/^rule(?:-(x|y|col|row))?(-width)?-(.+)$/,
+		handlerRuleSize,
+		{ autocomplete: [
+			"rule-$spacing",
+			"rule-<num>",
+			"rule-(x|y|col|row)-$spacing",
+			"rule-(x|y|col|row)-<num>"
+		] }
 	],
 	[
-		/^(?:flex-|grid-)?gap-(col|row)-?(.+)$/,
-		directionSize("gap", directions, (p, i) => `${i}${p}`),
-		{ autocomplete: ["gap-(col|row)-$spacing", "gap-(col|row)-<num>"] }
-	]
+		/^rule(?:-(x|y|col|row))?(-color)?-(.+)$/,
+		handlerRuleColor,
+		{ autocomplete: ["rule-$colors", "rule-(x|y|col|row)-$colors"] }
+	],
+	[
+		/^rule(?:-(x|y|col|row))?-op(?:acity)?-?(.+)$/,
+		([, d = "", v]) => ({ [`--un-${ruleDirections[d]}rule-opacity`]: h.bracket.percent(v) }),
+		{ autocomplete: ["rule-(op|opacity)-<percent>", "rule-(x|y|col|row)-(op|opacity)-<percent>"] }
+	],
+	[
+		/^rule(?:-(x|y|col|row))?(?:-style)?-(.+)$/,
+		handlerRuleStyle,
+		{ autocomplete: [`rule-style-(${borderStyles.join("|")})`, `rule-(x|y|col|row)-style-(${borderStyles.join(" | ")})`] }
+	],
+	[
+		/^rule(?:-(x|y|col|row))?-break-(normal|none|intersection)/,
+		([, d = "", v]) => ({ [`${ruleDirections[d]}rule-break`]: v }),
+		{ autocomplete: ["rule-break-(normal|none|intersection)", "rule-(x|y|col|row)-break-(normal|none|intersection)"] }
+	],
+	[
+		/^rule(?:-(x|y|col|row))?-visibility-(normal|all|none|between|around)$/,
+		([, d = "", v]) => ({ [`${ruleDirections[d]}rule-visibility-items`]: v }),
+		{ autocomplete: ["rule-visibility-(normal|all|none|between)", "rule-(x|y|col|row)-visibility-(normal|all|none|between)"] }
+	],
+	[
+		/^rule(?:-(x|y|col|row))?-inset(?:-(cap|junction))?(?:-(start|end))?-(.+)$/,
+		([, d = "", kind, edge, v]) => {
+			const p = ruleDirections[d];
+			const value = h.bracket.cssvar.px(v);
+			if (value != null) return { [[
+				p,
+				"rule",
+				"inset",
+				kind,
+				edge
+			].filter(Boolean).join("-")]: value };
+		},
+		{ autocomplete: [
+			"rule-inset-<num>",
+			"rule-inset-(start|end)-<num>",
+			"rule-inset-(cap|junction)-<num>",
+			"rule-inset-(cap|junction)-(start|end)-<num>",
+			"rule-(x|y|col|row)-inset-<num>",
+			"rule-(x|y|col|row)-inset-(start|end)-<num>",
+			"rule-(x|y|col|row)-inset-(cap|junction)-<num>",
+			"rule-(x|y|col|row)-inset-(cap|junction)-(start|end)-<num>"
+		] }
+	],
+	["rule-overlap-row", { "rule-overlap": "row-over-column" }],
+	["rule-overlap-column", { "rule-overlap": "column-over-row" }]
 ];
+function handlerRuleStyle([, a = "", s]) {
+	const property = ruleProperty(a, "style");
+	if (property && borderStyles.includes(s)) return { [property]: s };
+}
+function handlerRuleColor([, d = "", colorLabel, v], ctx) {
+	const property = ruleProperty(d, "color");
+	const varName = ruleProperty(d);
+	if (!property || !varName) return;
+	const bracketColor = h.bracket(v);
+	if (!colorLabel && hasRuleCSSVariable(bracketColor ?? v)) return;
+	if (bracketColor == null) return colorResolver(property, varName)(["", v], ctx);
+	const values = splitRuleValues(bracketColor);
+	if (values.every((c) => hasParseableColor(c, ctx.theme))) return { [property]: values.map((c) => parseColor(c, ctx.theme).color).join(",") };
+}
+function handlerRuleSize([, d = "", widthLabel, s = "1"], { theme }) {
+	const property = ruleProperty(d, "width");
+	if (!property) return;
+	const v = h.bracket.cssvar.px(s, theme);
+	if (!v) return;
+	const values = splitRuleValues(v).map((s) => h.cssvar.px(s) ?? s);
+	if (!widthLabel && values.some(isRuleCSSVariable)) return;
+	if (values.every((s) => isSize(s) || s.startsWith("var("))) return { [property]: values.join(",") };
+}
+function handlerRule([, d = "", v], { theme }) {
+	const property = ruleProperty(d);
+	const value = h.bracket.cssvar(v, theme);
+	const shorthand = value && resolveRuleShorthand(value, theme);
+	if (property && shorthand) return { [property]: shorthand };
+}
+function ruleProperty(direction, suffix) {
+	const prefix = ruleDirections[direction];
+	if (prefix == null) return;
+	return `${prefix}rule${suffix ? `-${suffix}` : ""}`;
+}
+function splitRuleValues(value) {
+	return value.split(splitComma).map((v) => v.trim());
+}
+function isRuleCSSVariable(value) {
+	return h.cssvar(value) != null;
+}
+function hasRuleCSSVariable(value) {
+	return splitRuleValues(value).some(isRuleCSSVariable);
+}
+function resolveRuleShorthand(value, theme) {
+	const components = getStringComponents(value, " ", 3);
+	if (!components) return;
+	if (!value.startsWith("var(") && !components.some((c) => borderStyles.includes(c))) return;
+	return components.map((c) => {
+		if (hasParseableColor(c, theme)) return parseColor(c, theme).color;
+		return h.cssvar.px(c) ?? c;
+	}).join(" ");
+}
 //#endregion
 //#region src/rules/grid.ts
 function rowCol(s) {
@@ -3075,7 +3200,8 @@ const rules = [
 	spaces,
 	divides,
 	fieldSizing,
+	gapRules,
 	questionMark
 ].flat();
 //#endregion
-export { accents, accessibility, alignments, animations, appearance, appearances, aspectRatio, backgroundBlendModes, backgroundStyles, bgColors, borderStyles, borders, boxShadows, boxSizing, breaks, carets, colorScheme, columns, container, containerParent, containerShortcuts, contains, contentVisibility, contents, cssProperty, cssVariables, cursors, displays, divides, dynamicViewportHeight, fieldSizing, filters, flex, flexGridJustifiesAlignments, floats, fontSmoothings, fontStyles, fontVariantNumeric, fonts, gaps, grids, handlerBorderStyle, hyphens, imageRenderings, insets, isolations, justifies, lineClamps, listStyle, margins, masks, mixBlendModes, notLastChildSelectorVariant, objectPositions, opacity, orders, outline, overflows, overscrolls, paddings, placeholders, placements, pointerEvents, positions, questionMark, resizes, rings, rules, screenReadersAccess, scrollBehaviors, scrolls, shadowProperties, sizes, spaces, splitShorthand, svgUtilities, tabSizes, tables, textAligns, textDecorations, textIndents, textOverflows, textShadows, textStrokes, textTransforms, textWraps, touchActions, transformBase, transforms, transitions, userSelects, verticalAligns, viewTransition, whitespaces, willChange, writingModes, writingOrientations, zIndexes };
+export { accents, accessibility, alignments, animations, appearance, appearances, aspectRatio, backgroundBlendModes, backgroundStyles, bgColors, borderStyles, borders, boxShadows, boxSizing, breaks, carets, colorScheme, columns, container, containerParent, containerShortcuts, contains, contentVisibility, contents, cssProperty, cssVariables, cursors, displays, divides, dynamicViewportHeight, fieldSizing, filters, flex, flexGridJustifiesAlignments, floats, fontSmoothings, fontStyles, fontVariantNumeric, fonts, gapRules, gaps, grids, handlerBorderStyle, hyphens, imageRenderings, insets, isolations, justifies, lineClamps, listStyle, margins, masks, mixBlendModes, notLastChildSelectorVariant, objectPositions, opacity, orders, outline, overflows, overscrolls, paddings, placeholders, placements, pointerEvents, positions, questionMark, resizes, rings, rules, screenReadersAccess, scrollBehaviors, scrolls, shadowProperties, sizes, spaces, splitShorthand, svgUtilities, tabSizes, tables, textAligns, textDecorations, textIndents, textOverflows, textShadows, textStrokes, textTransforms, textWraps, touchActions, transformBase, transforms, transitions, userSelects, verticalAligns, viewTransition, whitespaces, willChange, writingModes, writingOrientations, zIndexes };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/preset-wind4",
   "type": "module",
-  "version": "66.7.4-beta.1",
+  "version": "66.7.5",
   "description": "Tailwind 4 compact preset for UnoCSS",
   "authors": [
     {
@@ -54,9 +54,9 @@
     "dist"
   ],
   "dependencies": {
-    "@unocss/extractor-arbitrary-variants": "66.7.4-beta.1",
-    "@unocss/rule-utils": "66.7.4-beta.1",
-    "@unocss/core": "66.7.4-beta.1"
+    "@unocss/core": "66.7.5",
+    "@unocss/extractor-arbitrary-variants": "66.7.5",
+    "@unocss/rule-utils": "66.7.5"
   },
   "scripts": {
     "build": "tsdown --config-loader unrun",