@weapp-tailwindcss/postcss 1.3.2 → 1.3.3-alpha.0

package/dist/index.js

@@ -514,6 +514,67 @@ function ruleTransformSync(rule, options) {
 
 // src/plugins/post.ts
 var OklabSuffix = "in oklab";
+var logicalPropMap = /* @__PURE__ */ new Map([
+  ["margin-inline-start", "margin-left"],
+  ["margin-inline-end", "margin-right"],
+  ["margin-block-start", "margin-top"],
+  ["margin-block-end", "margin-bottom"],
+  ["padding-inline-start", "padding-left"],
+  ["padding-inline-end", "padding-right"],
+  ["padding-block-start", "padding-top"],
+  ["padding-block-end", "padding-bottom"]
+]);
+function getCanonicalProp(prop) {
+  return _nullishCoalesce(logicalPropMap.get(prop), () => ( prop));
+}
+function normalizeCalcValue(value) {
+  if (!value.includes("calc")) {
+    return value;
+  }
+  let next = value;
+  let prev;
+  do {
+    prev = next;
+    next = prev.replace(/calc\(\s*calc\(/gi, "calc((");
+  } while (next !== prev);
+  return next.replace(/calc\(\s*(1\s*-\s*var\([^()]+\))\s*\)/gi, "($1)");
+}
+function dedupeDeclarations(rule) {
+  const entries = [];
+  for (const node of [...rule.nodes]) {
+    if (node.type !== "decl") {
+      continue;
+    }
+    const decl = node;
+    const normalizedValue = normalizeCalcValue(decl.value);
+    if (normalizedValue !== decl.value) {
+      decl.value = normalizedValue;
+    }
+    const canonicalProp = getCanonicalProp(decl.prop);
+    entries.push({
+      decl,
+      normalizedValue,
+      canonicalProp,
+      importantKey: decl.important ? "!important" : "",
+      isLogical: canonicalProp !== decl.prop
+    });
+  }
+  const seen = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    const key = `${entry.canonicalProp}${entry.importantKey}@@${entry.normalizedValue}`;
+    const existing = seen.get(key);
+    if (!existing) {
+      seen.set(key, entry);
+      continue;
+    }
+    if (existing.isLogical && !entry.isLogical) {
+      existing.decl.remove();
+      seen.set(key, entry);
+    } else {
+      entry.decl.remove();
+    }
+  }
+}
 var postcssWeappTailwindcssPostPlugin = (options) => {
   const opts = _shared.defu.call(void 0, options, {
     isMainChunk: true
@@ -525,6 +586,7 @@ var postcssWeappTailwindcssPostPlugin = (options) => {
     const fallbackRemove = getFallbackRemove(void 0, opts);
     p.RuleExit = (rule) => {
       fallbackRemove.transformSync(rule);
+      dedupeDeclarations(rule);
       if (rule.selectors.length === 0 || rule.selectors.length === 1 && rule.selector.trim() === "") {
         rule.remove();
       }

package/dist/index.mjs

@@ -514,6 +514,67 @@ function ruleTransformSync(rule, options) {
 
 // src/plugins/post.ts
 var OklabSuffix = "in oklab";
+var logicalPropMap = /* @__PURE__ */ new Map([
+  ["margin-inline-start", "margin-left"],
+  ["margin-inline-end", "margin-right"],
+  ["margin-block-start", "margin-top"],
+  ["margin-block-end", "margin-bottom"],
+  ["padding-inline-start", "padding-left"],
+  ["padding-inline-end", "padding-right"],
+  ["padding-block-start", "padding-top"],
+  ["padding-block-end", "padding-bottom"]
+]);
+function getCanonicalProp(prop) {
+  return logicalPropMap.get(prop) ?? prop;
+}
+function normalizeCalcValue(value) {
+  if (!value.includes("calc")) {
+    return value;
+  }
+  let next = value;
+  let prev;
+  do {
+    prev = next;
+    next = prev.replace(/calc\(\s*calc\(/gi, "calc((");
+  } while (next !== prev);
+  return next.replace(/calc\(\s*(1\s*-\s*var\([^()]+\))\s*\)/gi, "($1)");
+}
+function dedupeDeclarations(rule) {
+  const entries = [];
+  for (const node of [...rule.nodes]) {
+    if (node.type !== "decl") {
+      continue;
+    }
+    const decl = node;
+    const normalizedValue = normalizeCalcValue(decl.value);
+    if (normalizedValue !== decl.value) {
+      decl.value = normalizedValue;
+    }
+    const canonicalProp = getCanonicalProp(decl.prop);
+    entries.push({
+      decl,
+      normalizedValue,
+      canonicalProp,
+      importantKey: decl.important ? "!important" : "",
+      isLogical: canonicalProp !== decl.prop
+    });
+  }
+  const seen = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    const key = `${entry.canonicalProp}${entry.importantKey}@@${entry.normalizedValue}`;
+    const existing = seen.get(key);
+    if (!existing) {
+      seen.set(key, entry);
+      continue;
+    }
+    if (existing.isLogical && !entry.isLogical) {
+      existing.decl.remove();
+      seen.set(key, entry);
+    } else {
+      entry.decl.remove();
+    }
+  }
+}
 var postcssWeappTailwindcssPostPlugin = (options) => {
   const opts = defu(options, {
     isMainChunk: true
@@ -525,6 +586,7 @@ var postcssWeappTailwindcssPostPlugin = (options) => {
     const fallbackRemove = getFallbackRemove(void 0, opts);
     p.RuleExit = (rule) => {
       fallbackRemove.transformSync(rule);
+      dedupeDeclarations(rule);
       if (rule.selectors.length === 0 || rule.selectors.length === 1 && rule.selector.trim() === "") {
         rule.remove();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-tailwindcss/postcss",
-  "version": "1.3.2",
+  "version": "1.3.3-alpha.0",
   "description": "@weapp-tailwindcss/postcss",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -47,13 +47,13 @@
     "postcss-rem-to-responsive-pixel": "~6.1.0",
     "postcss-selector-parser": "~7.1.0",
     "postcss-value-parser": "^4.2.0",
-    "@weapp-tailwindcss/shared": "1.0.3"
+    "@weapp-tailwindcss/shared": "1.1.0-alpha.0"
   },
   "devDependencies": {
     "@csstools/postcss-is-pseudo-class": "^5.0.3",
     "postcss-calc": "^10.1.1",
     "postcss-custom-properties": "^14.0.6",
-    "@weapp-tailwindcss/mangle": "1.0.5"
+    "@weapp-tailwindcss/mangle": "1.0.6-alpha.0"
   },
   "scripts": {
     "dev": "tsup --watch --sourcemap",