refactor: upgrade to Zod 4

also updates Hono Zod related deps
This commit is contained in:
2025-12-19 05:39:26 -05:00
parent 734ce25aa2
commit 3a821a2c98
12 changed files with 58 additions and 64 deletions

View File

@@ -17,8 +17,8 @@
}, },
"dependencies": { "dependencies": {
"@hono/swagger-ui": "^0.5.1", "@hono/swagger-ui": "^0.5.1",
"@hono/zod-openapi": "^0.19.5", "@hono/zod-openapi": "^1.1.6",
"@hono/zod-validator": "^0.2.2", "@hono/zod-validator": "^0.7.6",
"drizzle-orm": "^0.44.7", "drizzle-orm": "^0.44.7",
"gql.tada": "^1.8.10", "gql.tada": "^1.8.10",
"graphql": "^16.12.0", "graphql": "^16.12.0",
@@ -27,7 +27,7 @@
"jose": "^5.10.0", "jose": "^5.10.0",
"lodash.mapkeys": "^4.6.0", "lodash.mapkeys": "^4.6.0",
"luxon": "^3.6.1", "luxon": "^3.6.1",
"zod": "^3.24.3" "zod": "^4.2.1"
}, },
"devDependencies": { "devDependencies": {
"@cloudflare/vitest-pool-workers": "^0.10.15", "@cloudflare/vitest-pool-workers": "^0.10.15",

66
pnpm-lock.yaml generated
View File

@@ -11,11 +11,11 @@ importers:
specifier: ^0.5.1 specifier: ^0.5.1
version: 0.5.2(hono@4.10.8) version: 0.5.2(hono@4.10.8)
"@hono/zod-openapi": "@hono/zod-openapi":
specifier: ^0.19.5 specifier: ^1.1.6
version: 0.19.10(hono@4.10.8)(zod@3.25.76) version: 1.1.6(hono@4.10.8)(zod@4.2.1)
"@hono/zod-validator": "@hono/zod-validator":
specifier: ^0.2.2 specifier: ^0.7.6
version: 0.2.2(hono@4.10.8)(zod@3.25.76) version: 0.7.6(hono@4.10.8)(zod@4.2.1)
drizzle-orm: drizzle-orm:
specifier: ^0.44.7 specifier: ^0.44.7
version: 0.44.7 version: 0.44.7
@@ -41,8 +41,8 @@ importers:
specifier: ^3.6.1 specifier: ^3.6.1
version: 3.7.2 version: 3.7.2
zod: zod:
specifier: ^3.24.3 specifier: ^4.2.1
version: 3.25.76 version: 4.2.1
devDependencies: devDependencies:
"@cloudflare/vitest-pool-workers": "@cloudflare/vitest-pool-workers":
specifier: ^0.10.15 specifier: ^0.10.15
@@ -138,13 +138,13 @@ packages:
graphql: ^15.5.0 || ^16.0.0 || ^17.0.0 graphql: ^15.5.0 || ^16.0.0 || ^17.0.0
typescript: ^5.0.0 typescript: ^5.0.0
"@asteasolutions/zod-to-openapi@7.3.4": "@asteasolutions/zod-to-openapi@8.2.0":
resolution: resolution:
{ {
integrity: sha512-/2rThQ5zPi9OzVwes6U7lK1+Yvug0iXu25olp7S0XsYmOqnyMfxH7gdSQjn/+DSOHRg7wnotwGJSyL+fBKdnEA==, integrity: sha512-u05zNUirlukJAf9oEHmxSF31L1XQhz9XdpVILt7+xhrz65oQqBpiOWFkGvRWL0IpjOUJ878idKoNmYPxrFnkeg==,
} }
peerDependencies: peerDependencies:
zod: ^3.20.2 zod: ^4.0.0
"@babel/code-frame@7.27.1": "@babel/code-frame@7.27.1":
resolution: resolution:
@@ -1411,29 +1411,20 @@ packages:
peerDependencies: peerDependencies:
hono: "*" hono: "*"
"@hono/zod-openapi@0.19.10": "@hono/zod-openapi@1.1.6":
resolution: resolution:
{ {
integrity: sha512-dpoS6DenvoJyvxtQ7Kd633FRZ/Qf74+4+o9s+zZI8pEqnbjdF/DtxIib08WDpCaWabMEJOL5TXpMgNEZvb7hpA==, integrity: sha512-wEdG1MlCWAnngRVPKZJ/dv5P/b5UL3di/+SLX0Cuuc8hJ6Gf8L3vDMXcXywSYAwxK8iiatF7HoTxJ96gtckLpQ==,
} }
engines: { node: ">=16.0.0" } engines: { node: ">=16.0.0" }
peerDependencies: peerDependencies:
hono: ">=4.3.6" hono: ">=4.3.6"
zod: ">=3.0.0" zod: ^4.0.0
"@hono/zod-validator@0.2.2": "@hono/zod-validator@0.7.6":
resolution: resolution:
{ {
integrity: sha512-dSDxaPV70Py8wuIU2QNpoVEIOSzSXZ/6/B/h4xA7eOMz7+AarKTSGV8E6QwrdcCbBLkpqfJ4Q2TmBO0eP1tCBQ==, integrity: sha512-Io1B6d011Gj1KknV4rXYz4le5+5EubcWEU/speUjuw9XMMIaP3n78yXLhjd2A3PXaXaUwEAluOiAyLqhBEJgsw==,
}
peerDependencies:
hono: ">=3.9.0"
zod: ^3.19.1
"@hono/zod-validator@0.7.5":
resolution:
{
integrity: sha512-n4l4hutkfYU07PzRUHBOVzUEn38VSfrh+UVE5d0w4lyfWDOEhzxIupqo5iakRiJL44c3vTuFJBvcmUl8b9agIA==,
} }
peerDependencies: peerDependencies:
hono: ">=3.9.0" hono: ">=3.9.0"
@@ -4137,6 +4128,12 @@ packages:
integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==, integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==,
} }
zod@4.2.1:
resolution:
{
integrity: sha512-0wZ1IRqGGhMP76gLqz8EyfBXKk0J2qo2+H3fi4mcUP/KtTocoX08nmIAHl1Z2kJIZbZee8KOpBCSNPRgauucjw==,
}
zx@8.1.5: zx@8.1.5:
resolution: resolution:
{ {
@@ -4156,10 +4153,10 @@ snapshots:
graphql: 16.12.0 graphql: 16.12.0
typescript: 5.9.3 typescript: 5.9.3
"@asteasolutions/zod-to-openapi@7.3.4(zod@3.25.76)": "@asteasolutions/zod-to-openapi@8.2.0(zod@4.2.1)":
dependencies: dependencies:
openapi3-ts: 4.5.0 openapi3-ts: 4.5.0
zod: 3.25.76 zod: 4.2.1
"@babel/code-frame@7.27.1": "@babel/code-frame@7.27.1":
dependencies: dependencies:
@@ -4705,23 +4702,18 @@ snapshots:
dependencies: dependencies:
hono: 4.10.8 hono: 4.10.8
"@hono/zod-openapi@0.19.10(hono@4.10.8)(zod@3.25.76)": "@hono/zod-openapi@1.1.6(hono@4.10.8)(zod@4.2.1)":
dependencies: dependencies:
"@asteasolutions/zod-to-openapi": 7.3.4(zod@3.25.76) "@asteasolutions/zod-to-openapi": 8.2.0(zod@4.2.1)
"@hono/zod-validator": 0.7.5(hono@4.10.8)(zod@3.25.76) "@hono/zod-validator": 0.7.6(hono@4.10.8)(zod@4.2.1)
hono: 4.10.8 hono: 4.10.8
openapi3-ts: 4.5.0 openapi3-ts: 4.5.0
zod: 3.25.76 zod: 4.2.1
"@hono/zod-validator@0.2.2(hono@4.10.8)(zod@3.25.76)": "@hono/zod-validator@0.7.6(hono@4.10.8)(zod@4.2.1)":
dependencies: dependencies:
hono: 4.10.8 hono: 4.10.8
zod: 3.25.76 zod: 4.2.1
"@hono/zod-validator@0.7.5(hono@4.10.8)(zod@3.25.76)":
dependencies:
hono: 4.10.8
zod: 3.25.76
"@img/sharp-darwin-arm64@0.33.5": "@img/sharp-darwin-arm64@0.33.5":
optionalDependencies: optionalDependencies:
@@ -6301,6 +6293,8 @@ snapshots:
zod@3.25.76: {} zod@3.25.76: {}
zod@4.2.1: {}
zx@8.1.5: zx@8.1.5:
optionalDependencies: optionalDependencies:
"@types/fs-extra": 11.0.4 "@types/fs-extra": 11.0.4

View File

@@ -20,8 +20,8 @@ const UserSchema = z.object({
}), }),
statistics: z.object({ statistics: z.object({
minutesWatched: z.number().openapi({ type: "integer", format: "int64" }), minutesWatched: z.number().openapi({ type: "integer", format: "int64" }),
episodesWatched: z.number().int(), episodesWatched: z.int(),
count: z.number().int(), count: z.int(),
meanScore: z.number().openapi({ type: "number", format: "float" }), meanScore: z.number().openapi({ type: "number", format: "float" }),
}), }),
}); });

