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

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

@@ -1,141 +1,110 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const _ = 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];
+'use strict';
+
+var fp = require('lodash/fp');
+var strapiUtils = require('@strapi/utils');
+var i18n = require('../utils/i18n.js');
+var dp = require('../utils/dp.js');
+var mapRelation = require('../utils/map-relation.js');
+
+const { isPolymorphic } = strapiUtils.relations;
+/**
+ * Get the entry ids for a given documentId.
+ */ const getRelationIds = fp.curry((idMap, source, targetUid, relation)=>{
+    // locale to connect to
+    const targetLocale = i18n.getRelationTargetLocale(relation, {
+        targetUid,
+        sourceUid: source.uid,
+        sourceLocale: source.locale
+    });
+    // status(es) to connect to
+    const targetStatus = dp.getRelationTargetStatus(relation, {
+        targetUid,
+        sourceUid: source.uid,
+        sourceStatus: source.status
+    });
+    const ids = [];
+    // Find mapping between documentID -> id(s).
+    // There are scenarios where a single documentID can map to multiple ids.
+    // e.g when connecting Non DP -> DP and connecting to both the draft and publish version at the same time
+    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;
+});
+/**
+ * Iterate over all relations of a data object and transform all relational document ids to entity ids.
+ */ 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;
-        }
-      }
-      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
+        const isPolymorphicRelation = isPolymorphic(attribute);
+        const getIds = getRelationIds(idMap, source);
+        // Transform the relation documentId to entity id
+        const newRelation = await mapRelation.mapRelation((relation)=>{
+            if (!relation || !relation.documentId) {
+                return relation;
+            }
+            // Find relational attributes, and return the document ids
+            // if its a polymorphic relation we need to get it from the data itself
+            const targetUid = isPolymorphicRelation ? relation.__type : attribute.target;
+            const ids = getIds(targetUid, relation);
+            // Handle positional arguments
+            const position = {
+                ...relation.position
+            };
+            // The positional relation target uid can be different for polymorphic relations
+            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);
+            }
+            // Transform all ids to new relations
+            return ids?.map((id)=>{
+                const newRelation = {
+                    id
+                };
+                if (relation.position) {
+                    newRelation.position = position;
+                }
+                // Insert type if its a polymorphic relation
+                if (isPolymorphicRelation) {
+                    newRelation.__type = targetUid;
+                }
+                return newRelation;
             });
-            if (entryId)
-              ids.push(entryId);
-          }
-          if (!ids.length && !opts.allowMissingId) {
-            throw new strapiUtils.errors.ValidationError(
-              `Document with id "${documentId}", locale "${targetLocale}" not found`
-            );
-          }
-          return ids;
-        };
-        const newRelation = transformRelationIdsVisitor(value, getIds);
+        }, value);
         set(key, newRelation);
-      }
-    },
-    { schema: strapi.getModel(opts.uid) },
-    data2
-  );
+    }, {
+        schema: strapi.getModel(source.uid),
+        getModel: strapi.getModel.bind(strapi)
+    }, data);
 };
+
 exports.transformDataIdsVisitor = transformDataIdsVisitor;
 //# sourceMappingURL=data-ids.js.map

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, 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":["isPolymorphic","relations","getRelationIds","curry","idMap","source","targetUid","relation","targetLocale","getRelationTargetLocale","sourceUid","uid","sourceLocale","locale","targetStatus","getRelationTargetStatus","sourceStatus","status","ids","tStatus","entryId","get","documentId","push","length","allowMissingId","errors","ValidationError","transformDataIdsVisitor","data","traverseEntityRelations","key","value","attribute","set","isPolymorphicRelation","getIds","newRelation","mapRelation","__type","target","position","positionTargetUid","before","beforeRelation","beforeIds","at","after","afterRelation","map","id","schema","strapi","getModel","bind"],"mappings":"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"}

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

