Breaking: Updates to AST node types of some TSNodes (fixes #386) (#388)

Author: JamesHenry

README.md

@@ -75,4 +75,3 @@ Issues and pull requests will be triaged and responded to as quickly as possible
 ## License
 
 TypeScript ESLint Parser is licensed under a permissive BSD 2-clause license.
-

lib/ast-node-types.js

@@ -97,7 +97,6 @@ module.exports = {
     ThisExpression: "ThisExpression",
     ThrowStatement: "ThrowStatement",
     TryStatement: "TryStatement",
-
     /**
      * TS-prefixed nodes
      */
@@ -140,17 +139,16 @@ module.exports = {
     TSStaticKeyword: "TSStaticKeyword",
     TSStringKeyword: "TSStringKeyword",
     TSSymbolKeyword: "TSSymbolKeyword",
+    TSTypeAnnotation: "TSTypeAnnotation",
     TSTypeLiteral: "TSTypeLiteral",
+    TSTypeParameter: "TSTypeParameter",
+    TSTypeParameterDeclaration: "TSTypeParameterDeclaration",
+    TSTypeParameterInstantiation: "TSTypeParameterInstantiation",
     TSTypePredicate: "TSTypePredicate",
     TSTypeReference: "TSTypeReference",
     TSUnionType: "TSUnionType",
     TSUndefinedKeyword: "TSUndefinedKeyword",
     TSVoidKeyword: "TSVoidKeyword",
-
-    TypeAnnotation: "TypeAnnotation",
-    TypeParameter: "TypeParameter",
-    TypeParameterDeclaration: "TypeParameterDeclaration",
-    TypeParameterInstantiation: "TypeParameterInstantiation",
     UnaryExpression: "UnaryExpression",
     UpdateExpression: "UpdateExpression",
     VariableDeclaration: "VariableDeclaration",

lib/convert.js

@@ -89,7 +89,7 @@ module.exports = function convert(config) {
         const annotationStartCol = child.getFullStart() - 1;
         const loc = nodeUtils.getLocFor(annotationStartCol, child.end, ast);
         return {
-            type: AST_NODE_TYPES.TypeAnnotation,
+            type: AST_NODE_TYPES.TSTypeAnnotation,
             loc,
             range: [annotationStartCol, child.end],
             typeAnnotation: annotation
@@ -122,7 +122,7 @@ module.exports = function convert(config) {
             }
         }
         return {
-            type: AST_NODE_TYPES.TypeParameterInstantiation,
+            type: AST_NODE_TYPES.TSTypeParameterInstantiation,
             range: [
                 start,
                 end
@@ -167,7 +167,7 @@ module.exports = function convert(config) {
         const greaterThanToken = nodeUtils.findNextToken(lastTypeParameter, ast);
 
         return {
-            type: AST_NODE_TYPES.TypeParameterDeclaration,
+            type: AST_NODE_TYPES.TSTypeParameterDeclaration,
             range: [
                 firstTypeParameter.pos - 1,
                 greaterThanToken.end
@@ -185,7 +185,7 @@ module.exports = function convert(config) {
                     : typeParameter.default;
 
                 return {
-                    type: AST_NODE_TYPES.TypeParameter,
+                    type: AST_NODE_TYPES.TSTypeParameter,
                     range: [
                         typeParameter.getStart(),
                         typeParameter.getEnd()

package.json

@@ -19,9 +19,9 @@
   "license": "BSD-2-Clause",
   "devDependencies": {
     "babel-code-frame": "6.26.0",
-    "babylon": "7.0.0-beta.24",
-    "dedent": "^0.7.0",
-    "eslint": "4.10.0",
+    "babylon": "7.0.0-beta.34",
+    "dedent": "0.7.0",
+    "eslint": "4.13.0",
     "eslint-config-eslint": "4.0.0",
     "eslint-plugin-node": "5.2.1",
     "eslint-release": "0.10.3",

tests/lib/__snapshots__/tsx.js.snap

@@ -159,7 +159,7 @@ Object {
                     53,
                     61,
                   ],
-                  "type": "TypeAnnotation",
+                  "type": "TSTypeAnnotation",
                   "typeAnnotation": Object {
                     "loc": Object {
                       "end": Object {
@@ -526,7 +526,7 @@ Object {
                 98,
                 105,
               ],
-              "type": "TypeAnnotation",
+              "type": "TSTypeAnnotation",
               "typeAnnotation": Object {
                 "loc": Object {
                   "end": Object {