@danielx/civet 0.7.13 → 0.7.14

package/dist/astro.js

@@ -100,6 +100,7 @@ var rawPlugin = (options = {}, meta) => {
   let compilerOptions, compilerOptionsWithSourceMap;
   let rootDir = process.cwd();
   let esbuildOptions;
+  let configErrors;
   const tsPromise = transformTS || options.ts === "tsc" ? import("typescript").then((m) => m.default) : null;
   const getFormatHost = (sys) => {
     return {
@@ -140,12 +141,13 @@ var rawPlugin = (options = {}, meta) => {
           ts.sys,
           process.cwd()
         );
+        configErrors = configContents.errors;
         compilerOptions = {
           ...configContents.options,
           target: ts.ScriptTarget.ESNext,
           composite: false
         };
-        compilerOptions.jsx ?? (compilerOptions.jsx = "preserve");
+        compilerOptions.jsx ?? (compilerOptions.jsx = ts.JsxEmit.Preserve);
         compilerOptionsWithSourceMap = {
           ...compilerOptions,
           sourceMap: true
@@ -166,6 +168,31 @@ var rawPlugin = (options = {}, meta) => {
           return systemFileExists(filename.slice(0, -4));
         };
         system.readFile = (filename, encoding = "utf-8") => {
+          if (import_path.default.basename(filename) === "package.json") {
+            let recurse2 = function(node) {
+              if (node && typeof node === "object") {
+                for (const key in node) {
+                  const value = node[key];
+                  if (typeof value === "string") {
+                    if (value.endsWith(".civet")) {
+                      node[key] = value + ".tsx";
+                      modified = true;
+                    }
+                  } else if (value) {
+                    recurse2(value);
+                  }
+                }
+              }
+            };
+            var recurse = recurse2;
+            const json = systemReadFile(filename);
+            if (!json)
+              return json;
+            const parsed = JSON.parse(json);
+            let modified = false;
+            recurse2(parsed.imports);
+            return modified ? JSON.stringify(parsed) : json;
+          }
           if (!filename.endsWith(".civet.tsx"))
             return systemReadFile(filename);
           if (fsMap.has(filename))
@@ -216,6 +243,9 @@ var rawPlugin = (options = {}, meta) => {
             start: range.start
           };
         });
+        if (configErrors?.length) {
+          diagnostics.unshift(...configErrors);
+        }
         if (diagnostics.length > 0) {
           console.error(
             ts.formatDiagnosticsWithColorAndContext(

package/dist/browser.js

@@ -522,6 +522,7 @@ ${body}`;
     blockWithPrefix: () => blockWithPrefix,
     convertNamedImportsToObject: () => convertNamedImportsToObject,
     convertObjectToJSXAttributes: () => convertObjectToJSXAttributes,
+    convertWithClause: () => convertWithClause,
     dedentBlockString: () => dedentBlockString,
     dedentBlockSubstitutions: () => dedentBlockSubstitutions,
     deepCopy: () => deepCopy,
@@ -573,6 +574,7 @@ ${body}`;
     replaceNode: () => replaceNode,
     replaceNodes: () => replaceNodes,
     skipImplicitArguments: () => skipImplicitArguments,
+    trimFirstSpace: () => trimFirstSpace,
     typeOfJSX: () => typeOfJSX,
     wrapIIFE: () => wrapIIFE
   });
@@ -1715,8 +1717,11 @@ ${body}`;
     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",
@@ -1815,10 +1820,15 @@ ${body}`;
         ...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;
@@ -2239,7 +2249,11 @@ ${body}`;
         });
       }
       default: {
-        return gatherNodes(node.children, predicate);
+        return gatherNodes(
+          //@ts-ignore
+          node.children,
+          predicate
+        );
       }
     }
   }
@@ -2250,12 +2264,18 @@ ${body}`;
     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") {
@@ -2264,7 +2284,11 @@ ${body}`;
     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);
     }
@@ -2677,15 +2701,6 @@ ${body}`;
         ";\n"
       ]]);
     },
