fix(mount): include query params (#1224)

* fix(mount): include query params

* denoify

deno_dist/hono-base.ts

@@ -20,7 +20,7 @@ import type {
   FetchEventLike,
 } from './types.ts'
 import type { RemoveBlankRecord } from './utils/types.ts'
-import { getPath, getPathNoStrict, mergePath } from './utils/url.ts'
+import { getPath, getPathNoStrict, getQueryStrings, mergePath } from './utils/url.ts'
 
 type Methods = typeof METHODS[number] | typeof METHOD_NAME_ALL_LOWERCASE
 
@@ -216,8 +216,13 @@ class Hono<E extends Env = Env, S = {}, BasePath extends string = '/'> extends d
       } catch {} // Do nothing
       const options = optionHandler ? optionHandler(c) : [c.env, executionContext]
       const optionsArray = Array.isArray(options) ? options : [options]
+
+      const queryStrings = getQueryStrings(c.req.url)
       const res = await applicationHandler(
-        new Request(new URL(c.req.path.slice(pathPrefixLength) || '/', c.req.url), c.req.raw),
+        new Request(
+          new URL((c.req.path.slice(pathPrefixLength) || '/') + queryStrings, c.req.url),
+          c.req.raw
+        ),
         ...optionsArray
       )
 

deno_dist/utils/url.ts

@@ -74,6 +74,11 @@ export const getPath = (request: Request): string => {
   return url.slice(url.indexOf('/', 8), queryIndex === -1 ? undefined : queryIndex)
 }
 
+export const getQueryStrings = (url: string): string => {
+  const queryIndex = url.indexOf('?', 8)
+  return queryIndex === -1 ? '' : '?' + url.slice(queryIndex + 1)
+}
+
 export const getPathNoStrict = (request: Request): string => {
   const result = getPath(request)
 

src/hono-base.ts

@@ -20,7 +20,7 @@ import type {
   FetchEventLike,
 } from './types'
 import type { RemoveBlankRecord } from './utils/types'
-import { getPath, getPathNoStrict, mergePath } from './utils/url'
+import { getPath, getPathNoStrict, getQueryStrings, mergePath } from './utils/url'
 
 type Methods = typeof METHODS[number] | typeof METHOD_NAME_ALL_LOWERCASE
 
@@ -216,8 +216,13 @@ class Hono<E extends Env = Env, S = {}, BasePath extends string = '/'> extends d
       } catch {} // Do nothing
       const options = optionHandler ? optionHandler(c) : [c.env, executionContext]
       const optionsArray = Array.isArray(options) ? options : [options]
+
+      const queryStrings = getQueryStrings(c.req.url)
       const res = await applicationHandler(
-        new Request(new URL(c.req.path.slice(pathPrefixLength) || '/', c.req.url), c.req.raw),
+        new Request(
+          new URL((c.req.path.slice(pathPrefixLength) || '/') + queryStrings, c.req.url),
+          c.req.raw
+        ),
         ...optionsArray
       )
 

src/hono.test.ts

@@ -1925,6 +1925,10 @@ describe('app.mount()', () => {
         const message = req.headers.get('x-message')
         return new Response(message)
       }
+      if (path === '/with-query') {
+        const queryStrings = new URL(req.url).searchParams.toString()
+        return new Response(queryStrings)
+      }
       if (path == '/with-params') {
         return new Response(
           JSON.stringify({
@@ -1989,6 +1993,10 @@ describe('app.mount()', () => {
       expect(res.headers.get('x-message')).toBe('Foo')
       expect(await res.text()).toBe('Not Found from AnotherApp')
 
+      res = await app.request('/another-app/with-query?foo=bar&baz=qux')
+      expect(res.status).toBe(200)
+      expect(await res.text()).toBe('foo=bar&baz=qux')
+
       res = await app.request('/another-app/with-params')
       expect(res.status).toBe(200)
       expect(await res.json()).toEqual({

src/utils/url.test.ts

@@ -8,6 +8,7 @@ import {
   checkOptionalParameter,
   getQueryParam,
   getQueryParams,
+  getQueryStrings,
 } from './url'
 
 describe('url', () => {
@@ -84,6 +85,20 @@ describe('url', () => {
     })
   })
 
+  describe('getQueryStrings', () => {
+    it('getQueryStrings', () => {
+      let qs = getQueryStrings('https://example.com/hello?name=foo&name=bar&age=20')
+      expect(qs).toBe('?name=foo&name=bar&age=20')
+      qs = getQueryStrings('https://example.com/hello?')
+      expect(qs).toBe('?')
+      qs = getQueryStrings('https://example.com/hello')
+      expect(qs).toBe('')
+      // Allows to contain hash
+      qs = getQueryStrings('https://example.com/hello?name=foo&name=bar&age=20#hash')
+      expect(qs).toBe('?name=foo&name=bar&age=20#hash')
+    })
+  })
+
   describe('getPathNoStrict', () => {
     it('getPathNoStrict - no strict is false', () => {
       let path = getPathNoStrict(new Request('https://example.com/hello/'))

src/utils/url.ts

@@ -74,6 +74,11 @@ export const getPath = (request: Request): string => {
   return url.slice(url.indexOf('/', 8), queryIndex === -1 ? undefined : queryIndex)
 }
 
+export const getQueryStrings = (url: string): string => {
+  const queryIndex = url.indexOf('?', 8)
+  return queryIndex === -1 ? '' : '?' + url.slice(queryIndex + 1)
+}
+
 export const getPathNoStrict = (request: Request): string => {
   const result = getPath(request)