@homebound/truss 2.1.2 → 2.2.0

package/build/plugin/index.js

@@ -501,9 +501,9 @@ var PSEUDO_CLASS_PRIORITIES = {
   ":past": 126,
   ":future": 127,
   ":hover": 130,
-  ":focusWithin": 140,
+  ":focus-within": 140,
   ":focus": 150,
-  ":focusVisible": 160,
+  ":focus-visible": 160,
   ":active": 170
 };
 var AT_RULE_PRIORITIES = {
@@ -520,7 +520,9 @@ function getPropertyPriority(property) {
   return 3e3;
 }
 function getPseudoClassPriority(pseudo) {
-  const base = pseudo.split("(")[0];
+  const base = pseudo.split("(")[0].replace(/[A-Z]/g, function(match) {
+    return `-${match.toLowerCase()}`;
+  });
   return PSEUDO_CLASS_PRIORITIES[base] ?? 40;
 }
 function getAtRulePriority(atRule) {
@@ -581,6 +583,7 @@ var PSEUDO_SUFFIX = {
   ":hover": "_h",
   ":focus": "_f",
   ":focus-visible": "_fv",
+  ":focus-within": "_fw",
   ":active": "_a",
   ":disabled": "_d"
 };
@@ -1195,7 +1198,7 @@ function resolveChain(chain, mapping) {
           currentWhenPseudo = null;
           continue;
         }
-        if (abbr === "add") {
+        if (abbr === "add" || abbr === "addCss") {
           const seg = resolveAddCall(
             node,
             mapping,
@@ -1450,6 +1453,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") {
@@ -1468,7 +1489,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];
@@ -1555,6 +1576,7 @@ var PSEUDO_METHODS = {
   onHover: ":hover",
   onFocus: ":focus",
   onFocusVisible: ":focus-visible",
+  onFocusWithin: ":focus-within",
   onActive: ":active",
   onDisabled: ":disabled"
 };
@@ -1993,7 +2015,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) {
@@ -2014,6 +2040,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) {