deno_dist/jsx/dom/render.ts

@@ -2,10 +2,10 @@ import type { JSXNode } from '../base.ts'
 import type { FC, Child, Props } from '../base.ts'
 import { DOM_RENDERER, DOM_ERROR_HANDLER, DOM_STASH } from '../constants.ts'
 import type { Context as JSXContext } from '../context.ts'
-import { globalContexts as globalJSXContexts } from '../context.ts'
+import { globalContexts as globalJSXContexts, useContext } from '../context.ts'
 import type { EffectData } from '../hooks/index.ts'
 import { STASH_EFFECT } from '../hooks/index.ts'
-import { useContext, createContext } from './index.ts'
+import { createContext } from './context.ts' // import dom-specific versions
 
 const eventAliasMap: Record<string, string> = {
   Change: 'Input',

deno_dist/types.ts

@@ -1615,10 +1615,26 @@ export type MergeSchemaPath<OrigSchema extends Schema, SubPath extends string> =
           input: Input extends { param: infer _ }
             ? ExtractParams<SubPath> extends never
               ? Input
-              : FlattenIfIntersect<Input & { param: ExtractParams<SubPath> }>
+              : FlattenIfIntersect<
+                  Input & {
+                    param: {
+                      // Maps extracted keys, stripping braces, to a string-typed record.
+                      [K in keyof ExtractParams<SubPath> as K extends `${infer Prefix}{${infer _}}`
+                        ? Prefix
+                        : K]: string
+                    }
+                  }
+                >
             : RemoveBlankRecord<ExtractParams<SubPath>> extends never
             ? Input
-            : Input & { param: ExtractParams<SubPath> }
+            : Input & {
+                // Maps extracted keys, stripping braces, to a string-typed record.
+                param: {
+                  [K in keyof ExtractParams<SubPath> as K extends `${infer Prefix}{${infer _}}`
+                    ? Prefix
+                    : K]: string
+                }
+              }
           output: Output
         }
       : never

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.0.6",
+  "version": "4.0.7",
   "description": "Ultrafast web framework for the Edges",
   "main": "dist/cjs/index.js",
   "type": "module",

src/jsx/dom/render.ts

@@ -2,10 +2,10 @@ import type { JSXNode } from '../base'
 import type { FC, Child, Props } from '../base'
 import { DOM_RENDERER, DOM_ERROR_HANDLER, DOM_STASH } from '../constants'
 import type { Context as JSXContext } from '../context'
-import { globalContexts as globalJSXContexts } from '../context'
+import { globalContexts as globalJSXContexts, useContext } from '../context'
 import type { EffectData } from '../hooks'
 import { STASH_EFFECT } from '../hooks'
-import { useContext, createContext } from '.'
+import { createContext } from './context' // import dom-specific versions
 
 const eventAliasMap: Record<string, string> = {
   Change: 'Input',

src/types.test.ts

@@ -681,6 +681,25 @@ describe('MergeSchemaPath', () => {
     }
     type verify = Expect<Equal<Expected, Actual>>
   })
+
+  test('MergeSchemaPath - Path and SubPath have regexp 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()', () => {

src/types.ts

@@ -1615,10 +1615,26 @@ export type MergeSchemaPath<OrigSchema extends Schema, SubPath extends string> =
           input: Input extends { param: infer _ }
             ? ExtractParams<SubPath> extends never
               ? Input
-              : FlattenIfIntersect<Input & { param: ExtractParams<SubPath> }>
+              : FlattenIfIntersect<
+                  Input & {
+                    param: {
+                      // Maps extracted keys, stripping braces, to a string-typed record.
+                      [K in keyof ExtractParams<SubPath> as K extends `${infer Prefix}{${infer _}}`
+                        ? Prefix
+                        : K]: string
+                    }
+                  }
+                >
             : RemoveBlankRecord<ExtractParams<SubPath>> extends never
             ? Input
-            : Input & { param: ExtractParams<SubPath> }
+            : Input & {
+                // Maps extracted keys, stripping braces, to a string-typed record.
+                param: {
+                  [K in keyof ExtractParams<SubPath> as K extends `${infer Prefix}{${infer _}}`
+                    ? Prefix
+                    : K]: string
+                }
+              }
           output: Output
         }
       : never