@danielx/civet 0.6.70 → 0.6.72

package/dist/browser.js

@@ -83,6 +83,7 @@ var Civet = (() => {
     isWhitespaceOrEmpty: () => isWhitespaceOrEmpty,
     lastAccessInCallExpression: () => lastAccessInCallExpression,
     literalValue: () => literalValue,
+    makeAmpersandFunction: () => makeAmpersandFunction,
     makeAsConst: () => makeAsConst,
     makeEmptyBlock: () => makeEmptyBlock,
     makeExpressionStatement: () => makeExpressionStatement,
@@ -154,6 +155,30 @@ var Civet = (() => {
     updateParentPointers(node);
     return node;
   }
+  function makeAmpersandFunction(bodyAfterRef = []) {
+    const ref = makeRef("$");
+    const body = [ref, ...bodyAfterRef];
+    const parameters = {
+      type: "Parameters",
+      children: [ref],
+      names: []
+    };
+    const block = {
+      expressions: body
+    };
+    return {
+      type: "ArrowFunction",
+      signature: {
+        modifier: {}
+      },
+      children: [parameters, " => ", body],
+      ref,
+      body,
+      ampersandBlock: true,
+      block,
+      parameters
+    };
+  }
   function addPostfixStatement(statement, ws, post) {
     const expressions = [
       ...post.blockPrefix || [],
@@ -3372,7 +3397,7 @@ var Civet = (() => {
           }
         ];
       }
-      if (rest.delim?.at(-1)?.token === ",") {
+      if (Array.isArray(rest.delim) && rest.delim.at(-1)?.token === ",") {
         rest.delim.pop();
       }
       const children = [...props, ...after, rest];
@@ -3626,9 +3651,9 @@ var Civet = (() => {
         Validator: () => Validator
       });
       module.exports = __toCommonJS2(machine_exports);
-      function $EXPECT(parser2, expectation) {
+      function $EXPECT(parser, expectation) {
         return function(ctx, state) {
-          const result = parser2(ctx, state);
+          const result = parser(ctx, state);
           if (!result)
             ctx.fail(state.pos, expectation);
           return result;
@@ -3815,9 +3840,9 @@ var Civet = (() => {
           };
         };
       }
-      function $T(parser2, fn) {
+      function $T(parser, fn) {
         return function(ctx, state) {
-          const result = parser2(ctx, state);
+          const result = parser(ctx, state);
           if (!result)
             return;
           if (ctx.tokenize)
@@ -3828,9 +3853,9 @@ var Civet = (() => {
           return result;
         };
       }
-      function $TR(parser2, fn) {
+      function $TR(parser, fn) {
         return function(ctx, state) {
-          const result = parser2(ctx, state);
+          const result = parser(ctx, state);
           if (!result)
             return;
           if (ctx.tokenize)
@@ -3844,9 +3869,9 @@ var Civet = (() => {
           return result;
         };
       }
-      function $TS(parser2, fn) {
+      function $TS(parser, fn) {
         return function(ctx, state) {
-          const result = parser2(ctx, state);
+          const result = parser(ctx, state);
           if (!result)
             return;
           if (ctx.tokenize)
@@ -3860,9 +3885,9 @@ var Civet = (() => {
           return result;
         };
       }
-      function $TV(parser2, fn) {
+      function $TV(parser, fn) {
         return function(ctx, state) {
-          const result = parser2(ctx, state);
+          const result = parser(ctx, state);
           if (!result)
             return;
           if (ctx.tokenize)
@@ -3876,9 +3901,9 @@ var Civet = (() => {
           return result;
         };
       }
-      function $R$0(parser2) {
+      function $R$0(parser) {
         return function(ctx, state) {
-          const result = parser2(ctx, state);
+          const result = parser(ctx, state);
           if (!result)
             return;
           const value = result.value[0];
@@ -4105,6 +4130,7 @@ ${input.slice(result.pos)}
         UnaryWithoutParenthesizedAssignmentBody,
         UnaryPostfix,
         TypePostfix,
+        NWTypePostfix,
         UpdateExpression,
         UpdateExpressionSymbol,
         AssignmentExpression,
@@ -4217,6 +4243,7 @@ ${input.slice(result.pos)}
         OperatorDeclaration,
         OperatorSignature,
         AmpersandBlockRHS,
+        AmpersandTypeSuffix,
         AmpersandBlockRHSBody,
         ThinArrowFunction,
         Arrow,
@@ -4273,8 +4300,10 @@ ${input.slice(result.pos)}
         NestedImplicitPropertyDefinition,
         NestedPropertyDefinitions,
         NestedPropertyDefinition,
+        ImplicitObjectLiteral,
+        ImplicitObjectPropertyDelimiter,
         InlineObjectLiteral,
-        ImplicitInlineObjectPropertyDelimiter,
+        InlineObjectPropertyDelimiter,
         ObjectPropertyDelimiter,
         PropertyDefinition,
         NamedProperty,
@@ -4547,6 +4576,7 @@ ${input.slice(result.pos)}
         If,
         Import,
         In,
+        Infer,
         LetOrConst,
         Const,
         Is,
@@ -4645,6 +4675,9 @@ ${input.slice(result.pos)}
         UsingJSModeError,
         TypeDeclaration,
         TypeDeclarationRest,
+        TypeAliasDeclaration,
+        InterfaceDeclaration,
+        NamespaceDeclaration,
         OptionalEquals,
         TypeLexicalDeclaration,
         TypeDeclarationBinding,
@@ -4672,7 +4705,7 @@ ${input.slice(result.pos)}
         EnumDeclaration,
         EnumBlock,
         NestedEnumProperties,
-        NestedEnumProperty,
+        NestedEnumPropertyLine,
         EnumProperty,
         TypeProperty,
         TypeIndexSignature,
@@ -4881,118 +4914,119 @@ ${input.slice(result.pos)}
       var $L100 = $L("\u2209");
       var $L101 = $L("&");
       var $L102 = $L("|");
-      var $L103 = $L(";");
-      var $L104 = $L("$:");
+      var $L103 = $L("$:");
+      var $L104 = $L(";");
       var $L105 = $L("break");
       var $L106 = $L("continue");
       var $L107 = $L("debugger");
-      var $L108 = $L("with");
-      var $L109 = $L("assert");
-      var $L110 = $L(":=");
-      var $L111 = $L("\u2254");
-      var $L112 = $L(".=");
-      var $L113 = $L("/*");
-      var $L114 = $L("*/");
-      var $L115 = $L("\\");
-      var $L116 = $L(")");
-      var $L117 = $L("abstract");
-      var $L118 = $L("as");
-      var $L119 = $L("@");
-      var $L120 = $L("@@");
-      var $L121 = $L("async");
-      var $L122 = $L("await");
-      var $L123 = $L("`");
-      var $L124 = $L("by");
-      var $L125 = $L("case");
-      var $L126 = $L("catch");
-      var $L127 = $L("class");
-      var $L128 = $L("#{");
-      var $L129 = $L("declare");
-      var $L130 = $L("default");
-      var $L131 = $L("delete");
-      var $L132 = $L("do");
-      var $L133 = $L("..");
-      var $L134 = $L("\u2025");
-      var $L135 = $L("...");
-      var $L136 = $L("\u2026");
-      var $L137 = $L("::");
-      var $L138 = $L('"');
-      var $L139 = $L("each");
-      var $L140 = $L("else");
-      var $L141 = $L("export");
-      var $L142 = $L("extends");
-      var $L143 = $L("finally");
-      var $L144 = $L("for");
-      var $L145 = $L("from");
-      var $L146 = $L("function");
-      var $L147 = $L("get");
-      var $L148 = $L("set");
-      var $L149 = $L("#");
-      var $L150 = $L("if");
-      var $L151 = $L("in");
-      var $L152 = $L("let");
-      var $L153 = $L("const");
-      var $L154 = $L("is");
-      var $L155 = $L("loop");
-      var $L156 = $L("new");
-      var $L157 = $L("not");
-      var $L158 = $L("of");
-      var $L159 = $L("[");
-      var $L160 = $L("operator");
-      var $L161 = $L("own");
-      var $L162 = $L("public");
-      var $L163 = $L("private");
-      var $L164 = $L("protected");
-      var $L165 = $L("||>");
-      var $L166 = $L("|\u25B7");
-      var $L167 = $L("|>=");
-      var $L168 = $L("\u25B7=");
-      var $L169 = $L("|>");
-      var $L170 = $L("\u25B7");
-      var $L171 = $L("readonly");
-      var $L172 = $L("return");
-      var $L173 = $L("satisfies");
-      var $L174 = $L("'");
-      var $L175 = $L("static");
-      var $L176 = $L("${");
-      var $L177 = $L("super");
-      var $L178 = $L("switch");
-      var $L179 = $L("target");
-      var $L180 = $L("then");
-      var $L181 = $L("this");
-      var $L182 = $L("throw");
-      var $L183 = $L('"""');
-      var $L184 = $L("'''");
-      var $L185 = $L("///");
-      var $L186 = $L("```");
-      var $L187 = $L("try");
-      var $L188 = $L("typeof");
-      var $L189 = $L("unless");
-      var $L190 = $L("until");
-      var $L191 = $L("using");
-      var $L192 = $L("var");
-      var $L193 = $L("void");
-      var $L194 = $L("when");
-      var $L195 = $L("while");
-      var $L196 = $L("yield");
-      var $L197 = $L("/>");
-      var $L198 = $L("</");
-      var $L199 = $L("<>");
-      var $L200 = $L("</>");
-      var $L201 = $L("<!--");
-      var $L202 = $L("-->");
-      var $L203 = $L("type");
-      var $L204 = $L("enum");
-      var $L205 = $L("interface");
-      var $L206 = $L("global");
-      var $L207 = $L("module");
-      var $L208 = $L("namespace");
-      var $L209 = $L("asserts");
-      var $L210 = $L("keyof");
-      var $L211 = $L("infer");
-      var $L212 = $L("???");
-      var $L213 = $L("[]");
-      var $L214 = $L("civet");
+      var $L108 = $L("require");
+      var $L109 = $L("with");
+      var $L110 = $L("assert");
+      var $L111 = $L(":=");
+      var $L112 = $L("\u2254");
+      var $L113 = $L(".=");
+      var $L114 = $L("/*");
+      var $L115 = $L("*/");
+      var $L116 = $L("\\");
+      var $L117 = $L(")");
+      var $L118 = $L("abstract");
+      var $L119 = $L("as");
+      var $L120 = $L("@");
+      var $L121 = $L("@@");
+      var $L122 = $L("async");
+      var $L123 = $L("await");
+      var $L124 = $L("`");
+      var $L125 = $L("by");
+      var $L126 = $L("case");
+      var $L127 = $L("catch");
+      var $L128 = $L("class");
+      var $L129 = $L("#{");
+      var $L130 = $L("declare");
+      var $L131 = $L("default");
+      var $L132 = $L("delete");
+      var $L133 = $L("do");
+      var $L134 = $L("..");
+      var $L135 = $L("\u2025");
+      var $L136 = $L("...");
+      var $L137 = $L("\u2026");
+      var $L138 = $L("::");
+      var $L139 = $L('"');
+      var $L140 = $L("each");
+      var $L141 = $L("else");
+      var $L142 = $L("export");
+      var $L143 = $L("extends");
+      var $L144 = $L("finally");
+      var $L145 = $L("for");
+      var $L146 = $L("from");
+      var $L147 = $L("function");
+      var $L148 = $L("get");
+      var $L149 = $L("set");
+      var $L150 = $L("#");
+      var $L151 = $L("if");
+      var $L152 = $L("in");
+      var $L153 = $L("infer");
+      var $L154 = $L("let");
+      var $L155 = $L("const");
+      var $L156 = $L("is");
+      var $L157 = $L("loop");
+      var $L158 = $L("new");
+      var $L159 = $L("not");
+      var $L160 = $L("of");
+      var $L161 = $L("[");
+      var $L162 = $L("operator");
+      var $L163 = $L("own");
+      var $L164 = $L("public");
+      var $L165 = $L("private");
+      var $L166 = $L("protected");
+      var $L167 = $L("||>");
+      var $L168 = $L("|\u25B7");
+      var $L169 = $L("|>=");
+      var $L170 = $L("\u25B7=");
+      var $L171 = $L("|>");
+      var $L172 = $L("\u25B7");
+      var $L173 = $L("readonly");
+      var $L174 = $L("return");
+      var $L175 = $L("satisfies");
+      var $L176 = $L("'");
+      var $L177 = $L("static");
+      var $L178 = $L("${");
+      var $L179 = $L("super");
+      var $L180 = $L("switch");
+      var $L181 = $L("target");
+      var $L182 = $L("then");
+      var $L183 = $L("this");
+      var $L184 = $L("throw");
+      var $L185 = $L('"""');
+      var $L186 = $L("'''");
+      var $L187 = $L("///");
+      var $L188 = $L("```");
+      var $L189 = $L("try");
+      var $L190 = $L("typeof");
+      var $L191 = $L("unless");
+      var $L192 = $L("until");
+      var $L193 = $L("using");
+      var $L194 = $L("var");
+      var $L195 = $L("void");
+      var $L196 = $L("when");
+      var $L197 = $L("while");
+      var $L198 = $L("yield");
+      var $L199 = $L("/>");
+      var $L200 = $L("</");
+      var $L201 = $L("<>");
+      var $L202 = $L("</>");
+      var $L203 = $L("<!--");
+      var $L204 = $L("-->");
+      var $L205 = $L("type");
+      var $L206 = $L("enum");
+      var $L207 = $L("interface");
+      var $L208 = $L("global");
+      var $L209 = $L("module");
+      var $L210 = $L("namespace");
+      var $L211 = $L("asserts");
+      var $L212 = $L("keyof");
+      var $L213 = $L("???");
+      var $L214 = $L("[]");
+      var $L215 = $L("civet");
       var $R0 = $R(new RegExp("(?=debugger|if|unless|do|for|loop|until|while|switch|throw|try)", "suy"));
       var $R1 = $R(new RegExp("(as|of|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
       var $R2 = $R(new RegExp("[0-9]", "suy"));
@@ -5557,20 +5591,27 @@ ${input.slice(result.pos)}
       function UnaryPostfix(ctx, state) {
         return $EVENT_C(ctx, state, "UnaryPostfix", UnaryPostfix$$);
       }
-      var TypePostfix$0 = $TS($S(_, As, $E(ExclamationPoint), Type), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var TypePostfix$0 = $TS($S(_, NWTypePostfix), function($skip, $loc, $0, $1, $2) {
         var ws = $1;
-        var as = $2;
-        var ex = $3;
-        var type = $4;
+        var postfix = $2;
+        return [ws, ...postfix];
+      });
+      function TypePostfix(ctx, state) {
+        return $EVENT(ctx, state, "TypePostfix", TypePostfix$0);
+      }
+      var NWTypePostfix$0 = $TS($S(As, $E(ExclamationPoint), Type), function($skip, $loc, $0, $1, $2, $3) {
+        var as = $1;
+        var ex = $2;
+        var type = $3;
         if (ex) {
-          return [{ $loc: ex.$loc, token: " as unknown" }, ws, as, type];
+          return [{ $loc: ex.$loc, token: "as unknown " }, as, type];
         }
-        return [ws, as, type];
+        return [as, type];
       });
-      var TypePostfix$1 = $S(_, Satisfies, Type);
-      var TypePostfix$$ = [TypePostfix$0, TypePostfix$1];
-      function TypePostfix(ctx, state) {
-        return $EVENT_C(ctx, state, "TypePostfix", TypePostfix$$);
+      var NWTypePostfix$1 = $S(Satisfies, Type);
+      var NWTypePostfix$$ = [NWTypePostfix$0, NWTypePostfix$1];
+      function NWTypePostfix(ctx, state) {
+        return $EVENT_C(ctx, state, "NWTypePostfix", NWTypePostfix$$);
       }
       var UpdateExpression$0 = $TS($S(UpdateExpressionSymbol, UnaryWithoutParenthesizedAssignment), function($skip, $loc, $0, $1, $2) {
         return {
@@ -5765,36 +5806,19 @@ ${input.slice(result.pos)}
         var head = $2;
         var body = $3;
         if (head.token === "&") {
-          const ref = makeRef("$");
-          const arrowBody = {
+          head = makeAmpersandFunction();
+        }
+        if (head.type === "ArrowFunction" && head.ampersandBlock) {
+          const expressions = [{
             type: "PipelineExpression",
-            children: [ws, ref, body]
-          };
-          const parameters = {
-            type: "Parameters",
-            children: [ref],
-            names: []
-          };
-          const expressions = [arrowBody];
-          const block = {
-            bare: true,
-            expressions,
-            children: [expressions]
-          };
-          const children = [parameters, " => ", block];
+            children: [ws, head.block.expressions[0], body]
+          }];
+          const block = { ...head.block, expressions, children: [expressions] };
           return {
-            type: "ArrowFunction",
-            signature: {
-              modifier: {
-                children: []
-              }
-            },
-            children,
-            ref,
-            body: [arrowBody],
-            ampersandBlock: true,
-            parameters,
-            block
+            ...head,
+            block,
+            body: expressions,
+            children: [...head.children.slice(0, -1), block]
           };
         }
         return {
@@ -5817,11 +5841,14 @@ ${input.slice(result.pos)}
       var PipelineTailItem$2 = $T($S(Return, $N(AccessStart)), function(value) {
         return value[0];
       });
-      var PipelineTailItem$3 = AmpersandFunctionExpression;
-      var PipelineTailItem$4 = $T($S($N(Ampersand), PipelineHeadItem), function(value) {
+      var PipelineTailItem$3 = $TS($S(NWTypePostfix, $Q(TypePostfix)), function($skip, $loc, $0, $1, $2) {
+        return makeAmpersandFunction([" ", $1, ...$2]);
+      });
+      var PipelineTailItem$4 = AmpersandFunctionExpression;
+      var PipelineTailItem$5 = $T($S($N(Ampersand), PipelineHeadItem), function(value) {
         return value[1];
       });
-      var PipelineTailItem$$ = [PipelineTailItem$0, PipelineTailItem$1, PipelineTailItem$2, PipelineTailItem$3, PipelineTailItem$4];
+      var PipelineTailItem$$ = [PipelineTailItem$0, PipelineTailItem$1, PipelineTailItem$2, PipelineTailItem$3, PipelineTailItem$4, PipelineTailItem$5];
       function PipelineTailItem(ctx, state) {
         return $EVENT_C(ctx, state, "PipelineTailItem", PipelineTailItem$$);
       }
@@ -5868,7 +5895,7 @@ ${input.slice(result.pos)}
         return $EVENT(ctx, state, "ParenthesizedExpression", ParenthesizedExpression$0);
       }
       var ClassDeclaration$0 = $TS($S(ClassExpression), function($skip, $loc, $0, $1) {
-        if ($1.binding)
+        if ($1.id)
           return $1;
         return makeLeftHandSideExpression($1);
       });
@@ -5885,6 +5912,7 @@ ${input.slice(result.pos)}
           decorators,
           abstract,
           binding,
+          id: binding?.[0],
           heritage,
           body,
           children: $0
@@ -6202,7 +6230,8 @@ ${input.slice(result.pos)}
             name: id.name,
             children: [".", id]
           }],
-          privateShorthand: true
+          privateShorthand: true,
+          privateId: id
         };
       });
       var PrivateThis$$ = [PrivateThis$0, PrivateThis$1];
@@ -7209,27 +7238,7 @@ ${input.slice(result.pos)}
         };
       });
       var FunctionExpression$1 = $TV($EXPECT($L26, 'FunctionExpression "(&)"'), function($skip, $loc, $0, $1) {
-        const ref = makeRef("$"), body = [ref];
-        const parameters = {
-          type: "Parameters",
-          children: [ref],
-          names: []
-        };
-        const block = {
-          expressions: [ref]
-        };
-        return {
-          type: "ArrowFunction",
-          signature: {
-            modifier: {}
-          },
-          children: [parameters, " => ", body],
-          ref,
-          body,
-          ampersandBlock: true,
-          block,
-          parameters
-        };
+        return makeAmpersandFunction();
       });
       var FunctionExpression$2 = $TS($S(OpenParen, BinaryOp, CloseParen), function($skip, $loc, $0, $1, $2, $3) {
         var open = $1;
@@ -7353,15 +7362,11 @@ ${input.slice(result.pos)}
         var rhs = $3;
         if (!prefix.length && !rhs)
           return $skip;
-        let body, ref;
+        let body, ref, typeSuffix;
         if (!rhs) {
           body = ref = makeRef("$");
         } else {
-          let exp = rhs;
-          while (!exp.ref && exp.expression) {
-            exp = exp.expression;
-          }
-          ({ ref } = exp);
+          ({ ref, typeSuffix } = rhs);
           if (!ref) {
             throw new Error("Could not find ref in ampersand shorthand block");
           }
@@ -7375,7 +7380,7 @@ ${input.slice(result.pos)}
         }
         const parameters = {
           type: "Parameters",
-          children: [ref],
+          children: typeSuffix ? ["(", ref, typeSuffix, ")"] : [ref],
           names: []
         };
         const expressions = [body];
@@ -7412,7 +7417,10 @@ ${input.slice(result.pos)}
         var w = $2;
         var decl = $3;
         decl.names.forEach((name) => module.operators.add(name));
-        return [insertTrimmingSpace(w, ""), decl];
+        return {
+          ...decl,
+          children: [insertTrimmingSpace(w, ""), ...decl.children]
+        };
       });
       var OperatorDeclaration$1 = $TS($S(OperatorSignature, BracedBlock), function($skip, $loc, $0, $1, $2) {
         var signature = $1;
@@ -7434,7 +7442,10 @@ ${input.slice(result.pos)}
         var ids = $4;
         module.operators.add(id.name);
         ids.forEach(([, , id2]) => module.operators.add(id2.name));
-        return [];
+        return {
+          id,
+          children: []
+        };
       });
       var OperatorDeclaration$$ = [OperatorDeclaration$0, OperatorDeclaration$1, OperatorDeclaration$2];
       function OperatorDeclaration(ctx, state) {
@@ -7475,12 +7486,19 @@ ${input.slice(result.pos)}
       function AmpersandBlockRHS(ctx, state) {
         return $EVENT(ctx, state, "AmpersandBlockRHS", AmpersandBlockRHS$0);
       }
-      var AmpersandBlockRHSBody$0 = $TS($S($E($S($N(_), $P(CallExpressionRest))), $E(QuestionMark), $E($S(WAssignmentOp, $Q($S(NotDedented, UpdateExpression, WAssignmentOp)), NonPipelineExtendedExpression)), $E($S($N($EXPECT($R10, "AmpersandBlockRHSBody /[&]/")), $P(BinaryOpRHS)))), function($skip, $loc, $0, $1, $2, $3, $4) {
-        var callExpRest = $1;
-        var unaryPostfix = $2;
-        var assign = $3;
-        var binopRHS = $4;
-        if (!callExpRest && !binopRHS && !unaryPostfix)
+      var AmpersandTypeSuffix$0 = $T($S($Y($S($E(_), $E(QuestionMark), $E(_), Colon)), TypeSuffix), function(value) {
+        return value[1];
+      });
+      function AmpersandTypeSuffix(ctx, state) {
+        return $EVENT(ctx, state, "AmpersandTypeSuffix", AmpersandTypeSuffix$0);
+      }
+      var AmpersandBlockRHSBody$0 = $TS($S($E(AmpersandTypeSuffix), $E($S($N(_), $P(CallExpressionRest))), $E(UnaryPostfix), $E($S(WAssignmentOp, $Q($S(NotDedented, UpdateExpression, WAssignmentOp)), NonPipelineExtendedExpression)), $E($S($N($EXPECT($R10, "AmpersandBlockRHSBody /[&]/")), $P(BinaryOpRHS)))), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+        var typeSuffix = $1;
+        var callExpRest = $2;
+        var unaryPostfix = $3;
+        var assign = $4;
+        var binopRHS = $5;
+        if (!typeSuffix && !callExpRest && !binopRHS && !unaryPostfix)
           return $skip;
         const ref = makeRef("$");
         let exp = {
@@ -7507,16 +7525,16 @@ ${input.slice(result.pos)}
             names: null,
             lhs,
             assigned: exp,
-            exp: rhs,
-            ref
+            exp: rhs
           };
         }
         if (binopRHS) {
           exp = {
-            children: processBinaryOpExpression([exp, binopRHS[1]]),
-            ref
+            children: processBinaryOpExpression([exp, binopRHS[1]])
           };
         }
+        exp.ref = ref;
+        exp.typeSuffix = typeSuffix;
         return exp;
       });
       function AmpersandBlockRHSBody(ctx, state) {
@@ -7788,13 +7806,12 @@ ${input.slice(result.pos)}
         return block;
       });
       var NonSingleBracedBlock$1 = ImplicitNestedBlock;
-      var NonSingleBracedBlock$2 = $TS($S(InsertOpenBrace, $Y(EOS), ObjectLiteral, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
-        var s = $3;
+      var NonSingleBracedBlock$2 = $TS($S(InsertOpenBrace, NestedImplicitObjectLiteral, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3) {
+        var s = $2;
         return {
           type: "BlockStatement",
           expressions: [s],
-          // Remove &EOS assertion
-          children: [$1, s, $3]
+          children: $0
         };
       });
       var NonSingleBracedBlock$$ = [NonSingleBracedBlock$0, NonSingleBracedBlock$1, NonSingleBracedBlock$2];
@@ -8192,7 +8209,10 @@ ${input.slice(result.pos)}
         return $EVENT(ctx, state, "ElementListRest", ElementListRest$0);
       }
       var ArrayElementExpression$0 = JSXTag;
-      var ArrayElementExpression$1 = $TS($S($E(ExtendedExpression), __, DotDotDot, $Y(ArrayElementDelimiter)), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var ArrayElementExpression$1 = $T($S(ImplicitObjectLiteral, $Y(ArrayElementDelimiter)), function(value) {
+        return value[0];
+      });
+      var ArrayElementExpression$2 = $TS($S($E(ExtendedExpression), __, DotDotDot, $Y(ArrayElementDelimiter)), function($skip, $loc, $0, $1, $2, $3, $4) {
         var exp = $1;
         var ws = $2;
         var dots = $3;
@@ -8205,7 +8225,7 @@ ${input.slice(result.pos)}
           names: exp.names
         };
       });
-      var ArrayElementExpression$2 = $TS($S($E($S($E($S(__, DotDotDot, __)), PostfixedExpression)), $Y(ArrayElementDelimiter)), function($skip, $loc, $0, $1, $2) {
+      var ArrayElementExpression$3 = $TS($S($E($S($E($S(__, DotDotDot, __)), PostfixedExpression)), $Y(ArrayElementDelimiter)), function($skip, $loc, $0, $1, $2) {
         var expMaybeSpread = $1;
         if (expMaybeSpread) {
           const [spread, exp] = expMaybeSpread;
@@ -8228,7 +8248,7 @@ ${input.slice(result.pos)}
           children: []
         };
       });
-      var ArrayElementExpression$$ = [ArrayElementExpression$0, ArrayElementExpression$1, ArrayElementExpression$2];
+      var ArrayElementExpression$$ = [ArrayElementExpression$0, ArrayElementExpression$1, ArrayElementExpression$2, ArrayElementExpression$3];
       function ArrayElementExpression(ctx, state) {
         return $EVENT_C(ctx, state, "ArrayElementExpression", ArrayElementExpression$$);
       }
@@ -8292,8 +8312,10 @@ ${input.slice(result.pos)}
       function BracedObjectLiteralContent(ctx, state) {
         return $EVENT_C(ctx, state, "BracedObjectLiteralContent", BracedObjectLiteralContent$$);
       }
-      var NestedImplicitObjectLiteral$0 = $TS($S(InsertOpenBrace, NestedImplicitPropertyDefinitions, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-        var properties = $2;
+      var NestedImplicitObjectLiteral$0 = $TS($S(InsertOpenBrace, PushIndent, $E(NestedImplicitPropertyDefinitions), PopIndent, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+        var properties = $3;
+        if (!properties)
+          return $skip;
         return {
           type: "ObjectExpression",
           properties,
@@ -8303,10 +8325,8 @@ ${input.slice(result.pos)}
       function NestedImplicitObjectLiteral(ctx, state) {
         return $EVENT(ctx, state, "NestedImplicitObjectLiteral", NestedImplicitObjectLiteral$0);
       }
-      var NestedImplicitPropertyDefinitions$0 = $TS($S(PushIndent, $Q(NestedImplicitPropertyDefinition), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
-        var defs = $2;
-        if (!defs.length)
-          return $skip;
+      var NestedImplicitPropertyDefinitions$0 = $TV($P(NestedImplicitPropertyDefinition), function($skip, $loc, $0, $1) {
+        var defs = $0;
         return defs.flat();
       });
       function NestedImplicitPropertyDefinitions(ctx, state) {
@@ -8358,7 +8378,7 @@ ${input.slice(result.pos)}
       function NestedPropertyDefinition(ctx, state) {
         return $EVENT(ctx, state, "NestedPropertyDefinition", NestedPropertyDefinition$0);
       }
-      var InlineObjectLiteral$0 = $TS($S(InsertInlineOpenBrace, SnugNamedProperty, $Q($S(ImplicitInlineObjectPropertyDelimiter, NamedProperty)), $E($S($E(_), Comma, $Y(Dedented))), InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var ImplicitObjectLiteral$0 = $TS($S(InsertInlineOpenBrace, SnugNamedProperty, $Q($S(ImplicitObjectPropertyDelimiter, NamedProperty)), $E($S($E(_), Comma)), InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         var open = $1;
         var first = $2;
         var rest = $3;
@@ -8369,16 +8389,34 @@ ${input.slice(result.pos)}
           children: [open, first, ...rest, trailing, close]
         };
       });
-      function InlineObjectLiteral(ctx, state) {
-        return $EVENT(ctx, state, "InlineObjectLiteral", InlineObjectLiteral$0);
+      function ImplicitObjectLiteral(ctx, state) {
+        return $EVENT(ctx, state, "ImplicitObjectLiteral", ImplicitObjectLiteral$0);
       }
-      var ImplicitInlineObjectPropertyDelimiter$0 = $S($E(_), Comma, $C(NotDedented, $E(_)));
-      var ImplicitInlineObjectPropertyDelimiter$1 = $T($S($Y($S(Nested, NamedProperty)), InsertComma, $C(Nested, $E(_))), function(value) {
+      var ImplicitObjectPropertyDelimiter$0 = $S($E(_), Comma, $C(NotDedented, $E(_)));
+      var ImplicitObjectPropertyDelimiter$1 = $T($S($Y($S(Nested, NamedProperty)), InsertComma, Nested), function(value) {
         return [value[1], value[2]];
       });
-      var ImplicitInlineObjectPropertyDelimiter$$ = [ImplicitInlineObjectPropertyDelimiter$0, ImplicitInlineObjectPropertyDelimiter$1];
-      function ImplicitInlineObjectPropertyDelimiter(ctx, state) {
-        return $EVENT_C(ctx, state, "ImplicitInlineObjectPropertyDelimiter", ImplicitInlineObjectPropertyDelimiter$$);
+      var ImplicitObjectPropertyDelimiter$$ = [ImplicitObjectPropertyDelimiter$0, ImplicitObjectPropertyDelimiter$1];
+      function ImplicitObjectPropertyDelimiter(ctx, state) {
+        return $EVENT_C(ctx, state, "ImplicitObjectPropertyDelimiter", ImplicitObjectPropertyDelimiter$$);
+      }
+      var InlineObjectLiteral$0 = $TS($S(InsertInlineOpenBrace, SnugNamedProperty, $Q($S(InlineObjectPropertyDelimiter, NamedProperty)), $E($S($E(_), Comma, $Y(Dedented))), InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+        var open = $1;
+        var first = $2;
+        var rest = $3;
+        var trailing = $4;
+        var close = $5;
+        return {
+          type: "ObjectExpression",
+          children: [open, first, ...rest, trailing, close]
+        };
+      });
+      function InlineObjectLiteral(ctx, state) {
+        return $EVENT(ctx, state, "InlineObjectLiteral", InlineObjectLiteral$0);
+      }
+      var InlineObjectPropertyDelimiter$0 = $S($E(_), Comma, $C(NotDedented, $E(_)));
+      function InlineObjectPropertyDelimiter(ctx, state) {
+        return $EVENT(ctx, state, "InlineObjectPropertyDelimiter", InlineObjectPropertyDelimiter$0);
       }
       var ObjectPropertyDelimiter$0 = $S($E(_), Comma);
       var ObjectPropertyDelimiter$1 = $Y($S(__, $EXPECT($L29, 'ObjectPropertyDelimiter "}"')));
@@ -8699,7 +8737,12 @@ ${input.slice(result.pos)}
                     v = insertTrimmingSpace(p, "");
                     break;
                   case "Property":
-                    v = insertTrimmingSpace(p.value, "");
+                    const { value: value2 } = p;
+                    if (value2.privateShorthand) {
+                      v = value2.privateId;
+                    } else {
+                      v = insertTrimmingSpace(value2, "");
+                    }
                     break;
                 }
                 const exp = processCallMemberExpression({
@@ -9269,8 +9312,11 @@ ${input.slice(result.pos)}
         return $EVENT_C(ctx, state, "ModuleItem", ModuleItem$$);
       }
       var StatementListItem$0 = Declaration;
-      var StatementListItem$1 = PostfixedStatement;
-      var StatementListItem$$ = [StatementListItem$0, StatementListItem$1];
+      var StatementListItem$1 = $TS($S($N($EXPECT($L103, 'StatementListItem "$:"')), ImplicitObjectLiteral), function($skip, $loc, $0, $1, $2) {
+        return makeLeftHandSideExpression($2);
+      });
+      var StatementListItem$2 = PostfixedStatement;
+      var StatementListItem$$ = [StatementListItem$0, StatementListItem$1, StatementListItem$2];
       function StatementListItem(ctx, state) {
         return $EVENT_C(ctx, state, "StatementListItem", StatementListItem$$);
       }
@@ -9376,7 +9422,7 @@ ${input.slice(result.pos)}
       function NoCommaStatement(ctx, state) {
         return $EVENT_C(ctx, state, "NoCommaStatement", NoCommaStatement$$);
       }
-      var EmptyStatement$0 = $TS($S($E(_), $Y($EXPECT($L103, 'EmptyStatement ";"'))), function($skip, $loc, $0, $1, $2) {
+      var EmptyStatement$0 = $TS($S($E(_), $Y($EXPECT($L104, 'EmptyStatement ";"'))), function($skip, $loc, $0, $1, $2) {
         return { type: "EmptyStatement", children: $1 || [] };
       });
       function EmptyStatement(ctx, state) {
@@ -9407,7 +9453,7 @@ ${input.slice(result.pos)}
         var w = $3;
         return [id, colon, w];
       });
-      var Label$1 = $S($EXPECT($L104, 'Label "$:"'), Whitespace);
+      var Label$1 = $S($EXPECT($L103, 'Label "$:"'), Whitespace);
       var Label$$ = [Label$0, Label$1];
       function Label(ctx, state) {
         return $EVENT_C(ctx, state, "Label", Label$$);
@@ -10565,16 +10611,26 @@ ${input.slice(result.pos)}
       function MaybeNestedExpression(ctx, state) {
         return $EVENT_C(ctx, state, "MaybeNestedExpression", MaybeNestedExpression$$);
       }
-      var ImportDeclaration$0 = $T($S(Import, __, TypeKeyword, __, ImportClause, __, FromClause, $E(ImportAssertion)), function(value) {
+      var ImportDeclaration$0 = $TS($S(Import, _, Identifier, $E(_), Equals, __, $EXPECT($L108, 'ImportDeclaration "require"'), NonIdContinue, Arguments), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+        const imp = [
+          { ...$1, ts: true },
+          { ...$1, token: "const", js: true }
+        ];
+        return {
+          type: "ImportDeclaration",
+          children: [imp, $0.slice(1)]
+        };
+      });
+      var ImportDeclaration$1 = $T($S(Import, __, TypeKeyword, __, ImportClause, __, FromClause, $E(ImportAssertion)), function(value) {
         return { "type": "ImportDeclaration", "ts": true, "children": value };
       });
-      var ImportDeclaration$1 = $T($S(Import, __, ImportClause, __, FromClause, $E(ImportAssertion)), function(value) {
+      var ImportDeclaration$2 = $T($S(Import, __, ImportClause, __, FromClause, $E(ImportAssertion)), function(value) {
         return { "type": "ImportDeclaration", "children": value };
       });
-      var ImportDeclaration$2 = $T($S(Import, __, ModuleSpecifier, $E(ImportAssertion)), function(value) {
+      var ImportDeclaration$3 = $T($S(Import, __, ModuleSpecifier, $E(ImportAssertion)), function(value) {
         return { "type": "ImportDeclaration", "children": value };
       });
-      var ImportDeclaration$3 = $TS($S(ImpliedImport, $E($S(TypeKeyword, __)), ImportClause, __, FromClause, $E(ImportAssertion)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+      var ImportDeclaration$4 = $TS($S(ImpliedImport, $E($S(TypeKeyword, __)), ImportClause, __, FromClause, $E(ImportAssertion)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
         var i = $1;
         var t = $2;
         var c = $3;
@@ -10590,7 +10646,7 @@ ${input.slice(result.pos)}
           return children;
         return { type: "ImportDeclaration", ts: true, children };
       });
-      var ImportDeclaration$$ = [ImportDeclaration$0, ImportDeclaration$1, ImportDeclaration$2, ImportDeclaration$3];
+      var ImportDeclaration$$ = [ImportDeclaration$0, ImportDeclaration$1, ImportDeclaration$2, ImportDeclaration$3, ImportDeclaration$4];
       function ImportDeclaration(ctx, state) {
         return $EVENT_C(ctx, state, "ImportDeclaration", ImportDeclaration$$);
       }
@@ -10649,7 +10705,7 @@ ${input.slice(result.pos)}
       function FromClause(ctx, state) {
         return $EVENT(ctx, state, "FromClause", FromClause$0);
       }
-      var ImportAssertion$0 = $S($E(_), $C($EXPECT($L108, 'ImportAssertion "with"'), $EXPECT($L109, 'ImportAssertion "assert"')), NonIdContinue, $E(_), ObjectLiteral);
+      var ImportAssertion$0 = $S($E(_), $C($EXPECT($L109, 'ImportAssertion "with"'), $EXPECT($L110, 'ImportAssertion "assert"')), NonIdContinue, $E(_), ObjectLiteral);
       function ImportAssertion(ctx, state) {
         return $EVENT(ctx, state, "ImportAssertion", ImportAssertion$0);
       }
@@ -10723,10 +10779,17 @@ ${input.slice(result.pos)}
         return $EVENT_C(ctx, state, "ModuleExportName", ModuleExportName$$);
       }
       var ModuleSpecifier$0 = $TS($S(UnprocessedModuleSpecifier), function($skip, $loc, $0, $1) {
-        if (!module.config.rewriteTsImports)
-          return $1;
-        const { token } = $1;
-        return { $loc, token: token.replace(/\.([mc])?ts(['"])$/, ".$1js$2") };
+        let { token } = $1;
+        if (module.config.rewriteTsImports) {
+          token = token.replace(/\.([mc])?ts(['"])$/, ".$1js$2");
+        }
+        if (module.config.rewriteCivetImports) {
+          token = token.replace(
+            /\.civet(['"])$/,
+            `${module.config.rewriteCivetImports.replace(/\$/g, "$$")}$1`
+          );
+        }
+        return { ...$1, token };
       });
       function ModuleSpecifier(ctx, state) {
         return $EVENT(ctx, state, "ModuleSpecifier", ModuleSpecifier$0);
@@ -10748,18 +10811,55 @@ ${input.slice(result.pos)}
       function ImportedBinding(ctx, state) {
         return $EVENT(ctx, state, "ImportedBinding", ImportedBinding$0);
       }
-      var ExportDeclaration$0 = $TS($S($E(Decorators), Export, __, Default, __, $C(HoistableDeclaration, ClassDeclaration, ExtendedExpression)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+      var ExportDeclaration$0 = $TS($S(Export, $E(_), Equals, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4) {
+        const exp = [
+          { ...$1, ts: true },
+          { ...$1, token: "module.exports", js: true }
+        ];
+        return {
+          type: "ExportDeclaration",
+          children: [exp, $0.slice(1)]
+        };
+      });
+      var ExportDeclaration$1 = $TS($S($E(Decorators), Export, __, Default, __, $N(FunctionDeclaration), $C(LexicalDeclaration, VariableStatement, TypeAliasDeclaration, NamespaceDeclaration, EnumDeclaration, OperatorDeclaration)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+        var declaration = $7;
+        let id, error;
+        if (declaration.id) {
+          id = declaration.id;
+        } else if (declaration.names) {
+          if (declaration.names.length !== 1) {
+            error = {
+              type: "Error",
+              message: `export default with ${declaration.names.length} variable declaration (should be 1)`
+            };
+          }
+          id = declaration.names[0];
+        } else {
+          throw new Error("Could not find name of declaration in export default");
+        }
+        return [
+          declaration,
+          { children: [";"], ts: declaration.ts },
+          error ?? {
+            type: "ExportDeclaration",
+            declaration: id,
+            ts: declaration.ts,
+            children: [...$0.slice(0, -2), id]
+          }
+        ];
+      });
+      var ExportDeclaration$2 = $TS($S($E(Decorators), Export, __, Default, __, $C(HoistableDeclaration, ClassDeclaration, InterfaceDeclaration, ExtendedExpression)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
         var declaration = $6;
-        return { type: "ExportDeclaration", declaration, children: $0 };
+        return { type: "ExportDeclaration", declaration, ts: declaration.ts, children: $0 };
       });
-      var ExportDeclaration$1 = $TS($S(Export, __, ExportFromClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var ExportDeclaration$3 = $TS($S(Export, __, ExportFromClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         return { type: "ExportDeclaration", ts: $3.ts, children: $0 };
       });
-      var ExportDeclaration$2 = $TS($S($E(Decorators), Export, __, $C(Declaration, VariableStatement, TypeAndNamedExports, ExportVarDec)), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var ExportDeclaration$4 = $TS($S($E(Decorators), Export, __, $C(Declaration, VariableStatement, TypeAndNamedExports, ExportVarDec)), function($skip, $loc, $0, $1, $2, $3, $4) {
         var declaration = $4;
         return { type: "ExportDeclaration", declaration, ts: declaration.ts, children: $0 };
       });
-      var ExportDeclaration$$ = [ExportDeclaration$0, ExportDeclaration$1, ExportDeclaration$2];
+      var ExportDeclaration$$ = [ExportDeclaration$0, ExportDeclaration$1, ExportDeclaration$2, ExportDeclaration$3, ExportDeclaration$4];
       function ExportDeclaration(ctx, state) {
         return $EVENT_C(ctx, state, "ExportDeclaration", ExportDeclaration$$);
       }
@@ -10787,7 +10887,7 @@ ${input.slice(result.pos)}
         return $EVENT(ctx, state, "TypeAndNamedExports", TypeAndNamedExports$0);
       }
       var NamedExports$0 = $S(OpenBrace, $Q(ExportSpecifier), $E($S(__, Comma)), __, CloseBrace);
-      var NamedExports$1 = $TS($S(InsertInlineOpenBrace, ImplicitExportSpecifier, $Q($S(ImplicitInlineObjectPropertyDelimiter, ImplicitExportSpecifier)), InsertCloseBrace, $Y($C(StatementDelimiter, $S(__, From)))), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var NamedExports$1 = $TS($S(InsertInlineOpenBrace, ImplicitExportSpecifier, $Q($S(ImplicitObjectPropertyDelimiter, ImplicitExportSpecifier)), InsertCloseBrace, $Y($C(StatementDelimiter, $S(__, From)))), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         var open = $1;
         var first = $2;
         var rest = $3;
@@ -10869,13 +10969,13 @@ ${input.slice(result.pos)}
       function LexicalDeclaration(ctx, state) {
         return $EVENT_C(ctx, state, "LexicalDeclaration", LexicalDeclaration$$);
       }
-      var ConstAssignment$0 = $TV($C($EXPECT($L110, 'ConstAssignment ":="'), $EXPECT($L111, 'ConstAssignment "\u2254"')), function($skip, $loc, $0, $1) {
+      var ConstAssignment$0 = $TV($C($EXPECT($L111, 'ConstAssignment ":="'), $EXPECT($L112, 'ConstAssignment "\u2254"')), function($skip, $loc, $0, $1) {
         return { $loc, token: "=" };
       });
       function ConstAssignment(ctx, state) {
         return $EVENT(ctx, state, "ConstAssignment", ConstAssignment$0);
       }
-      var LetAssignment$0 = $TV($EXPECT($L112, 'LetAssignment ".="'), function($skip, $loc, $0, $1) {
+      var LetAssignment$0 = $TV($EXPECT($L113, 'LetAssignment ".="'), function($skip, $loc, $0, $1) {
         return { $loc, token: "=" };
       });
       function LetAssignment(ctx, state) {
@@ -10923,6 +11023,7 @@ ${input.slice(result.pos)}
       var VariableStatement$0 = $TS($S(Var, __, VariableDeclarationList), function($skip, $loc, $0, $1, $2, $3) {
         return {
           ...$3,
+          names: $3.names,
           children: [$1, ...$2, ...$3.children]
         };
       });
@@ -11281,7 +11382,7 @@ ${input.slice(result.pos)}
       function MultiLineComment(ctx, state) {
         return $EVENT_C(ctx, state, "MultiLineComment", MultiLineComment$$);
       }
-      var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L113, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L114, 'JSMultiLineComment "*/"')), $EXPECT($R59, "JSMultiLineComment /./"))), $EXPECT($L114, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
+      var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L114, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L115, 'JSMultiLineComment "*/"')), $EXPECT($R59, "JSMultiLineComment /./"))), $EXPECT($L115, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
         return { type: "Comment", $loc, token: $1 };
       });
       function JSMultiLineComment(ctx, state) {
@@ -11327,7 +11428,7 @@ ${input.slice(result.pos)}
       var NonNewlineWhitespace$0 = $TR($EXPECT($R65, "NonNewlineWhitespace /[ \\t]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
-      var NonNewlineWhitespace$1 = $T($S($EXPECT($L115, 'NonNewlineWhitespace "\\\\\\\\"'), CoffeeLineContinuationEnabled, EOL), function(value) {
+      var NonNewlineWhitespace$1 = $T($S($EXPECT($L116, 'NonNewlineWhitespace "\\\\\\\\"'), CoffeeLineContinuationEnabled, EOL), function(value) {
         return " ";
       });
       var NonNewlineWhitespace$$ = [NonNewlineWhitespace$0, NonNewlineWhitespace$1];
@@ -11373,7 +11474,7 @@ ${input.slice(result.pos)}
       }
       var StatementDelimiter$0 = $Y(EOS);
       var StatementDelimiter$1 = SemicolonDelimiter;
-      var StatementDelimiter$2 = $Y($S($E(_), $C($EXPECT($L29, 'StatementDelimiter "}"'), $EXPECT($L116, 'StatementDelimiter ")"'), $EXPECT($L38, 'StatementDelimiter "]"'))));
+      var StatementDelimiter$2 = $Y($S($E(_), $C($EXPECT($L29, 'StatementDelimiter "}"'), $EXPECT($L117, 'StatementDelimiter ")"'), $EXPECT($L38, 'StatementDelimiter "]"'))));
       var StatementDelimiter$$ = [StatementDelimiter$0, StatementDelimiter$1, StatementDelimiter$2];
       function StatementDelimiter(ctx, state) {
         return $EVENT_C(ctx, state, "StatementDelimiter", StatementDelimiter$$);
@@ -11397,7 +11498,7 @@ ${input.slice(result.pos)}
       function Loc(ctx, state) {
         return $EVENT(ctx, state, "Loc", Loc$0);
       }
-      var Abstract$0 = $TV($TEXT($S($EXPECT($L117, 'Abstract "abstract"'), NonIdContinue, $E($EXPECT($L15, 'Abstract " "')))), function($skip, $loc, $0, $1) {
+      var Abstract$0 = $TV($TEXT($S($EXPECT($L118, 'Abstract "abstract"'), NonIdContinue, $E($EXPECT($L15, 'Abstract " "')))), function($skip, $loc, $0, $1) {
         return { $loc, token: $1, ts: true };
       });
       function Abstract(ctx, state) {
@@ -11409,43 +11510,43 @@ ${input.slice(result.pos)}
       function Ampersand(ctx, state) {
         return $EVENT(ctx, state, "Ampersand", Ampersand$0);
       }
-      var As$0 = $TS($S($EXPECT($L118, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var As$0 = $TS($S($EXPECT($L119, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function As(ctx, state) {
         return $EVENT(ctx, state, "As", As$0);
       }
-      var At$0 = $TV($EXPECT($L119, 'At "@"'), function($skip, $loc, $0, $1) {
+      var At$0 = $TV($EXPECT($L120, 'At "@"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function At(ctx, state) {
         return $EVENT(ctx, state, "At", At$0);
       }
-      var AtAt$0 = $TV($EXPECT($L120, 'AtAt "@@"'), function($skip, $loc, $0, $1) {
+      var AtAt$0 = $TV($EXPECT($L121, 'AtAt "@@"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "@" };
       });
       function AtAt(ctx, state) {
         return $EVENT(ctx, state, "AtAt", AtAt$0);
       }
-      var Async$0 = $TS($S($EXPECT($L121, 'Async "async"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Async$0 = $TS($S($EXPECT($L122, 'Async "async"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1, type: "Async" };
       });
       function Async(ctx, state) {
         return $EVENT(ctx, state, "Async", Async$0);
       }
-      var Await$0 = $TS($S($EXPECT($L122, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Await$0 = $TS($S($EXPECT($L123, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1, type: "Await" };
       });
       function Await(ctx, state) {
         return $EVENT(ctx, state, "Await", Await$0);
       }
-      var Backtick$0 = $TV($EXPECT($L123, 'Backtick "`"'), function($skip, $loc, $0, $1) {
+      var Backtick$0 = $TV($EXPECT($L124, 'Backtick "`"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Backtick(ctx, state) {
         return $EVENT(ctx, state, "Backtick", Backtick$0);
       }
-      var By$0 = $TS($S($EXPECT($L124, 'By "by"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var By$0 = $TS($S($EXPECT($L125, 'By "by"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function By(ctx, state) {
@@ -11457,19 +11558,19 @@ ${input.slice(result.pos)}
       function Caret(ctx, state) {
         return $EVENT(ctx, state, "Caret", Caret$0);
       }
-      var Case$0 = $TS($S($EXPECT($L125, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Case$0 = $TS($S($EXPECT($L126, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Case(ctx, state) {
         return $EVENT(ctx, state, "Case", Case$0);
       }
-      var Catch$0 = $TS($S($EXPECT($L126, 'Catch "catch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Catch$0 = $TS($S($EXPECT($L127, 'Catch "catch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Catch(ctx, state) {
         return $EVENT(ctx, state, "Catch", Catch$0);
       }
-      var Class$0 = $TS($S($EXPECT($L127, 'Class "class"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Class$0 = $TS($S($EXPECT($L128, 'Class "class"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Class(ctx, state) {
@@ -11493,13 +11594,13 @@ ${input.slice(result.pos)}
       function CloseBracket(ctx, state) {
         return $EVENT(ctx, state, "CloseBracket", CloseBracket$0);
       }
-      var CloseParen$0 = $TV($EXPECT($L116, 'CloseParen ")"'), function($skip, $loc, $0, $1) {
+      var CloseParen$0 = $TV($EXPECT($L117, 'CloseParen ")"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function CloseParen(ctx, state) {
         return $EVENT(ctx, state, "CloseParen", CloseParen$0);
       }
-      var CoffeeSubstitutionStart$0 = $TV($EXPECT($L128, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
+      var CoffeeSubstitutionStart$0 = $TV($EXPECT($L129, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "${" };
       });
       function CoffeeSubstitutionStart(ctx, state) {
@@ -11517,31 +11618,31 @@ ${input.slice(result.pos)}
       function Comma(ctx, state) {
         return $EVENT(ctx, state, "Comma", Comma$0);
       }
-      var ConstructorShorthand$0 = $TV($EXPECT($L119, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
+      var ConstructorShorthand$0 = $TV($EXPECT($L120, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "constructor" };
       });
       function ConstructorShorthand(ctx, state) {
         return $EVENT(ctx, state, "ConstructorShorthand", ConstructorShorthand$0);
       }
-      var Declare$0 = $TS($S($EXPECT($L129, 'Declare "declare"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Declare$0 = $TS($S($EXPECT($L130, 'Declare "declare"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Declare(ctx, state) {
         return $EVENT(ctx, state, "Declare", Declare$0);
       }
-      var Default$0 = $TS($S($EXPECT($L130, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Default$0 = $TS($S($EXPECT($L131, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Default(ctx, state) {
         return $EVENT(ctx, state, "Default", Default$0);
       }
-      var Delete$0 = $TS($S($EXPECT($L131, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Delete$0 = $TS($S($EXPECT($L132, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Delete(ctx, state) {
         return $EVENT(ctx, state, "Delete", Delete$0);
       }
-      var Do$0 = $TS($S($EXPECT($L132, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Do$0 = $TS($S($EXPECT($L133, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Do(ctx, state) {
@@ -11561,45 +11662,45 @@ ${input.slice(result.pos)}
       function Dot(ctx, state) {
         return $EVENT_C(ctx, state, "Dot", Dot$$);
       }
-      var DotDot$0 = $TS($S($EXPECT($L133, 'DotDot ".."'), $N($EXPECT($L7, 'DotDot "."'))), function($skip, $loc, $0, $1, $2) {
+      var DotDot$0 = $TS($S($EXPECT($L134, 'DotDot ".."'), $N($EXPECT($L7, 'DotDot "."'))), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
-      var DotDot$1 = $TV($EXPECT($L134, 'DotDot "\u2025"'), function($skip, $loc, $0, $1) {
+      var DotDot$1 = $TV($EXPECT($L135, 'DotDot "\u2025"'), function($skip, $loc, $0, $1) {
         return { $loc, token: ".." };
       });
       var DotDot$$ = [DotDot$0, DotDot$1];
       function DotDot(ctx, state) {
         return $EVENT_C(ctx, state, "DotDot", DotDot$$);
       }
-      var DotDotDot$0 = $TV($EXPECT($L135, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
+      var DotDotDot$0 = $TV($EXPECT($L136, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
-      var DotDotDot$1 = $TV($EXPECT($L136, 'DotDotDot "\u2026"'), function($skip, $loc, $0, $1) {
+      var DotDotDot$1 = $TV($EXPECT($L137, 'DotDotDot "\u2026"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "..." };
       });
       var DotDotDot$$ = [DotDotDot$0, DotDotDot$1];
       function DotDotDot(ctx, state) {
         return $EVENT_C(ctx, state, "DotDotDot", DotDotDot$$);
       }
-      var DoubleColon$0 = $TV($EXPECT($L137, 'DoubleColon "::"'), function($skip, $loc, $0, $1) {
+      var DoubleColon$0 = $TV($EXPECT($L138, 'DoubleColon "::"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function DoubleColon(ctx, state) {
         return $EVENT(ctx, state, "DoubleColon", DoubleColon$0);
       }
-      var DoubleQuote$0 = $TV($EXPECT($L138, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
+      var DoubleQuote$0 = $TV($EXPECT($L139, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function DoubleQuote(ctx, state) {
         return $EVENT(ctx, state, "DoubleQuote", DoubleQuote$0);
       }
-      var Each$0 = $TS($S($EXPECT($L139, 'Each "each"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Each$0 = $TS($S($EXPECT($L140, 'Each "each"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Each(ctx, state) {
         return $EVENT(ctx, state, "Each", Each$0);
       }
-      var Else$0 = $TS($S($EXPECT($L140, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Else$0 = $TS($S($EXPECT($L141, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Else(ctx, state) {
@@ -11617,55 +11718,55 @@ ${input.slice(result.pos)}
       function ExclamationPoint(ctx, state) {
         return $EVENT(ctx, state, "ExclamationPoint", ExclamationPoint$0);
       }
-      var Export$0 = $TS($S($EXPECT($L141, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Export$0 = $TS($S($EXPECT($L142, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Export(ctx, state) {
         return $EVENT(ctx, state, "Export", Export$0);
       }
-      var Extends$0 = $TS($S($EXPECT($L142, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Extends$0 = $TS($S($EXPECT($L143, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Extends(ctx, state) {
         return $EVENT(ctx, state, "Extends", Extends$0);
       }
-      var Finally$0 = $TS($S($EXPECT($L143, 'Finally "finally"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Finally$0 = $TS($S($EXPECT($L144, 'Finally "finally"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Finally(ctx, state) {
         return $EVENT(ctx, state, "Finally", Finally$0);
       }
-      var For$0 = $TS($S($EXPECT($L144, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var For$0 = $TS($S($EXPECT($L145, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function For(ctx, state) {
         return $EVENT(ctx, state, "For", For$0);
       }
-      var From$0 = $TS($S($EXPECT($L145, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var From$0 = $TS($S($EXPECT($L146, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function From(ctx, state) {
         return $EVENT(ctx, state, "From", From$0);
       }
-      var Function$0 = $TS($S($EXPECT($L146, 'Function "function"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Function$0 = $TS($S($EXPECT($L147, 'Function "function"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Function(ctx, state) {
         return $EVENT(ctx, state, "Function", Function$0);
       }
-      var GetOrSet$0 = $TS($S($C($EXPECT($L147, 'GetOrSet "get"'), $EXPECT($L148, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var GetOrSet$0 = $TS($S($C($EXPECT($L148, 'GetOrSet "get"'), $EXPECT($L149, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1, type: "GetOrSet" };
       });
       function GetOrSet(ctx, state) {
         return $EVENT(ctx, state, "GetOrSet", GetOrSet$0);
       }
-      var Hash$0 = $TV($EXPECT($L149, 'Hash "#"'), function($skip, $loc, $0, $1) {
+      var Hash$0 = $TV($EXPECT($L150, 'Hash "#"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Hash(ctx, state) {
         return $EVENT(ctx, state, "Hash", Hash$0);
       }
-      var If$0 = $TV($TEXT($S($EXPECT($L150, 'If "if"'), NonIdContinue, $E($EXPECT($L15, 'If " "')))), function($skip, $loc, $0, $1) {
+      var If$0 = $TV($TEXT($S($EXPECT($L151, 'If "if"'), NonIdContinue, $E($EXPECT($L15, 'If " "')))), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function If(ctx, state) {
@@ -11677,25 +11778,31 @@ ${input.slice(result.pos)}
       function Import(ctx, state) {
         return $EVENT(ctx, state, "Import", Import$0);
       }
-      var In$0 = $TS($S($EXPECT($L151, 'In "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var In$0 = $TS($S($EXPECT($L152, 'In "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function In(ctx, state) {
         return $EVENT(ctx, state, "In", In$0);
       }
-      var LetOrConst$0 = $TS($S($C($EXPECT($L152, 'LetOrConst "let"'), $EXPECT($L153, 'LetOrConst "const"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Infer$0 = $TS($S($EXPECT($L153, 'Infer "infer"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+        return { $loc, token: $1 };
+      });
+      function Infer(ctx, state) {
+        return $EVENT(ctx, state, "Infer", Infer$0);
+      }
+      var LetOrConst$0 = $TS($S($C($EXPECT($L154, 'LetOrConst "let"'), $EXPECT($L155, 'LetOrConst "const"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function LetOrConst(ctx, state) {
         return $EVENT(ctx, state, "LetOrConst", LetOrConst$0);
       }
-      var Const$0 = $TS($S($EXPECT($L153, 'Const "const"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Const$0 = $TS($S($EXPECT($L155, 'Const "const"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Const(ctx, state) {
         return $EVENT(ctx, state, "Const", Const$0);
       }
-      var Is$0 = $TS($S($EXPECT($L154, 'Is "is"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Is$0 = $TS($S($EXPECT($L156, 'Is "is"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Is(ctx, state) {
@@ -11707,25 +11814,25 @@ ${input.slice(result.pos)}
       function LetOrConstOrVar(ctx, state) {
         return $EVENT_C(ctx, state, "LetOrConstOrVar", LetOrConstOrVar$$);
       }
-      var Loop$0 = $TS($S($EXPECT($L155, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Loop$0 = $TS($S($EXPECT($L157, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "while(true)" };
       });
       function Loop(ctx, state) {
         return $EVENT(ctx, state, "Loop", Loop$0);
       }
-      var New$0 = $TS($S($EXPECT($L156, 'New "new"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var New$0 = $TS($S($EXPECT($L158, 'New "new"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function New(ctx, state) {
         return $EVENT(ctx, state, "New", New$0);
       }
-      var Not$0 = $TS($S($EXPECT($L157, 'Not "not"'), NonIdContinue, $N($S($E(_), $EXPECT($L14, 'Not ":"')))), function($skip, $loc, $0, $1, $2, $3) {
+      var Not$0 = $TS($S($EXPECT($L159, 'Not "not"'), NonIdContinue, $N($S($E(_), $EXPECT($L14, 'Not ":"')))), function($skip, $loc, $0, $1, $2, $3) {
         return { $loc, token: "!" };
       });
       function Not(ctx, state) {
         return $EVENT(ctx, state, "Not", Not$0);
       }
-      var Of$0 = $TS($S($EXPECT($L158, 'Of "of"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Of$0 = $TS($S($EXPECT($L160, 'Of "of"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Of(ctx, state) {
@@ -11743,7 +11850,7 @@ ${input.slice(result.pos)}
       function OpenBrace(ctx, state) {
         return $EVENT(ctx, state, "OpenBrace", OpenBrace$0);
       }
-      var OpenBracket$0 = $TV($EXPECT($L159, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
+      var OpenBracket$0 = $TV($EXPECT($L161, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function OpenBracket(ctx, state) {
@@ -11755,43 +11862,43 @@ ${input.slice(result.pos)}
       function OpenParen(ctx, state) {
         return $EVENT(ctx, state, "OpenParen", OpenParen$0);
       }
-      var Operator$0 = $TS($S($EXPECT($L160, 'Operator "operator"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Operator$0 = $TS($S($EXPECT($L162, 'Operator "operator"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Operator(ctx, state) {
         return $EVENT(ctx, state, "Operator", Operator$0);
       }
-      var Own$0 = $TS($S($EXPECT($L161, 'Own "own"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Own$0 = $TS($S($EXPECT($L163, 'Own "own"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Own(ctx, state) {
         return $EVENT(ctx, state, "Own", Own$0);
       }
-      var Public$0 = $TS($S($EXPECT($L162, 'Public "public"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Public$0 = $TS($S($EXPECT($L164, 'Public "public"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Public(ctx, state) {
         return $EVENT(ctx, state, "Public", Public$0);
       }
-      var Private$0 = $TS($S($EXPECT($L163, 'Private "private"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Private$0 = $TS($S($EXPECT($L165, 'Private "private"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Private(ctx, state) {
         return $EVENT(ctx, state, "Private", Private$0);
       }
-      var Protected$0 = $TS($S($EXPECT($L164, 'Protected "protected"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Protected$0 = $TS($S($EXPECT($L166, 'Protected "protected"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Protected(ctx, state) {
         return $EVENT(ctx, state, "Protected", Protected$0);
       }
-      var Pipe$0 = $TV($C($EXPECT($L165, 'Pipe "||>"'), $EXPECT($L166, 'Pipe "|\u25B7"')), function($skip, $loc, $0, $1) {
+      var Pipe$0 = $TV($C($EXPECT($L167, 'Pipe "||>"'), $EXPECT($L168, 'Pipe "|\u25B7"')), function($skip, $loc, $0, $1) {
         return { $loc, token: "||>" };
       });
-      var Pipe$1 = $TV($C($EXPECT($L167, 'Pipe "|>="'), $EXPECT($L168, 'Pipe "\u25B7="')), function($skip, $loc, $0, $1) {
+      var Pipe$1 = $TV($C($EXPECT($L169, 'Pipe "|>="'), $EXPECT($L170, 'Pipe "\u25B7="')), function($skip, $loc, $0, $1) {
         return { $loc, token: "|>=" };
       });
-      var Pipe$2 = $TV($C($EXPECT($L169, 'Pipe "|>"'), $EXPECT($L170, 'Pipe "\u25B7"')), function($skip, $loc, $0, $1) {
+      var Pipe$2 = $TV($C($EXPECT($L171, 'Pipe "|>"'), $EXPECT($L172, 'Pipe "\u25B7"')), function($skip, $loc, $0, $1) {
         return { $loc, token: "|>" };
       });
       var Pipe$$ = [Pipe$0, Pipe$1, Pipe$2];
@@ -11804,31 +11911,31 @@ ${input.slice(result.pos)}
       function QuestionMark(ctx, state) {
         return $EVENT(ctx, state, "QuestionMark", QuestionMark$0);
       }
-      var Readonly$0 = $TS($S($EXPECT($L171, 'Readonly "readonly"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Readonly$0 = $TS($S($EXPECT($L173, 'Readonly "readonly"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1, ts: true };
       });
       function Readonly(ctx, state) {
         return $EVENT(ctx, state, "Readonly", Readonly$0);
       }
-      var Return$0 = $TS($S($EXPECT($L172, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Return$0 = $TS($S($EXPECT($L174, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Return(ctx, state) {
         return $EVENT(ctx, state, "Return", Return$0);
       }
-      var Satisfies$0 = $TS($S($EXPECT($L173, 'Satisfies "satisfies"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Satisfies$0 = $TS($S($EXPECT($L175, 'Satisfies "satisfies"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Satisfies(ctx, state) {
         return $EVENT(ctx, state, "Satisfies", Satisfies$0);
       }
-      var Semicolon$0 = $TV($EXPECT($L103, 'Semicolon ";"'), function($skip, $loc, $0, $1) {
+      var Semicolon$0 = $TV($EXPECT($L104, 'Semicolon ";"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Semicolon(ctx, state) {
         return $EVENT(ctx, state, "Semicolon", Semicolon$0);
       }
-      var SingleQuote$0 = $TV($EXPECT($L174, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
+      var SingleQuote$0 = $TV($EXPECT($L176, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function SingleQuote(ctx, state) {
@@ -11840,137 +11947,137 @@ ${input.slice(result.pos)}
       function Star(ctx, state) {
         return $EVENT(ctx, state, "Star", Star$0);
       }
-      var Static$0 = $TS($S($EXPECT($L175, 'Static "static"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Static$0 = $TS($S($EXPECT($L177, 'Static "static"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
-      var Static$1 = $TS($S($EXPECT($L119, 'Static "@"'), $N($C($EXPECT($L4, 'Static "("'), $EXPECT($L119, 'Static "@"')))), function($skip, $loc, $0, $1, $2) {
+      var Static$1 = $TS($S($EXPECT($L120, 'Static "@"'), $N($C($EXPECT($L4, 'Static "("'), $EXPECT($L120, 'Static "@"')))), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "static " };
       });
       var Static$$ = [Static$0, Static$1];
       function Static(ctx, state) {
         return $EVENT_C(ctx, state, "Static", Static$$);
       }
-      var SubstitutionStart$0 = $TV($EXPECT($L176, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
+      var SubstitutionStart$0 = $TV($EXPECT($L178, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function SubstitutionStart(ctx, state) {
         return $EVENT(ctx, state, "SubstitutionStart", SubstitutionStart$0);
       }
-      var Super$0 = $TS($S($EXPECT($L177, 'Super "super"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Super$0 = $TS($S($EXPECT($L179, 'Super "super"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Super(ctx, state) {
         return $EVENT(ctx, state, "Super", Super$0);
       }
-      var Switch$0 = $TS($S($EXPECT($L178, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Switch$0 = $TS($S($EXPECT($L180, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Switch(ctx, state) {
         return $EVENT(ctx, state, "Switch", Switch$0);
       }
-      var Target$0 = $TS($S($EXPECT($L179, 'Target "target"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Target$0 = $TS($S($EXPECT($L181, 'Target "target"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Target(ctx, state) {
         return $EVENT(ctx, state, "Target", Target$0);
       }
-      var Then$0 = $TS($S(__, $EXPECT($L180, 'Then "then"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
+      var Then$0 = $TS($S(__, $EXPECT($L182, 'Then "then"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
         return { $loc, token: "" };
       });
       function Then(ctx, state) {
         return $EVENT(ctx, state, "Then", Then$0);
       }
-      var This$0 = $TS($S($EXPECT($L181, 'This "this"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var This$0 = $TS($S($EXPECT($L183, 'This "this"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function This(ctx, state) {
         return $EVENT(ctx, state, "This", This$0);
       }
-      var Throw$0 = $TS($S($EXPECT($L182, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Throw$0 = $TS($S($EXPECT($L184, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Throw(ctx, state) {
         return $EVENT(ctx, state, "Throw", Throw$0);
       }
-      var TripleDoubleQuote$0 = $TV($EXPECT($L183, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
+      var TripleDoubleQuote$0 = $TV($EXPECT($L185, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
         return { $loc, token: "`" };
       });
       function TripleDoubleQuote(ctx, state) {
         return $EVENT(ctx, state, "TripleDoubleQuote", TripleDoubleQuote$0);
       }
-      var TripleSingleQuote$0 = $TV($EXPECT($L184, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
+      var TripleSingleQuote$0 = $TV($EXPECT($L186, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
         return { $loc, token: "`" };
       });
       function TripleSingleQuote(ctx, state) {
         return $EVENT(ctx, state, "TripleSingleQuote", TripleSingleQuote$0);
       }
-      var TripleSlash$0 = $TV($EXPECT($L185, 'TripleSlash "///"'), function($skip, $loc, $0, $1) {
+      var TripleSlash$0 = $TV($EXPECT($L187, 'TripleSlash "///"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "/" };
       });
       function TripleSlash(ctx, state) {
         return $EVENT(ctx, state, "TripleSlash", TripleSlash$0);
       }
-      var TripleTick$0 = $TV($EXPECT($L186, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
+      var TripleTick$0 = $TV($EXPECT($L188, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "`" };
       });
       function TripleTick(ctx, state) {
         return $EVENT(ctx, state, "TripleTick", TripleTick$0);
       }
-      var Try$0 = $TS($S($EXPECT($L187, 'Try "try"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Try$0 = $TS($S($EXPECT($L189, 'Try "try"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Try(ctx, state) {
         return $EVENT(ctx, state, "Try", Try$0);
       }
-      var Typeof$0 = $TS($S($EXPECT($L188, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Typeof$0 = $TS($S($EXPECT($L190, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Typeof(ctx, state) {
         return $EVENT(ctx, state, "Typeof", Typeof$0);
       }
-      var Unless$0 = $TS($S($EXPECT($L189, 'Unless "unless"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Unless$0 = $TS($S($EXPECT($L191, 'Unless "unless"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1, negated: true };
       });
       function Unless(ctx, state) {
         return $EVENT(ctx, state, "Unless", Unless$0);
       }
-      var Until$0 = $TS($S($EXPECT($L190, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Until$0 = $TS($S($EXPECT($L192, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Until(ctx, state) {
         return $EVENT(ctx, state, "Until", Until$0);
       }
-      var Using$0 = $TS($S($EXPECT($L191, 'Using "using"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Using$0 = $TS($S($EXPECT($L193, 'Using "using"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Using(ctx, state) {
         return $EVENT(ctx, state, "Using", Using$0);
       }
-      var Var$0 = $TS($S($EXPECT($L192, 'Var "var"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Var$0 = $TS($S($EXPECT($L194, 'Var "var"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Var(ctx, state) {
         return $EVENT(ctx, state, "Var", Var$0);
       }
-      var Void$0 = $TS($S($EXPECT($L193, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Void$0 = $TS($S($EXPECT($L195, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Void(ctx, state) {
         return $EVENT(ctx, state, "Void", Void$0);
       }
-      var When$0 = $TS($S($EXPECT($L194, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var When$0 = $TS($S($EXPECT($L196, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "case" };
       });
       function When(ctx, state) {
         return $EVENT(ctx, state, "When", When$0);
       }
-      var While$0 = $TS($S($EXPECT($L195, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var While$0 = $TS($S($EXPECT($L197, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function While(ctx, state) {
         return $EVENT(ctx, state, "While", While$0);
       }
-      var Yield$0 = $TS($S($EXPECT($L196, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Yield$0 = $TS($S($EXPECT($L198, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1, type: "Yield" };
       });
       function Yield(ctx, state) {
@@ -12049,7 +12156,7 @@ ${input.slice(result.pos)}
       function JSXElement(ctx, state) {
         return $EVENT_C(ctx, state, "JSXElement", JSXElement$$);
       }
-      var JSXSelfClosingElement$0 = $TS($S($EXPECT($L16, 'JSXSelfClosingElement "<"'), JSXElementName, $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L197, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+      var JSXSelfClosingElement$0 = $TS($S($EXPECT($L16, 'JSXSelfClosingElement "<"'), JSXElementName, $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L199, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
         return { type: "JSXElement", children: $0, tag: $2 };
       });
       function JSXSelfClosingElement(ctx, state) {
@@ -12083,7 +12190,7 @@ ${input.slice(result.pos)}
       function JSXOptionalClosingElement(ctx, state) {
         return $EVENT_C(ctx, state, "JSXOptionalClosingElement", JSXOptionalClosingElement$$);
       }
-      var JSXClosingElement$0 = $S($EXPECT($L198, 'JSXClosingElement "</"'), $E(Whitespace), JSXElementName, $E(Whitespace), $EXPECT($L37, 'JSXClosingElement ">"'));
+      var JSXClosingElement$0 = $S($EXPECT($L200, 'JSXClosingElement "</"'), $E(Whitespace), JSXElementName, $E(Whitespace), $EXPECT($L37, 'JSXClosingElement ">"'));
       function JSXClosingElement(ctx, state) {
         return $EVENT(ctx, state, "JSXClosingElement", JSXClosingElement$0);
       }
@@ -12104,7 +12211,7 @@ ${input.slice(result.pos)}
         ];
         return { type: "JSXFragment", children: parts, jsxChildren: children.jsxChildren };
       });
-      var JSXFragment$1 = $TS($S(CoffeeJSXEnabled, $EXPECT($L199, 'JSXFragment "<>"'), $E(JSXChildren), $E(Whitespace), JSXClosingFragment), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var JSXFragment$1 = $TS($S(CoffeeJSXEnabled, $EXPECT($L201, 'JSXFragment "<>"'), $E(JSXChildren), $E(Whitespace), JSXClosingFragment), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         var children = $3;
         $0 = $0.slice(1);
         return {
@@ -12117,7 +12224,7 @@ ${input.slice(result.pos)}
       function JSXFragment(ctx, state) {
         return $EVENT_C(ctx, state, "JSXFragment", JSXFragment$$);
       }
-      var PushJSXOpeningFragment$0 = $TV($EXPECT($L199, 'PushJSXOpeningFragment "<>"'), function($skip, $loc, $0, $1) {
+      var PushJSXOpeningFragment$0 = $TV($EXPECT($L201, 'PushJSXOpeningFragment "<>"'), function($skip, $loc, $0, $1) {
         module.JSXTagStack.push("");
         return $1;
       });
@@ -12134,11 +12241,11 @@ ${input.slice(result.pos)}
       function JSXOptionalClosingFragment(ctx, state) {
         return $EVENT_C(ctx, state, "JSXOptionalClosingFragment", JSXOptionalClosingFragment$$);
       }
-      var JSXClosingFragment$0 = $EXPECT($L200, 'JSXClosingFragment "</>"');
+      var JSXClosingFragment$0 = $EXPECT($L202, 'JSXClosingFragment "</>"');
       function JSXClosingFragment(ctx, state) {
         return $EVENT(ctx, state, "JSXClosingFragment", JSXClosingFragment$0);
       }
-      var JSXElementName$0 = $TV($Y($S($C($EXPECT($L149, 'JSXElementName "#"'), Dot), JSXShorthandString)), function($skip, $loc, $0, $1) {
+      var JSXElementName$0 = $TV($Y($S($C($EXPECT($L150, 'JSXElementName "#"'), Dot), JSXShorthandString)), function($skip, $loc, $0, $1) {
         return module.config.defaultElement;
       });
       var JSXElementName$1 = $TEXT($S(JSXIdentifierName, $C($S(Colon, JSXIdentifierName), $Q($S(Dot, JSXIdentifierName)))));
@@ -12316,7 +12423,7 @@ ${input.slice(result.pos)}
         }
         return $skip;
       });
-      var JSXAttribute$5 = $TS($S($EXPECT($L149, 'JSXAttribute "#"'), JSXShorthandString), function($skip, $loc, $0, $1, $2) {
+      var JSXAttribute$5 = $TS($S($EXPECT($L150, 'JSXAttribute "#"'), JSXShorthandString), function($skip, $loc, $0, $1, $2) {
         return [" ", "id=", $2];
       });
       var JSXAttribute$6 = $TS($S(Dot, JSXShorthandString), function($skip, $loc, $0, $1, $2) {
@@ -12608,7 +12715,7 @@ ${input.slice(result.pos)}
       function JSXChild(ctx, state) {
         return $EVENT_C(ctx, state, "JSXChild", JSXChild$$);
       }
-      var JSXComment$0 = $TS($S($EXPECT($L201, 'JSXComment "<!--"'), JSXCommentContent, $EXPECT($L202, 'JSXComment "-->"')), function($skip, $loc, $0, $1, $2, $3) {
+      var JSXComment$0 = $TS($S($EXPECT($L203, 'JSXComment "<!--"'), JSXCommentContent, $EXPECT($L204, 'JSXComment "-->"')), function($skip, $loc, $0, $1, $2, $3) {
         return ["{/*", $2, "*/}"];
       });
       function JSXComment(ctx, state) {
@@ -12695,21 +12802,66 @@ ${input.slice(result.pos)}
       var TypeDeclaration$0 = $T($S($E($S(Export, $E(_))), $S(Declare, $E(_)), TypeLexicalDeclaration), function(value) {
         return { "ts": true, "children": value };
       });
-      var TypeDeclaration$1 = $T($S($E($S(Export, $E(_))), $E($S(Declare, $E(_))), TypeDeclarationRest), function(value) {
-        return { "ts": true, "children": value };
+      var TypeDeclaration$1 = $TS($S($E($S(Export, $E(_))), $E($S(Declare, $E(_))), TypeDeclarationRest), function($skip, $loc, $0, $1, $2, $3) {
+        var export_ = $1;
+        var declare = $2;
+        var t = $3;
+        return {
+          ...t,
+          ts: true,
+          export: export_,
+          declare,
+          children: [export_, declare, ...t.children]
+        };
       });
       var TypeDeclaration$$ = [TypeDeclaration$0, TypeDeclaration$1];
       function TypeDeclaration(ctx, state) {
         return $EVENT_C(ctx, state, "TypeDeclaration", TypeDeclaration$$);
       }
-      var TypeDeclarationRest$0 = $S(TypeKeyword, $E(_), IdentifierName, $E(TypeParameters), OptionalEquals, $C($S($E(_), Type), $S(__, Type)));
-      var TypeDeclarationRest$1 = $S(Interface, $E(_), IdentifierName, $E(TypeParameters), $E(InterfaceExtendsClause), InterfaceBlock);
-      var TypeDeclarationRest$2 = $S(Namespace, $E(_), IdentifierName, ModuleBlock);
+      var TypeDeclarationRest$0 = TypeAliasDeclaration;
+      var TypeDeclarationRest$1 = InterfaceDeclaration;
+      var TypeDeclarationRest$2 = NamespaceDeclaration;
       var TypeDeclarationRest$3 = FunctionSignature;
       var TypeDeclarationRest$$ = [TypeDeclarationRest$0, TypeDeclarationRest$1, TypeDeclarationRest$2, TypeDeclarationRest$3];
       function TypeDeclarationRest(ctx, state) {
         return $EVENT_C(ctx, state, "TypeDeclarationRest", TypeDeclarationRest$$);
       }
+      var TypeAliasDeclaration$0 = $TS($S(TypeKeyword, $E(_), IdentifierName, $E(TypeParameters), OptionalEquals, $C($S($E(_), Type), $S(__, Type))), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+        var id = $3;
+        return {
+          type: "TypeDeclaration",
+          id,
+          children: $0,
+          ts: true
+        };
+      });
+      function TypeAliasDeclaration(ctx, state) {
+        return $EVENT(ctx, state, "TypeAliasDeclaration", TypeAliasDeclaration$0);
+      }
+      var InterfaceDeclaration$0 = $TS($S(Interface, $E(_), IdentifierName, $E(TypeParameters), $E(InterfaceExtendsClause), InterfaceBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+        var id = $3;
+        return {
+          type: "InterfaceDeclaration",
+          id,
+          children: $0,
+          ts: true
+        };
+      });
+      function InterfaceDeclaration(ctx, state) {
+        return $EVENT(ctx, state, "InterfaceDeclaration", InterfaceDeclaration$0);
+      }
+      var NamespaceDeclaration$0 = $TS($S(Namespace, $E(_), IdentifierName, ModuleBlock), function($skip, $loc, $0, $1, $2, $3, $4) {
+        var id = $3;
+        return {
+          type: "NamespaceDeclaration",
+          id,
+          children: $0,
+          ts: true
+        };
+      });
+      function NamespaceDeclaration(ctx, state) {
+        return $EVENT(ctx, state, "NamespaceDeclaration", NamespaceDeclaration$0);
+      }
       var OptionalEquals$0 = $S(__, Equals);
       var OptionalEquals$1 = $T($S($Y(IndentedFurther), InsertSpaceEquals), function(value) {
         return value[1];
@@ -12740,37 +12892,37 @@ ${input.slice(result.pos)}
       function InterfaceExtendsTarget(ctx, state) {
         return $EVENT(ctx, state, "InterfaceExtendsTarget", InterfaceExtendsTarget$0);
       }
-      var TypeKeyword$0 = $TS($S($EXPECT($L203, 'TypeKeyword "type"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var TypeKeyword$0 = $TS($S($EXPECT($L205, 'TypeKeyword "type"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function TypeKeyword(ctx, state) {
         return $EVENT(ctx, state, "TypeKeyword", TypeKeyword$0);
       }
-      var Enum$0 = $TS($S($EXPECT($L204, 'Enum "enum"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Enum$0 = $TS($S($EXPECT($L206, 'Enum "enum"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Enum(ctx, state) {
         return $EVENT(ctx, state, "Enum", Enum$0);
       }
-      var Interface$0 = $TS($S($EXPECT($L205, 'Interface "interface"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Interface$0 = $TS($S($EXPECT($L207, 'Interface "interface"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Interface(ctx, state) {
         return $EVENT(ctx, state, "Interface", Interface$0);
       }
-      var Global$0 = $TS($S($EXPECT($L206, 'Global "global"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Global$0 = $TS($S($EXPECT($L208, 'Global "global"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Global(ctx, state) {
         return $EVENT(ctx, state, "Global", Global$0);
       }
-      var Module$0 = $TS($S($EXPECT($L207, 'Module "module"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Module$0 = $TS($S($EXPECT($L209, 'Module "module"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Module(ctx, state) {
         return $EVENT(ctx, state, "Module", Module$0);
       }
-      var Namespace$0 = $TS($S($EXPECT($L208, 'Namespace "namespace"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Namespace$0 = $TS($S($EXPECT($L210, 'Namespace "namespace"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Namespace(ctx, state) {
@@ -12872,9 +13024,10 @@ ${input.slice(result.pos)}
           children: $0
         };
         const names = new Set(block.properties.map((p) => p.name.name));
-        return [
-          ts,
-          {
+        return {
+          type: "EnumDeclaration",
+          id,
+          children: [ts, {
             js: true,
             children: [
               ["let ", id, " = {};\n"],
@@ -12916,8 +13069,8 @@ ${input.slice(result.pos)}
                 }
               })
             ]
-          }
-        ];
+          }]
+        };
       });
       function EnumDeclaration(ctx, state) {
         return $EVENT(ctx, state, "EnumDeclaration", EnumDeclaration$0);
@@ -12947,26 +13100,26 @@ ${input.slice(result.pos)}
       function EnumBlock(ctx, state) {
         return $EVENT_C(ctx, state, "EnumBlock", EnumBlock$$);
       }
-      var NestedEnumProperties$0 = $TS($S(PushIndent, $Q(NestedEnumProperty), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+      var NestedEnumProperties$0 = $TS($S(PushIndent, $Q(NestedEnumPropertyLine), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
         var props = $2;
         if (!props.length)
           return $skip;
         return {
-          properties: props.map((p) => p.property),
+          properties: props.flat().map((p) => p.property),
           children: $0
         };
       });
       function NestedEnumProperties(ctx, state) {
         return $EVENT(ctx, state, "NestedEnumProperties", NestedEnumProperties$0);
       }
-      var NestedEnumProperty$0 = $TS($S(Nested, EnumProperty), function($skip, $loc, $0, $1, $2) {
-        return {
-          property: $2,
-          children: $0
-        };
+      var NestedEnumPropertyLine$0 = $TS($S($S(Nested, EnumProperty), $Q($S($E(_), EnumProperty))), function($skip, $loc, $0, $1, $2) {
+        return [$1, ...$2].map((pair) => ({
+          property: pair[1],
+          children: pair
+        }));
       });
-      function NestedEnumProperty(ctx, state) {
-        return $EVENT(ctx, state, "NestedEnumProperty", NestedEnumProperty$0);
+      function NestedEnumPropertyLine(ctx, state) {
+        return $EVENT(ctx, state, "NestedEnumPropertyLine", NestedEnumPropertyLine$0);
       }
       var EnumProperty$0 = $TS($S(Identifier, $E($S(__, Equals, ExtendedExpression)), ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3) {
         var name = $1;
@@ -13043,7 +13196,7 @@ ${input.slice(result.pos)}
       function ReturnTypeSuffix(ctx, state) {
         return $EVENT(ctx, state, "ReturnTypeSuffix", ReturnTypeSuffix$0);
       }
-      var ReturnType$0 = $TS($S($E($S(__, $EXPECT($L209, 'ReturnType "asserts"'), NonIdContinue)), TypePredicate), function($skip, $loc, $0, $1, $2) {
+      var ReturnType$0 = $TS($S($E($S(__, $EXPECT($L211, 'ReturnType "asserts"'), NonIdContinue)), TypePredicate), function($skip, $loc, $0, $1, $2) {
         var asserts = $1;
         var t = $2;
         if (asserts) {
@@ -13064,7 +13217,7 @@ ${input.slice(result.pos)}
       function ReturnType(ctx, state) {
         return $EVENT(ctx, state, "ReturnType", ReturnType$0);
       }
-      var TypePredicate$0 = $TS($S(Type, $E($S(__, $EXPECT($L154, 'TypePredicate "is"'), NonIdContinue, Type))), function($skip, $loc, $0, $1, $2) {
+      var TypePredicate$0 = $TS($S(Type, $E($S(__, $EXPECT($L156, 'TypePredicate "is"'), NonIdContinue, Type))), function($skip, $loc, $0, $1, $2) {
         var lhs = $1;
         var rhs = $2;
         if (!rhs)
@@ -13098,7 +13251,7 @@ ${input.slice(result.pos)}
       function TypeBinary(ctx, state) {
         return $EVENT(ctx, state, "TypeBinary", TypeBinary$0);
       }
-      var TypeUnary$0 = $TS($S($Q($S(__, TypeUnaryOp, NonIdContinue)), TypePrimary, $Q(TypeUnarySuffix)), function($skip, $loc, $0, $1, $2, $3) {
+      var TypeUnary$0 = $TS($S($Q($S(__, TypeUnaryOp)), TypePrimary, $Q(TypeUnarySuffix)), function($skip, $loc, $0, $1, $2, $3) {
         var prefix = $1;
         var t = $2;
         var suffix = $3;
@@ -13122,10 +13275,9 @@ ${input.slice(result.pos)}
       function TypeUnarySuffix(ctx, state) {
         return $EVENT_C(ctx, state, "TypeUnarySuffix", TypeUnarySuffix$$);
       }
-      var TypeUnaryOp$0 = $S($EXPECT($L210, 'TypeUnaryOp "keyof"'), NonIdContinue);
-      var TypeUnaryOp$1 = $S($EXPECT($L211, 'TypeUnaryOp "infer"'), NonIdContinue);
-      var TypeUnaryOp$2 = $S($EXPECT($L171, 'TypeUnaryOp "readonly"'), NonIdContinue);
-      var TypeUnaryOp$$ = [TypeUnaryOp$0, TypeUnaryOp$1, TypeUnaryOp$2];
+      var TypeUnaryOp$0 = $S($EXPECT($L212, 'TypeUnaryOp "keyof"'), NonIdContinue);
+      var TypeUnaryOp$1 = $S($EXPECT($L173, 'TypeUnaryOp "readonly"'), NonIdContinue);
+      var TypeUnaryOp$$ = [TypeUnaryOp$0, TypeUnaryOp$1];
       function TypeUnaryOp(ctx, state) {
         return $EVENT_C(ctx, state, "TypeUnaryOp", TypeUnaryOp$$);
       }
@@ -13154,25 +13306,26 @@ ${input.slice(result.pos)}
       function TypeIndexedAccess(ctx, state) {
         return $EVENT_C(ctx, state, "TypeIndexedAccess", TypeIndexedAccess$$);
       }
-      var UnknownAlias$0 = $TV($EXPECT($L212, 'UnknownAlias "???"'), function($skip, $loc, $0, $1) {
+      var UnknownAlias$0 = $TV($EXPECT($L213, 'UnknownAlias "???"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "unknown" };
       });
       function UnknownAlias(ctx, state) {
         return $EVENT(ctx, state, "UnknownAlias", UnknownAlias$0);
       }
-      var TypePrimary$0 = $TS($S($E(_), Typeof, $E(_), ConditionalExpression), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var TypePrimary$0 = $S($E(_), Infer, $E(_), IdentifierName, $E($S(NotDedented, ExtendsToken, Type)));
+      var TypePrimary$1 = $TS($S($E(_), Typeof, $E(_), UnaryExpression), function($skip, $loc, $0, $1, $2, $3, $4) {
         return {
           type: "TypeofType",
           children: $0
         };
       });
-      var TypePrimary$1 = $TS($S($E(_), TypeTuple), function($skip, $loc, $0, $1, $2) {
+      var TypePrimary$2 = $TS($S($E(_), TypeTuple), function($skip, $loc, $0, $1, $2) {
         return { ...$2, children: [$1, ...$2.children] };
       });
-      var TypePrimary$2 = InterfaceBlock;
-      var TypePrimary$3 = $S($E(_), FunctionType);
-      var TypePrimary$4 = $S($E(_), InlineInterfaceLiteral);
-      var TypePrimary$5 = $TS($S($E(_), ImportType), function($skip, $loc, $0, $1, $2) {
+      var TypePrimary$3 = InterfaceBlock;
+      var TypePrimary$4 = $S($E(_), FunctionType);
+      var TypePrimary$5 = $S($E(_), InlineInterfaceLiteral);
+      var TypePrimary$6 = $TS($S($E(_), ImportType), function($skip, $loc, $0, $1, $2) {
         var t = $2;
         return {
           type: "ImportType",
@@ -13180,7 +13333,7 @@ ${input.slice(result.pos)}
           children: $0
         };
       });
-      var TypePrimary$6 = $TS($S($E(_), TypeLiteral), function($skip, $loc, $0, $1, $2) {
+      var TypePrimary$7 = $TS($S($E(_), TypeLiteral), function($skip, $loc, $0, $1, $2) {
         var t = $2;
         return {
           type: "LiteralType",
@@ -13188,7 +13341,7 @@ ${input.slice(result.pos)}
           children: $0
         };
       });
-      var TypePrimary$7 = $TS($S($E(_), UnknownAlias), function($skip, $loc, $0, $1, $2) {
+      var TypePrimary$8 = $TS($S($E(_), UnknownAlias), function($skip, $loc, $0, $1, $2) {
         return {
           type: "IdentifierType",
           children: $0,
@@ -13196,7 +13349,7 @@ ${input.slice(result.pos)}
           args: void 0
         };
       });
-      var TypePrimary$8 = $TS($S($E(_), IdentifierName, $Q($S(Dot, IdentifierName)), $E(TypeArguments)), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var TypePrimary$9 = $TS($S($E(_), IdentifierName, $Q($S(Dot, IdentifierName)), $E(TypeArguments)), function($skip, $loc, $0, $1, $2, $3, $4) {
         var args = $4;
         return {
           type: "IdentifierType",
@@ -13205,13 +13358,13 @@ ${input.slice(result.pos)}
           args
         };
       });
-      var TypePrimary$9 = $TS($S($E(_), OpenParen, $C(Type, $S(EOS, Type)), __, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var TypePrimary$10 = $TS($S($E(_), OpenParen, $C(Type, $S(EOS, Type)), __, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         return {
           type: "ParenthesizedType",
           children: $0
         };
       });
-      var TypePrimary$$ = [TypePrimary$0, TypePrimary$1, TypePrimary$2, TypePrimary$3, TypePrimary$4, TypePrimary$5, TypePrimary$6, TypePrimary$7, TypePrimary$8, TypePrimary$9];
+      var TypePrimary$$ = [TypePrimary$0, TypePrimary$1, TypePrimary$2, TypePrimary$3, TypePrimary$4, TypePrimary$5, TypePrimary$6, TypePrimary$7, TypePrimary$8, TypePrimary$9, TypePrimary$10];
       function TypePrimary(ctx, state) {
         return $EVENT_C(ctx, state, "TypePrimary", TypePrimary$$);
       }
@@ -13287,11 +13440,7 @@ ${input.slice(result.pos)}
           return [$1, $2, $3, $7, $5, $6, $4];
         return $0;
       });
-      var TypeConditional$2 = $TS($S(TypeBinary, $E($S($E(IndentedFurther), ExtendsToken, Type))), function($skip, $loc, $0, $1, $2) {
-        if (!$2)
-          return $1;
-        return $0;
-      });
+      var TypeConditional$2 = TypeBinary;
       var TypeConditional$$ = [TypeConditional$0, TypeConditional$1, TypeConditional$2];
       function TypeConditional(ctx, state) {
         return $EVENT_C(ctx, state, "TypeConditional", TypeConditional$$);
@@ -13363,10 +13512,10 @@ ${input.slice(result.pos)}
       }
       var TypeLiteral$0 = TypeTemplateLiteral;
       var TypeLiteral$1 = Literal;
-      var TypeLiteral$2 = $TS($S($EXPECT($L193, 'TypeLiteral "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var TypeLiteral$2 = $TS($S($EXPECT($L195, 'TypeLiteral "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { type: "VoidType", $loc, token: $1 };
       });
-      var TypeLiteral$3 = $TV($EXPECT($L213, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
+      var TypeLiteral$3 = $TV($EXPECT($L214, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "[]" };
       });
       var TypeLiteral$$ = [TypeLiteral$0, TypeLiteral$1, TypeLiteral$2, TypeLiteral$3];
@@ -13385,7 +13534,7 @@ ${input.slice(result.pos)}
       var InlineInterfacePropertyDelimiter$1 = $T($S($Y($S($C(IndentedFurther, $E(_)), InlineBasicInterfaceProperty)), InsertComma), function(value) {
         return value[1];
       });
-      var InlineInterfacePropertyDelimiter$2 = $Y($S(__, $C($EXPECT($L14, 'InlineInterfacePropertyDelimiter ":"'), $EXPECT($L116, 'InlineInterfacePropertyDelimiter ")"'), $EXPECT($L38, 'InlineInterfacePropertyDelimiter "]"'), $EXPECT($L29, 'InlineInterfacePropertyDelimiter "}"'))));
+      var InlineInterfacePropertyDelimiter$2 = $Y($S(__, $C($EXPECT($L14, 'InlineInterfacePropertyDelimiter ":"'), $EXPECT($L117, 'InlineInterfacePropertyDelimiter ")"'), $EXPECT($L38, 'InlineInterfacePropertyDelimiter "]"'), $EXPECT($L29, 'InlineInterfacePropertyDelimiter "}"'))));
       var InlineInterfacePropertyDelimiter$3 = $Y(EOS);
       var InlineInterfacePropertyDelimiter$$ = [InlineInterfacePropertyDelimiter$0, InlineInterfacePropertyDelimiter$1, InlineInterfacePropertyDelimiter$2, InlineInterfacePropertyDelimiter$3];
       function InlineInterfacePropertyDelimiter(ctx, state) {
@@ -13449,11 +13598,11 @@ ${input.slice(result.pos)}
       function TypeParameters(ctx, state) {
         return $EVENT(ctx, state, "TypeParameters", TypeParameters$0);
       }
-      var TypeParameter$0 = $S(__, $E($S($EXPECT($L153, 'TypeParameter "const"'), $E(_))), Identifier, $E(TypeConstraint), $E(TypeInitializer), TypeParameterDelimiter);
+      var TypeParameter$0 = $S(__, $E($S($EXPECT($L155, 'TypeParameter "const"'), $E(_))), Identifier, $E(TypeConstraint), $E(TypeInitializer), TypeParameterDelimiter);
       function TypeParameter(ctx, state) {
         return $EVENT(ctx, state, "TypeParameter", TypeParameter$0);
       }
-      var TypeConstraint$0 = $S(__, $EXPECT($L142, 'TypeConstraint "extends"'), NonIdContinue, Type);
+      var TypeConstraint$0 = $S(__, $EXPECT($L143, 'TypeConstraint "extends"'), NonIdContinue, Type);
       function TypeConstraint(ctx, state) {
         return $EVENT(ctx, state, "TypeConstraint", TypeConstraint$0);
       }
@@ -13492,7 +13641,7 @@ ${input.slice(result.pos)}
       function CivetPrologue(ctx, state) {
         return $EVENT_C(ctx, state, "CivetPrologue", CivetPrologue$$);
       }
-      var CivetPrologueContent$0 = $TS($S($EXPECT($L214, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R85, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var CivetPrologueContent$0 = $TS($S($EXPECT($L215, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R85, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
         var options = $3;
         return {
           type: "CivetPrologue",
@@ -13975,9 +14124,9 @@ ${input.slice(result.pos)}
                 preludeVar,
                 ref,
                 typeSuffix,
-                " = (lhs, rhs) => ((rhs",
+                " = (lhs, rhs) => (((rhs",
                 asAny,
-                ")?.[Symbol.isConcatSpreadable] ? (lhs",
+                ")?.[Symbol.isConcatSpreadable] ?? Array.isArray(rhs)) ? (lhs",
                 asAny,
                 ").push.apply(lhs, rhs",
                 asAny,
@@ -14179,20 +14328,20 @@ ${input.slice(result.pos)}
       function Dedented(ctx, state) {
         return $EVENT(ctx, state, "Dedented", Dedented$0);
       }
-      var parser2 = function() {
+      var parser = function() {
         const { fail, validate, reset } = Validator();
         let ctx = { expectation: "", fail };
         return {
           parse: (input, options = {}) => {
             if (typeof input !== "string")
               throw new Error("Input must be a string");
-            const parser3 = options.startRule != null ? grammar[options.startRule] : Object.values(grammar)[0];
-            if (!parser3)
+            const parser2 = options.startRule != null ? grammar[options.startRule] : Object.values(grammar)[0];
+            if (!parser2)
               throw new Error(`Could not find rule with name '${options.startRule}'`);
             const filename = options.filename || "<anonymous>";
             reset();
             Object.assign(ctx, { ...options.events, tokenize: options.tokenize });
-            return validate(input, parser3(ctx, {
+            return validate(input, parser2(ctx, {
               input,
               pos: 0
             }), {
@@ -14201,8 +14350,8 @@ ${input.slice(result.pos)}
           }
         };
       }();
-      exports.default = parser2;
-      exports.parse = parser2.parse;
+      exports.default = parser;
+      exports.parse = parser.parse;
       exports.Program = Program;
       exports.TopLevelStatements = TopLevelStatements;
       exports.NestedTopLevelStatements = NestedTopLevelStatements;
@@ -14248,6 +14397,7 @@ ${input.slice(result.pos)}
       exports.UnaryWithoutParenthesizedAssignmentBody = UnaryWithoutParenthesizedAssignmentBody;
       exports.UnaryPostfix = UnaryPostfix;
       exports.TypePostfix = TypePostfix;
+      exports.NWTypePostfix = NWTypePostfix;
       exports.UpdateExpression = UpdateExpression;
       exports.UpdateExpressionSymbol = UpdateExpressionSymbol;
       exports.AssignmentExpression = AssignmentExpression;
@@ -14360,6 +14510,7 @@ ${input.slice(result.pos)}
       exports.OperatorDeclaration = OperatorDeclaration;
       exports.OperatorSignature = OperatorSignature;
       exports.AmpersandBlockRHS = AmpersandBlockRHS;
+      exports.AmpersandTypeSuffix = AmpersandTypeSuffix;
       exports.AmpersandBlockRHSBody = AmpersandBlockRHSBody;
       exports.ThinArrowFunction = ThinArrowFunction;
       exports.Arrow = Arrow;
@@ -14416,8 +14567,10 @@ ${input.slice(result.pos)}
       exports.NestedImplicitPropertyDefinition = NestedImplicitPropertyDefinition;
       exports.NestedPropertyDefinitions = NestedPropertyDefinitions;
       exports.NestedPropertyDefinition = NestedPropertyDefinition;
+      exports.ImplicitObjectLiteral = ImplicitObjectLiteral;
+      exports.ImplicitObjectPropertyDelimiter = ImplicitObjectPropertyDelimiter;
       exports.InlineObjectLiteral = InlineObjectLiteral;
-      exports.ImplicitInlineObjectPropertyDelimiter = ImplicitInlineObjectPropertyDelimiter;
+      exports.InlineObjectPropertyDelimiter = InlineObjectPropertyDelimiter;
       exports.ObjectPropertyDelimiter = ObjectPropertyDelimiter;
       exports.PropertyDefinition = PropertyDefinition;
       exports.NamedProperty = NamedProperty;
@@ -14690,6 +14843,7 @@ ${input.slice(result.pos)}
       exports.If = If;
       exports.Import = Import;
       exports.In = In;
+      exports.Infer = Infer;
       exports.LetOrConst = LetOrConst;
       exports.Const = Const;
       exports.Is = Is;
@@ -14788,6 +14942,9 @@ ${input.slice(result.pos)}
       exports.UsingJSModeError = UsingJSModeError;
       exports.TypeDeclaration = TypeDeclaration;
       exports.TypeDeclarationRest = TypeDeclarationRest;
+      exports.TypeAliasDeclaration = TypeAliasDeclaration;
+      exports.InterfaceDeclaration = InterfaceDeclaration;
+      exports.NamespaceDeclaration = NamespaceDeclaration;
       exports.OptionalEquals = OptionalEquals;
       exports.TypeLexicalDeclaration = TypeLexicalDeclaration;
       exports.TypeDeclarationBinding = TypeDeclarationBinding;
@@ -14815,7 +14972,7 @@ ${input.slice(result.pos)}
       exports.EnumDeclaration = EnumDeclaration;
       exports.EnumBlock = EnumBlock;
       exports.NestedEnumProperties = NestedEnumProperties;
-      exports.NestedEnumProperty = NestedEnumProperty;
+      exports.NestedEnumPropertyLine = NestedEnumPropertyLine;
       exports.EnumProperty = EnumProperty;
       exports.TypeProperty = TypeProperty;
       exports.TypeIndexSignature = TypeIndexSignature;
@@ -14932,7 +15089,7 @@ ${input.slice(result.pos)}
     generate: () => generate_default,
     isCompileError: () => isCompileError,
     lib: () => lib_exports,
-    parse: () => parse2,
+    parse: () => import_parser.parse,
     prune: () => prune2,
     util: () => util_exports
   });
@@ -15396,7 +15553,6 @@ ${input.slice(result.pos)}
   };
 
   // source/main.civet
-  var { parse: parse2 } = import_parser.default;
   var { SourceMap: SourceMap2 } = util_exports;
   var uncacheable = /* @__PURE__ */ new Set([
     // Meta
@@ -15458,8 +15614,8 @@ ${input.slice(result.pos)}
     }
     let ast;
     try {
-      parse2.config = options.parseOptions || {};
-      ast = prune2(parse2(src, {
+      import_parser.parse.config = options.parseOptions || {};
+      ast = prune2((0, import_parser.parse)(src, {
         filename,
         events
       }));
@@ -15568,7 +15724,7 @@ ${counts}`;
           const key = [tagKey, stateKey, state.pos, ruleName];
           stateCache.set(key, result);
         }
-        if (parse2.config.verbose && result) {
+        if (import_parser.parse.config.verbose && result) {
           console.log(`Parsed ${JSON.stringify(state.input.slice(state.pos, result.pos))} [pos ${state.pos}-${result.pos}] as ${ruleName}`);
         }
         if (trace) {
@@ -15584,6 +15740,6 @@ ${counts}`;
     return err instanceof Error && //@ts-ignore
     [err.message, err.name, err.filename, err.line, err.column, err.offset].every(($1) => $1 !== void 0);
   };
-  var main_default = { parse: parse2, generate: generate_default, util: util_exports, compile, isCompileError };
+  var main_default = { parse: import_parser.parse, generate: generate_default, util: util_exports, compile, isCompileError };
   return __toCommonJS(main_exports);
 })();