@danielx/civet 0.8.16 → 0.9.0

package/dist/main.js

@@ -62,7 +62,7 @@ var require_machine = __commonJS({
       $N: () => $N2,
       $P: () => $P2,
       $Q: () => $Q2,
-      $R: () => $R102,
+      $R: () => $R103,
       $R$0: () => $R$02,
       $S: () => $S2,
       $T: () => $T2,
@@ -99,7 +99,7 @@ var require_machine = __commonJS({
         return;
       };
     }
-    function $R102(regExp) {
+    function $R103(regExp) {
       return function(_ctx, state2) {
         const { input, pos } = state2;
         regExp.lastIndex = state2.pos;
@@ -1195,7 +1195,6 @@ var skipParens = /* @__PURE__ */ new Set([
   "JSXElement",
   "JSXFragment",
   "Literal",
-  "NewExpression",
   "ParenthesizedExpression",
   "Ref",
   "Placeholder",
@@ -1217,7 +1216,10 @@ function makeLeftHandSideExpression(expression) {
     if (skipParens.has(expression.type)) {
       return expression;
     }
-    if (expression.type === "MemberExpression" && !startsWithPredicate(expression, ($6) => $6.type === "ObjectExpression")) {
+    if (expression.type === "NewExpression" && expression.expression.children.some(($6) => $6?.type === "Call")) {
+      return expression;
+    }
+    if (expression.type === "MemberExpression" && !startsWithPredicate(expression, ($7) => $7.type === "ObjectExpression")) {
       return expression;
     }
   }
@@ -1753,13 +1755,14 @@ function gatherBindingCode(statements, opts) {
         return;
       }
       if (opts?.injectParamProps && n.type === "Parameter" && n.accessModifier) {
-        n.names.forEach((id) => ({
-          push: thisAssignments2.push({
+        for (let ref1 = n.names, i2 = 0, len1 = ref1.length; i2 < len1; i2++) {
+          const id = ref1[i2];
+          thisAssignments2.push({
             type: "AssignmentExpression",
             children: [`this.${id} = `, id],
             js: true
-          })
-        }));
+          });
+        }
         return;
       }
       const { blockPrefix } = n;
@@ -1771,8 +1774,8 @@ function gatherBindingCode(statements, opts) {
   return [splices, thisAssignments];
 }
 function arrayElementHasTrailingComma(elementNode) {
-  let ref1;
-  const lastChild = (ref1 = elementNode.children)[ref1.length - 1];
+  let ref2;
+  const lastChild = (ref2 = elementNode.children)[ref2.length - 1];
   return lastChild && lastChild[lastChild.length - 1]?.token === ",";
 }
 function gatherBindingPatternTypeSuffix(pattern) {
@@ -1784,8 +1787,8 @@ function gatherBindingPatternTypeSuffix(pattern) {
     case "ArrayBindingPattern": {
       {
         const results = [];
-        for (let ref2 = pattern.elements, i2 = 0, len1 = ref2.length; i2 < len1; i2++) {
-          const elem = ref2[i2];
+        for (let ref3 = pattern.elements, i3 = 0, len22 = ref3.length; i3 < len22; i3++) {
+          const elem = ref3[i3];
           let { typeSuffix } = elem;
           typeSuffix ??= elem.binding?.typeSuffix;
           if (typeSuffix) {
@@ -1823,8 +1826,8 @@ function gatherBindingPatternTypeSuffix(pattern) {
       {
         let restType;
         const results1 = [];
-        for (let ref3 = pattern.properties, i3 = 0, len22 = ref3.length; i3 < len22; i3++) {
-          const prop = ref3[i3];
+        for (let ref4 = pattern.properties, i4 = 0, len3 = ref4.length; i4 < len3; i4++) {
+          const prop = ref4[i4];
           let { typeSuffix } = prop;
           typeSuffix ??= prop.value?.typeSuffix;
           if (typeSuffix) {
@@ -1976,8 +1979,14 @@ var declareHelper = {
       // [indent, statement]
       preludeVar,
       moduloRef,
-      ts(": (a: number, b: number) => number"),
-      " = (a, b) => (a % b + b) % b"
+      " = ",
+      ts("("),
+      "(a",
+      ts(": number"),
+      ", b",
+      ts(": number"),
+      ") => (a % b + b) % b",
+      ts(") as ((a: number, b: number) => number) & ((a: bigint, b: bigint) => bigint)")
     ], ";\n"]);
   },
   Falsy(FalsyRef) {
@@ -2542,7 +2551,7 @@ function getTypeArguments(args) {
   if (!Array.isArray(args)) {
     throw new Error("getTypeArguments could not find relevant array");
   }
-  return args.filter((a) => typeof a === "object" && a != null && "type" in a && a.type === "TypeArgument");
+  return args.filter((a1) => typeof a1 === "object" && a1 != null && "type" in a1 && a1.type === "TypeArgument");
 }
 function isVoidType(t) {
   return typeof t === "object" && t != null && "type" in t && t.type === "TypeLiteral" && "t" in t && typeof t.t === "object" && t.t != null && "type" in t.t && t.t.type === "VoidType";
@@ -3408,7 +3417,7 @@ function processParams(f) {
   if (isConstructor) {
     const { ancestor } = findAncestor(f, ($6) => $6.type === "ClassExpression");
     if (ancestor != null) {
-      const fields = new Set(gatherRecursiveWithinFunction(ancestor, ($7) => $7.type === "FieldDefinition").map(($8) => $8.id).filter((a1) => typeof a1 === "object" && a1 != null && "type" in a1 && a1.type === "Identifier").map(($9) => $9.name));
+      const fields = new Set(gatherRecursiveWithinFunction(ancestor, ($7) => $7.type === "FieldDefinition").map(($8) => $8.id).filter((a2) => typeof a2 === "object" && a2 != null && "type" in a2 && a2.type === "Identifier").map(($9) => $9.name));
       const classExpressions = ancestor.body.expressions;
       let index = findChildIndex(classExpressions, f);
       assert.notEqual(index, -1, "Could not find constructor in class");
@@ -3419,15 +3428,20 @@ function processParams(f) {
       const fStatement = classExpressions[index];
       for (let ref16 = gatherRecursive(parameters, ($10) => $10.type === "Parameter"), i8 = 0, len7 = ref16.length; i8 < len7; i8++) {
         const parameter = ref16[i8];
-        if (!parameter.typeSuffix) {
+        const { accessModifier } = parameter;
+        if (!(accessModifier || parameter.typeSuffix)) {
           continue;
         }
         for (let ref17 = gatherRecursive(parameter, ($11) => $11.type === "AtBinding"), i9 = 0, len8 = ref17.length; i9 < len8; i9++) {
           const binding = ref17[i9];
           const typeSuffix = binding.parent?.typeSuffix;
-          if (!typeSuffix) {
+          if (!(accessModifier || typeSuffix)) {
             continue;
           }
+          if (parameter.accessModifier) {
+            replaceNode(parameter.accessModifier, void 0);
+            parameter.accessModifier = void 0;
+          }
           const id = binding.ref.id;
           if (fields.has(id)) {
             continue;
@@ -3436,7 +3450,7 @@ function processParams(f) {
             type: "FieldDefinition",
             id,
             typeSuffix,
-            children: [id, typeSuffix]
+            children: [accessModifier, id, typeSuffix]
           }, ";"]);
           fStatement[0] = "";
         }
@@ -3460,10 +3474,10 @@ function processParams(f) {
   if (isConstructor) {
     const superCalls = gatherNodes(
       expressions,
-      (a2) => typeof a2 === "object" && a2 != null && "type" in a2 && a2.type === "CallExpression" && "children" in a2 && Array.isArray(a2.children) && a2.children.length >= 1 && typeof a2.children[0] === "object" && a2.children[0] != null && "token" in a2.children[0] && a2.children[0].token === "super"
+      (a3) => typeof a3 === "object" && a3 != null && "type" in a3 && a3.type === "CallExpression" && "children" in a3 && Array.isArray(a3.children) && a3.children.length >= 1 && typeof a3.children[0] === "object" && a3.children[0] != null && "token" in a3.children[0] && a3.children[0].token === "super"
     );
     if (superCalls.length) {
-      const { child } = findAncestor(superCalls[0], (a3) => a3 === block);
+      const { child } = findAncestor(superCalls[0], (a4) => a4 === block);
       const index = findChildIndex(expressions, child);
       if (index < 0) {
         throw new Error("Could not find super call within top-level expressions");
@@ -3478,21 +3492,33 @@ function processParams(f) {
 function processSignature(f) {
   const { block, signature } = f;
   if (!f.async?.length && hasAwait(block)) {
-    f.async.push("async ");
-    signature.modifier.async = true;
-  }
-  if (!f.generator?.length && hasYield(block)) {
-    if (f.type === "ArrowFunction") {
-      gatherRecursiveWithinFunction(block, ($12) => $12.type === "YieldExpression").forEach((y) => {
-        const i = y.children.findIndex(($13) => $13.type === "Yield");
-        return y.children.splice(i + 1, 0, {
+    if (f.async != null) {
+      f.async.push("async ");
+      signature.modifier.async = true;
+    } else {
+      for (let ref18 = gatherRecursiveWithinFunction(block, ($12) => $12.type === "Await"), i10 = 0, len9 = ref18.length; i10 < len9; i10++) {
+        const a = ref18[i10];
+        const i = findChildIndex(a.parent, a);
+        a.parent.children.splice(i + 1, 0, {
           type: "Error",
-          message: "Can't use yield inside of => arrow function"
+          message: `await invalid in ${signature.modifier.get ? "getter" : signature.modifier.set ? "setter" : signature.name}`
         });
-      });
-    } else {
+      }
+    }
+  }
+  if (!f.generator?.length && hasYield(block)) {
+    if (f.generator != null) {
       f.generator.push("*");
       signature.modifier.generator = true;
+    } else {
+      for (let ref19 = gatherRecursiveWithinFunction(block, ($13) => $13.type === "YieldExpression"), i11 = 0, len10 = ref19.length; i11 < len10; i11++) {
+        const y = ref19[i11];
+        const i = y.children.findIndex(($14) => $14.type === "Yield");
+        y.children.splice(i + 1, 0, {
+          type: "Error",
+          message: `yield invalid in ${f.type === "ArrowFunction" ? "=> arrow function" : signature.modifier.get ? "getter" : signature.modifier.set ? "setter" : signature.name}`
+        });
+      }
     }
   }
   if (signature.modifier.async && !signature.modifier.generator && signature.returnType && !isPromiseType(signature.returnType.t)) {
@@ -3500,21 +3526,15 @@ function processSignature(f) {
   }
 }
 function processFunctions(statements, config2) {
-  for (let ref18 = gatherRecursiveAll(statements, ($14) => $14.type === "FunctionExpression" || $14.type === "ArrowFunction"), i10 = 0, len9 = ref18.length; i10 < len9; i10++) {
-    const f = ref18[i10];
-    if (f.type === "FunctionExpression") {
+  for (let ref20 = gatherRecursiveAll(statements, ($15) => $15.type === "FunctionExpression" || $15.type === "ArrowFunction" || $15.type === "MethodDefinition"), i12 = 0, len11 = ref20.length; i12 < len11; i12++) {
+    const f = ref20[i12];
+    if (f.type === "FunctionExpression" || f.type === "MethodDefinition") {
       implicitFunctionBlock(f);
     }
     processSignature(f);
     processParams(f);
     processReturn(f, config2.implicitReturns);
   }
-  for (let ref19 = gatherRecursiveAll(statements, ($15) => $15.type === "MethodDefinition"), i11 = 0, len10 = ref19.length; i11 < len10; i11++) {
-    const f = ref19[i11];
-    implicitFunctionBlock(f);
-    processParams(f);
-    processReturn(f, config2.implicitReturns);
-  }
 }
 function expressionizeIteration(exp) {
   let { async, generator, block, children, statement } = exp;
@@ -3563,9 +3583,9 @@ function expressionizeIteration(exp) {
   }
   let done;
   if (!async) {
-    let ref20;
-    if ((ref20 = blockContainingStatement(exp)) && typeof ref20 === "object" && "block" in ref20 && "index" in ref20) {
-      const { block: parentBlock, index } = ref20;
+    let ref21;
+    if ((ref21 = blockContainingStatement(exp)) && typeof ref21 === "object" && "block" in ref21 && "index" in ref21) {
+      const { block: parentBlock, index } = ref21;
       statements[0][0] = parentBlock.expressions[index][0];
       parentBlock.expressions.splice(index, index + 1 - index, ...statements);
       updateParentPointers(parentBlock);
@@ -3582,8 +3602,8 @@ function expressionizeIteration(exp) {
   }
 }
 function processIterationExpressions(statements) {
-  for (let ref21 = gatherRecursiveAll(statements, ($16) => $16.type === "IterationExpression"), i12 = 0, len11 = ref21.length; i12 < len11; i12++) {
-    const s = ref21[i12];
+  for (let ref22 = gatherRecursiveAll(statements, ($16) => $16.type === "IterationExpression"), i13 = 0, len12 = ref22.length; i13 < len12; i13++) {
+    const s = ref22[i13];
     expressionizeIteration(s);
   }
 }
@@ -3609,21 +3629,21 @@ function processCoffeeDo(ws, expression) {
       ...parameters,
       children: (() => {
         const results1 = [];
-        for (let ref22 = parameters.children, i13 = 0, len12 = ref22.length; i13 < len12; i13++) {
-          let parameter = ref22[i13];
+        for (let ref23 = parameters.children, i14 = 0, len13 = ref23.length; i14 < len13; i14++) {
+          let parameter = ref23[i14];
           if (typeof parameter === "object" && parameter != null && "type" in parameter && parameter.type === "Parameter") {
-            let ref23;
-            if (ref23 = parameter.initializer) {
-              const initializer = ref23;
+            let ref24;
+            if (ref24 = parameter.initializer) {
+              const initializer = ref24;
               args.push(initializer.expression, parameter.delim);
               parameter = {
                 ...parameter,
                 initializer: void 0,
-                children: parameter.children.filter((a4) => a4 !== initializer)
+                children: parameter.children.filter((a5) => a5 !== initializer)
               };
             } else {
               args.push(parameter.children.filter(
-                (a5) => a5 !== parameter.typeSuffix
+                (a6) => a6 !== parameter.typeSuffix
               ));
             }
           }
@@ -3696,7 +3716,7 @@ function makeAmpersandFunction(rhs) {
   }
   if (gatherRecursiveWithinFunction(
     block,
-    (a6) => a6 === ref
+    (a7) => a7 === ref
   ).length > 1) {
     fn.ampersandBlock = false;
   }
@@ -5373,7 +5393,6 @@ function processUnaryNestedExpression(pre, args, post) {
 
 // source/parser/pipe.civet
 function constructInvocation(fn, arg) {
-  const fnArr = [fn.leadingComment, fn.expr, fn.trailingComment];
   let expr = fn.expr;
   while (expr.type === "ParenthesizedExpression") {
     expr = expr.expression;
@@ -5390,22 +5409,46 @@ function constructInvocation(fn, arg) {
     });
   }
   expr = fn.expr;
-  const lhs = makeLeftHandSideExpression(expr);
+  let lhs = expr;
+  if (!(lhs.type === "NewExpression")) {
+    lhs = makeLeftHandSideExpression(lhs);
+  }
   let comment = skipIfOnlyWS(fn.trailingComment);
   if (comment)
-    lhs.children.splice(2, 0, comment);
+    lhs.children.push(comment);
   comment = skipIfOnlyWS(fn.leadingComment);
   if (comment)
     lhs.children.splice(1, 0, comment);
   switch (arg.type) {
-    case "CommaExpression":
+    case "CommaExpression": {
       arg = makeLeftHandSideExpression(arg);
       break;
+    }
   }
-  return {
-    type: "CallExpression",
-    children: [lhs, "(", arg, ")"]
+  const args = [arg];
+  const call = {
+    type: "Call",
+    args,
+    children: ["(", args, ")"]
   };
+  if (lhs.type === "NewExpression") {
+    let { expression } = lhs;
+    expression = {
+      ...expression,
+      type: "CallExpression",
+      children: [...expression.children, call]
+    };
+    return {
+      ...lhs,
+      expression,
+      children: lhs.children.map(($) => $ === lhs.expression ? expression : $)
+    };
+  } else {
+    return {
+      type: "CallExpression",
+      children: [lhs, call]
+    };
+  }
 }
 function constructPipeStep(fn, arg, returning) {
   if (!returning) {
@@ -5452,21 +5495,24 @@ function processPipelineExpressions(statements) {
     let i = 0, l = body.length;
     const children = [ws];
     let usingRef = null;
-    for (i = 0; i < l; i++) {
-      const step = body[i];
+    for (let i1 = 0, len3 = body.length; i1 < len3; i1++) {
+      const i2 = i1;
+      const step = body[i1];
       const [leadingComment, pipe, trailingComment, expr] = step;
       const returns = pipe.token === "||>";
       let ref, result, returning = returns ? arg : null;
       if (pipe.token === "|>=") {
         let initRef;
-        if (i === 0) {
+        if (i2 === 0) {
           checkValidLHS(arg);
           outer:
             switch (arg.type) {
-              case "MemberExpression":
-                if (arg.children.length <= 2)
+              case "MemberExpression": {
+                if (arg.children.length <= 2) {
                   break;
-              case "CallExpression":
+                }
+              }
+              case "CallExpression": {
                 const access = arg.children.pop();
                 usingRef = makeRef();
                 initRef = {
@@ -5478,6 +5524,7 @@ function processPipelineExpressions(statements) {
                   children: [usingRef, access]
                 };
                 break;
+              }
             }
           const lhs = [[
             [initRef],
@@ -5506,7 +5553,7 @@ function processPipelineExpressions(statements) {
           });
         }
       } else {
-        if (i === 0)
+        if (i2 === 0)
           s.children = children;
       }
       if (returns && (ref = needsRef(arg))) {
@@ -5531,7 +5578,7 @@ function processPipelineExpressions(statements) {
         returning
       );
       if (result.type === "ReturnStatement") {
-        if (i < l - 1) {
+        if (i2 < l - 1) {
           result.children.push({
             type: "Error",
             message: "Can't continue a pipeline after returning"
@@ -5559,7 +5606,7 @@ function processPipelineExpressions(statements) {
       };
     }
     children.push(arg);
-    if (!children.some(($) => $?.type === "ReturnStatement") && children.some(($1) => $1 === ",")) {
+    if (!children.some(($1) => $1?.type === "ReturnStatement") && children.some(($2) => $2 === ",")) {
       const { parent } = s;
       const parenthesizedExpression = makeLeftHandSideExpression({ ...s });
       Object.assign(s, parenthesizedExpression, {
@@ -5699,7 +5746,7 @@ function processRangeExpression(start, ws1, range, end) {
   };
 }
 function forRange(open, forDeclaration, range, stepExp, close) {
-  const { start, end, left, right, increasing } = range;
+  let { start, end, left, right, increasing } = range;
   const counterRef = makeRef("i");
   const infinite = typeof end === "object" && end != null && "type" in end && end.type === "Identifier" && "name" in end && end.name === "Infinity";
   let stepRef, asc;
@@ -5741,28 +5788,35 @@ function forRange(open, forDeclaration, range, stepExp, close) {
   let endRef = maybeRef(end, "end");
   const startRefDec = startRef !== start ? [startRef, " = ", start, ", "] : [];
   const endRefDec = endRef !== end ? [endRef, " = ", end, ", "] : [];
-  if (!left.inclusive) {
-    startRef = [
-      makeLeftHandSideExpression(start),
-      " + ",
-      stepRef
-    ];
-  }
   let ascDec = [], ascRef;
   if (stepExp) {
     if (!(stepRef === stepExp)) {
       ascDec = [", ", stepRef, " = ", stepExp];
     }
-  } else if (start?.type === "Literal" && "Literal" === end?.type) {
+  }
+  if (start?.type === "Literal" && "Literal" === end?.type) {
     asc = literalValue(start) <= literalValue(end);
     if ("StringLiteral" === start.subtype && start.subtype === end.subtype) {
-      startRef = literalValue(start).charCodeAt(0).toString();
+      const startChar = literalValue(start).charCodeAt(0).toString();
+      startRef = {
+        type: "Literal",
+        subtype: "NumericLiteral",
+        raw: startChar,
+        children: [startChar]
+      };
       endRef = literalValue(end).charCodeAt(0).toString();
     }
-  } else {
+  } else if (!stepExp) {
     ascRef = makeRef("asc");
     ascDec = [", ", ascRef, " = ", startRef, " <= ", endRef];
   }
+  if (!left.inclusive) {
+    startRef = [
+      makeLeftHandSideExpression(startRef),
+      " + ",
+      stepRef
+    ];
+  }
   let varAssign = [], varLetAssign = varAssign, varLet = varAssign, blockPrefix;
   let names = forDeclaration?.names ?? [];
   if (forDeclaration != null) {
@@ -5774,7 +5828,7 @@ function forRange(open, forDeclaration, range, stepExp, close) {
       varAssign = [...trimFirstSpace(varName), " = "];
       varLet = [",", ...varName, " = ", counterRef];
     } else {
-      const value = "StringLiteral" === start.subtype ? ["String.fromCharCode(", counterRef, ")"] : counterRef;
+      const value = "StringLiteral" === start?.subtype ? ["String.fromCharCode(", counterRef, ")"] : counterRef;
       blockPrefix = [
         ["", [forDeclaration, " = ", value], ";"]
       ];
@@ -5845,7 +5899,8 @@ function processForInOf($0) {
       blockPrefix.push(["", {
         type: "Declaration",
         children: [declaration, " = ", trimFirstSpace(expRef2), "[", counterRef, "]"],
-        names: assignmentNames
+        names: assignmentNames,
+        implicitLift: true
       }, ";"]);
       declaration = {
         type: "Declaration",
@@ -6933,19 +6988,19 @@ function lastAccessInCallExpression(exp) {
 }
 function convertMethodToFunction(method) {
   const { signature, block } = method;
-  let { modifier, optional } = signature;
-  if (optional)
+  const { async, modifier, optional } = signature;
+  if (optional) {
     return;
-  if (modifier) {
-    if (modifier.get || modifier.set) {
-      return;
-    } else if (modifier.async) {
-      modifier = [modifier.children[0][0], " function ", ...modifier.children.slice(1)];
-    } else {
-      modifier = ["function ", ...modifier.children || []];
+  }
+  if (modifier?.get || modifier?.set) {
+    return;
+  }
+  const func = ["function "];
+  if (async != null) {
+    func.unshift(async);
+    if (async.length && !async[async.length - 1]?.length) {
+      async.push(" ");
     }
-  } else {
-    modifier = "function ";
   }
   return {
     ...signature,
@@ -6953,7 +7008,7 @@ function convertMethodToFunction(method) {
     signature,
     type: "FunctionExpression",
     children: [
-      [modifier, ...signature.children.slice(1)],
+      [...func, ...signature.children.slice(1)],
       block
     ],
     block
@@ -7067,7 +7122,8 @@ function makeGetterMethod(name, ws, value, returnType, block, kind = { token: "g
     block = {
       type: "BlockStatement",
       expressions,
-      children: ["{ ", expressions, " }"]
+      children: ["{ ", expressions, " }"],
+      bare: false
     };
   }
   if (autoReturn) {
@@ -7780,7 +7836,13 @@ function processPlaceholders(statements) {
       }
     } else {
       let child;
+      let implicitLift;
       ({ ancestor, child } = findAncestor(exp, (ancestor2, child2) => {
+        const prevImplicitLift = implicitLift;
+        ({ implicitLift } = ancestor2);
+        if (prevImplicitLift) {
+          return;
+        }
         const { type } = ancestor2;
         if (type === "IfStatement") {
           liftedIfs.add(ancestor2);
@@ -7866,7 +7928,7 @@ function processPlaceholders(statements) {
       const placeholder = placeholders[i15];
       typeSuffix ??= placeholder.typeSuffix;
       let ref26;
-      replaceNode((ref26 = placeholder.children)[ref26.length - 1], ref);
+      (ref26 = placeholder.children)[ref26.length - 1] = ref;
     }
     const { parent } = ancestor;
     const body = maybeUnwrap(ancestor);
@@ -8156,6 +8218,7 @@ var grammar = {
   LeftHandSideExpression,
   CallExpression,
   CallExpressionRest,
+  ExplicitCallExpressionRest,
   OptionalShorthand,
   OptionalDot,
   NonNullAssertion,
@@ -8439,8 +8502,8 @@ var grammar = {
   Debugger,
   MaybeNestedNonPipelineExpression,
   MaybeNestedPostfixedExpression,
+  NestedPostfixedExpressionNoTrailing,
   MaybeNestedExpression,
-  NestedExpression,
   MaybeParenNestedExpression,
   ImportDeclaration,
   ImpliedImport,
@@ -8492,6 +8555,8 @@ var grammar = {
   StringLiteral,
   DoubleStringCharacters,
   SingleStringCharacters,
+  TripleDoubleStringContents,
+  CoffeeTripleDoubleStringCharacters,
   TripleDoubleStringCharacters,
   TripleSingleStringCharacters,
   CoffeeStringSubstitution,
@@ -9162,60 +9227,61 @@ var $R44 = (0, import_lib2.$R)(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)", "suy")
 var $R45 = (0, import_lib2.$R)(new RegExp('(?:\\\\.|[^"])*', "suy"));
 var $R46 = (0, import_lib2.$R)(new RegExp("(?:\\\\.|[^'])*", "suy"));
 var $R47 = (0, import_lib2.$R)(new RegExp('(?:"(?!"")|#(?!\\{)|\\\\.|[^#"])+', "suy"));
-var $R48 = (0, import_lib2.$R)(new RegExp("(?:'(?!'')|\\\\.|[^'])*", "suy"));
-var $R49 = (0, import_lib2.$R)(new RegExp('(?:\\\\.|#(?!\\{)|[^"#])+', "suy"));
-var $R50 = (0, import_lib2.$R)(new RegExp("(?:\\\\.|[^\\]])*", "suy"));
-var $R51 = (0, import_lib2.$R)(new RegExp("(?:\\\\.)", "suy"));
-var $R52 = (0, import_lib2.$R)(new RegExp("[\\s]+", "suy"));
-var $R53 = (0, import_lib2.$R)(new RegExp("\\/(?!\\/\\/)", "suy"));
-var $R54 = (0, import_lib2.$R)(new RegExp("[^[\\/\\s#\\\\]+", "suy"));
-var $R55 = (0, import_lib2.$R)(new RegExp("[*\\/\\r\\n]", "suy"));
-var $R56 = (0, import_lib2.$R)(new RegExp("(?:\\\\.|[^[\\/\\r\\n])+", "suy"));
-var $R57 = (0, import_lib2.$R)(new RegExp("(?:\\p{ID_Continue}|[\\u200C\\u200D$])*", "suy"));
-var $R58 = (0, import_lib2.$R)(new RegExp("(?=[`'\"])", "suy"));
-var $R59 = (0, import_lib2.$R)(new RegExp("(?:\\$(?!\\{)|\\\\.|[^$`])+", "suy"));
-var $R60 = (0, import_lib2.$R)(new RegExp("(?:\\$(?!\\{)|`(?!``)|\\\\.|[^$`])+", "suy"));
-var $R61 = (0, import_lib2.$R)(new RegExp("(?:on|off|yes|no)(?!\\p{ID_Continue})", "suy"));
-var $R62 = (0, import_lib2.$R)(new RegExp("(?:isnt)(?!\\p{ID_Continue})", "suy"));
-var $R63 = (0, import_lib2.$R)(new RegExp("(?:by)(?!\\p{ID_Continue})", "suy"));
-var $R64 = (0, import_lib2.$R)(new RegExp("(?:of)(?!\\p{ID_Continue})", "suy"));
-var $R65 = (0, import_lib2.$R)(new RegExp("(?:and|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|let|loop|new|not|null|or|private|protected|public|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})", "suy"));
-var $R66 = (0, import_lib2.$R)(new RegExp("(?=\\/|#)", "suy"));
-var $R67 = (0, import_lib2.$R)(new RegExp("\\/\\/(?!\\/)[^\\r\\n]*", "suy"));
-var $R68 = (0, import_lib2.$R)(new RegExp(".", "suy"));
-var $R69 = (0, import_lib2.$R)(new RegExp("#(?!##(?!#))([^\\r\\n]*)", "suy"));
-var $R70 = (0, import_lib2.$R)(new RegExp("[^]*?###", "suy"));
-var $R71 = (0, import_lib2.$R)(new RegExp("###(?!#)", "suy"));
-var $R72 = (0, import_lib2.$R)(new RegExp("\\/\\*(?:(?!\\*\\/)[^\\r\\n])*\\*\\/", "suy"));
-var $R73 = (0, import_lib2.$R)(new RegExp("(?=[ \\t\\/\\\\])", "suy"));
-var $R74 = (0, import_lib2.$R)(new RegExp("(?=\\s|\\/|#)", "suy"));
-var $R75 = (0, import_lib2.$R)(new RegExp("(?!\\p{ID_Continue})", "suy"));
-var $R76 = (0, import_lib2.$R)(new RegExp("[=:]", "suy"));
-var $R77 = (0, import_lib2.$R)(new RegExp("['\u2019]s", "suy"));
-var $R78 = (0, import_lib2.$R)(new RegExp("\\s", "suy"));
-var $R79 = (0, import_lib2.$R)(new RegExp("(?=[<])", "suy"));
-var $R80 = (0, import_lib2.$R)(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
-var $R81 = (0, import_lib2.$R)(new RegExp("[!+-]", "suy"));
-var $R82 = (0, import_lib2.$R)(new RegExp("[\\s>]|\\/>", "suy"));
-var $R83 = (0, import_lib2.$R)(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
-var $R84 = (0, import_lib2.$R)(new RegExp(`"[^"]*"|'[^']*'`, "suy"));
-var $R85 = (0, import_lib2.$R)(new RegExp("[<>]", "suy"));
-var $R86 = (0, import_lib2.$R)(new RegExp("[!~+-](?!\\s|[!~+-]*&)", "suy"));
-var $R87 = (0, import_lib2.$R)(new RegExp("(?:-[^-]|[^-]*)*", "suy"));
-var $R88 = (0, import_lib2.$R)(new RegExp("[^{}<>\\r\\n]+", "suy"));
-var $R89 = (0, import_lib2.$R)(new RegExp("[+-]?", "suy"));
-var $R90 = (0, import_lib2.$R)(new RegExp("(?=if|unless)", "suy"));
-var $R91 = (0, import_lib2.$R)(new RegExp("[|&<!=\\-\u21D2\u2192]", "suy"));
-var $R92 = (0, import_lib2.$R)(new RegExp("(extends|not|is)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
-var $R93 = (0, import_lib2.$R)(new RegExp("const|in|out", "suy"));
-var $R94 = (0, import_lib2.$R)(new RegExp("#![^\\r\\n]*", "suy"));
-var $R95 = (0, import_lib2.$R)(new RegExp("[\\t ]*", "suy"));
-var $R96 = (0, import_lib2.$R)(new RegExp("[\\s]*", "suy"));
-var $R97 = (0, import_lib2.$R)(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([\\p{ID_Continue}.,+-]*))?", "suy"));
-var $R98 = (0, import_lib2.$R)(new RegExp("\\/\\/\\/[^\\r\\n]*", "suy"));
-var $R99 = (0, import_lib2.$R)(new RegExp("(?=[ \\t\\r\\n\\/#]|$)", "suy"));
-var $R100 = (0, import_lib2.$R)(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
-var $R101 = (0, import_lib2.$R)(new RegExp("[^]*", "suy"));
+var $R48 = (0, import_lib2.$R)(new RegExp('(?:"(?!"")|\\\\.|[^"])+', "suy"));
+var $R49 = (0, import_lib2.$R)(new RegExp("(?:'(?!'')|\\\\.|[^'])*", "suy"));
+var $R50 = (0, import_lib2.$R)(new RegExp('(?:\\\\.|#(?!\\{)|[^"#])+', "suy"));
+var $R51 = (0, import_lib2.$R)(new RegExp("(?:\\\\.|[^\\]])*", "suy"));
+var $R52 = (0, import_lib2.$R)(new RegExp("(?:\\\\.)", "suy"));
+var $R53 = (0, import_lib2.$R)(new RegExp("[\\s]+", "suy"));
+var $R54 = (0, import_lib2.$R)(new RegExp("\\/(?!\\/\\/)", "suy"));
+var $R55 = (0, import_lib2.$R)(new RegExp("[^[\\/\\s#$\\\\]+|[#$]", "suy"));
+var $R56 = (0, import_lib2.$R)(new RegExp("[*\\/\\r\\n]", "suy"));
+var $R57 = (0, import_lib2.$R)(new RegExp("(?:\\\\.|[^[\\/\\r\\n])+", "suy"));
+var $R58 = (0, import_lib2.$R)(new RegExp("(?:\\p{ID_Continue}|[\\u200C\\u200D$])*", "suy"));
+var $R59 = (0, import_lib2.$R)(new RegExp("(?=[`'\"])", "suy"));
+var $R60 = (0, import_lib2.$R)(new RegExp("(?:\\$(?!\\{)|\\\\.|[^$`])+", "suy"));
+var $R61 = (0, import_lib2.$R)(new RegExp("(?:\\$(?!\\{)|`(?!``)|\\\\.|[^$`])+", "suy"));
+var $R62 = (0, import_lib2.$R)(new RegExp("(?:on|off|yes|no)(?!\\p{ID_Continue})", "suy"));
+var $R63 = (0, import_lib2.$R)(new RegExp("(?:isnt)(?!\\p{ID_Continue})", "suy"));
+var $R64 = (0, import_lib2.$R)(new RegExp("(?:by)(?!\\p{ID_Continue})", "suy"));
+var $R65 = (0, import_lib2.$R)(new RegExp("(?:of)(?!\\p{ID_Continue})", "suy"));
+var $R66 = (0, import_lib2.$R)(new RegExp("(?:and|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|let|loop|new|not|null|or|private|protected|public|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})", "suy"));
+var $R67 = (0, import_lib2.$R)(new RegExp("(?=\\/|#)", "suy"));
+var $R68 = (0, import_lib2.$R)(new RegExp("\\/\\/(?!\\/)[^\\r\\n]*", "suy"));
+var $R69 = (0, import_lib2.$R)(new RegExp(".", "suy"));
+var $R70 = (0, import_lib2.$R)(new RegExp("#(?!##(?!#))([^\\r\\n]*)", "suy"));
+var $R71 = (0, import_lib2.$R)(new RegExp("[^]*?###", "suy"));
+var $R72 = (0, import_lib2.$R)(new RegExp("###(?!#)", "suy"));
+var $R73 = (0, import_lib2.$R)(new RegExp("\\/\\*(?:(?!\\*\\/)[^\\r\\n])*\\*\\/", "suy"));
+var $R74 = (0, import_lib2.$R)(new RegExp("(?=[ \\t\\/\\\\])", "suy"));
+var $R75 = (0, import_lib2.$R)(new RegExp("(?=\\s|\\/|#)", "suy"));
+var $R76 = (0, import_lib2.$R)(new RegExp("(?!\\p{ID_Continue})", "suy"));
+var $R77 = (0, import_lib2.$R)(new RegExp("[=:]", "suy"));
+var $R78 = (0, import_lib2.$R)(new RegExp("['\u2019]s", "suy"));
+var $R79 = (0, import_lib2.$R)(new RegExp("\\s", "suy"));
+var $R80 = (0, import_lib2.$R)(new RegExp("(?=[<])", "suy"));
+var $R81 = (0, import_lib2.$R)(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
+var $R82 = (0, import_lib2.$R)(new RegExp("[!+-]", "suy"));
+var $R83 = (0, import_lib2.$R)(new RegExp("[\\s>]|\\/>", "suy"));
+var $R84 = (0, import_lib2.$R)(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
+var $R85 = (0, import_lib2.$R)(new RegExp(`"[^"]*"|'[^']*'`, "suy"));
+var $R86 = (0, import_lib2.$R)(new RegExp("[<>]", "suy"));
+var $R87 = (0, import_lib2.$R)(new RegExp("[!~+-](?!\\s|[!~+-]*&)", "suy"));
+var $R88 = (0, import_lib2.$R)(new RegExp("(?:-[^-]|[^-]*)*", "suy"));
+var $R89 = (0, import_lib2.$R)(new RegExp("[^{}<>\\r\\n]+", "suy"));
+var $R90 = (0, import_lib2.$R)(new RegExp("[+-]?", "suy"));
+var $R91 = (0, import_lib2.$R)(new RegExp("(?=if|unless)", "suy"));
+var $R92 = (0, import_lib2.$R)(new RegExp("[|&<!=\\-\u21D2\u2192]", "suy"));
+var $R93 = (0, import_lib2.$R)(new RegExp("(extends|not|is)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
+var $R94 = (0, import_lib2.$R)(new RegExp("const|in|out", "suy"));
+var $R95 = (0, import_lib2.$R)(new RegExp("#![^\\r\\n]*", "suy"));
+var $R96 = (0, import_lib2.$R)(new RegExp("[\\t ]*", "suy"));
+var $R97 = (0, import_lib2.$R)(new RegExp("[\\s]*", "suy"));
+var $R98 = (0, import_lib2.$R)(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([\\p{ID_Continue}.,+-]*))?", "suy"));
+var $R99 = (0, import_lib2.$R)(new RegExp("\\/\\/\\/[^\\r\\n]*", "suy"));
+var $R100 = (0, import_lib2.$R)(new RegExp("(?=[ \\t\\r\\n\\/#]|$)", "suy"));
+var $R101 = (0, import_lib2.$R)(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
+var $R102 = (0, import_lib2.$R)(new RegExp("[^]*", "suy"));
 var Program$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Reset, Init, (0, import_lib2.$E)(EOS), TopLevelStatements, __), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var reset = $1;
   var init = $2;
@@ -9453,7 +9519,7 @@ var ArgumentsWithTrailingCallExpressions$0 = (0, import_lib2.$TS)((0, import_lib
 function ArgumentsWithTrailingCallExpressions(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "ArgumentsWithTrailingCallExpressions", ArgumentsWithTrailingCallExpressions$0);
 }
-var TrailingCallExpressions$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$Q)(CallExpressionRest), (0, import_lib2.$E)(IndentedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2) {
+var TrailingCallExpressions$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$Q)(ExplicitCallExpressionRest), (0, import_lib2.$E)(IndentedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2) {
   $1 = $1.flat();
   if (!$1.length && !$2)
     return $skip;
@@ -9549,10 +9615,10 @@ var NestedArgumentList$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent,
 function NestedArgumentList(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "NestedArgumentList", NestedArgumentList$0);
 }
-var NestedArgument$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Nested, (0, import_lib2.$N)(Bullet), SingleLineArgumentExpressions, ParameterElementDelimiter), function($skip, $loc, $0, $1, $2, $3, $4) {
-  var indent = $1;
-  var args = $3;
-  var comma = $4;
+var NestedArgument$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(NestedImplicitPropertyDefinition), Nested, (0, import_lib2.$N)(Bullet), SingleLineArgumentExpressions, ParameterElementDelimiter), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var indent = $2;
+  var args = $4;
+  var comma = $5;
   let [arg0, ...rest] = args;
   arg0 = prepend(indent, arg0);
   return [arg0, ...rest, comma];
@@ -10742,6 +10808,32 @@ var CallExpressionRest$$ = [CallExpressionRest$0, CallExpressionRest$1, CallExpr
 function CallExpressionRest(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "CallExpressionRest", CallExpressionRest$$);
 }
+var ExplicitCallExpressionRest$0 = MemberExpressionRest;
+var ExplicitCallExpressionRest$1 = (0, import_lib2.$T)((0, import_lib2.$S)(TypeArguments, (0, import_lib2.$N)((0, import_lib2.$C)(IdentifierName, NumericLiteral))), function(value) {
+  return value[0];
+});
+var ExplicitCallExpressionRest$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R8, "ExplicitCallExpressionRest /(?=['\"`])/"), (0, import_lib2.$C)(TemplateLiteral, StringLiteral)), function($skip, $loc, $0, $1, $2) {
+  var literal = $2;
+  if (literal.type === "StringLiteral") {
+    literal = "`" + literal.token.slice(1, -1).replace(/(`|\$\{)/g, "\\$1") + "`";
+  }
+  return literal;
+});
+var ExplicitCallExpressionRest$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(OptionalShorthand), ExplicitArguments), function($skip, $loc, $0, $1, $2) {
+  var optional = $1;
+  var call = $2;
+  if (!optional)
+    return call;
+  return {
+    ...call,
+    children: [optional, ...call.children],
+    optional
+  };
+});
+var ExplicitCallExpressionRest$$ = [ExplicitCallExpressionRest$0, ExplicitCallExpressionRest$1, ExplicitCallExpressionRest$2, ExplicitCallExpressionRest$3];
+function ExplicitCallExpressionRest(ctx, state2) {
+  return (0, import_lib2.$EVENT_C)(ctx, state2, "ExplicitCallExpressionRest", ExplicitCallExpressionRest$$);
+}
 var OptionalShorthand$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R9, "OptionalShorthand /(?=[\\/?])/"), (0, import_lib2.$Q)(InlineComment), QuestionMark, OptionalDot), function($skip, $loc, $0, $1, $2, $3, $4) {
   var comments = $2;
   var q = $3;
@@ -11379,7 +11471,8 @@ var NWBindingIdentifier$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(At, AtIdent
   return {
     type: "AtBinding",
     children: [ref],
-    ref
+    ref,
+    names: []
   };
 });
 var NWBindingIdentifier$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(Hash, AtIdentifierRef), function($skip, $loc, $0, $1, $2) {
@@ -11388,7 +11481,8 @@ var NWBindingIdentifier$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(Hash, AtIde
   return {
     type: "AtBinding",
     children: [ref],
-    ref
+    ref,
+    names: []
   };
 });
 var NWBindingIdentifier$2 = Identifier;
@@ -12697,7 +12791,8 @@ var RangeDots$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(DotDotDot), function(
     type: "RangeDots",
     left: { inclusive: true, raw: "" },
     right: { inclusive: false, raw: "." },
-    increasing: void 0,
+    // Ranges are increasing by default, but adaptive in coffeeCompat mode
+    increasing: config.coffeeRange ? void 0 : true,
     triple: true,
     children: []
   };
@@ -12708,7 +12803,7 @@ var RangeDots$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(OptionalRangeEnd, (0,
   var dots = $3;
   var ws2 = $4;
   var right = $5;
-  const increasing = left.increasing ?? right.increasing;
+  const increasing = left.increasing ?? right.increasing ?? (config.coffeeRange ? void 0 : true);
   if (left.increasing != null && right.increasing != null && left.increasing !== right.increasing) {
     const error = {
       type: "Error",
@@ -13504,52 +13599,23 @@ var MethodDefinition$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Abstract, __,
     abstract: true,
     signature,
     parameters: signature.parameters,
+    async: signature.async,
+    generator: signature.generator,
     ts: true
   };
 });
 var MethodDefinition$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(MethodSignature, (0, import_lib2.$N)((0, import_lib2.$C)(PropertyAccess, ExplicitPropertyGlob, UnaryPostfix, NonNullAssertion)), (0, import_lib2.$E)(BracedBlock)), function($skip, $loc, $0, $1, $2, $3) {
   var signature = $1;
   var block = $3;
-  let children = $0;
-  let generatorPos = 0;
-  let { modifier } = signature;
-  if (hasAwait(block)) {
-    generatorPos++;
-    children = children.slice();
-    if (modifier?.get || modifier?.set) {
-      children.push({
-        type: "Error",
-        message: "Getters and setters cannot be async"
-      });
-    } else if (modifier?.async) {
-    } else {
-      children.unshift("async ");
-      modifier = { ...modifier, async: true };
-      signature = { ...signature, modifier };
-    }
-  }
-  if (hasYield(block)) {
-    if (children === $0)
-      children = children.slice();
-    if (modifier?.get || modifier?.set) {
-      children.push({
-        type: "Error",
-        message: "Getters and setters cannot be generators"
-      });
-    } else if (modifier?.generator) {
-    } else {
-      children.splice(generatorPos, 0, "*");
-      modifier = { ...modifier, generator: true };
-      signature = { ...signature, modifier };
-    }
-  }
   return {
     type: "MethodDefinition",
-    children,
+    children: $0,
     name: signature.name,
     signature,
     block,
-    parameters: signature.parameters
+    parameters: signature.parameters,
+    async: signature.async,
+    generator: signature.generator
   };
 });
 var MethodDefinition$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(GetOrSet, (0, import_lib2.$E)(_), ForbidIndentedApplication, (0, import_lib2.$E)((0, import_lib2.$S)(MemberBase, (0, import_lib2.$Q)(CallExpressionRest), (0, import_lib2.$E)(ReturnTypeSuffix))), RestoreIndentedApplication, (0, import_lib2.$E)(BracedBlock)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
@@ -13632,36 +13698,38 @@ function MethodDefinition(ctx, state2) {
 }
 var MethodModifier$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(GetOrSet, (0, import_lib2.$E)(_), (0, import_lib2.$Y)(ClassElementName)), function($skip, $loc, $0, $1, $2, $3) {
   var kind = $1;
+  var ws = $2;
   return {
-    type: "MethodModifier",
-    async: false,
-    generator: false,
-    get: kind.token === "get",
-    set: kind.token === "set",
-    children: $0
-  };
-});
-var MethodModifier$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$S)(Async, __), (0, import_lib2.$E)((0, import_lib2.$S)(Star, __))), function($skip, $loc, $0, $1, $2) {
-  return {
-    type: "MethodModifier",
-    async: true,
-    get: false,
-    set: false,
-    generator: !!$2,
-    children: $0
+    // no async or generator, because getters and setters can't be
+    modifier: {
+      async: false,
+      generator: false,
+      get: kind.token === "get",
+      set: kind.token === "set"
+    },
+    children: [kind, ws]
   };
 });
-var MethodModifier$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(Star, __), function($skip, $loc, $0, $1, $2) {
+var MethodModifier$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)((0, import_lib2.$S)(Async, __)), (0, import_lib2.$E)((0, import_lib2.$S)(Star, __))), function($skip, $loc, $0, $1, $2) {
+  var async = $1;
+  var generator = $2;
+  if (!async)
+    async = [];
+  if (!generator)
+    generator = [];
   return {
-    type: "MethodModifier",
-    async: false,
-    get: false,
-    set: false,
-    generator: true,
-    children: $0
+    async,
+    generator,
+    modifier: {
+      async: !!async.length,
+      get: false,
+      set: false,
+      generator: !!generator.length
+    },
+    children: [async, generator]
   };
 });
-var MethodModifier$$ = [MethodModifier$0, MethodModifier$1, MethodModifier$2];
+var MethodModifier$$ = [MethodModifier$0, MethodModifier$1];
 function MethodModifier(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "MethodModifier", MethodModifier$$);
 }
@@ -13676,10 +13744,12 @@ var MethodSignature$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(ConstructorShor
     parameters
   };
 });
-var MethodSignature$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(MethodModifier), ClassElementName, (0, import_lib2.$E)(_), (0, import_lib2.$E)(QuestionMark), (0, import_lib2.$E)(_), NonEmptyParameters, (0, import_lib2.$E)(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+var MethodSignature$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(MethodModifier, ClassElementName, (0, import_lib2.$E)(_), (0, import_lib2.$E)(QuestionMark), (0, import_lib2.$E)(_), NonEmptyParameters, (0, import_lib2.$E)(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
   var modifier = $1;
   var name = $2;
+  var ws1 = $3;
   var optional = $4;
+  var ws2 = $5;
   var parameters = $6;
   var returnType = $7;
   if (name.name) {
@@ -13688,14 +13758,15 @@ var MethodSignature$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2
     name = name.token.match(/^(?:"|')/) ? name.token.slice(1, -1) : name.token;
   }
   if (optional)
-    $0[3] = optional = { ...optional, ts: true };
-  modifier = modifier || {};
+    optional = { ...optional, ts: true };
   return {
     type: "MethodSignature",
-    children: $0,
+    children: [...modifier.children, name, ws1, optional, ws2, parameters, returnType],
+    async: modifier.async,
+    generator: modifier.generator,
     name,
     optional,
-    modifier,
+    modifier: modifier.modifier,
     // get/set/async/generator
     returnType,
     parameters
@@ -15696,48 +15767,65 @@ function Debugger(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Debugger", Debugger$0);
 }
 var MaybeNestedNonPipelineExpression$0 = NestedBulletedArray;
-var MaybeNestedNonPipelineExpression$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, NonPipelineExpression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
-  if ($3)
-    return $3;
-  return $skip;
+var MaybeNestedNonPipelineExpression$1 = NestedImplicitObjectLiteral;
+var MaybeNestedNonPipelineExpression$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, NonPipelineExpression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var expression = $2;
+  var trailing = $4;
+  if (!expression)
+    return $skip;
+  if (!trailing)
+    return expression;
+  return [expression, trailing];
 });
-var MaybeNestedNonPipelineExpression$2 = NonPipelineExpression;
-var MaybeNestedNonPipelineExpression$$ = [MaybeNestedNonPipelineExpression$0, MaybeNestedNonPipelineExpression$1, MaybeNestedNonPipelineExpression$2];
+var MaybeNestedNonPipelineExpression$3 = NonPipelineExpression;
+var MaybeNestedNonPipelineExpression$$ = [MaybeNestedNonPipelineExpression$0, MaybeNestedNonPipelineExpression$1, MaybeNestedNonPipelineExpression$2, MaybeNestedNonPipelineExpression$3];
 function MaybeNestedNonPipelineExpression(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "MaybeNestedNonPipelineExpression", MaybeNestedNonPipelineExpression$$);
 }
 var MaybeNestedPostfixedExpression$0 = NestedBulletedArray;
-var MaybeNestedPostfixedExpression$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, PostfixedExpression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
-  if ($3)
-    return $3;
-  return $skip;
+var MaybeNestedPostfixedExpression$1 = NestedImplicitObjectLiteral;
+var MaybeNestedPostfixedExpression$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, PostfixedExpression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var expression = $2;
+  var trailing = $4;
+  if (!expression)
+    return $skip;
+  if (!trailing)
+    return expression;
+  return [expression, trailing];
 });
-var MaybeNestedPostfixedExpression$2 = PostfixedExpression;
-var MaybeNestedPostfixedExpression$$ = [MaybeNestedPostfixedExpression$0, MaybeNestedPostfixedExpression$1, MaybeNestedPostfixedExpression$2];
+var MaybeNestedPostfixedExpression$3 = PostfixedExpression;
+var MaybeNestedPostfixedExpression$$ = [MaybeNestedPostfixedExpression$0, MaybeNestedPostfixedExpression$1, MaybeNestedPostfixedExpression$2, MaybeNestedPostfixedExpression$3];
 function MaybeNestedPostfixedExpression(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "MaybeNestedPostfixedExpression", MaybeNestedPostfixedExpression$$);
 }
+var NestedPostfixedExpressionNoTrailing$0 = NestedBulletedArray;
+var NestedPostfixedExpressionNoTrailing$1 = NestedImplicitObjectLiteral;
+var NestedPostfixedExpressionNoTrailing$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, PostfixedExpression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+  var expression = $2;
+  if (!expression)
+    return $skip;
+  return expression;
+});
+var NestedPostfixedExpressionNoTrailing$$ = [NestedPostfixedExpressionNoTrailing$0, NestedPostfixedExpressionNoTrailing$1, NestedPostfixedExpressionNoTrailing$2];
+function NestedPostfixedExpressionNoTrailing(ctx, state2) {
+  return (0, import_lib2.$EVENT_C)(ctx, state2, "NestedPostfixedExpressionNoTrailing", NestedPostfixedExpressionNoTrailing$$);
+}
 var MaybeNestedExpression$0 = NestedBulletedArray;
-var MaybeNestedExpression$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, Expression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
-  if ($3)
-    return $3;
-  return $skip;
+var MaybeNestedExpression$1 = NestedImplicitObjectLiteral;
+var MaybeNestedExpression$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, Expression)), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var expression = $2;
+  var trailing = $4;
+  if (!expression)
+    return $skip;
+  if (!trailing)
+    return expression;
+  return [expression, trailing];
 });
-var MaybeNestedExpression$2 = Expression;
-var MaybeNestedExpression$$ = [MaybeNestedExpression$0, MaybeNestedExpression$1, MaybeNestedExpression$2];
+var MaybeNestedExpression$3 = Expression;
+var MaybeNestedExpression$$ = [MaybeNestedExpression$0, MaybeNestedExpression$1, MaybeNestedExpression$2, MaybeNestedExpression$3];
 function MaybeNestedExpression(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "MaybeNestedExpression", MaybeNestedExpression$$);
 }
-var NestedExpression$0 = NestedBulletedArray;
-var NestedExpression$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$E)((0, import_lib2.$S)(Nested, Expression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
-  if ($3)
-    return $3;
-  return $skip;
-});
-var NestedExpression$$ = [NestedExpression$0, NestedExpression$1];
-function NestedExpression(ctx, state2) {
-  return (0, import_lib2.$EVENT_C)(ctx, state2, "NestedExpression", NestedExpression$$);
-}
 var MaybeParenNestedExpression$0 = (0, import_lib2.$T)((0, import_lib2.$Y)((0, import_lib2.$S)((0, import_lib2.$E)(_), PostfixStatement, NoBlock)), function(value) {
   return "";
 });
@@ -15747,7 +15835,7 @@ var MaybeParenNestedExpression$1 = (0, import_lib2.$T)((0, import_lib2.$S)((0, i
 var MaybeParenNestedExpression$2 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$Y)(EOS), (0, import_lib2.$C)(ArrayLiteral, ObjectLiteral)), function(value) {
   return value[1];
 });
-var MaybeParenNestedExpression$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$Y)(EOS), InsertSpace, InsertOpenParen, PushIndent, (0, import_lib2.$S)(Nested, Expression), PopIndent, InsertNewline, InsertIndent, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var MaybeParenNestedExpression$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$Y)(EOS), InsertSpace, InsertOpenParen, PushIndent, (0, import_lib2.$S)(Nested, Expression), PopIndent, (0, import_lib2.$E)(AllowedTrailingCallExpressions), InsertNewline, InsertIndent, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9, $10) {
   var exp = $5;
   if (!exp)
     return $skip;
@@ -16456,13 +16544,29 @@ var SingleStringCharacters$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R4
 function SingleStringCharacters(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "SingleStringCharacters", SingleStringCharacters$0);
 }
-var TripleDoubleStringCharacters$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R47, 'TripleDoubleStringCharacters /(?:"(?!"")|#(?!\\{)|\\\\.|[^#"])+/'), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var TripleDoubleStringContents$0 = (0, import_lib2.$T)((0, import_lib2.$S)(CoffeeInterpolationEnabled, (0, import_lib2.$Q)((0, import_lib2.$C)(CoffeeTripleDoubleStringCharacters, CoffeeStringSubstitution))), function(value) {
+  return value[1];
+});
+var TripleDoubleStringContents$1 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$N)(CoffeeInterpolationEnabled), TripleDoubleStringCharacters), function(value) {
+  return [value[1]];
+});
+var TripleDoubleStringContents$$ = [TripleDoubleStringContents$0, TripleDoubleStringContents$1];
+function TripleDoubleStringContents(ctx, state2) {
+  return (0, import_lib2.$EVENT_C)(ctx, state2, "TripleDoubleStringContents", TripleDoubleStringContents$$);
+}
+var CoffeeTripleDoubleStringCharacters$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R47, 'CoffeeTripleDoubleStringCharacters /(?:"(?!"")|#(?!\\{)|\\\\.|[^#"])+/'), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+  return { $loc, token: $0 };
+});
+function CoffeeTripleDoubleStringCharacters(ctx, state2) {
+  return (0, import_lib2.$EVENT)(ctx, state2, "CoffeeTripleDoubleStringCharacters", CoffeeTripleDoubleStringCharacters$0);
+}
+var TripleDoubleStringCharacters$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R48, 'TripleDoubleStringCharacters /(?:"(?!"")|\\\\.|[^"])+/'), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   return { $loc, token: $0 };
 });
 function TripleDoubleStringCharacters(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "TripleDoubleStringCharacters", TripleDoubleStringCharacters$0);
 }
-var TripleSingleStringCharacters$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R48, "TripleSingleStringCharacters /(?:'(?!'')|\\\\.|[^'])*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var TripleSingleStringCharacters$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R49, "TripleSingleStringCharacters /(?:'(?!'')|\\\\.|[^'])*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   return { $loc, token: $0 };
 });
 function TripleSingleStringCharacters(ctx, state2) {
@@ -16485,7 +16589,7 @@ var CoffeeInterpolatedDoubleQuotedString$0 = (0, import_lib2.$TS)((0, import_lib
 function CoffeeInterpolatedDoubleQuotedString(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "CoffeeInterpolatedDoubleQuotedString", CoffeeInterpolatedDoubleQuotedString$0);
 }
-var CoffeeDoubleQuotedStringCharacters$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R49, 'CoffeeDoubleQuotedStringCharacters /(?:\\\\.|#(?!\\{)|[^"#])+/'), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var CoffeeDoubleQuotedStringCharacters$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R50, 'CoffeeDoubleQuotedStringCharacters /(?:\\\\.|#(?!\\{)|[^"#])+/'), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   return { $loc, token: $0 };
 });
 function CoffeeDoubleQuotedStringCharacters(ctx, state2) {
@@ -16505,7 +16609,7 @@ var RegularExpressionClass$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, i
 function RegularExpressionClass(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "RegularExpressionClass", RegularExpressionClass$0);
 }
-var RegularExpressionClassCharacters$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R50, "RegularExpressionClassCharacters /(?:\\\\.|[^\\]])*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var RegularExpressionClassCharacters$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R51, "RegularExpressionClassCharacters /(?:\\\\.|[^\\]])*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   return { $loc, token: $0 };
 });
 function RegularExpressionClassCharacters(ctx, state2) {
@@ -16556,13 +16660,13 @@ function HeregexBody(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "HeregexBody", HeregexBody$0);
 }
 var HeregexPart$0 = RegularExpressionClass;
-var HeregexPart$1 = (0, import_lib2.$T)((0, import_lib2.$S)(CoffeeStringSubstitution), function(value) {
-  return { "type": "Substitution", "children": value[0] };
+var HeregexPart$1 = (0, import_lib2.$T)((0, import_lib2.$S)(CoffeeInterpolationEnabled, CoffeeStringSubstitution), function(value) {
+  return { "type": "Substitution", "children": value[1] };
 });
 var HeregexPart$2 = (0, import_lib2.$T)((0, import_lib2.$S)(TemplateSubstitution), function(value) {
   return { "type": "Substitution", "children": value[0] };
 });
-var HeregexPart$3 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R51, "HeregexPart /(?:\\\\.)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var HeregexPart$3 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R52, "HeregexPart /(?:\\\\.)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   let token = $0;
   switch ($0[1]) {
     case "\n":
@@ -16580,26 +16684,28 @@ var HeregexPart$3 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R51, "Heregex
 var HeregexPart$4 = (0, import_lib2.$TS)((0, import_lib2.$S)(HeregexComment), function($skip, $loc, $0, $1) {
   return { $loc, token: "" };
 });
-var HeregexPart$5 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R52, "HeregexPart /[\\s]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var HeregexPart$5 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R53, "HeregexPart /[\\s]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   return { $loc, token: "" };
 });
-var HeregexPart$6 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R53, "HeregexPart /\\/(?!\\/\\/)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var HeregexPart$6 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R54, "HeregexPart /\\/(?!\\/\\/)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   return { $loc, token: "\\/" };
 });
-var HeregexPart$7 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R54, "HeregexPart /[^[\\/\\s#\\\\]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var HeregexPart$7 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R55, "HeregexPart /[^[\\/\\s#$\\\\]+|[#$]/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   return { $loc, token: $0 };
 });
 var HeregexPart$$ = [HeregexPart$0, HeregexPart$1, HeregexPart$2, HeregexPart$3, HeregexPart$4, HeregexPart$5, HeregexPart$6, HeregexPart$7];
 function HeregexPart(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "HeregexPart", HeregexPart$$);
 }
-var HeregexComment$0 = JSSingleLineComment;
-var HeregexComment$1 = CoffeeSingleLineComment;
+var HeregexComment$0 = (0, import_lib2.$S)((0, import_lib2.$N)(CoffeeDivEnabled), JSSingleLineComment);
+var HeregexComment$1 = (0, import_lib2.$T)((0, import_lib2.$S)(CoffeeCommentEnabled, CoffeeSingleLineComment), function(value) {
+  return value[1];
+});
 var HeregexComment$$ = [HeregexComment$0, HeregexComment$1];
 function HeregexComment(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "HeregexComment", HeregexComment$$);
 }
-var RegularExpressionBody$0 = (0, import_lib2.$S)((0, import_lib2.$N)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R55, "RegularExpressionBody /[*\\/\\r\\n]/"))), (0, import_lib2.$Q)(RegExpPart));
+var RegularExpressionBody$0 = (0, import_lib2.$S)((0, import_lib2.$N)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R56, "RegularExpressionBody /[*\\/\\r\\n]/"))), (0, import_lib2.$Q)(RegExpPart));
 function RegularExpressionBody(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "RegularExpressionBody", RegularExpressionBody$0);
 }
@@ -16609,15 +16715,15 @@ var RegExpPart$$ = [RegExpPart$0, RegExpPart$1];
 function RegExpPart(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "RegExpPart", RegExpPart$$);
 }
-var RegExpCharacter$0 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R56, "RegExpCharacter /(?:\\\\.|[^[\\/\\r\\n])+/"));
+var RegExpCharacter$0 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R57, "RegExpCharacter /(?:\\\\.|[^[\\/\\r\\n])+/"));
 function RegExpCharacter(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "RegExpCharacter", RegExpCharacter$0);
 }
-var RegularExpressionFlags$0 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R57, "RegularExpressionFlags /(?:\\p{ID_Continue}|[\\u200C\\u200D$])*/"));
+var RegularExpressionFlags$0 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R58, "RegularExpressionFlags /(?:\\p{ID_Continue}|[\\u200C\\u200D$])*/"));
 function RegularExpressionFlags(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "RegularExpressionFlags", RegularExpressionFlags$0);
 }
-var TemplateLiteral$0 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R58, "TemplateLiteral /(?=[`'\"])/"), _TemplateLiteral), function(value) {
+var TemplateLiteral$0 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R59, "TemplateLiteral /(?=[`'\"])/"), _TemplateLiteral), function(value) {
   return value[1];
 });
 function TemplateLiteral(ctx, state2) {
@@ -16632,7 +16738,7 @@ var _TemplateLiteral$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(Backtick, (0,
     children: $0
   };
 });
-var _TemplateLiteral$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(TripleDoubleQuote, (0, import_lib2.$Q)((0, import_lib2.$C)(TripleDoubleStringCharacters, CoffeeStringSubstitution)), TripleDoubleQuote), function($skip, $loc, $0, $1, $2, $3) {
+var _TemplateLiteral$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(TripleDoubleQuote, TripleDoubleStringContents, TripleDoubleQuote), function($skip, $loc, $0, $1, $2, $3) {
   return dedentBlockSubstitutions($0, config.tab);
 });
 var _TemplateLiteral$3 = (0, import_lib2.$TS)((0, import_lib2.$S)(TripleSingleQuote, TripleSingleStringCharacters, TripleSingleQuote), function($skip, $loc, $0, $1, $2, $3) {
@@ -16657,28 +16763,28 @@ var TemplateSubstitution$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Substituti
 function TemplateSubstitution(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "TemplateSubstitution", TemplateSubstitution$0);
 }
-var TemplateCharacters$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R59, "TemplateCharacters /(?:\\$(?!\\{)|\\\\.|[^$`])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var TemplateCharacters$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R60, "TemplateCharacters /(?:\\$(?!\\{)|\\\\.|[^$`])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   return { $loc, token: $0 };
 });
 function TemplateCharacters(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "TemplateCharacters", TemplateCharacters$0);
 }
-var TemplateBlockCharacters$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R60, "TemplateBlockCharacters /(?:\\$(?!\\{)|`(?!``)|\\\\.|[^$`])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var TemplateBlockCharacters$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R61, "TemplateBlockCharacters /(?:\\$(?!\\{)|`(?!``)|\\\\.|[^$`])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   return { $loc, token: $0 };
 });
 function TemplateBlockCharacters(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "TemplateBlockCharacters", TemplateBlockCharacters$0);
 }
-var ReservedWord$0 = (0, import_lib2.$S)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R61, "ReservedWord /(?:on|off|yes|no)(?!\\p{ID_Continue})/")), CoffeeBooleansEnabled);
-var ReservedWord$1 = (0, import_lib2.$S)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R62, "ReservedWord /(?:isnt)(?!\\p{ID_Continue})/")), CoffeeIsntEnabled);
-var ReservedWord$2 = (0, import_lib2.$S)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R63, "ReservedWord /(?:by)(?!\\p{ID_Continue})/")), CoffeeForLoopsEnabled);
-var ReservedWord$3 = (0, import_lib2.$S)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R64, "ReservedWord /(?:of)(?!\\p{ID_Continue})/")), CoffeeOfEnabled);
-var ReservedWord$4 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R65, "ReservedWord /(?:and|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|let|loop|new|not|null|or|private|protected|public|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})/"));
+var ReservedWord$0 = (0, import_lib2.$S)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R62, "ReservedWord /(?:on|off|yes|no)(?!\\p{ID_Continue})/")), CoffeeBooleansEnabled);
+var ReservedWord$1 = (0, import_lib2.$S)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R63, "ReservedWord /(?:isnt)(?!\\p{ID_Continue})/")), CoffeeIsntEnabled);
+var ReservedWord$2 = (0, import_lib2.$S)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R64, "ReservedWord /(?:by)(?!\\p{ID_Continue})/")), CoffeeForLoopsEnabled);
+var ReservedWord$3 = (0, import_lib2.$S)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R65, "ReservedWord /(?:of)(?!\\p{ID_Continue})/")), CoffeeOfEnabled);
+var ReservedWord$4 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R66, "ReservedWord /(?:and|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|let|loop|new|not|null|or|private|protected|public|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})/"));
 var ReservedWord$$ = [ReservedWord$0, ReservedWord$1, ReservedWord$2, ReservedWord$3, ReservedWord$4];
 function ReservedWord(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "ReservedWord", ReservedWord$$);
 }
-var Comment$0 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R66, "Comment /(?=\\/|#)/"), _Comment), function(value) {
+var Comment$0 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R67, "Comment /(?=\\/|#)/"), _Comment), function(value) {
   return value[1];
 });
 function Comment(ctx, state2) {
@@ -16696,7 +16802,7 @@ var SingleLineComment$$ = [SingleLineComment$0, SingleLineComment$1];
 function SingleLineComment(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "SingleLineComment", SingleLineComment$$);
 }
-var JSSingleLineComment$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R67, "JSSingleLineComment /\\/\\/(?!\\/)[^\\r\\n]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var JSSingleLineComment$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R68, "JSSingleLineComment /\\/\\/(?!\\/)[^\\r\\n]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   return { type: "Comment", $loc, token: $0 };
 });
 function JSSingleLineComment(ctx, state2) {
@@ -16708,30 +16814,30 @@ var MultiLineComment$$ = [MultiLineComment$0, MultiLineComment$1];
 function MultiLineComment(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "MultiLineComment", MultiLineComment$$);
 }
-var JSMultiLineComment$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L138, 'JSMultiLineComment "/*"'), (0, import_lib2.$Q)((0, import_lib2.$S)((0, import_lib2.$N)((0, import_lib2.$EXPECT)($L139, 'JSMultiLineComment "*/"')), (0, import_lib2.$EXPECT)($R68, "JSMultiLineComment /./"))), (0, import_lib2.$EXPECT)($L139, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
+var JSMultiLineComment$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L138, 'JSMultiLineComment "/*"'), (0, import_lib2.$Q)((0, import_lib2.$S)((0, import_lib2.$N)((0, import_lib2.$EXPECT)($L139, 'JSMultiLineComment "*/"')), (0, import_lib2.$EXPECT)($R69, "JSMultiLineComment /./"))), (0, import_lib2.$EXPECT)($L139, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
   return { type: "Comment", $loc, token: $1 };
 });
 function JSMultiLineComment(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "JSMultiLineComment", JSMultiLineComment$0);
 }
-var CoffeeSingleLineComment$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R69, "CoffeeSingleLineComment /#(?!##(?!#))([^\\r\\n]*)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var CoffeeSingleLineComment$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R70, "CoffeeSingleLineComment /#(?!##(?!#))([^\\r\\n]*)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   return { type: "Comment", $loc, token: `//${$1}` };
 });
 function CoffeeSingleLineComment(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "CoffeeSingleLineComment", CoffeeSingleLineComment$0);
 }
-var CoffeeMultiLineComment$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(CoffeeHereCommentStart, (0, import_lib2.$TEXT)((0, import_lib2.$EXPECT)($R70, "CoffeeMultiLineComment /[^]*?###/"))), function($skip, $loc, $0, $1, $2) {
+var CoffeeMultiLineComment$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(CoffeeHereCommentStart, (0, import_lib2.$TEXT)((0, import_lib2.$EXPECT)($R71, "CoffeeMultiLineComment /[^]*?###/"))), function($skip, $loc, $0, $1, $2) {
   $2 = $2.slice(0, $2.length - 3).replace(/\*\//g, "* /");
   return { type: "Comment", $loc, token: `/*${$2}*/` };
 });
 function CoffeeMultiLineComment(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "CoffeeMultiLineComment", CoffeeMultiLineComment$0);
 }
-var CoffeeHereCommentStart$0 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R71, "CoffeeHereCommentStart /###(?!#)/"));
+var CoffeeHereCommentStart$0 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R72, "CoffeeHereCommentStart /###(?!#)/"));
 function CoffeeHereCommentStart(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "CoffeeHereCommentStart", CoffeeHereCommentStart$0);
 }
-var InlineComment$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R72, "InlineComment /\\/\\*(?:(?!\\*\\/)[^\\r\\n])*\\*\\//"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var InlineComment$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R73, "InlineComment /\\/\\*(?:(?!\\*\\/)[^\\r\\n])*\\*\\//"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   return { $loc, token: $0 };
 });
 function InlineComment(ctx, state2) {
@@ -16745,7 +16851,7 @@ var TrailingComment$0 = (0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_l
 function TrailingComment(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "TrailingComment", TrailingComment$0);
 }
-var _$0 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R73, "_ /(?=[ \\t\\/\\\\])/"), (0, import_lib2.$P)((0, import_lib2.$C)(NonNewlineWhitespace, InlineComment))), function(value) {
+var _$0 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R74, "_ /(?=[ \\t\\/\\\\])/"), (0, import_lib2.$P)((0, import_lib2.$C)(NonNewlineWhitespace, InlineComment))), function(value) {
   return value[1];
 });
 function _(ctx, state2) {
@@ -16768,7 +16874,7 @@ var Trimmed_$0 = (0, import_lib2.$TV)(_, function($skip, $loc, $0, $1) {
 function Trimmed_(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Trimmed_", Trimmed_$0);
 }
-var __$0 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R74, "__ /(?=\\s|\\/|#)/"), (0, import_lib2.$Q)((0, import_lib2.$C)(Whitespace, Comment))), function(value) {
+var __$0 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R75, "__ /(?=\\s|\\/|#)/"), (0, import_lib2.$Q)((0, import_lib2.$C)(Whitespace, Comment))), function(value) {
   return value[1];
 });
 var __$1 = (0, import_lib2.$EXPECT)($L0, '__ ""');
@@ -16776,7 +16882,7 @@ var __$$ = [__$0, __$1];
 function __(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "__", __$$);
 }
-var Whitespace$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R52, "Whitespace /[\\s]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var Whitespace$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R53, "Whitespace /[\\s]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   return { $loc, token: $0 };
 });
 function Whitespace(ctx, state2) {
@@ -16818,7 +16924,7 @@ var SemicolonDelimiter$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_l
 function SemicolonDelimiter(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "SemicolonDelimiter", SemicolonDelimiter$0);
 }
-var NonIdContinue$0 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R75, "NonIdContinue /(?!\\p{ID_Continue})/"));
+var NonIdContinue$0 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R76, "NonIdContinue /(?!\\p{ID_Continue})/"));
 function NonIdContinue(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "NonIdContinue", NonIdContinue$0);
 }
@@ -16936,7 +17042,7 @@ var CoffeeSubstitutionStart$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L
 function CoffeeSubstitutionStart(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "CoffeeSubstitutionStart", CoffeeSubstitutionStart$0);
 }
-var Colon$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L16, 'Colon ":"'), (0, import_lib2.$N)((0, import_lib2.$EXPECT)($R76, "Colon /[=:]/"))), function($skip, $loc, $0, $1, $2) {
+var Colon$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L16, 'Colon ":"'), (0, import_lib2.$N)((0, import_lib2.$EXPECT)($R77, "Colon /[=:]/"))), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Colon(ctx, state2) {
@@ -16987,7 +17093,7 @@ function Do(ctx, state2) {
 var Dot$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L7, 'Dot "."'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
-var Dot$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R77, "Dot /['\u2019]s/"), Trimmed_), function($skip, $loc, $0, $1, $2) {
+var Dot$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R78, "Dot /['\u2019]s/"), Trimmed_), function($skip, $loc, $0, $1, $2) {
   var ws = $2;
   return [
     { $loc, token: "." },
@@ -17120,7 +17226,7 @@ var If$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, i
 function If(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "If", If$0);
 }
-var Import$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L15, 'Import "import"'), (0, import_lib2.$Y)((0, import_lib2.$EXPECT)($R78, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
+var Import$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L15, 'Import "import"'), (0, import_lib2.$Y)((0, import_lib2.$EXPECT)($R79, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Import(ctx, state2) {
@@ -17478,7 +17584,7 @@ var JSXImplicitFragment$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(JSXTag, (0,
 function JSXImplicitFragment(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "JSXImplicitFragment", JSXImplicitFragment$0);
 }
-var JSXTag$0 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R79, "JSXTag /(?=[<])/"), _JSXTag), function(value) {
+var JSXTag$0 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R80, "JSXTag /(?=[<])/"), _JSXTag), function(value) {
   return value[1];
 });
 function JSXTag(ctx, state2) {
@@ -17625,7 +17731,7 @@ var JSXElementName$$ = [JSXElementName$0, JSXElementName$1];
 function JSXElementName(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "JSXElementName", JSXElementName$$);
 }
-var JSXIdentifierName$0 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R80, "JSXIdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*/"));
+var JSXIdentifierName$0 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R81, "JSXIdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*/"));
 function JSXIdentifierName(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "JSXIdentifierName", JSXIdentifierName$0);
 }
