Bugfix/anonymous class name (#810)

Perryvw · web-flow · commit 282da2350bf7 · 2020-04-05T21:20:19.000+02:00
* Updated tests to new TestBuilder * Updated classes/classes tests to new TestBuilder * Fixed exported class super call test * Fixed inconsistency between reflection class names of JS and Lua * Reverted unique default class name change * Reverted change and changed tests to use testModule instead of setTsHeader * Fixed some remaining merge issues * Added gitattributes * Refactored class transformation functions * Also fixed #584, moved getReflectionName to setup and some other minor changes * Moved getReflectionClassName to setup completely * Moved tests
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+* text eol=lf
diff --git a/src/transformation/visitors/class/index.ts b/src/transformation/visitors/class/index.ts
@@ -7,9 +7,9 @@ import {
     extensionAndMetaExtensionConflict,
     extensionCannotExport,
     extensionCannotExtend,
-    metaExtensionMissingExtends,
-    luaTableMustBeAmbient,
     luaTableCannotBeExtended,
+    luaTableMustBeAmbient,
+    metaExtensionMissingExtends,
 } from "../../utils/diagnostics";
 import {
     createDefaultExportIdentifier,
@@ -21,7 +21,6 @@ import {
 import {
     createImmediatelyInvokedFunctionExpression,
     createSelfIdentifier,
-    OneToManyVisitorResult,
     unwrapVisitorResult,
 } from "../../utils/lua-ast";
 import { createSafeName, isUnsafeName } from "../../utils/safe-names";
@@ -38,25 +37,29 @@ import { checkForLuaLibType } from "./new";
 import { createClassSetup } from "./setup";
 import { getExtendedNode, getExtendedType, isStaticNode } from "./utils";
 
+export const transformClassDeclaration: FunctionVisitor<ts.ClassLikeDeclaration> = (declaration, context) => {
+    // If declaration is a default export, transform to export variable assignment instead
+    if (hasDefaultExportModifier(declaration)) {
+        const left = createExportedIdentifier(context, createDefaultExportIdentifier(declaration));
+        const right = transformClassAsExpression(declaration, context);
+        return [lua.createAssignmentStatement(left, right, declaration)];
+    }
+
+    const { statements } = transformClassLikeDeclaration(declaration, context);
+    return statements;
+};
+
+export const transformThisExpression: FunctionVisitor<ts.ThisExpression> = node => createSelfIdentifier(node);
+
 export function transformClassAsExpression(
     expression: ts.ClassLikeDeclaration,
-    context: TransformationContext,
-    isDefaultExport = false
+    context: TransformationContext
 ): lua.Expression {
-    let className: lua.Identifier;
-    if (expression.name) {
-        className = transformIdentifier(context, expression.name);
-    } else if (isDefaultExport) {
-        className = createDefaultExportIdentifier(expression);
-    } else {
-        className = lua.createAnonymousIdentifier();
-    }
-
     pushScope(context, ScopeType.Function);
-    const classDeclaration = unwrapVisitorResult(transformClassDeclaration(expression, context, className));
+    const { statements, name } = transformClassLikeDeclaration(expression, context);
     popScope(context);
 
-    return createImmediatelyInvokedFunctionExpression(classDeclaration, className, expression);
+    return createImmediatelyInvokedFunctionExpression(unwrapVisitorResult(statements), name, expression);
 }
 
 const classSuperInfos = new WeakMap<TransformationContext, ClassSuperInfo[]>();
@@ -65,28 +68,19 @@ interface ClassSuperInfo {
     extendedTypeNode?: ts.ExpressionWithTypeArguments;
 }
 
-export function transformClassDeclaration(
+function transformClassLikeDeclaration(
     classDeclaration: ts.ClassLikeDeclaration,
     context: TransformationContext,
     nameOverride?: lua.Identifier
-): OneToManyVisitorResult<lua.Statement> {
+): { statements: lua.Statement[]; name: lua.Identifier } {
     let className: lua.Identifier;
-    let classNameText: string;
     if (nameOverride !== undefined) {
         className = nameOverride;
-        classNameText = nameOverride.text;
     } else if (classDeclaration.name !== undefined) {
         className = transformIdentifier(context, classDeclaration.name);
-        classNameText = classDeclaration.name.text;
-    } else if (hasDefaultExportModifier(classDeclaration)) {
-        const left = createExportedIdentifier(context, createDefaultExportIdentifier(classDeclaration));
-        const right = transformClassAsExpression(classDeclaration, context, true);
-
-        return lua.createAssignmentStatement(left, right, classDeclaration);
     } else {
         // TypeScript error
         className = lua.createAnonymousIdentifier();
-        classNameText = className.text;
     }
 
     const annotations = getTypeAnnotations(context.checker.getTypeAtLocation(classDeclaration));
@@ -196,9 +190,7 @@ export function transformClassDeclaration(
     }
 
     if (!isExtension && !isMetaExtension) {
-        result.push(
-            ...createClassSetup(context, classDeclaration, className, localClassName, classNameText, extendedType)
-        );
+        result.push(...createClassSetup(context, classDeclaration, className, localClassName, extendedType));
     } else {
         for (const f of instanceFields) {
             const fieldName = transformPropertyName(context, f.name);
@@ -317,7 +309,7 @@ export function transformClassDeclaration(
 
     superInfo.pop();
 
-    return result;
+    return { statements: result, name: className };
 }
 
 export const transformSuperExpression: FunctionVisitor<ts.SuperExpression> = (expression, context) => {
@@ -345,5 +337,3 @@ export const transformSuperExpression: FunctionVisitor<ts.SuperExpression> = (ex
 
     return lua.createTableIndexExpression(baseClassName, lua.createStringLiteral("prototype"));
 };
-
-export const transformThisExpression: FunctionVisitor<ts.ThisExpression> = node => createSelfIdentifier(node);
diff --git a/src/transformation/visitors/class/setup.ts b/src/transformation/visitors/class/setup.ts
@@ -17,7 +17,6 @@ export function createClassSetup(
     statement: ts.ClassLikeDeclarationBase,
     className: lua.Identifier,
     localClassName: lua.Identifier,
-    classNameText: string,
     extendsType?: ts.Type
 ): lua.Statement[] {
     const result: lua.Statement[] = [];
@@ -56,7 +55,7 @@ export function createClassSetup(
     result.push(
         lua.createAssignmentStatement(
             lua.createTableIndexExpression(lua.cloneIdentifier(localClassName), lua.createStringLiteral("name")),
-            lua.createStringLiteral(classNameText),
+            getReflectionClassName(context, statement, className),
             statement
         )
     );
@@ -79,3 +78,23 @@ export function createClassSetup(
 
     return result;
 }
+
+export function getReflectionClassName(
+    context: TransformationContext,
+    declaration: ts.ClassLikeDeclarationBase,
+    className: lua.Identifier
+): lua.Expression {
+    if (declaration.name) {
+        return lua.createStringLiteral(declaration.name.text);
+    } else if (ts.isVariableDeclaration(declaration.parent) && ts.isIdentifier(declaration.parent.name)) {
+        return lua.createStringLiteral(declaration.parent.name.text);
+    } else if (hasDefaultExportModifier(declaration)) {
+        return lua.createStringLiteral("default");
+    }
+
+    if (getExtendedNode(context, declaration)) {
+        return lua.createTableIndexExpression(className, lua.createStringLiteral("name"));
+    }
+
+    return lua.createStringLiteral("");
+}
diff --git a/test/unit/classes/__snapshots__/classes.spec.ts.snap b/test/unit/classes/__snapshots__/classes.spec.ts.snap
@@ -3,7 +3,7 @@
 exports[`missing declaration name: code 1`] = `
 "require(\\"lualib_bundle\\");
 ____ = __TS__Class()
-____.name = \\"____\\"
+____.name = \\"\\"
 function ____.prototype.____constructor(self)
 end"
 `;
diff --git a/test/unit/classes/classes.spec.ts b/test/unit/classes/classes.spec.ts
diff --git a/test/unit/modules/modules.spec.ts b/test/unit/modules/modules.spec.ts
