fix(types): param in ValidationTargets supports optional param (#…

…3229)
honojs · Aug 6, 2024 · d58b98a · d58b98a
1 parent b3b1e8a
commit d58b98a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/types.ts b/src/types.ts
@@ -1808,7 +1808,7 @@ type ChangePathOfSchema<S extends Schema, Path extends string> = keyof S extends
   : { [K in keyof S as Path]: S[K] }
 
 export type Endpoint = {
-  input: Partial<ValidationTargets>
+  input: any
   output: any
   outputFormat: ResponseFormat
   status: StatusCode
@@ -1930,11 +1930,11 @@ type MergeTypedResponse<T> = T extends Promise<infer T2>
 export type FormValue = string | Blob
 export type ParsedFormValue = string | File
 
-export type ValidationTargets<T extends FormValue = ParsedFormValue> = {
+export type ValidationTargets<T extends FormValue = ParsedFormValue, P extends string = string> = {
   json: any
   form: Record<string, T | T[]>
   query: Record<string, string | string[]>
-  param: Record<string, string> | Record<string, string | undefined>
+  param: Record<P, P extends `${infer _}?` ? string | undefined : string>
   header: Record<string, string>
   cookie: Record<string, string>
 }

diff --git a/src/validator/validator.test.ts b/src/validator/validator.test.ts
@@ -833,6 +833,11 @@ it('With path parameters', () => {
 
   const route = app.put(
     '/posts/:id',
+    validator('param', () => {
+      return {
+        id: '123',
+      }
+    }),
     validator('form', () => {
       return {
         title: 'Foo',