@danielx/civet 0.5.44 → 0.5.46

package/dist/main.mjs

@@ -514,33 +514,19 @@ ${input.slice(result.pos)}
       BindingPattern,
       ObjectBindingPattern,
       ObjectBindingPatternContent,
+      BindingPropertyList,
       ArrayBindingPattern,
       ArrayBindingPatternContent,
       Elision,
       NestedBindingProperties,
-      NestedBindingProperty,
+      NestedBindingPropertyList,
       BindingProperty,
-      NestedBindingRestProperty,
       BindingRestProperty,
       NestedBindingElements,
       NestedBindingElement,
       BindingElement,
       BindingRestElement,
       EmptyBindingPattern,
-      MatchingPattern,
-      ObjectMatchingPattern,
-      ObjectMatchingPatternContent,
-      NestedMatchingProperties,
-      NestedMatchingProperty,
-      MatchingProperty,
-      NestedMatchingRestProperty,
-      MatchingRestProperty,
-      ArrayMatchingPattern,
-      ArrayMatchingPatternContent,
-      NestedMatchingElements,
-      NestedMatchingElement,
-      MatchingElement,
-      MatchingRestElement,
       FunctionDeclaration,
       FunctionSignature,
       FunctionExpression,
@@ -676,6 +662,7 @@ ${input.slice(result.pos)}
       NameSpaceImport,
       NamedImports,
       FromClause,
+      ImportAssertion,
       TypeAndImportSpecifier,
       ImportSpecifier,
       ImportAsToken,
@@ -1052,90 +1039,91 @@ ${input.slice(result.pos)}
     var $L82 = $L("break");
     var $L83 = $L("continue");
     var $L84 = $L("debugger");
-    var $L85 = $L("default");
-    var $L86 = $L(":=");
-    var $L87 = $L(".=");
-    var $L88 = $L("/*");
-    var $L89 = $L("*/");
-    var $L90 = $L("\\");
-    var $L91 = $L("abstract");
-    var $L92 = $L("as");
-    var $L93 = $L("@");
-    var $L94 = $L("@@");
-    var $L95 = $L("async");
-    var $L96 = $L("await");
-    var $L97 = $L("`");
-    var $L98 = $L("by");
-    var $L99 = $L("case");
-    var $L100 = $L("catch");
-    var $L101 = $L("class");
-    var $L102 = $L("#{");
-    var $L103 = $L("delete");
-    var $L104 = $L("do");
-    var $L105 = $L("..");
-    var $L106 = $L("...");
-    var $L107 = $L("::");
-    var $L108 = $L('"');
-    var $L109 = $L("else");
-    var $L110 = $L("export");
-    var $L111 = $L("extends");
-    var $L112 = $L("for");
-    var $L113 = $L("from");
-    var $L114 = $L("function");
-    var $L115 = $L("get");
-    var $L116 = $L("set");
-    var $L117 = $L("if");
-    var $L118 = $L("let");
-    var $L119 = $L("const");
-    var $L120 = $L("loop");
-    var $L121 = $L("new");
-    var $L122 = $L("<");
-    var $L123 = $L("{");
-    var $L124 = $L("[");
-    var $L125 = $L("(");
-    var $L126 = $L("public");
-    var $L127 = $L("private");
-    var $L128 = $L("protected");
-    var $L129 = $L("|>");
-    var $L130 = $L("readonly");
-    var $L131 = $L("return");
-    var $L132 = $L("satisfies");
-    var $L133 = $L("'");
-    var $L134 = $L("static");
-    var $L135 = $L("${");
-    var $L136 = $L("switch");
-    var $L137 = $L("target");
-    var $L138 = $L("then");
-    var $L139 = $L("this");
-    var $L140 = $L("throw");
-    var $L141 = $L('"""');
-    var $L142 = $L("'''");
-    var $L143 = $L("///");
-    var $L144 = $L("```");
-    var $L145 = $L("try");
-    var $L146 = $L("typeof");
-    var $L147 = $L("unless");
-    var $L148 = $L("until");
-    var $L149 = $L("var");
-    var $L150 = $L("void");
-    var $L151 = $L("when");
-    var $L152 = $L("while");
-    var $L153 = $L("yield");
-    var $L154 = $L("/>");
-    var $L155 = $L("</");
-    var $L156 = $L("<>");
-    var $L157 = $L("</>");
-    var $L158 = $L("<!--");
-    var $L159 = $L("-->");
-    var $L160 = $L("declare");
-    var $L161 = $L("type");
-    var $L162 = $L("interface");
-    var $L163 = $L("namespace");
-    var $L164 = $L("asserts");
-    var $L165 = $L("keyof");
-    var $L166 = $L("infer");
-    var $L167 = $L("[]");
-    var $L168 = $L("civet");
+    var $L85 = $L("assert");
+    var $L86 = $L("default");
+    var $L87 = $L(":=");
+    var $L88 = $L(".=");
+    var $L89 = $L("/*");
+    var $L90 = $L("*/");
+    var $L91 = $L("\\");
+    var $L92 = $L("abstract");
+    var $L93 = $L("as");
+    var $L94 = $L("@");
+    var $L95 = $L("@@");
+    var $L96 = $L("async");
+    var $L97 = $L("await");
+    var $L98 = $L("`");
+    var $L99 = $L("by");
+    var $L100 = $L("case");
+    var $L101 = $L("catch");
+    var $L102 = $L("class");
+    var $L103 = $L("#{");
+    var $L104 = $L("delete");
+    var $L105 = $L("do");
+    var $L106 = $L("..");
+    var $L107 = $L("...");
+    var $L108 = $L("::");
+    var $L109 = $L('"');
+    var $L110 = $L("else");
+    var $L111 = $L("export");
+    var $L112 = $L("extends");
+    var $L113 = $L("for");
+    var $L114 = $L("from");
+    var $L115 = $L("function");
+    var $L116 = $L("get");
+    var $L117 = $L("set");
+    var $L118 = $L("if");
+    var $L119 = $L("let");
+    var $L120 = $L("const");
+    var $L121 = $L("loop");
+    var $L122 = $L("new");
+    var $L123 = $L("<");
+    var $L124 = $L("{");
+    var $L125 = $L("[");
+    var $L126 = $L("(");
+    var $L127 = $L("public");
+    var $L128 = $L("private");
+    var $L129 = $L("protected");
+    var $L130 = $L("|>");
+    var $L131 = $L("readonly");
+    var $L132 = $L("return");
+    var $L133 = $L("satisfies");
+    var $L134 = $L("'");
+    var $L135 = $L("static");
+    var $L136 = $L("${");
+    var $L137 = $L("switch");
+    var $L138 = $L("target");
+    var $L139 = $L("then");
+    var $L140 = $L("this");
+    var $L141 = $L("throw");
+    var $L142 = $L('"""');
+    var $L143 = $L("'''");
+    var $L144 = $L("///");
+    var $L145 = $L("```");
+    var $L146 = $L("try");
+    var $L147 = $L("typeof");
+    var $L148 = $L("unless");
+    var $L149 = $L("until");
+    var $L150 = $L("var");
+    var $L151 = $L("void");
+    var $L152 = $L("when");
+    var $L153 = $L("while");
+    var $L154 = $L("yield");
+    var $L155 = $L("/>");
+    var $L156 = $L("</");
+    var $L157 = $L("<>");
+    var $L158 = $L("</>");
+    var $L159 = $L("<!--");
+    var $L160 = $L("-->");
+    var $L161 = $L("declare");
+    var $L162 = $L("type");
+    var $L163 = $L("interface");
+    var $L164 = $L("namespace");
+    var $L165 = $L("asserts");
+    var $L166 = $L("keyof");
+    var $L167 = $L("infer");
+    var $L168 = $L("[]");
+    var $L169 = $L("civet");
     var $R0 = $R(new RegExp("(as|for|of|satisfies|then|when)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
     var $R1 = $R(new RegExp("[&]", "suy"));
     var $R2 = $R(new RegExp("[!~+-]+", "suy"));
@@ -3826,21 +3814,11 @@ ${input.slice(result.pos)}
       }
     }
     var ObjectBindingPatternContent$0 = NestedBindingProperties;
