weapp-tailwindcss 2.11.2 → 2.11.3

package/dist/index-D3TDwy2Y.mjs

@@ -0,0 +1,140 @@
+import { g as getOptions, c as createTailwindcssPatcher, _ as __awaiter } from './options-B5UOFsZN.mjs';
+import { v as vitePluginName } from './plugin-Du3zrk3S.mjs';
+import { g as getGroupedEntries } from './defaults-DMBtD8TO.mjs';
+import { c as createDebug } from './index-CLxBL7MC.mjs';
+
+const debug = createDebug('generateBundle: ');
+function UnifiedViteWeappTailwindcssPlugin(options = {}) {
+    if (options.customReplaceDictionary === undefined) {
+        options.customReplaceDictionary = 'simple';
+    }
+    const opts = getOptions(options);
+    const { disabled, onEnd, onLoad, onStart, onUpdate, templateHandler, styleHandler, patch, jsHandler, mainCssChunkMatcher, appType, setMangleRuntimeSet, cache, tailwindcssBasedir } = opts;
+    if (disabled) {
+        return;
+    }
+    patch === null || patch === void 0 ? void 0 : patch();
+    const twPatcher = createTailwindcssPatcher();
+    onLoad();
+    return {
+        name: vitePluginName,
+        enforce: 'post',
+        generateBundle(opt, bundle) {
+            return __awaiter(this, void 0, void 0, function* () {
+                debug('start');
+                onStart();
+                const entries = Object.entries(bundle);
+                const groupedEntries = getGroupedEntries(entries, opts);
+                const runtimeSet = twPatcher.getClassSet({
+                    basedir: tailwindcssBasedir
+                });
+                setMangleRuntimeSet(runtimeSet);
+                debug('get runtimeSet, class count: %d', runtimeSet.size);
+                if (Array.isArray(groupedEntries.html)) {
+                    let noCachedCount = 0;
+                    for (let i = 0; i < groupedEntries.html.length; i++) {
+                        const [file, originalSource] = groupedEntries.html[i];
+                        const oldVal = originalSource.source.toString();
+                        const hash = cache.computeHash(oldVal);
+                        cache.calcHashValueChanged(file, hash);
+                        yield cache.process(file, () => {
+                            const source = cache.get(file);
+                            if (source) {
+                                originalSource.source = source;
+                                debug('html cache hit: %s', file);
+                            }
+                            else {
+                                return false;
+                            }
+                        }, () => {
+                            originalSource.source = templateHandler(oldVal, {
+                                runtimeSet
+                            });
+                            onUpdate(file, oldVal, originalSource.source);
+                            debug('html handle: %s', file);
+                            noCachedCount++;
+                            return {
+                                key: file,
+                                source: originalSource.source
+                            };
+                        });
+                    }
+                    debug('html handle finish, total: %d, no-cached: %d', groupedEntries.html.length, noCachedCount);
+                }
+                if (Array.isArray(groupedEntries.js)) {
+                    let noCachedCount = 0;
+                    for (let i = 0; i < groupedEntries.js.length; i++) {
+                        const [file, originalSource] = groupedEntries.js[i];
+                        const rawSource = originalSource.code;
+                        const hash = cache.computeHash(rawSource);
+                        cache.calcHashValueChanged(file, hash);
+                        yield cache.process(file, () => {
+                            const source = cache.get(file);
+                            if (source) {
+                                originalSource.code = source;
+                                debug('js cache hit: %s', file);
+                            }
+                            else {
+                                return false;
+                            }
+                        }, () => {
+                            const mapFilename = file + '.map';
+                            const hasMap = Boolean(bundle[mapFilename]);
+                            const { code, map } = jsHandler(rawSource, runtimeSet, {
+                                generateMap: hasMap
+                            });
+                            originalSource.code = code;
+                            onUpdate(file, rawSource, code);
+                            debug('js handle: %s', file);
+                            noCachedCount++;
+                            if (hasMap && map) {
+                                bundle[mapFilename].source = map.toString();
+                            }
+                            return {
+                                key: file,
+                                source: code
+                            };
+                        });
+                    }
+                    debug('js handle finish, total: %d, no-cached: %d', groupedEntries.js.length, noCachedCount);
+                }
+                if (Array.isArray(groupedEntries.css)) {
+                    let noCachedCount = 0;
+                    for (let i = 0; i < groupedEntries.css.length; i++) {
+                        const [file, originalSource] = groupedEntries.css[i];
+                        const rawSource = originalSource.source.toString();
+                        const hash = cache.computeHash(rawSource);
+                        cache.calcHashValueChanged(file, hash);
+                        yield cache.process(file, () => {
+                            const source = cache.get(file);
+                            if (source) {
+                                originalSource.source = source;
+                                debug('css cache hit: %s', file);
+                            }
+                            else {
+                                return false;
+                            }
+                        }, () => __awaiter(this, void 0, void 0, function* () {
+                            const css = yield styleHandler(rawSource, {
+                                isMainChunk: mainCssChunkMatcher(originalSource.fileName, appType)
+                            });
+                            originalSource.source = css;
+                            onUpdate(file, rawSource, css);
+                            debug('css handle: %s', file);
+                            noCachedCount++;
+                            return {
+                                key: file,
+                                source: css
+                            };
+                        }));
+                    }
+                    debug('css handle finish, total: %d, no-cached: %d', groupedEntries.css.length, noCachedCount);
+                }
+                onEnd();
+                debug('end');
+            });
+        }
+    };
+}
+
+export { UnifiedViteWeappTailwindcssPlugin as U };

