@danielx/civet 0.7.10 → 0.7.12

package/dist/browser.js

@@ -967,27 +967,49 @@ ${body}`;
       case "DebuggerStatement":
       case "EmptyStatement":
       case "ReturnStatement":
-      case "ThrowStatement":
+      case "ThrowStatement": {
         return;
-      case "Declaration":
+      }
+      case "Declaration": {
+        let ref5;
+        if (exp.bindings?.length) {
+          ref5 = patternAsValue((ref4 = exp.bindings)[ref4.length - 1].pattern);
+        } else {
+          ref5 = "void 0";
+        }
+        ;
+        const value = ref5;
         exp.children.push([
           "",
-          [";", collect(patternAsValue((ref4 = exp.bindings)[ref4.length - 1].pattern))]
+          [";", collect(value)]
         ]);
         return;
+      }
+      case "FunctionExpression": {
+        if (exp.id) {
+          exp.children.push([
+            "",
+            [";", collect(exp.id)]
+          ]);
+          return;
+        }
+        break;
+      }
       case "ForStatement":
       case "IterationStatement":
       case "DoStatement":
-      case "ComptimeStatement":
+      case "ComptimeStatement": {
         wrapIterationReturningResults(exp, outer, collect);
         return;
-      case "BlockStatement":
+      }
+      case "BlockStatement": {
         if (node.expressions.some(isExit)) {
           return;
         }
         assignResults(exp.expressions[exp.expressions.length - 1], collect);
         return;
-      case "IfStatement":
+      }
+      case "IfStatement": {
         assignResults(exp.then, collect);
         if (exp.then.bare && !exp.then.semicolon) {
           exp.then.children.push(exp.then.semicolon = ";");
@@ -995,18 +1017,22 @@ ${body}`;
         if (exp.else) {
           assignResults(exp.else.block, collect);
         } else {
-          exp.children.push([" else {", collect("undefined"), "}"]);
+          exp.children.push([" else {", collect("void 0"), "}"]);
         }
         return;
-      case "PatternMatchingStatement":
+      }
+      case "PatternMatchingStatement": {
         assignResults(exp.children[0], collect);
         return;
-      case "SwitchStatement":
+      }
+      case "SwitchStatement": {
         assignResults(exp.children[2], collect);
         return;
-      case "TryStatement":
+      }
+      case "TryStatement": {
         exp.blocks.forEach((block) => assignResults(block, collect));
         return;
+      }
     }
     if (node[node.length - 1]?.type === "SemicolonDelimiter") {
       return;
@@ -1017,7 +1043,7 @@ ${body}`;
     if (!node)
       return;
     switch (node.type) {
-      case "BlockStatement":
+      case "BlockStatement": {
         if (node.expressions.length) {
           if (node.expressions.some(([, exp2]) => isExit(exp2))) {
             return;
@@ -1030,7 +1056,8 @@ ${body}`;
           }
         }
         return;
-      case "WhenClause":
+      }
+      case "WhenClause": {
         if (node.break) {
           node.children.splice(node.children.indexOf(node.break), 1);
         }
@@ -1040,9 +1067,11 @@ ${body}`;
           node.block.expressions.push(wrapWithReturn());
         }
         return;
-      case "DefaultClause":
+      }
+      case "DefaultClause": {
         insertReturn(node.block);
         return;
+      }
     }
     if (!Array.isArray(node))
       return;
@@ -1062,23 +1091,36 @@ ${body}`;
       exp = exp.statement;
       ({ type } = exp);
     }
-    let ref5;
+    let ref6;
     switch (type) {
       case "BreakStatement":
       case "ContinueStatement":
       case "DebuggerStatement":
       case "EmptyStatement":
       case "ReturnStatement":
-      case "ThrowStatement":
+      case "ThrowStatement": {
         return;
-      case "Declaration":
+      }
+      case "Declaration": {
+        let ref7;
+        if (exp.bindings?.length) {
+          ref7 = [" ", patternAsValue((ref6 = exp.bindings)[ref6.length - 1].pattern)];
+        } else {
+          ref7 = [];
+        }
+        ;
+        const value = ref7;
         exp.children.push(["", {
           type: "ReturnStatement",
-          children: [";return ", patternAsValue((ref5 = exp.bindings)[ref5.length - 1].pattern)],
+          children: [
+            ";return",
+            ...value
+          ],
           parent: exp
         }]);
         return;
-      case "FunctionExpression":
+      }
+      case "FunctionExpression": {
         if (exp.id) {
           exp.children.push([
             "",
@@ -1091,16 +1133,19 @@ ${body}`;
           return;
         }
         break;
+      }
       case "ForStatement":
       case "IterationStatement":
       case "DoStatement":
-      case "ComptimeStatement":
+      case "ComptimeStatement": {
         wrapIterationReturningResults(exp, outer);
         return;
-      case "BlockStatement":
+      }
+      case "BlockStatement": {
         insertReturn(exp.expressions[exp.expressions.length - 1]);
         return;
-      case "IfStatement":
+      }
+      case "IfStatement": {
         insertReturn(exp.then);
         if (exp.else)
           insertReturn(exp.else.block);
@@ -1112,18 +1157,23 @@ ${body}`;
             parent: exp
           }]);
         return;
-      case "PatternMatchingStatement":
+      }
+      case "PatternMatchingStatement": {
         insertReturn(exp.children[0]);
         return;
-      case "SwitchStatement":
+      }
+      case "SwitchStatement": {
         insertSwitchReturns(exp);
         return;
-      case "TryStatement":
+      }
+      case "TryStatement": {
         exp.blocks.forEach((block) => insertReturn(block));
         return;
+      }
     }
-    if (node[node.length - 1]?.type === "SemicolonDelimiter")
+    if (node[node.length - 1]?.type === "SemicolonDelimiter") {
       return;
+    }
     const returnStatement = wrapWithReturn(node[1]);
     node.splice(1, 1, returnStatement);
   }
