@unocss/svelte-scoped 66.2.3 → 66.3.1

package/dist/preprocess.mjs

@@ -1,7 +1,9 @@
-export { U as default } from './shared/svelte-scoped.Mm5co22N.mjs';
+export { U as default } from './shared/svelte-scoped.OigInX2n.mjs';
 import 'node:process';
 import '@unocss/config';
 import '@unocss/core';
 import '@unocss/preset-uno';
 import 'magic-string';
+import 'acorn';
+import 'zimmerframe';
 import 'css-tree';

package/dist/shared/{svelte-scoped.Mm5co22N.mjs → svelte-scoped.OigInX2n.mjs}

@@ -3,7 +3,9 @@ import { createRecoveryConfigLoader } from '@unocss/config';
 import { expandVariantGroup, warnOnce, regexScopePlaceholder, toArray, createGenerator } from '@unocss/core';
 import presetUno from '@unocss/preset-uno';
 import MagicString from 'magic-string';
-import { generate, parse, clone, walk } from 'css-tree';
+import * as acorn from 'acorn';
+import { walk } from 'zimmerframe';
+import { generate, parse, clone, walk as walk$1 } from 'css-tree';
 
 const notInCommentRE = /(?<!<!--\s*)/;
 const stylesTagWithCapturedDirectivesRE = /<style([^>]*)>[\s\S]*?<\/style\s*>/;
