fix: trim root folder / when calculating relative paths (#142)

Co-authored-by: Daniel Roe <daniel@roe.dev>
unjs · Dec 12, 2023 · 5930a85 · 5930a85
1 parent 8f3d913
commit 5930a85
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/path.ts b/src/path.ts
@@ -13,6 +13,7 @@ import { normalizeWindowsPath } from "./_internal";
 const _UNC_REGEX = /^[/\\]{2}/;
 const _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
 const _DRIVE_LETTER_RE = /^[A-Za-z]:$/;
+const _ROOT_FOLDER_RE = /^\/([A-Za-z]:)?$/;
 
 // Force POSIX contants
 export const sep = "/";
@@ -211,8 +212,9 @@ export const extname: typeof path.extname = function (p) {
 
 // relative
 export const relative: typeof path.relative = function (from, to) {
-  const _from = resolve(from).split("/");
-  const _to = resolve(to).split("/");
+  const _from = resolve(from).replace(_ROOT_FOLDER_RE, "$1").split("/");
+  const _to = resolve(to).replace(_ROOT_FOLDER_RE, "$1").split("/");
+
   const _fromCopy = [..._from];
   for (const segment of _fromCopy) {
     if (_to[0] !== segment) {

diff --git a/test/index.spec.ts b/test/index.spec.ts
@@ -235,6 +235,8 @@ it("parse", () => {
 runTest("relative", relative, [
   // POSIX
   ["/data/orandea/test/aaa", "/data/orandea/impl/bbb", "../../impl/bbb"],
+  ["/", "/foo/bar", "foo/bar"],
+  ["/foo", "/", ".."],
   [
     () => process.cwd(),
     "./dist/client/b-scroll.d.ts",
@@ -243,6 +245,8 @@ runTest("relative", relative, [
 
   // Windows
   ["C:\\orandea\\test\\aaa", "C:\\orandea\\impl\\bbb", "../../impl/bbb"],
+  ["C:\\", "C:\\foo\\bar", "foo/bar"],
+  ["C:\\foo", "C:\\", ".."],
   [
     () => process.cwd().replace(/\\/g, "/"),
     "./dist/client/b-scroll.d.ts",