@@ -1,141 +1,108 @@
-import { isObject, isNil, pick } from "lodash/fp";
-import { traverseEntity, errors } from "@strapi/utils";
-import { isShortHand, isLongHand } from "../utils/data.mjs";
-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 { curry } from 'lodash/fp';
+import { errors, relations } from '@strapi/utils';
+import { getRelationTargetLocale } from '../utils/i18n.mjs';
+import { getRelationTargetStatus } from '../utils/dp.mjs';
+import { traverseEntityRelations as traverseEntityRelationsCurried, mapRelation as mapRelationCurried } from '../utils/map-relation.mjs';
+
+const { isPolymorphic } = relations;
+/**
+ * Get the entry ids for a given documentId.
+ */ const getRelationIds = curry((idMap, source, targetUid, relation)=>{
+    // locale to connect to
+    const targetLocale = getRelationTargetLocale(relation, {
+        targetUid,
+        sourceUid: source.uid,
+        sourceLocale: source.locale
+    });
+    // status(es) to connect to
+    const targetStatus = getRelationTargetStatus(relation, {
+        targetUid,
+        sourceUid: source.uid,
+        sourceStatus: source.status
+    });
+    const ids = [];
+    // Find mapping between documentID -> id(s).
+    // There are scenarios where a single documentID can map to multiple ids.
+    // e.g when connecting Non DP -> DP and connecting to both the draft and publish version at the same time
+    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;
+});
+/**
+ * Iterate over all relations of a data object and transform all relational document ids to entity ids.
+ */ 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;
-        }
-      }
-      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
+        const isPolymorphicRelation = isPolymorphic(attribute);
+        const getIds = getRelationIds(idMap, source);
+        // Transform the relation documentId to entity id
+        const newRelation = await mapRelationCurried((relation)=>{
+            if (!relation || !relation.documentId) {
+                return relation;
+            }
+            // Find relational attributes, and return the document ids
+            // if its a polymorphic relation we need to get it from the data itself
+            const targetUid = isPolymorphicRelation ? relation.__type : attribute.target;
+            const ids = getIds(targetUid, relation);
+            // Handle positional arguments
+            const position = {
+                ...relation.position
+            };
+            // The positional relation target uid can be different for polymorphic relations
+            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);
+            }
+            // Transform all ids to new relations
+            return ids?.map((id)=>{
+                const newRelation = {
+                    id
+                };
+                if (relation.position) {
+                    newRelation.position = position;
+                }
+                // Insert type if its a polymorphic relation
+                if (isPolymorphicRelation) {
+                    newRelation.__type = targetUid;
+                }
+                return newRelation;
             });
-            if (entryId)
-              ids.push(entryId);
-          }
-          if (!ids.length && !opts.allowMissingId) {
-            throw new errors.ValidationError(
-              `Document with id "${documentId}", locale "${targetLocale}" not found`
-            );
-          }
-          return ids;
-        };
-        const newRelation = transformRelationIdsVisitor(value, getIds);
+        }, value);
         set(key, newRelation);
-      }
-    },
-    { schema: strapi.getModel(opts.uid) },
-    data
-  );
-};
-export {
-  transformDataIdsVisitor
+    }, {
+        schema: strapi.getModel(source.uid),
+        getModel: strapi.getModel.bind(strapi)
+    }, data);
 };
+
+export { transformDataIdsVisitor };
 //# sourceMappingURL=data-ids.mjs.map

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 { 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":["relation"],"mappings":"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"}
+{"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, 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":["isPolymorphic","relations","getRelationIds","curry","idMap","source","targetUid","relation","targetLocale","getRelationTargetLocale","sourceUid","uid","sourceLocale","locale","targetStatus","getRelationTargetStatus","sourceStatus","status","ids","tStatus","entryId","get","documentId","push","length","allowMissingId","errors","ValidationError","transformDataIdsVisitor","data","traverseEntityRelations","key","value","attribute","set","isPolymorphicRelation","getIds","newRelation","mapRelation","__type","target","position","positionTargetUid","before","beforeRelation","beforeIds","at","after","afterRelation","map","id","schema","strapi","getModel","bind"],"mappings":"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"}

package/dist/services/document-service/transform/relations/transform/default-locale.d.ts

@@ -0,0 +1,9 @@
+import type { UID } from '@strapi/types';
+/**
+ * In scenarios like Non i18n CT -> i18n CT
+ * relations can be connected to multiple locales,
+ * in case user does not provide the locale, this sets it to the default one.
+ */
+declare const setDefaultLocaleToRelations: (data: Record<string, any>, uid: UID.Schema) => Record<string, any> | Promise<import("@strapi/utils/dist/types").Data>;
+export { setDefaultLocaleToRelations };
+//# sourceMappingURL=default-locale.d.ts.map

package/dist/services/document-service/transform/relations/transform/default-locale.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"default-locale.d.ts","sourceRoot":"","sources":["../../../../../../src/services/document-service/transform/relations/transform/default-locale.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAKzC;;;;GAIG;AACH,QAAA,MAAM,2BAA2B,SAAU,OAAO,MAAM,EAAE,GAAG,CAAC,OAAO,IAAI,MAAM,2EA2C9E,CAAC;AAEF,OAAO,EAAE,2BAA2B,EAAE,CAAC"}