Merge d5d5240 into b0d28c4

Author: usualoma

src/middleware/mount/index.test.ts

@@ -138,6 +138,84 @@ describe('mount()', () => {
     })
   })
 
+  describe('With dynamic prefixes', () => {
+    const anotherApp = (req: Request) => new Response(getPath(req))
+
+    it.each([
+      ['/api/:version/*', '/api/v1/hello', '/hello'],
+      ['/api/:version/*', '/api/long-version/hello', '/hello'],
+      ['/api/:version/*', '/api/v1', '/'],
+      ['/api/:version/*', '/api/v1/', '/'],
+      ['/api/:version/*', '/api/v1//hello', '//hello'],
+      ['/user/:id{[^/]+}/*', '/user/123/hello', '/hello'],
+      ['/api/:id{[0-9]{2}}/*', '/api/12/hello', '/hello'],
+      ['/x/:prefix{.+}/x/*', '/x/a/b/x/c/d', '/c/d'],
+      ['/x/:prefix{.+}/x/*', '/x/a%2Fb/c/x/d%2Fe', '/d%2Fe'],
+      ['/api/:id{[^/]+}/*', '/api/ad%2Fmin/x%252Fy', '/x%252Fy'],
+      ['/api/:id{[^/]+}/*', '/api/foo%252Fbar/hello', '/hello'],
+      ['/api/:id{[^/]+}/*', '/api/%C3%A9/admin%2Fsecret', '/admin%2Fsecret'],
+    ])('Should strip %s from %s', async (route, path, expected) => {
+      const app = new Hono()
+      app.all(route, mount(anotherApp))
+
+      const res = await app.request(path)
+
+      expect(res.status).toBe(200)
+      expect(await res.text()).toBe(expected)
+    })
+
+    it('Should use the current route captures with a merged basePath', async () => {
+      const app = new Hono()
+      app.use('*', async (_c, next) => {
+        await next()
+      })
+      const subApp = new Hono().basePath('/:tenant')
+      subApp.all('/app/:id{[^/]+}/*', mount(anotherApp))
+      app.route('/api', subApp)
+
+      const res = await app.request('/api/acme/app/ad%2Fmin/hello')
+
+      expect(res.status).toBe(200)
+      expect(await res.text()).toBe('/hello')
+    })
+
+    it.each([
+      ['/a/*/b/*', '/a/one/b/two/three', '/two/three'],
+      ['/a/*/b/*', '/a/one/b', '/'],
+      ['/foo/*/*', '/foo/x/y/z', '/y/z'],
+      ['/x*/y/*', '/xabc/y/hello', '/hello'],
+      ['/x*/y/*', '/x/y/hello', '/hello'],
+      ['/x*/*', '/x/y', '/y'],
+      ['/x*/*', '/x/hello%2Fworld', '/hello%2Fworld'],
+      ['/x*/y/*', '/x%25/y/foo%252Fbar', '/foo%252Fbar'],
+      ['/assets*', '/assets/hello', '/hello'],
+      ['/assets*', '/assets-v2/hello', '/-v2/hello'],
+      ['/x*/y*', '/xyz/yellow/hello', '/ellow/hello'],
+    ])('Should strip %s up to the final wildcard from %s', async (route, path, expected) => {
+      const app = new Hono()
+      app.all(route, mount(anotherApp))
+
+      const res = await app.request(path)
+
+      expect(res.status).toBe(200)
+      expect(await res.text()).toBe(expected)
+    })
+
+    it.each([
+      ['/x*/:id/*', '/xabc/123/hello', '/hello'],
+      ['/x*/:id/*', '/x/123/hello', '/hello'],
+      ['/a/*/b/:prefix{.+}/c/*', '/a/one/b/two/three/c/four/five', '/four/five'],
+    ])('Should resolve wildcards and parameters in %s for %s', async (route, path, expected) => {
+      const app = new Hono()
+      app.all(route, mount(anotherApp))
+
+      const res = await app.request(path)
+
+      expect(res.status).toBe(200)
+      expect(await res.text()).toBe(expected)
+    })
+  })
+
   describe('With encoded paths', () => {
     const anotherApp = (req: Request) => new Response(getPath(req))
 
@@ -226,7 +304,7 @@ describe('mount()', () => {
     })
   })
 
-  describe('Mount on `/`', () => {
+  describe.each(['*', '/*'])('Mount on `%s`', (route) => {
     const anotherApp = (req: Request, _params: unknown) => {
       const path = getPath(req)
       if (path === '/') {
@@ -244,7 +322,7 @@ describe('mount()', () => {
     }
 
     const app = new Hono()
-    app.all('/*', mount(anotherApp))
+    app.all(route, mount(anotherApp))
 
     it('Should return responses from AnotherApp - mount on `/`', async () => {
       let res = await app.request('/')

src/middleware/mount/index.ts

@@ -5,7 +5,9 @@
 
 import type { Context, ExecutionContext } from '../../context'
 import { routePath } from '../../helper/route'
+import { GET_MATCH_RESULT } from '../../request/constants'
 import type { MiddlewareHandler } from '../../types'
+import { getPattern, splitRoutingPath } from '../../utils/url'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type ApplicationHandler = (request: Request, ...args: any) => Response | Promise<Response>
@@ -18,11 +20,37 @@ type MountOptions =
       replaceRequest?: MountReplaceRequest | false
     }
 
+const getPathPrefixLength = (c: Context, pathPrefix: string): number => {
+  if (!/[:*]/.test(pathPrefix)) {
+    return pathPrefix.length
+  }
+
+  const path = c.req.path
+  const matchResult = c.req[GET_MATCH_RESULT]
+  let length = 0
+  for (const part of splitRoutingPath(pathPrefix)) {
+    const pattern = getPattern(part)
+    if (pattern && pattern !== '*' && pattern[2] !== true) {
+      const value =
+        matchResult.length === 2
+          ? matchResult[1][matchResult[0][c.req.routeIndex][1][pattern[1]]]
+          : matchResult[0][c.req.routeIndex][1][pattern[1]]
+      length += value.length + 1
+    } else if (pattern || part.endsWith('*')) {
+      const end = path.indexOf('/', length + 1)
+      length = end === -1 ? path.length : end
+    } else {
+      length += part.length + 1
+    }
+  }
+  return length
+}
+
 const defaultReplaceRequest = (c: Context): Request => {
   // e.g. `/another-app/*` (basePath is already merged) -> `/another-app`
-  const pathPrefix = routePath(c).replace(/\/\*$/, '')
+  const pathPrefix = routePath(c).replace(/\/?\*$/, '')
   const url = new URL(c.req.raw.url)
-  url.pathname = c.req.path.slice(pathPrefix.length) || '/'
+  url.pathname = c.req.path.slice(getPathPrefixLength(c, pathPrefix)) || '/'
   return new Request(url, c.req.raw)
 }