@strapi/core 0.0.0-experimental.18019758d6ccd252f2f00bcc32c191402af2e60a → 0.0.0-experimental.1bca8e0e074de8b0775bcddc7656fbc9e9f1393b

package/dist/services/document-service/transform/relations/transform/data-ids.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"data-ids.mjs","sources":["../../../../../../src/services/document-service/transform/relations/transform/data-ids.ts"],"sourcesContent":["import { curry } from 'lodash/fp';\n\nimport type { UID } from '@strapi/types';\nimport { errors } from '@strapi/utils';\n\nimport { ID, LongHandDocument } from '../utils/types';\nimport { IdMap } from '../../id-map';\nimport { getRelationTargetLocale } from '../utils/i18n';\nimport { getRelationTargetStatus } from '../utils/dp';\nimport { mapRelation, traverseEntityRelations } from '../utils/map-relation';\n\ninterface Options {\n  uid: UID.Schema;\n  locale?: string | null;\n  status?: 'draft' | 'published';\n  allowMissingId?: boolean; // Whether to ignore missing ids and not throw any error\n}\n\n/**\n * Get the entry ids for a given documentId.\n */\nconst getRelationIds = curry(\n  (idMap: IdMap, targetUid: UID.Schema, source: Options, relation: LongHandDocument) => {\n    // locale to connect to\n    const targetLocale = getRelationTargetLocale(relation, {\n      targetUid,\n      sourceUid: source.uid,\n      sourceLocale: source.locale,\n    });\n\n    // status(es) to connect to\n    const targetStatus = getRelationTargetStatus(relation, {\n      targetUid,\n      sourceUid: source.uid,\n      sourceStatus: source.status,\n    });\n\n    const ids: ID[] = [];\n\n    // Find mapping between documentID -> id(s).\n    // There are scenarios where a single documentID can map to multiple ids.\n    // e.g when connecting Non DP -> DP and connecting to both the draft and publish version at the same time\n    for (const tStatus of targetStatus) {\n      const entryId = idMap.get({\n        uid: targetUid,\n        documentId: relation.documentId,\n        locale: targetLocale,\n        status: tStatus,\n      });\n\n      if (entryId) ids.push(entryId);\n    }\n\n    if (!ids.length && !source.allowMissingId) {\n      throw new errors.ValidationError(\n        `Document with id \"${relation.documentId}\", locale \"${targetLocale}\" not found`\n      );\n    }\n\n    return ids;\n  }\n);\n\n/**\n * Iterate over all relations of a data object and transform all relational document ids to entity ids.\n */\nconst transformDataIdsVisitor = (idMap: IdMap, data: Record<string, any>, source: Options) => {\n  return traverseEntityRelations(\n    async ({ key, value, attribute }, { set }) => {\n      // Find relational attributes, and return the document ids\n      const targetUid = attribute.target!;\n      const getIds = getRelationIds(idMap, targetUid, source);\n\n      // Transform the relation documentId to entity id\n      const newRelation = await mapRelation((relation) => {\n        if (!relation || !relation.documentId) {\n          return relation;\n        }\n\n        const ids = getIds(relation);\n\n        // Handle positional arguments\n        const position = { ...relation.position };\n\n        if (position.before) {\n          const beforeRelation = { ...relation, ...position, documentId: position.before };\n          position.before = getIds(beforeRelation).at(0);\n        }\n\n        if (position.after) {\n          const afterRelation = { ...relation, ...position, documentId: position.after };\n          position.after = getIds(afterRelation).at(0);\n        }\n\n        // Transform all ids to new relations\n        return ids?.map((id) => {\n          const newRelation = { id } as typeof relation;\n          if (relation.position) {\n            newRelation.position = position;\n          }\n\n          return newRelation;\n        });\n      }, value as any);\n\n      set(key, newRelation as any);\n    },\n    { schema: strapi.getModel(source.uid), getModel: strapi.getModel.bind(strapi) },\n    data\n  );\n};\n\nexport { transformDataIdsVisitor };\n"],"names":["traverseEntityRelations","mapRelation","newRelation"],"mappings":";;;;;AAqBA,MAAM,iBAAiB;AAAA,EACrB,CAAC,OAAc,WAAuB,QAAiB,aAA+B;AAE9E,UAAA,eAAe,wBAAwB,UAAU;AAAA,MACrD;AAAA,MACA,WAAW,OAAO;AAAA,MAClB,cAAc,OAAO;AAAA,IAAA,CACtB;AAGK,UAAA,eAAe,wBAAwB,UAAU;AAAA,MACrD;AAAA,MACA,WAAW,OAAO;AAAA,MAClB,cAAc,OAAO;AAAA,IAAA,CACtB;AAED,UAAM,MAAY,CAAA;AAKlB,eAAW,WAAW,cAAc;AAC5B,YAAA,UAAU,MAAM,IAAI;AAAA,QACxB,KAAK;AAAA,QACL,YAAY,SAAS;AAAA,QACrB,QAAQ;AAAA,QACR,QAAQ;AAAA,MAAA,CACT;AAEG,UAAA;AAAS,YAAI,KAAK,OAAO;AAAA,IAC/B;AAEA,QAAI,CAAC,IAAI,UAAU,CAAC,OAAO,gBAAgB;AACzC,YAAM,IAAI,OAAO;AAAA,QACf,qBAAqB,SAAS,UAAU,cAAc,YAAY;AAAA,MAAA;AAAA,IAEtE;AAEO,WAAA;AAAA,EACT;AACF;AAKA,MAAM,0BAA0B,CAAC,OAAc,MAA2B,WAAoB;AACrF,SAAAA;AAAAA,IACL,OAAO,EAAE,KAAK,OAAO,aAAa,EAAE,UAAU;AAE5C,YAAM,YAAY,UAAU;AAC5B,YAAM,SAAS,eAAe,OAAO,WAAW,MAAM;AAGtD,YAAM,cAAc,MAAMC,mBAAY,CAAC,aAAa;AAClD,YAAI,CAAC,YAAY,CAAC,SAAS,YAAY;AAC9B,iBAAA;AAAA,QACT;AAEM,cAAA,MAAM,OAAO,QAAQ;AAG3B,cAAM,WAAW,EAAE,GAAG,SAAS,SAAS;AAExC,YAAI,SAAS,QAAQ;AACb,gBAAA,iBAAiB,EAAE,GAAG,UAAU,GAAG,UAAU,YAAY,SAAS;AACxE,mBAAS,SAAS,OAAO,cAAc,EAAE,GAAG,CAAC;AAAA,QAC/C;AAEA,YAAI,SAAS,OAAO;AACZ,gBAAA,gBAAgB,EAAE,GAAG,UAAU,GAAG,UAAU,YAAY,SAAS;AACvE,mBAAS,QAAQ,OAAO,aAAa,EAAE,GAAG,CAAC;AAAA,QAC7C;AAGO,eAAA,KAAK,IAAI,CAAC,OAAO;AAChBC,gBAAAA,eAAc,EAAE;AACtB,cAAI,SAAS,UAAU;AACrBA,yBAAY,WAAW;AAAA,UACzB;AAEOA,iBAAAA;AAAAA,QAAA,CACR;AAAA,SACA,KAAY;AAEf,UAAI,KAAK,WAAkB;AAAA,IAC7B;AAAA,IACA,EAAE,QAAQ,OAAO,SAAS,OAAO,GAAG,GAAG,UAAU,OAAO,SAAS,KAAK,MAAM,EAAE;AAAA,IAC9E;AAAA,EAAA;AAEJ;"}
+{"version":3,"file":"data-ids.mjs","sources":["../../../../../../src/services/document-service/transform/relations/transform/data-ids.ts"],"sourcesContent":["import { curry } from 'lodash/fp';\n\nimport type { UID } from '@strapi/types';\nimport { errors } from '@strapi/utils';\n\nimport { ID, LongHandDocument } from '../utils/types';\nimport { IdMap } from '../../id-map';\nimport { getRelationTargetLocale } from '../utils/i18n';\nimport { getRelationTargetStatus } from '../utils/dp';\nimport { mapRelation, traverseEntityRelations } from '../utils/map-relation';\n\ninterface Options {\n  uid: UID.Schema;\n  locale?: string | null;\n  status?: 'draft' | 'published';\n  allowMissingId?: boolean; // Whether to ignore missing ids and not throw any error\n}\n\n/**\n * Get the entry ids for a given documentId.\n */\nconst getRelationIds = curry(\n  (idMap: IdMap, targetUid: UID.Schema, source: Options, relation: LongHandDocument) => {\n    // locale to connect to\n    const targetLocale = getRelationTargetLocale(relation, {\n      targetUid,\n      sourceUid: source.uid,\n      sourceLocale: source.locale,\n    });\n\n    // status(es) to connect to\n    const targetStatus = getRelationTargetStatus(relation, {\n      targetUid,\n      sourceUid: source.uid,\n      sourceStatus: source.status,\n    });\n\n    const ids: ID[] = [];\n\n    // Find mapping between documentID -> id(s).\n    // There are scenarios where a single documentID can map to multiple ids.\n    // e.g when connecting Non DP -> DP and connecting to both the draft and publish version at the same time\n    for (const tStatus of targetStatus) {\n      const entryId = idMap.get({\n        uid: targetUid,\n        documentId: relation.documentId,\n        locale: targetLocale,\n        status: tStatus,\n      });\n\n      if (entryId) ids.push(entryId);\n    }\n\n    if (!ids.length && !source.allowMissingId) {\n      throw new errors.ValidationError(\n        `Document with id \"${relation.documentId}\", locale \"${targetLocale}\" not found`\n      );\n    }\n\n    return ids;\n  }\n);\n\n/**\n * Iterate over all relations of a data object and transform all relational document ids to entity ids.\n */\nconst transformDataIdsVisitor = (idMap: IdMap, data: Record<string, any>, source: Options) => {\n  return traverseEntityRelations(\n    async ({ key, value, attribute }, { set }) => {\n      if (!attribute) {\n        return;\n      }\n\n      // Find relational attributes, and return the document ids\n      const targetUid = attribute.target!;\n      const getIds = getRelationIds(idMap, targetUid, source);\n\n      // Transform the relation documentId to entity id\n      const newRelation = await mapRelation((relation) => {\n        if (!relation || !relation.documentId) {\n          return relation;\n        }\n\n        const ids = getIds(relation);\n\n        // Handle positional arguments\n        const position = { ...relation.position };\n\n        if (position.before) {\n          const beforeRelation = { ...relation, ...position, documentId: position.before };\n          position.before = getIds(beforeRelation).at(0);\n        }\n\n        if (position.after) {\n          const afterRelation = { ...relation, ...position, documentId: position.after };\n          position.after = getIds(afterRelation).at(0);\n        }\n\n        // Transform all ids to new relations\n        return ids?.map((id) => {\n          const newRelation = { id } as typeof relation;\n          if (relation.position) {\n            newRelation.position = position;\n          }\n\n          return newRelation;\n        });\n      }, value as any);\n\n      set(key, newRelation as any);\n    },\n    { schema: strapi.getModel(source.uid), getModel: strapi.getModel.bind(strapi) },\n    data\n  );\n};\n\nexport { transformDataIdsVisitor };\n"],"names":["traverseEntityRelations","mapRelation","newRelation"],"mappings":";;;;;AAqBA,MAAM,iBAAiB;AAAA,EACrB,CAAC,OAAc,WAAuB,QAAiB,aAA+B;AAE9E,UAAA,eAAe,wBAAwB,UAAU;AAAA,MACrD;AAAA,MACA,WAAW,OAAO;AAAA,MAClB,cAAc,OAAO;AAAA,IAAA,CACtB;AAGK,UAAA,eAAe,wBAAwB,UAAU;AAAA,MACrD;AAAA,MACA,WAAW,OAAO;AAAA,MAClB,cAAc,OAAO;AAAA,IAAA,CACtB;AAED,UAAM,MAAY,CAAA;AAKlB,eAAW,WAAW,cAAc;AAC5B,YAAA,UAAU,MAAM,IAAI;AAAA,QACxB,KAAK;AAAA,QACL,YAAY,SAAS;AAAA,QACrB,QAAQ;AAAA,QACR,QAAQ;AAAA,MAAA,CACT;AAEG,UAAA;AAAS,YAAI,KAAK,OAAO;AAAA,IAC/B;AAEA,QAAI,CAAC,IAAI,UAAU,CAAC,OAAO,gBAAgB;AACzC,YAAM,IAAI,OAAO;AAAA,QACf,qBAAqB,SAAS,UAAU,cAAc,YAAY;AAAA,MAAA;AAAA,IAEtE;AAEO,WAAA;AAAA,EACT;AACF;AAKA,MAAM,0BAA0B,CAAC,OAAc,MAA2B,WAAoB;AACrF,SAAAA;AAAAA,IACL,OAAO,EAAE,KAAK,OAAO,aAAa,EAAE,UAAU;AAC5C,UAAI,CAAC,WAAW;AACd;AAAA,MACF;AAGA,YAAM,YAAY,UAAU;AAC5B,YAAM,SAAS,eAAe,OAAO,WAAW,MAAM;AAGtD,YAAM,cAAc,MAAMC,mBAAY,CAAC,aAAa;AAClD,YAAI,CAAC,YAAY,CAAC,SAAS,YAAY;AAC9B,iBAAA;AAAA,QACT;AAEM,cAAA,MAAM,OAAO,QAAQ;AAG3B,cAAM,WAAW,EAAE,GAAG,SAAS,SAAS;AAExC,YAAI,SAAS,QAAQ;AACb,gBAAA,iBAAiB,EAAE,GAAG,UAAU,GAAG,UAAU,YAAY,SAAS;AACxE,mBAAS,SAAS,OAAO,cAAc,EAAE,GAAG,CAAC;AAAA,QAC/C;AAEA,YAAI,SAAS,OAAO;AACZ,gBAAA,gBAAgB,EAAE,GAAG,UAAU,GAAG,UAAU,YAAY,SAAS;AACvE,mBAAS,QAAQ,OAAO,aAAa,EAAE,GAAG,CAAC;AAAA,QAC7C;AAGO,eAAA,KAAK,IAAI,CAAC,OAAO;AAChBC,gBAAAA,eAAc,EAAE;AACtB,cAAI,SAAS,UAAU;AACrBA,yBAAY,WAAW;AAAA,UACzB;AAEOA,iBAAAA;AAAAA,QAAA,CACR;AAAA,SACA,KAAY;AAEf,UAAI,KAAK,WAAkB;AAAA,IAC7B;AAAA,IACA,EAAE,QAAQ,OAAO,SAAS,OAAO,GAAG,GAAG,UAAU,OAAO,SAAS,KAAK,MAAM,EAAE;AAAA,IAC9E;AAAA,EAAA;AAEJ;"}

