@danielx/civet 0.7.13 → 0.7.14

package/dist/main.js

@@ -515,6 +515,7 @@ __export(lib_exports, {
   blockWithPrefix: () => blockWithPrefix,
   convertNamedImportsToObject: () => convertNamedImportsToObject,
   convertObjectToJSXAttributes: () => convertObjectToJSXAttributes,
+  convertWithClause: () => convertWithClause,
   dedentBlockString: () => dedentBlockString,
   dedentBlockSubstitutions: () => dedentBlockSubstitutions,
   deepCopy: () => deepCopy,
@@ -566,6 +567,7 @@ __export(lib_exports, {
   replaceNode: () => replaceNode,
   replaceNodes: () => replaceNodes,
   skipImplicitArguments: () => skipImplicitArguments,
+  trimFirstSpace: () => trimFirstSpace,
   typeOfJSX: () => typeOfJSX,
   wrapIIFE: () => wrapIIFE
 });
@@ -1708,8 +1710,11 @@ function isEmptyBareBlock(node) {
   return bare && (Array.isArray(expressions) && len(expressions, 0) || Array.isArray(expressions) && len(expressions, 1) && Array.isArray(expressions[0]) && expressions[0].length >= 2 && typeof expressions[0][1] === "object" && expressions[0][1] != null && "type" in expressions[0][1] && expressions[0][1].type === "EmptyStatement");
 }
 function isFunction(node) {
-  const { type } = node;
-  return type === "FunctionExpression" || type === "ArrowFunction" || type === "MethodDefinition" || !!node.async;
+  if (node && typeof node === "object" && "type" in node) {
+    const { type } = node;
+    return type === "FunctionExpression" || type === "ArrowFunction" || type === "MethodDefinition";
+  }
+  return false;
 }
 var statementTypes = /* @__PURE__ */ new Set([
   "BlockStatement",
@@ -1808,10 +1813,15 @@ function insertTrimmingSpace(target, c) {
       ...target,
       token: target.token.replace(/^ ?/, c)
     };
+  } else if (typeof target === "string") {
+    return target.replace(/^ ?/, c);
   } else {
     return target;
   }
 }
+function trimFirstSpace(target) {
+  return insertTrimmingSpace(target, "");
+}
 function inplaceInsertTrimmingSpace(target, c) {
   if (!(target != null)) {
     return target;
@@ -2232,7 +2242,11 @@ function gatherNodes(node, predicate) {
       });
     }
     default: {
-      return gatherNodes(node.children, predicate);
+      return gatherNodes(
+        //@ts-ignore
+        node.children,
+        predicate
+      );
     }
   }
 }
@@ -2243,12 +2257,18 @@ function gatherRecursive(node, predicate, skipPredicate) {
   if (Array.isArray(node)) {
     return node.flatMap(($) => gatherRecursive($, predicate, skipPredicate));
   }
-  if (skipPredicate?.(node))
+  if (skipPredicate?.(node)) {
     return [];
+  }
   if (predicate(node)) {
     return [node];
   }
-  return gatherRecursive(node.children, predicate, skipPredicate);
+  return gatherRecursive(
+    //@ts-ignore
+    node.children,
+    predicate,
+    skipPredicate
+  );
 }
 function gatherRecursiveAll(node, predicate) {
   if (node == null || typeof node === "string") {
@@ -2257,7 +2277,11 @@ function gatherRecursiveAll(node, predicate) {
   if (Array.isArray(node)) {
     return node.flatMap((n) => gatherRecursiveAll(n, predicate));
   }
-  const nodes = gatherRecursiveAll(node.children, predicate);
+  const nodes = gatherRecursiveAll(
+    //@ts-ignore
+    node.children,
+    predicate
+  );
   if (predicate(node)) {
     nodes.push(node);
   }
@@ -2670,15 +2694,6 @@ var declareHelper = {
       ";\n"
     ]]);
   },
