@strapi/core 0.0.0-next.c823b10e981295994d8b0733c78fa065aec064ee → 0.0.0-next.cb374d6b06692607bcfbd4d5131bafd4c990aa29

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

@@ -1,69 +1,128 @@
-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;
+import { omit, keyBy } from 'lodash/fp';
+
+/**
+ * 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.
+ */ const load = async (uid, { oldVersions, newVersions }, options = {})=>{
+    const updates = [];
+    // Iterate all components and content types to find relations that need to be updated
+    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)){
+                /**
+         * Only consider unidirectional relations
+         */ if (attribute.type !== 'relation' || attribute.target !== uid || attribute.inversedBy || attribute.mappedBy) {
+                    continue;
+                }
+                // TODO: joinColumn relations
+                const joinTable = attribute.joinTable;
+                if (!joinTable) {
+                    continue;
+                }
+                const { name: sourceColumnName } = joinTable.joinColumn;
+                const { name: targetColumnName } = joinTable.inverseJoinColumn;
+                /**
+         * Load all relations that need to be updated
+         */ // NOTE: when the model has draft and publish, we can assume relation are only draft to draft & published to published
+                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 publishing
+         *  if published version exists
+         *    updated published versions links
+         *  else
+         *    create link to newly published version
+         *
+         * if discarding
+         *    if published version link exists & not draft version link
+         *       create link to new draft version
+         */ if (!model.options?.draftAndPublish) {
+                    const ids = newVersions.map((entry)=>entry.id);
+                    // This is the step were we query the join table based on the id of the document
+                    const newVersionsRelations = await strapi.db.getConnection().select('*').from(joinTable.name).whereIn(targetColumnName, ids).transacting(trx);
+                    let versionRelations = newVersionsRelations;
+                    if (options.shouldPropagateRelation) {
+                        const relationsToPropagate = [];
+                        for (const relation of newVersionsRelations){
+                            if (await options.shouldPropagateRelation(relation, model, trx)) {
+                                relationsToPropagate.push(relation);
+                            }
+                        }
+                        versionRelations = relationsToPropagate;
+                    }
+                    if (versionRelations.length > 0) {
+                        // when publishing a draft that doesn't have a published version yet,
+                        // copy the links to the draft over to the published version
+                        // when discarding a published version, if no drafts exists
+                        const discardToAdd = versionRelations.filter((relation)=>{
+                            const matchingOldVersion = oldVersionsRelations.find((oldRelation)=>{
+                                return oldRelation[sourceColumnName] === relation[sourceColumnName];
+                            });
+                            return !matchingOldVersion;
+                        }).map(omit(strapi.db.metadata.identifiers.ID_COLUMN));
+                        updates.push({
+                            joinTable,
+                            relations: discardToAdd
+                        });
+                    }
+                }
+            }
         }
-        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;
+    });
+    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)
+/**
+ * Updates uni directional relations to target the right entries when overriding published or draft entries.
+ *
+ * This function:
+ * 1. Creates new relations pointing to the new entry versions
+ * 2. Precisely deletes only the old relations being replaced to prevent orphaned links
+ *
+ * @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
+ */ const sync = async (oldEntries, newEntries, oldRelations)=>{
+    /**
+   * Create a map of old entry ids to new entry ids
+   *
+   * Will be used to update the relation target ids
+   */ 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;
-      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
+    }, {});
+    await strapi.db.transaction(async ({ trx })=>{
+        // Iterate old relations that are deleted and insert the new ones
+        for (const { joinTable, relations } of oldRelations){
+            // Update old ids with the new ones
+            const column = joinTable.inverseJoinColumn.name;
+            const newRelations = relations.map((relation)=>{
+                const newId = oldEntriesMap[relation[column]];
+                return {
+                    ...relation,
+                    [column]: newId
+                };
+            });
+            // Insert those relations into the join table
+            await trx.batchInsert(joinTable.name, newRelations, 1000);
+        }
+    });
 };
+
+export { load, sync };
 //# sourceMappingURL=unidirectional-relations.mjs.map

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

