Lualib omit when unused (#280)

hazzard993 · lolleko · commit 43214f54dbcc · 2018-12-01T21:32:49.000+01:00
* lualib inline omit header when no features are used

* Tests to enforce no lualib text when unused, unless using always
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`);
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
`@@ -213,7 +213,7 @@ export abstract class LuaTranspiler {`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`// Inline lualib features`
`216`		`- if (this.options.luaLibImport === LuaLibImportKind.Inline) {`
	`216`	`+ if (this.options.luaLibImport === LuaLibImportKind.Inline && this.luaLibFeatureSet.size > 0) {`
`217`	`217`	`result += "\n" + "-- Lua Library Imports\n";`
`218`	`218`	`for (const feature of this.luaLibFeatureSet) {`
`219`	`219`	const featureFile = path.resolve(__dirname, `../dist/lualib/${feature}.lua`);