ast-types 0.13.4 → 0.15.0

package/gen/visitor.d.ts

@@ -47,6 +47,7 @@ export interface Visitor<M = {}> {
     visitUnaryExpression?(this: Context & M, path: NodePath<namedTypes.UnaryExpression>): any;
     visitBinaryExpression?(this: Context & M, path: NodePath<namedTypes.BinaryExpression>): any;
     visitAssignmentExpression?(this: Context & M, path: NodePath<namedTypes.AssignmentExpression>): any;
+    visitChainElement?(this: Context & M, path: NodePath<namedTypes.ChainElement>): any;
     visitMemberExpression?(this: Context & M, path: NodePath<namedTypes.MemberExpression>): any;
     visitUpdateExpression?(this: Context & M, path: NodePath<namedTypes.UpdateExpression>): any;
     visitLogicalExpression?(this: Context & M, path: NodePath<namedTypes.LogicalExpression>): any;
@@ -67,42 +68,60 @@ export interface Visitor<M = {}> {
     visitPropertyPattern?(this: Context & M, path: NodePath<namedTypes.PropertyPattern>): any;
     visitObjectPattern?(this: Context & M, path: NodePath<namedTypes.ObjectPattern>): any;
     visitArrayPattern?(this: Context & M, path: NodePath<namedTypes.ArrayPattern>): any;
-    visitMethodDefinition?(this: Context & M, path: NodePath<namedTypes.MethodDefinition>): any;
     visitSpreadElement?(this: Context & M, path: NodePath<namedTypes.SpreadElement>): any;
     visitAssignmentPattern?(this: Context & M, path: NodePath<namedTypes.AssignmentPattern>): any;
+    visitMethodDefinition?(this: Context & M, path: NodePath<namedTypes.MethodDefinition>): any;
     visitClassPropertyDefinition?(this: Context & M, path: NodePath<namedTypes.ClassPropertyDefinition>): any;
     visitClassProperty?(this: Context & M, path: NodePath<namedTypes.ClassProperty>): any;
     visitClassBody?(this: Context & M, path: NodePath<namedTypes.ClassBody>): any;
     visitClassDeclaration?(this: Context & M, path: NodePath<namedTypes.ClassDeclaration>): any;
     visitClassExpression?(this: Context & M, path: NodePath<namedTypes.ClassExpression>): any;
+    visitSuper?(this: Context & M, path: NodePath<namedTypes.Super>): any;
     visitSpecifier?(this: Context & M, path: NodePath<namedTypes.Specifier>): any;
     visitModuleSpecifier?(this: Context & M, path: NodePath<namedTypes.ModuleSpecifier>): any;
     visitImportSpecifier?(this: Context & M, path: NodePath<namedTypes.ImportSpecifier>): any;
-    visitImportNamespaceSpecifier?(this: Context & M, path: NodePath<namedTypes.ImportNamespaceSpecifier>): any;
     visitImportDefaultSpecifier?(this: Context & M, path: NodePath<namedTypes.ImportDefaultSpecifier>): any;
+    visitImportNamespaceSpecifier?(this: Context & M, path: NodePath<namedTypes.ImportNamespaceSpecifier>): any;
     visitImportDeclaration?(this: Context & M, path: NodePath<namedTypes.ImportDeclaration>): any;
+    visitExportNamedDeclaration?(this: Context & M, path: NodePath<namedTypes.ExportNamedDeclaration>): any;
+    visitExportSpecifier?(this: Context & M, path: NodePath<namedTypes.ExportSpecifier>): any;
+    visitExportDefaultDeclaration?(this: Context & M, path: NodePath<namedTypes.ExportDefaultDeclaration>): any;
+    visitExportAllDeclaration?(this: Context & M, path: NodePath<namedTypes.ExportAllDeclaration>): any;
     visitTaggedTemplateExpression?(this: Context & M, path: NodePath<namedTypes.TaggedTemplateExpression>): any;
     visitTemplateLiteral?(this: Context & M, path: NodePath<namedTypes.TemplateLiteral>): any;
     visitTemplateElement?(this: Context & M, path: NodePath<namedTypes.TemplateElement>): any;
+    visitMetaProperty?(this: Context & M, path: NodePath<namedTypes.MetaProperty>): any;
+    visitAwaitExpression?(this: Context & M, path: NodePath<namedTypes.AwaitExpression>): any;
     visitSpreadProperty?(this: Context & M, path: NodePath<namedTypes.SpreadProperty>): any;
     visitSpreadPropertyPattern?(this: Context & M, path: NodePath<namedTypes.SpreadPropertyPattern>): any;
-    visitAwaitExpression?(this: Context & M, path: NodePath<namedTypes.AwaitExpression>): any;
     visitImportExpression?(this: Context & M, path: NodePath<namedTypes.ImportExpression>): any;
+    visitChainExpression?(this: Context & M, path: NodePath<namedTypes.ChainExpression>): any;
+    visitOptionalCallExpression?(this: Context & M, path: NodePath<namedTypes.OptionalCallExpression>): any;
+    visitOptionalMemberExpression?(this: Context & M, path: NodePath<namedTypes.OptionalMemberExpression>): any;
+    visitStaticBlock?(this: Context & M, path: NodePath<namedTypes.StaticBlock>): any;
+    visitDecorator?(this: Context & M, path: NodePath<namedTypes.Decorator>): any;
+    visitPrivateName?(this: Context & M, path: NodePath<namedTypes.PrivateName>): any;
+    visitClassPrivateProperty?(this: Context & M, path: NodePath<namedTypes.ClassPrivateProperty>): any;
+    visitImportAttribute?(this: Context & M, path: NodePath<namedTypes.ImportAttribute>): any;
+    visitRecordExpression?(this: Context & M, path: NodePath<namedTypes.RecordExpression>): any;
+    visitObjectMethod?(this: Context & M, path: NodePath<namedTypes.ObjectMethod>): any;
+    visitTupleExpression?(this: Context & M, path: NodePath<namedTypes.TupleExpression>): any;
+    visitModuleExpression?(this: Context & M, path: NodePath<namedTypes.ModuleExpression>): any;
     visitJSXAttribute?(this: Context & M, path: NodePath<namedTypes.JSXAttribute>): any;
     visitJSXIdentifier?(this: Context & M, path: NodePath<namedTypes.JSXIdentifier>): any;
     visitJSXNamespacedName?(this: Context & M, path: NodePath<namedTypes.JSXNamespacedName>): any;
     visitJSXExpressionContainer?(this: Context & M, path: NodePath<namedTypes.JSXExpressionContainer>): any;
+    visitJSXElement?(this: Context & M, path: NodePath<namedTypes.JSXElement>): any;
+    visitJSXFragment?(this: Context & M, path: NodePath<namedTypes.JSXFragment>): any;
     visitJSXMemberExpression?(this: Context & M, path: NodePath<namedTypes.JSXMemberExpression>): any;
     visitJSXSpreadAttribute?(this: Context & M, path: NodePath<namedTypes.JSXSpreadAttribute>): any;
-    visitJSXElement?(this: Context & M, path: NodePath<namedTypes.JSXElement>): any;
+    visitJSXEmptyExpression?(this: Context & M, path: NodePath<namedTypes.JSXEmptyExpression>): any;
+    visitJSXText?(this: Context & M, path: NodePath<namedTypes.JSXText>): any;
+    visitJSXSpreadChild?(this: Context & M, path: NodePath<namedTypes.JSXSpreadChild>): any;
     visitJSXOpeningElement?(this: Context & M, path: NodePath<namedTypes.JSXOpeningElement>): any;
     visitJSXClosingElement?(this: Context & M, path: NodePath<namedTypes.JSXClosingElement>): any;
-    visitJSXFragment?(this: Context & M, path: NodePath<namedTypes.JSXFragment>): any;
-    visitJSXText?(this: Context & M, path: NodePath<namedTypes.JSXText>): any;
     visitJSXOpeningFragment?(this: Context & M, path: NodePath<namedTypes.JSXOpeningFragment>): any;
     visitJSXClosingFragment?(this: Context & M, path: NodePath<namedTypes.JSXClosingFragment>): any;
-    visitJSXEmptyExpression?(this: Context & M, path: NodePath<namedTypes.JSXEmptyExpression>): any;
-    visitJSXSpreadChild?(this: Context & M, path: NodePath<namedTypes.JSXSpreadChild>): any;
     visitTypeParameterDeclaration?(this: Context & M, path: NodePath<namedTypes.TypeParameterDeclaration>): any;
     visitTSTypeParameterDeclaration?(this: Context & M, path: NodePath<namedTypes.TSTypeParameterDeclaration>): any;
     visitTypeParameterInstantiation?(this: Context & M, path: NodePath<namedTypes.TypeParameterInstantiation>): any;
@@ -117,9 +136,12 @@ export interface Visitor<M = {}> {
     visitEmptyTypeAnnotation?(this: Context & M, path: NodePath<namedTypes.EmptyTypeAnnotation>): any;
     visitMixedTypeAnnotation?(this: Context & M, path: NodePath<namedTypes.MixedTypeAnnotation>): any;
     visitVoidTypeAnnotation?(this: Context & M, path: NodePath<namedTypes.VoidTypeAnnotation>): any;
+    visitSymbolTypeAnnotation?(this: Context & M, path: NodePath<namedTypes.SymbolTypeAnnotation>): any;
     visitNumberTypeAnnotation?(this: Context & M, path: NodePath<namedTypes.NumberTypeAnnotation>): any;
+    visitBigIntTypeAnnotation?(this: Context & M, path: NodePath<namedTypes.BigIntTypeAnnotation>): any;
     visitNumberLiteralTypeAnnotation?(this: Context & M, path: NodePath<namedTypes.NumberLiteralTypeAnnotation>): any;
     visitNumericLiteralTypeAnnotation?(this: Context & M, path: NodePath<namedTypes.NumericLiteralTypeAnnotation>): any;
+    visitBigIntLiteralTypeAnnotation?(this: Context & M, path: NodePath<namedTypes.BigIntLiteralTypeAnnotation>): any;
     visitStringTypeAnnotation?(this: Context & M, path: NodePath<namedTypes.StringTypeAnnotation>): any;
     visitStringLiteralTypeAnnotation?(this: Context & M, path: NodePath<namedTypes.StringLiteralTypeAnnotation>): any;
     visitBooleanTypeAnnotation?(this: Context & M, path: NodePath<namedTypes.BooleanTypeAnnotation>): any;
@@ -143,6 +165,8 @@ export interface Visitor<M = {}> {
     visitQualifiedTypeIdentifier?(this: Context & M, path: NodePath<namedTypes.QualifiedTypeIdentifier>): any;
     visitGenericTypeAnnotation?(this: Context & M, path: NodePath<namedTypes.GenericTypeAnnotation>): any;
     visitMemberTypeAnnotation?(this: Context & M, path: NodePath<namedTypes.MemberTypeAnnotation>): any;
+    visitIndexedAccessType?(this: Context & M, path: NodePath<namedTypes.IndexedAccessType>): any;
+    visitOptionalIndexedAccessType?(this: Context & M, path: NodePath<namedTypes.OptionalIndexedAccessType>): any;
     visitUnionTypeAnnotation?(this: Context & M, path: NodePath<namedTypes.UnionTypeAnnotation>): any;
     visitIntersectionTypeAnnotation?(this: Context & M, path: NodePath<namedTypes.IntersectionTypeAnnotation>): any;
     visitTypeofTypeAnnotation?(this: Context & M, path: NodePath<namedTypes.TypeofTypeAnnotation>): any;
@@ -152,38 +176,40 @@ export interface Visitor<M = {}> {
     visitInterfaceDeclaration?(this: Context & M, path: NodePath<namedTypes.InterfaceDeclaration>): any;
     visitDeclareInterface?(this: Context & M, path: NodePath<namedTypes.DeclareInterface>): any;
     visitTypeAlias?(this: Context & M, path: NodePath<namedTypes.TypeAlias>): any;
-    visitOpaqueType?(this: Context & M, path: NodePath<namedTypes.OpaqueType>): any;
     visitDeclareTypeAlias?(this: Context & M, path: NodePath<namedTypes.DeclareTypeAlias>): any;
+    visitOpaqueType?(this: Context & M, path: NodePath<namedTypes.OpaqueType>): any;
     visitDeclareOpaqueType?(this: Context & M, path: NodePath<namedTypes.DeclareOpaqueType>): any;
     visitTypeCastExpression?(this: Context & M, path: NodePath<namedTypes.TypeCastExpression>): any;
     visitTupleTypeAnnotation?(this: Context & M, path: NodePath<namedTypes.TupleTypeAnnotation>): any;
     visitDeclareVariable?(this: Context & M, path: NodePath<namedTypes.DeclareVariable>): any;
     visitDeclareFunction?(this: Context & M, path: NodePath<namedTypes.DeclareFunction>): any;
+    visitFlowPredicate?(this: Context & M, path: NodePath<namedTypes.FlowPredicate>): any;
     visitDeclareClass?(this: Context & M, path: NodePath<namedTypes.DeclareClass>): any;
     visitDeclareModule?(this: Context & M, path: NodePath<namedTypes.DeclareModule>): any;
     visitDeclareModuleExports?(this: Context & M, path: NodePath<namedTypes.DeclareModuleExports>): any;
     visitDeclareExportDeclaration?(this: Context & M, path: NodePath<namedTypes.DeclareExportDeclaration>): any;
-    visitExportSpecifier?(this: Context & M, path: NodePath<namedTypes.ExportSpecifier>): any;
     visitExportBatchSpecifier?(this: Context & M, path: NodePath<namedTypes.ExportBatchSpecifier>): any;
     visitDeclareExportAllDeclaration?(this: Context & M, path: NodePath<namedTypes.DeclareExportAllDeclaration>): any;
-    visitFlowPredicate?(this: Context & M, path: NodePath<namedTypes.FlowPredicate>): any;
     visitInferredPredicate?(this: Context & M, path: NodePath<namedTypes.InferredPredicate>): any;
     visitDeclaredPredicate?(this: Context & M, path: NodePath<namedTypes.DeclaredPredicate>): any;
+    visitEnumDeclaration?(this: Context & M, path: NodePath<namedTypes.EnumDeclaration>): any;
+    visitEnumBooleanBody?(this: Context & M, path: NodePath<namedTypes.EnumBooleanBody>): any;
+    visitEnumNumberBody?(this: Context & M, path: NodePath<namedTypes.EnumNumberBody>): any;
+    visitEnumStringBody?(this: Context & M, path: NodePath<namedTypes.EnumStringBody>): any;
+    visitEnumSymbolBody?(this: Context & M, path: NodePath<namedTypes.EnumSymbolBody>): any;
+    visitEnumBooleanMember?(this: Context & M, path: NodePath<namedTypes.EnumBooleanMember>): any;
+    visitEnumNumberMember?(this: Context & M, path: NodePath<namedTypes.EnumNumberMember>): any;
+    visitEnumStringMember?(this: Context & M, path: NodePath<namedTypes.EnumStringMember>): any;
+    visitEnumDefaultedMember?(this: Context & M, path: NodePath<namedTypes.EnumDefaultedMember>): any;
     visitExportDeclaration?(this: Context & M, path: NodePath<namedTypes.ExportDeclaration>): any;
     visitBlock?(this: Context & M, path: NodePath<namedTypes.Block>): any;
     visitLine?(this: Context & M, path: NodePath<namedTypes.Line>): any;
     visitNoop?(this: Context & M, path: NodePath<namedTypes.Noop>): any;
     visitDoExpression?(this: Context & M, path: NodePath<namedTypes.DoExpression>): any;
-    visitSuper?(this: Context & M, path: NodePath<namedTypes.Super>): any;
     visitBindExpression?(this: Context & M, path: NodePath<namedTypes.BindExpression>): any;
-    visitDecorator?(this: Context & M, path: NodePath<namedTypes.Decorator>): any;
-    visitMetaProperty?(this: Context & M, path: NodePath<namedTypes.MetaProperty>): any;
     visitParenthesizedExpression?(this: Context & M, path: NodePath<namedTypes.ParenthesizedExpression>): any;
-    visitExportDefaultDeclaration?(this: Context & M, path: NodePath<namedTypes.ExportDefaultDeclaration>): any;
-    visitExportNamedDeclaration?(this: Context & M, path: NodePath<namedTypes.ExportNamedDeclaration>): any;
     visitExportNamespaceSpecifier?(this: Context & M, path: NodePath<namedTypes.ExportNamespaceSpecifier>): any;
     visitExportDefaultSpecifier?(this: Context & M, path: NodePath<namedTypes.ExportDefaultSpecifier>): any;
-    visitExportAllDeclaration?(this: Context & M, path: NodePath<namedTypes.ExportAllDeclaration>): any;
     visitCommentBlock?(this: Context & M, path: NodePath<namedTypes.CommentBlock>): any;
     visitCommentLine?(this: Context & M, path: NodePath<namedTypes.CommentLine>): any;
     visitDirective?(this: Context & M, path: NodePath<namedTypes.Directive>): any;
@@ -192,17 +218,17 @@ export interface Visitor<M = {}> {
     visitStringLiteral?(this: Context & M, path: NodePath<namedTypes.StringLiteral>): any;
     visitNumericLiteral?(this: Context & M, path: NodePath<namedTypes.NumericLiteral>): any;
     visitBigIntLiteral?(this: Context & M, path: NodePath<namedTypes.BigIntLiteral>): any;
+    visitDecimalLiteral?(this: Context & M, path: NodePath<namedTypes.DecimalLiteral>): any;
     visitNullLiteral?(this: Context & M, path: NodePath<namedTypes.NullLiteral>): any;
     visitBooleanLiteral?(this: Context & M, path: NodePath<namedTypes.BooleanLiteral>): any;
     visitRegExpLiteral?(this: Context & M, path: NodePath<namedTypes.RegExpLiteral>): any;
-    visitObjectMethod?(this: Context & M, path: NodePath<namedTypes.ObjectMethod>): any;
-    visitClassPrivateProperty?(this: Context & M, path: NodePath<namedTypes.ClassPrivateProperty>): any;
     visitClassMethod?(this: Context & M, path: NodePath<namedTypes.ClassMethod>): any;
     visitClassPrivateMethod?(this: Context & M, path: NodePath<namedTypes.ClassPrivateMethod>): any;
-    visitPrivateName?(this: Context & M, path: NodePath<namedTypes.PrivateName>): any;
     visitRestProperty?(this: Context & M, path: NodePath<namedTypes.RestProperty>): any;
     visitForAwaitStatement?(this: Context & M, path: NodePath<namedTypes.ForAwaitStatement>): any;
     visitImport?(this: Context & M, path: NodePath<namedTypes.Import>): any;
+    visitV8IntrinsicIdentifier?(this: Context & M, path: NodePath<namedTypes.V8IntrinsicIdentifier>): any;
+    visitTopicReference?(this: Context & M, path: NodePath<namedTypes.TopicReference>): any;
     visitTSQualifiedName?(this: Context & M, path: NodePath<namedTypes.TSQualifiedName>): any;
     visitTSTypeReference?(this: Context & M, path: NodePath<namedTypes.TSTypeReference>): any;
     visitTSHasOptionalTypeParameters?(this: Context & M, path: NodePath<namedTypes.TSHasOptionalTypeParameters>): any;
@@ -221,6 +247,7 @@ export interface Visitor<M = {}> {
     visitTSUndefinedKeyword?(this: Context & M, path: NodePath<namedTypes.TSUndefinedKeyword>): any;
     visitTSUnknownKeyword?(this: Context & M, path: NodePath<namedTypes.TSUnknownKeyword>): any;
     visitTSVoidKeyword?(this: Context & M, path: NodePath<namedTypes.TSVoidKeyword>): any;
+    visitTSIntrinsicKeyword?(this: Context & M, path: NodePath<namedTypes.TSIntrinsicKeyword>): any;
     visitTSThisType?(this: Context & M, path: NodePath<namedTypes.TSThisType>): any;
     visitTSArrayType?(this: Context & M, path: NodePath<namedTypes.TSArrayType>): any;
     visitTSLiteralType?(this: Context & M, path: NodePath<namedTypes.TSLiteralType>): any;
@@ -263,6 +290,4 @@ export interface Visitor<M = {}> {
     visitTSInterfaceBody?(this: Context & M, path: NodePath<namedTypes.TSInterfaceBody>): any;
     visitTSInterfaceDeclaration?(this: Context & M, path: NodePath<namedTypes.TSInterfaceDeclaration>): any;
     visitTSParameterProperty?(this: Context & M, path: NodePath<namedTypes.TSParameterProperty>): any;
-    visitOptionalMemberExpression?(this: Context & M, path: NodePath<namedTypes.OptionalMemberExpression>): any;
-    visitOptionalCallExpression?(this: Context & M, path: NodePath<namedTypes.OptionalCallExpression>): any;
 }

package/lib/equiv.js

@@ -1,7 +1,7 @@
 "use strict";;
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-var types_1 = tslib_1.__importDefault(require("./types"));
+var types_1 = (0, tslib_1.__importDefault)(require("./types"));
 function default_1(fork) {
     var types = fork.use(types_1.default);
     var getFieldNames = types.getFieldNames;

package/lib/node-path.js

@@ -1,9 +1,9 @@
 "use strict";;
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-var types_1 = tslib_1.__importDefault(require("./types"));
-var path_1 = tslib_1.__importDefault(require("./path"));
-var scope_1 = tslib_1.__importDefault(require("./scope"));
+var types_1 = (0, tslib_1.__importDefault)(require("./types"));
+var path_1 = (0, tslib_1.__importDefault)(require("./path"));
+var scope_1 = (0, tslib_1.__importDefault)(require("./scope"));
 function nodePathPlugin(fork) {
     var types = fork.use(types_1.default);
     var n = types.namedTypes;

package/lib/path-visitor.js

@@ -1,8 +1,8 @@
 "use strict";;
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-var types_1 = tslib_1.__importDefault(require("./types"));
-var node_path_1 = tslib_1.__importDefault(require("./node-path"));
+var types_1 = (0, tslib_1.__importDefault)(require("./types"));
+var node_path_1 = (0, tslib_1.__importDefault)(require("./node-path"));
 var hasOwn = Object.prototype.hasOwnProperty;
 function pathVisitorPlugin(fork) {
     var types = fork.use(types_1.default);

package/lib/path.d.ts

@@ -7,9 +7,9 @@ export interface Path<V = any> {
     __childCache: object | null;
     getValueProperty(name: any): any;
     get(...names: any[]): any;
-    each(callback: any, context: any): any;
-    map(callback: any, context: any): any;
-    filter(callback: any, context: any): any;
+    each(callback: any, context?: any): any;
+    map(callback: any, context?: any): any;
+    filter(callback: any, context?: any): any;
     shift(): any;
     unshift(...args: any[]): any;
     push(...args: any[]): any;

package/lib/path.js

@@ -1,7 +1,7 @@
 "use strict";;
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-var types_1 = tslib_1.__importDefault(require("./types"));
+var types_1 = (0, tslib_1.__importDefault)(require("./types"));
 var Op = Object.prototype;
 var hasOwn = Op.hasOwnProperty;
 function pathPlugin(fork) {

package/lib/scope.d.ts

@@ -1,6 +1,7 @@
 import { Fork } from "../types";
+import { NodePath } from "./node-path";
 export interface Scope {
-    path: any;
+    path: NodePath;
     node: any;
     isGlobal: boolean;
     depth: number;
@@ -20,7 +21,7 @@ export interface Scope {
     getGlobalScope(): Scope;
 }
 export interface ScopeConstructor {
-    new (path: any, parentScope: any): Scope;
+    new (path: NodePath, parentScope: any): Scope;
     isEstablishedBy(node: any): any;
 }
 export default function scopePlugin(fork: Fork): ScopeConstructor;

package/lib/scope.js

@@ -1,7 +1,7 @@
 "use strict";;
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-var types_1 = tslib_1.__importDefault(require("./types"));
+var types_1 = (0, tslib_1.__importDefault)(require("./types"));
 var hasOwn = Object.prototype.hasOwnProperty;
 function scopePlugin(fork) {
     var types = fork.use(types_1.default);
@@ -15,7 +15,9 @@ function scopePlugin(fork) {
         if (!(this instanceof Scope)) {
             throw new Error("Scope constructor cannot be invoked without 'new'");
         }
-        ScopeType.assert(path.value);
+        if (!TypeParameterScopeType.check(path.value)) {
+            ScopeType.assert(path.value);
+        }
         var depth;
         if (parentScope) {
             if (!(parentScope instanceof Scope)) {
@@ -37,19 +39,21 @@ function scopePlugin(fork) {
             types: { value: {} },
         });
     };
-    var scopeTypes = [
-        // Program nodes introduce global scopes.
-        namedTypes.Program,
-        // Function is the supertype of FunctionExpression,
-        // FunctionDeclaration, ArrowExpression, etc.
-        namedTypes.Function,
-        // In case you didn't know, the caught parameter shadows any variable
-        // of the same name in an outer scope.
-        namedTypes.CatchClause
-    ];
-    var ScopeType = Type.or.apply(Type, scopeTypes);
+    var ScopeType = Type.or(
+    // Program nodes introduce global scopes.
+    namedTypes.Program, 
+    // Function is the supertype of FunctionExpression,
+    // FunctionDeclaration, ArrowExpression, etc.
+    namedTypes.Function, 
+    // In case you didn't know, the caught parameter shadows any variable
+    // of the same name in an outer scope.
+    namedTypes.CatchClause);
+    // These types introduce scopes that are restricted to type parameters in
+    // Flow (this doesn't apply to ECMAScript).
+    var TypeParameterScopeType = Type.or(namedTypes.Function, namedTypes.ClassDeclaration, namedTypes.ClassExpression, namedTypes.InterfaceDeclaration, namedTypes.TSInterfaceDeclaration, namedTypes.TypeAlias, namedTypes.TSTypeAliasDeclaration);
+    var FlowOrTSTypeParameterType = Type.or(namedTypes.TypeParameter, namedTypes.TSTypeParameter);
     Scope.isEstablishedBy = function (node) {
-        return ScopeType.check(node);
+        return ScopeType.check(node) || TypeParameterScopeType.check(node);
     };
     var Sp = Scope.prototype;
     // Will be overridden after an instance lazily calls scanScope.
@@ -97,6 +101,10 @@ function scopePlugin(fork) {
                 // Empty out this.bindings, just in cases.
                 delete this.bindings[name];
             }
+            for (var name in this.types) {
+                // Empty out this.types, just in cases.
+                delete this.types[name];
+            }
             scanScope(this.path, this.bindings, this.types);
             this.didScan = true;
         }
@@ -111,18 +119,24 @@ function scopePlugin(fork) {
     };
     function scanScope(path, bindings, scopeTypes) {
         var node = path.value;
-        ScopeType.assert(node);
-        if (namedTypes.CatchClause.check(node)) {
-            // A catch clause establishes a new scope but the only variable
-            // bound in that scope is the catch parameter. Any other
-            // declarations create bindings in the outer scope.
-            var param = path.get("param");
-            if (param.value) {
-                addPattern(param, bindings);
+        if (TypeParameterScopeType.check(node)) {
+            var params = path.get('typeParameters', 'params');
+            if (isArray.check(params.value)) {
+                params.each(function (childPath) {
+                    addTypeParameter(childPath, scopeTypes);
+                });
             }
         }
-        else {
-            recursiveScanScope(path, bindings, scopeTypes);
+        if (ScopeType.check(node)) {
+            if (namedTypes.CatchClause.check(node)) {
+                // A catch clause establishes a new scope but the only variable
+                // bound in that scope is the catch parameter. Any other
+                // declarations create bindings in the outer scope.
+                addPattern(path.get("param"), bindings);
+            }
+            else {
+                recursiveScanScope(path, bindings, scopeTypes);
+            }
         }
     }
     function recursiveScanScope(path, bindings, scopeTypes) {
@@ -145,6 +159,7 @@ function scopePlugin(fork) {
                 addPattern(paramPath, bindings);
             });
             recursiveScanChild(path.get("body"), bindings, scopeTypes);
+            recursiveScanScope(path.get("typeParameters"), bindings, scopeTypes);
         }
         else if ((namedTypes.TypeAlias && namedTypes.TypeAlias.check(node)) ||
             (namedTypes.InterfaceDeclaration && namedTypes.InterfaceDeclaration.check(node)) ||
@@ -201,8 +216,16 @@ function scopePlugin(fork) {
             addPattern(path.get("id"), bindings);
         }
         else if (namedTypes.ClassDeclaration &&
-            namedTypes.ClassDeclaration.check(node)) {
+            namedTypes.ClassDeclaration.check(node) &&
+            node.id !== null) {
             addPattern(path.get("id"), bindings);
+            recursiveScanScope(path.get("typeParameters"), bindings, scopeTypes);
+        }
+        else if ((namedTypes.InterfaceDeclaration &&
+            namedTypes.InterfaceDeclaration.check(node)) ||
+            (namedTypes.TSInterfaceDeclaration &&
+                namedTypes.TSInterfaceDeclaration.check(node))) {
+            addTypePattern(path.get("id"), scopeTypes);
         }
         else if (ScopeType.check(node)) {
             if (namedTypes.CatchClause.check(node) &&
@@ -249,7 +272,9 @@ function scopePlugin(fork) {
                 if (namedTypes.Pattern.check(property)) {
                     addPattern(propertyPath, bindings);
                 }
-                else if (namedTypes.Property.check(property)) {
+                else if (namedTypes.Property.check(property) ||
+                    (namedTypes.ObjectProperty &&
+                        namedTypes.ObjectProperty.check(property))) {
                     addPattern(propertyPath.get('value'), bindings);
                 }
                 else if (namedTypes.SpreadProperty &&
@@ -277,6 +302,8 @@ function scopePlugin(fork) {
         }
         else if ((namedTypes.SpreadElementPattern &&
             namedTypes.SpreadElementPattern.check(pattern)) ||
+            (namedTypes.RestElement &&
+                namedTypes.RestElement.check(pattern)) ||
             (namedTypes.SpreadPropertyPattern &&
                 namedTypes.SpreadPropertyPattern.check(pattern))) {
             addPattern(patternPath.get('argument'), bindings);
@@ -294,6 +321,16 @@ function scopePlugin(fork) {
             }
         }
     }
+    function addTypeParameter(parameterPath, types) {
+        var parameter = parameterPath.value;
+        FlowOrTSTypeParameterType.assert(parameter);
+        if (hasOwn.call(types, parameter.name)) {
+            types[parameter.name].push(parameterPath);
+        }
+        else {
+            types[parameter.name] = [parameterPath];
+        }
+    }
     Sp.lookup = function (name) {
         for (var scope = this; scope; scope = scope.parent)
             if (scope.declares(name))

package/lib/shared.js

@@ -1,7 +1,7 @@
 "use strict";;
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-var types_1 = tslib_1.__importDefault(require("./types"));
+var types_1 = (0, tslib_1.__importDefault)(require("./types"));
 function default_1(fork) {
     var types = fork.use(types_1.default);
     var Type = types.Type;

package/lib/types.js

@@ -22,7 +22,7 @@ var BaseType = /** @class */ (function () {
     return BaseType;
 }());
 var ArrayType = /** @class */ (function (_super) {
-    tslib_1.__extends(ArrayType, _super);
+    (0, tslib_1.__extends)(ArrayType, _super);
     function ArrayType(elemType) {
         var _this = _super.call(this) || this;
         _this.elemType = elemType;
@@ -39,7 +39,7 @@ var ArrayType = /** @class */ (function (_super) {
     return ArrayType;
 }(BaseType));
 var IdentityType = /** @class */ (function (_super) {
-    tslib_1.__extends(IdentityType, _super);
+    (0, tslib_1.__extends)(IdentityType, _super);
     function IdentityType(value) {
         var _this = _super.call(this) || this;
         _this.value = value;
@@ -59,7 +59,7 @@ var IdentityType = /** @class */ (function (_super) {
     return IdentityType;
 }(BaseType));
 var ObjectType = /** @class */ (function (_super) {
-    tslib_1.__extends(ObjectType, _super);
+    (0, tslib_1.__extends)(ObjectType, _super);
     function ObjectType(fields) {
         var _this = _super.call(this) || this;
         _this.fields = fields;
@@ -78,7 +78,7 @@ var ObjectType = /** @class */ (function (_super) {
     return ObjectType;
 }(BaseType));
 var OrType = /** @class */ (function (_super) {
-    tslib_1.__extends(OrType, _super);
+    (0, tslib_1.__extends)(OrType, _super);
     function OrType(types) {
         var _this = _super.call(this) || this;
         _this.types = types;
@@ -96,7 +96,7 @@ var OrType = /** @class */ (function (_super) {
     return OrType;
 }(BaseType));
 var PredicateType = /** @class */ (function (_super) {
-    tslib_1.__extends(PredicateType, _super);
+    (0, tslib_1.__extends)(PredicateType, _super);
     function PredicateType(name, predicate) {
         var _this = _super.call(this) || this;
         _this.name = name;
@@ -345,7 +345,7 @@ function typesPlugin(_fork) {
         return null;
     }
     var DefImpl = /** @class */ (function (_super) {
-        tslib_1.__extends(DefImpl, _super);
+        (0, tslib_1.__extends)(DefImpl, _super);
         function DefImpl(typeName) {
             var _this = _super.call(this, new PredicateType(typeName, function (value, deep) { return _this.check(value, deep); }), typeName) || this;
             return _this;

package/main.js

@@ -2,34 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.visit = exports.use = exports.Type = exports.someField = exports.PathVisitor = exports.Path = exports.NodePath = exports.namedTypes = exports.getSupertypeNames = exports.getFieldValue = exports.getFieldNames = exports.getBuilderName = exports.finalize = exports.eachField = exports.defineMethod = exports.builtInTypes = exports.builders = exports.astNodesAreEquivalent = void 0;
 var tslib_1 = require("tslib");
-var fork_1 = tslib_1.__importDefault(require("./fork"));
-var core_1 = tslib_1.__importDefault(require("./def/core"));
-var es6_1 = tslib_1.__importDefault(require("./def/es6"));
-var es7_1 = tslib_1.__importDefault(require("./def/es7"));
-var es2020_1 = tslib_1.__importDefault(require("./def/es2020"));
-var jsx_1 = tslib_1.__importDefault(require("./def/jsx"));
-var flow_1 = tslib_1.__importDefault(require("./def/flow"));
-var esprima_1 = tslib_1.__importDefault(require("./def/esprima"));
-var babel_1 = tslib_1.__importDefault(require("./def/babel"));
-var typescript_1 = tslib_1.__importDefault(require("./def/typescript"));
-var es_proposals_1 = tslib_1.__importDefault(require("./def/es-proposals"));
+var fork_1 = (0, tslib_1.__importDefault)(require("./fork"));
+var es_proposals_1 = (0, tslib_1.__importDefault)(require("./def/es-proposals"));
+var jsx_1 = (0, tslib_1.__importDefault)(require("./def/jsx"));
+var flow_1 = (0, tslib_1.__importDefault)(require("./def/flow"));
+var esprima_1 = (0, tslib_1.__importDefault)(require("./def/esprima"));
+var babel_1 = (0, tslib_1.__importDefault)(require("./def/babel"));
+var typescript_1 = (0, tslib_1.__importDefault)(require("./def/typescript"));
 var namedTypes_1 = require("./gen/namedTypes");
 Object.defineProperty(exports, "namedTypes", { enumerable: true, get: function () { return namedTypes_1.namedTypes; } });
-var _a = fork_1.default([
-    // This core module of AST types captures ES5 as it is parsed today by
-    // git://github.com/ariya/esprima.git#master.
-    core_1.default,
+var _a = (0, fork_1.default)([
     // Feel free to add to or remove from this list of extension modules to
     // configure the precise type hierarchy that you need.
-    es6_1.default,
-    es7_1.default,
-    es2020_1.default,
+    es_proposals_1.default,
     jsx_1.default,
     flow_1.default,
     esprima_1.default,
     babel_1.default,
     typescript_1.default,
-    es_proposals_1.default,
 ]), astNodesAreEquivalent = _a.astNodesAreEquivalent, builders = _a.builders, builtInTypes = _a.builtInTypes, defineMethod = _a.defineMethod, eachField = _a.eachField, finalize = _a.finalize, getBuilderName = _a.getBuilderName, getFieldNames = _a.getFieldNames, getFieldValue = _a.getFieldValue, getSupertypeNames = _a.getSupertypeNames, n = _a.namedTypes, NodePath = _a.NodePath, Path = _a.Path, PathVisitor = _a.PathVisitor, someField = _a.someField, Type = _a.Type, use = _a.use, visit = _a.visit;
 exports.astNodesAreEquivalent = astNodesAreEquivalent;
 exports.builders = builders;

package/package.json

@@ -1,7 +1,7 @@
 {
   "author": "Ben Newman <bn@cs.stanford.edu>",
   "name": "ast-types",
-  "version": "0.13.4",
+  "version": "0.15.0",
   "description": "Esprima-compatible implementation of the Mozilla JS Parser API",
   "keywords": [
     "ast",
@@ -33,31 +33,31 @@
     "test": "npm run gen && npm run build && npm run mocha",
     "clean": "ts-emit-clean",
     "build": "tsc && ts-add-module-exports",
-    "prepack": "npm run clean && npm run gen && npm run build",
+    "prepare": "npm run clean && npm run gen && npm run build",
     "postpack": "npm run clean"
   },
   "dependencies": {
     "tslib": "^2.0.1"
   },
   "devDependencies": {
-    "@babel/parser": "7.7.7",
-    "@babel/types": "7.4.4",
-    "@types/esprima": "4.0.2",
-    "@types/glob": "7.1.1",
-    "@types/mocha": "5.2.6",
-    "@types/node": "12.0.0",
-    "espree": "7.3.0",
+    "@babel/parser": "7.16.4",
+    "@babel/types": "7.16.0",
+    "@types/esprima": "4.0.3",
+    "@types/glob": "7.2.0",
+    "@types/mocha": "9.0.0",
+    "@types/node": "16.11.10",
+    "espree": "9.1.0",
     "esprima": "4.0.1",
     "esprima-fb": "15001.1001.0-dev-harmony-fb",
-    "flow-parser": "0.132.0",
-    "glob": "7.1.6",
-    "mocha": "6.1.4",
-    "recast": "0.20.0",
+    "flow-parser": "0.165.1",
+    "glob": "7.2.0",
+    "mocha": "^9.1.3",
+    "recast": "0.20.5",
     "reify": "0.20.12",
     "ts-add-module-exports": "1.0.0",
     "ts-emit-clean": "1.0.0",
-    "ts-node": "7.0.1",
-    "typescript": "3.9.7"
+    "ts-node": "10.4.0",
+    "typescript": "4.5.2"
   },
   "engines": {
     "node": ">=4"