-  returnSymbol(ref) {
-    state.prelude.push(["", [
-      // [indent, statement]
-      preludeVar,
-      ref,
-      ` = Symbol("return")';
-`
-    ]]);
-  },
   concatAssign(ref) {
     state.prelude.push(["", [
       // [indent, statement]
@@ -3625,6 +3640,39 @@ function dynamizeImportDeclarationExpression($0) {
     ]
   });
 }
+function convertWithClause(withClause, extendsClause) {
+  let extendsToken, extendsTarget, ws;
+  if (extendsClause) {
+    [extendsToken, ws, extendsTarget] = extendsClause;
+  } else {
+    extendsToken = {
+      type: "Extends",
+      children: [" extends"]
+    };
+    ws = "";
+    extendsTarget = "Object";
+  }
+  const wrapped = withClause.targets.reduce(
+    (extendsTarget2, [wsNext, withTarget]) => {
+      const args = [extendsTarget2];
+      const exp = {
+        type: "CallExpression",
+        children: [
+          makeLeftHandSideExpression(withTarget),
+          {
+            type: "Call",
+            args,
+            children: ["(", trimFirstSpace(ws), args, ")"]
+          }
+        ]
+      };
+      ws = wsNext;
+      return exp;
+    },
+    extendsTarget
+  );
+  return [extendsToken, insertTrimmingSpace(ws, " "), wrapped];
+}
 
 // source/parser/unary.civet
 function processUnaryExpression(pre, exp, post) {
@@ -4712,7 +4760,7 @@ function getIndentOfBlockString(str, tab) {
       minLevel = level;
     }
   }
-  if (minLevel == Infinity) {
+  if (minLevel === Infinity) {
     minLevel = 0;
   }
   return minLevel;
@@ -4758,7 +4806,7 @@ function dedentBlockSubstitutions($0, tab) {
   if (/^[ \t]*\r?\n/.test(stringPart)) {
     ref1 = getIndentOfBlockString(stringPart, tab);
   } else {
-    ref1 = false;
+    ref1 = void 0;
   }
   ;
   const dedent = ref1;
@@ -4784,21 +4832,39 @@ function dedentBlockSubstitutions($0, tab) {
   };
 }
 function processCoffeeInterpolation(s, parts, e, $loc) {
-  if (parts.length === 0 || parts.length === 1 && parts[0].token != null) {
+  if (parts.length === 0) {
     return {
       type: "StringLiteral",
-      token: parts.length ? `"${modifyString(parts[0].token)}"` : '""',
+      token: '""',
       $loc
     };
   }
-  parts.forEach((part) => {
-    if (part.token) {
-      const str = part.token.replace(/(`|\$\{)/g, "\\$1");
-      return part.token = modifyString(str);
+  if (parts.length === 1) {
+    let ref2;
+    if ((ref2 = parts[0]) && typeof ref2 === "object" && "token" in ref2) {
+      const { token } = ref2;
+      return {
+        type: "StringLiteral",
+        token: `"${modifyString(token)}"`,
+        $loc
+      };
+    }
+  }
+  const results2 = [];
+  for (let i4 = 0, len3 = parts.length; i4 < len3; i4++) {
+    const part = parts[i4];
+    if ("token" in part) {
+      const token = modifyString(part.token.replace(/(`|\$\{)/g, "\\$1"));
+      results2.push({
+        ...part,
+        token
+      });
+    } else {
+      results2.push(part);
     }
-    ;
-    return;
-  });
+  }
+  ;
+  parts = results2;
   s.token = e.token = "`";
   return {
     type: "TemplateLiteral",
@@ -6293,6 +6359,7 @@ var grammar = {
   ClassBinding,
   ClassHeritage,
   ExtendsClause,
+  WithClause,
   ExtendsToken,
   ExtendsShorthand,
   NotExtendsToken,
@@ -6762,6 +6829,7 @@ var grammar = {
   Void,
   When,
   While,
+  With,
   Yield,
   JSXImplicitFragment,
   JSXTag,
@@ -6829,6 +6897,7 @@ var grammar = {
   Module,
   Namespace,
   InterfaceBlock,
+  NestedInterfaceBlock,
   NestedInterfaceProperties,
   NestedInterfaceProperty,
   InterfaceProperty,
@@ -6970,15 +7039,15 @@ var $L13 = (0, import_lib3.$L)("=>");
 var $L14 = (0, import_lib3.$L)("\u21D2");
 var $L15 = (0, import_lib3.$L)("import");
 var $L16 = (0, import_lib3.$L)(":");
-var $L17 = (0, import_lib3.$L)(" ");
-var $L18 = (0, import_lib3.$L)("<");
-var $L19 = (0, import_lib3.$L)("implements");
-var $L20 = (0, import_lib3.$L)("<:");
-var $L21 = (0, import_lib3.$L)("^");
-var $L22 = (0, import_lib3.$L)("-");
-var $L23 = (0, import_lib3.$L)("import.meta");
-var $L24 = (0, import_lib3.$L)("return.value");
-var $L25 = (0, import_lib3.$L)(",");
+var $L17 = (0, import_lib3.$L)(",");
+var $L18 = (0, import_lib3.$L)(" ");
+var $L19 = (0, import_lib3.$L)("<");
+var $L20 = (0, import_lib3.$L)("implements");
+var $L21 = (0, import_lib3.$L)("<:");
+var $L22 = (0, import_lib3.$L)("^");
+var $L23 = (0, import_lib3.$L)("-");
+var $L24 = (0, import_lib3.$L)("import.meta");
+var $L25 = (0, import_lib3.$L)("return.value");
 var $L26 = (0, import_lib3.$L)("tighter");
 var $L27 = (0, import_lib3.$L)("looser");
 var $L28 = (0, import_lib3.$L)("same");
@@ -8236,8 +8305,24 @@ var ClassBinding$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$N)
 function ClassBinding(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "ClassBinding", ClassBinding$0);
 }
-var ClassHeritage$0 = (0, import_lib3.$S)(ExtendsClause, (0, import_lib3.$E)(ImplementsClause));
-var ClassHeritage$1 = ImplementsClause;
+var ClassHeritage$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(ExtendsClause, (0, import_lib3.$E)(WithClause), (0, import_lib3.$E)(ImplementsClause)), function($skip, $loc, $0, $1, $2, $3) {
+  var extendsClause = $1;
+  var withClause = $2;
+  var implementsClause = $3;
+  if (withClause) {
+    extendsClause = convertWithClause(withClause, extendsClause);
+  }
+  return [extendsClause, implementsClause];
+});
+var ClassHeritage$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(WithClause), (0, import_lib3.$E)(ImplementsClause)), function($skip, $loc, $0, $1, $2) {
+  var withClause = $1;
+  var implementsClause = $2;
+  if (withClause)
+    return [convertWithClause(withClause), implementsClause];
+  if (implementsClause)
+    return implementsClause;
+  return $skip;
+});
 var ClassHeritage$$ = [ClassHeritage$0, ClassHeritage$1];
 function ClassHeritage(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "ClassHeritage", ClassHeritage$$);
@@ -8246,7 +8331,20 @@ var ExtendsClause$0 = (0, import_lib3.$S)(ExtendsToken, __, ExtendsTarget);
 function ExtendsClause(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "ExtendsClause", ExtendsClause$0);
 }
-var ExtendsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, (0, import_lib3.$E)(_), ExtendsShorthand, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'ExtendsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
+var WithClause$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(__, With, __, ExtendsTarget, (0, import_lib3.$Q)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L17, 'WithClause ","'), __, ExtendsTarget))), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var ws = $3;
+  var t = $4;
+  var rest = $5;
+  return {
+    type: "WithClause",
+    children: $0,
+    targets: [[ws, t], ...rest.map(([_comma, ws2, target]) => [ws2, target])]
+  };
+});
+function WithClause(ctx, state2) {
+  return (0, import_lib3.$EVENT)(ctx, state2, "WithClause", WithClause$0);
+}
+var ExtendsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, (0, import_lib3.$E)(_), ExtendsShorthand, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L18, 'ExtendsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
   var l = $1;
   var ws = $2;
   var t = $3;
