@strapi/core 0.0.0-experimental.a407f3bc8fb79a53cf7975140864526b6ddbac4b → 0.0.0-experimental.d23c1d5b0e45dd06ef09977f526c85468be05403

package/dist/services/{entity-service → document-service}/components.js

@@ -5,14 +5,15 @@ const _ = require("lodash/fp");
 const strapiUtils = require("@strapi/utils");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
 const ___default = /* @__PURE__ */ _interopDefault(_$1);
-const isDialectMySQL = () => strapi.db?.dialect.client === "mysql";
-function omitComponentData(contentType, data) {
-  const { attributes } = contentType;
-  const componentAttributes = Object.keys(attributes).filter(
-    (attributeName) => strapiUtils.contentTypes.isComponentAttribute(attributes[attributeName])
-  );
-  return _.omit(componentAttributes, data);
-}
+const omitComponentData = _.curry(
+  (schema, data) => {
+    const { attributes } = schema;
+    const componentAttributes = Object.keys(attributes).filter(
+      (attributeName) => strapiUtils.contentTypes.isComponentAttribute(attributes[attributeName])
+    );
+    return _.omit(componentAttributes, data);
+  }
+);
 const createComponents = async (uid, data) => {
   const { attributes = {} } = strapi.getModel(uid);
   const componentBody = {};
@@ -32,10 +33,9 @@ const createComponents = async (uid, data) => {
         if (!Array.isArray(componentValue)) {
           throw new Error("Expected an array to create repeatable component");
         }
-        const components = await strapiUtils.mapAsync(
+        const components = await strapiUtils.async.map(
           componentValue,
-          (value) => createComponent(componentUID, value),
-          { concurrency: isDialectMySQL() && !strapi.db?.inTransaction() ? 1 : Infinity }
+          (value) => createComponent(componentUID, value)
         );
         componentBody[attributeName] = components.map(({ id }) => {
           return {
@@ -76,10 +76,9 @@ const createComponents = async (uid, data) => {
           }
         };
       };
-      componentBody[attributeName] = await strapiUtils.mapAsync(
+      componentBody[attributeName] = await strapiUtils.async.map(
         dynamiczoneValues,
-        createDynamicZoneComponents,
-        { concurrency: isDialectMySQL() && !strapi.db?.inTransaction() ? 1 : Infinity }
+        createDynamicZoneComponents
       );
       continue;
     }
@@ -91,7 +90,7 @@ const getComponents = async (uid, entity) => {
   if (___default.default.isEmpty(componentAttributes)) {
     return {};
   }
-  return strapi.query(uid).load(entity, componentAttributes);
+  return strapi.db.query(uid).load(entity, componentAttributes);
 };
 const updateComponents = async (uid, entityToUpdate, data) => {
   const { attributes = {} } = strapi.getModel(uid);
@@ -109,10 +108,9 @@ const updateComponents = async (uid, entityToUpdate, data) => {
         if (!Array.isArray(componentValue)) {
           throw new Error("Expected an array to create repeatable component");
         }
-        const components = await strapiUtils.mapAsync(
+        const components = await strapiUtils.async.map(
           componentValue,
-          (value) => updateOrCreateComponent(componentUID, value),
-          { concurrency: isDialectMySQL() && !strapi.db?.inTransaction() ? 1 : Infinity }
+          (value) => updateOrCreateComponent(componentUID, value)
         );
         componentBody[attributeName] = components.filter(___default.default.negate(___default.default.isNil)).map(({ id }) => {
           return {
@@ -133,29 +131,22 @@ const updateComponents = async (uid, entityToUpdate, data) => {
           }
         };
       }
-      continue;
-    }
-    if (attribute.type === "dynamiczone") {
+    } else if (attribute.type === "dynamiczone") {
       const dynamiczoneValues = data[attributeName];
       await deleteOldDZComponents(uid, entityToUpdate, attributeName, dynamiczoneValues);
       if (!Array.isArray(dynamiczoneValues)) {
         throw new Error("Expected an array to create repeatable component");
       }
-      componentBody[attributeName] = await strapiUtils.mapAsync(
-        dynamiczoneValues,
-        async (value) => {
-          const { id } = await updateOrCreateComponent(value.__component, value);
-          return {
-            id,
-            __component: value.__component,
-            __pivot: {
-              field: attributeName
-            }
-          };
-        },
-        { concurrency: isDialectMySQL() && !strapi.db?.inTransaction() ? 1 : Infinity }
-      );
-      continue;
+      componentBody[attributeName] = await strapiUtils.async.map(dynamiczoneValues, async (value) => {
+        const { id } = await updateOrCreateComponent(value.__component, value);
+        return {
+          id,
+          __component: value.__component,
+          __pivot: {
+            field: attributeName
+          }
+        };
+      });
     }
   }
   return componentBody;
@@ -169,7 +160,7 @@ const pickStringifiedId = ({
   return `${id}`;
 };
 const deleteOldComponents = async (uid, componentUID, entityToUpdate, attributeName, componentValue) => {
-  const previousValue = await strapi.query(uid).load(entityToUpdate, attributeName);
+  const previousValue = await strapi.db.query(uid).load(entityToUpdate, attributeName);
   const idsToKeep = ___default.default.castArray(componentValue).filter(_.has("id")).map(pickStringifiedId);
   const allIds = ___default.default.castArray(previousValue).filter(_.has("id")).map(pickStringifiedId);
   idsToKeep.forEach((id) => {
@@ -187,7 +178,7 @@ const deleteOldComponents = async (uid, componentUID, entityToUpdate, attributeN
   }
 };
 const deleteOldDZComponents = async (uid, entityToUpdate, attributeName, dynamiczoneValues) => {
-  const previousValue = await strapi.query(uid).load(entityToUpdate, attributeName);
+  const previousValue = await strapi.db.query(uid).load(entityToUpdate, attributeName);
   const idsToKeep = ___default.default.castArray(dynamiczoneValues).filter(_.has("id")).map((v) => ({
     id: pickStringifiedId(v),
     __component: v.__component
@@ -226,7 +217,7 @@ const deleteComponents = async (uid, entityToDelete, { loadComponents = true } =
     if (attribute.type === "component" || attribute.type === "dynamiczone") {
       let value;
       if (loadComponents) {
-        value = await strapi.query(uid).load(entityToDelete, attributeName);
+        value = await strapi.db.query(uid).load(entityToDelete, attributeName);
       } else {
         value = entityToDelete[attributeName];
       }
@@ -235,114 +226,38 @@ const deleteComponents = async (uid, entityToDelete, { loadComponents = true } =
       }
       if (attribute.type === "component") {
         const { component: componentUID } = attribute;
-        await strapiUtils.mapAsync(
+        await strapiUtils.async.map(
           ___default.default.castArray(value),
-          (subValue) => deleteComponent(componentUID, subValue),
-          {
-            concurrency: isDialectMySQL() && !strapi.db?.inTransaction() ? 1 : Infinity
-          }
+          (subValue) => deleteComponent(componentUID, subValue)
         );
       } else {
-        await strapiUtils.mapAsync(
+        await strapiUtils.async.map(
           ___default.default.castArray(value),
-          (subValue) => deleteComponent(subValue.__component, subValue),
-          { concurrency: isDialectMySQL() && !strapi.db?.inTransaction() ? 1 : Infinity }
+          (subValue) => deleteComponent(subValue.__component, subValue)
         );
       }
       continue;
     }
   }
 };
-const cloneComponents = async (uid, entityToClone, data) => {
-  const { attributes = {} } = strapi.getModel(uid);
-  const componentBody = {};
-  const componentData = await getComponents(uid, entityToClone);
-  for (const attributeName of Object.keys(attributes)) {
-    const attribute = attributes[attributeName];
-    if (!_.has(attributeName, data) && !_.has(attributeName, componentData)) {
-      continue;
-    }
-    if (attribute.type === "component") {
-      const { component: componentUID, repeatable = false } = attribute;
-      const componentValue = attributeName in data ? data[attributeName] : componentData[attributeName];
-      if (componentValue === null) {
-        continue;
-      }
-      if (repeatable === true) {
-        if (!Array.isArray(componentValue)) {
-          throw new Error("Expected an array to create repeatable component");
-        }
-        const components = await strapiUtils.mapAsync(
-          componentValue,
-          (value) => cloneComponent(componentUID, value),
-          { concurrency: isDialectMySQL() ? 1 : Infinity }
-        );
-        componentBody[attributeName] = components.filter(___default.default.negate(___default.default.isNil)).map(({ id }) => {
-          return {
-            id,
-            __pivot: {
-              field: attributeName,
-              component_type: componentUID
-            }
-          };
-        });
-      } else {
-        const component = await cloneComponent(componentUID, componentValue);
-        componentBody[attributeName] = component && {
-          id: component.id,
-          __pivot: {
-            field: attributeName,
-            component_type: componentUID
-          }
-        };
-      }
-      continue;
-    }
-    if (attribute.type === "dynamiczone") {
-      const dynamiczoneValues = _.has(attributeName, data) ? data[attributeName] : componentData[attributeName];
-      if (!Array.isArray(dynamiczoneValues)) {
-        throw new Error("Expected an array to create repeatable component");
-      }
-      componentBody[attributeName] = await strapiUtils.mapAsync(
-        dynamiczoneValues,
-        async (value) => {
-          const { id } = await cloneComponent(value.__component, value);
-          return {
-            id,
-            __component: value.__component,
-            __pivot: {
-              field: attributeName
-            }
-          };
-        },
-        { concurrency: isDialectMySQL() ? 1 : Infinity }
-      );
-      continue;
-    }
-  }
-  return componentBody;
-};
 const createComponent = async (uid, data) => {
-  const model = strapi.getModel(uid);
+  const schema = strapi.getModel(uid);
   const componentData = await createComponents(uid, data);
   const transform = _.pipe(
     // Make sure we don't save the component with a pre-defined ID
     _.omit("id"),
-    // Remove the component data from the original data object ...
-    (payload) => omitComponentData(model, payload),
-    // ... and assign the newly created component instead
-    _.assign(componentData)
+    assignComponentData(schema, componentData)
   );
-  return strapi.query(uid).create({ data: transform(data) });
+  return strapi.db.query(uid).create({ data: transform(data) });
 };
 const updateComponent = async (uid, componentToUpdate, data) => {
-  const model = strapi.getModel(uid);
+  const schema = strapi.getModel(uid);
   const componentData = await updateComponents(uid, componentToUpdate, data);
-  return strapi.query(uid).update({
+  return strapi.db.query(uid).update({
     where: {
       id: componentToUpdate.id
     },
-    data: Object.assign(omitComponentData(model, data), componentData)
+    data: assignComponentData(schema, componentData, data)
   });
 };
 const updateOrCreateComponent = (componentUID, value) => {
@@ -356,25 +271,14 @@ const updateOrCreateComponent = (componentUID, value) => {
 };
 const deleteComponent = async (uid, componentToDelete) => {
   await deleteComponents(uid, componentToDelete);
-  await strapi.query(uid).delete({ where: { id: componentToDelete.id } });
+  await strapi.db.query(uid).delete({ where: { id: componentToDelete.id } });
 };
-const cloneComponent = async (uid, data) => {
-  const model = strapi.getModel(uid);
-  if (!("id" in data) || typeof data.id === "undefined") {
-    return createComponent(uid, data);
+const assignComponentData = _.curry(
+  (schema, componentData, data) => {
+    return _.pipe(omitComponentData(schema), _.assign(componentData))(data);
   }
-  const componentData = await cloneComponents(uid, { id: data.id }, data);
-  const transform = _.pipe(
-    // Make sure we don't save the component with a pre-defined ID
-    _.omit("id"),
-    // Remove the component data from the original data object ...
-    (payload) => omitComponentData(model, payload),
-    // ... and assign the newly created component instead
-    _.assign(componentData)
-  );
-  return strapi.query(uid).clone(data.id, { data: transform(data) });
-};
-exports.cloneComponents = cloneComponents;
+);
+exports.assignComponentData = assignComponentData;
 exports.createComponents = createComponents;
 exports.deleteComponent = deleteComponent;
 exports.deleteComponents = deleteComponents;

package/dist/services/document-service/components.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"components.js","sources":["../../../src/services/document-service/components.ts"],"sourcesContent":["import _ from 'lodash';\nimport { has, omit, pipe, assign, curry } from 'lodash/fp';\nimport type { Utils, UID, Schema, Data, Modules } from '@strapi/types';\nimport { contentTypes as contentTypesUtils, async, errors } from '@strapi/utils';\n\n// type aliases for readability\ntype Input<T extends UID.Schema> = Modules.Documents.Params.Data.Input<T>;\n\ntype LoadedComponents<TUID extends UID.Schema> = Data.Entity<\n  TUID,\n  Schema.AttributeNamesByType<TUID, 'component' | 'dynamiczone'>\n>;\n\ntype SingleComponentValue = Schema.Attribute.ComponentValue<UID.Component, false>;\ntype RepeatableComponentValue = Schema.Attribute.ComponentValue<UID.Component, true>;\n\ntype ComponentValue = SingleComponentValue | RepeatableComponentValue;\n\ntype DynamicZoneValue = Schema.Attribute.DynamicZoneValue<UID.Component[]>;\n\ntype ComponentBody = {\n  [key: string]: ComponentValue | DynamicZoneValue;\n};\n\nconst omitComponentData = curry(\n  (schema: Schema.Schema, data: Input<UID.Schema>): Partial<Input<UID.Schema>> => {\n    const { attributes } = schema;\n    const componentAttributes = Object.keys(attributes).filter((attributeName) =>\n      contentTypesUtils.isComponentAttribute(attributes[attributeName])\n    );\n\n    return omit(componentAttributes, data);\n  }\n);\n\n// NOTE: we could generalize the logic to allow CRUD of relation directly in the DB layer\nconst createComponents = async <TUID extends UID.Schema, TData extends Input<TUID>>(\n  uid: TUID,\n  data: TData\n) => {\n  const { attributes = {} } = strapi.getModel(uid);\n\n  const componentBody: ComponentBody = {};\n\n  const attributeNames = Object.keys(attributes);\n\n  for (const attributeName of attributeNames) {\n    const attribute = attributes[attributeName];\n\n    if (!has(attributeName, data) || !contentTypesUtils.isComponentAttribute(attribute)) {\n      continue;\n    }\n\n    if (attribute.type === 'component') {\n      const { component: componentUID, repeatable = false } = attribute;\n\n      const componentValue = data[attributeName as keyof TData];\n\n      if (componentValue === null) {\n        continue;\n      }\n\n      if (repeatable === true) {\n        if (!Array.isArray(componentValue)) {\n          throw new Error('Expected an array to create repeatable component');\n        }\n\n        const components: RepeatableComponentValue = await async.map(componentValue, (value: any) =>\n          createComponent(componentUID, value)\n        );\n\n        componentBody[attributeName] = components.map(({ id }) => {\n          return {\n            id,\n            __pivot: {\n              field: attributeName,\n              component_type: componentUID,\n            },\n          };\n        });\n      } else {\n        const component = await createComponent(\n          componentUID,\n          componentValue as Input<UID.Component>\n        );\n\n        componentBody[attributeName] = {\n          id: component.id,\n          __pivot: {\n            field: attributeName,\n            component_type: componentUID,\n          },\n        };\n      }\n\n      continue;\n    }\n\n    if (attribute.type === 'dynamiczone') {\n      const dynamiczoneValues = data[\n        attributeName as keyof TData\n      ] as Modules.EntityService.Params.Attribute.GetValue<Schema.Attribute.DynamicZone>;\n\n      if (!Array.isArray(dynamiczoneValues)) {\n        throw new Error('Expected an array to create repeatable component');\n      }\n\n      const createDynamicZoneComponents = async (\n        value: Utils.Array.Values<typeof dynamiczoneValues>\n      ) => {\n        const { id } = await createComponent(value.__component, value);\n        return {\n          id,\n          __component: value.__component,\n          __pivot: {\n            field: attributeName,\n          },\n        };\n      };\n\n      // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1\n      componentBody[attributeName] = await async.map(\n        dynamiczoneValues,\n        createDynamicZoneComponents\n      );\n\n      continue;\n    }\n  }\n\n  return componentBody;\n};\n\nconst getComponents = async <TUID extends UID.Schema>(\n  uid: TUID,\n  entity: { id: Modules.EntityService.Params.Attribute.ID }\n): Promise<LoadedComponents<TUID>> => {\n  const componentAttributes = contentTypesUtils.getComponentAttributes(strapi.getModel(uid));\n\n  if (_.isEmpty(componentAttributes)) {\n    return {} as LoadedComponents<TUID>;\n  }\n\n  return strapi.db.query(uid).load(entity, componentAttributes) as Promise<LoadedComponents<TUID>>;\n};\n\n/*\n  delete old components\n  create or update\n*/\nconst updateComponents = async <TUID extends UID.Schema, TData extends Partial<Input<TUID>>>(\n  uid: TUID,\n  entityToUpdate: { id: Modules.EntityService.Params.Attribute.ID },\n  data: TData\n) => {\n  const { attributes = {} } = strapi.getModel(uid);\n\n  const componentBody: ComponentBody = {};\n\n  for (const attributeName of Object.keys(attributes)) {\n    const attribute = attributes[attributeName];\n\n    if (!has(attributeName, data)) {\n      continue;\n    }\n\n    if (attribute.type === 'component') {\n      const { component: componentUID, repeatable = false } = attribute;\n\n      const componentValue = data[attributeName as keyof TData] as ComponentValue;\n\n      await deleteOldComponents(uid, componentUID, entityToUpdate, attributeName, componentValue);\n\n      if (repeatable === true) {\n        if (!Array.isArray(componentValue)) {\n          throw new Error('Expected an array to create repeatable component');\n        }\n\n        // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1\n        const components: RepeatableComponentValue = await async.map(componentValue, (value: any) =>\n          updateOrCreateComponent(componentUID, value)\n        );\n\n        componentBody[attributeName] = components.filter(_.negate(_.isNil)).map(({ id }) => {\n          return {\n            id,\n            __pivot: {\n              field: attributeName,\n              component_type: componentUID,\n            },\n          };\n        });\n      } else {\n        const component = await updateOrCreateComponent(componentUID, componentValue);\n        componentBody[attributeName] = component && {\n          id: component.id,\n          __pivot: {\n            field: attributeName,\n            component_type: componentUID,\n          },\n        };\n      }\n    } else if (attribute.type === 'dynamiczone') {\n      const dynamiczoneValues = data[attributeName as keyof TData] as DynamicZoneValue;\n\n      await deleteOldDZComponents(uid, entityToUpdate, attributeName, dynamiczoneValues);\n\n      if (!Array.isArray(dynamiczoneValues)) {\n        throw new Error('Expected an array to create repeatable component');\n      }\n\n      // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1\n      componentBody[attributeName] = await async.map(dynamiczoneValues, async (value: any) => {\n        const { id } = await updateOrCreateComponent(value.__component, value);\n\n        return {\n          id,\n          __component: value.__component,\n          __pivot: {\n            field: attributeName,\n          },\n        };\n      });\n    }\n  }\n\n  return componentBody;\n};\n\nconst pickStringifiedId = ({\n  id,\n}: {\n  id: Modules.EntityService.Params.Attribute.ID;\n}): Modules.EntityService.Params.Attribute.ID & string => {\n  if (typeof id === 'string') {\n    return id;\n  }\n\n  return `${id}`;\n};\n\nconst deleteOldComponents = async <TUID extends UID.Schema>(\n  uid: TUID,\n  componentUID: UID.Component,\n  entityToUpdate: { id: Modules.EntityService.Params.Attribute.ID },\n  attributeName: string,\n  componentValue: ComponentValue\n) => {\n  const previousValue = (await strapi.db\n    .query(uid)\n    .load(entityToUpdate, attributeName)) as ComponentValue;\n\n  const idsToKeep = _.castArray(componentValue).filter(has('id')).map(pickStringifiedId);\n  const allIds = _.castArray(previousValue).filter(has('id')).map(pickStringifiedId);\n\n  idsToKeep.forEach((id) => {\n    if (!allIds.includes(id)) {\n      throw new errors.ApplicationError(\n        `Some of the provided components in ${attributeName} are not related to the entity`\n      );\n    }\n  });\n\n  const idsToDelete = _.difference(allIds, idsToKeep);\n\n  if (idsToDelete.length > 0) {\n    for (const idToDelete of idsToDelete) {\n      await deleteComponent(componentUID, { id: idToDelete });\n    }\n  }\n};\n\nconst deleteOldDZComponents = async <TUID extends UID.Schema>(\n  uid: TUID,\n  entityToUpdate: { id: Modules.EntityService.Params.Attribute.ID },\n  attributeName: string,\n  dynamiczoneValues: DynamicZoneValue\n) => {\n  const previousValue = (await strapi.db\n    .query(uid)\n    .load(entityToUpdate, attributeName)) as DynamicZoneValue;\n\n  const idsToKeep = _.castArray(dynamiczoneValues)\n    .filter(has('id'))\n    .map((v) => ({\n      id: pickStringifiedId(v),\n      __component: v.__component,\n    }));\n\n  const allIds = _.castArray(previousValue)\n    .filter(has('id'))\n    .map((v) => ({\n      id: pickStringifiedId(v),\n      __component: v.__component,\n    }));\n\n  idsToKeep.forEach(({ id, __component }) => {\n    if (!allIds.find((el) => el.id === id && el.__component === __component)) {\n      const err = new Error(\n        `Some of the provided components in ${attributeName} are not related to the entity`\n      );\n\n      Object.assign(err, { status: 400 });\n      throw err;\n    }\n  });\n\n  type IdsToDelete = DynamicZoneValue;\n\n  const idsToDelete = allIds.reduce((acc, { id, __component }) => {\n    if (!idsToKeep.find((el) => el.id === id && el.__component === __component)) {\n      acc.push({ id, __component });\n    }\n\n    return acc;\n  }, [] as IdsToDelete);\n\n  if (idsToDelete.length > 0) {\n    for (const idToDelete of idsToDelete) {\n      const { id, __component } = idToDelete;\n      await deleteComponent(__component, { id });\n    }\n  }\n};\n\nconst deleteComponents = async <TUID extends UID.Schema, TEntity extends Data.Entity<TUID>>(\n  uid: TUID,\n  entityToDelete: TEntity,\n  { loadComponents = true } = {}\n) => {\n  const { attributes = {} } = strapi.getModel(uid);\n\n  const attributeNames = Object.keys(attributes);\n\n  for (const attributeName of attributeNames) {\n    const attribute = attributes[attributeName];\n\n    if (attribute.type === 'component' || attribute.type === 'dynamiczone') {\n      let value;\n\n      if (loadComponents) {\n        value = await strapi.db.query(uid).load(entityToDelete, attributeName);\n      } else {\n        value = entityToDelete[attributeName as keyof TEntity];\n      }\n\n      if (!value) {\n        continue;\n      }\n\n      if (attribute.type === 'component') {\n        const { component: componentUID } = attribute;\n        await async.map(_.castArray(value), (subValue: any) =>\n          deleteComponent(componentUID, subValue)\n        );\n      } else {\n        await async.map(_.castArray(value), (subValue: any) =>\n          deleteComponent(subValue.__component, subValue)\n        );\n      }\n\n      continue;\n    }\n  }\n};\n\n/** *************************\n    Component queries\n************************** */\n\n// components can have nested compos so this must be recursive\nconst createComponent = async <TUID extends UID.Component>(uid: TUID, data: Input<TUID>) => {\n  const schema = strapi.getModel(uid);\n\n  const componentData = await createComponents(uid, data);\n\n  const transform = pipe(\n    // Make sure we don't save the component with a pre-defined ID\n    omit('id'),\n    assignComponentData(schema, componentData)\n  );\n\n  return strapi.db.query(uid).create({ data: transform(data) });\n};\n\n// components can have nested compos so this must be recursive\nconst updateComponent = async <TUID extends UID.Component>(\n  uid: TUID,\n  componentToUpdate: { id: Modules.EntityService.Params.Attribute.ID },\n  data: Input<TUID>\n) => {\n  const schema = strapi.getModel(uid);\n\n  const componentData = await updateComponents(uid, componentToUpdate, data);\n\n  return strapi.db.query(uid).update({\n    where: {\n      id: componentToUpdate.id,\n    },\n    data: assignComponentData(schema, componentData, data),\n  });\n};\n\nconst updateOrCreateComponent = <TUID extends UID.Component>(\n  componentUID: TUID,\n  value: Input<TUID>\n) => {\n  if (value === null) {\n    return null;\n  }\n\n  // update\n  if ('id' in value && typeof value.id !== 'undefined') {\n    // TODO: verify the compo is associated with the entity\n    return updateComponent(componentUID, { id: value.id }, value);\n  }\n\n  // create\n  return createComponent(componentUID, value);\n};\n\nconst deleteComponent = async <TUID extends UID.Component>(\n  uid: TUID,\n  componentToDelete: Data.Component<TUID>\n) => {\n  await deleteComponents(uid, componentToDelete);\n  await strapi.db.query(uid).delete({ where: { id: componentToDelete.id } });\n};\n\nconst assignComponentData = curry(\n  (schema: Schema.Schema, componentData: ComponentBody, data: Input<UID.Schema>) => {\n    return pipe(omitComponentData(schema), assign(componentData))(data);\n  }\n);\n\nexport {\n  omitComponentData,\n  assignComponentData,\n  getComponents,\n  createComponents,\n  updateComponents,\n  deleteComponents,\n  deleteComponent,\n};\n"],"names":["curry","contentTypesUtils","omit","has","async","_","errors","pipe","assign"],"mappings":"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"}

package/dist/services/{entity-service → document-service}/components.mjs

@@ -1,14 +1,15 @@
 import _ from "lodash";
-import { omit, has, pipe, assign } from "lodash/fp";
-import { contentTypes, mapAsync, errors } from "@strapi/utils";
-const isDialectMySQL = () => strapi.db?.dialect.client === "mysql";
-function omitComponentData(contentType, data) {
-  const { attributes } = contentType;
-  const componentAttributes = Object.keys(attributes).filter(
-    (attributeName) => contentTypes.isComponentAttribute(attributes[attributeName])
-  );
-  return omit(componentAttributes, data);
-}
+import { curry, omit, pipe, assign, has } from "lodash/fp";
+import { contentTypes, async, errors } from "@strapi/utils";
+const omitComponentData = curry(
+  (schema, data) => {
+    const { attributes } = schema;
+    const componentAttributes = Object.keys(attributes).filter(
+      (attributeName) => contentTypes.isComponentAttribute(attributes[attributeName])
+    );
+    return omit(componentAttributes, data);
+  }
+);
 const createComponents = async (uid, data) => {
   const { attributes = {} } = strapi.getModel(uid);
   const componentBody = {};
@@ -28,10 +29,9 @@ const createComponents = async (uid, data) => {
         if (!Array.isArray(componentValue)) {
           throw new Error("Expected an array to create repeatable component");
         }
-        const components = await mapAsync(
+        const components = await async.map(
           componentValue,
-          (value) => createComponent(componentUID, value),
-          { concurrency: isDialectMySQL() && !strapi.db?.inTransaction() ? 1 : Infinity }
+          (value) => createComponent(componentUID, value)
         );
         componentBody[attributeName] = components.map(({ id }) => {
           return {
@@ -72,10 +72,9 @@ const createComponents = async (uid, data) => {
           }
         };
       };
-      componentBody[attributeName] = await mapAsync(
+      componentBody[attributeName] = await async.map(
         dynamiczoneValues,
-        createDynamicZoneComponents,
-        { concurrency: isDialectMySQL() && !strapi.db?.inTransaction() ? 1 : Infinity }
+        createDynamicZoneComponents
       );
       continue;
     }
@@ -87,7 +86,7 @@ const getComponents = async (uid, entity) => {
   if (_.isEmpty(componentAttributes)) {
     return {};
   }
-  return strapi.query(uid).load(entity, componentAttributes);
+  return strapi.db.query(uid).load(entity, componentAttributes);
 };
 const updateComponents = async (uid, entityToUpdate, data) => {
   const { attributes = {} } = strapi.getModel(uid);
@@ -105,10 +104,9 @@ const updateComponents = async (uid, entityToUpdate, data) => {
         if (!Array.isArray(componentValue)) {
           throw new Error("Expected an array to create repeatable component");
         }
-        const components = await mapAsync(
+        const components = await async.map(
           componentValue,
-          (value) => updateOrCreateComponent(componentUID, value),
-          { concurrency: isDialectMySQL() && !strapi.db?.inTransaction() ? 1 : Infinity }
+          (value) => updateOrCreateComponent(componentUID, value)
         );
         componentBody[attributeName] = components.filter(_.negate(_.isNil)).map(({ id }) => {
           return {
@@ -129,29 +127,22 @@ const updateComponents = async (uid, entityToUpdate, data) => {
           }
         };
       }
-      continue;
-    }
-    if (attribute.type === "dynamiczone") {
+    } else if (attribute.type === "dynamiczone") {
       const dynamiczoneValues = data[attributeName];
       await deleteOldDZComponents(uid, entityToUpdate, attributeName, dynamiczoneValues);
       if (!Array.isArray(dynamiczoneValues)) {
         throw new Error("Expected an array to create repeatable component");
       }
-      componentBody[attributeName] = await mapAsync(
-        dynamiczoneValues,
-        async (value) => {
-          const { id } = await updateOrCreateComponent(value.__component, value);
-          return {
-            id,
-            __component: value.__component,
-            __pivot: {
-              field: attributeName
-            }
-          };
-        },
-        { concurrency: isDialectMySQL() && !strapi.db?.inTransaction() ? 1 : Infinity }
-      );
-      continue;
+      componentBody[attributeName] = await async.map(dynamiczoneValues, async (value) => {
+        const { id } = await updateOrCreateComponent(value.__component, value);
+        return {
+          id,
+          __component: value.__component,
+          __pivot: {
+            field: attributeName
+          }
+        };
+      });
     }
   }
   return componentBody;
@@ -165,7 +156,7 @@ const pickStringifiedId = ({
   return `${id}`;
 };
 const deleteOldComponents = async (uid, componentUID, entityToUpdate, attributeName, componentValue) => {
-  const previousValue = await strapi.query(uid).load(entityToUpdate, attributeName);
+  const previousValue = await strapi.db.query(uid).load(entityToUpdate, attributeName);
   const idsToKeep = _.castArray(componentValue).filter(has("id")).map(pickStringifiedId);
   const allIds = _.castArray(previousValue).filter(has("id")).map(pickStringifiedId);
   idsToKeep.forEach((id) => {
@@ -183,7 +174,7 @@ const deleteOldComponents = async (uid, componentUID, entityToUpdate, attributeN
   }
 };
 const deleteOldDZComponents = async (uid, entityToUpdate, attributeName, dynamiczoneValues) => {
-  const previousValue = await strapi.query(uid).load(entityToUpdate, attributeName);
+  const previousValue = await strapi.db.query(uid).load(entityToUpdate, attributeName);
   const idsToKeep = _.castArray(dynamiczoneValues).filter(has("id")).map((v) => ({
     id: pickStringifiedId(v),
     __component: v.__component
@@ -222,7 +213,7 @@ const deleteComponents = async (uid, entityToDelete, { loadComponents = true } =
     if (attribute.type === "component" || attribute.type === "dynamiczone") {
       let value;
       if (loadComponents) {
-        value = await strapi.query(uid).load(entityToDelete, attributeName);
+        value = await strapi.db.query(uid).load(entityToDelete, attributeName);
       } else {
         value = entityToDelete[attributeName];
       }
@@ -231,114 +222,38 @@ const deleteComponents = async (uid, entityToDelete, { loadComponents = true } =
       }
       if (attribute.type === "component") {
         const { component: componentUID } = attribute;
-        await mapAsync(
+        await async.map(
           _.castArray(value),
-          (subValue) => deleteComponent(componentUID, subValue),
-          {
-            concurrency: isDialectMySQL() && !strapi.db?.inTransaction() ? 1 : Infinity
-          }
+          (subValue) => deleteComponent(componentUID, subValue)
         );
       } else {
-        await mapAsync(
+        await async.map(
           _.castArray(value),
-          (subValue) => deleteComponent(subValue.__component, subValue),
-          { concurrency: isDialectMySQL() && !strapi.db?.inTransaction() ? 1 : Infinity }
+          (subValue) => deleteComponent(subValue.__component, subValue)
         );
       }
       continue;
     }
   }
 };
-const cloneComponents = async (uid, entityToClone, data) => {
-  const { attributes = {} } = strapi.getModel(uid);
-  const componentBody = {};
-  const componentData = await getComponents(uid, entityToClone);
-  for (const attributeName of Object.keys(attributes)) {
-    const attribute = attributes[attributeName];
-    if (!has(attributeName, data) && !has(attributeName, componentData)) {
-      continue;
-    }
-    if (attribute.type === "component") {
-      const { component: componentUID, repeatable = false } = attribute;
-      const componentValue = attributeName in data ? data[attributeName] : componentData[attributeName];
-      if (componentValue === null) {
-        continue;
-      }
-      if (repeatable === true) {
-        if (!Array.isArray(componentValue)) {
-          throw new Error("Expected an array to create repeatable component");
-        }
-        const components = await mapAsync(
-          componentValue,
-          (value) => cloneComponent(componentUID, value),
-          { concurrency: isDialectMySQL() ? 1 : Infinity }
-        );
-        componentBody[attributeName] = components.filter(_.negate(_.isNil)).map(({ id }) => {
-          return {
-            id,
-            __pivot: {
-              field: attributeName,
-              component_type: componentUID
-            }
-          };
-        });
-      } else {
-        const component = await cloneComponent(componentUID, componentValue);
-        componentBody[attributeName] = component && {
-          id: component.id,
-          __pivot: {
-            field: attributeName,
-            component_type: componentUID
-          }
-        };
-      }
-      continue;
-    }
-    if (attribute.type === "dynamiczone") {
-      const dynamiczoneValues = has(attributeName, data) ? data[attributeName] : componentData[attributeName];
-      if (!Array.isArray(dynamiczoneValues)) {
-        throw new Error("Expected an array to create repeatable component");
-      }
-      componentBody[attributeName] = await mapAsync(
-        dynamiczoneValues,
-        async (value) => {
-          const { id } = await cloneComponent(value.__component, value);
-          return {
-            id,
-            __component: value.__component,
-            __pivot: {
-              field: attributeName
-            }
-          };
-        },
-        { concurrency: isDialectMySQL() ? 1 : Infinity }
-      );
-      continue;
-    }
-  }
-  return componentBody;
-};
 const createComponent = async (uid, data) => {
-  const model = strapi.getModel(uid);
+  const schema = strapi.getModel(uid);
   const componentData = await createComponents(uid, data);
   const transform = pipe(
     // Make sure we don't save the component with a pre-defined ID
     omit("id"),
-    // Remove the component data from the original data object ...
-    (payload) => omitComponentData(model, payload),
-    // ... and assign the newly created component instead
-    assign(componentData)
+    assignComponentData(schema, componentData)
   );
-  return strapi.query(uid).create({ data: transform(data) });
+  return strapi.db.query(uid).create({ data: transform(data) });
 };
 const updateComponent = async (uid, componentToUpdate, data) => {
-  const model = strapi.getModel(uid);
+  const schema = strapi.getModel(uid);
   const componentData = await updateComponents(uid, componentToUpdate, data);
-  return strapi.query(uid).update({
+  return strapi.db.query(uid).update({
     where: {
       id: componentToUpdate.id
     },
-    data: Object.assign(omitComponentData(model, data), componentData)
+    data: assignComponentData(schema, componentData, data)
   });
 };
 const updateOrCreateComponent = (componentUID, value) => {
@@ -352,26 +267,15 @@ const updateOrCreateComponent = (componentUID, value) => {
 };
 const deleteComponent = async (uid, componentToDelete) => {
   await deleteComponents(uid, componentToDelete);
-  await strapi.query(uid).delete({ where: { id: componentToDelete.id } });
+  await strapi.db.query(uid).delete({ where: { id: componentToDelete.id } });
 };
-const cloneComponent = async (uid, data) => {
-  const model = strapi.getModel(uid);
-  if (!("id" in data) || typeof data.id === "undefined") {
-    return createComponent(uid, data);
+const assignComponentData = curry(
+  (schema, componentData, data) => {
+    return pipe(omitComponentData(schema), assign(componentData))(data);
   }
-  const componentData = await cloneComponents(uid, { id: data.id }, data);
-  const transform = pipe(
-    // Make sure we don't save the component with a pre-defined ID
-    omit("id"),
-    // Remove the component data from the original data object ...
-    (payload) => omitComponentData(model, payload),
-    // ... and assign the newly created component instead
-    assign(componentData)
-  );
-  return strapi.query(uid).clone(data.id, { data: transform(data) });
-};
+);
 export {
-  cloneComponents,
+  assignComponentData,
   createComponents,
   deleteComponent,
   deleteComponents,