@unocss/transformer-directives 0.62.2 → 0.62.3

package/dist/index.mjs

@@ -98,7 +98,7 @@ async function parseApply({ code, uno, applyVariable }, node, childNode) {
   }, []);
   if (!utils.length)
     return;
-  const simicolonOffset = original[childNode.loc.end.offset] === ";" ? 1 : 0;
+  let simicolonOffset = original[childNode.loc.end.offset] === ";" ? 1 : original[childNode.loc.end.offset] === "@" ? -1 : 0;
   for (const i of utils) {
     const [, _selector, body2, parent] = i;
     const selectorOrGroup = _selector?.replace(regexScopePlaceholder, " ") || _selector;
@@ -124,10 +124,11 @@ async function parseApply({ code, uno, applyVariable }, node, childNode) {
       let css = `${newSelector.replace(/.\\-/g, className)}{${body2}}`;
       if (parent)
         css = `${parent}{${css}}`;
+      simicolonOffset = 0;
       code.appendLeft(node.loc.end.offset, css);
     } else {
       if (body2.includes("@"))
-        code.appendRight(original.length + simicolonOffset, body2);
+        code.appendRight(original.length, body2);
       else
         code.appendRight(childNode.loc.end.offset + simicolonOffset, body2);
     }
@@ -167,12 +168,13 @@ async function transformDirectives(code, uno, options, filename, originalCode, o
     applyVariable = ["--at-apply", "--uno-apply", "--uno"];
   }
   applyVariable = toArray(applyVariable || []);
-  const hasApply = code.original.includes("@apply") || applyVariable.some((s) => code.original.includes(s));
-  const hasScreen = code.original.includes("@screen");
-  const hasThemeFn$1 = hasThemeFn(code.original);
+  const parseCode = originalCode || code.original;
+  const hasApply = parseCode.includes("@apply") || applyVariable.some((s) => parseCode.includes(s));
+  const hasScreen = parseCode.includes("@screen");
+  const hasThemeFn$1 = hasThemeFn(parseCode);
   if (!hasApply && !hasThemeFn$1 && !hasScreen)
     return;
-  const ast = parse(originalCode || code.original, {
+  const ast = parse(parseCode, {
     parseCustomProperty: true,
     parseAtrulePrelude: false,
     positions: true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/transformer-directives",
   "type": "module",
-  "version": "0.62.2",
+  "version": "0.62.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/rule-utils": "0.62.2",
-    "@unocss/core": "0.62.2"
+    "@unocss/core": "0.62.3",
+    "@unocss/rule-utils": "0.62.3"
   },
   "devDependencies": {
     "magic-string": "^0.30.11"