Merge pull request #26 from CloudCannon/fix/strip-top-path

Strip top path should handle leading/trailing slashes
CloudCannon · Oct 2, 2024 · 1cbdf26 · 1cbdf26
2 parents d130e15 + 7b99530
commit 1cbdf26
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/utility.js b/src/utility.js
@@ -30,6 +30,7 @@ export function joinPaths(paths) {
  * @returns {string}
  */
 export function stripTopPath(path, stripPath) {
+	stripPath = normalisePath(stripPath || '');
 	if (path === stripPath) {
 		return '';
 	}

diff --git a/test/utility.test.js b/test/utility.test.js
@@ -16,9 +16,14 @@ test('joins paths', (t) => {
 
 test('strips top path', (t) => {
 	t.is(stripTopPath('src/content/index.html', 'src'), 'content/index.html');
+	t.is(stripTopPath('src/content/index.html', 'src/'), 'content/index.html');
+	t.is(stripTopPath('src/content/index.html', '/src'), 'content/index.html');
+	t.is(stripTopPath('src/content/index.html', '/src/'), 'content/index.html');
+	t.is(stripTopPath('src/content/index.html', '/src/'), 'content/index.html');
 	t.is(stripTopPath('src/index.html', 'src'), 'index.html');
 	t.is(stripTopPath('src/index.html', ''), 'src/index.html');
 	t.is(stripTopPath('src', 'src'), '');
+	t.is(stripTopPath('src', '/src/'), '');
 	t.is(stripTopPath('src', ''), 'src');
 
 	t.is(stripTopPath('sauce/content', 'sauce'), 'content');