package/dist/index-De0cmOEK.js

@@ -0,0 +1,70 @@
+'use strict';
+
+var options = require('./options-BAFFNEBI.js');
+var stream = require('node:stream');
+
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
+
+var stream__default = /*#__PURE__*/_interopDefaultCompat(stream);
+
+const Transform = stream__default["default"].Transform;
+function createPlugins(options$1 = {}) {
+    const opts = options.getOptions(options$1);
+    const { templateHandler, styleHandler, patch, jsHandler, setMangleRuntimeSet, tailwindcssBasedir } = opts;
+    let runtimeSet = new Set();
+    patch === null || patch === void 0 ? void 0 : patch();
+    const twPatcher = options.createTailwindcssPatcher();
+    function transformWxss() {
+        const transformStream = new Transform({ objectMode: true });
+        transformStream._transform = function (file, encoding, callback) {
+            return options.__awaiter(this, void 0, void 0, function* () {
+                runtimeSet = twPatcher.getClassSet({
+                    basedir: tailwindcssBasedir
+                });
+                setMangleRuntimeSet(runtimeSet);
+                const error = null;
+                if (file.contents) {
+                    const code = yield styleHandler(file.contents.toString(), {
+                        isMainChunk: true
+                    });
+                    file.contents = Buffer.from(code);
+                }
+                callback(error, file);
+            });
+        };
+        return transformStream;
+    }
+    function transformJs() {
+        const transformStream = new Transform({ objectMode: true });
+        transformStream._transform = function (file, encoding, callback) {
+            const error = null;
+            if (file.contents) {
+                const { code } = jsHandler(file.contents.toString(), runtimeSet);
+                file.contents = Buffer.from(code);
+            }
+            callback(error, file);
+        };
+        return transformStream;
+    }
+    function transformWxml() {
+        const transformStream = new Transform({ objectMode: true });
+        transformStream._transform = function (file, encoding, callback) {
+            const error = null;
+            if (file.contents) {
+                const code = templateHandler(file.contents.toString(), {
+                    runtimeSet
+                });
+                file.contents = Buffer.from(code);
+            }
+            callback(error, file);
+        };
+        return transformStream;
+    }
+    return {
+        transformWxss,
+        transformWxml,
+        transformJs
+    };
+}
+
+exports.createPlugins = createPlugins;

package/dist/index-QLyv-Fcp.mjs

