weapp-tailwindcss 2.4.0 → 2.4.2

package/README.md

@@ -84,7 +84,7 @@
 
 <!-- ## [js文件内容中taiwlindcss类名的精确转化与忽略策略](https://weapp-tw.icebreaker.top/docs/options/comments) -->
 
-## [配置项参考](https://weapp-tw.icebreaker.top/docs/options/)
+## [配置项参考](https://weapp-tw.icebreaker.top/docs/api/interfaces/UserDefinedOptions)
 
 ## [使用tailwindcss任意值(arbitrary values)](https://tailwindcss.com/docs/adding-custom-styles#using-arbitrary-values)
 

package/dist/cli.js

@@ -1,22 +1,22 @@
 'use strict';
 
-var options = require('./options-450d76c2.js');
+var options = require('./options-3a20e9d4.js');
 require('micromatch');
 require('@babel/types');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
 require('./replace.js');
-require('./shared-9744fdd1.js');
-require('tailwindcss-mangle-shared');
+require('./shared-28d43730.js');
 require('postcss');
-require('./postcss-0c103b15.js');
+require('./postcss-e0e5739b.js');
 require('postcss-selector-parser');
 require('@csstools/postcss-is-pseudo-class');
 require('node:path');
 require('node:fs');
 require('semver');
 require('tailwindcss-patch');
