@strapi/core 0.0.0-experimental.2363945b79274c79e6505e5a6c3cdec876ed8cec → 0.0.0-experimental.25041a58cd2af628963c29620b4657416a4d772e

package/dist/services/document-service/utils/unidirectional-relations.d.ts

@@ -0,0 +1,36 @@
+import { UID } from '@strapi/types';
+interface LoadContext {
+    oldVersions: {
+        id: string;
+        locale: string;
+    }[];
+    newVersions: {
+        id: string;
+        locale: string;
+    }[];
+}
+/**
+ * Loads lingering relations that need to be updated when overriding a published or draft entry.
+ * This is necessary because the relations are uni-directional and the target entry is not aware of the source entry.
+ * This is not the case for bi-directional relations, where the target entry is also linked to the source entry.
+ */
+declare const load: (uid: UID.ContentType, { oldVersions, newVersions }: LoadContext) => Promise<any>;
+/**
+ * Updates uni directional relations to target the right entries when overriding published or draft entries.
+ *
+ * @param oldEntries The old entries that are being overridden
+ * @param newEntries The new entries that are overriding the old ones
+ * @param oldRelations The relations that were previously loaded with `load` @see load
+ */
+declare const sync: (oldEntries: {
+    id: string;
+    locale: string;
+}[], newEntries: {
+    id: string;
+    locale: string;
+}[], oldRelations: {
+    joinTable: any;
+    relations: any[];
+}[]) => Promise<void>;
+export { load, sync };
+//# sourceMappingURL=unidirectional-relations.d.ts.map

package/dist/services/document-service/utils/unidirectional-relations.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"unidirectional-relations.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/utils/unidirectional-relations.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,GAAG,EAAU,MAAM,eAAe,CAAC;AAE5C,UAAU,WAAW;IACnB,WAAW,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC9C,WAAW,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC/C;AAED;;;;GAIG;AACH,QAAA,MAAM,IAAI,QAAe,IAAI,WAAW,gCAAgC,WAAW,iBA8FlF,CAAC;AAEF;;;;;;GAMG;AACH,QAAA,MAAM,IAAI,eACI;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,cAChC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,gBAC9B;IAAE,SAAS,EAAE,GAAG,CAAC;IAAC,SAAS,EAAE,GAAG,EAAE,CAAA;CAAE,EAAE,kBAiCrD,CAAC;AAEF,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC"}

package/dist/services/document-service/utils/unidirectional-relations.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const fp = require("lodash/fp");
+const load = async (uid, { oldVersions, newVersions }) => {
+  const updates = [];
+  await strapi.db.transaction(async ({ trx }) => {
+    const contentTypes = Object.values(strapi.contentTypes);
+    const components = Object.values(strapi.components);
+    for (const model of [...contentTypes, ...components]) {
+      const dbModel = strapi.db.metadata.get(model.uid);
+      for (const attribute of Object.values(dbModel.attributes)) {
+        if (attribute.type !== "relation" || attribute.target !== uid || attribute.inversedBy || attribute.mappedBy) {
+          continue;
+        }
+        const joinTable = attribute.joinTable;
+        if (!joinTable) {
+          continue;
+        }
+        const { name: sourceColumnName } = joinTable.joinColumn;
+        const { name: targetColumnName } = joinTable.inverseJoinColumn;
+        const ids = oldVersions.map((entry) => entry.id);
+        const oldVersionsRelations = await strapi.db.getConnection().select("*").from(joinTable.name).whereIn(targetColumnName, ids).transacting(trx);
+        if (oldVersionsRelations.length > 0) {
+          updates.push({ joinTable, relations: oldVersionsRelations });
+        }
+        if (!model.options?.draftAndPublish) {
+          const ids2 = newVersions.map((entry) => entry.id);
+          const newVersionsRelations = await strapi.db.getConnection().select("*").from(joinTable.name).whereIn(targetColumnName, ids2).transacting(trx);
+          if (newVersionsRelations.length > 0) {
+            const discardToAdd = newVersionsRelations.filter((relation) => {
+              const matchingOldVerion = oldVersionsRelations.find((oldRelation) => {
+                return oldRelation[sourceColumnName] === relation[sourceColumnName];
+              });
+              return !matchingOldVerion;
+            }).map(fp.omit("id"));
+            updates.push({ joinTable, relations: discardToAdd });
+          }
+        }
+      }
+    }
+  });
+  return updates;
+};
+const sync = async (oldEntries, newEntries, oldRelations) => {
+  const newEntryByLocale = fp.keyBy("locale", newEntries);
+  const oldEntriesMap = oldEntries.reduce(
+    (acc, entry) => {
+      const newEntry = newEntryByLocale[entry.locale];
+      if (!newEntry)
+        return acc;
+      acc[entry.id] = newEntry.id;
+      return acc;
+    },
+    {}
+  );
+  await strapi.db.transaction(async ({ trx }) => {
+    for (const { joinTable, relations } of oldRelations) {
+      const column = joinTable.inverseJoinColumn.name;
+      const newRelations = relations.map((relation) => {
+        const newId = oldEntriesMap[relation[column]];
+        return { ...relation, [column]: newId };
+      });
+      await trx.batchInsert(joinTable.name, newRelations, 1e3);
+    }
+  });
+};
+exports.load = load;
+exports.sync = sync;
+//# sourceMappingURL=unidirectional-relations.js.map