View File

@@ -23,8 +23,8 @@ const route = createRoute({
path: "/", path: "/",
request: { request: {
query: z.object({ query: z.object({
limit: z limit: z.coerce
.number({ coerce: true }) .number()
.int() .int()
.default(10) .default(10)
.describe("The number of titles to return"), .describe("The number of titles to return"),

View File

@@ -22,12 +22,12 @@ const route = createRoute({
path: "/{category}", path: "/{category}",
request: { request: {
query: z.object({ query: z.object({
limit: z limit: z.coerce
.number({ coerce: true }) .number()
.int() .int()
.default(10) .prefault(10)
.describe("The number of titles to return"), .describe("The number of titles to return"),
page: z.number({ coerce: true }).int().min(1).default(1), page: z.coerce.number().int().min(1).prefault(1),
}), }),
params: z.object({ category: PopularCategory }), params: z.object({ category: PopularCategory }),
}, },

View File

@@ -17,8 +17,8 @@ const route = createRoute({
request: { request: {
query: z.object({ query: z.object({
query: z.string(), query: z.string(),
page: z.number({ coerce: true }).int().min(1).default(1), page: z.coerce.number().int().min(1).prefault(1),
limit: z.number({ coerce: true }).int().default(10), limit: z.coerce.number().int().prefault(10),
}), }),
}, },
responses: { responses: {

View File

@@ -24,9 +24,9 @@ import type { Title } from "~/types/title";
const nextAiringEpisodeSchema = z.nullable( const nextAiringEpisodeSchema = z.nullable(
z.object({ z.object({
episode: z.number().int(), episode: z.int(),
airingAt: z.number().int(), airingAt: z.int(),
timeUntilAiring: z.number().int(), timeUntilAiring: z.int(),
}), }),
); );

View File

@@ -9,7 +9,7 @@ export const FetchUrlResponseSchema = z.object({
audio: z.array(z.object({ url: z.string(), lang: z.string() })), audio: z.array(z.object({ url: z.string(), lang: z.string() })),
intro: SkippableSchema, intro: SkippableSchema,
outro: SkippableSchema, outro: SkippableSchema,
headers: z.record(z.string()).optional(), headers: z.record(z.string(), z.string()).optional(),
}); });
export type FetchUrlResponse = z.infer<typeof FetchUrlResponse> & { export type FetchUrlResponse = z.infer<typeof FetchUrlResponse> & {

View File

@@ -9,8 +9,8 @@ export const Episode = z.object({
title: z.string().nullish(), title: z.string().nullish(),
img: z.string().nullish(), img: z.string().nullish(),
description: z.string().nullish(), description: z.string().nullish(),
rating: z.number().int().nullish(), rating: z.int().nullish(),
updatedAt: z.number().int().default(0).openapi({ format: "int64" }), updatedAt: z.int().prefault(0).openapi({ format: "int64" }),
}); });
export type EpisodesResponse = z.infer<typeof EpisodesResponse>; export type EpisodesResponse = z.infer<typeof EpisodesResponse>;

View File

@@ -24,9 +24,9 @@ export const ErrorResponseSchema = z.object({
success: z.literal(false).openapi({ type: "boolean" }), success: z.literal(false).openapi({ type: "boolean" }),
}); });
export const NullableNumberSchema = z.number().int().nullable(); export const NullableNumberSchema = z.int().nullable();
export const AniListIdSchema = z.number().int().openapi({ format: "int64" }); export const AniListIdSchema = z.int().openapi({ format: "int64" });
export const AniListIdQuerySchema = z export const AniListIdQuerySchema = z
.string() .string()
.openapi({ type: "integer", format: "int64" }); .openapi({ type: "integer", format: "int64" });

View File

@@ -8,17 +8,17 @@ export type Title = z.infer<typeof Title>;
export const Title = z.object({ export const Title = z.object({
nextAiringEpisode: z.nullable( nextAiringEpisode: z.nullable(
z.object({ z.object({
episode: z.number().int(), episode: z.int(),
airingAt: z.number().int().openapi({ format: "int64" }), airingAt: z.int().openapi({ format: "int64" }),
timeUntilAiring: z.number().int().openapi({ format: "int64" }), timeUntilAiring: z.int().openapi({ format: "int64" }),
}), }),
), ),
mediaListEntry: z.nullable( mediaListEntry: z.nullable(
z.object({ z.object({
status: z.nullable(WatchStatus), status: z.nullable(WatchStatus),
progress: NullableNumberSchema, progress: NullableNumberSchema,
id: z.number().int(), id: z.int(),
updatedAt: z.number().int().openapi({ format: "int64" }).optional(), updatedAt: z.int().openapi({ format: "int64" }).optional(),
}), }),
), ),
countryOfOrigin: countryCodeSchema, countryOfOrigin: countryCodeSchema,
@@ -50,5 +50,5 @@ export const Title = z.object({
}), }),
), ),
idMal: NullableNumberSchema, idMal: NullableNumberSchema,
id: z.number().int().openapi({ format: "int64" }), id: z.int().openapi({ format: "int64" }),
}); });

View File

@@ -14,7 +14,7 @@ export const UserProfile = z.object({
statistics: z.object({ statistics: z.object({
minutesWatched: z.number().openapi({ type: "integer", format: "int64" }), minutesWatched: z.number().openapi({ type: "integer", format: "int64" }),
episodesWatched: z.number().openapi({ type: "integer", format: "int64" }), episodesWatched: z.number().openapi({ type: "integer", format: "int64" }),
count: z.number().int(), count: z.int(),
meanScore: z.number().openapi({ type: "number", format: "float" }), meanScore: z.number().openapi({ type: "number", format: "float" }),
}), }),
id: z.number().openapi({ type: "integer", format: "int64" }), id: z.number().openapi({ type: "integer", format: "int64" }),