@@ -17807,7 +17913,7 @@ var JSXAttribute$6 = (0, import_lib2.$TS)((0, import_lib2.$S)(Dot, JSXShorthandS
     class: $2
   };
 });
-var JSXAttribute$7 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$TEXT)((0, import_lib2.$EXPECT)($R81, "JSXAttribute /[!+-]/")), JSXAttributeName, (0, import_lib2.$Y)(JSXAttributeSpace)), function($skip, $loc, $0, $1, $2, $3) {
+var JSXAttribute$7 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$TEXT)((0, import_lib2.$EXPECT)($R82, "JSXAttribute /[!+-]/")), JSXAttributeName, (0, import_lib2.$Y)(JSXAttributeSpace)), function($skip, $loc, $0, $1, $2, $3) {
   var toggle = $1;
   var id = $2;
   const value = toggle === "+" ? "true" : "false";
@@ -17817,11 +17923,11 @@ var JSXAttribute$$ = [JSXAttribute$0, JSXAttribute$1, JSXAttribute$2, JSXAttribu
 function JSXAttribute(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "JSXAttribute", JSXAttribute$$);
 }
-var JSXAttributeSpace$0 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R82, "JSXAttributeSpace /[\\s>]|\\/>/"));
+var JSXAttributeSpace$0 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R83, "JSXAttributeSpace /[\\s>]|\\/>/"));
 function JSXAttributeSpace(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "JSXAttributeSpace", JSXAttributeSpace$0);
 }
