@danielx/civet 0.5.87 → 0.5.89

package/dist/browser.js

@@ -44,7 +44,7 @@ var Civet = (() => {
             children: block.children === block.expressions ? expressions : block.children.map((c) => c === block.expressions ? expressions : c)
           };
           if (block.bare) {
-            block.children = [[" {\n", indent], ...block.children, "}"];
+            block.children = [[" {"], ...block.children, "}"];
             block.bare = false;
           }
         }
@@ -152,8 +152,16 @@ var Civet = (() => {
       }
       function getIndent(statement) {
         let indent = statement?.[0];
-        if (Array.isArray(indent))
-          indent = indent[indent.length - 1];
+        if (Array.isArray(indent)) {
+          indent = indent.flat(Infinity);
+          return indent.filter((n) => n && !(n.type === "Comment")).map((n) => {
+            if (typeof n === "string")
+              return n;
+            if (n.token != null)
+              return n.token;
+            return "";
+          });
+        }
         return indent;
       }
       function hasAwait(exp) {
@@ -175,10 +183,11 @@ var Civet = (() => {
           }
           const block = outer.parent;
           const { expressions } = block;
-          const index = expressions.indexOf(outer);
-          const indent = getIndent(outer);
-          if (indent)
-            hoistDec[0][0] = indent;
+          const index = expressions.findIndex(([, s]) => outer === s);
+          if (index < 0)
+            throw new Error("Couldn't find expression in block for hoistable declaration.");
+          const indent = expressions[index][0];
+          hoistDec[0][0] = indent;
           expressions.splice(index, 0, hoistDec);
           node.hoistDec = null;
         });
@@ -318,7 +327,7 @@ var Civet = (() => {
             varLet = [",", ...varName, " = ", counterRef];
           } else {
             blockPrefix = [
-              ["", forDeclaration, " = ", counterRef, ";\n"]
+              ["", forDeclaration, " = ", counterRef, ";"]
             ];
           }
         } else if (forDeclaration) {
@@ -1032,6 +1041,7 @@ ${input.slice(result.pos)}
         OperatorDeclaration,
         OperatorSignature,
         AmpersandBlockRHS,
+        AmpersandBlockRHSBody,
         AmpersandUnaryPrefix,
         ThinArrowFunction,
         Arrow,
@@ -1785,7 +1795,8 @@ ${input.slice(result.pos)}
           type: "BlockStatement",
           expressions: statements,
           children: [statements],
-          bare: true
+          bare: true,
+          root: true
         });
         return $0;
       });