@@ -1 +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;"}
+{"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 type { UID, Schema } from '@strapi/types';\n\nimport type { JoinTable } from '@strapi/database';\n\ninterface LoadContext {\n  oldVersions: { id: string; locale: string }[];\n  newVersions: { id: string; locale: string }[];\n}\n\ninterface RelationUpdate {\n  joinTable: JoinTable;\n  relations: Record<string, any>[];\n}\n\ninterface RelationFilterOptions {\n  /**\n   * Function to determine if a relation should be propagated to new document versions\n   * This replaces the hardcoded component-specific logic\n   */\n  shouldPropagateRelation?: (\n    relation: Record<string, any>,\n    model: Schema.Component | Schema.ContentType,\n    trx: any\n  ) => Promise<boolean>;\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 (\n  uid: UID.ContentType,\n  { oldVersions, newVersions }: LoadContext,\n  options: RelationFilterOptions = {}\n): Promise<RelationUpdate[]> => {\n  const updates: RelationUpdate[] = [];\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        if (!model.options?.draftAndPublish) {\n          const ids = newVersions.map((entry) => entry.id);\n\n          // This is the step were we query the join table based on the id of the document\n          const newVersionsRelations = await strapi.db\n            .getConnection()\n            .select('*')\n            .from(joinTable.name)\n            .whereIn(targetColumnName, ids)\n            .transacting(trx);\n\n          let versionRelations = newVersionsRelations;\n          if (options.shouldPropagateRelation) {\n            const relationsToPropagate = [];\n            for (const relation of newVersionsRelations) {\n              if (await options.shouldPropagateRelation(relation, model, trx)) {\n                relationsToPropagate.push(relation);\n              }\n            }\n            versionRelations = relationsToPropagate;\n          }\n\n          if (versionRelations.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 = versionRelations\n              .filter((relation) => {\n                const matchingOldVersion = oldVersionsRelations.find((oldRelation) => {\n                  return oldRelation[sourceColumnName] === relation[sourceColumnName];\n                });\n\n                return !matchingOldVersion;\n              })\n              .map(omit(strapi.db.metadata.identifiers.ID_COLUMN));\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 * This function:\n * 1. Creates new relations pointing to the new entry versions\n * 2. Precisely deletes only the old relations being replaced to prevent orphaned links\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 };\nexport type { RelationFilterOptions };\n"],"names":["load","uid","oldVersions","newVersions","options","updates","strapi","db","transaction","trx","contentTypes","Object","values","components","model","dbModel","metadata","get","attribute","attributes","type","target","inversedBy","mappedBy","joinTable","name","sourceColumnName","joinColumn","targetColumnName","inverseJoinColumn","ids","map","entry","id","oldVersionsRelations","getConnection","select","from","whereIn","transacting","length","push","relations","draftAndPublish","newVersionsRelations","versionRelations","shouldPropagateRelation","relationsToPropagate","relation","discardToAdd","filter","matchingOldVersion","find","oldRelation","omit","identifiers","ID_COLUMN","sync","oldEntries","newEntries","oldRelations","newEntryByLocale","keyBy","oldEntriesMap","reduce","acc","newEntry","locale","column","newRelations","newId","batchInsert"],"mappings":"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"}

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

