@homebound/truss 2.2.0 → 2.2.2

package/build/plugin/index.js

@@ -688,17 +688,28 @@ function computeStaticBaseName(seg, cssProp, cssValue, isMultiProp, mapping) {
 function collectAtomicRules(chains, mapping) {
   const rules = /* @__PURE__ */ new Map();
   let needsMaybeInc = false;
+  function collectSegment(seg) {
+    if (seg.error || seg.styleArrayArg) return;
+    if (seg.typographyLookup) {
+      for (const segments of Object.values(seg.typographyLookup.segmentsByName)) {
+        for (const nestedSeg of segments) {
+          collectSegment(nestedSeg);
+        }
+      }
+      return;
+    }
+    if (seg.incremented) needsMaybeInc = true;
+    if (seg.variableProps) {
+      collectVariableRules(rules, seg, mapping);
+    } else {
+      collectStaticRules(rules, seg, mapping);
+    }
+  }
   for (const chain of chains) {
     for (const part of chain.parts) {
       const segs = part.type === "unconditional" ? part.segments : [...part.thenSegments, ...part.elseSegments];
       for (const seg of segs) {
-        if (seg.error || seg.styleArrayArg || seg.typographyLookup) continue;
-        if (seg.incremented) needsMaybeInc = true;
-        if (seg.variableProps) {
-          collectVariableRules(rules, seg, mapping);
-        } else {
-          collectStaticRules(rules, seg, mapping);
-        }
+        collectSegment(seg);
       }
     }
   }
@@ -801,10 +812,7 @@ function generateCssText(rules) {
   for (const rule of allRules) {
     for (const declaration of getRuleDeclarations(rule)) {
       if (declaration.cssVarName) {
-        lines.push(`@property ${declaration.cssVarName} {
-  syntax: "*";
-  inherits: false;
-}`);
+        lines.push(`@property ${declaration.cssVarName} { syntax: "*"; inherits: false; }`);
       }
     }
   }
@@ -869,21 +877,15 @@ function getRuleDeclarations(rule) {
 }
 function formatRuleBlock(selector, rule) {
   const body = getRuleDeclarations(rule).map(function(declaration) {
-    return `  ${declaration.cssProperty}: ${declaration.cssValue};`;
-  }).join("\n");
-  return `${selector} {
-${body}
-}`;
+    return `${declaration.cssProperty}: ${declaration.cssValue};`;
+  }).join(" ");
+  return `${selector} { ${body} }`;
 }
 function formatNestedRuleBlock(wrapper, selector, rule) {
   const body = getRuleDeclarations(rule).map(function(declaration) {
-    return `    ${declaration.cssProperty}: ${declaration.cssValue};`;
-  }).join("\n");
-  return `${wrapper} {
-  ${selector} {
-${body}
-  }
-}`;
+    return `${declaration.cssProperty}: ${declaration.cssValue};`;
+  }).join(" ");
+  return `${wrapper} { ${selector} { ${body} } }`;
 }
 function buildStyleHashProperties(segments, mapping, maybeIncHelperName) {
   const propGroups = /* @__PURE__ */ new Map();