Object literal method declaration support (#249)

tomblind · Perryvw · commit e27992221c9b · 2018-10-18T18:28:14.000+02:00
* support for object literal method declarations

* updated object literal method test to verify this works correctly
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -1861,6 +1861,9 @@ export abstract class LuaTranspiler {
                 properties.push(`${name} = ${expression}`);
             } else if (ts.isShorthandPropertyAssignment(element)) {
                 properties.push(`${name} = ${name}`);
+            } else if (ts.isMethodDeclaration(element)) {
+                const expression = this.transpileFunctionExpression(element);
+                properties.push(`${name} = ${expression}`);
             } else {
                 throw TSTLErrors.UnsupportedKind("object literal element", element.kind, node);
             }
@@ -1869,9 +1872,12 @@ export abstract class LuaTranspiler {
         return "{" + properties.join(",") + "}";
     }
 
-    public transpileFunctionExpression(node: ts.ArrowFunction): string {
+    public transpileFunctionExpression(node: ts.FunctionLikeDeclaration): string {
         // Build parameter string
         const paramNames: string[] = [];
+        if (ts.isMethodDeclaration(node)) {
+            paramNames.push("self");
+        }
         node.parameters.forEach(param => {
             paramNames.push(this.transpileIdentifier(param.name as ts.Identifier));
         });
diff --git a/test/unit/functions.spec.ts b/test/unit/functions.spec.ts
@@ -282,4 +282,11 @@ export class FunctionTests {
 
         Expect(result).toBe("function");
     }
+
+    @Test("Object method declaration")
+    public objectMethodDeclaration(): void {
+        const result = util.transpileAndExecute(
+            `let o = { v: 4, m(i: number): number { return this.v * i; } }; return o.m(3);`);
+        Expect(result).toBe(12);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -282,4 +282,11 @@ export class FunctionTests {`
`282`	`282`
`283`	`283`	`Expect(result).toBe("function");`
`284`	`284`	`}`
	`285`	`+`
	`286`	`+ @Test("Object method declaration")`
	`287`	`+ public objectMethodDeclaration(): void {`
	`288`	`+ const result = util.transpileAndExecute(`
	`289`	+ `let o = { v: 4, m(i: number): number { return this.v * i; } }; return o.m(3);`);
	`290`	`+ Expect(result).toBe(12);`
	`291`	`+ }`
`285`	`292`	`}`