fix: zod4 compatibility with server package

packages/plugins/trpc/tests/projects/nuxt-trpc-v10/package.json

@@ -17,7 +17,7 @@
         "trpc-nuxt": "^0.10.22",
         "vue": "latest",
         "vue-router": "latest",
-        "zod": "^3.25.0"
+        "zod": "^4.0.0"
     },
     "devDependencies": {
         "esbuild": "^0.24.0",

packages/plugins/trpc/tests/projects/nuxt-trpc-v11/package.json

@@ -17,7 +17,7 @@
         "trpc-nuxt": "^0.11.0-beta.1",
         "vue": "latest",
         "vue-router": "latest",
-        "zod": "^3.25.0"
+        "zod": "^4.0.0"
     },
     "devDependencies": {
         "esbuild": "^0.24.0",

packages/plugins/trpc/tests/projects/t3-trpc-v11/package.json

@@ -28,7 +28,7 @@
         "react-dom": "^18.3.1",
         "server-only": "^0.0.1",
         "superjson": "^2.2.1",
-        "zod": "^3.25.0"
+        "zod": "^4.0.0"
     },
     "devDependencies": {
         "@types/eslint": "^8.56.10",

packages/runtime/package.json

@@ -112,15 +112,6 @@
         "uuid": "^9.0.0",
         "zod-validation-error": "catalog:"
     },
-    "peerDependencies": {
-        "@prisma/client": "5.0.0 - 6.15.x",
-        "zod": "catalog:"
-    },
-    "author": {
-        "name": "ZenStack Team"
-    },
-    "homepage": "https://zenstack.dev",
-    "license": "MIT",
     "devDependencies": {
         "@types/bcryptjs": "^2.4.2",
         "@types/pluralize": "^0.0.29",
@@ -129,6 +120,16 @@
         "@types/uuid": "^8.3.4",
         "decimal.js-light": "^2.5.1",
         "superjson": "^1.13.0",
-        "uuid": "^9.0.0"
-    }
+        "uuid": "^9.0.0",
+        "zod": "^4.0.0"
+    },
+    "peerDependencies": {
+        "@prisma/client": "5.0.0 - 6.15.x",
+        "zod": "catalog:"
+    },
+    "author": {
+        "name": "ZenStack Team"
+    },
+    "homepage": "https://zenstack.dev",
+    "license": "MIT"
 }

packages/runtime/src/enhancements/node/policy/handler.ts

@@ -1262,7 +1262,7 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
             {}
         );
 
