@danielx/civet 0.5.18 → 0.5.20

package/README.md

@@ -193,6 +193,9 @@ Things Added that CoffeeScript didn't
   - Private identifiers `#id`
 - Convenience for ES6+ Features
   - Const assignment shorthand: `a := b` → `const a = b`, `{a, b} := c` → `const {a, b} = c`
+  - Let assignment shorthand (experimental): `a .= b` or `a ::= b` → `let a = b`
+  - Typed versions of above: `a: number .= 5` → `let a: number = 5`
+    (but note that `a: number = 5` is the object literal `{a: (number = 5)}`).
   - `@#id` → `this.#id` shorthand for private identifiers
   - `import` shorthand: `x from ./x` → `import x from "./x"`
   - Dynamic `import` shorthand: `import './x'` not at top level
@@ -209,6 +212,13 @@ Things Added that CoffeeScript didn't
   - Function call: `x.map &.callback a, b` → `x.map($ => $.callback(a, b))`
   - Unary operators: `x.map !!&` → `x.map($ => !!$)`
   - Binary operators: `x.map &+1` → `x.map($ => $+1)`
+- Pipe operator (based on [F# pipes](https://learn.microsoft.com/en-us/dotnet/fsharp/language-reference/symbol-and-operator-reference/#function-symbols-and-operators), [Hack pipes](https://docs.hhvm.com/hack/expressions-and-operators/pipe) and the [TC39 proposal](https://github.com/tc39/proposal-pipeline-operator))
+  - `data |> Object.keys |> console.log` equivalent to
+    `console.log(Object.keys(data))`
+  - Use single-argument arrow functions or `&` shorthand
+    to specify how to use left-hand side
+  - `|> await`, `|> yield`, and `|> return` (at end)
+    for wrapping left-hand side with that operation
 - Flagging shorthand [from LiveScript](https://livescript.net/#literals) `{+debug, -live}` → `{debug: true, live: false}`
 - JSX enhancements (inspired by [solid-dsl discussions](https://github.com/solidjs-community/solid-dsl/discussions)):
   - Indentation: instead of explicitly closing `<tag>`s or `<>`s,
@@ -239,6 +249,7 @@ Things Added that CoffeeScript didn't
     `"civet solid server"` for server-only code (SSR only), or
     `"civet solid client server"` for isomorphic code that runs on
     client and server (SSR + hydration).
+  - XML comments: `<!-- ... -->` → `{/* ... */}`
 - CoffeeScript improvements
   - Postfix loop `run() loop` → `while(true) run()`
   - Character range literals `["a".."z"]`, `['f'..'a']`, `['0'..'9']`
@@ -251,7 +262,9 @@ Things Added that CoffeeScript didn't
 Things Changed from ES6
 ---
 
-- Implicit returns
+- Implicit returns, even for multi-statement functions
+  (avoid by adding a trailing `;`, an explicit `return`, or
+  via the directive `"civet -implicitReturns"`)
 - Disallow no parens on single argument arrow function. `x => ...` must become `(x) => ...`
   The reasoning is `x -> ...` => `x(function() ...)` in CoffeeScript and having `->` and `=>`
   behave more differently than they already do is bad. Passing an anonymous function to an

package/dist/browser.js

@@ -692,6 +692,7 @@ ${input.slice(result.pos)}
         Whitespace,
         ExpressionDelimiter,
         StatementDelimiter,
+        SemicolonDelimiter,
         NonIdContinue,
         Loc,
         Abstract,
@@ -799,6 +800,8 @@ ${input.slice(result.pos)}
         JSXChildren,
         JSXNestedChildren,
         JSXChild,
+        JSXComment,
+        JSXCommentContent,
         JSXText,
         JSXChildExpression,
         TypeDeclaration,
@@ -1045,15 +1048,17 @@ ${input.slice(result.pos)}
       var $L154 = $L("</");
       var $L155 = $L("<>");
       var $L156 = $L("</>");
-      var $L157 = $L("declare");
-      var $L158 = $L("type");
-      var $L159 = $L("interface");
-      var $L160 = $L("namespace");
-      var $L161 = $L("asserts");
-      var $L162 = $L("keyof");
-      var $L163 = $L("infer");
-      var $L164 = $L("[]");
-      var $L165 = $L("civet");
+      var $L157 = $L("<!--");
+      var $L158 = $L("-->");
+      var $L159 = $L("declare");
+      var $L160 = $L("type");
+      var $L161 = $L("interface");
+      var $L162 = $L("namespace");
+      var $L163 = $L("asserts");
+      var $L164 = $L("keyof");
+      var $L165 = $L("infer");
+      var $L166 = $L("[]");
+      var $L167 = $L("civet");
       var $R0 = $R(new RegExp("(for|of|then|when)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
       var $R1 = $R(new RegExp("[&]", "suy"));
       var $R2 = $R(new RegExp("[!~+-]+", "suy"));
@@ -1101,14 +1106,15 @@ ${input.slice(result.pos)}
       var $R44 = $R(new RegExp("\\s", "suy"));
       var $R45 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
       var $R46 = $R(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
-      var $R47 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
-      var $R48 = $R(new RegExp("[+-]?", "suy"));
-      var $R49 = $R(new RegExp("#![^\\r\\n]*", "suy"));
-      var $R50 = $R(new RegExp("[\\t ]*", "suy"));
-      var $R51 = $R(new RegExp("[\\s]*", "suy"));
-      var $R52 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
-      var $R53 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
-      var $R54 = $R(new RegExp("[ \\t]*", "suy"));
+      var $R47 = $R(new RegExp("(?:-[^-]|[^-]*)*", "suy"));
+      var $R48 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
+      var $R49 = $R(new RegExp("[+-]?", "suy"));
+      var $R50 = $R(new RegExp("#![^\\r\\n]*", "suy"));
+      var $R51 = $R(new RegExp("[\\t ]*", "suy"));
+      var $R52 = $R(new RegExp("[\\s]*", "suy"));
+      var $R53 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
+      var $R54 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
+      var $R55 = $R(new RegExp("[ \\t]*", "suy"));
       var Program$0 = $TS($S(Reset, Init, __, $Q(TopLevelStatement), __), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         var statements = $4;
         module.processProgram(statements);
@@ -2099,7 +2105,8 @@ ${input.slice(result.pos)}
       }
       var PipelineTailItem$0 = Await;
       var PipelineTailItem$1 = Yield;
-      var PipelineTailItem$2 = PipelineHeadItem;
+      var PipelineTailItem$2 = Return;
+      var PipelineTailItem$3 = PipelineHeadItem;
       function PipelineTailItem(state) {
         if (state.events) {
           const result = state.events.enter?.("PipelineTailItem", state);
@@ -2107,12 +2114,12 @@ ${input.slice(result.pos)}
             return result.cache;
         }
         if (state.tokenize) {
-          const result = $TOKEN("PipelineTailItem", state, PipelineTailItem$0(state) || PipelineTailItem$1(state) || PipelineTailItem$2(state));
+          const result = $TOKEN("PipelineTailItem", state, PipelineTailItem$0(state) || PipelineTailItem$1(state) || PipelineTailItem$2(state) || PipelineTailItem$3(state));
           if (state.events)
             state.events.exit?.("PipelineTailItem", state, result);
           return result;
         } else {
-          const result = PipelineTailItem$0(state) || PipelineTailItem$1(state) || PipelineTailItem$2(state);
+          const result = PipelineTailItem$0(state) || PipelineTailItem$1(state) || PipelineTailItem$2(state) || PipelineTailItem$3(state);
           if (state.events)
             state.events.exit?.("PipelineTailItem", state, result);
           return result;
@@ -4060,7 +4067,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var SingleLineStatements$0 = $TS($S($S($Q(TrailingComment), Statement), $Q($S($S($Q(TrailingComment), Semicolon, $Q(TrailingComment)), Statement))), function($skip, $loc, $0, $1, $2) {
+      var SingleLineStatements$0 = $TS($S($S($Q(TrailingComment), Statement), $Q($S(SemicolonDelimiter, $E(Statement)))), function($skip, $loc, $0, $1, $2) {
         var first = $1;
         var rest = $2;
         if (rest.length) {
@@ -9251,7 +9258,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var StatementDelimiter$0 = $S($Q(TrailingComment), Semicolon, $Q(TrailingComment));
+      var StatementDelimiter$0 = SemicolonDelimiter;
       var StatementDelimiter$1 = $Y(EOS);
       function StatementDelimiter(state) {
         if (state.events) {
@@ -9271,6 +9278,30 @@ ${input.slice(result.pos)}
           return result;
         }
       }
+      var SemicolonDelimiter$0 = $TS($S($Q(TrailingComment), Semicolon, $Q(TrailingComment)), function($skip, $loc, $0, $1, $2, $3) {
+        return {
+          type: "SemicolonDelimiter",
+          children: $0
+        };
+      });
+      function SemicolonDelimiter(state) {
+        if (state.events) {
+          const result = state.events.enter?.("SemicolonDelimiter", state);
+          if (result)
+            return result.cache;
+        }
+        if (state.tokenize) {
+          const result = $TOKEN("SemicolonDelimiter", state, SemicolonDelimiter$0(state));
+          if (state.events)
+            state.events.exit?.("SemicolonDelimiter", state, result);
+          return result;
+        } else {
+          const result = SemicolonDelimiter$0(state);
+          if (state.events)
+            state.events.exit?.("SemicolonDelimiter", state, result);
+          return result;
+        }
+      }
       var NonIdContinue$0 = $R$0($EXPECT($R43, fail, "NonIdContinue /(?!\\p{ID_Continue})/"));
       function NonIdContinue(state) {
         if (state.events) {
@@ -11150,7 +11181,23 @@ ${input.slice(result.pos)}
             if (stringPart) {
               exprs.unshift(JSON.stringify(stringPart), ", ");
             }
-            classValue = ["{[", ...exprs, '].filter(Boolean).join(" ")}'];
+            if (exprs.length === 1) {
+              let root = exprs[0];
+              while (root.length && module.isWhitespaceOrEmpty(root[root.length - 1])) {
+                root = root.slice(0, -1);
+              }
+              while (root?.length === 1)
+                root = root[0];
+              if (root?.children)
+                root = root.children;
+              if (root?.[0]?.token === "`") {
+                classValue = ["{", ...exprs, "}"];
+              } else {
+                classValue = ["{(", ...exprs, ') || ""}'];
+              }
+            } else {
+              classValue = ["{[", ...exprs, '].filter(Boolean).join(" ")}'];
+            }
           } else {
             classValue = JSON.stringify(stringPart);
           }
@@ -11706,7 +11753,8 @@ ${input.slice(result.pos)}
       }
       var JSXChild$0 = JSXElement;
       var JSXChild$1 = JSXFragment;
-      var JSXChild$2 = $TS($S(OpenBrace, $E(JSXChildExpression), __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var JSXChild$2 = JSXComment;
+      var JSXChild$3 = $TS($S(OpenBrace, $E(JSXChildExpression), __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
         var expression = $2;
         return {
           type: "JSXChildExpression",
@@ -11714,7 +11762,7 @@ ${input.slice(result.pos)}
           expression
         };
       });
-      var JSXChild$3 = $TS($S(InsertInlineOpenBrace, ArrowFunction, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3) {
+      var JSXChild$4 = $TS($S(InsertInlineOpenBrace, ArrowFunction, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3) {
         var expression = $2;
         return {
           type: "JSXChildExpression",
@@ -11722,7 +11770,7 @@ ${input.slice(result.pos)}
           expression
         };
       });
-      var JSXChild$4 = JSXText;
+      var JSXChild$5 = JSXText;
       function JSXChild(state) {
         if (state.events) {
           const result = state.events.enter?.("JSXChild", state);
@@ -11730,18 +11778,60 @@ ${input.slice(result.pos)}
             return result.cache;
         }
         if (state.tokenize) {
-          const result = $TOKEN("JSXChild", state, JSXChild$0(state) || JSXChild$1(state) || JSXChild$2(state) || JSXChild$3(state) || JSXChild$4(state));
+          const result = $TOKEN("JSXChild", state, JSXChild$0(state) || JSXChild$1(state) || JSXChild$2(state) || JSXChild$3(state) || JSXChild$4(state) || JSXChild$5(state));
           if (state.events)
             state.events.exit?.("JSXChild", state, result);
           return result;
         } else {
-          const result = JSXChild$0(state) || JSXChild$1(state) || JSXChild$2(state) || JSXChild$3(state) || JSXChild$4(state);
+          const result = JSXChild$0(state) || JSXChild$1(state) || JSXChild$2(state) || JSXChild$3(state) || JSXChild$4(state) || JSXChild$5(state);
           if (state.events)
             state.events.exit?.("JSXChild", state, result);
           return result;
         }
       }
-      var JSXText$0 = $TR($EXPECT($R47, fail, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var JSXComment$0 = $TS($S($EXPECT($L157, fail, 'JSXComment "<!--"'), JSXCommentContent, $EXPECT($L158, fail, 'JSXComment "-->"')), function($skip, $loc, $0, $1, $2, $3) {
+        return ["{/*", $2, "*/}"];
+      });
+      function JSXComment(state) {
+        if (state.events) {
+          const result = state.events.enter?.("JSXComment", state);
+          if (result)
+            return result.cache;
+        }
+        if (state.tokenize) {
+          const result = $TOKEN("JSXComment", state, JSXComment$0(state));
+          if (state.events)
+            state.events.exit?.("JSXComment", state, result);
+          return result;
+        } else {
+          const result = JSXComment$0(state);
+          if (state.events)
+            state.events.exit?.("JSXComment", state, result);
+          return result;
+        }
+      }
+      var JSXCommentContent$0 = $TR($EXPECT($R47, fail, "JSXCommentContent /(?:-[^-]|[^-]*)*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+        return { $loc, token: $0.replace(/\*\//g, "* /") };
+      });
+      function JSXCommentContent(state) {
+        if (state.events) {
+          const result = state.events.enter?.("JSXCommentContent", state);
+          if (result)
+            return result.cache;
+        }
+        if (state.tokenize) {
+          const result = $TOKEN("JSXCommentContent", state, JSXCommentContent$0(state));
+          if (state.events)
+            state.events.exit?.("JSXCommentContent", state, result);
+          return result;
+        } else {
+          const result = JSXCommentContent$0(state);
+          if (state.events)
+            state.events.exit?.("JSXCommentContent", state, result);
+          return result;
+        }
+      }
+      var JSXText$0 = $TR($EXPECT($R48, fail, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return {
           type: "JSXText",
           token: $0,
@@ -11806,7 +11896,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TypeDeclarationModifier$0 = $S($EXPECT($L157, fail, 'TypeDeclarationModifier "declare"'), NonIdContinue);
+      var TypeDeclarationModifier$0 = $S($EXPECT($L159, fail, 'TypeDeclarationModifier "declare"'), NonIdContinue);
       var TypeDeclarationModifier$1 = Export;
       function TypeDeclarationModifier(state) {
         if (state.events) {
@@ -11848,7 +11938,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TypeKeyword$0 = $S($EXPECT($L158, fail, 'TypeKeyword "type"'), NonIdContinue);
+      var TypeKeyword$0 = $S($EXPECT($L160, fail, 'TypeKeyword "type"'), NonIdContinue);
       function TypeKeyword(state) {
         if (state.events) {
           const result = state.events.enter?.("TypeKeyword", state);
@@ -11867,7 +11957,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Interface$0 = $S($EXPECT($L159, fail, 'Interface "interface"'), NonIdContinue);
+      var Interface$0 = $S($EXPECT($L161, fail, 'Interface "interface"'), NonIdContinue);
       function Interface(state) {
         if (state.events) {
           const result = state.events.enter?.("Interface", state);
@@ -11886,7 +11976,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Namespace$0 = $S($EXPECT($L160, fail, 'Namespace "namespace"'), NonIdContinue);
+      var Namespace$0 = $S($EXPECT($L162, fail, 'Namespace "namespace"'), NonIdContinue);
       function Namespace(state) {
         if (state.events) {
           const result = state.events.enter?.("Namespace", state);
@@ -12075,7 +12165,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R48, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L129, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R4, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
+      var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R49, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L129, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R4, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
       function TypeIndexSignature(state) {
         if (state.events) {
           const result = state.events.enter?.("TypeIndexSignature", state);
@@ -12135,7 +12225,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var ReturnTypeSuffix$0 = $TS($S(__, Colon, $E($S(__, $EXPECT($L161, fail, 'ReturnTypeSuffix "asserts"'), NonIdContinue)), TypePredicate), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var ReturnTypeSuffix$0 = $TS($S(__, Colon, $E($S(__, $EXPECT($L163, fail, 'ReturnTypeSuffix "asserts"'), NonIdContinue)), TypePredicate), function($skip, $loc, $0, $1, $2, $3, $4) {
         const children = [...$1, $2];
         if ($3)
           children.push($3);
@@ -12270,9 +12360,9 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TypeUnaryOp$0 = $EXPECT($L162, fail, 'TypeUnaryOp "keyof"');
+      var TypeUnaryOp$0 = $EXPECT($L164, fail, 'TypeUnaryOp "keyof"');
       var TypeUnaryOp$1 = $EXPECT($L145, fail, 'TypeUnaryOp "typeof"');
-      var TypeUnaryOp$2 = $EXPECT($L163, fail, 'TypeUnaryOp "infer"');
+      var TypeUnaryOp$2 = $EXPECT($L165, fail, 'TypeUnaryOp "infer"');
       var TypeUnaryOp$3 = $EXPECT($L129, fail, 'TypeUnaryOp "readonly"');
       function TypeUnaryOp(state) {
         if (state.events) {
@@ -12445,7 +12535,7 @@ ${input.slice(result.pos)}
       var TypeLiteral$2 = $TV($EXPECT($L149, fail, 'TypeLiteral "void"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "void" };
       });
-      var TypeLiteral$3 = $TV($EXPECT($L164, fail, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
+      var TypeLiteral$3 = $TV($EXPECT($L166, fail, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "[]" };
       });
       function TypeLiteral(state) {
@@ -12677,7 +12767,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Shebang$0 = $S($R$0($EXPECT($R49, fail, "Shebang /#![^\\r\\n]*/")), EOL);
+      var Shebang$0 = $S($R$0($EXPECT($R50, fail, "Shebang /#![^\\r\\n]*/")), EOL);
       function Shebang(state) {
         if (state.events) {
           const result = state.events.enter?.("Shebang", state);
@@ -12696,11 +12786,11 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var CivetPrologue$0 = $T($S($EXPECT($R50, fail, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, $TEXT(StatementDelimiter), $E(EOS)), function(value) {
+      var CivetPrologue$0 = $T($S($EXPECT($R51, fail, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, $TEXT(StatementDelimiter), $E(EOS)), function(value) {
         var content = value[2];
         return content;
       });
-      var CivetPrologue$1 = $T($S($EXPECT($R50, fail, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, $TEXT(StatementDelimiter), $E(EOS)), function(value) {
+      var CivetPrologue$1 = $T($S($EXPECT($R51, fail, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, $TEXT(StatementDelimiter), $E(EOS)), function(value) {
         var content = value[2];
         return content;
       });
@@ -12722,7 +12812,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var CivetPrologueContent$0 = $TS($S($EXPECT($L165, fail, 'CivetPrologueContent "civet"'), $Q(CivetOption), $EXPECT($R51, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3) {
+      var CivetPrologueContent$0 = $TS($S($EXPECT($L167, fail, 'CivetPrologueContent "civet"'), $Q(CivetOption), $EXPECT($R52, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3) {
         var options = $2;
         return {
           type: "CivetPrologue",
@@ -12748,7 +12838,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var CivetOption$0 = $TR($EXPECT($R52, fail, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var CivetOption$0 = $TR($EXPECT($R53, fail, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         const optionName = $2.replace(/-+([a-z]?)/g, (_2, l) => {
           if (l)
             return l.toUpperCase();
@@ -12780,7 +12870,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var UnknownPrologue$0 = $S($R$0($EXPECT($R50, fail, "UnknownPrologue /[\\t ]*/")), BasicStringLiteral, $TEXT(StatementDelimiter), EOS);
+      var UnknownPrologue$0 = $S($R$0($EXPECT($R51, fail, "UnknownPrologue /[\\t ]*/")), BasicStringLiteral, $TEXT(StatementDelimiter), EOS);
       function UnknownPrologue(state) {
         if (state.events) {
           const result = state.events.enter?.("UnknownPrologue", state);
@@ -12838,7 +12928,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var EOL$0 = $TR($EXPECT($R53, fail, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var EOL$0 = $TR($EXPECT($R54, fail, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function EOL(state) {
@@ -13939,6 +14029,8 @@ ${input.slice(result.pos)}
                 insertReturn(exp.children[2][3]);
               return;
           }
+          if (node[node.length - 1]?.type === "SemicolonDelimiter")
+            return;
           node.splice(1, 0, "return ");
         }
         module.isWhitespaceOrEmpty = function(node) {
@@ -13946,6 +14038,8 @@ ${input.slice(result.pos)}
             return true;
           if (node.token)
             return node.token.match(/^\s*$/);
+          if (node.children)
+            node = node.children;
           if (!node.length)
             return true;
           if (typeof node === "string")
@@ -14598,7 +14692,7 @@ ${input.slice(result.pos)}
           }
         };
         module.constructPipeStep = function(caller, callee) {
-          if (caller.expr.token === "yield" || caller.expr.token === "await") {
+          if (caller.expr.token === "yield" || caller.expr.token === "await" || caller.expr.token === "return") {
             return [caller.leadingComment, caller.expr, caller.trailingComment, " ", callee.leadingComment, callee.expr, callee.trailingComment];
           }
           return module.constructInvocation(caller, callee);
@@ -14623,7 +14717,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Indent$0 = $TR($EXPECT($R54, fail, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var Indent$0 = $TR($EXPECT($R55, fail, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         let level;
         if (module.config.tab) {
           const tabs = $0.match(/\t/g);

package/dist/main.js

@@ -691,6 +691,7 @@ ${input.slice(result.pos)}
       Whitespace,
       ExpressionDelimiter,
       StatementDelimiter,
+      SemicolonDelimiter,
       NonIdContinue,
       Loc,
       Abstract,
@@ -798,6 +799,8 @@ ${input.slice(result.pos)}
       JSXChildren,
       JSXNestedChildren,
       JSXChild,
+      JSXComment,
+      JSXCommentContent,
       JSXText,
       JSXChildExpression,
       TypeDeclaration,
@@ -1044,15 +1047,17 @@ ${input.slice(result.pos)}
     var $L154 = $L("</");
     var $L155 = $L("<>");
     var $L156 = $L("</>");
-    var $L157 = $L("declare");
-    var $L158 = $L("type");
-    var $L159 = $L("interface");
-    var $L160 = $L("namespace");
-    var $L161 = $L("asserts");
-    var $L162 = $L("keyof");
-    var $L163 = $L("infer");
-    var $L164 = $L("[]");
-    var $L165 = $L("civet");
+    var $L157 = $L("<!--");
+    var $L158 = $L("-->");
+    var $L159 = $L("declare");
+    var $L160 = $L("type");
+    var $L161 = $L("interface");
+    var $L162 = $L("namespace");
+    var $L163 = $L("asserts");
+    var $L164 = $L("keyof");
+    var $L165 = $L("infer");
+    var $L166 = $L("[]");
+    var $L167 = $L("civet");
     var $R0 = $R(new RegExp("(for|of|then|when)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
     var $R1 = $R(new RegExp("[&]", "suy"));
     var $R2 = $R(new RegExp("[!~+-]+", "suy"));
@@ -1100,14 +1105,15 @@ ${input.slice(result.pos)}
     var $R44 = $R(new RegExp("\\s", "suy"));
     var $R45 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
     var $R46 = $R(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
-    var $R47 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
-    var $R48 = $R(new RegExp("[+-]?", "suy"));
-    var $R49 = $R(new RegExp("#![^\\r\\n]*", "suy"));
-    var $R50 = $R(new RegExp("[\\t ]*", "suy"));
-    var $R51 = $R(new RegExp("[\\s]*", "suy"));
-    var $R52 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
-    var $R53 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
-    var $R54 = $R(new RegExp("[ \\t]*", "suy"));
+    var $R47 = $R(new RegExp("(?:-[^-]|[^-]*)*", "suy"));
+    var $R48 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
+    var $R49 = $R(new RegExp("[+-]?", "suy"));
+    var $R50 = $R(new RegExp("#![^\\r\\n]*", "suy"));
+    var $R51 = $R(new RegExp("[\\t ]*", "suy"));
+    var $R52 = $R(new RegExp("[\\s]*", "suy"));
+    var $R53 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
+    var $R54 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
+    var $R55 = $R(new RegExp("[ \\t]*", "suy"));
     var Program$0 = $TS($S(Reset, Init, __, $Q(TopLevelStatement), __), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var statements = $4;
       module2.processProgram(statements);
@@ -2098,7 +2104,8 @@ ${input.slice(result.pos)}
     }
     var PipelineTailItem$0 = Await;
     var PipelineTailItem$1 = Yield;
-    var PipelineTailItem$2 = PipelineHeadItem;
+    var PipelineTailItem$2 = Return;
+    var PipelineTailItem$3 = PipelineHeadItem;
     function PipelineTailItem(state) {
       if (state.events) {
         const result = state.events.enter?.("PipelineTailItem", state);
@@ -2106,12 +2113,12 @@ ${input.slice(result.pos)}
           return result.cache;
       }
       if (state.tokenize) {
-        const result = $TOKEN("PipelineTailItem", state, PipelineTailItem$0(state) || PipelineTailItem$1(state) || PipelineTailItem$2(state));
+        const result = $TOKEN("PipelineTailItem", state, PipelineTailItem$0(state) || PipelineTailItem$1(state) || PipelineTailItem$2(state) || PipelineTailItem$3(state));
         if (state.events)
           state.events.exit?.("PipelineTailItem", state, result);
         return result;
       } else {
-        const result = PipelineTailItem$0(state) || PipelineTailItem$1(state) || PipelineTailItem$2(state);
+        const result = PipelineTailItem$0(state) || PipelineTailItem$1(state) || PipelineTailItem$2(state) || PipelineTailItem$3(state);
         if (state.events)
           state.events.exit?.("PipelineTailItem", state, result);
         return result;
@@ -4059,7 +4066,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var SingleLineStatements$0 = $TS($S($S($Q(TrailingComment), Statement), $Q($S($S($Q(TrailingComment), Semicolon, $Q(TrailingComment)), Statement))), function($skip, $loc, $0, $1, $2) {
+    var SingleLineStatements$0 = $TS($S($S($Q(TrailingComment), Statement), $Q($S(SemicolonDelimiter, $E(Statement)))), function($skip, $loc, $0, $1, $2) {
       var first = $1;
       var rest = $2;
       if (rest.length) {
@@ -9250,7 +9257,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var StatementDelimiter$0 = $S($Q(TrailingComment), Semicolon, $Q(TrailingComment));
+    var StatementDelimiter$0 = SemicolonDelimiter;
     var StatementDelimiter$1 = $Y(EOS);
     function StatementDelimiter(state) {
       if (state.events) {
@@ -9270,6 +9277,30 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var SemicolonDelimiter$0 = $TS($S($Q(TrailingComment), Semicolon, $Q(TrailingComment)), function($skip, $loc, $0, $1, $2, $3) {
+      return {
+        type: "SemicolonDelimiter",
+        children: $0
+      };
+    });
+    function SemicolonDelimiter(state) {
+      if (state.events) {
+        const result = state.events.enter?.("SemicolonDelimiter", state);
+        if (result)
+          return result.cache;
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("SemicolonDelimiter", state, SemicolonDelimiter$0(state));
+        if (state.events)
+          state.events.exit?.("SemicolonDelimiter", state, result);
+        return result;
+      } else {
+        const result = SemicolonDelimiter$0(state);
+        if (state.events)
+          state.events.exit?.("SemicolonDelimiter", state, result);
+        return result;
+      }
+    }
     var NonIdContinue$0 = $R$0($EXPECT($R43, fail, "NonIdContinue /(?!\\p{ID_Continue})/"));
     function NonIdContinue(state) {
       if (state.events) {
@@ -11149,7 +11180,23 @@ ${input.slice(result.pos)}
           if (stringPart) {
             exprs.unshift(JSON.stringify(stringPart), ", ");
           }
-          classValue = ["{[", ...exprs, '].filter(Boolean).join(" ")}'];
+          if (exprs.length === 1) {
+            let root = exprs[0];
+            while (root.length && module2.isWhitespaceOrEmpty(root[root.length - 1])) {
+              root = root.slice(0, -1);
+            }
+            while (root?.length === 1)
+              root = root[0];
+            if (root?.children)
+              root = root.children;
+            if (root?.[0]?.token === "`") {
+              classValue = ["{", ...exprs, "}"];
+            } else {
+              classValue = ["{(", ...exprs, ') || ""}'];
+            }
+          } else {
+            classValue = ["{[", ...exprs, '].filter(Boolean).join(" ")}'];
+          }
         } else {
           classValue = JSON.stringify(stringPart);
         }
@@ -11705,7 +11752,8 @@ ${input.slice(result.pos)}
     }
     var JSXChild$0 = JSXElement;
     var JSXChild$1 = JSXFragment;
-    var JSXChild$2 = $TS($S(OpenBrace, $E(JSXChildExpression), __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var JSXChild$2 = JSXComment;
+    var JSXChild$3 = $TS($S(OpenBrace, $E(JSXChildExpression), __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
       var expression = $2;
       return {
         type: "JSXChildExpression",
@@ -11713,7 +11761,7 @@ ${input.slice(result.pos)}
         expression
       };
     });
-    var JSXChild$3 = $TS($S(InsertInlineOpenBrace, ArrowFunction, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3) {
+    var JSXChild$4 = $TS($S(InsertInlineOpenBrace, ArrowFunction, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3) {
       var expression = $2;
       return {
         type: "JSXChildExpression",
@@ -11721,7 +11769,7 @@ ${input.slice(result.pos)}
         expression
       };
     });
-    var JSXChild$4 = JSXText;
+    var JSXChild$5 = JSXText;
     function JSXChild(state) {
       if (state.events) {
         const result = state.events.enter?.("JSXChild", state);
@@ -11729,18 +11777,60 @@ ${input.slice(result.pos)}
           return result.cache;
       }
       if (state.tokenize) {
-        const result = $TOKEN("JSXChild", state, JSXChild$0(state) || JSXChild$1(state) || JSXChild$2(state) || JSXChild$3(state) || JSXChild$4(state));
+        const result = $TOKEN("JSXChild", state, JSXChild$0(state) || JSXChild$1(state) || JSXChild$2(state) || JSXChild$3(state) || JSXChild$4(state) || JSXChild$5(state));
         if (state.events)
           state.events.exit?.("JSXChild", state, result);
         return result;
       } else {
-        const result = JSXChild$0(state) || JSXChild$1(state) || JSXChild$2(state) || JSXChild$3(state) || JSXChild$4(state);
+        const result = JSXChild$0(state) || JSXChild$1(state) || JSXChild$2(state) || JSXChild$3(state) || JSXChild$4(state) || JSXChild$5(state);
         if (state.events)
           state.events.exit?.("JSXChild", state, result);
         return result;
       }
     }
-    var JSXText$0 = $TR($EXPECT($R47, fail, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+    var JSXComment$0 = $TS($S($EXPECT($L157, fail, 'JSXComment "<!--"'), JSXCommentContent, $EXPECT($L158, fail, 'JSXComment "-->"')), function($skip, $loc, $0, $1, $2, $3) {
+      return ["{/*", $2, "*/}"];
+    });
+    function JSXComment(state) {
+      if (state.events) {
+        const result = state.events.enter?.("JSXComment", state);
+        if (result)
+          return result.cache;
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("JSXComment", state, JSXComment$0(state));
+        if (state.events)
+          state.events.exit?.("JSXComment", state, result);
+        return result;
+      } else {
+        const result = JSXComment$0(state);
+        if (state.events)
+          state.events.exit?.("JSXComment", state, result);
+        return result;
+      }
+    }
+    var JSXCommentContent$0 = $TR($EXPECT($R47, fail, "JSXCommentContent /(?:-[^-]|[^-]*)*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      return { $loc, token: $0.replace(/\*\//g, "* /") };
+    });
+    function JSXCommentContent(state) {
+      if (state.events) {
+        const result = state.events.enter?.("JSXCommentContent", state);
+        if (result)
+          return result.cache;
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("JSXCommentContent", state, JSXCommentContent$0(state));
+        if (state.events)
+          state.events.exit?.("JSXCommentContent", state, result);
+        return result;
+      } else {
+        const result = JSXCommentContent$0(state);
+        if (state.events)
+          state.events.exit?.("JSXCommentContent", state, result);
+        return result;
+      }
+    }
+    var JSXText$0 = $TR($EXPECT($R48, fail, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
       return {
         type: "JSXText",
         token: $0,
@@ -11805,7 +11895,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeDeclarationModifier$0 = $S($EXPECT($L157, fail, 'TypeDeclarationModifier "declare"'), NonIdContinue);
+    var TypeDeclarationModifier$0 = $S($EXPECT($L159, fail, 'TypeDeclarationModifier "declare"'), NonIdContinue);
     var TypeDeclarationModifier$1 = Export;
     function TypeDeclarationModifier(state) {
       if (state.events) {
@@ -11847,7 +11937,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeKeyword$0 = $S($EXPECT($L158, fail, 'TypeKeyword "type"'), NonIdContinue);
+    var TypeKeyword$0 = $S($EXPECT($L160, fail, 'TypeKeyword "type"'), NonIdContinue);
     function TypeKeyword(state) {
       if (state.events) {
         const result = state.events.enter?.("TypeKeyword", state);
@@ -11866,7 +11956,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Interface$0 = $S($EXPECT($L159, fail, 'Interface "interface"'), NonIdContinue);
+    var Interface$0 = $S($EXPECT($L161, fail, 'Interface "interface"'), NonIdContinue);
     function Interface(state) {
       if (state.events) {
         const result = state.events.enter?.("Interface", state);
@@ -11885,7 +11975,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Namespace$0 = $S($EXPECT($L160, fail, 'Namespace "namespace"'), NonIdContinue);
+    var Namespace$0 = $S($EXPECT($L162, fail, 'Namespace "namespace"'), NonIdContinue);
     function Namespace(state) {
       if (state.events) {
         const result = state.events.enter?.("Namespace", state);
@@ -12074,7 +12164,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R48, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L129, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R4, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
+    var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R49, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L129, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R4, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
     function TypeIndexSignature(state) {
       if (state.events) {
         const result = state.events.enter?.("TypeIndexSignature", state);
@@ -12134,7 +12224,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ReturnTypeSuffix$0 = $TS($S(__, Colon, $E($S(__, $EXPECT($L161, fail, 'ReturnTypeSuffix "asserts"'), NonIdContinue)), TypePredicate), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var ReturnTypeSuffix$0 = $TS($S(__, Colon, $E($S(__, $EXPECT($L163, fail, 'ReturnTypeSuffix "asserts"'), NonIdContinue)), TypePredicate), function($skip, $loc, $0, $1, $2, $3, $4) {
       const children = [...$1, $2];
       if ($3)
         children.push($3);
@@ -12269,9 +12359,9 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeUnaryOp$0 = $EXPECT($L162, fail, 'TypeUnaryOp "keyof"');
+    var TypeUnaryOp$0 = $EXPECT($L164, fail, 'TypeUnaryOp "keyof"');
     var TypeUnaryOp$1 = $EXPECT($L145, fail, 'TypeUnaryOp "typeof"');
-    var TypeUnaryOp$2 = $EXPECT($L163, fail, 'TypeUnaryOp "infer"');
+    var TypeUnaryOp$2 = $EXPECT($L165, fail, 'TypeUnaryOp "infer"');
     var TypeUnaryOp$3 = $EXPECT($L129, fail, 'TypeUnaryOp "readonly"');
     function TypeUnaryOp(state) {
       if (state.events) {
@@ -12444,7 +12534,7 @@ ${input.slice(result.pos)}
     var TypeLiteral$2 = $TV($EXPECT($L149, fail, 'TypeLiteral "void"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "void" };
     });
-    var TypeLiteral$3 = $TV($EXPECT($L164, fail, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
+    var TypeLiteral$3 = $TV($EXPECT($L166, fail, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "[]" };
     });
     function TypeLiteral(state) {
@@ -12676,7 +12766,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Shebang$0 = $S($R$0($EXPECT($R49, fail, "Shebang /#![^\\r\\n]*/")), EOL);
+    var Shebang$0 = $S($R$0($EXPECT($R50, fail, "Shebang /#![^\\r\\n]*/")), EOL);
     function Shebang(state) {
       if (state.events) {
         const result = state.events.enter?.("Shebang", state);
@@ -12695,11 +12785,11 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CivetPrologue$0 = $T($S($EXPECT($R50, fail, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, $TEXT(StatementDelimiter), $E(EOS)), function(value) {
+    var CivetPrologue$0 = $T($S($EXPECT($R51, fail, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, $TEXT(StatementDelimiter), $E(EOS)), function(value) {
       var content = value[2];
       return content;
     });
-    var CivetPrologue$1 = $T($S($EXPECT($R50, fail, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, $TEXT(StatementDelimiter), $E(EOS)), function(value) {
+    var CivetPrologue$1 = $T($S($EXPECT($R51, fail, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, $TEXT(StatementDelimiter), $E(EOS)), function(value) {
       var content = value[2];
       return content;
     });
@@ -12721,7 +12811,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CivetPrologueContent$0 = $TS($S($EXPECT($L165, fail, 'CivetPrologueContent "civet"'), $Q(CivetOption), $EXPECT($R51, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3) {
+    var CivetPrologueContent$0 = $TS($S($EXPECT($L167, fail, 'CivetPrologueContent "civet"'), $Q(CivetOption), $EXPECT($R52, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3) {
       var options = $2;
       return {
         type: "CivetPrologue",
@@ -12747,7 +12837,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CivetOption$0 = $TR($EXPECT($R52, fail, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+    var CivetOption$0 = $TR($EXPECT($R53, fail, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
       const optionName = $2.replace(/-+([a-z]?)/g, (_2, l) => {
         if (l)
           return l.toUpperCase();
@@ -12779,7 +12869,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var UnknownPrologue$0 = $S($R$0($EXPECT($R50, fail, "UnknownPrologue /[\\t ]*/")), BasicStringLiteral, $TEXT(StatementDelimiter), EOS);
+    var UnknownPrologue$0 = $S($R$0($EXPECT($R51, fail, "UnknownPrologue /[\\t ]*/")), BasicStringLiteral, $TEXT(StatementDelimiter), EOS);
     function UnknownPrologue(state) {
       if (state.events) {
         const result = state.events.enter?.("UnknownPrologue", state);
@@ -12837,7 +12927,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var EOL$0 = $TR($EXPECT($R53, fail, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+    var EOL$0 = $TR($EXPECT($R54, fail, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
       return { $loc, token: $0 };
     });
     function EOL(state) {
@@ -13938,6 +14028,8 @@ ${input.slice(result.pos)}
               insertReturn(exp.children[2][3]);
             return;
         }
+        if (node[node.length - 1]?.type === "SemicolonDelimiter")
+          return;
         node.splice(1, 0, "return ");
       }
       module2.isWhitespaceOrEmpty = function(node) {
@@ -13945,6 +14037,8 @@ ${input.slice(result.pos)}
           return true;
         if (node.token)
           return node.token.match(/^\s*$/);
+        if (node.children)
+          node = node.children;
         if (!node.length)
           return true;
         if (typeof node === "string")
@@ -14597,7 +14691,7 @@ ${input.slice(result.pos)}
         }
       };
       module2.constructPipeStep = function(caller, callee) {
-        if (caller.expr.token === "yield" || caller.expr.token === "await") {
+        if (caller.expr.token === "yield" || caller.expr.token === "await" || caller.expr.token === "return") {
           return [caller.leadingComment, caller.expr, caller.trailingComment, " ", callee.leadingComment, callee.expr, callee.trailingComment];
         }
         return module2.constructInvocation(caller, callee);
@@ -14622,7 +14716,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Indent$0 = $TR($EXPECT($R54, fail, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+    var Indent$0 = $TR($EXPECT($R55, fail, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
       let level;
       if (module2.config.tab) {
         const tabs = $0.match(/\t/g);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.5.18",
+  "version": "0.5.20",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "exports": {