Migrate from zod mini to zod

Author: aleclarson

readme.md

@@ -1,6 +1,6 @@
 # rouzer
 
-Type-safe routes shared by your server and client, powered by `zod/mini` (input validation + transforms), `@remix-run/route-pattern` (URL matching), and `alien-middleware` (typed middleware chaining). The router output is intended to be used with `@hattip/core` adapters.
+Type-safe routes shared by your server and client, powered by `zod` (input validation + transforms), `@remix-run/route-pattern` (URL matching), and `alien-middleware` (typed middleware chaining). The router output is intended to be used with `@hattip/core` adapters.
 
 ## Install
 
@@ -14,7 +14,7 @@ Everything is imported directly from `rouzer`.
 
 ```ts
 // routes.ts
-import * as z from 'zod/mini'
+import * as z from 'zod'
 import { $type, route } from 'rouzer'
 
 export const helloRoute = route('hello/:name', {
@@ -171,6 +171,6 @@ const pingText = await pingResponse.text()
 
 ## Add an endpoint
 
-1. Declare it in `routes.ts` with `route(…)` and `zod/mini` schemas.
+1. Declare it in `routes.ts` with `route(…)` and `zod` schemas.
 2. Implement the handler in your router assembly with `createRouter(…).use(routes, { … })`.
 3. Call it from the client with the generated helper via `client.json` or `client.request`.

src/server/router.ts

@@ -8,7 +8,7 @@ import {
   MiddlewareTypes,
   RequestContext,
 } from 'alien-middleware'
-import * as z from 'zod/mini'
+import * as z from 'zod'
 import { mapValues } from '../common.js'
 import type { Routes, RouteSchemaMap } from '../types.js'
 import type { RouteRequestHandlerMap } from './types.js'
@@ -276,7 +276,7 @@ function httpClientError(
 
 function parsePathParams(
   context: AdapterRequestContext & { path?: {} },
-  schema: z.ZodMiniType<any, any>,
+  schema: z.ZodType<any, any>,
   params: {}
 ) {
   const result = schema.safeParse(params)
@@ -289,7 +289,7 @@ function parsePathParams(
 
 function parseHeaders(
   context: AdapterRequestContext & { headers?: {} },
-  schema: z.ZodMiniType<any, any>
+  schema: z.ZodType<any, any>
 ) {
   const headers = Object.fromEntries(context.request.headers as any)
   const result = schema.safeParse(headers)
@@ -302,7 +302,7 @@ function parseHeaders(
 
 function parseQueryString(
   context: AdapterRequestContext & { url?: URL; query?: {} },
-  schema: z.ZodMiniType<any, any>
+  schema: z.ZodType<any, any>
 ) {
   const result = schema.safeParse(
     Object.fromEntries(context.url!.searchParams as any)
@@ -316,7 +316,7 @@ function parseQueryString(
 
 async function parseRequestBody(
   context: AdapterRequestContext & { body?: {} },
-  schema: z.ZodMiniType<any, any>
+  schema: z.ZodType<any, any>
 ) {
   const result = await context.request.json().then(
     body => schema.safeParse(body),
@@ -329,39 +329,36 @@ async function parseRequestBody(
   return null
 }
 
-const seen = new WeakMap<z.ZodMiniType<any, any>, z.ZodMiniType<any, any>>()
+const seen = new WeakMap<z.ZodType<any, any>, z.ZodType<any, any>>()
 
 /**
  * Traverse object and array schemas, finding schemas that expect a number or
  * boolean, and replace those schemas with a new schema that parses the input
  * value as a number or boolean.
  */
-function enableStringParsing(schema: z.ZodMiniType): typeof schema {
+function enableStringParsing(schema: z.ZodType): typeof schema {
   if (schema.type === 'optional') {
-    const { def } = schema as z.ZodMiniOptional<z.ZodMiniType>
+    const { def } = schema as z.ZodOptional<z.ZodType>
     return z.optional(enableStringParsing(def.innerType))
   }
   if (schema.type === 'number') {
-    return z.pipe(z.transform(Number), schema as z.ZodMiniNumber<number>)
+    return z.pipe(z.transform(Number), schema as z.ZodNumber)
   }
   if (schema.type === 'boolean') {
-    return z.pipe(
-      z.transform(toBooleanStrict),
-      schema as z.ZodMiniBoolean<boolean>
-    )
+    return z.pipe(z.transform(toBooleanStrict), schema as z.ZodBoolean)
   }
   if (schema.type === 'object') {
     const cachedSchema = seen.get(schema)
     if (cachedSchema) {
       return cachedSchema
     }
-    const { def } = schema as z.ZodMiniObject<Record<string, z.ZodMiniType>>
+    const { def } = schema as z.ZodObject<Record<string, z.ZodType>>
     const newSchema = z.object(mapValues(def.shape, enableStringParsing))
     seen.set(schema, newSchema)
     return newSchema
   }
   if (schema.type === 'array') {
-    const { def } = schema as z.ZodMiniArray<z.ZodMiniType>
+    const { def } = schema as z.ZodArray<z.ZodType>
     return z.array(enableStringParsing(def.element))
   }
   return schema

src/server/types.ts

@@ -4,7 +4,7 @@ import type {
   MiddlewareChain,
   MiddlewareContext,
 } from 'alien-middleware'
-import type * as z from 'zod/mini'
+import type * as z from 'zod'
 import { Promisable } from '../common.js'
 import type { InferRouteResponse, Routes, RouteSchema } from '../types.js'
 

src/types.ts

@@ -1,22 +1,22 @@
 import { Params, RoutePattern } from '@remix-run/route-pattern'
-import * as z from 'zod/mini'
+import * as z from 'zod'
 import { Unchecked } from './common.js'
 
 export type { Unchecked }
 
 export type QueryRouteSchema = {
-  path?: z.ZodMiniObject<any>
-  query?: z.ZodMiniObject<any>
+  path?: z.ZodObject<any>
+  query?: z.ZodObject<any>
   body?: never
-  headers?: z.ZodMiniObject<any>
+  headers?: z.ZodObject<any>
   response?: Unchecked<any>
 }
 
 export type MutationRouteSchema = {
-  path?: z.ZodMiniObject<any>
+  path?: z.ZodObject<any>
   query?: never
-  body?: z.ZodMiniType<any, any>
-  headers?: z.ZodMiniObject<any>
+  body?: z.ZodType<any, any>
+  headers?: z.ZodObject<any>
   response?: Unchecked<any>
 }
 
@@ -27,10 +27,10 @@ export type RouteSchemaMap = {
   PATCH?: MutationRouteSchema
   DELETE?: MutationRouteSchema
   ALL?: {
-    path?: z.ZodMiniObject<any>
-    query?: z.ZodMiniObject<any>
+    path?: z.ZodObject<any>
+    query?: z.ZodObject<any>
     body?: never
-    headers?: z.ZodMiniObject<any>
+    headers?: z.ZodObject<any>
     response?: never
   }
 }

test/fixtures/client-validation/routes.ts

@@ -1,5 +1,5 @@
 import { route } from 'rouzer'
-import * as z from 'zod/mini'
+import * as z from 'zod'
 
 export const queryRoute = route('query', {
   GET: {

test/fixtures/client-validation/test.ts

@@ -13,7 +13,7 @@ export default {
 
     await expect(queryClient.queryRoute.GET({ query: { q: 'x' } })).rejects
       .toMatchInlineSnapshot(`
