refactor: Node.isXNode(node) static type guard methods are now `Nod…

…e.isX(node)` BREAKING CHANGE: `Node.isXNode(node)` static type guard methods are now `Node.isX(node)` to reduce verbosity. Closes #1166
dsherret · Nov 20, 2021 · e5bcba9 · e5bcba9
1 parent 519b139
commit e5bcba9
Show file tree

Hide file tree

Showing 24 changed files with 305 additions and 305 deletions.
diff --git a/deno/ts_morph.d.ts b/deno/ts_morph.d.ts
diff --git a/deno/ts_morph.js b/deno/ts_morph.js
diff --git a/packages/ts-morph/lib/ts-morph.d.ts b/packages/ts-morph/lib/ts-morph.d.ts
diff --git a/packages/ts-morph/scripts/generation/createNodeTypeGuards.ts b/packages/ts-morph/scripts/generation/createNodeTypeGuards.ts
@@ -43,7 +43,7 @@ export function createNodeTypeGuards(inspector: TsMorphInspector, tsInspector: T
   getMethodInfos().filter(n => isAllowedClass(n.name.replace(/^is/, ""))).forEach(method => {
     const description = `Gets if the node is ${(method.name[0] === "A" || method.name[0] === "E") ? "an" : "a"} ${method.name}.`;
     const common = {
-      name: `is${method.name}`,
+      name: `is${method.name.endsWith("TypeNode") ? method.name : method.name.replace(/Node$/, "")}`,
       isStatic: true,
     };
     const isImplementedNodeName = implementedNodeNames.has(method.name);

diff --git a/packages/ts-morph/src/compiler/ast/base/ExclamationTokenableNode.ts b/packages/ts-morph/src/compiler/ast/base/ExclamationTokenableNode.ts
@@ -50,7 +50,7 @@ export function ExclamationTokenableNode<T extends Constructor<ExclamationTokena
         return this;
 
       if (value) {
-        if (Node.isQuestionTokenableNode(this))
+        if (Node.isQuestionTokenable(this))
           this.setHasQuestionToken(false);
 
         const colonNode = this.getFirstChildByKind(SyntaxKind.ColonToken);

diff --git a/packages/ts-morph/src/compiler/ast/base/ModuledNode.ts b/packages/ts-morph/src/compiler/ast/base/ModuledNode.ts
@@ -430,7 +430,7 @@ export function ModuledNode<T extends Constructor<ModuledNodeExtensionType>>(Bas
       const declaration = defaultExportSymbol.getDeclarations()[0];
       if (declaration.compilerNode.kind === SyntaxKind.ExportAssignment)
         removeChildrenWithFormatting({ children: [declaration], getSiblingFormatting: () => FormattingKind.Newline });
-      else if (Node.isModifierableNode(declaration)) {
+      else if (Node.isModifierable(declaration)) {
         declaration.toggleModifier("default", false);
         declaration.toggleModifier("export", false);
       }

diff --git a/packages/ts-morph/src/compiler/ast/base/QuestionTokenableNode.ts b/packages/ts-morph/src/compiler/ast/base/QuestionTokenableNode.ts
@@ -50,7 +50,7 @@ export function QuestionTokenableNode<T extends Constructor<QuestionTokenableNod
         return this;
 
       if (value) {
-        if (Node.isExclamationTokenableNode(this))
+        if (Node.isExclamationTokenable(this))
           this.setHasExclamationToken(false);
 
         insertIntoParentTextRange({

diff --git a/packages/ts-morph/src/compiler/ast/base/export/ExportGetableNode.ts b/packages/ts-morph/src/compiler/ast/base/export/ExportGetableNode.ts
@@ -55,7 +55,7 @@ export function ExportGetableNode<T extends Constructor<ExportGetableNodeExtensi
         const variableStatement = this.getVariableStatement();
         return variableStatement?.getExportKeyword();
       }
-      if (!Node.isModifierableNode(this))
+      if (!Node.isModifierable(this))
         return throwForNotModifierableNode();
       return this.getFirstModifierByKind(SyntaxKind.ExportKeyword);
     }
@@ -73,7 +73,7 @@ export function ExportGetableNode<T extends Constructor<ExportGetableNodeExtensi
         const variableStatement = this.getVariableStatement();
         return variableStatement?.getDefaultKeyword();
       }
-      if (!Node.isModifierableNode(this))
+      if (!Node.isModifierable(this))
         return throwForNotModifierableNode();
       return this.getFirstModifierByKind(SyntaxKind.DefaultKeyword);
     }

diff --git a/packages/ts-morph/src/compiler/ast/base/export/ExportableNode.ts b/packages/ts-morph/src/compiler/ast/base/export/ExportableNode.ts
@@ -66,7 +66,7 @@ function apply<T extends Constructor<ExportableNodeExtensionType & ExportGetable
       function shouldWriteAsSeparateStatement(this: Node) {
         if (Node.isEnumDeclaration(this) || Node.isModuleDeclaration(this) || Node.isTypeAliasDeclaration(this))
           return true;
-        if (Node.isAmbientableNode(this) && this.isAmbient())
+        if (Node.isAmbientable(this) && this.isAmbient())
           return true;
         return false;
       }

diff --git a/packages/ts-morph/src/compiler/ast/base/name/ReferenceFindableNode.ts b/packages/ts-morph/src/compiler/ast/base/name/ReferenceFindableNode.ts
@@ -34,7 +34,7 @@ function getNodeForReferences(node: ReferenceFindableNodeExtensionType) {
   const nameNode = node.getNodeProperty("name");
   if (nameNode != null)
     return nameNode;
-  if (Node.isExportableNode(node))
+  if (Node.isExportable(node))
     return node.getDefaultKeyword() || node;
   return node;
 }
diff --git a/packages/ts-morph/src/compiler/ast/class/base/ClassLikeDeclarationBase.ts b/packages/ts-morph/src/compiler/ast/class/base/ClassLikeDeclarationBase.ts
@@ -676,7 +676,7 @@ export function ClassLikeDeclarationBaseSpecific<T extends Constructor<ClassLike
         index,
         parent: this,
         write: (writer, info) => {
-          const previousMemberHasBody = !isAmbient && info.previousMember != null && Node.isBodyableNode(info.previousMember)
+          const previousMemberHasBody = !isAmbient && info.previousMember != null && Node.isBodyable(info.previousMember)
             && info.previousMember.hasBody();
           const firstStructureHasBody = !isAmbient && members instanceof Array && structureHasBody(members[0]);
 
@@ -693,7 +693,7 @@ export function ClassLikeDeclarationBaseSpecific<T extends Constructor<ClassLike
           writer.write(memberWriter.toString());
 
           const lastStructureHasBody = !isAmbient && members instanceof Array && structureHasBody(members[members.length - 1]);
-          const nextMemberHasBody = !isAmbient && info.nextMember != null && Node.isBodyableNode(info.nextMember) && info.nextMember.hasBody();
+          const nextMemberHasBody = !isAmbient && info.nextMember != null && Node.isBodyable(info.nextMember) && info.nextMember.hasBody();
 
           if (info.nextMember != null && lastStructureHasBody || nextMemberHasBody)
             writer.blankLineIfLastNot();