weapp-tailwindcss 2.6.2 → 2.7.0

package/dist/{options-244dcceb.mjs → options-5a3070c1.mjs}

@@ -1,141 +1,21 @@
 import { isMatch } from 'micromatch';
-import * as t from '@babel/types';
+import MagicString from 'magic-string';
+import { replaceJs as replaceWxml } from './replace.mjs';
+import { escapeStringRegexp, makeCustomAttributes, tagWithEitherClassAndHoverClassRegexp, templateClassExactRegexp, wxsTagRegexp, variableRegExp } from '@weapp-core/regex';
 import generate from '@babel/generator';
 import { parse, parseExpression } from '@babel/parser';
 import traverse from '@babel/traverse';
-import { replaceJs as replaceWxml } from './replace.mjs';
-import { i as isRegexp, n as noop, d as defaultOptions, a as isMap } from './defaults-c397b5f9.mjs';
+import { n as noop, d as defaultOptions, i as isMap } from './defaults-0743f523.mjs';
+import * as t from '@babel/types';
 import postcss from 'postcss';
-import { p as postcssWeappTailwindcss } from './postcss-99efb521.mjs';
+import { p as postcssWeappTailwindcss } from './postcss-a551ddc0.mjs';
 import postcssIsPseudoClass from '@csstools/postcss-is-pseudo-class';
-import { S as SimpleMappingChars2String, M as MappingChars2String } from './dic-3790a3a4.mjs';
+import { SimpleMappingChars2String, MappingChars2String } from '@weapp-core/escape';
 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";