-var JSXShorthandString$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R83, "JSXShorthandString /(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var JSXShorthandString$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R84, "JSXShorthandString /(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   return quoteString($0);
 });
 var JSXShorthandString$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(TemplateLiteral), function($skip, $loc, $0, $1) {
@@ -17839,17 +17945,13 @@ var JSXAttributeName$$ = [JSXAttributeName$0, JSXAttributeName$1];
 function JSXAttributeName(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "JSXAttributeName", JSXAttributeName$$);
 }
-var JSXAttributeInitializer$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(CoffeeJSXEnabled), (0, import_lib2.$E)(Whitespace), Equals, (0, import_lib2.$Y)((0, import_lib2.$S)((0, import_lib2.$Q)(NonNewlineWhitespace), EOL)), InsertInlineOpenBrace, PushIndent, (0, import_lib2.$E)(PostfixedExpression), PopIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var JSXAttributeInitializer$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(CoffeeJSXEnabled), (0, import_lib2.$E)(Whitespace), Equals, (0, import_lib2.$Y)((0, import_lib2.$S)((0, import_lib2.$Q)(NonNewlineWhitespace), EOL)), InsertInlineOpenBrace, NestedPostfixedExpressionNoTrailing, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
   var ws1 = $2;
   var equals = $3;
-  var ws2 = $4;
   var open = $5;
