@weapp-tailwindcss/postcss 1.0.5 → 1.0.6

package/dist/index.js

@@ -28,17 +28,14 @@ function getDefaultOptions() {
 var _postcsspresetenv = require('postcss-preset-env'); var _postcsspresetenv2 = _interopRequireDefault(_postcsspresetenv);
 var _postcssremtoresponsivepixel = require('postcss-rem-to-responsive-pixel'); var _postcssremtoresponsivepixel2 = _interopRequireDefault(_postcssremtoresponsivepixel);
 
-// src/symbols.ts
-var VariablesScopeSymbol = Symbol("VariablesScope");
-
 // src/plugins/ctx.ts
 function createContext() {
   const variablesScopeWeakMap = /* @__PURE__ */ new WeakMap();
   function isVariablesScope(rule) {
-    return variablesScopeWeakMap.get(rule) === VariablesScopeSymbol;
+    return variablesScopeWeakMap.get(rule) === true;
   }
   function markVariablesScope(rule) {
-    variablesScopeWeakMap.set(rule, VariablesScopeSymbol);
+    variablesScopeWeakMap.set(rule, true);
   }
   return {
     variablesScopeWeakMap,
@@ -53,8 +50,280 @@ var postcssPlugin = "postcss-weapp-tailwindcss-rename-plugin";
 // src/selectorParser.ts
 var _postcssselectorparser = require('postcss-selector-parser'); var _postcssselectorparser2 = _interopRequireDefault(_postcssselectorparser);
 
-// src/mp.ts
+// 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 mklist(node) {
+  return [
+    node,
+    _postcssselectorparser2.default.combinator({
+      value: "+"
+    }),
+    node.clone()
+  ];
+}
+function composeIsPseudoAst(strs) {
+  if (typeof strs === "string") {
+    return mklist(_postcssselectorparser2.default.tag({
+      value: strs
+    }));
+  }
+  if (strs.length > 1) {
+    return mklist(_postcssselectorparser2.default.pseudo({
+      value: ":is",
+      nodes: strs.map(
+        (str) => _postcssselectorparser2.default.tag({
+          value: str
+        })
+      )
+    }));
+  }
+  return mklist(_postcssselectorparser2.default.tag({
+    value: strs[0]
+  }));
+}
+function getCombinatorSelectorAst(options) {
+  let childCombinatorReplaceValue = mklist(_postcssselectorparser2.default.tag({ value: "view" }));
+  const { cssChildCombinatorReplaceValue } = options;
+  if (typeof cssChildCombinatorReplaceValue === "string" || Array.isArray(cssChildCombinatorReplaceValue) && cssChildCombinatorReplaceValue.length > 0) {
+    childCombinatorReplaceValue = composeIsPseudoAst(cssChildCombinatorReplaceValue);
+  }
+  return childCombinatorReplaceValue;
+}
+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', _ => _.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', _2 => _2.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', _3 => _3.parent, 'optionalAccess', _4 => _4.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);
+            for (const node of rule.nodes) {
+              if (node.type === "decl") {
+                if (node.prop === "margin-block-start") {
+                  node.prop = "margin-block-end";
+                } else if (node.prop === "margin-block-end") {
+                  node.prop = "margin-block-start";
+                } else if (node.prop === "margin-inline-start") {
+                  node.prop = "margin-inline-end";
+                } else if (node.prop === "margin-inline-end") {
+                  node.prop = "margin-inline-start";
+                } else if (node.prop === "margin-top") {
+                  node.prop = "margin-bottom";
+                } else if (node.prop === "margin-bottom") {
+                  node.prop = "margin-top";
+                } else if (node.prop === "margin-left") {
+                  node.prop = "margin-right";
+                } else if (node.prop === "margin-right") {
+                  node.prop = "margin-left";
+                }
+              }
+            }
+          }
+        }
+      } 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', _5 => _5.parent, 'optionalAccess', _6 => _6.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', _7 => _7.parent, 'optionalAccess', _8 => _8.nodes, 'access', _9 => _9.splice, 'call', _10 => _10(
+                    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', _11 => _11.parent, 'optionalAccess', _12 => _12.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', _13 => _13.parent, 'optionalAccess', _14 => _14.remove, 'call', _15 => _15()]);
+      }
+      if (selector.type === "pseudo") {
+        if (selector.value === ":is") {
+          if (maybeImportantId && _optionalChain([selector, 'access', _16 => _16.nodes, 'access', _17 => _17[0], 'optionalAccess', _18 => _18.type]) === "selector") {
+            selector.replaceWith(selector.nodes[0]);
+          } else {
+            _optionalChain([selector, 'access', _19 => _19.parent, 'optionalAccess', _20 => _20.remove, 'call', _21 => _21()]);
+          }
+        } 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', _22 => _22.remove, 'call', _23 => _23()]);
+        }
+      }
+    });
+    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
@@ -265,79 +534,6 @@ 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)({
@@ -345,11 +541,6 @@ var initialNodes = cssVars_default.map((x) => {
     value: x.value
   });
 });
