zod 3.16.0 → 3.17.2

package/lib/types.js

@@ -80,13 +80,13 @@ class ZodType {
         return this._def.description;
     }
     _getType(input) {
-        return (0, parseUtil_1.getParsedType)(input.data);
+        return (0, util_1.getParsedType)(input.data);
     }
     _getOrReturnCtx(input, ctx) {
         return (ctx || {
             common: input.parent.common,
             data: input.data,
-            parsedType: (0, parseUtil_1.getParsedType)(input.data),
+            parsedType: (0, util_1.getParsedType)(input.data),
             schemaErrorMap: this._def.errorMap,
             path: input.path,
             parent: input.parent,
@@ -98,7 +98,7 @@ class ZodType {
             ctx: {
                 common: input.parent.common,
                 data: input.data,
-                parsedType: (0, parseUtil_1.getParsedType)(input.data),
+                parsedType: (0, util_1.getParsedType)(input.data),
                 schemaErrorMap: this._def.errorMap,
                 path: input.path,
                 parent: input.parent,
@@ -134,7 +134,7 @@ class ZodType {
             schemaErrorMap: this._def.errorMap,
             parent: null,
             data,
-            parsedType: (0, parseUtil_1.getParsedType)(data),
+            parsedType: (0, util_1.getParsedType)(data),
         };
         const result = this._parseSync({ data, path: ctx.path, parent: ctx });
         return handleResult(ctx, result);
@@ -156,7 +156,7 @@ class ZodType {
             schemaErrorMap: this._def.errorMap,
             parent: null,
             data,
-            parsedType: (0, parseUtil_1.getParsedType)(data),
+            parsedType: (0, util_1.getParsedType)(data),
         };
         const maybeAsyncResult = this._parse({ data, path: [], parent: ctx });
         const result = await ((0, parseUtil_1.isAsync)(maybeAsyncResult)
@@ -291,18 +291,22 @@ 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));
+        this.trim = () => new ZodString({
+            ...this._def,
+            checks: [...this._def.checks, { kind: "trim" }],
+        });
     }
     _parse(input) {
         const parsedType = this._getType(input);
-        if (parsedType !== parseUtil_1.ZodParsedType.string) {
+        if (parsedType !== util_1.ZodParsedType.string) {
             const ctx = this._getOrReturnCtx(input);
             (0, parseUtil_1.addIssueToContext)(ctx, {
                 code: ZodError_1.ZodIssueCode.invalid_type,
-                expected: parseUtil_1.ZodParsedType.string,
+                expected: util_1.ZodParsedType.string,
                 received: ctx.parsedType,
             }
             //
@@ -398,6 +402,12 @@ class ZodString extends ZodType {
                     status.dirty();
                 }
             }
+            else if (check.kind === "trim") {
+                input.data = input.data.trim();
+            }
+            else {
+                util_1.util.assertNever(check);
+            }
         }
         return { status: status.value, value: input.data };
     }
@@ -504,11 +514,11 @@ class ZodNumber extends ZodType {
     }
     _parse(input) {
         const parsedType = this._getType(input);
-        if (parsedType !== parseUtil_1.ZodParsedType.number) {
+        if (parsedType !== util_1.ZodParsedType.number) {
             const ctx = this._getOrReturnCtx(input);
             (0, parseUtil_1.addIssueToContext)(ctx, {
                 code: ZodError_1.ZodIssueCode.invalid_type,
-                expected: parseUtil_1.ZodParsedType.number,
+                expected: util_1.ZodParsedType.number,
                 received: ctx.parsedType,
             });
             return parseUtil_1.INVALID;
@@ -689,11 +699,11 @@ ZodNumber.create = (params) => {
 class ZodBigInt extends ZodType {
     _parse(input) {
         const parsedType = this._getType(input);
-        if (parsedType !== parseUtil_1.ZodParsedType.bigint) {
+        if (parsedType !== util_1.ZodParsedType.bigint) {
             const ctx = this._getOrReturnCtx(input);
             (0, parseUtil_1.addIssueToContext)(ctx, {
                 code: ZodError_1.ZodIssueCode.invalid_type,
-                expected: parseUtil_1.ZodParsedType.bigint,
+                expected: util_1.ZodParsedType.bigint,
                 received: ctx.parsedType,
             });
             return parseUtil_1.INVALID;
@@ -711,11 +721,11 @@ ZodBigInt.create = (params) => {
 class ZodBoolean extends ZodType {
     _parse(input) {
         const parsedType = this._getType(input);
-        if (parsedType !== parseUtil_1.ZodParsedType.boolean) {
+        if (parsedType !== util_1.ZodParsedType.boolean) {
             const ctx = this._getOrReturnCtx(input);
             (0, parseUtil_1.addIssueToContext)(ctx, {
                 code: ZodError_1.ZodIssueCode.invalid_type,
-                expected: parseUtil_1.ZodParsedType.boolean,
+                expected: util_1.ZodParsedType.boolean,
                 received: ctx.parsedType,
             });
             return parseUtil_1.INVALID;
@@ -733,11 +743,11 @@ ZodBoolean.create = (params) => {
 class ZodDate extends ZodType {
     _parse(input) {
         const parsedType = this._getType(input);
-        if (parsedType !== parseUtil_1.ZodParsedType.date) {
+        if (parsedType !== util_1.ZodParsedType.date) {
             const ctx = this._getOrReturnCtx(input);
             (0, parseUtil_1.addIssueToContext)(ctx, {
                 code: ZodError_1.ZodIssueCode.invalid_type,
-                expected: parseUtil_1.ZodParsedType.date,
+                expected: util_1.ZodParsedType.date,
                 received: ctx.parsedType,
             });
             return parseUtil_1.INVALID;
@@ -765,11 +775,11 @@ ZodDate.create = (params) => {
 class ZodUndefined extends ZodType {
     _parse(input) {
         const parsedType = this._getType(input);
-        if (parsedType !== parseUtil_1.ZodParsedType.undefined) {
+        if (parsedType !== util_1.ZodParsedType.undefined) {
             const ctx = this._getOrReturnCtx(input);
             (0, parseUtil_1.addIssueToContext)(ctx, {
                 code: ZodError_1.ZodIssueCode.invalid_type,
-                expected: parseUtil_1.ZodParsedType.undefined,
+                expected: util_1.ZodParsedType.undefined,
                 received: ctx.parsedType,
             });
             return parseUtil_1.INVALID;
@@ -787,11 +797,11 @@ ZodUndefined.create = (params) => {
 class ZodNull extends ZodType {
     _parse(input) {
         const parsedType = this._getType(input);
-        if (parsedType !== parseUtil_1.ZodParsedType.null) {
+        if (parsedType !== util_1.ZodParsedType.null) {
             const ctx = this._getOrReturnCtx(input);
             (0, parseUtil_1.addIssueToContext)(ctx, {
                 code: ZodError_1.ZodIssueCode.invalid_type,
-                expected: parseUtil_1.ZodParsedType.null,
+                expected: util_1.ZodParsedType.null,
                 received: ctx.parsedType,
             });
             return parseUtil_1.INVALID;
@@ -845,7 +855,7 @@ class ZodNever extends ZodType {
         const ctx = this._getOrReturnCtx(input);
         (0, parseUtil_1.addIssueToContext)(ctx, {
             code: ZodError_1.ZodIssueCode.invalid_type,
-            expected: parseUtil_1.ZodParsedType.never,
+            expected: util_1.ZodParsedType.never,
             received: ctx.parsedType,
         });
         return parseUtil_1.INVALID;
@@ -861,11 +871,11 @@ ZodNever.create = (params) => {
 class ZodVoid extends ZodType {
     _parse(input) {
         const parsedType = this._getType(input);
-        if (parsedType !== parseUtil_1.ZodParsedType.undefined) {
+        if (parsedType !== util_1.ZodParsedType.undefined) {
             const ctx = this._getOrReturnCtx(input);
             (0, parseUtil_1.addIssueToContext)(ctx, {
                 code: ZodError_1.ZodIssueCode.invalid_type,
-                expected: parseUtil_1.ZodParsedType.void,
+                expected: util_1.ZodParsedType.void,
                 received: ctx.parsedType,
             });
             return parseUtil_1.INVALID;
@@ -884,10 +894,10 @@ class ZodArray extends ZodType {
     _parse(input) {
         const { ctx, status } = this._processInputParams(input);
         const def = this._def;
-        if (ctx.parsedType !== parseUtil_1.ZodParsedType.array) {
+        if (ctx.parsedType !== util_1.ZodParsedType.array) {
             (0, parseUtil_1.addIssueToContext)(ctx, {
                 code: ZodError_1.ZodIssueCode.invalid_type,
-                expected: parseUtil_1.ZodParsedType.array,
+                expected: util_1.ZodParsedType.array,
                 received: ctx.parsedType,
             });
             return parseUtil_1.INVALID;
@@ -1034,11 +1044,11 @@ class ZodObject extends ZodType {
     }
     _parse(input) {
         const parsedType = this._getType(input);
-        if (parsedType !== parseUtil_1.ZodParsedType.object) {
+        if (parsedType !== util_1.ZodParsedType.object) {
             const ctx = this._getOrReturnCtx(input);
             (0, parseUtil_1.addIssueToContext)(ctx, {
                 code: ZodError_1.ZodIssueCode.invalid_type,
-                expected: parseUtil_1.ZodParsedType.object,
+                expected: util_1.ZodParsedType.object,
                 received: ctx.parsedType,
             });
             return parseUtil_1.INVALID;
@@ -1188,7 +1198,9 @@ class ZodObject extends ZodType {
     pick(mask) {
         const shape = {};
         util_1.util.objectKeys(mask).map((key) => {
-            shape[key] = this.shape[key];
+            // only add to shape if key corresponds to an element of the current shape
+            if (this.shape[key])
+                shape[key] = this.shape[key];
         });
         return new ZodObject({
             ...this._def,
@@ -1381,10 +1393,10 @@ ZodUnion.create = (types, params) => {
 class ZodDiscriminatedUnion extends ZodType {
     _parse(input) {
         const { ctx } = this._processInputParams(input);
-        if (ctx.parsedType !== parseUtil_1.ZodParsedType.object) {
+        if (ctx.parsedType !== util_1.ZodParsedType.object) {
             (0, parseUtil_1.addIssueToContext)(ctx, {
                 code: ZodError_1.ZodIssueCode.invalid_type,
-                expected: parseUtil_1.ZodParsedType.object,
+                expected: util_1.ZodParsedType.object,
                 received: ctx.parsedType,
             });
             return parseUtil_1.INVALID;
@@ -1458,12 +1470,12 @@ class ZodDiscriminatedUnion extends ZodType {
 }
 exports.ZodDiscriminatedUnion = ZodDiscriminatedUnion;
 function mergeValues(a, b) {
-    const aType = (0, parseUtil_1.getParsedType)(a);
-    const bType = (0, parseUtil_1.getParsedType)(b);
+    const aType = (0, util_1.getParsedType)(a);
+    const bType = (0, util_1.getParsedType)(b);
     if (a === b) {
         return { valid: true, data: a };
     }
-    else if (aType === parseUtil_1.ZodParsedType.object && bType === parseUtil_1.ZodParsedType.object) {
+    else if (aType === util_1.ZodParsedType.object && bType === util_1.ZodParsedType.object) {
         const bKeys = util_1.util.objectKeys(b);
         const sharedKeys = util_1.util
             .objectKeys(a)
@@ -1478,7 +1490,7 @@ function mergeValues(a, b) {
         }
         return { valid: true, data: newObj };
     }
-    else if (aType === parseUtil_1.ZodParsedType.array && bType === parseUtil_1.ZodParsedType.array) {
+    else if (aType === util_1.ZodParsedType.array && bType === util_1.ZodParsedType.array) {
         if (a.length !== b.length) {
             return { valid: false };
         }
@@ -1494,8 +1506,8 @@ function mergeValues(a, b) {
         }
         return { valid: true, data: newArray };
     }
-    else if (aType === parseUtil_1.ZodParsedType.date &&
-        bType === parseUtil_1.ZodParsedType.date &&
+    else if (aType === util_1.ZodParsedType.date &&
+        bType === util_1.ZodParsedType.date &&
         +a === +b) {
         return { valid: true, data: a };
     }
@@ -1561,10 +1573,10 @@ ZodIntersection.create = (left, right, params) => {
 class ZodTuple extends ZodType {
     _parse(input) {
         const { status, ctx } = this._processInputParams(input);
-        if (ctx.parsedType !== parseUtil_1.ZodParsedType.array) {
+        if (ctx.parsedType !== util_1.ZodParsedType.array) {
             (0, parseUtil_1.addIssueToContext)(ctx, {
                 code: ZodError_1.ZodIssueCode.invalid_type,
-                expected: parseUtil_1.ZodParsedType.array,
+                expected: util_1.ZodParsedType.array,
                 received: ctx.parsedType,
             });
             return parseUtil_1.INVALID;
@@ -1633,10 +1645,10 @@ class ZodRecord extends ZodType {
     }
     _parse(input) {
         const { status, ctx } = this._processInputParams(input);
-        if (ctx.parsedType !== parseUtil_1.ZodParsedType.object) {
+        if (ctx.parsedType !== util_1.ZodParsedType.object) {
             (0, parseUtil_1.addIssueToContext)(ctx, {
                 code: ZodError_1.ZodIssueCode.invalid_type,
-                expected: parseUtil_1.ZodParsedType.object,
+                expected: util_1.ZodParsedType.object,
                 received: ctx.parsedType,
             });
             return parseUtil_1.INVALID;
@@ -1681,10 +1693,10 @@ exports.ZodRecord = ZodRecord;
 class ZodMap extends ZodType {
     _parse(input) {
         const { status, ctx } = this._processInputParams(input);
-        if (ctx.parsedType !== parseUtil_1.ZodParsedType.map) {
+        if (ctx.parsedType !== util_1.ZodParsedType.map) {
             (0, parseUtil_1.addIssueToContext)(ctx, {
                 code: ZodError_1.ZodIssueCode.invalid_type,
-                expected: parseUtil_1.ZodParsedType.map,
+                expected: util_1.ZodParsedType.map,
                 received: ctx.parsedType,
             });
             return parseUtil_1.INVALID;
@@ -1743,10 +1755,10 @@ ZodMap.create = (keyType, valueType, params) => {
 class ZodSet extends ZodType {
     _parse(input) {
         const { status, ctx } = this._processInputParams(input);
-        if (ctx.parsedType !== parseUtil_1.ZodParsedType.set) {
+        if (ctx.parsedType !== util_1.ZodParsedType.set) {
             (0, parseUtil_1.addIssueToContext)(ctx, {
                 code: ZodError_1.ZodIssueCode.invalid_type,
-                expected: parseUtil_1.ZodParsedType.set,
+                expected: util_1.ZodParsedType.set,
                 received: ctx.parsedType,
             });
             return parseUtil_1.INVALID;
@@ -1832,10 +1844,10 @@ class ZodFunction extends ZodType {
     }
     _parse(input) {
         const { ctx } = this._processInputParams(input);
-        if (ctx.parsedType !== parseUtil_1.ZodParsedType.function) {
+        if (ctx.parsedType !== util_1.ZodParsedType.function) {
             (0, parseUtil_1.addIssueToContext)(ctx, {
                 code: ZodError_1.ZodIssueCode.invalid_type,
-                expected: parseUtil_1.ZodParsedType.function,
+                expected: util_1.ZodParsedType.function,
                 received: ctx.parsedType,
             });
             return parseUtil_1.INVALID;
@@ -1988,10 +2000,11 @@ ZodLiteral.create = (value, params) => {
         ...processCreateParams(params),
     });
 };
-function createZodEnum(values) {
+function createZodEnum(values, params) {
     return new ZodEnum({
         values: values,
         typeName: ZodFirstPartyTypeKind.ZodEnum,
+        ...processCreateParams(params),
     });
 }
 class ZodEnum extends ZodType {
@@ -2049,8 +2062,8 @@ 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) {
+        if (ctx.parsedType !== util_1.ZodParsedType.string &&
+            ctx.parsedType !== util_1.ZodParsedType.number) {
             const expectedValues = util_1.util.objectValues(nativeEnumValues);
             (0, parseUtil_1.addIssueToContext)(ctx, {
                 expected: util_1.util.joinValues(expectedValues),
@@ -2085,16 +2098,16 @@ ZodNativeEnum.create = (values, params) => {
 class ZodPromise extends ZodType {
     _parse(input) {
         const { ctx } = this._processInputParams(input);
-        if (ctx.parsedType !== parseUtil_1.ZodParsedType.promise &&
+        if (ctx.parsedType !== util_1.ZodParsedType.promise &&
             ctx.common.async === false) {
             (0, parseUtil_1.addIssueToContext)(ctx, {
                 code: ZodError_1.ZodIssueCode.invalid_type,
-                expected: parseUtil_1.ZodParsedType.promise,
+                expected: util_1.ZodParsedType.promise,
                 received: ctx.parsedType,
             });
             return parseUtil_1.INVALID;
         }
-        const promisified = ctx.parsedType === parseUtil_1.ZodParsedType.promise
+        const promisified = ctx.parsedType === util_1.ZodParsedType.promise
             ? ctx.data
             : Promise.resolve(ctx.data);
         return (0, parseUtil_1.OK)(promisified.then((data) => {
@@ -2252,7 +2265,7 @@ ZodEffects.createWithPreprocess = (preprocess, schema, params) => {
 class ZodOptional extends ZodType {
     _parse(input) {
         const parsedType = this._getType(input);
-        if (parsedType === parseUtil_1.ZodParsedType.undefined) {
+        if (parsedType === util_1.ZodParsedType.undefined) {
             return (0, parseUtil_1.OK)(undefined);
         }
         return this._def.innerType._parse(input);
@@ -2272,7 +2285,7 @@ ZodOptional.create = (type, params) => {
 class ZodNullable extends ZodType {
     _parse(input) {
         const parsedType = this._getType(input);
-        if (parsedType === parseUtil_1.ZodParsedType.null) {
+        if (parsedType === util_1.ZodParsedType.null) {
             return (0, parseUtil_1.OK)(null);
         }
         return this._def.innerType._parse(input);
@@ -2293,7 +2306,7 @@ class ZodDefault extends ZodType {
     _parse(input) {
         const { ctx } = this._processInputParams(input);
         let data = ctx.data;
-        if (ctx.parsedType === parseUtil_1.ZodParsedType.undefined) {
+        if (ctx.parsedType === util_1.ZodParsedType.undefined) {
             data = this._def.defaultValue();
         }
         return this._def.innerType._parse({
@@ -2317,11 +2330,11 @@ ZodDefault.create = (type, params) => {
 class ZodNaN extends ZodType {
     _parse(input) {
         const parsedType = this._getType(input);
-        if (parsedType !== parseUtil_1.ZodParsedType.nan) {
+        if (parsedType !== util_1.ZodParsedType.nan) {
             const ctx = this._getOrReturnCtx(input);
             (0, parseUtil_1.addIssueToContext)(ctx, {
                 code: ZodError_1.ZodIssueCode.invalid_type,
-                expected: parseUtil_1.ZodParsedType.nan,
+                expected: util_1.ZodParsedType.nan,
                 received: ctx.parsedType,
             });
             return parseUtil_1.INVALID;
@@ -2336,9 +2349,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;
@@ -2381,7 +2400,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.16.0",
+  "version": "3.17.2",
   "description": "TypeScript-first schema declaration and validation library with static type inference",
   "main": "./lib/index.js",
   "types": "./index.d.ts",
@@ -51,7 +51,7 @@
     "fix": "yarn lint:fix && yarn prettier:fix",
     "clean": "rm -rf lib/* deno/lib/*",
     "build": "yarn run clean && npm run build:cjs && npm run build:esm && npm run build:deno",
-    "build:deno": "node ./deno/build.mjs",
+    "build:deno": "node ./deno/build.mjs && cp ./README.md ./deno/lib",
     "build:esm": "rollup --config rollup.config.js",
     "build:cjs": "tsc --p tsconfig.cjs.json",
     "build:types": "tsc --p tsconfig.types.json",