@@ -2244,7 +2255,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var ArgumentsWithTrailingMemberExpressions$0 = $TS($S(Arguments, TrailingMemberExpressions), function($skip, $loc, $0, $1, $2) {
+      var ArgumentsWithTrailingMemberExpressions$0 = $TS($S(Arguments, AllowedTrailingMemberExpressions), function($skip, $loc, $0, $1, $2) {
         var args = $1;
         var trailing = $2;
         const call = {
@@ -6262,7 +6273,34 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var AmpersandBlockRHS$0 = $TS($S($E($S($N(_), $P(CallExpressionRest))), $E($S($N($EXPECT($R3, fail, "AmpersandBlockRHS /[&]/")), $P(BinaryOpRHS)))), function($skip, $loc, $0, $1, $2) {
+      var AmpersandBlockRHS$0 = $TS($S(ForbidTrailingMemberProperty, $E(AmpersandBlockRHSBody), RestoreTrailingMemberProperty), function($skip, $loc, $0, $1, $2, $3) {
+        if (!$2)
+          return $skip;
+        return $2;
+      });
+      function AmpersandBlockRHS(state) {
+        let eventData;
+        if (state.events) {
+          const result = state.events.enter?.("AmpersandBlockRHS", state);
+          if (result) {
+            if (result.cache)
+              return result.cache;
+            eventData = result.data;
+          }
+        }
+        if (state.tokenize) {
+          const result = $TOKEN("AmpersandBlockRHS", state, AmpersandBlockRHS$0(state));
+          if (state.events)
+            state.events.exit?.("AmpersandBlockRHS", state, result, eventData);
+          return result;
+        } else {
+          const result = AmpersandBlockRHS$0(state);
+          if (state.events)
+            state.events.exit?.("AmpersandBlockRHS", state, result, eventData);
+          return result;
+        }
+      }
+      var AmpersandBlockRHSBody$0 = $TS($S($E($S($N(_), $P(CallExpressionRest))), $E($S($N($EXPECT($R3, fail, "AmpersandBlockRHSBody /[&]/")), $P(BinaryOpRHS)))), function($skip, $loc, $0, $1, $2) {
         var callExpRest = $1;
         var binopRHS = $2;
         if (!callExpRest && !binopRHS)
@@ -6289,10 +6327,10 @@ ${input.slice(result.pos)}
         }
         return exp;
       });
-      function AmpersandBlockRHS(state) {
+      function AmpersandBlockRHSBody(state) {
         let eventData;
         if (state.events) {
-          const result = state.events.enter?.("AmpersandBlockRHS", state);
+          const result = state.events.enter?.("AmpersandBlockRHSBody", state);
           if (result) {
             if (result.cache)
               return result.cache;
@@ -6300,14 +6338,14 @@ ${input.slice(result.pos)}
           }
         }
         if (state.tokenize) {
-          const result = $TOKEN("AmpersandBlockRHS", state, AmpersandBlockRHS$0(state));
+          const result = $TOKEN("AmpersandBlockRHSBody", state, AmpersandBlockRHSBody$0(state));
           if (state.events)
-            state.events.exit?.("AmpersandBlockRHS", state, result, eventData);
+            state.events.exit?.("AmpersandBlockRHSBody", state, result, eventData);
           return result;
         } else {
-          const result = AmpersandBlockRHS$0(state);
+          const result = AmpersandBlockRHSBody$0(state);
           if (state.events)
-            state.events.exit?.("AmpersandBlockRHS", state, result, eventData);
+            state.events.exit?.("AmpersandBlockRHSBody", state, result, eventData);
           return result;
         }
       }
@@ -6889,17 +6927,10 @@ ${input.slice(result.pos)}
         if (!statements.length)
           return $skip;
         statements = statements.flat();
-        const first = statements[0];
-        const ws = first[0];
-        const indent = ws.at(-1);
-        statements = [
-          [indent, ...first.slice(1)],
-          ...statements.slice(1)
-        ];
         return {
           type: "BlockStatement",
           expressions: statements,
-          children: [ws.slice(0, -1), statements],
+          children: [statements],
           bare: true
         };
       });
@@ -10098,13 +10129,12 @@ ${input.slice(result.pos)}
       });
       var ForStatementControl$1 = $TS($S(CoffeeForLoopsEnabled, CoffeeForStatementParameters, $E(WhenCondition)), function($skip, $loc, $0, $1, $2, $3) {
         if ($3) {
-          const indent = module.currentIndent.token + "  ";
-          const block = "continue\n";
+          const block = "continue;";
           $2 = {
             ...$2,
             blockPrefix: [
               ...$2.blockPrefix,
-              [indent, {
+              ["", {
                 type: "IfStatement",
                 then: block,
                 children: ["if (!(", insertTrimmingSpace($3, ""), ")) ", block]
@@ -10171,7 +10201,6 @@ ${input.slice(result.pos)}
         var step = $8;
         var close = $9;
         let blockPrefix = [];
-        const indent = module.currentIndent.token + "  ";
         exp = insertTrimmingSpace(exp, "");
         declaration = insertTrimmingSpace(declaration, "");
         if (kind.token === "from") {
@@ -10185,14 +10214,14 @@ ${input.slice(result.pos)}
           }
           if (declaration.own) {
             const hasPropRef = module.getRef("hasProp");
-            blockPrefix.push([indent, "if (!", hasPropRef, ".call(", exp, ", ", declaration, ")) continue\n"]);
+            blockPrefix.push(["", "if (!", hasPropRef, ".call(", exp, ", ", declaration, ")) continue", ";"]);
           }
           if (index) {
-            blockPrefix.push([indent, {
+            blockPrefix.push(["", {
               type: "AssignmentExpression",
               children: [index, " = ", exp, "[", declaration, "]"],
               names: index.names
-            }, ";\n"]);
+            }, ";"]);
           }
           kind.token = "in";
         } else if (kind.token === "in") {
@@ -10228,11 +10257,11 @@ ${input.slice(result.pos)}
             assignmentNames.push(...index.names);
           }
           const expRefDec = expRef !== exp ? [expRef, " = ", insertTrimmingSpace(exp, ""), ", "] : [];
-          blockPrefix.push([indent, {
+          blockPrefix.push(["", {
             type: "AssignmentExpression",
-            children: [varRef, " = ", expRef, "[", indexAssignment, counterRef, "]\n"],
+            children: [varRef, " = ", expRef, "[", indexAssignment, counterRef, "]"],
             names: assignmentNames
-          }]);
+          }, ";"]);
           declaration = {
             type: "Declaration",
             children: ["let ", ...expRefDec, counterRef, " = 0, ", lenRef, " = ", expRef, ".length"],
@@ -11155,8 +11184,8 @@ ${input.slice(result.pos)}
         const initCondition = {
           type: "AssignmentExpression",
           children: [ref, " ", initializer],
-          hoistDec: [["", ["let ", ref], ";\n"]],
-          blockPrefix: [["", [binding, "= ", ref], ";\n"]]
+          hoistDec: [["", ["let ", ref], ";"]],
+          blockPrefix: [["", [binding, "= ", ref], ";"]]
         };
         return initCondition;
       });
@@ -13868,7 +13897,7 @@ ${input.slice(result.pos)}
         }
       }
       var JSSingleLineComment$0 = $TR($EXPECT($R41, fail, "JSSingleLineComment /\\/\\/(?!\\/)[^\\r\\n]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
-        return { $loc, token: $0 };
+        return { type: "Comment", $loc, token: $0 };
       });
       function JSSingleLineComment(state) {
         let eventData;
@@ -13917,7 +13946,7 @@ ${input.slice(result.pos)}
         }
       }
       var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L94, fail, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L95, fail, 'JSMultiLineComment "*/"')), $EXPECT($R42, fail, "JSMultiLineComment /./"))), $EXPECT($L95, fail, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
-        return { $loc, token: $1 };
+        return { type: "Comment", $loc, token: $1 };
       });
       function JSMultiLineComment(state) {
         let eventData;
@@ -13942,7 +13971,7 @@ ${input.slice(result.pos)}
         }
       }
       var CoffeeSingleLineComment$0 = $TR($EXPECT($R43, fail, "CoffeeSingleLineComment /#(?!##(?!#))([^\\r\\n]*)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
-        return { $loc, token: `//${$1}` };
+        return { type: "Comment", $loc, token: `//${$1}` };
       });
       function CoffeeSingleLineComment(state) {
         let eventData;
@@ -13968,7 +13997,7 @@ ${input.slice(result.pos)}
       }
       var CoffeeMultiLineComment$0 = $TS($S(CoffeeHereCommentStart, $TEXT($EXPECT($R44, fail, "CoffeeMultiLineComment /[^]*?###/"))), function($skip, $loc, $0, $1, $2) {
         $2 = $2.slice(0, $2.length - 3).replace(/\*\//g, "* /");
-        return { $loc, token: `/*${$2}*/` };
+        return { type: "Comment", $loc, token: `/*${$2}*/` };
       });
       function CoffeeMultiLineComment(state) {
         let eventData;
@@ -21400,6 +21429,8 @@ ${input.slice(result.pos)}
               exp.blocks.forEach((block) => insertPush(block, ref));
               return;
           }
+          if (node[node.length - 1]?.type === "SemicolonDelimiter")
+            return;
           node.splice(1, 0, ref, ".push(");
           node.push(")");
         }
@@ -21478,7 +21509,10 @@ ${input.slice(result.pos)}
               if (exp.else)
                 insertReturn(exp.else[2]);
               else
-                exp.children.push(["\n", indent, wrapWithReturn()]);
+                exp.children.push(["", {
+                  type: "ReturnStatement",
+                  children: [";return"]
+                }]);
               return;
             case "PatternMatchingStatement":
               insertReturn(exp.children[0][0]);
@@ -21887,11 +21921,15 @@ ${input.slice(result.pos)}
           const [splices, thisAssignments] = gatherBindingCode(parameters, {
             injectParamProps: f.name === "constructor"
           });
+          const delimiter = {
+            type: "SemicolonDelimiter",
+            children: [";"]
+          };
           const prefix = splices.map((s) => ["let ", s]).concat(thisAssignments).map(
             (s) => s.type ? {
               ...s,
-              children: [indent, ...s.children, ";\n"]
-            } : [indent, s, ";\n"]
+              children: [indent, ...s.children, delimiter]
+            } : [indent, s, delimiter]
           );
           expressions.unshift(...prefix);
         }
