@una-ui/extractor-vue-script-edge 0.64.0-29305804.1d98fb4 → 0.64.0-29313954.f2c5220

package/dist/index.mjs

@@ -1,10 +1,10 @@
-import traverseDefault from '@babel/traverse';
+import * as babel from '@babel/types';
 import { defaultSplitRE } from '@unocss/core';
+import { transform, NodeTypes } from '@vue/compiler-core';
 import { parse } from '@vue/compiler-sfc';
 import { parseModule } from 'magicast';
 import { parsePath } from 'ufo';
 
-const traverse = "default" in traverseDefault ? traverseDefault.default : traverseDefault;
 function generateSelectors(prefix, values) {
   prefix = prefix.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
   return values.filter((v) => Boolean(v) && v !== ":").map((v) => `[${prefix}~="${v}"]`);
@@ -33,18 +33,19 @@ function getLiteralValue(node) {
 }
 function getObjectLiteralValue(node) {
   return Object.fromEntries(
-    node.properties.filter((prop) => prop.type === "ObjectProperty").filter((prop) => prop.key.type === "Identifier").map((prop) => {
-      const key = prop.key.name;
-      return [key, getLiteralValue(prop.value)];
+    node.properties.filter((prop) => prop.type === "ObjectProperty").flatMap((prop) => {
+      const key = prop.key.type === "Identifier" ? prop.key.name : prop.key.type === "StringLiteral" ? prop.key.value : null;
+      if (!key) {
+        return [];
+      }
+      return [[key, getLiteralValue(prop.value)]];
     })
   );
 }
 function discoverVariants(node, prefixes) {
   const result = [];
-  traverse(node, {
-    noScope: true,
-    // scope doesn't work for some reason.
-    enter({ node: node2 }) {
+  babel.traverse(node, {
+    enter(node2) {
       if (node2.type === "ObjectExpression") {
         const object = getObjectLiteralValue(node2);
         for (let [key, value] of Object.entries(object)) {
@@ -81,24 +82,57 @@ function discoverVariants(node, prefixes) {
     return generateSelectors(key, values);
   });
 }
+function parseCodeAst(code, id) {
+  const { $ast: node } = parseModule(code, {
+    sourceFileName: id
+  });
+  return node;
+}
+function extractTemplateExpressions(node) {
+  const expressions = [];
+  transform(node, {
+    nodeTransforms: [
+      // readonly "transformer", doesn't do any changes
+      (node2) => {
+        if (node2.type === NodeTypes.ELEMENT) {
+          node2.props.forEach((prop) => {
+            if (prop.type === NodeTypes.DIRECTIVE && prop.exp?.ast) {
+              expressions.push(prop.exp.ast);
+            }
+          });
+        }
+      }
+    ]
+  });
+  return expressions;
+}
 function extractorVueScript(options) {
   return {
     name: "@una-ui/extractor-vue-script",
     order: 0,
     async extract({ code, id }) {
+      const astExprs = [];
       const cleanPath = parsePath(id).pathname;
       if (cleanPath.endsWith(".vue")) {
         const sfc = parse(code, {
           filename: cleanPath
         });
-        code = sfc.descriptor.scriptSetup?.content || sfc.descriptor.script?.content || "";
+        if (sfc.descriptor.script) {
+          astExprs.push(parseCodeAst(sfc.descriptor.script.content));
+        }
+        if (sfc.descriptor.scriptSetup) {
+          astExprs.push(parseCodeAst(sfc.descriptor.scriptSetup.content));
+        }
+        if (sfc.descriptor.template?.ast) {
+          astExprs.push(...extractTemplateExpressions(sfc.descriptor.template.ast));
+        }
+      } else {
+        astExprs.push(parseCodeAst(code, id));
       }
-      const { $ast: node } = parseModule(code, {
-        sourceFileName: id
-      });
       const prefixes = normalizePrefixes(options?.prefixes ?? []);
-      const regularResults = discoverVariants(node, prefixes);
-      return [...new Set(regularResults)];
+      return [...new Set(
+        astExprs.flatMap((node) => discoverVariants(node, prefixes))
+      )];
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@una-ui/extractor-vue-script-edge",
-  "version": "0.64.0-29305804.1d98fb4",
+  "version": "0.64.0-29313954.f2c5220",
   "description": "Unocss extractor for Vue script",
   "author": "Phojie Rengel <phojrengel@gmail.com>",
   "license": "MIT",
@@ -35,15 +35,13 @@
     "access": "public"
   },
   "dependencies": {
-    "@babel/parser": "^7.28.3",
-    "@babel/traverse": "^7.28.3",
-    "@vue/compiler-sfc": "^3.5.20",
+    "@babel/types": "^7.28.2",
+    "@vue/compiler-core": "^3.5.22",
+    "@vue/compiler-sfc": "^3.5.22",
     "magicast": "^0.3.5",
     "ufo": "^1.6.1"
   },
   "devDependencies": {
-    "@babel/types": "^7.28.2",
-    "@types/babel__traverse": "^7.28.0",
     "@unocss/core": "^66.5.1",
     "vitest": "^3.2.4"
   },