@unocss/transformer-directives 66.6.6 → 66.6.7

package/dist/index.mjs

@@ -1,7 +1,6 @@
 import { cssIdRE, expandVariantGroup, notNull, regexScopePlaceholder, toArray } from "@unocss/core";
 import { calcMaxWidthBySize, hasIconFn, hasThemeFn, transformThemeFn, transformThemeString } from "@unocss/rule-utils";
 import { List, clone, generate, parse, walk } from "css-tree";
-
 //#region src/apply.ts
 async function handleApply(ctx, node) {
 	const { code, uno, options, filename } = ctx;
@@ -31,7 +30,7 @@ async function parseApply({ code, uno, applyVariable }, node, childNode) {
 	if (!utils.length) return;
 	let semicolonOffset = original[childNode.loc.end.offset] === ";" ? 1 : original[childNode.loc.end.offset] === "@" ? -1 : 0;
 	for (const i of utils) {
-		const [, _selector, body$1, parent, meta] = i;
+		const [, _selector, body, parent, meta] = i;
 		const selectorOrGroup = _selector?.replace(regexScopePlaceholder, " ") || _selector;
 		if (parent || selectorOrGroup && selectorOrGroup !== ".\\-" || meta?.noMerge) {
 			let newSelector = generate(node.prelude);
@@ -44,23 +43,23 @@ async function parseApply({ code, uno, applyVariable }, node, childNode) {
 					const selectorListAst = clone(ruleAST.prelude);
 					const classSelectors = new List();
 					selectorListAst?.children?.forEach((selectorAst) => {
-						classSelectors.appendList(selectorAst?.children?.filter((i$1) => i$1.type === "ClassSelector" && i$1.name === "\\-"));
+						classSelectors.appendList(selectorAst?.children?.filter((i) => i.type === "ClassSelector" && i.name === "\\-"));
 					});
-					classSelectors.forEach((i$1) => Object.assign(i$1, clone(child)));
+					classSelectors.forEach((i) => Object.assign(i, clone(child)));
 					Object.assign(child, selectorListAst);
 				});
 				newSelector = generate(prelude);
 			}
-			let css = `${newSelector.includes(".\\-") ? className.split(",").map((e) => newSelector.replace(/.\\-/g, e.trim())).join(",") : newSelector}{${body$1}}`;
+			let css = `${newSelector.includes(".\\-") ? className.split(",").map((e) => newSelector.replace(/.\\-/g, e.trim())).join(",") : newSelector}{${body}}`;
 			if (parent) if (parent.includes(" $$ ")) {
 				const [first, ...parentSelectors] = parent.split(" $$ ").reverse();
-				css = `${parentSelectors.reduce((p, c, i$1) => i$1 === parentSelectors.length - 1 ? `${p}{${c}{${css}}}${"}".repeat(i$1)}` : `${p}{${c}`, first)}`;
+				css = `${parentSelectors.reduce((p, c, i) => i === parentSelectors.length - 1 ? `${p}{${c}{${css}}}${"}".repeat(i)}` : `${p}{${c}`, first)}`;
 			} else if (parent === ".\\-") css = `${className}{${css}}`;
 			else css = `${parent}{${css}}`;
 			semicolonOffset = 0;
 			code.appendLeft(node.loc.end.offset, css);
-		} else if (body$1.includes("@")) code.appendRight(original.length, body$1);
-		else code.appendRight(childNode.loc.end.offset + semicolonOffset, body$1);
+		} else if (body.includes("@")) code.appendRight(original.length, body);
+		else code.appendRight(childNode.loc.end.offset + semicolonOffset, body);
 	}
 	code.remove(childNode.loc.start.offset, childNode.loc.end.offset + semicolonOffset);
 }
