@strapi/core 0.0.0-experimental.94632b9dc1ff6c9600db6db51cd6dd2d693f5204 → 0.0.0-experimental.997c519cb311bf692e8971f4bbd2e4a92694abee

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

@@ -120,9 +120,9 @@ const blockNodeValidator = yup.lazy((value) => {
       });
   }
 });
-const blocksValidator = yup.array().of(blockNodeValidator);
-const blocksValidator$1 = (metas, options) => blocksValidator;
+const blocksValidatorSchema = yup.array().of(blockNodeValidator);
+const blocksValidator = () => blocksValidatorSchema;
 export {
-  blocksValidator$1 as default
+  blocksValidator
 };
 //# sourceMappingURL=blocks-validator.mjs.map

package/dist/services/entity-validator/blocks-validator.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"blocks-validator.mjs","sources":["../../../src/services/entity-validator/blocks-validator.ts"],"sourcesContent":["import { yup } from '@strapi/utils';\n\nconst textNodeValidator = yup.object().shape({\n  type: yup.string().equals(['text']).required(),\n  text: yup\n    .string()\n    .test(\n      'is-valid-text',\n      'Text must be defined with at least an empty string',\n      (text: unknown) => {\n        return typeof text === 'string' || text === '';\n      }\n    ),\n  bold: yup.boolean(),\n  italic: yup.boolean(),\n  underline: yup.boolean(),\n  strikethrough: yup.boolean(),\n  code: yup.boolean(),\n});\n\nconst checkValidLink = (link: string) => {\n  try {\n    // eslint-disable-next-line no-new\n    new URL(link.startsWith('/') ? `https://strapi.io${link}` : link);\n  } catch (error) {\n    return false;\n  }\n  return true;\n};\n\nconst linkNodeValidator = yup.object().shape({\n  type: yup.string().equals(['link']).required(),\n  url: yup\n    .string()\n    .test('invalid-url', 'Please specify a valid link.', (value) => checkValidLink(value ?? '')),\n  children: yup.array().of(textNodeValidator).required(),\n});\n\n// TODO: remove any with a correct Type\nconst inlineNodeValidator: any = yup.lazy((value: { type: string }) => {\n  switch (value.type) {\n    case 'text':\n      return textNodeValidator;\n    case 'link':\n      return linkNodeValidator;\n    default:\n      return yup.mixed().test('invalid-type', 'Inline node must be Text or Link', () => {\n        return false;\n      });\n  }\n});\n\nconst paragraphNodeValidator = yup.object().shape({\n  type: yup.string().equals(['paragraph']).required(),\n  children: yup\n    .array()\n    .of(inlineNodeValidator)\n    .min(1, 'Paragraph node children must have at least one Text or Link node')\n    .required(),\n});\n\nconst headingNodeValidator = yup.object().shape({\n  type: yup.string().equals(['heading']).required(),\n  level: yup.number().oneOf([1, 2, 3, 4, 5, 6]).required(),\n  children: yup\n    .array()\n    .of(inlineNodeValidator)\n    .min(1, 'Heading node children must have at least one Text or Link node')\n    .required(),\n});\n\nconst quoteNodeValidator = yup.object().shape({\n  type: yup.string().equals(['quote']).required(),\n  children: yup\n    .array()\n    .of(inlineNodeValidator)\n    .min(1, 'Quote node children must have at least one Text or Link node')\n    .required(),\n});\n\nconst codeBlockValidator = yup.object().shape({\n  type: yup.string().equals(['code']).required(),\n  syntax: yup.string().nullable(),\n  children: yup\n    .array()\n    .of(textNodeValidator)\n    .min(1, 'Quote node children must have at least one Text or Link node')\n    .required(),\n});\n\nconst listItemNode = yup.object().shape({\n  type: yup.string().equals(['list-item']).required(),\n  children: yup.array().of(inlineNodeValidator).required(),\n});\n\n// Allow children to be either a listItemNode or a listNode itself\n// @ts-expect-error - listChildrenValidator needs a type\nconst listChildrenValidator = yup.lazy((value: { type: string }) => {\n  switch (value.type) {\n    case 'list':\n      return listNodeValidator;\n    case 'list-item':\n      return listItemNode;\n    default:\n      return yup.mixed().test('invalid-type', 'Inline node must be list-item or list', () => {\n        return false;\n      });\n  }\n});\n\n// @ts-expect-error - listNodeValidator needs a type\nconst listNodeValidator = yup.object().shape({\n  type: yup.string().equals(['list']).required(),\n  format: yup.string().equals(['ordered', 'unordered']).required(),\n  children: yup\n    .array()\n    .of(listChildrenValidator)\n    .min(1, 'List node children must have at least one ListItem or ListNode')\n    .required(),\n});\n\nconst imageNodeValidator = yup.object().shape({\n  type: yup.string().equals(['image']).required(),\n  image: yup.object().shape({\n    name: yup.string().required(),\n    alternativeText: yup.string().nullable(),\n    url: yup.string().required(),\n    caption: yup.string().nullable(),\n    width: yup.number().required(),\n    height: yup.number().required(),\n    formats: yup.object().required(),\n    hash: yup.string().required(),\n    ext: yup.string().required(),\n    mime: yup.string().required(),\n    size: yup.number().required(),\n    previewUrl: yup.string().nullable(),\n    provider: yup.string().required(),\n    provider_metadata: yup.mixed().nullable(),\n    createdAt: yup.string().required(),\n    updatedAt: yup.string().required(),\n  }),\n  children: yup.array().of(inlineNodeValidator).required(),\n});\n\n// TODO: remove the any and replace with a correct Type\nconst blockNodeValidator: any = yup.lazy((value: { type: string }) => {\n  switch (value.type) {\n    case 'paragraph':\n      return paragraphNodeValidator;\n    case 'heading':\n      return headingNodeValidator;\n    case 'quote':\n      return quoteNodeValidator;\n    case 'list':\n      return listNodeValidator;\n    case 'image':\n      return imageNodeValidator;\n    case 'code':\n      return codeBlockValidator;\n    default:\n      return yup.mixed().test('invalid-type', 'Block node is of invalid type', () => {\n        return false;\n      });\n  }\n});\n\nconst blocksValidator = yup.array().of(blockNodeValidator);\n\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nexport default (metas: any, options: any) => blocksValidator;\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"blocks-validator.mjs","sources":["../../../src/services/entity-validator/blocks-validator.ts"],"sourcesContent":["import { yup } from '@strapi/utils';\n\nconst textNodeValidator = yup.object().shape({\n  type: yup.string().equals(['text']).required(),\n  text: yup\n    .string()\n    .test(\n      'is-valid-text',\n      'Text must be defined with at least an empty string',\n      (text: unknown) => {\n        return typeof text === 'string' || text === '';\n      }\n    ),\n  bold: yup.boolean(),\n  italic: yup.boolean(),\n  underline: yup.boolean(),\n  strikethrough: yup.boolean(),\n  code: yup.boolean(),\n});\n\nconst checkValidLink = (link: string) => {\n  try {\n    // eslint-disable-next-line no-new\n    new URL(link.startsWith('/') ? `https://strapi.io${link}` : link);\n  } catch (error) {\n    return false;\n  }\n  return true;\n};\n\nconst linkNodeValidator = yup.object().shape({\n  type: yup.string().equals(['link']).required(),\n  url: yup\n    .string()\n    .test('invalid-url', 'Please specify a valid link.', (value) => checkValidLink(value ?? '')),\n  children: yup.array().of(textNodeValidator).required(),\n});\n\n// TODO: remove any with a correct Type\nconst inlineNodeValidator: any = yup.lazy((value: { type: string }) => {\n  switch (value.type) {\n    case 'text':\n      return textNodeValidator;\n    case 'link':\n      return linkNodeValidator;\n    default:\n      return yup.mixed().test('invalid-type', 'Inline node must be Text or Link', () => {\n        return false;\n      });\n  }\n});\n\nconst paragraphNodeValidator = yup.object().shape({\n  type: yup.string().equals(['paragraph']).required(),\n  children: yup\n    .array()\n    .of(inlineNodeValidator)\n    .min(1, 'Paragraph node children must have at least one Text or Link node')\n    .required(),\n});\n\nconst headingNodeValidator = yup.object().shape({\n  type: yup.string().equals(['heading']).required(),\n  level: yup.number().oneOf([1, 2, 3, 4, 5, 6]).required(),\n  children: yup\n    .array()\n    .of(inlineNodeValidator)\n    .min(1, 'Heading node children must have at least one Text or Link node')\n    .required(),\n});\n\nconst quoteNodeValidator = yup.object().shape({\n  type: yup.string().equals(['quote']).required(),\n  children: yup\n    .array()\n    .of(inlineNodeValidator)\n    .min(1, 'Quote node children must have at least one Text or Link node')\n    .required(),\n});\n\nconst codeBlockValidator = yup.object().shape({\n  type: yup.string().equals(['code']).required(),\n  syntax: yup.string().nullable(),\n  children: yup\n    .array()\n    .of(textNodeValidator)\n    .min(1, 'Quote node children must have at least one Text or Link node')\n    .required(),\n});\n\nconst listItemNode = yup.object().shape({\n  type: yup.string().equals(['list-item']).required(),\n  children: yup.array().of(inlineNodeValidator).required(),\n});\n\n// Allow children to be either a listItemNode or a listNode itself\n// @ts-expect-error - listChildrenValidator needs a type\nconst listChildrenValidator = yup.lazy((value: { type: string }) => {\n  switch (value.type) {\n    case 'list':\n      return listNodeValidator;\n    case 'list-item':\n      return listItemNode;\n    default:\n      return yup.mixed().test('invalid-type', 'Inline node must be list-item or list', () => {\n        return false;\n      });\n  }\n});\n\n// @ts-expect-error - listNodeValidator needs a type\nconst listNodeValidator = yup.object().shape({\n  type: yup.string().equals(['list']).required(),\n  format: yup.string().equals(['ordered', 'unordered']).required(),\n  children: yup\n    .array()\n    .of(listChildrenValidator)\n    .min(1, 'List node children must have at least one ListItem or ListNode')\n    .required(),\n});\n\nconst imageNodeValidator = yup.object().shape({\n  type: yup.string().equals(['image']).required(),\n  image: yup.object().shape({\n    name: yup.string().required(),\n    alternativeText: yup.string().nullable(),\n    url: yup.string().required(),\n    caption: yup.string().nullable(),\n    width: yup.number().required(),\n    height: yup.number().required(),\n    formats: yup.object().required(),\n    hash: yup.string().required(),\n    ext: yup.string().required(),\n    mime: yup.string().required(),\n    size: yup.number().required(),\n    previewUrl: yup.string().nullable(),\n    provider: yup.string().required(),\n    provider_metadata: yup.mixed().nullable(),\n    createdAt: yup.string().required(),\n    updatedAt: yup.string().required(),\n  }),\n  children: yup.array().of(inlineNodeValidator).required(),\n});\n\n// TODO: remove the any and replace with a correct Type\nconst blockNodeValidator: any = yup.lazy((value: { type: string }) => {\n  switch (value.type) {\n    case 'paragraph':\n      return paragraphNodeValidator;\n    case 'heading':\n      return headingNodeValidator;\n    case 'quote':\n      return quoteNodeValidator;\n    case 'list':\n      return listNodeValidator;\n    case 'image':\n      return imageNodeValidator;\n    case 'code':\n      return codeBlockValidator;\n    default:\n      return yup.mixed().test('invalid-type', 'Block node is of invalid type', () => {\n        return false;\n      });\n  }\n});\n\nconst blocksValidatorSchema = yup.array().of(blockNodeValidator);\n\nexport const blocksValidator = () => blocksValidatorSchema;\n"],"names":[],"mappings":"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"}

package/dist/services/entity-validator/index.d.ts

@@ -2,7 +2,21 @@
  * Entity validator
  * Module that will validate input data for entity creation or edition
  */
-import { EntityValidator } from '@strapi/types';
-declare const entityValidator: EntityValidator;
+import { Modules, Struct, Schema } from '@strapi/types';
+export type ComponentContext = {
+    parentContent: {
+        model: Struct.Schema;
+        id?: number;
+        options?: ValidatorContext;
+    };
+    pathToComponent: string[];
+    repeatableData: Modules.EntityValidator.Entity[];
+    fullDynamicZoneContent?: Schema.Attribute.Value<Schema.Attribute.DynamicZone>;
+};
+interface ValidatorContext {
+    isDraft?: boolean;
+    locale?: string | null;
+}
+declare const entityValidator: Modules.EntityValidator.EntityValidator;
 export default entityValidator;
 //# sourceMappingURL=index.d.ts.map

package/dist/services/entity-validator/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/entity-validator/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EAAE,eAAe,EAAoD,MAAM,eAAe,CAAC;AAwelG,QAAA,MAAM,eAAe,EAAE,eAGtB,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/entity-validator/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EAAE,OAAO,EAAO,MAAM,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAa7D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,aAAa,EAAE;QAEb,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC;QAErB,EAAE,CAAC,EAAE,MAAM,CAAC;QAGZ,OAAO,CAAC,EAAE,gBAAgB,CAAC;KAC5B,CAAC;IAEF,eAAe,EAAE,MAAM,EAAE,CAAC;IAG1B,cAAc,EAAE,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;IACjD,sBAAsB,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;CAC/E,CAAC;AAWF,UAAU,gBAAgB;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AA+gBD,QAAA,MAAM,eAAe,EAAE,OAAO,CAAC,eAAe,CAAC,eAG9C,CAAC;AAEF,eAAe,eAAe,CAAC"}

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

@@ -1,6 +1,6 @@
 "use strict";
-const _$1 = require("lodash");
-const _ = require("lodash/fp");
+const _ = require("lodash");
+const fp = require("lodash/fp");
 const strapiUtils = require("@strapi/utils");
 const validators = require("./validators.js");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
@@ -9,7 +9,10 @@ const { yup, validateYupSchema } = strapiUtils__default.default;
 const { isMediaAttribute, isScalarAttribute, getWritableAttributes } = strapiUtils__default.default.contentTypes;
 const { ValidationError } = strapiUtils__default.default.errors;
 const isInteger = (value) => Number.isInteger(value);
-const addMinMax = (validator, { attr, updatedAttribute }) => {
+const addMinMax = (validator, {
+  attr,
+  updatedAttribute
+}) => {
   let nextValidator = validator;
   if (isInteger(attr.min) && ("required" in attr && attr.required || Array.isArray(updatedAttribute.value) && updatedAttribute.value.length > 0)) {
     nextValidator = nextValidator.min(attr.min);
@@ -20,7 +23,9 @@ const addMinMax = (validator, { attr, updatedAttribute }) => {
   return nextValidator;
 };
 const addRequiredValidation = (createOrUpdate) => {
-  return (validator, { attr: { required } }) => {
+  return (validator, {
+    attr: { required }
+  }) => {
     let nextValidator = validator;
     if (required) {
       if (createOrUpdate === "creation") {
@@ -50,7 +55,11 @@ const addDefault = (createOrUpdate) => {
   };
 };
 const preventCast = (validator) => validator.transform((val, originalVal) => originalVal);
-const createComponentValidator = (createOrUpdate) => ({ attr, updatedAttribute }, { isDraft }) => {
+const createComponentValidator = (createOrUpdate) => ({
+  attr,
+  updatedAttribute,
+  componentContext
+}, { isDraft }) => {
   const model = strapi.getModel(attr.component);
   if (!model) {
     throw new Error("Validation failed: Model not found");
@@ -58,7 +67,10 @@ const createComponentValidator = (createOrUpdate) => ({ attr, updatedAttribute }
   if (attr?.repeatable) {
     let validator2 = yup.array().of(
       yup.lazy(
-        (item) => createModelValidator(createOrUpdate)({ model, data: item }, { isDraft }).notNull()
+        (item) => createModelValidator(createOrUpdate)(
+          { componentContext, model, data: item },
+          { isDraft }
+        ).notNull()
       )
     );
     validator2 = addRequiredValidation(createOrUpdate)(validator2, {
@@ -69,7 +81,11 @@ const createComponentValidator = (createOrUpdate) => ({ attr, updatedAttribute }
     return validator2;
   }
   let validator = createModelValidator(createOrUpdate)(
-    { model, data: updatedAttribute.value },
+    {
+      model,
+      data: updatedAttribute.value,
+      componentContext
+    },
     { isDraft }
   );
   validator = addRequiredValidation(createOrUpdate)(validator, {
@@ -78,15 +94,20 @@ const createComponentValidator = (createOrUpdate) => ({ attr, updatedAttribute }
   });
   return validator;
 };
-const createDzValidator = (createOrUpdate) => ({ attr, updatedAttribute }, { isDraft }) => {
+const createDzValidator = (createOrUpdate) => ({ attr, updatedAttribute, componentContext }, { isDraft }) => {
   let validator;
   validator = yup.array().of(
     yup.lazy((item) => {
-      const model = strapi.getModel(_.prop("__component", item));
+      const model = strapi.getModel(fp.prop("__component", item));
       const schema = yup.object().shape({
         __component: yup.string().required().oneOf(Object.keys(strapi.components))
       }).notNull();
-      return model ? schema.concat(createModelValidator(createOrUpdate)({ model, data: item }, { isDraft })) : schema;
+      return model ? schema.concat(
+        createModelValidator(createOrUpdate)(
+          { model, data: item, componentContext },
+          { isDraft }
+        )
+      ) : schema;
     })
     // FIXME: yup v1
   );
@@ -97,23 +118,21 @@ const createDzValidator = (createOrUpdate) => ({ attr, updatedAttribute }, { isD
   validator = addMinMax(validator, { attr, updatedAttribute });
   return validator;
 };
-const createRelationValidator = (createOrUpdate) => ({ attr, updatedAttribute }, { isDraft }) => {
+const createRelationValidator = ({
+  updatedAttribute
+}) => {
   let validator;
   if (Array.isArray(updatedAttribute.value)) {
     validator = yup.array().of(yup.mixed());
   } else {
     validator = yup.mixed();
   }
-  validator = addRequiredValidation(createOrUpdate)(validator, {
-    attr: { required: !isDraft && attr.required },
-    updatedAttribute
-  });
   return validator;
 };
 const createScalarAttributeValidator = (createOrUpdate) => (metas, options) => {
   let validator;
-  if (_.has(metas.attr.type, validators)) {
-    validator = validators[metas.attr.type](metas, options);
+  if (fp.has(metas.attr.type, validators.Validators)) {
+    validator = validators.Validators[metas.attr.type](metas, options);
   } else {
     validator = yup.mixed();
   }
@@ -130,67 +149,108 @@ const createAttributeValidator = (createOrUpdate) => (metas, options) => {
   } else if (isScalarAttribute(metas.attr)) {
     validator = createScalarAttributeValidator(createOrUpdate)(metas, options);
   } else {
-    if (metas.attr.type === "component") {
+    if (metas.attr.type === "component" && metas.componentContext) {
+      const pathToComponent = [
+        ...metas?.componentContext?.pathToComponent ?? [],
+        metas.updatedAttribute.name
+      ];
+      const repeatableData = metas.attr.repeatable && pathToComponent.length === 1 ? metas.updatedAttribute.value : metas.componentContext?.repeatableData;
+      const newComponentContext = {
+        ...metas.componentContext,
+        pathToComponent,
+        repeatableData
+      };
       validator = createComponentValidator(createOrUpdate)(
-        { attr: metas.attr, updatedAttribute: metas.updatedAttribute },
-        options
-      );
-    } else if (metas.attr.type === "dynamiczone") {
-      validator = createDzValidator(createOrUpdate)(metas, options);
-    } else if (metas.attr.type === "relation") {
-      validator = createRelationValidator(createOrUpdate)(
         {
+          componentContext: newComponentContext,
           attr: metas.attr,
           updatedAttribute: metas.updatedAttribute
         },
         options
       );
+    } else if (metas.attr.type === "dynamiczone" && metas.componentContext) {
+      const newComponentContext = {
+        ...metas.componentContext,
+        fullDynamicZoneContent: metas.updatedAttribute.value,
+        pathToComponent: [...metas.componentContext.pathToComponent, metas.updatedAttribute.name]
+      };
+      Object.assign(metas, { componentContext: newComponentContext });
+      validator = createDzValidator(createOrUpdate)(metas, options);
+    } else if (metas.attr.type === "relation") {
+      validator = createRelationValidator({
+        attr: metas.attr,
+        updatedAttribute: metas.updatedAttribute
+      });
     }
     validator = preventCast(validator);
   }
   validator = addDefault(createOrUpdate)(validator, metas);
   return validator;
 };
-const createModelValidator = (createOrUpdate) => ({ model, data, entity }, options) => {
+const createModelValidator = (createOrUpdate) => ({ componentContext, model, data, entity }, options) => {
   const writableAttributes = model ? getWritableAttributes(model) : [];
-  const schema = writableAttributes.reduce((validators2, attributeName) => {
-    const metas = {
-      attr: model.attributes[attributeName],
-      updatedAttribute: { name: attributeName, value: _.prop(attributeName, data) },
-      model,
-      entity
-    };
-    const validator = createAttributeValidator(createOrUpdate)(metas, options);
-    validators2[attributeName] = validator;
-    return validators2;
-  }, {});
+  const schema = writableAttributes.reduce(
+    (validators2, attributeName) => {
+      const metas = {
+        attr: model.attributes[attributeName],
+        updatedAttribute: { name: attributeName, value: fp.prop(attributeName, data) },
+        model,
+        entity,
+        componentContext
+      };
+      const validator = createAttributeValidator(createOrUpdate)(metas, options);
+      validators2[attributeName] = validator;
+      return validators2;
+    },
+    {}
+  );
   return yup.object().shape(schema);
 };
 const createValidateEntity = (createOrUpdate) => {
   return async (model, data, options, entity) => {
-    if (!_.isObject(data)) {
+    if (!fp.isObject(data)) {
       const { displayName } = model.info;
       throw new ValidationError(
         `Invalid payload submitted for the ${createOrUpdate} of an entity of type ${displayName}. Expected an object, but got ${typeof data}`
       );
     }
     const validator = createModelValidator(createOrUpdate)(
-      { model, data, entity },
+      {
+        model,
+        data,
+        entity,
+        componentContext: {
+          // Set up the initial component context.
+          // Keeping track of parent content type context in which a component will be used.
+          // This is necessary to validate component field constraints such as uniqueness.
+          parentContent: {
+            id: entity?.id,
+            model,
+            options
+          },
+          pathToComponent: [],
+          repeatableData: []
+        }
+      },
       {
         isDraft: options?.isDraft ?? false,
         locale: options?.locale ?? null
       }
-    ).test("relations-test", "check that all relations exist", async function(data2) {
-      try {
-        await checkRelationsExist(buildRelationsStore({ uid: model.uid, data: data2 }));
-      } catch (e) {
-        return this.createError({
-          path: this.path,
-          message: e instanceof ValidationError && e.message || "Invalid relations"
-        });
+    ).test(
+      "relations-test",
+      "check that all relations exist",
+      async function relationsValidation(data2) {
+        try {
+          await checkRelationsExist(buildRelationsStore({ uid: model.uid, data: data2 }));
+        } catch (e) {
+          return this.createError({
+            path: this.path,
+            message: e instanceof ValidationError && e.message || "Invalid relations"
+          });
+        }
+        return true;
       }
-      return true;
-    }).required();
+    ).required();
     return validateYupSchema(validator, {
       strict: false,
       abortEarly: false
@@ -204,99 +264,102 @@ const buildRelationsStore = ({
   if (!uid) {
     throw new ValidationError(`Cannot build relations store: "uid" is undefined`);
   }
-  if (_.isEmpty(data)) {
+  if (fp.isEmpty(data)) {
     return {};
   }
   const currentModel = strapi.getModel(uid);
-  return Object.keys(currentModel.attributes).reduce((result, attributeName) => {
-    const attribute = currentModel.attributes[attributeName];
-    const value = data[attributeName];
-    if (_$1.isNil(value)) {
-      return result;
-    }
-    switch (attribute.type) {
-      case "relation":
-      case "media": {
-        if (attribute.type === "relation" && (attribute.relation === "morphToMany" || attribute.relation === "morphToOne")) {
-          break;
-        }
-        const target = (
-          // eslint-disable-next-line no-nested-ternary
-          attribute.type === "media" ? "plugin::upload.file" : attribute.target
-        );
-        let source;
-        if (Array.isArray(value)) {
-          source = value;
-        } else if (_.isObject(value)) {
-          if ("connect" in value && !_$1.isNil(value.connect)) {
-            source = value.connect;
-          } else if ("set" in value && !_$1.isNil(value.set)) {
-            source = value.set;
-          } else {
-            source = [];
-          }
-        } else {
-          source = _$1.castArray(value);
-        }
-        const idArray = source.map((v) => ({
-          id: typeof v === "object" ? v.id : v
-        }));
-        result[target] = result[target] || [];
-        result[target].push(...idArray);
-        break;
+  return Object.keys(currentModel.attributes).reduce(
+    (result, attributeName) => {
+      const attribute = currentModel.attributes[attributeName];
+      const value = data[attributeName];
+      if (_.isNil(value)) {
+        return result;
       }
-      case "component": {
-        return _$1.castArray(value).reduce((relationsStore, componentValue) => {
-          if (!attribute.component) {
-            throw new ValidationError(
-              `Cannot build relations store from component, component identifier is undefined`
-            );
+      switch (attribute.type) {
+        case "relation":
+        case "media": {
+          if (attribute.type === "relation" && (attribute.relation === "morphToMany" || attribute.relation === "morphToOne")) {
+            break;
           }
-          return _$1.mergeWith(
-            relationsStore,
-            buildRelationsStore({
-              uid: attribute.component,
-              data: componentValue
-            }),
-            (objValue, srcValue) => {
-              if (_$1.isArray(objValue)) {
-                return objValue.concat(srcValue);
-              }
-            }
+          const target = (
+            // eslint-disable-next-line no-nested-ternary
+            attribute.type === "media" ? "plugin::upload.file" : attribute.target
           );
-        }, result);
-      }
-      case "dynamiczone": {
-        return _$1.castArray(value).reduce((relationsStore, dzValue) => {
-          const value2 = dzValue;
-          if (!value2.__component) {
-            throw new ValidationError(
-              `Cannot build relations store from dynamiczone, component identifier is undefined`
-            );
+          let source;
+          if (Array.isArray(value)) {
+            source = value;
+          } else if (fp.isObject(value)) {
+            if ("connect" in value && !_.isNil(value.connect)) {
+              source = value.connect;
+            } else if ("set" in value && !_.isNil(value.set)) {
+              source = value.set;
+            } else {
+              source = [];
+            }
+          } else {
+            source = _.castArray(value);
           }
-          return _$1.mergeWith(
-            relationsStore,
-            buildRelationsStore({
-              uid: value2.__component,
-              data: value2
-            }),
-            (objValue, srcValue) => {
-              if (_$1.isArray(objValue)) {
-                return objValue.concat(srcValue);
+          const idArray = source.map((v) => ({
+            id: typeof v === "object" ? v.id : v
+          }));
+          result[target] = result[target] || [];
+          result[target].push(...idArray);
+          break;
+        }
+        case "component": {
+          return _.castArray(value).reduce((relationsStore, componentValue) => {
+            if (!attribute.component) {
+              throw new ValidationError(
+                `Cannot build relations store from component, component identifier is undefined`
+              );
+            }
+            return _.mergeWith(
+              relationsStore,
+              buildRelationsStore({
+                uid: attribute.component,
+                data: componentValue
+              }),
+              (objValue, srcValue) => {
+                if (_.isArray(objValue)) {
+                  return objValue.concat(srcValue);
+                }
               }
+            );
+          }, result);
+        }
+        case "dynamiczone": {
+          return _.castArray(value).reduce((relationsStore, dzValue) => {
+            const value2 = dzValue;
+            if (!value2.__component) {
+              throw new ValidationError(
+                `Cannot build relations store from dynamiczone, component identifier is undefined`
+              );
             }
-          );
-        }, result);
+            return _.mergeWith(
+              relationsStore,
+              buildRelationsStore({
+                uid: value2.__component,
+                data: value2
+              }),
+              (objValue, srcValue) => {
+                if (_.isArray(objValue)) {
+                  return objValue.concat(srcValue);
+                }
+              }
+            );
+          }, result);
+        }
       }
-    }
-    return result;
-  }, {});
+      return result;
+    },
+    {}
+  );
 };
 const checkRelationsExist = async (relationsStore = {}) => {
   const promises = [];
   for (const [key, value] of Object.entries(relationsStore)) {
     const evaluate = async () => {
-      const uniqueValues = _$1.uniqBy(value, `id`);
+      const uniqueValues = _.uniqBy(value, `id`);
       const count = await strapi.db.query(key).count({
         where: {
           id: {