-var PATTERNS = [
-  /:not\(template\)\s*[~+]\s*:not\(template\)/.source,
-  /:not\(\[hidden\]\)\s*[~+]\s*:not\(\[hidden\]\)/.source
-].join("|");
-var BROAD_MATCH_GLOBAL_REGEXP = new RegExp(PATTERNS, "g");
 function testIfVariablesScope(node, count = 2) {
   if (isOnlyBeforeAndAfterPseudoElement(node)) {
     const nodes = node.nodes;
@@ -413,24 +604,10 @@ function remakeCssVarSelector(selectors, options) {
   }
   return selectors;
 }
-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) {
-    childCombinatorReplaceValue = composeIsPseudoAst(cssChildCombinatorReplaceValue);
-  } else if (typeof cssChildCombinatorReplaceValue === "string") {
-    childCombinatorReplaceValue = composeIsPseudoAst(cssChildCombinatorReplaceValue);
-  }
-  return childCombinatorReplaceValue;
-}
 function commonChunkPreflight(node, options) {
   const { ctx, cssInjectPreflight, injectAdditionalCssVarScope } = options;
   if (testIfVariablesScope(node)) {
-    _optionalChain([ctx, 'optionalAccess', _ => _.markVariablesScope, 'call', _2 => _2(node)]);
+    _optionalChain([ctx, 'optionalAccess', _24 => _24.markVariablesScope, 'call', _25 => _25(node)]);
     node.selectors = remakeCssVarSelector(node.selectors, options);
     node.before(makePseudoVarRule());
     if (typeof cssInjectPreflight === "function") {
@@ -451,198 +628,6 @@ 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);

package/dist/index.mjs

@@ -28,17 +28,14 @@ function getDefaultOptions() {
 import postcssPresetEnv from "postcss-preset-env";
 import postcssRem2rpx from "postcss-rem-to-responsive-pixel";
 
-// src/symbols.ts
-var VariablesScopeSymbol = Symbol("VariablesScope");
-
 // src/plugins/ctx.ts
 function createContext() {
   const variablesScopeWeakMap = /* @__PURE__ */ new WeakMap();
   function isVariablesScope(rule) {
-    return variablesScopeWeakMap.get(rule) === VariablesScopeSymbol;
+    return variablesScopeWeakMap.get(rule) === true;
   }
   function markVariablesScope(rule) {
-    variablesScopeWeakMap.set(rule, VariablesScopeSymbol);
+    variablesScopeWeakMap.set(rule, true);
   }
   return {
     variablesScopeWeakMap,
@@ -51,11 +48,283 @@ function createContext() {
 var postcssPlugin = "postcss-weapp-tailwindcss-rename-plugin";
 
 // src/selectorParser.ts
-import psp3 from "postcss-selector-parser";
+import psp 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 mklist(node) {
+  return [
+    node,
+    psp.combinator({
+      value: "+"
+    }),
+    node.clone()
+  ];
+}
+function composeIsPseudoAst(strs) {
+  if (typeof strs === "string") {
+    return mklist(psp.tag({
+      value: strs
+    }));
+  }
+  if (strs.length > 1) {
+    return mklist(psp.pseudo({
+      value: ":is",
+      nodes: strs.map(
+        (str) => psp.tag({
+          value: str
+        })
+      )
+    }));
+  }
+  return mklist(psp.tag({
+    value: strs[0]
+  }));
+}
+function getCombinatorSelectorAst(options) {
+  let childCombinatorReplaceValue = mklist(psp.tag({ value: "view" }));
+  const { cssChildCombinatorReplaceValue } = options;
+  if (typeof cssChildCombinatorReplaceValue === "string" || Array.isArray(cssChildCombinatorReplaceValue) && cssChildCombinatorReplaceValue.length > 0) {
+    childCombinatorReplaceValue = composeIsPseudoAst(cssChildCombinatorReplaceValue);
+  }
+  return childCombinatorReplaceValue;
+}
+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);
+            for (const node of rule.nodes) {
+              if (node.type === "decl") {
+                if (node.prop === "margin-block-start") {
+                  node.prop = "margin-block-end";
+                } else if (node.prop === "margin-block-end") {
+                  node.prop = "margin-block-start";
+                } else if (node.prop === "margin-inline-start") {
+                  node.prop = "margin-inline-end";
+                } else if (node.prop === "margin-inline-end") {
+                  node.prop = "margin-inline-start";
+                } else if (node.prop === "margin-top") {
+                  node.prop = "margin-bottom";
+                } else if (node.prop === "margin-bottom") {
+                  node.prop = "margin-top";
+                } else if (node.prop === "margin-left") {
+                  node.prop = "margin-right";
+                } else if (node.prop === "margin-right") {
+                  node.prop = "margin-left";
+                }
+              }
+            }
+          }
+        }
+      } 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 = psp(createRuleTransform(rule, options));
+  return transformer.transformSync(rule, {
+    lossless: false,
+    updateSelector: true
+  });
+}
+function isOnlyBeforeAndAfterPseudoElement(node) {
+  let b = false;
+  let a = false;
+  psp((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 = psp((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 = [
+                psp.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/mp.ts
 import { Declaration, Rule } from "postcss";
-import psp2 from "postcss-selector-parser";
 
 // src/cssVars.ts
 var cssVars_default = [
@@ -265,79 +534,6 @@ 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({
@@ -345,11 +541,6 @@ var initialNodes = cssVars_default.map((x) => {
     value: x.value
   });
 });
-var PATTERNS = [
-  /:not\(template\)\s*[~+]\s*:not\(template\)/.source,
-  /:not\(\[hidden\]\)\s*[~+]\s*:not\(\[hidden\]\)/.source
-].join("|");
-var BROAD_MATCH_GLOBAL_REGEXP = new RegExp(PATTERNS, "g");
 function testIfVariablesScope(node, count = 2) {
   if (isOnlyBeforeAndAfterPseudoElement(node)) {
     const nodes = node.nodes;
@@ -413,20 +604,6 @@ function remakeCssVarSelector(selectors, options) {
   }
   return selectors;
 }
-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) {
-    childCombinatorReplaceValue = composeIsPseudoAst(cssChildCombinatorReplaceValue);
-  } else if (typeof cssChildCombinatorReplaceValue === "string") {
-    childCombinatorReplaceValue = composeIsPseudoAst(cssChildCombinatorReplaceValue);
-  }
-  return childCombinatorReplaceValue;
-}
 function commonChunkPreflight(node, options) {
   const { ctx, cssInjectPreflight, injectAdditionalCssVarScope } = options;
   if (testIfVariablesScope(node)) {
@@ -451,198 +628,6 @@ 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.5",
+  "version": "1.0.6",
   "description": "@weapp-tailwindcss/postcss",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",