@@ -1212,10 +1262,33 @@ ${body}`;
     }
     expressions.unshift(...prefix);
   }
+  function processSignature(f) {
+    const { block, signature } = f;
+    if (hasAwait(block) && !f.async?.length) {
+      f.async.push("async ");
+      signature.modifier.async = true;
+    }
+    if (hasYield(block) && !f.generator?.length) {
+      if (f.type === "ArrowFunction") {
+        gatherRecursiveWithinFunction(block, ($) => $.type === "YieldExpression").forEach((y) => {
+          const i = y.children.findIndex(($1) => $1.type === "Yield");
+          return y.children.splice(i + 1, 0, {
+            type: "Error",
+            message: "Can't use yield inside of => arrow function"
+          });
+        });
+      } else {
+        f.generator.push("*");
+        signature.modifier.generator = true;
+      }
+    }
+  }
   function processFunctions(statements, config2) {
     gatherRecursiveAll(statements, ({ type }) => type === "FunctionExpression" || type === "ArrowFunction").forEach((f) => {
-      if (f.type === "FunctionExpression")
+      if (f.type === "FunctionExpression") {
         implicitFunctionBlock(f);
+      }
+      processSignature(f);
       processParams(f);
       return processReturn(f, config2.implicitReturns);
     });
@@ -1272,12 +1345,12 @@ ${body}`;
         ...parameters,
         children: (() => {
           const results = [];
-          for (let ref6 = parameters.children, i1 = 0, len3 = ref6.length; i1 < len3; i1++) {
-            let parameter = ref6[i1];
+          for (let ref8 = parameters.children, i1 = 0, len3 = ref8.length; i1 < len3; i1++) {
+            let parameter = ref8[i1];
             if (typeof parameter === "object" && parameter != null && "type" in parameter && parameter.type === "Parameter") {
-              let ref7;
-              if (ref7 = parameter.initializer) {
-                const initializer = ref7;
+              let ref9;
+              if (ref9 = parameter.initializer) {
+                const initializer = ref9;
                 args.push(initializer.expression, parameter.delim);
                 parameter = {
                   ...parameter,
@@ -1298,7 +1371,7 @@ ${body}`;
       expression = {
         ...expression,
         parameters: newParameters,
-        children: expression.children.map(($) => $ === parameters ? newParameters : $)
+        children: expression.children.map(($2) => $2 === parameters ? newParameters : $2)
       };
     }
     return {
@@ -1313,6 +1386,52 @@ ${body}`;
       ]
     };
   }
+  function makeAmpersandFunction(rhs) {
+    let { ref, typeSuffix, body } = rhs;
+    if (!(ref != null)) {
+      ref = makeRef("$");
+      inplacePrepend(ref, body);
+    }
+    if (body?.type === "ObjectExpression") {
+      body = makeLeftHandSideExpression(body);
+    }
+    const parameters = makeNode({
+      type: "Parameters",
+      children: typeSuffix ? ["(", ref, typeSuffix, ")"] : [ref],
+      names: []
+    });
+    const expressions = [[" ", body]];
+    const block = makeNode({
+      type: "BlockStatement",
+      bare: true,
+      expressions,
+      children: [expressions],
+      implicitlyReturned: true
+    });
+    const async = [];
+    const children = [async, parameters, " =>", block];
+    const fn = makeNode({
+      type: "ArrowFunction",
+      async,
+      signature: {
+        modifier: {
+          async: !!async.length
+        }
+      },
+      children,
+      ref,
+      block,
+      parameters,
+      ampersandBlock: true,
+      body
+    });
+    if (isStatement(body)) {
+      braceBlock(block);
+      fn.ampersandBlock = false;
+      delete fn.body;
+    }
+    return fn;
+  }
 
   // source/parser/block.civet
   function blockWithPrefix(prefixStatements, block) {
@@ -1536,8 +1655,8 @@ ${body}`;
       node.parent = parent;
     }
     if (node.children) {
-      for (let ref1 = node.children, i1 = 0, len1 = ref1.length; i1 < len1; i1++) {
-        const child = ref1[i1];
+      for (let ref = node.children, i1 = 0, len1 = ref.length; i1 < len1; i1++) {
+        const child = ref[i1];
         addParentPointers(child, node);
       }
     }
@@ -1819,13 +1938,13 @@ ${body}`;
     return;
   }
   function hasAwait(exp) {
-    return gatherRecursiveWithinFunction(exp, ({ type }) => type === "Await").length > 0;
+    return gatherRecursiveWithinFunction(exp, ($1) => $1.type === "Await").length > 0;
   }
   function hasYield(exp) {
-    return gatherRecursiveWithinFunction(exp, ({ type }) => type === "Yield").length > 0;
+    return gatherRecursiveWithinFunction(exp, ($2) => $2.type === "Yield").length > 0;
   }
   function hasImportDeclaration(exp) {
-    return gatherRecursiveWithinFunction(exp, ({ type }) => type === "ImportDeclaration").length > 0;
+    return gatherRecursiveWithinFunction(exp, ($3) => $3.type === "ImportDeclaration").length > 0;
   }
   function deepCopy(node) {
     if (node == null)
@@ -1863,54 +1982,6 @@ ${body}`;
       }
     }
   }
-  function makeAmpersandFunction(rhs) {
-    let { ref, typeSuffix, body } = rhs;
-    if (!(ref != null)) {
-      ref = makeRef("$");
-      inplacePrepend(ref, body);
-    }
-    if (body?.type === "ObjectExpression") {
-      body = makeLeftHandSideExpression(body);
-    }
-    const parameters = makeNode({
-      type: "Parameters",
-      children: typeSuffix ? ["(", ref, typeSuffix, ")"] : [ref],
-      names: []
-    });
-    const expressions = [[" ", body]];
-    const block = makeNode({
-      type: "BlockStatement",
-      bare: true,
-      expressions,
-      children: [expressions],
-      implicitlyReturned: true
-    });
-    const children = [parameters, " =>", block];
-    const async = hasAwait(body);
-    if (async) {
-      children.unshift("async ");
-    }
-    const fn = makeNode({
-      type: "ArrowFunction",
-      signature: {
-        modifier: {
-          async
-        }
-      },
-      children,
-      ref,
-      block,
-      parameters,
-      ampersandBlock: true,
-      body
-    });
-    if (isStatement(body)) {
-      braceBlock(block);
-      fn.ampersandBlock = false;
-      delete fn.body;
-    }
-    return fn;
-  }
   var skipParens = /* @__PURE__ */ new Set([
     "AmpersandRef",
     "CallExpression",
@@ -1961,8 +2032,8 @@ ${body}`;
       node.parent = parent;
     }
     if (depth && isParent(node)) {
-      for (let ref2 = node.children, i3 = 0, len3 = ref2.length; i3 < len3; i3++) {
-        const child = ref2[i3];
+      for (let ref1 = node.children, i3 = 0, len3 = ref1.length; i3 < len3; i3++) {
+        const child = ref1[i3];
         updateParentPointers(child, node, depth - 1);
       }
     }
@@ -2033,11 +2104,11 @@ ${body}`;
   }
   function wrapIIFE(expressions, asyncFlag) {
     let prefix;
-    let async;
+    const async = [];
     if (asyncFlag) {
-      async = "async ";
+      async.push("async ");
     } else if (hasAwait(expressions)) {
-      async = "async ";
+      async.push("async ");
       prefix = {
         type: "Await",
         children: ["await "]
@@ -2048,8 +2119,7 @@ ${body}`;
       expressions,
       children: ["{", expressions, "}"],
       bare: false,
-      root: false,
-      parent: void 0
+      root: false
     });
     const parameters = {
       type: "Parameters",
@@ -2058,7 +2128,7 @@ ${body}`;
     };
     const signature = {
       modifier: {
-        async: !!async
+        async: !!async.length
       },
       returnType: void 0
     };
@@ -2401,8 +2471,6 @@ ${body}`;
       }
       return expandedOps;
     }
-    ;
-    return recurse;
   }
   function dotNumericLiteral(literal) {
     if (literal?.type === "Literal" && /^[+-]?(?:0|[1-9](?:_[0-9]|[0-9])*)$/.test(literal.raw)) {
@@ -2919,7 +2987,13 @@ ${body}`;
     thisAssignments = thisAssignments.map(($6) => ["", $6, ";"]);
     const duplicateDeclarations = aggregateDuplicateBindings([patternBindings, splices]);
     return [
-      ["", [decl, patternBindings, suffix, " = ", ref, ...splices], ";"],
+      ["", {
+        type: "Declaration",
+        children: [decl, patternBindings, suffix, " = ", ref, ...splices],
+        names: [],
+        bindings: []
+        // avoid implicit return of any bindings
+      }, ";"],
       ...thisAssignments,
       ...duplicateDeclarations.map(($7) => ["", $7, ";"])
     ];
@@ -3067,9 +3141,18 @@ ${body}`;
         aliasBinding(p, ref);
         return ref;
       });
-      return declarations.push(["const ", key, " = [", ...refs.map((r, i) => {
-        return i === 0 ? r : [", ", r];
-      }), "]"]);
+      return declarations.push({
+        type: "Declaration",
+        children: [
+          "const ",
+          key,
+          " = [",
+          ...refs.map((r, i) => i === 0 ? r : [", ", r]),
+          "]"
+        ],
+        names: [],
+        bindings: []
+      });
     });
     return declarations;
   }
