zod 4.0.0-beta.20250409T222615 → 4.0.0-beta.20250410T041446

package/dist/commonjs/errors.d.ts

@@ -1,7 +1,8 @@
 import * as core from "@zod/core";
+import { $ZodError } from "@zod/core";
 /** @deprecated Use `z.core.$ZodIssue` from `@zod/core` instead, especially if you are building a library on top of Zod. */
 export type ZodIssue = core.$ZodIssue;
-export declare class ZodError<T = unknown> extends core.$ZodError<T> {
+export declare class ZodError<T = unknown> extends $ZodError<T> {
     /** @deprecated Use the `z.treeifyError(err)` function instead. */
     format(): core.$ZodFormattedError<T>;
     /** @deprecated Use the `z.treeifyError(err)` function instead. */

package/dist/commonjs/errors.js

@@ -35,7 +35,8 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZodError = void 0;
 const core = __importStar(require("@zod/core"));
-class ZodError extends core.$ZodError {
+const core_1 = require("@zod/core");
+class ZodError extends core_1.$ZodError {
     format(mapper) {
         return core.formatError(this, mapper);
     }

package/dist/commonjs/schemas.d.ts

@@ -32,7 +32,6 @@ export interface ZodType<out Output = unknown, out Input = unknown> extends core
     default(def: () => util.NoUndefined<core.output<this>>, params?: core.$ZodDefaultParams): ZodDefault<this>;
     array(): ZodArray<this>;
     or<T extends core.$ZodType>(option: T): ZodUnion<[this, T]>;
-    and<T extends core.$ZodType>(incoming: T): ZodIntersection<this, T>;
     transform<NewOut>(transform: (arg: core.output<this>, ctx: RefinementCtx<core.output<this>>) => NewOut | Promise<NewOut>): ZodPipe<this, ZodTransform<Awaited<NewOut>, core.output<this>>>;
     catch(def: core.output<this>): ZodCatch<this>;
     catch(def: (ctx: core.$ZodCatchCtx) => core.output<this>): ZodCatch<this>;
@@ -92,6 +91,10 @@ export interface _ZodString<Input = unknown> extends ZodType {
     ipv4(params?: string | core.$ZodCheckIPv4Params): this;
     /** @deprecated Use `z.ipv6()` instead. */
     ipv6(params?: string | core.$ZodCheckIPv6Params): this;
+    /** @deprecated Use `z.cidrv4()` instead. */
+    cidrv4(params?: string | core.$ZodCheckCIDRv4Params): this;
+    /** @deprecated Use `z.cidrv6()` instead. */
+    cidrv6(params?: string | core.$ZodCheckCIDRv6Params): this;
     /** @deprecated Use `z.e164()` instead. */
     e164(params?: string | core.$ZodCheckE164Params): this;
     /** @deprecated Use `z.iso.datetime()` instead. */
@@ -196,6 +199,16 @@ export interface ZodIPv6 extends ZodStringFormat<"ipv6"> {
 }
 export declare const ZodIPv6: core.$constructor<ZodIPv6>;
 export declare function ipv6(params?: string | core.$ZodIPv6Params): ZodIPv6;
+export interface ZodCIDRv4 extends ZodStringFormat<"cidrv4"> {
+    _zod: core.$ZodCIDRv4Internals;
+}
+export declare const ZodCIDRv4: core.$constructor<ZodCIDRv4>;
+export declare function cidrv4(params?: string | core.$ZodCIDRv4Params): ZodCIDRv4;
+export interface ZodCIDRv6 extends ZodStringFormat<"cidrv6"> {
+    _zod: core.$ZodCIDRv6Internals;
+}
+export declare const ZodCIDRv6: core.$constructor<ZodCIDRv6>;
+export declare function cidrv6(params?: string | core.$ZodCIDRv6Params): ZodCIDRv6;
 export interface ZodBase64 extends ZodStringFormat<"base64"> {
     _zod: core.$ZodBase64Internals;
 }
@@ -430,7 +443,6 @@ declare function _interface<T extends core.$ZodLooseShape>(shape: T, params?: co
 export { _interface as interface };
 export declare function strictInterface<T extends core.$ZodLooseShape>(shape: T, params?: core.$ZodInterfaceParams): ZodInterface<util.CleanInterfaceShape<T>, util.InitInterfaceParams<T, {}>>;
 export declare function looseInterface<T extends core.$ZodLooseShape>(shape: T, params?: core.$ZodInterfaceParams): ZodInterface<util.CleanInterfaceShape<T>, util.InitInterfaceParams<T, Record<string, unknown>>>;
-type MergeObjects<A extends ZodObject, B extends ZodObject> = ZodObject<util.ExtendShape<A["_zod"]["shape"], B["_zod"]["shape"]>, A["_zod"]["extra"]>;
 export interface ZodObject<out Shape extends core.$ZodShape = core.$ZodShape, Extra extends Record<string, unknown> = Record<string, unknown>> extends ZodType {
     _zod: core.$ZodObjectInternals<Shape, Extra>;
     /** @deprecated In Zod 4, you can pass `ZodObject` instances directly into `.extend()`. */
@@ -445,8 +457,8 @@ export interface ZodObject<out Shape extends core.$ZodShape = core.$ZodShape, Ex
     strict(): ZodObject<Shape, {}>;
     /** @deprecated This is the default behavior. This method call is likely unnecessary. */
     strip(): ZodObject<Shape, {}>;
-    extend<U extends ZodObject>(shape: U): MergeObjects<this, U>;
-    extend<U extends core.$ZodShape>(shape: U): MergeObjects<this, ZodObject<U, {}>>;
+    extend<U extends ZodObject>(shape: U): ZodObject<util.ExtendShape<Shape, U["_zod"]["shape"]>, Extra>;
+    extend<U extends core.$ZodShape>(shape: U): ZodObject<util.ExtendShape<Shape, U>, Extra>;
     /** @deprecated Use `A.extend(B)` */
     merge<U extends ZodObject<any, any>>(other: U): ZodObject<util.Flatten<util.Overwrite<Shape, U["_zod"]["def"]["shape"]>>, Extra>;
     pick<M extends util.Exactly<util.Mask<string & keyof Shape>, M>>(mask: M): ZodObject<util.Flatten<Pick<Shape, Extract<keyof Shape, keyof M>>>, Extra>;

package/dist/commonjs/schemas.js

@@ -33,8 +33,8 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ZodOptional = exports.ZodTransform = exports.ZodFile = exports.ZodLiteral = exports.ZodEnum = exports.ZodSet = exports.ZodMap = exports.ZodRecord = exports.ZodTuple = exports.ZodIntersection = exports.ZodDiscriminatedUnion = exports.ZodUnion = exports.ZodObject = exports.ZodInterface = exports.ZodObjectLike = exports.ZodArray = exports.ZodDate = exports.ZodVoid = exports.ZodNever = exports.ZodUnknown = exports.ZodAny = exports.ZodNull = exports.ZodUndefined = exports.ZodSymbol = exports.ZodBigIntFormat = exports.ZodBigInt = exports.ZodBoolean = exports.ZodNumberFormat = exports.ZodNumber = exports.ZodJWT = exports.ZodE164 = exports.ZodBase64 = exports.ZodIPv6 = exports.ZodIPv4 = exports.ZodKSUID = exports.ZodXID = exports.ZodULID = exports.ZodCUID2 = exports.ZodCUID = exports.ZodNanoID = exports.ZodEmoji = exports.ZodURL = exports.ZodUUID = exports.ZodGUID = exports.ZodEmail = exports.ZodStringFormat = exports.ZodString = exports.ZodType = exports.coerce = exports.iso = void 0;
-exports.stringbool = exports.ZodCustom = exports.ZodPromise = exports.ZodLazy = exports.ZodTemplateLiteral = exports.ZodReadonly = exports.ZodPipe = exports.ZodNaN = exports.ZodCatch = exports.ZodSuccess = exports.ZodNonOptional = exports.ZodDefault = exports.ZodNullable = void 0;
+exports.ZodFile = exports.ZodLiteral = exports.ZodEnum = exports.ZodSet = exports.ZodMap = exports.ZodRecord = exports.ZodTuple = exports.ZodIntersection = exports.ZodDiscriminatedUnion = exports.ZodUnion = exports.ZodObject = exports.ZodInterface = exports.ZodObjectLike = exports.ZodArray = exports.ZodDate = exports.ZodVoid = exports.ZodNever = exports.ZodUnknown = exports.ZodAny = exports.ZodNull = exports.ZodUndefined = exports.ZodSymbol = exports.ZodBigIntFormat = exports.ZodBigInt = exports.ZodBoolean = exports.ZodNumberFormat = exports.ZodNumber = exports.ZodJWT = exports.ZodE164 = exports.ZodBase64 = exports.ZodCIDRv6 = exports.ZodCIDRv4 = exports.ZodIPv6 = exports.ZodIPv4 = exports.ZodKSUID = exports.ZodXID = exports.ZodULID = exports.ZodCUID2 = exports.ZodCUID = exports.ZodNanoID = exports.ZodEmoji = exports.ZodURL = exports.ZodUUID = exports.ZodGUID = exports.ZodEmail = exports.ZodStringFormat = exports.ZodString = exports.ZodType = exports.coerce = exports.iso = void 0;
+exports.stringbool = exports.ZodCustom = exports.ZodPromise = exports.ZodLazy = exports.ZodTemplateLiteral = exports.ZodReadonly = exports.ZodPipe = exports.ZodNaN = exports.ZodCatch = exports.ZodSuccess = exports.ZodNonOptional = exports.ZodDefault = exports.ZodNullable = exports.ZodOptional = exports.ZodTransform = void 0;
 exports.string = string;
 exports.email = email;
 exports.guid = guid;
@@ -52,6 +52,8 @@ exports.xid = xid;
 exports.ksuid = ksuid;
 exports.ipv4 = ipv4;
 exports.ipv6 = ipv6;
+exports.cidrv4 = cidrv4;
+exports.cidrv6 = cidrv6;
 exports.base64 = base64;
 exports.e164 = e164;
 exports.jwt = jwt;
@@ -163,7 +165,7 @@ exports.ZodType = core.$constructor("ZodType", (inst, def) => {
     inst.nonoptional = (params) => nonoptional(inst, params);
     inst.array = () => array(inst);
     inst.or = (arg) => union([inst, arg]);
-    inst.and = (arg) => intersection(inst, arg);
+    // inst.and = (arg) => intersection(inst, arg);
     inst.transform = (tx) => pipe(inst, transform(tx));
     inst.default = (def, params) => _default(inst, def, params);
     // inst.coalesce = (def, params) => coalesce(inst, def, params);
@@ -229,6 +231,8 @@ exports.ZodString = core.$constructor("ZodString", (inst, def) => {
     // };
     inst.ipv4 = (params) => inst.check(core._ipv4(exports.ZodIPv4, params));
     inst.ipv6 = (params) => inst.check(core._ipv6(exports.ZodIPv6, params));
+    inst.cidrv4 = (params) => inst.check(core._cidrv4(exports.ZodCIDRv4, params));
+    inst.cidrv6 = (params) => inst.check(core._cidrv6(exports.ZodCIDRv6, params));
     inst.e164 = (params) => inst.check(core._e164(exports.ZodE164, params));
     // iso
     inst.datetime = (params) => inst.check(iso.datetime(params));
@@ -374,6 +378,20 @@ exports.ZodIPv6 = core.$constructor("ZodIPv6", (inst, def) => {
 function ipv6(params) {
     return core._ipv6(exports.ZodIPv6, params);
 }
+exports.ZodCIDRv4 = core.$constructor("ZodCIDRv4", (inst, def) => {
+    core.$ZodCIDRv4.init(inst, def);
+    exports.ZodType.init(inst, def);
+});
+function cidrv4(params) {
+    return core._cidrv4(exports.ZodCIDRv4, params);
+}
+exports.ZodCIDRv6 = core.$constructor("ZodCIDRv6", (inst, def) => {
+    core.$ZodCIDRv6.init(inst, def);
+    exports.ZodType.init(inst, def);
+});
+function cidrv6(params) {
+    return core._cidrv6(exports.ZodCIDRv6, params);
+}
 exports.ZodBase64 = core.$constructor("ZodBase64", (inst, def) => {
     // ZodStringFormat.init(inst, def);
     core.$ZodBase64.init(inst, def);
@@ -1154,7 +1172,8 @@ function _instanceof(cls, params = {
     });
 }
 // stringbool
-exports.stringbool = core._stringbool.bind(null, {
+exports.stringbool = 
+/*@__PURE__*/ core._stringbool.bind(null, {
     Pipe: exports.ZodPipe,
     Boolean: exports.ZodBoolean,
     Unknown: exports.ZodUnknown,

package/dist/esm/errors.d.ts

@@ -1,7 +1,8 @@
 import * as core from "@zod/core";
+import { $ZodError } from "@zod/core";
 /** @deprecated Use `z.core.$ZodIssue` from `@zod/core` instead, especially if you are building a library on top of Zod. */
 export type ZodIssue = core.$ZodIssue;
-export declare class ZodError<T = unknown> extends core.$ZodError<T> {
+export declare class ZodError<T = unknown> extends $ZodError<T> {
     /** @deprecated Use the `z.treeifyError(err)` function instead. */
     format(): core.$ZodFormattedError<T>;
     /** @deprecated Use the `z.treeifyError(err)` function instead. */

package/dist/esm/errors.js

@@ -1,5 +1,6 @@
 import * as core from "@zod/core";
-export class ZodError extends core.$ZodError {
+import { $ZodError } from "@zod/core";
+export class ZodError extends $ZodError {
     format(mapper) {
         return core.formatError(this, mapper);
     }

package/dist/esm/schemas.d.ts

@@ -32,7 +32,6 @@ export interface ZodType<out Output = unknown, out Input = unknown> extends core
     default(def: () => util.NoUndefined<core.output<this>>, params?: core.$ZodDefaultParams): ZodDefault<this>;
     array(): ZodArray<this>;
     or<T extends core.$ZodType>(option: T): ZodUnion<[this, T]>;
-    and<T extends core.$ZodType>(incoming: T): ZodIntersection<this, T>;
     transform<NewOut>(transform: (arg: core.output<this>, ctx: RefinementCtx<core.output<this>>) => NewOut | Promise<NewOut>): ZodPipe<this, ZodTransform<Awaited<NewOut>, core.output<this>>>;
     catch(def: core.output<this>): ZodCatch<this>;
     catch(def: (ctx: core.$ZodCatchCtx) => core.output<this>): ZodCatch<this>;
@@ -92,6 +91,10 @@ export interface _ZodString<Input = unknown> extends ZodType {
     ipv4(params?: string | core.$ZodCheckIPv4Params): this;
     /** @deprecated Use `z.ipv6()` instead. */
     ipv6(params?: string | core.$ZodCheckIPv6Params): this;
+    /** @deprecated Use `z.cidrv4()` instead. */
+    cidrv4(params?: string | core.$ZodCheckCIDRv4Params): this;
+    /** @deprecated Use `z.cidrv6()` instead. */
+    cidrv6(params?: string | core.$ZodCheckCIDRv6Params): this;
     /** @deprecated Use `z.e164()` instead. */
     e164(params?: string | core.$ZodCheckE164Params): this;
     /** @deprecated Use `z.iso.datetime()` instead. */
@@ -196,6 +199,16 @@ export interface ZodIPv6 extends ZodStringFormat<"ipv6"> {
 }
 export declare const ZodIPv6: core.$constructor<ZodIPv6>;
 export declare function ipv6(params?: string | core.$ZodIPv6Params): ZodIPv6;
+export interface ZodCIDRv4 extends ZodStringFormat<"cidrv4"> {
+    _zod: core.$ZodCIDRv4Internals;
+}
+export declare const ZodCIDRv4: core.$constructor<ZodCIDRv4>;
+export declare function cidrv4(params?: string | core.$ZodCIDRv4Params): ZodCIDRv4;
+export interface ZodCIDRv6 extends ZodStringFormat<"cidrv6"> {
+    _zod: core.$ZodCIDRv6Internals;
+}
+export declare const ZodCIDRv6: core.$constructor<ZodCIDRv6>;
+export declare function cidrv6(params?: string | core.$ZodCIDRv6Params): ZodCIDRv6;
 export interface ZodBase64 extends ZodStringFormat<"base64"> {
     _zod: core.$ZodBase64Internals;
 }
@@ -430,7 +443,6 @@ declare function _interface<T extends core.$ZodLooseShape>(shape: T, params?: co
 export { _interface as interface };
 export declare function strictInterface<T extends core.$ZodLooseShape>(shape: T, params?: core.$ZodInterfaceParams): ZodInterface<util.CleanInterfaceShape<T>, util.InitInterfaceParams<T, {}>>;
 export declare function looseInterface<T extends core.$ZodLooseShape>(shape: T, params?: core.$ZodInterfaceParams): ZodInterface<util.CleanInterfaceShape<T>, util.InitInterfaceParams<T, Record<string, unknown>>>;
-type MergeObjects<A extends ZodObject, B extends ZodObject> = ZodObject<util.ExtendShape<A["_zod"]["shape"], B["_zod"]["shape"]>, A["_zod"]["extra"]>;
 export interface ZodObject<out Shape extends core.$ZodShape = core.$ZodShape, Extra extends Record<string, unknown> = Record<string, unknown>> extends ZodType {
     _zod: core.$ZodObjectInternals<Shape, Extra>;
     /** @deprecated In Zod 4, you can pass `ZodObject` instances directly into `.extend()`. */
@@ -445,8 +457,8 @@ export interface ZodObject<out Shape extends core.$ZodShape = core.$ZodShape, Ex
     strict(): ZodObject<Shape, {}>;
     /** @deprecated This is the default behavior. This method call is likely unnecessary. */
     strip(): ZodObject<Shape, {}>;
-    extend<U extends ZodObject>(shape: U): MergeObjects<this, U>;
-    extend<U extends core.$ZodShape>(shape: U): MergeObjects<this, ZodObject<U, {}>>;
+    extend<U extends ZodObject>(shape: U): ZodObject<util.ExtendShape<Shape, U["_zod"]["shape"]>, Extra>;
+    extend<U extends core.$ZodShape>(shape: U): ZodObject<util.ExtendShape<Shape, U>, Extra>;
     /** @deprecated Use `A.extend(B)` */
     merge<U extends ZodObject<any, any>>(other: U): ZodObject<util.Flatten<util.Overwrite<Shape, U["_zod"]["def"]["shape"]>>, Extra>;
     pick<M extends util.Exactly<util.Mask<string & keyof Shape>, M>>(mask: M): ZodObject<util.Flatten<Pick<Shape, Extract<keyof Shape, keyof M>>>, Extra>;

package/dist/esm/schemas.js

@@ -42,7 +42,7 @@ export const ZodType = /*@__PURE__*/ core.$constructor("ZodType", (inst, def) =>
     inst.nonoptional = (params) => nonoptional(inst, params);
     inst.array = () => array(inst);
     inst.or = (arg) => union([inst, arg]);
-    inst.and = (arg) => intersection(inst, arg);
+    // inst.and = (arg) => intersection(inst, arg);
     inst.transform = (tx) => pipe(inst, transform(tx));
     inst.default = (def, params) => _default(inst, def, params);
     // inst.coalesce = (def, params) => coalesce(inst, def, params);
@@ -108,6 +108,8 @@ export const ZodString = /*@__PURE__*/ core.$constructor("ZodString", (inst, def
     // };
     inst.ipv4 = (params) => inst.check(core._ipv4(ZodIPv4, params));
     inst.ipv6 = (params) => inst.check(core._ipv6(ZodIPv6, params));
+    inst.cidrv4 = (params) => inst.check(core._cidrv4(ZodCIDRv4, params));
+    inst.cidrv6 = (params) => inst.check(core._cidrv6(ZodCIDRv6, params));
     inst.e164 = (params) => inst.check(core._e164(ZodE164, params));
     // iso
     inst.datetime = (params) => inst.check(iso.datetime(params));
@@ -253,6 +255,20 @@ export const ZodIPv6 = /*@__PURE__*/ core.$constructor("ZodIPv6", (inst, def) =>
 export function ipv6(params) {
     return core._ipv6(ZodIPv6, params);
 }
+export const ZodCIDRv4 = /*@__PURE__*/ core.$constructor("ZodCIDRv4", (inst, def) => {
+    core.$ZodCIDRv4.init(inst, def);
+    ZodType.init(inst, def);
+});
+export function cidrv4(params) {
+    return core._cidrv4(ZodCIDRv4, params);
+}
+export const ZodCIDRv6 = /*@__PURE__*/ core.$constructor("ZodCIDRv6", (inst, def) => {
+    core.$ZodCIDRv6.init(inst, def);
+    ZodType.init(inst, def);
+});
+export function cidrv6(params) {
+    return core._cidrv6(ZodCIDRv6, params);
+}
 export const ZodBase64 = /*@__PURE__*/ core.$constructor("ZodBase64", (inst, def) => {
     // ZodStringFormat.init(inst, def);
     core.$ZodBase64.init(inst, def);
@@ -1040,7 +1056,8 @@ function _instanceof(cls, params = {
 }
 export { _instanceof as instanceof };
 // stringbool
-export const stringbool = core._stringbool.bind(null, {
+export const stringbool = 
+/*@__PURE__*/ core._stringbool.bind(null, {
     Pipe: ZodPipe,
     Boolean: ZodBoolean,
     Unknown: ZodUnknown,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zod",
-  "version": "4.0.0-beta.20250409T222615",
+  "version": "4.0.0-beta.20250410T041446",
   "type": "module",
   "author": "Colin McDonnell <zod@colinhacks.com>",
   "description": "TypeScript-first schema declaration and validation library with static type inference",
@@ -70,7 +70,7 @@
     }
   },
   "dependencies": {
-    "@zod/core": "0.1.2"
+    "@zod/core": "0.2.1"
   },
   "scripts": {
     "clean": "rm -rf dist",

package/src/errors.ts

@@ -1,10 +1,11 @@
 import * as core from "@zod/core";
+import { $ZodError } from "@zod/core";
 import type { AnyFunc } from "@zod/core/util";
 
 /** @deprecated Use `z.core.$ZodIssue` from `@zod/core` instead, especially if you are building a library on top of Zod. */
 export type ZodIssue = core.$ZodIssue;
 
-export class ZodError<T = unknown> extends core.$ZodError<T> {
+export class ZodError<T = unknown> extends $ZodError<T> {
   /** @deprecated Use the `z.treeifyError(err)` function instead. */
   format(): core.$ZodFormattedError<T>;
   /** @deprecated Use the `z.treeifyError(err)` function instead. */
@@ -12,7 +13,6 @@ export class ZodError<T = unknown> extends core.$ZodError<T> {
   format(mapper?: AnyFunc): any {
     return core.formatError(this, mapper);
   }
-
   /** @deprecated Use the `z.treeifyError(err)` function instead. */
   flatten(): core.$ZodFlattenedError<T>;
   /** @deprecated Use the `z.treeifyError(err)` function instead. */
@@ -20,7 +20,6 @@ export class ZodError<T = unknown> extends core.$ZodError<T> {
   flatten(mapper?: AnyFunc): core.$ZodFlattenedError<T> {
     return core.flattenError(this, mapper);
   }
-
   /** @deprecated Push directly to `.issues` instead. */
   addIssue(issue: core.$ZodIssue): void {
     this.issues.push(issue);
@@ -29,7 +28,6 @@ export class ZodError<T = unknown> extends core.$ZodError<T> {
   addIssues(issues: core.$ZodIssue[]): void {
     this.issues.push(...issues);
   }
-
   /** @deprecated Check `err.issues.length === 0` instead. */
   get isEmpty(): boolean {
     return this.issues.length === 0;

package/src/schemas.ts

@@ -70,7 +70,7 @@ export interface ZodType<out Output = unknown, out Input = unknown> extends core
   default(def: () => util.NoUndefined<core.output<this>>, params?: core.$ZodDefaultParams): ZodDefault<this>;
   array(): ZodArray<this>;
   or<T extends core.$ZodType>(option: T): ZodUnion<[this, T]>;
-  and<T extends core.$ZodType>(incoming: T): ZodIntersection<this, T>;
+  // and<T extends core.$ZodType>(incoming: T): ZodIntersection<this, T>;
   transform<NewOut>(
     transform: (arg: core.output<this>, ctx: RefinementCtx<core.output<this>>) => NewOut | Promise<NewOut>
   ): ZodPipe<this, ZodTransform<Awaited<NewOut>, core.output<this>>>;
@@ -135,7 +135,7 @@ export const ZodType: core.$constructor<ZodType> = /*@__PURE__*/ core.$construct
   inst.nonoptional = (params) => nonoptional(inst, params);
   inst.array = () => array(inst);
   inst.or = (arg) => union([inst, arg]);
-  inst.and = (arg) => intersection(inst, arg);
+  // inst.and = (arg) => intersection(inst, arg);
   inst.transform = (tx) => pipe(inst, transform(tx as any)) as never;
   inst.default = (def, params) => _default(inst, def, params);
   // inst.coalesce = (def, params) => coalesce(inst, def, params);
@@ -224,6 +224,10 @@ export interface _ZodString<Input = unknown> extends ZodType {
   ipv4(params?: string | core.$ZodCheckIPv4Params): this;
   /** @deprecated Use `z.ipv6()` instead. */
   ipv6(params?: string | core.$ZodCheckIPv6Params): this;
+  /** @deprecated Use `z.cidrv4()` instead. */
+  cidrv4(params?: string | core.$ZodCheckCIDRv4Params): this;
+  /** @deprecated Use `z.cidrv6()` instead. */
+  cidrv6(params?: string | core.$ZodCheckCIDRv6Params): this;
   /** @deprecated Use `z.e164()` instead. */
   e164(params?: string | core.$ZodCheckE164Params): this;
 
@@ -303,6 +307,8 @@ export const ZodString: core.$constructor<ZodString> = /*@__PURE__*/ core.$const
   // };
   inst.ipv4 = (params) => inst.check(core._ipv4(ZodIPv4, params));
   inst.ipv6 = (params) => inst.check(core._ipv6(ZodIPv6, params));
+  inst.cidrv4 = (params) => inst.check(core._cidrv4(ZodCIDRv4, params));
+  inst.cidrv6 = (params) => inst.check(core._cidrv6(ZodCIDRv6, params));
   inst.e164 = (params) => inst.check(core._e164(ZodE164, params));
 
   // iso
@@ -557,6 +563,32 @@ export function ipv6(params?: string | core.$ZodIPv6Params): ZodIPv6 {
   return core._ipv6(ZodIPv6, params);
 }
 
+// ZodCIDRv4
+export interface ZodCIDRv4 extends ZodStringFormat<"cidrv4"> {
+  _zod: core.$ZodCIDRv4Internals;
+}
+export const ZodCIDRv4: core.$constructor<ZodCIDRv4> = /*@__PURE__*/ core.$constructor("ZodCIDRv4", (inst, def) => {
+  core.$ZodCIDRv4.init(inst, def);
+  ZodType.init(inst, def);
+});
+
+export function cidrv4(params?: string | core.$ZodCIDRv4Params): ZodCIDRv4 {
+  return core._cidrv4(ZodCIDRv4, params);
+}
+
+// ZodCIDRv6
+export interface ZodCIDRv6 extends ZodStringFormat<"cidrv6"> {
+  _zod: core.$ZodCIDRv6Internals;
+}
+export const ZodCIDRv6: core.$constructor<ZodCIDRv6> = /*@__PURE__*/ core.$constructor("ZodCIDRv6", (inst, def) => {
+  core.$ZodCIDRv6.init(inst, def);
+  ZodType.init(inst, def);
+});
+
+export function cidrv6(params?: string | core.$ZodCIDRv6Params): ZodCIDRv6 {
+  return core._cidrv6(ZodCIDRv6, params);
+}
+
 // ZodBase64
 export interface ZodBase64 extends ZodStringFormat<"base64"> {
   _zod: core.$ZodBase64Internals;
@@ -1193,13 +1225,7 @@ export function looseInterface<T extends core.$ZodLooseShape>(
   return new ZodInterface(def) as any;
 }
 
-type MergeObjects<A extends ZodObject, B extends ZodObject> = ZodObject<
-  util.ExtendShape<A["_zod"]["shape"], B["_zod"]["shape"]>,
-  A["_zod"]["extra"] // & B['_zod']["extra"]
->;
-
 // ZodObject
-
 export interface ZodObject<
   // @ts-ignore cast variance
   out Shape extends core.$ZodShape = core.$ZodShape,
@@ -1227,8 +1253,18 @@ export interface ZodObject<
   /** @deprecated This is the default behavior. This method call is likely unnecessary. */
   strip(): ZodObject<Shape, {}>;
 
-  extend<U extends ZodObject>(shape: U): MergeObjects<this, U>;
-  extend<U extends core.$ZodShape>(shape: U): MergeObjects<this, ZodObject<U, {}>>;
+  extend<U extends ZodObject>(
+    shape: U
+  ): ZodObject<
+    util.ExtendShape<Shape, U["_zod"]["shape"]>,
+    Extra // & B['_zod']["extra"]
+  >;
+  extend<U extends core.$ZodShape>(
+    shape: U
+  ): ZodObject<
+    util.ExtendShape<Shape, U>,
+    Extra // & B['_zod']["extra"]
+  >;
 
   // merge
   /** @deprecated Use `A.extend(B)` */
@@ -2287,7 +2323,7 @@ export { _instanceof as instanceof };
 
 // stringbool
 export const stringbool: (_params?: core.$ZodStringBoolParams) => ZodPipe<ZodUnknown, ZodBoolean> =
-  core._stringbool.bind(null, {
+  /*@__PURE__*/ core._stringbool.bind(null, {
     Pipe: ZodPipe,
     Boolean: ZodBoolean,
     Unknown: ZodUnknown,