fix: small issues discovered in testing

YoRyan · YoRyan · commit 892b2cf36443 · 2022-08-18T03:29:42.000Z
diff --git a/src/transpilation/bundle.ts b/src/transpilation/bundle.ts
@@ -107,7 +107,7 @@ export function getBundleResult(program: ts.Program, files: ProcessedFile[]): [t
 
     // return require("<entry module path>")
     const args = options.luaTarget === LuaTarget.Lua50 ? "unpack(arg == nil and {} or arg)" : "...";
-    const entryPoint = `return require(${createModulePath(entryModuleFilePath ?? entryModule, program)}, ${args}})\n`;
+    const entryPoint = `return require(${createModulePath(entryModuleFilePath ?? entryModule, program)}, ${args})\n`;
 
     const footers: string[] = [];
     if (options.sourceMapTraceback) {
diff --git a/test/json.50.lua b/test/json.50.lua
@@ -77,10 +77,12 @@ local function encode_table(val, stack)
     -- Treat as array -- check keys are valid and it is not sparse
     local n = 0
     for k in pairs(val) do
-      if type(k) ~= "number" then
-        error("invalid table: mixed or invalid key types")
+      if k ~= "n" then
+        if type(k) ~= "number" then
+            error("invalid table: mixed or invalid key types")
+        end
+        n = n + 1
       end
-      n = n + 1
     end
     if n ~= table.getn(val) then
       error("invalid table: sparse array")
@@ -107,7 +109,7 @@ end
 
 
 local function encode_string(val)
-  return '"' .. val:gsub('[%z\1-\31\\"]', escape_char) .. '"'
+  return '"' .. string.gsub(val, '[%z\1-\31\\"]', escape_char) .. '"'
 end
 
 
diff --git a/test/transpile/lualib.spec.ts b/test/transpile/lualib.spec.ts
@@ -1,10 +1,10 @@
 import * as ts from "typescript";
-import { LuaLibFeature } from "../../src";
+import { LuaLibFeature, LuaTarget } from "../../src";
 import { readLuaLibFeature } from "../../src/LuaLib";
 import * as util from "../util";
 
 test.each(Object.entries(LuaLibFeature))("Lualib does not use ____exports (%p)", (_, feature) => {
-    const lualibCode = readLuaLibFeature(feature, ts.sys);
+    const lualibCode = readLuaLibFeature(feature, LuaTarget.Lua54, ts.sys);
 
     const exportsOccurrences = lualibCode.match(/____exports/g);
     expect(exportsOccurrences).toBeNull();
diff --git a/test/util.ts b/test/util.ts
@@ -9,10 +9,13 @@ import * as ts from "typescript";
 import * as vm from "vm";
 import * as tstl from "../src";
 import { createEmitOutputCollector } from "../src/transpilation/output-collector";
-import { EmitHost, getEmitOutDir, transpileProject } from "../src";
+import { EmitHost, getEmitOutDir, LuaTarget, transpileProject } from "../src";
 import { formatPathToLuaPath, normalizeSlashes } from "../src/utils";
 
-const luaLib = fs.readFileSync(path.resolve(__dirname, "../dist/lualib/lualib_bundle.lua"), "utf8");
+function readLuaLib(target: tstl.LuaTarget) {
+    const luaLibDir = `../dist/${target === LuaTarget.Lua50 ? "lualib-lua50" : "lualib"}`;
+    return fs.readFileSync(path.resolve(__dirname, `${luaLibDir}/lualib_bundle.lua`), "utf8");
+}
 
 function jsonLib(target: tstl.LuaTarget): string {
     const fileName = target === tstl.LuaTarget.Lua50 ? "json.50.lua" : "json.lua";
@@ -425,7 +428,7 @@ export abstract class TestBuilder {
             this.options.luaLibImport === tstl.LuaLibImportKind.Require ||
             mainFile.includes('require("lualib_bundle")')
         ) {
-            this.injectLuaFile(L, lua, lauxlib, "lualib_bundle", luaLib);
+            this.injectLuaFile(L, lua, lauxlib, "lualib_bundle", readLuaLib(luaTarget));
         }
 
         // Load all transpiled files into Lua's package cache
