fix(withoutBase): preserve leading slash

resolves #64
unjs · Jul 7, 2022 · fc72dd0 · fc72dd0
1 parent cbdda7a
commit fc72dd0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/utils.ts b/src/utils.ts
@@ -77,10 +77,11 @@ export function withoutBase (input: string, base: string) {
     return input
   }
   const _base = withoutTrailingSlash(base)
-  if (input.startsWith(_base)) {
-    return input.substr(_base.length) || '/'
+  if (!input.startsWith(_base)) {
+    return input
   }
-  return input
+  const trimmed = input.substring(_base.length)
+  return trimmed[0] === '/' ? trimmed : ('/' + trimmed)
 }
 
 export function withQuery (input: string, query: QueryObject): string {

diff --git a/test/base.test.ts b/test/base.test.ts
@@ -31,7 +31,9 @@ describe('withoutBase', () => {
     { base: '/base', input: '/base/a', out: '/a' },
     { base: '/base/', input: '/base/a', out: '/a' },
     { base: '/base/a/', input: '/base/a', out: '/' },
-    { base: '/', input: '/test/', out: '/test/' }
+    { base: '/', input: '/test/', out: '/test/' },
+    { base: '/', input: '/?test', out: '/?test' },
+    { base: '/api', input: '/api?test', out: '/?test' }
   ]
 
   for (const t of tests) {