-    returnSymbol(ref) {
-      state.prelude.push(["", [
-        // [indent, statement]
-        preludeVar,
-        ref,
-        ` = Symbol("return")';
-`
-      ]]);
-    },
     concatAssign(ref) {
       state.prelude.push(["", [
         // [indent, statement]
@@ -3632,6 +3647,39 @@ ${body}`;
       ]
     });
   }
+  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) {
@@ -4734,7 +4782,7 @@ ${js}`
         minLevel = level;
       }
     }
-    if (minLevel == Infinity) {
+    if (minLevel === Infinity) {
       minLevel = 0;
     }
     return minLevel;
@@ -4780,7 +4828,7 @@ ${js}`
     if (/^[ \t]*\r?\n/.test(stringPart)) {
       ref1 = getIndentOfBlockString(stringPart, tab);
     } else {
-      ref1 = false;
+      ref1 = void 0;
     }
     ;
     const dedent = ref1;
@@ -4806,21 +4854,39 @@ ${js}`
     };
   }
   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",
@@ -6315,6 +6381,7 @@ ${js}`
     ClassBinding,
     ClassHeritage,
     ExtendsClause,
+    WithClause,
     ExtendsToken,
     ExtendsShorthand,
     NotExtendsToken,
@@ -6784,6 +6851,7 @@ ${js}`
     Void,
     When,
     While,
+    With,
     Yield,
     JSXImplicitFragment,
     JSXTag,
@@ -6851,6 +6919,7 @@ ${js}`
     Module,
     Namespace,
     InterfaceBlock,
+    NestedInterfaceBlock,
     NestedInterfaceProperties,
     NestedInterfaceProperty,
     InterfaceProperty,
@@ -6992,15 +7061,15 @@ ${js}`
   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");
@@ -8258,8 +8327,24 @@ ${js}`
   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$$);
@@ -8268,7 +8353,20 @@ ${js}`
   function ExtendsClause(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ExtendsClause", ExtendsClause$0);
   }
-  var ExtendsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, (0, import_lib3.$E)(_), ExtendsShorthand, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($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;
@@ -8290,13 +8388,13 @@ ${js}`
   function ExtendsToken(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "ExtendsToken", ExtendsToken$$);
   }
-  var ExtendsShorthand$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($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;
@@ -8322,7 +8420,7 @@ ${js}`
   var OmittedNegation$0 = (0, import_lib3.$T)((0, import_lib3.$S)(ExclamationPoint), function(value) {
     return "";
   });
-  var OmittedNegation$1 = (0, import_lib3.$T)((0, import_lib3.$S)(Not, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($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];
@@ -8345,7 +8443,7 @@ ${js}`
   function ImplementsClause(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ImplementsClause", ImplementsClause$0);
   }
-  var ImplementsToken$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, __, ImplementsShorthand, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($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;
@@ -8355,7 +8453,7 @@ ${js}`
     }
     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];
   });
@@ -8363,7 +8461,7 @@ ${js}`
   function ImplementsToken(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "ImplementsToken", ImplementsToken$$);
   }
-  var ImplementsShorthand$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($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) {
@@ -8712,7 +8810,7 @@ ${js}`
   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) {
@@ -8920,7 +9018,7 @@ ${js}`
       ]
     };
   });
-  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;
@@ -9027,7 +9125,7 @@ ${js}`
     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;
@@ -9035,7 +9133,7 @@ ${js}`
   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) {
@@ -9564,7 +9662,7 @@ ${js}`
       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",
@@ -11478,7 +11576,7 @@ ${js}`
     };
   });
   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 "<=";
@@ -11508,7 +11606,7 @@ ${js}`
   var BinaryOpSymbol$15 = (0, import_lib3.$T)((0, import_lib3.$EXPECT)($L77, 'BinaryOpSymbol "\xAB"'), function(value) {
     return "<<";
   });
-  var BinaryOpSymbol$16 = (0, import_lib3.$EXPECT)($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 ">>>";
@@ -11647,7 +11745,7 @@ ${js}`
   });
   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) {
@@ -11740,7 +11838,7 @@ ${js}`
       return [op, [" "]];
     return [op, ws];
   });
-  var UnaryOp$3 = (0, import_lib3.$T)((0, import_lib3.$S)(Not, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R23, "UnaryOp /[:.]/")), (0, import_lib3.$E)((0, import_lib3.$EXPECT)($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];
@@ -13163,7 +13261,7 @@ ${js}`
     return (0, import_lib3.$EVENT_C)(ctx, state2, "OperatorImportSpecifier", OperatorImportSpecifier$$);
   }
   var ImportAsToken$0 = (0, import_lib3.$S)(__, As);
-  var ImportAsToken$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(Loc, __, Colon, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($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;
@@ -13936,7 +14034,7 @@ ${js}`
   function Loc(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "Loc", Loc$0);
   }
-  var Abstract$0 = (0, import_lib3.$TV)((0, import_lib3.$TEXT)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L126, 'Abstract "abstract"'), NonIdContinue, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($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) {
@@ -13990,7 +14088,7 @@ ${js}`
   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) {
@@ -14050,7 +14148,7 @@ ${js}`
   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) {
@@ -14210,7 +14308,7 @@ ${js}`
   function Hash(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "Hash", Hash$0);
   }
-  var If$0 = (0, import_lib3.$TV)((0, import_lib3.$TEXT)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L161, 'If "if"'), NonIdContinue, (0, import_lib3.$E)((0, import_lib3.$EXPECT)($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) {
@@ -14288,7 +14386,7 @@ ${js}`
   function Of(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "Of", Of$0);
   }
-  var OpenAngleBracket$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($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) {
@@ -14539,6 +14637,12 @@ ${js}`
   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" };
   });
@@ -14618,7 +14722,7 @@ ${js}`
   function JSXElement(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "JSXElement", JSXElement$$);
   }
-  var JSXSelfClosingElement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($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) {
@@ -14637,7 +14741,7 @@ ${js}`
   function PopJSXStack(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "PopJSXStack", PopJSXStack$0);
   }
-  var JSXOpeningElement$0 = (0, import_lib3.$S)((0, import_lib3.$EXPECT)($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);
   }
@@ -15407,11 +15511,15 @@ ${js}`
   }
   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)
@@ -15650,9 +15758,7 @@ ${js}`
   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;
@@ -15914,9 +16020,9 @@ ${js}`
   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;
@@ -15952,12 +16058,13 @@ ${js}`
   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$$);
   }