@unocss/transformer-directives 0.59.4 → 0.60.1

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,13 +1,6 @@
-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 { transformThemeFn, hasThemeFn } from '@unocss/rule-utils';
-
-function handleThemeFn({ code, uno, options }, node) {
-  const { throwOnMissing = true } = options;
-  const offset = node.value.loc.start.offset;
-  const str = code.original.slice(offset, node.value.loc.end.offset);
-  code.overwrite(offset, node.value.loc.end.offset, transformThemeFn(str, uno.config.theme, throwOnMissing));
-}
+import { transformThemeString, hasThemeFn } from '@unocss/rule-utils';
 
 const screenRuleRE = /(@screen) (.+) /g;
 function handleScreen({ code, uno }, node) {
@@ -79,14 +72,19 @@ async function handleApply(ctx, node) {
 async function parseApply({ code, uno, offset, applyVariable }, node, childNode) {
   const calcOffset = (pos) => offset ? pos + offset : pos;
   let body;
-  if (childNode.type === "Atrule" && childNode.name === "apply" && childNode.prelude && childNode.prelude.type === "Raw")
-    body = childNode.prelude.value.trim();
-  else if (childNode.type === "Declaration" && applyVariable.includes(childNode.property) && childNode.value.type === "Raw")
-    body = childNode.value.value.trim();
+  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(
+      calcOffset(childNode.value.loc.start.offset),
+      calcOffset(childNode.value.loc.end.offset)
+    );
+    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, "-"))
@@ -138,17 +136,24 @@ async function parseApply({ code, uno, offset, applyVariable }, node, childNode)
     calcOffset(childNode.loc.end.offset + simicolonOffset)
   );
 }
+function removeQuotes(value) {
+  return value.replace(/^(['"])(.*)\1$/, "$2");
+}
 
-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);
+function handleFunction({ code, uno, options }, node) {
+  const { throwOnMissing = true } = options;
+  switch (node.name) {
+    case "theme": {
+      if (node.children.size !== 1)
+        throw new Error("theme() expect exact one argument");
+      const themeStr = node.children.first.value;
+      const value = transformThemeString(themeStr, uno.config.theme, throwOnMissing);
+      if (value)
+        code.overwrite(node.loc.start.offset, node.loc.end.offset, value);
     }
-  };
+  }
 }
+
 async function transformDirectives(code, uno, options, filename, originalCode, offset) {
   let { applyVariable } = options;
   const varStyle = options.varStyle;
@@ -164,6 +169,7 @@ async function transformDirectives(code, uno, options, filename, originalCode, o
   if (!hasApply && !hasThemeFn$1 && !hasScreen)
     return;
   const ast = parse(originalCode || code.original, {
+    parseCustomProperty: true,
     parseAtrulePrelude: false,
     positions: true,
     filename
@@ -182,8 +188,8 @@ async function transformDirectives(code, uno, options, filename, originalCode, o
   const processNode = async (node, _item, _list) => {
     if (hasScreen && node.type === "Atrule")
       handleScreen(ctx, node);
-    if (hasThemeFn$1 && node.type === "Declaration")
-      handleThemeFn(ctx, node);
+    if (node.type === "Function")
+      handleFunction(ctx, node);
     if (hasApply && node.type === "Rule")
       await handleApply(ctx, node);
   };
@@ -191,4 +197,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.59.4",
+  "version": "0.60.1",
   "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.59.4",
-    "@unocss/rule-utils": "0.59.4"
+    "@unocss/core": "0.60.1",
+    "@unocss/rule-utils": "0.60.1"
   },
   "devDependencies": {
     "magic-string": "^0.30.10"