@@ -21950,9 +21988,10 @@ ${input.slice(result.pos)}
               getIndent(block.expressions[0]),
               {
                 type: "Declaration",
-                children: ["let ", ref, returnType, ";\n"],
+                children: ["let ", ref, returnType],
                 names: []
-              }
+              },
+              ";"
             ]);
           }
           gatherRecursiveWithinFunction(
@@ -21964,7 +22003,7 @@ ${input.slice(result.pos)}
           });
           if (block.children.at(-2)?.type !== "ReturnStatement") {
             block.expressions.push([
-              ["\n", getIndent(block.expressions.at(-1))],
+              [getIndent(block.expressions.at(-1))],
               {
                 type: "ReturnStatement",
                 expression: ref,
@@ -22448,11 +22487,11 @@ ${input.slice(result.pos)}
                   let [splices, thisAssignments] = gatherBindingCode(pattern);
                   const patternBindings = nonMatcherBindings(pattern);
                   splices = splices.map((s2) => [", ", nonMatcherBindings(s2)]);
-                  thisAssignments = thisAssignments.map((a) => [indent, a, ";\n"]);
+                  thisAssignments = thisAssignments.map((a) => [indent, a, ";"]);
                   const duplicateDeclarations = aggregateDuplicateBindings([patternBindings, splices]);
-                  prefix.push([indent, "const ", patternBindings, " = ", ref, splices, ";\n"]);
+                  prefix.push([indent, "const ", patternBindings, " = ", ref, splices, ";"]);
                   prefix.push(...thisAssignments);
-                  prefix.push(...duplicateDeclarations.map((d) => [indent, d, ";\n"]));
+                  prefix.push(...duplicateDeclarations.map((d) => [indent, d, ";"]));
                   break;
                 }
               }
@@ -22607,6 +22646,11 @@ ${input.slice(result.pos)}
           });
         }
         module.processProgram = function(root) {
+          assert.equal(module.forbidClassImplicitCall.length, 1, "forbidClassImplicitCall");
+          assert.equal(module.forbidIndentedApplication.length, 1, "forbidIndentedApplication");
+          assert.equal(module.forbidTrailingMemberProperty.length, 1, "forbidTrailingMemberProperty");
+          assert.equal(module.forbidMultiLineImplicitObjectLiteral.length, 1, "forbidMultiLineImplicitObjectLiteral");
+          assert.equal(module.JSXTagStack.length, 0, "JSXTagStack should be empty");
           addParentPointers(root);
           const { expressions: statements } = root;
           processPipelineExpressions(statements);
@@ -22700,7 +22744,11 @@ ${input.slice(result.pos)}
           });
           if (varIds.length) {
             const indent = getIndent(statements[0]);
-            statements.unshift([indent, "var ", varIds.join(", "), "\n"]);
+            let delimiter = ";";
+            if (statements[0][1]?.parent?.root) {
+              delimiter = ";\n";
+            }
+            statements.unshift([indent, "var ", varIds.join(", "), delimiter]);
           }
           scopes.pop();
         }
@@ -23141,6 +23189,13 @@ ${input.slice(result.pos)}
         quoteString,
         removeParentPointers
       } = require_lib();
+      var assert = {
+        equal(a, b, msg) {
+          if (a !== b) {
+            throw new Error(`Assertion failed [${msg}]: ${a} !== ${b}`);
+          }
+        }
+      };
     }
   });
 
@@ -23577,7 +23632,7 @@ ${input.slice(result.pos)}
   var uncacheable;
   ({ parse } = import_parser.default);
   ({ SourceMap: SourceMap2, base64Encode: base64Encode2 } = util_exports);
-  uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "AllowAll", "AllowClassImplicitCall", "AllowIndentedApplication", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "ClassImplicitCallForbidden", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "Declaration", "Debugger", "ElementListWithIndentedApplicationForbidden", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidClassImplicitCall", "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", "RestoreClassImplicitCall", "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", "AllowClassImplicitCall", "AllowIndentedApplication", "AllowMultiLineImplicitObjectLiteral", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "ClassImplicitCallForbidden", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "Declaration", "Debugger", "ElementListWithIndentedApplicationForbidden", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidClassImplicitCall", "ForbidIndentedApplication", "ForbidMultiLineImplicitObjectLiteral", "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", "RestoreClassImplicitCall", "RestoreMultiLineImplicitObjectLiteral", "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) {

package/dist/main.js

@@ -43,7 +43,7 @@ var require_lib = __commonJS({
           children: block.children === block.expressions ? expressions : block.children.map((c) => c === block.expressions ? expressions : c)
         };
         if (block.bare) {
-          block.children = [[" {\n", indent], ...block.children, "}"];
+          block.children = [[" {"], ...block.children, "}"];
           block.bare = false;
         }
       }
@@ -151,8 +151,16 @@ var require_lib = __commonJS({
     }
     function getIndent(statement) {
       let indent = statement?.[0];
-      if (Array.isArray(indent))
-        indent = indent[indent.length - 1];
+      if (Array.isArray(indent)) {
+        indent = indent.flat(Infinity);
+        return indent.filter((n) => n && !(n.type === "Comment")).map((n) => {
+          if (typeof n === "string")
+            return n;
+          if (n.token != null)
+            return n.token;
+          return "";
+        });
+      }
       return indent;
     }
     function hasAwait(exp) {
@@ -174,10 +182,11 @@ var require_lib = __commonJS({
         }
         const block = outer.parent;
         const { expressions } = block;
-        const index = expressions.indexOf(outer);
-        const indent = getIndent(outer);
-        if (indent)
-          hoistDec[0][0] = indent;
+        const index = expressions.findIndex(([, s]) => outer === s);
+        if (index < 0)
+          throw new Error("Couldn't find expression in block for hoistable declaration.");
+        const indent = expressions[index][0];
+        hoistDec[0][0] = indent;
         expressions.splice(index, 0, hoistDec);
         node.hoistDec = null;
       });
@@ -317,7 +326,7 @@ var require_lib = __commonJS({
           varLet = [",", ...varName, " = ", counterRef];
         } else {
           blockPrefix = [
-            ["", forDeclaration, " = ", counterRef, ";\n"]
+            ["", forDeclaration, " = ", counterRef, ";"]
           ];
         }
       } else if (forDeclaration) {
@@ -1031,6 +1040,7 @@ ${input.slice(result.pos)}
       OperatorDeclaration,
       OperatorSignature,
       AmpersandBlockRHS,
+      AmpersandBlockRHSBody,
       AmpersandUnaryPrefix,
       ThinArrowFunction,
       Arrow,
@@ -1784,7 +1794,8 @@ ${input.slice(result.pos)}
         type: "BlockStatement",
         expressions: statements,
         children: [statements],
-        bare: true
+        bare: true,
+        root: true
       });
       return $0;
     });