@@ -0,0 +1,64 @@
+import { g as getOptions, c as createTailwindcssPatcher, _ as __awaiter } from './options-B5UOFsZN.mjs';
+import stream from 'node:stream';
+
+const Transform = stream.Transform;
+function createPlugins(options = {}) {
+    const opts = getOptions(options);
+    const { templateHandler, styleHandler, patch, jsHandler, setMangleRuntimeSet, tailwindcssBasedir } = opts;
+    let runtimeSet = new Set();
+    patch === null || patch === void 0 ? void 0 : patch();
+    const twPatcher = createTailwindcssPatcher();
+    function transformWxss() {
+        const transformStream = new Transform({ objectMode: true });
+        transformStream._transform = function (file, encoding, callback) {
+            return __awaiter(this, void 0, void 0, function* () {
+                runtimeSet = twPatcher.getClassSet({
+                    basedir: tailwindcssBasedir
+                });
+                setMangleRuntimeSet(runtimeSet);
+                const error = null;
+                if (file.contents) {
+                    const code = yield styleHandler(file.contents.toString(), {
+                        isMainChunk: true
+                    });
+                    file.contents = Buffer.from(code);
+                }
+                callback(error, file);
+            });
+        };
+        return transformStream;
+    }
+    function transformJs() {
+        const transformStream = new Transform({ objectMode: true });
+        transformStream._transform = function (file, encoding, callback) {
+            const error = null;
+            if (file.contents) {
+                const { code } = jsHandler(file.contents.toString(), runtimeSet);
+                file.contents = Buffer.from(code);
+            }
+            callback(error, file);
+        };
+        return transformStream;
+    }
+    function transformWxml() {
+        const transformStream = new Transform({ objectMode: true });
+        transformStream._transform = function (file, encoding, callback) {
+            const error = null;
+            if (file.contents) {
+                const code = templateHandler(file.contents.toString(), {
+                    runtimeSet
+                });
+                file.contents = Buffer.from(code);
+            }
+            callback(error, file);
+        };
+        return transformStream;
+    }
+    return {
+        transformWxss,
+        transformWxml,
+        transformJs
+    };
+}
+
+export { createPlugins as c };

package/dist/index.js

@@ -2,26 +2,26 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var webpack = require('./webpack.js');
-var vite = require('./vite.js');
-var gulp = require('./gulp.js');
-require('./options-GnoWW1lR.js');
+var v5 = require('./v5-Crbh5I-S.js');
+var index = require('./index-C70Rgk3g.js');
+var index$1 = require('./index-De0cmOEK.js');
+require('./options-BAFFNEBI.js');
 require('micromatch');
 require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
 require('@ast-core/escape');
-require('./shared-nXoJWFdz.js');
+require('./shared-DtRIj-D_.js');
 require('@weapp-core/regex');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
-require('./defu-VMJMz2AB.js');
-require('./defaults-0O-zKoXE.js');
+require('./defu-JkbfvVKI.js');
+require('./defaults-qX2VLo8u.js');
 require('@babel/types');
 require('htmlparser2');
 require('postcss');
-require('./postcss-Et8j4ugT.js');
+require('./plugin-Bxt3oO75.js');
 require('postcss-selector-parser');
 require('@csstools/postcss-is-pseudo-class');
 require('node:path');
@@ -31,12 +31,12 @@ require('tailwindcss-patch');
 require('@tailwindcss-mangle/shared');
 require('lru-cache');
 require('md5');
-require('./index-z25r_Htj.js');
+require('./index-CKXO21Qe.js');
 require('debug');
 require('node:stream');
 
 
 
-exports.UnifiedWebpackPluginV5 = webpack.UnifiedWebpackPluginV5;
-exports.UnifiedViteWeappTailwindcssPlugin = vite.UnifiedViteWeappTailwindcssPlugin;
-exports.createPlugins = gulp.createPlugins;
+exports.UnifiedWebpackPluginV5 = v5.UnifiedWebpackPluginV5;
+exports.UnifiedViteWeappTailwindcssPlugin = index.UnifiedViteWeappTailwindcssPlugin;
+exports.createPlugins = index$1.createPlugins;

package/dist/index.mjs

@@ -1,23 +1,23 @@
-export { UnifiedWebpackPluginV5 } from './webpack.mjs';
-export { UnifiedViteWeappTailwindcssPlugin } from './vite.mjs';
-export { createPlugins } from './gulp.mjs';
-import './options-QwNnkDpt.mjs';
+export { U as UnifiedWebpackPluginV5 } from './v5-V8LlDF1a.mjs';
+export { U as UnifiedViteWeappTailwindcssPlugin } from './index-D3TDwy2Y.mjs';
+export { c as createPlugins } from './index-QLyv-Fcp.mjs';
+import './options-B5UOFsZN.mjs';
 import 'micromatch';
 import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
 import '@ast-core/escape';