@@ -3560,8 +3643,7 @@ ${body}`;
         token: " != null"
       };
       if (pre.length) {
-        let ref;
-        const lastPre = (ref = pre)[ref.length - 1];
+        const lastPre = pre[pre.length - 1];
         if (lastPre.token === "!") {
           post.token = " == null";
           pre = pre.slice(0, -1);
@@ -3605,9 +3687,9 @@ ${body}`;
         }
       }
     }
-    let ref1;
-    while (ref1 = pre.length) {
-      const l = ref1;
+    let ref;
+    while (ref = pre.length) {
+      const l = ref;
       const last = pre[l - 1];
       if (last.type === "Await") {
         if (last.op) {
@@ -4276,8 +4358,6 @@ ${body}`;
       debugger;
       throw new Error(`Unknown node ${stringify(node)}`);
     }
-    ;
-    return recurse;
   }
   var generate_default = gen;
   function prune(node) {
@@ -4853,8 +4933,11 @@ ${js}`
       }
       if (results.length > 1) {
         return makeLeftHandSideExpression(results);
+      } else if (results.length) {
+        return results;
+      } else {
+        return ["void 0"];
       }
-      return results;
     } else {
       return blockOrExpression;
     }
@@ -4881,10 +4964,10 @@ ${js}`
       children.push(":void 0");
     }
     children.push(closeParen);
-    return {
+    return makeNode({
       type: "IfExpression",
       children
-    };
+    });
   }
   function expressionizeTypeIf([ws, ifOp, condition, t, e]) {
     const children = [
@@ -6904,12 +6987,12 @@ ${js}`
   var $L12 = (0, import_lib3.$L)("\u2014");
   var $L13 = (0, import_lib3.$L)("=>");
   var $L14 = (0, import_lib3.$L)("\u21D2");
-  var $L15 = (0, import_lib3.$L)(":");
-  var $L16 = (0, import_lib3.$L)(" ");
-  var $L17 = (0, import_lib3.$L)("<");
-  var $L18 = (0, import_lib3.$L)("implements");
-  var $L19 = (0, import_lib3.$L)("<:");
-  var $L20 = (0, import_lib3.$L)("import");
+  var $L15 = (0, import_lib3.$L)("import");
+  var $L16 = (0, import_lib3.$L)(":");
+  var $L17 = (0, import_lib3.$L)(" ");
+  var $L18 = (0, import_lib3.$L)("<");
+  var $L19 = (0, import_lib3.$L)("implements");
+  var $L20 = (0, import_lib3.$L)("<:");
   var $L21 = (0, import_lib3.$L)("^");
   var $L22 = (0, import_lib3.$L)("-");
   var $L23 = (0, import_lib3.$L)("import.meta");
@@ -7307,7 +7390,7 @@ ${js}`
     return (0, import_lib3.$EVENT_C)(ctx, state2, "NonPipelineExtendedExpression", NonPipelineExtendedExpression$$);
   }
   var NonAssignmentExtendedExpression$0 = NestedNonAssignmentExtendedExpression;
-  var NonAssignmentExtendedExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(__, ExpressionizedStatementWithTrailingCallExpressions), function($skip, $loc, $0, $1, $2) {
+  var NonAssignmentExtendedExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), ExpressionizedStatementWithTrailingCallExpressions), function($skip, $loc, $0, $1, $2) {
     return prepend($1, $2);
   });
   var NonAssignmentExtendedExpression$$ = [NonAssignmentExtendedExpression$0, NonAssignmentExtendedExpression$1];
@@ -7804,13 +7887,13 @@ ${js}`
   });
   var AssignmentExpression$1 = PipelineExpression;
   var AssignmentExpression$2 = SingleLineAssignmentExpression;
