Upgrade: typescript-estree to 12.0.0 and add new tests

Author: armano2

analyze-scope.js

@@ -346,13 +346,24 @@ class Referencer extends OriginalReferencer {
      * @returns {void}
      */
     TSInterfaceDeclaration(node) {
+        this.visitTypeNodes(node);
+    }
+
+    /**
+     * Visit type assertion.
+     * @param {TSTypeAssertion} node The TSTypeAssertion node to visit.
+     * @returns {void}
+     */
+    TSTypeAssertion(node) {
         if (this.typeMode) {
-            this.visitChildren(node);
+            this.visit(node.typeAnnotation);
         } else {
             this.typeMode = true;
-            this.visitChildren(node);
+            this.visit(node.typeAnnotation);
             this.typeMode = false;
         }
+
+        this.visit(node.expression);
     }
 
     /**
@@ -378,13 +389,7 @@ class Referencer extends OriginalReferencer {
      * @returns {void}
      */
     TSTypeAnnotation(node) {
-        if (this.typeMode) {
-            this.visitChildren(node);
-        } else {
-            this.typeMode = true;
-            this.visitChildren(node);
-            this.typeMode = false;
-        }
+        this.visitTypeNodes(node);
     }
 
     /**
@@ -393,13 +398,7 @@ class Referencer extends OriginalReferencer {
      * @returns {void}
      */
     TSTypeParameterDeclaration(node) {
-        if (this.typeMode) {
-            this.visitChildren(node);
-        } else {
-            this.typeMode = true;
-            this.visitChildren(node);
-            this.typeMode = false;
-        }
+        this.visitTypeNodes(node);
     }
 
     /**

package.json

@@ -46,7 +46,7 @@
   "dependencies": {
     "eslint-scope": "^4.0.0",
     "eslint-visitor-keys": "^1.0.0",
-    "typescript-estree": "9.0.0"
+    "typescript-estree": "12.0.0"
   },
   "devDependencies": {
     "eslint": "^4.19.1",

tests/fixtures/scope-analysis/export-as-namespace.ts

@@ -0,0 +1 @@
+export as namespace a;

tests/lib/__snapshots__/scope-analysis.js.snap

@@ -3396,6 +3396,53 @@ Object {
 }
 `;
 
+exports[`TypeScript scope analysis tests/fixtures/scope-analysis/export-as-namespace.ts 1`] = `
+Object {
+  "$id": 1,
+  "block": Object {
+    "range": Array [
+      0,
+      23,
+    ],
+    "type": "Program",
+  },
+  "childScopes": Array [],
+  "functionExpressionScope": false,
+  "isStrict": false,
+  "references": Array [
+    Object {
+      "$id": 0,
+      "from": Object {
+        "$ref": 1,
+      },
+      "identifier": Object {
+        "name": "a",
+        "range": Array [
+          20,
+          21,
+        ],
+        "type": "Identifier",
+      },
+      "kind": "r",
+      "resolved": null,
+      "writeExpr": undefined,
+    },
+  ],
+  "throughReferences": Array [
+    Object {
+      "$ref": 0,
+    },
+  ],
+  "type": "global",
+  "upperScope": null,
+  "variableMap": Object {},
+  "variableScope": Object {
+    "$ref": 1,
+  },
+  "variables": Array [],
+}
+`;
+
 exports[`TypeScript scope analysis tests/fixtures/scope-analysis/expression-as.ts 1`] = `
 Object {
   "$id": 1,
@@ -5677,7 +5724,7 @@ Object {
           21,
           26,
         ],
-        "type": "TSTypeAssertionExpression",
+        "type": "TSTypeAssertion",
       },
     },
     Object {
@@ -5949,7 +5996,7 @@ Object {
           27,
           40,
         ],
-        "type": "TSTypeAssertionExpression",
+        "type": "TSTypeAssertion",
       },
     },
     Object {

tests/lib/__snapshots__/typescript.js.snap

@@ -31746,8 +31746,7 @@ Object {
               245,
               265,
             ],
-            "type": "TSConstructSignature",
-            "typeAnnotation": Object {
+            "returnType": Object {
               "loc": Object {
                 "end": Object {
                   "column": 23,
@@ -31781,6 +31780,7 @@ Object {
                 "type": "TSStringKeyword",
               },
             },
+            "type": "TSConstructSignatureDeclaration",
           },
           Object {
             "loc": Object {
@@ -31836,8 +31836,7 @@ Object {
               270,
               293,
             ],
-            "type": "TSConstructSignature",
-            "typeAnnotation": Object {
+            "returnType": Object {
               "loc": Object {
                 "end": Object {
                   "column": 26,
@@ -31871,6 +31870,7 @@ Object {
                 "type": "TSStringKeyword",
               },
             },
+            "type": "TSConstructSignatureDeclaration",
             "typeParameters": Object {
               "loc": Object {
                 "end": Object {
@@ -34095,8 +34095,7 @@ Object {
               21,
               47,
             ],
-            "type": "TSConstructSignature",
-            "typeAnnotation": null,
+            "type": "TSConstructSignatureDeclaration",
           },
         ],
         "loc": Object {

visitor-keys.js

@@ -36,9 +36,9 @@ module.exports = Evk.unionWith({
     TSAsyncKeyword: [],
     TSBigIntKeyword: [],
     TSBooleanKeyword: [],
-    TSCallSignature: ["typeParameters", "parameters", "typeAnnotation"],
+    TSCallSignatureDeclaration: ["typeParameters", "params", "returnType"],
     TSConditionalType: ["checkType", "extendsType", "trueType", "falseType"],
-    TSConstructSignature: ["typeParameters", "params", "typeAnnotation"],
+    TSConstructSignatureDeclaration: ["typeParameters", "params", "returnType"],
     TSConstructorType: ["typeAnnotation", "parameters"],
     TSDeclareKeyword: [],
     TSEmptyBodyDeclareFunction: ["id", "typeParameters", "params", "returnType"],
@@ -64,6 +64,7 @@ module.exports = Evk.unionWith({
     TSMethodSignature: ["typeAnnotation", "typeParameters", "key", "params"],
     TSModuleBlock: ["body"],
     TSModuleDeclaration: ["id", "body"],
+    TSNamespaceExportDeclaration: ["id"],
     TSNamespaceFunctionDeclaration: [],
     TSNonNullExpression: ["expression"],
     TSNeverKeyword: [],
@@ -86,8 +87,9 @@ module.exports = Evk.unionWith({
     TSSymbolKeyword: [],
     TSThisType: [],
     TSTupleType: ["elementTypes"],
-    TSTypeAnnotation: ["typeAnnotation"],
     TSTypeAliasDeclaration: ["id", "typeParameters", "typeAnnotation"],
+    TSTypeAnnotation: ["typeAnnotation"],
+    TSTypeAssertion: ["typeAnnotation", "expression"],
     TSTypeLiteral: ["members"],
     TSTypeOperator: ["typeAnnotation"],
     TSTypeParameter: ["constraint", "default"],