X Tutup
Skip to content

Fix import expression #1321

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
Aug 3, 2022
Merged

Fix import expression #1321

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
11cf80c
Fix import expression
Perryvw Aug 1, 2022
4e89a42
removed incorrect assert
Perryvw Aug 3, 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
5 changes: 3 additions & 2 deletions src/transformation/visitors/modules/import.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ export const transformImportEqualsDeclaration: FunctionVisitor<ts.ImportEqualsDe
export const transformImportExpression: FunctionVisitor<ts.CallExpression> = (node, context) => {
importLuaLibFeature(context, LuaLibFeature.Promise);

const importPath = node.arguments.map(a => context.transformExpression(a));
return lua.createCallExpression(createStaticPromiseFunctionAccessor("resolve", node), importPath, node);
const moduleRequire =
node.arguments.length > 0 ? createModuleRequire(context, node.arguments[0], node) : lua.createNilLiteral();
return lua.createCallExpression(createStaticPromiseFunctionAccessor("resolve", node), [moduleRequire], node);
};
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 @@ -260,7 +260,7 @@ 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\("(.+?)"\)/g;
// eslint-disable-next-line @typescript-eslint/ban-types
let match: RegExpExecArray | null;
while ((match = pattern.exec(code))) {
Expand All @@ -277,7 +277,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\\("${escapedRequire}"\\)`),
`$1require("${requirePath}")`
);
}
Expand Down
2 changes: 1 addition & 1 deletion test/unit/modules/modules.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,5 +289,5 @@ test("import expression", () => {
`
.addExtraFile("module.ts", 'export function foo() { return "foo"; }')
.setOptions({ module: ts.ModuleKind.ESNext })
.expectToMatchJsResult();
.expectToEqual({ result: "foo" });
});
X Tutup