@danielx/civet 0.6.88 → 0.6.90

package/dist/browser.js

@@ -235,6 +235,9 @@ var Civet = (() => {
   function hasYield(exp) {
     return gatherRecursiveWithinFunction(exp, ({ type }) => type === "Yield").length > 0;
   }
+  function hasImportDeclaration(exp) {
+    return gatherRecursiveWithinFunction(exp, ({ type }) => type === "ImportDeclaration").length > 0;
+  }
   function deepCopy(node) {
     if (node == null)
       return node;
@@ -396,9 +399,10 @@ var Civet = (() => {
     }
     return ["(", type, ")"];
   }
-  function wrapIIFE(expressions, async) {
+  function wrapIIFE(expressions, asyncFlag) {
     let prefix;
-    if (async) {
+    let async;
+    if (asyncFlag) {
       async = "async ";
     } else if (hasAwait(expressions)) {
       async = "async ";
@@ -586,16 +590,16 @@ var Civet = (() => {
         expressions,
         children: block.children === block.expressions ? expressions : block.children.map((c) => c === block.expressions ? expressions : c)
       };
-      if (block.bare) {
-        block.children = [[" {"], ...block.children, "}"];
-        block.bare = false;
-      }
+      braceBlock(block);
       updateParentPointers(block);
     }
     return block;
   }
   function braceBlock(block) {
     if (block.bare) {
+      if (block.children === block.expressions) {
+        block.children = [block.expressions];
+      }
       block.children.unshift(" {");
       block.children.push("}");
       return block.bare = false;
@@ -605,8 +609,13 @@ var Civet = (() => {
   }
   function duplicateBlock(block) {
     const expressions = [...block.expressions];
-    const children = [...block.children];
-    children.splice(children.indexOf(block.expressions), 1, expressions);
+    let children;
+    if (block.children === block.expressions) {
+      children = expressions;
+    } else {
+      children = [...block.children];
+      children.splice(children.indexOf(block.expressions), 1, expressions);
+    }
     return {
       ...block,
       expressions,
@@ -1891,7 +1900,7 @@ var Civet = (() => {
         return;
       case "IfStatement":
         insertReturn(exp.then);
-        if (exp.else)
+        if (exp.else && exp.else.length !== 0)
           insertReturn(exp.else[2]);
         else
           exp.children.push(["", {
@@ -2023,8 +2032,7 @@ var Civet = (() => {
       throw new Error("Could not find iteration statement in iteration expression");
     }
     if (subtype === "DoStatement") {
-      insertReturn(block);
-      children.splice(i, 1, ...wrapIIFE(["", statement, void 0], async));
+      children.splice(i, 1, ...wrapIIFE([["", statement, void 0]], async));
       updateParentPointers(exp);
       return;
     }
@@ -2185,7 +2193,8 @@ var Civet = (() => {
     }
     const { decl, bindings } = condition.declaration;
     const binding = bindings[0];
-    const { pattern, suffix, initializer, splices, thisAssignments } = binding;
+    let { pattern, suffix, initializer, splices, thisAssignments } = binding;
+    const nullCheck = suffix?.optional && !suffix.t && !suffix.nonnull;
     let ref = prependStatementExpressionBlock(initializer, parent);
     if (ref) {
       Object.assign(condition, {
@@ -2199,11 +2208,16 @@ var Civet = (() => {
       ref = makeRef();
       const grandparent = condition.parent?.parent;
       const children = (
-        // Check that the declaration is a plain assignment (no pattern-matching) and the immediate grandchild of an `if` or `while`
+        // Wrap declaration that is a plain assignment (no pattern-matching) and the immediate grandchild of an `if` or `while`
+        // to satisfy eslint's no-cond-assign rule
         // More complex conditions (triggered by pattern matching or `until`/`unless`) don't need double parens
-        // @ts-ignore Just because pattern might not have a type at runtime doesn't mean it's unsafe
-        pattern.type === "Identifier" && (grandparent?.type === "IfStatement" || grandparent?.type === "WhileStatement") ? ["(", ref, initializer, ")"] : [ref, initializer]
+        pattern.type === "Identifier" && (grandparent?.type === "IfStatement" || grandparent?.type === "IterationStatement") && !nullCheck ? ["(", ref, initializer, ")"] : [ref, initializer]
       );
+      if (nullCheck) {
+        children.unshift("(");
+        children.push(") != null");
+        suffix = void 0;
+      }
       Object.assign(condition, {
         type: "AssignmentExpression",
         children,
@@ -3266,13 +3280,17 @@ var Civet = (() => {
     forRange: () => forRange,
     gatherBindingCode: () => gatherBindingCode,
     gatherRecursive: () => gatherRecursive,
+    gatherRecursiveAll: () => gatherRecursiveAll,
+    gatherRecursiveWithinFunction: () => gatherRecursiveWithinFunction,
     getIndentLevel: () => getIndentLevel,
     getPrecedence: () => getPrecedence,
     getTrimmingSpace: () => getTrimmingSpace,
     hasAwait: () => hasAwait,
+    hasImportDeclaration: () => hasImportDeclaration,
     hasYield: () => hasYield,
     insertTrimmingSpace: () => insertTrimmingSpace,
     isEmptyBareBlock: () => isEmptyBareBlock,
+    isFunction: () => isFunction,
     isWhitespaceOrEmpty: () => isWhitespaceOrEmpty,
     lastAccessInCallExpression: () => lastAccessInCallExpression,
     literalValue: () => literalValue,
@@ -5069,6 +5087,7 @@ ${input.slice(result.pos)}
         MemberBracketContent,
         SliceParameters,
         AccessStart,
+        ImplicitAccessStart,
         PropertyAccessModifier,
         PropertyAccess,
         PropertyGlob,
@@ -5203,6 +5222,7 @@ ${input.slice(result.pos)}
         BinaryOp,
         _BinaryOp,
         BinaryOpSymbol,
+        ActualIn,
         CoffeeOfOp,
         NotOp,
         Xor,
@@ -5915,7 +5935,7 @@ ${input.slice(result.pos)}
       var $R4 = $R(new RegExp("[ \\t]", "suy"));
       var $R5 = $R(new RegExp("(?=['\"`])", "suy"));
       var $R6 = $R(new RegExp("(?=[\\/?])", "suy"));
-      var $R7 = $R(new RegExp("(?=[\\/\\[{?.!@'\u2019:])", "suy"));
+      var $R7 = $R(new RegExp("(?=[\\/\\[{?.!@#'\u2019:])", "suy"));
       var $R8 = $R(new RegExp("[)}]", "suy"));
       var $R9 = $R(new RegExp("\\+\\+|--|[\\+-]\\S", "suy"));
       var $R10 = $R(new RegExp("[&]", "suy"));
@@ -5977,29 +5997,30 @@ ${input.slice(result.pos)}
       var $R66 = $R(new RegExp("[ \\t]+", "suy"));
       var $R67 = $R(new RegExp("(?=\\s|\\/|#)", "suy"));
       var $R68 = $R(new RegExp("(?!\\p{ID_Continue})", "suy"));
-      var $R69 = $R(new RegExp("['\u2019]s", "suy"));
-      var $R70 = $R(new RegExp("\\s", "suy"));
-      var $R71 = $R(new RegExp("(?=[<])", "suy"));
-      var $R72 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
-      var $R73 = $R(new RegExp("[!+-]", "suy"));
-      var $R74 = $R(new RegExp("[\\s>]|\\/>", "suy"));
-      var $R75 = $R(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
-      var $R76 = $R(new RegExp(`"[^"]*"|'[^']*'`, "suy"));
-      var $R77 = $R(new RegExp("[<>]", "suy"));
-      var $R78 = $R(new RegExp("[!~+-](?!\\s|[!~+-]*&)", "suy"));
-      var $R79 = $R(new RegExp("(?:-[^-]|[^-]*)*", "suy"));
-      var $R80 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
-      var $R81 = $R(new RegExp("[+-]?", "suy"));
-      var $R82 = $R(new RegExp("(?=if|unless)", "suy"));
-      var $R83 = $R(new RegExp("#![^\\r\\n]*", "suy"));
-      var $R84 = $R(new RegExp("[\\t ]*", "suy"));
-      var $R85 = $R(new RegExp("[ \\t]*", "suy"));
-      var $R86 = $R(new RegExp("[\\s]*", "suy"));
-      var $R87 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
-      var $R88 = $R(new RegExp("\\/\\/\\/[^\\r\\n]*", "suy"));
-      var $R89 = $R(new RegExp("(?=[ \\t\\r\\n\\/#]|$)", "suy"));
-      var $R90 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
-      var $R91 = $R(new RegExp("[^]*", "suy"));
+      var $R69 = $R(new RegExp("[=:]", "suy"));
+      var $R70 = $R(new RegExp("['\u2019]s", "suy"));
+      var $R71 = $R(new RegExp("\\s", "suy"));
+      var $R72 = $R(new RegExp("(?=[<])", "suy"));
+      var $R73 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
+      var $R74 = $R(new RegExp("[!+-]", "suy"));
+      var $R75 = $R(new RegExp("[\\s>]|\\/>", "suy"));
+      var $R76 = $R(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
+      var $R77 = $R(new RegExp(`"[^"]*"|'[^']*'`, "suy"));
+      var $R78 = $R(new RegExp("[<>]", "suy"));
+      var $R79 = $R(new RegExp("[!~+-](?!\\s|[!~+-]*&)", "suy"));
+      var $R80 = $R(new RegExp("(?:-[^-]|[^-]*)*", "suy"));
+      var $R81 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
+      var $R82 = $R(new RegExp("[+-]?", "suy"));
+      var $R83 = $R(new RegExp("(?=if|unless)", "suy"));
+      var $R84 = $R(new RegExp("#![^\\r\\n]*", "suy"));
+      var $R85 = $R(new RegExp("[\\t ]*", "suy"));
+      var $R86 = $R(new RegExp("[ \\t]*", "suy"));
+      var $R87 = $R(new RegExp("[\\s]*", "suy"));
+      var $R88 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
+      var $R89 = $R(new RegExp("\\/\\/\\/[^\\r\\n]*", "suy"));
+      var $R90 = $R(new RegExp("(?=[ \\t\\r\\n\\/#]|$)", "suy"));
+      var $R91 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
+      var $R92 = $R(new RegExp("[^]*", "suy"));
       var Program$0 = $TS($S(Reset, Init, $E(EOS), TopLevelStatements, __), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         var statements = $4;
         processProgram({
@@ -7115,7 +7136,8 @@ ${input.slice(result.pos)}
         return $EVENT_C(ctx, state, "FieldDefinition", FieldDefinition$$);
       }
       var ThisLiteral$0 = This;
-      var ThisLiteral$1 = $TS($S(AtThis, $TEXT($S($E(Hash), IdentifierName))), function($skip, $loc, $0, $1, $2) {
+      var ThisLiteral$1 = HashThis;
+      var ThisLiteral$2 = $TS($S(AtThis, $TEXT($S($E(Hash), IdentifierName))), function($skip, $loc, $0, $1, $2) {
         var at = $1;
         var id = $2;
         return {
@@ -7128,20 +7150,20 @@ ${input.slice(result.pos)}
           thisShorthand: true
         };
       });
-      var ThisLiteral$2 = AtThis;
-      var ThisLiteral$3 = HashThis;
+      var ThisLiteral$3 = AtThis;
       var ThisLiteral$$ = [ThisLiteral$0, ThisLiteral$1, ThisLiteral$2, ThisLiteral$3];
       function ThisLiteral(ctx, state) {
         return $EVENT_C(ctx, state, "ThisLiteral", ThisLiteral$$);
       }
-      var HashThis$0 = $TS($S(LengthShorthand, $E($S($Y($S($P(_), $C($S(Not, __, In), In))), $EXPECT($L0, 'HashThis ""')))), function($skip, $loc, $0, $1, $2) {
-        var id = $1;
-        var beforeIn = $2;
-        if (beforeIn != null)
+      var HashThis$0 = $TS($S($E(AtThis), LengthShorthand, $E($S($Y($S(_, $E($S(Not, __)), ActualIn)), $EXPECT($L0, 'HashThis ""')))), function($skip, $loc, $0, $1, $2, $3) {
+        var at = $1;
+        var id = $2;
+        var beforeIn = $3;
+        if (beforeIn != null && at == null)
           return ['"', id.name, '"'];
         return {
           type: "MemberExpression",
-          children: ["this", {
+          children: [at ?? "this", {
             type: "PropertyAccess",
             name: id.name,
             children: [".", id]
@@ -7149,7 +7171,7 @@ ${input.slice(result.pos)}
           thisShorthand: true
         };
       });
-      var HashThis$1 = $TS($S(PrivateIdentifier, $Y($S($P(_), $C($S(Not, __, In), In)))), function($skip, $loc, $0, $1, $2) {
+      var HashThis$1 = $TS($S(PrivateIdentifier, $Y($S(_, $E($S(Not, __)), ActualIn))), function($skip, $loc, $0, $1, $2) {
         var id = $1;
         return id;
       });
@@ -7320,7 +7342,7 @@ ${input.slice(result.pos)}
       function MemberBase(ctx, state) {
         return $EVENT_C(ctx, state, "MemberBase", MemberBase$$);
       }
-      var MemberExpressionRest$0 = $TS($S($EXPECT($R7, "MemberExpressionRest /(?=[\\/\\[{?.!@'\u2019:])/"), $Q(InlineComment), MemberExpressionRestBody), function($skip, $loc, $0, $1, $2, $3) {
+      var MemberExpressionRest$0 = $TS($S($EXPECT($R7, "MemberExpressionRest /(?=[\\/\\[{?.!@#'\u2019:])/"), $Q(InlineComment), MemberExpressionRestBody), function($skip, $loc, $0, $1, $2, $3) {
         var comments = $2;
         var body = $3;
         if (Array.isArray(body))
@@ -7453,16 +7475,27 @@ ${input.slice(result.pos)}
       var AccessStart$0 = $TS($S($E(PropertyAccessModifier), Dot, $N(Dot)), function($skip, $loc, $0, $1, $2, $3) {
         var modifier = $1;
         var dot = $2;
-        let children = modifier ? [modifier, dot] : [dot];
         return {
           type: "AccessStart",
-          children,
+          children: modifier ? [modifier, dot] : [dot],
           optional: modifier?.token === "?"
         };
       });
       function AccessStart(ctx, state) {
         return $EVENT(ctx, state, "AccessStart", AccessStart$0);
       }
+      var ImplicitAccessStart$0 = $TS($S($E(PropertyAccessModifier), InsertDot, $N(Dot)), function($skip, $loc, $0, $1, $2, $3) {
+        var modifier = $1;
+        var dot = $2;
+        return {
+          type: "AccessStart",
+          children: modifier ? [modifier, dot] : [dot],
+          optional: modifier?.token === "?"
+        };
+      });
+      function ImplicitAccessStart(ctx, state) {
+        return $EVENT(ctx, state, "ImplicitAccessStart", ImplicitAccessStart$0);
+      }
       var PropertyAccessModifier$0 = QuestionMark;
       var PropertyAccessModifier$1 = NonNullAssertion;
       var PropertyAccessModifier$$ = [PropertyAccessModifier$0, PropertyAccessModifier$1];
@@ -7504,15 +7537,24 @@ ${input.slice(result.pos)}
         var dot = $1;
         var comments = $2;
         var id = $3;
-        const children = [dot, ...comments, ...id.children];
         return {
           type: "PropertyAccess",
           name: id.name,
           dot,
-          children
+          children: [dot, ...comments, ...id.children]
         };
       });
-      var PropertyAccess$3 = $TS($S(CoffeePrototypeEnabled, DoubleColon, $E(IdentifierName)), function($skip, $loc, $0, $1, $2, $3) {
+      var PropertyAccess$3 = $TS($S(ImplicitAccessStart, $C(PrivateIdentifier, LengthShorthand)), function($skip, $loc, $0, $1, $2) {
+        var dot = $1;
+        var id = $2;
+        return {
+          type: "PropertyAccess",
+          name: id.name,
+          dot,
+          children: [dot, ...id.children]
+        };
+      });
+      var PropertyAccess$4 = $TS($S(CoffeePrototypeEnabled, DoubleColon, $E(IdentifierName)), function($skip, $loc, $0, $1, $2, $3) {
         var p = $2;
         var id = $3;
         if (id) {
@@ -7533,7 +7575,7 @@ ${input.slice(result.pos)}
           };
         }
       });
-      var PropertyAccess$$ = [PropertyAccess$0, PropertyAccess$1, PropertyAccess$2, PropertyAccess$3];
+      var PropertyAccess$$ = [PropertyAccess$0, PropertyAccess$1, PropertyAccess$2, PropertyAccess$3, PropertyAccess$4];
       function PropertyAccess(ctx, state) {
         return $EVENT_C(ctx, state, "PropertyAccess", PropertyAccess$$);
       }
@@ -8817,11 +8859,14 @@ ${input.slice(result.pos)}
       });
       var NonSingleBracedBlock$1 = ImplicitNestedBlock;
       var NonSingleBracedBlock$2 = $TS($S(InsertOpenBrace, NestedImplicitObjectLiteral, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3) {
+        var o = $1;
         var s = $2;
+        var c = $3;
+        const expressions = [s];
         return {
           type: "BlockStatement",
-          expressions: [s],
-          children: $0
+          expressions,
+          children: [o, expressions, c]
         };
       });
       var NonSingleBracedBlock$$ = [NonSingleBracedBlock$0, NonSingleBracedBlock$1, NonSingleBracedBlock$2];
@@ -9222,7 +9267,7 @@ ${input.slice(result.pos)}
       var ArrayElementExpression$1 = $T($S(ImplicitObjectLiteral, $Y(ArrayElementDelimiter)), function(value) {
         return value[0];
       });
-      var ArrayElementExpression$2 = $TS($S($E(ExtendedExpression), __, DotDotDot, $Y(ArrayElementDelimiter)), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var ArrayElementExpression$2 = $TS($S(ExtendedExpression, $E(_), DotDotDot, $Y(ArrayElementDelimiter)), function($skip, $loc, $0, $1, $2, $3, $4) {
         var exp = $1;
         var ws = $2;
         var dots = $3;
@@ -9231,7 +9276,7 @@ ${input.slice(result.pos)}
         }
         return {
           type: "SpreadElement",
-          children: [...ws, dots, exp],
+          children: [ws, dots, exp],
           names: exp.names
         };
       });
@@ -10241,6 +10286,16 @@ ${input.slice(result.pos)}
       function BinaryOpSymbol(ctx, state) {
         return $EVENT_C(ctx, state, "BinaryOpSymbol", BinaryOpSymbol$$);
       }
+      var ActualIn$0 = $T($S(CoffeeOfEnabled, Of), function(value) {
+        return value[1];
+      });
+      var ActualIn$1 = $T($S($N(CoffeeOfEnabled), In), function(value) {
+        return value[1];
+      });
+      var ActualIn$$ = [ActualIn$0, ActualIn$1];
+      function ActualIn(ctx, state) {
+        return $EVENT_C(ctx, state, "ActualIn", ActualIn$$);
+      }
       var CoffeeOfOp$0 = $T($S(Of), function(value) {
         return "in";
       });
@@ -12554,7 +12609,7 @@ ${input.slice(result.pos)}
       function CoffeeSubstitutionStart(ctx, state) {
         return $EVENT(ctx, state, "CoffeeSubstitutionStart", CoffeeSubstitutionStart$0);
       }
-      var Colon$0 = $TS($S($EXPECT($L15, 'Colon ":"'), $N($EXPECT($L3, 'Colon "="'))), function($skip, $loc, $0, $1, $2) {
+      var Colon$0 = $TS($S($EXPECT($L15, 'Colon ":"'), $N($EXPECT($R69, "Colon /[=:]/"))), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Colon(ctx, state) {
@@ -12599,7 +12654,7 @@ ${input.slice(result.pos)}
       var Dot$0 = $TV($EXPECT($L7, 'Dot "."'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
-      var Dot$1 = $TS($S($EXPECT($R69, "Dot /['\u2019]s/"), _), function($skip, $loc, $0, $1, $2) {
+      var Dot$1 = $TS($S($EXPECT($R70, "Dot /['\u2019]s/"), _), function($skip, $loc, $0, $1, $2) {
         var ws = $2;
         return [
           { $loc, token: "." },
@@ -12720,7 +12775,7 @@ ${input.slice(result.pos)}
       function If(ctx, state) {
         return $EVENT(ctx, state, "If", If$0);
       }
-      var Import$0 = $TS($S($EXPECT($L20, 'Import "import"'), $Y($EXPECT($R70, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
+      var Import$0 = $TS($S($EXPECT($L20, 'Import "import"'), $Y($EXPECT($R71, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Import(ctx, state) {
@@ -13060,7 +13115,7 @@ ${input.slice(result.pos)}
       function JSXImplicitFragment(ctx, state) {
         return $EVENT(ctx, state, "JSXImplicitFragment", JSXImplicitFragment$0);
       }
-      var JSXTag$0 = $T($S($EXPECT($R71, "JSXTag /(?=[<])/"), _JSXTag), function(value) {
+      var JSXTag$0 = $T($S($EXPECT($R72, "JSXTag /(?=[<])/"), _JSXTag), function(value) {
         return value[1];
       });
       function JSXTag(ctx, state) {
@@ -13207,7 +13262,7 @@ ${input.slice(result.pos)}
       function JSXElementName(ctx, state) {
         return $EVENT_C(ctx, state, "JSXElementName", JSXElementName$$);
       }
-      var JSXIdentifierName$0 = $R$0($EXPECT($R72, "JSXIdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*/"));
+      var JSXIdentifierName$0 = $R$0($EXPECT($R73, "JSXIdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*/"));
       function JSXIdentifierName(ctx, state) {
         return $EVENT(ctx, state, "JSXIdentifierName", JSXIdentifierName$0);
       }
@@ -13386,7 +13441,7 @@ ${input.slice(result.pos)}
           class: $2
         };
       });
-      var JSXAttribute$7 = $TS($S($TEXT($EXPECT($R73, "JSXAttribute /[!+-]/")), JSXAttributeName, $Y(JSXAttributeSpace)), function($skip, $loc, $0, $1, $2, $3) {
+      var JSXAttribute$7 = $TS($S($TEXT($EXPECT($R74, "JSXAttribute /[!+-]/")), JSXAttributeName, $Y(JSXAttributeSpace)), function($skip, $loc, $0, $1, $2, $3) {
         var toggle = $1;
         var id = $2;
         const value = toggle === "+" ? "true" : "false";
@@ -13396,11 +13451,11 @@ ${input.slice(result.pos)}
       function JSXAttribute(ctx, state) {
         return $EVENT_C(ctx, state, "JSXAttribute", JSXAttribute$$);
       }
-      var JSXAttributeSpace$0 = $R$0($EXPECT($R74, "JSXAttributeSpace /[\\s>]|\\/>/"));
+      var JSXAttributeSpace$0 = $R$0($EXPECT($R75, "JSXAttributeSpace /[\\s>]|\\/>/"));
       function JSXAttributeSpace(ctx, state) {
         return $EVENT(ctx, state, "JSXAttributeSpace", JSXAttributeSpace$0);
       }
-      var JSXShorthandString$0 = $TR($EXPECT($R75, "JSXShorthandString /(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var JSXShorthandString$0 = $TR($EXPECT($R76, "JSXShorthandString /(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return quoteString($0);
       });
       var JSXShorthandString$1 = $TS($S(TemplateLiteral), function($skip, $loc, $0, $1) {
@@ -13434,7 +13489,7 @@ ${input.slice(result.pos)}
         }
         return [open, value, close];
       });
-      var JSXAttributeValue$4 = $R$0($EXPECT($R76, `JSXAttributeValue /"[^"]*"|'[^']*'/`));
+      var JSXAttributeValue$4 = $R$0($EXPECT($R77, `JSXAttributeValue /"[^"]*"|'[^']*'/`));
       var JSXAttributeValue$$ = [JSXAttributeValue$0, JSXAttributeValue$1, JSXAttributeValue$2, JSXAttributeValue$3, JSXAttributeValue$4];
       function JSXAttributeValue(ctx, state) {
         return $EVENT_C(ctx, state, "JSXAttributeValue", JSXAttributeValue$$);
@@ -13447,7 +13502,7 @@ ${input.slice(result.pos)}
       function InlineJSXAttributeValue(ctx, state) {
         return $EVENT(ctx, state, "InlineJSXAttributeValue", InlineJSXAttributeValue$0);
       }
-      var InlineJSXBinaryOpRHS$0 = $TS($S($N($EXPECT($R77, "InlineJSXBinaryOpRHS /[<>]/")), BinaryOp, InlineJSXUnaryExpression), function($skip, $loc, $0, $1, $2, $3) {
+      var InlineJSXBinaryOpRHS$0 = $TS($S($N($EXPECT($R78, "InlineJSXBinaryOpRHS /[<>]/")), BinaryOp, InlineJSXUnaryExpression), function($skip, $loc, $0, $1, $2, $3) {
         var op = $2;
         var rhs = $3;
         return [[], op, [], rhs];
@@ -13464,7 +13519,7 @@ ${input.slice(result.pos)}
       function InlineJSXUnaryExpression(ctx, state) {
         return $EVENT(ctx, state, "InlineJSXUnaryExpression", InlineJSXUnaryExpression$0);
       }
-      var InlineJSXUnaryOp$0 = $TR($EXPECT($R78, "InlineJSXUnaryOp /[!~+-](?!\\s|[!~+-]*&)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var InlineJSXUnaryOp$0 = $TR($EXPECT($R79, "InlineJSXUnaryOp /[!~+-](?!\\s|[!~+-]*&)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function InlineJSXUnaryOp(ctx, state) {
@@ -13680,13 +13735,13 @@ ${input.slice(result.pos)}
       function JSXComment(ctx, state) {
         return $EVENT(ctx, state, "JSXComment", JSXComment$0);
       }
-      var JSXCommentContent$0 = $TR($EXPECT($R79, "JSXCommentContent /(?:-[^-]|[^-]*)*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var JSXCommentContent$0 = $TR($EXPECT($R80, "JSXCommentContent /(?:-[^-]|[^-]*)*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0.replace(/\*\//g, "* /") };
       });
       function JSXCommentContent(ctx, state) {
         return $EVENT(ctx, state, "JSXCommentContent", JSXCommentContent$0);
       }
-      var JSXText$0 = $TR($EXPECT($R80, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var JSXText$0 = $TR($EXPECT($R81, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return {
           type: "JSXText",
           token: $0,
@@ -14107,7 +14162,7 @@ ${input.slice(result.pos)}
       function TypeProperty(ctx, state) {
         return $EVENT(ctx, state, "TypeProperty", TypeProperty$0);
       }
-      var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R81, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R17, "TypeIndexSignature /[+-]/")), $Y($S($E(_), QuestionMark)))));
+      var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R82, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R17, "TypeIndexSignature /[+-]/")), $Y($S($E(_), QuestionMark)))));
       function TypeIndexSignature(ctx, state) {
         return $EVENT(ctx, state, "TypeIndexSignature", TypeIndexSignature$0);
       }
@@ -14127,11 +14182,13 @@ ${input.slice(result.pos)}
         return { "type": "TypeSuffix", "ts": true, "optional": optional, "children": value };
       });
       var TypeSuffix$2 = $TS($S(NonNullAssertion, $E(_), $E($S(Colon, MaybeIndentedType))), function($skip, $loc, $0, $1, $2, $3) {
+        var nonnull = $1;
         var ct = $3;
         const [colon, t] = ct ?? [];
         return {
           type: "TypeSuffix",
           ts: true,
+          nonnull,
           t,
           children: [$1, $2, colon, t]
         };
@@ -14401,7 +14458,7 @@ ${input.slice(result.pos)}
       function NestedType(ctx, state) {
         return $EVENT(ctx, state, "NestedType", NestedType$0);
       }
-      var TypeConditional$0 = $TS($S($E(_), $EXPECT($R82, "TypeConditional /(?=if|unless)/"), TypeIfThenElse), function($skip, $loc, $0, $1, $2, $3) {
+      var TypeConditional$0 = $TS($S($E(_), $EXPECT($R83, "TypeConditional /(?=if|unless)/"), TypeIfThenElse), function($skip, $loc, $0, $1, $2, $3) {
         return [$1, expressionizeTypeIf($3)];
       });
       var TypeConditional$1 = $TS($S(TypeCondition, NotDedented, QuestionMark, Type, __, Colon, Type), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
@@ -14601,15 +14658,15 @@ ${input.slice(result.pos)}
       function ThisType(ctx, state) {
         return $EVENT(ctx, state, "ThisType", ThisType$0);
       }
-      var Shebang$0 = $S($R$0($EXPECT($R83, "Shebang /#![^\\r\\n]*/")), EOL);
+      var Shebang$0 = $S($R$0($EXPECT($R84, "Shebang /#![^\\r\\n]*/")), EOL);
       function Shebang(ctx, state) {
         return $EVENT(ctx, state, "Shebang", Shebang$0);
       }
-      var CivetPrologue$0 = $T($S($EXPECT($R84, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, SimpleStatementDelimiter, $EXPECT($R85, "CivetPrologue /[ \\t]*/"), $C(EOL, $Y(RestOfLine))), function(value) {
+      var CivetPrologue$0 = $T($S($EXPECT($R85, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, SimpleStatementDelimiter, $EXPECT($R86, "CivetPrologue /[ \\t]*/"), $C(EOL, $Y(RestOfLine))), function(value) {
         var content = value[2];
         return content;
       });
-      var CivetPrologue$1 = $T($S($EXPECT($R84, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, SimpleStatementDelimiter, $EXPECT($R85, "CivetPrologue /[ \\t]*/"), $C(EOL, $Y(RestOfLine))), function(value) {
+      var CivetPrologue$1 = $T($S($EXPECT($R85, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, SimpleStatementDelimiter, $EXPECT($R86, "CivetPrologue /[ \\t]*/"), $C(EOL, $Y(RestOfLine))), function(value) {
         var content = value[2];
         return content;
       });
@@ -14617,7 +14674,7 @@ ${input.slice(result.pos)}
       function CivetPrologue(ctx, state) {
         return $EVENT_C(ctx, state, "CivetPrologue", CivetPrologue$$);
       }
-      var CivetPrologueContent$0 = $TS($S($EXPECT($L226, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R86, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var CivetPrologueContent$0 = $TS($S($EXPECT($L226, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R87, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
         var options = $3;
         return {
           type: "CivetPrologue",
@@ -14628,7 +14685,7 @@ ${input.slice(result.pos)}
       function CivetPrologueContent(ctx, state) {
         return $EVENT(ctx, state, "CivetPrologueContent", CivetPrologueContent$0);
       }
-      var CivetOption$0 = $TR($EXPECT($R87, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var CivetOption$0 = $TR($EXPECT($R88, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), 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();
@@ -14645,11 +14702,11 @@ ${input.slice(result.pos)}
       function CivetOption(ctx, state) {
         return $EVENT(ctx, state, "CivetOption", CivetOption$0);
       }
-      var UnknownPrologue$0 = $S($R$0($EXPECT($R84, "UnknownPrologue /[\\t ]*/")), StringLiteral, $TEXT(SimpleStatementDelimiter), EOS);
+      var UnknownPrologue$0 = $S($R$0($EXPECT($R85, "UnknownPrologue /[\\t ]*/")), StringLiteral, $TEXT(SimpleStatementDelimiter), EOS);
       function UnknownPrologue(ctx, state) {
         return $EVENT(ctx, state, "UnknownPrologue", UnknownPrologue$0);
       }
-      var TripleSlashDirective$0 = $S($R$0($EXPECT($R88, "TripleSlashDirective /\\/\\/\\/[^\\r\\n]*/")), $E(EOS));
+      var TripleSlashDirective$0 = $S($R$0($EXPECT($R89, "TripleSlashDirective /\\/\\/\\/[^\\r\\n]*/")), $E(EOS));
       function TripleSlashDirective(ctx, state) {
         return $EVENT(ctx, state, "TripleSlashDirective", TripleSlashDirective$0);
       }
@@ -14665,13 +14722,13 @@ ${input.slice(result.pos)}
       function PrologueString(ctx, state) {
         return $EVENT_C(ctx, state, "PrologueString", PrologueString$$);
       }
-      var EOS$0 = $T($S($EXPECT($R89, "EOS /(?=[ \\t\\r\\n\\/#]|$)/"), $P(RestOfLine)), function(value) {
+      var EOS$0 = $T($S($EXPECT($R90, "EOS /(?=[ \\t\\r\\n\\/#]|$)/"), $P(RestOfLine)), function(value) {
         return value[1];
       });
       function EOS(ctx, state) {
         return $EVENT(ctx, state, "EOS", EOS$0);
       }
-      var EOL$0 = $TR($EXPECT($R90, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var EOL$0 = $TR($EXPECT($R91, "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, state) {
@@ -15243,11 +15300,11 @@ ${input.slice(result.pos)}
       function Prologue(ctx, state) {
         return $EVENT(ctx, state, "Prologue", Prologue$0);
       }
-      var ProloguePrefix$0 = $S(Prologue, $R$0($EXPECT($R91, "ProloguePrefix /[^]*/")));
+      var ProloguePrefix$0 = $S(Prologue, $R$0($EXPECT($R92, "ProloguePrefix /[^]*/")));
       function ProloguePrefix(ctx, state) {
         return $EVENT(ctx, state, "ProloguePrefix", ProloguePrefix$0);
       }
-      var Indent$0 = $TR($EXPECT($R85, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var Indent$0 = $TR($EXPECT($R86, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         const level = getIndentLevel($0, module.config.tab);
         return {
           $loc,
@@ -15471,6 +15528,7 @@ ${input.slice(result.pos)}
       exports.MemberBracketContent = MemberBracketContent;
       exports.SliceParameters = SliceParameters;
       exports.AccessStart = AccessStart;
+      exports.ImplicitAccessStart = ImplicitAccessStart;
       exports.PropertyAccessModifier = PropertyAccessModifier;
       exports.PropertyAccess = PropertyAccess;
       exports.PropertyGlob = PropertyGlob;
@@ -15605,6 +15663,7 @@ ${input.slice(result.pos)}
       exports.BinaryOp = BinaryOp;
       exports._BinaryOp = _BinaryOp;
       exports.BinaryOpSymbol = BinaryOpSymbol;
+      exports.ActualIn = ActualIn;
       exports.CoffeeOfOp = CoffeeOfOp;
       exports.NotOp = NotOp;
       exports.Xor = Xor;
@@ -16620,10 +16679,13 @@ ${input.slice(result.pos)}
     let ast;
     try {
       import_parser.parse.config = options.parseOptions || {};
-      ast = prune((0, import_parser.parse)(src, {
+      ast = (0, import_parser.parse)(src, {
         filename,
         events
-      }));
+      });
+      if (!(options.ast === "raw")) {
+        ast = prune(ast);
+      }
     } finally {
       if (hits || trace) {
         import("fs").then(function({ writeFileSync }) {