-        const validatedData = this.policyUtils.validateZodSchema(model, 'update', literalData, false, (err) => {
+        const validatedData: any = this.policyUtils.validateZodSchema(model, 'update', literalData, false, (err) => {
             throw this.policyUtils.deniedByPolicy(
                 model,
                 'update',

packages/runtime/src/zod-utils.ts

@@ -121,5 +121,14 @@ function countUnrecognizedKeys(issues: Z.ZodIssue[]) {
 }
 
 function unwrapLazy<T extends Z.ZodSchema>(z: typeof Z, schema: T | Z.ZodLazy<T>): T {
-    return schema instanceof z.ZodLazy ? schema.schema : schema;
+    if (!(schema instanceof z.ZodLazy)) {
+        return schema;
+    }
+    if ('unwrap' in schema && typeof schema.unwrap === 'function') {
+        return schema.unwrap();
+    } else if ('schema' in schema) {
+        return schema.schema as T;
+    } else {
+        throw new Error('Unable to determine how to unwrap a lazy schema with this zod version.');
+    }
 }

packages/schema/src/plugins/zod/generator.ts

@@ -222,7 +222,15 @@ export class ZodSchemaGenerator {
                 path.join(output, 'common', 'index.ts'),
                 `
     import { z } from 'zod';
-    export const DecimalSchema = z.union([z.number(), z.string(), z.object({d: z.number().array(), e: z.number(), s: z.number()}).passthrough()]);
+    export const DecimalSchema = z.any().refine((val) => {
+        if (typeof val === 'string' || typeof val === 'number') {
+            return val;
+        }
+        // Decimal.js shape
+        if (typeof val === 'object' && val && Array.isArray(val.d) && typeof val.e === 'number' && typeof val.s === 'number') {
+            return val;
+        }
+    });
     `,
                 { overwrite: true }
             )
@@ -553,7 +561,7 @@ export const ${upperCaseFirst(model.name)}PrismaCreateSchema = ${prismaCreateSch
                     .map((field) => {
                         let fieldSchema = makeFieldSchema(field, false);
                         if (field.type.type === 'Int' || field.type.type === 'Float') {
-                            fieldSchema = `z.union([${fieldSchema}, z.record(z.unknown())])`;
+                            fieldSchema = `z.union([${fieldSchema}, z.record(z.string(), z.unknown())])`;
                         }
                         return `\t${field.name}: ${fieldSchema}`;
                     })

packages/schema/src/plugins/zod/transformer.ts

@@ -486,7 +486,7 @@ export const ${this.name}ObjectSchema: SchemaType = ${schema} as SchemaType;`;
             jsonSchemaImplementation += `\n`;
             jsonSchemaImplementation += `const literalSchema = z.union([z.string(), z.number(), z.boolean()]);\n`;
             jsonSchemaImplementation += `const jsonSchema: z.ZodType<Prisma.InputJsonValue> = z.lazy(() =>\n`;
-            jsonSchemaImplementation += `  z.union([literalSchema, z.array(jsonSchema.nullable()), z.record(jsonSchema.nullable())])\n`;
+            jsonSchemaImplementation += `  z.union([literalSchema, z.array(jsonSchema.nullable()), z.record(z.string(), jsonSchema.nullable())])\n`;
             jsonSchemaImplementation += `);\n\n`;
         }
 

packages/schema/src/plugins/zod/utils/schema-gen.ts

@@ -20,7 +20,9 @@ export function makeFieldSchema(field: DataModelField | TypeDefField, addDefault
             // array field is always optional
             return `z.array(z.unknown()).optional()`;
         } else {
-            return field.type.optional ? `z.record(z.unknown()).optional()` : `z.record(z.unknown())`;
+            return field.type.optional
+                ? `z.record(z.string(), z.unknown()).optional()`
+                : `z.record(z.string(), z.unknown())`;
         }
     }
 

packages/server/package.json

@@ -31,7 +31,6 @@
         "superjson": "^1.13.0",
         "ts-japi": "^1.10.1",
         "url-pattern": "^1.0.3",
-        "zod-validation-error": "catalog:",
         "decimal.js": "^10.4.2"
     },
     "peerDependencies": {
@@ -57,7 +56,8 @@
         "next": "14.2.4",
         "nuxt": "^3.7.4",
         "reflect-metadata": "^0.2.2",
-        "supertest": "^6.3.3"
+        "supertest": "^6.3.3",
+        "zod": "^4.0.0"
     },
     "exports": {
         "./package.json": "./package.json",

packages/server/src/api/rest/index.ts

@@ -201,6 +201,7 @@ class RequestHandler extends APIHandlerBase {
                 attributes: z.object({}).passthrough().optional(),
                 relationships: z
                     .record(
+                        z.string(),
                         z.object({
                             data: z.union([
                                 z.object({ type: z.string(), id: z.union([z.string(), z.number()]) }),
@@ -1973,7 +1974,7 @@ class RequestHandler extends APIHandlerBase {
         detail?: string,
         status?: number,
         reason?: string,
-        zodErrors?: ZodError
+        zodErrors?: ZodError<any>
     ) {
         const error: any = {
             status: status ?? this.errors[code].status,

packages/server/src/api/rpc/index.ts

@@ -7,10 +7,9 @@ import {
     isPrismaClientUnknownRequestError,
     isPrismaClientValidationError,
 } from '@zenstackhq/runtime';
-import { upperCaseFirst } from '@zenstackhq/runtime/local-helpers';
+import { upperCaseFirst, getZodErrorMessage } from '@zenstackhq/runtime/local-helpers';
 import SuperJSON from 'superjson';
 import { ZodError } from 'zod';
-import { fromZodError } from 'zod-validation-error/v3';
 import { Response } from '../../types';
 import { APIHandlerBase, RequestContext } from '../base';
 import { logError, registerCustomSerializers } from '../utils';
@@ -202,7 +201,8 @@ class RequestHandler extends APIHandlerBase {
         }
     }
 
-    private makeError(message: string, reason?: string, zodErrors?: ZodError) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    private makeError(message: string, reason?: string, zodErrors?: ZodError<any>) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const error: any = { message, reason };
         if (reason === CrudFailureReason.ACCESS_POLICY_VIOLATION || reason === CrudFailureReason.RESULT_NOT_READABLE) {
@@ -251,7 +251,7 @@ class RequestHandler extends APIHandlerBase {
             } else {
                 return {
                     data: undefined,
-                    error: fromZodError(parseResult.error).message,
+                    error: getZodErrorMessage(parseResult.error),
                     zodErrors: parseResult.error,
                 };
             }

script/test-scaffold.ts

@@ -20,7 +20,7 @@ function run(cmd: string) {
 
 run('npm init -y');
 run(
-    'npm i --no-audit --no-fund typescript@~5.8.0 [email protected] @prisma/[email protected] zod@^3.25.0 decimal.js @types/node'
+    'npm i --no-audit --no-fund typescript@~5.8.0 [email protected] @prisma/[email protected] zod@^4.0.0 decimal.js @types/node'
 );
 
 console.log('Test scaffold setup complete.');

tests/integration/test-run/package.json

@@ -16,6 +16,6 @@
         "react": "^18.2.0",
         "swr": "^1.3.0",
         "zenstack": "file:../../../packages/schema/dist",
-        "zod": "^3.25.0"
+        "zod": "^4.0.0"
     }
 }

tests/integration/tests/enhancements/with-password/with-password.test.ts

@@ -94,7 +94,7 @@ describe('Password test', () => {
                     password: 'abc456789',
                 },
             })
-        ).toBeRejectedByPolicy(['String must contain at most 8 character(s) at "password"']);
+        ).toBeRejectedByPolicy(['8 character']);
 
         await expect(
             db.user.create({
@@ -103,7 +103,7 @@ describe('Password test', () => {
                     password: 'abc456789',
                 },
             })
-        ).toBeRejectedByPolicy(['String must contain at most 8 character(s) at "password"']);
+        ).toBeRejectedByPolicy(['8 character']);
 
         await expect(
             db.user.create({