Resolve the correct lualib_bundles for node_modules dependencies (#1283)

Perryvw · web-flow · commit 60f11ddb4ba6 · 2022-06-12T14:59:48.000+02:00
* Resolve the correct lualib_bundles for node_modules dependencies

* Unfocus test
diff --git a/src/transpilation/resolve.ts b/src/transpilation/resolve.ts
@@ -138,8 +138,8 @@ function resolveFileDependencies(file: ProcessedFile, context: ResolutionContext
     const diagnostics: ts.Diagnostic[] = [];
 
     for (const required of findRequiredPaths(file.code)) {
-        // Do no resolve lualib
-        if (required === "lualib_bundle") {
+        // Do no resolve lualib, unless it is included from node_modules
+        if (required === "lualib_bundle" && !isNodeModulesFile(file.fileName)) {
             dependencies.push({ fileName: "lualib_bundle", code: "" });
             continue;
         }
diff --git a/test/transpile/module-resolution.spec.ts b/test/transpile/module-resolution.spec.ts
@@ -247,10 +247,21 @@ describe("module resolution project with dependencies built by tstl library mode
     };
 
     test("can resolve lua dependencies", () => {
-        util.testProject(path.join(projectPath, "tsconfig.json"))
+        const transpileResult = util
+            .testProject(path.join(projectPath, "tsconfig.json"))
             .setMainFileName(path.join(projectPath, "main.ts"))
             .setOptions({ outDir: "tstl-out" })
-            .expectToEqual(expectedResult);
+            .expectToEqual(expectedResult)
+            .getLuaResult();
+
+        // Assert lualib_bundle from node_module is include
+        const expectedLualibBundle = path.join("lua_modules", "dependency1", "lualib_bundle.lua");
+        expect(transpileResult.transpiledFiles.some(f => f.outPath.endsWith(expectedLualibBundle))).toBe(true);
+        // Assert node_modules file requires the correct lualib_bundle
+        const requiringLuaFile = path.join("lua_modules", "dependency1", "index.lua");
+        const lualibRequiringFile = transpileResult.transpiledFiles.find(f => f.outPath.endsWith(requiringLuaFile));
+        expect(lualibRequiringFile).toBeDefined();
+        expect(lualibRequiringFile?.lua).toContain('require("lua_modules.dependency1.lualib_bundle")');
     });
 
     test("can resolve dependencies and bundle", () => {
diff --git a/test/transpile/module-resolution/project-with-tstl-library-modules/dependency1-ts/index.ts b/test/transpile/module-resolution/project-with-tstl-library-modules/dependency1-ts/index.ts
@@ -3,3 +3,8 @@ import { dependency1OtherFileFunc } from "./d1otherfile";
 export function dependency1IndexFunc() {
     return "function in dependency 1 index: " + dependency1OtherFileFunc();
 }
+
+export function squares(nums: number[]) {
+    // Require lualib functionality
+    return nums.map(n => n * n);
+}

Original file line number	Diff line number	Diff line change
`@@ -3,3 +3,8 @@ import { dependency1OtherFileFunc } from "./d1otherfile";`
`3`	`3`	`export function dependency1IndexFunc() {`
`4`	`4`	`return "function in dependency 1 index: " + dependency1OtherFileFunc();`
`5`	`5`	`}`
	`6`	`+`
	`7`	`+export function squares(nums: number[]) {`
	`8`	`+ // Require lualib functionality`
	`9`	`+ return nums.map(n => n * n);`
	`10`	`+}`