Make module resolution with custom extension work for extensions starting with and without period (#1402)

Perryvw · web-flow · commit 625d0699a95c · 2023-02-16T14:21:59.000+01:00
diff --git a/src/transpilation/resolve.ts b/src/transpilation/resolve.ts
@@ -341,6 +341,9 @@ function replaceRequireInSourceMap(
 }
 
 function requirePathForFile(filePath: string, extension = ".lua"): string {
+    if (!extension.startsWith(".")) {
+        extension = `.${extension}`;
+    }
     if (filePath.endsWith(extension)) {
         return formatPathToLuaPath(filePath.substring(0, filePath.length - extension.length));
     } else {
diff --git a/test/transpile/module-resolution.spec.ts b/test/transpile/module-resolution.spec.ts
@@ -182,6 +182,14 @@ describe("module resolution with sourceDir", () => {
             .setOptions({ outDir: "tstl-out", extension: ".script" })
             .expectToEqual(expectedResult);
     });
+
+    // https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1394
+    test("can resolve files with non-standard extension without separator (#1394)", () => {
+        util.testProject(path.join(projectPath, "tsconfig.json"))
+            .setMainFileName(path.join(projectPath, "src", "main.ts"))
+            .setOptions({ outDir: "tstl-out", extension: "script" })
+            .expectToEqual(expectedResult);
+    });
 });
 
 describe("module resolution project with lua sources", () => {
diff --git a/test/util.ts b/test/util.ts
@@ -468,7 +468,10 @@ end)());`;
     }
 
     private injectLuaFile(state: LuaState, lua: Lua, lauxlib: LauxLib, fileName: string, fileContent: string) {
-        const extension = this.options.extension ?? ".lua";
+        let extension = this.options.extension ?? ".lua";
+        if (!extension.startsWith(".")) {
+            extension = `.${extension}`;
+        }
         const modName = fileName.endsWith(extension)
             ? formatPathToLuaPath(fileName.substring(0, fileName.length - extension.length))
             : fileName;

Original file line number	Diff line number	Diff line change
`@@ -341,6 +341,9 @@ function replaceRequireInSourceMap(`
`341`	`341`	`}`
`342`	`342`
`343`	`343`	`function requirePathForFile(filePath: string, extension = ".lua"): string {`
	`344`	`+ if (!extension.startsWith(".")) {`
	`345`	+ extension = `.${extension}`;
	`346`	`+ }`
`344`	`347`	`if (filePath.endsWith(extension)) {`
`345`	`348`	`return formatPathToLuaPath(filePath.substring(0, filePath.length - extension.length));`
`346`	`349`	`} else {`