@homebound/truss 2.19.1 → 2.19.3

package/build/plugin/index.js

@@ -1749,7 +1749,9 @@ function applyModifierNodeToConditionContext(context, node, mapping) {
     context.pseudoClass = pseudoSelector(node.name);
   }
 }
-function resolveFullChain(chain, mapping, cssBindingName, initialContext = emptyConditionContext()) {
+function resolveFullChain(ctx, chain) {
+  const { mapping } = ctx;
+  const initialContext = ctx.initialContext ?? emptyConditionContext();
   const parts = [];
   const markers = [];
   const nestedErrors = [];
@@ -1779,7 +1781,7 @@ function resolveFullChain(chain, mapping, cssBindingName, initialContext = empty
     }
     parts.push({
       type: "unconditional",
-      segments: resolveChain(currentNodes, mapping, currentNodesStartContext, cssBindingName)
+      segments: resolveChain({ ...ctx, initialContext: currentNodesStartContext }, currentNodes)
     });
     currentNodes = [];
     currentNodesStartContext = cloneConditionContext(currentContext);
@@ -1801,8 +1803,8 @@ function resolveFullChain(chain, mapping, cssBindingName, initialContext = empty
         const branchContext = cloneConditionContext(currentContext);
         const thenNodes = mediaStart.thenNodes ? [...mediaStart.thenNodes, ...filteredChain.slice(i + 1, elseIndex)] : filteredChain.slice(i, elseIndex);
         const elseNodes = [makeMediaQueryNode(mediaStart.inverseMediaQuery), ...filteredChain.slice(elseIndex + 1)];
-        const thenSegs = resolveChain(thenNodes, mapping, branchContext, cssBindingName);
-        const elseSegs = resolveChain(elseNodes, mapping, branchContext, cssBindingName);
+        const thenSegs = resolveChain({ ...ctx, initialContext: branchContext }, thenNodes);
+        const elseSegs = resolveChain({ ...ctx, initialContext: branchContext }, elseNodes);
         parts.push({ type: "unconditional", segments: [...thenSegs, ...elseSegs] });
         i = filteredChain.length;
         break;
@@ -1810,7 +1812,7 @@ function resolveFullChain(chain, mapping, cssBindingName, initialContext = empty
     }
     if (isWhenObjectCall(node)) {
       flushCurrentNodes();
-      const resolved = resolveWhenObjectSelectors(node, mapping, cssBindingName, currentContext);
+      const resolved = resolveWhenObjectSelectors(ctx, node, currentContext);
       parts.push(...resolved.parts);
       markers.push(...resolved.markers);
       nestedErrors.push(...resolved.errors);
@@ -1846,8 +1848,8 @@ function resolveFullChain(chain, mapping, cssBindingName, initialContext = empty
         }
         i++;
       }
-      const thenSegs = resolveChain(thenNodes, mapping, branchContext, cssBindingName);
-      const elseSegs = resolveChain(elseNodes, mapping, branchContext, cssBindingName);
+      const thenSegs = resolveChain({ ...ctx, initialContext: branchContext }, thenNodes);
+      const elseSegs = resolveChain({ ...ctx, initialContext: branchContext }, elseNodes);
       parts.push({
         type: "conditional",
         conditionNode: node.conditionNode,
@@ -1874,7 +1876,8 @@ function resolveFullChain(chain, mapping, cssBindingName, initialContext = empty
 function isWhenObjectCall(node) {
   return node.type === "call" && node.name === "when" && node.args.length === 1 && node.args[0].type === "ObjectExpression";
 }
-function resolveWhenObjectSelectors(node, mapping, cssBindingName, initialContext) {
+function resolveWhenObjectSelectors(ctx, node, initialContext) {
+  const { cssBindingName } = ctx;
   if (!cssBindingName) {
     return {
       parts: [],
@@ -1901,16 +1904,13 @@ function resolveWhenObjectSelectors(node, mapping, cssBindingName, initialContex
         throw new UnsupportedPatternError(`when({ ... }) selector keys must be string literals`);
       }
       const value = unwrapExpression(property.value);
-      if (value.type !== "MemberExpression" || value.computed || value.property.type !== "Identifier" || value.property.name !== "$") {
-        throw new UnsupportedPatternError(`when({ ... }) values must be Css.*.$ expressions`);
-      }
-      const innerChain = extractChain(value.object, cssBindingName);
+      const innerChain = resolveWhenObjectValueChain(ctx, value);
       if (!innerChain) {
         throw new UnsupportedPatternError(`when({ ... }) values must be Css.*.$ expressions`);
       }
       const selectorContext = cloneConditionContext(initialContext);
       selectorContext.pseudoClass = property.key.value;
-      const resolved = resolveFullChain(innerChain, mapping, cssBindingName, selectorContext);
+      const resolved = resolveFullChain({ ...ctx, initialContext: selectorContext }, innerChain);
       parts.push(...resolved.parts);
       markers.push(...resolved.markers);
       errors.push(...resolved.errors);
@@ -1924,6 +1924,13 @@ function resolveWhenObjectSelectors(node, mapping, cssBindingName, initialContex
   }
   return { parts, markers, errors: [...new Set(errors)] };
 }
+function resolveWhenObjectValueChain(ctx, value) {
+  const { cssBindingName, resolveCssChainReference: resolveCssChainReference2 } = ctx;
+  if (cssBindingName && value.type === "MemberExpression" && !value.computed && value.property.type === "Identifier" && value.property.name === "$") {
+    return extractChain(value.object, cssBindingName);
+  }
+  return resolveCssChainReference2?.(value) ?? null;
+}
 function flattenWhenObjectParts(resolved) {
   const segments = [];
   for (const part of resolved.parts) {
@@ -1984,7 +1991,9 @@ function invertMediaQuery(query) {
   }
   return query.replace("@media", "@media not");
 }
-function resolveChain(chain, mapping, initialContext = emptyConditionContext(), cssBindingName) {
+function resolveChain(ctx, chain) {
+  const { mapping, cssBindingName } = ctx;
+  const initialContext = ctx.initialContext ?? emptyConditionContext();
   const segments = [];
   const context = cloneConditionContext(initialContext);
   for (const node of chain) {
@@ -2084,7 +2093,7 @@ function resolveChain(chain, mapping, initialContext = emptyConditionContext(),
         }
         if (abbr === "when") {
           if (isWhenObjectCall(node)) {
-            const resolved2 = resolveWhenObjectSelectors(node, mapping, cssBindingName, context);
+            const resolved2 = resolveWhenObjectSelectors(ctx, node, context);
             segments.push(...flattenWhenObjectParts(resolved2));
             continue;
           }
@@ -3098,7 +3107,8 @@ function transformTruss(code, filename, mapping, options = {}) {
       if (parentPath && parentPath.isMemberExpression() && t4.isIdentifier(parentPath.node.property, { name: "$" })) {
         return;
       }
-      const resolvedChain = resolveFullChain(chain, mapping, cssBindingName);
+      const resolveCssChainReference2 = buildCssChainReferenceResolver(path, cssBindingName);
+      const resolvedChain = resolveFullChain({ mapping, cssBindingName, resolveCssChainReference: resolveCssChainReference2 }, chain);
       sites.push({ path, resolvedChain });
       const line = path.node.loc?.start.line ?? null;
       for (const err of resolvedChain.errors) {
@@ -3255,6 +3265,40 @@ function isInsideWhenObjectValue(path, cssBindingName) {
   }
   return false;
 }
+function buildCssChainReferenceResolver(path, cssBindingName) {
+  return (node) => {
+    return resolveCssChainReference(path, node, cssBindingName, /* @__PURE__ */ new Set());
+  };
+}
+function resolveCssChainReference(path, node, cssBindingName, seen2) {
+  const value = unwrapReferenceExpression(node);
+  if (t4.isMemberExpression(value) && !value.computed && t4.isIdentifier(value.property, { name: "$" })) {
+    return extractChain(value.object, cssBindingName);
+  }
+  if (!t4.isIdentifier(value) || seen2.has(value.name)) {
+    return null;
+  }
+  const binding = path.scope.getBinding(value.name);
+  if (!binding?.constant || !binding.path.isVariableDeclarator()) {
+    return null;
+  }
+  const init = binding.path.node.init;
+  if (!init || !t4.isExpression(init)) {
+    return null;
+  }
+  seen2.add(value.name);
+  return resolveCssChainReference(binding.path, init, cssBindingName, seen2);
+}
+function unwrapReferenceExpression(node) {
+  let current = node;
+  while (true) {
+    if (t4.isParenthesizedExpression(current) || t4.isTSAsExpression(current) || t4.isTSTypeAssertion(current) || t4.isTSNonNullExpression(current) || t4.isTSSatisfiesExpression(current)) {
+      current = current.expression;
+      continue;
+    }
+    return current;
+  }
+}
 function collectRuntimeLookups(chains) {
   const lookups = /* @__PURE__ */ new Map();
   for (const chain of chains) {
@@ -3461,8 +3505,11 @@ function resolveCssExpression(node, cssBindingName, mapping, filename) {
   for (const n of chain) {
     if (n.type === "if") return { error: "if() conditionals are not supported in .css.ts files" };
     if (n.type === "else") return { error: "else is not supported in .css.ts files" };
+    if (n.type === "call" && n.name === "when") {
+      return { error: "when() modifiers are not supported in .css.ts files" };
+    }
   }
-  const resolved = resolveFullChain(chain, mapping, cssBindingName);
+  const resolved = resolveFullChain({ mapping, cssBindingName }, chain);
   if (resolved.errors.length > 0) {
     return { error: resolved.errors[0] };
   }