fix: #799 - Support renaming anonymous class declarations

dsherret · Mar 29, 2020 · 253a43f · 253a43f
1 parent be7a1d2
commit 253a43f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/packages/ts-morph/src/compiler/ast/base/name/NameableNode.ts b/packages/ts-morph/src/compiler/ast/base/name/NameableNode.ts
@@ -114,7 +114,8 @@ function NameableNodeInternal<T extends Constructor<NameableNodeExtensionType>>(
 }
 
 function addNameNode(node: Node, newName: string) {
-    const openParenToken = node.getFirstChildByKindOrThrow(SyntaxKind.OpenParenToken);
+    const beginToken = Node.isClassDeclaration(node) ? SyntaxKind.OpenBraceToken : SyntaxKind.OpenParenToken;
+    const openParenToken = node.getFirstChildByKindOrThrow(beginToken);
     insertIntoParentTextRange({
         insertPos: openParenToken.getStart(),
         newText: " " + newName,

diff --git a/packages/ts-morph/src/tests/compiler/ast/base/name/nameableNodeTests.ts b/packages/ts-morph/src/tests/compiler/ast/base/name/nameableNodeTests.ts
@@ -1,5 +1,5 @@
 import { expect } from "chai";
-import { ClassDeclaration, FunctionExpression, NameableNode, VariableStatement } from "../../../../../compiler";
+import { InterfaceDeclaration, ClassDeclaration, FunctionExpression, NameableNode, VariableStatement } from "../../../../../compiler";
 import { NameableNodeStructure } from "../../../../../structures";
 import { getInfoFromText } from "../../../testHelpers";
 
@@ -11,26 +11,43 @@ describe(nameof(NameableNode), () => {
     }
 
     describe(nameof<NameableNode>(n => n.rename), () => {
-        function doTest(startCode: string, newName: string, expectedCode: string) {
+        function testFunction(startCode: string, newName: string, expectedCode: string) {
             const { funcExpr, sourceFile } = getFunctionExpression(startCode);
             funcExpr.rename(newName);
             expect(sourceFile.getFullText()).to.equal(expectedCode);
         }
+        function testClass(startCode: string, newName: string, expectedCode: string) {
+            const { firstChild, sourceFile } = getInfoFromText<ClassDeclaration | InterfaceDeclaration>(startCode);
+            firstChild.rename(newName);
+            expect(sourceFile.getFullText()).to.equal(expectedCode);
+        }
 
         it("should set the name if it doesn't exist", () => {
-            doTest("const v = function() { return 2; };", "newName", "const v = function newName() { return 2; };");
+            testFunction("const v = function() { return 2; };", "newName", "const v = function newName() { return 2; };");
         });
 
         it("should remove the name when providing an empty string", () => {
-            doTest("const v = function name() { return 2; };", "", "const v = function() { return 2; };");
+            testFunction("const v = function name() { return 2; };", "", "const v = function() { return 2; };");
         });
 
         it("should do nothing when no name and an empty string", () => {
-            doTest("const v = function() { return 2; };", "", "const v = function() { return 2; };");
+            testFunction("const v = function() { return 2; };", "", "const v = function() { return 2; };");
         });
 
         it("should rename the name", () => {
-            doTest("const v = function oldName() { return 2; };", "newName", "const v = function newName() { return 2; };");
+            testFunction("const v = function oldName() { return 2; };", "newName", "const v = function newName() { return 2; };");
+        });
+
+        it("should rename interface", () => {
+            testClass("interface Foo {}", "newName", "interface newName {}");
+        });
+
+        it("should rename class", () => {
+            testClass("class Foo {}", "newName", "class newName {}");
+        });
+
+        it("should add name if class name not defined", () => {
+            testClass("export default class {}", "newName", "export default class  newName{}");
         });
     });