package/dist/services/document-service/transform/relations/utils/dp.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const _ = require("lodash/fp");
+const fp = require("lodash/fp");
 const strapiUtils = require("@strapi/utils");
 const getRelationTargetStatus = (relation, opts) => {
   const targetContentType = strapi.getModel(opts.targetUid);
@@ -10,7 +10,7 @@ const getRelationTargetStatus = (relation, opts) => {
   if (!targetHasDP) {
     return ["published"];
   }
-  if (sourceHasDP && !_.isNil(opts.sourceStatus)) {
+  if (sourceHasDP && !fp.isNil(opts.sourceStatus)) {
     return [opts.sourceStatus];
   }
   if (relation.status) {

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

@@ -1 +1 @@
-{"version":3,"file":"dp.js","sources":["../../../../../../src/services/document-service/transform/relations/utils/dp.ts"],"sourcesContent":["import { isNil } from 'lodash/fp';\n\nimport { contentTypes } from '@strapi/utils';\nimport { UID } from '@strapi/types';\n\nimport { LongHandDocument } from './types';\n\ntype Status = 'draft' | 'published';\n\nexport const getRelationTargetStatus = (\n  relation: Pick<LongHandDocument, 'documentId' | 'status'>,\n  opts: {\n    targetUid: UID.Schema;\n    sourceUid: UID.Schema;\n    sourceStatus?: Status;\n  }\n): Status[] => {\n  // Ignore if the target content type does not have draft and publish enabled\n  const targetContentType = strapi.getModel(opts.targetUid);\n  const sourceContentType = strapi.getModel(opts.sourceUid);\n\n  const targetHasDP = contentTypes.hasDraftAndPublish(targetContentType);\n  const sourceHasDP = contentTypes.hasDraftAndPublish(sourceContentType);\n\n  if (!targetHasDP) {\n    return ['published'];\n  }\n\n  /**\n   * If both source and target have DP enabled,\n   * connect it to the same status as the source status\n   */\n  if (sourceHasDP && !isNil(opts.sourceStatus)) {\n    return [opts.sourceStatus];\n  }\n\n  /**\n   * Use the status from the relation if it's set\n   */\n  if (relation.status) {\n    switch (relation.status) {\n      case 'published':\n        return ['published'];\n      default:\n        // Default to draft if it's an invalid status (e.g. modified)\n        return ['draft'];\n    }\n  }\n\n  /**\n   * If DP is disabled and relation does not specify any status\n   * Connect to both draft and published versions\n   */\n  if (!sourceHasDP) {\n    return ['draft', 'published'];\n  }\n\n  // Default to draft as a fallback\n  return ['draft'];\n};\n"],"names":["contentTypes","isNil"],"mappings":";;;;AASa,MAAA,0BAA0B,CACrC,UACA,SAKa;AAEb,QAAM,oBAAoB,OAAO,SAAS,KAAK,SAAS;AACxD,QAAM,oBAAoB,OAAO,SAAS,KAAK,SAAS;AAElD,QAAA,cAAcA,YAAAA,aAAa,mBAAmB,iBAAiB;AAC/D,QAAA,cAAcA,YAAAA,aAAa,mBAAmB,iBAAiB;AAErE,MAAI,CAAC,aAAa;AAChB,WAAO,CAAC,WAAW;AAAA,EACrB;AAMA,MAAI,eAAe,CAACC,EAAAA,MAAM,KAAK,YAAY,GAAG;AACrC,WAAA,CAAC,KAAK,YAAY;AAAA,EAC3B;AAKA,MAAI,SAAS,QAAQ;AACnB,YAAQ,SAAS,QAAQ;AAAA,MACvB,KAAK;AACH,eAAO,CAAC,WAAW;AAAA,MACrB;AAEE,eAAO,CAAC,OAAO;AAAA,IACnB;AAAA,EACF;AAMA,MAAI,CAAC,aAAa;AACT,WAAA,CAAC,SAAS,WAAW;AAAA,EAC9B;AAGA,SAAO,CAAC,OAAO;AACjB;;"}
+{"version":3,"file":"dp.js","sources":["../../../../../../src/services/document-service/transform/relations/utils/dp.ts"],"sourcesContent":["import { isNil } from 'lodash/fp';\n\nimport { contentTypes } from '@strapi/utils';\nimport { UID } from '@strapi/types';\n\nimport { LongHandDocument } from './types';\n\ntype Status = 'draft' | 'published';\n\nexport const getRelationTargetStatus = (\n  relation: Pick<LongHandDocument, 'documentId' | 'status'>,\n  opts: {\n    targetUid: UID.Schema;\n    sourceUid: UID.Schema;\n    sourceStatus?: Status;\n  }\n): Status[] => {\n  // Ignore if the target content type does not have draft and publish enabled\n  const targetContentType = strapi.getModel(opts.targetUid);\n  const sourceContentType = strapi.getModel(opts.sourceUid);\n\n  const targetHasDP = contentTypes.hasDraftAndPublish(targetContentType);\n  const sourceHasDP = contentTypes.hasDraftAndPublish(sourceContentType);\n\n  if (!targetHasDP) {\n    return ['published'];\n  }\n\n  /**\n   * If both source and target have DP enabled,\n   * connect it to the same status as the source status\n   */\n  if (sourceHasDP && !isNil(opts.sourceStatus)) {\n    return [opts.sourceStatus];\n  }\n\n  /**\n   * Use the status from the relation if it's set\n   */\n  if (relation.status) {\n    switch (relation.status) {\n      case 'published':\n        return ['published'];\n      default:\n        // Default to draft if it's an invalid status (e.g. modified)\n        return ['draft'];\n    }\n  }\n\n  /**\n   * If DP is disabled and relation does not specify any status\n   * Connect to both draft and published versions\n   */\n  if (!sourceHasDP) {\n    return ['draft', 'published'];\n  }\n\n  // Default to draft as a fallback\n  return ['draft'];\n};\n"],"names":["contentTypes","isNil"],"mappings":";;;;AASa,MAAA,0BAA0B,CACrC,UACA,SAKa;AAEb,QAAM,oBAAoB,OAAO,SAAS,KAAK,SAAS;AACxD,QAAM,oBAAoB,OAAO,SAAS,KAAK,SAAS;AAElD,QAAA,cAAcA,YAAAA,aAAa,mBAAmB,iBAAiB;AAC/D,QAAA,cAAcA,YAAAA,aAAa,mBAAmB,iBAAiB;AAErE,MAAI,CAAC,aAAa;AAChB,WAAO,CAAC,WAAW;AAAA,EACrB;AAMA,MAAI,eAAe,CAACC,GAAAA,MAAM,KAAK,YAAY,GAAG;AACrC,WAAA,CAAC,KAAK,YAAY;AAAA,EAC3B;AAKA,MAAI,SAAS,QAAQ;AACnB,YAAQ,SAAS,QAAQ;AAAA,MACvB,KAAK;AACH,eAAO,CAAC,WAAW;AAAA,MACrB;AAEE,eAAO,CAAC,OAAO;AAAA,IACnB;AAAA,EACF;AAMA,MAAI,CAAC,aAAa;AACT,WAAA,CAAC,SAAS,WAAW;AAAA,EAC9B;AAGA,SAAO,CAAC,OAAO;AACjB;;"}

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

@@ -1 +1 @@
-{"version":3,"file":"map-relation.d.ts","sourceRoot":"","sources":["../../../../../../src/services/document-service/transform/relations/utils/map-relation.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAgJnC,QAAA,MAAM,kBAAkB,+CA/GD,GAAG,KAAK,GAAG,8BA+GW,CAAC;AAC9C,QAAA,MAAM,8BAA8B,kPAAiC,CAAC;AAEtE,OAAO,EACL,kBAAkB,IAAI,WAAW,EACjC,8BAA8B,IAAI,uBAAuB,GAC1D,CAAC"}
+{"version":3,"file":"map-relation.d.ts","sourceRoot":"","sources":["../../../../../../src/services/document-service/transform/relations/utils/map-relation.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAsJnC,QAAA,MAAM,kBAAkB,+CArHD,GAAG,KAAK,GAAG,8BAqHW,CAAC;AAC9C,QAAA,MAAM,8BAA8B,kPAAiC,CAAC;AAEtE,OAAO,EACL,kBAAkB,IAAI,WAAW,EACjC,8BAA8B,IAAI,uBAAuB,GAC1D,CAAC"}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const _ = require("lodash/fp");
+const fp = require("lodash/fp");
 const strapiUtils = require("@strapi/utils");
 const isNumeric = (value) => {
   if (Array.isArray(value))
@@ -9,7 +9,7 @@ const isNumeric = (value) => {
   return !Number.isNaN(parsed);
 };
 const toArray = (value) => {
-  if (_.isNil(value))
+  if (fp.isNil(value))
     return value;
   if (Array.isArray(value))
     return value;
@@ -23,13 +23,13 @@ const mapRelation = async (callback, rel, isRecursive = false) => {
     }
     return { set: toArray(value) };
   };
-  if (_.isNil(relation)) {
+  if (fp.isNil(relation)) {
     return callback(relation);
   }
   if (Array.isArray(relation)) {
     return strapiUtils.async.map(relation, (r) => mapRelation(callback, r, true)).then((result) => result.flat().filter(Boolean)).then(wrapInSet);
   }
-  if (_.isObject(relation)) {
+  if (fp.isObject(relation)) {
     if ("id" in relation || "documentId" in relation) {
       const result = await callback(relation);
       return wrapInSet(result);
@@ -64,13 +64,17 @@ const mapRelation = async (callback, rel, isRecursive = false) => {
 const traverseEntityRelations = async (visitor, options, data) => {
   return strapiUtils.traverseEntity(
     async (options2, utils) => {
-      if (options2.attribute.type !== "relation") {
+      const { attribute } = options2;
+      if (!attribute) {
         return;
       }
-      if (options2.attribute.useJoinTable === false) {
+      if (attribute.type !== "relation") {
         return;
       }
-      const target = options2.attribute.target;
+      if (attribute.useJoinTable === false) {
+        return;
+      }
+      const target = attribute.target;
       if (!target) {
         return;
       }
@@ -80,8 +84,8 @@ const traverseEntityRelations = async (visitor, options, data) => {
     data
   );
 };
-const mapRelationCurried = _.curry(mapRelation);
-const traverseEntityRelationsCurried = _.curry(traverseEntityRelations);
+const mapRelationCurried = fp.curry(mapRelation);
+const traverseEntityRelationsCurried = fp.curry(traverseEntityRelations);
 exports.mapRelation = mapRelationCurried;
 exports.traverseEntityRelations = traverseEntityRelationsCurried;
 //# sourceMappingURL=map-relation.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"map-relation.js","sources":["../../../../../../src/services/document-service/transform/relations/utils/map-relation.ts"],"sourcesContent":["/* eslint-disable node/no-callback-literal */\nimport { isObject, curry, isNil } from 'lodash/fp';\n\nimport type { UID } from '@strapi/types';\nimport { traverseEntity, async } from '@strapi/utils';\n\nimport { Relation } from './types';\n\nconst isNumeric = (value: any): value is number => {\n  if (Array.isArray(value)) return false; // Handle [1, 'docId'] case\n  const parsed = parseInt(value, 10);\n  return !Number.isNaN(parsed);\n};\n\nconst toArray = (value: any) => {\n  // Keep value as it is if it's a nullish value\n  if (isNil(value)) return value;\n  if (Array.isArray(value)) return value;\n\n  return [value];\n};\n\n/**\n * There are multiple ways to create Strapi relations.\n * This is a utility to traverse and transform relation data\n *\n *\n * For consistency and ease of use, the response will always be an object with the following shape:\n * { set: [{...}], connect: [{...}], disconnect: [{...}] }\n *\n * @example\n * transformRelationData({\n *  onLongHand: (relation) => {\n *    // Change the id of the relation\n *    return { id: 'other' };\n *  },\n * }, relation)\n */\nconst mapRelation = async (\n  callback: (relation: any) => any,\n  rel: Relation,\n  isRecursive = false\n): Promise<Relation> => {\n  let relation: Relation = rel;\n\n  const wrapInSet = (value: any) => {\n    // Ignore wrapping if it's a recursive call\n    if (isRecursive) {\n      return value;\n    }\n    return { set: toArray(value) };\n  };\n\n  // undefined | null\n  if (isNil(relation)) {\n    return callback(relation);\n  }\n\n  // LongHand[] | ShortHand[]\n  if (Array.isArray(relation)) {\n    return async\n      .map(relation, (r: Relation) => mapRelation(callback, r, true))\n      .then((result: any) => result.flat().filter(Boolean))\n      .then(wrapInSet);\n  }\n\n  // LongHand\n  if (isObject(relation)) {\n    // { id: 1 } || { documentId: 1 }\n    if ('id' in relation || 'documentId' in relation) {\n      const result = await callback(relation);\n      return wrapInSet(result);\n    }\n\n    // If not connecting anything, return default visitor\n    if (!relation.set && !relation.disconnect && !relation.connect) {\n      return callback(relation);\n    }\n\n    // { set }\n    if (relation.set) {\n      const set: any = await mapRelation(callback, relation.set, true);\n      relation = { ...relation, set: toArray(set) };\n    }\n\n    // { disconnect}\n    if (relation.disconnect) {\n      const disconnect: any = await mapRelation(callback, relation.disconnect, true);\n      relation = { ...relation, disconnect: toArray(disconnect) };\n    }\n\n    // { connect }\n    if (relation.connect) {\n      // Transform the relation to connect\n      const connect: any = await mapRelation(callback, relation.connect, true);\n      relation = { ...relation, connect: toArray(connect) };\n    }\n\n    return relation;\n  }\n\n  // ShortHand\n  if (isNumeric(relation)) {\n    const result = await callback({ id: relation });\n    return wrapInSet(result);\n  }\n\n  if (typeof relation === 'string') {\n    const result = await callback({ documentId: relation });\n    return wrapInSet(result);\n  }\n\n  // Anything else\n  return callback(relation);\n};\n\ntype TraverseEntity = Parameters<typeof traverseEntity>;\n\n/**\n * Utility function, same as `traverseEntity` but only for relations.\n */\nconst traverseEntityRelations = async (\n  visitor: TraverseEntity[0],\n  options: TraverseEntity[1],\n  data: TraverseEntity[2]\n) => {\n  return traverseEntity(\n    async (options, utils) => {\n      if (options.attribute.type !== 'relation') {\n        return;\n      }\n\n      // TODO: Handle join columns\n      if (options.attribute.useJoinTable === false) {\n        return;\n      }\n\n      // TODO: Handle morph relations (they have multiple targets)\n      const target = options.attribute.target as UID.Schema | undefined;\n      if (!target) {\n        return;\n      }\n\n      return visitor(options, utils);\n    },\n    options,\n    data\n  );\n};\n\nconst mapRelationCurried = curry(mapRelation);\nconst traverseEntityRelationsCurried = curry(traverseEntityRelations);\n\nexport {\n  mapRelationCurried as mapRelation,\n  traverseEntityRelationsCurried as traverseEntityRelations,\n};\n"],"names":["isNil","async","isObject","traverseEntity","options","curry"],"mappings":";;;;AAQA,MAAM,YAAY,CAAC,UAAgC;AAC7C,MAAA,MAAM,QAAQ,KAAK;AAAU,WAAA;AAC3B,QAAA,SAAS,SAAS,OAAO,EAAE;AAC1B,SAAA,CAAC,OAAO,MAAM,MAAM;AAC7B;AAEA,MAAM,UAAU,CAAC,UAAe;AAE9B,MAAIA,EAAAA,MAAM,KAAK;AAAU,WAAA;AACrB,MAAA,MAAM,QAAQ,KAAK;AAAU,WAAA;AAEjC,SAAO,CAAC,KAAK;AACf;AAkBA,MAAM,cAAc,OAClB,UACA,KACA,cAAc,UACQ;AACtB,MAAI,WAAqB;AAEnB,QAAA,YAAY,CAAC,UAAe;AAEhC,QAAI,aAAa;AACR,aAAA;AAAA,IACT;AACA,WAAO,EAAE,KAAK,QAAQ,KAAK,EAAE;AAAA,EAAA;AAI3B,MAAAA,EAAAA,MAAM,QAAQ,GAAG;AACnB,WAAO,SAAS,QAAQ;AAAA,EAC1B;AAGI,MAAA,MAAM,QAAQ,QAAQ,GAAG;AACpB,WAAAC,YAAA,MACJ,IAAI,UAAU,CAAC,MAAgB,YAAY,UAAU,GAAG,IAAI,CAAC,EAC7D,KAAK,CAAC,WAAgB,OAAO,OAAO,OAAO,OAAO,CAAC,EACnD,KAAK,SAAS;AAAA,EACnB;AAGI,MAAAC,EAAAA,SAAS,QAAQ,GAAG;AAElB,QAAA,QAAQ,YAAY,gBAAgB,UAAU;AAC1C,YAAA,SAAS,MAAM,SAAS,QAAQ;AACtC,aAAO,UAAU,MAAM;AAAA,IACzB;AAGI,QAAA,CAAC,SAAS,OAAO,CAAC,SAAS,cAAc,CAAC,SAAS,SAAS;AAC9D,aAAO,SAAS,QAAQ;AAAA,IAC1B;AAGA,QAAI,SAAS,KAAK;AAChB,YAAM,MAAW,MAAM,YAAY,UAAU,SAAS,KAAK,IAAI;AAC/D,iBAAW,EAAE,GAAG,UAAU,KAAK,QAAQ,GAAG;IAC5C;AAGA,QAAI,SAAS,YAAY;AACvB,YAAM,aAAkB,MAAM,YAAY,UAAU,SAAS,YAAY,IAAI;AAC7E,iBAAW,EAAE,GAAG,UAAU,YAAY,QAAQ,UAAU;IAC1D;AAGA,QAAI,SAAS,SAAS;AAEpB,YAAM,UAAe,MAAM,YAAY,UAAU,SAAS,SAAS,IAAI;AACvE,iBAAW,EAAE,GAAG,UAAU,SAAS,QAAQ,OAAO;IACpD;AAEO,WAAA;AAAA,EACT;AAGI,MAAA,UAAU,QAAQ,GAAG;AACvB,UAAM,SAAS,MAAM,SAAS,EAAE,IAAI,SAAU,CAAA;AAC9C,WAAO,UAAU,MAAM;AAAA,EACzB;AAEI,MAAA,OAAO,aAAa,UAAU;AAChC,UAAM,SAAS,MAAM,SAAS,EAAE,YAAY,SAAU,CAAA;AACtD,WAAO,UAAU,MAAM;AAAA,EACzB;AAGA,SAAO,SAAS,QAAQ;AAC1B;AAOA,MAAM,0BAA0B,OAC9B,SACA,SACA,SACG;AACI,SAAAC,YAAA;AAAA,IACL,OAAOC,UAAS,UAAU;AACpBA,UAAAA,SAAQ,UAAU,SAAS,YAAY;AACzC;AAAA,MACF;AAGIA,UAAAA,SAAQ,UAAU,iBAAiB,OAAO;AAC5C;AAAA,MACF;AAGM,YAAA,SAASA,SAAQ,UAAU;AACjC,UAAI,CAAC,QAAQ;AACX;AAAA,MACF;AAEO,aAAA,QAAQA,UAAS,KAAK;AAAA,IAC/B;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEJ;AAEM,MAAA,qBAAqBC,QAAM,WAAW;AACtC,MAAA,iCAAiCA,QAAM,uBAAuB;;;"}
+{"version":3,"file":"map-relation.js","sources":["../../../../../../src/services/document-service/transform/relations/utils/map-relation.ts"],"sourcesContent":["/* eslint-disable node/no-callback-literal */\nimport { isObject, curry, isNil } from 'lodash/fp';\n\nimport type { UID } from '@strapi/types';\nimport { traverseEntity, async } from '@strapi/utils';\n\nimport { Relation } from './types';\n\nconst isNumeric = (value: any): value is number => {\n  if (Array.isArray(value)) return false; // Handle [1, 'docId'] case\n  const parsed = parseInt(value, 10);\n  return !Number.isNaN(parsed);\n};\n\nconst toArray = (value: any) => {\n  // Keep value as it is if it's a nullish value\n  if (isNil(value)) return value;\n  if (Array.isArray(value)) return value;\n\n  return [value];\n};\n\n/**\n * There are multiple ways to create Strapi relations.\n * This is a utility to traverse and transform relation data\n *\n *\n * For consistency and ease of use, the response will always be an object with the following shape:\n * { set: [{...}], connect: [{...}], disconnect: [{...}] }\n *\n * @example\n * transformRelationData({\n *  onLongHand: (relation) => {\n *    // Change the id of the relation\n *    return { id: 'other' };\n *  },\n * }, relation)\n */\nconst mapRelation = async (\n  callback: (relation: any) => any,\n  rel: Relation,\n  isRecursive = false\n): Promise<Relation> => {\n  let relation: Relation = rel;\n\n  const wrapInSet = (value: any) => {\n    // Ignore wrapping if it's a recursive call\n    if (isRecursive) {\n      return value;\n    }\n    return { set: toArray(value) };\n  };\n\n  // undefined | null\n  if (isNil(relation)) {\n    return callback(relation);\n  }\n\n  // LongHand[] | ShortHand[]\n  if (Array.isArray(relation)) {\n    return async\n      .map(relation, (r: Relation) => mapRelation(callback, r, true))\n      .then((result: any) => result.flat().filter(Boolean))\n      .then(wrapInSet);\n  }\n\n  // LongHand\n  if (isObject(relation)) {\n    // { id: 1 } || { documentId: 1 }\n    if ('id' in relation || 'documentId' in relation) {\n      const result = await callback(relation);\n      return wrapInSet(result);\n    }\n\n    // If not connecting anything, return default visitor\n    if (!relation.set && !relation.disconnect && !relation.connect) {\n      return callback(relation);\n    }\n\n    // { set }\n    if (relation.set) {\n      const set: any = await mapRelation(callback, relation.set, true);\n      relation = { ...relation, set: toArray(set) };\n    }\n\n    // { disconnect}\n    if (relation.disconnect) {\n      const disconnect: any = await mapRelation(callback, relation.disconnect, true);\n      relation = { ...relation, disconnect: toArray(disconnect) };\n    }\n\n    // { connect }\n    if (relation.connect) {\n      // Transform the relation to connect\n      const connect: any = await mapRelation(callback, relation.connect, true);\n      relation = { ...relation, connect: toArray(connect) };\n    }\n\n    return relation;\n  }\n\n  // ShortHand\n  if (isNumeric(relation)) {\n    const result = await callback({ id: relation });\n    return wrapInSet(result);\n  }\n\n  if (typeof relation === 'string') {\n    const result = await callback({ documentId: relation });\n    return wrapInSet(result);\n  }\n\n  // Anything else\n  return callback(relation);\n};\n\ntype TraverseEntity = Parameters<typeof traverseEntity>;\n\n/**\n * Utility function, same as `traverseEntity` but only for relations.\n */\nconst traverseEntityRelations = async (\n  visitor: TraverseEntity[0],\n  options: TraverseEntity[1],\n  data: TraverseEntity[2]\n) => {\n  return traverseEntity(\n    async (options, utils) => {\n      const { attribute } = options;\n\n      if (!attribute) {\n        return;\n      }\n\n      if (attribute.type !== 'relation') {\n        return;\n      }\n\n      // TODO: Handle join columns\n      if (attribute.useJoinTable === false) {\n        return;\n      }\n\n      // TODO: Handle morph relations (they have multiple targets)\n      const target = attribute.target as UID.Schema | undefined;\n      if (!target) {\n        return;\n      }\n\n      return visitor(options, utils);\n    },\n    options,\n    data\n  );\n};\n\nconst mapRelationCurried = curry(mapRelation);\nconst traverseEntityRelationsCurried = curry(traverseEntityRelations);\n\nexport {\n  mapRelationCurried as mapRelation,\n  traverseEntityRelationsCurried as traverseEntityRelations,\n};\n"],"names":["isNil","async","isObject","traverseEntity","options","curry"],"mappings":";;;;AAQA,MAAM,YAAY,CAAC,UAAgC;AAC7C,MAAA,MAAM,QAAQ,KAAK;AAAU,WAAA;AAC3B,QAAA,SAAS,SAAS,OAAO,EAAE;AAC1B,SAAA,CAAC,OAAO,MAAM,MAAM;AAC7B;AAEA,MAAM,UAAU,CAAC,UAAe;AAE9B,MAAIA,GAAAA,MAAM,KAAK;AAAU,WAAA;AACrB,MAAA,MAAM,QAAQ,KAAK;AAAU,WAAA;AAEjC,SAAO,CAAC,KAAK;AACf;AAkBA,MAAM,cAAc,OAClB,UACA,KACA,cAAc,UACQ;AACtB,MAAI,WAAqB;AAEnB,QAAA,YAAY,CAAC,UAAe;AAEhC,QAAI,aAAa;AACR,aAAA;AAAA,IACT;AACA,WAAO,EAAE,KAAK,QAAQ,KAAK,EAAE;AAAA,EAAA;AAI3B,MAAAA,GAAAA,MAAM,QAAQ,GAAG;AACnB,WAAO,SAAS,QAAQ;AAAA,EAC1B;AAGI,MAAA,MAAM,QAAQ,QAAQ,GAAG;AACpB,WAAAC,YAAA,MACJ,IAAI,UAAU,CAAC,MAAgB,YAAY,UAAU,GAAG,IAAI,CAAC,EAC7D,KAAK,CAAC,WAAgB,OAAO,OAAO,OAAO,OAAO,CAAC,EACnD,KAAK,SAAS;AAAA,EACnB;AAGI,MAAAC,GAAAA,SAAS,QAAQ,GAAG;AAElB,QAAA,QAAQ,YAAY,gBAAgB,UAAU;AAC1C,YAAA,SAAS,MAAM,SAAS,QAAQ;AACtC,aAAO,UAAU,MAAM;AAAA,IACzB;AAGI,QAAA,CAAC,SAAS,OAAO,CAAC,SAAS,cAAc,CAAC,SAAS,SAAS;AAC9D,aAAO,SAAS,QAAQ;AAAA,IAC1B;AAGA,QAAI,SAAS,KAAK;AAChB,YAAM,MAAW,MAAM,YAAY,UAAU,SAAS,KAAK,IAAI;AAC/D,iBAAW,EAAE,GAAG,UAAU,KAAK,QAAQ,GAAG;IAC5C;AAGA,QAAI,SAAS,YAAY;AACvB,YAAM,aAAkB,MAAM,YAAY,UAAU,SAAS,YAAY,IAAI;AAC7E,iBAAW,EAAE,GAAG,UAAU,YAAY,QAAQ,UAAU;IAC1D;AAGA,QAAI,SAAS,SAAS;AAEpB,YAAM,UAAe,MAAM,YAAY,UAAU,SAAS,SAAS,IAAI;AACvE,iBAAW,EAAE,GAAG,UAAU,SAAS,QAAQ,OAAO;IACpD;AAEO,WAAA;AAAA,EACT;AAGI,MAAA,UAAU,QAAQ,GAAG;AACvB,UAAM,SAAS,MAAM,SAAS,EAAE,IAAI,SAAU,CAAA;AAC9C,WAAO,UAAU,MAAM;AAAA,EACzB;AAEI,MAAA,OAAO,aAAa,UAAU;AAChC,UAAM,SAAS,MAAM,SAAS,EAAE,YAAY,SAAU,CAAA;AACtD,WAAO,UAAU,MAAM;AAAA,EACzB;AAGA,SAAO,SAAS,QAAQ;AAC1B;AAOA,MAAM,0BAA0B,OAC9B,SACA,SACA,SACG;AACI,SAAAC,YAAA;AAAA,IACL,OAAOC,UAAS,UAAU;AAClB,YAAA,EAAE,UAAcA,IAAAA;AAEtB,UAAI,CAAC,WAAW;AACd;AAAA,MACF;AAEI,UAAA,UAAU,SAAS,YAAY;AACjC;AAAA,MACF;AAGI,UAAA,UAAU,iBAAiB,OAAO;AACpC;AAAA,MACF;AAGA,YAAM,SAAS,UAAU;AACzB,UAAI,CAAC,QAAQ;AACX;AAAA,MACF;AAEO,aAAA,QAAQA,UAAS,KAAK;AAAA,IAC/B;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEJ;AAEM,MAAA,qBAAqBC,SAAM,WAAW;AACtC,MAAA,iCAAiCA,SAAM,uBAAuB;;;"}

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

@@ -62,13 +62,17 @@ const mapRelation = async (callback, rel, isRecursive = false) => {
 const traverseEntityRelations = async (visitor, options, data) => {
   return traverseEntity(
     async (options2, utils) => {
-      if (options2.attribute.type !== "relation") {
+      const { attribute } = options2;
+      if (!attribute) {
         return;
       }
-      if (options2.attribute.useJoinTable === false) {
+      if (attribute.type !== "relation") {
         return;
       }
-      const target = options2.attribute.target;
+      if (attribute.useJoinTable === false) {
+        return;
+      }
+      const target = attribute.target;
       if (!target) {
         return;
       }

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

@@ -1 +1 @@
-{"version":3,"file":"map-relation.mjs","sources":["../../../../../../src/services/document-service/transform/relations/utils/map-relation.ts"],"sourcesContent":["/* eslint-disable node/no-callback-literal */\nimport { isObject, curry, isNil } from 'lodash/fp';\n\nimport type { UID } from '@strapi/types';\nimport { traverseEntity, async } from '@strapi/utils';\n\nimport { Relation } from './types';\n\nconst isNumeric = (value: any): value is number => {\n  if (Array.isArray(value)) return false; // Handle [1, 'docId'] case\n  const parsed = parseInt(value, 10);\n  return !Number.isNaN(parsed);\n};\n\nconst toArray = (value: any) => {\n  // Keep value as it is if it's a nullish value\n  if (isNil(value)) return value;\n  if (Array.isArray(value)) return value;\n\n  return [value];\n};\n\n/**\n * There are multiple ways to create Strapi relations.\n * This is a utility to traverse and transform relation data\n *\n *\n * For consistency and ease of use, the response will always be an object with the following shape:\n * { set: [{...}], connect: [{...}], disconnect: [{...}] }\n *\n * @example\n * transformRelationData({\n *  onLongHand: (relation) => {\n *    // Change the id of the relation\n *    return { id: 'other' };\n *  },\n * }, relation)\n */\nconst mapRelation = async (\n  callback: (relation: any) => any,\n  rel: Relation,\n  isRecursive = false\n): Promise<Relation> => {\n  let relation: Relation = rel;\n\n  const wrapInSet = (value: any) => {\n    // Ignore wrapping if it's a recursive call\n    if (isRecursive) {\n      return value;\n    }\n    return { set: toArray(value) };\n  };\n\n  // undefined | null\n  if (isNil(relation)) {\n    return callback(relation);\n  }\n\n  // LongHand[] | ShortHand[]\n  if (Array.isArray(relation)) {\n    return async\n      .map(relation, (r: Relation) => mapRelation(callback, r, true))\n      .then((result: any) => result.flat().filter(Boolean))\n      .then(wrapInSet);\n  }\n\n  // LongHand\n  if (isObject(relation)) {\n    // { id: 1 } || { documentId: 1 }\n    if ('id' in relation || 'documentId' in relation) {\n      const result = await callback(relation);\n      return wrapInSet(result);\n    }\n\n    // If not connecting anything, return default visitor\n    if (!relation.set && !relation.disconnect && !relation.connect) {\n      return callback(relation);\n    }\n\n    // { set }\n    if (relation.set) {\n      const set: any = await mapRelation(callback, relation.set, true);\n      relation = { ...relation, set: toArray(set) };\n    }\n\n    // { disconnect}\n    if (relation.disconnect) {\n      const disconnect: any = await mapRelation(callback, relation.disconnect, true);\n      relation = { ...relation, disconnect: toArray(disconnect) };\n    }\n\n    // { connect }\n    if (relation.connect) {\n      // Transform the relation to connect\n      const connect: any = await mapRelation(callback, relation.connect, true);\n      relation = { ...relation, connect: toArray(connect) };\n    }\n\n    return relation;\n  }\n\n  // ShortHand\n  if (isNumeric(relation)) {\n    const result = await callback({ id: relation });\n    return wrapInSet(result);\n  }\n\n  if (typeof relation === 'string') {\n    const result = await callback({ documentId: relation });\n    return wrapInSet(result);\n  }\n\n  // Anything else\n  return callback(relation);\n};\n\ntype TraverseEntity = Parameters<typeof traverseEntity>;\n\n/**\n * Utility function, same as `traverseEntity` but only for relations.\n */\nconst traverseEntityRelations = async (\n  visitor: TraverseEntity[0],\n  options: TraverseEntity[1],\n  data: TraverseEntity[2]\n) => {\n  return traverseEntity(\n    async (options, utils) => {\n      if (options.attribute.type !== 'relation') {\n        return;\n      }\n\n      // TODO: Handle join columns\n      if (options.attribute.useJoinTable === false) {\n        return;\n      }\n\n      // TODO: Handle morph relations (they have multiple targets)\n      const target = options.attribute.target as UID.Schema | undefined;\n      if (!target) {\n        return;\n      }\n\n      return visitor(options, utils);\n    },\n    options,\n    data\n  );\n};\n\nconst mapRelationCurried = curry(mapRelation);\nconst traverseEntityRelationsCurried = curry(traverseEntityRelations);\n\nexport {\n  mapRelationCurried as mapRelation,\n  traverseEntityRelationsCurried as traverseEntityRelations,\n};\n"],"names":["options"],"mappings":";;AAQA,MAAM,YAAY,CAAC,UAAgC;AAC7C,MAAA,MAAM,QAAQ,KAAK;AAAU,WAAA;AAC3B,QAAA,SAAS,SAAS,OAAO,EAAE;AAC1B,SAAA,CAAC,OAAO,MAAM,MAAM;AAC7B;AAEA,MAAM,UAAU,CAAC,UAAe;AAE9B,MAAI,MAAM,KAAK;AAAU,WAAA;AACrB,MAAA,MAAM,QAAQ,KAAK;AAAU,WAAA;AAEjC,SAAO,CAAC,KAAK;AACf;AAkBA,MAAM,cAAc,OAClB,UACA,KACA,cAAc,UACQ;AACtB,MAAI,WAAqB;AAEnB,QAAA,YAAY,CAAC,UAAe;AAEhC,QAAI,aAAa;AACR,aAAA;AAAA,IACT;AACA,WAAO,EAAE,KAAK,QAAQ,KAAK,EAAE;AAAA,EAAA;AAI3B,MAAA,MAAM,QAAQ,GAAG;AACnB,WAAO,SAAS,QAAQ;AAAA,EAC1B;AAGI,MAAA,MAAM,QAAQ,QAAQ,GAAG;AACpB,WAAA,MACJ,IAAI,UAAU,CAAC,MAAgB,YAAY,UAAU,GAAG,IAAI,CAAC,EAC7D,KAAK,CAAC,WAAgB,OAAO,OAAO,OAAO,OAAO,CAAC,EACnD,KAAK,SAAS;AAAA,EACnB;AAGI,MAAA,SAAS,QAAQ,GAAG;AAElB,QAAA,QAAQ,YAAY,gBAAgB,UAAU;AAC1C,YAAA,SAAS,MAAM,SAAS,QAAQ;AACtC,aAAO,UAAU,MAAM;AAAA,IACzB;AAGI,QAAA,CAAC,SAAS,OAAO,CAAC,SAAS,cAAc,CAAC,SAAS,SAAS;AAC9D,aAAO,SAAS,QAAQ;AAAA,IAC1B;AAGA,QAAI,SAAS,KAAK;AAChB,YAAM,MAAW,MAAM,YAAY,UAAU,SAAS,KAAK,IAAI;AAC/D,iBAAW,EAAE,GAAG,UAAU,KAAK,QAAQ,GAAG;IAC5C;AAGA,QAAI,SAAS,YAAY;AACvB,YAAM,aAAkB,MAAM,YAAY,UAAU,SAAS,YAAY,IAAI;AAC7E,iBAAW,EAAE,GAAG,UAAU,YAAY,QAAQ,UAAU;IAC1D;AAGA,QAAI,SAAS,SAAS;AAEpB,YAAM,UAAe,MAAM,YAAY,UAAU,SAAS,SAAS,IAAI;AACvE,iBAAW,EAAE,GAAG,UAAU,SAAS,QAAQ,OAAO;IACpD;AAEO,WAAA;AAAA,EACT;AAGI,MAAA,UAAU,QAAQ,GAAG;AACvB,UAAM,SAAS,MAAM,SAAS,EAAE,IAAI,SAAU,CAAA;AAC9C,WAAO,UAAU,MAAM;AAAA,EACzB;AAEI,MAAA,OAAO,aAAa,UAAU;AAChC,UAAM,SAAS,MAAM,SAAS,EAAE,YAAY,SAAU,CAAA;AACtD,WAAO,UAAU,MAAM;AAAA,EACzB;AAGA,SAAO,SAAS,QAAQ;AAC1B;AAOA,MAAM,0BAA0B,OAC9B,SACA,SACA,SACG;AACI,SAAA;AAAA,IACL,OAAOA,UAAS,UAAU;AACpBA,UAAAA,SAAQ,UAAU,SAAS,YAAY;AACzC;AAAA,MACF;AAGIA,UAAAA,SAAQ,UAAU,iBAAiB,OAAO;AAC5C;AAAA,MACF;AAGM,YAAA,SAASA,SAAQ,UAAU;AACjC,UAAI,CAAC,QAAQ;AACX;AAAA,MACF;AAEO,aAAA,QAAQA,UAAS,KAAK;AAAA,IAC/B;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEJ;AAEM,MAAA,qBAAqB,MAAM,WAAW;AACtC,MAAA,iCAAiC,MAAM,uBAAuB;"}
+{"version":3,"file":"map-relation.mjs","sources":["../../../../../../src/services/document-service/transform/relations/utils/map-relation.ts"],"sourcesContent":["/* eslint-disable node/no-callback-literal */\nimport { isObject, curry, isNil } from 'lodash/fp';\n\nimport type { UID } from '@strapi/types';\nimport { traverseEntity, async } from '@strapi/utils';\n\nimport { Relation } from './types';\n\nconst isNumeric = (value: any): value is number => {\n  if (Array.isArray(value)) return false; // Handle [1, 'docId'] case\n  const parsed = parseInt(value, 10);\n  return !Number.isNaN(parsed);\n};\n\nconst toArray = (value: any) => {\n  // Keep value as it is if it's a nullish value\n  if (isNil(value)) return value;\n  if (Array.isArray(value)) return value;\n\n  return [value];\n};\n\n/**\n * There are multiple ways to create Strapi relations.\n * This is a utility to traverse and transform relation data\n *\n *\n * For consistency and ease of use, the response will always be an object with the following shape:\n * { set: [{...}], connect: [{...}], disconnect: [{...}] }\n *\n * @example\n * transformRelationData({\n *  onLongHand: (relation) => {\n *    // Change the id of the relation\n *    return { id: 'other' };\n *  },\n * }, relation)\n */\nconst mapRelation = async (\n  callback: (relation: any) => any,\n  rel: Relation,\n  isRecursive = false\n): Promise<Relation> => {\n  let relation: Relation = rel;\n\n  const wrapInSet = (value: any) => {\n    // Ignore wrapping if it's a recursive call\n    if (isRecursive) {\n      return value;\n    }\n    return { set: toArray(value) };\n  };\n\n  // undefined | null\n  if (isNil(relation)) {\n    return callback(relation);\n  }\n\n  // LongHand[] | ShortHand[]\n  if (Array.isArray(relation)) {\n    return async\n      .map(relation, (r: Relation) => mapRelation(callback, r, true))\n      .then((result: any) => result.flat().filter(Boolean))\n      .then(wrapInSet);\n  }\n\n  // LongHand\n  if (isObject(relation)) {\n    // { id: 1 } || { documentId: 1 }\n    if ('id' in relation || 'documentId' in relation) {\n      const result = await callback(relation);\n      return wrapInSet(result);\n    }\n\n    // If not connecting anything, return default visitor\n    if (!relation.set && !relation.disconnect && !relation.connect) {\n      return callback(relation);\n    }\n\n    // { set }\n    if (relation.set) {\n      const set: any = await mapRelation(callback, relation.set, true);\n      relation = { ...relation, set: toArray(set) };\n    }\n\n    // { disconnect}\n    if (relation.disconnect) {\n      const disconnect: any = await mapRelation(callback, relation.disconnect, true);\n      relation = { ...relation, disconnect: toArray(disconnect) };\n    }\n\n    // { connect }\n    if (relation.connect) {\n      // Transform the relation to connect\n      const connect: any = await mapRelation(callback, relation.connect, true);\n      relation = { ...relation, connect: toArray(connect) };\n    }\n\n    return relation;\n  }\n\n  // ShortHand\n  if (isNumeric(relation)) {\n    const result = await callback({ id: relation });\n    return wrapInSet(result);\n  }\n\n  if (typeof relation === 'string') {\n    const result = await callback({ documentId: relation });\n    return wrapInSet(result);\n  }\n\n  // Anything else\n  return callback(relation);\n};\n\ntype TraverseEntity = Parameters<typeof traverseEntity>;\n\n/**\n * Utility function, same as `traverseEntity` but only for relations.\n */\nconst traverseEntityRelations = async (\n  visitor: TraverseEntity[0],\n  options: TraverseEntity[1],\n  data: TraverseEntity[2]\n) => {\n  return traverseEntity(\n    async (options, utils) => {\n      const { attribute } = options;\n\n      if (!attribute) {\n        return;\n      }\n\n      if (attribute.type !== 'relation') {\n        return;\n      }\n\n      // TODO: Handle join columns\n      if (attribute.useJoinTable === false) {\n        return;\n      }\n\n      // TODO: Handle morph relations (they have multiple targets)\n      const target = attribute.target as UID.Schema | undefined;\n      if (!target) {\n        return;\n      }\n\n      return visitor(options, utils);\n    },\n    options,\n    data\n  );\n};\n\nconst mapRelationCurried = curry(mapRelation);\nconst traverseEntityRelationsCurried = curry(traverseEntityRelations);\n\nexport {\n  mapRelationCurried as mapRelation,\n  traverseEntityRelationsCurried as traverseEntityRelations,\n};\n"],"names":["options"],"mappings":";;AAQA,MAAM,YAAY,CAAC,UAAgC;AAC7C,MAAA,MAAM,QAAQ,KAAK;AAAU,WAAA;AAC3B,QAAA,SAAS,SAAS,OAAO,EAAE;AAC1B,SAAA,CAAC,OAAO,MAAM,MAAM;AAC7B;AAEA,MAAM,UAAU,CAAC,UAAe;AAE9B,MAAI,MAAM,KAAK;AAAU,WAAA;AACrB,MAAA,MAAM,QAAQ,KAAK;AAAU,WAAA;AAEjC,SAAO,CAAC,KAAK;AACf;AAkBA,MAAM,cAAc,OAClB,UACA,KACA,cAAc,UACQ;AACtB,MAAI,WAAqB;AAEnB,QAAA,YAAY,CAAC,UAAe;AAEhC,QAAI,aAAa;AACR,aAAA;AAAA,IACT;AACA,WAAO,EAAE,KAAK,QAAQ,KAAK,EAAE;AAAA,EAAA;AAI3B,MAAA,MAAM,QAAQ,GAAG;AACnB,WAAO,SAAS,QAAQ;AAAA,EAC1B;AAGI,MAAA,MAAM,QAAQ,QAAQ,GAAG;AACpB,WAAA,MACJ,IAAI,UAAU,CAAC,MAAgB,YAAY,UAAU,GAAG,IAAI,CAAC,EAC7D,KAAK,CAAC,WAAgB,OAAO,OAAO,OAAO,OAAO,CAAC,EACnD,KAAK,SAAS;AAAA,EACnB;AAGI,MAAA,SAAS,QAAQ,GAAG;AAElB,QAAA,QAAQ,YAAY,gBAAgB,UAAU;AAC1C,YAAA,SAAS,MAAM,SAAS,QAAQ;AACtC,aAAO,UAAU,MAAM;AAAA,IACzB;AAGI,QAAA,CAAC,SAAS,OAAO,CAAC,SAAS,cAAc,CAAC,SAAS,SAAS;AAC9D,aAAO,SAAS,QAAQ;AAAA,IAC1B;AAGA,QAAI,SAAS,KAAK;AAChB,YAAM,MAAW,MAAM,YAAY,UAAU,SAAS,KAAK,IAAI;AAC/D,iBAAW,EAAE,GAAG,UAAU,KAAK,QAAQ,GAAG;IAC5C;AAGA,QAAI,SAAS,YAAY;AACvB,YAAM,aAAkB,MAAM,YAAY,UAAU,SAAS,YAAY,IAAI;AAC7E,iBAAW,EAAE,GAAG,UAAU,YAAY,QAAQ,UAAU;IAC1D;AAGA,QAAI,SAAS,SAAS;AAEpB,YAAM,UAAe,MAAM,YAAY,UAAU,SAAS,SAAS,IAAI;AACvE,iBAAW,EAAE,GAAG,UAAU,SAAS,QAAQ,OAAO;IACpD;AAEO,WAAA;AAAA,EACT;AAGI,MAAA,UAAU,QAAQ,GAAG;AACvB,UAAM,SAAS,MAAM,SAAS,EAAE,IAAI,SAAU,CAAA;AAC9C,WAAO,UAAU,MAAM;AAAA,EACzB;AAEI,MAAA,OAAO,aAAa,UAAU;AAChC,UAAM,SAAS,MAAM,SAAS,EAAE,YAAY,SAAU,CAAA;AACtD,WAAO,UAAU,MAAM;AAAA,EACzB;AAGA,SAAO,SAAS,QAAQ;AAC1B;AAOA,MAAM,0BAA0B,OAC9B,SACA,SACA,SACG;AACI,SAAA;AAAA,IACL,OAAOA,UAAS,UAAU;AAClB,YAAA,EAAE,UAAcA,IAAAA;AAEtB,UAAI,CAAC,WAAW;AACd;AAAA,MACF;AAEI,UAAA,UAAU,SAAS,YAAY;AACjC;AAAA,MACF;AAGI,UAAA,UAAU,iBAAiB,OAAO;AACpC;AAAA,MACF;AAGA,YAAM,SAAS,UAAU;AACzB,UAAI,CAAC,QAAQ;AACX;AAAA,MACF;AAEO,aAAA,QAAQA,UAAS,KAAK;AAAA,IAC/B;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEJ;AAEM,MAAA,qBAAqB,MAAM,WAAW;AACtC,MAAA,iCAAiC,MAAM,uBAAuB;"}

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

@@ -1 +1 @@
-{"version":3,"file":"populate.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/utils/populate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGpC,UAAU,OAAO;IACf;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAGD,eAAO,MAAM,eAAe,QAAS,IAAI,MAAM,SAAQ,OAAO,QA8C7D,CAAC"}
+{"version":3,"file":"populate.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/utils/populate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGpC,UAAU,OAAO;IACf;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAGD,eAAO,MAAM,eAAe,QAAS,IAAI,MAAM,SAAQ,OAAO,QAoD7D,CAAC"}

package/dist/services/document-service/utils/populate.js

@@ -7,6 +7,10 @@ const getDeepPopulate = (uid, opts = {}) => {
   return attributes.reduce((acc, [attributeName, attribute]) => {
     switch (attribute.type) {
       case "relation": {
+        const isMorphRelation = attribute.relation.toLowerCase().startsWith("morph");
+        if (isMorphRelation) {
+          break;
+        }
         const isVisible = strapiUtils.contentTypes.isVisibleAttribute(model, attributeName);
         if (isVisible) {
           acc[attributeName] = { select: opts.relationalFields };

package/dist/services/document-service/utils/populate.js.map

@@ -1 +1 @@
-{"version":3,"file":"populate.js","sources":["../../../../src/services/document-service/utils/populate.ts"],"sourcesContent":["import { UID } from '@strapi/types';\nimport { contentTypes } from '@strapi/utils';\n\ninterface Options {\n  /**\n   * Fields to select when populating relations\n   */\n  relationalFields?: string[];\n}\n\n// We want to build a populate object based on the schema\nexport const getDeepPopulate = (uid: UID.Schema, opts: Options = {}) => {\n  const model = strapi.getModel(uid);\n  const attributes = Object.entries(model.attributes);\n\n  return attributes.reduce((acc: any, [attributeName, attribute]) => {\n    switch (attribute.type) {\n      case 'relation': {\n        // TODO: Should this just be a plain list?\n        // Ignore createdBy, updatedBy, ...\n        const isVisible = contentTypes.isVisibleAttribute(model, attributeName);\n        if (isVisible) {\n          acc[attributeName] = { select: opts.relationalFields };\n        }\n        break;\n      }\n\n      case 'media': {\n        acc[attributeName] = { select: ['id'] };\n        break;\n      }\n\n      case 'component': {\n        const populate = getDeepPopulate(attribute.component, opts);\n        acc[attributeName] = { populate };\n        break;\n      }\n\n      case 'dynamiczone': {\n        // Use fragments to populate the dynamic zone components\n        const populatedComponents = (attribute.components || []).reduce(\n          (acc: any, componentUID: UID.Component) => {\n            acc[componentUID] = { populate: getDeepPopulate(componentUID, opts) };\n            return acc;\n          },\n          {}\n        );\n\n        acc[attributeName] = { on: populatedComponents };\n        break;\n      }\n      default:\n        break;\n    }\n\n    return acc;\n  }, {});\n};\n"],"names":["contentTypes","acc"],"mappings":";;;AAWO,MAAM,kBAAkB,CAAC,KAAiB,OAAgB,OAAO;AAChE,QAAA,QAAQ,OAAO,SAAS,GAAG;AACjC,QAAM,aAAa,OAAO,QAAQ,MAAM,UAAU;AAElD,SAAO,WAAW,OAAO,CAAC,KAAU,CAAC,eAAe,SAAS,MAAM;AACjE,YAAQ,UAAU,MAAM;AAAA,MACtB,KAAK,YAAY;AAGf,cAAM,YAAYA,YAAA,aAAa,mBAAmB,OAAO,aAAa;AACtE,YAAI,WAAW;AACb,cAAI,aAAa,IAAI,EAAE,QAAQ,KAAK,iBAAiB;AAAA,QACvD;AACA;AAAA,MACF;AAAA,MAEA,KAAK,SAAS;AACZ,YAAI,aAAa,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE;AACtC;AAAA,MACF;AAAA,MAEA,KAAK,aAAa;AAChB,cAAM,WAAW,gBAAgB,UAAU,WAAW,IAAI;AACtD,YAAA,aAAa,IAAI,EAAE;AACvB;AAAA,MACF;AAAA,MAEA,KAAK,eAAe;AAElB,cAAM,uBAAuB,UAAU,cAAc,CAAI,GAAA;AAAA,UACvD,CAACC,MAAU,iBAAgC;AACzCA,iBAAI,YAAY,IAAI,EAAE,UAAU,gBAAgB,cAAc,IAAI;AAC3DA,mBAAAA;AAAAA,UACT;AAAA,UACA,CAAC;AAAA,QAAA;AAGH,YAAI,aAAa,IAAI,EAAE,IAAI,oBAAoB;AAC/C;AAAA,MACF;AAAA,IAGF;AAEO,WAAA;AAAA,EACT,GAAG,CAAE,CAAA;AACP;;"}
+{"version":3,"file":"populate.js","sources":["../../../../src/services/document-service/utils/populate.ts"],"sourcesContent":["import { UID } from '@strapi/types';\nimport { contentTypes } from '@strapi/utils';\n\ninterface Options {\n  /**\n   * Fields to select when populating relations\n   */\n  relationalFields?: string[];\n}\n\n// We want to build a populate object based on the schema\nexport const getDeepPopulate = (uid: UID.Schema, opts: Options = {}) => {\n  const model = strapi.getModel(uid);\n  const attributes = Object.entries(model.attributes);\n\n  return attributes.reduce((acc: any, [attributeName, attribute]) => {\n    switch (attribute.type) {\n      case 'relation': {\n        // TODO: Support polymorphic relations\n        const isMorphRelation = attribute.relation.toLowerCase().startsWith('morph');\n        if (isMorphRelation) {\n          break;\n        }\n\n        // TODO: Should this just be a plain list?\n        // Ignore createdBy, updatedBy, ...\n        const isVisible = contentTypes.isVisibleAttribute(model, attributeName);\n        if (isVisible) {\n          acc[attributeName] = { select: opts.relationalFields };\n        }\n        break;\n      }\n\n      case 'media': {\n        acc[attributeName] = { select: ['id'] };\n        break;\n      }\n\n      case 'component': {\n        const populate = getDeepPopulate(attribute.component, opts);\n        acc[attributeName] = { populate };\n        break;\n      }\n\n      case 'dynamiczone': {\n        // Use fragments to populate the dynamic zone components\n        const populatedComponents = (attribute.components || []).reduce(\n          (acc: any, componentUID: UID.Component) => {\n            acc[componentUID] = { populate: getDeepPopulate(componentUID, opts) };\n            return acc;\n          },\n          {}\n        );\n\n        acc[attributeName] = { on: populatedComponents };\n        break;\n      }\n      default:\n        break;\n    }\n\n    return acc;\n  }, {});\n};\n"],"names":["contentTypes","acc"],"mappings":";;;AAWO,MAAM,kBAAkB,CAAC,KAAiB,OAAgB,OAAO;AAChE,QAAA,QAAQ,OAAO,SAAS,GAAG;AACjC,QAAM,aAAa,OAAO,QAAQ,MAAM,UAAU;AAElD,SAAO,WAAW,OAAO,CAAC,KAAU,CAAC,eAAe,SAAS,MAAM;AACjE,YAAQ,UAAU,MAAM;AAAA,MACtB,KAAK,YAAY;AAEf,cAAM,kBAAkB,UAAU,SAAS,YAAY,EAAE,WAAW,OAAO;AAC3E,YAAI,iBAAiB;AACnB;AAAA,QACF;AAIA,cAAM,YAAYA,YAAA,aAAa,mBAAmB,OAAO,aAAa;AACtE,YAAI,WAAW;AACb,cAAI,aAAa,IAAI,EAAE,QAAQ,KAAK,iBAAiB;AAAA,QACvD;AACA;AAAA,MACF;AAAA,MAEA,KAAK,SAAS;AACZ,YAAI,aAAa,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE;AACtC;AAAA,MACF;AAAA,MAEA,KAAK,aAAa;AAChB,cAAM,WAAW,gBAAgB,UAAU,WAAW,IAAI;AACtD,YAAA,aAAa,IAAI,EAAE;AACvB;AAAA,MACF;AAAA,MAEA,KAAK,eAAe;AAElB,cAAM,uBAAuB,UAAU,cAAc,CAAI,GAAA;AAAA,UACvD,CAACC,MAAU,iBAAgC;AACzCA,iBAAI,YAAY,IAAI,EAAE,UAAU,gBAAgB,cAAc,IAAI;AAC3DA,mBAAAA;AAAAA,UACT;AAAA,UACA,CAAC;AAAA,QAAA;AAGH,YAAI,aAAa,IAAI,EAAE,IAAI,oBAAoB;AAC/C;AAAA,MACF;AAAA,IAGF;AAEO,WAAA;AAAA,EACT,GAAG,CAAE,CAAA;AACP;;"}

package/dist/services/document-service/utils/populate.mjs

@@ -5,6 +5,10 @@ const getDeepPopulate = (uid, opts = {}) => {
   return attributes.reduce((acc, [attributeName, attribute]) => {
     switch (attribute.type) {
       case "relation": {
+        const isMorphRelation = attribute.relation.toLowerCase().startsWith("morph");
+        if (isMorphRelation) {
+          break;
+        }
         const isVisible = contentTypes.isVisibleAttribute(model, attributeName);
         if (isVisible) {
           acc[attributeName] = { select: opts.relationalFields };

package/dist/services/document-service/utils/populate.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"populate.mjs","sources":["../../../../src/services/document-service/utils/populate.ts"],"sourcesContent":["import { UID } from '@strapi/types';\nimport { contentTypes } from '@strapi/utils';\n\ninterface Options {\n  /**\n   * Fields to select when populating relations\n   */\n  relationalFields?: string[];\n}\n\n// We want to build a populate object based on the schema\nexport const getDeepPopulate = (uid: UID.Schema, opts: Options = {}) => {\n  const model = strapi.getModel(uid);\n  const attributes = Object.entries(model.attributes);\n\n  return attributes.reduce((acc: any, [attributeName, attribute]) => {\n    switch (attribute.type) {\n      case 'relation': {\n        // TODO: Should this just be a plain list?\n        // Ignore createdBy, updatedBy, ...\n        const isVisible = contentTypes.isVisibleAttribute(model, attributeName);\n        if (isVisible) {\n          acc[attributeName] = { select: opts.relationalFields };\n        }\n        break;\n      }\n\n      case 'media': {\n        acc[attributeName] = { select: ['id'] };\n        break;\n      }\n\n      case 'component': {\n        const populate = getDeepPopulate(attribute.component, opts);\n        acc[attributeName] = { populate };\n        break;\n      }\n\n      case 'dynamiczone': {\n        // Use fragments to populate the dynamic zone components\n        const populatedComponents = (attribute.components || []).reduce(\n          (acc: any, componentUID: UID.Component) => {\n            acc[componentUID] = { populate: getDeepPopulate(componentUID, opts) };\n            return acc;\n          },\n          {}\n        );\n\n        acc[attributeName] = { on: populatedComponents };\n        break;\n      }\n      default:\n        break;\n    }\n\n    return acc;\n  }, {});\n};\n"],"names":["acc"],"mappings":";AAWO,MAAM,kBAAkB,CAAC,KAAiB,OAAgB,OAAO;AAChE,QAAA,QAAQ,OAAO,SAAS,GAAG;AACjC,QAAM,aAAa,OAAO,QAAQ,MAAM,UAAU;AAElD,SAAO,WAAW,OAAO,CAAC,KAAU,CAAC,eAAe,SAAS,MAAM;AACjE,YAAQ,UAAU,MAAM;AAAA,MACtB,KAAK,YAAY;AAGf,cAAM,YAAY,aAAa,mBAAmB,OAAO,aAAa;AACtE,YAAI,WAAW;AACb,cAAI,aAAa,IAAI,EAAE,QAAQ,KAAK,iBAAiB;AAAA,QACvD;AACA;AAAA,MACF;AAAA,MAEA,KAAK,SAAS;AACZ,YAAI,aAAa,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE;AACtC;AAAA,MACF;AAAA,MAEA,KAAK,aAAa;AAChB,cAAM,WAAW,gBAAgB,UAAU,WAAW,IAAI;AACtD,YAAA,aAAa,IAAI,EAAE;AACvB;AAAA,MACF;AAAA,MAEA,KAAK,eAAe;AAElB,cAAM,uBAAuB,UAAU,cAAc,CAAI,GAAA;AAAA,UACvD,CAACA,MAAU,iBAAgC;AACzCA,iBAAI,YAAY,IAAI,EAAE,UAAU,gBAAgB,cAAc,IAAI;AAC3DA,mBAAAA;AAAAA,UACT;AAAA,UACA,CAAC;AAAA,QAAA;AAGH,YAAI,aAAa,IAAI,EAAE,IAAI,oBAAoB;AAC/C;AAAA,MACF;AAAA,IAGF;AAEO,WAAA;AAAA,EACT,GAAG,CAAE,CAAA;AACP;"}
+{"version":3,"file":"populate.mjs","sources":["../../../../src/services/document-service/utils/populate.ts"],"sourcesContent":["import { UID } from '@strapi/types';\nimport { contentTypes } from '@strapi/utils';\n\ninterface Options {\n  /**\n   * Fields to select when populating relations\n   */\n  relationalFields?: string[];\n}\n\n// We want to build a populate object based on the schema\nexport const getDeepPopulate = (uid: UID.Schema, opts: Options = {}) => {\n  const model = strapi.getModel(uid);\n  const attributes = Object.entries(model.attributes);\n\n  return attributes.reduce((acc: any, [attributeName, attribute]) => {\n    switch (attribute.type) {\n      case 'relation': {\n        // TODO: Support polymorphic relations\n        const isMorphRelation = attribute.relation.toLowerCase().startsWith('morph');\n        if (isMorphRelation) {\n          break;\n        }\n\n        // TODO: Should this just be a plain list?\n        // Ignore createdBy, updatedBy, ...\n        const isVisible = contentTypes.isVisibleAttribute(model, attributeName);\n        if (isVisible) {\n          acc[attributeName] = { select: opts.relationalFields };\n        }\n        break;\n      }\n\n      case 'media': {\n        acc[attributeName] = { select: ['id'] };\n        break;\n      }\n\n      case 'component': {\n        const populate = getDeepPopulate(attribute.component, opts);\n        acc[attributeName] = { populate };\n        break;\n      }\n\n      case 'dynamiczone': {\n        // Use fragments to populate the dynamic zone components\n        const populatedComponents = (attribute.components || []).reduce(\n          (acc: any, componentUID: UID.Component) => {\n            acc[componentUID] = { populate: getDeepPopulate(componentUID, opts) };\n            return acc;\n          },\n          {}\n        );\n\n        acc[attributeName] = { on: populatedComponents };\n        break;\n      }\n      default:\n        break;\n    }\n\n    return acc;\n  }, {});\n};\n"],"names":["acc"],"mappings":";AAWO,MAAM,kBAAkB,CAAC,KAAiB,OAAgB,OAAO;AAChE,QAAA,QAAQ,OAAO,SAAS,GAAG;AACjC,QAAM,aAAa,OAAO,QAAQ,MAAM,UAAU;AAElD,SAAO,WAAW,OAAO,CAAC,KAAU,CAAC,eAAe,SAAS,MAAM;AACjE,YAAQ,UAAU,MAAM;AAAA,MACtB,KAAK,YAAY;AAEf,cAAM,kBAAkB,UAAU,SAAS,YAAY,EAAE,WAAW,OAAO;AAC3E,YAAI,iBAAiB;AACnB;AAAA,QACF;AAIA,cAAM,YAAY,aAAa,mBAAmB,OAAO,aAAa;AACtE,YAAI,WAAW;AACb,cAAI,aAAa,IAAI,EAAE,QAAQ,KAAK,iBAAiB;AAAA,QACvD;AACA;AAAA,MACF;AAAA,MAEA,KAAK,SAAS;AACZ,YAAI,aAAa,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE;AACtC;AAAA,MACF;AAAA,MAEA,KAAK,aAAa;AAChB,cAAM,WAAW,gBAAgB,UAAU,WAAW,IAAI;AACtD,YAAA,aAAa,IAAI,EAAE;AACvB;AAAA,MACF;AAAA,MAEA,KAAK,eAAe;AAElB,cAAM,uBAAuB,UAAU,cAAc,CAAI,GAAA;AAAA,UACvD,CAACA,MAAU,iBAAgC;AACzCA,iBAAI,YAAY,IAAI,EAAE,UAAU,gBAAgB,cAAc,IAAI;AAC3DA,mBAAAA;AAAAA,UACT;AAAA,UACA,CAAC;AAAA,QAAA;AAGH,YAAI,aAAa,IAAI,EAAE,IAAI,oBAAoB;AAC/C;AAAA,MACF;AAAA,IAGF;AAEO,WAAA;AAAA,EACT,GAAG,CAAE,CAAA;AACP;"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/entity-validator/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EAAE,OAAO,EAAuB,MAAM,eAAe,CAAC;AAmf7D,QAAA,MAAM,eAAe,EAAE,OAAO,CAAC,eAAe,CAAC,eAG9C,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/entity-validator/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EAAE,OAAO,EAAO,MAAM,EAAU,MAAM,eAAe,CAAC;AAa7D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,aAAa,EAAE;QAEb,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC;QAErB,EAAE,CAAC,EAAE,MAAM,CAAC;QAGZ,OAAO,CAAC,EAAE,gBAAgB,CAAC;KAC5B,CAAC;IAEF,eAAe,EAAE,MAAM,EAAE,CAAC;IAG1B,cAAc,EAAE,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;CAClD,CAAC;AAWF,UAAU,gBAAgB;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AA8hBD,QAAA,MAAM,eAAe,EAAE,OAAO,CAAC,eAAe,CAAC,eAG9C,CAAC;AAEF,eAAe,eAAe,CAAC"}

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

@@ -1,6 +1,6 @@
 "use strict";
-const _$1 = require("lodash");
-const _ = require("lodash/fp");
+const _ = require("lodash");
+const fp = require("lodash/fp");
 const strapiUtils = require("@strapi/utils");
 const validators = require("./validators.js");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
@@ -55,7 +55,11 @@ const addDefault = (createOrUpdate) => {
   };
 };
 const preventCast = (validator) => validator.transform((val, originalVal) => originalVal);
-const createComponentValidator = (createOrUpdate) => ({ attr, updatedAttribute }, { isDraft }) => {
+const createComponentValidator = (createOrUpdate) => ({
+  attr,
+  updatedAttribute,
+  componentContext
+}, { isDraft }) => {
   const model = strapi.getModel(attr.component);
   if (!model) {
     throw new Error("Validation failed: Model not found");
@@ -63,7 +67,10 @@ const createComponentValidator = (createOrUpdate) => ({ attr, updatedAttribute }
   if (attr?.repeatable) {
     let validator2 = yup.array().of(
       yup.lazy(
-        (item) => createModelValidator(createOrUpdate)({ model, data: item }, { isDraft }).notNull()
+        (item) => createModelValidator(createOrUpdate)(
+          { componentContext, model, data: item },
+          { isDraft }
+        ).notNull()
       )
     );
     validator2 = addRequiredValidation(createOrUpdate)(validator2, {
@@ -74,7 +81,11 @@ const createComponentValidator = (createOrUpdate) => ({ attr, updatedAttribute }
     return validator2;
   }
   let validator = createModelValidator(createOrUpdate)(
-    { model, data: updatedAttribute.value },
+    {
+      model,
+      data: updatedAttribute.value,
+      componentContext
+    },
     { isDraft }
   );
   validator = addRequiredValidation(createOrUpdate)(validator, {
@@ -83,15 +94,20 @@ const createComponentValidator = (createOrUpdate) => ({ attr, updatedAttribute }
   });
   return validator;
 };
-const createDzValidator = (createOrUpdate) => ({ attr, updatedAttribute }, { isDraft }) => {
+const createDzValidator = (createOrUpdate) => ({ attr, updatedAttribute, componentContext }, { isDraft }) => {
   let validator;
   validator = yup.array().of(
     yup.lazy((item) => {
-      const model = strapi.getModel(_.prop("__component", item));
+      const model = strapi.getModel(fp.prop("__component", item));
       const schema = yup.object().shape({
         __component: yup.string().required().oneOf(Object.keys(strapi.components))
       }).notNull();
-      return model ? schema.concat(createModelValidator(createOrUpdate)({ model, data: item }, { isDraft })) : schema;
+      return model ? schema.concat(
+        createModelValidator(createOrUpdate)(
+          { model, data: item, componentContext },
+          { isDraft }
+        )
+      ) : schema;
     })
     // FIXME: yup v1
   );
@@ -102,22 +118,20 @@ const createDzValidator = (createOrUpdate) => ({ attr, updatedAttribute }, { isD
   validator = addMinMax(validator, { attr, updatedAttribute });
   return validator;
 };
-const createRelationValidator = (createOrUpdate) => ({ attr, updatedAttribute }, { isDraft }) => {
+const createRelationValidator = ({
+  updatedAttribute
+}) => {
   let validator;
   if (Array.isArray(updatedAttribute.value)) {
     validator = yup.array().of(yup.mixed());
   } else {
     validator = yup.mixed();
   }
-  validator = addRequiredValidation(createOrUpdate)(validator, {
-    attr: { required: !isDraft && attr.required },
-    updatedAttribute
-  });
   return validator;
 };
 const createScalarAttributeValidator = (createOrUpdate) => (metas, options) => {
   let validator;
-  if (_.has(metas.attr.type, validators)) {
+  if (fp.has(metas.attr.type, validators)) {
     validator = validators[metas.attr.type](metas, options);
   } else {
     validator = yup.mixed();
@@ -136,35 +150,58 @@ const createAttributeValidator = (createOrUpdate) => (metas, options) => {
     validator = createScalarAttributeValidator(createOrUpdate)(metas, options);
   } else {
     if (metas.attr.type === "component") {
+      const pathToComponent = [
+        ...metas?.componentContext?.pathToComponent ?? [],
+        metas.updatedAttribute.name
+      ];
+      const repeatableData = metas.attr.repeatable && pathToComponent.length === 1 ? metas.updatedAttribute.value : metas.componentContext?.repeatableData;
+      const newComponentContext = {
+        ...metas?.componentContext ?? {},
+        pathToComponent,
+        repeatableData
+      };
       validator = createComponentValidator(createOrUpdate)(
-        { attr: metas.attr, updatedAttribute: metas.updatedAttribute },
-        options
-      );
-    } else if (metas.attr.type === "dynamiczone") {
-      validator = createDzValidator(createOrUpdate)(metas, options);
-    } else if (metas.attr.type === "relation") {
-      validator = createRelationValidator(createOrUpdate)(
         {
+          componentContext: newComponentContext,
           attr: metas.attr,
           updatedAttribute: metas.updatedAttribute
         },
         options
       );
+    } else if (metas.attr.type === "dynamiczone") {
+      const pathToComponent = [
+        ...metas?.componentContext?.pathToComponent ?? [],
+        metas.updatedAttribute.name
+      ];
+      const newComponentContext = {
+        ...metas?.componentContext ?? {},
+        pathToComponent
+      };
+      validator = createDzValidator(createOrUpdate)(
+        { ...metas, componentContext: newComponentContext },
+        options
+      );
+    } else if (metas.attr.type === "relation") {
+      validator = createRelationValidator({
+        attr: metas.attr,
+        updatedAttribute: metas.updatedAttribute
+      });
     }
     validator = preventCast(validator);
   }
   validator = addDefault(createOrUpdate)(validator, metas);
   return validator;
 };
-const createModelValidator = (createOrUpdate) => ({ model, data, entity }, options) => {
+const createModelValidator = (createOrUpdate) => ({ componentContext, model, data, entity }, options) => {
   const writableAttributes = model ? getWritableAttributes(model) : [];
   const schema = writableAttributes.reduce(
     (validators2, attributeName) => {
       const metas = {
         attr: model.attributes[attributeName],
-        updatedAttribute: { name: attributeName, value: _.prop(attributeName, data) },
+        updatedAttribute: { name: attributeName, value: fp.prop(attributeName, data) },
         model,
-        entity
+        entity,
+        componentContext
       };
       const validator = createAttributeValidator(createOrUpdate)(metas, options);
       validators2[attributeName] = validator;
@@ -176,29 +213,49 @@ const createModelValidator = (createOrUpdate) => ({ model, data, entity }, optio
 };
 const createValidateEntity = (createOrUpdate) => {
   return async (model, data, options, entity) => {
-    if (!_.isObject(data)) {
+    if (!fp.isObject(data)) {
       const { displayName } = model.info;
       throw new ValidationError(
         `Invalid payload submitted for the ${createOrUpdate} of an entity of type ${displayName}. Expected an object, but got ${typeof data}`
       );
     }
     const validator = createModelValidator(createOrUpdate)(
-      { model, data, entity },
+      {
+        model,
+        data,
+        entity,
+        componentContext: {
+          // Set up the initial component context.
+          // Keeping track of parent content type context in which a component will be used.
+          // This is necessary to validate component field constraints such as uniqueness.
+          parentContent: {
+            id: entity?.id,
+            model,
+            options
+          },
+          pathToComponent: [],
+          repeatableData: []
+        }
+      },
       {
         isDraft: options?.isDraft ?? false,
         locale: options?.locale ?? null
       }
-    ).test("relations-test", "check that all relations exist", async function(data2) {
-      try {
-        await checkRelationsExist(buildRelationsStore({ uid: model.uid, data: data2 }));
-      } catch (e) {
-        return this.createError({
-          path: this.path,
-          message: e instanceof ValidationError && e.message || "Invalid relations"
-        });
+    ).test(
+      "relations-test",
+      "check that all relations exist",
+      async function relationsValidation(data2) {
+        try {
+          await checkRelationsExist(buildRelationsStore({ uid: model.uid, data: data2 }));
+        } catch (e) {
+          return this.createError({
+            path: this.path,
+            message: e instanceof ValidationError && e.message || "Invalid relations"
+          });
+        }
+        return true;
       }
-      return true;
-    }).required();
+    ).required();
     return validateYupSchema(validator, {
       strict: false,
       abortEarly: false
@@ -212,7 +269,7 @@ const buildRelationsStore = ({
   if (!uid) {
     throw new ValidationError(`Cannot build relations store: "uid" is undefined`);
   }
-  if (_.isEmpty(data)) {
+  if (fp.isEmpty(data)) {
     return {};
   }
   const currentModel = strapi.getModel(uid);
@@ -220,7 +277,7 @@ const buildRelationsStore = ({
     (result, attributeName) => {
       const attribute = currentModel.attributes[attributeName];
       const value = data[attributeName];
-      if (_$1.isNil(value)) {
+      if (_.isNil(value)) {
         return result;
       }
       switch (attribute.type) {
@@ -236,16 +293,16 @@ const buildRelationsStore = ({
           let source;
           if (Array.isArray(value)) {
             source = value;
-          } else if (_.isObject(value)) {
-            if ("connect" in value && !_$1.isNil(value.connect)) {
+          } else if (fp.isObject(value)) {
+            if ("connect" in value && !_.isNil(value.connect)) {
               source = value.connect;
-            } else if ("set" in value && !_$1.isNil(value.set)) {
+            } else if ("set" in value && !_.isNil(value.set)) {
               source = value.set;
             } else {
               source = [];
             }
           } else {
-            source = _$1.castArray(value);
+            source = _.castArray(value);
           }
           const idArray = source.map((v) => ({
             id: typeof v === "object" ? v.id : v
@@ -255,20 +312,20 @@ const buildRelationsStore = ({
           break;
         }
         case "component": {
-          return _$1.castArray(value).reduce((relationsStore, componentValue) => {
+          return _.castArray(value).reduce((relationsStore, componentValue) => {
             if (!attribute.component) {
               throw new ValidationError(
                 `Cannot build relations store from component, component identifier is undefined`
               );
             }
-            return _$1.mergeWith(
+            return _.mergeWith(
               relationsStore,
               buildRelationsStore({
                 uid: attribute.component,
                 data: componentValue
               }),
               (objValue, srcValue) => {
-                if (_$1.isArray(objValue)) {
+                if (_.isArray(objValue)) {
                   return objValue.concat(srcValue);
                 }
               }
@@ -276,21 +333,21 @@ const buildRelationsStore = ({
           }, result);
         }
         case "dynamiczone": {
-          return _$1.castArray(value).reduce((relationsStore, dzValue) => {
+          return _.castArray(value).reduce((relationsStore, dzValue) => {
             const value2 = dzValue;
             if (!value2.__component) {
               throw new ValidationError(
                 `Cannot build relations store from dynamiczone, component identifier is undefined`
               );
             }
-            return _$1.mergeWith(
+            return _.mergeWith(
               relationsStore,
               buildRelationsStore({
                 uid: value2.__component,
                 data: value2
               }),
               (objValue, srcValue) => {
-                if (_$1.isArray(objValue)) {
+                if (_.isArray(objValue)) {
                   return objValue.concat(srcValue);
                 }
               }
@@ -307,7 +364,7 @@ const checkRelationsExist = async (relationsStore = {}) => {
   const promises = [];
   for (const [key, value] of Object.entries(relationsStore)) {
     const evaluate = async () => {
-      const uniqueValues = _$1.uniqBy(value, `id`);
+      const uniqueValues = _.uniqBy(value, `id`);
       const count = await strapi.db.query(key).count({
         where: {
           id: {