-import './shared-S0v7ZvWs.mjs';
+import './shared-D4ZM_mI-.mjs';
 import '@weapp-core/regex';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
-import './defu-NLkZUlr9.mjs';
-import './defaults-dz6xGhOP.mjs';
+import './defu-D2_bzAv0.mjs';
+import './defaults-DMBtD8TO.mjs';
 import '@babel/types';
 import 'htmlparser2';
 import 'postcss';
-import './postcss-W8i3cl5I.mjs';
+import './plugin-Du3zrk3S.mjs';
 import 'postcss-selector-parser';
 import '@csstools/postcss-is-pseudo-class';
 import 'node:path';
@@ -27,6 +27,6 @@ import 'tailwindcss-patch';
 import '@tailwindcss-mangle/shared';
 import 'lru-cache';
 import 'md5';
-import './index-06BoOZig.mjs';
+import './index-CLxBL7MC.mjs';
 import 'debug';
 import 'node:stream';

package/dist/{options-QwNnkDpt.mjs → options-B5UOFsZN.mjs}

@@ -7,12 +7,12 @@ import { jsStringEscape } from '@ast-core/escape';
 import generate from '@babel/generator';
 import { parse, parseExpression } from '@babel/parser';
 import traverse from '@babel/traverse';
-import { d as defu } from './defu-NLkZUlr9.mjs';
-import { n as noop, d as defaultOptions, i as isMap } from './defaults-dz6xGhOP.mjs';
+import { d as defu } from './defu-D2_bzAv0.mjs';
+import { n as noop, d as defaultOptions, i as isMap } from './defaults-DMBtD8TO.mjs';
 import * as t from '@babel/types';
 import { Parser } from 'htmlparser2';
 import postcss from 'postcss';
-import { p as postcssWeappTailwindcss } from './postcss-W8i3cl5I.mjs';
+import { p as postcssWeappTailwindcss } from './plugin-Du3zrk3S.mjs';
 import postcssIsPseudoClass from '@csstools/postcss-is-pseudo-class';
 import path from 'node:path';
 import fs from 'node:fs';
