Fix import expression (#1321)

Perryvw · web-flow · commit dd334923d3ea · 2022-08-03T21:55:24.000+02:00
* Fix import expression

* removed incorrect assert
diff --git a/src/transformation/visitors/modules/import.ts b/src/transformation/visitors/modules/import.ts
@@ -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);
 };
diff --git a/src/transpilation/resolve.ts b/src/transpilation/resolve.ts
@@ -304,7 +304,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))) {
@@ -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\\("${escapedRequire}"\\)`),
         `$1require("${requirePath}")`
     );
 }
diff --git a/test/unit/modules/modules.spec.ts b/test/unit/modules/modules.spec.ts
@@ -289,5 +289,5 @@ test("import expression", () => {
     `
         .addExtraFile("module.ts", 'export function foo() { return "foo"; }')
         .setOptions({ module: ts.ModuleKind.ESNext })
-        .expectToMatchJsResult();
+        .expectToEqual({ result: "foo" });
 });

Original file line number	Diff line number	Diff line change
`@@ -289,5 +289,5 @@ test("import expression", () => {`
`289`	`289`	`
`290`	`290`	`.addExtraFile("module.ts", 'export function foo() { return "foo"; }')`
`291`	`291`	`.setOptions({ module: ts.ModuleKind.ESNext })`
`292`		`- .expectToMatchJsResult();`
	`292`	`+ .expectToEqual({ result: "foo" });`
`293`	`293`	`});`