@homebound/truss 2.1.3 → 2.2.1

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);
       }
     }
   }
@@ -1198,7 +1209,7 @@ function resolveChain(chain, mapping) {
           currentWhenPseudo = null;
           continue;
         }
-        if (abbr === "add") {
+        if (abbr === "add" || abbr === "addCss") {
           const seg = resolveAddCall(
             node,
             mapping,
@@ -1453,6 +1464,24 @@ function buildParameterizedSegment(params) {
   return base;
 }
 function resolveAddCall(node, mapping, mediaQuery, pseudoClass, pseudoElement, whenPseudo) {
+  const isAddCss = node.name === "addCss";
+  if (isAddCss) {
+    if (node.args.length !== 1) {
+      throw new UnsupportedPatternError(
+        `addCss() requires exactly 1 argument (an existing CssProp/style hash expression)`
+      );
+    }
+    const styleArg = node.args[0];
+    if (styleArg.type === "SpreadElement") {
+      throw new UnsupportedPatternError(`addCss() does not support spread arguments`);
+    }
+    return {
+      abbr: "__composed_css_prop",
+      defs: {},
+      styleArrayArg: styleArg,
+      isAddCss: true
+    };
+  }
   if (node.args.length === 1) {
     const styleArg = node.args[0];
     if (styleArg.type === "SpreadElement") {
@@ -1471,7 +1500,7 @@ function resolveAddCall(node, mapping, mediaQuery, pseudoClass, pseudoElement, w
   }
   if (node.args.length !== 2) {
     throw new UnsupportedPatternError(
-      `add() requires exactly 2 arguments (property name and value), got ${node.args.length}. Supported overloads are add(cssProp) and add("propName", value)`
+      `add() requires exactly 2 arguments (property name and value), got ${node.args.length}. Supported overloads are add(cssProp), addCss(cssProp), and add("propName", value)`
     );
   }
   const propArg = node.args[0];
@@ -1997,7 +2026,11 @@ function buildStyleHashMembers(segments, options) {
     if (seg.error) continue;
     if (seg.styleArrayArg) {
       flushNormal();
-      members.push(t3.spreadElement(seg.styleArrayArg));
+      if (seg.isAddCss && t3.isObjectExpression(seg.styleArrayArg)) {
+        members.push(...buildAddCssObjectMembers(seg.styleArrayArg));
+      } else {
+        members.push(t3.spreadElement(seg.styleArrayArg));
+      }
       continue;
     }
     if (seg.typographyLookup) {
@@ -2018,6 +2051,34 @@ function buildStyleHashMembers(segments, options) {
   flushNormal();
   return members;
 }
+function buildAddCssObjectMembers(styleObject) {
+  const members = [];
+  for (const property of styleObject.properties) {
+    if (t3.isSpreadElement(property)) {
+      members.push(t3.spreadElement(t3.cloneNode(property.argument, true)));
+      continue;
+    }
+    if (!t3.isObjectProperty(property) || property.computed) {
+      members.push(t3.spreadElement(t3.objectExpression([t3.cloneNode(property, true)])));
+      continue;
+    }
+    const value = property.value;
+    if (t3.isIdentifier(value) || t3.isMemberExpression(value) || t3.isOptionalMemberExpression(value)) {
+      members.push(
+        t3.spreadElement(
+          t3.conditionalExpression(
+            t3.binaryExpression("===", t3.cloneNode(value, true), t3.identifier("undefined")),
+            t3.objectExpression([]),
+            t3.objectExpression([t3.objectProperty(clonePropertyKey(property.key), t3.cloneNode(value, true))])
+          )
+        )
+      );
+      continue;
+    }
+    members.push(t3.spreadElement(t3.objectExpression([t3.cloneNode(property, true)])));
+  }
+  return members;
+}
 function collectConditionalOnlyProps(segments) {
   const allProps = /* @__PURE__ */ new Map();
   for (const seg of segments) {