TypeScriptToLua
diff --git a/‎src/LuaLib.ts‎
Lines changed: 15 additions & 5 deletions b/‎src/LuaLib.ts‎
Lines changed: 15 additions & 5 deletions
diff --git a/‎src/lualib-build/plugin.ts‎
Lines changed: 9 additions & 4 deletions b/‎src/lualib-build/plugin.ts‎
Lines changed: 9 additions & 4 deletions
@@ -130,11 +130,10 @@ export function readLuaLibFeature(feature: LuaLibFeature, emitHost: EmitHost): s
     return luaLibFeature;
 }
 
-export function loadInlineLualibFeatures(features: Iterable<LuaLibFeature>, emitHost: EmitHost): string {
-    let result = "";
-
+export function resolveRecursiveLualibFeatures(features: Iterable<LuaLibFeature>, emitHost: EmitHost): LuaLibFeature[] {
     const luaLibModulesInfo = getLuaLibModulesInfo(emitHost);
     const loadedFeatures = new Set<LuaLibFeature>();
+    const result: LuaLibFeature[] = [];
 
     function load(feature: LuaLibFeature): void {
         if (loadedFeatures.has(feature)) return;
@@ -144,8 +143,8 @@ export function loadInlineLualibFeatures(features: Iterable<LuaLibFeature>, emit
         if (dependencies) {
             dependencies.forEach(load);
         }
-        const luaLibFeature = readLuaLibFeature(feature, emitHost);
-        result += luaLibFeature + "\n";
+
+        result.push(feature);
     }
 
     for (const feature of features) {
@@ -155,6 +154,17 @@ export function loadInlineLualibFeatures(features: Iterable<LuaLibFeature>, emit
     return result;
 }
 
+export function loadInlineLualibFeatures(features: Iterable<LuaLibFeature>, emitHost: EmitHost): string {
+    let result = "";
+
+    for (const feature of resolveRecursiveLualibFeatures(features, emitHost)) {
+        const luaLibFeature = readLuaLibFeature(feature, emitHost);
+        result += luaLibFeature + "\n";
+    }
+
+    return result;
+}
+
 export function loadImportedLualibFeatures(
     features: Iterable<LuaLibFeature>,
     emitHost: EmitHost,
 
@@ -3,7 +3,7 @@ import * as ts from "typescript";
 import * as tstl from "..";
 import * as path from "path";
 import { getUsedLuaLibFeatures } from "../transformation/utils/lualib";
-import { LuaLibFeature, LuaLibModulesInfo, luaLibModulesInfoFileName } from "../LuaLib";
+import { LuaLibFeature, LuaLibModulesInfo, luaLibModulesInfoFileName, resolveRecursiveLualibFeatures } from "../LuaLib";
 import { EmitHost, ProcessedFile } from "../transpilation/utils";
 import {
     isExportAlias,
@@ -43,10 +43,15 @@ class LuaLibPlugin implements tstl.Plugin {
             emitBOM
         );
 
-        // Create lualib bundle by inlining all lualib features into one file
-        const exportedLualibFeatures = result.filter(f => path.basename(f.fileName).split(".")[0] in LuaLibFeature);
+        // Create map of result files keyed by their 'lualib name'
+        const exportedLualibFeatures = new Map(result.map(f => [path.basename(f.fileName).split(".")[0], f.code]));
+
+        // Figure out the order required in the bundle by recursively resolving all dependency features
         const allFeatures = Object.values(LuaLibFeature) as LuaLibFeature[];
-        let lualibBundle = exportedLualibFeatures.map(f => f.code).join("\n");
+        const orderedFeatures = resolveRecursiveLualibFeatures(allFeatures, emitHost);
+
+        // Concatenate lualib files into bundle with exports table and add lualib_bundle.lua to results
+        let lualibBundle = orderedFeatures.map(f => exportedLualibFeatures.get(LuaLibFeature[f])).join("\n");
         const exports = allFeatures.flatMap(feature => luaLibModuleInfo[feature].exports);
         lualibBundle += `\nreturn {\n${exports.map(exportName => `  ${exportName} = ${exportName}`).join(",\n")}\n}\n`;
         result.push({ fileName: "lualib_bundle.lua", code: lualibBundle });