@@ -8268,13 +8366,13 @@ var ExtendsToken$$ = [ExtendsToken$0, ExtendsToken$1];
 function ExtendsToken(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "ExtendsToken", ExtendsToken$$);
 }
-var ExtendsShorthand$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L18, 'ExtendsShorthand "<"'), function($skip, $loc, $0, $1) {
+var ExtendsShorthand$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L19, 'ExtendsShorthand "<"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "extends " };
 });
 function ExtendsShorthand(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "ExtendsShorthand", ExtendsShorthand$0);
 }
-var NotExtendsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, (0, import_lib3.$E)(_), OmittedNegation, ExtendsShorthand, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'NotExtendsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+var NotExtendsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, (0, import_lib3.$E)(_), OmittedNegation, ExtendsShorthand, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L18, 'NotExtendsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var l = $1;
   var ws1 = $2;
   var ws2 = $3;
@@ -8300,7 +8398,7 @@ function NotExtendsToken(ctx, state2) {
 var OmittedNegation$0 = (0, import_lib3.$T)((0, import_lib3.$S)(ExclamationPoint), function(value) {
   return "";
 });
-var OmittedNegation$1 = (0, import_lib3.$T)((0, import_lib3.$S)(Not, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'OmittedNegation " "')), (0, import_lib3.$E)(_)), function(value) {
+var OmittedNegation$1 = (0, import_lib3.$T)((0, import_lib3.$S)(Not, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L18, 'OmittedNegation " "')), (0, import_lib3.$E)(_)), function(value) {
   return value[2];
 });
 var OmittedNegation$$ = [OmittedNegation$0, OmittedNegation$1];