-  var AssignmentExpression$3 = (0, import_lib3.$S)(__, AssignmentExpressionTail);
+  var AssignmentExpression$3 = (0, import_lib3.$S)((0, import_lib3.$S)(EOS, (0, import_lib3.$E)(_)), AssignmentExpressionTail);
   var AssignmentExpression$$ = [AssignmentExpression$0, AssignmentExpression$1, AssignmentExpression$2, AssignmentExpression$3];
   function AssignmentExpression(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "AssignmentExpression", AssignmentExpression$$);
   }
   var NonPipelineAssignmentExpression$0 = NonPipelineSingleLineAssignmentExpression;
-  var NonPipelineAssignmentExpression$1 = (0, import_lib3.$S)(__, NonPipelineAssignmentExpressionTail);
+  var NonPipelineAssignmentExpression$1 = (0, import_lib3.$S)((0, import_lib3.$S)(EOS, (0, import_lib3.$E)(_)), NonPipelineAssignmentExpressionTail);
   var NonPipelineAssignmentExpression$$ = [NonPipelineAssignmentExpression$0, NonPipelineAssignmentExpression$1];
   function NonPipelineAssignmentExpression(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "NonPipelineAssignmentExpression", NonPipelineAssignmentExpression$$);
@@ -7906,30 +7989,21 @@ ${js}`
     var suffix = $3;
     var arrow = $4;
     var expOrBlock = $5;
-    if (hasAwait(expOrBlock) && !async) {
-      async = "async ";
-    }
-    let error;
-    if (hasYield(expOrBlock)) {
-      error = {
-        type: "Error",
-        message: "Can't use yield inside of => arrow function"
-      };
-    }
+    if (!async)
+      async = [];
     return {
       type: "ArrowFunction",
       signature: {
         modifier: {
-          async: !!async
+          async: !!async.length
         },
         returnType: suffix
       },
       parameters,
       returnType: suffix,
-      ts: false,
       async,
       block: expOrBlock,
-      children: [async, parameters, suffix, arrow, error, expOrBlock]
+      children: [async, parameters, suffix, arrow, expOrBlock]
     };
   });
   var ArrowFunction$$ = [ArrowFunction$0, ArrowFunction$1];
@@ -8039,24 +8113,24 @@ ${js}`
   function PipelineHeadItem(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "PipelineHeadItem", PipelineHeadItem$$);
   }
-  var PipelineTailItem$0 = (0, import_lib3.$T)((0, import_lib3.$S)(AwaitOp, (0, import_lib3.$N)(AccessStart)), function(value) {
+  var PipelineTailItem$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$C)(AwaitOp, Yield, Return), (0, import_lib3.$N)(AccessStart)), function(value) {
     return value[0];
   });
-  var PipelineTailItem$1 = (0, import_lib3.$T)((0, import_lib3.$S)(Yield, (0, import_lib3.$N)(AccessStart)), function(value) {
-    return value[0];
-  });
-  var PipelineTailItem$2 = (0, import_lib3.$T)((0, import_lib3.$S)(Return, (0, import_lib3.$N)(AccessStart)), function(value) {
-    return value[0];
+  var PipelineTailItem$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L15, 'PipelineTailItem "import"'), (0, import_lib3.$N)(AccessStart)), function($skip, $loc, $0, $1, $2) {
+    return {
+      type: "Identifier",
+      children: [$1]
+    };
   });
-  var PipelineTailItem$3 = (0, import_lib3.$TS)((0, import_lib3.$S)(NWTypePostfix, (0, import_lib3.$Q)(TypePostfix)), function($skip, $loc, $0, $1, $2) {
+  var PipelineTailItem$2 = (0, import_lib3.$TS)((0, import_lib3.$S)(NWTypePostfix, (0, import_lib3.$Q)(TypePostfix)), function($skip, $loc, $0, $1, $2) {
     return makeAmpersandFunction({
       body: [" ", $1, ...$2]
     });
   });
-  var PipelineTailItem$4 = (0, import_lib3.$T)((0, import_lib3.$S)(PipelineHeadItem), function(value) {
+  var PipelineTailItem$3 = (0, import_lib3.$T)((0, import_lib3.$S)(PipelineHeadItem), function(value) {
     return value[0];
   });
-  var PipelineTailItem$$ = [PipelineTailItem$0, PipelineTailItem$1, PipelineTailItem$2, PipelineTailItem$3, PipelineTailItem$4];
+  var PipelineTailItem$$ = [PipelineTailItem$0, PipelineTailItem$1, PipelineTailItem$2, PipelineTailItem$3];
   function PipelineTailItem(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "PipelineTailItem", PipelineTailItem$$);
   }
@@ -8151,7 +8225,7 @@ ${js}`
   function ClassDeclaration(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ClassDeclaration", ClassDeclaration$0);
   }
-  var ClassExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(Decorators), (0, import_lib3.$E)((0, import_lib3.$S)(Abstract, __)), Class, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($L15, 'ClassExpression ":"')), (0, import_lib3.$E)(ClassBinding), (0, import_lib3.$E)(ClassHeritage), ClassBody), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+  var ClassExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(Decorators), (0, import_lib3.$E)((0, import_lib3.$S)(Abstract, __)), Class, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($L16, 'ClassExpression ":"')), (0, import_lib3.$E)(ClassBinding), (0, import_lib3.$E)(ClassHeritage), ClassBody), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
     var decorators = $1;
     var abstract = $2;
     var binding = $5;
@@ -8186,7 +8260,7 @@ ${js}`
   function ExtendsClause(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ExtendsClause", ExtendsClause$0);
   }
-  var ExtendsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, (0, import_lib3.$E)(_), ExtendsShorthand, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L16, 'ExtendsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var ExtendsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, (0, import_lib3.$E)(_), ExtendsShorthand, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'ExtendsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
     var l = $1;
     var ws = $2;
     var t = $3;
@@ -8208,13 +8282,13 @@ ${js}`
   function ExtendsToken(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "ExtendsToken", ExtendsToken$$);
   }
-  var ExtendsShorthand$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L17, 'ExtendsShorthand "<"'), function($skip, $loc, $0, $1) {
+  var ExtendsShorthand$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L18, 'ExtendsShorthand "<"'), function($skip, $loc, $0, $1) {
     return { $loc, token: "extends " };
   });
   function ExtendsShorthand(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ExtendsShorthand", ExtendsShorthand$0);
   }
-  var NotExtendsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, (0, import_lib3.$E)(_), OmittedNegation, ExtendsShorthand, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L16, 'NotExtendsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var NotExtendsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, (0, import_lib3.$E)(_), OmittedNegation, ExtendsShorthand, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'NotExtendsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     var l = $1;
     var ws1 = $2;
     var ws2 = $3;
@@ -8240,7 +8314,7 @@ ${js}`
   var OmittedNegation$0 = (0, import_lib3.$T)((0, import_lib3.$S)(ExclamationPoint), function(value) {
     return "";
   });
-  var OmittedNegation$1 = (0, import_lib3.$T)((0, import_lib3.$S)(Not, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L16, 'OmittedNegation " "')), (0, import_lib3.$E)(_)), function(value) {
+  var OmittedNegation$1 = (0, import_lib3.$T)((0, import_lib3.$S)(Not, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'OmittedNegation " "')), (0, import_lib3.$E)(_)), function(value) {
     return value[2];
   });
   var OmittedNegation$$ = [OmittedNegation$0, OmittedNegation$1];
@@ -8263,7 +8337,7 @@ ${js}`
   function ImplementsClause(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ImplementsClause", ImplementsClause$0);
   }
-  var ImplementsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, __, ImplementsShorthand, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L16, 'ImplementsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var ImplementsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, __, ImplementsShorthand, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'ImplementsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
     var l = $1;
     var ws = $2;
     var token = $3;
@@ -8273,7 +8347,7 @@ ${js}`
     }
     return { children };
   });
