@strapi/core 0.0.0-experimental.b151f6317f694ea1dff40b241fc437c9a38036dc → 0.0.0-experimental.b2710a38fa715c2420a41122dc06ffd65f2514ee

package/dist/services/document-service/attributes/transforms.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"transforms.mjs","sources":["../../../../src/services/document-service/attributes/transforms.ts"],"sourcesContent":["import { getOr, toNumber, isString } from 'lodash/fp';\nimport type { Schema } from '@strapi/types';\nimport bcrypt from 'bcryptjs';\n\ntype Transforms = {\n  [TKind in Schema.Attribute.Kind]?: (\n    value: unknown,\n    context: {\n      attribute: Schema.Attribute.AnyAttribute;\n      attributeName: string;\n    }\n  ) => any;\n};\n\nconst transforms: Transforms = {\n  password(value, context) {\n    const { attribute } = context;\n\n    if (attribute.type !== 'password') {\n      throw new Error('Invalid attribute type');\n    }\n\n    if (!isString(value) && !(value instanceof Buffer)) {\n      return value;\n    }\n\n    const rounds = toNumber(getOr(10, 'encryption.rounds', attribute));\n\n    return bcrypt.hashSync(value.toString(), rounds);\n  },\n};\n\nexport default transforms;\n"],"names":[],"mappings":";;AAcA,MAAM,aAAyB;AAAA,EAC7B,SAAS,OAAO,SAAS;AACjB,UAAA,EAAE,cAAc;AAElB,QAAA,UAAU,SAAS,YAAY;AAC3B,YAAA,IAAI,MAAM,wBAAwB;AAAA,IAAA;AAG1C,QAAI,CAAC,SAAS,KAAK,KAAK,EAAE,iBAAiB,SAAS;AAC3C,aAAA;AAAA,IAAA;AAGT,UAAM,SAAS,SAAS,MAAM,IAAI,qBAAqB,SAAS,CAAC;AAEjE,WAAO,OAAO,SAAS,MAAM,SAAA,GAAY,MAAM;AAAA,EAAA;AAEnD;"}
+{"version":3,"file":"transforms.mjs","sources":["../../../../src/services/document-service/attributes/transforms.ts"],"sourcesContent":["import { getOr, toNumber, isString } from 'lodash/fp';\nimport type { Schema } from '@strapi/types';\nimport bcrypt from 'bcryptjs';\n\ntype Transforms = {\n  [TKind in Schema.Attribute.Kind]?: (\n    value: unknown,\n    context: {\n      attribute: Schema.Attribute.AnyAttribute;\n      attributeName: string;\n    }\n  ) => any;\n};\n\nconst transforms: Transforms = {\n  password(value, context) {\n    const { attribute } = context;\n\n    if (attribute.type !== 'password') {\n      throw new Error('Invalid attribute type');\n    }\n\n    if (!isString(value) && !(value instanceof Buffer)) {\n      return value;\n    }\n\n    const rounds = toNumber(getOr(10, 'encryption.rounds', attribute));\n\n    return bcrypt.hashSync(value.toString(), rounds);\n  },\n};\n\nexport default transforms;\n"],"names":["transforms","password","value","context","attribute","type","Error","isString","Buffer","rounds","toNumber","getOr","bcrypt","hashSync","toString"],"mappings":";;;AAcA,MAAMA,UAAyB,GAAA;IAC7BC,QAASC,CAAAA,CAAAA,KAAK,EAAEC,OAAO,EAAA;QACrB,MAAM,EAAEC,SAAS,EAAE,GAAGD,OAAAA;QAEtB,IAAIC,SAAAA,CAAUC,IAAI,KAAK,UAAY,EAAA;AACjC,YAAA,MAAM,IAAIC,KAAM,CAAA,wBAAA,CAAA;AAClB;AAEA,QAAA,IAAI,CAACC,QAASL,CAAAA,KAAAA,CAAAA,IAAU,EAAEA,KAAAA,YAAiBM,MAAK,CAAI,EAAA;YAClD,OAAON,KAAAA;AACT;AAEA,QAAA,MAAMO,MAASC,GAAAA,QAAAA,CAASC,KAAM,CAAA,EAAA,EAAI,mBAAqBP,EAAAA,SAAAA,CAAAA,CAAAA;AAEvD,QAAA,OAAOQ,MAAOC,CAAAA,QAAQ,CAACX,KAAAA,CAAMY,QAAQ,EAAIL,EAAAA,MAAAA,CAAAA;AAC3C;AACF;;;;"}