@@ -8323,7 +8421,7 @@ var ImplementsClause$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(ImplementsToke
 function ImplementsClause(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "ImplementsClause", ImplementsClause$0);
 }
-var ImplementsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, __, ImplementsShorthand, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'ImplementsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
+var ImplementsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, __, ImplementsShorthand, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L18, 'ImplementsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
   var l = $1;
   var ws = $2;
   var token = $3;
@@ -8333,7 +8431,7 @@ var ImplementsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, __, Implem
   }
   return { children };
 });
-var ImplementsToken$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(__, (0, import_lib3.$EXPECT)($L19, 'ImplementsToken "implements"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
+var ImplementsToken$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(__, (0, import_lib3.$EXPECT)($L20, 'ImplementsToken "implements"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
   $2 = { $loc, token: $2 };
   return [$1, $2];
 });
@@ -8341,7 +8439,7 @@ var ImplementsToken$$ = [ImplementsToken$0, ImplementsToken$1];
 function ImplementsToken(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "ImplementsToken", ImplementsToken$$);
 }
-var ImplementsShorthand$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L20, 'ImplementsShorthand "<:"'), function($skip, $loc, $0, $1) {
+var ImplementsShorthand$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L21, 'ImplementsShorthand "<:"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "implements " };
 });
 function ImplementsShorthand(ctx, state2) {
@@ -8690,7 +8788,7 @@ var OptionalDot$$ = [OptionalDot$0, OptionalDot$1];
 function OptionalDot(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "OptionalDot", OptionalDot$$);
 }
-var NonNullAssertion$0 = (0, import_lib3.$T)((0, import_lib3.$S)(ExclamationPoint, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($L21, 'NonNullAssertion "^"'))), function(value) {
+var NonNullAssertion$0 = (0, import_lib3.$T)((0, import_lib3.$S)(ExclamationPoint, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($L22, 'NonNullAssertion "^"'))), function(value) {
   return { "type": "NonNullAssertion", "ts": true, "children": [value[0]] };
 });
 function NonNullAssertion(ctx, state2) {
@@ -8898,7 +8996,7 @@ var PropertyAccess$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(AccessStart, (0,
     ]
   };
 });
