weapp-tailwindcss 3.0.10 → 3.1.0

package/dist/{index-BBGsdK79.js → index-jf-1m663.js}

@@ -1,11 +1,11 @@
 'use strict';
 
-var options = require('./options-Ce8c4jgF.js');
-var index = require('./index-CKzzVDhq.js');
+var options = require('./options-AIjWBFPo.js');
+var index = require('./index-CarwQa1I.js');
 var defaults = require('./defaults-BT3A8Rzc.js');
-var index$1 = require('./index-CKXO21Qe.js');
+var index$1 = require('./index-DyK5Vd4R.js');
 
-const debug = index$1.createDebug('generateBundle: ');
+const debug = index$1.createDebug();
 function UnifiedViteWeappTailwindcssPlugin(options$1 = {}) {
     if (options$1.customReplaceDictionary === undefined) {
         options$1.customReplaceDictionary = 'simple';
@@ -48,8 +48,8 @@ function UnifiedViteWeappTailwindcssPlugin(options$1 = {}) {
                             else {
                                 return false;
                             }
-                        }, () => {
-                            originalSource.source = templateHandler(oldVal, {
+                        }, () => options.__awaiter(this, void 0, void 0, function* () {
+                            originalSource.source = yield templateHandler(oldVal, {
                                 runtimeSet
                             });
                             onUpdate(file, oldVal, originalSource.source);
@@ -59,7 +59,7 @@ function UnifiedViteWeappTailwindcssPlugin(options$1 = {}) {
                                 key: file,
                                 source: originalSource.source
                             };
-                        });
+                        }));
                     }
                     debug('html handle finish, total: %d, no-cached: %d', groupedEntries.html.length, noCachedCount);
                 }
@@ -79,10 +79,10 @@ function UnifiedViteWeappTailwindcssPlugin(options$1 = {}) {
                             else {
                                 return false;
                             }
-                        }, () => {
+                        }, () => options.__awaiter(this, void 0, void 0, function* () {
                             const mapFilename = file + '.map';
                             const hasMap = Boolean(bundle[mapFilename]);
-                            const { code, map } = jsHandler(rawSource, runtimeSet, {
+                            const { code, map } = yield jsHandler(rawSource, runtimeSet, {
                                 generateMap: hasMap
                             });
                             originalSource.code = code;
@@ -96,7 +96,7 @@ function UnifiedViteWeappTailwindcssPlugin(options$1 = {}) {
                                 key: file,
                                 source: code
                             };
-                        });
+                        }));
                     }
                     debug('js handle finish, total: %d, no-cached: %d', groupedEntries.js.length, noCachedCount);
                 }

package/dist/index.js

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var v5 = require('./v5-B5nztYEa.js');
-var index = require('./index-BBGsdK79.js');
-var index$1 = require('./index-DXyNWU95.js');
-require('./options-Ce8c4jgF.js');
+var v5 = require('./v5-BV64BMJS.js');
+var index = require('./index-jf-1m663.js');
+var index$1 = require('./index-C9cFs8_u.js');
+require('./options-AIjWBFPo.js');
 require('magic-string');
 require('./replace.js');
 require('@weapp-core/escape');
@@ -20,7 +20,7 @@ require('./defu-Cdz2PomB.js');
 require('@babel/types');
 require('htmlparser2');
 require('postcss');
-require('./index-CKzzVDhq.js');
+require('./index-CarwQa1I.js');
 require('@csstools/postcss-is-pseudo-class');
 require('postcss-rem-to-responsive-pixel');
 require('postcss-selector-parser');
@@ -31,7 +31,7 @@ require('tailwindcss-patch');
 require('@tailwindcss-mangle/shared');
 require('lru-cache');
 require('md5');
-require('./index-CKXO21Qe.js');
+require('./index-DyK5Vd4R.js');
 require('debug');
 require('node:stream');
 

package/dist/index.mjs

@@ -1,7 +1,7 @@
-export { U as UnifiedWebpackPluginV5 } from './v5-KEbKT7UN.mjs';
-export { U as UnifiedViteWeappTailwindcssPlugin } from './index-DfbtBzIV.mjs';
-export { c as createPlugins } from './index-DMO3Y3vp.mjs';
-import './options-D74YiXdv.mjs';
+export { U as UnifiedWebpackPluginV5 } from './v5-CH-EIloz.mjs';
+export { U as UnifiedViteWeappTailwindcssPlugin } from './index-BatBMY3C.mjs';
+export { c as createPlugins } from './index-DEWZ8_xX.mjs';
+import './options-D6Mza941.mjs';
 import 'magic-string';
 import './replace.mjs';
 import '@weapp-core/escape';
