support for global $vararg in bundles (#1107)

tomblind · web-flow · commit 12cce1237af4 · 2021-08-30T20:01:10.000+02:00
* support for global $vararg in bundles fixes #1048 To emulate normal Lua functionality, the entry point receives the global vararg and sub-modules receive their own name when evaluating `$vararg` (`...`). * using dummy vararg when wrapping bundle tests to prevent lua error Co-authored-by: Tom <tomblind@users.noreply.github.com>
diff --git a/src/transpilation/bundle.ts b/src/transpilation/bundle.ts
@@ -16,12 +16,13 @@ const requireOverride = `
 local ____modules = {}
 local ____moduleCache = {}
 local ____originalRequire = require
-local function require(file)
+local function require(file, ...)
     if ____moduleCache[file] then
         return ____moduleCache[file].value
     end
     if ____modules[file] then
-        ____moduleCache[file] = { value = ____modules[file]() }
+        local module = ____modules[file]
+        ____moduleCache[file] = { value = (select("#", ...) > 0) and module(...) or module(file) }
         return ____moduleCache[file].value
     else
         if ____originalRequire then
@@ -55,7 +56,7 @@ export function getBundleResult(program: ts.Program, files: ProcessedFile[]): [t
     const moduleTable = createModuleTableNode(moduleTableEntries);
 
     // return require("<entry module path>")
-    const entryPoint = `return require(${createModulePath(entryModule, program)})\n`;
+    const entryPoint = `return require(${createModulePath(entryModule, program)}, ...)\n`;
 
     const sourceChunks = [requireOverride, moduleTable, entryPoint];
 
@@ -78,7 +79,7 @@ export function getBundleResult(program: ts.Program, files: ProcessedFile[]): [t
 }
 
 function moduleSourceNode({ code, sourceMapNode }: ProcessedFile, modulePath: string): SourceNode {
-    const tableEntryHead = `[${modulePath}] = function() `;
+    const tableEntryHead = `[${modulePath}] = function(...) `;
     const tableEntryTail = " end,\n";
 
     return joinSourceChunks([tableEntryHead, sourceMapNode ?? code, tableEntryTail]);
diff --git a/test/unit/language-extensions/vararg.spec.ts b/test/unit/language-extensions/vararg.spec.ts
@@ -6,6 +6,7 @@ test.each([
     'let result: string; { result = [...$vararg].join(""); }',
     'let result: string; if (true) { result = [...$vararg].join(""); }',
     'let result: string; do { result = [...$vararg].join(""); } while (false);',
+    'function foo(...args: unknown[]) { return args.join(""); } const result = foo(...$vararg);',
 ])("$vararg valid use (%p)", statement => {
     util.testModule`
         ${statement}
@@ -30,3 +31,25 @@ test.each([
         .withLanguageExtensions()
         .expectDiagnosticsToMatchSnapshot([invalidVarargUse.code]);
 });
+
+test("$vararg in bundle entry point", () => {
+    util.testModule`
+        export const result = [...$vararg].join("");
+    `
+        .setMainFileName("src/main.ts")
+        .setOptions({ rootDir: "src", luaBundle: "bundle.lua", luaBundleEntry: "src/main.ts" })
+        .withLanguageExtensions()
+        .setLuaFactory(code => `return (function(...) ${code} end)("A", "B", "C", "D")`)
+        .expectToEqual({ result: "ABCD" });
+});
+
+test("$vararg in bundle sub-module", () => {
+    util.testModule`
+        export { result } from "./module";
+    `
+        .setMainFileName("src/main.ts")
+        .addExtraFile("src/module.ts", 'export const result = [...$vararg].join("")')
+        .setOptions({ rootDir: "src", luaBundle: "bundle.lua", luaBundleEntry: "src/main.ts" })
+        .withLanguageExtensions()
+        .expectToEqual({ result: "module" });
+});
diff --git a/test/util.ts b/test/util.ts
@@ -529,7 +529,7 @@ class AccessorTestBuilder extends TestBuilder {
     protected accessor = "";
 
     protected getLuaCodeWithWrapper(code: string) {
-        return `return (function()\n${code}\nend)()${this.accessor}`;
+        return `return (function(...)\n${code}\nend)()${this.accessor}`;
     }
 
     @memoize

Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ class AccessorTestBuilder extends TestBuilder {`
`529`	`529`	`protected accessor = "";`
`530`	`530`
`531`	`531`	`protected getLuaCodeWithWrapper(code: string) {`
`532`		- return `return (function()\n${code}\nend)()${this.accessor}`;
	`532`	+ return `return (function(...)\n${code}\nend)()${this.accessor}`;
`533`	`533`	`}`
`534`	`534`
`535`	`535`	`@memoize`