@@ -2243,7 +2254,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ArgumentsWithTrailingMemberExpressions$0 = $TS($S(Arguments, TrailingMemberExpressions), function($skip, $loc, $0, $1, $2) {
+    var ArgumentsWithTrailingMemberExpressions$0 = $TS($S(Arguments, AllowedTrailingMemberExpressions), function($skip, $loc, $0, $1, $2) {
       var args = $1;
       var trailing = $2;
       const call = {
@@ -6261,7 +6272,34 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var AmpersandBlockRHS$0 = $TS($S($E($S($N(_), $P(CallExpressionRest))), $E($S($N($EXPECT($R3, fail, "AmpersandBlockRHS /[&]/")), $P(BinaryOpRHS)))), function($skip, $loc, $0, $1, $2) {
+    var AmpersandBlockRHS$0 = $TS($S(ForbidTrailingMemberProperty, $E(AmpersandBlockRHSBody), RestoreTrailingMemberProperty), function($skip, $loc, $0, $1, $2, $3) {
+      if (!$2)
+        return $skip;
+      return $2;
+    });
+    function AmpersandBlockRHS(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("AmpersandBlockRHS", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("AmpersandBlockRHS", state, AmpersandBlockRHS$0(state));
+        if (state.events)
+          state.events.exit?.("AmpersandBlockRHS", state, result, eventData);
+        return result;
+      } else {
+        const result = AmpersandBlockRHS$0(state);
+        if (state.events)
+          state.events.exit?.("AmpersandBlockRHS", state, result, eventData);
+        return result;
+      }
+    }
+    var AmpersandBlockRHSBody$0 = $TS($S($E($S($N(_), $P(CallExpressionRest))), $E($S($N($EXPECT($R3, fail, "AmpersandBlockRHSBody /[&]/")), $P(BinaryOpRHS)))), function($skip, $loc, $0, $1, $2) {
       var callExpRest = $1;
       var binopRHS = $2;
       if (!callExpRest && !binopRHS)
@@ -6288,10 +6326,10 @@ ${input.slice(result.pos)}
       }
       return exp;
     });
-    function AmpersandBlockRHS(state) {
+    function AmpersandBlockRHSBody(state) {
       let eventData;
       if (state.events) {
-        const result = state.events.enter?.("AmpersandBlockRHS", state);
+        const result = state.events.enter?.("AmpersandBlockRHSBody", state);
         if (result) {
           if (result.cache)
             return result.cache;
@@ -6299,14 +6337,14 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("AmpersandBlockRHS", state, AmpersandBlockRHS$0(state));
+        const result = $TOKEN("AmpersandBlockRHSBody", state, AmpersandBlockRHSBody$0(state));
         if (state.events)
-          state.events.exit?.("AmpersandBlockRHS", state, result, eventData);
+          state.events.exit?.("AmpersandBlockRHSBody", state, result, eventData);
         return result;
       } else {
-        const result = AmpersandBlockRHS$0(state);
+        const result = AmpersandBlockRHSBody$0(state);
         if (state.events)
-          state.events.exit?.("AmpersandBlockRHS", state, result, eventData);
+          state.events.exit?.("AmpersandBlockRHSBody", state, result, eventData);
         return result;
       }
     }
@@ -6888,17 +6926,10 @@ ${input.slice(result.pos)}
       if (!statements.length)
         return $skip;
       statements = statements.flat();
-      const first = statements[0];
-      const ws = first[0];
-      const indent = ws.at(-1);
-      statements = [
-        [indent, ...first.slice(1)],
-        ...statements.slice(1)
-      ];
       return {
         type: "BlockStatement",
         expressions: statements,
-        children: [ws.slice(0, -1), statements],
+        children: [statements],
         bare: true
       };
     });
@@ -10097,13 +10128,12 @@ ${input.slice(result.pos)}
     });
     var ForStatementControl$1 = $TS($S(CoffeeForLoopsEnabled, CoffeeForStatementParameters, $E(WhenCondition)), function($skip, $loc, $0, $1, $2, $3) {
       if ($3) {
-        const indent = module2.currentIndent.token + "  ";
-        const block = "continue\n";
+        const block = "continue;";
         $2 = {
           ...$2,
           blockPrefix: [
             ...$2.blockPrefix,
-            [indent, {
+            ["", {
               type: "IfStatement",
               then: block,
               children: ["if (!(", insertTrimmingSpace($3, ""), ")) ", block]
@@ -10170,7 +10200,6 @@ ${input.slice(result.pos)}
       var step = $8;
       var close = $9;
       let blockPrefix = [];
-      const indent = module2.currentIndent.token + "  ";
       exp = insertTrimmingSpace(exp, "");
       declaration = insertTrimmingSpace(declaration, "");
       if (kind.token === "from") {
@@ -10184,14 +10213,14 @@ ${input.slice(result.pos)}
         }
         if (declaration.own) {
           const hasPropRef = module2.getRef("hasProp");
-          blockPrefix.push([indent, "if (!", hasPropRef, ".call(", exp, ", ", declaration, ")) continue\n"]);
+          blockPrefix.push(["", "if (!", hasPropRef, ".call(", exp, ", ", declaration, ")) continue", ";"]);
         }
         if (index) {
-          blockPrefix.push([indent, {
+          blockPrefix.push(["", {
             type: "AssignmentExpression",
             children: [index, " = ", exp, "[", declaration, "]"],
             names: index.names
-          }, ";\n"]);
+          }, ";"]);
         }
         kind.token = "in";
       } else if (kind.token === "in") {
@@ -10227,11 +10256,11 @@ ${input.slice(result.pos)}
           assignmentNames.push(...index.names);
         }
         const expRefDec = expRef !== exp ? [expRef, " = ", insertTrimmingSpace(exp, ""), ", "] : [];
-        blockPrefix.push([indent, {
+        blockPrefix.push(["", {
           type: "AssignmentExpression",
-          children: [varRef, " = ", expRef, "[", indexAssignment, counterRef, "]\n"],
+          children: [varRef, " = ", expRef, "[", indexAssignment, counterRef, "]"],
           names: assignmentNames
-        }]);
+        }, ";"]);
         declaration = {
           type: "Declaration",
           children: ["let ", ...expRefDec, counterRef, " = 0, ", lenRef, " = ", expRef, ".length"],
@@ -11154,8 +11183,8 @@ ${input.slice(result.pos)}
       const initCondition = {
         type: "AssignmentExpression",
         children: [ref, " ", initializer],
-        hoistDec: [["", ["let ", ref], ";\n"]],
-        blockPrefix: [["", [binding, "= ", ref], ";\n"]]
+        hoistDec: [["", ["let ", ref], ";"]],
+        blockPrefix: [["", [binding, "= ", ref], ";"]]
       };
       return initCondition;
     });
@@ -13867,7 +13896,7 @@ ${input.slice(result.pos)}
       }
     }
     var JSSingleLineComment$0 = $TR($EXPECT($R41, fail, "JSSingleLineComment /\\/\\/(?!\\/)[^\\r\\n]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
-      return { $loc, token: $0 };
+      return { type: "Comment", $loc, token: $0 };
     });
     function JSSingleLineComment(state) {
       let eventData;
@@ -13916,7 +13945,7 @@ ${input.slice(result.pos)}
       }
     }
     var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L94, fail, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L95, fail, 'JSMultiLineComment "*/"')), $EXPECT($R42, fail, "JSMultiLineComment /./"))), $EXPECT($L95, fail, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
-      return { $loc, token: $1 };
+      return { type: "Comment", $loc, token: $1 };
     });
     function JSMultiLineComment(state) {
       let eventData;
@@ -13941,7 +13970,7 @@ ${input.slice(result.pos)}
       }
     }
     var CoffeeSingleLineComment$0 = $TR($EXPECT($R43, fail, "CoffeeSingleLineComment /#(?!##(?!#))([^\\r\\n]*)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
-      return { $loc, token: `//${$1}` };
+      return { type: "Comment", $loc, token: `//${$1}` };
     });
     function CoffeeSingleLineComment(state) {
       let eventData;
@@ -13967,7 +13996,7 @@ ${input.slice(result.pos)}
     }
     var CoffeeMultiLineComment$0 = $TS($S(CoffeeHereCommentStart, $TEXT($EXPECT($R44, fail, "CoffeeMultiLineComment /[^]*?###/"))), function($skip, $loc, $0, $1, $2) {
       $2 = $2.slice(0, $2.length - 3).replace(/\*\//g, "* /");
-      return { $loc, token: `/*${$2}*/` };
+      return { type: "Comment", $loc, token: `/*${$2}*/` };
     });
     function CoffeeMultiLineComment(state) {
       let eventData;
@@ -21399,6 +21428,8 @@ ${input.slice(result.pos)}
             exp.blocks.forEach((block) => insertPush(block, ref));
             return;
         }
+        if (node[node.length - 1]?.type === "SemicolonDelimiter")
+          return;
         node.splice(1, 0, ref, ".push(");
         node.push(")");
       }
@@ -21477,7 +21508,10 @@ ${input.slice(result.pos)}
             if (exp.else)
               insertReturn(exp.else[2]);
             else
-              exp.children.push(["\n", indent, wrapWithReturn()]);
+              exp.children.push(["", {
+                type: "ReturnStatement",
+                children: [";return"]
+              }]);
             return;
           case "PatternMatchingStatement":
             insertReturn(exp.children[0][0]);
@@ -21886,11 +21920,15 @@ ${input.slice(result.pos)}
         const [splices, thisAssignments] = gatherBindingCode(parameters, {
           injectParamProps: f.name === "constructor"
         });
+        const delimiter = {
+          type: "SemicolonDelimiter",
+          children: [";"]
+        };
         const prefix = splices.map((s) => ["let ", s]).concat(thisAssignments).map(
           (s) => s.type ? {
             ...s,
-            children: [indent, ...s.children, ";\n"]
-          } : [indent, s, ";\n"]
+            children: [indent, ...s.children, delimiter]
+          } : [indent, s, delimiter]
         );
         expressions.unshift(...prefix);
       }
