@strapi/core 5.0.0-rc.2 → 5.0.0-rc.21

package/dist/services/entity-validator/validators.js

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const _ = require("lodash");
 const strapiUtils = require("@strapi/utils");
 const blocksValidator = require("./blocks-validator.js");
@@ -16,20 +17,20 @@ const addMaxLengthValidator = (validator, {
 };
 const addMinIntegerValidator = (validator, {
   attr
-}) => ___default.default.isNumber(attr.min) ? validator.min(___default.default.toInteger(attr.min)) : validator;
+}, { isDraft }) => ___default.default.isNumber(attr.min) && !isDraft ? validator.min(___default.default.toInteger(attr.min)) : validator;
 const addMaxIntegerValidator = (validator, {
   attr
 }) => ___default.default.isNumber(attr.max) ? validator.max(___default.default.toInteger(attr.max)) : validator;
 const addMinFloatValidator = (validator, {
   attr
-}) => ___default.default.isNumber(attr.min) ? validator.min(attr.min) : validator;
+}, { isDraft }) => ___default.default.isNumber(attr.min) && !isDraft ? validator.min(attr.min) : validator;
 const addMaxFloatValidator = (validator, {
   attr
 }) => ___default.default.isNumber(attr.max) ? validator.max(attr.max) : validator;
 const addStringRegexValidator = (validator, {
   attr
-}) => {
-  return "regex" in attr && !___default.default.isUndefined(attr.regex) ? validator.matches(new RegExp(attr.regex), { excludeEmptyString: !attr.required }) : validator;
+}, { isDraft }) => {
+  return "regex" in attr && !___default.default.isUndefined(attr.regex) && !isDraft ? validator.matches(new RegExp(attr.regex), { excludeEmptyString: !attr.required }) : validator;
 };
 const addUniqueValidator = (validator, {
   attr,
@@ -41,82 +42,147 @@ const addUniqueValidator = (validator, {
   if (attr.type !== "uid" && !attr.unique) {
     return validator;
   }
+  const validateUniqueFieldWithinComponent = async (value) => {
+    if (!componentContext) {
+      return false;
+    }
+    const hasRepeatableData = componentContext.repeatableData.length > 0;
+    if (hasRepeatableData) {
+      const { name: updatedName, value: updatedValue } = updatedAttribute;
+      const pathToCheck = [...componentContext.pathToComponent.slice(1), updatedName].join(".");
+      const values = componentContext.repeatableData.map((item) => {
+        return pathToCheck.split(".").reduce((acc, key) => acc[key], item);
+      });
+      const isUpdatedAttributeRepeatedInThisEntity = values.filter((value2) => value2 === updatedValue).length > 1;
+      if (isUpdatedAttributeRepeatedInThisEntity) {
+        return false;
+      }
+    }
+    const {
+      model: parentModel,
+      options: parentOptions,
+      id: excludeId
+    } = componentContext.parentContent;
+    const whereConditions = {};
+    const isParentDraft = parentOptions && parentOptions.isDraft;
+    whereConditions.publishedAt = isParentDraft ? null : { $notNull: true };
+    if (parentOptions?.locale) {
+      whereConditions.locale = parentOptions.locale;
+    }
+    if (excludeId && !Number.isNaN(excludeId)) {
+      whereConditions.id = { $ne: excludeId };
+    }
+    const queryUid = parentModel.uid;
+    const queryWhere = {
+      ...componentContext.pathToComponent.reduceRight((acc, key) => ({ [key]: acc }), {
+        [updatedAttribute.name]: value
+      }),
+      ...whereConditions
+    };
+    return !await strapi.db.query(queryUid).findOne({ where: queryWhere });
+  };
+  const validateUniqueFieldWithinDynamicZoneComponent = async (startOfPath) => {
+    if (!componentContext) {
+      return false;
+    }
+    const targetComponentUID = model.uid;
+    const countOfValueInThisEntity = (componentContext?.fullDynamicZoneContent ?? []).reduce(
+      (acc, component) => {
+        if (component.__component !== targetComponentUID) {
+          return acc;
+        }
+        const updatedValue = component[updatedAttribute.name];
+        return updatedValue === updatedAttribute.value ? acc + 1 : acc;
+      },
+      0
+    );
+    if (countOfValueInThisEntity > 1) {
+      return false;
+    }
+    const query = {
+      select: ["id"],
+      where: {},
+      populate: {
+        [startOfPath]: {
+          on: {
+            [targetComponentUID]: {
+              select: ["id"],
+              where: { [updatedAttribute.name]: updatedAttribute.value }
+            }
+          }
+        }
+      }
+    };
+    const { options: options2, id } = componentContext.parentContent;
+    if (options2?.isDraft !== void 0) {
+      query.where.published_at = options2.isDraft ? { $eq: null } : { $ne: null };
+    }
+    if (id) {
+      query.where.id = { $ne: id };
+    }
+    if (options2?.locale) {
+      query.where.locale = options2.locale;
+    }
+    const parentModelQueryResult = await strapi.db.query(componentContext.parentContent.model.uid).findMany(query);
+    const filteredResults = parentModelQueryResult.filter((result) => Array.isArray(result[startOfPath]) && result[startOfPath].length).flatMap((result) => result[startOfPath]).filter((dynamicZoneComponent) => dynamicZoneComponent.__component === targetComponentUID);
+    if (filteredResults.length >= 1) {
+      return false;
+    }
+    return true;
+  };
   return validator.test("unique", "This attribute must be unique", async (value) => {
-    const isPublish = options.isDraft === false;
-    if (___default.default.isNil(value)) {
+    if (___default.default.isNil(value) || value === "") {
       return true;
     }
-    if (!isPublish && value === entity?.[updatedAttribute.name]) {
+    if (options.isDraft) {
       return true;
     }
-    let queryUid;
-    let queryWhere = {};
-    const hasPathToComponent = componentContext?.pathToComponent?.length > 0;
+    const hasPathToComponent = componentContext && componentContext.pathToComponent.length > 0;
     if (hasPathToComponent) {
-      const hasRepeatableData = componentContext.repeatableData.length > 0;
-      if (hasRepeatableData) {
-        const { name: updatedName, value: updatedValue } = updatedAttribute;
-        const pathToCheck = [...componentContext.pathToComponent.slice(1), updatedName].join(".");
-        const values = componentContext.repeatableData.map((item) => {
-          return pathToCheck.split(".").reduce((acc, key) => acc[key], item);
-        });
-        const isUpdatedAttributeRepeatedInThisEntity = values.filter((value2) => value2 === updatedValue).length > 1;
-        if (isUpdatedAttributeRepeatedInThisEntity) {
-          return false;
-        }
-      }
-      const {
-        model: parentModel,
-        options: parentOptions,
-        id: excludeId
-      } = componentContext.parentContent;
-      queryUid = parentModel.uid;
-      const whereConditions = {};
-      const isParentDraft = parentOptions && parentOptions.isDraft;
-      whereConditions.publishedAt = isParentDraft ? null : { $notNull: true };
-      if (parentOptions?.locale) {
-        whereConditions.locale = parentOptions.locale;
-      }
-      if (excludeId && !Number.isNaN(excludeId)) {
-        whereConditions.id = { $ne: excludeId };
-      }
-      queryWhere = {
-        ...componentContext.pathToComponent.reduceRight((acc, key) => ({ [key]: acc }), {
-          [updatedAttribute.name]: value
-        }),
-        ...whereConditions
-      };
-    } else {
-      queryUid = model.uid;
-      const scalarAttributeWhere = {
-        [updatedAttribute.name]: value
-      };
-      scalarAttributeWhere.publishedAt = options.isDraft ? null : { $notNull: true };
-      if (options?.locale) {
-        scalarAttributeWhere.locale = options.locale;
-      }
-      if (entity?.id) {
-        scalarAttributeWhere.id = { $ne: entity.id };
+      const startOfPath = componentContext.pathToComponent[0];
+      const testingDZ = componentContext.parentContent.model.attributes[startOfPath].type === "dynamiczone";
+      if (testingDZ) {
+        return validateUniqueFieldWithinDynamicZoneComponent(startOfPath);
       }
-      queryWhere = scalarAttributeWhere;
+      return validateUniqueFieldWithinComponent(value);
     }
-    return !await strapi.db.query(queryUid).findOne({ where: queryWhere });
+    const scalarAttributeWhere = {
+      [updatedAttribute.name]: value,
+      publishedAt: { $notNull: true }
+    };
+    if (options?.locale) {
+      scalarAttributeWhere.locale = options.locale;
+    }
+    if (entity?.id) {
+      scalarAttributeWhere.id = { $ne: entity.id };
+    }
+    return !await strapi.db.query(model.uid).findOne({ where: scalarAttributeWhere, select: ["id"] });
   });
 };
 const stringValidator = (metas, options) => {
   let schema = strapiUtils.yup.string().transform((val, originalVal) => originalVal);
   schema = addMinLengthValidator(schema, metas, options);
   schema = addMaxLengthValidator(schema, metas);
-  schema = addStringRegexValidator(schema, metas);
+  schema = addStringRegexValidator(schema, metas, options);
   schema = addUniqueValidator(schema, metas, options);
   return schema;
 };
 const emailValidator = (metas, options) => {
   const schema = stringValidator(metas, options);
-  return schema.email().min(1, "${path} cannot be empty");
+  if (options.isDraft) {
+    return schema;
+  }
+  return schema.email().min(
+    1,
+    // eslint-disable-next-line no-template-curly-in-string
+    "${path} cannot be empty"
+  );
 };
 const uidValidator = (metas, options) => {
   const schema = stringValidator(metas, options);
+  if (options.isDraft) {
+    return schema;
+  }
   return schema.matches(/^[A-Za-z0-9-_.~]*$/);
 };
 const enumerationValidator = ({ attr }) => {
@@ -124,14 +190,14 @@ const enumerationValidator = ({ attr }) => {
 };
 const integerValidator = (metas, options) => {
   let schema = strapiUtils.yup.number().integer();
-  schema = addMinIntegerValidator(schema, metas);
+  schema = addMinIntegerValidator(schema, metas, options);
   schema = addMaxIntegerValidator(schema, metas);
   schema = addUniqueValidator(schema, metas, options);
   return schema;
 };
 const floatValidator = (metas, options) => {
   let schema = strapiUtils.yup.number();
-  schema = addMinFloatValidator(schema, metas);
+  schema = addMinFloatValidator(schema, metas, options);
   schema = addMaxFloatValidator(schema, metas);
   schema = addUniqueValidator(schema, metas, options);
   return schema;
@@ -144,7 +210,7 @@ const datesValidator = (metas, options) => {
   const schema = strapiUtils.yup.mixed();
   return addUniqueValidator(schema, metas, options);
 };
-const validators = {
+const Validators = {
   string: stringValidator,
   text: stringValidator,
   richtext: stringValidator,
@@ -162,7 +228,14 @@ const validators = {
   time: datesValidator,
   datetime: datesValidator,
   timestamp: datesValidator,
-  blocks: blocksValidator
+  blocks: blocksValidator.blocksValidator
 };
-module.exports = validators;
+exports.Validators = Validators;
+exports.bigintegerValidator = bigintegerValidator;
+exports.datesValidator = datesValidator;
+exports.emailValidator = emailValidator;
+exports.enumerationValidator = enumerationValidator;
+exports.floatValidator = floatValidator;
+exports.integerValidator = integerValidator;
+exports.uidValidator = uidValidator;
 //# sourceMappingURL=validators.js.map

package/dist/services/entity-validator/validators.js.map

@@ -1 +1 @@
-{"version":3,"file":"validators.js","sources":["../../../src/services/entity-validator/validators.ts"],"sourcesContent":["import _ from 'lodash';\nimport { yup } from '@strapi/utils';\nimport type { Schema, Struct, Modules } from '@strapi/types';\nimport blocksValidator from './blocks-validator';\n\nimport type { ComponentContext } from '.';\n\ninterface ValidatorMetas<TAttribute extends Schema.Attribute.AnyAttribute> {\n  attr: TAttribute;\n  model: Struct.ContentTypeSchema;\n  updatedAttribute: { name: string; value: unknown };\n  entity: Modules.EntityValidator.Entity;\n  componentContext: ComponentContext;\n}\n\ninterface ValidatorOptions {\n  isDraft: boolean;\n  locale?: string;\n}\n\n/* Validator utils */\n\n/**\n * Adds minLength validator\n */\nconst addMinLengthValidator = (\n  validator: yup.StringSchema,\n  {\n    attr,\n  }: {\n    attr:\n      | Schema.Attribute.String\n      | Schema.Attribute.Text\n      | Schema.Attribute.RichText\n      | Schema.Attribute.Password\n      | Schema.Attribute.Email\n      | Schema.Attribute.UID;\n  },\n  { isDraft }: ValidatorOptions\n) => {\n  return attr.minLength && _.isInteger(attr.minLength) && !isDraft\n    ? validator.min(attr.minLength)\n    : validator;\n};\n\n/**\n * Adds maxLength validator\n * @returns {StringSchema}\n */\nconst addMaxLengthValidator = (\n  validator: yup.StringSchema,\n  {\n    attr,\n  }: {\n    attr:\n      | Schema.Attribute.String\n      | Schema.Attribute.Text\n      | Schema.Attribute.RichText\n      | Schema.Attribute.Password\n      | Schema.Attribute.Email\n      | Schema.Attribute.UID;\n  }\n) => {\n  return attr.maxLength && _.isInteger(attr.maxLength) ? validator.max(attr.maxLength) : validator;\n};\n\n/**\n * Adds min integer validator\n * @returns {NumberSchema}\n */\nconst addMinIntegerValidator = (\n  validator: yup.NumberSchema,\n  {\n    attr,\n  }: {\n    attr: Schema.Attribute.Integer | Schema.Attribute.BigInteger;\n  }\n) => (_.isNumber(attr.min) ? validator.min(_.toInteger(attr.min)) : validator);\n\n/**\n * Adds max integer validator\n */\nconst addMaxIntegerValidator = (\n  validator: yup.NumberSchema,\n  {\n    attr,\n  }: {\n    attr: Schema.Attribute.Integer | Schema.Attribute.BigInteger;\n  }\n) => (_.isNumber(attr.max) ? validator.max(_.toInteger(attr.max)) : validator);\n\n/**\n * Adds min float/decimal validator\n */\nconst addMinFloatValidator = (\n  validator: yup.NumberSchema,\n  {\n    attr,\n  }: {\n    attr: Schema.Attribute.Decimal | Schema.Attribute.Float;\n  }\n) => (_.isNumber(attr.min) ? validator.min(attr.min) : validator);\n\n/**\n * Adds max float/decimal validator\n */\nconst addMaxFloatValidator = (\n  validator: yup.NumberSchema,\n  {\n    attr,\n  }: {\n    attr: Schema.Attribute.Decimal | Schema.Attribute.Float;\n  }\n) => (_.isNumber(attr.max) ? validator.max(attr.max) : validator);\n\n/**\n * Adds regex validator\n */\nconst addStringRegexValidator = (\n  validator: yup.StringSchema,\n  {\n    attr,\n  }: {\n    attr:\n      | Schema.Attribute.String\n      | Schema.Attribute.Text\n      | Schema.Attribute.RichText\n      | Schema.Attribute.Password\n      | Schema.Attribute.Email\n      | Schema.Attribute.UID;\n  }\n) => {\n  return 'regex' in attr && !_.isUndefined(attr.regex)\n    ? validator.matches(new RegExp(attr.regex), { excludeEmptyString: !attr.required })\n    : validator;\n};\n\n/**\n * Adds unique validator\n */\nconst addUniqueValidator = <T extends yup.AnySchema>(\n  validator: T,\n  {\n    attr,\n    model,\n    updatedAttribute,\n    entity,\n    componentContext,\n  }: ValidatorMetas<Schema.Attribute.AnyAttribute & Schema.Attribute.UniqueOption>,\n  options: ValidatorOptions\n): T => {\n  if (attr.type !== 'uid' && !attr.unique) {\n    return validator;\n  }\n\n  return validator.test('unique', 'This attribute must be unique', async (value) => {\n    const isPublish = options.isDraft === false;\n\n    /**\n     * If the attribute value is `null` we want to skip the unique validation.\n     * Otherwise it'll only accept a single `null` entry in the database.\n     */\n    if (_.isNil(value)) {\n      return true;\n    }\n\n    /**\n     * If we are updating a draft and the value is unchanged we skip the unique verification. This will\n     * prevent the validator to be triggered in case the user activated the\n     * unique constraint after already creating multiple entries with\n     * the same attribute value for that field.\n     */\n    if (!isPublish && value === entity?.[updatedAttribute.name]) {\n      return true;\n    }\n\n    let queryUid: string;\n    let queryWhere: Record<string, any> = {};\n\n    const hasPathToComponent = componentContext?.pathToComponent?.length > 0;\n    if (hasPathToComponent) {\n      const hasRepeatableData = componentContext.repeatableData.length > 0;\n      if (hasRepeatableData) {\n        // If we are validating a unique field within a repeatable component,\n        // we first need to ensure that the repeatable in the current entity is\n        // valid against itself.\n\n        const { name: updatedName, value: updatedValue } = updatedAttribute;\n        // Construct the full path to the unique field within the component.\n        const pathToCheck = [...componentContext.pathToComponent.slice(1), updatedName].join('.');\n\n        // Extract the values from the repeatable data using the constructed path\n        const values = componentContext.repeatableData.map((item) => {\n          return pathToCheck.split('.').reduce((acc, key) => acc[key], item as any);\n        });\n\n        // Check if the value is repeated in the current entity\n        const isUpdatedAttributeRepeatedInThisEntity =\n          values.filter((value) => value === updatedValue).length > 1;\n\n        if (isUpdatedAttributeRepeatedInThisEntity) {\n          return false;\n        }\n      }\n\n      /**\n       * When `componentContext` is present it means we are dealing with a unique\n       * field within a component.\n       *\n       * The unique validation must consider the specific context of the\n       * component, which will always be contained within a parent content type\n       * and may also be nested within another component.\n       *\n       * We construct a query that takes into account the parent's model UID,\n       * dimensions (such as draft and publish state/locale) and excludes the current\n       * content type entity by its ID if provided.\n       */\n      const {\n        model: parentModel,\n        options: parentOptions,\n        id: excludeId,\n      } = componentContext.parentContent;\n      queryUid = parentModel.uid;\n\n      const whereConditions: Record<string, any> = {};\n      const isParentDraft = parentOptions && parentOptions.isDraft;\n\n      whereConditions.publishedAt = isParentDraft ? null : { $notNull: true };\n\n      if (parentOptions?.locale) {\n        whereConditions.locale = parentOptions.locale;\n      }\n\n      if (excludeId && !Number.isNaN(excludeId)) {\n        whereConditions.id = { $ne: excludeId };\n      }\n\n      queryWhere = {\n        ...componentContext.pathToComponent.reduceRight((acc, key) => ({ [key]: acc }), {\n          [updatedAttribute.name]: value,\n        }),\n\n        ...whereConditions,\n      };\n    } else {\n      /**\n       * Here we are validating a scalar unique field from the content type's schema.\n       * We construct a query to check if the value is unique\n       * considering dimensions (e.g. locale, publication state) and excluding the current entity by its ID if available.\n       */\n      queryUid = model.uid;\n      const scalarAttributeWhere: Record<string, any> = {\n        [updatedAttribute.name]: value,\n      };\n\n      scalarAttributeWhere.publishedAt = options.isDraft ? null : { $notNull: true };\n\n      if (options?.locale) {\n        scalarAttributeWhere.locale = options.locale;\n      }\n\n      if (entity?.id) {\n        scalarAttributeWhere.id = { $ne: entity.id };\n      }\n\n      queryWhere = scalarAttributeWhere;\n    }\n\n    // The validation should pass if there is no other record found from the query\n    // TODO query not working for dynamic zones (type === relation)\n    return !(await strapi.db.query(queryUid).findOne({ where: queryWhere }));\n  });\n};\n\n/* Type validators */\n\nconst stringValidator = (\n  metas: ValidatorMetas<\n    | Schema.Attribute.String\n    | Schema.Attribute.Text\n    | Schema.Attribute.RichText\n    | Schema.Attribute.Password\n    | Schema.Attribute.Email\n    | Schema.Attribute.UID\n  >,\n  options: ValidatorOptions\n) => {\n  let schema = yup.string().transform((val, originalVal) => originalVal);\n\n  schema = addMinLengthValidator(schema, metas, options);\n  schema = addMaxLengthValidator(schema, metas);\n  schema = addStringRegexValidator(schema, metas);\n  schema = addUniqueValidator(schema, metas, options);\n\n  return schema;\n};\n\nconst emailValidator = (\n  metas: ValidatorMetas<Schema.Attribute.Email>,\n  options: ValidatorOptions\n) => {\n  const schema = stringValidator(metas, options);\n  return schema.email().min(1, '${path} cannot be empty');\n};\n\nconst uidValidator = (metas: ValidatorMetas<Schema.Attribute.UID>, options: ValidatorOptions) => {\n  const schema = stringValidator(metas, options);\n\n  return schema.matches(/^[A-Za-z0-9-_.~]*$/);\n};\n\nconst enumerationValidator = ({ attr }: { attr: Schema.Attribute.Enumeration }) => {\n  return yup\n    .string()\n    .oneOf((Array.isArray(attr.enum) ? attr.enum : [attr.enum]).concat(null as any));\n};\n\nconst integerValidator = (\n  metas: ValidatorMetas<Schema.Attribute.Integer | Schema.Attribute.BigInteger>,\n  options: ValidatorOptions\n) => {\n  let schema = yup.number().integer();\n\n  schema = addMinIntegerValidator(schema, metas);\n  schema = addMaxIntegerValidator(schema, metas);\n  schema = addUniqueValidator(schema, metas, options);\n\n  return schema;\n};\n\nconst floatValidator = (\n  metas: ValidatorMetas<Schema.Attribute.Decimal | Schema.Attribute.Float>,\n  options: ValidatorOptions\n) => {\n  let schema = yup.number();\n  schema = addMinFloatValidator(schema, metas);\n  schema = addMaxFloatValidator(schema, metas);\n  schema = addUniqueValidator(schema, metas, options);\n\n  return schema;\n};\n\nconst bigintegerValidator = (\n  metas: ValidatorMetas<Schema.Attribute.BigInteger>,\n  options: ValidatorOptions\n) => {\n  const schema = yup.mixed();\n  return addUniqueValidator(schema, metas, options);\n};\n\nconst datesValidator = (\n  metas: ValidatorMetas<\n    | Schema.Attribute.Date\n    | Schema.Attribute.DateTime\n    | Schema.Attribute.Time\n    | Schema.Attribute.Timestamp\n  >,\n  options: ValidatorOptions\n) => {\n  const schema = yup.mixed();\n  return addUniqueValidator(schema, metas, options);\n};\n\nexport default {\n  string: stringValidator,\n  text: stringValidator,\n  richtext: stringValidator,\n  password: stringValidator,\n  email: emailValidator,\n  enumeration: enumerationValidator,\n  boolean: () => yup.boolean(),\n  uid: uidValidator,\n  json: () => yup.mixed(),\n  integer: integerValidator,\n  biginteger: bigintegerValidator,\n  float: floatValidator,\n  decimal: floatValidator,\n  date: datesValidator,\n  time: datesValidator,\n  datetime: datesValidator,\n  timestamp: datesValidator,\n  blocks: blocksValidator,\n};\n"],"names":["_","value","yup"],"mappings":"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"}
+{"version":3,"file":"validators.js","sources":["../../../src/services/entity-validator/validators.ts"],"sourcesContent":["/**\n * Validators check if the entry data meets specific criteria before saving or publishing.\n * (e.g., length, range, format).\n *\n * Drafts have limited validations (mainly max constraints),\n * while published content undergoes full validation.\n *\n * The system also takes locales into account when validating data.\n * E.g, unique fields must be unique within the same locale.\n */\nimport _ from 'lodash';\nimport { yup } from '@strapi/utils';\nimport type { Schema, Struct, Modules } from '@strapi/types';\nimport { blocksValidator } from './blocks-validator';\n\nimport type { ComponentContext } from '.';\n\nexport interface ValidatorMetas<\n  TAttribute extends Schema.Attribute.AnyAttribute = Schema.Attribute.AnyAttribute,\n  TValue extends Schema.Attribute.Value<TAttribute> = Schema.Attribute.Value<TAttribute>,\n> {\n  attr: TAttribute;\n  model: Struct.Schema;\n  updatedAttribute: {\n    name: string;\n    value: TValue;\n  };\n  componentContext?: ComponentContext;\n  entity?: Modules.EntityValidator.Entity;\n}\n\ninterface ValidatorOptions {\n  isDraft: boolean;\n  locale?: string;\n}\n\n/* Validator utils */\n\n/**\n * Adds minLength validator\n */\nconst addMinLengthValidator = (\n  validator: yup.StringSchema,\n  {\n    attr,\n  }: {\n    attr:\n      | Schema.Attribute.String\n      | Schema.Attribute.Text\n      | Schema.Attribute.RichText\n      | Schema.Attribute.Password\n      | Schema.Attribute.Email\n      | Schema.Attribute.UID;\n  },\n  { isDraft }: ValidatorOptions\n) => {\n  return attr.minLength && _.isInteger(attr.minLength) && !isDraft\n    ? validator.min(attr.minLength)\n    : validator;\n};\n\n/**\n * Adds maxLength validator\n * @returns {StringSchema}\n */\nconst addMaxLengthValidator = (\n  validator: yup.StringSchema,\n  {\n    attr,\n  }: {\n    attr:\n      | Schema.Attribute.String\n      | Schema.Attribute.Text\n      | Schema.Attribute.RichText\n      | Schema.Attribute.Password\n      | Schema.Attribute.Email\n      | Schema.Attribute.UID;\n  }\n) => {\n  return attr.maxLength && _.isInteger(attr.maxLength) ? validator.max(attr.maxLength) : validator;\n};\n\n/**\n * Adds min integer validator\n * @returns {NumberSchema}\n */\nconst addMinIntegerValidator = (\n  validator: yup.NumberSchema,\n  {\n    attr,\n  }: {\n    attr: Schema.Attribute.Integer | Schema.Attribute.BigInteger;\n  },\n  { isDraft }: ValidatorOptions\n) => (_.isNumber(attr.min) && !isDraft ? validator.min(_.toInteger(attr.min)) : validator);\n\n/**\n * Adds max integer validator\n */\nconst addMaxIntegerValidator = (\n  validator: yup.NumberSchema,\n  {\n    attr,\n  }: {\n    attr: Schema.Attribute.Integer | Schema.Attribute.BigInteger;\n  }\n) => (_.isNumber(attr.max) ? validator.max(_.toInteger(attr.max)) : validator);\n\n/**\n * Adds min float/decimal validator\n */\nconst addMinFloatValidator = (\n  validator: yup.NumberSchema,\n  {\n    attr,\n  }: {\n    attr: Schema.Attribute.Decimal | Schema.Attribute.Float;\n  },\n  { isDraft }: ValidatorOptions\n) => (_.isNumber(attr.min) && !isDraft ? validator.min(attr.min) : validator);\n\n/**\n * Adds max float/decimal validator\n */\nconst addMaxFloatValidator = (\n  validator: yup.NumberSchema,\n  {\n    attr,\n  }: {\n    attr: Schema.Attribute.Decimal | Schema.Attribute.Float;\n  }\n) => (_.isNumber(attr.max) ? validator.max(attr.max) : validator);\n\n/**\n * Adds regex validator\n */\nconst addStringRegexValidator = (\n  validator: yup.StringSchema,\n  {\n    attr,\n  }: {\n    attr:\n      | Schema.Attribute.String\n      | Schema.Attribute.Text\n      | Schema.Attribute.RichText\n      | Schema.Attribute.Password\n      | Schema.Attribute.Email\n      | Schema.Attribute.UID;\n  },\n  { isDraft }: ValidatorOptions\n) => {\n  return 'regex' in attr && !_.isUndefined(attr.regex) && !isDraft\n    ? validator.matches(new RegExp(attr.regex), { excludeEmptyString: !attr.required })\n    : validator;\n};\n\nconst addUniqueValidator = <T extends yup.AnySchema>(\n  validator: T,\n  {\n    attr,\n    model,\n    updatedAttribute,\n    entity,\n    componentContext,\n  }: ValidatorMetas<Schema.Attribute.AnyAttribute & Schema.Attribute.UniqueOption>,\n  options: ValidatorOptions\n): T => {\n  if (attr.type !== 'uid' && !attr.unique) {\n    return validator;\n  }\n\n  const validateUniqueFieldWithinComponent = async (value: any): Promise<boolean> => {\n    if (!componentContext) {\n      return false;\n    }\n\n    // If we are validating a unique field within a repeatable component,\n    // we first need to ensure that the repeatable in the current entity is\n    // valid against itself.\n    const hasRepeatableData = componentContext.repeatableData.length > 0;\n    if (hasRepeatableData) {\n      const { name: updatedName, value: updatedValue } = updatedAttribute;\n      // Construct the full path to the unique field within the component.\n      const pathToCheck = [...componentContext.pathToComponent.slice(1), updatedName].join('.');\n\n      // Extract the values from the repeatable data using the constructed path\n      const values = componentContext.repeatableData.map((item) => {\n        return pathToCheck.split('.').reduce((acc, key) => acc[key], item as any);\n      });\n\n      // Check if the value is repeated in the current entity\n      const isUpdatedAttributeRepeatedInThisEntity =\n        values.filter((value) => value === updatedValue).length > 1;\n\n      if (isUpdatedAttributeRepeatedInThisEntity) {\n        return false;\n      }\n    }\n\n    /**\n     * When `componentContext` is present it means we are dealing with a unique\n     * field within a component.\n     *\n     * The unique validation must consider the specific context of the\n     * component, which will always be contained within a parent content type\n     * and may also be nested within another component.\n     *\n     * We construct a query that takes into account the parent's model UID,\n     * dimensions (such as draft and publish state/locale) and excludes the current\n     * content type entity by its ID if provided.\n     */\n    const {\n      model: parentModel,\n      options: parentOptions,\n      id: excludeId,\n    } = componentContext.parentContent;\n\n    const whereConditions: Record<string, any> = {};\n    const isParentDraft = parentOptions && parentOptions.isDraft;\n\n    whereConditions.publishedAt = isParentDraft ? null : { $notNull: true };\n\n    if (parentOptions?.locale) {\n      whereConditions.locale = parentOptions.locale;\n    }\n\n    if (excludeId && !Number.isNaN(excludeId)) {\n      whereConditions.id = { $ne: excludeId };\n    }\n\n    const queryUid = parentModel.uid;\n    const queryWhere = {\n      ...componentContext.pathToComponent.reduceRight((acc, key) => ({ [key]: acc }), {\n        [updatedAttribute.name]: value,\n      }),\n\n      ...whereConditions,\n    };\n\n    // The validation should pass if there is no other record found from the query\n    return !(await strapi.db.query(queryUid).findOne({ where: queryWhere }));\n  };\n\n  const validateUniqueFieldWithinDynamicZoneComponent = async (\n    startOfPath: string\n  ): Promise<boolean> => {\n    if (!componentContext) {\n      return false;\n    }\n\n    const targetComponentUID = model.uid;\n    // Ensure that the value is unique within the dynamic zone in this entity.\n    const countOfValueInThisEntity = (componentContext?.fullDynamicZoneContent ?? []).reduce(\n      (acc, component) => {\n        if (component.__component !== targetComponentUID) {\n          return acc;\n        }\n\n        const updatedValue = component[updatedAttribute.name];\n        return updatedValue === updatedAttribute.value ? acc + 1 : acc;\n      },\n      0\n    );\n\n    if (countOfValueInThisEntity > 1) {\n      // If the value is repeated in the current entity, the validation fails.\n      return false;\n    }\n\n    // Build a query for the parent content type to find all entities in the\n    // same locale and publication state\n    type QueryType = {\n      select: string[];\n      where: {\n        published_at?: { $eq: null } | { $ne: null };\n        id?: { $ne: number };\n        locale?: string;\n      };\n      populate: {\n        [key: string]: {\n          on: {\n            [key: string]: {\n              select: string[];\n              where: { [key: string]: string | number | boolean };\n            };\n          };\n        };\n      };\n    };\n\n    // Populate the dynamic zone for any components that share the same value\n    // as the updated attribute.\n    const query: QueryType = {\n      select: ['id'],\n      where: {},\n      populate: {\n        [startOfPath]: {\n          on: {\n            [targetComponentUID]: {\n              select: ['id'],\n              where: { [updatedAttribute.name]: updatedAttribute.value },\n            },\n          },\n        },\n      },\n    };\n\n    const { options, id } = componentContext.parentContent;\n\n    if (options?.isDraft !== undefined) {\n      query.where.published_at = options.isDraft ? { $eq: null } : { $ne: null };\n    }\n\n    if (id) {\n      query.where.id = { $ne: id };\n    }\n\n    if (options?.locale) {\n      query.where.locale = options.locale;\n    }\n\n    const parentModelQueryResult = await strapi.db\n      .query(componentContext.parentContent.model.uid)\n      .findMany(query);\n\n    // Filter the results to only include results that have components in the\n    // dynamic zone that match the target component type.\n    const filteredResults = parentModelQueryResult\n      .filter((result) => Array.isArray(result[startOfPath]) && result[startOfPath].length)\n      .flatMap((result) => result[startOfPath])\n      .filter((dynamicZoneComponent) => dynamicZoneComponent.__component === targetComponentUID);\n\n    if (filteredResults.length >= 1) {\n      return false;\n    }\n\n    return true;\n  };\n\n  return validator.test('unique', 'This attribute must be unique', async (value) => {\n    /**\n     * If the attribute value is `null` or an empty string we want to skip the unique validation.\n     * Otherwise it'll only accept a single entry with that value in the database.\n     */\n    if (_.isNil(value) || value === '') {\n      return true;\n    }\n\n    /**\n     * We don't validate any unique constraint for draft entries.\n     */\n    if (options.isDraft) {\n      return true;\n    }\n\n    const hasPathToComponent = componentContext && componentContext.pathToComponent.length > 0;\n    if (hasPathToComponent) {\n      // Detect if we are validating within a dynamiczone by checking if the first\n      // path is a dynamiczone attribute in the parent content type.\n      const startOfPath = componentContext.pathToComponent[0];\n      const testingDZ =\n        componentContext.parentContent.model.attributes[startOfPath].type === 'dynamiczone';\n\n      if (testingDZ) {\n        return validateUniqueFieldWithinDynamicZoneComponent(startOfPath);\n      }\n\n      return validateUniqueFieldWithinComponent(value);\n    }\n\n    /**\n     * Here we are validating a scalar unique field from the content type's schema.\n     * We construct a query to check if the value is unique\n     * considering dimensions (e.g. locale, publication state) and excluding the current entity by its ID if available.\n     */\n    const scalarAttributeWhere: Record<string, any> = {\n      [updatedAttribute.name]: value,\n      publishedAt: { $notNull: true },\n    };\n\n    if (options?.locale) {\n      scalarAttributeWhere.locale = options.locale;\n    }\n\n    if (entity?.id) {\n      scalarAttributeWhere.id = { $ne: entity.id };\n    }\n\n    // The validation should pass if there is no other record found from the query\n    return !(await strapi.db\n      .query(model.uid)\n      .findOne({ where: scalarAttributeWhere, select: ['id'] }));\n  });\n};\n\n/* Type validators */\n\nconst stringValidator = (\n  metas: ValidatorMetas<\n    | Schema.Attribute.String\n    | Schema.Attribute.Text\n    | Schema.Attribute.RichText\n    | Schema.Attribute.Password\n    | Schema.Attribute.Email\n    | Schema.Attribute.UID\n  >,\n  options: ValidatorOptions\n) => {\n  let schema = yup.string().transform((val, originalVal) => originalVal);\n\n  schema = addMinLengthValidator(schema, metas, options);\n  schema = addMaxLengthValidator(schema, metas);\n  schema = addStringRegexValidator(schema, metas, options);\n  schema = addUniqueValidator(schema, metas, options);\n\n  return schema;\n};\n\nexport const emailValidator = (\n  metas: ValidatorMetas<Schema.Attribute.Email>,\n  options: ValidatorOptions\n) => {\n  const schema = stringValidator(metas, options);\n\n  if (options.isDraft) {\n    return schema;\n  }\n\n  return schema.email().min(\n    1,\n    // eslint-disable-next-line no-template-curly-in-string\n    '${path} cannot be empty'\n  );\n};\n\nexport const uidValidator = (\n  metas: ValidatorMetas<Schema.Attribute.UID>,\n  options: ValidatorOptions\n) => {\n  const schema = stringValidator(metas, options);\n\n  if (options.isDraft) {\n    return schema;\n  }\n\n  return schema.matches(/^[A-Za-z0-9-_.~]*$/);\n};\n\nexport const enumerationValidator = ({ attr }: { attr: Schema.Attribute.Enumeration }) => {\n  return yup\n    .string()\n    .oneOf((Array.isArray(attr.enum) ? attr.enum : [attr.enum]).concat(null as any));\n};\n\nexport const integerValidator = (\n  metas: ValidatorMetas<Schema.Attribute.Integer | Schema.Attribute.BigInteger>,\n  options: ValidatorOptions\n) => {\n  let schema = yup.number().integer();\n\n  schema = addMinIntegerValidator(schema, metas, options);\n  schema = addMaxIntegerValidator(schema, metas);\n  schema = addUniqueValidator(schema, metas, options);\n\n  return schema;\n};\n\nexport const floatValidator = (\n  metas: ValidatorMetas<Schema.Attribute.Decimal | Schema.Attribute.Float>,\n  options: ValidatorOptions\n) => {\n  let schema = yup.number();\n\n  schema = addMinFloatValidator(schema, metas, options);\n  schema = addMaxFloatValidator(schema, metas);\n  schema = addUniqueValidator(schema, metas, options);\n\n  return schema;\n};\n\nexport const bigintegerValidator = (\n  metas: ValidatorMetas<Schema.Attribute.BigInteger>,\n  options: ValidatorOptions\n) => {\n  const schema = yup.mixed();\n  return addUniqueValidator(schema, metas, options);\n};\n\nexport const datesValidator = (\n  metas: ValidatorMetas<\n    | Schema.Attribute.Date\n    | Schema.Attribute.DateTime\n    | Schema.Attribute.Time\n    | Schema.Attribute.Timestamp\n  >,\n  options: ValidatorOptions\n) => {\n  const schema = yup.mixed();\n  return addUniqueValidator(schema, metas, options);\n};\n\nexport const Validators = {\n  string: stringValidator,\n  text: stringValidator,\n  richtext: stringValidator,\n  password: stringValidator,\n  email: emailValidator,\n  enumeration: enumerationValidator,\n  boolean: () => yup.boolean(),\n  uid: uidValidator,\n  json: () => yup.mixed(),\n  integer: integerValidator,\n  biginteger: bigintegerValidator,\n  float: floatValidator,\n  decimal: floatValidator,\n  date: datesValidator,\n  time: datesValidator,\n  datetime: datesValidator,\n  timestamp: datesValidator,\n  blocks: blocksValidator,\n};\n"],"names":["_","value","options","yup","blocksValidator"],"mappings":"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"}

package/dist/services/entity-validator/validators.mjs

@@ -1,6 +1,6 @@
 import _ from "lodash";
 import { yup } from "@strapi/utils";
-import blocksValidator from "./blocks-validator.mjs";
+import { blocksValidator } from "./blocks-validator.mjs";
 const addMinLengthValidator = (validator, {
   attr
 }, { isDraft }) => {
@@ -13,20 +13,20 @@ const addMaxLengthValidator = (validator, {
 };
 const addMinIntegerValidator = (validator, {
   attr
-}) => _.isNumber(attr.min) ? validator.min(_.toInteger(attr.min)) : validator;
+}, { isDraft }) => _.isNumber(attr.min) && !isDraft ? validator.min(_.toInteger(attr.min)) : validator;
 const addMaxIntegerValidator = (validator, {
   attr
 }) => _.isNumber(attr.max) ? validator.max(_.toInteger(attr.max)) : validator;
 const addMinFloatValidator = (validator, {
   attr
-}) => _.isNumber(attr.min) ? validator.min(attr.min) : validator;
+}, { isDraft }) => _.isNumber(attr.min) && !isDraft ? validator.min(attr.min) : validator;
 const addMaxFloatValidator = (validator, {
   attr
 }) => _.isNumber(attr.max) ? validator.max(attr.max) : validator;
 const addStringRegexValidator = (validator, {
   attr
-}) => {
-  return "regex" in attr && !_.isUndefined(attr.regex) ? validator.matches(new RegExp(attr.regex), { excludeEmptyString: !attr.required }) : validator;
+}, { isDraft }) => {
+  return "regex" in attr && !_.isUndefined(attr.regex) && !isDraft ? validator.matches(new RegExp(attr.regex), { excludeEmptyString: !attr.required }) : validator;
 };
 const addUniqueValidator = (validator, {
   attr,
@@ -38,82 +38,147 @@ const addUniqueValidator = (validator, {
   if (attr.type !== "uid" && !attr.unique) {
     return validator;
   }
+  const validateUniqueFieldWithinComponent = async (value) => {
+    if (!componentContext) {
+      return false;
+    }
+    const hasRepeatableData = componentContext.repeatableData.length > 0;
+    if (hasRepeatableData) {
+      const { name: updatedName, value: updatedValue } = updatedAttribute;
+      const pathToCheck = [...componentContext.pathToComponent.slice(1), updatedName].join(".");
+      const values = componentContext.repeatableData.map((item) => {
+        return pathToCheck.split(".").reduce((acc, key) => acc[key], item);
+      });
+      const isUpdatedAttributeRepeatedInThisEntity = values.filter((value2) => value2 === updatedValue).length > 1;
+      if (isUpdatedAttributeRepeatedInThisEntity) {
+        return false;
+      }
+    }
+    const {
+      model: parentModel,
+      options: parentOptions,
+      id: excludeId
+    } = componentContext.parentContent;
+    const whereConditions = {};
+    const isParentDraft = parentOptions && parentOptions.isDraft;
+    whereConditions.publishedAt = isParentDraft ? null : { $notNull: true };
+    if (parentOptions?.locale) {
+      whereConditions.locale = parentOptions.locale;
+    }
+    if (excludeId && !Number.isNaN(excludeId)) {
+      whereConditions.id = { $ne: excludeId };
+    }
+    const queryUid = parentModel.uid;
+    const queryWhere = {
+      ...componentContext.pathToComponent.reduceRight((acc, key) => ({ [key]: acc }), {
+        [updatedAttribute.name]: value
+      }),
+      ...whereConditions
+    };
+    return !await strapi.db.query(queryUid).findOne({ where: queryWhere });
+  };
+  const validateUniqueFieldWithinDynamicZoneComponent = async (startOfPath) => {
+    if (!componentContext) {
+      return false;
+    }
+    const targetComponentUID = model.uid;
+    const countOfValueInThisEntity = (componentContext?.fullDynamicZoneContent ?? []).reduce(
+      (acc, component) => {
+        if (component.__component !== targetComponentUID) {
+          return acc;
+        }
+        const updatedValue = component[updatedAttribute.name];
+        return updatedValue === updatedAttribute.value ? acc + 1 : acc;
+      },
+      0
+    );
+    if (countOfValueInThisEntity > 1) {
+      return false;
+    }
+    const query = {
+      select: ["id"],
+      where: {},
+      populate: {
+        [startOfPath]: {
+          on: {
+            [targetComponentUID]: {
+              select: ["id"],
+              where: { [updatedAttribute.name]: updatedAttribute.value }
+            }
+          }
+        }
+      }
+    };
+    const { options: options2, id } = componentContext.parentContent;
+    if (options2?.isDraft !== void 0) {
+      query.where.published_at = options2.isDraft ? { $eq: null } : { $ne: null };
+    }
+    if (id) {
+      query.where.id = { $ne: id };
+    }
+    if (options2?.locale) {
+      query.where.locale = options2.locale;
+    }
+    const parentModelQueryResult = await strapi.db.query(componentContext.parentContent.model.uid).findMany(query);
+    const filteredResults = parentModelQueryResult.filter((result) => Array.isArray(result[startOfPath]) && result[startOfPath].length).flatMap((result) => result[startOfPath]).filter((dynamicZoneComponent) => dynamicZoneComponent.__component === targetComponentUID);
+    if (filteredResults.length >= 1) {
+      return false;
+    }
+    return true;
+  };
   return validator.test("unique", "This attribute must be unique", async (value) => {
-    const isPublish = options.isDraft === false;
-    if (_.isNil(value)) {
+    if (_.isNil(value) || value === "") {
       return true;
     }
-    if (!isPublish && value === entity?.[updatedAttribute.name]) {
+    if (options.isDraft) {
       return true;
     }
-    let queryUid;
-    let queryWhere = {};
-    const hasPathToComponent = componentContext?.pathToComponent?.length > 0;
+    const hasPathToComponent = componentContext && componentContext.pathToComponent.length > 0;
     if (hasPathToComponent) {
-      const hasRepeatableData = componentContext.repeatableData.length > 0;
-      if (hasRepeatableData) {
-        const { name: updatedName, value: updatedValue } = updatedAttribute;
-        const pathToCheck = [...componentContext.pathToComponent.slice(1), updatedName].join(".");
-        const values = componentContext.repeatableData.map((item) => {
-          return pathToCheck.split(".").reduce((acc, key) => acc[key], item);
-        });
-        const isUpdatedAttributeRepeatedInThisEntity = values.filter((value2) => value2 === updatedValue).length > 1;
-        if (isUpdatedAttributeRepeatedInThisEntity) {
-          return false;
-        }
-      }
-      const {
-        model: parentModel,
-        options: parentOptions,
-        id: excludeId
-      } = componentContext.parentContent;
-      queryUid = parentModel.uid;
-      const whereConditions = {};
-      const isParentDraft = parentOptions && parentOptions.isDraft;
-      whereConditions.publishedAt = isParentDraft ? null : { $notNull: true };
-      if (parentOptions?.locale) {
-        whereConditions.locale = parentOptions.locale;
-      }
-      if (excludeId && !Number.isNaN(excludeId)) {
-        whereConditions.id = { $ne: excludeId };
-      }
-      queryWhere = {
-        ...componentContext.pathToComponent.reduceRight((acc, key) => ({ [key]: acc }), {
-          [updatedAttribute.name]: value
-        }),
-        ...whereConditions
-      };
-    } else {
-      queryUid = model.uid;
-      const scalarAttributeWhere = {
-        [updatedAttribute.name]: value
-      };
-      scalarAttributeWhere.publishedAt = options.isDraft ? null : { $notNull: true };
-      if (options?.locale) {
-        scalarAttributeWhere.locale = options.locale;
-      }
-      if (entity?.id) {
-        scalarAttributeWhere.id = { $ne: entity.id };
+      const startOfPath = componentContext.pathToComponent[0];
+      const testingDZ = componentContext.parentContent.model.attributes[startOfPath].type === "dynamiczone";
+      if (testingDZ) {
+        return validateUniqueFieldWithinDynamicZoneComponent(startOfPath);
       }
-      queryWhere = scalarAttributeWhere;
+      return validateUniqueFieldWithinComponent(value);
     }
-    return !await strapi.db.query(queryUid).findOne({ where: queryWhere });
+    const scalarAttributeWhere = {
+      [updatedAttribute.name]: value,
+      publishedAt: { $notNull: true }
+    };
+    if (options?.locale) {
+      scalarAttributeWhere.locale = options.locale;
+    }
+    if (entity?.id) {
+      scalarAttributeWhere.id = { $ne: entity.id };
+    }
+    return !await strapi.db.query(model.uid).findOne({ where: scalarAttributeWhere, select: ["id"] });
   });
 };
 const stringValidator = (metas, options) => {
   let schema = yup.string().transform((val, originalVal) => originalVal);
   schema = addMinLengthValidator(schema, metas, options);
   schema = addMaxLengthValidator(schema, metas);
-  schema = addStringRegexValidator(schema, metas);
+  schema = addStringRegexValidator(schema, metas, options);
   schema = addUniqueValidator(schema, metas, options);
   return schema;
 };
 const emailValidator = (metas, options) => {
   const schema = stringValidator(metas, options);
-  return schema.email().min(1, "${path} cannot be empty");
+  if (options.isDraft) {
+    return schema;
+  }
+  return schema.email().min(
+    1,
+    // eslint-disable-next-line no-template-curly-in-string
+    "${path} cannot be empty"
+  );
 };
 const uidValidator = (metas, options) => {
   const schema = stringValidator(metas, options);
+  if (options.isDraft) {
+    return schema;
+  }
   return schema.matches(/^[A-Za-z0-9-_.~]*$/);
 };
 const enumerationValidator = ({ attr }) => {
@@ -121,14 +186,14 @@ const enumerationValidator = ({ attr }) => {
 };
 const integerValidator = (metas, options) => {
   let schema = yup.number().integer();
-  schema = addMinIntegerValidator(schema, metas);
+  schema = addMinIntegerValidator(schema, metas, options);
   schema = addMaxIntegerValidator(schema, metas);
   schema = addUniqueValidator(schema, metas, options);
   return schema;
 };
 const floatValidator = (metas, options) => {
   let schema = yup.number();
-  schema = addMinFloatValidator(schema, metas);
+  schema = addMinFloatValidator(schema, metas, options);
   schema = addMaxFloatValidator(schema, metas);
   schema = addUniqueValidator(schema, metas, options);
   return schema;
@@ -141,7 +206,7 @@ const datesValidator = (metas, options) => {
   const schema = yup.mixed();
   return addUniqueValidator(schema, metas, options);
 };
-const validators = {
+const Validators = {
   string: stringValidator,
   text: stringValidator,
   richtext: stringValidator,
@@ -162,6 +227,13 @@ const validators = {
   blocks: blocksValidator
 };
 export {
-  validators as default
+  Validators,
+  bigintegerValidator,
+  datesValidator,
+  emailValidator,
+  enumerationValidator,
+  floatValidator,
+  integerValidator,
+  uidValidator
 };
 //# sourceMappingURL=validators.mjs.map