-  var indent = $6;
-  var expression = $7;
-  var close = $9;
-  if (!expression)
-    return $skip;
-  return [ws1, equals, ws2, open, indent, expression, close];
+  var expression = $6;
+  var close = $7;
+  return [ws1, equals, open, trimFirstSpace(expression), close];
 });
 var JSXAttributeInitializer$1 = (0, import_lib2.$S)((0, import_lib2.$E)(Whitespace), Equals, (0, import_lib2.$E)(Whitespace), JSXAttributeValue);
 var JSXAttributeInitializer$$ = [JSXAttributeInitializer$0, JSXAttributeInitializer$1];
@@ -17868,7 +17970,7 @@ var JSXAttributeValue$3 = (0, import_lib2.$TS)((0, import_lib2.$S)(InsertInlineO
   }
   return [open, value, close];
 });
-var JSXAttributeValue$4 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R84, `JSXAttributeValue /"[^"]*"|'[^']*'/`));
+var JSXAttributeValue$4 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R85, `JSXAttributeValue /"[^"]*"|'[^']*'/`));
 var JSXAttributeValue$$ = [JSXAttributeValue$0, JSXAttributeValue$1, JSXAttributeValue$2, JSXAttributeValue$3, JSXAttributeValue$4];
 function JSXAttributeValue(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "JSXAttributeValue", JSXAttributeValue$$);