@@ -21949,9 +21987,10 @@ ${input.slice(result.pos)}
             getIndent(block.expressions[0]),
             {
               type: "Declaration",
-              children: ["let ", ref, returnType, ";\n"],
+              children: ["let ", ref, returnType],
               names: []
-            }
+            },
+            ";"
           ]);
         }
         gatherRecursiveWithinFunction(
@@ -21963,7 +22002,7 @@ ${input.slice(result.pos)}
         });
         if (block.children.at(-2)?.type !== "ReturnStatement") {
           block.expressions.push([
-            ["\n", getIndent(block.expressions.at(-1))],
+            [getIndent(block.expressions.at(-1))],
             {
               type: "ReturnStatement",
               expression: ref,
@@ -22447,11 +22486,11 @@ ${input.slice(result.pos)}
                 let [splices, thisAssignments] = gatherBindingCode(pattern);
                 const patternBindings = nonMatcherBindings(pattern);
                 splices = splices.map((s2) => [", ", nonMatcherBindings(s2)]);
-                thisAssignments = thisAssignments.map((a) => [indent, a, ";\n"]);
+                thisAssignments = thisAssignments.map((a) => [indent, a, ";"]);
                 const duplicateDeclarations = aggregateDuplicateBindings([patternBindings, splices]);
-                prefix.push([indent, "const ", patternBindings, " = ", ref, splices, ";\n"]);
+                prefix.push([indent, "const ", patternBindings, " = ", ref, splices, ";"]);
                 prefix.push(...thisAssignments);
-                prefix.push(...duplicateDeclarations.map((d) => [indent, d, ";\n"]));
+                prefix.push(...duplicateDeclarations.map((d) => [indent, d, ";"]));
                 break;
               }
             }
@@ -22606,6 +22645,11 @@ ${input.slice(result.pos)}
         });
       }
       module2.processProgram = function(root) {
+        assert.equal(module2.forbidClassImplicitCall.length, 1, "forbidClassImplicitCall");
+        assert.equal(module2.forbidIndentedApplication.length, 1, "forbidIndentedApplication");
+        assert.equal(module2.forbidTrailingMemberProperty.length, 1, "forbidTrailingMemberProperty");
+        assert.equal(module2.forbidMultiLineImplicitObjectLiteral.length, 1, "forbidMultiLineImplicitObjectLiteral");
+        assert.equal(module2.JSXTagStack.length, 0, "JSXTagStack should be empty");
         addParentPointers(root);
         const { expressions: statements } = root;
         processPipelineExpressions(statements);
@@ -22699,7 +22743,11 @@ ${input.slice(result.pos)}
         });
         if (varIds.length) {
           const indent = getIndent(statements[0]);
-          statements.unshift([indent, "var ", varIds.join(", "), "\n"]);
+          let delimiter = ";";
+          if (statements[0][1]?.parent?.root) {
+            delimiter = ";\n";
+          }
+          statements.unshift([indent, "var ", varIds.join(", "), delimiter]);
         }
         scopes.pop();
       }