-  var ImplementsToken$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(__, (0, import_lib3.$EXPECT)($L18, 'ImplementsToken "implements"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
+  var ImplementsToken$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(__, (0, import_lib3.$EXPECT)($L19, 'ImplementsToken "implements"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
     $2 = { $loc, token: $2 };
     return [$1, $2];
   });
@@ -8281,7 +8355,7 @@ ${js}`
   function ImplementsToken(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "ImplementsToken", ImplementsToken$$);
   }
-  var ImplementsShorthand$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L19, 'ImplementsShorthand "<:"'), function($skip, $loc, $0, $1) {
+  var ImplementsShorthand$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L20, 'ImplementsShorthand "<:"'), function($skip, $loc, $0, $1) {
     return { $loc, token: "implements " };
   });
   function ImplementsShorthand(ctx, state2) {
@@ -8538,7 +8612,7 @@ ${js}`
   function AtThis(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "AtThis", AtThis$0);
   }
-  var LeftHandSideExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$P)((0, import_lib3.$S)(New, (0, import_lib3.$N)((0, import_lib3.$C)((0, import_lib3.$EXPECT)($L7, 'LeftHandSideExpression "."'), (0, import_lib3.$EXPECT)($L15, 'LeftHandSideExpression ":"'))), __)), CallExpression), function($skip, $loc, $0, $1, $2) {
+  var LeftHandSideExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$P)((0, import_lib3.$S)(New, (0, import_lib3.$N)((0, import_lib3.$C)((0, import_lib3.$EXPECT)($L7, 'LeftHandSideExpression "."'), (0, import_lib3.$EXPECT)($L16, 'LeftHandSideExpression ":"'))), __)), CallExpression), function($skip, $loc, $0, $1, $2) {
     var expression = $2;
     return {
       type: "NewExpression",
@@ -8561,7 +8635,7 @@ ${js}`
   var CallExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(Import, _, NamedImports, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     return dynamizeImportDeclarationExpression($0);
   });
-  var CallExpression$2 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L20, 'CallExpression "import"'), ArgumentsWithTrailingMemberExpressions, (0, import_lib3.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+  var CallExpression$2 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L15, 'CallExpression "import"'), ArgumentsWithTrailingMemberExpressions, (0, import_lib3.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
     var rest = $3;
     return processCallMemberExpression({
       type: "CallExpression",
@@ -9566,7 +9640,6 @@ ${js}`
       name: id?.name,
       parameters,
       returnType: suffix,
-      ts: false,
       async,
       generator,
       modifier: {
@@ -9592,14 +9665,6 @@ ${js}`
         ts: true
       };
     }
-    if (hasAwait(block) && !signature.async.length) {
-      signature.async.push("async ");
-      signature.modifier.async = true;
-    }
-    if (hasYield(block) && !signature.generator.length) {
-      signature.generator.push("*");
-      signature.modifier.generator = true;
-    }
     return {
       ...signature,
       type: "FunctionExpression",
@@ -9771,15 +9836,21 @@ ${js}`
   function OperatorDeclaration(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "OperatorDeclaration", OperatorDeclaration$$);
   }
-  var OperatorSignature$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Operator, (0, import_lib3.$E)((0, import_lib3.$S)(_, Function2)), _, Identifier, (0, import_lib3.$E)(OperatorBehavior), (0, import_lib3.$E)(_), NonEmptyParameters, (0, import_lib3.$E)(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
-    var op = $1;
-    var func = $2;
-    var w1 = $3;
-    var id = $4;
-    var behavior = $5;
-    var w2 = $6;
-    var parameters = $7;
-    var suffix = $8;
+  var OperatorSignature$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$S)(Async, _)), Operator, (0, import_lib3.$E)((0, import_lib3.$S)(_, Function2)), (0, import_lib3.$E)((0, import_lib3.$S)((0, import_lib3.$E)(_), Star)), _, Identifier, (0, import_lib3.$E)(OperatorBehavior), (0, import_lib3.$E)(_), NonEmptyParameters, (0, import_lib3.$E)(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9, $10) {
+    var async = $1;
+    var op = $2;
+    var func = $3;
+    var generator = $4;
+    var w1 = $5;
+    var id = $6;
+    var behavior = $7;
+    var w2 = $8;
+    var parameters = $9;
+    var suffix = $10;
+    if (!async)
+      async = [];
+    if (!generator)
+      generator = [];
     if (!func) {
       func = { $loc: op.$loc, token: "function" };
     } else {
@@ -9788,12 +9859,17 @@ ${js}`
     return {
       type: "FunctionSignature",
       id,
-      modifier: {},
+      name: id.name,
       parameters,
       returnType: suffix,
-      ts: false,
+      async,
+      generator,
+      modifier: {
+        async: !!async.length,
+        generator: !!generator.length
+      },
       block: null,
-      children: [func, w1, id, w2, parameters, suffix],
+      children: [async, func, generator, w1, id, w2, parameters, suffix],
       behavior
     };
   });
@@ -9843,27 +9919,24 @@ ${js}`
     var suffix = $3;
     var arrow = $5;
     var block = $6;
-    if (hasAwait(block) && !async) {
-      async = "async ";
-    }
-    let generator;
-    if (hasYield(block)) {
-      generator = "*";
-    }
+    if (!async)
+      async = [];
+    const generator = [];
     return {
       type: "FunctionExpression",
       id: void 0,
       parameters,
       returnType: suffix,
-      ts: false,
       async,
       generator,
       block,
       signature: {
         name: void 0,
+        async,
+        generator,
         modifier: {
-          async: !!async,
-          generator: !!generator
+          async: !!async.length,
+          generator: !!generator.length
         },
         returnType: suffix
       },
@@ -11427,7 +11500,7 @@ ${js}`
   var BinaryOpSymbol$15 = (0, import_lib3.$T)((0, import_lib3.$EXPECT)($L77, 'BinaryOpSymbol "\xAB"'), function(value) {
     return "<<";
   });
-  var BinaryOpSymbol$16 = (0, import_lib3.$EXPECT)($L17, 'BinaryOpSymbol "<"');
+  var BinaryOpSymbol$16 = (0, import_lib3.$EXPECT)($L18, 'BinaryOpSymbol "<"');
   var BinaryOpSymbol$17 = (0, import_lib3.$EXPECT)($L78, 'BinaryOpSymbol ">>>"');
   var BinaryOpSymbol$18 = (0, import_lib3.$T)((0, import_lib3.$EXPECT)($L79, 'BinaryOpSymbol "\u22D9"'), function(value) {
     return ">>>";
@@ -11659,7 +11732,7 @@ ${js}`
       return [op, [" "]];
     return [op, ws];
   });
-  var UnaryOp$3 = (0, import_lib3.$T)((0, import_lib3.$S)(Not, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R23, "UnaryOp /[:.]/")), (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L16, 'UnaryOp " "')), (0, import_lib3.$E)(_)), function(value) {
+  var UnaryOp$3 = (0, import_lib3.$T)((0, import_lib3.$S)(Not, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R23, "UnaryOp /[:.]/")), (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'UnaryOp " "')), (0, import_lib3.$E)(_)), function(value) {
     return [value[0], value[3]];
   });
   var UnaryOp$$ = [UnaryOp$0, UnaryOp$1, UnaryOp$2, UnaryOp$3];