@@ -1,169 +1,238 @@
-"use strict";
-const _ = require("lodash");
-const delegate = require("delegates");
-const database = require("@strapi/database");
-const strapiUtils = require("@strapi/utils");
-const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
-const ___default = /* @__PURE__ */ _interopDefault(_);
-const delegate__default = /* @__PURE__ */ _interopDefault(delegate);
-const transformLoadParamsToQuery = (uid, field, params, pagination = {}) => {
-  const query = strapi.get("query-params").transform(uid, { populate: { [field]: params } });
-  const res = {
-    ...query.populate[field],
-    ...pagination
-  };
-  return res;
+'use strict';
+
+var _ = require('lodash');
+var delegate = require('delegates');
+var database = require('@strapi/database');
+var strapiUtils = require('@strapi/utils');
+
+const transformLoadParamsToQuery = (uid, field, params, pagination = {})=>{
+    const query = strapi.get('query-params').transform(uid, {
+        populate: {
+            [field]: params
+        }
+    });
+    const res = {
+        ...query.populate[field],
+        ...pagination
+    };
+    return res;
 };
 const databaseErrorsToTransform = [
-  database.errors.InvalidTimeError,
-  database.errors.InvalidDateTimeError,
-  database.errors.InvalidDateError,
-  database.errors.InvalidRelationError
+    database.errors.InvalidTimeError,
+    database.errors.InvalidDateTimeError,
+    database.errors.InvalidDateError,
+    database.errors.InvalidRelationError
 ];
-const createDefaultImplementation = ({
-  strapi: strapi2,
-  db
-}) => ({
-  async wrapParams(options = {}) {
-    return options;
-  },
-  async wrapResult(result = {}) {
-    return result;
-  },
-  async findMany(uid, opts) {
-    const { kind } = strapi2.getModel(uid);
-    const wrappedParams = await this.wrapParams(opts, { uid, action: "findMany" });
-    if (kind === "singleType") {
-      const entity = strapi2.documents(uid).findFirst(wrappedParams);
-      return this.wrapResult(entity, { uid, action: "findOne" });
-    }
-    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 = strapi2.get("query-params").transform(uid, wrappedParams);
-    const entities = await db.query(uid).findPage(query);
-    return this.wrapResult(entities, { uid, action: "findMany" });
-  },
-  async findOne(uid, entityId, opts) {
-    const wrappedParams = await this.wrapParams(opts, { uid, action: "findOne" });
-    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" });
-    return strapi2.documents(uid).count(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 shouldPublish = !strapiUtils.contentTypes.isDraft(data, strapi2.getModel(uid));
-    const entity = await strapi2.documents(uid).create({
-      ...wrappedParams,
-      status: shouldPublish ? "published" : "draft"
-    });
-    return this.wrapResult(entity, { uid, action: "create" });
-  },
-  async update(uid, entityId, opts) {
-    const wrappedParams = await this.wrapParams(opts, {
-      uid,
-      action: "update"
-    });
-    const entityToUpdate = await db.query(uid).findOne({ where: { id: entityId } });
-    if (!entityToUpdate) {
-      return this.wrapResult(null, { uid, action: "update" });
-    }
-    const shouldPublish = !strapiUtils.contentTypes.isDraft(entityToUpdate, strapi2.getModel(uid));
-    const entity = strapi2.documents(uid).update({
-      ...wrappedParams,
-      status: shouldPublish ? "published" : "draft",
-      documentId: entityToUpdate.documentId
-    });
-    return this.wrapResult(entity, { uid, action: "update" });
-  },
-  async delete(uid, entityId, opts) {
-    const wrappedParams = await this.wrapParams(opts, { uid, action: "delete" });
-    const entityToDelete = await db.query(uid).findOne({ where: { id: entityId } });
-    if (!entityToDelete) {
-      return this.wrapResult(null, { uid, action: "delete" });
-    }
-    await strapi2.documents(uid).delete({
-      ...wrappedParams,
-      documentId: entityToDelete.documentId
+const createDefaultImplementation = ({ strapi: strapi1, db })=>({
+        async wrapParams (options = {}) {
+            return options;
+        },
+        async wrapResult (result = {}) {
+            return result;
+        },
+        async findMany (uid, opts) {
+            const { kind } = strapi1.getModel(uid);
+            const wrappedParams = await this.wrapParams(opts, {
+                uid,
+                action: 'findMany'
+            });
+            if (kind === 'singleType') {
+                const entity = strapi1.documents(uid).findFirst(wrappedParams);
+                return this.wrapResult(entity, {
+                    uid,
+                    action: 'findOne'
+                });
+            }
+            const entities = await strapi1.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 = strapi1.get('query-params').transform(uid, wrappedParams);
+            const entities = await db.query(uid).findPage(query);
+            return this.wrapResult(entities, {
+                uid,
+                action: 'findMany'
+            });
+        },
+        async findOne (uid, entityId, opts) {
+            const wrappedParams = await this.wrapParams(opts, {
+                uid,
+                action: 'findOne'
+            });
+            const res = await db.query(uid).findOne({
+                where: {
+                    id: entityId
+                }
+            });
+            if (!res) {
+                return this.wrapResult(null, {
+                    uid,
+                    action: 'findOne'
+                });
+            }
+            const entity = await strapi1.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'
+            });
+            return strapi1.documents(uid).count(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 shouldPublish = !strapiUtils.contentTypes.isDraft(data, strapi1.getModel(uid));
+            const entity = await strapi1.documents(uid).create({
+                ...wrappedParams,
+                status: shouldPublish ? 'published' : 'draft'
+            });
+            return this.wrapResult(entity, {
+                uid,
+                action: 'create'
+            });
+        },
+        async update (uid, entityId, opts) {
+            const wrappedParams = await this.wrapParams(opts, {
+                uid,
+                action: 'update'
+            });
+            const entityToUpdate = await db.query(uid).findOne({
+                where: {
+                    id: entityId
+                }
+            });
+            if (!entityToUpdate) {
+                return this.wrapResult(null, {
+                    uid,
+                    action: 'update'
+                });
+            }
+            const shouldPublish = !strapiUtils.contentTypes.isDraft(entityToUpdate, strapi1.getModel(uid));
+            const entity = strapi1.documents(uid).update({
+                ...wrappedParams,
+                status: shouldPublish ? 'published' : 'draft',
+                documentId: entityToUpdate.documentId
+            });
+            return this.wrapResult(entity, {
+                uid,
+                action: 'update'
+            });
+        },
+        async delete (uid, entityId, opts) {
+            const wrappedParams = await this.wrapParams(opts, {
+                uid,
+                action: 'delete'
+            });
+            const entityToDelete = await db.query(uid).findOne({
+                where: {
+                    id: entityId
+                }
+            });
+            if (!entityToDelete) {
+                return this.wrapResult(null, {
+                    uid,
+                    action: 'delete'
+                });
+            }
+            await strapi1.documents(uid).delete({
+                ...wrappedParams,
+                documentId: entityToDelete.documentId
+            });
+            return this.wrapResult(entityToDelete, {
+                uid,
+                action: 'delete'
+            });
+        },
+        async load (uid, entity, field, params) {
+            if (!_.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, params ?? {}));
+            return this.wrapResult(loadedEntity, {
+                uid,
+                field,
+                action: 'load'
+            });
+        },
+        async loadPages (uid, entity, field, params, pagination = {}) {
+            if (!_.isString(field)) {
+                throw new Error(`Invalid load. Expected "${field}" to be a string`);
+            }
+            const { attributes } = strapi1.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, params ?? {}, pagination);
+            const loadedPage = await db.query(uid).loadPages(entity, field, query);
+            return {
+                ...loadedPage,
+                results: await this.wrapResult(loadedPage.results, {
+                    uid,
+                    field,
+                    action: 'load'
+                })
+            };
+        }
     });
-    return this.wrapResult(entityToDelete, { uid, action: "delete" });
-  },
-  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, params ?? {}));
-    return this.wrapResult(loadedEntity, { uid, field, action: "load" });
-  },
-  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 } = 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, params ?? {}, pagination);
-    const loadedPage = await db.query(uid).loadPages(entity, field, query);
-    return {
-      ...loadedPage,
-      results: await this.wrapResult(loadedPage.results, { uid, field, action: "load" })
-    };
-  }
-});
-const createEntityService = (ctx) => {
-  const implementation = createDefaultImplementation(ctx);
-  const service = {
-    implementation,
-    decorate(decorator) {
-      if (typeof decorator !== "function") {
-        throw new Error(`Decorator must be a function, received ${typeof decorator}`);
-      }
-      this.implementation = { ...this.implementation, ...decorator(this.implementation) };
-      return this;
-    }
-  };
-  const delegator = delegate__default.default(service, "implementation");
-  Object.keys(service.implementation).forEach((key) => delegator.method(key));
-  service.decorate((oldService) => {
-    const newService = ___default.default.mapValues(
-      oldService,
-      (method, methodName) => async function(...args) {
-        try {
-          return await oldService[methodName].call(this, ...args);
-        } catch (error) {
-          if (databaseErrorsToTransform.some(
-            (errorToTransform) => error instanceof errorToTransform
-          )) {
-            if (error instanceof Error) {
-              throw new strapiUtils.errors.ValidationError(error.message);
+var createEntityService = ((ctx)=>{
+    const implementation = createDefaultImplementation(ctx);
+    const service = {
+        implementation,
+        decorate (decorator) {
+            if (typeof decorator !== 'function') {
+                throw new Error(`Decorator must be a function, received ${typeof decorator}`);
             }
-            throw error;
-          }
-          throw error;
+            this.implementation = {
+                ...this.implementation,
+                ...decorator(this.implementation)
+            };
+            return this;
         }
-      }
-    );
-    return newService;
-  });
-  return service;
-};
+    };
+    const delegator = delegate(service, 'implementation');
+    // delegate every method in implementation
+    Object.keys(service.implementation).forEach((key)=>delegator.method(key));
+    // wrap methods to handle Database Errors
+    service.decorate((oldService)=>{
+        const newService = _.mapValues(oldService, (method, methodName)=>async function(...args) {
+                try {
+                    return await oldService[methodName].call(this, ...args);
+                } catch (error) {
+                    if (databaseErrorsToTransform.some((errorToTransform)=>error instanceof errorToTransform)) {
+                        if (error instanceof Error) {
+                            throw new strapiUtils.errors.ValidationError(error.message);
+                        }
+                        throw error;
+                    }
+                    throw error;
+                }
+            });
+        return newService;
+    });
+    return service;
+});
+
 module.exports = createEntityService;
 //# sourceMappingURL=index.js.map