@@ -17881,7 +17983,7 @@ var InlineJSXAttributeValue$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(InlineJ
 function InlineJSXAttributeValue(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "InlineJSXAttributeValue", InlineJSXAttributeValue$0);
 }
-var InlineJSXBinaryOpRHS$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)((0, import_lib2.$EXPECT)($R85, "InlineJSXBinaryOpRHS /[<>]/")), BinaryOp, InlineJSXUnaryExpression), function($skip, $loc, $0, $1, $2, $3) {
+var InlineJSXBinaryOpRHS$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)((0, import_lib2.$EXPECT)($R86, "InlineJSXBinaryOpRHS /[<>]/")), BinaryOp, InlineJSXUnaryExpression), function($skip, $loc, $0, $1, $2, $3) {
   var op = $2;
   var rhs = $3;
   return [[], op, [], rhs];
@@ -17898,7 +18000,7 @@ var InlineJSXUnaryExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, im
 function InlineJSXUnaryExpression(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "InlineJSXUnaryExpression", InlineJSXUnaryExpression$0);
 }
-var InlineJSXUnaryOp$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R86, "InlineJSXUnaryOp /[!~+-](?!\\s|[!~+-]*&)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var InlineJSXUnaryOp$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R87, "InlineJSXUnaryOp /[!~+-](?!\\s|[!~+-]*&)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   return { $loc, token: $0 };
 });
 function InlineJSXUnaryOp(ctx, state2) {
@@ -18149,13 +18251,13 @@ var JSXComment$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXP
 function JSXComment(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "JSXComment", JSXComment$0);
 }
