fix(utils/url): calculate ends with slash on every iteration (#3910)

honojs · Feb 10, 2025 · 8340a7b · 8340a7b
1 parent 6ceb1ab
commit 8340a7b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/utils/url.test.ts b/src/utils/url.test.ts
@@ -152,6 +152,8 @@ describe('url', () => {
       expect(mergePath('/book', 'hey', 'say')).toBe('/book/hey/say')
       expect(mergePath('/book', '/hey/', '/say/')).toBe('/book/hey/say/')
       expect(mergePath('/book', '/hey/', '/say/', '/')).toBe('/book/hey/say/')
+      expect(mergePath('/book', '/hey', '/say', '/')).toBe('/book/hey/say')
+      expect(mergePath('/', '/book', '/hey', '/say', '/')).toBe('/book/hey/say')
 
       expect(mergePath('book', '/')).toBe('/book')
       expect(mergePath('book/', '/')).toBe('/book/')

diff --git a/src/utils/url.ts b/src/utils/url.ts
@@ -141,10 +141,12 @@ export const mergePath = (...paths: string[]): string => {
   let endsWithSlash = false
 
   for (let path of paths) {
+    // calculate endsWithSlash at the start of each iteration
+    endsWithSlash = p.at(-1) === '/'
+
     /* ['/hey/','/say'] => ['/hey', '/say'] */
-    if (p.at(-1) === '/') {
+    if (endsWithSlash) {
       p = p.slice(0, -1)
-      endsWithSlash = true
     }
 
     /* ['/hey','say'] => ['/hey', '/say'] */