package/dist/services/document-service/utils/unidirectional-relations.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"unidirectional-relations.js","sources":["../../../../src/services/document-service/utils/unidirectional-relations.ts"],"sourcesContent":["/* eslint-disable no-continue */\nimport { keyBy, omit } from 'lodash/fp';\n\nimport { UID, Schema } from '@strapi/types';\n\ninterface LoadContext {\n  oldVersions: { id: string; locale: string }[];\n  newVersions: { id: string; locale: string }[];\n}\n\n/**\n * Loads lingering relations that need to be updated when overriding a published or draft entry.\n * This is necessary because the relations are uni-directional and the target entry is not aware of the source entry.\n * This is not the case for bi-directional relations, where the target entry is also linked to the source entry.\n */\nconst load = async (uid: UID.ContentType, { oldVersions, newVersions }: LoadContext) => {\n  const updates = [] as any;\n\n  // Iterate all components and content types to find relations that need to be updated\n  await strapi.db.transaction(async ({ trx }) => {\n    const contentTypes = Object.values(strapi.contentTypes) as Schema.ContentType[];\n    const components = Object.values(strapi.components) as Schema.Component[];\n\n    for (const model of [...contentTypes, ...components]) {\n      const dbModel = strapi.db.metadata.get(model.uid);\n\n      for (const attribute of Object.values(dbModel.attributes) as any) {\n        /**\n         * Only consider unidirectional relations\n         */\n        if (\n          attribute.type !== 'relation' ||\n          attribute.target !== uid ||\n          attribute.inversedBy ||\n          attribute.mappedBy\n        ) {\n          continue;\n        }\n\n        // TODO: joinColumn relations\n        const joinTable = attribute.joinTable;\n        if (!joinTable) {\n          continue;\n        }\n\n        const { name: sourceColumnName } = joinTable.joinColumn;\n        const { name: targetColumnName } = joinTable.inverseJoinColumn;\n\n        /**\n         * Load all relations that need to be updated\n         */\n        // NOTE: when the model has draft and publish, we can assume relation are only draft to draft & published to published\n        const ids = oldVersions.map((entry) => entry.id);\n\n        const oldVersionsRelations = await strapi.db\n          .getConnection()\n          .select('*')\n          .from(joinTable.name)\n          .whereIn(targetColumnName, ids)\n          .transacting(trx);\n\n        if (oldVersionsRelations.length > 0) {\n          updates.push({ joinTable, relations: oldVersionsRelations });\n        }\n\n        /**\n         * if publishing\n         *  if published version exists\n         *    updated published versions links\n         *  else\n         *    create link to newly published version\n         *\n         * if discarding\n         *    if published version link exists & not draft version link\n         *       create link to new draft version\n         */\n\n        if (!model.options?.draftAndPublish) {\n          const ids = newVersions.map((entry) => entry.id);\n\n          const newVersionsRelations = await strapi.db\n            .getConnection()\n            .select('*')\n            .from(joinTable.name)\n            .whereIn(targetColumnName, ids)\n            .transacting(trx);\n\n          if (newVersionsRelations.length > 0) {\n            // when publishing a draft that doesn't have a published version yet,\n            // copy the links to the draft over to the published version\n            // when discarding a published version, if no drafts exists\n            const discardToAdd = newVersionsRelations\n              .filter((relation) => {\n                const matchingOldVerion = oldVersionsRelations.find((oldRelation) => {\n                  return oldRelation[sourceColumnName] === relation[sourceColumnName];\n                });\n\n                return !matchingOldVerion;\n              })\n              .map(omit('id'));\n\n            updates.push({ joinTable, relations: discardToAdd });\n          }\n        }\n      }\n    }\n  });\n\n  return updates;\n};\n\n/**\n * Updates uni directional relations to target the right entries when overriding published or draft entries.\n *\n * @param oldEntries The old entries that are being overridden\n * @param newEntries The new entries that are overriding the old ones\n * @param oldRelations The relations that were previously loaded with `load` @see load\n */\nconst sync = async (\n  oldEntries: { id: string; locale: string }[],\n  newEntries: { id: string; locale: string }[],\n  oldRelations: { joinTable: any; relations: any[] }[]\n) => {\n  /**\n   * Create a map of old entry ids to new entry ids\n   *\n   * Will be used to update the relation target ids\n   */\n  const newEntryByLocale = keyBy('locale', newEntries);\n  const oldEntriesMap = oldEntries.reduce(\n    (acc, entry) => {\n      const newEntry = newEntryByLocale[entry.locale];\n      if (!newEntry) return acc;\n      acc[entry.id] = newEntry.id;\n      return acc;\n    },\n    {} as Record<string, string>\n  );\n\n  await strapi.db.transaction(async ({ trx }) => {\n    // Iterate old relations that are deleted and insert the new ones\n    for (const { joinTable, relations } of oldRelations) {\n      // Update old ids with the new ones\n      const column = joinTable.inverseJoinColumn.name;\n\n      const newRelations = relations.map((relation) => {\n        const newId = oldEntriesMap[relation[column]];\n        return { ...relation, [column]: newId };\n      });\n\n      // Insert those relations into the join table\n      await trx.batchInsert(joinTable.name, newRelations, 1000);\n    }\n  });\n};\n\nexport { load, sync };\n"],"names":["ids","omit","keyBy"],"mappings":";;;AAeA,MAAM,OAAO,OAAO,KAAsB,EAAE,aAAa,kBAA+B;AACtF,QAAM,UAAU,CAAA;AAGhB,QAAM,OAAO,GAAG,YAAY,OAAO,EAAE,UAAU;AAC7C,UAAM,eAAe,OAAO,OAAO,OAAO,YAAY;AACtD,UAAM,aAAa,OAAO,OAAO,OAAO,UAAU;AAElD,eAAW,SAAS,CAAC,GAAG,cAAc,GAAG,UAAU,GAAG;AACpD,YAAM,UAAU,OAAO,GAAG,SAAS,IAAI,MAAM,GAAG;AAEhD,iBAAW,aAAa,OAAO,OAAO,QAAQ,UAAU,GAAU;AAK9D,YAAA,UAAU,SAAS,cACnB,UAAU,WAAW,OACrB,UAAU,cACV,UAAU,UACV;AACA;AAAA,QACF;AAGA,cAAM,YAAY,UAAU;AAC5B,YAAI,CAAC,WAAW;AACd;AAAA,QACF;AAEA,cAAM,EAAE,MAAM,qBAAqB,UAAU;AAC7C,cAAM,EAAE,MAAM,qBAAqB,UAAU;AAM7C,cAAM,MAAM,YAAY,IAAI,CAAC,UAAU,MAAM,EAAE;AAE/C,cAAM,uBAAuB,MAAM,OAAO,GACvC,gBACA,OAAO,GAAG,EACV,KAAK,UAAU,IAAI,EACnB,QAAQ,kBAAkB,GAAG,EAC7B,YAAY,GAAG;AAEd,YAAA,qBAAqB,SAAS,GAAG;AACnC,kBAAQ,KAAK,EAAE,WAAW,WAAW,qBAAsB,CAAA;AAAA,QAC7D;AAcI,YAAA,CAAC,MAAM,SAAS,iBAAiB;AACnC,gBAAMA,OAAM,YAAY,IAAI,CAAC,UAAU,MAAM,EAAE;AAE/C,gBAAM,uBAAuB,MAAM,OAAO,GACvC,gBACA,OAAO,GAAG,EACV,KAAK,UAAU,IAAI,EACnB,QAAQ,kBAAkBA,IAAG,EAC7B,YAAY,GAAG;AAEd,cAAA,qBAAqB,SAAS,GAAG;AAInC,kBAAM,eAAe,qBAClB,OAAO,CAAC,aAAa;AACpB,oBAAM,oBAAoB,qBAAqB,KAAK,CAAC,gBAAgB;AACnE,uBAAO,YAAY,gBAAgB,MAAM,SAAS,gBAAgB;AAAA,cAAA,CACnE;AAED,qBAAO,CAAC;AAAA,YACT,CAAA,EACA,IAAIC,QAAK,IAAI,CAAC;AAEjB,oBAAQ,KAAK,EAAE,WAAW,WAAW,aAAc,CAAA;AAAA,UACrD;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EAAA,CACD;AAEM,SAAA;AACT;AASA,MAAM,OAAO,OACX,YACA,YACA,iBACG;AAMG,QAAA,mBAAmBC,GAAAA,MAAM,UAAU,UAAU;AACnD,QAAM,gBAAgB,WAAW;AAAA,IAC/B,CAAC,KAAK,UAAU;AACR,YAAA,WAAW,iBAAiB,MAAM,MAAM;AAC9C,UAAI,CAAC;AAAiB,eAAA;AAClB,UAAA,MAAM,EAAE,IAAI,SAAS;AAClB,aAAA;AAAA,IACT;AAAA,IACA,CAAC;AAAA,EAAA;AAGH,QAAM,OAAO,GAAG,YAAY,OAAO,EAAE,UAAU;AAE7C,eAAW,EAAE,WAAW,UAAU,KAAK,cAAc;AAE7C,YAAA,SAAS,UAAU,kBAAkB;AAE3C,YAAM,eAAe,UAAU,IAAI,CAAC,aAAa;AAC/C,cAAM,QAAQ,cAAc,SAAS,MAAM,CAAC;AAC5C,eAAO,EAAE,GAAG,UAAU,CAAC,MAAM,GAAG,MAAM;AAAA,MAAA,CACvC;AAGD,YAAM,IAAI,YAAY,UAAU,MAAM,cAAc,GAAI;AAAA,IAC1D;AAAA,EAAA,CACD;AACH;;;"}

