Breaking: Check for isTypeKeyword in type params (fixes #373) (#374)

Author: JamesHenry

lib/convert.js

@@ -110,18 +110,30 @@ module.exports = function convert(config) {
                 greaterThanToken.end
             ],
             loc: nodeUtils.getLocFor(firstTypeArgument.pos - 1, greaterThanToken.end, ast),
-            params: typeArguments.map(typeArgument => ({
-                type: AST_NODE_TYPES.TSTypeReference,
-                range: [
-                    typeArgument.getStart(),
-                    typeArgument.getEnd()
-                ],
-                loc: nodeUtils.getLoc(typeArgument, ast),
-                typeName: convertChild(typeArgument.typeName || typeArgument),
-                typeParameters: (typeArgument.typeArguments)
-                    ? convertTypeArgumentsToTypeParameters(typeArgument.typeArguments)
-                    : null
-            }))
+            params: typeArguments.map(typeArgument => {
+                if (nodeUtils.isTypeKeyword(typeArgument.kind)) {
+                    return {
+                        type: AST_NODE_TYPES[`TS${SyntaxKind[typeArgument.kind]}`],
+                        range: [
+                            typeArgument.getStart(),
+                            typeArgument.getEnd()
+                        ],
+                        loc: nodeUtils.getLoc(typeArgument, ast)
+                    };
+                }
+                return {
+                    type: AST_NODE_TYPES.TSTypeReference,
+                    range: [
+                        typeArgument.getStart(),
+                        typeArgument.getEnd()
+                    ],
+                    loc: nodeUtils.getLoc(typeArgument, ast),
+                    typeName: convertChild(typeArgument.typeName || typeArgument),
+                    typeParameters: (typeArgument.typeArguments)
+                        ? convertTypeArgumentsToTypeParameters(typeArgument.typeArguments)
+                        : undefined
+                };
+            })
         };
     }
 
@@ -794,10 +806,13 @@ module.exports = function convert(config) {
                 value: convertChild(node.initializer),
                 computed: nodeUtils.isComputedProperty(node.name),
                 static: nodeUtils.hasStaticModifierFlag(node),
-                readonly: nodeUtils.hasModifier(SyntaxKind.ReadonlyKeyword, node),
-                typeAnnotation: (node.type) ? convertTypeAnnotation(node.type) : null
+                readonly: nodeUtils.hasModifier(SyntaxKind.ReadonlyKeyword, node)
             });
 
+            if (node.type) {
+                result.typeAnnotation = convertTypeAnnotation(node.type);
+            }
+
             if (node.decorators) {
                 result.decorators = convertDecorators(node.decorators);
             }

lib/node-utils.js

@@ -183,7 +183,8 @@ module.exports = {
     convertToken,
     convertTokens,
     getNodeContainer,
-    isWithinTypeAnnotation
+    isWithinTypeAnnotation,
+    isTypeKeyword
 };
 /* eslint-enable no-use-before-define */
 
@@ -313,6 +314,27 @@ function isJSXToken(node) {
     );
 }
 
+/**
+ * Returns true if the given TSNode.kind value corresponds to a type keyword
+ * @param {number} kind TypeScript SyntaxKind
+ * @returns {boolean} is a type keyword
+ */
+function isTypeKeyword(kind) {
+    switch (kind) {
+        case SyntaxKind.AnyKeyword:
+        case SyntaxKind.BooleanKeyword:
+        case SyntaxKind.NeverKeyword:
+        case SyntaxKind.NumberKeyword:
+        case SyntaxKind.ObjectKeyword:
+        case SyntaxKind.StringKeyword:
+        case SyntaxKind.SymbolKeyword:
+        case SyntaxKind.VoidKeyword:
+            return true;
+        default:
+            return false;
+    }
+}
+
 /**
  * Returns the declaration kind of the given TSNode
  * @param  {TSNode}  node TypeScript AST node

tests/ast-alignment/spec.js

@@ -423,6 +423,9 @@ const fixturePatternsToTest = [
     "typescript/basics/function-with-await.src.ts",
     "typescript/errorRecovery/class-extends-empty-implements.src.ts",
     "typescript/basics/const-enum.src.ts",
+    "typescript/basics/class-with-readonly-property.src.ts",
+    "typescript/expressions/call-expression-type-arguments.src.ts",
+    "typescript/expressions/new-expression-type-arguments.src.ts",
 
     {
         pattern: "typescript/basics/export-named-enum.src.ts",
@@ -486,7 +489,6 @@ const fixturePatternsToTest = [
     // "typescript/basics/class-with-protected-parameter-properties.src.ts",
     // "typescript/basics/class-with-public-parameter-properties.src.ts",
     // "typescript/basics/class-with-readonly-parameter-properties.src.ts",
-    // "typescript/basics/class-with-readonly-property.src.ts",
     // "typescript/basics/class-with-type-parameter-default.src.ts",
     // "typescript/basics/class-with-type-parameter-underscore.src.ts",
     // "typescript/basics/class-with-type-parameter.src.ts",
@@ -544,8 +546,6 @@ const fixturePatternsToTest = [
     // "typescript/decorators/property-decorators/property-decorator-instance-member.src.ts",
     // "typescript/decorators/property-decorators/property-decorator-static-member.src.ts",
     // "typescript/errorRecovery/interface-empty-extends.src.ts",
-    // "typescript/expressions/call-expression-type-arguments.src.ts",
-    // "typescript/expressions/new-expression-type-arguments.src.ts",
     // "typescript/namespaces-and-modules/ambient-module-declaration-with-import.src.ts",
     // "typescript/namespaces-and-modules/declare-namespace-with-exported-function.src.ts",
     // "typescript/namespaces-and-modules/module-with-default-exports.src.ts",