Upgrade: typescript-estree to 13.5.1

Author: armano2

analyze-scope.js

@@ -120,7 +120,7 @@ class Referencer extends OriginalReferencer {
             const { defs, identifiers } = upperScope.set.get(id.name);
             for (let i = 0; i < defs.length; ++i) {
                 const def = defs[i];
-                if (def.type === "FunctionName" && def.node.type === "TSEmptyBodyFunctionDeclaration") {
+                if (def.type === "FunctionName" && def.node.type === "TSDeclareFunction") {
                     defs.splice(i, 1);
                     identifiers.splice(i, 1);
                     break;
@@ -292,10 +292,10 @@ class Referencer extends OriginalReferencer {
     /**
      * Define the variable of this function declaration only once.
      * Because to avoid confusion of `no-redeclare` rule by overloading.
-     * @param {TSEmptyBodyFunctionDeclaration} node The TSEmptyBodyFunctionDeclaration node to visit.
+     * @param {TSDeclareFunction} node The TSDeclareFunction node to visit.
      * @returns {void}
      */
-    TSEmptyBodyFunctionDeclaration(node) {
+    TSDeclareFunction(node) {
         const upperTypeMode = this.typeMode;
         const scope = this.currentScope();
         const { id, typeParameters, params, returnType } = node;
@@ -319,10 +319,6 @@ class Referencer extends OriginalReferencer {
         this.typeMode = upperTypeMode;
     }
 
-    TSEmptyBodyDeclareFunction(node) {
-        this.TSEmptyBodyFunctionDeclaration(node);
-    }
-
     /**
      * Create reference objects for the references in parameters and return type.
      * @param {TSEmptyBodyFunctionExpression} node The TSEmptyBodyFunctionExpression node to visit.

package.json

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

parser.js

@@ -41,16 +41,8 @@ exports.parseForESLint = function parseForESLint(code, options) {
     traverser.traverse(ast, {
         enter: node => {
             switch (node.type) {
-                // Just for backward compatibility.
-                case "TSDeclareFunction":
-                    if (!node.body) {
-                        node.type = "TSEmptyBodyDeclareFunction";
-                    }
-                    break;
-
                 // Function#body cannot be null in ESTree spec.
                 case "FunctionExpression":
-                case "FunctionDeclaration":
                     if (!node.body) {
                         node.type = `TSEmptyBody${node.type}`;
                     }

tests/lib/__snapshots__/ecma-features.js.snap

@@ -102133,7 +102133,7 @@ Object {
         0,
         24,
       ],
-      "type": "TSEmptyBodyFunctionDeclaration",
+      "type": "TSDeclareFunction",
     },
   ],
   "comments": Array [],
@@ -102468,7 +102468,7 @@ Object {
         0,
         23,
       ],
-      "type": "TSEmptyBodyFunctionDeclaration",
+      "type": "TSDeclareFunction",
     },
   ],
   "comments": Array [],

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

@@ -1689,7 +1689,7 @@ Object {
               0,
               37,
             ],
-            "type": "TSEmptyBodyDeclareFunction",
+            "type": "TSDeclareFunction",
           },
           "parent": null,
           "type": "FunctionName",
@@ -4188,7 +4188,7 @@ Object {
               0,
               18,
             ],
-            "type": "TSEmptyBodyFunctionDeclaration",
+            "type": "TSDeclareFunction",
           },
           "parent": null,
           "type": "FunctionName",

tests/lib/__snapshots__/typescript.js.snap

@@ -10822,7 +10822,7 @@ Object {
             "line": 9,
           },
         },
-        "parameters": Array [
+        "params": Array [
           Object {
             "argument": Object {
               "loc": Object {
@@ -10914,20 +10914,19 @@ Object {
           180,
           205,
         ],
-        "type": "TSConstructorType",
-        "typeAnnotation": Object {
+        "returnType": Object {
           "loc": Object {
             "end": Object {
               "column": 47,
               "line": 9,
             },
             "start": Object {
-              "column": 44,
+              "column": 43,
               "line": 9,
             },
           },
           "range": Array [
-            202,
+            201,
             205,
           ],
           "type": "TSTypeAnnotation",
@@ -10967,7 +10966,7 @@ Object {
             },
           },
         },
-        "typeParameters": null,
+        "type": "TSConstructorType",
       },
       "typeParameters": Object {
         "loc": Object {
@@ -20726,7 +20725,7 @@ Object {
           "type": "TSStringKeyword",
         },
       },
-      "type": "TSEmptyBodyDeclareFunction",
+      "type": "TSDeclareFunction",
     },
   ],
   "comments": Array [],
@@ -23686,7 +23685,7 @@ Object {
               "line": 1,
             },
           },
-          "parameters": Array [
+          "params": Array [
             Object {
               "loc": Object {
                 "end": Object {
@@ -23744,20 +23743,19 @@ Object {
             27,
             46,
           ],
-          "type": "TSFunctionType",
-          "typeAnnotation": Object {
+          "returnType": Object {
             "loc": Object {
               "end": Object {
                 "column": 46,
                 "line": 1,
               },
               "start": Object {
-                "column": 40,
+                "column": 39,
                 "line": 1,
               },
             },
             "range": Array [
-              40,
+              39,
               46,
             ],
             "type": "TSTypeAnnotation",
@@ -23779,7 +23777,7 @@ Object {
               "type": "TSVoidKeyword",
             },
           },
-          "typeParameters": null,
+          "type": "TSFunctionType",
         },
       },
       "loc": Object {
@@ -43967,7 +43965,7 @@ Object {
                         "line": 2,
                       },
                     },
-                    "parameters": Array [
+                    "params": Array [
                       Object {
                         "loc": Object {
                           "end": Object {
@@ -44095,20 +44093,19 @@ Object {
                       49,
                       79,
                     ],
-                    "type": "TSFunctionType",
-                    "typeAnnotation": Object {
+                    "returnType": Object {
                       "loc": Object {
                         "end": Object {
                           "column": 57,
                           "line": 2,
                         },
                         "start": Object {
-                          "column": 51,
+                          "column": 50,
                           "line": 2,
                         },
                       },
                       "range": Array [
-                        73,
+                        72,
                         79,
                       ],
                       "type": "TSTypeAnnotation",
@@ -44130,7 +44127,7 @@ Object {
                         "type": "TSVoidKeyword",
                       },
                     },
-                    "typeParameters": null,
+                    "type": "TSFunctionType",
                   },
                 },
               },
@@ -66021,7 +66018,7 @@ Object {
                   },
                 },
               },
-              "type": "TSEmptyBodyFunctionDeclaration",
+              "type": "TSDeclareFunction",
             },
             "loc": Object {
               "end": Object {

visitor-keys.js

@@ -39,10 +39,9 @@ module.exports = Evk.unionWith({
     TSCallSignatureDeclaration: ["typeParameters", "params", "returnType"],
     TSConditionalType: ["checkType", "extendsType", "trueType", "falseType"],
     TSConstructSignatureDeclaration: ["typeParameters", "params", "returnType"],
-    TSConstructorType: ["typeAnnotation", "parameters"],
+    TSConstructorType: ["typeParameters", "params", "returnType"],
+    TSDeclareFunction: ["id", "typeParameters", "params", "returnType"],
     TSDeclareKeyword: [],
-    TSEmptyBodyDeclareFunction: ["id", "typeParameters", "params", "returnType"],
-    TSEmptyBodyFunctionDeclaration: ["id", "typeParameters", "params", "returnType"],
     TSEmptyBodyFunctionExpression: ["id", "typeParameters", "params", "returnType"],
     TSEnumDeclaration: ["members"],
     TSEnumMember: ["id", "initializer"],
@@ -59,13 +58,12 @@ module.exports = Evk.unionWith({
     TSInterfaceDeclaration: ["id", "typeParameters", "heritage", "body"],
     TSInterfaceHeritage: ["id", "typeParameters"],
     TSImportEqualsDeclaration: ["id", "moduleReference"],
-    TSFunctionType: ["parameters", "typeAnnotation"],
+    TSFunctionType: ["typeParameters", "params", "returnType"],
     TSMappedType: ["typeParameter"],
     TSMethodSignature: ["typeAnnotation", "typeParameters", "key", "params"],
     TSModuleBlock: ["body"],
     TSModuleDeclaration: ["id", "body"],
     TSNamespaceExportDeclaration: ["id"],
-    TSNamespaceFunctionDeclaration: [],
     TSNonNullExpression: ["expression"],
     TSNeverKeyword: [],
     TSNullKeyword: [],