Fix incorrect require searching pattern (#1151)

Perryvw · web-flow · commit cb24c17911a2 · 2021-11-02T18:20:40.000+01:00
diff --git a/src/transpilation/resolve.ts b/src/transpilation/resolve.ts
@@ -293,7 +293,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))) {
diff --git a/test/transpile/module-resolution.spec.ts b/test/transpile/module-resolution.spec.ts
@@ -503,3 +503,16 @@ test("includes lualib_bundle when external lua requests it", () => {
             foo: ["foo", "bar"],
         });
 });
+
+// https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1146
+test("require matches correct pattern", () => {
+    util.testModule`
+        declare function require(this: void, module: string): any;
+        export const addResult = require("a").foo + require("b").foo;
+        export const callResult = require("c")("foo");
+    `
+        .addExtraFile("a.lua", "return { foo = 3 }")
+        .addExtraFile("b.lua", "return { foo = 5 }")
+        .addExtraFile("c.lua", "return function(self, a) return a end")
+        .expectToEqual({ addResult: 3 + 5, callResult: "foo" });
+});