@@ -12498,7 +12571,7 @@ ${js}`
   function IgnoreColon(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "IgnoreColon", IgnoreColon$0);
   }
-  var TryStatement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Try, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($L15, 'TryStatement ":"')), NoPostfixBracedOrEmptyBlock, (0, import_lib3.$E)(CatchClause), (0, import_lib3.$E)(ElseClause), (0, import_lib3.$E)(FinallyClause)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+  var TryStatement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Try, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($L16, 'TryStatement ":"')), NoPostfixBracedOrEmptyBlock, (0, import_lib3.$E)(CatchClause), (0, import_lib3.$E)(ElseClause), (0, import_lib3.$E)(FinallyClause)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
     return processTryBlock($0);
   });
   function TryStatement(ctx, state2) {
@@ -12807,7 +12880,7 @@ ${js}`
     };
   });
   var KeywordStatement$2 = DebuggerStatement;
-  var KeywordStatement$3 = (0, import_lib3.$T)((0, import_lib3.$S)(Return, (0, import_lib3.$N)((0, import_lib3.$C)((0, import_lib3.$EXPECT)($L15, 'KeywordStatement ":"'), (0, import_lib3.$EXPECT)($L7, 'KeywordStatement "."'), AfterReturnShorthand)), (0, import_lib3.$E)(MaybeNestedExpression)), function(value) {
+  var KeywordStatement$3 = (0, import_lib3.$T)((0, import_lib3.$S)(Return, (0, import_lib3.$N)((0, import_lib3.$C)((0, import_lib3.$EXPECT)($L16, 'KeywordStatement ":"'), (0, import_lib3.$EXPECT)($L7, 'KeywordStatement "."'), AfterReturnShorthand)), (0, import_lib3.$E)(MaybeNestedExpression)), function(value) {
     var expression = value[2];
     return { "type": "ReturnStatement", "expression": expression, "children": value };
   });
@@ -13047,7 +13120,7 @@ ${js}`
     return (0, import_lib3.$EVENT_C)(ctx, state2, "OperatorImportSpecifier", OperatorImportSpecifier$$);
   }
   var ImportAsToken$0 = (0, import_lib3.$S)(__, As);
-  var ImportAsToken$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, __, Colon, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L16, 'ImportAsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var ImportAsToken$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, __, Colon, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'ImportAsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
     var l = $1;
     var ws = $2;
     var c = $3;
@@ -13818,7 +13891,7 @@ ${js}`
   function Loc(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "Loc", Loc$0);
   }
-  var Abstract$0 = (0, import_lib3.$TV)((0, import_lib3.$TEXT)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L126, 'Abstract "abstract"'), NonIdContinue, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L16, 'Abstract " "')))), function($skip, $loc, $0, $1) {
+  var Abstract$0 = (0, import_lib3.$TV)((0, import_lib3.$TEXT)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L126, 'Abstract "abstract"'), NonIdContinue, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'Abstract " "')))), function($skip, $loc, $0, $1) {
     return { $loc, token: $1, ts: true };
   });
   function Abstract(ctx, state2) {
@@ -13926,7 +13999,7 @@ ${js}`
   function CoffeeSubstitutionStart(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "CoffeeSubstitutionStart", CoffeeSubstitutionStart$0);
   }
-  var Colon$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L15, 'Colon ":"'), (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R71, "Colon /[=:]/"))), function($skip, $loc, $0, $1, $2) {
+  var Colon$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L16, 'Colon ":"'), (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R71, "Colon /[=:]/"))), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Colon(ctx, state2) {
@@ -13938,7 +14011,7 @@ ${js}`
   function Comma(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "Comma", Comma$0);
   }
