Merge pull request #63 from nodelib/FG-277_fs.walk_fix

FG-277: correctly handle the leading slash
nodelib · Dec 27, 2020 · a6ad025 · a6ad025
2 parents cb5f7e8 + 9b3db1c
commit a6ad025
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/packages/fs/fs.walk/src/readers/common.spec.ts b/packages/fs/fs.walk/src/readers/common.spec.ts
@@ -97,5 +97,18 @@ describe('Readers → Common', () => {
 
 			assert.strictEqual(actual, expected);
 		});
+
+		it('should return correct string when the first segment ens with the separator symbol', () => {
+			// Unix
+			assert.strictEqual(common.joinPathSegments('/', 'a', '/'), '/a');
+			assert.strictEqual(common.joinPathSegments('//', 'a', '/'), '//a');
+			assert.strictEqual(common.joinPathSegments('/a/', 'b', '/'), '/a/b');
+
+			// Windows
+			assert.strictEqual(common.joinPathSegments('C:/', 'Users', '/'), 'C:/Users');
+			assert.strictEqual(common.joinPathSegments('C:\\', 'Users', '\\'), 'C:\\Users');
+			assert.strictEqual(common.joinPathSegments('//?/C:/', 'Users', '/'), '//?/C:/Users');
+			assert.strictEqual(common.joinPathSegments('\\\\?\\C:\\', 'Users', '\\'), '\\\\?\\C:\\Users');
+		});
 	});
 });
diff --git a/packages/fs/fs.walk/src/readers/common.ts b/packages/fs/fs.walk/src/readers/common.ts
@@ -22,5 +22,12 @@ export function joinPathSegments(a: string, b: string, separator: string): strin
 		return b;
 	}
 
+	/**
+	 * The correct handling of cases when the first segment is a root (`/`, `C:/`) or UNC path (`//?/C:/`).
+	 */
+	if (a.endsWith(separator)) {
+		return a + b;
+	}
+
 	return a + separator + b;
 }