-}
-function _defu(baseObject, defaults, namespace = ".", merger) {
-  if (!isObject(defaults)) {
-    return _defu(baseObject, {}, namespace, merger);
-  }
-  const object = Object.assign({}, defaults);
-  for (const key in baseObject) {
-    if (key === "__proto__" || key === "constructor") {
-      continue;
-    }
-    const value = baseObject[key];
-    if (value === null || value === void 0) {
-      continue;
-    }
-    if (merger && merger(object, key, value, namespace)) {
-      continue;
-    }
-    if (Array.isArray(value) && Array.isArray(object[key])) {
-      object[key] = [...value, ...object[key]];
-    } else if (isObject(value) && isObject(object[key])) {
-      object[key] = _defu(
-        value,
-        object[key],
-        (namespace ? `${namespace}.` : "") + key.toString(),
-        merger
-      );
-    } else {
-      object[key] = value;
-    }
-  }
-  return object;
-}
-function createDefu(merger) {
-  return (...arguments_) => (
-    // eslint-disable-next-line unicorn/no-array-reduce
-    arguments_.reduce((p, c) => _defu(p, c, "", merger), {})
-  );
-}
-const defu = createDefu();
-
-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-)?class="[^"]*"[^>]*?\/?>/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 createTemplateHandlerMatchRegexp(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: createTemplateHandlerMatchRegexp(k, v),
-                attrRegexp: createTemplateClassRegexp(v),
-                tag: getSourceString(k),
-                attrs: v
-            };
-        });
-    }
-}
-const variableRegExp = /{{(.*?)}}/gs;
-const wxsTagRegexp = /<wxs\s*(?:[a-z][a-z-]*[a-z]*(?:\s*=\s*".*?")?)*\s*>(.*?)<\/wxs>/gs;
+import { ClassGenerator, defaultMangleClassFilter } from '@tailwindcss-mangle/shared';
 
 const validateFilterRE = /[\w%-?\u00A0-\uFFFF-]/;
 function isValidSelector(selector = '') {
@@ -146,9 +26,7 @@ const splitCode = (code, allowDoubleQuotes = false) => {
     return code.split(splitter).filter((element) => isValidSelector(element));
 };
 
-const isProd = () => process.env.NODE_ENV === 'production';
-
-function handleValue(str, node, options) {
+function regenerateHandleValue(str, node, options) {
     var _a;
     const set = options.classNameSet;
     const escapeMap = options.escapeMap;
@@ -175,44 +53,126 @@ function handleValue(str, node, options) {
     }
     return rawStr;
 }
+function replaceHandleValue(str, node, options, ms, offset = 1) {
+    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 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))) {
+            let ignoreFlag = false;
+            if (Array.isArray(node.leadingComments)) {
+                ignoreFlag = node.leadingComments.findIndex((x) => x.value.includes('weapp-tw') && x.value.includes('ignore')) > -1;
+            }
+            if (!ignoreFlag) {
+                if (ctx) {
+                    rawStr = ctx.jsHandler(rawStr);
+                }
+                rawStr = rawStr.replaceAll(new RegExp(escapeStringRegexp(v), 'g'), replaceWxml(v, {
+                    escapeMap
+                }));
+            }
+        }
+    }
+    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, rawStr);
+        }
+    }
+    return rawStr;
+}
+
+const isProd = () => process.env.NODE_ENV === 'production';
+
 function jsHandler(rawSource, options) {
     var _a;
     const ast = parse(rawSource, {
         sourceType: 'unambiguous'
     });
-    const topt = {
-        StringLiteral: {
-            enter(p) {
-                const n = p.node;
-                n.value = handleValue(n.value, n, options);
-            }
-        },
-        TemplateElement: {
-            enter(p) {
-                const n = p.node;
-                n.value.raw = handleValue(n.value.raw, n, options);
+    if (options.strategy === 'replace') {
+        const ms = new MagicString(rawSource);
+        const ropt = {
+            StringLiteral: {
+                enter(p) {
+                    const n = p.node;
+                    replaceHandleValue(n.value, n, options, ms);
+                }
+            },
+            TemplateElement: {
+                enter(p) {
+                    const n = p.node;
+                    replaceHandleValue(n.value.raw, n, options, ms, 0);
+                }
+            },
+            CallExpression: {
+                enter(p) {
+                    const calleePath = p.get('callee');
+                    if (calleePath.isIdentifier() && calleePath.node.name === 'eval') {
+                        p.traverse({
+                            StringLiteral: {
+                                enter(s) {
+                                    const res = jsHandler(s.node.value, options);
+                                    if (res.code) {
+                                        s.node.value = res.code;
+                                    }
+                                }
+                            }
+                        });
+                    }
+                }
             }
-        },
-        CallExpression: {
-            enter(p) {
-                const n = p.node;
-                if (t.isIdentifier(n.callee) && n.callee.name === 'eval' && t.isStringLiteral(n.arguments[0])) {
-                    const res = jsHandler(n.arguments[0].value, options);
-                    if (res.code) {
-                        n.arguments[0].value = res.code;
+        };
+        traverse(ast, ropt);
+        return {
+            code: ms.toString()
+        };
+    }
+    else {
+        const gopt = {
+            StringLiteral: {
+                enter(p) {
+                    const n = p.node;
+                    n.value = regenerateHandleValue(n.value, n, options);
+                }
+            },
+            TemplateElement: {
+                enter(p) {
+                    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') {
+                        p.traverse({
+                            StringLiteral: {
+                                enter(s) {
+                                    const res = jsHandler(s.node.value, options);
+                                    if (res.code) {
+                                        s.node.value = res.code;
+                                    }
+                                }
+                            }
+                        });
                     }
                 }
             }
-        },
-        noScope: true
-    };
-    traverse(ast, topt);
-    return generate(ast, {
-        minified: (_a = options.minifiedJs) !== null && _a !== void 0 ? _a : isProd()
-    });
+        };
+        traverse(ast, gopt);
+        return generate(ast, {
+            minified: (_a = options.minifiedJs) !== null && _a !== void 0 ? _a : isProd()
+        });
+    }
 }
 function createjsHandler(options) {
-    const { mangleContext, arbitraryValues, minifiedJs, escapeMap, jsPreserveClass } = options;
+    const { mangleContext, arbitraryValues, minifiedJs, escapeMap, jsPreserveClass, strategy } = options;
     return (rawSource, set) => {
         return jsHandler(rawSource, {
             classNameSet: set,
@@ -220,11 +180,54 @@ function createjsHandler(options) {
             escapeMap,
             arbitraryValues,
             mangleContext,
-            jsPreserveClass
+            jsPreserveClass,
+            strategy
         });
     };
 }
 
+function isObject(value) {
+  return value !== null && typeof value === "object";
+}
+function _defu(baseObject, defaults, namespace = ".", merger) {
+  if (!isObject(defaults)) {
+    return _defu(baseObject, {}, namespace, merger);
+  }
+  const object = Object.assign({}, defaults);
+  for (const key in baseObject) {
+    if (key === "__proto__" || key === "constructor") {
+      continue;
+    }
+    const value = baseObject[key];
+    if (value === null || value === void 0) {
+      continue;
+    }
+    if (merger && merger(object, key, value, namespace)) {
+      continue;
+    }
+    if (Array.isArray(value) && Array.isArray(object[key])) {
+      object[key] = [...value, ...object[key]];
+    } else if (isObject(value) && isObject(object[key])) {
+      object[key] = _defu(
+        value,
+        object[key],
+        (namespace ? `${namespace}.` : "") + key.toString(),
+        merger
+      );
+    } else {
+      object[key] = value;
+    }
+  }
+  return object;
+}
+function createDefu(merger) {
+  return (...arguments_) => (
+    // eslint-disable-next-line unicorn/no-array-reduce
+    arguments_.reduce((p, c) => _defu(p, c, "", merger), {})
+  );
+}
+const defu = createDefu();
+
 function generateCode(match, options = {}) {
     const ast = parseExpression(match);
     traverse(ast, {
@@ -587,7 +590,7 @@ function getOptions(options = {}) {
     const result = defu(options, defaultOptions, {
         minifiedJs: isProd()
     });
-    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue, inlineWxs, injectAdditionalCssVarScope, jsPreserveClass, disabledDefaultTemplateHandler } = result;
+    const { cssPreflight, customRuleCallback, cssPreflightRange, replaceUniversalSelectorWith, customAttributes, customReplaceDictionary, supportCustomLengthUnitsPatch, arbitraryValues, cssChildCombinatorReplaceValue, inlineWxs, injectAdditionalCssVarScope, jsPreserveClass, disabledDefaultTemplateHandler, jsEscapeStrategy } = result;
     result.escapeMap = customReplaceDictionary;
     const cssInjectPreflight = createInjectPreflight(cssPreflight);
     const customAttributesEntities = isMap(options.customAttributes)
@@ -612,7 +615,8 @@ function getOptions(options = {}) {
         escapeMap,
         mangleContext,
         arbitraryValues,
-        jsPreserveClass
+        jsPreserveClass,
+        strategy: jsEscapeStrategy
     });
     result.jsHandler = jsHandler;
     const templateHandler = createTemplateHandler({