weapp-tailwindcss 2.7.1 → 2.8.1

package/README.md

@@ -24,7 +24,7 @@
 > `小程序` + `tailwindcss` 全方面解决方案  
 > 想试试在小程序里使用 `CSS-in-JS` 思想？ 👉🏻👉🏻试试 [`weapp-pandacss`](https://github.com/sonofmagic/weapp-pandacss)
 
-\[[国内部署的文档地址](https://weapp-tw.icebreaker.top)\] \| \[[备用Github Page](https://sonofmagic.github.io/weapp-tailwindcss/)\] \| \[[1.x文档]('./v1.md')\]
+\[[国内部署的文档地址](https://weapp-tw.icebreaker.top)\] \| \[[备用Github Page](https://sonofmagic.github.io/weapp-tailwindcss/)\] \| \[[1.x文档](./v1.md)\]
 
 - [Tips](#tips)
 - [特性](#特性)

package/dist/cli.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var options = require('./options-b7411c31.js');
+var options = require('./options-4284d635.js');
 require('micromatch');
 require('magic-string');
 require('./replace.js');
@@ -10,8 +10,9 @@ require('@weapp-core/regex');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
-require('./defaults-344ba6d9.js');
+require('./defaults-c6437917.js');
 require('@babel/types');
+require('htmlparser2');
 require('postcss');
 require('./postcss-4e99a8e8.js');
 require('postcss-selector-parser');

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { g as getOptions, c as createPatch } from './options-8805cf56.mjs';
+import { g as getOptions, c as createPatch } from './options-ad0be036.mjs';
 import 'micromatch';
 import 'magic-string';
 import './replace.mjs';
@@ -8,8 +8,9 @@ import '@weapp-core/regex';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
-import './defaults-0743f523.mjs';
+import './defaults-72ea9566.mjs';
 import '@babel/types';
+import 'htmlparser2';
 import 'postcss';
 import './postcss-a551ddc0.mjs';
 import 'postcss-selector-parser';

package/dist/{defaults-0743f523.mjs → defaults-72ea9566.mjs}

@@ -126,7 +126,7 @@ const defaultOptions = {
         return false;
     },
     disabledDefaultTemplateHandler: false,
-    jsEscapeStrategy: 'regenerate'
+    jsEscapeStrategy: 'replace'
 };
 
 export { defaultOptions as d, getGroupedEntries as g, isMap as i, noop as n };

package/dist/{defaults-344ba6d9.js → defaults-c6437917.js}

@@ -128,7 +128,7 @@ const defaultOptions = {
         return false;
     },
     disabledDefaultTemplateHandler: false,
-    jsEscapeStrategy: 'regenerate'
+    jsEscapeStrategy: 'replace'
 };
 
 exports.defaultOptions = defaultOptions;

package/dist/defaults.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var defaults = require('./defaults-344ba6d9.js');
+var defaults = require('./defaults-c6437917.js');
 require('@weapp-core/escape');
 
 

package/dist/defaults.mjs

@@ -1,2 +1,2 @@
-export { d as defaultOptions } from './defaults-0743f523.mjs';
+export { d as defaultOptions } from './defaults-72ea9566.mjs';
 import '@weapp-core/escape';

package/dist/gulp.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var stream = require('node:stream');
-var options = require('./options-b7411c31.js');
+var options = require('./options-4284d635.js');
 require('micromatch');
 require('magic-string');
 require('./replace.js');
@@ -13,8 +13,9 @@ require('@weapp-core/regex');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
-require('./defaults-344ba6d9.js');
+require('./defaults-c6437917.js');
 require('@babel/types');
+require('htmlparser2');
 require('postcss');
 require('./postcss-4e99a8e8.js');
 require('postcss-selector-parser');

package/dist/gulp.mjs

@@ -1,5 +1,5 @@
 import stream from 'node:stream';
-import { g as getOptions, a as createTailwindcssPatcher } from './options-8805cf56.mjs';
+import { g as getOptions, a as createTailwindcssPatcher } from './options-ad0be036.mjs';
 import 'micromatch';
 import 'magic-string';
 import './replace.mjs';
@@ -9,8 +9,9 @@ import '@weapp-core/regex';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
-import './defaults-0743f523.mjs';
+import './defaults-72ea9566.mjs';
 import '@babel/types';
+import 'htmlparser2';
 import 'postcss';
 import './postcss-a551ddc0.mjs';
 import 'postcss-selector-parser';

package/dist/index.js

@@ -7,7 +7,7 @@ var vite = require('./vite.js');
 var gulp = require('./gulp.js');
 require('node:path');
 require('node:fs');
-require('./options-b7411c31.js');
+require('./options-4284d635.js');
 require('micromatch');
 require('magic-string');
 require('./replace.js');
@@ -17,8 +17,9 @@ require('@weapp-core/regex');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
-require('./defaults-344ba6d9.js');
+require('./defaults-c6437917.js');
 require('@babel/types');
+require('htmlparser2');
 require('postcss');
 require('./postcss-4e99a8e8.js');
 require('postcss-selector-parser');

package/dist/index.mjs

@@ -3,7 +3,7 @@ export { UnifiedViteWeappTailwindcssPlugin } from './vite.mjs';
 export { createPlugins } from './gulp.mjs';
 import 'node:path';
 import 'node:fs';
-import './options-8805cf56.mjs';
+import './options-ad0be036.mjs';
 import 'micromatch';
 import 'magic-string';
 import './replace.mjs';
@@ -13,8 +13,9 @@ import '@weapp-core/regex';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
-import './defaults-0743f523.mjs';
+import './defaults-72ea9566.mjs';
 import '@babel/types';
+import 'htmlparser2';
 import 'postcss';
 import './postcss-a551ddc0.mjs';
 import 'postcss-selector-parser';

package/dist/js/handlers.d.ts

@@ -1,6 +1,5 @@
 import type { StringLiteral, TemplateElement } from '@babel/types';
 import MagicString from 'magic-string';
 import type { IJsHandlerOptions } from "../types";
-export declare function jsStringEscape(str: unknown): string;
 export declare function regenerateHandleValue(str: string, node: StringLiteral | TemplateElement, options: IJsHandlerOptions): string;
 export declare function replaceHandleValue(str: string, node: StringLiteral | TemplateElement, options: IJsHandlerOptions, ms: MagicString, offset?: number, needEscaped?: boolean): string;

package/dist/{options-b7411c31.js → options-4284d635.js}

@@ -4,15 +4,16 @@ var micromatch = require('micromatch');
 var MagicString = require('magic-string');
 var replace = require('./replace.js');
 var regex = require('@weapp-core/regex');
+var escape = require('@weapp-core/escape');
 var generate = require('@babel/generator');
 var parser = require('@babel/parser');
 var traverse = require('@babel/traverse');
-var defaults = require('./defaults-344ba6d9.js');
+var defaults = require('./defaults-c6437917.js');
 var t = require('@babel/types');
+var htmlparser2 = require('htmlparser2');
 var postcss = require('postcss');
 var postcss$1 = require('./postcss-4e99a8e8.js');
 var postcssIsPseudoClass = require('@csstools/postcss-is-pseudo-class');
-var escape = require('@weapp-core/escape');
 var path = require('node:path');
 var fs = require('node:fs');
 var semver = require('semver');
@@ -57,32 +58,6 @@ const splitCode = (code, allowDoubleQuotes = false) => {
     return code.split(splitter).filter((element) => isValidSelector(element));
 };
 
-function jsStringEscape(str) {
-    return ('' + str).replaceAll(/[\n\r"'\\\u2028\u2029]/g, (character) => {
-        switch (character) {
-            case '"':
-            case "'":
-            case '\\': {
-                return '\\' + character;
-            }
-            case '\n': {
-                return '\\n';
-            }
-            case '\r': {
-                return '\\r';
-            }
-            case '\u2028': {
-                return '\\u2028';
-            }
-            case '\u2029': {
-                return '\\u2029';
-            }
-            default: {
-                return character;
-            }
-        }
-    });
-}
 function regenerateHandleValue(str, node, options) {
     var _a;
     const set = options.classNameSet;
@@ -138,8 +113,9 @@ function replaceHandleValue(str, node, options, ms, offset = 0, needEscaped = fa
     if (typeof node.start === 'number' && typeof node.end === 'number') {
         const start = node.start + offset;
         const end = node.end - offset;
-        if (start < end) {
-            ms.update(node.start + offset, node.end - offset, needEscaped ? jsStringEscape(rawStr) : rawStr);
+        if (start < end && str !== rawStr) {
+            const content = needEscaped ? escape.jsStringEscape(rawStr) : rawStr;
+            ms.update(start, end, content);
         }
     }
     return rawStr;
@@ -147,6 +123,13 @@ function replaceHandleValue(str, node, options, ms, offset = 0, needEscaped = fa
 
 const isProd = () => process.env.NODE_ENV === 'production';
 
+function isEvalPath(p) {
+    if (p.isCallExpression()) {
+        const calleePath = p.get('callee');
+        return calleePath.isIdentifier() && calleePath.node.name === 'eval';
+    }
+    return false;
+}
 function jsHandler(rawSource, options) {
     var _a;
     const ast = parser.parse(rawSource, {
@@ -157,26 +140,56 @@ function jsHandler(rawSource, options) {
         const ropt = {
             StringLiteral: {
                 enter(p) {
+                    var _a;
+                    if (isEvalPath(p.parentPath)) {
+                        return;
+                    }
                     const n = p.node;
-                    replaceHandleValue(n.value, n, options, ms, 1, true);
+                    replaceHandleValue(n.value, n, options, ms, 1, (_a = options.needEscaped) !== null && _a !== void 0 ? _a : true);
                 }
             },
             TemplateElement: {
                 enter(p) {
+                    if (p.parentPath.isTemplateLiteral() && isEvalPath(p.parentPath.parentPath)) {
+                        return;
+                    }
                     const n = p.node;
                     replaceHandleValue(n.value.raw, n, options, ms, 0, false);
                 }
             },
             CallExpression: {
                 enter(p) {
-                    const calleePath = p.get('callee');
-                    if (calleePath.isIdentifier() && calleePath.node.name === 'eval') {
+                    if (isEvalPath(p)) {
                         p.traverse({
                             StringLiteral: {
                                 enter(s) {
-                                    const res = jsHandler(s.node.value, options);
+                                    const res = jsHandler(s.node.value, Object.assign(Object.assign({}, options), { needEscaped: false }));
                                     if (res.code) {
-                                        s.node.value = res.code;
+                                        const node = s.node;
+                                        if (typeof node.start === 'number' && typeof node.end === 'number') {
+                                            const start = node.start + 1;
+                                            const end = node.end - 1;
+                                            if (start < end && s.node.value !== res.code) {
+                                                ms.update(start, end, escape.jsStringEscape(res.code));
+                                                node.value = res.code;
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                            TemplateElement: {
+                                enter(s) {
+                                    const res = jsHandler(s.node.value.raw, options);
+                                    if (res.code) {
+                                        const node = s.node;
+                                        if (typeof node.start === 'number' && typeof node.end === 'number') {
+                                            const start = node.start;
+                                            const end = node.end;
+                                            if (start < end && s.node.value.raw !== res.code) {
+                                                ms.update(start, end, res.code);
+                                                s.node.value.raw = res.code;
+                                            }
+                                        }
                                     }
                                 }
                             }
@@ -194,20 +207,25 @@ function jsHandler(rawSource, options) {
         const gopt = {
             StringLiteral: {
                 enter(p) {
+                    if (isEvalPath(p.parentPath)) {
+                        return;
+                    }
                     const n = p.node;
                     n.value = regenerateHandleValue(n.value, n, options);
                 }
             },
             TemplateElement: {
                 enter(p) {
+                    if (p.parentPath.isTemplateLiteral() && isEvalPath(p.parentPath.parentPath)) {
+                        return;
+                    }
                     const n = p.node;
                     n.value.raw = regenerateHandleValue(n.value.raw, n, options);
                 }
             },
             CallExpression: {
                 enter(p) {
-                    const calleePath = p.get('callee');
-                    if (calleePath.isIdentifier() && calleePath.node.name === 'eval') {
+                    if (isEvalPath(p)) {
                         p.traverse({
                             StringLiteral: {
                                 enter(s) {
@@ -216,6 +234,14 @@ function jsHandler(rawSource, options) {
                                         s.node.value = res.code;
                                     }
                                 }
+                            },
+                            TemplateElement: {
+                                enter(s) {
+                                    const res = jsHandler(s.node.value.raw, options);
+                                    if (res.code) {
+                                        s.node.value.raw = res.code;
+                                    }
+                                }
                             }
                         });
                     }
@@ -371,37 +397,77 @@ function templateReplacer(original, options = {}) {
         });
     }
 }
-function templateHandler(rawSource, options = {}) {
-    if (options.disabledDefaultTemplateHandler) {
-        return rawSource;
-    }
-    return rawSource.replace(regex.tagWithEitherClassAndHoverClassRegexp, (m0) => {
-        return m0.replace(regex.templateClassExactRegexp, (m1, className) => {
-            return m1.replace(className, templateReplacer(className, options));
-        });
-    });
+function regTest(reg, str) {
+    reg.lastIndex = 0;
+    return reg.test(str);
 }
-function customTemplateHandler(rawSource, options) {
-    const { customAttributesEntities, inlineWxs, runtimeSet, jsHandler } = options;
-    let source = templateHandler(rawSource, options);
-    const regexps = regex.makeCustomAttributes(customAttributesEntities);
-    if (regexps && Array.isArray(regexps)) {
-        for (const regexp of regexps) {
-            source = source.replace(regexp.tagRegexp, (m0) => {
-                return m0.replace(regexp.attrRegexp, (m1, className) => {
-                    return m1.replace(className, templateReplacer(className, options));
-                });
-            });
+function isPropsMatch(props, attr) {
+    if (Array.isArray(props)) {
+        for (const prop of props) {
+            const res = typeof prop === 'string' ? prop.toLowerCase() === attr : regTest(prop, attr);
+            if (res) {
+                return res;
+            }
         }
+        return false;
     }
-    if (inlineWxs) {
-        const wxsTags = extract(source, regex.wxsTagRegexp);
-        for (const x of wxsTags) {
-            const code = jsHandler(x.raw, runtimeSet).code;
-            source = source.replaceAll(x.raw, code);
-        }
+    else if (typeof props === 'string') {
+        return props === attr;
+    }
+    else {
+        return regTest(props, attr);
     }
-    return source;
+}
+function customTemplateHandler(rawSource, options) {
+    const { customAttributesEntities = [], disabledDefaultTemplateHandler, inlineWxs, runtimeSet, jsHandler } = options !== null && options !== void 0 ? options : {};
+    const s = new MagicString__default["default"](rawSource);
+    let tag = '';
+    const parser = new htmlparser2.Parser({
+        onopentagname(name) {
+            tag = name;
+        },
+        onattribute(name, value, quote) {
+            if (value) {
+                if (quote === "'") {
+                    s.update(parser.startIndex + name.length + 1, parser.startIndex + name.length + 2, '"');
+                    s.update(parser.startIndex + name.length + value.length + 2, parser.startIndex + name.length + value.length + 3, '"');
+                }
+                function update() {
+                    s.update(parser.startIndex + name.length + 2, parser.endIndex, templateReplacer(value, options));
+                }
+                if (!disabledDefaultTemplateHandler && (name === 'class' || name === 'hover-class')) {
+                    update();
+                }
+                for (const [t, props] of customAttributesEntities) {
+                    if (t === '*') {
+                        if (isPropsMatch(props, name)) {
+                            update();
+                        }
+                    }
+                    else if (typeof t === 'string') {
+                        if (t === tag && isPropsMatch(props, name)) {
+                            update();
+                        }
+                    }
+                    else if (regTest(t, tag) && isPropsMatch(props, name)) {
+                        update();
+                    }
+                }
+            }
+        },
+        ontext(data) {
+            if (inlineWxs && tag === 'wxs') {
+                const code = jsHandler(data, runtimeSet).code;
+                s.update(parser.startIndex, parser.endIndex + 1, code);
+            }
+        },
+        onclosetag() {
+            tag = '';
+        }
+    });
+    parser.write(s.original);
+    parser.end();
+    return s.toString();
 }
 function createTemplateHandler(options = {}) {
     return (rawSource, opt = {}) => {

package/dist/{options-8805cf56.mjs → options-ad0be036.mjs}

@@ -1,16 +1,17 @@
 import { isMatch } from 'micromatch';
 import MagicString from 'magic-string';
 import { replaceJs as replaceWxml } from './replace.mjs';
-import { escapeStringRegexp, makeCustomAttributes, tagWithEitherClassAndHoverClassRegexp, templateClassExactRegexp, wxsTagRegexp, variableRegExp } from '@weapp-core/regex';
+import { escapeStringRegexp, variableRegExp } from '@weapp-core/regex';
+import { jsStringEscape, SimpleMappingChars2String, MappingChars2String } from '@weapp-core/escape';
 import generate from '@babel/generator';
 import { parse, parseExpression } from '@babel/parser';
 import traverse from '@babel/traverse';
-import { n as noop, d as defaultOptions, i as isMap } from './defaults-0743f523.mjs';
+import { n as noop, d as defaultOptions, i as isMap } from './defaults-72ea9566.mjs';
 import * as t from '@babel/types';
+import { Parser } from 'htmlparser2';
 import postcss from 'postcss';
 import { p as postcssWeappTailwindcss } from './postcss-a551ddc0.mjs';
 import postcssIsPseudoClass from '@csstools/postcss-is-pseudo-class';
-import { SimpleMappingChars2String, MappingChars2String } from '@weapp-core/escape';
 import path from 'node:path';
 import fs from 'node:fs';
 import { gte } from 'semver';
@@ -26,32 +27,6 @@ const splitCode = (code, allowDoubleQuotes = false) => {
     return code.split(splitter).filter((element) => isValidSelector(element));
 };
 
-function jsStringEscape(str) {
-    return ('' + str).replaceAll(/[\n\r"'\\\u2028\u2029]/g, (character) => {
-        switch (character) {
-            case '"':
-            case "'":
-            case '\\': {
-                return '\\' + character;
-            }
-            case '\n': {
-                return '\\n';
-            }
-            case '\r': {
-                return '\\r';
-            }
-            case '\u2028': {
-                return '\\u2028';
-            }
-            case '\u2029': {
-                return '\\u2029';
-            }
-            default: {
-                return character;
-            }
-        }
-    });
-}
 function regenerateHandleValue(str, node, options) {
     var _a;
     const set = options.classNameSet;
@@ -107,8 +82,9 @@ function replaceHandleValue(str, node, options, ms, offset = 0, needEscaped = fa
     if (typeof node.start === 'number' && typeof node.end === 'number') {
         const start = node.start + offset;
         const end = node.end - offset;
-        if (start < end) {
-            ms.update(node.start + offset, node.end - offset, needEscaped ? jsStringEscape(rawStr) : rawStr);
+        if (start < end && str !== rawStr) {
+            const content = needEscaped ? jsStringEscape(rawStr) : rawStr;
+            ms.update(start, end, content);
         }
     }
     return rawStr;
@@ -116,6 +92,13 @@ function replaceHandleValue(str, node, options, ms, offset = 0, needEscaped = fa
 
 const isProd = () => process.env.NODE_ENV === 'production';
 
+function isEvalPath(p) {
+    if (p.isCallExpression()) {
+        const calleePath = p.get('callee');
+        return calleePath.isIdentifier() && calleePath.node.name === 'eval';
+    }
+    return false;
+}
 function jsHandler(rawSource, options) {
     var _a;
     const ast = parse(rawSource, {
@@ -126,26 +109,56 @@ function jsHandler(rawSource, options) {
         const ropt = {
             StringLiteral: {
                 enter(p) {
+                    var _a;
+                    if (isEvalPath(p.parentPath)) {
+                        return;
+                    }
                     const n = p.node;
-                    replaceHandleValue(n.value, n, options, ms, 1, true);
+                    replaceHandleValue(n.value, n, options, ms, 1, (_a = options.needEscaped) !== null && _a !== void 0 ? _a : true);
                 }
             },
             TemplateElement: {
                 enter(p) {
+                    if (p.parentPath.isTemplateLiteral() && isEvalPath(p.parentPath.parentPath)) {
+                        return;
+                    }
                     const n = p.node;
                     replaceHandleValue(n.value.raw, n, options, ms, 0, false);
                 }
             },
             CallExpression: {
                 enter(p) {
-                    const calleePath = p.get('callee');
-                    if (calleePath.isIdentifier() && calleePath.node.name === 'eval') {
+                    if (isEvalPath(p)) {
                         p.traverse({
                             StringLiteral: {
                                 enter(s) {
-                                    const res = jsHandler(s.node.value, options);
+                                    const res = jsHandler(s.node.value, Object.assign(Object.assign({}, options), { needEscaped: false }));
                                     if (res.code) {
-                                        s.node.value = res.code;
+                                        const node = s.node;
+                                        if (typeof node.start === 'number' && typeof node.end === 'number') {
+                                            const start = node.start + 1;
+                                            const end = node.end - 1;
+                                            if (start < end && s.node.value !== res.code) {
+                                                ms.update(start, end, jsStringEscape(res.code));
+                                                node.value = res.code;
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                            TemplateElement: {
+                                enter(s) {
+                                    const res = jsHandler(s.node.value.raw, options);
+                                    if (res.code) {
+                                        const node = s.node;
+                                        if (typeof node.start === 'number' && typeof node.end === 'number') {
+                                            const start = node.start;
+                                            const end = node.end;
+                                            if (start < end && s.node.value.raw !== res.code) {
+                                                ms.update(start, end, res.code);
+                                                s.node.value.raw = res.code;
+                                            }
+                                        }
                                     }
                                 }
                             }
@@ -163,20 +176,25 @@ function jsHandler(rawSource, options) {
         const gopt = {
             StringLiteral: {
                 enter(p) {
+                    if (isEvalPath(p.parentPath)) {
+                        return;
+                    }
                     const n = p.node;
                     n.value = regenerateHandleValue(n.value, n, options);
                 }
             },
             TemplateElement: {
                 enter(p) {
+                    if (p.parentPath.isTemplateLiteral() && isEvalPath(p.parentPath.parentPath)) {
+                        return;
+                    }
                     const n = p.node;
                     n.value.raw = regenerateHandleValue(n.value.raw, n, options);
                 }
             },
             CallExpression: {
                 enter(p) {
-                    const calleePath = p.get('callee');
-                    if (calleePath.isIdentifier() && calleePath.node.name === 'eval') {
+                    if (isEvalPath(p)) {
                         p.traverse({
                             StringLiteral: {
                                 enter(s) {
@@ -185,6 +203,14 @@ function jsHandler(rawSource, options) {
                                         s.node.value = res.code;
                                     }
                                 }
+                            },
+                            TemplateElement: {
+                                enter(s) {
+                                    const res = jsHandler(s.node.value.raw, options);
+                                    if (res.code) {
+                                        s.node.value.raw = res.code;
+                                    }
+                                }
                             }
                         });
                     }
@@ -340,37 +366,77 @@ function templateReplacer(original, options = {}) {
         });
     }
 }
-function templateHandler(rawSource, options = {}) {
-    if (options.disabledDefaultTemplateHandler) {
-        return rawSource;
-    }
-    return rawSource.replace(tagWithEitherClassAndHoverClassRegexp, (m0) => {
-        return m0.replace(templateClassExactRegexp, (m1, className) => {
-            return m1.replace(className, templateReplacer(className, options));
-        });
-    });
+function regTest(reg, str) {
+    reg.lastIndex = 0;
+    return reg.test(str);
 }
-function customTemplateHandler(rawSource, options) {
-    const { customAttributesEntities, inlineWxs, runtimeSet, jsHandler } = options;
-    let source = templateHandler(rawSource, options);
-    const regexps = makeCustomAttributes(customAttributesEntities);
-    if (regexps && Array.isArray(regexps)) {
-        for (const regexp of regexps) {
-            source = source.replace(regexp.tagRegexp, (m0) => {
-                return m0.replace(regexp.attrRegexp, (m1, className) => {
-                    return m1.replace(className, templateReplacer(className, options));
-                });
-            });
+function isPropsMatch(props, attr) {
+    if (Array.isArray(props)) {
+        for (const prop of props) {
+            const res = typeof prop === 'string' ? prop.toLowerCase() === attr : regTest(prop, attr);
+            if (res) {
+                return res;
+            }
         }
+        return false;
     }
-    if (inlineWxs) {
-        const wxsTags = extract(source, wxsTagRegexp);
-        for (const x of wxsTags) {
-            const code = jsHandler(x.raw, runtimeSet).code;
-            source = source.replaceAll(x.raw, code);
-        }
+    else if (typeof props === 'string') {
+        return props === attr;
+    }
+    else {
+        return regTest(props, attr);
     }
-    return source;
+}
+function customTemplateHandler(rawSource, options) {
+    const { customAttributesEntities = [], disabledDefaultTemplateHandler, inlineWxs, runtimeSet, jsHandler } = options !== null && options !== void 0 ? options : {};
+    const s = new MagicString(rawSource);
+    let tag = '';
+    const parser = new Parser({
+        onopentagname(name) {
+            tag = name;
+        },
+        onattribute(name, value, quote) {
+            if (value) {
+                if (quote === "'") {
+                    s.update(parser.startIndex + name.length + 1, parser.startIndex + name.length + 2, '"');
+                    s.update(parser.startIndex + name.length + value.length + 2, parser.startIndex + name.length + value.length + 3, '"');
+                }
+                function update() {
+                    s.update(parser.startIndex + name.length + 2, parser.endIndex, templateReplacer(value, options));
+                }
+                if (!disabledDefaultTemplateHandler && (name === 'class' || name === 'hover-class')) {
+                    update();
+                }
+                for (const [t, props] of customAttributesEntities) {
+                    if (t === '*') {
+                        if (isPropsMatch(props, name)) {
+                            update();
+                        }
+                    }
+                    else if (typeof t === 'string') {
+                        if (t === tag && isPropsMatch(props, name)) {
+                            update();
+                        }
+                    }
+                    else if (regTest(t, tag) && isPropsMatch(props, name)) {
+                        update();
+                    }
+                }
+            }
+        },
+        ontext(data) {
+            if (inlineWxs && tag === 'wxs') {
+                const code = jsHandler(data, runtimeSet).code;
+                s.update(parser.startIndex, parser.endIndex + 1, code);
+            }
+        },
+        onclosetag() {
+            tag = '';
+        }
+    });
+    parser.write(s.original);
+    parser.end();
+    return s.toString();
 }
 function createTemplateHandler(options = {}) {
     return (rawSource, opt = {}) => {

package/dist/types.d.ts

@@ -39,6 +39,7 @@ export type IJsHandlerOptions = {
     mangleContext?: IMangleScopeContext;
     jsPreserveClass?: (keyword: string) => boolean | undefined;
     strategy?: UserDefinedOptions['jsEscapeStrategy'];
+    needEscaped?: boolean;
 };
 export interface RawSource {
     start: number;
@@ -95,6 +96,7 @@ export interface UserDefinedOptions {
     jsPreserveClass?: (keyword: string) => boolean | undefined;
     disabledDefaultTemplateHandler?: boolean;
     jsEscapeStrategy?: 'regenerate' | 'replace';
+    runtimeLoaderPath?: string;
 }
 export interface IMangleScopeContext {
     rawOptions: UserDefinedOptions['mangle'];

package/dist/vite.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var options = require('./options-b7411c31.js');
+var options = require('./options-4284d635.js');
 var postcss = require('./postcss-4e99a8e8.js');
-var defaults = require('./defaults-344ba6d9.js');
+var defaults = require('./defaults-c6437917.js');
 require('micromatch');
 require('magic-string');
 require('./replace.js');
@@ -15,6 +15,7 @@ require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
 require('@babel/types');
+require('htmlparser2');
 require('postcss');
 require('@csstools/postcss-is-pseudo-class');
 require('node:path');
@@ -39,10 +40,8 @@ function UnifiedViteWeappTailwindcssPlugin(options$1 = {}) {
     return {
         name: postcss.vitePluginName,
         enforce: 'post',
-        buildStart() {
+        generateBundle(opt, bundle) {
             onStart();
-        },
-        generateBundle(opt, bundle, isWrite) {
             const entries = Object.entries(bundle);
             const groupedEntries = defaults.getGroupedEntries(entries, opts);
             const runtimeSet = twPatcher.getClassSet();
@@ -77,8 +76,6 @@ function UnifiedViteWeappTailwindcssPlugin(options$1 = {}) {
                     onUpdate(file, rawSource, code);
                 }
             }
-        },
-        buildEnd() {
             onEnd();
         }
     };

package/dist/vite.mjs

@@ -1,6 +1,6 @@
-import { g as getOptions, a as createTailwindcssPatcher } from './options-8805cf56.mjs';
+import { g as getOptions, a as createTailwindcssPatcher } from './options-ad0be036.mjs';
 import { v as vitePluginName } from './postcss-a551ddc0.mjs';
-import { g as getGroupedEntries } from './defaults-0743f523.mjs';
+import { g as getGroupedEntries } from './defaults-72ea9566.mjs';
 import 'micromatch';
 import 'magic-string';
 import './replace.mjs';
@@ -11,6 +11,7 @@ import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
 import '@babel/types';
+import 'htmlparser2';
 import 'postcss';
 import '@csstools/postcss-is-pseudo-class';
 import 'node:path';
@@ -35,10 +36,8 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
     return {
         name: vitePluginName,
         enforce: 'post',
-        buildStart() {
+        generateBundle(opt, bundle) {
             onStart();
-        },
-        generateBundle(opt, bundle, isWrite) {
             const entries = Object.entries(bundle);
             const groupedEntries = getGroupedEntries(entries, opts);
             const runtimeSet = twPatcher.getClassSet();
@@ -73,8 +72,6 @@ function UnifiedViteWeappTailwindcssPlugin(options = {}) {
                     onUpdate(file, rawSource, code);
                 }
             }
-        },
-        buildEnd() {
             onEnd();
         }
     };

package/dist/webpack.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var path = require('node:path');
 var fs = require('node:fs');
-var options = require('./options-b7411c31.js');
+var options = require('./options-4284d635.js');
 var postcss = require('./postcss-4e99a8e8.js');
-var defaults = require('./defaults-344ba6d9.js');
+var defaults = require('./defaults-c6437917.js');
 require('micromatch');
 require('magic-string');
 require('./replace.js');
@@ -17,6 +17,7 @@ require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
 require('@babel/types');
+require('htmlparser2');
 require('postcss');
 require('@csstools/postcss-is-pseudo-class');
 require('semver');
@@ -38,7 +39,7 @@ class UnifiedWebpackPluginV5 {
         this.appType = this.options.appType;
     }
     apply(compiler) {
-        const { mainCssChunkMatcher, disabled, onLoad, onUpdate, onEnd, onStart, styleHandler, patch, templateHandler, jsHandler, setMangleRuntimeSet } = this.options;
+        const { mainCssChunkMatcher, disabled, onLoad, onUpdate, onEnd, onStart, styleHandler, patch, templateHandler, jsHandler, setMangleRuntimeSet, runtimeLoaderPath } = this.options;
         if (disabled) {
             return;
         }
@@ -50,7 +51,7 @@ class UnifiedWebpackPluginV5 {
             return twPatcher.getClassSet();
         }
         onLoad();
-        const loader = path__default["default"].resolve(__dirname, './weapp-tw-runtime-loader.js');
+        const loader = runtimeLoaderPath !== null && runtimeLoaderPath !== void 0 ? runtimeLoaderPath : path__default["default"].resolve(__dirname, './weapp-tw-runtime-loader.js');
         const isExisted = fs__default["default"].existsSync(loader);
         const WeappTwRuntimeAopLoader = {
             loader,

package/dist/webpack.mjs

@@ -1,8 +1,8 @@
 import path from 'node:path';
 import fs from 'node:fs';
-import { g as getOptions, a as createTailwindcssPatcher } from './options-8805cf56.mjs';
+import { g as getOptions, a as createTailwindcssPatcher } from './options-ad0be036.mjs';
 import { a as pluginName } from './postcss-a551ddc0.mjs';
-import { g as getGroupedEntries } from './defaults-0743f523.mjs';
+import { g as getGroupedEntries } from './defaults-72ea9566.mjs';
 import 'micromatch';
 import 'magic-string';
 import './replace.mjs';
@@ -13,6 +13,7 @@ import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
 import '@babel/types';
+import 'htmlparser2';
 import 'postcss';
 import '@csstools/postcss-is-pseudo-class';
 import 'semver';
@@ -29,7 +30,7 @@ class UnifiedWebpackPluginV5 {
         this.appType = this.options.appType;
     }
     apply(compiler) {
-        const { mainCssChunkMatcher, disabled, onLoad, onUpdate, onEnd, onStart, styleHandler, patch, templateHandler, jsHandler, setMangleRuntimeSet } = this.options;
+        const { mainCssChunkMatcher, disabled, onLoad, onUpdate, onEnd, onStart, styleHandler, patch, templateHandler, jsHandler, setMangleRuntimeSet, runtimeLoaderPath } = this.options;
         if (disabled) {
             return;
         }
@@ -41,7 +42,7 @@ class UnifiedWebpackPluginV5 {
             return twPatcher.getClassSet();
         }
         onLoad();
-        const loader = path.resolve(__dirname, './weapp-tw-runtime-loader.js');
+        const loader = runtimeLoaderPath !== null && runtimeLoaderPath !== void 0 ? runtimeLoaderPath : path.resolve(__dirname, './weapp-tw-runtime-loader.js');
         const isExisted = fs.existsSync(loader);
         const WeappTwRuntimeAopLoader = {
             loader,

package/dist/wxml/index.d.ts

@@ -1,2 +1,2 @@
 export { replaceWxml } from './shared';
-export { generateCode, templateHandler, templateReplacer, customTemplateHandler, createTemplateHandler, extractSource } from './utils';
+export { generateCode, templateReplacer, customTemplateHandler, createTemplateHandler, extractSource } from './utils';

package/dist/wxml/utils.d.ts

@@ -1,7 +1,8 @@
+import { ItemOrItemArray } from "../reg";
 import type { RawSource, ITemplateHandlerOptions } from "../types";
 export declare function generateCode(match: string, options?: ITemplateHandlerOptions): string;
 export declare function extractSource(original: string): RawSource[];
 export declare function templateReplacer(original: string, options?: ITemplateHandlerOptions): string;
-export declare function templateHandler(rawSource: string, options?: ITemplateHandlerOptions): string;
+export declare function isPropsMatch(props: ItemOrItemArray<string | RegExp>, attr: string): boolean;
 export declare function customTemplateHandler(rawSource: string, options: Required<ITemplateHandlerOptions>): string;
 export declare function createTemplateHandler(options?: Omit<ITemplateHandlerOptions, 'runtimeSet'>): (rawSource: string, opt?: Pick<ITemplateHandlerOptions, 'runtimeSet'>) => string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "2.7.1",
-  "description": "把tailwindcss jit引擎，带给小程序开发者们\nbring tailwindcss jit engine to our miniprogram developers!",
+  "version": "2.8.1",
+  "description": "把tailwindcss jit引擎，带给小程序开发者们! bring tailwindcss jit engine to miniprogram developers!",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -106,9 +106,9 @@
     "@icebreakers/cli": "0.1.1",
     "@icebreakers/readme": "0.1.0",
     "@rollup/plugin-alias": "^5.0.0",
-    "@rollup/plugin-commonjs": "^25.0.3",
+    "@rollup/plugin-commonjs": "^25.0.4",
     "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.1.0",
+    "@rollup/plugin-node-resolve": "^15.2.0",
     "@rollup/plugin-terser": "^0.4.3",
     "@rollup/plugin-typescript": "^11.1.2",
     "@tsconfig/recommended": "^1.0.2",
@@ -123,22 +123,23 @@
     "@types/loader-utils": "^2.0.3",
     "@types/lodash": "^4.14.197",
     "@types/micromatch": "^4.0.2",
-    "@types/node": "^20.4.9",
+    "@types/node": "^20.5.1",
     "@types/semver": "^7.5.0",
     "@types/vinyl": "^2.0.7",
     "@types/webpack": "^5.28.1",
     "@types/webpack-sources": "^3.2.0",
-    "@vitest/coverage-v8": "^0.34.1",
-    "autoprefixer": "^10.4.14",
+    "@vitest/coverage-v8": "^0.34.2",
+    "autoprefixer": "^10.4.15",
     "babel-loader": "^9.1.3",
-    "bumpp": "^9.1.1",
+    "bumpp": "^9.2.0",
     "colorette": "^2.0.20",
     "cross-env": "^7.0.3",
     "css-loader": "^6.8.1",
     "dedent": "^1.5.1",
     "defu": "6.1.2",
     "del": "^7.0.0",
-    "eslint": "8.46.0",
+    "domhandler": "^5.0.3",
+    "eslint": "8.47.0",
     "eslint-config-icebreaker": "^1.2.2",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-prettier": "^5.0.0",
@@ -148,7 +149,7 @@
     "gulp": "^4.0.2",
     "gulp-postcss": "^9.0.1",
     "html-loader": "^4.2.0",
-    "jest": "^29.6.2",
+    "jest": "^29.6.3",
     "js-beautify": "^1.14.9",
     "klaw": "^4.1.0",
     "lodash": "^4.17.21",
@@ -158,7 +159,7 @@
     "postcss-load-config": "^4.0.1",
     "postcss-loader": "^7.3.3",
     "postcss-rem-to-responsive-pixel": "^5.1.3",
-    "prettier": "^3.0.1",
+    "prettier": "^3.0.2",
     "promisify-loader-runner": "^1.0.0",
     "rollup": "^3.28.0",
     "rollup-plugin-visualizer": "^5.9.2",
@@ -169,12 +170,12 @@
     "ts-node": "^10.9.1",
     "ts-patch": "^3.0.2",
     "tsd": "^0.28.1",
-    "tslib": "^2.6.1",
+    "tslib": "^2.6.2",
     "typescript": "^5.1.6",
     "typescript-transform-paths": "^3.4.6",
     "vinyl": "^3.0.0",
     "vite": "^4.4.9",
-    "vitest": "^0.34.1",
+    "vitest": "^0.34.2",
     "weapp-tailwindcss-children": "^0.1.0",
     "webpack": "^5.88.2",
     "webpack-build-utils": "^0.0.4"
@@ -185,18 +186,19 @@
     "@babel/traverse": "^7.22.10",
     "@babel/types": "^7.22.10",
     "@csstools/postcss-is-pseudo-class": "^4.0.0",
-    "@tailwindcss-mangle/shared": "^2.0.4",
-    "@weapp-core/escape": "^1.0.0",
+    "@tailwindcss-mangle/shared": "^2.1.0",
+    "@weapp-core/escape": "^1.1.0",
     "@weapp-core/regex": "^1.0.0",
+    "htmlparser2": "^9.0.0",
     "loader-utils": "^2.0.3",
-    "magic-string": "^0.30.2",
+    "magic-string": "^0.30.3",
     "micromatch": "^4.0.5",
-    "postcss": "8.4.27",
+    "postcss": "8.4.28",
     "postcss-selector-parser": "^6.0.13",
     "semver": "^7.5.4",
-    "tailwindcss-patch": "^2.0.4"
+    "tailwindcss-patch": "^2.1.1"
   },
-  "packageManager": "pnpm@8.6.11",
+  "packageManager": "pnpm@8.6.12",
   "engines": {
     "node": ">=16.6.0"
   },