Merge branch 'master' into multiphase-transpile

lolleko · lolleko · commit 7ab9a8740dc5 · 2018-11-28T19:23:29.000+01:00
diff --git a/README.md b/README.md
@@ -8,6 +8,8 @@ Large projects written in lua can become hard to maintain and make it easy to ma
 [![Coverage](https://codecov.io/gh/perryvw/typescripttolua/branch/master/graph/badge.svg)](https://codecov.io/gh/perryvw/typescripttolua)
 [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/TypescriptToLua/Lobby)
 
+You can also find us on Discord: [![Discord](https://img.shields.io/discord/515854149821267971.svg)](https://discord.gg/BWAq58Y)
+
 ## Documentation
 More detailed documentation and info on writing declarations can be found [on the wiki](https://github.com/Perryvw/TypescriptToLua/wiki).
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "typescript-to-lua",
     "license": "MIT",
-    "version": "0.11.0",
+    "version": "0.11.1",
     "repository": "https://github.com/Perryvw/TypescriptToLua",
     "keywords": [
         "typescript",
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -213,7 +213,7 @@ export abstract class LuaTranspiler {
         }
 
         // Inline lualib features
-        if (this.options.luaLibImport === LuaLibImportKind.Inline) {
+        if (this.options.luaLibImport === LuaLibImportKind.Inline && this.luaLibFeatureSet.size > 0) {
             result += "\n" + "-- Lua Library Imports\n";
             for (const feature of this.luaLibFeatureSet) {
                 const featureFile = path.resolve(__dirname, `../dist/lualib/${feature}.lua`);
@@ -1820,29 +1820,30 @@ export abstract class LuaTranspiler {
 
     public transpileConstructor(node: ts.ConstructorDeclaration,
                                 className: string): string {
-        const extraInstanceFields = [];
+        // Check for field declarations in constructor
+        const constructorFieldsDeclarations = node.parameters.filter(p => p.modifiers !== undefined);
 
-        const parameters = ["self"];
-        node.parameters.forEach(param => {
-            // If param has decorators, add extra instance field
-            if (param.modifiers !== undefined) {
-                extraInstanceFields.push(this.transpileIdentifier(param.name as ts.Identifier));
-            }
-            // Add to parameter list
-            parameters.push(this.transpileIdentifier(param.name as ts.Identifier));
-        });
-
-        let result = this.indent + `function ${className}.constructor(${parameters.join(",")})\n`;
+        const [paramNames, spreadIdentifier] = this.transpileParameters(node.parameters);
 
-        // Add in instance field declarations
-        for (const f of extraInstanceFields) {
-            result += this.indent + `    self.${f} = ${f}\n`;
-        }
+        let result = this.indent + `function ${className}.constructor(${["self"].concat(paramNames).join(",")})\n`;
 
         // Transpile constructor body
         this.pushIndent();
         this.classStack.push(className);
-        result += this.transpileBlock(node.body);
+
+        // Add in instance field declarations
+        for (const declaration of constructorFieldsDeclarations) {
+            const declarationName = this.transpileIdentifier(declaration.name as ts.Identifier);
+            if (declaration.initializer) {
+                const value = this.transpileExpression(declaration.initializer);
+                result += this.indent + `self.${declarationName} = ${declarationName} or ${value}\n`;
+            } else {
+                result += this.indent + `self.${declarationName} = ${declarationName}\n`;
+            }
+        }
+
+        result += this.transpileFunctionBody(node.parameters, node.body, spreadIdentifier);
+
         this.classStack.pop();
         this.popIndent();
 
diff --git a/test/unit/class.spec.ts b/test/unit/class.spec.ts
@@ -44,7 +44,7 @@ export class ClassTests {
 
     @Test("ClassConstructorAssignment")
     public classConstructorAssignment(): void {
-         // Transpile
+        // Transpile
         const lua = util.transpileString(
             `class a { constructor(public field: number) {} }
             return new a(4).field;`
@@ -57,6 +57,26 @@ export class ClassTests {
         Expect(result).toBe(4);
     }
 
+    @Test("ClassConstructorDefaultParameter")
+    public classConstructorDefaultParameter(): void {
+        const result = util.transpileAndExecute(
+            `class a { public field: number; constructor(f: number = 3) { this.field = f; } }
+            return new a().field;`
+        );
+
+        Expect(result).toBe(3);
+    }
+
+    @Test("ClassConstructorAssignmentDefault")
+    public classConstructorAssignmentParameterDefault(): void {
+        const result = util.transpileAndExecute(
+            `class a { constructor(public field: number = 3) { } }
+            return new a().field;`
+        );
+
+        Expect(result).toBe(3);
+    }
+
     @Test("ClassNewNoBrackets")
     public classNewNoBrackets(): void {
         // Transpile
diff --git a/test/unit/modules.spec.ts b/test/unit/modules.spec.ts
@@ -23,15 +23,6 @@ export class LuaModuleTests {
         Expect(lua.startsWith(`require("lualib_bundle")`));
     }
 
-    @Test("lualibRequireNoUses")
-    public lualibRequireNoUses(): void {
-        // Transpile
-        const lua = util.transpileString(``, { luaLibImport: LuaLibImportKind.Require, luaTarget: LuaTarget.LuaJIT });
-
-        // Assert
-        Expect(lua).toBe(``);
-    }
-
     @Test("lualibRequireAlways")
     public lualibRequireAlways(): void {
         // Transpile
@@ -49,4 +40,16 @@ export class LuaModuleTests {
 
         Expect(result).toBe(3);
     }
+
+    @TestCase(LuaLibImportKind.Inline)
+    @TestCase(LuaLibImportKind.None)
+    @TestCase(LuaLibImportKind.Require)
+    @Test("LuaLib no uses? No code")
+    public lualibNoUsesNoCode(impKind: LuaLibImportKind): void {
+        // Transpile
+        const lua = util.transpileString(``, { luaLibImport: impKind });
+
+        // Assert
+        Expect(lua).toBe(``);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "typescript-to-lua",`
`3`	`3`	`"license": "MIT",`
`4`		`- "version": "0.11.0",`
	`4`	`+ "version": "0.11.1",`
`5`	`5`	`"repository": "https://github.com/Perryvw/TypescriptToLua",`
`6`	`6`	`"keywords": [`
`7`	`7`	`"typescript",`