Check baseUrl when resolving imported files (#1067)

Perryvw · web-flow · commit d47019903976 · 2021-08-05T21:54:18.000+02:00
diff --git a/src/transpilation/resolve.ts b/src/transpilation/resolve.ts
@@ -167,7 +167,7 @@ function resolveDependency(
     }
 
     // Check if file is a file in the project
-    const resolvedPath = path.join(fileDirectory, dependency);
+    const resolvedPath = path.join(options.baseUrl ?? fileDirectory, dependency);
 
     const possibleProjectFiles = [
         resolvedPath, // JSON files need their extension as part of the import path, caught by this branch,
diff --git a/test/transpile/module-resolution.spec.ts b/test/transpile/module-resolution.spec.ts
@@ -350,3 +350,43 @@ test("module resolution should not rewrite @NoResolution requires in library mod
     expect(transpiledFiles).toHaveLength(1);
     expect(transpiledFiles[0].lua).toContain('require("@NoResolution:');
 });
+
+test("module resolution uses baseURL to resolve imported files", () => {
+    util.testModule`
+        import { foo } from "dep1";
+        import { bar } from "dep2";
+        import { baz } from "luadep";
+
+        export const fooResult = foo();
+        export const barResult = bar();
+    `
+        .addExtraFile(
+            "myproject/mydeps/dep1.ts",
+            `
+                export function foo() { return "foo"; }
+            `
+        )
+        .addExtraFile(
+            "myproject/mydeps/dep2.ts",
+            `
+                export function bar() { return "bar"; }
+            `
+        )
+        .addExtraFile(
+            "myproject/mydeps/luadep.d.ts",
+            `
+                export function baz(): string;
+            `
+        )
+        .addExtraFile(
+            "myproject/mydeps/luadep.lua",
+            `
+                return { baz = function() return "baz" end }
+            `
+        )
+        .setOptions({ baseUrl: "./myproject/mydeps" })
+        .expectToEqual({
+            fooResult: "foo",
+            barResult: "bar",
+        });
+});
diff --git a/test/util.ts b/test/util.ts
@@ -178,8 +178,14 @@ export abstract class TestBuilder {
     @memoize
     public getProgram(): ts.Program {
         this.hasProgram = true;
+
+        // Exclude lua files from TS program, but keep them in extraFiles so module resolution can find them
+        const nonLuaExtraFiles = Object.fromEntries(
+            Object.entries(this.extraFiles).filter(([fileName]) => !fileName.endsWith(".lua"))
+        );
+
         return tstl.createVirtualProgram(
-            { ...this.extraFiles, [normalizeSlashes(this.mainFileName)]: this.getTsCode() },
+            { ...nonLuaExtraFiles, [normalizeSlashes(this.mainFileName)]: this.getTsCode() },
             this.options
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ function resolveDependency(`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`// Check if file is a file in the project`
`170`		`- const resolvedPath = path.join(fileDirectory, dependency);`
	`170`	`+ const resolvedPath = path.join(options.baseUrl ?? fileDirectory, dependency);`
`171`	`171`
`172`	`172`	`const possibleProjectFiles = [`
`173`	`173`	`resolvedPath, // JSON files need their extension as part of the import path, caught by this branch,`