@unocss/transformer-directives 0.60.0 → 0.60.2

package/dist/index.d.mts

@@ -35,7 +35,7 @@ interface TransformerDirectivesContext {
     offset?: number;
     filename?: string;
 }
+
 declare function transformerDirectives(options?: TransformerDirectivesOptions): SourceCodeTransformer;
-declare function transformDirectives(code: MagicString, uno: UnoGenerator, options: TransformerDirectivesOptions, filename?: string, originalCode?: string, offset?: number): Promise<void>;
 
-export { type TransformerDirectivesContext, type TransformerDirectivesOptions, transformerDirectives as default, transformDirectives };
+export { type TransformerDirectivesContext, type TransformerDirectivesOptions, transformerDirectives as default };

package/dist/index.d.ts

@@ -35,7 +35,7 @@ interface TransformerDirectivesContext {
     offset?: number;
     filename?: string;
 }
+
 declare function transformerDirectives(options?: TransformerDirectivesOptions): SourceCodeTransformer;
-declare function transformDirectives(code: MagicString, uno: UnoGenerator, options: TransformerDirectivesOptions, filename?: string, originalCode?: string, offset?: number): Promise<void>;
 
-export { type TransformerDirectivesContext, type TransformerDirectivesOptions, transformerDirectives as default, transformDirectives };
+export { type TransformerDirectivesContext, type TransformerDirectivesOptions, transformerDirectives as default };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { expandVariantGroup, notNull, regexScopePlaceholder, cssIdRE, toArray } from '@unocss/core';
+import { expandVariantGroup, notNull, regexScopePlaceholder, toArray, cssIdRE } from '@unocss/core';
 import { generate, parse, clone, List, walk } from 'css-tree';
 import { transformThemeString, hasThemeFn } from '@unocss/rule-utils';
 
@@ -71,25 +71,21 @@ 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 = childNode.prelude.value.trim();
+    body = removeQuotes(childNode.prelude.value.trim());
   } else if (childNode.type === "Declaration" && applyVariable.includes(childNode.property) && childNode.value.type === "Value") {
-    body = childNode.value.children.reduce((str, nodeItem) => {
-      switch (nodeItem.type) {
-        case "String":
-          return `${str} ${nodeItem.value}`;
-        case "Identifier":
-          return `${str} ${nodeItem.name}`;
-        default:
-          return str;
-      }
-    }, "").trim();
+    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;
-  if (/^(['"]).*\1$/.test(body))
-    body = body.slice(1, -1);
   const classNames = expandVariantGroup(body).split(/\s+/g).map((className) => className.trim().replace(/\\/, ""));
   const utils = (await Promise.all(
     classNames.map((i) => uno.parseToken(i, "-"))
@@ -103,7 +99,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;
@@ -131,7 +127,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);
     }
@@ -141,6 +137,9 @@ async function parseApply({ code, uno, offset, applyVariable }, node, childNode)
     calcOffset(childNode.loc.end.offset + simicolonOffset)
   );
 }
+function removeQuotes(value) {
+  return value.replace(/^(['"])(.*)\1$/, "$2");
+}
 
 function handleFunction({ code, uno, options }, node) {
   const { throwOnMissing = true } = options;
@@ -156,16 +155,6 @@ function handleFunction({ code, uno, options }, node) {
   }
 }
 
-function transformerDirectives(options = {}) {
-  return {
-    name: "@unocss/transformer-directives",
-    enforce: options?.enforce,
-    idFilter: (id) => cssIdRE.test(id),
-    transform: (code, id, ctx) => {
-      return transformDirectives(code, ctx.uno, options, id);
-    }
-  };
-}
 async function transformDirectives(code, uno, options, filename, originalCode, offset) {
   let { applyVariable } = options;
   const varStyle = options.varStyle;
@@ -209,4 +198,15 @@ async function transformDirectives(code, uno, options, filename, originalCode, o
   await Promise.all(stack);
 }
 
-export { transformerDirectives as default, transformDirectives };
+function transformerDirectives(options = {}) {
+  return {
+    name: "@unocss/transformer-directives",
+    enforce: options?.enforce,
+    idFilter: (id) => cssIdRE.test(id),
+    transform: (code, id, ctx) => {
+      return transformDirectives(code, ctx.uno, options, id);
+    }
+  };
+}
+
+export { transformerDirectives as default };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/transformer-directives",
   "type": "module",
-  "version": "0.60.0",
+  "version": "0.60.2",
   "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.60.0",
-    "@unocss/core": "0.60.0"
+    "@unocss/rule-utils": "0.60.2",
+    "@unocss/core": "0.60.2"
   },
   "devDependencies": {
     "magic-string": "^0.30.10"