package/dist/services/document-service/common.js

@@ -1,7 +1,8 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const wrapInTransaction = (fn) => {
-  return (...args) => strapi.db.transaction?.(() => fn(...args));
+'use strict';
+
+const wrapInTransaction = (fn)=>{
+    return (...args)=>strapi.db.transaction?.(()=>fn(...args));
 };
+
 exports.wrapInTransaction = wrapInTransaction;
 //# sourceMappingURL=common.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"common.js","sources":["../../../src/services/document-service/common.ts"],"sourcesContent":["import type { UID, Modules } from '@strapi/types';\n\nexport type RepositoryFactoryMethod = <TContentTypeUID extends UID.ContentType>(\n  uid: TContentTypeUID,\n  entityValidator: Modules.EntityValidator.EntityValidator\n) => Modules.Documents.ServiceInstance<TContentTypeUID>;\n\nexport const wrapInTransaction = (fn: (...args: any) => any) => {\n  return (...args: any[]) => strapi.db.transaction?.(() => fn(...args));\n};\n"],"names":[],"mappings":";;AAOa,MAAA,oBAAoB,CAAC,OAA8B;AACvD,SAAA,IAAI,SAAgB,OAAO,GAAG,cAAc,MAAM,GAAG,GAAG,IAAI,CAAC;AACtE;;"}
+{"version":3,"file":"common.js","sources":["../../../src/services/document-service/common.ts"],"sourcesContent":["import type { UID, Modules } from '@strapi/types';\n\nexport type RepositoryFactoryMethod = <TContentTypeUID extends UID.ContentType>(\n  uid: TContentTypeUID,\n  entityValidator: Modules.EntityValidator.EntityValidator\n) => Modules.Documents.ServiceInstance<TContentTypeUID>;\n\nexport const wrapInTransaction = (fn: (...args: any) => any) => {\n  return (...args: any[]) => strapi.db.transaction?.(() => fn(...args));\n};\n"],"names":["wrapInTransaction","fn","args","strapi","db","transaction"],"mappings":";;AAOO,MAAMA,oBAAoB,CAACC,EAAAA,GAAAA;IAChC,OAAO,CAAC,GAAGC,IAAgBC,GAAAA,MAAAA,CAAOC,EAAE,CAACC,WAAW,GAAG,IAAMJ,EAAMC,CAAAA,GAAAA,IAAAA,CAAAA,CAAAA;AACjE;;;;"}

package/dist/services/document-service/common.mjs

@@ -1,7 +1,6 @@
-const wrapInTransaction = (fn) => {
-  return (...args) => strapi.db.transaction?.(() => fn(...args));
-};
-export {
-  wrapInTransaction
+const wrapInTransaction = (fn)=>{
+    return (...args)=>strapi.db.transaction?.(()=>fn(...args));
 };
+
+export { wrapInTransaction };
 //# sourceMappingURL=common.mjs.map

package/dist/services/document-service/common.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"common.mjs","sources":["../../../src/services/document-service/common.ts"],"sourcesContent":["import type { UID, Modules } from '@strapi/types';\n\nexport type RepositoryFactoryMethod = <TContentTypeUID extends UID.ContentType>(\n  uid: TContentTypeUID,\n  entityValidator: Modules.EntityValidator.EntityValidator\n) => Modules.Documents.ServiceInstance<TContentTypeUID>;\n\nexport const wrapInTransaction = (fn: (...args: any) => any) => {\n  return (...args: any[]) => strapi.db.transaction?.(() => fn(...args));\n};\n"],"names":[],"mappings":"AAOa,MAAA,oBAAoB,CAAC,OAA8B;AACvD,SAAA,IAAI,SAAgB,OAAO,GAAG,cAAc,MAAM,GAAG,GAAG,IAAI,CAAC;AACtE;"}
+{"version":3,"file":"common.mjs","sources":["../../../src/services/document-service/common.ts"],"sourcesContent":["import type { UID, Modules } from '@strapi/types';\n\nexport type RepositoryFactoryMethod = <TContentTypeUID extends UID.ContentType>(\n  uid: TContentTypeUID,\n  entityValidator: Modules.EntityValidator.EntityValidator\n) => Modules.Documents.ServiceInstance<TContentTypeUID>;\n\nexport const wrapInTransaction = (fn: (...args: any) => any) => {\n  return (...args: any[]) => strapi.db.transaction?.(() => fn(...args));\n};\n"],"names":["wrapInTransaction","fn","args","strapi","db","transaction"],"mappings":"AAOO,MAAMA,oBAAoB,CAACC,EAAAA,GAAAA;IAChC,OAAO,CAAC,GAAGC,IAAgBC,GAAAA,MAAAA,CAAOC,EAAE,CAACC,WAAW,GAAG,IAAMJ,EAAMC,CAAAA,GAAAA,IAAAA,CAAAA,CAAAA;AACjE;;;;"}

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

@@ -1,283 +1,281 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const _ = require("lodash");
-const fp = require("lodash/fp");
-const strapiUtils = require("@strapi/utils");
-const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
-const ___default = /* @__PURE__ */ _interopDefault(_);
-const omitComponentData = fp.curry(
-  (schema, data) => {
+'use strict';
+
+var _ = require('lodash');
+var fp = require('lodash/fp');
+var strapiUtils = require('@strapi/utils');
+
+const omitComponentData = fp.curry((schema, data)=>{
     const { attributes } = schema;
-    const componentAttributes = Object.keys(attributes).filter(
-      (attributeName) => strapiUtils.contentTypes.isComponentAttribute(attributes[attributeName])
-    );
+    const componentAttributes = Object.keys(attributes).filter((attributeName)=>strapiUtils.contentTypes.isComponentAttribute(attributes[attributeName]));
     return fp.omit(componentAttributes, data);
-  }
-);
-const createComponents = async (uid, data) => {
-  const { attributes = {} } = strapi.getModel(uid);
-  const componentBody = {};
-  const attributeNames = Object.keys(attributes);
-  for (const attributeName of attributeNames) {
-    const attribute = attributes[attributeName];
-    if (!fp.has(attributeName, data) || !strapiUtils.contentTypes.isComponentAttribute(attribute)) {
-      continue;
-    }
-    if (attribute.type === "component") {
-      const { component: componentUID, repeatable = false } = attribute;
-      const componentValue = data[attributeName];
-      if (componentValue === null) {
-        continue;
-      }
-      if (repeatable === true) {
-        if (!Array.isArray(componentValue)) {
-          throw new Error("Expected an array to create repeatable component");
+});
+// NOTE: we could generalize the logic to allow CRUD of relation directly in the DB layer
+const createComponents = async (uid, data)=>{
+    const { attributes = {} } = strapi.getModel(uid);
+    const componentBody = {};
+    const attributeNames = Object.keys(attributes);
+    for (const attributeName of attributeNames){
+        const attribute = attributes[attributeName];
+        if (!fp.has(attributeName, data) || !strapiUtils.contentTypes.isComponentAttribute(attribute)) {
+            continue;
         }
-        const components = await strapiUtils.async.map(
-          componentValue,
-          (value) => createComponent(componentUID, value)
-        );
-        componentBody[attributeName] = components.map(({ id }) => {
-          return {
-            id,
-            __pivot: {
-              field: attributeName,
-              component_type: componentUID
+        if (attribute.type === 'component') {
+            const { component: componentUID, repeatable = false } = attribute;
+            const componentValue = data[attributeName];
+            if (componentValue === null) {
+                continue;
             }
-          };
-        });
-      } else {
-        const component = await createComponent(
-          componentUID,
-          componentValue
-        );
-        componentBody[attributeName] = {
-          id: component.id,
-          __pivot: {
-            field: attributeName,
-            component_type: componentUID
-          }
-        };
-      }
-      continue;
-    }
-    if (attribute.type === "dynamiczone") {
-      const dynamiczoneValues = data[attributeName];
-      if (!Array.isArray(dynamiczoneValues)) {
-        throw new Error("Expected an array to create repeatable component");
-      }
-      const createDynamicZoneComponents = async (value) => {
-        const { id } = await createComponent(value.__component, value);
-        return {
-          id,
-          __component: value.__component,
-          __pivot: {
-            field: attributeName
-          }
-        };
-      };
-      componentBody[attributeName] = await strapiUtils.async.map(
-        dynamiczoneValues,
-        createDynamicZoneComponents
-      );
-      continue;
+            if (repeatable === true) {
+                if (!Array.isArray(componentValue)) {
+                    throw new Error('Expected an array to create repeatable component');
+                }
+                const components = await strapiUtils.async.map(componentValue, (value)=>createComponent(componentUID, value));
+                componentBody[attributeName] = components.map(({ id })=>{
+                    return {
+                        id,
+                        __pivot: {
+                            field: attributeName,
+                            component_type: componentUID
+                        }
+                    };
+                });
+            } else {
+                const component = await createComponent(componentUID, componentValue);
+                componentBody[attributeName] = {
+                    id: component.id,
+                    __pivot: {
+                        field: attributeName,
+                        component_type: componentUID
+                    }
+                };
+            }
+            continue;
+        }
+        if (attribute.type === 'dynamiczone') {
+            const dynamiczoneValues = data[attributeName];
+            if (!Array.isArray(dynamiczoneValues)) {
+                throw new Error('Expected an array to create repeatable component');
+            }
+            const createDynamicZoneComponents = async (value)=>{
+                const { id } = await createComponent(value.__component, value);
+                return {
+                    id,
+                    __component: value.__component,
+                    __pivot: {
+                        field: attributeName
+                    }
+                };
+            };
+            // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1
+            componentBody[attributeName] = await strapiUtils.async.map(dynamiczoneValues, createDynamicZoneComponents);
+            continue;
+        }
     }
-  }
-  return componentBody;
-};
-const getComponents = async (uid, entity) => {
-  const componentAttributes = strapiUtils.contentTypes.getComponentAttributes(strapi.getModel(uid));
-  if (___default.default.isEmpty(componentAttributes)) {
-    return {};
-  }
-  return strapi.db.query(uid).load(entity, componentAttributes);
+    return componentBody;
 };
-const updateComponents = async (uid, entityToUpdate, data) => {
-  const { attributes = {} } = strapi.getModel(uid);
-  const componentBody = {};
-  for (const attributeName of Object.keys(attributes)) {
-    const attribute = attributes[attributeName];
-    if (!fp.has(attributeName, data)) {
-      continue;
+const getComponents = async (uid, entity)=>{
+    const componentAttributes = strapiUtils.contentTypes.getComponentAttributes(strapi.getModel(uid));
+    if (_.isEmpty(componentAttributes)) {
+        return {};
     }
-    if (attribute.type === "component") {
-      const { component: componentUID, repeatable = false } = attribute;
-      const componentValue = data[attributeName];
-      await deleteOldComponents(uid, componentUID, entityToUpdate, attributeName, componentValue);
-      if (repeatable === true) {
-        if (!Array.isArray(componentValue)) {
-          throw new Error("Expected an array to create repeatable component");
+    return strapi.db.query(uid).load(entity, componentAttributes);
+};
+/*
+  delete old components
+  create or update
+*/ const updateComponents = async (uid, entityToUpdate, data)=>{
+    const { attributes = {} } = strapi.getModel(uid);
+    const componentBody = {};
+    for (const attributeName of Object.keys(attributes)){
+        const attribute = attributes[attributeName];
+        if (!fp.has(attributeName, data)) {
+            continue;
         }
-        const components = await strapiUtils.async.map(
-          componentValue,
-          (value) => updateOrCreateComponent(componentUID, value)
-        );
-        componentBody[attributeName] = components.filter(___default.default.negate(___default.default.isNil)).map(({ id }) => {
-          return {
-            id,
-            __pivot: {
-              field: attributeName,
-              component_type: componentUID
+        if (attribute.type === 'component') {
+            const { component: componentUID, repeatable = false } = attribute;
+            const componentValue = data[attributeName];
+            await deleteOldComponents(uid, componentUID, entityToUpdate, attributeName, componentValue);
+            if (repeatable === true) {
+                if (!Array.isArray(componentValue)) {
+                    throw new Error('Expected an array to create repeatable component');
+                }
+                // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1
+                const components = await strapiUtils.async.map(componentValue, (value)=>updateOrCreateComponent(componentUID, value));
+                componentBody[attributeName] = components.filter(_.negate(_.isNil)).map(({ id })=>{
+                    return {
+                        id,
+                        __pivot: {
+                            field: attributeName,
+                            component_type: componentUID
+                        }
+                    };
+                });
+            } else {
+                const component = await updateOrCreateComponent(componentUID, componentValue);
+                componentBody[attributeName] = component && {
+                    id: component.id,
+                    __pivot: {
+                        field: attributeName,
+                        component_type: componentUID
+                    }
+                };
+            }
+        } 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');
             }
-          };
-        });
-      } else {
-        const component = await updateOrCreateComponent(componentUID, componentValue);
-        componentBody[attributeName] = component && {
-          id: component.id,
-          __pivot: {
-            field: attributeName,
-            component_type: componentUID
-          }
-        };
-      }
-    } 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.async.map(dynamiczoneValues, async (value) => {
-        const { id } = await updateOrCreateComponent(value.__component, value);
-        return {
-          id,
-          __component: value.__component,
-          __pivot: {
-            field: attributeName
-          }
-        };
-      });
+            // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1
+            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;
+    return componentBody;
 };
-const pickStringifiedId = ({
-  id
-}) => {
-  if (typeof id === "string") {
-    return id;
-  }
-  return `${id}`;
-};
-const deleteOldComponents = async (uid, componentUID, entityToUpdate, attributeName, componentValue) => {
-  const previousValue = await strapi.db.query(uid).load(entityToUpdate, attributeName);
-  const idsToKeep = ___default.default.castArray(componentValue).filter(fp.has("id")).map(pickStringifiedId);
-  const allIds = ___default.default.castArray(previousValue).filter(fp.has("id")).map(pickStringifiedId);
-  idsToKeep.forEach((id) => {
-    if (!allIds.includes(id)) {
-      throw new strapiUtils.errors.ApplicationError(
-        `Some of the provided components in ${attributeName} are not related to the entity`
-      );
-    }
-  });
-  const idsToDelete = ___default.default.difference(allIds, idsToKeep);
-  if (idsToDelete.length > 0) {
-    for (const idToDelete of idsToDelete) {
-      await deleteComponent(componentUID, { id: idToDelete });
+const pickStringifiedId = ({ id })=>{
+    if (typeof id === 'string') {
+        return id;
     }
-  }
+    return `${id}`;
 };
-const deleteOldDZComponents = async (uid, entityToUpdate, attributeName, dynamiczoneValues) => {
-  const previousValue = await strapi.db.query(uid).load(entityToUpdate, attributeName);
-  const idsToKeep = ___default.default.castArray(dynamiczoneValues).filter(fp.has("id")).map((v) => ({
-    id: pickStringifiedId(v),
-    __component: v.__component
-  }));
-  const allIds = ___default.default.castArray(previousValue).filter(fp.has("id")).map((v) => ({
-    id: pickStringifiedId(v),
-    __component: v.__component
-  }));
-  idsToKeep.forEach(({ id, __component }) => {
-    if (!allIds.find((el) => el.id === id && el.__component === __component)) {
-      const err = new Error(
-        `Some of the provided components in ${attributeName} are not related to the entity`
-      );
-      Object.assign(err, { status: 400 });
-      throw err;
-    }
-  });
-  const idsToDelete = allIds.reduce((acc, { id, __component }) => {
-    if (!idsToKeep.find((el) => el.id === id && el.__component === __component)) {
-      acc.push({ id, __component });
+const deleteOldComponents = async (uid, componentUID, entityToUpdate, attributeName, componentValue)=>{
+    const previousValue = await strapi.db.query(uid).load(entityToUpdate, attributeName);
+    const idsToKeep = _.castArray(componentValue).filter(fp.has('id')).map(pickStringifiedId);
+    const allIds = _.castArray(previousValue).filter(fp.has('id')).map(pickStringifiedId);
+    idsToKeep.forEach((id)=>{
+        if (!allIds.includes(id)) {
+            throw new strapiUtils.errors.ApplicationError(`Some of the provided components in ${attributeName} are not related to the entity`);
+        }
+    });
+    const idsToDelete = _.difference(allIds, idsToKeep);
+    if (idsToDelete.length > 0) {
+        for (const idToDelete of idsToDelete){
+            await deleteComponent(componentUID, {
+                id: idToDelete
+            });
+        }
     }
-    return acc;
-  }, []);
-  if (idsToDelete.length > 0) {
-    for (const idToDelete of idsToDelete) {
-      const { id, __component } = idToDelete;
-      await deleteComponent(__component, { id });
+};
+const deleteOldDZComponents = async (uid, entityToUpdate, attributeName, dynamiczoneValues)=>{
+    const previousValue = await strapi.db.query(uid).load(entityToUpdate, attributeName);
+    const idsToKeep = _.castArray(dynamiczoneValues).filter(fp.has('id')).map((v)=>({
+            id: pickStringifiedId(v),
+            __component: v.__component
+        }));
+    const allIds = _.castArray(previousValue).filter(fp.has('id')).map((v)=>({
+            id: pickStringifiedId(v),
+            __component: v.__component
+        }));
+    idsToKeep.forEach(({ id, __component })=>{
+        if (!allIds.find((el)=>el.id === id && el.__component === __component)) {
+            const err = new Error(`Some of the provided components in ${attributeName} are not related to the entity`);
+            Object.assign(err, {
+                status: 400
+            });
+            throw err;
+        }
+    });
+    const idsToDelete = allIds.reduce((acc, { id, __component })=>{
+        if (!idsToKeep.find((el)=>el.id === id && el.__component === __component)) {
+            acc.push({
+                id,
+                __component
+            });
+        }
+        return acc;
+    }, []);
+    if (idsToDelete.length > 0) {
+        for (const idToDelete of idsToDelete){
+            const { id, __component } = idToDelete;
+            await deleteComponent(__component, {
+                id
+            });
+        }
     }
-  }
 };
-const deleteComponents = async (uid, entityToDelete, { loadComponents = true } = {}) => {
-  const { attributes = {} } = strapi.getModel(uid);
-  const attributeNames = Object.keys(attributes);
-  for (const attributeName of attributeNames) {
-    const attribute = attributes[attributeName];
-    if (attribute.type === "component" || attribute.type === "dynamiczone") {
-      let value;
-      if (loadComponents) {
-        value = await strapi.db.query(uid).load(entityToDelete, attributeName);
-      } else {
-        value = entityToDelete[attributeName];
-      }
-      if (!value) {
-        continue;
-      }
-      if (attribute.type === "component") {
-        const { component: componentUID } = attribute;
-        await strapiUtils.async.map(
-          ___default.default.castArray(value),
-          (subValue) => deleteComponent(componentUID, subValue)
-        );
-      } else {
-        await strapiUtils.async.map(
-          ___default.default.castArray(value),
-          (subValue) => deleteComponent(subValue.__component, subValue)
-        );
-      }
-      continue;
+const deleteComponents = async (uid, entityToDelete, { loadComponents = true } = {})=>{
+    const { attributes = {} } = strapi.getModel(uid);
+    const attributeNames = Object.keys(attributes);
+    for (const attributeName of attributeNames){
+        const attribute = attributes[attributeName];
+        if (attribute.type === 'component' || attribute.type === 'dynamiczone') {
+            let value;
+            if (loadComponents) {
+                value = await strapi.db.query(uid).load(entityToDelete, attributeName);
+            } else {
+                value = entityToDelete[attributeName];
+            }
+            if (!value) {
+                continue;
+            }
+            if (attribute.type === 'component') {
+                const { component: componentUID } = attribute;
+                await strapiUtils.async.map(_.castArray(value), (subValue)=>deleteComponent(componentUID, subValue));
+            } else {
+                await strapiUtils.async.map(_.castArray(value), (subValue)=>deleteComponent(subValue.__component, subValue));
+            }
+            continue;
+        }
     }
-  }
 };
-const createComponent = async (uid, data) => {
-  const schema = strapi.getModel(uid);
-  const componentData = await createComponents(uid, data);
-  const transform = fp.pipe(
-    // Make sure we don't save the component with a pre-defined ID
-    fp.omit("id"),
-    assignComponentData(schema, componentData)
-  );
-  return strapi.db.query(uid).create({ data: transform(data) });
+/** *************************
+    Component queries
+************************** */ // components can have nested compos so this must be recursive
+const createComponent = async (uid, data)=>{
+    const schema = strapi.getModel(uid);
+    const componentData = await createComponents(uid, data);
+    const transform = fp.pipe(// Make sure we don't save the component with a pre-defined ID
+    fp.omit('id'), assignComponentData(schema, componentData));
+    return strapi.db.query(uid).create({
+        data: transform(data)
+    });
 };
-const updateComponent = async (uid, componentToUpdate, data) => {
-  const schema = strapi.getModel(uid);
-  const componentData = await updateComponents(uid, componentToUpdate, data);
-  return strapi.db.query(uid).update({
-    where: {
-      id: componentToUpdate.id
-    },
-    data: assignComponentData(schema, componentData, data)
-  });
+// components can have nested compos so this must be recursive
+const updateComponent = async (uid, componentToUpdate, data)=>{
+    const schema = strapi.getModel(uid);
+    const componentData = await updateComponents(uid, componentToUpdate, data);
+    return strapi.db.query(uid).update({
+        where: {
+            id: componentToUpdate.id
+        },
+        data: assignComponentData(schema, componentData, data)
+    });
 };
-const updateOrCreateComponent = (componentUID, value) => {
-  if (value === null) {
-    return null;
-  }
-  if ("id" in value && typeof value.id !== "undefined") {
-    return updateComponent(componentUID, { id: value.id }, value);
-  }
-  return createComponent(componentUID, value);
+const updateOrCreateComponent = (componentUID, value)=>{
+    if (value === null) {
+        return null;
+    }
+    // update
+    if ('id' in value && typeof value.id !== 'undefined') {
+        // TODO: verify the compo is associated with the entity
+        return updateComponent(componentUID, {
+            id: value.id
+        }, value);
+    }
+    // create
+    return createComponent(componentUID, value);
 };
-const deleteComponent = async (uid, componentToDelete) => {
-  await deleteComponents(uid, componentToDelete);
-  await strapi.db.query(uid).delete({ where: { id: componentToDelete.id } });
+const deleteComponent = async (uid, componentToDelete)=>{
+    await deleteComponents(uid, componentToDelete);
+    await strapi.db.query(uid).delete({
+        where: {
+            id: componentToDelete.id
+        }
+    });
 };
-const assignComponentData = fp.curry(
-  (schema, componentData, data) => {
+const assignComponentData = fp.curry((schema, componentData, data)=>{
     return fp.pipe(omitComponentData(schema), fp.assign(componentData))(data);
-  }
-);
+});
+
 exports.assignComponentData = assignComponentData;
 exports.createComponents = createComponents;
 exports.deleteComponent = deleteComponent;