zod 3.24.0 → 3.24.2

package/lib/index.mjs

@@ -160,6 +160,9 @@ const quotelessJson = (obj) => {
     return json.replace(/"([^"]+)":/g, "$1:");
 };
 class ZodError extends Error {
+    get errors() {
+        return this.issues;
+    }
     constructor(issues) {
         super();
         this.issues = [];
@@ -180,9 +183,6 @@ class ZodError extends Error {
         this.name = "ZodError";
         this.issues = issues;
     }
-    get errors() {
-        return this.issues;
-    }
     format(_mapper) {
         const mapper = _mapper ||
             function (issue) {
@@ -438,9 +438,9 @@ function addIssueToContext(ctx, issueData) {
         data: ctx.data,
         path: ctx.path,
         errorMaps: [
-            ctx.common.contextualErrorMap,
-            ctx.schemaErrorMap,
-            overrideMap,
+            ctx.common.contextualErrorMap, // contextual error map is first priority
+            ctx.schemaErrorMap, // then schema-bound map if available
+            overrideMap, // then global override map
             overrideMap === errorMap ? undefined : errorMap, // then global default map
         ].filter((x) => !!x),
     });
@@ -616,40 +616,6 @@ function processCreateParams(params) {
     return { errorMap: customMap, description };
 }
 class ZodType {
-    constructor(def) {
-        /** Alias of safeParseAsync */
-        this.spa = this.safeParseAsync;
-        this._def = def;
-        this.parse = this.parse.bind(this);
-        this.safeParse = this.safeParse.bind(this);
-        this.parseAsync = this.parseAsync.bind(this);
-        this.safeParseAsync = this.safeParseAsync.bind(this);
-        this.spa = this.spa.bind(this);
-        this.refine = this.refine.bind(this);
-        this.refinement = this.refinement.bind(this);
-        this.superRefine = this.superRefine.bind(this);
-        this.optional = this.optional.bind(this);
-        this.nullable = this.nullable.bind(this);
-        this.nullish = this.nullish.bind(this);
-        this.array = this.array.bind(this);
-        this.promise = this.promise.bind(this);
-        this.or = this.or.bind(this);
-        this.and = this.and.bind(this);
-        this.transform = this.transform.bind(this);
-        this.brand = this.brand.bind(this);
-        this.default = this.default.bind(this);
-        this.catch = this.catch.bind(this);
-        this.describe = this.describe.bind(this);
-        this.pipe = this.pipe.bind(this);
-        this.readonly = this.readonly.bind(this);
-        this.isNullable = this.isNullable.bind(this);
-        this.isOptional = this.isOptional.bind(this);
-        this["~standard"] = {
-            version: 1,
-            vendor: "zod",
-            validate: (data) => this["~validate"](data),
-        };
-    }
     get description() {
         return this._def.description;
     }
@@ -714,7 +680,7 @@ class ZodType {
         return handleResult(ctx, result);
     }
     "~validate"(data) {
-        var _a, _b, _c;
+        var _a, _b;
         const ctx = {
             common: {
                 issues: [],
@@ -738,7 +704,7 @@ class ZodType {
                     };
             }
             catch (err) {
-                if ((_c = (_b = (_a = err) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === null || _c === void 0 ? void 0 : _c.includes("encountered")) {
+                if ((_b = (_a = err === null || err === void 0 ? void 0 : err.message) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === null || _b === void 0 ? void 0 : _b.includes("encountered")) {
                     this["~standard"].async = true;
                 }
                 ctx.common = {
@@ -841,6 +807,40 @@ class ZodType {
     superRefine(refinement) {
         return this._refinement(refinement);
     }
+    constructor(def) {
+        /** Alias of safeParseAsync */
+        this.spa = this.safeParseAsync;
+        this._def = def;
+        this.parse = this.parse.bind(this);
+        this.safeParse = this.safeParse.bind(this);
+        this.parseAsync = this.parseAsync.bind(this);
+        this.safeParseAsync = this.safeParseAsync.bind(this);
+        this.spa = this.spa.bind(this);
+        this.refine = this.refine.bind(this);
+        this.refinement = this.refinement.bind(this);
+        this.superRefine = this.superRefine.bind(this);
+        this.optional = this.optional.bind(this);
+        this.nullable = this.nullable.bind(this);
+        this.nullish = this.nullish.bind(this);
+        this.array = this.array.bind(this);
+        this.promise = this.promise.bind(this);
+        this.or = this.or.bind(this);
+        this.and = this.and.bind(this);
+        this.transform = this.transform.bind(this);
+        this.brand = this.brand.bind(this);
+        this.default = this.default.bind(this);
+        this.catch = this.catch.bind(this);
+        this.describe = this.describe.bind(this);
+        this.pipe = this.pipe.bind(this);
+        this.readonly = this.readonly.bind(this);
+        this.isNullable = this.isNullable.bind(this);
+        this.isOptional = this.isOptional.bind(this);
+        this["~standard"] = {
+            version: 1,
+            vendor: "zod",
+            validate: (data) => this["~validate"](data),
+        };
+    }
     optional() {
         return ZodOptional.create(this, this._def);
     }
@@ -1398,7 +1398,10 @@ class ZodString extends ZodType {
     }
     base64url(message) {
         // base64url encoding is a modification of base64 that can safely be used in URLs and filenames
-        return this._addCheck({ kind: "base64url", ...errorUtil.errToObj(message) });
+        return this._addCheck({
+            kind: "base64url",
+            ...errorUtil.errToObj(message),
+        });
     }
     jwt(options) {
         return this._addCheck({ kind: "jwt", ...errorUtil.errToObj(options) });
@@ -1499,8 +1502,7 @@ class ZodString extends ZodType {
         });
     }
     /**
-     * @deprecated Use z.string().min(1) instead.
-     * @see {@link ZodString.min}
+     * Equivalent to `.min(1)`
      */
     nonempty(message) {
         return this.min(1, errorUtil.errToObj(message));
@@ -4142,7 +4144,23 @@ ZodReadonly.create = (type, params) => {
         ...processCreateParams(params),
     });
 };
-function custom(check, params = {}, 
+////////////////////////////////////////
+////////////////////////////////////////
+//////////                    //////////
+//////////      z.custom      //////////
+//////////                    //////////
+////////////////////////////////////////
+////////////////////////////////////////
+function cleanParams(params, data) {
+    const p = typeof params === "function"
+        ? params(data)
+        : typeof params === "string"
+            ? { message: params }
+            : params;
+    const p2 = typeof p === "string" ? { message: p } : p;
+    return p2;
+}
+function custom(check, _params = {}, 
 /**
  * @deprecated
  *
@@ -4157,16 +4175,23 @@ fatal) {
     if (check)
         return ZodAny.create().superRefine((data, ctx) => {
             var _a, _b;
-            if (!check(data)) {
-                const p = typeof params === "function"
-                    ? params(data)
-                    : typeof params === "string"
-                        ? { message: params }
-                        : params;
-                const _fatal = (_b = (_a = p.fatal) !== null && _a !== void 0 ? _a : fatal) !== null && _b !== void 0 ? _b : true;
-                const p2 = typeof p === "string" ? { message: p } : p;
-                ctx.addIssue({ code: "custom", ...p2, fatal: _fatal });
+            const r = check(data);
+            if (r instanceof Promise) {
+                return r.then((r) => {
+                    var _a, _b;
+                    if (!r) {
+                        const params = cleanParams(_params, data);
+                        const _fatal = (_b = (_a = params.fatal) !== null && _a !== void 0 ? _a : fatal) !== null && _b !== void 0 ? _b : true;
+                        ctx.addIssue({ code: "custom", ...params, fatal: _fatal });
+                    }
+                });
+            }
+            if (!r) {
+                const params = cleanParams(_params, data);
+                const _fatal = (_b = (_a = params.fatal) !== null && _a !== void 0 ? _a : fatal) !== null && _b !== void 0 ? _b : true;
+                ctx.addIssue({ code: "custom", ...params, fatal: _fatal });
             }
+            return;
         });
     return ZodAny.create();
 }

package/lib/index.umd.js

@@ -166,6 +166,9 @@
         return json.replace(/"([^"]+)":/g, "$1:");
     };
     class ZodError extends Error {
+        get errors() {
+            return this.issues;
+        }
         constructor(issues) {
             super();
             this.issues = [];
@@ -186,9 +189,6 @@
             this.name = "ZodError";
             this.issues = issues;
         }
-        get errors() {
-            return this.issues;
-        }
         format(_mapper) {
             const mapper = _mapper ||
                 function (issue) {
@@ -444,9 +444,9 @@
             data: ctx.data,
             path: ctx.path,
             errorMaps: [
-                ctx.common.contextualErrorMap,
-                ctx.schemaErrorMap,
-                overrideMap,
+                ctx.common.contextualErrorMap, // contextual error map is first priority
+                ctx.schemaErrorMap, // then schema-bound map if available
+                overrideMap, // then global override map
                 overrideMap === errorMap ? undefined : errorMap, // then global default map
             ].filter((x) => !!x),
         });
@@ -622,40 +622,6 @@
         return { errorMap: customMap, description };
     }
     class ZodType {
-        constructor(def) {
-            /** Alias of safeParseAsync */
-            this.spa = this.safeParseAsync;
-            this._def = def;
-            this.parse = this.parse.bind(this);
-            this.safeParse = this.safeParse.bind(this);
-            this.parseAsync = this.parseAsync.bind(this);
-            this.safeParseAsync = this.safeParseAsync.bind(this);
-            this.spa = this.spa.bind(this);
-            this.refine = this.refine.bind(this);
-            this.refinement = this.refinement.bind(this);
-            this.superRefine = this.superRefine.bind(this);
-            this.optional = this.optional.bind(this);
-            this.nullable = this.nullable.bind(this);
-            this.nullish = this.nullish.bind(this);
-            this.array = this.array.bind(this);
-            this.promise = this.promise.bind(this);
-            this.or = this.or.bind(this);
-            this.and = this.and.bind(this);
-            this.transform = this.transform.bind(this);
-            this.brand = this.brand.bind(this);
-            this.default = this.default.bind(this);
-            this.catch = this.catch.bind(this);
-            this.describe = this.describe.bind(this);
-            this.pipe = this.pipe.bind(this);
-            this.readonly = this.readonly.bind(this);
-            this.isNullable = this.isNullable.bind(this);
-            this.isOptional = this.isOptional.bind(this);
-            this["~standard"] = {
-                version: 1,
-                vendor: "zod",
-                validate: (data) => this["~validate"](data),
-            };
-        }
         get description() {
             return this._def.description;
         }
@@ -720,7 +686,7 @@
             return handleResult(ctx, result);
         }
         "~validate"(data) {
-            var _a, _b, _c;
+            var _a, _b;
             const ctx = {
                 common: {
                     issues: [],
@@ -744,7 +710,7 @@
                         };
                 }
                 catch (err) {
-                    if ((_c = (_b = (_a = err) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === null || _c === void 0 ? void 0 : _c.includes("encountered")) {
+                    if ((_b = (_a = err === null || err === void 0 ? void 0 : err.message) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === null || _b === void 0 ? void 0 : _b.includes("encountered")) {
                         this["~standard"].async = true;
                     }
                     ctx.common = {
@@ -847,6 +813,40 @@
         superRefine(refinement) {
             return this._refinement(refinement);
         }
+        constructor(def) {
+            /** Alias of safeParseAsync */
+            this.spa = this.safeParseAsync;
+            this._def = def;
+            this.parse = this.parse.bind(this);
+            this.safeParse = this.safeParse.bind(this);
+            this.parseAsync = this.parseAsync.bind(this);
+            this.safeParseAsync = this.safeParseAsync.bind(this);
+            this.spa = this.spa.bind(this);
+            this.refine = this.refine.bind(this);
+            this.refinement = this.refinement.bind(this);
+            this.superRefine = this.superRefine.bind(this);
+            this.optional = this.optional.bind(this);
+            this.nullable = this.nullable.bind(this);
+            this.nullish = this.nullish.bind(this);
+            this.array = this.array.bind(this);
+            this.promise = this.promise.bind(this);
+            this.or = this.or.bind(this);
+            this.and = this.and.bind(this);
+            this.transform = this.transform.bind(this);
+            this.brand = this.brand.bind(this);
+            this.default = this.default.bind(this);
+            this.catch = this.catch.bind(this);
+            this.describe = this.describe.bind(this);
+            this.pipe = this.pipe.bind(this);
+            this.readonly = this.readonly.bind(this);
+            this.isNullable = this.isNullable.bind(this);
+            this.isOptional = this.isOptional.bind(this);
+            this["~standard"] = {
+                version: 1,
+                vendor: "zod",
+                validate: (data) => this["~validate"](data),
+            };
+        }
         optional() {
             return ZodOptional.create(this, this._def);
         }
@@ -1404,7 +1404,10 @@
         }
         base64url(message) {
             // base64url encoding is a modification of base64 that can safely be used in URLs and filenames
-            return this._addCheck({ kind: "base64url", ...errorUtil.errToObj(message) });
+            return this._addCheck({
+                kind: "base64url",
+                ...errorUtil.errToObj(message),
+            });
         }
         jwt(options) {
             return this._addCheck({ kind: "jwt", ...errorUtil.errToObj(options) });
@@ -1505,8 +1508,7 @@
             });
         }
         /**
-         * @deprecated Use z.string().min(1) instead.
-         * @see {@link ZodString.min}
+         * Equivalent to `.min(1)`
          */
         nonempty(message) {
             return this.min(1, errorUtil.errToObj(message));
@@ -4148,7 +4150,23 @@
             ...processCreateParams(params),
         });
     };
-    function custom(check, params = {}, 
+    ////////////////////////////////////////
+    ////////////////////////////////////////
+    //////////                    //////////
+    //////////      z.custom      //////////
+    //////////                    //////////
+    ////////////////////////////////////////
+    ////////////////////////////////////////
+    function cleanParams(params, data) {
+        const p = typeof params === "function"
+            ? params(data)
+            : typeof params === "string"
+                ? { message: params }
+                : params;
+        const p2 = typeof p === "string" ? { message: p } : p;
+        return p2;
+    }
+    function custom(check, _params = {}, 
     /**
      * @deprecated
      *
@@ -4163,16 +4181,23 @@
         if (check)
             return ZodAny.create().superRefine((data, ctx) => {
                 var _a, _b;
-                if (!check(data)) {
-                    const p = typeof params === "function"
-                        ? params(data)
-                        : typeof params === "string"
-                            ? { message: params }
-                            : params;
-                    const _fatal = (_b = (_a = p.fatal) !== null && _a !== void 0 ? _a : fatal) !== null && _b !== void 0 ? _b : true;
-                    const p2 = typeof p === "string" ? { message: p } : p;
-                    ctx.addIssue({ code: "custom", ...p2, fatal: _fatal });
+                const r = check(data);
+                if (r instanceof Promise) {
+                    return r.then((r) => {
+                        var _a, _b;
+                        if (!r) {
+                            const params = cleanParams(_params, data);
+                            const _fatal = (_b = (_a = params.fatal) !== null && _a !== void 0 ? _a : fatal) !== null && _b !== void 0 ? _b : true;
+                            ctx.addIssue({ code: "custom", ...params, fatal: _fatal });
+                        }
+                    });
+                }
+                if (!r) {
+                    const params = cleanParams(_params, data);
+                    const _fatal = (_b = (_a = params.fatal) !== null && _a !== void 0 ? _a : fatal) !== null && _b !== void 0 ? _b : true;
+                    ctx.addIssue({ code: "custom", ...params, fatal: _fatal });
                 }
+                return;
             });
         return ZodAny.create();
     }

package/lib/standard-schema.d.ts

@@ -1,7 +1,7 @@
 /**
  * The Standard Schema interface.
  */
-export declare type StandardSchemaV1<Input = unknown, Output = Input> = {
+export type StandardSchemaV1<Input = unknown, Output = Input> = {
     /**
      * The Standard Schema properties.
      */