+require('tailwindcss-mangle-shared');
 
 const args = process.argv.slice(2);
 if (args[0] === 'patch') {

package/dist/cli.mjs

@@ -1,20 +1,20 @@
-import { g as getOptions, c as createPatch } from './options-5c083791.mjs';
+import { g as getOptions, c as createPatch } from './options-2a6f14b8.mjs';
 import 'micromatch';
 import '@babel/types';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
 import './replace.mjs';
-import './shared-89ea7f77.mjs';
-import 'tailwindcss-mangle-shared';
+import './shared-31001503.mjs';
 import 'postcss';
-import './postcss-e3fcf6f1.mjs';
+import './postcss-b4e0e1ac.mjs';
 import 'postcss-selector-parser';
 import '@csstools/postcss-is-pseudo-class';
 import 'node:path';
 import 'node:fs';
 import 'semver';
 import 'tailwindcss-patch';
+import 'tailwindcss-mangle-shared';
 
 const args = process.argv.slice(2);
 if (args[0] === 'patch') {

package/dist/extractors/split.d.ts

@@ -1,3 +1,3 @@
 export declare const validateFilterRE: RegExp;
 export declare function isValidSelector(selector?: string): selector is string;
-export declare const splitCode: (code: string) => string[];
+export declare const splitCode: (code: string, allowDoubleQuotes?: boolean) => string[];

package/dist/gulp.js

@@ -3,16 +3,16 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var stream = require('node:stream');
-var options = require('./options-450d76c2.js');
-var shared = require('./shared-9744fdd1.js');
+var options = require('./options-3a20e9d4.js');
 require('micromatch');
 require('@babel/types');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
 require('./replace.js');
+require('./shared-28d43730.js');
 require('postcss');
-require('./postcss-0c103b15.js');
+require('./postcss-e0e5739b.js');
 require('postcss-selector-parser');
 require('@csstools/postcss-is-pseudo-class');
 require('node:path');
@@ -30,17 +30,16 @@ function createPlugins(options$1 = {}) {
     if (options$1.customReplaceDictionary === undefined) {
         options$1.customReplaceDictionary = 'simple';
     }
-    const opts = options.getOptions(options$1, ['patch', 'style', 'templete', 'js']);
-    const { templeteHandler, styleHandler, patch, jsHandler, mangle } = opts;
+    const opts = options.getOptions(options$1);
+    const { templeteHandler, styleHandler, patch, jsHandler, setMangleRuntimeSet } = opts;
     let set = new Set();
     patch === null || patch === void 0 ? void 0 : patch();
-    shared.initStore(mangle);
     const twPatcher = options.createTailwindcssPatcher();
     function transformWxss() {
         const transformStream = new Transform({ objectMode: true });
         transformStream._transform = function (file, encoding, callback) {
             set = twPatcher.getClassSet();
-            shared.setRuntimeSet(set);
+            setMangleRuntimeSet(set);
             const error = null;
             if (file.contents) {
                 const code = styleHandler(file.contents.toString(), {

package/dist/gulp.mjs

@@ -1,14 +1,14 @@
 import stream from 'node:stream';
-import { g as getOptions, a as createTailwindcssPatcher } from './options-5c083791.mjs';
-import { c as initStore, d as setRuntimeSet } from './shared-89ea7f77.mjs';
+import { g as getOptions, a as createTailwindcssPatcher } from './options-2a6f14b8.mjs';
 import 'micromatch';
 import '@babel/types';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
 import './replace.mjs';
+import './shared-31001503.mjs';
 import 'postcss';
-import './postcss-e3fcf6f1.mjs';
+import './postcss-b4e0e1ac.mjs';
 import 'postcss-selector-parser';
 import '@csstools/postcss-is-pseudo-class';
 import 'node:path';
@@ -22,17 +22,16 @@ function createPlugins(options = {}) {
     if (options.customReplaceDictionary === undefined) {
         options.customReplaceDictionary = 'simple';
     }
-    const opts = getOptions(options, ['patch', 'style', 'templete', 'js']);
-    const { templeteHandler, styleHandler, patch, jsHandler, mangle } = opts;
+    const opts = getOptions(options);
+    const { templeteHandler, styleHandler, patch, jsHandler, setMangleRuntimeSet } = opts;
     let set = new Set();
     patch === null || patch === void 0 ? void 0 : patch();
-    initStore(mangle);
     const twPatcher = createTailwindcssPatcher();
     function transformWxss() {
         const transformStream = new Transform({ objectMode: true });
         transformStream._transform = function (file, encoding, callback) {
             set = twPatcher.getClassSet();
-            setRuntimeSet(set);
+            setMangleRuntimeSet(set);
             const error = null;
             if (file.contents) {
                 const code = styleHandler(file.contents.toString(), {

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export * from './webpack';
 export * from './vite';
 export * from './gulp';
+export * from './types';

package/dist/index.js

@@ -5,23 +5,23 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var webpack = require('./webpack.js');
 var vite = require('./vite.js');
 var gulp = require('./gulp.js');
-require('./options-450d76c2.js');
+require('./options-3a20e9d4.js');
 require('micromatch');
 require('@babel/types');
 require('@babel/generator');
 require('@babel/parser');
 require('@babel/traverse');
 require('./replace.js');
-require('./shared-9744fdd1.js');
-require('tailwindcss-mangle-shared');
+require('./shared-28d43730.js');
 require('postcss');
-require('./postcss-0c103b15.js');
+require('./postcss-e0e5739b.js');
 require('postcss-selector-parser');
 require('@csstools/postcss-is-pseudo-class');
 require('node:path');
 require('node:fs');
 require('semver');
 require('tailwindcss-patch');
+require('tailwindcss-mangle-shared');
 require('node:stream');
 
 

package/dist/index.mjs

@@ -1,21 +1,21 @@
 export { UnifiedWebpackPluginV5 } from './webpack.mjs';
 export { UnifiedViteWeappTailwindcssPlugin } from './vite.mjs';
 export { createPlugins } from './gulp.mjs';
-import './options-5c083791.mjs';
+import './options-2a6f14b8.mjs';
 import 'micromatch';
 import '@babel/types';
 import '@babel/generator';
 import '@babel/parser';
 import '@babel/traverse';
 import './replace.mjs';
-import './shared-89ea7f77.mjs';
-import 'tailwindcss-mangle-shared';
+import './shared-31001503.mjs';
 import 'postcss';
-import './postcss-e3fcf6f1.mjs';
+import './postcss-b4e0e1ac.mjs';
 import 'postcss-selector-parser';
 import '@csstools/postcss-is-pseudo-class';
 import 'node:path';
 import 'node:fs';
 import 'semver';
 import 'tailwindcss-patch';
+import 'tailwindcss-mangle-shared';
 import 'node:stream';

package/dist/mangle/index.d.ts

@@ -0,0 +1,8 @@
+import type { UserDefinedOptions, IMangleScopeContext } from "../types";
+export declare const defaultMangleContext: IMangleScopeContext;
+export declare function useMangleStore(): {
+    mangleContext: IMangleScopeContext;
+    resetMangle: () => IMangleScopeContext;
+    initMangle: (options: UserDefinedOptions['mangle']) => void;
+    setMangleRuntimeSet: (runtimeSet: Set<string>) => void;
+};

package/dist/{options-5c083791.mjs → options-2a6f14b8.mjs}

@@ -4,14 +4,15 @@ import generate from '@babel/generator';
 import { parse, parseExpression } from '@babel/parser';
 import traverse from '@babel/traverse';
 import { replaceJs as replaceWxml } from './replace.mjs';
-import { s as splitCode, e as escapeStringRegexp, u as useStore, n as noop, S as SimpleMappingChars2String, m as makeCustomAttributes, t as tagWithEitherClassAndHoverClassRegexp, a as templateClassExactRegexp, v as variableMatch, b as variableRegExp, M as MappingChars2String, i as isMap } from './shared-89ea7f77.mjs';
+import { S as SimpleMappingChars2String, M as MappingChars2String } from './shared-31001503.mjs';
 import postcss from 'postcss';
-import { p as postcssWeappTailwindcss } from './postcss-e3fcf6f1.mjs';
+import { p as postcssWeappTailwindcss } from './postcss-b4e0e1ac.mjs';
 import postcssIsPseudoClass from '@csstools/postcss-is-pseudo-class';
 import path from 'node:path';
 import fs from 'node:fs';
 import { gte } from 'semver';
 import { monkeyPatchForExposingContext, requireResolve, TailwindcssPatcher } from 'tailwindcss-patch';
+import { ClassGenerator, defaultMangleClassFilter } from 'tailwindcss-mangle-shared';
 
 function isObject(value) {
   return value !== null && typeof value === "object";
@@ -55,12 +56,152 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
+function isRegexp(value) {
+    return Object.prototype.toString.call(value) === '[object RegExp]';
+}
+function isMap(value) {
+    return Object.prototype.toString.call(value) === '[object Map]';
+}
+const noop = () => { };
+function groupBy(arr, cb) {
+    if (!Array.isArray(arr)) {
+        throw new TypeError('expected an array for first argument');
+    }
+    if (typeof cb !== 'function') {
+        throw new TypeError('expected a function for second argument');
+    }
+    const result = {};
+    for (const item of arr) {
+        const bucketCategory = cb(item);
+        const bucket = result[bucketCategory];
+        if (Array.isArray(bucket)) {
+            result[bucketCategory].push(item);
+        }
+        else {
+            result[bucketCategory] = [item];
+        }
+    }
+    return result;
+}
+function getGroupedEntries(entries, options) {
+    const { cssMatcher, htmlMatcher, jsMatcher } = options;
+    const groupedEntries = groupBy(entries, ([file]) => {
+        if (cssMatcher(file)) {
+            return 'css';
+        }
+        else if (htmlMatcher(file)) {
+            return 'html';
+        }
+        else if (jsMatcher(file)) {
+            return 'js';
+        }
+        else {
+            return 'other';
+        }
+    });
+    return groupedEntries;
+}
+
+function escapeStringRegexp(str) {
+    if (typeof str !== 'string') {
+        throw new TypeError('Expected a string');
+    }
+    return str.replaceAll(/[$()*+.?[\\\]^{|}]/g, '\\$&').replaceAll('-', '\\x2d');
+}
+const templateClassExactRegexp = /(?<=^|\s)(?:hover-)?class=(?:["']\W+\s*\w+\()?["']([^"]+)["']/gs;
+const tagWithEitherClassAndHoverClassRegexp = /<[a-z][a-z-]*[a-z]*\s+[^>]*?(?:hover-)?clas{2}="[^"]*"[^>]*?\/?>/g;
+function handleRegexp(reg) {
+    return `(?:${reg.source})`;
+}
+function getSourceString(input) {
+    let result;
+    if (typeof input === 'string') {
+        result = input;
+    }
+    else if (isRegexp(input)) {
+        result = input.source;
+    }
+    else {
+        result = input.toString();
+    }
+    return result;
+}
+function makePattern(arr) {
+    let pattern = '';
+    if (Array.isArray(arr)) {
+        pattern = arr
+            .reduce((acc, cur) => {
+            if (typeof cur === 'string') {
+                acc.push(cur);
+            }
+            else if (isRegexp(cur)) {
+                acc.push(handleRegexp(cur));
+            }
+            return acc;
+        }, [])
+            .join('|');
+    }
+    else if (typeof arr === 'string') {
+        pattern = arr;
+    }
+    else if (isRegexp(arr)) {
+        pattern = handleRegexp(arr);
+    }
+    return pattern;
+}
+function createTempleteHandlerMatchRegexp(tag, attrs, options = {}) {
+    const { exact = true } = options;
+    const prefix = exact ? '(?<=^|\\s)' : '';
+    const pattern = makePattern(attrs);
+    let tagPattern = getSourceString(tag);
+    if (tagPattern === '*') {
+        tagPattern = '[a-z][-a-z]*[a-z]*';
+    }
+    const source = `<(${tagPattern})\\s+[^>]*?(?:${prefix}(${pattern})="(?:[^"]*)")[^>]*?\\/?>`;
+    return new RegExp(source, 'g');
+}
+function createTemplateClassRegexp(attrs, options = {}) {
+    const { exact = true } = options;
+    const prefix = exact ? '(?<=^|\\s)' : '';
+    const pattern = makePattern(attrs);
+    const source = `(?:${prefix}${pattern})=(?:["']\\W+\\s*(?:\\w+)\\()?["']([^"]+)['"]`;
+    return new RegExp(source, 'gs');
+}
+function makeCustomAttributes(entries) {
+    if (Array.isArray(entries)) {
+        return entries.map(([k, v]) => {
+            return {
+                tagRegexp: createTempleteHandlerMatchRegexp(k, v),
+                attrRegexp: createTemplateClassRegexp(v),
+                tag: getSourceString(k),
+                attrs: v
+            };
+        });
+    }
+}
+const variableRegExp = /{{(.*?)}}/gs;
+function variableMatch(original) {
+    return variableRegExp.exec(original);
+}
+
+const validateFilterRE = /[\w%-?\u00A0-\uFFFF-]/;
+function isValidSelector(selector = '') {
+    return validateFilterRE.test(selector);
+}
+const splitCode = (code, allowDoubleQuotes = false) => {
+    const splitter = allowDoubleQuotes ? /\s+/ : /\s+|"/;
+    return code.split(splitter).filter((element) => isValidSelector(element));
+};
+
 const isProd = () => process.env.NODE_ENV === 'production';
 
 function handleValue(str, node, options) {
+    var _a;
     const set = options.classNameSet;
     const escapeMap = options.escapeMap;
-    const arr = splitCode(str);
+    const allowDoubleQuotes = (_a = options.arbitraryValues) === null || _a === void 0 ? void 0 : _a.allowDoubleQuotes;
+    const ctx = options.mangleContext;
+    const arr = splitCode(str, allowDoubleQuotes);
     let rawStr = str;
     for (const v of arr) {
         if (set.has(v)) {
@@ -69,8 +210,9 @@ function handleValue(str, node, options) {
                 ignoreFlag = node.leadingComments.findIndex((x) => x.value.includes('weapp-tw') && x.value.includes('ignore')) > -1;
             }
             if (!ignoreFlag) {
-                const { jsHandler } = useStore();
-                rawStr = jsHandler(rawStr);
+                if (ctx) {
+                    rawStr = ctx.jsHandler(rawStr);
+                }
                 rawStr = rawStr.replaceAll(new RegExp(escapeStringRegexp(v), 'g'), replaceWxml(v, {
                     escapeMap
                 }));
@@ -116,11 +258,14 @@ function jsHandler(rawSource, options) {
     });
 }
 function createjsHandler(options) {
+    const { mangleContext, arbitraryValues, minifiedJs, escapeMap } = options;
     return (rawSource, set) => {
         return jsHandler(rawSource, {
             classNameSet: set,
-            minifiedJs: options.minifiedJs,
-            escapeMap: options.escapeMap
+            minifiedJs,
+            escapeMap,
+            arbitraryValues,
+            mangleContext
         });
     };
 }
@@ -191,7 +336,10 @@ const defaultOptions = {
             overwrite: true
         }
     },
-    appType: undefined
+    appType: undefined,
+    arbitraryValues: {
+        allowDoubleQuotes: false
+    }
 };
 
 function generateCode(match, options = {}) {
@@ -246,7 +394,8 @@ function templeteReplacer(original, options = {}) {
             const before = original.slice(p, m.start);
             resultArray.push(replaceWxml(before, {
                 keepEOL: true,
-                escapeMap: options.escapeMap
+                escapeMap: options.escapeMap,
+                mangleContext: options.mangleContext
             }));
             p = m.start;
             if (m.raw.trim().length > 0) {
@@ -263,7 +412,8 @@ function templeteReplacer(original, options = {}) {
                 const after = original.slice(m.end);
                 resultArray.push(replaceWxml(after, {
                     keepEOL: true,
-                    escapeMap: options.escapeMap
+                    escapeMap: options.escapeMap,
+                    mangleContext: options.mangleContext
                 }));
             }
         }
@@ -275,7 +425,8 @@ function templeteReplacer(original, options = {}) {
     else {
         return replaceWxml(original, {
             keepEOL: false,
-            escapeMap: options.escapeMap
+            escapeMap: options.escapeMap,
+            mangleContext: options.mangleContext
         });
     }
 }
@@ -453,6 +604,72 @@ function createTailwindcssPatcher() {
     });
 }
 
+function getSelf(x) {
+    return x;
+}
+const defaultMangleContext = {
+    rawOptions: false,
+    runtimeSet: new Set(),
+    classGenerator: new ClassGenerator(),
+    filter: defaultMangleClassFilter,
+    cssHandler: getSelf,
+    jsHandler: getSelf,
+    wxmlHandler: getSelf
+};
+function useMangleStore() {
+    const ctx = Object.assign({}, defaultMangleContext);
+    function resetMangle() {
+        return Object.assign(ctx, defaultMangleContext);
+    }
+    function handleValue(rawSource) {
+        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);
+            }
+        }
+        return rawSource;
+    }
+    function initMangle(options) {
+        var _a;
+        ctx.rawOptions = options;
+        if (options) {
+            if (options === true) {
+                options = {
+                    classGenerator: {},
+                    mangleClassFilter: defaultMangleClassFilter
+                };
+            }
+            ctx.classGenerator = new ClassGenerator(options.classGenerator);
+            ctx.filter = (_a = options.mangleClassFilter) !== null && _a !== void 0 ? _a : defaultMangleClassFilter;
+            ctx.jsHandler = (rawSource) => {
+                return handleValue(rawSource);
+            };
+            ctx.cssHandler = (rawSource) => {
+                return handleValue(rawSource);
+            };
+            ctx.wxmlHandler = (rawSource) => {
+                return handleValue(rawSource);
+            };
+        }
+    }
+    function setMangleRuntimeSet(runtimeSet) {
+        const newSet = new Set();
+        for (const c of runtimeSet) {
+            if (ctx.filter(c)) {
+                newSet.add(c);
+            }
+        }
+        ctx.runtimeSet = newSet;
+    }
+    return {
+        mangleContext: ctx,
+        resetMangle,
+        initMangle,
+        setMangleRuntimeSet
+    };
+}
+
 function createGlobMatcher(pattern) {
     return function (file) {
         return isMatch(file, pattern);
@@ -463,18 +680,7 @@ function normalizeMatcher(options, key) {
         options[key] = createGlobMatcher(options[key]);
     }
 }
-function getOptions(options = {}, modules = ['style', 'templete', 'patch', 'js']) {
-    const registerModules = modules.reduce((acc, cur) => {
-        if (acc[cur] !== undefined) {
-            acc[cur] = true;
-        }
-        return acc;
-    }, {
-        templete: false,
-        style: false,
-        patch: false,
-        js: false
-    });
+function getOptions(options = {}) {
     if (options.supportCustomLengthUnitsPatch === true) {
         options.supportCustomLengthUnitsPatch = undefined;
     }
@@ -491,36 +697,35 @@ function getOptions(options = {}, modules = ['style', 'templete', 'patch', 'js']
     const result = defu(options, defaultOptions, {
         minifiedJs: isProd()
     });
-    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch } = result;
+    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues } = result;
     result.escapeMap = customReplaceDictionary;
     const cssInjectPreflight = createInjectPreflight(cssPreflight);
     const customAttributesEntities = isMap(options.customAttributes) ? [...options.customAttributes.entries()] : Object.entries(customAttributes);
     const { escapeMap, minifiedJs } = result;
-    if (registerModules.templete) {
-        result.templeteHandler = createTempleteHandler({
-            customAttributesEntities,
-            escapeMap
-        });
-    }
-    if (registerModules.style) {
-        result.styleHandler = createStyleHandler({
-            cssInjectPreflight,
-            customRuleCallback,
-            cssPreflightRange,
-            replaceUniversalSelectorWith,
-            escapeMap
-        });
-    }
-    if (registerModules.js) {
-        result.jsHandler = createjsHandler({
-            minifiedJs,
-            escapeMap
-        });
-    }
-    if (registerModules.patch) {
-        result.patch = createPatch(supportCustomLengthUnitsPatch);
-    }
+    const { initMangle, mangleContext, setMangleRuntimeSet } = useMangleStore();
+    initMangle(options.mangle);
+    result.templeteHandler = createTempleteHandler({
+        customAttributesEntities,
+        escapeMap,
+        mangleContext,
+    });
+    result.styleHandler = createStyleHandler({
+        cssInjectPreflight,
+        customRuleCallback,
+        cssPreflightRange,
+        replaceUniversalSelectorWith,
+        escapeMap,
+        mangleContext,
+    });
+    result.jsHandler = createjsHandler({
+        minifiedJs,
+        escapeMap,
+        mangleContext,
+        arbitraryValues
+    });
+    result.patch = createPatch(supportCustomLengthUnitsPatch);
+    result.setMangleRuntimeSet = setMangleRuntimeSet;
     return result;
 }
 
-export { createTailwindcssPatcher as a, createPatch as c, getOptions as g };
+export { createTailwindcssPatcher as a, getGroupedEntries as b, createPatch as c, getOptions as g };