package/dist/services/document-service/utils/unidirectional-relations.mjs

@@ -0,0 +1,69 @@
+import { omit, keyBy } from "lodash/fp";
+const load = async (uid, { oldVersions, newVersions }) => {
+  const updates = [];
+  await strapi.db.transaction(async ({ trx }) => {
+    const contentTypes = Object.values(strapi.contentTypes);
+    const components = Object.values(strapi.components);
+    for (const model of [...contentTypes, ...components]) {
+      const dbModel = strapi.db.metadata.get(model.uid);
+      for (const attribute of Object.values(dbModel.attributes)) {
+        if (attribute.type !== "relation" || attribute.target !== uid || attribute.inversedBy || attribute.mappedBy) {
+          continue;
+        }
+        const joinTable = attribute.joinTable;
+        if (!joinTable) {
+          continue;
+        }
+        const { name: sourceColumnName } = joinTable.joinColumn;
+        const { name: targetColumnName } = joinTable.inverseJoinColumn;
+        const ids = oldVersions.map((entry) => entry.id);
+        const oldVersionsRelations = await strapi.db.getConnection().select("*").from(joinTable.name).whereIn(targetColumnName, ids).transacting(trx);
+        if (oldVersionsRelations.length > 0) {
+          updates.push({ joinTable, relations: oldVersionsRelations });
+        }
+        if (!model.options?.draftAndPublish) {
+          const ids2 = newVersions.map((entry) => entry.id);
+          const newVersionsRelations = await strapi.db.getConnection().select("*").from(joinTable.name).whereIn(targetColumnName, ids2).transacting(trx);
+          if (newVersionsRelations.length > 0) {
+            const discardToAdd = newVersionsRelations.filter((relation) => {
+              const matchingOldVerion = oldVersionsRelations.find((oldRelation) => {
+                return oldRelation[sourceColumnName] === relation[sourceColumnName];
+              });
+              return !matchingOldVerion;
+            }).map(omit("id"));
+            updates.push({ joinTable, relations: discardToAdd });
+          }
+        }
+      }
+    }
+  });
+  return updates;
+};
+const sync = async (oldEntries, newEntries, oldRelations) => {
+  const newEntryByLocale = keyBy("locale", newEntries);
+  const oldEntriesMap = oldEntries.reduce(
+    (acc, entry) => {
+      const newEntry = newEntryByLocale[entry.locale];
+      if (!newEntry)
+        return acc;
+      acc[entry.id] = newEntry.id;
+      return acc;
+    },
+    {}
+  );
+  await strapi.db.transaction(async ({ trx }) => {
+    for (const { joinTable, relations } of oldRelations) {
+      const column = joinTable.inverseJoinColumn.name;
+      const newRelations = relations.map((relation) => {
+        const newId = oldEntriesMap[relation[column]];
+        return { ...relation, [column]: newId };
+      });
+      await trx.batchInsert(joinTable.name, newRelations, 1e3);
+    }
+  });
+};
+export {
+  load,
+  sync
+};
+//# sourceMappingURL=unidirectional-relations.mjs.map

