@weapp-tailwindcss/postcss 1.0.4 → 1.0.5

package/dist/index.js

@@ -53,179 +53,10 @@ var postcssPlugin = "postcss-weapp-tailwindcss-rename-plugin";
 // src/selectorParser.ts
 var _postcssselectorparser = require('postcss-selector-parser'); var _postcssselectorparser2 = _interopRequireDefault(_postcssselectorparser);
 
-// src/shared.ts
-var _escape = require('@weapp-core/escape');
-function internalCssSelectorReplacer(selectors, options = {
-  escapeMap: _escape.MappingChars2String
-}) {
-  const { mangleContext, escapeMap } = options;
-  if (mangleContext) {
-    selectors = mangleContext.cssHandler(selectors);
-  }
-  return _escape.escape.call(void 0, selectors, {
-    map: escapeMap
-  });
-}
-function composeIsPseudo(strs) {
-  if (typeof strs === "string") {
-    return strs;
-  }
-  if (strs.length > 1) {
-    return `:is(${strs.join(",")})`;
-  }
-  return strs.join("");
-}
-
-// src/selectorParser.ts
-function createRuleTransform(rule, options) {
-  const { escapeMap, mangleContext, cssSelectorReplacement, cssRemoveHoverPseudoClass } = options;
-  const transform = (selectors) => {
-    selectors.walk((selector) => {
-      if (selector.type === "universal" && _optionalChain([cssSelectorReplacement, 'optionalAccess', _ => _.universal])) {
-        selector.value = composeIsPseudo(cssSelectorReplacement.universal);
-      }
-      if (cssRemoveHoverPseudoClass && selector.type === "selector") {
-        const node = selector.nodes.find((x) => x.type === "pseudo" && x.value === ":hover");
-        if (node) {
-          selector.remove();
-        }
-      }
-      if (selector.type === "pseudo" && selector.value === ":root" && _optionalChain([cssSelectorReplacement, 'optionalAccess', _2 => _2.root])) {
-        selector.value = composeIsPseudo(cssSelectorReplacement.root);
-      }
-      if (selector.type === "class") {
-        selector.value = internalCssSelectorReplacer(selector.value, {
-          escapeMap,
-          mangleContext
-        });
-      }
-    });
-    if (selectors.length === 0) {
-      rule.remove();
-    }
-  };
-  return transform;
-}
-function ruleTransformSync(rule, options) {
-  const transformer = _postcssselectorparser2.default.call(void 0, createRuleTransform(rule, options));
-  return transformer.transformSync(rule, {
-    lossless: false,
-    updateSelector: true
-  });
-}
-function isOnlyBeforeAndAfterPseudoElement(node) {
-  let b = false;
-  let a = false;
-  _postcssselectorparser2.default.call(void 0, (selectors) => {
-    selectors.walkPseudos((s) => {
-      if (_optionalChain([s, 'access', _3 => _3.parent, 'optionalAccess', _4 => _4.length]) === 1) {
-        if (/^:?:before$/.test(s.value)) {
-          b = true;
-        }
-        if (/^:?:after$/.test(s.value)) {
-          a = true;
-        }
-      }
-    });
-  }).astSync(node);
-  return b && a;
-}
-function getFallbackRemove(rule) {
-  const fallbackRemove = _postcssselectorparser2.default.call(void 0, (selectors) => {
-    let maybeImportantId = false;
-    selectors.walk((selector, idx) => {
-      if (idx === 0 && (selector.type === "id" || selector.type === "class" || selector.type === "attribute")) {
-        maybeImportantId = true;
-      }
-      if (selector.type === "universal") {
-        _optionalChain([selector, 'access', _5 => _5.parent, 'optionalAccess', _6 => _6.remove, 'call', _7 => _7()]);
-      }
-      if (selector.type === "pseudo") {
-        if (selector.value === ":is") {
-          if (maybeImportantId && _optionalChain([selector, 'access', _8 => _8.nodes, 'access', _9 => _9[0], 'optionalAccess', _10 => _10.type]) === "selector") {
-            selector.replaceWith(selector.nodes[0]);
-          } else {
-            _optionalChain([selector, 'access', _11 => _11.parent, 'optionalAccess', _12 => _12.remove, 'call', _13 => _13()]);
-          }
-        } else if (selector.value === ":not") {
-          for (const x of selector.nodes) {
-            if (x.nodes.length === 1 && x.nodes[0].type === "id" && x.nodes[0].value === "#") {
-              x.nodes = [
-                _postcssselectorparser2.default.tag({
-                  value: "#n"
-                })
-              ];
-            }
-          }
-        } else if (selector.value === ":where") {
-          for (const n of selector.nodes) {
-            for (const node of n.nodes) {
-              if (node.type === "attribute") {
-                node.remove();
-              }
-            }
-          }
-        }
-      }
-      if (selector.type === "attribute") {
-        if (selector.attribute === "hidden") {
-          _optionalChain([rule, 'optionalAccess', _14 => _14.remove, 'call', _15 => _15()]);
-        }
-      }
-    });
-    selectors.walk((selector) => {
-      if (selector.type === "pseudo") {
-        if (selector.value === ":where") {
-          const res = selector.nodes.every((x) => x.nodes.length === 0);
-          if (res) {
-            selector.remove();
-          }
-        }
-      }
-    });
-  });
-  return fallbackRemove;
-}
-
-// src/plugins/post.ts
-var OklabSuffix = "in oklab";
-var postcssWeappTailwindcssPostPlugin = (options = {
-  isMainChunk: true
-}) => {
-  const { customRuleCallback, isMainChunk } = options;
-  const p = {
-    postcssPlugin
-  };
-  if (isMainChunk) {
-    p.OnceExit = (root) => {
-      root.walkRules((rule) => {
-        getFallbackRemove(rule).transformSync(rule, {
-          updateSelector: true,
-          lossless: false
-        });
-        if (rule.selectors.length === 0 || rule.selectors.length === 1 && rule.selector.trim() === "") {
-          rule.remove();
-        }
-        rule.walkDecls((decl) => {
-          if (decl.prop === "--tw-gradient-position" && decl.value.endsWith(OklabSuffix)) {
-            decl.value = decl.value.slice(0, decl.value.length - OklabSuffix.length);
-          }
-        });
-      });
-    };
-  }
-  if (typeof customRuleCallback === "function") {
-    p.Rule = (rule) => {
-      customRuleCallback(rule, options);
-    };
-  }
-  return p;
-};
-postcssWeappTailwindcssPostPlugin.postcss = true;
-
 // src/mp.ts
 
 