@@ -23140,6 +23188,13 @@ ${input.slice(result.pos)}
       quoteString,
       removeParentPointers
     } = require_lib();
+    var assert = {
+      equal(a, b, msg) {
+        if (a !== b) {
+          throw new Error(`Assertion failed [${msg}]: ${a} !== ${b}`);
+        }
+      }
+    };
   }
 });
 
@@ -23577,7 +23632,7 @@ var parse;
 var uncacheable;
 ({ parse } = import_parser.default);
 ({ SourceMap: SourceMap2, base64Encode: base64Encode2 } = util_exports);
-uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "AllowAll", "AllowClassImplicitCall", "AllowIndentedApplication", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "ClassImplicitCallForbidden", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "Declaration", "Debugger", "ElementListWithIndentedApplicationForbidden", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidClassImplicitCall", "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", "RestoreClassImplicitCall", "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", "AllowClassImplicitCall", "AllowIndentedApplication", "AllowMultiLineImplicitObjectLiteral", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "ClassImplicitCallForbidden", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "Declaration", "Debugger", "ElementListWithIndentedApplicationForbidden", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidClassImplicitCall", "ForbidIndentedApplication", "ForbidMultiLineImplicitObjectLiteral", "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", "RestoreClassImplicitCall", "RestoreMultiLineImplicitObjectLiteral", "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) {

package/dist/main.mjs

@@ -41,7 +41,7 @@ var require_lib = __commonJS({
           children: block.children === block.expressions ? expressions : block.children.map((c) => c === block.expressions ? expressions : c)
         };
         if (block.bare) {
-          block.children = [[" {\n", indent], ...block.children, "}"];
+          block.children = [[" {"], ...block.children, "}"];
           block.bare = false;
         }
       }
@@ -149,8 +149,16 @@ var require_lib = __commonJS({
     }
     function getIndent(statement) {
       let indent = statement?.[0];
-      if (Array.isArray(indent))
-        indent = indent[indent.length - 1];
+      if (Array.isArray(indent)) {
+        indent = indent.flat(Infinity);
+        return indent.filter((n) => n && !(n.type === "Comment")).map((n) => {
+          if (typeof n === "string")
+            return n;
+          if (n.token != null)
+            return n.token;
+          return "";
+        });
+      }
       return indent;
     }
     function hasAwait(exp) {
@@ -172,10 +180,11 @@ var require_lib = __commonJS({
         }
         const block = outer.parent;
         const { expressions } = block;
-        const index = expressions.indexOf(outer);
-        const indent = getIndent(outer);
-        if (indent)
-          hoistDec[0][0] = indent;
+        const index = expressions.findIndex(([, s]) => outer === s);
+        if (index < 0)
+          throw new Error("Couldn't find expression in block for hoistable declaration.");
+        const indent = expressions[index][0];
+        hoistDec[0][0] = indent;
         expressions.splice(index, 0, hoistDec);
         node.hoistDec = null;
       });
@@ -315,7 +324,7 @@ var require_lib = __commonJS({
           varLet = [",", ...varName, " = ", counterRef];
         } else {
           blockPrefix = [
-            ["", forDeclaration, " = ", counterRef, ";\n"]
+            ["", forDeclaration, " = ", counterRef, ";"]
           ];
         }
       } else if (forDeclaration) {
@@ -1029,6 +1038,7 @@ ${input.slice(result.pos)}
       OperatorDeclaration,
       OperatorSignature,
       AmpersandBlockRHS,
+      AmpersandBlockRHSBody,
       AmpersandUnaryPrefix,
       ThinArrowFunction,
       Arrow,
@@ -1782,7 +1792,8 @@ ${input.slice(result.pos)}
         type: "BlockStatement",
         expressions: statements,
         children: [statements],
-        bare: true
+        bare: true,
+        root: true
       });
       return $0;
     });