-var JSXCommentContent$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R87, "JSXCommentContent /(?:-[^-]|[^-]*)*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var JSXCommentContent$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R88, "JSXCommentContent /(?:-[^-]|[^-]*)*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   return { $loc, token: $0.replace(/\*\//g, "* /") };
 });
 function JSXCommentContent(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "JSXCommentContent", JSXCommentContent$0);
 }
-var JSXText$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R88, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var JSXText$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R89, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   return {
     type: "JSXText",
     token: $0,
@@ -18689,7 +18791,7 @@ var TypeProperty$0 = (0, import_lib2.$S)((0, import_lib2.$E)((0, import_lib2.$S)
 function TypeProperty(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "TypeProperty", TypeProperty$0);
 }
-var TypeIndexSignature$0 = (0, import_lib2.$S)((0, import_lib2.$E)((0, import_lib2.$S)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R89, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, (0, import_lib2.$E)((0, import_lib2.$S)(__, (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R14, "TypeIndexSignature /[+-]/")), (0, import_lib2.$Y)((0, import_lib2.$S)((0, import_lib2.$E)(_), QuestionMark)))));
+var TypeIndexSignature$0 = (0, import_lib2.$S)((0, import_lib2.$E)((0, import_lib2.$S)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R90, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, (0, import_lib2.$E)((0, import_lib2.$S)(__, (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R14, "TypeIndexSignature /[+-]/")), (0, import_lib2.$Y)((0, import_lib2.$S)((0, import_lib2.$E)(_), QuestionMark)))));
 function TypeIndexSignature(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "TypeIndexSignature", TypeIndexSignature$0);
 }
@@ -19198,7 +19300,7 @@ var TypeWithPostfix$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(TypeConditional
 function TypeWithPostfix(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "TypeWithPostfix", TypeWithPostfix$0);
 }
-var TypeConditional$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$EXPECT)($R90, "TypeConditional /(?=if|unless)/"), TypeIfThenElse), function($skip, $loc, $0, $1, $2, $3) {
+var TypeConditional$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$EXPECT)($R91, "TypeConditional /(?=if|unless)/"), TypeIfThenElse), function($skip, $loc, $0, $1, $2, $3) {
   return prepend($1, expressionizeTypeIf($3));
 });
 var TypeConditional$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(TypeCondition, NotDedented, QuestionMark, __, Type, __, Colon, __, Type), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
