@danielx/civet 0.5.73 → 0.5.75

package/dist/main.mjs

@@ -597,6 +597,7 @@ ${input.slice(result.pos)}
       NestedElementList,
       NestedElement,
       ArrayElementDelimiter,
+      ElementListWithIndentedApplicationForbidden,
       ElementList,
       ElementListRest,
       ArrayElementExpression,
@@ -639,6 +640,7 @@ ${input.slice(result.pos)}
       StatementListItem,
       PostfixedStatement,
       PostfixedExpression,
+      NonPipelinePostfixedExpression,
       PostfixStatement,
       Statement,
       EmptyStatement,
@@ -662,6 +664,7 @@ ${input.slice(result.pos)}
       LoopStatement,
       LoopClause,
       DoWhileStatement,
+      DoStatement,
       WhileStatement,
       WhileClause,
       ForStatement,
@@ -1035,6 +1038,7 @@ ${input.slice(result.pos)}
       TrackIndented,
       Samedent,
       IndentedFurther,
+      NotDedented,
       PushIndent,
       PopIndent,
       Nested
@@ -1963,7 +1967,7 @@ ${input.slice(result.pos)}
       var rhs = $2;
       return [[], op, [], rhs];
     });
-    var BinaryOpRHS$1 = $S(__, BinaryOp, $C(_, $S(EOS, __)), RHS);
+    var BinaryOpRHS$1 = $S(NotDedented, BinaryOp, $C(_, $S(EOS, __)), RHS);
     function BinaryOpRHS(state) {
       let eventData;
       if (state.events) {
@@ -2445,7 +2449,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var FatArrowBody$0 = $T($S($N(EOS), PostfixedExpression, $N(SemicolonDelimiter)), function(value) {
+    var FatArrowBody$0 = $T($S($N(EOS), NonPipelinePostfixedExpression, $N(SemicolonDelimiter)), function(value) {
       var exp = value[1];
       return exp;
     });
@@ -2576,12 +2580,13 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var PipelineExpression$0 = $TS($S(PipelineHeadItem, $P($S(__, Pipe, __, PipelineTailItem))), function($skip, $loc, $0, $1, $2) {
-      var head = $1;
-      var body = $2;
+    var PipelineExpression$0 = $TS($S($E(_), PipelineHeadItem, $P($S(NotDedented, Pipe, __, PipelineTailItem))), function($skip, $loc, $0, $1, $2, $3) {
+      var ws = $1;
+      var head = $2;
+      var body = $3;
       return {
         type: "PipelineExpression",
-        children: [head, body]
+        children: [ws, head, body]
       };
     });
     function PipelineExpression(state) {
@@ -5477,9 +5482,13 @@ ${input.slice(result.pos)}
         };
       }
       const { ref } = rhs;
+      const children = [ref, " => ", prefix, rhs];
+      if (module.hasAwait(rhs)) {
+        children.unshift("async ");
+      }
       return {
         type: "ArrowFunction",
-        children: [ref, " => ", prefix, rhs],
+        children,
         ampersandBlock: true
       };
     });
@@ -6512,7 +6521,7 @@ ${input.slice(result.pos)}
     var ArrayLiteral$0 = $T($S(ArrayBindingPattern, UpcomingAssignment), function(value) {
       return value[0];
     });
-    var ArrayLiteral$1 = $TS($S(OpenBracket, AllowAll, $E($S(ArrayLiteralContent, __, CloseBracket)), RestoreIndentedApplication, RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var ArrayLiteral$1 = $TS($S(OpenBracket, AllowAll, $E($S(ArrayLiteralContent, __, CloseBracket)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
       var open = $1;
       if (!$3)
         return $skip;
@@ -6649,7 +6658,7 @@ ${input.slice(result.pos)}
     var ArrayLiteralContent$0 = RangeExpression;
     var ArrayLiteralContent$1 = $S(NestedImplicitObjectLiteral, $Q($S(__, Comma, NestedImplicitObjectLiteral)));
     var ArrayLiteralContent$2 = NestedElementList;
-    var ArrayLiteralContent$3 = $TS($S(ElementList, InsertComma, $E(NestedElementList)), function($skip, $loc, $0, $1, $2, $3) {
+    var ArrayLiteralContent$3 = $TS($S(ElementListWithIndentedApplicationForbidden, InsertComma, $E(NestedElementList)), function($skip, $loc, $0, $1, $2, $3) {
       var list = $1;
       var comma = $2;
       var nested = $3;
@@ -6778,6 +6787,33 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var ElementListWithIndentedApplicationForbidden$0 = $TS($S(ForbidIndentedApplication, $E(ElementList), RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3) {
+      if ($2)
+        return $2;
+      return $skip;
+    });
+    function ElementListWithIndentedApplicationForbidden(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("ElementListWithIndentedApplicationForbidden", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("ElementListWithIndentedApplicationForbidden", state, ElementListWithIndentedApplicationForbidden$0(state));
+        if (state.events)
+          state.events.exit?.("ElementListWithIndentedApplicationForbidden", state, result, eventData);
+        return result;
+      } else {
+        const result = ElementListWithIndentedApplicationForbidden$0(state);
+        if (state.events)
+          state.events.exit?.("ElementListWithIndentedApplicationForbidden", state, result, eventData);
+        return result;
+      }
+    }
     var ElementList$0 = $TS($S(ArrayElementExpression, $Q(ElementListRest)), function($skip, $loc, $0, $1, $2) {
       var first = $1;
       var rest = $2;
@@ -8362,6 +8398,35 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var NonPipelinePostfixedExpression$0 = $TS($S(NonPipelineExtendedExpression, $E($S($Q(TrailingComment), PostfixStatement))), function($skip, $loc, $0, $1, $2) {
+      var expression = $1;
+      var post = $2;
+      if (post)
+        return module.attachPostfixStatementAsExpression(expression, post);
+      return expression;
+    });
+    function NonPipelinePostfixedExpression(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("NonPipelinePostfixedExpression", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("NonPipelinePostfixedExpression", state, NonPipelinePostfixedExpression$0(state));
+        if (state.events)
+          state.events.exit?.("NonPipelinePostfixedExpression", state, result, eventData);
+        return result;
+      } else {
+        const result = NonPipelinePostfixedExpression$0(state);
+        if (state.events)
+          state.events.exit?.("NonPipelinePostfixedExpression", state, result, eventData);
+        return result;
+      }
+    }
     var PostfixStatement$0 = ForClause;
     var PostfixStatement$1 = IfClause;
     var PostfixStatement$2 = LoopClause;
@@ -8898,8 +8963,11 @@ ${input.slice(result.pos)}
     var IterationStatement$1 = $T($S($N(CoffeeDoEnabled), DoWhileStatement), function(value) {
       return value[1];
     });
-    var IterationStatement$2 = WhileStatement;
-    var IterationStatement$3 = ForStatement;
+    var IterationStatement$2 = $T($S($N(CoffeeDoEnabled), DoStatement), function(value) {
+      return value[1];
+    });
+    var IterationStatement$3 = WhileStatement;
+    var IterationStatement$4 = ForStatement;
     function IterationStatement(state) {
       let eventData;
       if (state.events) {
@@ -8911,12 +8979,12 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("IterationStatement", state, IterationStatement$0(state) || IterationStatement$1(state) || IterationStatement$2(state) || IterationStatement$3(state));
+        const result = $TOKEN("IterationStatement", state, IterationStatement$0(state) || IterationStatement$1(state) || IterationStatement$2(state) || IterationStatement$3(state) || IterationStatement$4(state));
         if (state.events)
           state.events.exit?.("IterationStatement", state, result, eventData);
         return result;
       } else {
-        const result = IterationStatement$0(state) || IterationStatement$1(state) || IterationStatement$2(state) || IterationStatement$3(state);
+        const result = IterationStatement$0(state) || IterationStatement$1(state) || IterationStatement$2(state) || IterationStatement$3(state) || IterationStatement$4(state);
         if (state.events)
           state.events.exit?.("IterationStatement", state, result, eventData);
         return result;
@@ -8925,6 +8993,7 @@ ${input.slice(result.pos)}
     var IterationExpression$0 = $TS($S(IterationStatement), function($skip, $loc, $0, $1) {
       return {
         type: "IterationExpression",
+        subtype: $1.type,
         children: [$1],
         block: $1.block
       };
@@ -9033,6 +9102,37 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var DoStatement$0 = $TS($S(Do, NoPostfixBracedBlock), function($skip, $loc, $0, $1, $2) {
+      var block = $2;
+      block = module.insertTrimmingSpace(block, "");
+      return {
+        type: "DoStatement",
+        children: [block],
+        block
+      };
+    });
+    function DoStatement(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("DoStatement", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("DoStatement", state, DoStatement$0(state));
+        if (state.events)
+          state.events.exit?.("DoStatement", state, result, eventData);
+        return result;
+      } else {
+        const result = DoStatement$0(state);
+        if (state.events)
+          state.events.exit?.("DoStatement", state, result, eventData);
+        return result;
+      }
+    }
     var WhileStatement$0 = $TS($S(WhileClause, Block), function($skip, $loc, $0, $1, $2) {
       var clause = $1;
       var block = $2;
@@ -9206,7 +9306,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var WhenCondition$0 = $T($S(__, When, ExtendedExpression), function(value) {
+    var WhenCondition$0 = $T($S(__, When, ExpressionWithIndentedApplicationForbidden), function(value) {
       var exp = value[2];
       return exp;
     });
@@ -9232,7 +9332,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeForStatementParameters$0 = $TS($S($E($S(Await, __)), InsertOpenParen, CoffeeForDeclaration, $E(CoffeeForIndex), __, $C(In, Of, From), ExtendedExpression, $E($S(__, By, ExtendedExpression)), InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+    var CoffeeForStatementParameters$0 = $TS($S($E($S(Await, __)), InsertOpenParen, CoffeeForDeclaration, $E(CoffeeForIndex), __, $C(In, Of, From), ExpressionWithIndentedApplicationForbidden, $E($S(__, By, ExpressionWithIndentedApplicationForbidden)), InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
       var open = $2;
       var declaration = $3;
       var index = $4;
@@ -9719,7 +9819,7 @@ ${input.slice(result.pos)}
       var e = $0;
       return {
         type: "SwitchExpression",
-        children: ["(()=>{", e.children, "})()"],
+        children: module.wrapIIFE(e.children),
         expression: e.expression,
         caseBlock: e.caseBlock
       };
@@ -9974,13 +10074,31 @@ ${input.slice(result.pos)}
       var c = $3;
       var f = $4;
       if (!c && !f) {
+        const e = [];
+        const emptyCatchBlock = {
+          type: "BlockStatement",
+          expressions: e,
+          children: ["{", e, "}"],
+          bare: false,
+          empty: true
+        };
+        c = {
+          type: "CatchClause",
+          children: [" catch(e) ", emptyCatchBlock],
+          block: emptyCatchBlock
+        };
         return {
           type: "TryStatement",
-          children: [t, b, " catch(e) {}"]
+          blocks: [b, emptyCatchBlock],
+          children: [t, b, c]
         };
       }
+      const blocks = [b];
+      if (c)
+        blocks.push(c.block);
       return {
         type: "TryStatement",
+        blocks,
         children: [t, b, c, f]
       };
     });
@@ -10010,8 +10128,8 @@ ${input.slice(result.pos)}
       var t = $0;
       return {
         type: "TryExpression",
-        blocks: [t.children[1], t.children[2]?.[3]],
-        children: ["(()=>{", t, "})()"]
+        blocks: t.blocks,
+        children: module.wrapIIFE(t)
       };
     });
     function TryExpression(state) {
@@ -10036,7 +10154,14 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CatchClause$0 = $S($C(Samedent, _), Catch, $E(CatchBind), $C(ThenClause, BracedOrEmptyBlock));
+    var CatchClause$0 = $TS($S($C(Samedent, _), Catch, $E(CatchBind), $C(ThenClause, BracedOrEmptyBlock)), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var block = $4;
+      return {
+        type: "CatchClause",
+        children: $0,
+        block
+      };
+    });
     function CatchClause(state) {
       let eventData;
       if (state.events) {
@@ -10700,7 +10825,7 @@ ${input.slice(result.pos)}
     var DebuggerExpression$0 = $TS($S(Debugger), function($skip, $loc, $0, $1) {
       return {
         type: "DebuggerExpression",
-        children: ["(()=>{", $1, "})()"]
+        children: module.wrapIIFE($1)
       };
     });
     function DebuggerExpression(state) {
@@ -10728,7 +10853,7 @@ ${input.slice(result.pos)}
     var ThrowExpression$0 = $TS($S(Throw, ExtendedExpression), function($skip, $loc, $0, $1, $2) {
       return {
         type: "ThrowExpression",
-        children: ["(()=>{", $0, "})()"]
+        children: module.wrapIIFE($0)
       };
     });
     function ThrowExpression(state) {
@@ -13218,7 +13343,7 @@ ${input.slice(result.pos)}
       }
     }
     var StatementDelimiter$0 = SemicolonDelimiter;
-    var StatementDelimiter$1 = $S($Y($S(Samedent, $C($EXPECT($L2, fail, 'StatementDelimiter "("'), $EXPECT($L97, fail, 'StatementDelimiter "["'), $EXPECT($L98, fail, 'StatementDelimiter "`"'), $EXPECT($L58, fail, 'StatementDelimiter "+"'), $EXPECT($L17, fail, 'StatementDelimiter "-"'), $EXPECT($L54, fail, 'StatementDelimiter "*"'), $EXPECT($L55, fail, 'StatementDelimiter "/"'), ObjectLiteral, Arrow, $S(Function, $E($S($E(_), Star)), $E(_), $EXPECT($L2, fail, 'StatementDelimiter "("'))))), InsertSemicolon);
+    var StatementDelimiter$1 = $S($Y($S(Samedent, $C($EXPECT($L2, fail, 'StatementDelimiter "("'), $EXPECT($L97, fail, 'StatementDelimiter "["'), $EXPECT($L98, fail, 'StatementDelimiter "`"'), $EXPECT($L58, fail, 'StatementDelimiter "+"'), $EXPECT($L17, fail, 'StatementDelimiter "-"'), $EXPECT($L54, fail, 'StatementDelimiter "*"'), $EXPECT($L55, fail, 'StatementDelimiter "/"'), ObjectLiteral, Arrow, FatArrow, $S(Function, $E($S($E(_), Star)), $E(_), $EXPECT($L2, fail, 'StatementDelimiter "("'))))), InsertSemicolon);
     var StatementDelimiter$2 = $Y(EOS);
     function StatementDelimiter(state) {
       let eventData;
@@ -13469,7 +13594,7 @@ ${input.slice(result.pos)}
       }
     }
     var Await$0 = $TS($S($EXPECT($L104, fail, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
-      return { $loc, token: $1 };
+      return { $loc, token: $1, type: "Await" };
     });
     function Await(state) {
       let eventData;
@@ -17451,6 +17576,9 @@ ${input.slice(result.pos)}
     var TypeSuffix$1 = $T($S(QuestionMark, $E(_)), function(value) {
       return { "type": "TypeSuffix", "ts": true, "children": value };
     });
+    var TypeSuffix$2 = $T($S(NonNullAssertion, $E(_), $E($S(Colon, Type))), function(value) {
+      return { "type": "TypeSuffix", "ts": true, "children": value };
+    });
     function TypeSuffix(state) {
       let eventData;
       if (state.events) {
@@ -17462,12 +17590,12 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("TypeSuffix", state, TypeSuffix$0(state) || TypeSuffix$1(state));
+        const result = $TOKEN("TypeSuffix", state, TypeSuffix$0(state) || TypeSuffix$1(state) || TypeSuffix$2(state));
         if (state.events)
           state.events.exit?.("TypeSuffix", state, result, eventData);
         return result;
       } else {
-        const result = TypeSuffix$0(state) || TypeSuffix$1(state);
+        const result = TypeSuffix$0(state) || TypeSuffix$1(state) || TypeSuffix$2(state);
         if (state.events)
           state.events.exit?.("TypeSuffix", state, result, eventData);
         return result;
@@ -19872,15 +20000,49 @@ ${input.slice(result.pos)}
         return post;
       };
       function expressionizeIteration(exp) {
+        const i = exp.children.indexOf(exp.block);
+        if (exp.subtype === "DoStatement") {
+          insertReturn(exp.block);
+          exp.children.splice(i, 1, ...module.wrapIIFE(exp.children));
+          return;
+        }
         const resultsRef = {
           type: "Ref",
           base: "results",
           id: "results"
         };
         insertPush(exp.block, resultsRef);
-        exp.children = ["(()=>{const ", resultsRef, "=[];", ...exp.children, "; return ", resultsRef, "})()"];
+        exp.children.splice(i, 1, module.wrapIIFE(
+          ["const ", resultsRef, "=[];", ...exp.children, "; return ", resultsRef]
+        ));
       }
+      module.hasAwait = (exp) => {
+        return gatherRecursiveWithinFunction(exp, ({ type }) => type === "Await").length > 0;
+      };
+      module.wrapIIFE = (exp) => {
+        let prefix, suffix;
+        if (module.hasAwait(exp)) {
+          prefix = "(await (async ()=>{";
+          suffix = "})())";
+        } else {
+          prefix = "(()=>{";
+          suffix = "})()";
+        }
+        if (Array.isArray(exp)) {
+          return [prefix, ...exp, suffix];
+        } else {
+          return [prefix, exp, suffix];
+        }
+      };
       function wrapIterationReturningResults(statement, outerRef) {
+        if (statement.type === "DoStatement") {
+          if (outerRef) {
+            insertPush(statement.block, outerRef);
+          } else {
+            insertReturn(statement.block);
+          }
+          return;
+        }
         const resultsRef = {
           type: "Ref",
           base: "results",
@@ -19903,7 +20065,12 @@ ${input.slice(result.pos)}
           return;
         switch (node.type) {
           case "BlockStatement":
-            insertPush(node.expressions[node.expressions.length - 1], ref);
+            if (node.expressions.length) {
+              const last = node.expressions[node.expressions.length - 1];
+              insertPush(last, ref);
+            } else {
+              node.expressions.push([ref, ".push(void 0);"]);
+            }
             return;
           case "CaseBlock":
             node.clauses.forEach((clause) => {
@@ -19936,6 +20103,7 @@ ${input.slice(result.pos)}
             return;
           case "ForStatement":
           case "IterationStatement":
+          case "DoStatement":
             wrapIterationReturningResults(exp, ref);
             return;
           case "BlockStatement":
@@ -19955,9 +20123,7 @@ ${input.slice(result.pos)}
             insertPush(exp.children[2], ref);
             return;
           case "TryStatement":
-            insertPush(exp.children[1], ref);
-            if (exp.children[2])
-              insertPush(exp.children[2][2], ref);
+            exp.blocks.forEach((block) => insertPush(block, ref));
             return;
         }
         node.splice(1, 0, ref, ".push(");
@@ -19993,7 +20159,14 @@ ${input.slice(result.pos)}
           return;
         switch (node.type) {
           case "BlockStatement":
-            insertReturn(node.expressions[node.expressions.length - 1]);
+            if (node.expressions.length) {
+              const last = node.expressions[node.expressions.length - 1];
+              insertReturn(last);
+            } else {
+              if (node.parent.type === "CatchClause") {
+                node.expressions.push(["return"]);
+              }
+            }
             return;
           case "WhenClause":
             node.children.splice(node.children.indexOf(node.break), 1);
@@ -20026,6 +20199,7 @@ ${input.slice(result.pos)}
             return;
           case "ForStatement":
           case "IterationStatement":
+          case "DoStatement":
             wrapIterationReturningResults(exp);
             return;
           case "BlockStatement":
@@ -20045,9 +20219,7 @@ ${input.slice(result.pos)}
             insertSwitchReturns(exp);
             return;
           case "TryStatement":
-            insertReturn(exp.children[1]);
-            if (exp.children[2])
-              insertReturn(exp.children[2][3]);
+            exp.blocks.forEach((block) => insertReturn(block));
             return;
         }
         if (node[node.length - 1]?.type === "SemicolonDelimiter")
@@ -20223,10 +20395,12 @@ ${input.slice(result.pos)}
         if (Array.isArray(target)) {
           if (target.length === 1) {
             return module.skipIfOnlyWS(target[0]);
+          } else if (target.every((e) => module.skipIfOnlyWS(e) === void 0)) {
+            return void 0;
           }
           return target;
         }
-        if (target.token && target.token.trim() === "") {
+        if (target.token != null && target.token.trim() === "") {
           return void 0;
         }
         return target;
@@ -20471,12 +20645,14 @@ ${input.slice(result.pos)}
           return;
         if (typeof node !== "object")
           return;
-        node.parent = parent;
         if (Array.isArray(node)) {
           for (const child of node) {
-            addParentPointers(child, node);
+            addParentPointers(child, parent);
           }
-        } else if (node.children) {
+          return;
+        }
+        node.parent = parent;
+        if (node.children) {
           for (const child of node.children) {
             addParentPointers(child, node);
           }
@@ -20761,8 +20937,9 @@ ${input.slice(result.pos)}
       module.attachPostfixStatementAsExpression = function(exp, post) {
         let clause;
         switch (post[1].type) {
-          case "IterationStatement":
           case "ForStatement":
+          case "IterationStatement":
+          case "DoStatement":
             clause = module.addPostfixStatement(exp, ...post);
             return {
               type: "IterationExpression",
@@ -20967,6 +21144,37 @@ ${input.slice(result.pos)}
             return pattern;
         }
       }
+      function aggregateDuplicateBindings(bindings) {
+        const props2 = gatherRecursiveAll(bindings, (n) => n.type === "BindingMatchProperty");
+        const declarations = [];
+        const propsGroupedByName = /* @__PURE__ */ new Map();
+        for (const p of props2) {
+          const { name } = p;
+          const key = name.name;
+          if (propsGroupedByName.has(key)) {
+            propsGroupedByName.get(key).push(p);
+          } else {
+            propsGroupedByName.set(key, [p]);
+          }
+        }
+        propsGroupedByName.forEach((shared, key) => {
+          if (shared.length === 1)
+            return;
+          const refs = shared.map((p) => {
+            const ref = {
+              type: "Ref",
+              base: key,
+              id: key
+            };
+            p.children.push(": ", ref);
+            return ref;
+          });
+          declarations.push(["const ", key, " = [", ...refs.map((r, i) => {
+            return i === 0 ? r : [", ", r];
+          }), "]"]);
+        });
+        return declarations;
+      }
       function processPatternMatching(statements) {
         gatherRecursiveAll(statements, (n) => n.type === "SwitchStatement" || n.type === "SwitchExpression").forEach((s) => {
           const { caseBlock } = s;
@@ -21033,10 +21241,13 @@ ${input.slice(result.pos)}
                 if (pattern.properties?.length === 0)
                   break;
                 let [splices, thisAssignments] = gatherBindingCode(pattern);
+                const patternBindings = nonMatcherBindings(pattern);
                 splices = splices.map((s2) => [", ", nonMatcherBindings(s2)]);
                 thisAssignments = thisAssignments.map((a) => [indent, a, ";\n"]);
-                prefix.push([indent, "const ", nonMatcherBindings(pattern), " = ", ref, splices, ";\n"]);
+                const duplicateDeclarations = aggregateDuplicateBindings([patternBindings, splices]);
+                prefix.push([indent, "const ", patternBindings, " = ", ref, splices, ";\n"]);
                 prefix.push(...thisAssignments);
+                prefix.push(...duplicateDeclarations.map((d) => [indent, d, ";\n"]));
                 break;
               }
             }
@@ -21059,19 +21270,19 @@ ${input.slice(result.pos)}
           });
           if (module.config.implicitReturns && s.type === "SwitchExpression") {
             insertReturn(root[0]);
-            root.unshift("(()=>{");
-            root.push("})()");
+            root.splice(0, 1, module.wrapIIFE(root[0]));
           }
           s.type = "PatternMatchingStatement";
           s.children = [root];
+          addParentPointers(s, s.parent);
         });
       }
       function processPipelineExpressions(statements) {
         gatherRecursiveAll(statements, (n) => n.type === "PipelineExpression").forEach((s) => {
-          const [, body] = s.children;
-          let [arg] = s.children;
+          const [ws, , body] = s.children;
+          let [, arg] = s.children;
           let i = 0, l = body.length;
-          const children = [];
+          const children = [ws];
           for (i = 0; i < l; i++) {
             const step = body[i];
             const [leadingComment, pipe, trailingComment, expr] = step;
@@ -21096,7 +21307,17 @@ ${input.slice(result.pos)}
               returns ? arg : null
             );
             if (result.type === "ReturnStatement") {
+              if (i < l - 1) {
+                result.children.push({
+                  type: "Error",
+                  message: "Can't continue a pipeline after returning"
+                });
+              }
               arg = result;
+              if (children[children.length - 1] === ",") {
+                children.pop();
+                children.push(";");
+              }
               break;
             }
             if (returning) {
@@ -21108,6 +21329,7 @@ ${input.slice(result.pos)}
           }
           children.push(arg);
           s.children = children;
+          addParentPointers(s, s.parent);
         });
       }
       module.processProgram = function(statements) {
@@ -21527,6 +21749,36 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var NotDedented$0 = $TS($S($E($C(Samedent, IndentedFurther)), $E(_)), function($skip, $loc, $0, $1, $2) {
+      const ws = [];
+      if ($1)
+        ws.push(...$1);
+      if ($2)
+        ws.push(...$2);
+      return ws.flat(Infinity).filter(Boolean);
+    });
+    function NotDedented(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("NotDedented", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("NotDedented", state, NotDedented$0(state));
+        if (state.events)
+          state.events.exit?.("NotDedented", state, result, eventData);
+        return result;
+      } else {
+        const result = NotDedented$0(state);
+        if (state.events)
+          state.events.exit?.("NotDedented", state, result, eventData);
+        return result;
+      }
+    }
     var PushIndent$0 = $Y($S(EOS, TrackIndented));
     function PushIndent(state) {
       let eventData;
@@ -22045,7 +22297,7 @@ var parse;
 var uncacheable;
 ({ parse } = import_parser.default);
 ({ SourceMap: SourceMap2, base64Encode: base64Encode2 } = util_exports);
-uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "AllowAll", "AllowIndentedApplication", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "Declaration", "Debugger", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidIndentedApplication", "ForbidTrailingMemberProperty", "FunctionDeclaration", "FunctionExpression", "HoistableDeclaration", "ImplicitArguments", "ImplicitInlineObjectPropertyDelimiter", "ImplicitNestedBlock", "IndentedApplicationAllowed", "IndentedFurther", "IndentedJSXChildExpression", "InlineObjectLiteral", "InsertIndent", "JSXChild", "JSXChildren", "JSXElement", "JSXFragment", "JSXImplicitFragment", "JSXMixedChildren", "JSXNested", "JSXNestedChildren", "JSXOptionalClosingElement", "JSXOptionalClosingFragment", "JSXTag", "LeftHandSideExpression", "MemberExpression", "MemberExpressionRest", "Nested", "NestedBindingElement", "NestedBindingElements", "NestedBlockExpression", "NestedBlockExpression", "NestedBlockStatement", "NestedBlockStatements", "NestedClassSignatureElement", "NestedClassSignatureElements", "NestedDeclareElement", "NestedDeclareElements", "NestedElement", "NestedElementList", "NestedImplicitObjectLiteral", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedInterfaceProperty", "NestedJSXChildExpression", "NestedModuleItem", "NestedModuleItems", "NestedObject", "NestedPropertyDefinitions", "NonSingleBracedBlock", "ObjectLiteral", "PopIndent", "PopJSXStack", "PostfixedExpression", "PostfixedStatement", "PrimaryExpression", "PushIndent", "PushJSXOpeningElement", "PushJSXOpeningFragment", "RestoreAll", "RestoreIndentedApplication", "RestoreTrailingMemberProperty", "RHS", "Samedent", "ShortCircuitExpression", "SingleLineAssignmentExpression", "SingleLineComment", "SingleLineStatements", "SnugNamedProperty", "Statement", "StatementListItem", "SuffixedExpression", "SuffixedStatement", "ThinArrowFunction", "TrackIndented", "TrailingMemberExpressions", "TrailingMemberPropertyAllowed", "TypedJSXElement", "TypedJSXFragment", "UnaryExpression", "UpdateExpression"]);
+uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "AllowAll", "AllowIndentedApplication", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "Declaration", "Debugger", "ElementListWithIndentedApplicationForbidden", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidIndentedApplication", "ForbidTrailingMemberProperty", "FunctionDeclaration", "FunctionExpression", "HoistableDeclaration", "ImplicitArguments", "ImplicitInlineObjectPropertyDelimiter", "ImplicitNestedBlock", "IndentedApplicationAllowed", "IndentedFurther", "IndentedJSXChildExpression", "InlineObjectLiteral", "InsertIndent", "JSXChild", "JSXChildren", "JSXElement", "JSXFragment", "JSXImplicitFragment", "JSXMixedChildren", "JSXNested", "JSXNestedChildren", "JSXOptionalClosingElement", "JSXOptionalClosingFragment", "JSXTag", "LeftHandSideExpression", "MemberExpression", "MemberExpressionRest", "Nested", "NestedBindingElement", "NestedBindingElements", "NestedBlockExpression", "NestedBlockExpression", "NestedBlockStatement", "NestedBlockStatements", "NestedClassSignatureElement", "NestedClassSignatureElements", "NestedDeclareElement", "NestedDeclareElements", "NestedElement", "NestedElementList", "NestedImplicitObjectLiteral", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedInterfaceProperty", "NestedJSXChildExpression", "NestedModuleItem", "NestedModuleItems", "NestedObject", "NestedPropertyDefinitions", "NonSingleBracedBlock", "NotDedented", "ObjectLiteral", "PopIndent", "PopJSXStack", "PostfixedExpression", "PostfixedStatement", "PrimaryExpression", "PushIndent", "PushJSXOpeningElement", "PushJSXOpeningFragment", "RestoreAll", "RestoreIndentedApplication", "RestoreTrailingMemberProperty", "RHS", "Samedent", "ShortCircuitExpression", "SingleLineAssignmentExpression", "SingleLineComment", "SingleLineStatements", "SnugNamedProperty", "Statement", "StatementListItem", "SuffixedExpression", "SuffixedStatement", "ThinArrowFunction", "TrackIndented", "TrailingMemberExpressions", "TrailingMemberPropertyAllowed", "TypedJSXElement", "TypedJSXFragment", "UnaryExpression", "UpdateExpression"]);
 var compile = function(src, options) {
   var ast, code, events, filename, ref, result, sm, srcMapJSON;
   if (!options) {