-var PropertyAccess$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(AccessStart, (0, import_lib3.$EXPECT)($L22, 'PropertyAccess "-"'), IntegerLiteral), function($skip, $loc, $0, $1, $2, $3) {
+var PropertyAccess$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(AccessStart, (0, import_lib3.$EXPECT)($L23, 'PropertyAccess "-"'), IntegerLiteral), function($skip, $loc, $0, $1, $2, $3) {
   var dot = $1;
   var neg = $2;
   var num = $3;
@@ -9005,7 +9103,7 @@ function SuperProperty(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "SuperProperty", SuperProperty$$);
 }
 var MetaProperty$0 = (0, import_lib3.$S)(New, Dot, Target);
-var MetaProperty$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L23, 'MetaProperty "import.meta"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var MetaProperty$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L24, 'MetaProperty "import.meta"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 var MetaProperty$2 = ReturnValue;
@@ -9013,7 +9111,7 @@ var MetaProperty$$ = [MetaProperty$0, MetaProperty$1, MetaProperty$2];
 function MetaProperty(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "MetaProperty", MetaProperty$$);
 }
-var ReturnValue$0 = (0, import_lib3.$TV)((0, import_lib3.$C)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L24, 'ReturnValue "return.value"'), NonIdContinue), (0, import_lib3.$S)(Return, (0, import_lib3.$Y)(AfterReturnShorthand))), function($skip, $loc, $0, $1) {
+var ReturnValue$0 = (0, import_lib3.$TV)((0, import_lib3.$C)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L25, 'ReturnValue "return.value"'), NonIdContinue), (0, import_lib3.$S)(Return, (0, import_lib3.$Y)(AfterReturnShorthand))), function($skip, $loc, $0, $1) {
   return { type: "ReturnValue", children: [$1[0]] };
 });
 function ReturnValue(ctx, state2) {
@@ -9542,7 +9640,7 @@ var BindingElement$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.
     children: [ws, binding]
   };
 });
