TypeScriptToLua
diff --git a/‎build_lualib.ts‎
Lines changed: 2 additions & 6 deletions b/‎build_lualib.ts‎
Lines changed: 2 additions & 6 deletions
diff --git a/‎src/LuaLib.ts‎
Lines changed: 22 additions & 22 deletions b/‎src/LuaLib.ts‎
Lines changed: 22 additions & 22 deletions
diff --git a/‎src/LuaPrinter.ts‎
Lines changed: 3 additions & 3 deletions b/‎src/LuaPrinter.ts‎
Lines changed: 3 additions & 3 deletions
@@ -2,7 +2,7 @@ import * as fs from "fs";
 import * as path from "path";
 import * as ts from "typescript";
 import * as tstl from "./src";
-import { LuaLib } from "./src/LuaLib";
+import { loadLuaLibFeatures } from "./src/LuaLib";
 
 const configFileName = path.resolve(__dirname, "src/lualib/tsconfig.json");
 const { emitResult, diagnostics } = tstl.transpileProject(configFileName);
@@ -16,8 +16,4 @@ if (fs.existsSync(bundlePath)) {
     fs.unlinkSync(bundlePath);
 }
 
-const emitHost = {
-    readFile: (path: string) => fs.readFileSync(path, "utf-8"),
-    writeFile: fs.writeFileSync,
-};
-fs.writeFileSync(bundlePath, LuaLib.loadFeatures(Object.values(tstl.LuaLibFeature), emitHost));
+fs.writeFileSync(bundlePath, loadLuaLibFeatures(Object.values(tstl.LuaLibFeature), ts.sys));
@@ -72,32 +72,32 @@ const luaLibDependencies: { [lib in LuaLibFeature]?: LuaLibFeature[] } = {
     SymbolRegistry: [LuaLibFeature.Symbol],
 };
 
-export class LuaLib {
-    public static loadFeatures(features: Iterable<LuaLibFeature>, emitHost: EmitHost): string {
-        let result = "";
+export function loadLuaLibFeatures(features: Iterable<LuaLibFeature>, emitHost: EmitHost): string {
+    let result = "";
 
-        const loadedFeatures = new Set<LuaLibFeature>();
+    const loadedFeatures = new Set<LuaLibFeature>();
 
-        function load(feature: LuaLibFeature): void {
-            if (!loadedFeatures.has(feature)) {
-                loadedFeatures.add(feature);
-                const dependencies = luaLibDependencies[feature];
-                if (dependencies) {
-                    dependencies.forEach(load);
-                }
-                const featureFile = path.resolve(__dirname, `../dist/lualib/${feature}.lua`);
-                const luaLibFeature = emitHost.readFile(featureFile);
-                if (luaLibFeature !== undefined) {
-                    result += luaLibFeature.toString() + "\n";
-                } else {
-                    throw new Error(`Could not read lualib feature ../dist/lualib/${feature}.lua`);
-                }
-            }
+    function load(feature: LuaLibFeature): void {
+        if (loadedFeatures.has(feature)) return;
+        loadedFeatures.add(feature);
+
+        const dependencies = luaLibDependencies[feature];
+        if (dependencies) {
+            dependencies.forEach(load);
         }
 
-        for (const feature of features) {
-            load(feature);
+        const featureFile = path.resolve(__dirname, `../dist/lualib/${feature}.lua`);
+        const luaLibFeature = emitHost.readFile(featureFile);
+        if (luaLibFeature !== undefined) {
+            result += luaLibFeature + "\n";
+        } else {
+            throw new Error(`Could not read lualib feature ../dist/lualib/${feature}.lua`);
         }
-        return result;
     }
+
+    for (const feature of features) {
+        load(feature);
+    }
+
+    return result;
 }
@@ -3,9 +3,9 @@ import { Mapping, SourceMapGenerator, SourceNode } from "source-map";
 import { CompilerOptions, LuaLibImportKind } from "./CompilerOptions";
 import * as tstl from "./LuaAST";
 import { luaKeywords } from "./LuaKeywords";
-import { LuaLib, LuaLibFeature } from "./LuaLib";
-import * as tsHelper from "./TSHelper";
+import { loadLuaLibFeatures, LuaLibFeature } from "./LuaLib";
 import { EmitHost } from "./Transpile";
+import * as tsHelper from "./TSHelper";
 
 type SourceChunk = string | SourceNode;
 
@@ -132,7 +132,7 @@ export class LuaPrinter {
             // Inline lualib features
             else if (luaLibImport === LuaLibImportKind.Inline && luaLibFeatures.size > 0) {
                 header += "-- Lua Library inline imports\n";
-                header += LuaLib.loadFeatures(luaLibFeatures, this.emitHost);
+                header += loadLuaLibFeatures(luaLibFeatures, this.emitHost);
             }
         }