@strapi/core 0.0.0-experimental.fc1ac2acd58c8a5a858679956b6d102ac5ee4011 → 0.0.0-experimental.fd379e4937e431407d784eaa5fe7f93cf2a53386

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

@@ -1,86 +1,53 @@
-import { isObject } from "lodash/fp";
-import { traverseEntity } from "@strapi/utils";
-import { isShortHand, isLongHand } from "../utils/data.mjs";
+import { curry } from "lodash/fp";
 import { getRelationTargetLocale } from "../utils/i18n.mjs";
 import { getRelationTargetStatus } from "../utils/dp.mjs";
-const handlePrimitive = (relation) => {
-  if (!relation) {
-    return [];
-  }
-  if (isShortHand(relation)) {
-    return [{ documentId: relation }];
-  }
-  if (isLongHand(relation)) {
-    if ("documentId" in relation) {
-      return [
-        { documentId: relation.documentId, locale: relation.locale, status: relation.status }
-      ];
-    }
-    return [];
-  }
-  if (Array.isArray(relation)) {
-    return relation.map((item) => isShortHand(item) ? { documentId: item } : item);
-  }
-  return [];
-};
-const extractRelationIds = (relation) => {
-  const ids = handlePrimitive(relation);
-  if (!isObject(relation))
-    return ids;
-  if ("set" in relation)
-    ids.push(...handlePrimitive(relation.set));
-  if ("disconnect" in relation)
-    ids.push(...handlePrimitive(relation.disconnect));
-  if ("connect" in relation) {
-    if (!relation.connect)
-      return [];
-    ids.push(...handlePrimitive(relation.connect));
-    const connect = Array.isArray(relation.connect) ? relation.connect : [relation.connect];
-    connect.forEach((relation2) => {
-      if (isShortHand(relation2) || !("position" in relation2))
-        return;
-      const { position } = relation2;
-      if (position?.before) {
-        ids.push(...handlePrimitive({ ...position, documentId: position.before }));
-      }
-      if (position?.after) {
-        ids.push(...handlePrimitive({ ...position, documentId: position.after }));
-      }
+import { traverseEntityRelations as traverseEntityRelationsCurried, mapRelation as mapRelationCurried } from "../utils/map-relation.mjs";
+const addRelationDocId = curry(
+  (idMap, targetUid, source, relation) => {
+    const targetLocale = getRelationTargetLocale(relation, {
+      targetUid,
+      sourceUid: source.uid,
+      sourceLocale: source.locale
+    });
+    const targetStatus = getRelationTargetStatus(relation, {
+      targetUid,
+      sourceUid: source.uid,
+      sourceStatus: source.status
+    });
+    targetStatus.forEach((status) => {
+      idMap.add({
+        uid: targetUid,
+        documentId: relation.documentId,
+        locale: targetLocale,
+        status
+      });
     });
   }
-  return ids;
-};
-const extractDataIds = (idMap, data, opts) => {
-  return traverseEntity(
-    ({ value, attribute }) => {
-      if (attribute.type === "relation") {
-        const extractedIds = extractRelationIds(value);
-        const target = attribute.target;
-        if (!target)
-          return;
-        extractedIds.forEach((relation) => {
-          const targetLocale = getRelationTargetLocale(relation, {
-            targetUid: target,
-            sourceUid: opts.uid,
-            sourceLocale: opts.locale
-          });
-          const targetStatus = getRelationTargetStatus(relation, {
-            targetUid: target,
-            sourceUid: opts.uid,
-            sourceStatus: opts.status
-          });
-          targetStatus.forEach((status) => {
-            idMap.add({
-              uid: target,
-              documentId: relation.documentId,
-              locale: targetLocale,
-              status
-            });
-          });
-        });
+);
+const extractDataIds = (idMap, data, source) => {
+  return traverseEntityRelationsCurried(
+    async ({ attribute, value }) => {
+      if (!attribute) {
+        return;
       }
+      const targetUid = attribute.target;
+      const addDocId = addRelationDocId(idMap, targetUid, source);
+      return mapRelationCurried((relation) => {
+        if (!relation || !relation.documentId) {
+          return relation;
+        }
+        addDocId(relation);
+        const position = relation.position;
+        if (position?.before) {
+          addDocId({ ...relation, ...position, documentId: position.before });
+        }
+        if (position?.after) {
+          addDocId({ ...relation, ...position, documentId: position.after });
+        }
+        return relation;
+      }, value);
     },
-    { schema: strapi.getModel(opts.uid) },
+    { schema: strapi.getModel(source.uid), getModel: strapi.getModel.bind(strapi) },
     data
   );
 };

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

@@ -1 +1 @@
-{"version":3,"file":"data-ids.mjs","sources":["../../../../../../src/services/document-service/transform/relations/extract/data-ids.ts"],"sourcesContent":["import { isObject } from 'lodash/fp';\nimport { EntityService, Attribute, Common } from '@strapi/types';\nimport { traverseEntity } from '@strapi/utils';\nimport { IdMap } from '../../id-map';\nimport { ShortHand, LongHand, LongHandDocument } from '../utils/types';\nimport { isShortHand, isLongHand } from '../utils/data';\nimport { getRelationTargetLocale } from '../utils/i18n';\nimport { getRelationTargetStatus } from '../utils/dp';\n\n/**\n *  Get relation ids from primitive representation (id, id[], {id}, {id}[])\n */\nconst handlePrimitive = (\n  relation: ShortHand | LongHand | ShortHand[] | LongHand[] | null | undefined | any\n): LongHandDocument[] => {\n  if (!relation) {\n    return []; // null\n  }\n\n  if (isShortHand(relation)) {\n    return [{ documentId: relation }]; // id\n  }\n\n  if (isLongHand(relation)) {\n    // { documentId, locale? }\n    if ('documentId' in relation) {\n      return [\n        { documentId: relation.documentId, locale: relation.locale, status: relation.status },\n      ];\n    }\n    // { id }\n    return [];\n  }\n\n  if (Array.isArray(relation)) {\n    return relation.map((item) => (isShortHand(item) ? { documentId: item } : item)); // id[]\n  }\n\n  return [];\n};\n\n/**\n * Get all relations document ids from a relation input value\n */\nconst extractRelationIds = <T extends Attribute.RelationKind.Any>(\n  relation: EntityService.Params.Attribute.RelationInputValue<T>\n): LongHandDocument[] => {\n  const ids = handlePrimitive(relation);\n  if (!isObject(relation)) return ids;\n\n  if ('set' in relation) ids.push(...handlePrimitive(relation.set)); // set: id[]\n  if ('disconnect' in relation) ids.push(...handlePrimitive(relation.disconnect)); // disconnect: id[]\n  if ('connect' in relation) {\n    // connect: id[] | { id } | ...\n    if (!relation.connect) return [];\n    ids.push(...handlePrimitive(relation.connect));\n\n    // handle positional arguments\n    const connect = Array.isArray(relation.connect) ? relation.connect : [relation.connect];\n    connect.forEach((relation) => {\n      if (isShortHand(relation) || !('position' in relation)) return;\n\n      const { position } = relation;\n\n      // { connect: { id: id, position: { before: id } } }\n      if (position?.before) {\n        ids.push(...handlePrimitive({ ...position, documentId: position.before }));\n      }\n\n      // { connect: { id: id, position: { after: id } } }\n      if (position?.after) {\n        ids.push(...handlePrimitive({ ...position, documentId: position.after }));\n      }\n    });\n  }\n\n  return ids;\n};\n\n/**\n * Iterate over all attributes of a Data object and extract all relational document ids.\n * Those will later be transformed to entity ids.\n */\nconst extractDataIds = (\n  idMap: IdMap,\n  data: Record<string, any>,\n  opts: { uid: Common.UID.Schema; locale?: string | null; status?: 'draft' | 'published' }\n) => {\n  return traverseEntity(\n    ({ value, attribute }) => {\n      // Find relational attributes, and return the document ids\n      if (attribute.type === 'relation') {\n        const extractedIds = extractRelationIds(value as any);\n\n        // TODO: Handle morph relations (they have multiple targets)\n        const target = attribute.target;\n        if (!target) return;\n\n        // If not connecting to any version on disabled d&p, we should connect to both draft and published relations at the same time\n        extractedIds.forEach((relation) => {\n          const targetLocale = getRelationTargetLocale(relation, {\n            targetUid: target as Common.UID.Schema,\n            sourceUid: opts.uid,\n            sourceLocale: opts.locale,\n          });\n\n          const targetStatus = getRelationTargetStatus(relation, {\n            targetUid: target as Common.UID.Schema,\n            sourceUid: opts.uid,\n            sourceStatus: opts.status,\n          });\n\n          targetStatus.forEach((status) => {\n            idMap.add({\n              uid: target,\n              documentId: relation.documentId,\n              locale: targetLocale,\n              status,\n            });\n          });\n        });\n      }\n    },\n    { schema: strapi.getModel(opts.uid) },\n    data\n  );\n};\n\nexport { extractDataIds };\n"],"names":["relation"],"mappings":";;;;;AAYA,MAAM,kBAAkB,CACtB,aACuB;AACvB,MAAI,CAAC,UAAU;AACb,WAAO;EACT;AAEI,MAAA,YAAY,QAAQ,GAAG;AACzB,WAAO,CAAC,EAAE,YAAY,SAAA,CAAU;AAAA,EAClC;AAEI,MAAA,WAAW,QAAQ,GAAG;AAExB,QAAI,gBAAgB,UAAU;AACrB,aAAA;AAAA,QACL,EAAE,YAAY,SAAS,YAAY,QAAQ,SAAS,QAAQ,QAAQ,SAAS,OAAO;AAAA,MAAA;AAAA,IAExF;AAEA,WAAO;EACT;AAEI,MAAA,MAAM,QAAQ,QAAQ,GAAG;AACpB,WAAA,SAAS,IAAI,CAAC,SAAU,YAAY,IAAI,IAAI,EAAE,YAAY,KAAK,IAAI,IAAK;AAAA,EACjF;AAEA,SAAO;AACT;AAKA,MAAM,qBAAqB,CACzB,aACuB;AACjB,QAAA,MAAM,gBAAgB,QAAQ;AAChC,MAAA,CAAC,SAAS,QAAQ;AAAU,WAAA;AAEhC,MAAI,SAAS;AAAU,QAAI,KAAK,GAAG,gBAAgB,SAAS,GAAG,CAAC;AAChE,MAAI,gBAAgB;AAAU,QAAI,KAAK,GAAG,gBAAgB,SAAS,UAAU,CAAC;AAC9E,MAAI,aAAa,UAAU;AAEzB,QAAI,CAAC,SAAS;AAAS,aAAO;AAC9B,QAAI,KAAK,GAAG,gBAAgB,SAAS,OAAO,CAAC;AAGvC,UAAA,UAAU,MAAM,QAAQ,SAAS,OAAO,IAAI,SAAS,UAAU,CAAC,SAAS,OAAO;AAC9E,YAAA,QAAQ,CAACA,cAAa;AAC5B,UAAI,YAAYA,SAAQ,KAAK,EAAE,cAAcA;AAAW;AAElD,YAAA,EAAE,SAAaA,IAAAA;AAGrB,UAAI,UAAU,QAAQ;AAChB,YAAA,KAAK,GAAG,gBAAgB,EAAE,GAAG,UAAU,YAAY,SAAS,OAAQ,CAAA,CAAC;AAAA,MAC3E;AAGA,UAAI,UAAU,OAAO;AACf,YAAA,KAAK,GAAG,gBAAgB,EAAE,GAAG,UAAU,YAAY,SAAS,MAAO,CAAA,CAAC;AAAA,MAC1E;AAAA,IAAA,CACD;AAAA,EACH;AAEO,SAAA;AACT;AAMA,MAAM,iBAAiB,CACrB,OACA,MACA,SACG;AACI,SAAA;AAAA,IACL,CAAC,EAAE,OAAO,gBAAgB;AAEpB,UAAA,UAAU,SAAS,YAAY;AAC3B,cAAA,eAAe,mBAAmB,KAAY;AAGpD,cAAM,SAAS,UAAU;AACzB,YAAI,CAAC;AAAQ;AAGA,qBAAA,QAAQ,CAAC,aAAa;AAC3B,gBAAA,eAAe,wBAAwB,UAAU;AAAA,YACrD,WAAW;AAAA,YACX,WAAW,KAAK;AAAA,YAChB,cAAc,KAAK;AAAA,UAAA,CACpB;AAEK,gBAAA,eAAe,wBAAwB,UAAU;AAAA,YACrD,WAAW;AAAA,YACX,WAAW,KAAK;AAAA,YAChB,cAAc,KAAK;AAAA,UAAA,CACpB;AAEY,uBAAA,QAAQ,CAAC,WAAW;AAC/B,kBAAM,IAAI;AAAA,cACR,KAAK;AAAA,cACL,YAAY,SAAS;AAAA,cACrB,QAAQ;AAAA,cACR;AAAA,YAAA,CACD;AAAA,UAAA,CACF;AAAA,QAAA,CACF;AAAA,MACH;AAAA,IACF;AAAA,IACA,EAAE,QAAQ,OAAO,SAAS,KAAK,GAAG,EAAE;AAAA,IACpC;AAAA,EAAA;AAEJ;"}
+{"version":3,"file":"data-ids.mjs","sources":["../../../../../../src/services/document-service/transform/relations/extract/data-ids.ts"],"sourcesContent":["import { curry } from 'lodash/fp';\n\nimport { UID } from '@strapi/types';\n\nimport { IdMap } from '../../id-map';\nimport { getRelationTargetLocale } from '../utils/i18n';\nimport { getRelationTargetStatus } from '../utils/dp';\nimport { mapRelation, traverseEntityRelations } from '../utils/map-relation';\nimport { LongHandDocument } from '../utils/types';\n\ninterface Options {\n  uid: UID.Schema;\n  locale?: string | null;\n  status?: 'draft' | 'published';\n}\n\n/**\n * Load a relation documentId into the idMap.\n */\nconst addRelationDocId = curry(\n  (idMap: IdMap, targetUid: UID.Schema, source: Options, relation: LongHandDocument) => {\n    const targetLocale = getRelationTargetLocale(relation, {\n      targetUid,\n      sourceUid: source.uid,\n      sourceLocale: source.locale,\n    });\n\n    const targetStatus = getRelationTargetStatus(relation, {\n      targetUid,\n      sourceUid: source.uid,\n      sourceStatus: source.status,\n    });\n\n    targetStatus.forEach((status) => {\n      idMap.add({\n        uid: targetUid,\n        documentId: relation.documentId,\n        locale: targetLocale,\n        status,\n      });\n    });\n  }\n);\n\n/**\n * Iterate over all relations of a data object and extract all relational document ids.\n * Those will later be transformed to entity ids.\n */\nconst extractDataIds = (idMap: IdMap, data: Record<string, any>, source: Options) => {\n  return traverseEntityRelations(\n    async ({ attribute, value }) => {\n      if (!attribute) {\n        return;\n      }\n\n      const targetUid = attribute.target!;\n      const addDocId = addRelationDocId(idMap, targetUid, source);\n\n      return mapRelation((relation) => {\n        if (!relation || !relation.documentId) {\n          return relation;\n        }\n\n        addDocId(relation);\n\n        // Handle positional arguments\n        const position = relation.position;\n\n        if (position?.before) {\n          addDocId({ ...relation, ...position, documentId: position.before });\n        }\n\n        if (position?.after) {\n          addDocId({ ...relation, ...position, documentId: position.after });\n        }\n\n        return relation;\n      }, value as any);\n    },\n    { schema: strapi.getModel(source.uid), getModel: strapi.getModel.bind(strapi) },\n    data\n  );\n};\n\nexport { extractDataIds };\n"],"names":["traverseEntityRelations","mapRelation"],"mappings":";;;;AAmBA,MAAM,mBAAmB;AAAA,EACvB,CAAC,OAAc,WAAuB,QAAiB,aAA+B;AAC9E,UAAA,eAAe,wBAAwB,UAAU;AAAA,MACrD;AAAA,MACA,WAAW,OAAO;AAAA,MAClB,cAAc,OAAO;AAAA,IAAA,CACtB;AAEK,UAAA,eAAe,wBAAwB,UAAU;AAAA,MACrD;AAAA,MACA,WAAW,OAAO;AAAA,MAClB,cAAc,OAAO;AAAA,IAAA,CACtB;AAEY,iBAAA,QAAQ,CAAC,WAAW;AAC/B,YAAM,IAAI;AAAA,QACR,KAAK;AAAA,QACL,YAAY,SAAS;AAAA,QACrB,QAAQ;AAAA,QACR;AAAA,MAAA,CACD;AAAA,IAAA,CACF;AAAA,EACH;AACF;AAMA,MAAM,iBAAiB,CAAC,OAAc,MAA2B,WAAoB;AAC5E,SAAAA;AAAAA,IACL,OAAO,EAAE,WAAW,YAAY;AAC9B,UAAI,CAAC,WAAW;AACd;AAAA,MACF;AAEA,YAAM,YAAY,UAAU;AAC5B,YAAM,WAAW,iBAAiB,OAAO,WAAW,MAAM;AAEnD,aAAAC,mBAAY,CAAC,aAAa;AAC/B,YAAI,CAAC,YAAY,CAAC,SAAS,YAAY;AAC9B,iBAAA;AAAA,QACT;AAEA,iBAAS,QAAQ;AAGjB,cAAM,WAAW,SAAS;AAE1B,YAAI,UAAU,QAAQ;AACX,mBAAA,EAAE,GAAG,UAAU,GAAG,UAAU,YAAY,SAAS,QAAQ;AAAA,QACpE;AAEA,YAAI,UAAU,OAAO;AACV,mBAAA,EAAE,GAAG,UAAU,GAAG,UAAU,YAAY,SAAS,OAAO;AAAA,QACnE;AAEO,eAAA;AAAA,SACN,KAAY;AAAA,IACjB;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/transform/data-ids.d.ts

@@ -1,10 +1,14 @@
-import { Common } from '@strapi/types';
+import type { UID } from '@strapi/types';
 import { IdMap } from '../../id-map';
-declare const transformDataIdsVisitor: (idMap: IdMap, data: Record<string, any>, opts: {
-    uid: Common.UID.Schema;
+interface Options {
+    uid: UID.Schema;
     locale?: string | null;
     status?: 'draft' | 'published';
     allowMissingId?: boolean;
-}) => Promise<import("@strapi/utils/dist/types").Data>;
+}
+/**
+ * Iterate over all relations of a data object and transform all relational document ids to entity ids.
+ */
+declare const transformDataIdsVisitor: (idMap: IdMap, data: Record<string, any>, source: Options) => Promise<import("@strapi/utils/dist/types").Data>;
 export { transformDataIdsVisitor };
 //# sourceMappingURL=data-ids.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"data-ids.d.ts","sourceRoot":"","sources":["../../../../../../src/services/document-service/transform/relations/transform/data-ids.ts"],"names":[],"mappings":"AAEA,OAAO,EAA4B,MAAM,EAAE,MAAM,eAAe,CAAC;AAKjE,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AA8JrC,QAAA,MAAM,uBAAuB,UACpB,KAAK,QACN,OAAO,MAAM,EAAE,GAAG,CAAC,QACnB;IACJ,GAAG,EAAE,OAAO,GAAG,CAAC,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,qDA6DF,CAAC;AAEF,OAAO,EAAE,uBAAuB,EAAE,CAAC"}
+{"version":3,"file":"data-ids.d.ts","sourceRoot":"","sources":["../../../../../../src/services/document-service/transform/relations/transform/data-ids.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAIzC,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAKrC,UAAU,OAAO;IACf,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AA+CD;;GAEG;AACH,QAAA,MAAM,uBAAuB,UAAW,KAAK,QAAQ,OAAO,MAAM,EAAE,GAAG,CAAC,UAAU,OAAO,qDAgDxF,CAAC;AAEF,OAAO,EAAE,uBAAuB,EAAE,CAAC"}

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

@@ -1,140 +1,75 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const _ = require("lodash/fp");
+const fp = require("lodash/fp");
 const strapiUtils = require("@strapi/utils");
-const data = require("../utils/data.js");
 const i18n = require("../utils/i18n.js");
 const dp = require("../utils/dp.js");
-const isNumeric = (value) => {
-  if (Array.isArray(value))
-    return false;
-  const parsed = parseInt(value, 10);
-  return !Number.isNaN(parsed);
-};
-const transformPrimitive = (relation, getIds) => {
-  if (isNumeric(relation)) {
-    return relation;
-  }
-  if (_.isNil(relation)) {
-    return relation;
-  }
-  if (data.isShortHand(relation)) {
-    const ids = getIds(relation);
-    if (ids?.length === 1)
-      return ids[0];
+const mapRelation = require("../utils/map-relation.js");
+const getRelationIds = fp.curry(
+  (idMap, targetUid, source, relation) => {
+    const targetLocale = i18n.getRelationTargetLocale(relation, {
+      targetUid,
+      sourceUid: source.uid,
+      sourceLocale: source.locale
+    });
+    const targetStatus = dp.getRelationTargetStatus(relation, {
+      targetUid,
+      sourceUid: source.uid,
+      sourceStatus: source.status
+    });
+    const ids = [];
+    for (const tStatus of targetStatus) {
+      const entryId = idMap.get({
+        uid: targetUid,
+        documentId: relation.documentId,
+        locale: targetLocale,
+        status: tStatus
+      });
+      if (entryId)
+        ids.push(entryId);
+    }
+    if (!ids.length && !source.allowMissingId) {
+      throw new strapiUtils.errors.ValidationError(
+        `Document with id "${relation.documentId}", locale "${targetLocale}" not found`
+      );
+    }
     return ids;
   }
-  if (data.isLongHand(relation)) {
-    if (!("documentId" in relation))
-      return relation;
-    const ids = getIds(relation.documentId, relation.locale, relation.status);
-    if (!ids?.length)
-      return void 0;
-    if (ids.length === 1)
-      return { id: ids[0], ..._.pick(["position"], relation) };
-    return ids.map((id) => ({ id, ..._.pick(["position"], relation) }));
-  }
-  if (Array.isArray(relation)) {
-    return relation.flatMap((item) => transformPrimitive(item, getIds)).filter(Boolean);
-  }
-  return void 0;
-};
-const transformRelationIdsVisitor = (relation, getIds) => {
-  const map = transformPrimitive(relation, getIds);
-  if (map)
-    return map;
-  if (!_.isObject(relation))
-    return relation;
-  if (!("set" in relation) && !("disconnect" in relation) && !("connect" in relation)) {
-    return;
-  }
-  if ("set" in relation) {
-    relation.set = transformPrimitive(relation.set, getIds);
-  }
-  if ("disconnect" in relation) {
-    relation.disconnect = transformPrimitive(relation.disconnect, getIds);
-  }
-  if ("connect" in relation) {
-    relation.connect = transformPrimitive(relation.connect, getIds);
-    const mapPosition = (relation2) => {
-      if (data.isShortHand(relation2) || !("position" in relation2))
-        return relation2;
-      const position = { ...relation2?.position };
-      if (position?.before) {
-        const result = transformPrimitive({ ...position, documentId: position.before }, getIds);
-        if (Array.isArray(result)) {
-          position.before = result[0]?.id;
-        } else {
-          position.before = result?.id;
-        }
+);
+const transformDataIdsVisitor = (idMap, data, source) => {
+  return mapRelation.traverseEntityRelations(
+    async ({ key, value, attribute }, { set }) => {
+      if (!attribute) {
+        return;
       }
-      if (position?.after) {
-        const result = transformPrimitive({ ...position, documentId: position.after }, getIds);
-        if (Array.isArray(result)) {
-          position.after = result[0]?.id;
-        } else {
-          position.after = result?.id;
+      const targetUid = attribute.target;
+      const getIds = getRelationIds(idMap, targetUid, source);
+      const newRelation = await mapRelation.mapRelation((relation) => {
+        if (!relation || !relation.documentId) {
+          return relation;
         }
-      }
-      return { ...relation2, position };
-    };
-    if (Array.isArray(relation.connect)) {
-      relation.connect = relation.connect.map(mapPosition);
-    } else {
-      relation.connect = mapPosition(relation.connect);
-    }
-  }
-  return relation;
-};
-const EXCLUDED_FIELDS = [
-  "createdBy",
-  "updatedBy",
-  "localizations",
-  "strapi_stage",
-  "strapi_assignee"
-];
-const transformDataIdsVisitor = (idMap, data2, opts) => {
-  return strapiUtils.traverseEntity(
-    ({ key, value, attribute }, { set }) => {
-      if (attribute.type === "relation") {
-        const target = attribute.target;
-        if (!target)
-          return;
-        if (EXCLUDED_FIELDS.includes(key))
-          return;
-        const getIds = (documentId, locale, status) => {
-          const targetLocale = i18n.getRelationTargetLocale(
-            { documentId, locale },
-            { targetUid: target, sourceUid: opts.uid, sourceLocale: opts.locale }
-          );
-          const targetStatuses = dp.getRelationTargetStatus(
-            { documentId, status },
-            { targetUid: target, sourceUid: opts.uid, sourceStatus: opts.status }
-          );
-          const ids = [];
-          for (const targetStatus of targetStatuses) {
-            const entryId = idMap.get({
-              uid: target,
-              documentId,
-              locale: targetLocale,
-              status: targetStatus
-            });
-            if (entryId)
-              ids.push(entryId);
-          }
-          if (!ids.length && !opts.allowMissingId) {
-            throw new strapiUtils.errors.ValidationError(
-              `Document with id "${documentId}", locale "${targetLocale}" not found`
-            );
+        const ids = getIds(relation);
+        const position = { ...relation.position };
+        if (position.before) {
+          const beforeRelation = { ...relation, ...position, documentId: position.before };
+          position.before = getIds(beforeRelation).at(0);
+        }
+        if (position.after) {
+          const afterRelation = { ...relation, ...position, documentId: position.after };
+          position.after = getIds(afterRelation).at(0);
+        }
+        return ids?.map((id) => {
+          const newRelation2 = { id };
+          if (relation.position) {
+            newRelation2.position = position;
           }
-          return ids;
-        };
-        const newRelation = transformRelationIdsVisitor(value, getIds);
-        set(key, newRelation);
-      }
+          return newRelation2;
+        });
+      }, value);
+      set(key, newRelation);
     },
-    { schema: strapi.getModel(opts.uid) },
-    data2
+    { schema: strapi.getModel(source.uid), getModel: strapi.getModel.bind(strapi) },
+    data
   );
 };
 exports.transformDataIdsVisitor = transformDataIdsVisitor;

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

@@ -1 +1 @@
-{"version":3,"file":"data-ids.js","sources":["../../../../../../src/services/document-service/transform/relations/transform/data-ids.ts"],"sourcesContent":["import { isObject, isNil, pick } from 'lodash/fp';\n\nimport { EntityService, Attribute, Common } from '@strapi/types';\nimport { traverseEntity, errors } from '@strapi/utils';\n\nimport { ShortHand, LongHand, ID, GetIds } from '../utils/types';\nimport { isShortHand, isLongHand } from '../utils/data';\nimport { IdMap } from '../../id-map';\nimport { getRelationTargetLocale } from '../utils/i18n';\nimport { getRelationTargetStatus } from '../utils/dp';\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\n/**\n * Transform primitive relation representation to entry ids\n *\n *  docId -> id\n *  [docId] -> [id]\n *  { documentID, locale, status } -> { id }\n *  [{ documentID, locale, status }] -> [{ id }]\n *\n * Note: There are scenarios where a single documentID can map to multiple ids.\n * By default the returned format will match the input format.\n * Only when the docID maps to multiple ids, an array will always be returned, regardless of the input format.\n */\nconst transformPrimitive = <T extends ShortHand | LongHand>(\n  relation: T | T[] | null | undefined,\n  getIds: GetIds\n): T | T[] | undefined => {\n  // TODO: Remove this, we should use the long hand version with 'id' for this case\n  // If id value is a number, return it as is, it's already an entry id\n  if (isNumeric(relation)) {\n    return relation;\n  }\n\n  // null\n  if (isNil(relation)) {\n    return relation as T | undefined;\n  }\n\n  // id\n  if (isShortHand(relation)) {\n    const ids = getIds(relation) as T[];\n\n    // Return it with the same format for consistency\n    if (ids?.length === 1) return ids[0];\n\n    // Return an array if multiple ids are found\n    return ids;\n  }\n\n  // { id }\n  if (isLongHand(relation)) {\n    // If the id is already an entry id, return it as is\n    if (!('documentId' in relation)) return relation;\n\n    // @ts-expect-error - TODO: Add relation type\n    const ids = getIds(relation.documentId, relation.locale, relation.status);\n\n    // No ids to connect\n    if (!ids?.length) return undefined;\n\n    // Return it with the same format for consistency\n    if (ids.length === 1) return { id: ids[0], ...pick(['position'], relation) } as T;\n\n    // Return an array if it multiple ids are found\n    return ids.map((id: ID) => ({ id, ...pick(['position'], relation) })) as T[];\n  }\n\n  // id[]\n  if (Array.isArray(relation)) {\n    return relation.flatMap((item) => transformPrimitive(item, getIds)).filter(Boolean) as T[];\n  }\n\n  return undefined;\n};\n\n/**\n * Transform ids in any type of relation input value\n *  - set: [docId]\n *  - disconnect: [docId]\n *  - connect: [docId]\n * Or using any of the other primitive representations\n */\nconst transformRelationIdsVisitor = <T extends Attribute.RelationKind.Any>(\n  relation: EntityService.Params.Attribute.RelationInputValue<T>,\n  getIds: GetIds\n): EntityService.Params.Attribute.RelationInputValue<T> | undefined => {\n  const map = transformPrimitive(relation as any, getIds);\n  if (map) return map;\n\n  if (!isObject(relation)) return relation;\n\n  if (!('set' in relation) && !('disconnect' in relation) && !('connect' in relation)) {\n    // The entry id couldn't be found and there are no connection properties in\n    // the relation, therefore we want to remove the relation\n    return;\n  }\n\n  // set: id[]\n  // what if result of mapPrimitive is undefined?\n  if ('set' in relation) {\n    relation.set = transformPrimitive(relation.set as any, getIds);\n  }\n\n  if ('disconnect' in relation) {\n    relation.disconnect = transformPrimitive(relation.disconnect as any, getIds);\n  }\n\n  if ('connect' in relation) {\n    // connect: id[] | { id } | ...\n    relation.connect = transformPrimitive(relation.connect as any, getIds);\n\n    const mapPosition = (relation: any) => {\n      if (isShortHand(relation) || !('position' in relation)) return relation;\n\n      const position = { ...relation?.position };\n\n      // { connect: { id: id, position: { before: id } } }\n      if (position?.before) {\n        const result = transformPrimitive({ ...position, documentId: position.before }, getIds);\n\n        if (Array.isArray(result)) {\n          position.before = result[0]?.id;\n        } else {\n          position.before = result?.id;\n        }\n      }\n\n      // { connect: { id: id, position: { after: id } } }\n      if (position?.after) {\n        const result = transformPrimitive({ ...position, documentId: position.after }, getIds);\n\n        if (Array.isArray(result)) {\n          position.after = result[0]?.id;\n        } else {\n          position.after = result?.id;\n        }\n      }\n\n      return { ...relation, position };\n    };\n\n    if (Array.isArray(relation.connect)) {\n      relation.connect = relation.connect.map(mapPosition);\n    } else {\n      relation.connect = mapPosition(relation.connect);\n    }\n  }\n\n  return relation;\n};\n\nconst EXCLUDED_FIELDS = [\n  'createdBy',\n  'updatedBy',\n  'localizations',\n  'strapi_stage',\n  'strapi_assignee',\n];\n\nconst transformDataIdsVisitor = (\n  idMap: IdMap,\n  data: Record<string, any>,\n  opts: {\n    uid: Common.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  return traverseEntity(\n    ({ key, value, attribute }, { set }) => {\n      // Find relational attributes, and return the document ids\n      if (attribute.type === 'relation') {\n        const target = attribute.target as Common.UID.Schema | undefined;\n        // TODO: Handle polymorphic relations\n        if (!target) return;\n        // TODO: V5 remove excluded fields and use { id: } syntax for those relations\n        if (EXCLUDED_FIELDS.includes(key)) return;\n\n        const getIds = (\n          documentId: ID,\n          locale?: string,\n          status?: 'draft' | 'published'\n        ): ID[] | null => {\n          // locale to connect to\n          const targetLocale = getRelationTargetLocale(\n            { documentId, locale },\n            { targetUid: target, sourceUid: opts.uid, sourceLocale: opts.locale }\n          );\n\n          // status(es) to connect to\n          const targetStatuses = getRelationTargetStatus(\n            { documentId, status },\n            { targetUid: target, sourceUid: opts.uid, sourceStatus: opts.status }\n          );\n\n          const ids = [];\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 targetStatus of targetStatuses) {\n            const entryId = idMap.get({\n              uid: target,\n              documentId,\n              locale: targetLocale,\n              status: targetStatus,\n            });\n\n            if (entryId) ids.push(entryId);\n          }\n\n          if (!ids.length && !opts.allowMissingId) {\n            throw new errors.ValidationError(\n              `Document with id \"${documentId}\", locale \"${targetLocale}\" not found`\n            );\n          }\n\n          return ids;\n        };\n\n        const newRelation = transformRelationIdsVisitor(value as any, getIds);\n        set(key, newRelation as any);\n      }\n    },\n    { schema: strapi.getModel(opts.uid) },\n    data\n  );\n};\n\nexport { transformDataIdsVisitor };\n"],"names":["isNil","isShortHand","isLongHand","pick","isObject","relation","data","traverseEntity","getRelationTargetLocale","getRelationTargetStatus","errors"],"mappings":"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"}
+{"version":3,"file":"data-ids.js","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":["curry","getRelationTargetLocale","getRelationTargetStatus","errors","traverseEntityRelations","mapRelation","newRelation"],"mappings":";;;;;;;AAqBA,MAAM,iBAAiBA,GAAA;AAAA,EACrB,CAAC,OAAc,WAAuB,QAAiB,aAA+B;AAE9E,UAAA,eAAeC,6BAAwB,UAAU;AAAA,MACrD;AAAA,MACA,WAAW,OAAO;AAAA,MAClB,cAAc,OAAO;AAAA,IAAA,CACtB;AAGK,UAAA,eAAeC,2BAAwB,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,IAAIC,YAAO,OAAA;AAAA,QACf,qBAAqB,SAAS,UAAU,cAAc,YAAY;AAAA,MAAA;AAAA,IAEtE;AAEO,WAAA;AAAA,EACT;AACF;AAKA,MAAM,0BAA0B,CAAC,OAAc,MAA2B,WAAoB;AACrF,SAAAC,YAAA;AAAA,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,wBAAY,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/transform/data-ids.mjs

@@ -1,137 +1,72 @@
-import { isObject, isNil, pick } from "lodash/fp";
-import { traverseEntity, errors } from "@strapi/utils";
-import { isShortHand, isLongHand } from "../utils/data.mjs";
+import { curry } from "lodash/fp";
+import { errors } from "@strapi/utils";
 import { getRelationTargetLocale } from "../utils/i18n.mjs";
 import { getRelationTargetStatus } from "../utils/dp.mjs";
-const isNumeric = (value) => {
-  if (Array.isArray(value))
-    return false;
-  const parsed = parseInt(value, 10);
-  return !Number.isNaN(parsed);
-};
-const transformPrimitive = (relation, getIds) => {
-  if (isNumeric(relation)) {
-    return relation;
-  }
-  if (isNil(relation)) {
-    return relation;
-  }
-  if (isShortHand(relation)) {
-    const ids = getIds(relation);
-    if (ids?.length === 1)
-      return ids[0];
+import { traverseEntityRelations as traverseEntityRelationsCurried, mapRelation as mapRelationCurried } from "../utils/map-relation.mjs";
+const getRelationIds = curry(
+  (idMap, targetUid, source, relation) => {
+    const targetLocale = getRelationTargetLocale(relation, {
+      targetUid,
+      sourceUid: source.uid,
+      sourceLocale: source.locale
+    });
+    const targetStatus = getRelationTargetStatus(relation, {
+      targetUid,
+      sourceUid: source.uid,
+      sourceStatus: source.status
+    });
+    const ids = [];
+    for (const tStatus of targetStatus) {
+      const entryId = idMap.get({
+        uid: targetUid,
+        documentId: relation.documentId,
+        locale: targetLocale,
+        status: tStatus
+      });
+      if (entryId)
+        ids.push(entryId);
+    }
+    if (!ids.length && !source.allowMissingId) {
+      throw new errors.ValidationError(
+        `Document with id "${relation.documentId}", locale "${targetLocale}" not found`
+      );
+    }
     return ids;
   }
-  if (isLongHand(relation)) {
-    if (!("documentId" in relation))
-      return relation;
-    const ids = getIds(relation.documentId, relation.locale, relation.status);
-    if (!ids?.length)
-      return void 0;
-    if (ids.length === 1)
-      return { id: ids[0], ...pick(["position"], relation) };
-    return ids.map((id) => ({ id, ...pick(["position"], relation) }));
-  }
-  if (Array.isArray(relation)) {
-    return relation.flatMap((item) => transformPrimitive(item, getIds)).filter(Boolean);
-  }
-  return void 0;
-};
-const transformRelationIdsVisitor = (relation, getIds) => {
-  const map = transformPrimitive(relation, getIds);
-  if (map)
-    return map;
-  if (!isObject(relation))
-    return relation;
-  if (!("set" in relation) && !("disconnect" in relation) && !("connect" in relation)) {
-    return;
-  }
-  if ("set" in relation) {
-    relation.set = transformPrimitive(relation.set, getIds);
-  }
-  if ("disconnect" in relation) {
-    relation.disconnect = transformPrimitive(relation.disconnect, getIds);
-  }
-  if ("connect" in relation) {
-    relation.connect = transformPrimitive(relation.connect, getIds);
-    const mapPosition = (relation2) => {
-      if (isShortHand(relation2) || !("position" in relation2))
-        return relation2;
-      const position = { ...relation2?.position };
-      if (position?.before) {
-        const result = transformPrimitive({ ...position, documentId: position.before }, getIds);
-        if (Array.isArray(result)) {
-          position.before = result[0]?.id;
-        } else {
-          position.before = result?.id;
-        }
+);
+const transformDataIdsVisitor = (idMap, data, source) => {
+  return traverseEntityRelationsCurried(
+    async ({ key, value, attribute }, { set }) => {
+      if (!attribute) {
+        return;
       }
-      if (position?.after) {
-        const result = transformPrimitive({ ...position, documentId: position.after }, getIds);
-        if (Array.isArray(result)) {
-          position.after = result[0]?.id;
-        } else {
-          position.after = result?.id;
+      const targetUid = attribute.target;
+      const getIds = getRelationIds(idMap, targetUid, source);
+      const newRelation = await mapRelationCurried((relation) => {
+        if (!relation || !relation.documentId) {
+          return relation;
         }
-      }
-      return { ...relation2, position };
-    };
-    if (Array.isArray(relation.connect)) {
-      relation.connect = relation.connect.map(mapPosition);
-    } else {
-      relation.connect = mapPosition(relation.connect);
-    }
-  }
-  return relation;
-};
-const EXCLUDED_FIELDS = [
-  "createdBy",
-  "updatedBy",
-  "localizations",
-  "strapi_stage",
-  "strapi_assignee"
-];
-const transformDataIdsVisitor = (idMap, data, opts) => {
-  return traverseEntity(
-    ({ key, value, attribute }, { set }) => {
-      if (attribute.type === "relation") {
-        const target = attribute.target;
-        if (!target)
-          return;
-        if (EXCLUDED_FIELDS.includes(key))
-          return;
-        const getIds = (documentId, locale, status) => {
-          const targetLocale = getRelationTargetLocale(
-            { documentId, locale },
-            { targetUid: target, sourceUid: opts.uid, sourceLocale: opts.locale }
-          );
-          const targetStatuses = getRelationTargetStatus(
-            { documentId, status },
-            { targetUid: target, sourceUid: opts.uid, sourceStatus: opts.status }
-          );
-          const ids = [];
-          for (const targetStatus of targetStatuses) {
-            const entryId = idMap.get({
-              uid: target,
-              documentId,
-              locale: targetLocale,
-              status: targetStatus
-            });
-            if (entryId)
-              ids.push(entryId);
-          }
-          if (!ids.length && !opts.allowMissingId) {
-            throw new errors.ValidationError(
-              `Document with id "${documentId}", locale "${targetLocale}" not found`
-            );
+        const ids = getIds(relation);
+        const position = { ...relation.position };
+        if (position.before) {
+          const beforeRelation = { ...relation, ...position, documentId: position.before };
+          position.before = getIds(beforeRelation).at(0);
+        }
+        if (position.after) {
+          const afterRelation = { ...relation, ...position, documentId: position.after };
+          position.after = getIds(afterRelation).at(0);
+        }
+        return ids?.map((id) => {
+          const newRelation2 = { id };
+          if (relation.position) {
+            newRelation2.position = position;
           }
-          return ids;
-        };
-        const newRelation = transformRelationIdsVisitor(value, getIds);
-        set(key, newRelation);
-      }
+          return newRelation2;
+        });
+      }, value);
+      set(key, newRelation);
     },
-    { schema: strapi.getModel(opts.uid) },
+    { schema: strapi.getModel(source.uid), getModel: strapi.getModel.bind(strapi) },
     data
   );
 };