-  var Comptime$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L138, 'Comptime "comptime"'), NonIdContinue, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($L15, 'Comptime ":"'))), function($skip, $loc, $0, $1, $2, $3) {
+  var Comptime$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L138, 'Comptime "comptime"'), NonIdContinue, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($L16, 'Comptime ":"'))), function($skip, $loc, $0, $1, $2, $3) {
     return { $loc, token: $1 };
   });
   function Comptime(ctx, state2) {
@@ -14092,13 +14165,13 @@ ${js}`
   function Hash(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "Hash", Hash$0);
   }
-  var If$0 = (0, import_lib3.$TV)((0, import_lib3.$TEXT)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L161, 'If "if"'), NonIdContinue, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L16, 'If " "')))), function($skip, $loc, $0, $1) {
+  var If$0 = (0, import_lib3.$TV)((0, import_lib3.$TEXT)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L161, 'If "if"'), NonIdContinue, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'If " "')))), function($skip, $loc, $0, $1) {
     return { $loc, token: $1 };
   });
   function If(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "If", If$0);
   }
-  var Import$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L20, 'Import "import"'), (0, import_lib3.$Y)((0, import_lib3.$EXPECT)($R73, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
+  var Import$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L15, 'Import "import"'), (0, import_lib3.$Y)((0, import_lib3.$EXPECT)($R73, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Import(ctx, state2) {
@@ -14158,7 +14231,7 @@ ${js}`
   function New(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "New", New$0);
   }
-  var Not$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L170, 'Not "not"'), NonIdContinue, (0, import_lib3.$N)((0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$EXPECT)($L15, 'Not ":"')))), function($skip, $loc, $0, $1, $2, $3) {
+  var Not$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L170, 'Not "not"'), NonIdContinue, (0, import_lib3.$N)((0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$EXPECT)($L16, 'Not ":"')))), function($skip, $loc, $0, $1, $2, $3) {
     return { $loc, token: "!" };
   });
   function Not(ctx, state2) {
@@ -14170,7 +14243,7 @@ ${js}`
   function Of(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "Of", Of$0);
   }
-  var OpenAngleBracket$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L17, 'OpenAngleBracket "<"'), function($skip, $loc, $0, $1) {
+  var OpenAngleBracket$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L18, 'OpenAngleBracket "<"'), function($skip, $loc, $0, $1) {
     return { $loc, token: $1 };
   });
   function OpenAngleBracket(ctx, state2) {
@@ -14500,7 +14573,7 @@ ${js}`
   function JSXElement(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "JSXElement", JSXElement$$);
   }
-  var JSXSelfClosingElement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L17, 'JSXSelfClosingElement "<"'), JSXElementName, (0, import_lib3.$E)(TypeArguments), (0, import_lib3.$E)(JSXAttributes), (0, import_lib3.$E)(Whitespace), (0, import_lib3.$EXPECT)($L212, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+  var JSXSelfClosingElement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L18, 'JSXSelfClosingElement "<"'), JSXElementName, (0, import_lib3.$E)(TypeArguments), (0, import_lib3.$E)(JSXAttributes), (0, import_lib3.$E)(Whitespace), (0, import_lib3.$EXPECT)($L212, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
     return { type: "JSXElement", children: $0, tag: $2 };
   });
   function JSXSelfClosingElement(ctx, state2) {
@@ -14519,7 +14592,7 @@ ${js}`
   function PopJSXStack(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "PopJSXStack", PopJSXStack$0);
   }
-  var JSXOpeningElement$0 = (0, import_lib3.$S)((0, import_lib3.$EXPECT)($L17, 'JSXOpeningElement "<"'), JSXElementName, (0, import_lib3.$E)(TypeArguments), (0, import_lib3.$E)(JSXAttributes), (0, import_lib3.$E)(Whitespace), (0, import_lib3.$EXPECT)($L44, 'JSXOpeningElement ">"'));
+  var JSXOpeningElement$0 = (0, import_lib3.$S)((0, import_lib3.$EXPECT)($L18, 'JSXOpeningElement "<"'), JSXElementName, (0, import_lib3.$E)(TypeArguments), (0, import_lib3.$E)(JSXAttributes), (0, import_lib3.$E)(Whitespace), (0, import_lib3.$EXPECT)($L44, 'JSXOpeningElement ">"'));
   function JSXOpeningElement(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "JSXOpeningElement", JSXOpeningElement$0);
   }
@@ -14886,7 +14959,7 @@ ${js}`
       ]
     });
   });
-  var InlineJSXCallExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L20, 'InlineJSXCallExpression "import"'), ExplicitArguments, (0, import_lib3.$Q)(InlineJSXCallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+  var InlineJSXCallExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L15, 'InlineJSXCallExpression "import"'), ExplicitArguments, (0, import_lib3.$Q)(InlineJSXCallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
     var args = $2;
     var rest = $3;
     return processCallMemberExpression({
@@ -15729,8 +15802,8 @@ ${js}`
   function TypePrimary(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "TypePrimary", TypePrimary$$);
   }
-  var ImportType$0 = (0, import_lib3.$S)((0, import_lib3.$EXPECT)($L20, 'ImportType "import"'), OpenParen, __, StringLiteral, __, CloseParen, (0, import_lib3.$E)((0, import_lib3.$S)(Dot, IdentifierName)), (0, import_lib3.$E)(TypeArguments));
-  var ImportType$1 = (0, import_lib3.$S)((0, import_lib3.$EXPECT)($L20, 'ImportType "import"'), InsertOpenParen, (0, import_lib3.$E)(Trimmed_), StringLiteral, InsertCloseParen);
+  var ImportType$0 = (0, import_lib3.$S)((0, import_lib3.$EXPECT)($L15, 'ImportType "import"'), OpenParen, __, StringLiteral, __, CloseParen, (0, import_lib3.$E)((0, import_lib3.$S)(Dot, IdentifierName)), (0, import_lib3.$E)(TypeArguments));
+  var ImportType$1 = (0, import_lib3.$S)((0, import_lib3.$EXPECT)($L15, 'ImportType "import"'), InsertOpenParen, (0, import_lib3.$E)(Trimmed_), StringLiteral, InsertCloseParen);
   var ImportType$$ = [ImportType$0, ImportType$1];
   function ImportType(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "ImportType", ImportType$$);
@@ -15902,7 +15975,7 @@ ${js}`
   var InlineInterfacePropertyDelimiter$1 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$Y)((0, import_lib3.$S)((0, import_lib3.$C)(IndentedFurther, (0, import_lib3.$E)(_)), InlineBasicInterfaceProperty)), InsertComma), function(value) {
     return value[1];
   });