-      [$ZodError: [
+      [ZodError: [
         {
           "origin": "string",
           "code": "too_small",
@@ -22,7 +22,7 @@ export default {
           "path": [
             "q"
           ],
-          "message": "Invalid input"
+          "message": "Too small: expected string to have >=2 characters"
         }
       ]]
     `)
@@ -37,7 +37,7 @@ export default {
 
     await expect(bodyClient.bodyRoute.POST({ body: { count: -1 } })).rejects
       .toMatchInlineSnapshot(`
-      [$ZodError: [
+      [ZodError: [
         {
           "origin": "number",
           "code": "too_small",
@@ -46,7 +46,7 @@ export default {
           "path": [
             "count"
           ],
-          "message": "Invalid input"
+          "message": "Too small: expected number to be >0"
         }
       ]]
     `)

test/fixtures/coercion/routes.ts

@@ -1,5 +1,5 @@
 import { $type, route } from 'rouzer'
-import * as z from 'zod/mini'
+import * as z from 'zod'
 
 export const coercionRoute = route('coercion/:id', {
   GET: {

test/fixtures/server-validation/routes.ts

@@ -1,5 +1,5 @@
 import { $type, route } from 'rouzer'
-import * as z from 'zod/mini'
+import * as z from 'zod'
 
 export const validateRoute = route('validate/:id', {
   GET: {

test/infer-route-body.test-d.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod/mini'
+import * as z from 'zod'
 import type { InferRouteBody, InferRouteMethodBody } from 'rouzer'
 import { route } from 'rouzer'