Fix renamed class extension (#343)

TheLartians · Perryvw · commit 851205b51057 · 2019-01-21T21:17:56.000+01:00
* transpile type node instead of using typename

* lint

* use correct __base

* correct formatting

* added test
diff --git a/src/TSHelper.ts b/src/TSHelper.ts
@@ -54,21 +54,27 @@ export class TSHelper {
         return result;
     }
 
-    public static getExtendedType(node: ts.ClassLikeDeclarationBase, checker: ts.TypeChecker): ts.Type | undefined {
+    public static getExtendedTypeNode(node: ts.ClassLikeDeclarationBase, checker: ts.TypeChecker):
+    ts.ExpressionWithTypeArguments | undefined {
         if (node && node.heritageClauses) {
             for (const clause of node.heritageClauses) {
                 if (clause.token === ts.SyntaxKind.ExtendsKeyword) {
                     const superType = checker.getTypeAtLocation(clause.types[0]);
                     const decorators = this.getCustomDecorators(superType, checker);
                     if (!decorators.has(DecoratorKind.PureAbstract)) {
-                        return superType;
+                        return clause.types[0];
                     }
                 }
             }
         }
         return undefined;
     }
 
+    public static getExtendedType(node: ts.ClassLikeDeclarationBase, checker: ts.TypeChecker): ts.Type | undefined {
+        const extendedTypeNode = this.getExtendedTypeNode(node, checker);
+        return extendedTypeNode && checker.getTypeAtLocation(extendedTypeNode);
+    }
+
     public static isFileModule(sourceFile: ts.SourceFile): boolean {
         if (sourceFile) {
             // Vanilla ts flags files as external module if they have an import or
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -2128,13 +2128,15 @@ export abstract class LuaTranspiler {
             result += this.indent + this.accessPrefix(node) + `${className} = ${classOr}{}\n`;
             this.pushExport(className, node);
         } else {
-            const baseName = extendsType.symbol.escapedName;
+            const extendedTypeNode = tsHelper.getExtendedTypeNode(node, this.checker);
+            const baseName = this.transpileNode(extendedTypeNode.expression);
             result += this.indent + this.accessPrefix(node) + `${className} = ${classOr}${baseName}.new()\n`;
             this.pushExport(className, node);
         }
         result += this.indent + `${className}.__index = ${className}\n`;
         if (extendsType) {
-            const baseName = extendsType.symbol.escapedName;
+            const extendedTypeNode = tsHelper.getExtendedTypeNode(node, this.checker);
+            const baseName = this.transpileNode(extendedTypeNode.expression);
             result += this.indent + `${className}.__base = ${baseName}\n`;
         }
         result += this.indent + `function ${className}.new(construct, ...)\n`;
diff --git a/test/unit/class.spec.ts b/test/unit/class.spec.ts
@@ -333,6 +333,31 @@ export class ClassTests {
         Expect(result).toBe(10);
     }
 
+    @Test("renamedClassExtends")
+    public renamedClassExtends(): void {
+        // Transpile
+        const lua = util.transpileString(
+            `namespace Classes{
+              export class Base{
+                value:number;
+                constructor(){ this.value = 3; }
+              }
+            }
+            const A = Classes.Base;
+            class B extends A{
+              constructor(){ super(); }
+            };
+            const b = new B();
+            return b.value;`
+        );
+
+        // Execute
+        const result = util.executeLua(lua);
+
+        // Assert
+        Expect(result).toBe(3);
+    }
+
     @Test("ClassMethodCall")
     public classMethodCall(): void {
         // Transpile

Original file line number	Diff line number	Diff line change
`@@ -54,21 +54,27 @@ export class TSHelper {`
`54`	`54`	`return result;`
`55`	`55`	`}`
`56`	`56`
`57`		`- public static getExtendedType(node: ts.ClassLikeDeclarationBase, checker: ts.TypeChecker): ts.Type \| undefined {`
	`57`	`+ public static getExtendedTypeNode(node: ts.ClassLikeDeclarationBase, checker: ts.TypeChecker):`
	`58`	`+ ts.ExpressionWithTypeArguments \| undefined {`
`58`	`59`	`if (node && node.heritageClauses) {`
`59`	`60`	`for (const clause of node.heritageClauses) {`
`60`	`61`	`if (clause.token === ts.SyntaxKind.ExtendsKeyword) {`
`61`	`62`	`const superType = checker.getTypeAtLocation(clause.types[0]);`
`62`	`63`	`const decorators = this.getCustomDecorators(superType, checker);`
`63`	`64`	`if (!decorators.has(DecoratorKind.PureAbstract)) {`
`64`		`- return superType;`
	`65`	`+ return clause.types[0];`
`65`	`66`	`}`
`66`	`67`	`}`
`67`	`68`	`}`
`68`	`69`	`}`
`69`	`70`	`return undefined;`
`70`	`71`	`}`
`71`	`72`
	`73`	`+ public static getExtendedType(node: ts.ClassLikeDeclarationBase, checker: ts.TypeChecker): ts.Type \| undefined {`
	`74`	`+ const extendedTypeNode = this.getExtendedTypeNode(node, checker);`
	`75`	`+ return extendedTypeNode && checker.getTypeAtLocation(extendedTypeNode);`
	`76`	`+ }`
	`77`	`+`
`72`	`78`	`public static isFileModule(sourceFile: ts.SourceFile): boolean {`
`73`	`79`	`if (sourceFile) {`
`74`	`80`	`// Vanilla ts flags files as external module if they have an import or`