@@ -70,7 +69,6 @@ function removeQuotes(value) {
 function removeComments(value) {
 	return value.replace(/(\/\*(?:.|\n)*?\*\/)|(\/\/.*)/g, "");
 }
-
 //#endregion
 //#region src/icon.ts
 async function transformIconString(uno, icon, color) {
@@ -91,8 +89,8 @@ async function transformIconString(uno, icon, color) {
 		customizations: {
 			...customizations,
 			trimCustomSvg: true,
-			async iconCustomizer(collection, icon$1, props) {
-				await customizations.iconCustomizer?.(collection, icon$1, props);
+			async iconCustomizer(collection, icon, props) {
+				await customizations.iconCustomizer?.(collection, icon, props);
 				if (unit) {
 					if (!props.width) props.width = `${scale}${unit}`;
 					if (!props.height) props.height = `${scale}${unit}`;
@@ -107,7 +105,6 @@ async function transformIconString(uno, icon, color) {
 		if (parsed) return `url("data:image/svg+xml;utf8,${color ? api.encodeSvgForCss(parsed.svg).replace(/currentcolor/gi, color) : api.encodeSvgForCss(parsed.svg)}")`;
 	}
 }
-
 //#endregion
 //#region src/functions.ts
 async function handleFunction({ code, uno, options }, node) {
@@ -129,7 +126,7 @@ async function handleFunction({ code, uno, options }, node) {
 			break;
 		}
 		case "icon": {
-			const params = node.children.toArray().filter((node$1) => node$1.type === "String").map((node$1) => node$1.value);
+			const params = node.children.toArray().filter((node) => node.type === "String").map((node) => node.value);
 			if (params.length === 0) throw new Error("icon() expects at least one argument");
 			let [icon, color] = params;
 			if (color) color = encodeURIComponent(transformThemeFn(color, uno.config.theme, throwOnMissing));
@@ -139,7 +136,6 @@ async function handleFunction({ code, uno, options }, node) {
 		}
 	}
 }
-
 //#endregion
 //#region src/screen.ts
 const screenRuleRE = /(@screen [^{]+)(.+)/g;
@@ -166,11 +162,11 @@ function handleScreen({ code, uno }, node) {
 		size,
 		idx
 	]);
-	const generateMediaQuery = (breakpointName$1, prefix$1) => {
-		const [, size, idx] = variantEntries.find((i) => i[0] === breakpointName$1);
-		if (prefix$1) if (prefix$1 === "lt") return `@media (max-width: ${calcMaxWidthBySize(size)})`;
-		else if (prefix$1 === "at") return `@media (min-width: ${size})${variantEntries[idx + 1] ? ` and (max-width: ${calcMaxWidthBySize(variantEntries[idx + 1][1])})` : ""}`;
-		else throw new Error(`breakpoint variant not supported: ${prefix$1}`);
+	const generateMediaQuery = (breakpointName, prefix) => {
+		const [, size, idx] = variantEntries.find((i) => i[0] === breakpointName);
+		if (prefix) if (prefix === "lt") return `@media (max-width: ${calcMaxWidthBySize(size)})`;
+		else if (prefix === "at") return `@media (min-width: ${size})${variantEntries[idx + 1] ? ` and (max-width: ${calcMaxWidthBySize(variantEntries[idx + 1][1])})` : ""}`;
+		else throw new Error(`breakpoint variant not supported: ${prefix}`);
 		return `@media (min-width: ${size})`;
 	};
 	if (!variantEntries.find((i) => i[0] === breakpointName)) throw new Error(`breakpoint ${breakpointName} not found`);
@@ -178,9 +174,8 @@ function handleScreen({ code, uno }, node) {
 	const str = code.original.slice(offset, node.loc.end.offset);
 	const matches = Array.from(str.matchAll(screenRuleRE));
 	if (!matches.length) return;
-	for (const match$1 of matches) code.overwrite(offset + match$1.index, offset + match$1.index + match$1[1].length, `${generateMediaQuery(breakpointName, prefix)}`);
+	for (const match of matches) code.overwrite(offset + match.index, offset + match.index + match[1].length, `${generateMediaQuery(breakpointName, prefix)}`);
 }
-
 //#endregion
 //#region src/transform.ts
 async function transformDirectives(code, uno, options, filename, originalCode, offset) {
@@ -195,7 +190,7 @@ async function transformDirectives(code, uno, options, filename, originalCode, o
 		];
 	}
 	applyVariable = toArray(applyVariable || []);
-	const isHasApply = (code$1) => code$1.includes("@apply") || applyVariable.some((s) => code$1.includes(s));
+	const isHasApply = (code) => code.includes("@apply") || applyVariable.some((s) => code.includes(s));
 	const parseCode = originalCode || code.original;
 	const hasApply = isHasApply(parseCode);
 	const hasScreen = parseCode.includes("@screen");
@@ -234,7 +229,6 @@ async function transformDirectives(code, uno, options, filename, originalCode, o
 		if (newCode !== oldCode) code.update(0, code.original.length, newCode);
 	}
 }
-
 //#endregion
 //#region src/index.ts
 function transformerDirectives(options = {}) {
@@ -247,6 +241,5 @@ function transformerDirectives(options = {}) {
 		}
 	};
 }
-
 //#endregion
-export { transformerDirectives as default };
+export { transformerDirectives as default };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/transformer-directives",
   "type": "module",
-  "version": "66.6.6",
+  "version": "66.6.7",
   "description": "UnoCSS transformer for `@apply` directive",
   "author": "hannoeru <me@hanlee.co>",
   "license": "MIT",
@@ -29,8 +29,8 @@
   ],
   "dependencies": {
     "css-tree": "^3.1.0",
-    "@unocss/core": "66.6.6",
-    "@unocss/rule-utils": "66.6.6"
+    "@unocss/core": "66.6.7",
+    "@unocss/rule-utils": "66.6.7"
   },
   "devDependencies": {
     "magic-string": "^0.30.21"