zod 3.20.2 → 3.20.6

package/lib/index.umd.js

@@ -478,7 +478,7 @@
     const isAborted = (x) => x.status === "aborted";
     const isDirty = (x) => x.status === "dirty";
     const isValid = (x) => x.status === "valid";
-    const isAsync = (x) => typeof Promise !== undefined && x instanceof Promise;
+    const isAsync = (x) => typeof Promise !== "undefined" && x instanceof Promise;
 
     var errorUtil;
     (function (errorUtil) {
@@ -707,28 +707,29 @@
             return this._refinement(refinement);
         }
         optional() {
-            return ZodOptional.create(this);
+            return ZodOptional.create(this, this._def);
         }
         nullable() {
-            return ZodNullable.create(this);
+            return ZodNullable.create(this, this._def);
         }
         nullish() {
-            return this.optional().nullable();
+            return this.nullable().optional();
         }
         array() {
-            return ZodArray.create(this);
+            return ZodArray.create(this, this._def);
         }
         promise() {
-            return ZodPromise.create(this);
+            return ZodPromise.create(this, this._def);
         }
         or(option) {
-            return ZodUnion.create([this, option]);
+            return ZodUnion.create([this, option], this._def);
         }
         and(incoming) {
-            return ZodIntersection.create(this, incoming);
+            return ZodIntersection.create(this, incoming, this._def);
         }
         transform(transform) {
             return new ZodEffects({
+                ...processCreateParams(this._def),
                 schema: this,
                 typeName: exports.ZodFirstPartyTypeKind.ZodEffects,
                 effect: { type: "transform", transform },
@@ -737,6 +738,7 @@
         default(def) {
             const defaultValueFunc = typeof def === "function" ? def : () => def;
             return new ZodDefault({
+                ...processCreateParams(this._def),
                 innerType: this,
                 defaultValue: defaultValueFunc,
                 typeName: exports.ZodFirstPartyTypeKind.ZodDefault,
@@ -746,14 +748,15 @@
             return new ZodBranded({
                 typeName: exports.ZodFirstPartyTypeKind.ZodBranded,
                 type: this,
-                ...processCreateParams(undefined),
+                ...processCreateParams(this._def),
             });
         }
         catch(def) {
-            const defaultValueFunc = typeof def === "function" ? def : () => def;
+            const catchValueFunc = typeof def === "function" ? def : () => def;
             return new ZodCatch({
+                ...processCreateParams(this._def),
                 innerType: this,
-                defaultValue: defaultValueFunc,
+                catchValue: catchValueFunc,
                 typeName: exports.ZodFirstPartyTypeKind.ZodCatch,
             });
         }
@@ -775,12 +778,15 @@
         }
     }
     const cuidRegex = /^c[^\s-]{8,}$/i;
+    const cuid2Regex = /^[a-z][a-z0-9]*$/;
     const uuidRegex = /^([a-f0-9]{8}-[a-f0-9]{4}-[1-5][a-f0-9]{3}-[a-f0-9]{4}-[a-f0-9]{12}|00000000-0000-0000-0000-000000000000)$/i;
     // from https://stackoverflow.com/a/46181/1550155
     // old version: too slow, didn't support unicode
     // const emailRegex = /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i;
+    //old email regex
+    // const emailRegex = /^(([^<>()[\].,;:\s@"]+(\.[^<>()[\].,;:\s@"]+)*)|(".+"))@((?!-)([^<>()[\].,;:\s@"]+\.)+[^<>()[\].,;:\s@"]{1,})[^-<>()[\].,;:\s@"]$/i;
     // eslint-disable-next-line
-    const emailRegex = /^(([^<>()[\]\.,;:\s@\"]+(\.[^<>()[\]\.,;:\s@\"]+)*)|(\".+\"))@(([^<>()[\]\.,;:\s@\"]+\.)+[^<>()[\]\.,;:\s@\"]{2,})$/i;
+    const emailRegex = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|([^-]([a-zA-Z0-9-]*\.)+[a-zA-Z]{2,}))$/;
     // interface IsDateStringOptions extends StringDateOptions {
     /**
      * Match any configuration
@@ -791,7 +797,7 @@
     const datetimeRegex = (args) => {
         if (args.precision) {
             if (args.offset) {
-                return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{${args.precision}}(([+-]\\d{2}:\\d{2})|Z)$`);
+                return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{${args.precision}}(([+-]\\d{2}(:?\\d{2})?)|Z)$`);
             }
             else {
                 return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{${args.precision}}Z$`);
@@ -799,7 +805,7 @@
         }
         else if (args.precision === 0) {
             if (args.offset) {
-                return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(([+-]\\d{2}:\\d{2})|Z)$`);
+                return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(([+-]\\d{2}(:?\\d{2})?)|Z)$`);
             }
             else {
                 return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}Z$`);
@@ -807,7 +813,7 @@
         }
         else {
             if (args.offset) {
-                return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d+)?(([+-]\\d{2}:\\d{2})|Z)$`);
+                return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d+)?(([+-]\\d{2}(:?\\d{2})?)|Z)$`);
             }
             else {
                 return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d+)?Z$`);
@@ -940,6 +946,17 @@
                         status.dirty();
                     }
                 }
+                else if (check.kind === "cuid2") {
+                    if (!cuid2Regex.test(input.data)) {
+                        ctx = this._getOrReturnCtx(input, ctx);
+                        addIssueToContext(ctx, {
+                            validation: "cuid2",
+                            code: ZodIssueCode.invalid_string,
+                            message: check.message,
+                        });
+                        status.dirty();
+                    }
+                }
                 else if (check.kind === "url") {
                     try {
                         new URL(input.data);
@@ -1028,6 +1045,9 @@
         cuid(message) {
             return this._addCheck({ kind: "cuid", ...errorUtil.errToObj(message) });
         }
+        cuid2(message) {
+            return this._addCheck({ kind: "cuid2", ...errorUtil.errToObj(message) });
+        }
         datetime(options) {
             var _a;
             if (typeof options === "string") {
@@ -1102,6 +1122,9 @@
         get isCUID() {
             return !!this._def.checks.find((ch) => ch.kind === "cuid");
         }
+        get isCUID2() {
+            return !!this._def.checks.find((ch) => ch.kind === "cuid2");
+        }
         get minLength() {
             let min = null;
             for (const ch of this._def.checks) {
@@ -1342,7 +1365,27 @@
             return max;
         }
         get isInt() {
-            return !!this._def.checks.find((ch) => ch.kind === "int");
+            return !!this._def.checks.find((ch) => ch.kind === "int" ||
+                (ch.kind === "multipleOf" && exports.util.isInteger(ch.value)));
+        }
+        get isFinite() {
+            let max = null, min = null;
+            for (const ch of this._def.checks) {
+                if (ch.kind === "finite" ||
+                    ch.kind === "int" ||
+                    ch.kind === "multipleOf") {
+                    return true;
+                }
+                else if (ch.kind === "min") {
+                    if (min === null || ch.value > min)
+                        min = ch.value;
+                }
+                else if (ch.kind === "max") {
+                    if (max === null || ch.value < max)
+                        max = ch.value;
+                }
+            }
+            return Number.isFinite(min) && Number.isFinite(max);
         }
     }
     ZodNumber.create = (params) => {
@@ -1703,13 +1746,13 @@
                 }
             }
             if (ctx.common.async) {
-                return Promise.all(ctx.data.map((item, i) => {
+                return Promise.all([...ctx.data].map((item, i) => {
                     return def.type._parseAsync(new ParseInputLazyPath(ctx, item, ctx.path, i));
                 })).then((result) => {
                     return ParseStatus.mergeArray(status, result);
                 });
             }
-            const result = ctx.data.map((item, i) => {
+            const result = [...ctx.data].map((item, i) => {
                 return def.type._parseSync(new ParseInputLazyPath(ctx, item, ctx.path, i));
             });
             return ParseStatus.mergeArray(status, result);
@@ -1765,15 +1808,6 @@
             };
         };
     })(exports.objectUtil || (exports.objectUtil = {}));
-    const AugmentFactory = (def) => (augmentation) => {
-        return new ZodObject({
-            ...def,
-            shape: () => ({
-                ...def.shape(),
-                ...augmentation,
-            }),
-        });
-    };
     function deepPartialify(schema) {
         if (schema instanceof ZodObject) {
             const newShape = {};
@@ -1811,8 +1845,43 @@
              * If you want to pass through unknown properties, use `.passthrough()` instead.
              */
             this.nonstrict = this.passthrough;
-            this.augment = AugmentFactory(this._def);
-            this.extend = AugmentFactory(this._def);
+            // extend<
+            //   Augmentation extends ZodRawShape,
+            //   NewOutput extends util.flatten<{
+            //     [k in keyof Augmentation | keyof Output]: k extends keyof Augmentation
+            //       ? Augmentation[k]["_output"]
+            //       : k extends keyof Output
+            //       ? Output[k]
+            //       : never;
+            //   }>,
+            //   NewInput extends util.flatten<{
+            //     [k in keyof Augmentation | keyof Input]: k extends keyof Augmentation
+            //       ? Augmentation[k]["_input"]
+            //       : k extends keyof Input
+            //       ? Input[k]
+            //       : never;
+            //   }>
+            // >(
+            //   augmentation: Augmentation
+            // ): ZodObject<
+            //   extendShape<T, Augmentation>,
+            //   UnknownKeys,
+            //   Catchall,
+            //   NewOutput,
+            //   NewInput
+            // > {
+            //   return new ZodObject({
+            //     ...this._def,
+            //     shape: () => ({
+            //       ...this._def.shape(),
+            //       ...augmentation,
+            //     }),
+            //   }) as any;
+            // }
+            /**
+             * @deprecated Use `.extend` instead
+             *  */
+            this.augment = this.extend;
         }
         _getCached() {
             if (this._cached !== null)
@@ -1949,8 +2018,31 @@
                 unknownKeys: "passthrough",
             });
         }
-        setKey(key, schema) {
-            return this.augment({ [key]: schema });
+        // const AugmentFactory =
+        //   <Def extends ZodObjectDef>(def: Def) =>
+        //   <Augmentation extends ZodRawShape>(
+        //     augmentation: Augmentation
+        //   ): ZodObject<
+        //     extendShape<ReturnType<Def["shape"]>, Augmentation>,
+        //     Def["unknownKeys"],
+        //     Def["catchall"]
+        //   > => {
+        //     return new ZodObject({
+        //       ...def,
+        //       shape: () => ({
+        //         ...def.shape(),
+        //         ...augmentation,
+        //       }),
+        //     }) as any;
+        //   };
+        extend(augmentation) {
+            return new ZodObject({
+                ...this._def,
+                shape: () => ({
+                    ...this._def.shape(),
+                    ...augmentation,
+                }),
+            });
         }
         /**
          * Prior to zod@1.0.12 there was a bug in the
@@ -1958,10 +2050,6 @@
          * upgrade if you are experiencing issues.
          */
         merge(merging) {
-            // const mergedShape = objectUtil.mergeShapes(
-            //   this._def.shape(),
-            //   merging._def.shape()
-            // );
             const merged = new ZodObject({
                 unknownKeys: merging._def.unknownKeys,
                 catchall: merging._def.catchall,
@@ -1970,6 +2058,65 @@
             });
             return merged;
         }
+        // merge<
+        //   Incoming extends AnyZodObject,
+        //   Augmentation extends Incoming["shape"],
+        //   NewOutput extends {
+        //     [k in keyof Augmentation | keyof Output]: k extends keyof Augmentation
+        //       ? Augmentation[k]["_output"]
+        //       : k extends keyof Output
+        //       ? Output[k]
+        //       : never;
+        //   },
+        //   NewInput extends {
+        //     [k in keyof Augmentation | keyof Input]: k extends keyof Augmentation
+        //       ? Augmentation[k]["_input"]
+        //       : k extends keyof Input
+        //       ? Input[k]
+        //       : never;
+        //   }
+        // >(
+        //   merging: Incoming
+        // ): ZodObject<
+        //   extendShape<T, ReturnType<Incoming["_def"]["shape"]>>,
+        //   Incoming["_def"]["unknownKeys"],
+        //   Incoming["_def"]["catchall"],
+        //   NewOutput,
+        //   NewInput
+        // > {
+        //   const merged: any = new ZodObject({
+        //     unknownKeys: merging._def.unknownKeys,
+        //     catchall: merging._def.catchall,
+        //     shape: () =>
+        //       objectUtil.mergeShapes(this._def.shape(), merging._def.shape()),
+        //     typeName: ZodFirstPartyTypeKind.ZodObject,
+        //   }) as any;
+        //   return merged;
+        // }
+        setKey(key, schema) {
+            return this.augment({ [key]: schema });
+        }
+        // merge<Incoming extends AnyZodObject>(
+        //   merging: Incoming
+        // ): //ZodObject<T & Incoming["_shape"], UnknownKeys, Catchall> = (merging) => {
+        // ZodObject<
+        //   extendShape<T, ReturnType<Incoming["_def"]["shape"]>>,
+        //   Incoming["_def"]["unknownKeys"],
+        //   Incoming["_def"]["catchall"]
+        // > {
+        //   // const mergedShape = objectUtil.mergeShapes(
+        //   //   this._def.shape(),
+        //   //   merging._def.shape()
+        //   // );
+        //   const merged: any = new ZodObject({
+        //     unknownKeys: merging._def.unknownKeys,
+        //     catchall: merging._def.catchall,
+        //     shape: () =>
+        //       objectUtil.mergeShapes(this._def.shape(), merging._def.shape()),
+        //     typeName: ZodFirstPartyTypeKind.ZodObject,
+        //   }) as any;
+        //   return merged;
+        // }
         catchall(index) {
             return new ZodObject({
                 ...this._def,
@@ -1978,10 +2125,10 @@
         }
         pick(mask) {
             const shape = {};
-            exports.util.objectKeys(mask).map((key) => {
-                // only add to shape if key corresponds to an element of the current shape
-                if (this.shape[key])
+            exports.util.objectKeys(mask).forEach((key) => {
+                if (mask[key] && this.shape[key]) {
                     shape[key] = this.shape[key];
+                }
             });
             return new ZodObject({
                 ...this._def,
@@ -1990,8 +2137,8 @@
         }
         omit(mask) {
             const shape = {};
-            exports.util.objectKeys(this.shape).map((key) => {
-                if (exports.util.objectKeys(mask).indexOf(key) === -1) {
+            exports.util.objectKeys(this.shape).forEach((key) => {
+                if (!mask[key]) {
                     shape[key] = this.shape[key];
                 }
             });
@@ -2005,26 +2152,15 @@
         }
         partial(mask) {
             const newShape = {};
-            if (mask) {
-                exports.util.objectKeys(this.shape).map((key) => {
-                    if (exports.util.objectKeys(mask).indexOf(key) === -1) {
-                        newShape[key] = this.shape[key];
-                    }
-                    else {
-                        newShape[key] = this.shape[key].optional();
-                    }
-                });
-                return new ZodObject({
-                    ...this._def,
-                    shape: () => newShape,
-                });
-            }
-            else {
-                for (const key in this.shape) {
-                    const fieldSchema = this.shape[key];
+            exports.util.objectKeys(this.shape).forEach((key) => {
+                const fieldSchema = this.shape[key];
+                if (mask && !mask[key]) {
+                    newShape[key] = fieldSchema;
+                }
+                else {
                     newShape[key] = fieldSchema.optional();
                 }
-            }
+            });
             return new ZodObject({
                 ...this._def,
                 shape: () => newShape,
@@ -2032,23 +2168,11 @@
         }
         required(mask) {
             const newShape = {};
-            if (mask) {
-                exports.util.objectKeys(this.shape).map((key) => {
-                    if (exports.util.objectKeys(mask).indexOf(key) === -1) {
-                        newShape[key] = this.shape[key];
-                    }
-                    else {
-                        const fieldSchema = this.shape[key];
-                        let newField = fieldSchema;
-                        while (newField instanceof ZodOptional) {
-                            newField = newField._def.innerType;
-                        }
-                        newShape[key] = newField;
-                    }
-                });
-            }
-            else {
-                for (const key in this.shape) {
+            exports.util.objectKeys(this.shape).forEach((key) => {
+                if (mask && !mask[key]) {
+                    newShape[key] = this.shape[key];
+                }
+                else {
                     const fieldSchema = this.shape[key];
                     let newField = fieldSchema;
                     while (newField instanceof ZodOptional) {
@@ -2056,7 +2180,7 @@
                     }
                     newShape[key] = newField;
                 }
-            }
+            });
             return new ZodObject({
                 ...this._def,
                 shape: () => newShape,
@@ -2437,7 +2561,7 @@
                 });
                 status.dirty();
             }
-            const items = ctx.data
+            const items = [...ctx.data]
                 .map((item, itemIndex) => {
                 const schema = this._def.items[itemIndex] || this._def.rest;
                 if (!schema)
@@ -2817,6 +2941,7 @@
             if (input.data !== this._def.value) {
                 const ctx = this._getOrReturnCtx(input);
                 addIssueToContext(ctx, {
+                    received: ctx.data,
                     code: ZodIssueCode.invalid_literal,
                     expected: this._def.value,
                 });
@@ -2890,6 +3015,12 @@
             }
             return enumValues;
         }
+        extract(values) {
+            return ZodEnum.create(values);
+        }
+        exclude(values) {
+            return ZodEnum.create(this.options.filter((opt) => !values.includes(opt)));
+        }
     }
     ZodEnum.create = createZodEnum;
     class ZodNativeEnum extends ZodType {
@@ -2929,6 +3060,9 @@
         });
     };
     class ZodPromise extends ZodType {
+        unwrap() {
+            return this._def.type;
+        }
         _parse(input) {
             const { ctx } = this._processInputParams(input);
             if (ctx.parsedType !== ZodParsedType.promise &&
@@ -3168,24 +3302,30 @@
             const result = this._def.innerType._parse({
                 data: ctx.data,
                 path: ctx.path,
-                parent: ctx,
+                parent: {
+                    ...ctx,
+                    common: {
+                        ...ctx.common,
+                        issues: [], // don't collect issues from inner type
+                    },
+                },
             });
             if (isAsync(result)) {
                 return result.then((result) => {
                     return {
                         status: "valid",
-                        value: result.status === "valid" ? result.value : this._def.defaultValue(),
+                        value: result.status === "valid" ? result.value : this._def.catchValue(),
                     };
                 });
             }
             else {
                 return {
                     status: "valid",
-                    value: result.status === "valid" ? result.value : this._def.defaultValue(),
+                    value: result.status === "valid" ? result.value : this._def.catchValue(),
                 };
             }
         }
-        removeDefault() {
+        removeCatch() {
             return this._def.innerType;
         }
     }
@@ -3193,9 +3333,7 @@
         return new ZodCatch({
             innerType: type,
             typeName: exports.ZodFirstPartyTypeKind.ZodCatch,
-            defaultValue: typeof params.default === "function"
-                ? params.default
-                : () => params.default,
+            catchValue: typeof params.catch === "function" ? params.catch : () => params.catch,
             ...processCreateParams(params),
         });
     };
@@ -3390,7 +3528,10 @@
     const coerce = {
         string: ((arg) => ZodString.create({ ...arg, coerce: true })),
         number: ((arg) => ZodNumber.create({ ...arg, coerce: true })),
-        boolean: ((arg) => ZodBoolean.create({ ...arg, coerce: true })),
+        boolean: ((arg) => ZodBoolean.create({
+            ...arg,
+            coerce: true,
+        })),
         bigint: ((arg) => ZodBigInt.create({ ...arg, coerce: true })),
         date: ((arg) => ZodDate.create({ ...arg, coerce: true })),
     };