Add isTypeAnnotation (#19921)

src/language-js/comments/handle-comments.js

@@ -28,6 +28,7 @@ import {
   isIntersectionType,
   isMemberExpression,
   isTypeAlias,
+  isTypeAnnotation,
   isUnionType,
 } from "../utilities/node-types.js";
 import { stripComments } from "../utilities/strip-comments.js";
@@ -994,8 +995,7 @@ function handleCommentsInDestructuringPattern({
     (enclosingNode.type === "ObjectPattern" ||
       enclosingNode.type === "ArrayPattern") &&
     enclosingNode.typeAnnotation === followingNode &&
-    (followingNode.type === "TSTypeAnnotation" ||
-      followingNode.type === "TypeAnnotation")
+    isTypeAnnotation(followingNode)
   ) {
     if (
       getNextNonSpaceNonCommentCharacter(text, locEnd(comment)) ===

src/language-js/print/function-parameters.js

@@ -23,6 +23,7 @@ import {
   isArrayExpression,
   isObjectExpression,
   isObjectType,
+  isTypeAnnotation,
 } from "../utilities/node-types.js";
 import { isTestCall } from "../utilities/test-libraries.js";
 import {
@@ -209,9 +210,7 @@ function shouldHugTheOnlyFunctionParameter(node) {
     (parameter.type === "ObjectPattern" ||
       parameter.type === "ArrayPattern" ||
       (parameter.type === "Identifier" &&
-        parameter.typeAnnotation &&
-        (parameter.typeAnnotation.type === "TypeAnnotation" ||
-          parameter.typeAnnotation.type === "TSTypeAnnotation") &&
+        isTypeAnnotation(parameter.typeAnnotation) &&
         isObjectType(parameter.typeAnnotation.typeAnnotation)) ||
       (parameter.type === "FunctionTypeParam" &&
         isObjectType(parameter.typeAnnotation) &&

src/language-js/print/type-annotation.js

@@ -1,6 +1,10 @@
 import { CommentCheckFlags, hasComment } from "../utilities/comments.js";
 import { isSimpleType } from "../utilities/is-simple-type.js";
-import { isObjectType, isUnionType } from "../utilities/node-types.js";
+import {
+  isObjectType,
+  isTypeAnnotation,
+  isUnionType,
+} from "../utilities/node-types.js";
 import { shouldHugUnionType } from "./union-type.js";
 
 /**
@@ -40,10 +44,7 @@ function printTypeAnnotationProperty(
 
   let shouldPrintLeadingSpace = false;
 
-  if (
-    typeAnnotation.type === "TSTypeAnnotation" ||
-    typeAnnotation.type === "TypeAnnotation"
-  ) {
+  if (isTypeAnnotation(typeAnnotation)) {
     const firstToken = path.call(getTypeAnnotationFirstToken, propertyName);
 
     if (

src/language-js/utilities/is-type-annotation-a-function.js

@@ -5,7 +5,7 @@ import { hasSameLocStart } from "../location/index.js";
 // var f: (a) => void;
 function isTypeAnnotationAFunction(node) {
   return (
-    (node.type === "TypeAnnotation" || node.type === "TSTypeAnnotation") &&
+    node.type === "TypeAnnotation" &&
     node.typeAnnotation.type === "FunctionTypeAnnotation" &&
     !node.static &&
     !hasSameLocStart(node, node.typeAnnotation)

src/language-js/utilities/node-types.js

@@ -142,4 +142,9 @@ export const isTypeParameterInstantiation = createTypeCheckFunction([
   "TypeParameterInstantiation",
 ]);
 
+export const isTypeAnnotation = createTypeCheckFunction([
+  "TSTypeAnnotation",
+  "TypeAnnotation",
+]);
+
 export * from "./literal.js";