Fix require resolve (#1346)

Perryvw · web-flow · commit 9392c7e243b8 · 2022-09-04T17:57:48.000+02:00
* Fixed missed require patterns for module resolution

* fix bug with mixed quotes
diff --git a/src/transpilation/resolve.ts b/src/transpilation/resolve.ts
@@ -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;
@@ -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}")`
     );
 }
diff --git a/test/unit/modules/resolution.spec.ts b/test/unit/modules/resolution.spec.ts
@@ -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: `
