@homebound/truss 2.1.0-next.9 → 2.1.1

package/build/plugin/index.js

@@ -570,7 +570,9 @@ function isVariableRule(rule) {
 }
 function sortRulesByPriority(rules) {
   rules.sort(function(a, b) {
-    return computeRulePriority(a) - computeRulePriority(b);
+    const diff = computeRulePriority(a) - computeRulePriority(b);
+    if (diff !== 0) return diff;
+    return a.className < b.className ? -1 : a.className > b.className ? 1 : 0;
   });
 }
 
@@ -882,17 +884,30 @@ ${body}
 }
 function buildStyleHashProperties(segments, mapping, maybeIncHelperName) {
   const propGroups = /* @__PURE__ */ new Map();
+  function pushEntry(cssProp, entry) {
+    if (!propGroups.has(cssProp)) propGroups.set(cssProp, []);
+    const entries = propGroups.get(cssProp);
+    if (!entry.isConditional) {
+      for (let i = entries.length - 1; i >= 0; i--) {
+        if (!entries[i].isConditional) {
+          entries.splice(i, 1);
+        }
+      }
+    }
+    entries.push(entry);
+  }
   for (const seg of segments) {
     if (seg.error || seg.styleArrayArg || seg.typographyLookup) continue;
     const { prefix } = segmentContext(seg, mapping);
+    const isConditional = prefix !== "";
     if (seg.variableProps) {
       for (const prop of seg.variableProps) {
         const className = prefix ? `${prefix}${seg.abbr}_var` : `${seg.abbr}_var`;
         const varName = toCssVariableName(className, seg.abbr, prop);
-        if (!propGroups.has(prop)) propGroups.set(prop, []);
-        propGroups.get(prop).push({
+        pushEntry(prop, {
           className,
           isVariable: true,
+          isConditional,
           varName,
           argNode: seg.argNode,
           incremented: seg.incremented,
@@ -903,8 +918,7 @@ function buildStyleHashProperties(segments, mapping, maybeIncHelperName) {
         for (const [cssProp, value] of Object.entries(seg.variableExtraDefs)) {
           const extraBase = `${seg.abbr}_${cssProp}`;
           const extraName = prefix ? `${prefix}${extraBase}` : extraBase;
-          if (!propGroups.has(cssProp)) propGroups.set(cssProp, []);
-          propGroups.get(cssProp).push({ className: extraName, isVariable: false });
+          pushEntry(cssProp, { className: extraName, isVariable: false, isConditional });
         }
       }
     } else {
@@ -912,8 +926,7 @@ function buildStyleHashProperties(segments, mapping, maybeIncHelperName) {
       for (const [cssProp, val] of Object.entries(seg.defs)) {
         const baseName = computeStaticBaseName(seg, cssProp, String(val), isMultiProp, mapping);
         const className = prefix ? `${prefix}${baseName}` : baseName;
-        if (!propGroups.has(cssProp)) propGroups.set(cssProp, []);
-        propGroups.get(cssProp).push({ className, isVariable: false });
+        pushEntry(cssProp, { className, isVariable: false, isConditional });
       }
     }
   }
@@ -1950,11 +1963,13 @@ function buildStyleHashFromChain(chain, options) {
     } else {
       const thenMembers = mergeConditionalBranchMembers(
         buildStyleHashMembers(part.thenSegments, options),
-        previousProperties
+        previousProperties,
+        collectConditionalOnlyProps(part.thenSegments)
       );
       const elseMembers = mergeConditionalBranchMembers(
         buildStyleHashMembers(part.elseSegments, options),
-        previousProperties
+        previousProperties,
+        collectConditionalOnlyProps(part.elseSegments)
       );
       members.push(
         t3.spreadElement(
@@ -1999,13 +2014,31 @@ function buildStyleHashMembers(segments, options) {
   flushNormal();
   return members;
 }
-function mergeConditionalBranchMembers(members, previousProperties) {
+function collectConditionalOnlyProps(segments) {
+  const allProps = /* @__PURE__ */ new Map();
+  for (const seg of segments) {
+    if (seg.error || seg.styleArrayArg || seg.typographyLookup) continue;
+    const hasCondition = !!(seg.pseudoClass || seg.mediaQuery || seg.pseudoElement || seg.whenPseudo);
+    const props = seg.variableProps ?? Object.keys(seg.defs);
+    for (const prop of props) {
+      const current = allProps.get(prop);
+      allProps.set(prop, current === void 0 ? hasCondition : current && hasCondition);
+    }
+  }
+  const result = /* @__PURE__ */ new Set();
+  for (const [prop, isConditionalOnly] of allProps) {
+    if (isConditionalOnly) result.add(prop);
+  }
+  return result;
+}
+function mergeConditionalBranchMembers(members, previousProperties, conditionalOnlyProps) {
   return members.map(function(member) {
     if (!t3.isObjectProperty(member)) {
       return member;
     }
-    const prior = previousProperties.get(propertyName(member.key));
-    if (!prior) {
+    const prop = propertyName(member.key);
+    const prior = previousProperties.get(prop);
+    if (!prior || !conditionalOnlyProps.has(prop)) {
       return member;
     }
     return t3.objectProperty(