package/dist/services/document-service/utils/unidirectional-relations.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"unidirectional-relations.mjs","sources":["../../../../src/services/document-service/utils/unidirectional-relations.ts"],"sourcesContent":["/* eslint-disable no-continue */\nimport { keyBy, omit } from 'lodash/fp';\n\nimport { UID, Schema } from '@strapi/types';\n\ninterface LoadContext {\n  oldVersions: { id: string; locale: string }[];\n  newVersions: { id: string; locale: string }[];\n}\n\n/**\n * Loads lingering relations that need to be updated when overriding a published or draft entry.\n * This is necessary because the relations are uni-directional and the target entry is not aware of the source entry.\n * This is not the case for bi-directional relations, where the target entry is also linked to the source entry.\n */\nconst load = async (uid: UID.ContentType, { oldVersions, newVersions }: LoadContext) => {\n  const updates = [] as any;\n\n  // Iterate all components and content types to find relations that need to be updated\n  await strapi.db.transaction(async ({ trx }) => {\n    const contentTypes = Object.values(strapi.contentTypes) as Schema.ContentType[];\n    const components = Object.values(strapi.components) as Schema.Component[];\n\n    for (const model of [...contentTypes, ...components]) {\n      const dbModel = strapi.db.metadata.get(model.uid);\n\n      for (const attribute of Object.values(dbModel.attributes) as any) {\n        /**\n         * Only consider unidirectional relations\n         */\n        if (\n          attribute.type !== 'relation' ||\n          attribute.target !== uid ||\n          attribute.inversedBy ||\n          attribute.mappedBy\n        ) {\n          continue;\n        }\n\n        // TODO: joinColumn relations\n        const joinTable = attribute.joinTable;\n        if (!joinTable) {\n          continue;\n        }\n\n        const { name: sourceColumnName } = joinTable.joinColumn;\n        const { name: targetColumnName } = joinTable.inverseJoinColumn;\n\n        /**\n         * Load all relations that need to be updated\n         */\n        // NOTE: when the model has draft and publish, we can assume relation are only draft to draft & published to published\n        const ids = oldVersions.map((entry) => entry.id);\n\n        const oldVersionsRelations = await strapi.db\n          .getConnection()\n          .select('*')\n          .from(joinTable.name)\n          .whereIn(targetColumnName, ids)\n          .transacting(trx);\n\n        if (oldVersionsRelations.length > 0) {\n          updates.push({ joinTable, relations: oldVersionsRelations });\n        }\n\n        /**\n         * if publishing\n         *  if published version exists\n         *    updated published versions links\n         *  else\n         *    create link to newly published version\n         *\n         * if discarding\n         *    if published version link exists & not draft version link\n         *       create link to new draft version\n         */\n\n        if (!model.options?.draftAndPublish) {\n          const ids = newVersions.map((entry) => entry.id);\n\n          const newVersionsRelations = await strapi.db\n            .getConnection()\n            .select('*')\n            .from(joinTable.name)\n            .whereIn(targetColumnName, ids)\n            .transacting(trx);\n\n          if (newVersionsRelations.length > 0) {\n            // when publishing a draft that doesn't have a published version yet,\n            // copy the links to the draft over to the published version\n            // when discarding a published version, if no drafts exists\n            const discardToAdd = newVersionsRelations\n              .filter((relation) => {\n                const matchingOldVerion = oldVersionsRelations.find((oldRelation) => {\n                  return oldRelation[sourceColumnName] === relation[sourceColumnName];\n                });\n\n                return !matchingOldVerion;\n              })\n              .map(omit('id'));\n\n            updates.push({ joinTable, relations: discardToAdd });\n          }\n        }\n      }\n    }\n  });\n\n  return updates;\n};\n\n/**\n * Updates uni directional relations to target the right entries when overriding published or draft entries.\n *\n * @param oldEntries The old entries that are being overridden\n * @param newEntries The new entries that are overriding the old ones\n * @param oldRelations The relations that were previously loaded with `load` @see load\n */\nconst sync = async (\n  oldEntries: { id: string; locale: string }[],\n  newEntries: { id: string; locale: string }[],\n  oldRelations: { joinTable: any; relations: any[] }[]\n) => {\n  /**\n   * Create a map of old entry ids to new entry ids\n   *\n   * Will be used to update the relation target ids\n   */\n  const newEntryByLocale = keyBy('locale', newEntries);\n  const oldEntriesMap = oldEntries.reduce(\n    (acc, entry) => {\n      const newEntry = newEntryByLocale[entry.locale];\n      if (!newEntry) return acc;\n      acc[entry.id] = newEntry.id;\n      return acc;\n    },\n    {} as Record<string, string>\n  );\n\n  await strapi.db.transaction(async ({ trx }) => {\n    // Iterate old relations that are deleted and insert the new ones\n    for (const { joinTable, relations } of oldRelations) {\n      // Update old ids with the new ones\n      const column = joinTable.inverseJoinColumn.name;\n\n      const newRelations = relations.map((relation) => {\n        const newId = oldEntriesMap[relation[column]];\n        return { ...relation, [column]: newId };\n      });\n\n      // Insert those relations into the join table\n      await trx.batchInsert(joinTable.name, newRelations, 1000);\n    }\n  });\n};\n\nexport { load, sync };\n"],"names":["ids"],"mappings":";AAeA,MAAM,OAAO,OAAO,KAAsB,EAAE,aAAa,kBAA+B;AACtF,QAAM,UAAU,CAAA;AAGhB,QAAM,OAAO,GAAG,YAAY,OAAO,EAAE,UAAU;AAC7C,UAAM,eAAe,OAAO,OAAO,OAAO,YAAY;AACtD,UAAM,aAAa,OAAO,OAAO,OAAO,UAAU;AAElD,eAAW,SAAS,CAAC,GAAG,cAAc,GAAG,UAAU,GAAG;AACpD,YAAM,UAAU,OAAO,GAAG,SAAS,IAAI,MAAM,GAAG;AAEhD,iBAAW,aAAa,OAAO,OAAO,QAAQ,UAAU,GAAU;AAK9D,YAAA,UAAU,SAAS,cACnB,UAAU,WAAW,OACrB,UAAU,cACV,UAAU,UACV;AACA;AAAA,QACF;AAGA,cAAM,YAAY,UAAU;AAC5B,YAAI,CAAC,WAAW;AACd;AAAA,QACF;AAEA,cAAM,EAAE,MAAM,qBAAqB,UAAU;AAC7C,cAAM,EAAE,MAAM,qBAAqB,UAAU;AAM7C,cAAM,MAAM,YAAY,IAAI,CAAC,UAAU,MAAM,EAAE;AAE/C,cAAM,uBAAuB,MAAM,OAAO,GACvC,gBACA,OAAO,GAAG,EACV,KAAK,UAAU,IAAI,EACnB,QAAQ,kBAAkB,GAAG,EAC7B,YAAY,GAAG;AAEd,YAAA,qBAAqB,SAAS,GAAG;AACnC,kBAAQ,KAAK,EAAE,WAAW,WAAW,qBAAsB,CAAA;AAAA,QAC7D;AAcI,YAAA,CAAC,MAAM,SAAS,iBAAiB;AACnC,gBAAMA,OAAM,YAAY,IAAI,CAAC,UAAU,MAAM,EAAE;AAE/C,gBAAM,uBAAuB,MAAM,OAAO,GACvC,gBACA,OAAO,GAAG,EACV,KAAK,UAAU,IAAI,EACnB,QAAQ,kBAAkBA,IAAG,EAC7B,YAAY,GAAG;AAEd,cAAA,qBAAqB,SAAS,GAAG;AAInC,kBAAM,eAAe,qBAClB,OAAO,CAAC,aAAa;AACpB,oBAAM,oBAAoB,qBAAqB,KAAK,CAAC,gBAAgB;AACnE,uBAAO,YAAY,gBAAgB,MAAM,SAAS,gBAAgB;AAAA,cAAA,CACnE;AAED,qBAAO,CAAC;AAAA,YACT,CAAA,EACA,IAAI,KAAK,IAAI,CAAC;AAEjB,oBAAQ,KAAK,EAAE,WAAW,WAAW,aAAc,CAAA;AAAA,UACrD;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EAAA,CACD;AAEM,SAAA;AACT;AASA,MAAM,OAAO,OACX,YACA,YACA,iBACG;AAMG,QAAA,mBAAmB,MAAM,UAAU,UAAU;AACnD,QAAM,gBAAgB,WAAW;AAAA,IAC/B,CAAC,KAAK,UAAU;AACR,YAAA,WAAW,iBAAiB,MAAM,MAAM;AAC9C,UAAI,CAAC;AAAiB,eAAA;AAClB,UAAA,MAAM,EAAE,IAAI,SAAS;AAClB,aAAA;AAAA,IACT;AAAA,IACA,CAAC;AAAA,EAAA;AAGH,QAAM,OAAO,GAAG,YAAY,OAAO,EAAE,UAAU;AAE7C,eAAW,EAAE,WAAW,UAAU,KAAK,cAAc;AAE7C,YAAA,SAAS,UAAU,kBAAkB;AAE3C,YAAM,eAAe,UAAU,IAAI,CAAC,aAAa;AAC/C,cAAM,QAAQ,cAAc,SAAS,MAAM,CAAC;AAC5C,eAAO,EAAE,GAAG,UAAU,CAAC,MAAM,GAAG,MAAM;AAAA,MAAA,CACvC;AAGD,YAAM,IAAI,YAAY,UAAU,MAAM,cAAc,GAAI;AAAA,IAC1D;AAAA,EAAA,CACD;AACH;"}

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