@@ -20,14 +22,17 @@ function addGeneratedStylesIntoStyleBlock(code, styles) {
 const classesRE$1 = /class=(["'`])([\s\S]*?)\1/g;
 const classDirectivesRE = /class:(\S+?)="?\{/g;
 const classDirectivesShorthandRE = /class:([^=>\s/]+)[{>\s/]/g;
+const classClsxRE = /(?<prefix>class=\{\w*)[[{(]/g;
 function findClasses(code) {
   const matchedClasses = [...code.matchAll(classesRE$1)];
   const matchedClassDirectives = [...code.matchAll(classDirectivesRE)];
   const matchedClassDirectivesShorthand = [...code.matchAll(classDirectivesShorthandRE)];
+  const matchedClassClsx = [...code.matchAll(classClsxRE)];
   const classes = parseMatches(matchedClasses, "regular", 'class="'.length);
   const classDirectives = parseMatches(matchedClassDirectives, "directive", "class:".length);
   const classDirectivesShorthand = parseMatches(matchedClassDirectivesShorthand, "directiveShorthand", "class:".length);
-  return [...classes, ...classDirectives, ...classDirectivesShorthand];
+  const classClsx = parseMatchesWithAcorn(matchedClassClsx, code);
+  return [...classes, ...classDirectives, ...classDirectivesShorthand, ...classClsx];
 }
 function parseMatches(matches, type, prefixLength) {
   return matches.map((match) => {
@@ -44,6 +49,71 @@ function parseMatches(matches, type, prefixLength) {
 function hasBody(foundClass) {
   return foundClass.body;
 }
+function parseMatchesWithAcorn(matches, code) {
+  return matches.flatMap((match) => {
+    const start = match.index + match.groups.prefix.length;
+    const ast = acorn.parseExpressionAt(code, start, {
+      sourceType: "module",
+      ecmaVersion: 16,
+      locations: true
+    });
+    const classes = [];
+    function fromProperty(body, node, property) {
+      return {
+        body,
+        start: node.start,
+        end: node.end,
+        type: property.shorthand ? "clsxObjectShorthand" : "clsxObject"
+      };
+    }
+    function fromString(body, node) {
+      return {
+        body,
+        start: node.start + 1,
+        end: node.end - 1,
+        type: "regular"
+      };
+    }
+    walk(
+      ast,
+      { property: void 0 },
+      {
+        Property(node, { visit }) {
+          visit(node.key, { property: node });
+        },
+        Identifier(node, { state, next }) {
+          if (state.property) {
+            classes.push(fromProperty(node.name, node, state.property));
+          }
+          next();
+        },
+        Literal(node, { state, next }) {
+          if (typeof node.value === "string") {
+            const body = node.value;
+            if (state.property) {
+              classes.push(fromProperty(body, node, state.property));
+            } else {
+              classes.push(fromString(body, node));
+            }
+          }
+          next();
+        },
+        TemplateLiteral(node, { state, next }) {
+          if (node.expressions.length === 0 && node.quasis.length === 1) {
+            const body = node.quasis[0].value.raw;
+            if (state.property) {
+              classes.push(fromProperty(body, node, state.property));
+            } else {
+              classes.push(fromString(body, node));
+            }
+          }
+          next();
+        }
+      }
+    );
+    return classes;
+  }).filter(hasBody);
+}
 
 function hash(str) {
   let i;
@@ -161,28 +231,45 @@ async function processDirective({ body: token, start, end, type }, options, uno,
   };
 }
 
+async function processClsx(cls, options, uno, filename) {
+  if (cls.type === "clsxObject") {
+    const { rulesToGenerate, codeUpdate } = await processClassBody({ ...cls}, options, uno, filename);
+    if (rulesToGenerate && codeUpdate) {
+      codeUpdate.content = `"${codeUpdate.content}"`;
+      return { rulesToGenerate, codeUpdate };
+    }
+  } else if (cls.type === "clsxObjectShorthand") {
+    const { rulesToGenerate, codeUpdate } = await processDirective({ ...cls, type: "directive" }, options, uno, filename) ?? {};
+    if (rulesToGenerate && codeUpdate) {
+      codeUpdate.content = `"${codeUpdate.content}": ${cls.body}`;
+      return { rulesToGenerate, codeUpdate };
+    }
+  }
+}
+
 async function processClasses(classes, options, uno, filename) {
   const result = {
     rulesToGenerate: {},
     codeUpdates: []
   };
   for (const foundClass of classes) {
-    if (foundClass.type === "regular") {
-      const { rulesToGenerate, codeUpdate } = await processClassBody(foundClass, options, uno, filename);
-      if (rulesToGenerate)
-        Object.assign(result.rulesToGenerate, rulesToGenerate);
-      if (codeUpdate)
-        result.codeUpdates.push(codeUpdate);
-    } else {
-      const { rulesToGenerate, codeUpdate } = await processDirective(foundClass, options, uno, filename) || {};
-      if (rulesToGenerate)
-        Object.assign(result.rulesToGenerate, rulesToGenerate);
-      if (codeUpdate)
-        result.codeUpdates.push(codeUpdate);
-    }
+    const { rulesToGenerate, codeUpdate } = await processClass(foundClass, options, uno, filename);
+    if (rulesToGenerate)
+      Object.assign(result.rulesToGenerate, rulesToGenerate);
+    if (codeUpdate)
+      result.codeUpdates.push(codeUpdate);
   }
   return result;
 }
+async function processClass(foundClass, options, uno, filename) {
+  if (foundClass.type === "regular") {
+    return await processClassBody(foundClass, options, uno, filename);
+  }
+  if (foundClass.type === "clsxObject" || foundClass.type === "clsxObjectShorthand") {
+    return await processClsx(foundClass, options, uno, filename) ?? {};
+  }
+  return await processDirective(foundClass, options, uno, filename) ?? {};
+}
 
 const NOT_PRECEDED_BY_DIGIT_OR_OPEN_PARENTHESIS_RE = /(?<![\d(])/;
 const SELECTOR_STARTING_WITH_BRACKET_OR_PERIOD_RE = /([[.][\s\S]+?)/;
@@ -335,7 +422,7 @@ async function transformApply(ctx) {
   if (ast.type !== "StyleSheet")
     return ctx.s;
   const stack = [];
-  walk(ast, (node) => {
+  walk$1(ast, (node) => {
     if (node.type === "Rule")
       stack.push(handleApply(ctx, node));
   });

package/dist/vite.mjs

@@ -7,7 +7,9 @@ import MagicString from 'magic-string';
 import { readFileSync, existsSync, statSync } from 'node:fs';
 import { resolve, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { U as UnocssSveltePreprocess } from './shared/svelte-scoped.Mm5co22N.mjs';
+import { U as UnocssSveltePreprocess } from './shared/svelte-scoped.OigInX2n.mjs';
+import 'acorn';
+import 'zimmerframe';
 import 'css-tree';
 
 function ConfigHMRPlugin({ ready }) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/svelte-scoped",
   "type": "module",
-  "version": "66.2.3",
+  "version": "66.3.1",
   "description": "Use UnoCSS in a modular fashion with styles being stored only in the Svelte component they are used in: Vite plugin for apps, Svelte preprocessor for component libraries",
   "author": "Jacob Bowdoin",
   "license": "MIT",
@@ -50,15 +50,17 @@
     "dist"
   ],
   "dependencies": {
+    "acorn": "^8.15.0",
     "css-tree": "^3.1.0",
     "magic-string": "^0.30.17",
-    "@unocss/config": "66.2.3",
-    "@unocss/preset-uno": "66.2.3",
-    "@unocss/reset": "66.2.3"
+    "zimmerframe": "^1.1.2",
+    "@unocss/config": "66.3.1",
+    "@unocss/reset": "66.3.1",
+    "@unocss/preset-uno": "66.3.1"
   },
   "devDependencies": {
     "prettier-plugin-svelte": "^2.10.1",
-    "svelte": "^5.34.1"
+    "svelte": "^5.34.7"
   },
   "scripts": {
     "build": "unbuild",