-var BindingElement$2 = (0, import_lib3.$TV)((0, import_lib3.$Y)((0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$EXPECT)($L25, 'BindingElement ","'))), function($skip, $loc, $0, $1) {
+var BindingElement$2 = (0, import_lib3.$TV)((0, import_lib3.$Y)((0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$EXPECT)($L17, 'BindingElement ","'))), function($skip, $loc, $0, $1) {
   return {
     children: [{
       type: "ElisionElement",
@@ -11456,7 +11554,7 @@ var BinaryOpSymbol$5 = (0, import_lib3.$TV)((0, import_lib3.$C)((0, import_lib3.
   };
 });
 var BinaryOpSymbol$6 = (0, import_lib3.$EXPECT)($L69, 'BinaryOpSymbol "+"');
-var BinaryOpSymbol$7 = (0, import_lib3.$EXPECT)($L22, 'BinaryOpSymbol "-"');
+var BinaryOpSymbol$7 = (0, import_lib3.$EXPECT)($L23, 'BinaryOpSymbol "-"');
 var BinaryOpSymbol$8 = (0, import_lib3.$EXPECT)($L70, 'BinaryOpSymbol "<="');
 var BinaryOpSymbol$9 = (0, import_lib3.$T)((0, import_lib3.$EXPECT)($L71, 'BinaryOpSymbol "\u2264"'), function(value) {
   return "<=";
@@ -11486,7 +11584,7 @@ var BinaryOpSymbol$14 = (0, import_lib3.$EXPECT)($L76, 'BinaryOpSymbol "<<"');
 var BinaryOpSymbol$15 = (0, import_lib3.$T)((0, import_lib3.$EXPECT)($L77, 'BinaryOpSymbol "\xAB"'), function(value) {
   return "<<";
 });
-var BinaryOpSymbol$16 = (0, import_lib3.$EXPECT)($L18, 'BinaryOpSymbol "<"');
+var BinaryOpSymbol$16 = (0, import_lib3.$EXPECT)($L19, 'BinaryOpSymbol "<"');
 var BinaryOpSymbol$17 = (0, import_lib3.$EXPECT)($L78, 'BinaryOpSymbol ">>>"');
 var BinaryOpSymbol$18 = (0, import_lib3.$T)((0, import_lib3.$EXPECT)($L79, 'BinaryOpSymbol "\u22D9"'), function(value) {
   return ">>>";
@@ -11625,7 +11723,7 @@ var BinaryOpSymbol$47 = (0, import_lib3.$TS)((0, import_lib3.$S)(Is), function($
 });
 var BinaryOpSymbol$48 = In;
 var BinaryOpSymbol$49 = (0, import_lib3.$EXPECT)($L108, 'BinaryOpSymbol "&"');
-var BinaryOpSymbol$50 = (0, import_lib3.$EXPECT)($L21, 'BinaryOpSymbol "^"');
+var BinaryOpSymbol$50 = (0, import_lib3.$EXPECT)($L22, 'BinaryOpSymbol "^"');
 var BinaryOpSymbol$51 = (0, import_lib3.$EXPECT)($L109, 'BinaryOpSymbol "|"');
 var BinaryOpSymbol$$ = [BinaryOpSymbol$0, BinaryOpSymbol$1, BinaryOpSymbol$2, BinaryOpSymbol$3, BinaryOpSymbol$4, BinaryOpSymbol$5, BinaryOpSymbol$6, BinaryOpSymbol$7, BinaryOpSymbol$8, BinaryOpSymbol$9, BinaryOpSymbol$10, BinaryOpSymbol$11, BinaryOpSymbol$12, BinaryOpSymbol$13, BinaryOpSymbol$14, BinaryOpSymbol$15, BinaryOpSymbol$16, BinaryOpSymbol$17, BinaryOpSymbol$18, BinaryOpSymbol$19, BinaryOpSymbol$20, BinaryOpSymbol$21, BinaryOpSymbol$22, BinaryOpSymbol$23, BinaryOpSymbol$24, BinaryOpSymbol$25, BinaryOpSymbol$26, BinaryOpSymbol$27, BinaryOpSymbol$28, BinaryOpSymbol$29, BinaryOpSymbol$30, BinaryOpSymbol$31, BinaryOpSymbol$32, BinaryOpSymbol$33, BinaryOpSymbol$34, BinaryOpSymbol$35, BinaryOpSymbol$36, BinaryOpSymbol$37, BinaryOpSymbol$38, BinaryOpSymbol$39, BinaryOpSymbol$40, BinaryOpSymbol$41, BinaryOpSymbol$42, BinaryOpSymbol$43, BinaryOpSymbol$44, BinaryOpSymbol$45, BinaryOpSymbol$46, BinaryOpSymbol$47, BinaryOpSymbol$48, BinaryOpSymbol$49, BinaryOpSymbol$50, BinaryOpSymbol$51];
 function BinaryOpSymbol(ctx, state2) {
@@ -11718,7 +11816,7 @@ var UnaryOp$2 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$C)(Del
     return [op, [" "]];
   return [op, ws];
 });
-var UnaryOp$3 = (0, import_lib3.$T)((0, import_lib3.$S)(Not, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R23, "UnaryOp /[:.]/")), (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'UnaryOp " "')), (0, import_lib3.$E)(_)), function(value) {
+var UnaryOp$3 = (0, import_lib3.$T)((0, import_lib3.$S)(Not, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R23, "UnaryOp /[:.]/")), (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L18, 'UnaryOp " "')), (0, import_lib3.$E)(_)), function(value) {
   return [value[0], value[3]];
 });
 var UnaryOp$$ = [UnaryOp$0, UnaryOp$1, UnaryOp$2, UnaryOp$3];
@@ -13141,7 +13239,7 @@ function OperatorImportSpecifier(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "OperatorImportSpecifier", OperatorImportSpecifier$$);
 }
 var ImportAsToken$0 = (0, import_lib3.$S)(__, As);
-var ImportAsToken$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, __, Colon, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'ImportAsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
+var ImportAsToken$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, __, Colon, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L18, 'ImportAsToken " "'))), function($skip, $loc, $0, $1, $2, $3, $4) {
   var l = $1;
   var ws = $2;
   var c = $3;
@@ -13914,7 +14012,7 @@ var Loc$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L0, 'Loc ""'), functi
 function Loc(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "Loc", Loc$0);
 }
