Merge pull request #427 from actions/dependabot/npm_and_yarn/zod-3.21.4
Bump zod from 3.21.0 to 3.21.4
This commit is contained in:
325
dist/index.js
generated
vendored
325
dist/index.js
generated
vendored
@@ -40903,7 +40903,6 @@ class ZodError extends Error {
|
||||
};
|
||||
const actualProto = new.target.prototype;
|
||||
if (Object.setPrototypeOf) {
|
||||
// eslint-disable-next-line ban/ban
|
||||
Object.setPrototypeOf(this, actualProto);
|
||||
}
|
||||
else {
|
||||
@@ -40943,13 +40942,6 @@ class ZodError extends Error {
|
||||
const terminal = i === issue.path.length - 1;
|
||||
if (!terminal) {
|
||||
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: [] };
|
||||
@@ -41111,7 +41103,7 @@ function addIssueToContext(ctx, issueData) {
|
||||
ctx.common.contextualErrorMap,
|
||||
ctx.schemaErrorMap,
|
||||
(0, errors_1.getErrorMap)(),
|
||||
en_1.default, // then global default map
|
||||
en_1.default,
|
||||
].filter((x) => !!x),
|
||||
});
|
||||
ctx.common.issues.push(issue);
|
||||
@@ -41205,7 +41197,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
|
||||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
||||
exports.getParsedType = exports.ZodParsedType = exports.util = void 0;
|
||||
exports.getParsedType = exports.ZodParsedType = exports.objectUtil = exports.util = void 0;
|
||||
var util;
|
||||
(function (util) {
|
||||
util.assertEqual = (val) => val;
|
||||
@@ -41235,8 +41227,8 @@ var util;
|
||||
return obj[e];
|
||||
});
|
||||
};
|
||||
util.objectKeys = typeof Object.keys === "function" // eslint-disable-line ban/ban
|
||||
? (obj) => Object.keys(obj) // eslint-disable-line ban/ban
|
||||
util.objectKeys = typeof Object.keys === "function"
|
||||
? (obj) => Object.keys(obj)
|
||||
: (object) => {
|
||||
const keys = [];
|
||||
for (const key in object) {
|
||||
@@ -41254,7 +41246,7 @@ var util;
|
||||
return undefined;
|
||||
};
|
||||
util.isInteger = typeof Number.isInteger === "function"
|
||||
? (val) => Number.isInteger(val) // eslint-disable-line ban/ban
|
||||
? (val) => Number.isInteger(val)
|
||||
: (val) => typeof val === "number" && isFinite(val) && Math.floor(val) === val;
|
||||
function joinValues(array, separator = " | ") {
|
||||
return array
|
||||
@@ -41269,6 +41261,15 @@ var util;
|
||||
return value;
|
||||
};
|
||||
})(util = exports.util || (exports.util = {}));
|
||||
var objectUtil;
|
||||
(function (objectUtil) {
|
||||
objectUtil.mergeShapes = (first, second) => {
|
||||
return {
|
||||
...first,
|
||||
...second,
|
||||
};
|
||||
};
|
||||
})(objectUtil = exports.objectUtil || (exports.objectUtil = {}));
|
||||
exports.ZodParsedType = util.arrayToEnum([
|
||||
"string",
|
||||
"nan",
|
||||
@@ -41422,7 +41423,13 @@ const errorMap = (issue, _ctx) => {
|
||||
break;
|
||||
case ZodError_1.ZodIssueCode.invalid_string:
|
||||
if (typeof issue.validation === "object") {
|
||||
if ("startsWith" in issue.validation) {
|
||||
if ("includes" in issue.validation) {
|
||||
message = `Invalid input: must include "${issue.validation.includes}"`;
|
||||
if (typeof issue.validation.position === "number") {
|
||||
message = `${message} at one or more positions greater than or equal to ${issue.validation.position}`;
|
||||
}
|
||||
}
|
||||
else if ("startsWith" in issue.validation) {
|
||||
message = `Invalid input: must start with "${issue.validation.startsWith}"`;
|
||||
}
|
||||
else if ("endsWith" in issue.validation) {
|
||||
@@ -41514,8 +41521,8 @@ exports["default"] = errorMap;
|
||||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
||||
exports.date = exports.boolean = exports.bigint = exports.array = exports.any = exports.coerce = exports.ZodFirstPartyTypeKind = exports.late = exports.ZodSchema = exports.Schema = exports.custom = exports.ZodPipeline = exports.ZodBranded = exports.BRAND = exports.ZodNaN = exports.ZodCatch = exports.ZodDefault = exports.ZodNullable = exports.ZodOptional = exports.ZodTransformer = exports.ZodEffects = exports.ZodPromise = exports.ZodNativeEnum = exports.ZodEnum = exports.ZodLiteral = exports.ZodLazy = exports.ZodFunction = exports.ZodSet = exports.ZodMap = exports.ZodRecord = exports.ZodTuple = exports.ZodIntersection = exports.ZodDiscriminatedUnion = exports.ZodUnion = exports.ZodObject = exports.objectUtil = exports.ZodArray = exports.ZodVoid = exports.ZodNever = exports.ZodUnknown = exports.ZodAny = exports.ZodNull = exports.ZodUndefined = exports.ZodSymbol = exports.ZodDate = exports.ZodBoolean = exports.ZodBigInt = exports.ZodNumber = exports.ZodString = exports.ZodType = void 0;
|
||||
exports.NEVER = exports["void"] = exports.unknown = exports.union = exports.undefined = exports.tuple = exports.transformer = exports.symbol = exports.string = exports.strictObject = exports.set = exports.record = exports.promise = exports.preprocess = exports.pipeline = exports.ostring = exports.optional = exports.onumber = exports.oboolean = exports.object = exports.number = exports.nullable = exports["null"] = exports.never = exports.nativeEnum = exports.nan = exports.map = exports.literal = exports.lazy = exports.intersection = exports["instanceof"] = exports["function"] = exports["enum"] = exports.effect = exports.discriminatedUnion = void 0;
|
||||
exports.discriminatedUnion = exports.date = exports.boolean = exports.bigint = exports.array = exports.any = exports.coerce = exports.ZodFirstPartyTypeKind = exports.late = exports.ZodSchema = exports.Schema = exports.custom = exports.ZodPipeline = exports.ZodBranded = exports.BRAND = exports.ZodNaN = exports.ZodCatch = exports.ZodDefault = exports.ZodNullable = exports.ZodOptional = exports.ZodTransformer = exports.ZodEffects = exports.ZodPromise = exports.ZodNativeEnum = exports.ZodEnum = exports.ZodLiteral = exports.ZodLazy = exports.ZodFunction = exports.ZodSet = exports.ZodMap = exports.ZodRecord = exports.ZodTuple = exports.ZodIntersection = exports.ZodDiscriminatedUnion = exports.ZodUnion = exports.ZodObject = exports.ZodArray = exports.ZodVoid = exports.ZodNever = exports.ZodUnknown = exports.ZodAny = exports.ZodNull = exports.ZodUndefined = exports.ZodSymbol = exports.ZodDate = exports.ZodBoolean = exports.ZodBigInt = exports.ZodNumber = exports.ZodString = exports.ZodType = void 0;
|
||||
exports.NEVER = exports["void"] = exports.unknown = exports.union = exports.undefined = exports.tuple = exports.transformer = exports.symbol = exports.string = exports.strictObject = exports.set = exports.record = exports.promise = exports.preprocess = exports.pipeline = exports.ostring = exports.optional = exports.onumber = exports.oboolean = exports.object = exports.number = exports.nullable = exports["null"] = exports.never = exports.nativeEnum = exports.nan = exports.map = exports.literal = exports.lazy = exports.intersection = exports["instanceof"] = exports["function"] = exports["enum"] = exports.effect = void 0;
|
||||
const errors_1 = __nccwpck_require__(9566);
|
||||
const errorUtil_1 = __nccwpck_require__(2513);
|
||||
const parseUtil_1 = __nccwpck_require__(888);
|
||||
@@ -41523,13 +41530,22 @@ const util_1 = __nccwpck_require__(3985);
|
||||
const ZodError_1 = __nccwpck_require__(9892);
|
||||
class ParseInputLazyPath {
|
||||
constructor(parent, value, path, key) {
|
||||
this._cachedPath = [];
|
||||
this.parent = parent;
|
||||
this.data = value;
|
||||
this._path = path;
|
||||
this._key = key;
|
||||
}
|
||||
get path() {
|
||||
return this._path.concat(this._key);
|
||||
if (!this._cachedPath.length) {
|
||||
if (this._key instanceof Array) {
|
||||
this._cachedPath.push(...this._path, ...this._key);
|
||||
}
|
||||
else {
|
||||
this._cachedPath.push(...this._path, this._key);
|
||||
}
|
||||
}
|
||||
return this._cachedPath;
|
||||
}
|
||||
}
|
||||
const handleResult = (ctx, result) => {
|
||||
@@ -41540,8 +41556,16 @@ const handleResult = (ctx, result) => {
|
||||
if (!ctx.common.issues.length) {
|
||||
throw new Error("Validation failed but no issues detected.");
|
||||
}
|
||||
const error = new ZodError_1.ZodError(ctx.common.issues);
|
||||
return { success: false, error };
|
||||
return {
|
||||
success: false,
|
||||
get error() {
|
||||
if (this._error)
|
||||
return this._error;
|
||||
const error = new ZodError_1.ZodError(ctx.common.issues);
|
||||
this._error = error;
|
||||
return this._error;
|
||||
},
|
||||
};
|
||||
}
|
||||
};
|
||||
function processCreateParams(params) {
|
||||
@@ -41565,7 +41589,6 @@ function processCreateParams(params) {
|
||||
}
|
||||
class ZodType {
|
||||
constructor(def) {
|
||||
/** Alias of safeParseAsync */
|
||||
this.spa = this.safeParseAsync;
|
||||
this._def = def;
|
||||
this.parse = this.parse.bind(this);
|
||||
@@ -41817,19 +41840,12 @@ exports.Schema = ZodType;
|
||||
exports.ZodSchema = ZodType;
|
||||
const cuidRegex = /^c[^\s-]{8,}$/i;
|
||||
const cuid2Regex = /^[a-z][a-z0-9]*$/;
|
||||
const ulidRegex = /[0-9A-HJKMNP-TV-Z]{26}/;
|
||||
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@\"]+)*)|(\".+\"))@((\[(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([0-9]{1,2}))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([0-9]{1,2}))\])|(\[IPv6:(([a-f0-9]{1,4}:){7}|::([a-f0-9]{1,4}:){0,6}|([a-f0-9]{1,4}:){1}:([a-f0-9]{1,4}:){0,5}|([a-f0-9]{1,4}:){2}:([a-f0-9]{1,4}:){0,4}|([a-f0-9]{1,4}:){3}:([a-f0-9]{1,4}:){0,3}|([a-f0-9]{1,4}:){4}:([a-f0-9]{1,4}:){0,2}|([a-f0-9]{1,4}:){5}:([a-f0-9]{1,4}:){0,1})([a-f0-9]{1,4}|(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([0-9]{1,2}))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([0-9]{1,2})))\])|([A-Za-z0-9]([A-Za-z0-9-]*[A-Za-z0-9])*(\.[A-Za-z]{2,})+))$/;
|
||||
// from https://thekevinscott.com/emojis-in-javascript/#writing-a-regular-expression
|
||||
const emojiRegex = /^(\p{Extended_Pictographic}|\p{Emoji_Component})+$/u;
|
||||
const ipv4Regex = /^(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([0-9]{1,2}))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([0-9]{1,2}))$/;
|
||||
const ipv6Regex = /^(([a-f0-9]{1,4}:){7}|::([a-f0-9]{1,4}:){0,6}|([a-f0-9]{1,4}:){1}:([a-f0-9]{1,4}:){0,5}|([a-f0-9]{1,4}:){2}:([a-f0-9]{1,4}:){0,4}|([a-f0-9]{1,4}:){3}:([a-f0-9]{1,4}:){0,3}|([a-f0-9]{1,4}:){4}:([a-f0-9]{1,4}:){0,2}|([a-f0-9]{1,4}:){5}:([a-f0-9]{1,4}:){0,1})([a-f0-9]{1,4}|(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([0-9]{1,2}))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([0-9]{1,2})))$/;
|
||||
// Adapted from https://stackoverflow.com/a/3143231
|
||||
const datetimeRegex = (args) => {
|
||||
if (args.precision) {
|
||||
if (args.offset) {
|
||||
@@ -41873,10 +41889,6 @@ class ZodString extends ZodType {
|
||||
code: ZodError_1.ZodIssueCode.invalid_string,
|
||||
...errorUtil_1.errorUtil.errToObj(message),
|
||||
});
|
||||
/**
|
||||
* @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,
|
||||
@@ -41902,9 +41914,7 @@ class ZodString extends ZodType {
|
||||
code: ZodError_1.ZodIssueCode.invalid_type,
|
||||
expected: util_1.ZodParsedType.string,
|
||||
received: ctx.parsedType,
|
||||
}
|
||||
//
|
||||
);
|
||||
});
|
||||
return parseUtil_1.INVALID;
|
||||
}
|
||||
const status = new parseUtil_1.ParseStatus();
|
||||
@@ -42021,6 +42031,17 @@ class ZodString extends ZodType {
|
||||
status.dirty();
|
||||
}
|
||||
}
|
||||
else if (check.kind === "ulid") {
|
||||
if (!ulidRegex.test(input.data)) {
|
||||
ctx = this._getOrReturnCtx(input, ctx);
|
||||
(0, parseUtil_1.addIssueToContext)(ctx, {
|
||||
validation: "ulid",
|
||||
code: ZodError_1.ZodIssueCode.invalid_string,
|
||||
message: check.message,
|
||||
});
|
||||
status.dirty();
|
||||
}
|
||||
}
|
||||
else if (check.kind === "url") {
|
||||
try {
|
||||
new URL(input.data);
|
||||
@@ -42051,6 +42072,17 @@ class ZodString extends ZodType {
|
||||
else if (check.kind === "trim") {
|
||||
input.data = input.data.trim();
|
||||
}
|
||||
else if (check.kind === "includes") {
|
||||
if (!input.data.includes(check.value, check.position)) {
|
||||
ctx = this._getOrReturnCtx(input, ctx);
|
||||
(0, parseUtil_1.addIssueToContext)(ctx, {
|
||||
code: ZodError_1.ZodIssueCode.invalid_string,
|
||||
validation: { includes: check.value, position: check.position },
|
||||
message: check.message,
|
||||
});
|
||||
status.dirty();
|
||||
}
|
||||
}
|
||||
else if (check.kind === "toLowerCase") {
|
||||
input.data = input.data.toLowerCase();
|
||||
}
|
||||
@@ -42132,6 +42164,9 @@ class ZodString extends ZodType {
|
||||
cuid2(message) {
|
||||
return this._addCheck({ kind: "cuid2", ...errorUtil_1.errorUtil.errToObj(message) });
|
||||
}
|
||||
ulid(message) {
|
||||
return this._addCheck({ kind: "ulid", ...errorUtil_1.errorUtil.errToObj(message) });
|
||||
}
|
||||
ip(options) {
|
||||
return this._addCheck({ kind: "ip", ...errorUtil_1.errorUtil.errToObj(options) });
|
||||
}
|
||||
@@ -42159,6 +42194,14 @@ class ZodString extends ZodType {
|
||||
...errorUtil_1.errorUtil.errToObj(message),
|
||||
});
|
||||
}
|
||||
includes(value, options) {
|
||||
return this._addCheck({
|
||||
kind: "includes",
|
||||
value: value,
|
||||
position: options === null || options === void 0 ? void 0 : options.position,
|
||||
...errorUtil_1.errorUtil.errToObj(options === null || options === void 0 ? void 0 : options.message),
|
||||
});
|
||||
}
|
||||
startsWith(value, message) {
|
||||
return this._addCheck({
|
||||
kind: "startsWith",
|
||||
@@ -42215,6 +42258,9 @@ class ZodString extends ZodType {
|
||||
get isCUID2() {
|
||||
return !!this._def.checks.find((ch) => ch.kind === "cuid2");
|
||||
}
|
||||
get isULID() {
|
||||
return !!this._def.checks.find((ch) => ch.kind === "ulid");
|
||||
}
|
||||
get isIP() {
|
||||
return !!this._def.checks.find((ch) => ch.kind === "ip");
|
||||
}
|
||||
@@ -42249,7 +42295,6 @@ ZodString.create = (params) => {
|
||||
...processCreateParams(params),
|
||||
});
|
||||
};
|
||||
// https://stackoverflow.com/questions/3966484/why-does-modulus-operator-return-fractional-number-in-javascript/31711034#31711034
|
||||
function floatSafeRemainder(val, step) {
|
||||
const valDecCount = (val.toString().split(".")[1] || "").length;
|
||||
const stepDecCount = (step.toString().split(".")[1] || "").length;
|
||||
@@ -42885,7 +42930,6 @@ ZodNull.create = (params) => {
|
||||
class ZodAny extends ZodType {
|
||||
constructor() {
|
||||
super(...arguments);
|
||||
// to prevent instances of other classes from extending ZodAny. this causes issues with catchall in ZodObject.
|
||||
this._any = true;
|
||||
}
|
||||
_parse(input) {
|
||||
@@ -42902,7 +42946,6 @@ ZodAny.create = (params) => {
|
||||
class ZodUnknown extends ZodType {
|
||||
constructor() {
|
||||
super(...arguments);
|
||||
// required
|
||||
this._unknown = true;
|
||||
}
|
||||
_parse(input) {
|
||||
@@ -43058,22 +43101,6 @@ ZodArray.create = (schema, params) => {
|
||||
...processCreateParams(params),
|
||||
});
|
||||
};
|
||||
/////////////////////////////////////////
|
||||
/////////////////////////////////////////
|
||||
////////// //////////
|
||||
////////// ZodObject //////////
|
||||
////////// //////////
|
||||
/////////////////////////////////////////
|
||||
/////////////////////////////////////////
|
||||
var objectUtil;
|
||||
(function (objectUtil) {
|
||||
objectUtil.mergeShapes = (first, second) => {
|
||||
return {
|
||||
...first,
|
||||
...second, // second overwrites first
|
||||
};
|
||||
};
|
||||
})(objectUtil = exports.objectUtil || (exports.objectUtil = {}));
|
||||
function deepPartialify(schema) {
|
||||
if (schema instanceof ZodObject) {
|
||||
const newShape = {};
|
||||
@@ -43087,7 +43114,10 @@ function deepPartialify(schema) {
|
||||
});
|
||||
}
|
||||
else if (schema instanceof ZodArray) {
|
||||
return ZodArray.create(deepPartialify(schema.element));
|
||||
return new ZodArray({
|
||||
...schema._def,
|
||||
type: deepPartialify(schema.element),
|
||||
});
|
||||
}
|
||||
else if (schema instanceof ZodOptional) {
|
||||
return ZodOptional.create(deepPartialify(schema.unwrap()));
|
||||
@@ -43106,47 +43136,7 @@ class ZodObject extends ZodType {
|
||||
constructor() {
|
||||
super(...arguments);
|
||||
this._cached = null;
|
||||
/**
|
||||
* @deprecated In most cases, this is no longer needed - unknown properties are now silently stripped.
|
||||
* If you want to pass through unknown properties, use `.passthrough()` instead.
|
||||
*/
|
||||
this.nonstrict = this.passthrough;
|
||||
// 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() {
|
||||
@@ -43214,14 +43204,12 @@ class ZodObject extends ZodType {
|
||||
}
|
||||
}
|
||||
else {
|
||||
// run catchall validation
|
||||
const catchall = this._def.catchall;
|
||||
for (const key of extraKeys) {
|
||||
const value = ctx.data[key];
|
||||
pairs.push({
|
||||
key: { status: "valid", value: key },
|
||||
value: catchall._parse(new ParseInputLazyPath(ctx, value, ctx.path, key) //, ctx.child(key), value, getParsedType(value)
|
||||
),
|
||||
value: catchall._parse(new ParseInputLazyPath(ctx, value, ctx.path, key)),
|
||||
alwaysSet: key in ctx.data,
|
||||
});
|
||||
}
|
||||
@@ -43285,23 +43273,6 @@ class ZodObject extends ZodType {
|
||||
unknownKeys: "passthrough",
|
||||
});
|
||||
}
|
||||
// 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,
|
||||
@@ -43311,79 +43282,21 @@ class ZodObject extends ZodType {
|
||||
}),
|
||||
});
|
||||
}
|
||||
/**
|
||||
* Prior to zod@1.0.12 there was a bug in the
|
||||
* inferred type of merged objects. Please
|
||||
* upgrade if you are experiencing issues.
|
||||
*/
|
||||
merge(merging) {
|
||||
const merged = new ZodObject({
|
||||
unknownKeys: merging._def.unknownKeys,
|
||||
catchall: merging._def.catchall,
|
||||
shape: () => objectUtil.mergeShapes(this._def.shape(), merging._def.shape()),
|
||||
shape: () => ({
|
||||
...this._def.shape(),
|
||||
...merging._def.shape(),
|
||||
}),
|
||||
typeName: ZodFirstPartyTypeKind.ZodObject,
|
||||
});
|
||||
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,
|
||||
@@ -43414,9 +43327,6 @@ class ZodObject extends ZodType {
|
||||
shape: () => shape,
|
||||
});
|
||||
}
|
||||
/**
|
||||
* @deprecated
|
||||
*/
|
||||
deepPartial() {
|
||||
return deepPartialify(this);
|
||||
}
|
||||
@@ -43493,7 +43403,6 @@ class ZodUnion extends ZodType {
|
||||
const { ctx } = this._processInputParams(input);
|
||||
const options = this._def.options;
|
||||
function handleResults(results) {
|
||||
// return first issue-free validation if it exists
|
||||
for (const result of results) {
|
||||
if (result.result.status === "valid") {
|
||||
return result.result;
|
||||
@@ -43501,12 +43410,10 @@ class ZodUnion extends ZodType {
|
||||
}
|
||||
for (const result of results) {
|
||||
if (result.result.status === "dirty") {
|
||||
// add issues from dirty option
|
||||
ctx.common.issues.push(...result.ctx.common.issues);
|
||||
return result.result;
|
||||
}
|
||||
}
|
||||
// return invalid
|
||||
const unionErrors = results.map((result) => new ZodError_1.ZodError(result.ctx.common.issues));
|
||||
(0, parseUtil_1.addIssueToContext)(ctx, {
|
||||
code: ZodError_1.ZodIssueCode.invalid_union,
|
||||
@@ -43585,13 +43492,6 @@ ZodUnion.create = (types, params) => {
|
||||
...processCreateParams(params),
|
||||
});
|
||||
};
|
||||
/////////////////////////////////////////////////////
|
||||
/////////////////////////////////////////////////////
|
||||
////////// //////////
|
||||
////////// ZodDiscriminatedUnion //////////
|
||||
////////// //////////
|
||||
/////////////////////////////////////////////////////
|
||||
/////////////////////////////////////////////////////
|
||||
const getDiscriminator = (type) => {
|
||||
if (type instanceof ZodLazy) {
|
||||
return getDiscriminator(type.schema);
|
||||
@@ -43606,7 +43506,6 @@ const getDiscriminator = (type) => {
|
||||
return type.options;
|
||||
}
|
||||
else if (type instanceof ZodNativeEnum) {
|
||||
// eslint-disable-next-line ban/ban
|
||||
return Object.keys(type.enum);
|
||||
}
|
||||
else if (type instanceof ZodDefault) {
|
||||
@@ -43668,18 +43567,8 @@ class ZodDiscriminatedUnion extends ZodType {
|
||||
get optionsMap() {
|
||||
return this._def.optionsMap;
|
||||
}
|
||||
/**
|
||||
* The constructor of the discriminated union schema. Its behaviour is very similar to that of the normal z.union() constructor.
|
||||
* However, it only allows a union of objects, all of which need to share a discriminator property. This property must
|
||||
* have a different value for each object in the union.
|
||||
* @param discriminator the name of the discriminator property
|
||||
* @param types an array of object schemas
|
||||
* @param params
|
||||
*/
|
||||
static create(discriminator, options, params) {
|
||||
// Get all the valid discriminator values
|
||||
const optionsMap = new Map();
|
||||
// try {
|
||||
for (const type of options) {
|
||||
const discriminatorValues = getDiscriminator(type.shape[discriminator]);
|
||||
if (!discriminatorValues) {
|
||||
@@ -43842,7 +43731,7 @@ class ZodTuple extends ZodType {
|
||||
return null;
|
||||
return schema._parse(new ParseInputLazyPath(ctx, item, ctx.path, itemIndex));
|
||||
})
|
||||
.filter((x) => !!x); // filter nulls
|
||||
.filter((x) => !!x);
|
||||
if (ctx.common.async) {
|
||||
return Promise.all(items).then((results) => {
|
||||
return parseUtil_1.ParseStatus.mergeArray(status, results);
|
||||
@@ -44423,9 +44312,7 @@ class ZodEffects extends ZodType {
|
||||
};
|
||||
checkCtx.addIssue = checkCtx.addIssue.bind(checkCtx);
|
||||
if (effect.type === "refinement") {
|
||||
const executeRefinement = (acc
|
||||
// effect: RefinementEffect<any>
|
||||
) => {
|
||||
const executeRefinement = (acc) => {
|
||||
const result = effect.refinement(acc, checkCtx);
|
||||
if (ctx.common.async) {
|
||||
return Promise.resolve(result);
|
||||
@@ -44445,7 +44332,6 @@ class ZodEffects extends ZodType {
|
||||
return parseUtil_1.INVALID;
|
||||
if (inner.status === "dirty")
|
||||
status.dirty();
|
||||
// return value is ignored
|
||||
executeRefinement(inner.value);
|
||||
return { status: status.value, value: inner.value };
|
||||
}
|
||||
@@ -44470,10 +44356,6 @@ class ZodEffects extends ZodType {
|
||||
path: ctx.path,
|
||||
parent: ctx,
|
||||
});
|
||||
// if (base.status === "aborted") return INVALID;
|
||||
// if (base.status === "dirty") {
|
||||
// return { status: "dirty", value: base.value };
|
||||
// }
|
||||
if (!(0, parseUtil_1.isValid)(base))
|
||||
return base;
|
||||
const result = effect.transform(base.value, checkCtx);
|
||||
@@ -44488,10 +44370,6 @@ class ZodEffects extends ZodType {
|
||||
.then((base) => {
|
||||
if (!(0, parseUtil_1.isValid)(base))
|
||||
return base;
|
||||
// if (base.status === "aborted") return INVALID;
|
||||
// if (base.status === "dirty") {
|
||||
// return { status: "dirty", value: base.value };
|
||||
// }
|
||||
return Promise.resolve(effect.transform(base.value, checkCtx)).then((result) => ({ status: status.value, value: result }));
|
||||
});
|
||||
}
|
||||
@@ -44588,7 +44466,6 @@ ZodDefault.create = (type, params) => {
|
||||
class ZodCatch extends ZodType {
|
||||
_parse(input) {
|
||||
const { ctx } = this._processInputParams(input);
|
||||
// newCtx is used to not collect issues from inner types in ctx
|
||||
const newCtx = {
|
||||
...ctx,
|
||||
common: {
|
||||
@@ -44613,6 +44490,7 @@ class ZodCatch extends ZodType {
|
||||
get error() {
|
||||
return new ZodError_1.ZodError(newCtx.common.issues);
|
||||
},
|
||||
input: newCtx.data,
|
||||
}),
|
||||
};
|
||||
});
|
||||
@@ -44626,6 +44504,7 @@ class ZodCatch extends ZodType {
|
||||
get error() {
|
||||
return new ZodError_1.ZodError(newCtx.common.issues);
|
||||
},
|
||||
input: newCtx.data,
|
||||
}),
|
||||
};
|
||||
}
|
||||
@@ -44740,14 +44619,16 @@ class ZodPipeline extends ZodType {
|
||||
}
|
||||
}
|
||||
exports.ZodPipeline = ZodPipeline;
|
||||
const custom = (check, params = {},
|
||||
/* @deprecated */
|
||||
fatal) => {
|
||||
const custom = (check, params = {}, fatal) => {
|
||||
if (check)
|
||||
return ZodAny.create().superRefine((data, ctx) => {
|
||||
var _a, _b;
|
||||
if (!check(data)) {
|
||||
const p = typeof params === "function" ? params(data) : params;
|
||||
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 });
|
||||
@@ -44797,14 +44678,10 @@ var ZodFirstPartyTypeKind;
|
||||
ZodFirstPartyTypeKind["ZodBranded"] = "ZodBranded";
|
||||
ZodFirstPartyTypeKind["ZodPipeline"] = "ZodPipeline";
|
||||
})(ZodFirstPartyTypeKind = exports.ZodFirstPartyTypeKind || (exports.ZodFirstPartyTypeKind = {}));
|
||||
// new approach that works for abstract classes
|
||||
// but requires TS 4.4+
|
||||
class Class {
|
||||
constructor(..._) { }
|
||||
}
|
||||
const instanceOfType = (
|
||||
// const instanceOfType = <T extends new (...args: any[]) => any>(
|
||||
cls, params = {
|
||||
const instanceOfType = (cls, params = {
|
||||
message: `Input not instance of ${cls.name}`,
|
||||
}) => (0, exports.custom)((data) => data instanceof cls, params);
|
||||
exports["instanceof"] = instanceOfType;
|
||||
|
||||
2
dist/index.js.map
generated
vendored
2
dist/index.js.map
generated
vendored
File diff suppressed because one or more lines are too long
14
package-lock.json
generated
14
package-lock.json
generated
@@ -20,7 +20,7 @@
|
||||
"spdx-expression-parse": "^3.0.1",
|
||||
"spdx-satisfies": "^5.0.1",
|
||||
"yaml": "^2.2.1",
|
||||
"zod": "^3.21.0"
|
||||
"zod": "^3.21.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/jest": "^27.5.2",
|
||||
@@ -8731,9 +8731,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/zod": {
|
||||
"version": "3.21.0",
|
||||
"resolved": "https://registry.npmjs.org/zod/-/zod-3.21.0.tgz",
|
||||
"integrity": "sha512-UYdykTcVxB6lfdyLzAqLyyYAlOcpoluECvjsdoaqfQmz9p+3LRaIqYcNiL/J2kFYp66fBM8wwBvIGVEjq7KtZw==",
|
||||
"version": "3.21.4",
|
||||
"resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz",
|
||||
"integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==",
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/colinhacks"
|
||||
}
|
||||
@@ -15177,9 +15177,9 @@
|
||||
"dev": true
|
||||
},
|
||||
"zod": {
|
||||
"version": "3.21.0",
|
||||
"resolved": "https://registry.npmjs.org/zod/-/zod-3.21.0.tgz",
|
||||
"integrity": "sha512-UYdykTcVxB6lfdyLzAqLyyYAlOcpoluECvjsdoaqfQmz9p+3LRaIqYcNiL/J2kFYp66fBM8wwBvIGVEjq7KtZw=="
|
||||
"version": "3.21.4",
|
||||
"resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz",
|
||||
"integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
"spdx-expression-parse": "^3.0.1",
|
||||
"spdx-satisfies": "^5.0.1",
|
||||
"yaml": "^2.2.1",
|
||||
"zod": "^3.21.0"
|
||||
"zod": "^3.21.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/jest": "^27.5.2",
|
||||
|
||||
Reference in New Issue
Block a user