@@ -2241,7 +2252,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ArgumentsWithTrailingMemberExpressions$0 = $TS($S(Arguments, TrailingMemberExpressions), function($skip, $loc, $0, $1, $2) {
+    var ArgumentsWithTrailingMemberExpressions$0 = $TS($S(Arguments, AllowedTrailingMemberExpressions), function($skip, $loc, $0, $1, $2) {
       var args = $1;
       var trailing = $2;
       const call = {
@@ -6259,7 +6270,34 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var AmpersandBlockRHS$0 = $TS($S($E($S($N(_), $P(CallExpressionRest))), $E($S($N($EXPECT($R3, fail, "AmpersandBlockRHS /[&]/")), $P(BinaryOpRHS)))), function($skip, $loc, $0, $1, $2) {
+    var AmpersandBlockRHS$0 = $TS($S(ForbidTrailingMemberProperty, $E(AmpersandBlockRHSBody), RestoreTrailingMemberProperty), function($skip, $loc, $0, $1, $2, $3) {
+      if (!$2)
+        return $skip;
+      return $2;
+    });
+    function AmpersandBlockRHS(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("AmpersandBlockRHS", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("AmpersandBlockRHS", state, AmpersandBlockRHS$0(state));
+        if (state.events)
+          state.events.exit?.("AmpersandBlockRHS", state, result, eventData);
+        return result;
+      } else {
+        const result = AmpersandBlockRHS$0(state);
+        if (state.events)
+          state.events.exit?.("AmpersandBlockRHS", state, result, eventData);
+        return result;
+      }
+    }
+    var AmpersandBlockRHSBody$0 = $TS($S($E($S($N(_), $P(CallExpressionRest))), $E($S($N($EXPECT($R3, fail, "AmpersandBlockRHSBody /[&]/")), $P(BinaryOpRHS)))), function($skip, $loc, $0, $1, $2) {
       var callExpRest = $1;
       var binopRHS = $2;
       if (!callExpRest && !binopRHS)
@@ -6286,10 +6324,10 @@ ${input.slice(result.pos)}
       }
       return exp;
     });
-    function AmpersandBlockRHS(state) {
+    function AmpersandBlockRHSBody(state) {
       let eventData;
       if (state.events) {
-        const result = state.events.enter?.("AmpersandBlockRHS", state);
+        const result = state.events.enter?.("AmpersandBlockRHSBody", state);
         if (result) {
           if (result.cache)
             return result.cache;
@@ -6297,14 +6335,14 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("AmpersandBlockRHS", state, AmpersandBlockRHS$0(state));
+        const result = $TOKEN("AmpersandBlockRHSBody", state, AmpersandBlockRHSBody$0(state));
         if (state.events)
-          state.events.exit?.("AmpersandBlockRHS", state, result, eventData);
+          state.events.exit?.("AmpersandBlockRHSBody", state, result, eventData);
         return result;
       } else {
-        const result = AmpersandBlockRHS$0(state);
+        const result = AmpersandBlockRHSBody$0(state);
         if (state.events)
-          state.events.exit?.("AmpersandBlockRHS", state, result, eventData);
+          state.events.exit?.("AmpersandBlockRHSBody", state, result, eventData);
         return result;
       }
     }
@@ -6886,17 +6924,10 @@ ${input.slice(result.pos)}
       if (!statements.length)
         return $skip;
       statements = statements.flat();
-      const first = statements[0];
-      const ws = first[0];
-      const indent = ws.at(-1);
-      statements = [
-        [indent, ...first.slice(1)],
-        ...statements.slice(1)
-      ];
       return {
         type: "BlockStatement",
         expressions: statements,
-        children: [ws.slice(0, -1), statements],
+        children: [statements],
         bare: true
       };
     });
@@ -10095,13 +10126,12 @@ ${input.slice(result.pos)}
     });
     var ForStatementControl$1 = $TS($S(CoffeeForLoopsEnabled, CoffeeForStatementParameters, $E(WhenCondition)), function($skip, $loc, $0, $1, $2, $3) {
       if ($3) {
-        const indent = module.currentIndent.token + "  ";
-        const block = "continue\n";
+        const block = "continue;";
         $2 = {
           ...$2,
           blockPrefix: [
             ...$2.blockPrefix,
-            [indent, {
+            ["", {
               type: "IfStatement",
               then: block,
               children: ["if (!(", insertTrimmingSpace($3, ""), ")) ", block]
@@ -10168,7 +10198,6 @@ ${input.slice(result.pos)}
       var step = $8;
       var close = $9;
       let blockPrefix = [];
-      const indent = module.currentIndent.token + "  ";
       exp = insertTrimmingSpace(exp, "");
       declaration = insertTrimmingSpace(declaration, "");
       if (kind.token === "from") {
@@ -10182,14 +10211,14 @@ ${input.slice(result.pos)}
         }
         if (declaration.own) {
           const hasPropRef = module.getRef("hasProp");
-          blockPrefix.push([indent, "if (!", hasPropRef, ".call(", exp, ", ", declaration, ")) continue\n"]);
+          blockPrefix.push(["", "if (!", hasPropRef, ".call(", exp, ", ", declaration, ")) continue", ";"]);
         }
         if (index) {
-          blockPrefix.push([indent, {
+          blockPrefix.push(["", {
             type: "AssignmentExpression",
             children: [index, " = ", exp, "[", declaration, "]"],
             names: index.names
-          }, ";\n"]);
+          }, ";"]);
         }
         kind.token = "in";
       } else if (kind.token === "in") {
@@ -10225,11 +10254,11 @@ ${input.slice(result.pos)}
           assignmentNames.push(...index.names);
         }
         const expRefDec = expRef !== exp ? [expRef, " = ", insertTrimmingSpace(exp, ""), ", "] : [];
-        blockPrefix.push([indent, {
+        blockPrefix.push(["", {
           type: "AssignmentExpression",
-          children: [varRef, " = ", expRef, "[", indexAssignment, counterRef, "]\n"],
+          children: [varRef, " = ", expRef, "[", indexAssignment, counterRef, "]"],
           names: assignmentNames
-        }]);
+        }, ";"]);
         declaration = {
           type: "Declaration",
           children: ["let ", ...expRefDec, counterRef, " = 0, ", lenRef, " = ", expRef, ".length"],
@@ -11152,8 +11181,8 @@ ${input.slice(result.pos)}
       const initCondition = {
         type: "AssignmentExpression",
         children: [ref, " ", initializer],
-        hoistDec: [["", ["let ", ref], ";\n"]],
-        blockPrefix: [["", [binding, "= ", ref], ";\n"]]
+        hoistDec: [["", ["let ", ref], ";"]],
+        blockPrefix: [["", [binding, "= ", ref], ";"]]
       };
       return initCondition;
     });
@@ -13865,7 +13894,7 @@ ${input.slice(result.pos)}
       }
     }
     var JSSingleLineComment$0 = $TR($EXPECT($R41, fail, "JSSingleLineComment /\\/\\/(?!\\/)[^\\r\\n]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
-      return { $loc, token: $0 };
+      return { type: "Comment", $loc, token: $0 };
     });
     function JSSingleLineComment(state) {
       let eventData;
@@ -13914,7 +13943,7 @@ ${input.slice(result.pos)}
       }
     }
     var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L94, fail, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L95, fail, 'JSMultiLineComment "*/"')), $EXPECT($R42, fail, "JSMultiLineComment /./"))), $EXPECT($L95, fail, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
-      return { $loc, token: $1 };
+      return { type: "Comment", $loc, token: $1 };
     });
     function JSMultiLineComment(state) {
       let eventData;
@@ -13939,7 +13968,7 @@ ${input.slice(result.pos)}
       }
     }
     var CoffeeSingleLineComment$0 = $TR($EXPECT($R43, fail, "CoffeeSingleLineComment /#(?!##(?!#))([^\\r\\n]*)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
-      return { $loc, token: `//${$1}` };
+      return { type: "Comment", $loc, token: `//${$1}` };
     });
     function CoffeeSingleLineComment(state) {
       let eventData;
@@ -13965,7 +13994,7 @@ ${input.slice(result.pos)}
     }
     var CoffeeMultiLineComment$0 = $TS($S(CoffeeHereCommentStart, $TEXT($EXPECT($R44, fail, "CoffeeMultiLineComment /[^]*?###/"))), function($skip, $loc, $0, $1, $2) {
       $2 = $2.slice(0, $2.length - 3).replace(/\*\//g, "* /");
-      return { $loc, token: `/*${$2}*/` };
+      return { type: "Comment", $loc, token: `/*${$2}*/` };
     });
     function CoffeeMultiLineComment(state) {
       let eventData;
@@ -21397,6 +21426,8 @@ ${input.slice(result.pos)}
             exp.blocks.forEach((block) => insertPush(block, ref));
             return;
         }
+        if (node[node.length - 1]?.type === "SemicolonDelimiter")
+          return;
         node.splice(1, 0, ref, ".push(");
         node.push(")");
       }
@@ -21475,7 +21506,10 @@ ${input.slice(result.pos)}
             if (exp.else)
               insertReturn(exp.else[2]);
             else
-              exp.children.push(["\n", indent, wrapWithReturn()]);
+              exp.children.push(["", {
+                type: "ReturnStatement",
+                children: [";return"]
+              }]);
             return;
           case "PatternMatchingStatement":
             insertReturn(exp.children[0][0]);
@@ -21884,11 +21918,15 @@ ${input.slice(result.pos)}
         const [splices, thisAssignments] = gatherBindingCode(parameters, {
           injectParamProps: f.name === "constructor"
         });
+        const delimiter = {
+          type: "SemicolonDelimiter",
+          children: [";"]
+        };
         const prefix = splices.map((s) => ["let ", s]).concat(thisAssignments).map(
           (s) => s.type ? {
             ...s,
-            children: [indent, ...s.children, ";\n"]
-          } : [indent, s, ";\n"]
+            children: [indent, ...s.children, delimiter]
+          } : [indent, s, delimiter]
         );
         expressions.unshift(...prefix);
       }
