@homebound/truss 2.1.0 → 2.1.2

package/build/plugin/index.js

@@ -884,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,
@@ -905,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 {
@@ -914,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 });
       }
     }
   }