ast-types 0.14.1 → 0.15.2

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.d.ts

@@ -118,6 +118,7 @@ export default function typesPlugin(_fork: Fork): {
         boolean: Type<boolean>;
         null: Type<null>;
         undefined: Type<undefined>;
+        BigInt: Type<BigInt>;
     };
     getSupertypeNames: (typeName: string) => string[];
     computeSupertypeLookupTable: (candidates: any) => {

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;
@@ -316,6 +316,9 @@ function typesPlugin(_fork) {
     var isBoolean = defBuiltInType("boolean", true);
     var isNull = defBuiltInType("null", null);
     var isUndefined = defBuiltInType("undefined", undefined);
+    var isBigInt = typeof BigInt === "function"
+        ? defBuiltInType("BigInt", BigInt(1234))
+        : new PredicateType("BigInt", function () { return false; });
     var builtInTypes = {
         string: isString,
         function: isFunction,
@@ -327,6 +330,7 @@ function typesPlugin(_fork) {
         boolean: isBoolean,
         null: isNull,
         undefined: isUndefined,
+        BigInt: isBigInt,
     };
     // In order to return the same Def instance every time Type.def is called
     // with a particular name, those instances need to be stored in a cache.
@@ -345,7 +349,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.d.ts

@@ -19,6 +19,7 @@ declare const astNodesAreEquivalent: {
     boolean: Type<boolean>;
     null: Type<null>;
     undefined: Type<undefined>;
+    BigInt: Type<BigInt>;
 }, defineMethod: (name: any, func?: Function | undefined) => Function, eachField: (object: any, callback: (name: any, value: any) => any, context?: any) => void, finalize: () => void, getBuilderName: (typeName: any) => any, getFieldNames: (object: any) => string[], getFieldValue: (object: any, fieldName: any) => any, getSupertypeNames: (typeName: string) => string[], NodePath: import("./lib/node-path").NodePathConstructor, Path: import("./lib/path").PathConstructor, PathVisitor: import("./lib/path-visitor").PathVisitorConstructor, someField: (object: any, callback: (name: any, value: any) => any, context?: any) => boolean, Type: {
     or(...types: any[]): Type<any>;
     from<T>(value: any, name?: string | undefined): Type<T>;

package/main.js

@@ -2,40 +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 es2016_1 = tslib_1.__importDefault(require("./def/es2016"));
-var es2017_1 = tslib_1.__importDefault(require("./def/es2017"));
-var es2018_1 = tslib_1.__importDefault(require("./def/es2018"));
-var es2019_1 = tslib_1.__importDefault(require("./def/es2019"));
-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,
-    es2016_1.default,
-    es2017_1.default,
-    es2018_1.default,
-    es2019_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.14.1",
+  "version": "0.15.2",
   "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.11.4",
-    "@babel/types": "7.4.4",
-    "@types/esprima": "4.0.2",
-    "@types/glob": "7.1.3",
-    "@types/mocha": "8.0.3",
-    "@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": "^8.1.1",
-    "recast": "0.20.1",
+    "flow-parser": "0.166.0",
+    "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"

package/types.d.ts

@@ -2,5 +2,4 @@ export declare type Fork = {
     use<T>(plugin: Plugin<T>): T;
 };
 export declare type Plugin<T> = (fork: Fork) => T;
-export declare type Def = Plugin<void>;
 export declare type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;

package/def/core-operators.d.ts

@@ -1,3 +0,0 @@
-export declare const BinaryOperators: string[];
-export declare const AssignmentOperators: string[];
-export declare const LogicalOperators: string[];

package/def/core-operators.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogicalOperators = exports.AssignmentOperators = exports.BinaryOperators = void 0;
-exports.BinaryOperators = [
-    "==", "!=", "===", "!==",
-    "<", "<=", ">", ">=",
-    "<<", ">>", ">>>",
-    "+", "-", "*", "/", "%",
-    "&",
-    "|", "^", "in",
-    "instanceof",
-];
-exports.AssignmentOperators = [
-    "=", "+=", "-=", "*=", "/=", "%=",
-    "<<=", ">>=", ">>>=",
-    "|=", "^=", "&=",
-];
-exports.LogicalOperators = [
-    "||", "&&",
-];

package/def/es7.js

@@ -1,34 +0,0 @@
-"use strict";;
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var es6_1 = tslib_1.__importDefault(require("./es6"));
-var types_1 = tslib_1.__importDefault(require("../lib/types"));
-var shared_1 = tslib_1.__importDefault(require("../lib/shared"));
-function default_1(fork) {
-    fork.use(es6_1.default);
-    var types = fork.use(types_1.default);
-    var def = types.Type.def;
-    var or = types.Type.or;
-    var defaults = fork.use(shared_1.default).defaults;
-    def("Function")
-        .field("async", Boolean, defaults["false"]);
-    def("SpreadProperty")
-        .bases("Node")
-        .build("argument")
-        .field("argument", def("Expression"));
-    def("ObjectExpression")
-        .field("properties", [or(def("Property"), def("SpreadProperty"), def("SpreadElement"))]);
-    def("SpreadPropertyPattern")
-        .bases("Pattern")
-        .build("argument")
-        .field("argument", def("Pattern"));
-    def("ObjectPattern")
-        .field("properties", [or(def("Property"), def("PropertyPattern"), def("SpreadPropertyPattern"))]);
-    def("AwaitExpression")
-        .bases("Expression")
-        .build("argument", "all")
-        .field("argument", or(def("Expression"), null))
-        .field("all", Boolean, defaults["false"]);
-}
-exports.default = default_1;
-module.exports = exports["default"];