feat!(validator): supports transformation (#2130)

* feat!(validator): supports transformation

* refactored

* denoify

deno_dist/validator/validator.ts

@@ -29,13 +29,22 @@ export const validator = <
   M extends string,
   U extends ValidationTargetByMethod<M>,
   OutputType = ValidationTargets[U],
+  OutputTypeExcludeResponseType = ExcludeResponseType<OutputType>,
   P2 extends string = P,
   V extends {
-    in: { [K in U]: unknown extends InputType ? OutputType : InputType }
-    out: { [K in U]: ExcludeResponseType<OutputType> }
+    in: {
+      [K in U]: K extends 'json'
+        ? InputType
+        : { [K2 in keyof OutputTypeExcludeResponseType]: ValidationTargets[K][K2] }
+    }
+    out: { [K in U]: OutputTypeExcludeResponseType }
   } = {
-    in: { [K in U]: unknown extends InputType ? OutputType : InputType }
-    out: { [K in U]: ExcludeResponseType<OutputType> }
+    in: {
+      [K in U]: K extends 'json'
+        ? InputType
+        : { [K2 in keyof OutputTypeExcludeResponseType]: ValidationTargets[K][K2] }
+    }
+    out: { [K in U]: OutputTypeExcludeResponseType }
   },
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   E extends Env = any

src/client/client.test.ts

@@ -322,8 +322,8 @@ describe('Infer the response/request type', () => {
 
     type Actual = InferRequestType<typeof req>
     type Expected = {
-      age: string
-      name: string
+      age: string | string[]
+      name: string | string[]
     }
     type verify = Expect<Equal<Expected, Actual['query']>>
   })

src/validator/validator.test.ts

@@ -602,7 +602,7 @@ it('With path parameters', () => {
       $put: {
         input: {
           form: {
-            title: string
+            title: string | File
           }
         } & {
           param: {
@@ -646,11 +646,11 @@ it('`on`', () => {
       $purge: {
         input: {
           form: {
-            tag: string
+            tag: string | File
           }
         } & {
           query: {
-            q: string
+            q: string | string[]
           }
         }
         output: {
@@ -834,3 +834,39 @@ describe('Validator with using Zod directly', () => {
     )
   })
 })
+
+describe('Transform', () => {
+  it('Should be number when the type is transformed', () => {
+    const route = new Hono().get(
+      '/',
+      validator('query', async () => {
+        return {
+          page: 1,
+        }
+      }),
+      (c) => {
+        const { page } = c.req.valid('query')
+        expectTypeOf(page).toEqualTypeOf<number>()
+        return c.json({ page })
+      }
+    )
+
+    type Expected = {
+      '/': {
+        $get: {
+          input: {
+            query: {
+              page: string | string[]
+            }
+          }
+          output: {
+            page: number
+          }
+        }
+      }
+    }
+
+    type Actual = ExtractSchema<typeof route>
+    type verify = Expect<Equal<Expected, Actual>>
+  })
+})

src/validator/validator.ts

@@ -29,13 +29,22 @@ export const validator = <
   M extends string,
   U extends ValidationTargetByMethod<M>,
   OutputType = ValidationTargets[U],
+  OutputTypeExcludeResponseType = ExcludeResponseType<OutputType>,
   P2 extends string = P,
   V extends {
-    in: { [K in U]: unknown extends InputType ? OutputType : InputType }
-    out: { [K in U]: ExcludeResponseType<OutputType> }
+    in: {
+      [K in U]: K extends 'json'
+        ? InputType
+        : { [K2 in keyof OutputTypeExcludeResponseType]: ValidationTargets[K][K2] }
+    }
+    out: { [K in U]: OutputTypeExcludeResponseType }
   } = {
-    in: { [K in U]: unknown extends InputType ? OutputType : InputType }
-    out: { [K in U]: ExcludeResponseType<OutputType> }
+    in: {
+      [K in U]: K extends 'json'
+        ? InputType
+        : { [K2 in keyof OutputTypeExcludeResponseType]: ValidationTargets[K][K2] }
+    }
+    out: { [K in U]: OutputTypeExcludeResponseType }
   },
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   E extends Env = any