unjs · Jun 10, 2022 · Jul 7, 2022 · Jul 7, 2022 · Jul 7, 2022
Showing with 397 additions and 315 deletions.

+7 −0 CHANGELOG.md

+3 −3 package.json

+380 −308 pnpm-lock.yaml

+4 −3 src/utils.ts

+3 −1 test/base.test.ts
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.8.5](https://github.com/unjs/ufo/compare/v0.8.4...v0.8.5) (2022-07-07)
+
+
+### Bug Fixes
+
+* **withoutBase:** preserve leading slash ([fc72dd0](https://github.com/unjs/ufo/commit/fc72dd0b7e503c07e4788ebb7af6fb790c714035)), closes [#64](https://github.com/unjs/ufo/issues/64)
+
 ### [0.8.4](https://github.com/unjs/ufo/compare/v0.8.3...v0.8.4) (2022-05-06)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ufo",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "description": "URL utils for humans",
   "repository": "unjs/ufo",
   "license": "MIT",
@@ -31,12 +31,12 @@
     "@nuxtjs/eslint-config-typescript": "latest",
     "@types/flat": "latest",
     "@types/node": "latest",
-    "c8": "^7.11.2",
+    "c8": "^7.11.3",
     "eslint": "latest",
     "standard-version": "latest",
     "typescript": "latest",
     "unbuild": "latest",
     "vitest": "latest"
   },
-  "packageManager": "pnpm@6.32.11"
+  "packageManager": "pnpm@7.5.0"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
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) {