@@ -64,16 +64,12 @@ const splitCode = (code, allowDoubleQuotes = false) => {
 };
 
 function regenerateHandleValue(str, node, options) {
-    var _a;
-    const set = options.classNameSet;
-    const escapeMap = options.escapeMap;
-    const allowDoubleQuotes = (_a = options.arbitraryValues) === null || _a === void 0 ? void 0 : _a.allowDoubleQuotes;
-    const ctx = options.mangleContext;
-    const jsPreserveClass = options.jsPreserveClass;
+    const { classNameSet: set, escapeMap, always, arbitraryValues, mangleContext: ctx, jsPreserveClass } = options;
+    const allowDoubleQuotes = arbitraryValues === null || arbitraryValues === void 0 ? void 0 : arbitraryValues.allowDoubleQuotes;
     const arr = splitCode(str, allowDoubleQuotes);
     let rawStr = str;
     for (const v of arr) {
-        if (set.has(v) && !(jsPreserveClass === null || jsPreserveClass === void 0 ? void 0 : jsPreserveClass(v))) {
+        if (always || (set && set.has(v) && !(jsPreserveClass === null || jsPreserveClass === void 0 ? void 0 : jsPreserveClass(v)))) {
             let ignoreFlag = false;
             if (Array.isArray(node.leadingComments)) {
                 ignoreFlag = node.leadingComments.findIndex((x) => x.value.includes('weapp-tw') && x.value.includes('ignore')) > -1;
@@ -82,7 +78,7 @@ function regenerateHandleValue(str, node, options) {
                 if (ctx) {
                     rawStr = ctx.jsHandler(rawStr);
                 }
-                rawStr = rawStr.replaceAll(new RegExp(escapeStringRegexp(v), 'g'), replaceWxml(v, {
+                rawStr = rawStr.replace(new RegExp(escapeStringRegexp(v)), replaceWxml(v, {
                     escapeMap
                 }));
             }
@@ -91,16 +87,12 @@ function regenerateHandleValue(str, node, options) {
     return rawStr;
 }
 function replaceHandleValue(str, node, options, ms, offset = 0, needEscaped = false) {
-    var _a;
-    const set = options.classNameSet;
-    const escapeMap = options.escapeMap;
-    const allowDoubleQuotes = (_a = options.arbitraryValues) === null || _a === void 0 ? void 0 : _a.allowDoubleQuotes;
-    const ctx = options.mangleContext;
-    const jsPreserveClass = options.jsPreserveClass;
+    const { classNameSet: set, escapeMap, always, arbitraryValues, mangleContext: ctx, jsPreserveClass } = options;
+    const allowDoubleQuotes = arbitraryValues === null || arbitraryValues === void 0 ? void 0 : arbitraryValues.allowDoubleQuotes;
     const arr = splitCode(str, allowDoubleQuotes);
     let rawStr = str;
     for (const v of arr) {
-        if (set.has(v) && !(jsPreserveClass === null || jsPreserveClass === void 0 ? void 0 : jsPreserveClass(v))) {
+        if (always || (set && set.has(v) && !(jsPreserveClass === null || jsPreserveClass === void 0 ? void 0 : jsPreserveClass(v)))) {
             let ignoreFlag = false;
             if (Array.isArray(node.leadingComments)) {
                 ignoreFlag = node.leadingComments.findIndex((x) => x.value.includes('weapp-tw') && x.value.includes('ignore')) > -1;
@@ -109,7 +101,7 @@ function replaceHandleValue(str, node, options, ms, offset = 0, needEscaped = fa
                 if (ctx) {
                     rawStr = ctx.jsHandler(rawStr);
                 }
-                rawStr = rawStr.replaceAll(new RegExp(escapeStringRegexp(v), 'g'), replaceWxml(v, {
+                rawStr = rawStr.replace(new RegExp(escapeStringRegexp(v)), replaceWxml(v, {
                     escapeMap
                 }));
             }
@@ -285,13 +277,10 @@ function createJsHandler(options) {
     };
 }
 
-function getQuotes(quote) {
-    const quotes = quote === "'" ? 'double' : 'single';
-    return quotes;
-}
 function generateCode(match, options = {}) {
     try {
         const ast = parseExpression(match);
+        const ms = new MagicString(match);
         traverse(ast, {
             StringLiteral(path) {
                 var _a;
@@ -301,19 +290,18 @@ function generateCode(match, options = {}) {
                 if (t.isBinaryExpression(path.parent) && t.isConditionalExpression((_a = path.parentPath) === null || _a === void 0 ? void 0 : _a.parent)) {
                     return;
                 }
-                path.node.value = replaceWxml(path.node.value, options);
+                const n = path.node;
+                replaceHandleValue(n.value, n, {
+                    always: true,
+                    classNameSet: options.runtimeSet,
+                    mangleContext: options.mangleContext,
+                    escapeMap: options.escapeMap,
+                    needEscaped: true
+                }, ms, 1, true);
             },
             noScope: true
         });
-        const { code } = generate(ast, {
-            compact: true,
-            minified: true,
-            jsescOption: {
-                quotes: getQuotes(options.quote),
-                minimal: true
-            }
-        });
-        return code;
+        return ms.toString();
     }
     catch (_a) {
         return match;
@@ -412,7 +400,7 @@ function customTemplateHandler(rawSource, options) {
         onattribute(name, value, quote) {
             if (value) {
                 function update() {
-                    s.update(parser.startIndex + name.length + 2, parser.endIndex, templateReplacer(value, Object.assign(Object.assign({}, options), { quote })));
+                    s.update(parser.startIndex + name.length + 2, parser.endIndex - 1, templateReplacer(value, Object.assign(Object.assign({}, options), { quote })));
                 }
                 if (!disabledDefaultTemplateHandler && (name === 'class' || name === 'hover-class' || name === 'virtualhostclass')) {
                     update();
@@ -623,7 +611,7 @@ function useMangleStore() {
         const arr = splitCode(rawSource);
         for (const x of arr) {
             if (ctx.runtimeSet.has(x)) {
-                rawSource = rawSource.replaceAll(new RegExp(escapeStringRegexp(x), 'g'), ctx.classGenerator.generateClassName(x).name);
+                rawSource = rawSource.replace(new RegExp(escapeStringRegexp(x)), ctx.classGenerator.generateClassName(x).name);
             }
         }
         return rawSource;
@@ -807,4 +795,4 @@ function getOptions(options = {}) {
     return result;
 }
 
-export { __awaiter as _, createTailwindcssPatcher as a, createPatch as c, getOptions as g };
+export { __awaiter as _, createPatch as a, createTailwindcssPatcher as c, getOptions as g };

package/dist/{options-GnoWW1lR.js → options-BAFFNEBI.js}

@@ -9,12 +9,12 @@ var escape = require('@ast-core/escape');
 var generate = require('@babel/generator');
 var parser = require('@babel/parser');
 var traverse = require('@babel/traverse');
-var defu = require('./defu-VMJMz2AB.js');
-var defaults = require('./defaults-0O-zKoXE.js');
+var defu = require('./defu-JkbfvVKI.js');
+var defaults = require('./defaults-qX2VLo8u.js');
 var t = require('@babel/types');
 var htmlparser2 = require('htmlparser2');
 var postcss = require('postcss');
-var postcss$1 = require('./postcss-Et8j4ugT.js');
+var plugin = require('./plugin-Bxt3oO75.js');
 var postcssIsPseudoClass = require('@csstools/postcss-is-pseudo-class');
 var path = require('node:path');
 var fs = require('node:fs');
@@ -24,7 +24,7 @@ var shared = require('@tailwindcss-mangle/shared');
 var lruCache = require('lru-cache');
 var md5 = require('md5');
 
-function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
 function _interopNamespaceCompat(e) {
     if (e && typeof e === 'object' && 'default' in e) return e;
@@ -96,16 +96,12 @@ const splitCode = (code, allowDoubleQuotes = false) => {
 };
 
 function regenerateHandleValue(str, node, options) {
-    var _a;
-    const set = options.classNameSet;
-    const escapeMap = options.escapeMap;
-    const allowDoubleQuotes = (_a = options.arbitraryValues) === null || _a === void 0 ? void 0 : _a.allowDoubleQuotes;
-    const ctx = options.mangleContext;
-    const jsPreserveClass = options.jsPreserveClass;
+    const { classNameSet: set, escapeMap, always, arbitraryValues, mangleContext: ctx, jsPreserveClass } = options;
+    const allowDoubleQuotes = arbitraryValues === null || arbitraryValues === void 0 ? void 0 : arbitraryValues.allowDoubleQuotes;
     const arr = splitCode(str, allowDoubleQuotes);
     let rawStr = str;
     for (const v of arr) {
-        if (set.has(v) && !(jsPreserveClass === null || jsPreserveClass === void 0 ? void 0 : jsPreserveClass(v))) {
+        if (always || (set && set.has(v) && !(jsPreserveClass === null || jsPreserveClass === void 0 ? void 0 : jsPreserveClass(v)))) {
             let ignoreFlag = false;
             if (Array.isArray(node.leadingComments)) {
                 ignoreFlag = node.leadingComments.findIndex((x) => x.value.includes('weapp-tw') && x.value.includes('ignore')) > -1;
@@ -114,7 +110,7 @@ function regenerateHandleValue(str, node, options) {
                 if (ctx) {
                     rawStr = ctx.jsHandler(rawStr);
                 }
-                rawStr = rawStr.replaceAll(new RegExp(regex.escapeStringRegexp(v), 'g'), replace.replaceJs(v, {
+                rawStr = rawStr.replace(new RegExp(regex.escapeStringRegexp(v)), replace.replaceJs(v, {
                     escapeMap
                 }));
             }
@@ -123,16 +119,12 @@ function regenerateHandleValue(str, node, options) {
     return rawStr;
 }
 function replaceHandleValue(str, node, options, ms, offset = 0, needEscaped = false) {
-    var _a;
-    const set = options.classNameSet;
-    const escapeMap = options.escapeMap;
-    const allowDoubleQuotes = (_a = options.arbitraryValues) === null || _a === void 0 ? void 0 : _a.allowDoubleQuotes;
-    const ctx = options.mangleContext;
-    const jsPreserveClass = options.jsPreserveClass;
+    const { classNameSet: set, escapeMap, always, arbitraryValues, mangleContext: ctx, jsPreserveClass } = options;
+    const allowDoubleQuotes = arbitraryValues === null || arbitraryValues === void 0 ? void 0 : arbitraryValues.allowDoubleQuotes;
     const arr = splitCode(str, allowDoubleQuotes);
     let rawStr = str;
     for (const v of arr) {
-        if (set.has(v) && !(jsPreserveClass === null || jsPreserveClass === void 0 ? void 0 : jsPreserveClass(v))) {
+        if (always || (set && set.has(v) && !(jsPreserveClass === null || jsPreserveClass === void 0 ? void 0 : jsPreserveClass(v)))) {
             let ignoreFlag = false;
             if (Array.isArray(node.leadingComments)) {
                 ignoreFlag = node.leadingComments.findIndex((x) => x.value.includes('weapp-tw') && x.value.includes('ignore')) > -1;
@@ -141,7 +133,7 @@ function replaceHandleValue(str, node, options, ms, offset = 0, needEscaped = fa
                 if (ctx) {
                     rawStr = ctx.jsHandler(rawStr);
                 }
-                rawStr = rawStr.replaceAll(new RegExp(regex.escapeStringRegexp(v), 'g'), replace.replaceJs(v, {
+                rawStr = rawStr.replace(new RegExp(regex.escapeStringRegexp(v)), replace.replaceJs(v, {
                     escapeMap
                 }));
             }
@@ -317,13 +309,10 @@ function createJsHandler(options) {
     };
 }
 
-function getQuotes(quote) {
-    const quotes = quote === "'" ? 'double' : 'single';
-    return quotes;
-}
 function generateCode(match, options = {}) {
     try {
         const ast = parser.parseExpression(match);
+        const ms = new MagicString__default["default"](match);
         traverse__default["default"](ast, {
             StringLiteral(path) {
                 var _a;
@@ -333,19 +322,18 @@ function generateCode(match, options = {}) {
                 if (t__namespace.isBinaryExpression(path.parent) && t__namespace.isConditionalExpression((_a = path.parentPath) === null || _a === void 0 ? void 0 : _a.parent)) {
                     return;
                 }
-                path.node.value = replace.replaceJs(path.node.value, options);
+                const n = path.node;
+                replaceHandleValue(n.value, n, {
+                    always: true,
+                    classNameSet: options.runtimeSet,
+                    mangleContext: options.mangleContext,
+                    escapeMap: options.escapeMap,
+                    needEscaped: true
+                }, ms, 1, true);
             },
             noScope: true
         });
-        const { code } = generate__default["default"](ast, {
-            compact: true,
-            minified: true,
-            jsescOption: {
-                quotes: getQuotes(options.quote),
-                minimal: true
-            }
-        });
-        return code;
+        return ms.toString();
     }
     catch (_a) {
         return match;
@@ -444,7 +432,7 @@ function customTemplateHandler(rawSource, options) {
         onattribute(name, value, quote) {
             if (value) {
                 function update() {
-                    s.update(parser.startIndex + name.length + 2, parser.endIndex, templateReplacer(value, Object.assign(Object.assign({}, options), { quote })));
+                    s.update(parser.startIndex + name.length + 2, parser.endIndex - 1, templateReplacer(value, Object.assign(Object.assign({}, options), { quote })));
                 }
                 if (!disabledDefaultTemplateHandler && (name === 'class' || name === 'hover-class' || name === 'virtualhostclass')) {
                     update();
@@ -488,7 +476,7 @@ function createTemplateHandler(options = {}) {
 
 function styleHandler(rawSource, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield postcss__default["default"]([postcssIsPseudoClass__default["default"](), postcss$1.postcssWeappTailwindcss(options)])
+        return (yield postcss__default["default"]([postcssIsPseudoClass__default["default"](), plugin.postcssWeappTailwindcss(options)])
             .process(rawSource)
             .async()).css;
     });
@@ -655,7 +643,7 @@ function useMangleStore() {
         const arr = splitCode(rawSource);
         for (const x of arr) {
             if (ctx.runtimeSet.has(x)) {
-                rawSource = rawSource.replaceAll(new RegExp(regex.escapeStringRegexp(x), 'g'), ctx.classGenerator.generateClassName(x).name);
+                rawSource = rawSource.replace(new RegExp(regex.escapeStringRegexp(x)), ctx.classGenerator.generateClassName(x).name);
             }
         }
         return rawSource;