-  var InlineInterfacePropertyDelimiter$2 = (0, import_lib3.$Y)((0, import_lib3.$S)(__, (0, import_lib3.$C)((0, import_lib3.$EXPECT)($L15, 'InlineInterfacePropertyDelimiter ":"'), (0, import_lib3.$EXPECT)($L125, 'InlineInterfacePropertyDelimiter ")"'), (0, import_lib3.$EXPECT)($L45, 'InlineInterfacePropertyDelimiter "]"'), (0, import_lib3.$EXPECT)($L36, 'InlineInterfacePropertyDelimiter "}"'))));
+  var InlineInterfacePropertyDelimiter$2 = (0, import_lib3.$Y)((0, import_lib3.$S)(__, (0, import_lib3.$C)((0, import_lib3.$EXPECT)($L16, 'InlineInterfacePropertyDelimiter ":"'), (0, import_lib3.$EXPECT)($L125, 'InlineInterfacePropertyDelimiter ")"'), (0, import_lib3.$EXPECT)($L45, 'InlineInterfacePropertyDelimiter "]"'), (0, import_lib3.$EXPECT)($L36, 'InlineInterfacePropertyDelimiter "}"'))));
   var InlineInterfacePropertyDelimiter$3 = (0, import_lib3.$Y)(EOS);
   var InlineInterfacePropertyDelimiter$$ = [InlineInterfacePropertyDelimiter$0, InlineInterfacePropertyDelimiter$1, InlineInterfacePropertyDelimiter$2, InlineInterfacePropertyDelimiter$3];
   function InlineInterfacePropertyDelimiter(ctx, state2) {
@@ -16620,8 +16693,9 @@ ${js}`
     const lines = [];
     let line = 0;
     let pos = 0;
-    let result;
-    while (result = linesRe.exec(input)) {
+    let ref;
+    while (ref = linesRe.exec(input)) {
+      const result = ref;
       pos += result[0].length;
       lines[line++] = pos;
       if (pos === input.length) {
@@ -16643,7 +16717,8 @@ ${js}`
     const sm = {
       lines: [[]],
       line: 0,
-      column: 0,
+      colOffset: 0,
+      // relative to previous entry
       srcLine: 0,
       srcColumn: 0,
       srcOffset: 0,
@@ -16652,11 +16727,14 @@ ${js}`
     const EOL2 = /\r?\n|\r/;
     return {
       data: sm,
+      source: function() {
+        return sourceString;
+      },
       renderMappings: function() {
         let lastSourceLine = 0;
         let lastSourceColumn = 0;
-        return sm.lines.map(function(line) {
-          return line.map(function(entry) {
+        return sm.lines.map((line) => {
+          return line.map((entry) => {
             if (entry.length === 4) {
               let [colDelta, sourceFileIndex, srcLine, srcCol] = entry;
               const lineDelta = srcLine - lastSourceLine;
@@ -16693,25 +16771,25 @@ ${js}`
           sm.srcColumn = srcCol;
           sm.srcOffset = inputPos + outputStr.length;
         }
-        outLines.forEach(function(line, i) {
+        for (let i1 = 0, len3 = outLines.length; i1 < len3; i1++) {
+          const i = i1;
+          const line = outLines[i1];
           if (i > 0) {
             sm.line++;
             sm.srcLine++;
-            sm.column = 0;
+            sm.colOffset = 0;
             sm.lines[sm.line] = [];
             sm.srcColumn = srcCol = colOffset;
           }
-          const l = sm.column;
-          sm.column += line.length;
+          const l = sm.colOffset;
+          sm.colOffset = line.length;
           sm.srcColumn += line.length;
           if (inputPos != null) {
-            return sm.lines[sm.line].push([l, 0, srcLine + i, srcCol]);
+            sm.lines[sm.line].push([l, 0, srcLine + i, srcCol]);
           } else if (l != 0) {
-            return sm.lines[sm.line].push([l]);
+            sm.lines[sm.line].push([l]);
           }
-          ;
-          return;
-        });
+        }
         return;
       }
     };
@@ -16735,8 +16813,8 @@ ${js}`
     return remappedCodeWithSourceMap;
   };
   var composeLines = function(upstreamMapping, lines) {
-    return lines.map(function(line) {
-      return line.map(function(entry) {
+    return lines.map((line) => {
+      return line.map((entry) => {
         if (entry.length === 1) {
           return entry;
         }
@@ -16757,11 +16835,11 @@ ${js}`
     const json = JSON.parse(Buffer.from(base64encodedJSONstr, "base64").toString("utf8"));
     let sourceLine = 0;
     let sourceColumn = 0;
-    const lines = json.mappings.split(";").map(function(line) {
+    const lines = json.mappings.split(";").map((line) => {
       if (line.length === 0) {
         return [];
       }
-      return line.split(",").map(function(entry) {
+      return line.split(",").map((entry) => {
         const result = decodeVLQ(entry);
         switch (result.length) {
           case 1: {
@@ -16788,12 +16866,12 @@ ${js}`
   var VLQ_VALUE_MASK = VLQ_CONTINUATION_BIT - 1;
   var encodeVlq = function(value) {
     let answer = "";
-    let ref;
+    let ref1;
     if (value < 0)
-      ref = 1;
+      ref1 = 1;
     else
-      ref = 0;
-    const signBit = ref;
+      ref1 = 0;
+    const signBit = ref1;
     let valueToEncode = (Math.abs(value) << 1) + signBit;
     while (valueToEncode || !answer) {
       let nextChunk = valueToEncode & VLQ_VALUE_MASK;
@@ -16816,7 +16894,7 @@ ${js}`
   };
   var vlqTable = new Uint8Array(128);
   var vlqChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-  (function() {
+  {
     let i = 0;
     let l = vlqTable.length;
     while (i < l) {
@@ -16825,14 +16903,11 @@ ${js}`
     }
     i = 0;
     l = vlqChars.length;
-    const results = [];
     while (i < l) {
       vlqTable[vlqChars.charCodeAt(i)] = i;
-      results.push(i++);
+      i++;
     }
-    ;
-    return results;
-  })();
+  }
   var decodeError = function(message) {
     throw new Error(message);
   };