Merge branch 'main' into v4

honojs · Feb 3, 2024 · 0623c21 · 0623c21
2 parents 88f2983 + f44c705
commit 0623c21
Show file tree

Hide file tree

Showing 11 changed files with 143 additions and 61 deletions.
diff --git a/deno_dist/helper/html/index.ts b/deno_dist/helper/html/index.ts
@@ -1,18 +1,7 @@
-import { escapeToBuffer, stringBufferToString } from '../../utils/html.ts'
-import type {
-  StringBuffer,
-  HtmlEscaped,
-  HtmlEscapedString,
-  HtmlEscapedCallback,
-} from '../../utils/html.ts'
+import { escapeToBuffer, stringBufferToString, raw } from '../../utils/html.ts'
+import type { StringBuffer, HtmlEscaped, HtmlEscapedString } from '../../utils/html.ts'
 
-export const raw = (value: unknown, callbacks?: HtmlEscapedCallback[]): HtmlEscapedString => {
-  const escapedString = new String(value) as HtmlEscapedString
-  escapedString.isEscaped = true
-  escapedString.callbacks = callbacks
-
-  return escapedString
-}
+export { raw }
 
 export const html = (
   strings: TemplateStringsArray,

diff --git a/deno_dist/router/trie-router/node.ts b/deno_dist/router/trie-router/node.ts
@@ -119,7 +119,6 @@ export class Node<T> {
   search(method: string, path: string): [[T, Params][]] {
     const handlerSets: HandlerParamsSet<T>[] = []
     this.params = {}
-    const params: Record<string, string> = {}
 
     // eslint-disable-next-line @typescript-eslint/no-this-alias
     const curNode: Node<T> = this
@@ -151,6 +150,8 @@ export class Node<T> {
         for (let k = 0, len3 = node.patterns.length; k < len3; k++) {
           const pattern = node.patterns[k]
 
+          const params = { ...node.params }
+
           // Wildcard
           // '/hello/*/foo' => match /hello/bar/foo
           if (pattern === '*') {
@@ -184,10 +185,10 @@ export class Node<T> {
               if (isLast === true) {
                 handlerSets.push(...this.gHSets(child, method, params, node.params))
                 if (child.children['*']) {
-                  handlerSets.push(...this.gHSets(child.children['*'], method, node.params, params))
+                  handlerSets.push(...this.gHSets(child.children['*'], method, params, node.params))
                 }
               } else {
-                child.params = { ...params }
+                child.params = params
                 tempNodes.push(child)
               }
             }

diff --git a/deno_dist/types.ts b/deno_dist/types.ts
@@ -3,7 +3,7 @@
 /* eslint-disable @typescript-eslint/ban-types */
 import type { Context } from './context.ts'
 import type { Hono } from './hono.ts'
-import type { IfAnyThenEmptyObject, UnionToIntersection } from './utils/types.ts'
+import type { IfAnyThenEmptyObject, RemoveBlankRecord, UnionToIntersection } from './utils/types.ts'
 
 ////////////////////////////////////////
 //////                            //////
@@ -1595,8 +1595,30 @@ export type Schema = {
   }
 }
 
-export type MergeSchemaPath<OrigSchema, SubPath extends string> = {
-  [K in keyof OrigSchema as `${MergePath<SubPath, K & string>}`]: OrigSchema[K]
+type ExtractParams<Path extends string> = string extends Path
+  ? Record<string, string>
+  : Path extends `${infer Start}:${infer Param}/${infer Rest}`
+  ? { [K in Param | keyof ExtractParams<`/${Rest}`>]: string }
+  : Path extends `${infer Start}:${infer Param}`
+  ? { [K in Param]: string }
+  : never
+
+export type MergeSchemaPath<OrigSchema extends Schema, SubPath extends string> = {
+  [P in keyof OrigSchema as MergePath<SubPath, P & string>]: {
+    [M in keyof OrigSchema[P]]: OrigSchema[P][M] extends {
+      input: infer Input
+      output: infer Output
+    }
+      ? {
+          input: Input extends { param: infer Params }
+            ? { param: Params & ExtractParams<SubPath> }
+            : RemoveBlankRecord<ExtractParams<SubPath>> extends never
+            ? Input
+            : Input & { param: ExtractParams<SubPath> }
+          output: Output
+        }
+      : never
+  }
 }
 
 export type AddParam<I, P extends string> = ParamKeys<P> extends never

diff --git a/deno_dist/utils/html.ts b/deno_dist/utils/html.ts
@@ -31,7 +31,13 @@ export type HtmlEscapedString = string & HtmlEscaped
  */
 export type StringBuffer = (string | Promise<string>)[]
 
-import { raw } from '../helper/html/index.ts'
+export const raw = (value: unknown, callbacks?: HtmlEscapedCallback[]): HtmlEscapedString => {
+  const escapedString = new String(value) as HtmlEscapedString
+  escapedString.isEscaped = true
+  escapedString.callbacks = callbacks
+
+  return escapedString
+}
 
 // The `escapeToBuffer` implementation is based on code from the MIT licensed `react-dom` package.
 // https://github.com/facebook/react/blob/main/packages/react-dom-bindings/src/server/escapeTextForBrowser.js

diff --git a/src/adapter/bun/serve-static.ts b/src/adapter/bun/serve-static.ts
@@ -1,14 +1,10 @@
 // @denoify-ignore
 /* eslint-disable @typescript-eslint/ban-ts-comment */
-import { existsSync } from 'fs'
 import type { Context } from '../../context'
 import type { Env, MiddlewareHandler } from '../../types'
 import { getFilePath } from '../../utils/filepath'
 import { getMimeType } from '../../utils/mime'
 
-// @ts-ignore
-const { file } = Bun
-
 export type ServeStaticOptions<E extends Env = Env> = {
   root?: string
   path?: string
@@ -43,21 +39,21 @@ export const serveStatic = <E extends Env = Env>(
 
     path = `./${path}`
 
-    if (existsSync(path)) {
-      const content = file(path)
-      if (content) {
-        let mimeType: string | undefined = undefined
-        if (options.mimes) {
-          mimeType = getMimeType(path, options.mimes) ?? getMimeType(path)
-        } else {
-          mimeType = getMimeType(path)
-        }
-        if (mimeType) {
-          c.header('Content-Type', mimeType)
-        }
-        // Return Response object
-        return c.body(content)
+    // @ts-ignore
+    const file = Bun.file(path)
+    const isExists = await file.exists()
+    if (isExists) {
+      let mimeType: string | undefined = undefined
+      if (options.mimes) {
+        mimeType = getMimeType(path, options.mimes) ?? getMimeType(path)
+      } else {
+        mimeType = getMimeType(path)
+      }
+      if (mimeType) {
+        c.header('Content-Type', mimeType)
       }
+      // Return Response object
+      return c.body(file)
     }
 
     await options.onNotFound?.(path, c)

diff --git a/src/helper/html/index.ts b/src/helper/html/index.ts
@@ -1,18 +1,7 @@
-import { escapeToBuffer, stringBufferToString } from '../../utils/html'
-import type {
-  StringBuffer,
-  HtmlEscaped,
-  HtmlEscapedString,
-  HtmlEscapedCallback,
-} from '../../utils/html'
+import { escapeToBuffer, stringBufferToString, raw } from '../../utils/html'
+import type { StringBuffer, HtmlEscaped, HtmlEscapedString } from '../../utils/html'
 
-export const raw = (value: unknown, callbacks?: HtmlEscapedCallback[]): HtmlEscapedString => {
-  const escapedString = new String(value) as HtmlEscapedString
-  escapedString.isEscaped = true
-  escapedString.callbacks = callbacks
-
-  return escapedString
-}
+export { raw }
 
 export const html = (
   strings: TemplateStringsArray,

diff --git a/src/router/trie-router/node.test.ts b/src/router/trie-router/node.test.ts
@@ -768,4 +768,19 @@ describe('The same name is used for path params', () => {
       expect(res[0][1]).toEqual({ b: 'about', a: 'me' })
     })
   })
+
+  describe('Complex with tails', () => {
+    const node = new Node()
+    node.insert('get', '/:id/:id2/comments', 'a')
+    node.insert('get', '/posts/:id/comments', 'b')
+    it('/posts/123/comments', () => {
+      const [res] = node.search('get', '/posts/123/comments')
+      expect(res).not.toBeNull()
+      expect(res.length).toBe(2)
+      expect(res[0][0]).toEqual('a')
+      expect(res[0][1]).toEqual({ id: 'posts', id2: '123' })
+      expect(res[1][0]).toEqual('b')
+      expect(res[1][1]).toEqual({ id: '123' })
+    })
+  })
 })
diff --git a/src/router/trie-router/node.ts b/src/router/trie-router/node.ts
@@ -119,7 +119,6 @@ export class Node<T> {
   search(method: string, path: string): [[T, Params][]] {
     const handlerSets: HandlerParamsSet<T>[] = []
     this.params = {}
-    const params: Record<string, string> = {}
 
     // eslint-disable-next-line @typescript-eslint/no-this-alias
     const curNode: Node<T> = this
@@ -151,6 +150,8 @@ export class Node<T> {
         for (let k = 0, len3 = node.patterns.length; k < len3; k++) {
           const pattern = node.patterns[k]
 
+          const params = { ...node.params }
+
           // Wildcard
           // '/hello/*/foo' => match /hello/bar/foo
           if (pattern === '*') {
@@ -184,10 +185,10 @@ export class Node<T> {
               if (isLast === true) {
                 handlerSets.push(...this.gHSets(child, method, params, node.params))
                 if (child.children['*']) {
-                  handlerSets.push(...this.gHSets(child.children['*'], method, node.params, params))
+                  handlerSets.push(...this.gHSets(child.children['*'], method, params, node.params))
                 }
               } else {
-                child.params = { ...params }
+                child.params = params
                 tempNodes.push(child)
               }
             }

diff --git a/src/types.test.ts b/src/types.test.ts
@@ -525,7 +525,6 @@ describe('merge path', () => {
             message: string
           }
         }
-      } & {
         $get: {
           input: {}
           output: {
@@ -557,6 +556,42 @@ describe('merge path', () => {
     type Actual = MergeSchemaPath<Sub, '/tags'>
     type verify = Expect<Equal<'/tags', GetKey<Actual>>>
   })
+
+  test('MergeSchemaPath - SubPath has path params', () => {
+    type Actual = MergeSchemaPath<ToSchema<'get', '/', {}, {}>, '/a/:b'>
+    type Expected = {
+      '/a/:b': {
+        $get: {
+          input: {
+            param: {
+              b: string
+            }
+          }
+          output: {}
+        }
+      }
+    }
+    type verify = Expect<Equal<Expected, Actual>>
+  })
+
+  test('MergeSchemaPath - Path and SubPath have path params', () => {
+    type Actual = MergeSchemaPath<ToSchema<'get', '/c/:d', {}, {}>, '/a/:b'>
+    type Expected = {
+      '/a/:b/c/:d': {
+        $get: {
+          input: {
+            param: {
+              d: string
+            } & {
+              b: string
+            }
+          }
+          output: {}
+        }
+      }
+    }
+    type verify = Expect<Equal<Expected, Actual>>
+  })
 })
 
 describe('Different types using json()', () => {

diff --git a/src/types.ts b/src/types.ts
@@ -3,7 +3,7 @@
 /* eslint-disable @typescript-eslint/ban-types */
 import type { Context } from './context'
 import type { Hono } from './hono'
-import type { IfAnyThenEmptyObject, UnionToIntersection } from './utils/types'
+import type { IfAnyThenEmptyObject, RemoveBlankRecord, UnionToIntersection } from './utils/types'
 
 ////////////////////////////////////////
 //////                            //////
@@ -1595,8 +1595,30 @@ export type Schema = {
   }
 }
 
-export type MergeSchemaPath<OrigSchema, SubPath extends string> = {
-  [K in keyof OrigSchema as `${MergePath<SubPath, K & string>}`]: OrigSchema[K]
+type ExtractParams<Path extends string> = string extends Path
+  ? Record<string, string>
+  : Path extends `${infer Start}:${infer Param}/${infer Rest}`
+  ? { [K in Param | keyof ExtractParams<`/${Rest}`>]: string }
+  : Path extends `${infer Start}:${infer Param}`
+  ? { [K in Param]: string }
+  : never
+
+export type MergeSchemaPath<OrigSchema extends Schema, SubPath extends string> = {
+  [P in keyof OrigSchema as MergePath<SubPath, P & string>]: {
+    [M in keyof OrigSchema[P]]: OrigSchema[P][M] extends {
+      input: infer Input
+      output: infer Output
+    }
+      ? {
+          input: Input extends { param: infer Params }
+            ? { param: Params & ExtractParams<SubPath> }
+            : RemoveBlankRecord<ExtractParams<SubPath>> extends never
+            ? Input
+            : Input & { param: ExtractParams<SubPath> }
+          output: Output
+        }
+      : never
+  }
 }
 
 export type AddParam<I, P extends string> = ParamKeys<P> extends never

diff --git a/src/utils/html.ts b/src/utils/html.ts
@@ -31,7 +31,13 @@ export type HtmlEscapedString = string & HtmlEscaped
  */
 export type StringBuffer = (string | Promise<string>)[]
 
-import { raw } from '../helper/html'
+export const raw = (value: unknown, callbacks?: HtmlEscapedCallback[]): HtmlEscapedString => {
+  const escapedString = new String(value) as HtmlEscapedString
+  escapedString.isEscaped = true
+  escapedString.callbacks = callbacks
+
+  return escapedString
+}
 
 // The `escapeToBuffer` implementation is based on code from the MIT licensed `react-dom` package.
 // https://github.com/facebook/react/blob/main/packages/react-dom-bindings/src/server/escapeTextForBrowser.js