@@ -1,15 +1,13 @@
 import type { Database } from '@strapi/database';
-import type { Strapi, EntityService, EntityValidator, EventHub } from '@strapi/types';
+import type { Core, Modules } from '@strapi/types';
 type Decoratable<T> = T & {
-    decorate(decorator: (old: EntityService.EntityService) => EntityService.EntityService & {
+    decorate(decorator: (old: Modules.EntityService.EntityService) => Modules.EntityService.EntityService & {
         [key: string]: unknown;
     }): void;
 };
 declare const _default: (ctx: {
-    strapi: Strapi;
+    strapi: Core.Strapi;
     db: Database;
-    eventHub: EventHub;
-    entityValidator: EntityValidator;
-}) => Decoratable<EntityService.EntityService>;
+}) => Decoratable<Modules.EntityService.EntityService>;
 export default _default;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/entity-service/index.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EACV,MAAM,EACN,aAAa,EACb,eAAe,EACf,QAAQ,EAKT,MAAM,eAAe,CAAC;AAkBvB,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG;IACxB,QAAQ,CACN,SAAS,EAAE,CAAC,GAAG,EAAE,aAAa,CAAC,aAAa,KAAK,aAAa,CAAC,aAAa,GAAG;QAC7E,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,GACA,IAAI,CAAC;CACT,CAAC;8BAsZmB;IACnB,QAAQ,MAAM,CAAC;IACf,EAAE,EAAE,QAAQ,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;CAClC,KAAG,YAAY,2BAA2B,CAAC;AAL5C,wBA0DE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/entity-service/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAS,MAAM,eAAe,CAAC;AAE1D,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG;IACxB,QAAQ,CACN,SAAS,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,aAAa,CAAC,aAAa,KAAK,OAAO,CAAC,aAAa,CAAC,aAAa,GAAG;QAC7F,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,GACA,IAAI,CAAC;CACT,CAAC;8BAuLmB;IACnB,MAAM,EAAE,KAAK,MAAM,CAAC;IACpB,EAAE,EAAE,QAAQ,CAAC;CACd,KAAG,YAAY,QAAQ,aAAa,CAAC,aAAa,CAAC;AAHpD,wBAoDE"}

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

