zod 3.15.0 → 3.16.1

package/lib/ZodError.d.ts

@@ -54,6 +54,7 @@ export interface ZodInvalidUnionDiscriminatorIssue extends ZodIssueBase {
     options: Primitive[];
 }
 export interface ZodInvalidEnumValueIssue extends ZodIssueBase {
+    received: string | number;
     code: typeof ZodIssueCode.invalid_enum_value;
     options: (string | number)[];
 }
@@ -110,7 +111,9 @@ export declare type ZodFormattedError<T, U = string> = {
     _errors: U[];
 } & (T extends [any, ...any[]] ? {
     [K in keyof T]?: ZodFormattedError<T[K]>;
-} : T extends any[] ? ZodFormattedError<T[number]>[] : T extends object ? {
+} : T extends any[] ? {
+    [k: number]: ZodFormattedError<T[number]>;
+} : T extends object ? {
     [K in keyof T]?: ZodFormattedError<T[K]>;
 } : unknown);
 export declare type inferFormattedError<T extends ZodType<any, any, any>, U = string> = ZodFormattedError<TypeOf<T>, U>;

package/lib/ZodError.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setErrorMap = exports.overrideErrorMap = exports.defaultErrorMap = exports.ZodError = exports.quotelessJson = exports.ZodIssueCode = void 0;
+const parseUtil_1 = require("./helpers/parseUtil");
 const util_1 = require("./helpers/util");
 exports.ZodIssueCode = util_1.util.arrayToEnum([
     "invalid_type",
@@ -75,14 +76,14 @@ class ZodError extends Error {
                         const el = issue.path[i];
                         const terminal = i === issue.path.length - 1;
                         if (!terminal) {
-                            if (typeof el === "string") {
-                                curr[el] = curr[el] || { _errors: [] };
-                            }
-                            else if (typeof el === "number") {
-                                const errorArray = [];
-                                errorArray._errors = [];
-                                curr[el] = curr[el] || errorArray;
-                            }
+                            curr[el] = curr[el] || { _errors: [] };
+                            // if (typeof el === "string") {
+                            //   curr[el] = curr[el] || { _errors: [] };
+                            // } else if (typeof el === "number") {
+                            //   const errorArray: any = [];
+                            //   errorArray._errors = [];
+                            //   curr[el] = curr[el] || errorArray;
+                            // }
                         }
                         else {
                             curr[el] = curr[el] || { _errors: [] };
@@ -133,7 +134,7 @@ const defaultErrorMap = (issue, _ctx) => {
     let message;
     switch (issue.code) {
         case exports.ZodIssueCode.invalid_type:
-            if (issue.received === "undefined") {
+            if (issue.received === parseUtil_1.ZodParsedType.undefined) {
                 message = "Required";
             }
             else {
@@ -144,22 +145,16 @@ const defaultErrorMap = (issue, _ctx) => {
             message = `Invalid literal value, expected ${JSON.stringify(issue.expected)}`;
             break;
         case exports.ZodIssueCode.unrecognized_keys:
-            message = `Unrecognized key(s) in object: ${issue.keys
-                .map((k) => `'${k}'`)
-                .join(", ")}`;
+            message = `Unrecognized key(s) in object: ${util_1.util.joinValues(issue.keys, ", ")}`;
             break;
         case exports.ZodIssueCode.invalid_union:
             message = `Invalid input`;
             break;
         case exports.ZodIssueCode.invalid_union_discriminator:
-            message = `Invalid discriminator value. Expected ${issue.options
-                .map((val) => (typeof val === "string" ? `'${val}'` : val))
-                .join(" | ")}`;
+            message = `Invalid discriminator value. Expected ${util_1.util.joinValues(issue.options)}`;
             break;
         case exports.ZodIssueCode.invalid_enum_value:
-            message = `Invalid enum value. Expected ${issue.options
-                .map((val) => (typeof val === "string" ? `'${val}'` : val))
-                .join(" | ")}`;
+            message = `Invalid enum value. Expected ${util_1.util.joinValues(issue.options)}, received '${issue.received}'`;
             break;
         case exports.ZodIssueCode.invalid_arguments:
             message = `Invalid function arguments`;

package/lib/helpers/util.d.ts

@@ -15,4 +15,5 @@ export declare namespace util {
     }>;
     type noUndefined<T> = T extends undefined ? never : T;
     const isInteger: NumberConstructor["isInteger"];
+    function joinValues<T extends any[]>(array: T, separator?: string): string;
 }

package/lib/helpers/util.js

@@ -48,4 +48,10 @@ var util;
     util.isInteger = typeof Number.isInteger === "function"
         ? (val) => Number.isInteger(val) // eslint-disable-line ban/ban
         : (val) => typeof val === "number" && isFinite(val) && Math.floor(val) === val;
+    function joinValues(array, separator = " | ") {
+        return array
+            .map((val) => (typeof val === "string" ? `'${val}'` : val))
+            .join(separator);
+    }
+    util.joinValues = joinValues;
 })(util = exports.util || (exports.util = {}));

package/lib/index.mjs

@@ -45,6 +45,12 @@ var util;
     util.isInteger = typeof Number.isInteger === "function"
         ? (val) => Number.isInteger(val) // eslint-disable-line ban/ban
         : (val) => typeof val === "number" && isFinite(val) && Math.floor(val) === val;
+    function joinValues(array, separator = " | ") {
+        return array
+            .map((val) => (typeof val === "string" ? `'${val}'` : val))
+            .join(separator);
+    }
+    util.joinValues = joinValues;
 })(util || (util = {}));
 
 const ZodIssueCode = util.arrayToEnum([
@@ -119,14 +125,14 @@ class ZodError extends Error {
                         const el = issue.path[i];
                         const terminal = i === issue.path.length - 1;
                         if (!terminal) {
-                            if (typeof el === "string") {
-                                curr[el] = curr[el] || { _errors: [] };
-                            }
-                            else if (typeof el === "number") {
-                                const errorArray = [];
-                                errorArray._errors = [];
-                                curr[el] = curr[el] || errorArray;
-                            }
+                            curr[el] = curr[el] || { _errors: [] };
+                            // if (typeof el === "string") {
+                            //   curr[el] = curr[el] || { _errors: [] };
+                            // } else if (typeof el === "number") {
+                            //   const errorArray: any = [];
+                            //   errorArray._errors = [];
+                            //   curr[el] = curr[el] || errorArray;
+                            // }
                         }
                         else {
                             curr[el] = curr[el] || { _errors: [] };
@@ -176,7 +182,7 @@ const defaultErrorMap = (issue, _ctx) => {
     let message;
     switch (issue.code) {
         case ZodIssueCode.invalid_type:
-            if (issue.received === "undefined") {
+            if (issue.received === ZodParsedType.undefined) {
                 message = "Required";
             }
             else {
@@ -187,22 +193,16 @@ const defaultErrorMap = (issue, _ctx) => {
             message = `Invalid literal value, expected ${JSON.stringify(issue.expected)}`;
             break;
         case ZodIssueCode.unrecognized_keys:
-            message = `Unrecognized key(s) in object: ${issue.keys
-                .map((k) => `'${k}'`)
-                .join(", ")}`;
+            message = `Unrecognized key(s) in object: ${util.joinValues(issue.keys, ", ")}`;
             break;
         case ZodIssueCode.invalid_union:
             message = `Invalid input`;
             break;
         case ZodIssueCode.invalid_union_discriminator:
-            message = `Invalid discriminator value. Expected ${issue.options
-                .map((val) => (typeof val === "string" ? `'${val}'` : val))
-                .join(" | ")}`;
+            message = `Invalid discriminator value. Expected ${util.joinValues(issue.options)}`;
             break;
         case ZodIssueCode.invalid_enum_value:
-            message = `Invalid enum value. Expected ${issue.options
-                .map((val) => (typeof val === "string" ? `'${val}'` : val))
-                .join(" | ")}`;
+            message = `Invalid enum value. Expected ${util.joinValues(issue.options)}, received '${issue.received}'`;
             break;
         case ZodIssueCode.invalid_arguments:
             message = `Invalid function arguments`;
@@ -709,8 +709,8 @@ class ZodString extends ZodType {
             ...errorUtil.errToObj(message),
         });
         /**
-         * Deprecated.
-         * Use z.string().min(1) instead.
+         * @deprecated Use z.string().min(1) instead.
+         * @see {@link ZodString.min}
          */
         this.nonempty = (message) => this.min(1, errorUtil.errToObj(message));
     }
@@ -2390,11 +2390,23 @@ function createZodEnum(values) {
 }
 class ZodEnum extends ZodType {
     _parse(input) {
+        if (typeof input.data !== "string") {
+            const ctx = this._getOrReturnCtx(input);
+            const expectedValues = this._def.values;
+            addIssueToContext(ctx, {
+                expected: util.joinValues(expectedValues),
+                received: ctx.parsedType,
+                code: ZodIssueCode.invalid_type,
+            });
+            return INVALID;
+        }
         if (this._def.values.indexOf(input.data) === -1) {
             const ctx = this._getOrReturnCtx(input);
+            const expectedValues = this._def.values;
             addIssueToContext(ctx, {
+                received: ctx.data,
                 code: ZodIssueCode.invalid_enum_value,
-                options: this._def.values,
+                options: expectedValues,
             });
             return INVALID;
         }
@@ -2429,11 +2441,23 @@ ZodEnum.create = createZodEnum;
 class ZodNativeEnum extends ZodType {
     _parse(input) {
         const nativeEnumValues = util.getValidEnumValues(this._def.values);
+        const ctx = this._getOrReturnCtx(input);
+        if (ctx.parsedType !== ZodParsedType.string &&
+            ctx.parsedType !== ZodParsedType.number) {
+            const expectedValues = util.objectValues(nativeEnumValues);
+            addIssueToContext(ctx, {
+                expected: util.joinValues(expectedValues),
+                received: ctx.parsedType,
+                code: ZodIssueCode.invalid_type,
+            });
+            return INVALID;
+        }
         if (nativeEnumValues.indexOf(input.data) === -1) {
-            const ctx = this._getOrReturnCtx(input);
+            const expectedValues = util.objectValues(nativeEnumValues);
             addIssueToContext(ctx, {
+                received: ctx.data,
                 code: ZodIssueCode.invalid_enum_value,
-                options: util.objectValues(nativeEnumValues),
+                options: expectedValues,
             });
             return INVALID;
         }
@@ -2591,7 +2615,7 @@ class ZodEffects extends ZodType {
                     // if (base.status === "dirty") {
                     //   return { status: "dirty", value: base.value };
                     // }
-                    return Promise.resolve(effect.transform(base.value, checkCtx)).then(OK);
+                    return Promise.resolve(effect.transform(base.value, checkCtx)).then((result) => ({ status: status.value, value: result }));
                 });
             }
         }
@@ -2697,9 +2721,15 @@ ZodNaN.create = (params) => {
         ...processCreateParams(params),
     });
 };
-const custom = (check, params) => {
+const custom = (check, params = {}, fatal) => {
     if (check)
-        return ZodAny.create().refine(check, params);
+        return ZodAny.create().superRefine((data, ctx) => {
+            if (!check(data)) {
+                const p = typeof params === "function" ? params(data) : params;
+                const p2 = typeof p === "string" ? { message: p } : p;
+                ctx.addIssue({ code: "custom", ...p2, fatal });
+            }
+        });
     return ZodAny.create();
 };
 const late = {
@@ -2741,7 +2771,7 @@ var ZodFirstPartyTypeKind;
 })(ZodFirstPartyTypeKind || (ZodFirstPartyTypeKind = {}));
 const instanceOfType = (cls, params = {
     message: `Input not instance of ${cls.name}`,
-}) => custom((data) => data instanceof cls, params);
+}) => custom((data) => data instanceof cls, params, true);
 const stringType = ZodString.create;
 const numberType = ZodNumber.create;
 const nanType = ZodNaN.create;

package/lib/index.umd.js

@@ -51,6 +51,12 @@
         util.isInteger = typeof Number.isInteger === "function"
             ? (val) => Number.isInteger(val) // eslint-disable-line ban/ban
             : (val) => typeof val === "number" && isFinite(val) && Math.floor(val) === val;
+        function joinValues(array, separator = " | ") {
+            return array
+                .map((val) => (typeof val === "string" ? `'${val}'` : val))
+                .join(separator);
+        }
+        util.joinValues = joinValues;
     })(util || (util = {}));
 
     const ZodIssueCode = util.arrayToEnum([
@@ -125,14 +131,14 @@
                             const el = issue.path[i];
                             const terminal = i === issue.path.length - 1;
                             if (!terminal) {
-                                if (typeof el === "string") {
-                                    curr[el] = curr[el] || { _errors: [] };
-                                }
-                                else if (typeof el === "number") {
-                                    const errorArray = [];
-                                    errorArray._errors = [];
-                                    curr[el] = curr[el] || errorArray;
-                                }
+                                curr[el] = curr[el] || { _errors: [] };
+                                // if (typeof el === "string") {
+                                //   curr[el] = curr[el] || { _errors: [] };
+                                // } else if (typeof el === "number") {
+                                //   const errorArray: any = [];
+                                //   errorArray._errors = [];
+                                //   curr[el] = curr[el] || errorArray;
+                                // }
                             }
                             else {
                                 curr[el] = curr[el] || { _errors: [] };
@@ -182,7 +188,7 @@
         let message;
         switch (issue.code) {
             case ZodIssueCode.invalid_type:
-                if (issue.received === "undefined") {
+                if (issue.received === ZodParsedType.undefined) {
                     message = "Required";
                 }
                 else {
@@ -193,22 +199,16 @@
                 message = `Invalid literal value, expected ${JSON.stringify(issue.expected)}`;
                 break;
             case ZodIssueCode.unrecognized_keys:
-                message = `Unrecognized key(s) in object: ${issue.keys
-                .map((k) => `'${k}'`)
-                .join(", ")}`;
+                message = `Unrecognized key(s) in object: ${util.joinValues(issue.keys, ", ")}`;
                 break;
             case ZodIssueCode.invalid_union:
                 message = `Invalid input`;
                 break;
             case ZodIssueCode.invalid_union_discriminator:
-                message = `Invalid discriminator value. Expected ${issue.options
-                .map((val) => (typeof val === "string" ? `'${val}'` : val))
-                .join(" | ")}`;
+                message = `Invalid discriminator value. Expected ${util.joinValues(issue.options)}`;
                 break;
             case ZodIssueCode.invalid_enum_value:
-                message = `Invalid enum value. Expected ${issue.options
-                .map((val) => (typeof val === "string" ? `'${val}'` : val))
-                .join(" | ")}`;
+                message = `Invalid enum value. Expected ${util.joinValues(issue.options)}, received '${issue.received}'`;
                 break;
             case ZodIssueCode.invalid_arguments:
                 message = `Invalid function arguments`;
@@ -715,8 +715,8 @@
                 ...errorUtil.errToObj(message),
             });
             /**
-             * Deprecated.
-             * Use z.string().min(1) instead.
+             * @deprecated Use z.string().min(1) instead.
+             * @see {@link ZodString.min}
              */
             this.nonempty = (message) => this.min(1, errorUtil.errToObj(message));
         }
@@ -2396,11 +2396,23 @@
     }
     class ZodEnum extends ZodType {
         _parse(input) {
+            if (typeof input.data !== "string") {
+                const ctx = this._getOrReturnCtx(input);
+                const expectedValues = this._def.values;
+                addIssueToContext(ctx, {
+                    expected: util.joinValues(expectedValues),
+                    received: ctx.parsedType,
+                    code: ZodIssueCode.invalid_type,
+                });
+                return INVALID;
+            }
             if (this._def.values.indexOf(input.data) === -1) {
                 const ctx = this._getOrReturnCtx(input);
+                const expectedValues = this._def.values;
                 addIssueToContext(ctx, {
+                    received: ctx.data,
                     code: ZodIssueCode.invalid_enum_value,
-                    options: this._def.values,
+                    options: expectedValues,
                 });
                 return INVALID;
             }
@@ -2435,11 +2447,23 @@
     class ZodNativeEnum extends ZodType {
         _parse(input) {
             const nativeEnumValues = util.getValidEnumValues(this._def.values);
+            const ctx = this._getOrReturnCtx(input);
+            if (ctx.parsedType !== ZodParsedType.string &&
+                ctx.parsedType !== ZodParsedType.number) {
+                const expectedValues = util.objectValues(nativeEnumValues);
+                addIssueToContext(ctx, {
+                    expected: util.joinValues(expectedValues),
+                    received: ctx.parsedType,
+                    code: ZodIssueCode.invalid_type,
+                });
+                return INVALID;
+            }
             if (nativeEnumValues.indexOf(input.data) === -1) {
-                const ctx = this._getOrReturnCtx(input);
+                const expectedValues = util.objectValues(nativeEnumValues);
                 addIssueToContext(ctx, {
+                    received: ctx.data,
                     code: ZodIssueCode.invalid_enum_value,
-                    options: util.objectValues(nativeEnumValues),
+                    options: expectedValues,
                 });
                 return INVALID;
             }
@@ -2597,7 +2621,7 @@
                         // if (base.status === "dirty") {
                         //   return { status: "dirty", value: base.value };
                         // }
-                        return Promise.resolve(effect.transform(base.value, checkCtx)).then(OK);
+                        return Promise.resolve(effect.transform(base.value, checkCtx)).then((result) => ({ status: status.value, value: result }));
                     });
                 }
             }
@@ -2703,9 +2727,15 @@
             ...processCreateParams(params),
         });
     };
-    const custom = (check, params) => {
+    const custom = (check, params = {}, fatal) => {
         if (check)
-            return ZodAny.create().refine(check, params);
+            return ZodAny.create().superRefine((data, ctx) => {
+                if (!check(data)) {
+                    const p = typeof params === "function" ? params(data) : params;
+                    const p2 = typeof p === "string" ? { message: p } : p;
+                    ctx.addIssue({ code: "custom", ...p2, fatal });
+                }
+            });
         return ZodAny.create();
     };
     const late = {
@@ -2747,7 +2777,7 @@
     })(exports.ZodFirstPartyTypeKind || (exports.ZodFirstPartyTypeKind = {}));
     const instanceOfType = (cls, params = {
         message: `Input not instance of ${cls.name}`,
-    }) => custom((data) => data instanceof cls, params);
+    }) => custom((data) => data instanceof cls, params, true);
     const stringType = ZodString.create;
     const numberType = ZodNumber.create;
     const nanType = ZodNaN.create;

package/lib/types.d.ts

@@ -120,8 +120,8 @@ export declare class ZodString extends ZodType<string, ZodStringDef> {
     max(maxLength: number, message?: errorUtil.ErrMessage): ZodString;
     length(len: number, message?: errorUtil.ErrMessage): ZodString;
     /**
-     * Deprecated.
-     * Use z.string().min(1) instead.
+     * @deprecated Use z.string().min(1) instead.
+     * @see {@link ZodString.min}
      */
     nonempty: (message?: errorUtil.ErrMessage | undefined) => ZodString;
     get isEmail(): boolean;
@@ -267,28 +267,28 @@ export declare class ZodArray<T extends ZodTypeAny, Cardinality extends ArrayCar
 }
 export declare type ZodNonEmptyArray<T extends ZodTypeAny> = ZodArray<T, "atleastone">;
 export declare namespace objectUtil {
-    type MergeShapes<U extends ZodRawShape, V extends ZodRawShape> = {
+    export type MergeShapes<U extends ZodRawShape, V extends ZodRawShape> = {
         [k in Exclude<keyof U, keyof V>]: U[k];
     } & V;
+    type optionalKeys<T extends object> = {
+        [k in keyof T]: undefined extends T[k] ? k : never;
+    }[keyof T];
     type requiredKeys<T extends object> = {
         [k in keyof T]: undefined extends T[k] ? never : k;
     }[keyof T];
-    type addQuestionMarks<T extends object> = {
-        [k in keyof T]?: T[k];
-    } & {
-        [k in requiredKeys<T>]: T[k];
-    };
-    type identity<T> = T;
-    type flatten<T extends object> = identity<{
+    export type addQuestionMarks<T extends object> = Partial<Pick<T, optionalKeys<T>>> & Pick<T, requiredKeys<T>>;
+    export type identity<T> = T;
+    export type flatten<T extends object> = identity<{
         [k in keyof T]: T[k];
     }>;
-    type noNeverKeys<T extends ZodRawShape> = {
+    export type noNeverKeys<T extends ZodRawShape> = {
         [k in keyof T]: [T[k]] extends [never] ? never : k;
     }[keyof T];
-    type noNever<T extends ZodRawShape> = identity<{
+    export type noNever<T extends ZodRawShape> = identity<{
         [k in noNeverKeys<T>]: k extends keyof T ? T[k] : never;
     }>;
-    const mergeShapes: <U extends ZodRawShape, T extends ZodRawShape>(first: U, second: T) => T & U;
+    export const mergeShapes: <U extends ZodRawShape, T extends ZodRawShape>(first: U, second: T) => T & U;
+    export {};
 }
 export declare type extendShape<A, B> = Omit<A, keyof B> & B;
 declare type UnknownKeysParam = "passthrough" | "strict" | "strip";
@@ -625,7 +625,7 @@ export declare class ZodNaN extends ZodType<number, ZodNaNDef> {
     _parse(input: ParseInput): ParseReturnType<any>;
     static create: (params?: RawCreateParams) => ZodNaN;
 }
-export declare const custom: <T>(check?: ((data: unknown) => any) | undefined, params?: Parameters<ZodTypeAny["refine"]>[1]) => ZodType<T, ZodTypeDef, T>;
+export declare const custom: <T>(check?: ((data: unknown) => any) | undefined, params?: Parameters<ZodTypeAny["refine"]>[1], fatal?: boolean | undefined) => ZodType<T, ZodTypeDef, T>;
 export { ZodType as Schema, ZodType as ZodSchema };
 export declare const late: {
     object: <T extends ZodRawShape>(shape: () => T, params?: RawCreateParams) => ZodObject<T, "strip", ZodTypeAny, { [k_1 in keyof objectUtil.addQuestionMarks<{ [k in keyof T]: T[k]["_output"]; }>]: objectUtil.addQuestionMarks<{ [k in keyof T]: T[k]["_output"]; }>[k_1]; }, { [k_3 in keyof objectUtil.addQuestionMarks<{ [k_2 in keyof T]: T[k_2]["_input"]; }>]: objectUtil.addQuestionMarks<{ [k_2 in keyof T]: T[k_2]["_input"]; }>[k_3]; }>;

package/lib/types.js

@@ -291,8 +291,8 @@ class ZodString extends ZodType {
             ...errorUtil_1.errorUtil.errToObj(message),
         });
         /**
-         * Deprecated.
-         * Use z.string().min(1) instead.
+         * @deprecated Use z.string().min(1) instead.
+         * @see {@link ZodString.min}
          */
         this.nonempty = (message) => this.min(1, errorUtil_1.errorUtil.errToObj(message));
     }
@@ -1996,11 +1996,23 @@ function createZodEnum(values) {
 }
 class ZodEnum extends ZodType {
     _parse(input) {
+        if (typeof input.data !== "string") {
+            const ctx = this._getOrReturnCtx(input);
+            const expectedValues = this._def.values;
+            (0, parseUtil_1.addIssueToContext)(ctx, {
+                expected: util_1.util.joinValues(expectedValues),
+                received: ctx.parsedType,
+                code: ZodError_1.ZodIssueCode.invalid_type,
+            });
+            return parseUtil_1.INVALID;
+        }
         if (this._def.values.indexOf(input.data) === -1) {
             const ctx = this._getOrReturnCtx(input);
+            const expectedValues = this._def.values;
             (0, parseUtil_1.addIssueToContext)(ctx, {
+                received: ctx.data,
                 code: ZodError_1.ZodIssueCode.invalid_enum_value,
-                options: this._def.values,
+                options: expectedValues,
             });
             return parseUtil_1.INVALID;
         }
@@ -2036,11 +2048,23 @@ ZodEnum.create = createZodEnum;
 class ZodNativeEnum extends ZodType {
     _parse(input) {
         const nativeEnumValues = util_1.util.getValidEnumValues(this._def.values);
+        const ctx = this._getOrReturnCtx(input);
+        if (ctx.parsedType !== parseUtil_1.ZodParsedType.string &&
+            ctx.parsedType !== parseUtil_1.ZodParsedType.number) {
+            const expectedValues = util_1.util.objectValues(nativeEnumValues);
+            (0, parseUtil_1.addIssueToContext)(ctx, {
+                expected: util_1.util.joinValues(expectedValues),
+                received: ctx.parsedType,
+                code: ZodError_1.ZodIssueCode.invalid_type,
+            });
+            return parseUtil_1.INVALID;
+        }
         if (nativeEnumValues.indexOf(input.data) === -1) {
-            const ctx = this._getOrReturnCtx(input);
+            const expectedValues = util_1.util.objectValues(nativeEnumValues);
             (0, parseUtil_1.addIssueToContext)(ctx, {
+                received: ctx.data,
                 code: ZodError_1.ZodIssueCode.invalid_enum_value,
-                options: util_1.util.objectValues(nativeEnumValues),
+                options: expectedValues,
             });
             return parseUtil_1.INVALID;
         }
@@ -2200,7 +2224,7 @@ class ZodEffects extends ZodType {
                     // if (base.status === "dirty") {
                     //   return { status: "dirty", value: base.value };
                     // }
-                    return Promise.resolve(effect.transform(base.value, checkCtx)).then(parseUtil_1.OK);
+                    return Promise.resolve(effect.transform(base.value, checkCtx)).then((result) => ({ status: status.value, value: result }));
                 });
             }
         }
@@ -2312,9 +2336,15 @@ ZodNaN.create = (params) => {
         ...processCreateParams(params),
     });
 };
-const custom = (check, params) => {
+const custom = (check, params = {}, fatal) => {
     if (check)
-        return ZodAny.create().refine(check, params);
+        return ZodAny.create().superRefine((data, ctx) => {
+            if (!check(data)) {
+                const p = typeof params === "function" ? params(data) : params;
+                const p2 = typeof p === "string" ? { message: p } : p;
+                ctx.addIssue({ code: "custom", ...p2, fatal });
+            }
+        });
     return ZodAny.create();
 };
 exports.custom = custom;
@@ -2357,7 +2387,7 @@ var ZodFirstPartyTypeKind;
 })(ZodFirstPartyTypeKind = exports.ZodFirstPartyTypeKind || (exports.ZodFirstPartyTypeKind = {}));
 const instanceOfType = (cls, params = {
     message: `Input not instance of ${cls.name}`,
-}) => (0, exports.custom)((data) => data instanceof cls, params);
+}) => (0, exports.custom)((data) => data instanceof cls, params, true);
 exports.instanceof = instanceOfType;
 const stringType = ZodString.create;
 exports.string = stringType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zod",
-  "version": "3.15.0",
+  "version": "3.16.1",
   "description": "TypeScript-first schema declaration and validation library with static type inference",
   "main": "./lib/index.js",
   "types": "./index.d.ts",