X Tutup
Skip to content

Resolve the correct lualib_bundles for node_modules dependencies #1283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Perryvw merged 2 commits into from
Jun 12, 2022
Merged

Resolve the correct lualib_bundles for node_modules dependencies #1283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01aa16f
Resolve the correct lualib_bundles for node_modules dependencies
Perryvw Jun 4, 2022
677e7d3
Unfocus test
Perryvw Jun 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/transpilation/resolve.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
15 changes: 13 additions & 2 deletions test/transpile/module-resolution.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", () => {
Expand Down
5 changes: 5 additions & 0 deletions test/transpile/module-resolution/project-with-tstl-library-modules/dependency1-ts/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
X Tutup