@@ -16,7 +16,7 @@ import './defu-n46TJT6t.mjs';
 import '@babel/types';
 import 'htmlparser2';
 import 'postcss';
-import './index-C7QwtXvo.mjs';
+import './index-DKNUquoz.mjs';
 import '@csstools/postcss-is-pseudo-class';
 import 'postcss-rem-to-responsive-pixel';
 import 'postcss-selector-parser';
@@ -27,6 +27,6 @@ import 'tailwindcss-patch';
 import '@tailwindcss-mangle/shared';
 import 'lru-cache';
 import 'md5';
-import './index-CLxBL7MC.mjs';
+import './index-CsZGfl55.mjs';
 import 'debug';
 import 'node:stream';

package/dist/js/handlers.d.ts

@@ -1,4 +1,11 @@
-import type { StringLiteral, TemplateElement } from '@babel/types';
 import MagicString from 'magic-string';
 import type { IJsHandlerOptions } from "../types";
-export declare function replaceHandleValue(str: string, node: StringLiteral | TemplateElement, options: IJsHandlerOptions, ms: MagicString, offset?: number): string;
+interface ReplaceNode {
+    leadingComments?: {
+        value: string;
+    }[] | null | undefined;
+    start?: number | null;
+    end?: number | null;
+}
+export declare function replaceHandleValue(str: string, node: ReplaceNode, options: IJsHandlerOptions, ms: MagicString, offset?: number): string;
+export {};

package/dist/js/index.d.ts

@@ -1,3 +1,4 @@
 import type { CreateJsHandlerOptions, IJsHandlerOptions, JsHandlerResult } from "../types";
 export declare function jsHandler(rawSource: string, options: IJsHandlerOptions): JsHandlerResult;
-export declare function createJsHandler(options: CreateJsHandlerOptions): (rawSource: string, set: Set<string>, options?: CreateJsHandlerOptions) => JsHandlerResult;
+export declare function jsHandlerAsync(rawSource: string, options: IJsHandlerOptions): Promise<JsHandlerResult>;
+export declare function createJsHandler(options: CreateJsHandlerOptions): (rawSource: string, set: Set<string>, options?: CreateJsHandlerOptions) => JsHandlerResult | Promise<JsHandlerResult>;

package/dist/{options-Ce8c4jgF.js → options-AIjWBFPo.js}

@@ -12,7 +12,7 @@ var defaults = require('./defaults-BT3A8Rzc.js');
 var t = require('@babel/types');
 var htmlparser2 = require('htmlparser2');
 var postcss = require('postcss');
-var index = require('./index-CKzzVDhq.js');
+var index = require('./index-CarwQa1I.js');
 var path = require('node:path');
 var fs = require('node:fs');
 var semver = require('semver');
@@ -91,12 +91,23 @@ const splitCode = (code, allowDoubleQuotes = false) => {
     return code.split(splitter).filter((element) => isValidSelector(element));
 };
 
