@unocss/transformer-attributify-jsx 0.59.4 → 0.60.1

package/dist/index.mjs

@@ -9,9 +9,9 @@ function createFilter(include, exclude) {
     return includePattern.some((p) => id.match(p));
   };
 }
-const elementRE = /(<\w[\w:\.$-]*\s)([\s\S]*?)(?=>[\s\S]?<\/[\s\w:\.$-]*>|\/>)/g;
+const elementRE = /<([^\/?<>0-9$_!][^\s>]*)\s+((?:"[^"]*"|'[^"]*'|({[^}]*})|[^{>])+)>/g;
 const attributeRE = /(?<![~`!$%^&*()_+\-=[{;':"|,.<>/?]\s*)([a-zA-Z()#][\[?a-zA-Z0-9-_:()#%\]?]*)(?:\s*=\s*((?:'[^']*')|(?:"[^"]*")|\S+))?/g;
-const valuedAttributeRE = /((?!\d|-{2}|-\d)[a-zA-Z0-9\u00A0-\uFFFF-_:!%-.~<]+)=(?:["]([^"]*)["]|[']([^']*)[']|[{]((?:[`(](?:[^`)]*)[`)]|[^}])+)[}])/gms;
+const valuedAttributeRE = /((?!\d|-{2}|-\d)[a-zA-Z0-9\u00A0-\uFFFF-_:!%-.~<]+)=(?:["](?:[^"]*)["]|['](?:[^']*)[']|([{])((?:[`(](?:[^`)]*)[`)]|[^}])+)([}]))/gms;
 function transformerAttributifyJsx(options = {}) {
   const {
     blocklist = []
@@ -39,16 +39,32 @@ function transformerAttributifyJsx(options = {}) {
       const tasks = [];
       for (const item of Array.from(code.original.matchAll(elementRE))) {
         let attributifyPart = item[2];
-        if (valuedAttributeRE.test(attributifyPart))
-          attributifyPart = attributifyPart.replace(valuedAttributeRE, (match) => " ".repeat(match.length));
+        if (valuedAttributeRE.test(attributifyPart)) {
+          attributifyPart = attributifyPart.replace(valuedAttributeRE, (match, _2, dynamicFlagStart) => {
+            if (!dynamicFlagStart)
+              return " ".repeat(match.length);
+            let preLastModifierIndex = 0;
+            let temp = match;
+            for (const _item of match.matchAll(elementRE)) {
+              const attrAttributePart = _item[2];
+              if (valuedAttributeRE.test(attrAttributePart))
+                attrAttributePart.replace(valuedAttributeRE, (m) => " ".repeat(m.length));
+              const pre = temp.slice(0, preLastModifierIndex) + " ".repeat(_item.index + _item[0].indexOf(_item[2]) - preLastModifierIndex) + attrAttributePart;
+              temp = pre + " ".repeat(_item.input.length - pre.length);
+              preLastModifierIndex = pre.length;
+            }
+            if (preLastModifierIndex !== 0)
+              return temp;
+            return " ".repeat(match.length);
+          });
+        }
         for (const attr of attributifyPart.matchAll(attributeRE)) {
           const matchedRule = attr[0].replace(/\:/i, "-");
           if (matchedRule.includes("=") || isBlocked(matchedRule))
             continue;
           tasks.push(uno.parseToken(matchedRule).then((matched) => {
             if (matched) {
-              const tag = item[1];
-              const startIdx = (item.index || 0) + (attr.index || 0) + tag.length;
+              const startIdx = (item.index || 0) + (attr.index || 0) + item[0].indexOf(item[2]);
               const endIdx = startIdx + matchedRule.length;
               code.overwrite(startIdx, endIdx, `${matchedRule}=""`);
             }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/transformer-attributify-jsx",
   "type": "module",
-  "version": "0.59.4",
+  "version": "0.60.1",
   "description": "Support valueless attributify in JSX/TSX.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -33,7 +33,7 @@
     "dist"
   ],
   "dependencies": {
-    "@unocss/core": "0.59.4"
+    "@unocss/core": "0.60.1"
   },
   "devDependencies": {
     "magic-string": "^0.30.10"