zod 4.1.8 → 4.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zod",
-  "version": "4.1.8",
+  "version": "4.1.10",
   "type": "module",
   "license": "MIT",
   "author": "Colin McDonnell <zod@colinhacks.com>",

package/src/v4/classic/schemas.ts

@@ -146,16 +146,14 @@ export const ZodType: core.$constructor<ZodType> = /*@__PURE__*/ core.$construct
   // base methods
   inst.check = (...checks) => {
     return inst.clone(
-      {
-        ...def,
+      util.mergeDefs(def, {
         checks: [
           ...(def.checks ?? []),
           ...checks.map((ch) =>
             typeof ch === "function" ? { _zod: { check: ch, def: { check: "custom" }, onattach: [] } } : ch
           ),
         ],
-      }
-      // { parent: true }
+      })
     );
   };
   inst.clone = (def, params) => core.clone(inst, def, params);
@@ -1196,7 +1194,10 @@ export const ZodObject: core.$constructor<ZodObject> = /*@__PURE__*/ core.$const
   core.$ZodObjectJIT.init(inst, def);
   ZodType.init(inst, def);
 
-  util.defineLazy(inst, "shape", () => def.shape);
+  util.defineLazy(inst, "shape", () => {
+    return def.shape;
+  });
+
   inst.keyof = () => _enum(Object.keys(inst._zod.def.shape)) as any;
   inst.catchall = (catchall) => inst.clone({ ...inst._zod.def, catchall: catchall as any as core.$ZodType }) as any;
   inst.passthrough = () => inst.clone({ ...inst._zod.def, catchall: unknown() });
