@homebound/truss 2.19.2 → 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(), resolveCssChainReference2) {
+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, resolveCssChainReference2)
+      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, resolveCssChainReference2);
-        const elseSegs = resolveChain(elseNodes, mapping, branchContext, cssBindingName, resolveCssChainReference2);
+        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,13 +1812,7 @@ function resolveFullChain(chain, mapping, cssBindingName, initialContext = empty
     }
     if (isWhenObjectCall(node)) {
       flushCurrentNodes();
-      const resolved = resolveWhenObjectSelectors(
-        node,
-        mapping,
-        cssBindingName,
-        currentContext,
-        resolveCssChainReference2
-      );
+      const resolved = resolveWhenObjectSelectors(ctx, node, currentContext);
       parts.push(...resolved.parts);
       markers.push(...resolved.markers);
       nestedErrors.push(...resolved.errors);
@@ -1852,8 +1848,8 @@ function resolveFullChain(chain, mapping, cssBindingName, initialContext = empty
         }
         i++;
       }
-      const thenSegs = resolveChain(thenNodes, mapping, branchContext, cssBindingName, resolveCssChainReference2);
-      const elseSegs = resolveChain(elseNodes, mapping, branchContext, cssBindingName, resolveCssChainReference2);
+      const thenSegs = resolveChain({ ...ctx, initialContext: branchContext }, thenNodes);
+      const elseSegs = resolveChain({ ...ctx, initialContext: branchContext }, elseNodes);
       parts.push({
         type: "conditional",
         conditionNode: node.conditionNode,
@@ -1880,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, resolveCssChainReference2) {
+function resolveWhenObjectSelectors(ctx, node, initialContext) {
+  const { cssBindingName } = ctx;
   if (!cssBindingName) {
     return {
       parts: [],
@@ -1907,13 +1904,13 @@ function resolveWhenObjectSelectors(node, mapping, cssBindingName, initialContex
         throw new UnsupportedPatternError(`when({ ... }) selector keys must be string literals`);
       }
       const value = unwrapExpression(property.value);
-      const innerChain = resolveWhenObjectValueChain(value, cssBindingName, resolveCssChainReference2);
+      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, resolveCssChainReference2);
+      const resolved = resolveFullChain({ ...ctx, initialContext: selectorContext }, innerChain);
       parts.push(...resolved.parts);
       markers.push(...resolved.markers);
       errors.push(...resolved.errors);
@@ -1927,7 +1924,8 @@ function resolveWhenObjectSelectors(node, mapping, cssBindingName, initialContex
   }
   return { parts, markers, errors: [...new Set(errors)] };
 }
-function resolveWhenObjectValueChain(value, cssBindingName, resolveCssChainReference2) {
+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);
   }
@@ -1993,7 +1991,9 @@ function invertMediaQuery(query) {
   }
   return query.replace("@media", "@media not");
 }
-function resolveChain(chain, mapping, initialContext = emptyConditionContext(), cssBindingName, resolveCssChainReference2) {
+function resolveChain(ctx, chain) {
+  const { mapping, cssBindingName } = ctx;
+  const initialContext = ctx.initialContext ?? emptyConditionContext();
   const segments = [];
   const context = cloneConditionContext(initialContext);
   for (const node of chain) {
@@ -2093,13 +2093,7 @@ function resolveChain(chain, mapping, initialContext = emptyConditionContext(),
         }
         if (abbr === "when") {
           if (isWhenObjectCall(node)) {
-            const resolved2 = resolveWhenObjectSelectors(
-              node,
-              mapping,
-              cssBindingName,
-              context,
-              resolveCssChainReference2
-            );
+            const resolved2 = resolveWhenObjectSelectors(ctx, node, context);
             segments.push(...flattenWhenObjectParts(resolved2));
             continue;
           }
@@ -3114,7 +3108,7 @@ function transformTruss(code, filename, mapping, options = {}) {
         return;
       }
       const resolveCssChainReference2 = buildCssChainReferenceResolver(path, cssBindingName);
-      const resolvedChain = resolveFullChain(chain, mapping, cssBindingName, void 0, resolveCssChainReference2);
+      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) {
@@ -3515,7 +3509,7 @@ function resolveCssExpression(node, cssBindingName, mapping, filename) {
       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] };
   }