From 7375c096b51b3e050cc808c29f5d122c028e4291 Mon Sep 17 00:00:00 2001
From: chimame <rito.tamata@gmail.com>
Date: Sun, 9 Jun 2024 13:15:41 +0900
Subject: [PATCH] chore: Update valibot to version 0.31.0 (#553)

* chore: Update valibot to version 0.31.0

* Modify update valibot to version 0.31.0

* Modify update yarn.lock to valibot 0.31.0

* Add CHANGELOG using changesets
---
 .changeset/early-panthers-fetch.md            |  5 +++++
 packages/valibot-validator/package.json       |  4 ++--
 packages/valibot-validator/src/index.ts       | 14 +++++++-------
 packages/valibot-validator/test/index.test.ts | 14 +++++++-------
 yarn.lock                                     | 12 ++++++------
 5 files changed, 27 insertions(+), 22 deletions(-)
 create mode 100644 .changeset/early-panthers-fetch.md

diff --git a/.changeset/early-panthers-fetch.md b/.changeset/early-panthers-fetch.md
new file mode 100644
index 00000000..919b792c
--- /dev/null
+++ b/.changeset/early-panthers-fetch.md
@@ -0,0 +1,5 @@
+---
+'@hono/valibot-validator': minor
+---
+
+changed supported version of valibot to 0.31.0 or later
diff --git a/packages/valibot-validator/package.json b/packages/valibot-validator/package.json
index a7b948b7..989dccea 100644
--- a/packages/valibot-validator/package.json
+++ b/packages/valibot-validator/package.json
@@ -28,12 +28,12 @@
   "homepage": "https://github.com/honojs/middleware",
   "peerDependencies": {
     "hono": ">=3.9.0",
-    "valibot": ">=0.13.1 <1"
+    "valibot": ">=0.31.0 <1"
   },
   "devDependencies": {
     "hono": "^4.0.10",
     "jest": "^29.7.0",
     "rimraf": "^5.0.5",
-    "valibot": "^0.24.1"
+    "valibot": "^0.31.0"
   }
 }
diff --git a/packages/valibot-validator/src/index.ts b/packages/valibot-validator/src/index.ts
index 15c3ef01..36834916 100644
--- a/packages/valibot-validator/src/index.ts
+++ b/packages/valibot-validator/src/index.ts
@@ -1,9 +1,9 @@
-import type { Context, MiddlewareHandler, Env, ValidationTargets, Input as HonoInput } from 'hono'
+import type { Context, Env, Input as HonoInput, MiddlewareHandler, ValidationTargets } from 'hono'
 import { validator } from 'hono/validator'
-import type { BaseSchema, BaseSchemaAsync, Input, Output, SafeParseResult } from 'valibot'
+import type { GenericSchema, GenericSchemaAsync, InferInput, InferOutput, SafeParseResult } from 'valibot'
 import { safeParseAsync } from 'valibot'
 
-type Hook<T extends BaseSchema | BaseSchemaAsync, E extends Env, P extends string> = (
+type Hook<T extends GenericSchema | GenericSchemaAsync, E extends Env, P extends string> = (
   result: SafeParseResult<T>,
   c: Context<E, P>
 ) => Response | Promise<Response> | void | Promise<Response | void>
@@ -11,12 +11,12 @@ type Hook<T extends BaseSchema | BaseSchemaAsync, E extends Env, P extends strin
 type HasUndefined<T> = undefined extends T ? true : false
 
 export const vValidator = <
-  T extends BaseSchema | BaseSchemaAsync,
+  T extends GenericSchema | GenericSchemaAsync,
   Target extends keyof ValidationTargets,
   E extends Env,
   P extends string,
-  In = Input<T>,
-  Out = Output<T>,
+  In = InferInput<T>,
+  Out = InferOutput<T>,
   I extends HonoInput = {
     in: HasUndefined<In> extends true
       ? {
@@ -56,6 +56,6 @@ export const vValidator = <
       return c.json(result, 400)
     }
 
-    const data = result.output as Output<T>
+    const data = result.output as InferOutput<T>
     return data
   })
diff --git a/packages/valibot-validator/test/index.test.ts b/packages/valibot-validator/test/index.test.ts
index fd719c4a..7c1b94ca 100644
--- a/packages/valibot-validator/test/index.test.ts
+++ b/packages/valibot-validator/test/index.test.ts
@@ -1,6 +1,6 @@
 import { Hono } from 'hono'
 import type { Equal, Expect } from 'hono/utils/types'
-import { number, object, string, optional, numberAsync, objectAsync, stringAsync, optionalAsync } from 'valibot'
+import { number, object, objectAsync, optional, optionalAsync, string } from 'valibot'
 import { vValidator } from '../src'
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -167,14 +167,14 @@ describe('Async', () => {
   const app = new Hono()
 
   const schemaAsync = objectAsync({
-    name: stringAsync(),
-    age: numberAsync(),
+    name: string(),
+    age: number(),
   })
 
   const querySchemaAsync = optionalAsync(
     objectAsync({
-      search: optionalAsync(stringAsync()),
-      page: optionalAsync(numberAsync()),
+      search: optionalAsync(string()),
+      page: optionalAsync(number()),
     })
   )
 
@@ -264,8 +264,8 @@ describe('With Hook Async', () => {
   const app = new Hono()
 
   const schemaAsync = objectAsync({
-    id: numberAsync(),
-    title: stringAsync(),
+    id: number(),
+    title: string(),
   })
 
   app.post(
diff --git a/yarn.lock b/yarn.lock
index fdb377f6..11ecc34b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2155,10 +2155,10 @@ __metadata:
     hono: "npm:^4.0.10"
     jest: "npm:^29.7.0"
     rimraf: "npm:^5.0.5"
-    valibot: "npm:^0.24.1"
+    valibot: "npm:^0.31.0"
   peerDependencies:
     hono: ">=3.9.0"
-    valibot: ">=0.13.1 <1"
+    valibot: ">=0.31.0 <1"
   languageName: unknown
   linkType: soft
 
@@ -18181,10 +18181,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"valibot@npm:^0.24.1":
-  version: 0.24.1
-  resolution: "valibot@npm:0.24.1"
-  checksum: 637c3641bc800506982ea507c55b65154653ea1f38bf3c7ad6c0fc3dd3bead4644e2172ddd8cade2821c280886dd9d99b36e7a778607cae7dfab107de74c5547
+"valibot@npm:^0.31.0":
+  version: 0.31.1
+  resolution: "valibot@npm:0.31.1"
+  checksum: 666abefeffe1b92e324bc1f35e9052929365d9646f324197d21a506ada07e605958853e04144996b698c866cc327be78138712a5b79e1dbe98caf52229b49fc0
   languageName: node
   linkType: hard