-var Abstract$0 = (0, import_lib3.$TV)((0, import_lib3.$TEXT)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L126, 'Abstract "abstract"'), NonIdContinue, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'Abstract " "')))), function($skip, $loc, $0, $1) {
+var Abstract$0 = (0, import_lib3.$TV)((0, import_lib3.$TEXT)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L126, 'Abstract "abstract"'), NonIdContinue, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L18, 'Abstract " "')))), function($skip, $loc, $0, $1) {
   return { $loc, token: $1, ts: true };
 });
 function Abstract(ctx, state2) {
@@ -13968,7 +14066,7 @@ var By$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L1
 function By(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "By", By$0);
 }
-var Caret$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L21, 'Caret "^"'), function($skip, $loc, $0, $1) {
+var Caret$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L22, 'Caret "^"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function Caret(ctx, state2) {
@@ -14028,7 +14126,7 @@ var Colon$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)(
 function Colon(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "Colon", Colon$0);
 }
-var Comma$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L25, 'Comma ","'), function($skip, $loc, $0, $1) {
+var Comma$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L17, 'Comma ","'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function Comma(ctx, state2) {
@@ -14188,7 +14286,7 @@ var Hash$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L160, 'Hash "#"'), f
 function Hash(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "Hash", Hash$0);
 }
-var If$0 = (0, import_lib3.$TV)((0, import_lib3.$TEXT)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L161, 'If "if"'), NonIdContinue, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L17, 'If " "')))), function($skip, $loc, $0, $1) {
+var If$0 = (0, import_lib3.$TV)((0, import_lib3.$TEXT)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L161, 'If "if"'), NonIdContinue, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($L18, 'If " "')))), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function If(ctx, state2) {
@@ -14266,7 +14364,7 @@ var Of$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L1
 function Of(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "Of", Of$0);
 }
-var OpenAngleBracket$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L18, 'OpenAngleBracket "<"'), function($skip, $loc, $0, $1) {
+var OpenAngleBracket$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L19, 'OpenAngleBracket "<"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function OpenAngleBracket(ctx, state2) {
@@ -14517,6 +14615,12 @@ var While$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)(
 function While(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "While", While$0);
 }
+var With$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L116, 'With "with"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  return { $loc, token: $1 };
+});
+function With(ctx, state2) {
+  return (0, import_lib3.$EVENT)(ctx, state2, "With", With$0);
+}
 var Yield$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L211, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1, type: "Yield" };
 });
@@ -14596,7 +14700,7 @@ var JSXElement$$ = [JSXElement$0, JSXElement$1, JSXElement$2];
 function JSXElement(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "JSXElement", JSXElement$$);
 }
-var JSXSelfClosingElement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L18, 'JSXSelfClosingElement "<"'), JSXElementName, (0, import_lib3.$E)(TypeArguments), (0, import_lib3.$E)(JSXAttributes), (0, import_lib3.$E)(Whitespace), (0, import_lib3.$EXPECT)($L212, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+var JSXSelfClosingElement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L19, 'JSXSelfClosingElement "<"'), JSXElementName, (0, import_lib3.$E)(TypeArguments), (0, import_lib3.$E)(JSXAttributes), (0, import_lib3.$E)(Whitespace), (0, import_lib3.$EXPECT)($L212, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
   return { type: "JSXElement", children: $0, tag: $2 };
 });
 function JSXSelfClosingElement(ctx, state2) {
@@ -14615,7 +14719,7 @@ var PopJSXStack$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L0, 'PopJSXSt
 function PopJSXStack(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "PopJSXStack", PopJSXStack$0);
 }