+
 // src/cssVars.ts
 var cssVars_default = [
   {
@@ -434,6 +265,79 @@ var cssVars_default = [
   }
 ];
 
+// src/shared.ts
+var _escape = require('@weapp-core/escape');
+
+function internalCssSelectorReplacer(selectors, options = {
+  escapeMap: _escape.MappingChars2String
+}) {
+  const { mangleContext, escapeMap } = options;
+  if (mangleContext) {
+    selectors = mangleContext.cssHandler(selectors);
+  }
+  return _escape.escape.call(void 0, selectors, {
+    map: escapeMap
+  });
+}
+function composeIsPseudoAst(strs) {
+  if (typeof strs === "string") {
+    return [
+      _postcssselectorparser2.default.tag({
+        value: strs
+      }),
+      _postcssselectorparser2.default.combinator({
+        value: "+"
+      }),
+      _postcssselectorparser2.default.tag({
+        value: strs
+      })
+    ];
+  }
+  if (strs.length > 1) {
+    return [
+      _postcssselectorparser2.default.pseudo({
+        value: ":is",
+        nodes: strs.map(
+          (str) => _postcssselectorparser2.default.tag({
+            value: str
+          })
+        )
+      }),
+      _postcssselectorparser2.default.combinator({
+        value: "+"
+      }),
+      _postcssselectorparser2.default.pseudo({
+        value: ":is",
+        nodes: strs.map(
+          (str) => _postcssselectorparser2.default.tag({
+            value: str
+          })
+        )
+      })
+    ];
+  }
+  return [
+    _postcssselectorparser2.default.tag({
+      value: strs[0]
+    }),
+    _postcssselectorparser2.default.combinator({
+      value: "+"
+    }),
+    _postcssselectorparser2.default.tag({
+      value: strs[0]
+    })
+  ];
+}
+function composeIsPseudo(strs) {
+  if (typeof strs === "string") {
+    return strs;
+  }
+  if (strs.length > 1) {
+    return `:is(${strs.join(",")})`;
+  }
+  return strs.join("");
+}
+
 // src/mp.ts
 var initialNodes = cssVars_default.map((x) => {
   return new (0, _postcss.Declaration)({
@@ -509,21 +413,24 @@ function remakeCssVarSelector(selectors, options) {
   }
   return selectors;
 }
-function remakeCombinatorSelector(selector, cssChildCombinatorReplaceValue) {
-  let childCombinatorReplaceValue = "view + view";
+function getCombinatorSelectorAst(options) {
+  let childCombinatorReplaceValue = [
+    _postcssselectorparser2.default.tag({ value: "view" }),
+    _postcssselectorparser2.default.combinator({ value: "+" }),
+    _postcssselectorparser2.default.tag({ value: "view" })
+  ];
+  const { cssChildCombinatorReplaceValue } = options;
   if (Array.isArray(cssChildCombinatorReplaceValue) && cssChildCombinatorReplaceValue.length > 0) {
-    const x = composeIsPseudo(cssChildCombinatorReplaceValue);
-    childCombinatorReplaceValue = `${x} + ${x}`;
+    childCombinatorReplaceValue = composeIsPseudoAst(cssChildCombinatorReplaceValue);
   } else if (typeof cssChildCombinatorReplaceValue === "string") {
-    childCombinatorReplaceValue = cssChildCombinatorReplaceValue;
+    childCombinatorReplaceValue = composeIsPseudoAst(cssChildCombinatorReplaceValue);
   }
-  return selector.replaceAll(BROAD_MATCH_GLOBAL_REGEXP, childCombinatorReplaceValue);
+  return childCombinatorReplaceValue;
 }
 function commonChunkPreflight(node, options) {
-  const { ctx, cssChildCombinatorReplaceValue, cssInjectPreflight, injectAdditionalCssVarScope } = options;
-  node.selector = remakeCombinatorSelector(node.selector, cssChildCombinatorReplaceValue);
+  const { ctx, cssInjectPreflight, injectAdditionalCssVarScope } = options;
   if (testIfVariablesScope(node)) {
-    _optionalChain([ctx, 'optionalAccess', _16 => _16.markVariablesScope, 'call', _17 => _17(node)]);
+    _optionalChain([ctx, 'optionalAccess', _ => _.markVariablesScope, 'call', _2 => _2(node)]);
     node.selectors = remakeCssVarSelector(node.selectors, options);
     node.before(makePseudoVarRule());
     if (typeof cssInjectPreflight === "function") {
@@ -544,6 +451,198 @@ function commonChunkPreflight(node, options) {
   }
 }
 
+// src/selectorParser.ts
+function createRuleTransform(rule, options) {
+  const { escapeMap, mangleContext, cssSelectorReplacement, cssRemoveHoverPseudoClass } = options;
+  const transform = (selectors) => {
+    selectors.walk((selector, index) => {
+      if (selector.type === "universal") {
+        if (_optionalChain([cssSelectorReplacement, 'optionalAccess', _3 => _3.universal])) {
+          selector.value = composeIsPseudo(cssSelectorReplacement.universal);
+        }
+      } else if (selector.type === "selector") {
+        if (cssRemoveHoverPseudoClass) {
+          const node = selector.nodes.find((x) => x.type === "pseudo" && x.value === ":hover");
+          if (node) {
+            selector.remove();
+          }
+        }
+      } else if (selector.type === "pseudo") {
+        if (selector.value === ":root" && _optionalChain([cssSelectorReplacement, 'optionalAccess', _4 => _4.root])) {
+          selector.value = composeIsPseudo(cssSelectorReplacement.root);
+        } else if (selector.value === ":where") {
+          if (index === 0 && selector.length === 1) {
+            selector.walk((node, idx) => {
+              if (idx === 0 && node.type === "class") {
+                const nodes = _optionalChain([node, 'access', _5 => _5.parent, 'optionalAccess', _6 => _6.nodes]);
+                if (nodes) {
+                  const first = nodes[idx + 1];
+                  if (first && first.type === "combinator" && first.value === ">") {
+                    const second = nodes[idx + 2];
+                    if (second && second.type === "pseudo" && second.value === ":not" && second.first.first.type === "pseudo" && second.first.first.value === ":last-child") {
+                      const ast = getCombinatorSelectorAst(options);
+                      second.replaceWith(
+                        ...ast
+                      );
+                    }
+                  }
+                }
+              }
+            });
+            selector.replaceWith(...selector.nodes);
+          }
+        }
+      } else if (selector.type === "class") {
+        selector.value = internalCssSelectorReplacer(selector.value, {
+          escapeMap,
+          mangleContext
+        });
+      } else if (selector.type === "combinator") {
+        if (selector.value === ">") {
+          const nodes = _optionalChain([selector, 'access', _7 => _7.parent, 'optionalAccess', _8 => _8.nodes]);
+          if (nodes) {
+            const first = nodes[index + 1];
+            if (first && first.type === "pseudo" && first.value === ":not" && (first.first.first.type === "attribute" && first.first.first.attribute === "hidden" || first.first.first.type === "tag" && first.first.first.value === "template")) {
+              const second = nodes[index + 2];
+              if (second && second.type === "combinator" && (second.value === "~" || second.value === "+")) {
+                const third = nodes[index + 3];
+                if (third && third.type === "pseudo" && third.value === ":not" && (third.first.first.type === "attribute" && third.first.first.attribute === "hidden" || third.first.first.type === "tag" && third.first.first.value === "template")) {
+                  const ast = getCombinatorSelectorAst(options);
+                  _optionalChain([selector, 'access', _9 => _9.parent, 'optionalAccess', _10 => _10.nodes, 'access', _11 => _11.splice, 'call', _12 => _12(
+                    index + 1,
+                    3,
+                    ...ast
+                  )]);
+                }
+              }
+            }
+          }
+        }
+      }
+    });
+    if (selectors.length === 0) {
+      rule.remove();
+    }
+  };
+  return transform;
+}
+function ruleTransformSync(rule, options) {
+  const transformer = _postcssselectorparser2.default.call(void 0, createRuleTransform(rule, options));
+  return transformer.transformSync(rule, {
+    lossless: false,
+    updateSelector: true
+  });
+}
+function isOnlyBeforeAndAfterPseudoElement(node) {
+  let b = false;
+  let a = false;
+  _postcssselectorparser2.default.call(void 0, (selectors) => {
+    selectors.walkPseudos((s) => {
+      if (_optionalChain([s, 'access', _13 => _13.parent, 'optionalAccess', _14 => _14.length]) === 1) {
+        if (/^:?:before$/.test(s.value)) {
+          b = true;
+        }
+        if (/^:?:after$/.test(s.value)) {
+          a = true;
+        }
+      }
+    });
+  }).astSync(node);
+  return b && a;
+}
+function getFallbackRemove(rule) {
+  const fallbackRemove = _postcssselectorparser2.default.call(void 0, (selectors) => {
+    let maybeImportantId = false;
+    selectors.walk((selector, idx) => {
+      if (idx === 0 && (selector.type === "id" || selector.type === "class" || selector.type === "attribute")) {
+        maybeImportantId = true;
+      }
+      if (selector.type === "universal") {
+        _optionalChain([selector, 'access', _15 => _15.parent, 'optionalAccess', _16 => _16.remove, 'call', _17 => _17()]);
+      }
+      if (selector.type === "pseudo") {
+        if (selector.value === ":is") {
+          if (maybeImportantId && _optionalChain([selector, 'access', _18 => _18.nodes, 'access', _19 => _19[0], 'optionalAccess', _20 => _20.type]) === "selector") {
+            selector.replaceWith(selector.nodes[0]);
+          } else {
+            _optionalChain([selector, 'access', _21 => _21.parent, 'optionalAccess', _22 => _22.remove, 'call', _23 => _23()]);
+          }
+        } else if (selector.value === ":not") {
+          for (const x of selector.nodes) {
+            if (x.nodes.length === 1 && x.nodes[0].type === "id" && x.nodes[0].value === "#") {
+              x.nodes = [
+                _postcssselectorparser2.default.tag({
+                  value: "#n"
+                })
+              ];
+            }
+          }
+        } else if (selector.value === ":where") {
+          for (const n of selector.nodes) {
+            for (const node of n.nodes) {
+              if (node.type === "attribute") {
+                node.remove();
+              }
+            }
+          }
+        }
+      }
+      if (selector.type === "attribute") {
+        if (selector.attribute === "hidden") {
+          _optionalChain([rule, 'optionalAccess', _24 => _24.remove, 'call', _25 => _25()]);
+        }
+      }
+    });
+    selectors.walk((selector) => {
+      if (selector.type === "pseudo") {
+        if (selector.value === ":where") {
+          const res = selector.nodes.every((x) => x.nodes.length === 0);
+          if (res) {
+            selector.remove();
+          }
+        }
+      }
+    });
+  });
+  return fallbackRemove;
+}
+
+// src/plugins/post.ts
+var OklabSuffix = "in oklab";
+var postcssWeappTailwindcssPostPlugin = (options = {
+  isMainChunk: true
+}) => {
+  const { customRuleCallback, isMainChunk } = options;
+  const p = {
+    postcssPlugin
+  };
+  if (isMainChunk) {
+    p.OnceExit = (root) => {
+      root.walkRules((rule) => {
+        getFallbackRemove(rule).transformSync(rule, {
+          updateSelector: true,
+          lossless: false
+        });
+        if (rule.selectors.length === 0 || rule.selectors.length === 1 && rule.selector.trim() === "") {
+          rule.remove();
+        }
+        rule.walkDecls((decl) => {
+          if (decl.prop === "--tw-gradient-position" && decl.value.endsWith(OklabSuffix)) {
+            decl.value = decl.value.slice(0, decl.value.length - OklabSuffix.length);
+          }
+        });
+      });
+    };
+  }
+  if (typeof customRuleCallback === "function") {
+    p.Rule = (rule) => {
+      customRuleCallback(rule, options);
+    };
+  }
+  return p;
+};
+postcssWeappTailwindcssPostPlugin.postcss = true;
+
 // src/plugins/pre.ts
 function isAtMediaHover(atRule) {
   return /media\(\s*hover\s*:\s*hover\s*\)/.test(atRule.name) || atRule.name === "media" && /\(\s*hover\s*:\s*hover\s*\)/.test(atRule.params);
@@ -587,7 +686,7 @@ function compare(e3, t2) {
   return e3.a === t2.a ? e3.b === t2.b ? e3.c - t2.c : e3.b - t2.b : e3.a - t2.a;
 }
 function selectorSpecificity(t2, s) {
-  const i = _optionalChain([s, 'optionalAccess', _18 => _18.customSpecificity, 'optionalCall', _19 => _19(t2)]);
+  const i = _optionalChain([s, 'optionalAccess', _26 => _26.customSpecificity, 'optionalCall', _27 => _27(t2)]);
   if (i) return i;
   if (!t2) return { a: 0, b: 0, c: 0 };
   let c = 0, n = 0, o2 = 0;
@@ -663,7 +762,7 @@ function selectorSpecificity(t2, s) {
     case ":active-view-transition-type":
       return { a: 0, b: 1, c: 0 };
   }
-  else _postcssselectorparser2.default.isContainer(t2) && _optionalChain([t2, 'access', _20 => _20.nodes, 'optionalAccess', _21 => _21.length]) > 0 && t2.nodes.forEach((e3) => {
+  else _postcssselectorparser2.default.isContainer(t2) && _optionalChain([t2, 'access', _28 => _28.nodes, 'optionalAccess', _29 => _29.length]) > 0 && t2.nodes.forEach((e3) => {
     const t3 = selectorSpecificity(e3, s);
     c += t3.a, n += t3.b, o2 += t3.c;
   });
@@ -691,8 +790,8 @@ function alwaysValidSelector(s) {
   const o2 = _postcssselectorparser2.default.call(void 0, ).astSync(s);
   let t2 = true;
   return o2.walk((e3) => {
-    if ("class" !== e3.type && "comment" !== e3.type && "id" !== e3.type && "root" !== e3.type && "selector" !== e3.type && "string" !== e3.type && "tag" !== e3.type && "universal" !== e3.type && ("attribute" !== e3.type || e3.insensitive) && ("combinator" !== e3.type || "+" !== e3.value && ">" !== e3.value && "~" !== e3.value && " " !== e3.value) && ("pseudo" !== e3.type || _optionalChain([e3, 'access', _22 => _22.nodes, 'optionalAccess', _23 => _23.length]) || ":hover" !== e3.value.toLowerCase() && ":focus" !== e3.value.toLowerCase())) {
-      if ("pseudo" === e3.type && 1 === _optionalChain([e3, 'access', _24 => _24.nodes, 'optionalAccess', _25 => _25.length]) && ":not" === e3.value.toLowerCase()) {
+    if ("class" !== e3.type && "comment" !== e3.type && "id" !== e3.type && "root" !== e3.type && "selector" !== e3.type && "string" !== e3.type && "tag" !== e3.type && "universal" !== e3.type && ("attribute" !== e3.type || e3.insensitive) && ("combinator" !== e3.type || "+" !== e3.value && ">" !== e3.value && "~" !== e3.value && " " !== e3.value) && ("pseudo" !== e3.type || _optionalChain([e3, 'access', _30 => _30.nodes, 'optionalAccess', _31 => _31.length]) || ":hover" !== e3.value.toLowerCase() && ":focus" !== e3.value.toLowerCase())) {
+      if ("pseudo" === e3.type && 1 === _optionalChain([e3, 'access', _32 => _32.nodes, 'optionalAccess', _33 => _33.length]) && ":not" === e3.value.toLowerCase()) {
         let s2 = true;
         if (e3.nodes[0].walkCombinators(() => {
           s2 = false;
@@ -804,8 +903,8 @@ function splitSelectors(o2, t2, n = 0) {
     if (_postcssselectorparser2.default.call(void 0, ).astSync(o3).walkPseudos((e3) => {
       if (":is" !== e3.value.toLowerCase() || !e3.nodes || !e3.nodes.length) return;
       if ("selector" === e3.nodes[0].type && 0 === e3.nodes[0].nodes.length) return;
-      if ("pseudo" === _optionalChain([e3, 'access', _26 => _26.parent, 'optionalAccess', _27 => _27.parent, 'optionalAccess', _28 => _28.type]) && ":not" === _optionalChain([e3, 'access', _29 => _29.parent, 'optionalAccess', _30 => _30.parent, 'optionalAccess', _31 => _31.value, 'optionalAccess', _32 => _32.toLowerCase, 'call', _33 => _33()])) return void i.push([{ start: e3.parent.parent.sourceIndex, end: e3.parent.parent.sourceIndex + e3.parent.parent.toString().length, option: `:not(${e3.nodes.toString()})` }]);
-      if ("pseudo" === _optionalChain([e3, 'access', _34 => _34.parent, 'optionalAccess', _35 => _35.parent, 'optionalAccess', _36 => _36.type]) && ":has" === _optionalChain([e3, 'access', _37 => _37.parent, 'optionalAccess', _38 => _38.parent, 'optionalAccess', _39 => _39.value, 'optionalAccess', _40 => _40.toLowerCase, 'call', _41 => _41()])) return void (e3.value = ":-csstools-matches");
+      if ("pseudo" === _optionalChain([e3, 'access', _34 => _34.parent, 'optionalAccess', _35 => _35.parent, 'optionalAccess', _36 => _36.type]) && ":not" === _optionalChain([e3, 'access', _37 => _37.parent, 'optionalAccess', _38 => _38.parent, 'optionalAccess', _39 => _39.value, 'optionalAccess', _40 => _40.toLowerCase, 'call', _41 => _41()])) return void i.push([{ start: e3.parent.parent.sourceIndex, end: e3.parent.parent.sourceIndex + e3.parent.parent.toString().length, option: `:not(${e3.nodes.toString()})` }]);
+      if ("pseudo" === _optionalChain([e3, 'access', _42 => _42.parent, 'optionalAccess', _43 => _43.parent, 'optionalAccess', _44 => _44.type]) && ":has" === _optionalChain([e3, 'access', _45 => _45.parent, 'optionalAccess', _46 => _46.parent, 'optionalAccess', _47 => _47.value, 'optionalAccess', _48 => _48.toLowerCase, 'call', _49 => _49()])) return void (e3.value = ":-csstools-matches");
       let o4 = e3.parent;
       for (; o4; ) {
         if (o4.value && ":is" === o4.value.toLowerCase() && "pseudo" === o4.type) return void (a = true);
@@ -827,7 +926,7 @@ function splitSelectors(o2, t2, n = 0) {
       let s = "";
       for (let t3 = 0; t3 < e3.length; t3++) {
         const n2 = e3[t3];
-        s += o3.substring(_optionalChain([e3, 'access', _42 => _42[t3 - 1], 'optionalAccess', _43 => _43.end]) || 0, e3[t3].start), s += ":-csstools-matches(" + n2.option + ")", t3 === e3.length - 1 && (s += o3.substring(e3[t3].end));
+        s += o3.substring(_optionalChain([e3, 'access', _50 => _50[t3 - 1], 'optionalAccess', _51 => _51.end]) || 0, e3[t3].start), s += ":-csstools-matches(" + n2.option + ")", t3 === e3.length - 1 && (s += o3.substring(e3[t3].end));
       }
       c.push(s);
     }), a && n < 10 && (c = splitSelectors(c, t2, n + 1)), c;
@@ -888,7 +987,7 @@ function getPlugins(options) {
   const ctx = createContext();
   options.ctx = ctx;
   const plugins = [
-    ..._nullishCoalesce(_optionalChain([options, 'access', _44 => _44.postcssOptions, 'optionalAccess', _45 => _45.plugins]), () => ( [])),
+    ..._nullishCoalesce(_optionalChain([options, 'access', _52 => _52.postcssOptions, 'optionalAccess', _53 => _53.plugins]), () => ( [])),
     postcssWeappTailwindcssPrePlugin(options),
     _postcsspresetenv2.default.call(void 0, options.cssPresetEnv)
   ];
@@ -932,7 +1031,7 @@ function styleHandler(rawSource, options) {
     getPlugins(options)
   ).process(
     rawSource,
-    _nullishCoalesce(_optionalChain([options, 'access', _46 => _46.postcssOptions, 'optionalAccess', _47 => _47.options]), () => ( {
+    _nullishCoalesce(_optionalChain([options, 'access', _54 => _54.postcssOptions, 'optionalAccess', _55 => _55.options]), () => ( {
       from: void 0
     }))
   ).async();

package/dist/index.mjs

@@ -51,180 +51,11 @@ function createContext() {
 var postcssPlugin = "postcss-weapp-tailwindcss-rename-plugin";
 
 // src/selectorParser.ts
-import selectorParser from "postcss-selector-parser";
-
-// src/shared.ts
-import { escape, MappingChars2String } from "@weapp-core/escape";
-function internalCssSelectorReplacer(selectors, options = {
-  escapeMap: MappingChars2String
-}) {
-  const { mangleContext, escapeMap } = options;
-  if (mangleContext) {
-    selectors = mangleContext.cssHandler(selectors);
-  }
-  return escape(selectors, {
-    map: escapeMap
-  });
-}
-function composeIsPseudo(strs) {
-  if (typeof strs === "string") {
-    return strs;
-  }
-  if (strs.length > 1) {
-    return `:is(${strs.join(",")})`;
-  }
-  return strs.join("");
-}
-
-// src/selectorParser.ts
-function createRuleTransform(rule, options) {
-  const { escapeMap, mangleContext, cssSelectorReplacement, cssRemoveHoverPseudoClass } = options;
-  const transform = (selectors) => {
-    selectors.walk((selector) => {
-      if (selector.type === "universal" && cssSelectorReplacement?.universal) {
-        selector.value = composeIsPseudo(cssSelectorReplacement.universal);
-      }
-      if (cssRemoveHoverPseudoClass && selector.type === "selector") {
-        const node = selector.nodes.find((x) => x.type === "pseudo" && x.value === ":hover");
-        if (node) {
-          selector.remove();
-        }
-      }
-      if (selector.type === "pseudo" && selector.value === ":root" && cssSelectorReplacement?.root) {
-        selector.value = composeIsPseudo(cssSelectorReplacement.root);
-      }
-      if (selector.type === "class") {
-        selector.value = internalCssSelectorReplacer(selector.value, {
-          escapeMap,
-          mangleContext
-        });
-      }
-    });
-    if (selectors.length === 0) {
-      rule.remove();
-    }
-  };
-  return transform;
-}
-function ruleTransformSync(rule, options) {
-  const transformer = selectorParser(createRuleTransform(rule, options));
-  return transformer.transformSync(rule, {
-    lossless: false,
-    updateSelector: true
-  });
-}
-function isOnlyBeforeAndAfterPseudoElement(node) {
-  let b = false;
-  let a = false;
-  selectorParser((selectors) => {
-    selectors.walkPseudos((s) => {
-      if (s.parent?.length === 1) {
-        if (/^:?:before$/.test(s.value)) {
-          b = true;
-        }
-        if (/^:?:after$/.test(s.value)) {
-          a = true;
-        }
-      }
-    });
-  }).astSync(node);
-  return b && a;
-}
-function getFallbackRemove(rule) {
-  const fallbackRemove = selectorParser((selectors) => {
-    let maybeImportantId = false;
-    selectors.walk((selector, idx) => {
-      if (idx === 0 && (selector.type === "id" || selector.type === "class" || selector.type === "attribute")) {
-        maybeImportantId = true;
-      }
-      if (selector.type === "universal") {
-        selector.parent?.remove();
-      }
-      if (selector.type === "pseudo") {
-        if (selector.value === ":is") {
-          if (maybeImportantId && selector.nodes[0]?.type === "selector") {
-            selector.replaceWith(selector.nodes[0]);
-          } else {
-            selector.parent?.remove();
-          }
-        } else if (selector.value === ":not") {
-          for (const x of selector.nodes) {
-            if (x.nodes.length === 1 && x.nodes[0].type === "id" && x.nodes[0].value === "#") {
-              x.nodes = [
-                selectorParser.tag({
-                  value: "#n"
-                })
-              ];
-            }
-          }
-        } else if (selector.value === ":where") {
-          for (const n of selector.nodes) {
-            for (const node of n.nodes) {
-              if (node.type === "attribute") {
-                node.remove();
-              }
-            }
-          }
-        }
-      }
-      if (selector.type === "attribute") {
-        if (selector.attribute === "hidden") {
-          rule?.remove();
-        }
-      }
-    });
-    selectors.walk((selector) => {
-      if (selector.type === "pseudo") {
-        if (selector.value === ":where") {
-          const res = selector.nodes.every((x) => x.nodes.length === 0);
-          if (res) {
-            selector.remove();
-          }
-        }
-      }
-    });
-  });
-  return fallbackRemove;
-}
-
-// src/plugins/post.ts
-var OklabSuffix = "in oklab";
-var postcssWeappTailwindcssPostPlugin = (options = {
-  isMainChunk: true
-}) => {
-  const { customRuleCallback, isMainChunk } = options;
-  const p = {
-    postcssPlugin
-  };
-  if (isMainChunk) {
-    p.OnceExit = (root) => {
-      root.walkRules((rule) => {
-        getFallbackRemove(rule).transformSync(rule, {
-          updateSelector: true,
-          lossless: false
-        });
-        if (rule.selectors.length === 0 || rule.selectors.length === 1 && rule.selector.trim() === "") {
-          rule.remove();
-        }
-        rule.walkDecls((decl) => {
-          if (decl.prop === "--tw-gradient-position" && decl.value.endsWith(OklabSuffix)) {
-            decl.value = decl.value.slice(0, decl.value.length - OklabSuffix.length);
-          }
-        });
-      });
-    };
-  }
-  if (typeof customRuleCallback === "function") {
-    p.Rule = (rule) => {
-      customRuleCallback(rule, options);
-    };
-  }
-  return p;
-};
-postcssWeappTailwindcssPostPlugin.postcss = true;
+import psp3 from "postcss-selector-parser";
 
 // src/mp.ts
 import { Declaration, Rule } from "postcss";
+import psp2 from "postcss-selector-parser";
 
 // src/cssVars.ts
 var cssVars_default = [
@@ -434,6 +265,79 @@ var cssVars_default = [
   }
 ];
 
+// src/shared.ts
+import { escape, MappingChars2String } from "@weapp-core/escape";
+import psp from "postcss-selector-parser";
+function internalCssSelectorReplacer(selectors, options = {
+  escapeMap: MappingChars2String
+}) {
+  const { mangleContext, escapeMap } = options;
+  if (mangleContext) {
+    selectors = mangleContext.cssHandler(selectors);
+  }
+  return escape(selectors, {
+    map: escapeMap
+  });
+}
+function composeIsPseudoAst(strs) {
+  if (typeof strs === "string") {
+    return [
+      psp.tag({
+        value: strs
+      }),
+      psp.combinator({
+        value: "+"
+      }),
+      psp.tag({
+        value: strs
+      })
+    ];
+  }
+  if (strs.length > 1) {
+    return [
+      psp.pseudo({
+        value: ":is",
+        nodes: strs.map(
+          (str) => psp.tag({
+            value: str
+          })
+        )
+      }),
+      psp.combinator({
+        value: "+"
+      }),
+      psp.pseudo({
+        value: ":is",
+        nodes: strs.map(
+          (str) => psp.tag({
+            value: str
+          })
+        )
+      })
+    ];
+  }
+  return [
+    psp.tag({
+      value: strs[0]
+    }),
+    psp.combinator({
+      value: "+"
+    }),
+    psp.tag({
+      value: strs[0]
+    })
+  ];
+}
+function composeIsPseudo(strs) {
+  if (typeof strs === "string") {
+    return strs;
+  }
+  if (strs.length > 1) {
+    return `:is(${strs.join(",")})`;
+  }
+  return strs.join("");
+}
+
 // src/mp.ts
 var initialNodes = cssVars_default.map((x) => {
   return new Declaration({
@@ -509,19 +413,22 @@ function remakeCssVarSelector(selectors, options) {
   }
   return selectors;
 }
-function remakeCombinatorSelector(selector, cssChildCombinatorReplaceValue) {
-  let childCombinatorReplaceValue = "view + view";
+function getCombinatorSelectorAst(options) {
+  let childCombinatorReplaceValue = [
+    psp2.tag({ value: "view" }),
+    psp2.combinator({ value: "+" }),
+    psp2.tag({ value: "view" })
+  ];
+  const { cssChildCombinatorReplaceValue } = options;
   if (Array.isArray(cssChildCombinatorReplaceValue) && cssChildCombinatorReplaceValue.length > 0) {
-    const x = composeIsPseudo(cssChildCombinatorReplaceValue);
-    childCombinatorReplaceValue = `${x} + ${x}`;
+    childCombinatorReplaceValue = composeIsPseudoAst(cssChildCombinatorReplaceValue);
   } else if (typeof cssChildCombinatorReplaceValue === "string") {
-    childCombinatorReplaceValue = cssChildCombinatorReplaceValue;
+    childCombinatorReplaceValue = composeIsPseudoAst(cssChildCombinatorReplaceValue);
   }
-  return selector.replaceAll(BROAD_MATCH_GLOBAL_REGEXP, childCombinatorReplaceValue);
+  return childCombinatorReplaceValue;
 }
 function commonChunkPreflight(node, options) {
-  const { ctx, cssChildCombinatorReplaceValue, cssInjectPreflight, injectAdditionalCssVarScope } = options;
-  node.selector = remakeCombinatorSelector(node.selector, cssChildCombinatorReplaceValue);
+  const { ctx, cssInjectPreflight, injectAdditionalCssVarScope } = options;
   if (testIfVariablesScope(node)) {
     ctx?.markVariablesScope(node);
     node.selectors = remakeCssVarSelector(node.selectors, options);
@@ -544,6 +451,198 @@ function commonChunkPreflight(node, options) {
   }
 }
 
+// src/selectorParser.ts
+function createRuleTransform(rule, options) {
+  const { escapeMap, mangleContext, cssSelectorReplacement, cssRemoveHoverPseudoClass } = options;
+  const transform = (selectors) => {
+    selectors.walk((selector, index) => {
+      if (selector.type === "universal") {
+        if (cssSelectorReplacement?.universal) {
+          selector.value = composeIsPseudo(cssSelectorReplacement.universal);
+        }
+      } else if (selector.type === "selector") {
+        if (cssRemoveHoverPseudoClass) {
+          const node = selector.nodes.find((x) => x.type === "pseudo" && x.value === ":hover");
+          if (node) {
+            selector.remove();
+          }
+        }
+      } else if (selector.type === "pseudo") {
+        if (selector.value === ":root" && cssSelectorReplacement?.root) {
+          selector.value = composeIsPseudo(cssSelectorReplacement.root);
+        } else if (selector.value === ":where") {
+          if (index === 0 && selector.length === 1) {
+            selector.walk((node, idx) => {
+              if (idx === 0 && node.type === "class") {
+                const nodes = node.parent?.nodes;
+                if (nodes) {
+                  const first = nodes[idx + 1];
+                  if (first && first.type === "combinator" && first.value === ">") {
+                    const second = nodes[idx + 2];
+                    if (second && second.type === "pseudo" && second.value === ":not" && second.first.first.type === "pseudo" && second.first.first.value === ":last-child") {
+                      const ast = getCombinatorSelectorAst(options);
+                      second.replaceWith(
+                        ...ast
+                      );
+                    }
+                  }
+                }
+              }
+            });
+            selector.replaceWith(...selector.nodes);
+          }
+        }
+      } else if (selector.type === "class") {
+        selector.value = internalCssSelectorReplacer(selector.value, {
+          escapeMap,
+          mangleContext
+        });
+      } else if (selector.type === "combinator") {
+        if (selector.value === ">") {
+          const nodes = selector.parent?.nodes;
+          if (nodes) {
+            const first = nodes[index + 1];
+            if (first && first.type === "pseudo" && first.value === ":not" && (first.first.first.type === "attribute" && first.first.first.attribute === "hidden" || first.first.first.type === "tag" && first.first.first.value === "template")) {
+              const second = nodes[index + 2];
+              if (second && second.type === "combinator" && (second.value === "~" || second.value === "+")) {
+                const third = nodes[index + 3];
+                if (third && third.type === "pseudo" && third.value === ":not" && (third.first.first.type === "attribute" && third.first.first.attribute === "hidden" || third.first.first.type === "tag" && third.first.first.value === "template")) {
+                  const ast = getCombinatorSelectorAst(options);
+                  selector.parent?.nodes.splice(
+                    index + 1,
+                    3,
+                    ...ast
+                  );
+                }
+              }
+            }
+          }
+        }
+      }
+    });
+    if (selectors.length === 0) {
+      rule.remove();
+    }
+  };
+  return transform;
+}
+function ruleTransformSync(rule, options) {
+  const transformer = psp3(createRuleTransform(rule, options));
+  return transformer.transformSync(rule, {
+    lossless: false,
+    updateSelector: true
+  });
+}
+function isOnlyBeforeAndAfterPseudoElement(node) {
+  let b = false;
+  let a = false;
+  psp3((selectors) => {
+    selectors.walkPseudos((s) => {
+      if (s.parent?.length === 1) {
+        if (/^:?:before$/.test(s.value)) {
+          b = true;
+        }
+        if (/^:?:after$/.test(s.value)) {
+          a = true;
+        }
+      }
+    });
+  }).astSync(node);
+  return b && a;
+}
+function getFallbackRemove(rule) {
+  const fallbackRemove = psp3((selectors) => {
+    let maybeImportantId = false;
+    selectors.walk((selector, idx) => {
+      if (idx === 0 && (selector.type === "id" || selector.type === "class" || selector.type === "attribute")) {
+        maybeImportantId = true;
+      }
+      if (selector.type === "universal") {
+        selector.parent?.remove();
+      }
+      if (selector.type === "pseudo") {
+        if (selector.value === ":is") {
+          if (maybeImportantId && selector.nodes[0]?.type === "selector") {
+            selector.replaceWith(selector.nodes[0]);
+          } else {
+            selector.parent?.remove();
+          }
+        } else if (selector.value === ":not") {
+          for (const x of selector.nodes) {
+            if (x.nodes.length === 1 && x.nodes[0].type === "id" && x.nodes[0].value === "#") {
+              x.nodes = [
+                psp3.tag({
+                  value: "#n"
+                })
+              ];
+            }
+          }
+        } else if (selector.value === ":where") {
+          for (const n of selector.nodes) {
+            for (const node of n.nodes) {
+              if (node.type === "attribute") {
+                node.remove();
+              }
+            }
+          }
+        }
+      }
+      if (selector.type === "attribute") {
+        if (selector.attribute === "hidden") {
+          rule?.remove();
+        }
+      }
+    });
+    selectors.walk((selector) => {
+      if (selector.type === "pseudo") {
+        if (selector.value === ":where") {
+          const res = selector.nodes.every((x) => x.nodes.length === 0);
+          if (res) {
+            selector.remove();
+          }
+        }
+      }
+    });
+  });
+  return fallbackRemove;
+}
+
+// src/plugins/post.ts
+var OklabSuffix = "in oklab";
+var postcssWeappTailwindcssPostPlugin = (options = {
+  isMainChunk: true
+}) => {
+  const { customRuleCallback, isMainChunk } = options;
+  const p = {
+    postcssPlugin
+  };
+  if (isMainChunk) {
+    p.OnceExit = (root) => {
+      root.walkRules((rule) => {
+        getFallbackRemove(rule).transformSync(rule, {
+          updateSelector: true,
+          lossless: false
+        });
+        if (rule.selectors.length === 0 || rule.selectors.length === 1 && rule.selector.trim() === "") {
+          rule.remove();
+        }
+        rule.walkDecls((decl) => {
+          if (decl.prop === "--tw-gradient-position" && decl.value.endsWith(OklabSuffix)) {
+            decl.value = decl.value.slice(0, decl.value.length - OklabSuffix.length);
+          }
+        });
+      });
+    };
+  }
+  if (typeof customRuleCallback === "function") {
+    p.Rule = (rule) => {
+      customRuleCallback(rule, options);
+    };
+  }
+  return p;
+};
+postcssWeappTailwindcssPostPlugin.postcss = true;
+
 // src/plugins/pre.ts
 function isAtMediaHover(atRule) {
   return /media\(\s*hover\s*:\s*hover\s*\)/.test(atRule.name) || atRule.name === "media" && /\(\s*hover\s*:\s*hover\s*\)/.test(atRule.params);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-tailwindcss/postcss",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "@weapp-tailwindcss/postcss",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",