Skip to content

Fix require resolve #1346

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 3 commits into from
Sep 4, 2022
Merged

Fix require resolve #1346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2544ba
Fixed missed require patterns for module resolution
Perryvw Sep 1, 2022
f092ce4
Merge branch 'master' into fix-require-resolve
Perryvw Sep 4, 2022
2cfe1f8
fix bug with mixed quotes
Perryvw Sep 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
6 changes: 3 additions & 3 deletions src/transpilation/resolve.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,11 +304,11 @@ function isBuildModeLibrary(program: ts.Program) {
function findRequiredPaths(code: string): string[] {
// Find all require("<path>") paths in a lua code string
const paths: string[] = [];
const pattern = /(^|\s|;|=|\()require\("(.+?)"\)/g;
const pattern = /(^|\s|;|=|\()require\s*\(?(["|'])(.+?)\2\)?/g;
// eslint-disable-next-line @typescript-eslint/ban-types
let match: RegExpExecArray | null;
while ((match = pattern.exec(code))) {
paths.push(match[2]);
paths.push(match[3]);
}

return paths;
Expand All @@ -321,7 +321,7 @@ function replaceRequireInCode(file: ProcessedFile, originalRequire: string, newR
const escapedRequire = originalRequire.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");

file.code = file.code.replace(
new RegExp(`(^|\\s|;|=|\\()require\\("${escapedRequire}"\\)`),
new RegExp(`(^|\\s|;|=|\\()require\\s*\\(?["|']${escapedRequire}["|']\\)?`),
`$1require("${requirePath}")`
);
}
Expand Down
31 changes: 31 additions & 0 deletions test/unit/modules/resolution.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,37 @@ test("doesn't resolve paths out of root dir", () => {
.expectDiagnosticsToMatchSnapshot([couldNotResolveRequire.code]);
});

test("resolves non-standard requires", () => {
const { transpiledFiles } = util.testModule`
export * from "./externalLua";
`
.addExtraFile("externalLua.d.ts", "export const foo = 3;")
.addExtraFile(
"externalLua.lua",
`
require("requiredLuaFile1") -- standard
require('requiredLuaFile2') -- single quote
require'requiredLuaFile3' -- no parentheses
require"requiredLuaFile4" -- no parentheses double quote
require "requiredLuaFile5" -- no parentheses and space
require "requiredLua'File6" -- no parentheses and space
require 'requiredLua"File7' -- no parentheses and space
`
)
.addExtraFile("requiredLuaFile1.lua", "")
.addExtraFile("requiredLuaFile2.lua", "")
.addExtraFile("requiredLuaFile3.lua", "")
.addExtraFile("requiredLuaFile4.lua", "")
.addExtraFile("requiredLuaFile5.lua", "")
.addExtraFile("requiredLua'File6.lua", "")
.addExtraFile('requiredLua"File7.lua', "")
.expectToHaveNoDiagnostics()
.getLuaResult();

// Expect main.lua, externalLua.lua and all 7 required lua files in there
expect(transpiledFiles.map(f => f.outPath)).toHaveLength(9);
});

test.each([
{
declarationStatement: `
Expand Down