fix joinURIAndPath()

pilcrowonpaper · Jan 9, 2025 · 8e73119 · 8e73119
1 parent 4fc9cbe
commit 8e73119
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/request.test.ts b/src/request.test.ts
@@ -0,0 +1,21 @@
+import * as vitest from "vitest";
+
+import { joinURIAndPath } from "./request.js";
+
+vitest.test("joinBaseURIAndPath()", () => {
+	vitest.expect(joinURIAndPath("https://example.com", "/hi")).toBe("https://example.com/hi");
+	vitest.expect(joinURIAndPath("https://example.com/", "/hi")).toBe("https://example.com/hi");
+	vitest.expect(joinURIAndPath("https://example.com/", "hi")).toBe("https://example.com/hi");
+	vitest.expect(joinURIAndPath("https://example.com", "hi")).toBe("https://example.com/hi");
+	vitest.expect(joinURIAndPath("https://example.com", "/hi/")).toBe("https://example.com/hi/");
+
+	vitest
+		.expect(joinURIAndPath("https://example.com", "/hi", "/bye"))
+		.toBe("https://example.com/hi/bye");
+	vitest
+		.expect(joinURIAndPath("https://example.com", "hi", "bye"))
+		.toBe("https://example.com/hi/bye");
+	vitest
+		.expect(joinURIAndPath("https://example.com", "/hi/", "/bye/"))
+		.toBe("https://example.com/hi/bye/");
+});
diff --git a/src/request.ts b/src/request.ts
@@ -5,8 +5,7 @@ import { trimLeft, trimRight } from "./utils.js";
 export function joinURIAndPath(base: string, ...path: string[]): string {
 	let joined = trimRight(base, "/");
 	for (const part of path) {
-		joined += "/";
-		joined += trimRight(trimLeft(part, "/"), "/");
+		joined = trimRight(joined, "/") + "/" + trimLeft(part, "/");
 	}
 	return joined;
 }