fix(zod): align Json and TypeDef zod types with @zenstackhq/orm types

Fixes #2639 — `JsonValue` from `@zenstackhq/orm` was not assignable to
the union type previously inferred by the zod factory for Json fields.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: Azzerty23

packages/zod/package.json

@@ -50,6 +50,7 @@
         "@zenstackhq/tsdown-config": "workspace:*",
         "@zenstackhq/typescript-config": "workspace:*",
         "@zenstackhq/vitest-config": "workspace:*",
+        "@zenstackhq/orm": "workspace:*",
         "zod": "^4.1.0"
     },
     "peerDependencies": {

packages/zod/src/types.ts

@@ -1,3 +1,4 @@
+import type { TypeDefResult, JsonValue } from '@zenstackhq/orm';
 import type {
     FieldHasDefault,
     FieldIsArray,
@@ -132,16 +133,10 @@ type MapFieldTypeToZod<Schema extends SchemaDef, FieldType> = FieldType extends
     : FieldType extends GetEnums<Schema>
       ? EnumZodType<Schema, FieldType>
       : FieldType extends GetTypeDefs<Schema>
-        ? z.ZodObject<GetTypeDefFieldsShape<Schema, FieldType>, z.core.$strict>
+        ? z.ZodType<TypeDefResult<Schema, FieldType>>
         : z.ZodUnknown;
 
-type JsonZodType =
-    | z.ZodObject<Record<string, z.ZodType>, z.core.$loose>
-    | z.ZodArray<z.ZodType>
-    | z.ZodString
-    | z.ZodNumber
-    | z.ZodBoolean
-    | z.ZodNull;
+type JsonZodType = z.ZodType<JsonValue>;
 
 type EnumZodType<Schema extends SchemaDef, EnumName extends GetEnums<Schema>> = z.ZodEnum<{
     [Key in keyof GetEnum<Schema, EnumName>]: GetEnum<Schema, EnumName>[Key];

packages/zod/test/factory.test.ts

@@ -3,6 +3,8 @@ import { describe, expect, expectTypeOf, it } from 'vitest';
 import { createSchemaFactory } from '../src/index';
 import { schema } from './schema/schema';
 import z from 'zod';
+import type { User as ModelUser } from './schema/models';
+import type { JsonValue } from '@zenstackhq/orm';
 
 const factory = createSchemaFactory(schema);
 
@@ -69,9 +71,7 @@ describe('SchemaFactory - makeModelSchema', () => {
 
             // optional Json
             expectTypeOf<User>().toHaveProperty('metadata');
-            expectTypeOf<User['metadata']>().toEqualTypeOf<
-                string | number | boolean | null | Record<string, unknown> | unknown[] | undefined
-            >();
+            expectTypeOf<User['metadata']>().toEqualTypeOf<JsonValue | null | undefined>();
 
             // required enum
             expectTypeOf<User['status']>().toEqualTypeOf<'ACTIVE' | 'INACTIVE' | 'PENDING'>();
@@ -194,6 +194,22 @@ describe('SchemaFactory - makeModelSchema', () => {
             expect(userSchema.safeParse({ ...validUser, metadata: { key: 'value' } }).success).toBe(true);
             expect(userSchema.safeParse({ ...validUser, metadata: [1, 2, 3] }).success).toBe(true);
             expect(userSchema.safeParse({ ...validUser, metadata: 42 }).success).toBe(true);
+            expect(userSchema.safeParse({ ...validUser, metadata: null }).success).toBe(true);
+        });
+
+        it('infers zod type compatible with ORM model type (except optionality)', () => {
+            // ORM model results use `T | null` for optional fields; the Zod schema
+            // uses `T | null | undefined` to also accept missing fields in input
+            // objects. The useful property is that any ORM model value is valid
+            // input for the Zod schema.
+            const userSchema = factory.makeModelSchema('User');
+            type ZodUser = z.infer<typeof userSchema>;
+            expectTypeOf<ModelUser>().toExtend<ZodUser>();
+
+            // or with required
+            const _userSchemaRequired = userSchema.required();
+            type ZodUserRequired = z.infer<typeof _userSchemaRequired>;
+            expectTypeOf<ZodUserRequired>().toMatchTypeOf<ModelUser>();
         });
 
         it('rejects invalid Json values', () => {

packages/zod/test/schema/models.ts

@@ -0,0 +1,18 @@
+//////////////////////////////////////////////////////////////////////////////////////////////
+// DO NOT MODIFY THIS FILE                                                                  //
+// This file is automatically generated by ZenStack CLI and should not be manually updated. //
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+/* eslint-disable */
+
+import { schema as $schema, type SchemaType as $Schema } from "./schema";
+import type { ModelResult as $ModelResult, TypeDefResult as $TypeDefResult } from "@zenstackhq/orm";
+export type User = $ModelResult<$Schema, "User">;
+export type Post = $ModelResult<$Schema, "Post">;
+export type Product = $ModelResult<$Schema, "Product">;
+export type Asset = $ModelResult<$Schema, "Asset">;
+export type Video = $ModelResult<$Schema, "Video">;
+export type Image = $ModelResult<$Schema, "Image">;
+export type Address = $TypeDefResult<$Schema, "Address">;
+export const Status = $schema.enums.Status.values;
+export type Status = (typeof Status)[keyof typeof Status];