@@ -3,16 +3,11 @@ const _ = require("lodash");
 const delegate = require("delegates");
 const database = require("@strapi/database");
 const strapiUtils = require("@strapi/utils");
-const uploadFiles = require("../utils/upload-files.js");
-const components = require("./components.js");
-const params = require("./params.js");
-const index = require("./attributes/index.js");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
 const ___default = /* @__PURE__ */ _interopDefault(_);
 const delegate__default = /* @__PURE__ */ _interopDefault(delegate);
-const { transformParamsToQuery } = strapiUtils.convertQueryParams;
-const transformLoadParamsToQuery = (uid, field, params2, pagination = {}) => {
-  const query = transformParamsToQuery(uid, { populate: { [field]: params2 } });
+const transformLoadParamsToQuery = (uid, field, params, pagination = {}) => {
+  const query = strapi.get("query-params").transform(uid, { populate: { [field]: params } });
   const res = {
     ...query.populate[field],
     ...pagination
@@ -25,258 +20,107 @@ const databaseErrorsToTransform = [
   database.errors.InvalidDateError,
   database.errors.InvalidRelationError
 ];
-const creationPipeline = (data, context) => {
-  return index.applyTransforms(data, context);
-};
-const updatePipeline = (data, context) => {
-  return index.applyTransforms(data, context);
-};
-const ALLOWED_WEBHOOK_EVENTS = {
-  ENTRY_CREATE: "entry.create",
-  ENTRY_UPDATE: "entry.update",
-  ENTRY_DELETE: "entry.delete"
-};
 const createDefaultImplementation = ({
-  strapi,
-  db,
-  eventHub,
-  entityValidator
+  strapi: strapi2,
+  db
 }) => ({
-  /**
-   * Upload files utility
-   */
-  uploadFiles,
   async wrapParams(options = {}) {
     return options;
   },
   async wrapResult(result = {}) {
     return result;
   },
-  async emitEvent(uid, event, entity) {
-    if (uid === "admin::audit-log") {
-      return;
-    }
-    const model = strapi.getModel(uid);
-    const sanitizedEntity = await strapiUtils.sanitize.sanitizers.defaultSanitizeOutput(model, entity);
-    eventHub.emit(event, {
-      model: model.modelName,
-      uid: model.uid,
-      entry: sanitizedEntity
-    });
-  },
   async findMany(uid, opts) {
-    const { kind } = strapi.getModel(uid);
+    const { kind } = strapi2.getModel(uid);
     const wrappedParams = await this.wrapParams(opts, { uid, action: "findMany" });
-    const query = transformParamsToQuery(uid, wrappedParams);
     if (kind === "singleType") {
-      const entity = db.query(uid).findOne(query);
+      const entity = strapi2.documents(uid).findFirst(wrappedParams);
       return this.wrapResult(entity, { uid, action: "findOne" });
     }
-    const entities = await db.query(uid).findMany(query);
+    const entities = await strapi2.documents(uid).findMany(wrappedParams);
     return this.wrapResult(entities, { uid, action: "findMany" });
   },
   async findPage(uid, opts) {
     const wrappedParams = await this.wrapParams(opts, { uid, action: "findPage" });
-    const query = transformParamsToQuery(uid, wrappedParams);
-    const page = await db.query(uid).findPage(query);
-    return {
-      ...page,
-      results: await this.wrapResult(page.results, { uid, action: "findPage" })
-    };
-  },
-  // TODO: streamline the logic based on the populate option
-  async findWithRelationCountsPage(uid, opts) {
-    const wrappedParams = await this.wrapParams(opts, { uid, action: "findWithRelationCounts" });
-    const query = transformParamsToQuery(uid, wrappedParams);
+    const query = strapi2.get("query-params").transform(uid, wrappedParams);
     const entities = await db.query(uid).findPage(query);
-    return {
-      ...entities,
-      results: await this.wrapResult(entities.results, { uid, action: "findWithRelationCounts" })
-    };
-  },
-  async findWithRelationCounts(uid, opts) {
-    const wrappedParams = await this.wrapParams(opts, { uid, action: "findWithRelationCounts" });
-    const query = transformParamsToQuery(uid, wrappedParams);
-    const entities = await db.query(uid).findMany(query);
-    return this.wrapResult(entities, { uid, action: "findWithRelationCounts" });
+    return this.wrapResult(entities, { uid, action: "findMany" });
   },
   async findOne(uid, entityId, opts) {
     const wrappedParams = await this.wrapParams(opts, { uid, action: "findOne" });
-    const query = transformParamsToQuery(uid, params.pickSelectionParams(wrappedParams));
-    const entity = await db.query(uid).findOne({ ...query, where: { id: entityId } });
+    const res = await db.query(uid).findOne({ where: { id: entityId } });
+    if (!res) {
+      return this.wrapResult(null, { uid, action: "findOne" });
+    }
+    const entity = await strapi2.documents(uid).findOne({
+      ...wrappedParams,
+      documentId: res.documentId
+    });
     return this.wrapResult(entity, { uid, action: "findOne" });
   },
   async count(uid, opts) {
     const wrappedParams = await this.wrapParams(opts, { uid, action: "count" });
-    const query = transformParamsToQuery(uid, wrappedParams);
-    return db.query(uid).count(query);
+    return strapi2.documents(uid).count(wrappedParams);
   },
-  async create(uid, params$1) {
-    const wrappedParams = await this.wrapParams(params$1, { uid, action: "create" });
-    const { data, files } = wrappedParams;
+  async create(uid, params) {
+    const wrappedParams = await this.wrapParams(params, { uid, action: "create" });
+    const { data } = wrappedParams;
     if (!data) {
       throw new Error("cannot create");
     }
-    const model = strapi.getModel(uid);
-    const isDraft = strapiUtils.contentTypes.isDraft(data);
-    const validData = await entityValidator.validateEntityCreation(model, data, { isDraft });
-    const query = transformParamsToQuery(uid, params.pickSelectionParams(wrappedParams));
-    const componentData = await components.createComponents(uid, validData);
-    const entityData = creationPipeline(
-      Object.assign(components.omitComponentData(model, validData), componentData),
-      {
-        contentType: model
-      }
-    );
-    let entity = await db.query(uid).create({
-      ...query,
-      data: entityData
+    const shouldPublish = !strapiUtils.contentTypes.isDraft(data, strapi2.getModel(uid));
+    const entity = await strapi2.documents(uid).create({
+      ...wrappedParams,
+      status: shouldPublish ? "published" : "draft"
     });
-    if (files && Object.keys(files).length > 0) {
-      await this.uploadFiles(uid, Object.assign(entityData, entity), files);
-      entity = await this.findOne(uid, entity.id, wrappedParams);
-    }
-    entity = await this.wrapResult(entity, { uid, action: "create" });
-    const { ENTRY_CREATE } = ALLOWED_WEBHOOK_EVENTS;
-    await this.emitEvent(uid, ENTRY_CREATE, entity);
-    return entity;
+    return this.wrapResult(entity, { uid, action: "create" });
   },
   async update(uid, entityId, opts) {
     const wrappedParams = await this.wrapParams(opts, {
       uid,
       action: "update"
     });
-    const { data, files } = wrappedParams;
-    const model = strapi.getModel(uid);
     const entityToUpdate = await db.query(uid).findOne({ where: { id: entityId } });
     if (!entityToUpdate) {
-      return null;
+      return this.wrapResult(null, { uid, action: "update" });
     }
-    const isDraft = strapiUtils.contentTypes.isDraft(entityToUpdate);
-    const validData = await entityValidator.validateEntityUpdate(
-      model,
-      data,
-      {
-        isDraft
-      },
-      entityToUpdate
-    );
-    const query = transformParamsToQuery(uid, params.pickSelectionParams(wrappedParams));
-    const componentData = await components.updateComponents(uid, entityToUpdate, validData);
-    const entityData = updatePipeline(
-      Object.assign(components.omitComponentData(model, validData), componentData),
-      { contentType: model }
-    );
-    let entity = await db.query(uid).update({
-      ...query,
-      where: { id: entityId },
-      data: entityData
+    const shouldPublish = !strapiUtils.contentTypes.isDraft(entityToUpdate, strapi2.getModel(uid));
+    const entity = strapi2.documents(uid).update({
+      ...wrappedParams,
+      status: shouldPublish ? "published" : "draft",
+      documentId: entityToUpdate.documentId
     });
-    if (files && Object.keys(files).length > 0) {
-      await this.uploadFiles(uid, Object.assign(entityData, entity), files);
-      entity = await this.findOne(uid, entity.id, wrappedParams);
-    }
-    entity = await this.wrapResult(entity, { uid, action: "update" });
-    const { ENTRY_UPDATE } = ALLOWED_WEBHOOK_EVENTS;
-    await this.emitEvent(uid, ENTRY_UPDATE, entity);
-    return entity;
+    return this.wrapResult(entity, { uid, action: "update" });
   },
   async delete(uid, entityId, opts) {
     const wrappedParams = await this.wrapParams(opts, { uid, action: "delete" });
-    const query = transformParamsToQuery(uid, params.pickSelectionParams(wrappedParams));
-    let entityToDelete = await db.query(uid).findOne({
-      ...query,
-      where: { id: entityId }
-    });
+    const entityToDelete = await db.query(uid).findOne({ where: { id: entityId } });
     if (!entityToDelete) {
-      return null;
+      return this.wrapResult(null, { uid, action: "delete" });
     }
-    const componentsToDelete = await components.getComponents(uid, entityToDelete);
-    await db.query(uid).delete({ where: { id: entityToDelete.id } });
-    await components.deleteComponents(uid, componentsToDelete, { loadComponents: false });
-    entityToDelete = await this.wrapResult(entityToDelete, { uid, action: "delete" });
-    const { ENTRY_DELETE } = ALLOWED_WEBHOOK_EVENTS;
-    await this.emitEvent(uid, ENTRY_DELETE, entityToDelete);
-    return entityToDelete;
-  },
-  async clone(uid, cloneId, opts) {
-    const wrappedParams = await this.wrapParams(opts, { uid, action: "clone" });
-    const { data, files } = wrappedParams;
-    if (!data) {
-      throw new Error("cannot clone");
-    }
-    const model = strapi.getModel(uid);
-    const entityToClone = await db.query(uid).findOne({ where: { id: cloneId } });
-    if (!entityToClone) {
-      return null;
-    }
-    const isDraft = strapiUtils.contentTypes.isDraft(entityToClone);
-    const validData = await entityValidator.validateEntityUpdate(
-      model,
-      // Omit the id, the cloned entity id will be generated by the database
-      ___default.default.omit(data, ["id"]),
-      { isDraft },
-      entityToClone
-    );
-    const query = transformParamsToQuery(uid, params.pickSelectionParams(wrappedParams));
-    const componentData = await components.cloneComponents(uid, entityToClone, validData);
-    const entityData = creationPipeline(
-      Object.assign(components.omitComponentData(model, validData), componentData),
-      {
-        contentType: model
-      }
-    );
-    let entity = await db.query(uid).clone(cloneId, {
-      ...query,
-      data: entityData
+    await strapi2.documents(uid).delete({
+      ...wrappedParams,
+      documentId: entityToDelete.documentId
     });
-    if (files && Object.keys(files).length > 0) {
-      await this.uploadFiles(uid, Object.assign(entityData, entity), files);
-      entity = await this.findOne(uid, entity.id, wrappedParams);
-    }
-    const { ENTRY_CREATE } = ALLOWED_WEBHOOK_EVENTS;
-    await this.emitEvent(uid, ENTRY_CREATE, entity);
-    return entity;
+    return this.wrapResult(entityToDelete, { uid, action: "delete" });
   },
-  // FIXME: used only for the CM to be removed
-  async deleteMany(uid, opts) {
-    const wrappedParams = await this.wrapParams(opts, { uid, action: "delete" });
-    const query = transformParamsToQuery(uid, wrappedParams);
-    let entitiesToDelete = await db.query(uid).findMany(query);
-    if (!entitiesToDelete.length) {
-      return { count: 0 };
-    }
-    const componentsToDelete = await Promise.all(
-      entitiesToDelete.map((entityToDelete) => components.getComponents(uid, entityToDelete))
-    );
-    const deletedEntities = await db.query(uid).deleteMany(query);
-    await Promise.all(
-      componentsToDelete.map(
-        (compos) => components.deleteComponents(uid, compos, { loadComponents: false })
-      )
-    );
-    entitiesToDelete = await this.wrapResult(entitiesToDelete, { uid, action: "delete" });
-    const { ENTRY_DELETE } = ALLOWED_WEBHOOK_EVENTS;
-    await Promise.all(entitiesToDelete.map((entity) => this.emitEvent(uid, ENTRY_DELETE, entity)));
-    return deletedEntities;
-  },
-  async load(uid, entity, field, params2) {
+  async load(uid, entity, field, params) {
     if (!___default.default.isString(field)) {
       throw new Error(`Invalid load. Expected "${field}" to be a string`);
     }
-    const loadedEntity = await db.query(uid).load(entity, field, transformLoadParamsToQuery(uid, field, params2 ?? {}));
+    const loadedEntity = await db.query(uid).load(entity, field, transformLoadParamsToQuery(uid, field, params ?? {}));
     return this.wrapResult(loadedEntity, { uid, field, action: "load" });
   },
-  async loadPages(uid, entity, field, params2, pagination = {}) {
+  async loadPages(uid, entity, field, params, pagination = {}) {
     if (!___default.default.isString(field)) {
       throw new Error(`Invalid load. Expected "${field}" to be a string`);
     }
-    const { attributes } = strapi.getModel(uid);
+    const { attributes } = strapi2.getModel(uid);
     const attribute = attributes[field];
     if (!strapiUtils.relations.isAnyToMany(attribute)) {
       throw new Error(`Invalid load. Expected "${field}" to be an anyToMany relational attribute`);
     }
-    const query = transformLoadParamsToQuery(uid, field, params2 ?? {}, pagination);
+    const query = transformLoadParamsToQuery(uid, field, params ?? {}, pagination);
     const loadedPage = await db.query(uid).loadPages(entity, field, query);
     return {
       ...loadedPage,
@@ -285,9 +129,6 @@ const createDefaultImplementation = ({
   }
 });
 const createEntityService = (ctx) => {
-  Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
-    ctx.strapi.webhookStore?.addAllowedEvent(key, value);
-  });
   const implementation = createDefaultImplementation(ctx);
   const service = {
     implementation,