@unocss/transformer-directives 0.59.4 → 0.60.0

package/dist/index.mjs

@@ -1,13 +1,6 @@
 import { expandVariantGroup, notNull, regexScopePlaceholder, cssIdRE, toArray } 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,10 +72,20 @@ 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")
+  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();
+  } 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();
+  }
   if (!body)
     return;
   if (/^(['"]).*\1$/.test(body))
@@ -139,6 +142,20 @@ async function parseApply({ code, uno, offset, applyVariable }, node, childNode)
   );
 }
 
+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);
+    }
+  }
+}
+
 function transformerDirectives(options = {}) {
   return {
     name: "@unocss/transformer-directives",
@@ -164,6 +181,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 +200,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);
   };

package/package.json

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