fix: Include the correct relative paths in circular import errors

jespertheend · Feb 2, 2023 · acb632f · acb632f
1 parent 1fe5cd7
commit acb632f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/getRelativePath.js b/src/getRelativePath.js
@@ -6,7 +6,10 @@ import { posix } from "https://deno.land/[email protected]/path/mod.ts";
  * @param {string} pathB
  */
 export function getRelativePath(pathA, pathB) {
-	const a = posix.fromFileUrl(pathA);
+	let a = posix.fromFileUrl(pathA);
+	if (!a.endsWith("/")) {
+		a = posix.dirname(a)
+	}
 	const b = posix.fromFileUrl(pathB);
 	let rel = posix.relative(a, b);
 	if (!rel.startsWith("/") && !rel.startsWith(".")) {

diff --git a/test/integration/circular.test.js b/test/integration/circular.test.js
@@ -358,7 +358,7 @@ Consider passing the following path to \`importer.makeReal()\`:
 });
 
 Deno.test({
-	name: "circular import with file above the base path",
+	name: "circular import with file above the base path, base path ends with a file name",
 	async fn() {
 		//    A  <-+
 		//    |    |
@@ -377,7 +377,7 @@ Deno.test({
 			`,
 		});
 
-		const basePath = tmpDirBasePath + "A/";
+		const basePath = tmpDirBasePath + "A/foo.js";
 
 		try {
 			const importer = new Importer(basePath);