@homebound/truss 2.2.1 → 2.3.0

package/build/plugin/index.js

@@ -520,7 +520,8 @@ function getPropertyPriority(property) {
   return 3e3;
 }
 function getPseudoClassPriority(pseudo) {
-  const base = pseudo.split("(")[0].replace(/[A-Z]/g, function(match) {
+  const leadingPseudo = pseudo.trim().match(/^::?[a-zA-Z-]+/)?.[0] ?? pseudo.split("(")[0];
+  const base = leadingPseudo.replace(/[A-Z]/g, function(match) {
     return `-${match.toLowerCase()}`;
   });
   return PSEUDO_CLASS_PRIORITIES[base] ?? 40;
@@ -587,6 +588,13 @@ var PSEUDO_SUFFIX = {
   ":active": "_a",
   ":disabled": "_d"
 };
+var PSEUDO_SELECTOR_SUFFIX = {
+  ...PSEUDO_SUFFIX,
+  ":not": "_n",
+  ":is": "_is",
+  ":where": "_where",
+  ":has": "_has"
+};
 var RELATIONSHIP_SHORT = {
   ancestor: "anc",
   descendant: "desc",
@@ -604,10 +612,33 @@ function markerClassName(markerNode) {
 }
 function whenPrefix(whenPseudo) {
   const rel = RELATIONSHIP_SHORT[whenPseudo.relationship ?? "ancestor"] ?? "anc";
-  const pseudoTag = PSEUDO_SUFFIX[whenPseudo.pseudo]?.replace(/^_/, "") ?? whenPseudo.pseudo.replace(/^:/, "");
+  const pseudoTag = pseudoSelectorTag(whenPseudo.pseudo);
   const markerPart = whenPseudo.markerNode?.type === "Identifier" ? `${whenPseudo.markerNode.name}_` : "";
   return `wh_${rel}_${pseudoTag}_${markerPart}`;
 }
+function pseudoSelectorTag(pseudo) {
+  const replaced = pseudo.trim().replace(/::?[a-zA-Z-]+/g, function(match) {
+    return `_${pseudoIdentifierTag(match)}_`;
+  });
+  const cleaned = replaced.replace(/[^a-zA-Z0-9]/g, "_").replace(/_+/g, "_").replace(/^_|_$/g, "");
+  return cleaned || "pseudo";
+}
+function pseudoIdentifierTag(pseudo) {
+  const normalized = normalizePseudoIdentifier(pseudo);
+  const known = PSEUDO_SELECTOR_SUFFIX[normalized];
+  if (known) {
+    return known.replace(/^_/, "");
+  }
+  return normalized.replace(/^::?/, "").replace(/-/g, "_");
+}
+function normalizePseudoIdentifier(pseudo) {
+  const prefixMatch = pseudo.match(/^::?/);
+  const prefix = prefixMatch?.[0] ?? "";
+  const name = pseudo.slice(prefix.length).replace(/[A-Z]/g, function(match) {
+    return `-${match.toLowerCase()}`;
+  });
+  return `${prefix}${name}`;
+}
 function conditionPrefix(pseudoClass, mediaQuery, pseudoElement, breakpoints) {
   const parts = [];
   if (pseudoElement) {
@@ -625,9 +656,7 @@ function conditionPrefix(pseudoClass, mediaQuery, pseudoElement, breakpoints) {
     parts.push("mq_");
   }
   if (pseudoClass) {
-    const tag = PSEUDO_SUFFIX[pseudoClass];
-    if (tag) parts.push(`${tag.replace(/^_/, "")}_`);
-    else parts.push(`${pseudoClass.replace(/^:/, "")}_`);
+    parts.push(`${pseudoSelectorTag(pseudoClass)}_`);
   }
   return parts.join("");
 }
@@ -812,10 +841,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; }`);
       }
     }
   }
@@ -880,21 +906,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();
@@ -1243,9 +1263,14 @@ function resolveChain(chain, mapping) {
         }
         if (abbr === "when") {
           const resolved = resolveWhenCall(node);
-          currentPseudoClass = null;
-          currentMediaQuery = null;
-          currentWhenPseudo = resolved;
+          if (resolved.kind === "selector") {
+            currentPseudoClass = resolved.pseudo;
+            currentWhenPseudo = null;
+          } else {
+            currentPseudoClass = null;
+            currentMediaQuery = null;
+            currentWhenPseudo = resolved;
+          }
           continue;
         }
         if (isPseudoMethod(abbr)) {
@@ -1253,7 +1278,7 @@ function resolveChain(chain, mapping) {
           currentWhenPseudo = null;
           if (node.args.length > 0) {
             throw new UnsupportedPatternError(
-              `${abbr}() does not take arguments -- use when("ancestor", ":hover") for relationship pseudos`
+              `${abbr}() does not take arguments -- use when(marker, "ancestor", ":hover") for relationship selectors`
             );
           }
           continue;
@@ -1553,14 +1578,23 @@ function tryEvaluateAddLiteral(node) {
 }
 var WHEN_RELATIONSHIPS = /* @__PURE__ */ new Set(["ancestor", "descendant", "anySibling", "siblingBefore", "siblingAfter"]);
 function resolveWhenCall(node) {
-  if (node.args.length < 2 || node.args.length > 3) {
+  if (node.args.length !== 1 && node.args.length !== 3) {
     throw new UnsupportedPatternError(
-      `when() expects 2 or 3 arguments (relationship, [marker], pseudo), got ${node.args.length}`
+      `when() expects 1 or 3 arguments (selector) or (marker, relationship, pseudo), got ${node.args.length}`
     );
   }
-  const relationshipArg = node.args[0];
+  if (node.args.length === 1) {
+    const pseudoArg2 = node.args[0];
+    if (pseudoArg2.type !== "StringLiteral") {
+      throw new UnsupportedPatternError(`when() selector must be a string literal`);
+    }
+    return { kind: "selector", pseudo: pseudoArg2.value };
+  }
+  const markerArg = node.args[0];
+  const markerNode = resolveWhenMarker(markerArg);
+  const relationshipArg = node.args[1];
   if (relationshipArg.type !== "StringLiteral") {
-    throw new UnsupportedPatternError(`when() first argument must be a string literal relationship`);
+    throw new UnsupportedPatternError(`when() relationship argument must be a string literal`);
   }
   const relationship = relationshipArg.value;
   if (!WHEN_RELATIONSHIPS.has(relationship)) {
@@ -1568,20 +1602,29 @@ function resolveWhenCall(node) {
       `when() relationship must be one of: ${[...WHEN_RELATIONSHIPS].join(", ")} -- got "${relationship}"`
     );
   }
-  if (node.args.length === 2) {
-    const pseudoArg = node.args[1];
-    if (pseudoArg.type !== "StringLiteral") {
-      throw new UnsupportedPatternError(`when() pseudo selector must be a string literal`);
-    }
-    return { pseudo: pseudoArg.value, relationship };
-  } else {
-    const markerNode = node.args[1];
-    const pseudoArg = node.args[2];
-    if (pseudoArg.type !== "StringLiteral") {
-      throw new UnsupportedPatternError(`when() pseudo selector (3rd argument) must be a string literal`);
-    }
-    return { pseudo: pseudoArg.value, markerNode, relationship };
+  const pseudoArg = node.args[2];
+  if (pseudoArg.type !== "StringLiteral") {
+    throw new UnsupportedPatternError(`when() pseudo selector (3rd argument) must be a string literal`);
+  }
+  return { kind: "relationship", pseudo: pseudoArg.value, markerNode, relationship };
+}
+function resolveWhenMarker(node) {
+  if (isDefaultMarkerNode(node)) {
+    return void 0;
+  }
+  if (node.type === "Identifier") {
+    return node;
   }
+  throw new UnsupportedPatternError(`when() marker must be a marker variable or defaultMarker`);
+}
+function isDefaultMarkerNode(node) {
+  if (node.type === "Identifier" && node.name === "defaultMarker") {
+    return true;
+  }
+  return isLegacyDefaultMarkerExpression(node);
+}
+function isLegacyDefaultMarkerExpression(node) {
+  return node.type === "CallExpression" && node.arguments.length === 0 && node.callee.type === "MemberExpression" && !node.callee.computed && node.callee.property.type === "Identifier" && node.callee.property.name === "defaultMarker";
 }
 var PSEUDO_METHODS = {
   onHover: ":hover",