@@ -19432,8 +19534,8 @@ function TypeApplicationStart(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "TypeApplicationStart", TypeApplicationStart$$);
 }
 var ForbiddenImplicitTypeCalls$0 = ReservedBinary;
-var ForbiddenImplicitTypeCalls$1 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R91, "ForbiddenImplicitTypeCalls /[|&<!=\\-\u21D2\u2192]/"));
-var ForbiddenImplicitTypeCalls$2 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R92, "ForbiddenImplicitTypeCalls /(extends|not|is)(?!\\p{ID_Continue}|[\\u200C\\u200D$])/"));
+var ForbiddenImplicitTypeCalls$1 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R92, "ForbiddenImplicitTypeCalls /[|&<!=\\-\u21D2\u2192]/"));
+var ForbiddenImplicitTypeCalls$2 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R93, "ForbiddenImplicitTypeCalls /(extends|not|is)(?!\\p{ID_Continue}|[\\u200C\\u200D$])/"));
 var ForbiddenImplicitTypeCalls$$ = [ForbiddenImplicitTypeCalls$0, ForbiddenImplicitTypeCalls$1, ForbiddenImplicitTypeCalls$2];
 function ForbiddenImplicitTypeCalls(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "ForbiddenImplicitTypeCalls", ForbiddenImplicitTypeCalls$$);