-var JSXOpeningElement$0 = (0, import_lib3.$S)((0, import_lib3.$EXPECT)($L18, 'JSXOpeningElement "<"'), JSXElementName, (0, import_lib3.$E)(TypeArguments), (0, import_lib3.$E)(JSXAttributes), (0, import_lib3.$E)(Whitespace), (0, import_lib3.$EXPECT)($L44, 'JSXOpeningElement ">"'));
+var JSXOpeningElement$0 = (0, import_lib3.$S)((0, import_lib3.$EXPECT)($L19, 'JSXOpeningElement "<"'), JSXElementName, (0, import_lib3.$E)(TypeArguments), (0, import_lib3.$E)(JSXAttributes), (0, import_lib3.$E)(Whitespace), (0, import_lib3.$EXPECT)($L44, 'JSXOpeningElement ">"'));
 function JSXOpeningElement(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "JSXOpeningElement", JSXOpeningElement$0);
 }
@@ -15385,11 +15489,15 @@ function Namespace(ctx, state2) {
 }
 var InterfaceBlock$0 = (0, import_lib3.$S)(__, OpenBrace, NestedInterfaceProperties, __, CloseBrace);
 var InterfaceBlock$1 = (0, import_lib3.$S)(__, OpenBrace, (0, import_lib3.$Q)((0, import_lib3.$S)(__, InterfaceProperty)), __, CloseBrace);
-var InterfaceBlock$2 = (0, import_lib3.$S)(InsertOpenBrace, NestedInterfaceProperties, InsertNewline, InsertIndent, InsertCloseBrace);
+var InterfaceBlock$2 = NestedInterfaceBlock;
 var InterfaceBlock$$ = [InterfaceBlock$0, InterfaceBlock$1, InterfaceBlock$2];
 function InterfaceBlock(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "InterfaceBlock", InterfaceBlock$$);
 }
+var NestedInterfaceBlock$0 = (0, import_lib3.$S)(InsertOpenBrace, NestedInterfaceProperties, InsertNewline, InsertIndent, InsertCloseBrace);
+function NestedInterfaceBlock(ctx, state2) {
+  return (0, import_lib3.$EVENT)(ctx, state2, "NestedInterfaceBlock", NestedInterfaceBlock$0);
+}
 var NestedInterfaceProperties$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$Q)(NestedInterfaceProperty), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
   var props = $2;
   if (props.length)
@@ -15628,9 +15736,7 @@ var TypeSuffix$$ = [TypeSuffix$0, TypeSuffix$1, TypeSuffix$2];
 function TypeSuffix(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeSuffix", TypeSuffix$$);
 }
-var MaybeNestedType$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$N)((0, import_lib3.$S)(__, OpenBrace)), InterfaceBlock), function(value) {
-  return value[1];
-});
+var MaybeNestedType$0 = NestedInterfaceBlock;
 var MaybeNestedType$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, Type)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
   if (!$2)
     return $skip;
@@ -15892,9 +15998,9 @@ function NestedType(ctx, state2) {
 var TypeConditional$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$EXPECT)($R85, "TypeConditional /(?=if|unless)/"), TypeIfThenElse), function($skip, $loc, $0, $1, $2, $3) {
   return [$1, expressionizeTypeIf($3)];
 });
-var TypeConditional$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(TypeCondition, NotDedented, QuestionMark, Type, __, Colon, Type), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+var TypeConditional$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(TypeCondition, NotDedented, QuestionMark, __, Type, __, Colon, __, Type), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   if ($1.negated)
-    return [$1, $2, $3, $7, $5, $6, $4];
+    return [$1, $2, $3, $4, $9, $6, $7, $8, $5];
   return $0;
 });
 var TypeConditional$2 = TypeBinary;
@@ -15930,12 +16036,13 @@ var TypeBlock$0 = (0, import_lib3.$T)((0, import_lib3.$S)(Then, Type), function(
 var TypeBlock$1 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$N)(EOS), Type), function(value) {
   return value[1];
 });
-var TypeBlock$2 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, Type)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+var TypeBlock$2 = NestedInterfaceBlock;
+var TypeBlock$3 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, Type)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
   if (!$2)
     return $skip;
   return $2;
 });
-var TypeBlock$$ = [TypeBlock$0, TypeBlock$1, TypeBlock$2];
+var TypeBlock$$ = [TypeBlock$0, TypeBlock$1, TypeBlock$2, TypeBlock$3];
 function TypeBlock(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeBlock", TypeBlock$$);
 }