@strapi/core 0.0.0-experimental.a407f3bc8fb79a53cf7975140864526b6ddbac4b → 0.0.0-experimental.a4bb06d54b493ab973659d0200e0e42937988850

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

@@ -1,75 +1,60 @@
-import { isObject } from "lodash/fp";
-import { traverseEntity } from "@strapi/utils";
-import { isShortHand, isLongHand } from "../utils/data.mjs";
+import { curry } from "lodash/fp";
+import { relations } from "@strapi/utils";
 import { getRelationTargetLocale } from "../utils/i18n.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 }];
-    }
-    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, id: position.before }));
-      }
-      if (position?.after) {
-        ids.push(...handlePrimitive({ ...position, id: position.after }));
-      }
+import { getRelationTargetStatus } from "../utils/dp.mjs";
+import { traverseEntityRelations as traverseEntityRelationsCurried, mapRelation as mapRelationCurried } from "../utils/map-relation.mjs";
+const { isPolymorphic } = relations;
+const addRelationDocId = curry(
+  (idMap, source, targetUid, 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) => {
-          idMap.add({
-            uid: target,
-            documentId: relation.documentId,
-            locale: getRelationTargetLocale(relation, {
-              targetUid: target,
-              sourceUid: opts.uid,
-              sourceLocale: opts.locale
-            }),
-            isDraft: opts.isDraft
-          });
-        });
+);
+const extractDataIds = (idMap, data, source) => {
+  return traverseEntityRelationsCurried(
+    async ({ attribute, value }) => {
+      if (!attribute) {
+        return;
       }
+      const isPolymorphicRelation = isPolymorphic(attribute);
+      const addDocId = addRelationDocId(idMap, source);
+      return mapRelationCurried((relation) => {
+        if (!relation || !relation.documentId) {
+          return relation;
+        }
+        const targetUid = isPolymorphicRelation ? relation.__type : attribute.target;
+        addDocId(targetUid, relation);
+        const position = relation.position;
+        let positionTargetUid = targetUid;
+        if (isPolymorphicRelation && position?.__type) {
+          positionTargetUid = position.__type;
+        }
+        if (position?.before) {
+          addDocId(positionTargetUid, { ...relation, ...position, documentId: position.before });
+        }
+        if (position?.after) {
+          addDocId(positionTargetUid, { ...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';\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 [{ documentId: relation.documentId, locale: relation.locale }];\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, id: position.before }));\n      }\n\n      // { connect: { id: id, position: { after: id } } }\n      if (position?.after) {\n        ids.push(...handlePrimitive({ ...position, id: 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; isDraft?: boolean }\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        extractedIds.forEach((relation) => {\n          idMap.add({\n            uid: target,\n            documentId: relation.documentId,\n            locale: getRelationTargetLocale(relation, {\n              targetUid: target as Common.UID.Schema,\n              sourceUid: opts.uid,\n              sourceLocale: opts.locale,\n            }),\n            isDraft: opts.isDraft,\n          });\n        });\n      }\n    },\n    { schema: strapi.getModel(opts.uid) },\n    data\n  );\n};\n\nexport { extractDataIds };\n"],"names":["relation"],"mappings":";;;;AAWA,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,CAAC,EAAE,YAAY,SAAS,YAAY,QAAQ,SAAS,QAAQ;AAAA,IACtE;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,IAAI,SAAS,OAAQ,CAAA,CAAC;AAAA,MACnE;AAGA,UAAI,UAAU,OAAO;AACf,YAAA,KAAK,GAAG,gBAAgB,EAAE,GAAG,UAAU,IAAI,SAAS,MAAO,CAAA,CAAC;AAAA,MAClE;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;AAEA,qBAAA,QAAQ,CAAC,aAAa;AACjC,gBAAM,IAAI;AAAA,YACR,KAAK;AAAA,YACL,YAAY,SAAS;AAAA,YACrB,QAAQ,wBAAwB,UAAU;AAAA,cACxC,WAAW;AAAA,cACX,WAAW,KAAK;AAAA,cAChB,cAAc,KAAK;AAAA,YAAA,CACpB;AAAA,YACD,SAAS,KAAK;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';\nimport { relations } from '@strapi/utils';\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\nconst { isPolymorphic } = relations;\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, source: Options, targetUid: UID.Schema, 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      const isPolymorphicRelation = isPolymorphic(attribute);\n      const addDocId = addRelationDocId(idMap, source);\n\n      return mapRelation((relation) => {\n        if (!relation || !relation.documentId) {\n          return relation;\n        }\n\n        // Regular relations will always target the same target\n        // if its a polymorphic relation we need to get it from the data itself\n        const targetUid = isPolymorphicRelation ? relation.__type : attribute.target;\n\n        addDocId(targetUid, relation);\n\n        // Handle positional arguments\n        const position = relation.position;\n\n        // The positional relation target uid can be different for polymorphic relations\n        let positionTargetUid = targetUid;\n        if (isPolymorphicRelation && position?.__type) {\n          positionTargetUid = position.__type;\n        }\n\n        if (position?.before) {\n          addDocId(positionTargetUid, { ...relation, ...position, documentId: position.before });\n        }\n\n        if (position?.after) {\n          addDocId(positionTargetUid, { ...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":";;;;;AAUA,MAAM,EAAE,cAAkB,IAAA;AAW1B,MAAM,mBAAmB;AAAA,EACvB,CAAC,OAAc,QAAiB,WAAuB,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,EAAA;AAEL;AAMA,MAAM,iBAAiB,CAAC,OAAc,MAA2B,WAAoB;AAC5E,SAAAA;AAAAA,IACL,OAAO,EAAE,WAAW,YAAY;AAC9B,UAAI,CAAC,WAAW;AACd;AAAA,MAAA;AAEI,YAAA,wBAAwB,cAAc,SAAS;AAC/C,YAAA,WAAW,iBAAiB,OAAO,MAAM;AAExC,aAAAC,mBAAY,CAAC,aAAa;AAC/B,YAAI,CAAC,YAAY,CAAC,SAAS,YAAY;AAC9B,iBAAA;AAAA,QAAA;AAKT,cAAM,YAAY,wBAAwB,SAAS,SAAS,UAAU;AAEtE,iBAAS,WAAW,QAAQ;AAG5B,cAAM,WAAW,SAAS;AAG1B,YAAI,oBAAoB;AACpB,YAAA,yBAAyB,UAAU,QAAQ;AAC7C,8BAAoB,SAAS;AAAA,QAAA;AAG/B,YAAI,UAAU,QAAQ;AACX,mBAAA,mBAAmB,EAAE,GAAG,UAAU,GAAG,UAAU,YAAY,SAAS,QAAQ;AAAA,QAAA;AAGvF,YAAI,UAAU,OAAO;AACV,mBAAA,mBAAmB,EAAE,GAAG,UAAU,GAAG,UAAU,YAAY,SAAS,OAAO;AAAA,QAAA;AAG/E,eAAA;AAAA,SACN,KAAY;AAAA,IACjB;AAAA,IACA,EAAE,QAAQ,OAAO,SAAS,OAAO,GAAG,GAAG,UAAU,OAAO,SAAS,KAAK,MAAM,EAAE;AAAA,IAC9E;AAAA,EACF;AACF;"}

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;
-    isDraft?: boolean;
+    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;AA8GrC,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,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,qDAwCF,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;AAOrC,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,qDA8DxF,CAAC;AAEF,OAAO,EAAE,uBAAuB,EAAE,CAAC"}

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

@@ -1,116 +1,84 @@
 "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 isNumeric = (value) => {
-  if (Array.isArray(value))
-    return false;
-  const parsed = parseInt(value, 10);
-  return !Number.isNaN(parsed);
-};
-const transformPrimitive = (relation, getId) => {
-  if (isNumeric(relation)) {
-    return relation;
-  }
-  if (_.isNil(relation)) {
-    return relation;
-  }
-  if (data.isShortHand(relation)) {
-    return getId(relation);
-  }
-  if (data.isLongHand(relation)) {
-    if (!("documentId" in relation))
-      return relation;
-    const entryId = getId(relation.documentId, relation.locale);
-    if (!entryId)
-      return void 0;
-    return { ...relation, id: entryId };
-  }
-  if (Array.isArray(relation)) {
-    return relation.map((item) => transformPrimitive(item, getId)).filter(Boolean);
-  }
-  return void 0;
-};
-const transformRelationIdsVisitor = (relation, getId) => {
-  const map = transformPrimitive(relation, getId);
-  if (map)
-    return map;
-  if (!_.isObject(relation))
-    return relation;
-  if ("set" in relation) {
-    relation.set = transformPrimitive(relation.set, getId);
-  }
-  if ("disconnect" in relation) {
-    relation.disconnect = transformPrimitive(relation.disconnect, getId);
-  }
-  if ("connect" in relation) {
-    relation.connect = transformPrimitive(relation.connect, getId);
-    const mapPosition = (relation2) => {
-      if (data.isShortHand(relation2) || !("position" in relation2))
-        return relation2;
-      const { position } = relation2;
-      if (position?.before) {
-        const { id } = transformPrimitive({ ...position, documentId: position.before }, getId);
-        position.before = id;
-      }
-      if (position?.after) {
-        const { id } = transformPrimitive({ ...position, documentId: position.after }, getId);
-        position.after = id;
-      }
-      return relation2;
-    };
-    if (Array.isArray(relation.connect)) {
-      relation.connect = relation.connect.map(mapPosition);
-    } else {
-      relation.connect = mapPosition(relation.connect);
+const dp = require("../utils/dp.js");
+const mapRelation = require("../utils/map-relation.js");
+const { isPolymorphic } = strapiUtils.relations;
+const getRelationIds = fp.curry(
+  (idMap, source, targetUid, 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;
   }
-  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 getId = (documentId, locale) => {
-          const entryId = idMap.get({
-            uid: target,
-            documentId,
-            locale: i18n.getRelationTargetLocale(
-              { documentId, locale },
-              {
-                targetUid: target,
-                sourceUid: opts.uid,
-                sourceLocale: opts.locale
-              }
-            ),
-            isDraft: opts.isDraft
-          });
-          if (entryId)
-            return entryId;
-          if (opts.allowMissingId)
-            return null;
-          throw new strapiUtils.errors.ValidationError(`Document with id "${documentId}" not found`);
-        };
-        const newRelation = transformRelationIdsVisitor(value, getId);
-        set(key, newRelation);
+);
+const transformDataIdsVisitor = (idMap, data, source) => {
+  return mapRelation.traverseEntityRelations(
+    async ({ key, value, attribute }, { set }) => {
+      if (!attribute) {
+        return;
       }
+      const isPolymorphicRelation = isPolymorphic(attribute);
+      const getIds = getRelationIds(idMap, source);
+      const newRelation = await mapRelation.mapRelation((relation) => {
+        if (!relation || !relation.documentId) {
+          return relation;
+        }
+        const targetUid = isPolymorphicRelation ? relation.__type : attribute.target;
+        const ids = getIds(targetUid, relation);
+        const position = { ...relation.position };
+        let positionTargetUid = targetUid;
+        if (isPolymorphicRelation && position?.__type) {
+          positionTargetUid = position.__type;
+        }
+        if (position.before) {
+          const beforeRelation = { ...relation, ...position, documentId: position.before };
+          const beforeIds = getIds(positionTargetUid, beforeRelation);
+          position.before = beforeIds.at(0);
+        }
+        if (position.after) {
+          const afterRelation = { ...relation, ...position, documentId: position.after };
+          position.after = getIds(positionTargetUid, afterRelation).at(0);
+        }
+        return ids?.map((id) => {
+          const newRelation2 = { id };
+          if (relation.position) {
+            newRelation2.position = position;
+          }
+          if (isPolymorphicRelation) {
+            newRelation2.__type = targetUid;
+          }
+          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 } from 'lodash/fp';\n\nimport { EntityService, Attribute, Common } from '@strapi/types';\nimport { traverseEntity, errors } from '@strapi/utils';\n\nimport { ShortHand, LongHand, ID, GetId } from '../utils/types';\nimport { isShortHand, isLongHand } from '../utils/data';\nimport { IdMap } from '../../id-map';\nimport { getRelationTargetLocale } from '../utils/i18n';\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 transformPrimitive = <T extends ShortHand | LongHand>(\n  relation: T | T[] | null | undefined,\n  getId: GetId\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    return getId(relation) as T;\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 entryId = getId(relation.documentId, relation.locale) as T;\n\n    // If the id is not found, return undefined\n    if (!entryId) return undefined;\n\n    return { ...(relation as object), id: entryId } as T;\n  }\n\n  // id[]\n  if (Array.isArray(relation)) {\n    return relation.map((item) => transformPrimitive(item, getId)).filter(Boolean) as T[];\n  }\n  return undefined;\n};\n\nconst transformRelationIdsVisitor = <T extends Attribute.RelationKind.Any>(\n  relation: EntityService.Params.Attribute.RelationInputValue<T>,\n  getId: GetId\n): EntityService.Params.Attribute.RelationInputValue<T> => {\n  const map = transformPrimitive(relation as any, getId);\n  if (map) return map;\n\n  if (!isObject(relation)) return relation;\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, getId);\n  }\n  if ('disconnect' in relation) {\n    relation.disconnect = transformPrimitive(relation.disconnect as any, getId);\n  }\n\n  if ('connect' in relation) {\n    // connect: id[] | { id } | ...\n    relation.connect = transformPrimitive(relation.connect as any, getId);\n\n    const mapPosition = (relation: any) => {\n      if (isShortHand(relation) || !('position' in relation)) return relation;\n\n      const { position } = relation;\n\n      // { connect: { id: id, position: { before: id } } }\n      if (position?.before) {\n        const { id } = transformPrimitive({ ...position, documentId: position.before }, getId);\n        position.before = id;\n      }\n\n      // { connect: { id: id, position: { after: id } } }\n      if (position?.after) {\n        const { id } = transformPrimitive({ ...position, documentId: position.after }, getId);\n        position.after = id;\n      }\n\n      return relation;\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    isDraft?: boolean;\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;\n        // TODO: Handle polymorphic relations\n        if (!target) return;\n        // TODO: Handle this differently\n        if (EXCLUDED_FIELDS.includes(key)) return;\n\n        const getId = (documentId: ID, locale?: string): ID | null => {\n          const entryId = idMap.get({\n            uid: target,\n            documentId,\n            locale: getRelationTargetLocale(\n              { documentId, locale },\n              {\n                targetUid: target as Common.UID.Schema,\n                sourceUid: opts.uid,\n                sourceLocale: opts.locale,\n              }\n            ),\n            isDraft: opts.isDraft,\n          });\n\n          if (entryId) return entryId;\n          if (opts.allowMissingId) return null;\n\n          throw new errors.ValidationError(`Document with id \"${documentId}\" not found`);\n        };\n\n        const newRelation = transformRelationIdsVisitor(value as any, getId);\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","isObject","relation","data","traverseEntity","getRelationTargetLocale","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, relations } 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\nconst { isPolymorphic } = relations;\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, source: Options, targetUid: UID.Schema, 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      const isPolymorphicRelation = isPolymorphic(attribute);\n      const getIds = getRelationIds(idMap, 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        // Find relational attributes, and return the document ids\n        // if its a polymorphic relation we need to get it from the data itself\n        const targetUid: UID.Schema = isPolymorphicRelation ? relation.__type : attribute.target;\n        const ids: ID[] = getIds(targetUid, relation);\n\n        // Handle positional arguments\n        const position = { ...relation.position };\n\n        // The positional relation target uid can be different for polymorphic relations\n        let positionTargetUid: UID.Schema = targetUid;\n        if (isPolymorphicRelation && position?.__type) {\n          positionTargetUid = position.__type;\n        }\n\n        if (position.before) {\n          const beforeRelation = { ...relation, ...position, documentId: position.before };\n          const beforeIds: ID[] = getIds(positionTargetUid, beforeRelation);\n          position.before = beforeIds.at(0);\n        }\n\n        if (position.after) {\n          const afterRelation = { ...relation, ...position, documentId: position.after };\n          position.after = getIds(positionTargetUid, 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\n          if (relation.position) {\n            newRelation.position = position;\n          }\n\n          // Insert type if its a polymorphic relation\n          if (isPolymorphicRelation) {\n            newRelation.__type = targetUid;\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":["relations","curry","getRelationTargetLocale","getRelationTargetStatus","errors","traverseEntityRelations","mapRelation","newRelation"],"mappings":";;;;;;;AAWA,MAAM,EAAE,cAAkB,IAAAA,YAAA;AAY1B,MAAM,iBAAiBC,GAAA;AAAA,EACrB,CAAC,OAAc,QAAiB,WAAuB,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,CAAC;AAKnB,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,QAAa,KAAA,KAAK,OAAO;AAAA,IAAA;AAG/B,QAAI,CAAC,IAAI,UAAU,CAAC,OAAO,gBAAgB;AACzC,YAAM,IAAIC,YAAO,OAAA;AAAA,QACf,qBAAqB,SAAS,UAAU,cAAc,YAAY;AAAA,MACpE;AAAA,IAAA;AAGK,WAAA;AAAA,EAAA;AAEX;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,MAAA;AAEI,YAAA,wBAAwB,cAAc,SAAS;AAC/C,YAAA,SAAS,eAAe,OAAO,MAAM;AAG3C,YAAM,cAAc,MAAMC,wBAAY,CAAC,aAAa;AAClD,YAAI,CAAC,YAAY,CAAC,SAAS,YAAY;AAC9B,iBAAA;AAAA,QAAA;AAKT,cAAM,YAAwB,wBAAwB,SAAS,SAAS,UAAU;AAC5E,cAAA,MAAY,OAAO,WAAW,QAAQ;AAG5C,cAAM,WAAW,EAAE,GAAG,SAAS,SAAS;AAGxC,YAAI,oBAAgC;AAChC,YAAA,yBAAyB,UAAU,QAAQ;AAC7C,8BAAoB,SAAS;AAAA,QAAA;AAG/B,YAAI,SAAS,QAAQ;AACb,gBAAA,iBAAiB,EAAE,GAAG,UAAU,GAAG,UAAU,YAAY,SAAS,OAAO;AACzE,gBAAA,YAAkB,OAAO,mBAAmB,cAAc;AACvD,mBAAA,SAAS,UAAU,GAAG,CAAC;AAAA,QAAA;AAGlC,YAAI,SAAS,OAAO;AACZ,gBAAA,gBAAgB,EAAE,GAAG,UAAU,GAAG,UAAU,YAAY,SAAS,MAAM;AAC7E,mBAAS,QAAQ,OAAO,mBAAmB,aAAa,EAAE,GAAG,CAAC;AAAA,QAAA;AAIzD,eAAA,KAAK,IAAI,CAAC,OAAO;AAChBC,gBAAAA,eAAc,EAAE,GAAG;AAEzB,cAAI,SAAS,UAAU;AACrBA,yBAAY,WAAW;AAAA,UAAA;AAIzB,cAAI,uBAAuB;AACzBA,yBAAY,SAAS;AAAA,UAAA;AAGhBA,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,EACF;AACF;;"}

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

@@ -1,113 +1,81 @@
-import { isObject, isNil } from "lodash/fp";
-import { traverseEntity, errors } from "@strapi/utils";
-import { isShortHand, isLongHand } from "../utils/data.mjs";
+import { curry } from "lodash/fp";
+import { errors, relations } from "@strapi/utils";
 import { getRelationTargetLocale } from "../utils/i18n.mjs";
-const isNumeric = (value) => {
-  if (Array.isArray(value))
-    return false;
-  const parsed = parseInt(value, 10);
-  return !Number.isNaN(parsed);
-};
-const transformPrimitive = (relation, getId) => {
-  if (isNumeric(relation)) {
-    return relation;
-  }
-  if (isNil(relation)) {
-    return relation;
-  }
-  if (isShortHand(relation)) {
-    return getId(relation);
-  }
-  if (isLongHand(relation)) {
-    if (!("documentId" in relation))
-      return relation;
-    const entryId = getId(relation.documentId, relation.locale);
-    if (!entryId)
-      return void 0;
-    return { ...relation, id: entryId };
-  }
-  if (Array.isArray(relation)) {
-    return relation.map((item) => transformPrimitive(item, getId)).filter(Boolean);
-  }
-  return void 0;
-};
-const transformRelationIdsVisitor = (relation, getId) => {
-  const map = transformPrimitive(relation, getId);
-  if (map)
-    return map;
-  if (!isObject(relation))
-    return relation;
-  if ("set" in relation) {
-    relation.set = transformPrimitive(relation.set, getId);
-  }
-  if ("disconnect" in relation) {
-    relation.disconnect = transformPrimitive(relation.disconnect, getId);
-  }
-  if ("connect" in relation) {
-    relation.connect = transformPrimitive(relation.connect, getId);
-    const mapPosition = (relation2) => {
-      if (isShortHand(relation2) || !("position" in relation2))
-        return relation2;
-      const { position } = relation2;
-      if (position?.before) {
-        const { id } = transformPrimitive({ ...position, documentId: position.before }, getId);
-        position.before = id;
-      }
-      if (position?.after) {
-        const { id } = transformPrimitive({ ...position, documentId: position.after }, getId);
-        position.after = id;
-      }
-      return relation2;
-    };
-    if (Array.isArray(relation.connect)) {
-      relation.connect = relation.connect.map(mapPosition);
-    } else {
-      relation.connect = mapPosition(relation.connect);
+import { getRelationTargetStatus } from "../utils/dp.mjs";
+import { traverseEntityRelations as traverseEntityRelationsCurried, mapRelation as mapRelationCurried } from "../utils/map-relation.mjs";
+const { isPolymorphic } = relations;
+const getRelationIds = curry(
+  (idMap, source, targetUid, 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;
   }
-  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 getId = (documentId, locale) => {
-          const entryId = idMap.get({
-            uid: target,
-            documentId,
-            locale: getRelationTargetLocale(
-              { documentId, locale },
-              {
-                targetUid: target,
-                sourceUid: opts.uid,
-                sourceLocale: opts.locale
-              }
-            ),
-            isDraft: opts.isDraft
-          });
-          if (entryId)
-            return entryId;
-          if (opts.allowMissingId)
-            return null;
-          throw new errors.ValidationError(`Document with id "${documentId}" not found`);
-        };
-        const newRelation = transformRelationIdsVisitor(value, getId);
-        set(key, newRelation);
+);
+const transformDataIdsVisitor = (idMap, data, source) => {
+  return traverseEntityRelationsCurried(
+    async ({ key, value, attribute }, { set }) => {
+      if (!attribute) {
+        return;
       }
+      const isPolymorphicRelation = isPolymorphic(attribute);
+      const getIds = getRelationIds(idMap, source);
+      const newRelation = await mapRelationCurried((relation) => {
+        if (!relation || !relation.documentId) {
+          return relation;
+        }
+        const targetUid = isPolymorphicRelation ? relation.__type : attribute.target;
+        const ids = getIds(targetUid, relation);
+        const position = { ...relation.position };
+        let positionTargetUid = targetUid;
+        if (isPolymorphicRelation && position?.__type) {
+          positionTargetUid = position.__type;
+        }
+        if (position.before) {
+          const beforeRelation = { ...relation, ...position, documentId: position.before };
+          const beforeIds = getIds(positionTargetUid, beforeRelation);
+          position.before = beforeIds.at(0);
+        }
+        if (position.after) {
+          const afterRelation = { ...relation, ...position, documentId: position.after };
+          position.after = getIds(positionTargetUid, afterRelation).at(0);
+        }
+        return ids?.map((id) => {
+          const newRelation2 = { id };
+          if (relation.position) {
+            newRelation2.position = position;
+          }
+          if (isPolymorphicRelation) {
+            newRelation2.__type = targetUid;
+          }
+          return newRelation2;
+        });
+      }, value);
+      set(key, newRelation);
     },
-    { schema: strapi.getModel(opts.uid) },
+    { schema: strapi.getModel(source.uid), getModel: strapi.getModel.bind(strapi) },
     data
   );
 };