ast-types 0.12.2 → 0.13.1

package/lib/scope.js

@@ -145,7 +145,10 @@ function scopePlugin(fork) {
             });
             recursiveScanChild(path.get("body"), bindings, scopeTypes);
         }
-        else if (namedTypes.TypeAlias && namedTypes.TypeAlias.check(node)) {
+        else if ((namedTypes.TypeAlias && namedTypes.TypeAlias.check(node)) ||
+            (namedTypes.InterfaceDeclaration && namedTypes.InterfaceDeclaration.check(node)) ||
+            (namedTypes.TSTypeAliasDeclaration && namedTypes.TSTypeAliasDeclaration.check(node)) ||
+            (namedTypes.TSInterfaceDeclaration && namedTypes.TSInterfaceDeclaration.check(node))) {
             addTypePattern(path.get("id"), scopeTypes);
         }
         else if (namedTypes.VariableDeclarator.check(node)) {
@@ -201,7 +204,9 @@ function scopePlugin(fork) {
             addPattern(path.get("id"), bindings);
         }
         else if (ScopeType.check(node)) {
-            if (namedTypes.CatchClause.check(node)) {
+            if (namedTypes.CatchClause.check(node) &&
+                // TODO Broaden this to accept any pattern.
+                namedTypes.Identifier.check(node.param)) {
                 var catchParamName = node.param.name;
                 var hadBinding = hasOwn.call(bindings, catchParamName);
                 // Any declarations that occur inside the catch body that do

package/lib/types.d.ts

@@ -123,15 +123,11 @@ export default function typesPlugin(_fork: Fork): {
     computeSupertypeLookupTable: (candidates: any) => {
         [typeName: string]: any;
     };
-    builders: {
-        [name: string]: Builder;
-    };
+    builders: import("../gen/builders").builders;
     defineMethod: (name: any, func?: Function | undefined) => Function;
     getBuilderName: (typeName: any) => any;
     getStatementBuilderName: (typeName: any) => any;
-    namedTypes: {
-        [name: string]: AnyType;
-    };
+    namedTypes: import("../gen/namedTypes").NamedTypes;
     getFieldNames: (object: any) => string[];
     getFieldValue: (object: any, fieldName: any) => any;
     eachField: (object: any, callback: (name: any, value: any) => any, context?: any) => void;

package/main.d.ts

@@ -1,16 +1,28 @@
-import fork from "./fork";
-import { Omit } from "./types";
 import { ASTNode, Type, AnyType, Field } from "./lib/types";
 import { NodePath } from "./lib/node-path";
-import { NamedTypes } from "./gen/namedTypes";
-import { Builders } from "./gen/builders";
+import { namedTypes } from "./gen/namedTypes";
+import { builders } from "./gen/builders";
 import { Visitor } from "./gen/visitor";
-declare type GenTypes = {
-    namedTypes: NamedTypes;
-    builders: Builders;
-    visit<M = {}>(node: ASTNode, methods?: Visitor<M> & M): any;
-};
-declare type Main = Omit<ReturnType<typeof fork>, keyof GenTypes> & GenTypes;
-declare const main: Main;
-export default main;
-export { ASTNode, Type, AnyType, Field, NodePath, NamedTypes, Builders, Visitor, };
+declare const astNodesAreEquivalent: {
+    (a: any, b: any, problemPath?: any): boolean;
+    assert(a: any, b: any): void;
+}, builders: builders, builtInTypes: {
+    string: Type<string>;
+    function: Type<Function>;
+    array: Type<any[]>;
+    object: Type<{
+        [key: string]: any;
+    }>;
+    RegExp: Type<RegExp>;
+    Date: Type<Date>;
+    number: Type<number>;
+    boolean: Type<boolean>;
+    null: Type<null>;
+    undefined: Type<undefined>;
+}, 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>;
+    def(typeName: string): import("./lib/types").Def<any>;
+    hasDef(typeName: string): boolean;
+}, use: <T>(plugin: import("./types").Plugin<T>) => T, visit: <M = {}>(node: ASTNode, methods?: Visitor<M> | undefined) => any;
+export { AnyType, ASTNode, astNodesAreEquivalent, builders, builtInTypes, defineMethod, eachField, Field, finalize, getBuilderName, getFieldNames, getFieldValue, getSupertypeNames, namedTypes, NodePath, Path, PathVisitor, someField, Type, use, visit, Visitor, };

package/main.js

@@ -1,4 +1,4 @@
-"use strict";;
+"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -13,7 +13,9 @@ var esprima_1 = __importDefault(require("./def/esprima"));
 var babel_1 = __importDefault(require("./def/babel"));
 var typescript_1 = __importDefault(require("./def/typescript"));
 var es_proposals_1 = __importDefault(require("./def/es-proposals"));
-var defs = [
+var namedTypes_1 = require("./gen/namedTypes");
+exports.namedTypes = 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,
@@ -27,7 +29,24 @@ var defs = [
     babel_1.default,
     typescript_1.default,
     es_proposals_1.default,
-];
-var main = fork_1.default(defs);
-exports.default = main;
-module.exports = exports["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;
+exports.builtInTypes = builtInTypes;
+exports.defineMethod = defineMethod;
+exports.eachField = eachField;
+exports.finalize = finalize;
+exports.getBuilderName = getBuilderName;
+exports.getFieldNames = getFieldNames;
+exports.getFieldValue = getFieldValue;
+exports.getSupertypeNames = getSupertypeNames;
+exports.NodePath = NodePath;
+exports.Path = Path;
+exports.PathVisitor = PathVisitor;
+exports.someField = someField;
+exports.Type = Type;
+exports.use = use;
+exports.visit = visit;
+// Populate the exported fields of the namedTypes namespace, while still
+// retaining its member types.
+Object.assign(namedTypes_1.namedTypes, n);

package/package.json

@@ -1,7 +1,7 @@
 {
   "author": "Ben Newman <bn@cs.stanford.edu>",
   "name": "ast-types",
-  "version": "0.12.2",
+  "version": "0.13.1",
   "description": "Esprima-compatible implementation of the Mozilla JS Parser API",
   "keywords": [
     "ast",
@@ -38,24 +38,24 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@babel/parser": "^7.1.6",
-    "@babel/types": "^7.1.6",
-    "@types/esprima": "^4.0.2",
-    "@types/glob": "^7.1.1",
-    "@types/mocha": "^5.2.5",
-    "@types/node": "^10.12.9",
-    "espree": "^4.0.0",
-    "esprima": "~4.0.0",
-    "esprima-fb": "~14001.1.0-dev-harmony-fb",
-    "flow-parser": "^0.83.0",
-    "glob": "^7.1.2",
-    "mocha": "^5.0.0",
-    "recast": "^0.16.1",
-    "reify": "^0.18.1",
-    "ts-add-module-exports": "^1.0.0",
-    "ts-emit-clean": "^1.0.0",
-    "ts-node": "^7.0.1",
-    "typescript": "^3.2.2"
+    "@babel/parser": "7.4.4",
+    "@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": "5.0.1",
+    "esprima": "4.0.1",
+    "esprima-fb": "15001.1001.0-dev-harmony-fb",
+    "flow-parser": "0.98.1",
+    "glob": "7.1.4",
+    "mocha": "6.1.4",
+    "recast": "0.17.6",
+    "reify": "0.18.1",
+    "ts-add-module-exports": "1.0.0",
+    "ts-emit-clean": "1.0.0",
+    "ts-node": "7.0.1",
+    "typescript": "3.4.5"
   },
   "engines": {
     "node": ">=4"