@@ -19524,7 +19626,7 @@ var TypeParameters$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenAngleBracket
 function TypeParameters(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "TypeParameters", TypeParameters$0);
 }
-var TypeParameter$0 = (0, import_lib2.$S)(__, (0, import_lib2.$Q)((0, import_lib2.$S)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R93, "TypeParameter /const|in|out/")), _)), Identifier, (0, import_lib2.$E)(TypeConstraint), (0, import_lib2.$E)(TypeInitializer), TypeParameterDelimiter);
+var TypeParameter$0 = (0, import_lib2.$S)(__, (0, import_lib2.$Q)((0, import_lib2.$S)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R94, "TypeParameter /const|in|out/")), _)), Identifier, (0, import_lib2.$E)(TypeConstraint), (0, import_lib2.$E)(TypeInitializer), TypeParameterDelimiter);
 function TypeParameter(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "TypeParameter", TypeParameter$0);
 }
@@ -19551,15 +19653,15 @@ var ThisType$0 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$E)(_),
 function ThisType(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "ThisType", ThisType$0);
 }
-var Shebang$0 = (0, import_lib2.$S)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R94, "Shebang /#![^\\r\\n]*/")), EOL);
+var Shebang$0 = (0, import_lib2.$S)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R95, "Shebang /#![^\\r\\n]*/")), EOL);
 function Shebang(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Shebang", Shebang$0);
 }
-var CivetPrologue$0 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R95, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, SimpleStatementDelimiter, (0, import_lib2.$EXPECT)($R22, "CivetPrologue /[ \\t]*/"), (0, import_lib2.$C)(EOL, (0, import_lib2.$Y)(RestOfLine))), function(value) {
+var CivetPrologue$0 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R96, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, SimpleStatementDelimiter, (0, import_lib2.$EXPECT)($R22, "CivetPrologue /[ \\t]*/"), (0, import_lib2.$C)(EOL, (0, import_lib2.$Y)(RestOfLine))), function(value) {
   var content = value[2];
   return content;
 });
-var CivetPrologue$1 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R95, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, SimpleStatementDelimiter, (0, import_lib2.$EXPECT)($R22, "CivetPrologue /[ \\t]*/"), (0, import_lib2.$C)(EOL, (0, import_lib2.$Y)(RestOfLine))), function(value) {
+var CivetPrologue$1 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R96, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, SimpleStatementDelimiter, (0, import_lib2.$EXPECT)($R22, "CivetPrologue /[ \\t]*/"), (0, import_lib2.$C)(EOL, (0, import_lib2.$Y)(RestOfLine))), function(value) {
   var content = value[2];
   return content;
 });
@@ -19567,7 +19669,7 @@ var CivetPrologue$$ = [CivetPrologue$0, CivetPrologue$1];
 function CivetPrologue(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "CivetPrologue", CivetPrologue$$);
 }
-var CivetPrologueContent$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L246, 'CivetPrologueContent "civet"'), NonIdContinue, (0, import_lib2.$Q)(CivetOption), (0, import_lib2.$EXPECT)($R96, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
+var CivetPrologueContent$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L246, 'CivetPrologueContent "civet"'), NonIdContinue, (0, import_lib2.$Q)(CivetOption), (0, import_lib2.$EXPECT)($R97, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
   var options = $3;
   return {
     type: "CivetPrologue",
@@ -19578,7 +19680,7 @@ var CivetPrologueContent$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import
 function CivetPrologueContent(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "CivetPrologueContent", CivetPrologueContent$0);
 }
-var CivetOption$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R97, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([\\p{ID_Continue}.,+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var CivetOption$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R98, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([\\p{ID_Continue}.,+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   const optionName = $2.replace(/-+([a-z]?)/g, (_2, l) => {
     if (l)
       return l.toUpperCase();
@@ -19601,11 +19703,11 @@ var CivetOption$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R97, "CivetOp
 function CivetOption(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "CivetOption", CivetOption$0);
 }
-var UnknownPrologue$0 = (0, import_lib2.$S)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R95, "UnknownPrologue /[\\t ]*/")), StringLiteral, (0, import_lib2.$TEXT)(SimpleStatementDelimiter), EOS);
+var UnknownPrologue$0 = (0, import_lib2.$S)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R96, "UnknownPrologue /[\\t ]*/")), StringLiteral, (0, import_lib2.$TEXT)(SimpleStatementDelimiter), EOS);
 function UnknownPrologue(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "UnknownPrologue", UnknownPrologue$0);
 }
-var TripleSlashDirective$0 = (0, import_lib2.$S)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R98, "TripleSlashDirective /\\/\\/\\/[^\\r\\n]*/")), (0, import_lib2.$E)(EOS));
+var TripleSlashDirective$0 = (0, import_lib2.$S)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R99, "TripleSlashDirective /\\/\\/\\/[^\\r\\n]*/")), (0, import_lib2.$E)(EOS));
 function TripleSlashDirective(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "TripleSlashDirective", TripleSlashDirective$0);
 }
@@ -19621,13 +19723,13 @@ var PrologueString$$ = [PrologueString$0, PrologueString$1];
 function PrologueString(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "PrologueString", PrologueString$$);
 }
-var EOS$0 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R99, "EOS /(?=[ \\t\\r\\n\\/#]|$)/"), (0, import_lib2.$P)(RestOfLine)), function(value) {
+var EOS$0 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R100, "EOS /(?=[ \\t\\r\\n\\/#]|$)/"), (0, import_lib2.$P)(RestOfLine)), function(value) {
   return value[1];
 });
 function EOS(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "EOS", EOS$0);
 }
-var EOL$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R100, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var EOL$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R101, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   return { $loc, token: $0 };
 });
 function EOL(ctx, state2) {
@@ -19955,6 +20057,7 @@ var Reset$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L0, 'Reset ""'), fu
     coffeeNot: false,
     coffeeOf: false,
     coffeePrototype: false,
+    coffeeRange: false,
     defaultElement: "div",
     globals: [],
     iife: false,
@@ -19998,7 +20101,8 @@ var Reset$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L0, 'Reset ""'), fu
         "coffeeLineContinuation",
         "coffeeNot",
         "coffeeOf",
-        "coffeePrototype"
+        "coffeePrototype",
+        "coffeeRange"
       ]) {
         config[option] = b;
       }
@@ -20041,7 +20145,7 @@ var Prologue$0 = (0, import_lib2.$Q)((0, import_lib2.$C)(TripleSlashDirective, (
 function Prologue(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Prologue", Prologue$0);
 }
-var ProloguePrefix$0 = (0, import_lib2.$S)(Prologue, (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R101, "ProloguePrefix /[^]*/")));
+var ProloguePrefix$0 = (0, import_lib2.$S)(Prologue, (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R102, "ProloguePrefix /[^]*/")));
 function ProloguePrefix(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "ProloguePrefix", ProloguePrefix$0);
 }