@@ -1223,10 +1224,7 @@ export function object<T extends core.$ZodLooseShape = Partial<Record<never, cor
 ): ZodObject<util.Writeable<T>, core.$strip> {
   const def: core.$ZodObjectDef = {
     type: "object",
-    get shape() {
-      util.assignProp(this, "shape", shape ? util.objectClone(shape) : {});
-      return this.shape;
-    },
+    shape: shape!,
     ...util.normalizeParams(params),
   };
   return new ZodObject(def) as any;
@@ -1240,10 +1238,7 @@ export function strictObject<T extends core.$ZodLooseShape>(
 ): ZodObject<T, core.$strict> {
   return new ZodObject({
     type: "object",
-    get shape() {
-      util.assignProp(this, "shape", util.objectClone(shape));
-      return this.shape;
-    },
+    shape,
     catchall: never(),
     ...util.normalizeParams(params),
   }) as any;
@@ -1257,10 +1252,7 @@ export function looseObject<T extends core.$ZodLooseShape>(
 ): ZodObject<T, core.$loose> {
   return new ZodObject({
     type: "object",
-    get shape() {
-      util.assignProp(this, "shape", util.objectClone(shape));
-      return this.shape;
-    },
+    shape,
     catchall: unknown(),
     ...util.normalizeParams(params),
   }) as any;

package/src/v4/classic/tests/recursive-types.test.ts

@@ -537,3 +537,46 @@ export type RecursiveA = z.ZodUnion<
     }>,
   ]
 >;
+
+test("recursive type with `id` meta", () => {
+  const AType = z.object({
+    type: z.literal("a"),
+    name: z.string(),
+  });
+
+  const BType = z.object({
+    type: z.literal("b"),
+    name: z.string(),
+  });
+
+  const CType = z.object({
+    type: z.literal("c"),
+    name: z.string(),
+  });
+
+  const Schema = z.object({
+    type: z.literal("special").meta({ description: "Type" }),
+    config: z.object({
+      title: z.string().meta({ description: "Title" }),
+      get elements() {
+        return z.array(z.discriminatedUnion("type", [AType, BType, CType])).meta({
+          id: "SpecialElements",
+          title: "SpecialElements",
+          description: "Array of elements",
+        });
+      },
+    }),
+  });
+
+  Schema.parse({
+    type: "special",
+    config: {
+      title: "Special",
+      elements: [
+        { type: "a", name: "John" },
+        { type: "b", name: "Jane" },
+        { type: "c", name: "Jim" },
+      ],
+    },
+  });
+});

package/src/v4/core/schemas.ts

@@ -1739,7 +1739,7 @@ export interface $ZodObjectDef<Shape extends $ZodShape = $ZodShape> extends $Zod
 
 export interface $ZodObjectInternals<
   /** @ts-ignore Cast variance */
-  out Shape extends Readonly<$ZodShape> = Readonly<$ZodShape>,
+  out Shape extends $ZodShape = $ZodShape,
   out Config extends $ZodObjectConfig = $ZodObjectConfig,
 > extends _$ZodTypeInternals {
   def: $ZodObjectDef<Shape>;
@@ -1825,6 +1825,21 @@ function handleCatchall(
 export const $ZodObject: core.$constructor<$ZodObject> = /*@__PURE__*/ core.$constructor("$ZodObject", (inst, def) => {
   // requires cast because technically $ZodObject doesn't extend
   $ZodType.init(inst, def);
+  // const sh = def.shape;
+  const desc = Object.getOwnPropertyDescriptor(def, "shape");
+  if (!desc!.get) {
+    const sh = def.shape;
+    Object.defineProperty(def, "shape", {
+      get: () => {
+        const newSh = { ...sh };
+        Object.defineProperty(def, "shape", {
+          value: newSh,
+        });
+
+        return newSh;
+      },
+    });
+  }
 
   const _normalized = util.cached(() => normalizeDef(def));
 
@@ -1853,7 +1868,6 @@ export const $ZodObject: core.$constructor<$ZodObject> = /*@__PURE__*/ core.$con
       payload.issues.push({
         expected: "object",
         code: "invalid_type",
-
         input,
         inst,
       });

package/src/v4/core/versions.ts

@@ -1,5 +1,5 @@
 export const version = {
   major: 4,
   minor: 1,
-  patch: 8 as number,
+  patch: 10 as number,
 } as const;

package/src/v4/mini/schemas.ts

@@ -769,10 +769,7 @@ export function object<T extends core.$ZodLooseShape = Record<never, SomeType>>(
 ): ZodMiniObject<T, core.$strip> {
   const def: core.$ZodObjectDef = {
     type: "object",
-    get shape() {
-      util.assignProp(this, "shape", { ...shape });
-      return this.shape;
-    },
+    shape: shape!,
     ...util.normalizeParams(params),
   };
   return new ZodMiniObject(def) as any;
@@ -785,11 +782,7 @@ export function strictObject<T extends core.$ZodLooseShape>(
 ): ZodMiniObject<T, core.$strict> {
   return new ZodMiniObject({
     type: "object",
-    // shape: shape as core.$ZodLooseShape,
-    get shape() {
-      util.assignProp(this, "shape", { ...shape });
-      return this.shape;
-    },
+    shape,
     catchall: never(),
     ...util.normalizeParams(params),
   }) as any;
@@ -802,14 +795,7 @@ export function looseObject<T extends core.$ZodLooseShape>(
 ): ZodMiniObject<T, core.$loose> {
   return new ZodMiniObject({
     type: "object",
-    // shape: shape as core.$ZodLooseShape,
-    get shape() {
-      util.assignProp(this, "shape", { ...shape });
-      return this.shape;
-    },
-    // get optional() {
-    //   return util.optionalKeys(shape);
-    // },
+    shape,
     catchall: unknown(),
     ...util.normalizeParams(params),
   }) as any;

package/v4/classic/schemas.cjs

@@ -127,15 +127,12 @@ exports.ZodType = core.$constructor("ZodType", (inst, def) => {
     Object.defineProperty(inst, "_def", { value: def });
     // base methods
     inst.check = (...checks) => {
-        return inst.clone({
-            ...def,
+        return inst.clone(index_js_1.util.mergeDefs(def, {
             checks: [
                 ...(def.checks ?? []),
                 ...checks.map((ch) => typeof ch === "function" ? { _zod: { check: ch, def: { check: "custom" }, onattach: [] } } : ch),
             ],
-        }
-        // { parent: true }
-        );
+        }));
     };
     inst.clone = (def, params) => core.clone(inst, def, params);
     inst.brand = () => inst;
@@ -631,7 +628,9 @@ function keyof(schema) {
 exports.ZodObject = core.$constructor("ZodObject", (inst, def) => {
     core.$ZodObjectJIT.init(inst, def);
     exports.ZodType.init(inst, def);
-    index_js_1.util.defineLazy(inst, "shape", () => def.shape);
+    index_js_1.util.defineLazy(inst, "shape", () => {
+        return def.shape;
+    });
     inst.keyof = () => _enum(Object.keys(inst._zod.def.shape));
     inst.catchall = (catchall) => inst.clone({ ...inst._zod.def, catchall: catchall });
     inst.passthrough = () => inst.clone({ ...inst._zod.def, catchall: unknown() });
@@ -653,10 +652,7 @@ exports.ZodObject = core.$constructor("ZodObject", (inst, def) => {
 function object(shape, params) {
     const def = {
         type: "object",
-        get shape() {
-            index_js_1.util.assignProp(this, "shape", shape ? index_js_1.util.objectClone(shape) : {});
-            return this.shape;
-        },
+        shape: shape,
         ...index_js_1.util.normalizeParams(params),
     };
     return new exports.ZodObject(def);
@@ -665,10 +661,7 @@ function object(shape, params) {
 function strictObject(shape, params) {
     return new exports.ZodObject({
         type: "object",
-        get shape() {
-            index_js_1.util.assignProp(this, "shape", index_js_1.util.objectClone(shape));
-            return this.shape;
-        },
+        shape,
         catchall: never(),
         ...index_js_1.util.normalizeParams(params),
     });
@@ -677,10 +670,7 @@ function strictObject(shape, params) {
 function looseObject(shape, params) {
     return new exports.ZodObject({
         type: "object",
-        get shape() {
-            index_js_1.util.assignProp(this, "shape", index_js_1.util.objectClone(shape));
-            return this.shape;
-        },
+        shape,
         catchall: unknown(),
         ...index_js_1.util.normalizeParams(params),
     });

package/v4/classic/schemas.js

@@ -10,15 +10,12 @@ export const ZodType = /*@__PURE__*/ core.$constructor("ZodType", (inst, def) =>
     Object.defineProperty(inst, "_def", { value: def });
     // base methods
     inst.check = (...checks) => {
-        return inst.clone({
-            ...def,
+        return inst.clone(util.mergeDefs(def, {
             checks: [
                 ...(def.checks ?? []),
                 ...checks.map((ch) => typeof ch === "function" ? { _zod: { check: ch, def: { check: "custom" }, onattach: [] } } : ch),
             ],
-        }
-        // { parent: true }
-        );
+        }));
     };
     inst.clone = (def, params) => core.clone(inst, def, params);
     inst.brand = () => inst;
@@ -517,7 +514,9 @@ export function keyof(schema) {
 export const ZodObject = /*@__PURE__*/ core.$constructor("ZodObject", (inst, def) => {
     core.$ZodObjectJIT.init(inst, def);
     ZodType.init(inst, def);
-    util.defineLazy(inst, "shape", () => def.shape);
+    util.defineLazy(inst, "shape", () => {
+        return def.shape;
+    });
     inst.keyof = () => _enum(Object.keys(inst._zod.def.shape));
     inst.catchall = (catchall) => inst.clone({ ...inst._zod.def, catchall: catchall });
     inst.passthrough = () => inst.clone({ ...inst._zod.def, catchall: unknown() });
@@ -539,10 +538,7 @@ export const ZodObject = /*@__PURE__*/ core.$constructor("ZodObject", (inst, def
 export function object(shape, params) {
     const def = {
         type: "object",
-        get shape() {
-            util.assignProp(this, "shape", shape ? util.objectClone(shape) : {});
-            return this.shape;
-        },
+        shape: shape,
         ...util.normalizeParams(params),
     };
     return new ZodObject(def);
@@ -551,10 +547,7 @@ export function object(shape, params) {
 export function strictObject(shape, params) {
     return new ZodObject({
         type: "object",
-        get shape() {
-            util.assignProp(this, "shape", util.objectClone(shape));
-            return this.shape;
-        },
+        shape,
         catchall: never(),
         ...util.normalizeParams(params),
     });
@@ -563,10 +556,7 @@ export function strictObject(shape, params) {
 export function looseObject(shape, params) {
     return new ZodObject({
         type: "object",
-        get shape() {
-            util.assignProp(this, "shape", util.objectClone(shape));
-            return this.shape;
-        },
+        shape,
         catchall: unknown(),
         ...util.normalizeParams(params),
     });

package/v4/core/schemas.cjs

@@ -800,6 +800,20 @@ function handleCatchall(proms, input, payload, ctx, def, inst) {
 exports.$ZodObject = core.$constructor("$ZodObject", (inst, def) => {
     // requires cast because technically $ZodObject doesn't extend
     exports.$ZodType.init(inst, def);
+    // const sh = def.shape;
+    const desc = Object.getOwnPropertyDescriptor(def, "shape");
+    if (!desc.get) {
+        const sh = def.shape;
+        Object.defineProperty(def, "shape", {
+            get: () => {
+                const newSh = { ...sh };
+                Object.defineProperty(def, "shape", {
+                    value: newSh,
+                });
+                return newSh;
+            },
+        });
+    }
     const _normalized = util.cached(() => normalizeDef(def));
     util.defineLazy(inst._zod, "propValues", () => {
         const shape = def.shape;

package/v4/core/schemas.d.cts

@@ -584,7 +584,7 @@ export interface $ZodObjectDef<Shape extends $ZodShape = $ZodShape> extends $Zod
 }
 export interface $ZodObjectInternals<
 /** @ts-ignore Cast variance */
-out Shape extends Readonly<$ZodShape> = Readonly<$ZodShape>, out Config extends $ZodObjectConfig = $ZodObjectConfig> extends _$ZodTypeInternals {
+out Shape extends $ZodShape = $ZodShape, out Config extends $ZodObjectConfig = $ZodObjectConfig> extends _$ZodTypeInternals {
     def: $ZodObjectDef<Shape>;
     config: Config;
     isst: errors.$ZodIssueInvalidType | errors.$ZodIssueUnrecognizedKeys;

package/v4/core/schemas.d.ts

@@ -584,7 +584,7 @@ export interface $ZodObjectDef<Shape extends $ZodShape = $ZodShape> extends $Zod
 }
 export interface $ZodObjectInternals<
 /** @ts-ignore Cast variance */
-out Shape extends Readonly<$ZodShape> = Readonly<$ZodShape>, out Config extends $ZodObjectConfig = $ZodObjectConfig> extends _$ZodTypeInternals {
+out Shape extends $ZodShape = $ZodShape, out Config extends $ZodObjectConfig = $ZodObjectConfig> extends _$ZodTypeInternals {
     def: $ZodObjectDef<Shape>;
     config: Config;
     isst: errors.$ZodIssueInvalidType | errors.$ZodIssueUnrecognizedKeys;

package/v4/core/schemas.js

@@ -769,6 +769,20 @@ function handleCatchall(proms, input, payload, ctx, def, inst) {
 export const $ZodObject = /*@__PURE__*/ core.$constructor("$ZodObject", (inst, def) => {
     // requires cast because technically $ZodObject doesn't extend
     $ZodType.init(inst, def);
+    // const sh = def.shape;
+    const desc = Object.getOwnPropertyDescriptor(def, "shape");
+    if (!desc.get) {
+        const sh = def.shape;
+        Object.defineProperty(def, "shape", {
+            get: () => {
+                const newSh = { ...sh };
+                Object.defineProperty(def, "shape", {
+                    value: newSh,
+                });
+                return newSh;
+            },
+        });
+    }
     const _normalized = util.cached(() => normalizeDef(def));
     util.defineLazy(inst._zod, "propValues", () => {
         const shape = def.shape;

package/v4/core/versions.cjs

@@ -4,5 +4,5 @@ exports.version = void 0;
 exports.version = {
     major: 4,
     minor: 1,
-    patch: 8,
+    patch: 10,
 };

package/v4/core/versions.js

@@ -1,5 +1,5 @@
 export const version = {
     major: 4,
     minor: 1,
-    patch: 8,
+    patch: 10,
 };

package/v4/mini/schemas.cjs

@@ -474,10 +474,7 @@ exports.ZodMiniObject = core.$constructor("ZodMiniObject", (inst, def) => {
 function object(shape, params) {
     const def = {
         type: "object",
-        get shape() {
-            index_js_1.util.assignProp(this, "shape", { ...shape });
-            return this.shape;
-        },
+        shape: shape,
         ...index_js_1.util.normalizeParams(params),
     };
     return new exports.ZodMiniObject(def);
@@ -486,11 +483,7 @@ function object(shape, params) {
 function strictObject(shape, params) {
     return new exports.ZodMiniObject({
         type: "object",
-        // shape: shape as core.$ZodLooseShape,
-        get shape() {
-            index_js_1.util.assignProp(this, "shape", { ...shape });
-            return this.shape;
-        },
+        shape,
         catchall: never(),
         ...index_js_1.util.normalizeParams(params),
     });
@@ -499,14 +492,7 @@ function strictObject(shape, params) {
 function looseObject(shape, params) {
     return new exports.ZodMiniObject({
         type: "object",
-        // shape: shape as core.$ZodLooseShape,
-        get shape() {
-            index_js_1.util.assignProp(this, "shape", { ...shape });
-            return this.shape;
-        },
-        // get optional() {
-        //   return util.optionalKeys(shape);
-        // },
+        shape,
         catchall: unknown(),
         ...index_js_1.util.normalizeParams(params),
     });

package/v4/mini/schemas.js

@@ -353,10 +353,7 @@ export const ZodMiniObject = /*@__PURE__*/ core.$constructor("ZodMiniObject", (i
 export function object(shape, params) {
     const def = {
         type: "object",
-        get shape() {
-            util.assignProp(this, "shape", { ...shape });
-            return this.shape;
-        },
+        shape: shape,
         ...util.normalizeParams(params),
     };
     return new ZodMiniObject(def);
@@ -365,11 +362,7 @@ export function object(shape, params) {
 export function strictObject(shape, params) {
     return new ZodMiniObject({
         type: "object",
-        // shape: shape as core.$ZodLooseShape,
-        get shape() {
-            util.assignProp(this, "shape", { ...shape });
-            return this.shape;
-        },
+        shape,
         catchall: never(),
         ...util.normalizeParams(params),
     });
@@ -378,14 +371,7 @@ export function strictObject(shape, params) {
 export function looseObject(shape, params) {
     return new ZodMiniObject({
         type: "object",
-        // shape: shape as core.$ZodLooseShape,
-        get shape() {
-            util.assignProp(this, "shape", { ...shape });
-            return this.shape;
-        },
-        // get optional() {
-        //   return util.optionalKeys(shape);
-        // },
+        shape,
         catchall: unknown(),
         ...util.normalizeParams(params),
     });