@unocss/transformer-directives 0.60.1 → 0.60.3

package/dist/index.mjs

@@ -52,7 +52,7 @@ function handleScreen({ code, uno }, node) {
   }
 }
 function calcMaxWidthBySize(size) {
-  const value = size.match(/^-?[0-9]+\.?[0-9]*/)?.[0] || "";
+  const value = size.match(/^-?\d+\.?\d*/)?.[0] || "";
   const unit = size.slice(value.length);
   const maxWidth = Number.parseFloat(value) - 0.1;
   return Number.isNaN(maxWidth) ? size : `${maxWidth}${unit}`;
@@ -71,20 +71,22 @@ async function handleApply(ctx, node) {
 }
 async function parseApply({ code, uno, offset, applyVariable }, node, childNode) {
   const calcOffset = (pos) => offset ? pos + offset : pos;
+  const original = code.original;
   let body;
   if (childNode.type === "Atrule" && childNode.name === "apply" && childNode.prelude && childNode.prelude.type === "Raw") {
     body = removeQuotes(childNode.prelude.value.trim());
   } else if (childNode.type === "Declaration" && applyVariable.includes(childNode.property) && childNode.value.type === "Value") {
-    let rawValue = code.original.slice(
+    let rawValue = original.slice(
       calcOffset(childNode.value.loc.start.offset),
       calcOffset(childNode.value.loc.end.offset)
-    );
+    ).trim();
     rawValue = removeQuotes(rawValue);
     const items = rawValue.split(/\s+/g).filter(Boolean).map((i) => removeQuotes(i));
     body = items.join(" ");
   }
   if (!body)
     return;
+  body = removeComments(body);
   const classNames = expandVariantGroup(body).split(/\s+/g).map((className) => className.trim().replace(/\\/, ""));
   const utils = (await Promise.all(
     classNames.map((i) => uno.parseToken(i, "-"))
@@ -98,7 +100,7 @@ async function parseApply({ code, uno, offset, applyVariable }, node, childNode)
   }, []);
   if (!utils.length)
     return;
-  const simicolonOffset = code.toString()[childNode.loc.end.offset] === ";" ? 1 : 0;
+  const simicolonOffset = original[calcOffset(childNode.loc.end.offset)] === ";" ? 1 : 0;
   for (const i of utils) {
     const [, _selector, body2, parent] = i;
     const selectorOrGroup = _selector?.replace(regexScopePlaceholder, " ") || _selector;
@@ -126,7 +128,7 @@ async function parseApply({ code, uno, offset, applyVariable }, node, childNode)
       code.appendLeft(calcOffset(node.loc.end.offset), css);
     } else {
       if (body2.includes("@"))
-        code.appendRight(code.original.length + simicolonOffset, body2);
+        code.appendRight(original.length + simicolonOffset, body2);
       else
         code.appendRight(calcOffset(childNode.loc.end.offset + simicolonOffset), body2);
     }
@@ -139,6 +141,9 @@ async function parseApply({ code, uno, offset, applyVariable }, node, childNode)
 function removeQuotes(value) {
   return value.replace(/^(['"])(.*)\1$/, "$2");
 }
+function removeComments(value) {
+  return value.replace(/(\/\*(?:.|\n)*?\*\/)|(\/\/.*)/g, "");
+}
 
 function handleFunction({ code, uno, options }, node) {
   const { throwOnMissing = true } = options;

package/package.json

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