@homebound/truss 2.28.0 → 2.29.0

package/build/plugin/index.js

@@ -1928,13 +1928,29 @@ function resolveFullChain(ctx, chain) {
       if (elseIndex !== -1) {
         flushCurrentNodes();
         const branchContext = cloneConditionContext(currentContext);
+        let branchEnd = filteredChain.length;
+        for (let branchIndex = elseIndex + 1; branchIndex < filteredChain.length; branchIndex++) {
+          const branchNode = filteredChain[branchIndex];
+          if (branchNode.type === "getter" && branchNode.name === "end") {
+            branchEnd = branchIndex;
+            break;
+          }
+        }
         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 elseNodes = [
+          makeMediaQueryNode(mediaStart.inverseMediaQuery),
+          ...filteredChain.slice(elseIndex + 1, branchEnd)
+        ];
         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;
+        if (branchEnd === filteredChain.length) {
+          i = filteredChain.length;
+          break;
+        }
+        resetConditionContext(currentContext);
+        i = branchEnd + 1;
+        continue;
       }
     }
     if (isWhenObjectCall(node)) {
@@ -1960,18 +1976,24 @@ function resolveFullChain(ctx, chain) {
       i++;
       let inElse = false;
       while (i < filteredChain.length) {
-        if (filteredChain[i].type === "else") {
+        const branchNode = filteredChain[i];
+        if (branchNode.type === "getter" && branchNode.name === "end") {
+          resetConditionContext(currentContext);
+          i++;
+          break;
+        }
+        if (branchNode.type === "else") {
           inElse = true;
           i++;
           continue;
         }
-        if (filteredChain[i].type === "if") {
+        if (branchNode.type === "if") {
           break;
         }
         if (inElse) {
-          elseNodes.push(filteredChain[i]);
+          elseNodes.push(branchNode);
         } else {
-          thenNodes.push(filteredChain[i]);
+          thenNodes.push(branchNode);
         }
         i++;
       }
@@ -2109,10 +2131,14 @@ function getMediaConditionalStartNode(node, mapping) {
 }
 function findElseIndex(chain, start) {
   for (let i = start; i < chain.length; i++) {
-    if (chain[i].type === "if") {
+    const node = chain[i];
+    if (node.type === "if") {
+      return -1;
+    }
+    if (node.type === "getter" && node.name === "end") {
       return -1;
     }
-    if (chain[i].type === "else") {
+    if (node.type === "else") {
       return i;
     }
   }