-    var ObjectBindingPatternContent$1 = $TS($S($Q(BindingProperty), $E(BindingRestProperty), $Q(BindingProperty)), function($skip, $loc, $0, $1, $2, $3) {
-      var props = $1;
-      var rest = $2;
-      var after = $3;
-      const names = props.flatMap((p) => p.names);
-      const children = [...props];
-      if (rest) {
-        [rest, after] = module.reorderBindingRestProperty(rest, after);
-        children.push(...after, rest);
-        names.push(...after.flatMap((p) => p.names), ...rest.names);
-      }
-      return {
-        names,
-        children
-      };
+    var ObjectBindingPatternContent$1 = $TV($E(BindingPropertyList), function($skip, $loc, $0, $1) {
+      var props = $0;
+      if (!props)
+        return { children: [], names: [] };
+      return module.reorderBindingRestProperty(props);
     });
     function ObjectBindingPatternContent(state) {
       let eventData;
@@ -3864,6 +3842,37 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var BindingPropertyList$0 = $TV($P($S(BindingProperty, ObjectPropertyDelimiter)), function($skip, $loc, $0, $1) {
+      var props = $0;
+      return props.map(([prop, delim]) => {
+        return {
+          ...prop,
+          children: [...prop.children, delim]
+        };
+      });
+    });
+    function BindingPropertyList(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("BindingPropertyList", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("BindingPropertyList", state, BindingPropertyList$0(state));
+        if (state.events)
+          state.events.exit?.("BindingPropertyList", state, result, eventData);
+        return result;
+      } else {
+        const result = BindingPropertyList$0(state);
+        if (state.events)
+          state.events.exit?.("BindingPropertyList", state, result, eventData);
+        return result;
+      }
+    }
     var ArrayBindingPattern$0 = $TS($S(OpenBracket, ArrayBindingPatternContent, __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
       var c = $2;
       return {
@@ -3971,23 +3980,12 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var NestedBindingProperties$0 = $TS($S(PushIndent, $Q(NestedBindingProperty), $E(NestedBindingRestProperty), $Q(NestedBindingProperty), PopIndent), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var NestedBindingProperties$0 = $TS($S(PushIndent, $Q(NestedBindingPropertyList), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
       var props = $2;
-      var rest = $3;
-      var after = $4;
-      if (!(props.length || rest))
+      if (!props.length)
         return $skip;
-      const names = props.flatMap((p) => p.names);
-      const children = [...props];
-      if (rest) {
-        [rest, after] = module.reorderBindingRestProperty(rest, after);
-        children.push(...after, rest);
-        names.push(...after.flatMap((p) => p.names), ...rest.names);
-      }
-      return {
-        children,
-        names
-      };
+      props = props.flat();
+      return module.reorderBindingRestProperty(props);
     });
     function NestedBindingProperties(state) {
       let eventData;
@@ -4011,18 +4009,22 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var NestedBindingProperty$0 = $TS($S(Nested, BindingProperty), function($skip, $loc, $0, $1, $2) {
-      var indent = $1;
-      var prop = $2;
-      return {
-        ...prop,
-        children: [...indent, ...prop.children]
-      };
+    var NestedBindingPropertyList$0 = $TS($S(Nested, BindingPropertyList), function($skip, $loc, $0, $1, $2) {
+      var ws = $1;
+      var props = $2;
+      return props.map((prop, i) => {
+        if (i > 0)
+          return prop;
+        return {
+          ...prop,
+          children: [ws, ...prop.children]
+        };
+      });
     });
-    function NestedBindingProperty(state) {
+    function NestedBindingPropertyList(state) {
       let eventData;
       if (state.events) {
-        const result = state.events.enter?.("NestedBindingProperty", state);
+        const result = state.events.enter?.("NestedBindingPropertyList", state);
         if (result) {
           if (result.cache)
             return result.cache;
@@ -4030,25 +4032,26 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("NestedBindingProperty", state, NestedBindingProperty$0(state));
+        const result = $TOKEN("NestedBindingPropertyList", state, NestedBindingPropertyList$0(state));
         if (state.events)
-          state.events.exit?.("NestedBindingProperty", state, result, eventData);
+          state.events.exit?.("NestedBindingPropertyList", state, result, eventData);
         return result;
       } else {
-        const result = NestedBindingProperty$0(state);
+        const result = NestedBindingPropertyList$0(state);
         if (state.events)
-          state.events.exit?.("NestedBindingProperty", state, result, eventData);
+          state.events.exit?.("NestedBindingPropertyList", state, result, eventData);
         return result;
       }
     }
-    var BindingProperty$0 = $TS($S(__, PropertyName, __, Colon, $C(BindingIdentifier, BindingPattern), $E(Initializer), ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+    var BindingProperty$0 = BindingRestProperty;
+    var BindingProperty$1 = $TS($S($E(_), PropertyName, __, Colon, $C(BindingIdentifier, BindingPattern), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       var b = $5;
       return {
         names: b.names,
         children: $0
       };
     });
-    var BindingProperty$1 = $TS($S(BindingIdentifier, $E(Initializer), ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3) {
+    var BindingProperty$2 = $TS($S(BindingIdentifier, $E(Initializer)), function($skip, $loc, $0, $1, $2) {
       var b = $1;
       if (b.type === "AtBinding") {
         return {
@@ -4074,65 +4077,35 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("BindingProperty", state, BindingProperty$0(state) || BindingProperty$1(state));
+        const result = $TOKEN("BindingProperty", state, BindingProperty$0(state) || BindingProperty$1(state) || BindingProperty$2(state));
         if (state.events)
           state.events.exit?.("BindingProperty", state, result, eventData);
         return result;
       } else {
-        const result = BindingProperty$0(state) || BindingProperty$1(state);
+        const result = BindingProperty$0(state) || BindingProperty$1(state) || BindingProperty$2(state);
         if (state.events)
           state.events.exit?.("BindingProperty", state, result, eventData);
         return result;
       }
     }
-    var NestedBindingRestProperty$0 = $TS($S(Nested, BindingRestProperty), function($skip, $loc, $0, $1, $2) {
-      var indent = $1;
-      var prop = $2;
-      return {
-        ...prop,
-        children: [indent, ...prop.children]
-      };
-    });
-    function NestedBindingRestProperty(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("NestedBindingRestProperty", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("NestedBindingRestProperty", state, NestedBindingRestProperty$0(state));
-        if (state.events)
-          state.events.exit?.("NestedBindingRestProperty", state, result, eventData);
-        return result;
-      } else {
-        const result = NestedBindingRestProperty$0(state);
-        if (state.events)
-          state.events.exit?.("NestedBindingRestProperty", state, result, eventData);
-        return result;
-      }
-    }
-    var BindingRestProperty$0 = $TS($S(__, DotDotDot, BindingIdentifier, ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var BindingRestProperty$0 = $TS($S($E(_), DotDotDot, BindingIdentifier), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var dots = $2;
       var id = $3;
-      var delimiter = $4;
       return {
         ...id,
-        children: [...ws, dots, ...id.children, delimiter]
+        type: "BindingRestProperty",
+        children: [...ws || [], dots, ...id.children]
       };
     });
-    var BindingRestProperty$1 = $TS($S(__, BindingIdentifier, DotDotDot, ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var BindingRestProperty$1 = $TS($S($E(_), BindingIdentifier, DotDotDot), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var id = $2;
       var dots = $3;
-      var delimiter = $4;
       return {
         ...id,
-        children: [...ws, dots, ...id.children, delimiter]
+        type: "BindingRestProperty",
+        children: [...ws || [], dots, ...id.children]
       };
     });
     function BindingRestProperty(state) {
@@ -4345,492 +4318,6 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var MatchingPattern$0 = ObjectMatchingPattern;
-    var MatchingPattern$1 = ArrayMatchingPattern;
-    var MatchingPattern$2 = Literal;
-    var MatchingPattern$3 = RegularExpressionLiteral;
-    function MatchingPattern(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("MatchingPattern", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("MatchingPattern", state, MatchingPattern$0(state) || MatchingPattern$1(state) || MatchingPattern$2(state) || MatchingPattern$3(state));
-        if (state.events)
-          state.events.exit?.("MatchingPattern", state, result, eventData);
-        return result;
-      } else {
-        const result = MatchingPattern$0(state) || MatchingPattern$1(state) || MatchingPattern$2(state) || MatchingPattern$3(state);
-        if (state.events)
-          state.events.exit?.("MatchingPattern", state, result, eventData);
-        return result;
-      }
-    }
-    var ObjectMatchingPattern$0 = $TS($S(OpenBrace, ObjectMatchingPatternContent, __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
-      var open = $1;
-      var content = $2;
-      var ws = $3;
-      var close = $4;
-      return {
-        type: "ObjectMatchingPattern",
-        children: [open, ...content.children, ...ws, close]
-      };
-    });
-    function ObjectMatchingPattern(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("ObjectMatchingPattern", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("ObjectMatchingPattern", state, ObjectMatchingPattern$0(state));
-        if (state.events)
-          state.events.exit?.("ObjectMatchingPattern", state, result, eventData);
-        return result;
-      } else {
-        const result = ObjectMatchingPattern$0(state);
-        if (state.events)
-          state.events.exit?.("ObjectMatchingPattern", state, result, eventData);
-        return result;
-      }
-    }
-    var ObjectMatchingPatternContent$0 = NestedMatchingProperties;
-    var ObjectMatchingPatternContent$1 = $TS($S($Q(MatchingProperty), $E(MatchingRestProperty), $Q(MatchingProperty)), function($skip, $loc, $0, $1, $2, $3) {
-      var props = $1;
-      var rest = $2;
-      var after = $3;
-      const names = props.flatMap((p) => p.names);
-      const children = [...props];
-      if (rest) {
-        [rest, after] = module.reorderBindingRestProperty(rest, after);
-        children.push(...after, rest);
-        names.push(...after.flatMap((p) => p.names), ...rest.names);
-      }
-      return {
-        names,
-        children
-      };
-    });
-    function ObjectMatchingPatternContent(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("ObjectMatchingPatternContent", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("ObjectMatchingPatternContent", state, ObjectMatchingPatternContent$0(state) || ObjectMatchingPatternContent$1(state));
-        if (state.events)
-          state.events.exit?.("ObjectMatchingPatternContent", state, result, eventData);
-        return result;
-      } else {
-        const result = ObjectMatchingPatternContent$0(state) || ObjectMatchingPatternContent$1(state);
-        if (state.events)
-          state.events.exit?.("ObjectMatchingPatternContent", state, result, eventData);
-        return result;
-      }
-    }
-    var NestedMatchingProperties$0 = $TS($S(PushIndent, $Q(NestedMatchingProperty), $E(NestedMatchingRestProperty), $Q(NestedMatchingProperty), PopIndent), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-      var props = $2;
-      var rest = $3;
-      var after = $4;
-      if (!(props.length || rest))
-        return $skip;
-      const names = props.flatMap((p) => p.names);
-      const children = [...props];
-      if (rest) {
-        [rest, after] = module.reorderBindingRestProperty(rest, after);
-        children.push(...after, rest);
-        names.push(...after.flatMap((p) => p.names), ...rest.names);
-      }
-      return {
-        children,
-        names
-      };
-    });
-    function NestedMatchingProperties(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("NestedMatchingProperties", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("NestedMatchingProperties", state, NestedMatchingProperties$0(state));
-        if (state.events)
-          state.events.exit?.("NestedMatchingProperties", state, result, eventData);
-        return result;
-      } else {
-        const result = NestedMatchingProperties$0(state);
-        if (state.events)
-          state.events.exit?.("NestedMatchingProperties", state, result, eventData);
-        return result;
-      }
-    }
-    var NestedMatchingProperty$0 = $TS($S(Nested, MatchingProperty), function($skip, $loc, $0, $1, $2) {
-      var indent = $1;
-      var prop = $2;
-      return {
-        ...prop,
-        children: [...indent, ...prop.children]
-      };
-    });
-    function NestedMatchingProperty(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("NestedMatchingProperty", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("NestedMatchingProperty", state, NestedMatchingProperty$0(state));
-        if (state.events)
-          state.events.exit?.("NestedMatchingProperty", state, result, eventData);
-        return result;
-      } else {
-        const result = NestedMatchingProperty$0(state);
-        if (state.events)
-          state.events.exit?.("NestedMatchingProperty", state, result, eventData);
-        return result;
-      }
-    }
-    var MatchingProperty$0 = $TS($S(__, PropertyName, __, Colon, $C(BindingIdentifier, MatchingPattern), ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
-      var m = $5;
-      return {
-        names: m.names,
-        children: $0
-      };
-    });
-    var MatchingProperty$1 = $TS($S(BindingIdentifier, ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2) {
-      var b = $1;
-      if (b.type === "AtBinding") {
-        return {
-          type: "AtBindingProperty",
-          ref: b.ref,
-          names: [],
-          children: $0
-        };
-      }
-      return {
-        names: b.names,
-        children: $0
-      };
-    });
-    function MatchingProperty(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("MatchingProperty", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("MatchingProperty", state, MatchingProperty$0(state) || MatchingProperty$1(state));
-        if (state.events)
-          state.events.exit?.("MatchingProperty", state, result, eventData);
-        return result;
-      } else {
-        const result = MatchingProperty$0(state) || MatchingProperty$1(state);
-        if (state.events)
-          state.events.exit?.("MatchingProperty", state, result, eventData);
-        return result;
-      }
-    }
-    var NestedMatchingRestProperty$0 = $TS($S(Nested, MatchingRestProperty), function($skip, $loc, $0, $1, $2) {
-      var indent = $1;
-      var prop = $2;
-      return {
-        ...prop,
-        children: [indent, ...prop.children]
-      };
-    });
-    function NestedMatchingRestProperty(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("NestedMatchingRestProperty", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("NestedMatchingRestProperty", state, NestedMatchingRestProperty$0(state));
-        if (state.events)
-          state.events.exit?.("NestedMatchingRestProperty", state, result, eventData);
-        return result;
-      } else {
-        const result = NestedMatchingRestProperty$0(state);
-        if (state.events)
-          state.events.exit?.("NestedMatchingRestProperty", state, result, eventData);
-        return result;
-      }
-    }
-    var MatchingRestProperty$0 = BindingRestProperty;
-    function MatchingRestProperty(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("MatchingRestProperty", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("MatchingRestProperty", state, MatchingRestProperty$0(state));
-        if (state.events)
-          state.events.exit?.("MatchingRestProperty", state, result, eventData);
-        return result;
-      } else {
-        const result = MatchingRestProperty$0(state);
-        if (state.events)
-          state.events.exit?.("MatchingRestProperty", state, result, eventData);
-        return result;
-      }
-    }
-    var ArrayMatchingPattern$0 = $TS($S(OpenBracket, ArrayMatchingPatternContent, __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
-      var open = $1;
-      var content = $2;
-      var ws = $3;
-      var close = $4;
-      return {
-        type: "ArrayMatchingPattern",
-        children: $0
-      };
-    });
-    function ArrayMatchingPattern(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("ArrayMatchingPattern", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("ArrayMatchingPattern", state, ArrayMatchingPattern$0(state));
-        if (state.events)
-          state.events.exit?.("ArrayMatchingPattern", state, result, eventData);
-        return result;
-      } else {
-        const result = ArrayMatchingPattern$0(state);
-        if (state.events)
-          state.events.exit?.("ArrayMatchingPattern", state, result, eventData);
-        return result;
-      }
-    }
-    var ArrayMatchingPatternContent$0 = NestedMatchingElements;
-    var ArrayMatchingPatternContent$1 = $TS($S($Q($C(MatchingElement, Elision)), $E($S(MatchingRestElement, ArrayElementDelimiter)), $Q($C(MatchingElement, Elision))), function($skip, $loc, $0, $1, $2, $3) {
-      var props = $1;
-      var rest = $2;
-      var after = $3;
-      const names = props.flatMap((p) => p.names || []);
-      const children = [...props];
-      let blockPrefix;
-      if (rest) {
-        const [restBinding] = rest;
-        children.push(restBinding);
-        let restIdentifier;
-        if (restBinding.ref) {
-          restIdentifier = restBinding.ref;
-        } else {
-          restIdentifier = restBinding.names[0];
-          names.push(...restBinding.names);
-        }
-        if (after.length) {
-          const spliceRef = module.getRef("splice");
-          blockPrefix = {
-            children: ["[", module.insertTrimmingSpace(after, ""), "] = ", spliceRef, ".call(", restIdentifier, ", -", after.length.toString(), ")"],
-            names: after.flatMap((p) => p.names)
-          };
-        }
-      }
-      return {
-        names,
-        children,
-        blockPrefix
-      };
-    });
-    function ArrayMatchingPatternContent(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("ArrayMatchingPatternContent", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("ArrayMatchingPatternContent", state, ArrayMatchingPatternContent$0(state) || ArrayMatchingPatternContent$1(state));
-        if (state.events)
-          state.events.exit?.("ArrayMatchingPatternContent", state, result, eventData);
-        return result;
-      } else {
-        const result = ArrayMatchingPatternContent$0(state) || ArrayMatchingPatternContent$1(state);
-        if (state.events)
-          state.events.exit?.("ArrayMatchingPatternContent", state, result, eventData);
-        return result;
-      }
-    }
-    var NestedMatchingElements$0 = $TS($S(PushIndent, $Q(NestedMatchingElement), $E($S(Nested, MatchingRestElement, ArrayElementDelimiter)), $Q(NestedMatchingElement), PopIndent), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-      var props = $2;
-      var rest = $3;
-      var after = $4;
-      if (!(props.length || rest))
-        return $skip;
-      const names = props.flatMap((p) => p.names), children = [...props];
-      let blockPrefix;
-      if (rest) {
-        const [, restBinding] = rest;
-        let restIdentifier;
-        if (restBinding.ref) {
-          restIdentifier = restBinding.binding.ref;
-        } else {
-          restIdentifier = restBinding.names[0];
-        }
-        if (after.length) {
-          const spliceRef = module.getRef("splice");
-          blockPrefix = {
-            children: ["[", module.insertTrimmingSpace(after, ""), "] = ", spliceRef, ".call(", restIdentifier, ", -", after.length.toString(), ")"],
-            names: after.flatMap((p) => p.names)
-          };
-        }
-        children.push(...rest);
-        names.push(...restBinding.names);
-      }
-      return {
-        children,
-        names,
-        blockPrefix
-      };
-    });
-    function NestedMatchingElements(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("NestedMatchingElements", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("NestedMatchingElements", state, NestedMatchingElements$0(state));
-        if (state.events)
-          state.events.exit?.("NestedMatchingElements", state, result, eventData);
-        return result;
-      } else {
-        const result = NestedMatchingElements$0(state);
-        if (state.events)
-          state.events.exit?.("NestedMatchingElements", state, result, eventData);
-        return result;
-      }
-    }
-    var NestedMatchingElement$0 = $TS($S(Nested, MatchingElement), function($skip, $loc, $0, $1, $2) {
-      var indent = $1;
-      var element = $2;
-      return {
-        ...element,
-        children: [indent, ...element.children]
-      };
-    });
-    function NestedMatchingElement(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("NestedMatchingElement", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("NestedMatchingElement", state, NestedMatchingElement$0(state));
-        if (state.events)
-          state.events.exit?.("NestedMatchingElement", state, result, eventData);
-        return result;
-      } else {
-        const result = NestedMatchingElement$0(state);
-        if (state.events)
-          state.events.exit?.("NestedMatchingElement", state, result, eventData);
-        return result;
-      }
-    }
-    var MatchingElement$0 = $TS($S($C(BindingIdentifier, MatchingPattern), ArrayElementDelimiter), function($skip, $loc, $0, $1, $2) {
-      var binding = $1;
-      return {
-        names: binding.names,
-        children: $0
-      };
-    });
-    function MatchingElement(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("MatchingElement", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("MatchingElement", state, MatchingElement$0(state));
-        if (state.events)
-          state.events.exit?.("MatchingElement", state, result, eventData);
-        return result;
-      } else {
-        const result = MatchingElement$0(state);
-        if (state.events)
-          state.events.exit?.("MatchingElement", state, result, eventData);
-        return result;
-      }
-    }
-    var MatchingRestElement$0 = BindingRestElement;
-    function MatchingRestElement(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("MatchingRestElement", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("MatchingRestElement", state, MatchingRestElement$0(state));
-        if (state.events)
-          state.events.exit?.("MatchingRestElement", state, result, eventData);
-        return result;
-      } else {
-        const result = MatchingRestElement$0(state);
-        if (state.events)
-          state.events.exit?.("MatchingRestElement", state, result, eventData);
-        return result;
-      }
-    }
     var FunctionDeclaration$0 = FunctionExpression;
     function FunctionDeclaration(state) {
       let eventData;
@@ -6366,7 +5853,10 @@ ${input.slice(result.pos)}
     var InlineObjectLiteral$0 = $TS($S(InsertInlineOpenBrace, SnugNamedProperty, ImplicitInlineObjectPropertyDelimiter, $Q($S($C(Samedent, $Q(_)), NamedProperty, ImplicitInlineObjectPropertyDelimiter)), InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var open = $1;
       var close = $5;
-      return [open, $2, $3, ...$4, close];
+      return {
+        type: "ObjectExpression",
+        children: [open, $2, $3, ...$4, close]
+      };
     });
     function InlineObjectLiteral(state) {
       let eventData;
@@ -7272,7 +6762,15 @@ ${input.slice(result.pos)}
     var Statement$4 = SwitchStatement;
     var Statement$5 = TryStatement;
     var Statement$6 = EmptyStatement;
-    var Statement$7 = ExpressionStatement;
+    var Statement$7 = $TS($S(ExpressionStatement), function($skip, $loc, $0, $1) {
+      if ($1.type === "ObjectExpression") {
+        return {
+          type: "ParenthesizedExpression",
+          children: ["(", $1, ")"]
+        };
+      }
+      return $1;
+    });
     var Statement$8 = BlockStatement;
     function Statement(state) {
       let eventData;
@@ -9243,21 +8741,26 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ImportDeclaration$0 = $T($S(Import, __, TypeKeyword, __, ImportClause, __, FromClause), function(value) {
+    var ImportDeclaration$0 = $T($S(Import, __, TypeKeyword, __, ImportClause, __, FromClause, $E(ImportAssertion)), function(value) {
       return { "ts": true, "children": value };
     });
-    var ImportDeclaration$1 = $S(Import, __, ImportClause, __, FromClause);
-    var ImportDeclaration$2 = $S(Import, __, ModuleSpecifier);
-    var ImportDeclaration$3 = $TS($S(ImpliedImport, ImportClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var ImportDeclaration$1 = $S(Import, __, ImportClause, __, FromClause, $E(ImportAssertion));
+    var ImportDeclaration$2 = $S(Import, __, ModuleSpecifier, $E(ImportAssertion));
+    var ImportDeclaration$3 = $TS($S(ImpliedImport, $E($S(TypeKeyword, __)), ImportClause, __, FromClause, $E(ImportAssertion)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       var i = $1;
-      var c = $2;
-      var w = $3;
-      var f = $4;
+      var t = $2;
+      var c = $3;
+      var w = $4;
+      var f = $5;
+      var a = $6;
       i.$loc = {
         pos: f[0].$loc.pos - 1,
         length: f[0].$loc.length + 1
       };
-      return [i, c, w, f];
+      const children = [i, t, c, w, f, a];
+      if (!t)
+        return children;
+      return { ts: true, children };
     });
     function ImportDeclaration(state) {
       let eventData;
@@ -9430,6 +8933,29 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var ImportAssertion$0 = $S($E(_), $EXPECT($L85, fail, 'ImportAssertion "assert"'), NonIdContinue, $E(_), ObjectLiteral);
+    function ImportAssertion(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("ImportAssertion", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("ImportAssertion", state, ImportAssertion$0(state));
+        if (state.events)
+          state.events.exit?.("ImportAssertion", state, result, eventData);
+        return result;
+      } else {
+        const result = ImportAssertion$0(state);
+        if (state.events)
+          state.events.exit?.("ImportAssertion", state, result, eventData);
+        return result;
+      }
+    }
     var TypeAndImportSpecifier$0 = $TS($S($E($S(__, TypeKeyword)), ImportSpecifier), function($skip, $loc, $0, $1, $2) {
       if (!$1)
         return $2;
@@ -9654,7 +9180,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ExportDeclaration$0 = $S(Export, __, $EXPECT($L85, fail, 'ExportDeclaration "default"'), NonIdContinue, __, $C(HoistableDeclaration, ClassDeclaration, ExtendedExpression));
+    var ExportDeclaration$0 = $S(Export, __, $EXPECT($L86, fail, 'ExportDeclaration "default"'), NonIdContinue, __, $C(HoistableDeclaration, ClassDeclaration, ExtendedExpression));
     var ExportDeclaration$1 = $TS($S(Export, __, ExportFromClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       if (!$3.ts)
         return $0;
@@ -9816,7 +9342,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ImplicitExportSpecifier$0 = $S($N($EXPECT($L85, fail, 'ImplicitExportSpecifier "default"')), ModuleExportName, $E($S(__, As, __, ModuleExportName)), $C($Y($S(__, From)), ImplicitInlineObjectPropertyDelimiter));
+    var ImplicitExportSpecifier$0 = $S($N($EXPECT($L86, fail, 'ImplicitExportSpecifier "default"')), ModuleExportName, $E($S(__, As, __, ModuleExportName)), $C($Y($S(__, From)), ImplicitInlineObjectPropertyDelimiter));
     function ImplicitExportSpecifier(state) {
       let eventData;
       if (state.events) {
@@ -9987,7 +9513,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ConstAssignment$0 = $TV($EXPECT($L86, fail, 'ConstAssignment ":="'), function($skip, $loc, $0, $1) {
+    var ConstAssignment$0 = $TV($EXPECT($L87, fail, 'ConstAssignment ":="'), function($skip, $loc, $0, $1) {
       return { $loc, token: "=" };
     });
     function ConstAssignment(state) {
@@ -10012,7 +9538,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var LetAssignment$0 = $TV($EXPECT($L87, fail, 'LetAssignment ".="'), function($skip, $loc, $0, $1) {
+    var LetAssignment$0 = $TV($EXPECT($L88, fail, 'LetAssignment ".="'), function($skip, $loc, $0, $1) {
       return { $loc, token: "=" };
     });
     function LetAssignment(state) {
@@ -11186,7 +10712,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L88, fail, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L89, fail, 'JSMultiLineComment "*/"')), $EXPECT($R39, fail, "JSMultiLineComment /./"))), $EXPECT($L89, fail, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
+    var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L89, fail, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L90, fail, 'JSMultiLineComment "*/"')), $EXPECT($R39, fail, "JSMultiLineComment /./"))), $EXPECT($L90, fail, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function JSMultiLineComment(state) {
@@ -11236,7 +10762,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeMultiLineComment$0 = $TS($S(CoffeeHereCommentStart, $TEXT($Q($S($N($C(CoffeeHereCommentStart, $EXPECT($L89, fail, 'CoffeeMultiLineComment "*/"'))), $EXPECT($R39, fail, "CoffeeMultiLineComment /./")))), CoffeeHereCommentStart), function($skip, $loc, $0, $1, $2, $3) {
+    var CoffeeMultiLineComment$0 = $TS($S(CoffeeHereCommentStart, $TEXT($Q($S($N($C(CoffeeHereCommentStart, $EXPECT($L90, fail, 'CoffeeMultiLineComment "*/"'))), $EXPECT($R39, fail, "CoffeeMultiLineComment /./")))), CoffeeHereCommentStart), function($skip, $loc, $0, $1, $2, $3) {
       return { $loc, token: `/*${$2}*/` };
     });
     function CoffeeMultiLineComment(state) {
@@ -11284,7 +10810,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InlineComment$0 = $TV($TEXT($S($EXPECT($L88, fail, 'InlineComment "/*"'), $TEXT($Q($S($N($EXPECT($L89, fail, 'InlineComment "*/"')), $EXPECT($R42, fail, "InlineComment /[^\\r\\n]/")))), $EXPECT($L89, fail, 'InlineComment "*/"'))), function($skip, $loc, $0, $1) {
+    var InlineComment$0 = $TV($TEXT($S($EXPECT($L89, fail, 'InlineComment "/*"'), $TEXT($Q($S($N($EXPECT($L90, fail, 'InlineComment "*/"')), $EXPECT($R42, fail, "InlineComment /[^\\r\\n]/")))), $EXPECT($L90, fail, 'InlineComment "*/"'))), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function InlineComment(state) {
@@ -11383,7 +10909,7 @@ ${input.slice(result.pos)}
     var NonNewlineWhitespace$0 = $TR($EXPECT($R43, fail, "NonNewlineWhitespace /[ \\t]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
       return { $loc, token: $0 };
     });
-    var NonNewlineWhitespace$1 = $T($S(CoffeeLineContinuationEnabled, $EXPECT($L90, fail, 'NonNewlineWhitespace "\\\\\\\\"'), EOL), function(value) {
+    var NonNewlineWhitespace$1 = $T($S(CoffeeLineContinuationEnabled, $EXPECT($L91, fail, 'NonNewlineWhitespace "\\\\\\\\"'), EOL), function(value) {
       return "";
     });
     function NonNewlineWhitespace(state) {
@@ -11610,7 +11136,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Abstract$0 = $TV($TEXT($S($EXPECT($L91, fail, 'Abstract "abstract"'), NonIdContinue, $E($EXPECT($L6, fail, 'Abstract " "')))), function($skip, $loc, $0, $1) {
+    var Abstract$0 = $TV($TEXT($S($EXPECT($L92, fail, 'Abstract "abstract"'), NonIdContinue, $E($EXPECT($L6, fail, 'Abstract " "')))), function($skip, $loc, $0, $1) {
       return { $loc, token: $1, ts: true };
     });
     function Abstract(state) {
@@ -11660,7 +11186,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var As$0 = $TS($S($EXPECT($L92, fail, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var As$0 = $TS($S($EXPECT($L93, fail, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function As(state) {
@@ -11685,7 +11211,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var At$0 = $TV($EXPECT($L93, fail, 'At "@"'), function($skip, $loc, $0, $1) {
+    var At$0 = $TV($EXPECT($L94, fail, 'At "@"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function At(state) {
@@ -11710,7 +11236,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var AtAt$0 = $TV($EXPECT($L94, fail, 'AtAt "@@"'), function($skip, $loc, $0, $1) {
+    var AtAt$0 = $TV($EXPECT($L95, fail, 'AtAt "@@"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "@" };
     });
     function AtAt(state) {
@@ -11735,7 +11261,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Async$0 = $TS($S($EXPECT($L95, fail, 'Async "async"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Async$0 = $TS($S($EXPECT($L96, fail, 'Async "async"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1, type: "Async" };
     });
     function Async(state) {
@@ -11760,7 +11286,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Await$0 = $TS($S($EXPECT($L96, fail, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Await$0 = $TS($S($EXPECT($L97, fail, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Await(state) {
@@ -11785,7 +11311,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Backtick$0 = $TV($EXPECT($L97, fail, 'Backtick "`"'), function($skip, $loc, $0, $1) {
+    var Backtick$0 = $TV($EXPECT($L98, fail, 'Backtick "`"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Backtick(state) {
@@ -11810,7 +11336,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var By$0 = $TS($S($EXPECT($L98, fail, 'By "by"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var By$0 = $TS($S($EXPECT($L99, fail, 'By "by"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function By(state) {
@@ -11835,7 +11361,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Case$0 = $TS($S($EXPECT($L99, fail, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Case$0 = $TS($S($EXPECT($L100, fail, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Case(state) {
@@ -11860,7 +11386,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Catch$0 = $TS($S($EXPECT($L100, fail, 'Catch "catch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Catch$0 = $TS($S($EXPECT($L101, fail, 'Catch "catch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Catch(state) {
@@ -11885,7 +11411,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Class$0 = $TS($S($EXPECT($L101, fail, 'Class "class"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Class$0 = $TS($S($EXPECT($L102, fail, 'Class "class"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Class(state) {
@@ -11985,7 +11511,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeSubstitutionStart$0 = $TV($EXPECT($L102, fail, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
+    var CoffeeSubstitutionStart$0 = $TV($EXPECT($L103, fail, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "${" };
     });
     function CoffeeSubstitutionStart(state) {
@@ -12035,7 +11561,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ConstructorShorthand$0 = $TV($EXPECT($L93, fail, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
+    var ConstructorShorthand$0 = $TV($EXPECT($L94, fail, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "constructor" };
     });
     function ConstructorShorthand(state) {
@@ -12060,7 +11586,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Default$0 = $TS($S($EXPECT($L85, fail, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Default$0 = $TS($S($EXPECT($L86, fail, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Default(state) {
@@ -12085,7 +11611,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Delete$0 = $TS($S($EXPECT($L103, fail, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Delete$0 = $TS($S($EXPECT($L104, fail, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Delete(state) {
@@ -12110,7 +11636,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Do$0 = $TS($S($EXPECT($L104, fail, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Do$0 = $TS($S($EXPECT($L105, fail, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Do(state) {
@@ -12160,7 +11686,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var DotDot$0 = $TV($EXPECT($L105, fail, 'DotDot ".."'), function($skip, $loc, $0, $1) {
+    var DotDot$0 = $TV($EXPECT($L106, fail, 'DotDot ".."'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function DotDot(state) {
@@ -12185,7 +11711,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var DotDotDot$0 = $TV($EXPECT($L106, fail, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
+    var DotDotDot$0 = $TV($EXPECT($L107, fail, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function DotDotDot(state) {
@@ -12210,7 +11736,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var DoubleColon$0 = $TV($EXPECT($L107, fail, 'DoubleColon "::"'), function($skip, $loc, $0, $1) {
+    var DoubleColon$0 = $TV($EXPECT($L108, fail, 'DoubleColon "::"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function DoubleColon(state) {
@@ -12235,7 +11761,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var DoubleQuote$0 = $TV($EXPECT($L108, fail, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
+    var DoubleQuote$0 = $TV($EXPECT($L109, fail, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function DoubleQuote(state) {
@@ -12260,7 +11786,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Else$0 = $TS($S($EXPECT($L109, fail, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Else$0 = $TS($S($EXPECT($L110, fail, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Else(state) {
@@ -12310,7 +11836,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Export$0 = $TS($S($EXPECT($L110, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Export$0 = $TS($S($EXPECT($L111, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Export(state) {
@@ -12335,7 +11861,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Extends$0 = $TS($S($EXPECT($L111, fail, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Extends$0 = $TS($S($EXPECT($L112, fail, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Extends(state) {
@@ -12360,7 +11886,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var For$0 = $TS($S($EXPECT($L112, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var For$0 = $TS($S($EXPECT($L113, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function For(state) {
@@ -12385,7 +11911,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var From$0 = $TS($S($EXPECT($L113, fail, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var From$0 = $TS($S($EXPECT($L114, fail, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function From(state) {
@@ -12410,7 +11936,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Function$0 = $TS($S($EXPECT($L114, fail, 'Function "function"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Function$0 = $TS($S($EXPECT($L115, fail, 'Function "function"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Function(state) {
@@ -12435,7 +11961,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var GetOrSet$0 = $TS($S($C($EXPECT($L115, fail, 'GetOrSet "get"'), $EXPECT($L116, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var GetOrSet$0 = $TS($S($C($EXPECT($L116, fail, 'GetOrSet "get"'), $EXPECT($L117, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1, type: "GetOrSet" };
     });
     function GetOrSet(state) {
@@ -12460,7 +11986,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var If$0 = $TV($TEXT($S($EXPECT($L117, fail, 'If "if"'), NonIdContinue, $E($EXPECT($L6, fail, 'If " "')))), function($skip, $loc, $0, $1) {
+    var If$0 = $TV($TEXT($S($EXPECT($L118, fail, 'If "if"'), NonIdContinue, $E($EXPECT($L6, fail, 'If " "')))), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function If(state) {
@@ -12535,7 +12061,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var LetOrConst$0 = $TS($S($C($EXPECT($L118, fail, 'LetOrConst "let"'), $EXPECT($L119, fail, 'LetOrConst "const"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var LetOrConst$0 = $TS($S($C($EXPECT($L119, fail, 'LetOrConst "let"'), $EXPECT($L120, fail, 'LetOrConst "const"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function LetOrConst(state) {
@@ -12560,7 +12086,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Loop$0 = $TS($S($EXPECT($L120, fail, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Loop$0 = $TS($S($EXPECT($L121, fail, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: "while(true)" };
     });
     function Loop(state) {
@@ -12585,7 +12111,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var New$0 = $TS($S($EXPECT($L121, fail, 'New "new"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var New$0 = $TS($S($EXPECT($L122, fail, 'New "new"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function New(state) {
@@ -12660,7 +12186,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var OpenAngleBracket$0 = $TV($EXPECT($L122, fail, 'OpenAngleBracket "<"'), function($skip, $loc, $0, $1) {
+    var OpenAngleBracket$0 = $TV($EXPECT($L123, fail, 'OpenAngleBracket "<"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function OpenAngleBracket(state) {
@@ -12685,7 +12211,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var OpenBrace$0 = $TV($EXPECT($L123, fail, 'OpenBrace "{"'), function($skip, $loc, $0, $1) {
+    var OpenBrace$0 = $TV($EXPECT($L124, fail, 'OpenBrace "{"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function OpenBrace(state) {
@@ -12710,7 +12236,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var OpenBracket$0 = $TV($EXPECT($L124, fail, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
+    var OpenBracket$0 = $TV($EXPECT($L125, fail, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function OpenBracket(state) {
@@ -12735,7 +12261,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var OpenParen$0 = $TV($EXPECT($L125, fail, 'OpenParen "("'), function($skip, $loc, $0, $1) {
+    var OpenParen$0 = $TV($EXPECT($L126, fail, 'OpenParen "("'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function OpenParen(state) {
@@ -12760,7 +12286,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Public$0 = $TS($S($EXPECT($L126, fail, 'Public "public"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Public$0 = $TS($S($EXPECT($L127, fail, 'Public "public"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Public(state) {
@@ -12785,7 +12311,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Private$0 = $TS($S($EXPECT($L127, fail, 'Private "private"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Private$0 = $TS($S($EXPECT($L128, fail, 'Private "private"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Private(state) {
@@ -12810,7 +12336,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Protected$0 = $TS($S($EXPECT($L128, fail, 'Protected "protected"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Protected$0 = $TS($S($EXPECT($L129, fail, 'Protected "protected"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Protected(state) {
@@ -12835,7 +12361,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Pipe$0 = $TV($EXPECT($L129, fail, 'Pipe "|>"'), function($skip, $loc, $0, $1) {
+    var Pipe$0 = $TV($EXPECT($L130, fail, 'Pipe "|>"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Pipe(state) {
@@ -12885,7 +12411,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Readonly$0 = $TS($S($EXPECT($L130, fail, 'Readonly "readonly"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Readonly$0 = $TS($S($EXPECT($L131, fail, 'Readonly "readonly"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1, ts: true };
     });
     function Readonly(state) {
@@ -12910,7 +12436,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Return$0 = $TS($S($EXPECT($L131, fail, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Return$0 = $TS($S($EXPECT($L132, fail, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Return(state) {
@@ -12935,7 +12461,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Satisfies$0 = $TS($S($EXPECT($L132, fail, 'Satisfies "satisfies"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Satisfies$0 = $TS($S($EXPECT($L133, fail, 'Satisfies "satisfies"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Satisfies(state) {
@@ -12985,7 +12511,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var SingleQuote$0 = $TV($EXPECT($L133, fail, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
+    var SingleQuote$0 = $TV($EXPECT($L134, fail, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function SingleQuote(state) {
@@ -13035,10 +12561,10 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Static$0 = $TS($S($EXPECT($L134, fail, 'Static "static"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Static$0 = $TS($S($EXPECT($L135, fail, 'Static "static"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
-    var Static$1 = $TS($S($EXPECT($L93, fail, 'Static "@"'), $N($C($EXPECT($L125, fail, 'Static "("'), $EXPECT($L93, fail, 'Static "@"')))), function($skip, $loc, $0, $1, $2) {
+    var Static$1 = $TS($S($EXPECT($L94, fail, 'Static "@"'), $N($C($EXPECT($L126, fail, 'Static "("'), $EXPECT($L94, fail, 'Static "@"')))), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: "static " };
     });
     function Static(state) {
@@ -13063,7 +12589,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var SubstitutionStart$0 = $TV($EXPECT($L135, fail, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
+    var SubstitutionStart$0 = $TV($EXPECT($L136, fail, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function SubstitutionStart(state) {
@@ -13088,7 +12614,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Switch$0 = $TS($S($EXPECT($L136, fail, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Switch$0 = $TS($S($EXPECT($L137, fail, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Switch(state) {
@@ -13113,7 +12639,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Target$0 = $TS($S($EXPECT($L137, fail, 'Target "target"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Target$0 = $TS($S($EXPECT($L138, fail, 'Target "target"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Target(state) {
@@ -13138,7 +12664,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Then$0 = $TS($S(__, $EXPECT($L138, fail, 'Then "then"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
+    var Then$0 = $TS($S(__, $EXPECT($L139, fail, 'Then "then"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
       return { $loc, token: "" };
     });
     function Then(state) {
@@ -13163,7 +12689,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var This$0 = $TS($S($EXPECT($L139, fail, 'This "this"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var This$0 = $TS($S($EXPECT($L140, fail, 'This "this"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function This(state) {
@@ -13188,7 +12714,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Throw$0 = $TS($S($EXPECT($L140, fail, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Throw$0 = $TS($S($EXPECT($L141, fail, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Throw(state) {
@@ -13213,7 +12739,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TripleDoubleQuote$0 = $TV($EXPECT($L141, fail, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
+    var TripleDoubleQuote$0 = $TV($EXPECT($L142, fail, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "`" };
     });
     function TripleDoubleQuote(state) {
@@ -13238,7 +12764,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TripleSingleQuote$0 = $TV($EXPECT($L142, fail, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
+    var TripleSingleQuote$0 = $TV($EXPECT($L143, fail, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
       return { $loc, token: "`" };
     });
     function TripleSingleQuote(state) {
@@ -13263,7 +12789,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TripleSlash$0 = $TV($EXPECT($L143, fail, 'TripleSlash "///"'), function($skip, $loc, $0, $1) {
+    var TripleSlash$0 = $TV($EXPECT($L144, fail, 'TripleSlash "///"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "/" };
     });
     function TripleSlash(state) {
@@ -13288,7 +12814,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TripleTick$0 = $TV($EXPECT($L144, fail, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
+    var TripleTick$0 = $TV($EXPECT($L145, fail, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "`" };
     });
     function TripleTick(state) {
@@ -13313,7 +12839,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Try$0 = $TS($S($EXPECT($L145, fail, 'Try "try"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Try$0 = $TS($S($EXPECT($L146, fail, 'Try "try"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Try(state) {
@@ -13338,7 +12864,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Typeof$0 = $TS($S($EXPECT($L146, fail, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Typeof$0 = $TS($S($EXPECT($L147, fail, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Typeof(state) {
@@ -13363,7 +12889,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Unless$0 = $TS($S($EXPECT($L147, fail, 'Unless "unless"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Unless$0 = $TS($S($EXPECT($L148, fail, 'Unless "unless"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Unless(state) {
@@ -13388,7 +12914,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Until$0 = $TS($S($EXPECT($L148, fail, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Until$0 = $TS($S($EXPECT($L149, fail, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Until(state) {
@@ -13413,7 +12939,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Var$0 = $TS($S($EXPECT($L149, fail, 'Var "var"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Var$0 = $TS($S($EXPECT($L150, fail, 'Var "var"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Var(state) {
@@ -13438,7 +12964,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Void$0 = $TS($S($EXPECT($L150, fail, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Void$0 = $TS($S($EXPECT($L151, fail, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Void(state) {
@@ -13463,7 +12989,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var When$0 = $TS($S($EXPECT($L151, fail, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var When$0 = $TS($S($EXPECT($L152, fail, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: "case" };
     });
     function When(state) {
@@ -13488,7 +13014,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var While$0 = $TS($S($EXPECT($L152, fail, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var While$0 = $TS($S($EXPECT($L153, fail, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function While(state) {
@@ -13513,7 +13039,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Yield$0 = $TS($S($EXPECT($L153, fail, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Yield$0 = $TS($S($EXPECT($L154, fail, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Yield(state) {
@@ -13659,7 +13185,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXSelfClosingElement$0 = $TS($S($EXPECT($L122, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L154, fail, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var JSXSelfClosingElement$0 = $TS($S($EXPECT($L123, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L155, fail, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       return { type: "JSXElement", children: $0, tag: $2 };
     });
     function JSXSelfClosingElement(state) {
@@ -13710,7 +13236,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXOpeningElement$0 = $S($EXPECT($L122, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L27, fail, 'JSXOpeningElement ">"'));
+    var JSXOpeningElement$0 = $S($EXPECT($L123, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L27, fail, 'JSXOpeningElement ">"'));
     function JSXOpeningElement(state) {
       let eventData;
       if (state.events) {
@@ -13762,7 +13288,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXClosingElement$0 = $S($EXPECT($L155, fail, 'JSXClosingElement "</"'), $E(Whitespace), $TEXT(JSXElementName), $E(Whitespace), $EXPECT($L27, fail, 'JSXClosingElement ">"'));
+    var JSXClosingElement$0 = $S($EXPECT($L156, fail, 'JSXClosingElement "</"'), $E(Whitespace), $TEXT(JSXElementName), $E(Whitespace), $EXPECT($L27, fail, 'JSXClosingElement ">"'));
     function JSXClosingElement(state) {
       let eventData;
       if (state.events) {
@@ -13801,7 +13327,7 @@ ${input.slice(result.pos)}
       ];
       return { type: "JSXFragment", children: parts, jsxChildren: children.jsxChildren };
     });
-    var JSXFragment$1 = $TS($S(CoffeeJSXEnabled, $EXPECT($L156, fail, 'JSXFragment "<>"'), $E(JSXChildren), $E(Whitespace), JSXClosingFragment), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var JSXFragment$1 = $TS($S(CoffeeJSXEnabled, $EXPECT($L157, fail, 'JSXFragment "<>"'), $E(JSXChildren), $E(Whitespace), JSXClosingFragment), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var children = $3;
       $0 = $0.slice(1);
       return {
@@ -13832,7 +13358,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var PushJSXOpeningFragment$0 = $TV($EXPECT($L156, fail, 'PushJSXOpeningFragment "<>"'), function($skip, $loc, $0, $1) {
+    var PushJSXOpeningFragment$0 = $TV($EXPECT($L157, fail, 'PushJSXOpeningFragment "<>"'), function($skip, $loc, $0, $1) {
       module.JSXTagStack.push("");
       return $1;
     });
@@ -13886,7 +13412,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXClosingFragment$0 = $EXPECT($L157, fail, 'JSXClosingFragment "</>"');
+    var JSXClosingFragment$0 = $EXPECT($L158, fail, 'JSXClosingFragment "</>"');
     function JSXClosingFragment(state) {
       let eventData;
       if (state.events) {
@@ -14763,7 +14289,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXComment$0 = $TS($S($EXPECT($L158, fail, 'JSXComment "<!--"'), JSXCommentContent, $EXPECT($L159, fail, 'JSXComment "-->"')), function($skip, $loc, $0, $1, $2, $3) {
+    var JSXComment$0 = $TS($S($EXPECT($L159, fail, 'JSXComment "<!--"'), JSXCommentContent, $EXPECT($L160, fail, 'JSXComment "-->"')), function($skip, $loc, $0, $1, $2, $3) {
       return ["{/*", $2, "*/}"];
     });
     function JSXComment(state) {
@@ -14940,7 +14466,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeDeclarationModifier$0 = $S($EXPECT($L160, fail, 'TypeDeclarationModifier "declare"'), NonIdContinue);
+    var TypeDeclarationModifier$0 = $S($EXPECT($L161, fail, 'TypeDeclarationModifier "declare"'), NonIdContinue);
     var TypeDeclarationModifier$1 = Export;
     function TypeDeclarationModifier(state) {
       let eventData;
@@ -15036,7 +14562,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeKeyword$0 = $S($EXPECT($L161, fail, 'TypeKeyword "type"'), NonIdContinue);
+    var TypeKeyword$0 = $S($EXPECT($L162, fail, 'TypeKeyword "type"'), NonIdContinue);
     function TypeKeyword(state) {
       let eventData;
       if (state.events) {
@@ -15059,7 +14585,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Interface$0 = $S($EXPECT($L162, fail, 'Interface "interface"'), NonIdContinue);
+    var Interface$0 = $S($EXPECT($L163, fail, 'Interface "interface"'), NonIdContinue);
     function Interface(state) {
       let eventData;
       if (state.events) {
@@ -15082,7 +14608,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Namespace$0 = $S($EXPECT($L163, fail, 'Namespace "namespace"'), NonIdContinue);
+    var Namespace$0 = $S($EXPECT($L164, fail, 'Namespace "namespace"'), NonIdContinue);
     function Namespace(state) {
       let eventData;
       if (state.events) {
@@ -15307,7 +14833,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R50, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L130, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R51, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
+    var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R50, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L131, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R51, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
     function TypeIndexSignature(state) {
       let eventData;
       if (state.events) {
@@ -15379,7 +14905,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ReturnTypeSuffix$0 = $TS($S(__, Colon, $E($S(__, $EXPECT($L164, fail, 'ReturnTypeSuffix "asserts"'), NonIdContinue)), TypePredicate), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var ReturnTypeSuffix$0 = $TS($S(__, Colon, $E($S(__, $EXPECT($L165, fail, 'ReturnTypeSuffix "asserts"'), NonIdContinue)), TypePredicate), function($skip, $loc, $0, $1, $2, $3, $4) {
       const children = [...$1, $2];
       if ($3)
         children.push($3);
@@ -15538,10 +15064,10 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeUnaryOp$0 = $S($EXPECT($L165, fail, 'TypeUnaryOp "keyof"'), NonIdContinue);
-    var TypeUnaryOp$1 = $S($EXPECT($L146, fail, 'TypeUnaryOp "typeof"'), NonIdContinue);
-    var TypeUnaryOp$2 = $S($EXPECT($L166, fail, 'TypeUnaryOp "infer"'), NonIdContinue);
-    var TypeUnaryOp$3 = $S($EXPECT($L130, fail, 'TypeUnaryOp "readonly"'), NonIdContinue);
+    var TypeUnaryOp$0 = $S($EXPECT($L166, fail, 'TypeUnaryOp "keyof"'), NonIdContinue);
+    var TypeUnaryOp$1 = $S($EXPECT($L147, fail, 'TypeUnaryOp "typeof"'), NonIdContinue);
+    var TypeUnaryOp$2 = $S($EXPECT($L167, fail, 'TypeUnaryOp "infer"'), NonIdContinue);
+    var TypeUnaryOp$3 = $S($EXPECT($L131, fail, 'TypeUnaryOp "readonly"'), NonIdContinue);
     function TypeUnaryOp(state) {
       let eventData;
       if (state.events) {
@@ -15564,7 +15090,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeIndexedAccess$0 = $S(__, OpenBracket, $E(Type), __, CloseBracket);
+    var TypeIndexedAccess$0 = $S(OpenBracket, $E(Type), __, CloseBracket);
     function TypeIndexedAccess(state) {
       let eventData;
       if (state.events) {
@@ -15589,11 +15115,11 @@ ${input.slice(result.pos)}
     }
     var TypePrimary$0 = InterfaceBlock;
     var TypePrimary$1 = $S(__, OpenParen, Type, __, CloseParen);
-    var TypePrimary$2 = $S(__, TypeTuple);
-    var TypePrimary$3 = $S($Q(_), ImportType);
-    var TypePrimary$4 = $S($Q(_), FunctionType);
-    var TypePrimary$5 = $S($Q(_), TypeLiteral);
-    var TypePrimary$6 = $S($Q(_), IdentifierName, $Q($S(Dot, IdentifierName)), $E(TypeArguments));
+    var TypePrimary$2 = $S($E(_), TypeTuple);
+    var TypePrimary$3 = $S($E(_), ImportType);
+    var TypePrimary$4 = $S($E(_), FunctionType);
+    var TypePrimary$5 = $S($E(_), TypeLiteral);
+    var TypePrimary$6 = $S($E(_), IdentifierName, $Q($S(Dot, IdentifierName)), $E(TypeArguments));
     function TypePrimary(state) {
       let eventData;
       if (state.events) {
@@ -15738,7 +15264,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeConditional$0 = $TS($S(TypeBinary, $E($S(__, $EXPECT($L111, fail, 'TypeConditional "extends"'), NonIdContinue, Type, $E($S(__, QuestionMark, Type, __, Colon, Type))))), function($skip, $loc, $0, $1, $2) {
+    var TypeConditional$0 = $TS($S(TypeBinary, $E($S(__, $EXPECT($L112, fail, 'TypeConditional "extends"'), NonIdContinue, Type, $E($S(__, QuestionMark, Type, __, Colon, Type))))), function($skip, $loc, $0, $1, $2) {
       if ($2)
         return $0;
       return $1;
@@ -15767,10 +15293,10 @@ ${input.slice(result.pos)}
     }
     var TypeLiteral$0 = Literal;
     var TypeLiteral$1 = TemplateLiteral;
-    var TypeLiteral$2 = $TS($S($EXPECT($L150, fail, 'TypeLiteral "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var TypeLiteral$2 = $TS($S($EXPECT($L151, fail, 'TypeLiteral "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: "void" };
     });
-    var TypeLiteral$3 = $TV($EXPECT($L167, fail, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
+    var TypeLiteral$3 = $TV($EXPECT($L168, fail, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "[]" };
     });
     function TypeLiteral(state) {
@@ -15852,7 +15378,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeArguments$0 = $TS($S($EXPECT($L122, fail, 'TypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L27, fail, 'TypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var TypeArguments$0 = $TS($S($EXPECT($L123, fail, 'TypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L27, fail, 'TypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4) {
       return { ts: true, children: $0 };
     });
     function TypeArguments(state) {
@@ -15923,7 +15449,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeParameters$0 = $TS($S(__, $EXPECT($L122, fail, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L27, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var TypeParameters$0 = $TS($S(__, $EXPECT($L123, fail, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L27, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var parameters = $3;
       return {
         type: "TypeParameters",
@@ -15977,7 +15503,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeConstraint$0 = $S(__, $EXPECT($L111, fail, 'TypeConstraint "extends"'), NonIdContinue, Type);
+    var TypeConstraint$0 = $S(__, $EXPECT($L112, fail, 'TypeConstraint "extends"'), NonIdContinue, Type);
     function TypeConstraint(state) {
       let eventData;
       if (state.events) {
@@ -16128,7 +15654,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CivetPrologueContent$0 = $TS($S($EXPECT($L168, fail, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R54, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var CivetPrologueContent$0 = $TS($S($EXPECT($L169, fail, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R54, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
       var options = $3;
       return {
         type: "CivetPrologue",
@@ -17776,13 +17302,39 @@ ${input.slice(result.pos)}
           token: str
         };
       };
-      module.reorderBindingRestProperty = function(rest, after) {
-        if (after.length) {
-          const [restDelim] = rest.children.slice(-1), lastAfterProp = after[after.length - 1], lastAfterChildren = lastAfterProp.children, [lastDelim] = lastAfterChildren.slice(-1);
-          rest = { ...rest, children: [...rest.children.slice(0, -1), lastDelim] };
-          after = [...after.slice(0, -1), { ...lastAfterProp, children: [...lastAfterChildren.slice(0, -1), restDelim] }];
+      module.reorderBindingRestProperty = function(props) {
+        const names = props.flatMap((p) => p.names);
+        let restIndex = -1;
+        let restCount = 0;
+        props.forEach(({ type }, i) => {
+          if (type === "BindingRestProperty") {
+            if (restIndex < 0)
+              restIndex = i;
+            restCount++;
+          }
+        });
+        if (restCount === 0) {
+          const children = [...props];
+          return {
+            children,
+            names
+          };
+        } else if (restCount === 1) {
+          let after = props.slice(restIndex + 1);
+          let rest = props[restIndex];
+          props = props.slice(0, restIndex);
+          if (after.length) {
+            const [restDelim] = rest.children.slice(-1), lastAfterProp = after[after.length - 1], lastAfterChildren = lastAfterProp.children, [lastDelim] = lastAfterChildren.slice(-1);
+            rest = { ...rest, children: [...rest.children.slice(0, -1), lastDelim] };
+            after = [...after.slice(0, -1), { ...lastAfterProp, children: [...lastAfterChildren.slice(0, -1), restDelim] }];
+          }
+          const children = [...props, ...after, rest];
+          return {
+            children,
+            names
+          };
         }
-        return [rest, after];
+        throw new Error("Multiple rest properties in object pattern");
       };
       function gatherNodes(node, predicate) {
         if (node == null)