+function decodeUnicode(s) {
+    return unescape(s.replaceAll(/\\(u[\dA-Fa-f]{4})/gm, '%$1'));
+}
 function replaceHandleValue(str, node, options, ms, offset = 0) {
-    const { classNameSet: set, escapeMap, mangleContext: ctx, needEscaped = false, jsPreserveClass, arbitraryValues, always } = options;
+    const { classNameSet: set, escapeMap, mangleContext: ctx, needEscaped = false, jsPreserveClass, arbitraryValues, always, unescapeUnicode } = 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) {
+    let needDecodeUnicode = false;
+    if (unescapeUnicode && rawStr.includes('\\')) {
+        rawStr = decodeUnicode(rawStr);
+        needDecodeUnicode = true;
+    }
+    for (let v of arr) {
+        if (needDecodeUnicode && v.includes('\\')) {
+            v = decodeUnicode(v);
+        }
         if (always || (set && set.has(v) && !(jsPreserveClass === null || jsPreserveClass === void 0 ? void 0 : jsPreserveClass(v)))) {
             let ignoreFlag = false;
             if (Array.isArray(node.leadingComments)) {
@@ -130,7 +141,46 @@ function isEvalPath(p) {
     }
     return false;
 }
+function getAstGrep() {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const { js } = yield import('@ast-grep/napi');
+            return js;
+        }
+        catch (error) {
+            console.warn('请先安装 `@ast-grep/napi` , 安装完成后再尝试运行！');
+            throw error;
+        }
+    });
+}
+function astGrepUpdateString(ast, options, ms) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const js = yield getAstGrep();
+        const nodes = ast.findAll(js.kind('string'));
+        for (const node of nodes) {
+            const range = node.range();
+            const text = node.text();
+            replaceHandleValue(text.slice(1, -1), {
+                end: range.end.index - 1,
+                start: range.start.index + 1
+            }, Object.assign(Object.assign({}, options), { unescapeUnicode: true }), ms, 0);
+        }
+        const templateNodes = ast.findAll(js.kind('template_string'));
+        for (const node of templateNodes) {
+            const fragments = node.findAll(js.kind('string_fragment'));
+            for (const fragment of fragments) {
+                const range = fragment.range();
+                const text = fragment.text();
+                replaceHandleValue(text, {
+                    end: range.end.index,
+                    start: range.start.index
+                }, Object.assign(Object.assign({}, options), { unescapeUnicode: true }), ms, 0);
+            }
+        }
+    });
+}
 function jsHandler(rawSource, options) {
+    const ms = new MagicString__default["default"](rawSource);
     let ast;
     try {
         ast = parser.parse(rawSource, {
@@ -142,8 +192,7 @@ function jsHandler(rawSource, options) {
             code: rawSource
         };
     }
-    const ms = new MagicString__default["default"](rawSource);
-    const ropt = {
+    const traverseOptions = {
         StringLiteral: {
             enter(p) {
                 var _a;
@@ -204,14 +253,33 @@ function jsHandler(rawSource, options) {
             }
         }
     };
-    traverse__default["default"](ast, ropt);
-    const result = {
+    traverse__default["default"](ast, traverseOptions);
+    return {
         code: ms.toString()
     };
-    return result;
+}
+function jsHandlerAsync(rawSource, options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const ms = new MagicString__default["default"](rawSource);
+        const js = yield getAstGrep();
+        let ast;
+        try {
+            const root = yield js.parseAsync(rawSource);
+            ast = root.root();
+        }
+        catch (_a) {
+            return {
+                code: rawSource
+            };
+        }
+        yield astGrepUpdateString(ast, options, ms);
+        return {
+            code: ms.toString()
+        };
+    });
 }
 function createJsHandler(options) {
-    const { mangleContext, arbitraryValues, escapeMap, jsPreserveClass, generateMap } = options;
+    const { mangleContext, arbitraryValues, escapeMap, jsPreserveClass, generateMap, jsAstTool } = options;
     return (rawSource, set, options) => {
         const opts = defaults.defuOverrideArray(options, {
             classNameSet: set,
@@ -219,8 +287,12 @@ function createJsHandler(options) {
             arbitraryValues,
             mangleContext,
             jsPreserveClass,
-            generateMap
+            generateMap,
+            jsAstTool
         });
+        if (opts.jsAstTool === 'ast-grep') {
+            return jsHandlerAsync(rawSource, opts);
+        }
         return jsHandler(rawSource, opts);
     };
 }
@@ -323,7 +395,7 @@ function regTest(reg, str) {
 function isPropsMatch(props, attr) {
     if (Array.isArray(props)) {
         for (const prop of props) {
-            const res = typeof prop === 'string' ? prop.toLowerCase() === attr : regTest(prop, attr);
+            const res = typeof prop === 'string' ? prop.toLowerCase() === attr.toLowerCase() : regTest(prop, attr);
             if (res) {
                 return res;
             }
@@ -338,51 +410,63 @@ function isPropsMatch(props, attr) {
     }
 }
 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) {
-                function update() {
-                    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();
-                }
-                for (const [t, props] of customAttributesEntities) {
-                    if (t === '*') {
-                        if (isPropsMatch(props, name)) {
-                            update();
-                        }
+    return __awaiter(this, void 0, void 0, function* () {
+        const { customAttributesEntities = [], disabledDefaultTemplateHandler, inlineWxs, runtimeSet, jsHandler } = options !== null && options !== void 0 ? options : {};
+        const s = new MagicString__default["default"](rawSource);
+        let tag = '';
+        const wxsArray = [];
+        const parser = new htmlparser2.Parser({
+            onopentagname(name) {
+                tag = name;
+            },
+            onattribute(name, value, quote) {
+                if (value) {
+                    function update() {
+                        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' || name === 'virtualhostclass')) {
+                        update();
                     }
-                    else if (typeof t === 'string') {
-                        if (t === tag && isPropsMatch(props, name)) {
+                    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();
                         }
                     }
-                    else if (regTest(t, tag) && isPropsMatch(props, name)) {
-                        update();
-                    }
                 }
+            },
+            ontext(data) {
+                if (inlineWxs && tag === 'wxs') {
+                    wxsArray.push({
+                        data,
+                        endIndex: parser.endIndex + 1,
+                        startIndex: parser.startIndex
+                    });
+                }
+            },
+            onclosetag() {
+                tag = '';
             }
-        },
-        ontext(data) {
-            if (inlineWxs && tag === 'wxs') {
-                const code = jsHandler(data, runtimeSet).code;
-                s.update(parser.startIndex, parser.endIndex + 1, code);
-            }
-        },
-        onclosetag() {
-            tag = '';
+        }, {
+            xmlMode: true
+        });
+        parser.write(s.original);
+        parser.end();
+        for (const { data, endIndex, startIndex } of wxsArray) {
+            const { code } = yield jsHandler(data, runtimeSet);
+            s.update(startIndex, endIndex, code);
         }
+        return s.toString();
     });
-    parser.write(s.original);
-    parser.end();
-    return s.toString();
 }
 function createTemplateHandler(options = {}) {
     return (rawSource, opt = {}) => {
@@ -602,7 +686,8 @@ function useMangleStore() {
     };
 }
 
-function createCache() {
+function createCache(options) {
+    const disabled = options === false;
     const hashMap = new Map();
     const instance = new lruCache.LRUCache({
         max: 1024,
@@ -651,16 +736,24 @@ function createCache() {
         },
         process(key, callback, fallback) {
             return __awaiter(this, void 0, void 0, function* () {
-                const hit = this.getHashValue(key);
-                if (hit && !hit.changed) {
-                    const returnFlag = yield callback();
-                    if (returnFlag !== false) {
-                        return;
+                if (disabled) {
+                    const res = yield fallback();
+                    if (res) {
+                        this.set(res.key, res.source);
                     }
                 }
-                const res = yield fallback();
-                if (res) {
-                    this.set(res.key, res.source);
+                else {
+                    const hit = this.getHashValue(key);
+                    if (hit && !hit.changed) {
+                        const returnFlag = yield callback();
+                        if (returnFlag !== false) {
+                            return;
+                        }
+                    }
+                    const res = yield fallback();
+                    if (res) {
+                        this.set(res.key, res.source);
+                    }
                 }
             });
         }
@@ -672,7 +765,7 @@ function getOptions(options = {}) {
         options.customReplaceDictionary = escape$1.SimpleMappingChars2String;
     }
     const result = defaults.defuOverrideArray(options, defaults.defaultOptions, {});
-    const { cssPreflight, customRuleCallback, cssPreflightRange, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue, inlineWxs, injectAdditionalCssVarScope, jsPreserveClass, disabledDefaultTemplateHandler, cssSelectorReplacement, rem2rpx } = result;
+    const { cssPreflight, customRuleCallback, cssPreflightRange, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue, inlineWxs, injectAdditionalCssVarScope, jsPreserveClass, disabledDefaultTemplateHandler, cssSelectorReplacement, rem2rpx, cache, jsAstTool } = result;
     result.escapeMap = customReplaceDictionary;
     const cssInjectPreflight = createInjectPreflight(cssPreflight);
     const customAttributesEntities = defaults.isMap(options.customAttributes)
@@ -698,7 +791,8 @@ function getOptions(options = {}) {
         mangleContext,
         arbitraryValues,
         jsPreserveClass,
-        generateMap: true
+        generateMap: true,
+        jsAstTool
     });
     result.jsHandler = jsHandler;
     const templateHandler = createTemplateHandler({
@@ -712,7 +806,7 @@ function getOptions(options = {}) {
     result.templateHandler = templateHandler;
     result.patch = createPatch(supportCustomLengthUnitsPatch);
     result.setMangleRuntimeSet = setMangleRuntimeSet;
-    result.cache = createCache();
+    result.cache = cache === undefined || typeof cache === 'boolean' ? createCache(cache) : cache;
     return result;
 }