@@ -21947,9 +21985,10 @@ ${input.slice(result.pos)}
             getIndent(block.expressions[0]),
             {
               type: "Declaration",
-              children: ["let ", ref, returnType, ";\n"],
+              children: ["let ", ref, returnType],
               names: []
-            }
+            },
+            ";"
           ]);
         }
         gatherRecursiveWithinFunction(
@@ -21961,7 +22000,7 @@ ${input.slice(result.pos)}
         });
         if (block.children.at(-2)?.type !== "ReturnStatement") {
           block.expressions.push([
-            ["\n", getIndent(block.expressions.at(-1))],
+            [getIndent(block.expressions.at(-1))],
             {
               type: "ReturnStatement",
               expression: ref,
@@ -22445,11 +22484,11 @@ ${input.slice(result.pos)}
                 let [splices, thisAssignments] = gatherBindingCode(pattern);
                 const patternBindings = nonMatcherBindings(pattern);
                 splices = splices.map((s2) => [", ", nonMatcherBindings(s2)]);
-                thisAssignments = thisAssignments.map((a) => [indent, a, ";\n"]);
+                thisAssignments = thisAssignments.map((a) => [indent, a, ";"]);
                 const duplicateDeclarations = aggregateDuplicateBindings([patternBindings, splices]);
-                prefix.push([indent, "const ", patternBindings, " = ", ref, splices, ";\n"]);
+                prefix.push([indent, "const ", patternBindings, " = ", ref, splices, ";"]);
                 prefix.push(...thisAssignments);
-                prefix.push(...duplicateDeclarations.map((d) => [indent, d, ";\n"]));
+                prefix.push(...duplicateDeclarations.map((d) => [indent, d, ";"]));
                 break;
               }
             }
@@ -22604,6 +22643,11 @@ ${input.slice(result.pos)}
         });
       }
       module.processProgram = function(root) {
+        assert.equal(module.forbidClassImplicitCall.length, 1, "forbidClassImplicitCall");
+        assert.equal(module.forbidIndentedApplication.length, 1, "forbidIndentedApplication");
+        assert.equal(module.forbidTrailingMemberProperty.length, 1, "forbidTrailingMemberProperty");
+        assert.equal(module.forbidMultiLineImplicitObjectLiteral.length, 1, "forbidMultiLineImplicitObjectLiteral");
+        assert.equal(module.JSXTagStack.length, 0, "JSXTagStack should be empty");
         addParentPointers(root);
         const { expressions: statements } = root;
         processPipelineExpressions(statements);
@@ -22697,7 +22741,11 @@ ${input.slice(result.pos)}
         });
         if (varIds.length) {
           const indent = getIndent(statements[0]);
-          statements.unshift([indent, "var ", varIds.join(", "), "\n"]);
+          let delimiter = ";";
+          if (statements[0][1]?.parent?.root) {
+            delimiter = ";\n";
+          }
+          statements.unshift([indent, "var ", varIds.join(", "), delimiter]);
         }
         scopes.pop();
       }
@@ -23138,6 +23186,13 @@ ${input.slice(result.pos)}
       quoteString,
       removeParentPointers
     } = require_lib();
+    var assert = {
+      equal(a, b, msg) {
+        if (a !== b) {
+          throw new Error(`Assertion failed [${msg}]: ${a} !== ${b}`);
+        }
+      }
+    };
   }
 });
 
@@ -23565,7 +23620,7 @@ var parse;
 var uncacheable;
 ({ parse } = import_parser.default);
 ({ SourceMap: SourceMap2, base64Encode: base64Encode2 } = util_exports);
-uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "AllowAll", "AllowClassImplicitCall", "AllowIndentedApplication", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "ClassImplicitCallForbidden", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "Declaration", "Debugger", "ElementListWithIndentedApplicationForbidden", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidClassImplicitCall", "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", "RestoreClassImplicitCall", "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", "AllowClassImplicitCall", "AllowIndentedApplication", "AllowMultiLineImplicitObjectLiteral", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "ClassImplicitCallForbidden", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "Declaration", "Debugger", "ElementListWithIndentedApplicationForbidden", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidClassImplicitCall", "ForbidIndentedApplication", "ForbidMultiLineImplicitObjectLiteral", "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", "RestoreClassImplicitCall", "RestoreMultiLineImplicitObjectLiteral", "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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.5.87",
+  "version": "0.5.89",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",