@strapi/core 5.45.1 → 5.46.0

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

@@ -5,6 +5,7 @@ var strapiUtils = require('@strapi/utils');
 var i18n = require('../utils/i18n.js');
 var dp = require('../utils/dp.js');
 var mapRelation = require('../utils/map-relation.js');
+var xtoOne = require('../utils/xto-one.js');
 
 const { isPolymorphic } = strapiUtils.relations;
 /**
@@ -49,6 +50,8 @@ const { isPolymorphic } = strapiUtils.relations;
         }
         const isPolymorphicRelation = isPolymorphic(attribute);
         const getIds = getRelationIds(idMap, source);
+        // Collapse a "relates to one" payload to a single entry first.
+        const normalizedValue = xtoOne.normalizeXToOneRelationValue(attribute, value);
         // Transform the relation documentId to entity id
         const newRelation = await mapRelation.mapRelation((relation)=>{
             if (!relation || !relation.documentId) {
@@ -98,7 +101,7 @@ const { isPolymorphic } = strapiUtils.relations;
                 }
                 return newRelation;
             });
-        }, value);
+        }, normalizedValue);
         set(key, newRelation);
     }, {
         schema: strapi.getModel(source.uid),

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 { 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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"}
+{"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';\nimport { normalizeXToOneRelationValue } from '../utils/xto-one';\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      // Collapse a \"relates to one\" payload to a single entry first.\n      const normalizedValue = normalizeXToOneRelationValue(attribute, value as any);\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      }, normalizedValue 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","normalizedValue","normalizeXToOneRelationValue","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

@@ -3,6 +3,7 @@ import { relations, errors } 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';
+import { normalizeXToOneRelationValue } from '../utils/xto-one.mjs';
 
 const { isPolymorphic } = relations;
 /**
@@ -47,6 +48,8 @@ const { isPolymorphic } = relations;
         }
         const isPolymorphicRelation = isPolymorphic(attribute);
         const getIds = getRelationIds(idMap, source);
+        // Collapse a "relates to one" payload to a single entry first.
+        const normalizedValue = normalizeXToOneRelationValue(attribute, value);
         // Transform the relation documentId to entity id
         const newRelation = await mapRelationCurried((relation)=>{
             if (!relation || !relation.documentId) {
@@ -96,7 +99,7 @@ const { isPolymorphic } = relations;
                 }
                 return newRelation;
             });
-        }, value);
+        }, normalizedValue);
         set(key, newRelation);
     }, {
         schema: strapi.getModel(source.uid),

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

@@ -1 +1 @@
-{"version":3,"file":"data-ids.mjs","sources":["../../../../../../src/services/document-service/transform/relations/transform/data-ids.ts"],"sourcesContent":["import { curry } from 'lodash/fp';\n\nimport type { UID } from '@strapi/types';\nimport { errors, 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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"}
+{"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';\nimport { normalizeXToOneRelationValue } from '../utils/xto-one';\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      // Collapse a \"relates to one\" payload to a single entry first.\n      const normalizedValue = normalizeXToOneRelationValue(attribute, value as any);\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      }, normalizedValue 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","normalizedValue","normalizeXToOneRelationValue","newRelation","mapRelation","__type","target","position","positionTargetUid","before","beforeRelation","beforeIds","at","after","afterRelation","map","id","schema","strapi","getModel","bind"],"mappings":";;;;;;;AAYA,MAAM,EAAEA,aAAa,EAAE,GAAGC,SAAAA;AAS1B;;AAEC,IACD,MAAMC,cAAAA,GAAiBC,KAAAA,CACrB,CAACC,KAAAA,EAAcC,QAAiBC,SAAAA,EAAuBC,QAAAA,GAAAA;;IAErD,MAAMC,YAAAA,GAAeC,wBAAwBF,QAAAA,EAAU;AACrDD,QAAAA,SAAAA;AACAI,QAAAA,SAAAA,EAAWL,OAAOM,GAAG;AACrBC,QAAAA,YAAAA,EAAcP,OAAOQ;AACvB,KAAA,CAAA;;IAGA,MAAMC,YAAAA,GAAeC,wBAAwBR,QAAAA,EAAU;AACrDD,QAAAA,SAAAA;AACAI,QAAAA,SAAAA,EAAWL,OAAOM,GAAG;AACrBK,QAAAA,YAAAA,EAAcX,OAAOY;AACvB,KAAA,CAAA;AAEA,IAAA,MAAMC,MAAY,EAAE;;;;IAKpB,KAAK,MAAMC,WAAWL,YAAAA,CAAc;QAClC,MAAMM,OAAAA,GAAUhB,KAAAA,CAAMiB,GAAG,CAAC;YACxBV,GAAAA,EAAKL,SAAAA;AACLgB,YAAAA,UAAAA,EAAYf,SAASe,UAAU;YAC/BT,MAAAA,EAAQL,YAAAA;YACRS,MAAAA,EAAQE;AACV,SAAA,CAAA;QAEA,IAAIC,OAAAA,EAASF,GAAAA,CAAIK,IAAI,CAACH,OAAAA,CAAAA;AACxB,IAAA;AAEA,IAAA,IAAI,CAACF,GAAAA,CAAIM,MAAM,IAAI,CAACnB,MAAAA,CAAOoB,cAAc,EAAE;AACzC,QAAA,MAAM,IAAIC,MAAAA,CAAOC,eAAe,CAC9B,CAAC,kBAAkB,EAAEpB,QAAAA,CAASe,UAAU,CAAC,WAAW,EAAEd,YAAAA,CAAa,WAAW,CAAC,CAAA;AAEnF,IAAA;IAEA,OAAOU,GAAAA;AACT,CAAA,CAAA;AAGF;;AAEC,IACD,MAAMU,uBAAAA,GAA0B,CAACxB,KAAAA,EAAcyB,IAAAA,EAA2BxB,MAAAA,GAAAA;AACxE,IAAA,OAAOyB,8BAAAA,CACL,OAAO,EAAEC,GAAG,EAAEC,KAAK,EAAEC,SAAS,EAAE,EAAE,EAAEC,GAAG,EAAE,GAAA;AACvC,QAAA,IAAI,CAACD,SAAAA,EAAW;AACd,YAAA;AACF,QAAA;AACA,QAAA,MAAME,wBAAwBnC,aAAAA,CAAciC,SAAAA,CAAAA;QAC5C,MAAMG,MAAAA,GAASlC,eAAeE,KAAAA,EAAOC,MAAAA,CAAAA;;QAGrC,MAAMgC,eAAAA,GAAkBC,6BAA6BL,SAAAA,EAAWD,KAAAA,CAAAA;;QAGhE,MAAMO,WAAAA,GAAc,MAAMC,kBAAAA,CAAY,CAACjC,QAAAA,GAAAA;AACrC,YAAA,IAAI,CAACA,QAAAA,IAAY,CAACA,QAAAA,CAASe,UAAU,EAAE;gBACrC,OAAOf,QAAAA;AACT,YAAA;;;AAIA,YAAA,MAAMD,YAAwB6B,qBAAAA,GAAwB5B,QAAAA,CAASkC,MAAM,GAAGR,UAAUS,MAAM;YACxF,MAAMxB,GAAAA,GAAYkB,OAAO9B,SAAAA,EAAWC,QAAAA,CAAAA;;AAGpC,YAAA,MAAMoC,QAAAA,GAAW;AAAE,gBAAA,GAAGpC,SAASoC;AAAS,aAAA;;AAGxC,YAAA,IAAIC,iBAAAA,GAAgCtC,SAAAA;YACpC,IAAI6B,qBAAAA,IAAyBQ,UAAUF,MAAAA,EAAQ;AAC7CG,gBAAAA,iBAAAA,GAAoBD,SAASF,MAAM;AACrC,YAAA;YAEA,IAAIE,QAAAA,CAASE,MAAM,EAAE;AACnB,gBAAA,MAAMC,cAAAA,GAAiB;AAAE,oBAAA,GAAGvC,QAAQ;AAAE,oBAAA,GAAGoC,QAAQ;AAAErB,oBAAAA,UAAAA,EAAYqB,SAASE;AAAO,iBAAA;gBAC/E,MAAME,SAAAA,GAAkBX,OAAOQ,iBAAAA,EAAmBE,cAAAA,CAAAA;AAClDH,gBAAAA,QAAAA,CAASE,MAAM,GAAGE,SAAAA,CAAUC,EAAE,CAAC,CAAA,CAAA;AACjC,YAAA;YAEA,IAAIL,QAAAA,CAASM,KAAK,EAAE;AAClB,gBAAA,MAAMC,aAAAA,GAAgB;AAAE,oBAAA,GAAG3C,QAAQ;AAAE,oBAAA,GAAGoC,QAAQ;AAAErB,oBAAAA,UAAAA,EAAYqB,SAASM;AAAM,iBAAA;AAC7EN,gBAAAA,QAAAA,CAASM,KAAK,GAAGb,MAAAA,CAAOQ,iBAAAA,EAAmBM,aAAAA,CAAAA,CAAeF,EAAE,CAAC,CAAA,CAAA;AAC/D,YAAA;;YAGA,OAAO9B,GAAAA,EAAKiC,IAAI,CAACC,EAAAA,GAAAA;AACf,gBAAA,MAAMb,WAAAA,GAAc;AAAEa,oBAAAA;AAAG,iBAAA;gBAEzB,IAAI7C,QAAAA,CAASoC,QAAQ,EAAE;AACrBJ,oBAAAA,WAAAA,CAAYI,QAAQ,GAAGA,QAAAA;AACzB,gBAAA;;AAGA,gBAAA,IAAIR,qBAAAA,EAAuB;AACzBI,oBAAAA,WAAAA,CAAYE,MAAM,GAAGnC,SAAAA;AACvB,gBAAA;gBAEA,OAAOiC,WAAAA;AACT,YAAA,CAAA,CAAA;QACF,CAAA,EAAGF,eAAAA,CAAAA;AAEHH,QAAAA,GAAAA,CAAIH,GAAAA,EAAKQ,WAAAA,CAAAA;IACX,CAAA,EACA;AAAEc,QAAAA,MAAAA,EAAQC,MAAAA,CAAOC,QAAQ,CAAClD,MAAAA,CAAOM,GAAG,CAAA;AAAG4C,QAAAA,QAAAA,EAAUD,MAAAA,CAAOC,QAAQ,CAACC,IAAI,CAACF,MAAAA;KAAQ,EAC9EzB,IAAAA,CAAAA;AAEJ;;;;"}

package/dist/services/document-service/transform/relations/utils/xto-one.d.ts

@@ -0,0 +1,8 @@
+import { Relation } from './types';
+/**
+ * "Relates to one" fields hold a single entry. If a caller passes more
+ * than one, keep the last. Runs on the user-provided payload only — never
+ * on the internal draft/published expansion that happens later.
+ */
+export declare const normalizeXToOneRelationValue: (attribute: any, value: Relation) => Relation;
+//# sourceMappingURL=xto-one.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"xto-one.d.ts","sourceRoot":"","sources":["../../../../../../src/services/document-service/transform/relations/utils/xto-one.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAInC;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,cAAe,GAAG,SAAS,QAAQ,KAAG,QA2B9E,CAAC"}

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

@@ -0,0 +1,41 @@
+'use strict';
+
+var fp = require('lodash/fp');
+var strapiUtils = require('@strapi/utils');
+
+const { isAnyToOne } = strapiUtils.relations;
+/**
+ * "Relates to one" fields hold a single entry. If a caller passes more
+ * than one, keep the last. Runs on the user-provided payload only — never
+ * on the internal draft/published expansion that happens later.
+ */ const normalizeXToOneRelationValue = (attribute, value)=>{
+    if (!isAnyToOne(attribute)) {
+        return value;
+    }
+    if (fp.isNil(value)) {
+        return value;
+    }
+    if (Array.isArray(value)) {
+        if (value.length > 1) {
+            return [
+                value[value.length - 1]
+            ];
+        }
+        return value;
+    }
+    if (fp.isObject(value) && !Array.isArray(value)) {
+        const objValue = value;
+        if (Array.isArray(objValue.set) && objValue.set.length > 1) {
+            return {
+                ...objValue,
+                set: [
+                    objValue.set[objValue.set.length - 1]
+                ]
+            };
+        }
+    }
+    return value;
+};
+
+exports.normalizeXToOneRelationValue = normalizeXToOneRelationValue;
+//# sourceMappingURL=xto-one.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"xto-one.js","sources":["../../../../../../src/services/document-service/transform/relations/utils/xto-one.ts"],"sourcesContent":["import { isNil, isObject } from 'lodash/fp';\n\nimport { relations } from '@strapi/utils';\n\nimport { Relation } from './types';\n\nconst { isAnyToOne } = relations;\n\n/**\n * \"Relates to one\" fields hold a single entry. If a caller passes more\n * than one, keep the last. Runs on the user-provided payload only — never\n * on the internal draft/published expansion that happens later.\n */\nexport const normalizeXToOneRelationValue = (attribute: any, value: Relation): Relation => {\n  if (!isAnyToOne(attribute)) {\n    return value;\n  }\n\n  if (isNil(value)) {\n    return value;\n  }\n\n  if (Array.isArray(value)) {\n    if (value.length > 1) {\n      return [value[value.length - 1]] as Relation;\n    }\n    return value;\n  }\n\n  if (isObject(value) && !Array.isArray(value)) {\n    const objValue = value as { set?: any; connect?: any; disconnect?: any };\n    if (Array.isArray(objValue.set) && objValue.set.length > 1) {\n      return {\n        ...objValue,\n        set: [objValue.set[objValue.set.length - 1]],\n      } as Relation;\n    }\n  }\n\n  return value;\n};\n"],"names":["isAnyToOne","relations","normalizeXToOneRelationValue","attribute","value","isNil","Array","isArray","length","isObject","objValue","set"],"mappings":";;;;;AAMA,MAAM,EAAEA,UAAU,EAAE,GAAGC,qBAAAA;AAEvB;;;;AAIC,IACM,MAAMC,4BAAAA,GAA+B,CAACC,SAAAA,EAAgBC,KAAAA,GAAAA;IAC3D,IAAI,CAACJ,WAAWG,SAAAA,CAAAA,EAAY;QAC1B,OAAOC,KAAAA;AACT,IAAA;AAEA,IAAA,IAAIC,SAAMD,KAAAA,CAAAA,EAAQ;QAChB,OAAOA,KAAAA;AACT,IAAA;IAEA,IAAIE,KAAAA,CAAMC,OAAO,CAACH,KAAAA,CAAAA,EAAQ;QACxB,IAAIA,KAAAA,CAAMI,MAAM,GAAG,CAAA,EAAG;YACpB,OAAO;AAACJ,gBAAAA,KAAK,CAACA,KAAAA,CAAMI,MAAM,GAAG,CAAA;AAAG,aAAA;AAClC,QAAA;QACA,OAAOJ,KAAAA;AACT,IAAA;AAEA,IAAA,IAAIK,YAASL,KAAAA,CAAAA,IAAU,CAACE,KAAAA,CAAMC,OAAO,CAACH,KAAAA,CAAAA,EAAQ;AAC5C,QAAA,MAAMM,QAAAA,GAAWN,KAAAA;QACjB,IAAIE,KAAAA,CAAMC,OAAO,CAACG,QAAAA,CAASC,GAAG,CAAA,IAAKD,QAAAA,CAASC,GAAG,CAACH,MAAM,GAAG,CAAA,EAAG;YAC1D,OAAO;AACL,gBAAA,GAAGE,QAAQ;gBACXC,GAAAA,EAAK;AAACD,oBAAAA,QAAAA,CAASC,GAAG,CAACD,QAAAA,CAASC,GAAG,CAACH,MAAM,GAAG,CAAA;AAAG;AAC9C,aAAA;AACF,QAAA;AACF,IAAA;IAEA,OAAOJ,KAAAA;AACT;;;;"}

package/dist/services/document-service/transform/relations/utils/xto-one.mjs

@@ -0,0 +1,39 @@
+import { isNil, isObject } from 'lodash/fp';
+import { relations } from '@strapi/utils';
+
+const { isAnyToOne } = relations;
+/**
+ * "Relates to one" fields hold a single entry. If a caller passes more
+ * than one, keep the last. Runs on the user-provided payload only — never
+ * on the internal draft/published expansion that happens later.
+ */ const normalizeXToOneRelationValue = (attribute, value)=>{
+    if (!isAnyToOne(attribute)) {
+        return value;
+    }
+    if (isNil(value)) {
+        return value;
+    }
+    if (Array.isArray(value)) {
+        if (value.length > 1) {
+            return [
+                value[value.length - 1]
+            ];
+        }
+        return value;
+    }
+    if (isObject(value) && !Array.isArray(value)) {
+        const objValue = value;
+        if (Array.isArray(objValue.set) && objValue.set.length > 1) {
+            return {
+                ...objValue,
+                set: [
+                    objValue.set[objValue.set.length - 1]
+                ]
+            };
+        }
+    }
+    return value;
+};
+
+export { normalizeXToOneRelationValue };
+//# sourceMappingURL=xto-one.mjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"xto-one.mjs","sources":["../../../../../../src/services/document-service/transform/relations/utils/xto-one.ts"],"sourcesContent":["import { isNil, isObject } from 'lodash/fp';\n\nimport { relations } from '@strapi/utils';\n\nimport { Relation } from './types';\n\nconst { isAnyToOne } = relations;\n\n/**\n * \"Relates to one\" fields hold a single entry. If a caller passes more\n * than one, keep the last. Runs on the user-provided payload only — never\n * on the internal draft/published expansion that happens later.\n */\nexport const normalizeXToOneRelationValue = (attribute: any, value: Relation): Relation => {\n  if (!isAnyToOne(attribute)) {\n    return value;\n  }\n\n  if (isNil(value)) {\n    return value;\n  }\n\n  if (Array.isArray(value)) {\n    if (value.length > 1) {\n      return [value[value.length - 1]] as Relation;\n    }\n    return value;\n  }\n\n  if (isObject(value) && !Array.isArray(value)) {\n    const objValue = value as { set?: any; connect?: any; disconnect?: any };\n    if (Array.isArray(objValue.set) && objValue.set.length > 1) {\n      return {\n        ...objValue,\n        set: [objValue.set[objValue.set.length - 1]],\n      } as Relation;\n    }\n  }\n\n  return value;\n};\n"],"names":["isAnyToOne","relations","normalizeXToOneRelationValue","attribute","value","isNil","Array","isArray","length","isObject","objValue","set"],"mappings":";;;AAMA,MAAM,EAAEA,UAAU,EAAE,GAAGC,SAAAA;AAEvB;;;;AAIC,IACM,MAAMC,4BAAAA,GAA+B,CAACC,SAAAA,EAAgBC,KAAAA,GAAAA;IAC3D,IAAI,CAACJ,WAAWG,SAAAA,CAAAA,EAAY;QAC1B,OAAOC,KAAAA;AACT,IAAA;AAEA,IAAA,IAAIC,MAAMD,KAAAA,CAAAA,EAAQ;QAChB,OAAOA,KAAAA;AACT,IAAA;IAEA,IAAIE,KAAAA,CAAMC,OAAO,CAACH,KAAAA,CAAAA,EAAQ;QACxB,IAAIA,KAAAA,CAAMI,MAAM,GAAG,CAAA,EAAG;YACpB,OAAO;AAACJ,gBAAAA,KAAK,CAACA,KAAAA,CAAMI,MAAM,GAAG,CAAA;AAAG,aAAA;AAClC,QAAA;QACA,OAAOJ,KAAAA;AACT,IAAA;AAEA,IAAA,IAAIK,SAASL,KAAAA,CAAAA,IAAU,CAACE,KAAAA,CAAMC,OAAO,CAACH,KAAAA,CAAAA,EAAQ;AAC5C,QAAA,MAAMM,QAAAA,GAAWN,KAAAA;QACjB,IAAIE,KAAAA,CAAMC,OAAO,CAACG,QAAAA,CAASC,GAAG,CAAA,IAAKD,QAAAA,CAASC,GAAG,CAACH,MAAM,GAAG,CAAA,EAAG;YAC1D,OAAO;AACL,gBAAA,GAAGE,QAAQ;gBACXC,GAAAA,EAAK;AAACD,oBAAAA,QAAAA,CAASC,GAAG,CAACD,QAAAA,CAASC,GAAG,CAACH,MAAM,GAAG,CAAA;AAAG;AAC9C,aAAA;AACF,QAAA;AACF,IAAA;IAEA,OAAOJ,KAAAA;AACT;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/core",
-  "version": "5.45.1",
+  "version": "5.46.0",
   "description": "Core of Strapi",
   "homepage": "https://strapi.io",
   "bugs": {
@@ -59,14 +59,14 @@
     "@koa/cors": "5.0.0",
     "@koa/router": "12.0.2",
     "@paralleldrive/cuid2": "2.2.2",
-    "@strapi/admin": "5.45.1",
-    "@strapi/database": "5.45.1",
-    "@strapi/generators": "5.45.1",
-    "@strapi/logger": "5.45.1",
-    "@strapi/permissions": "5.45.1",
-    "@strapi/types": "5.45.1",
-    "@strapi/typescript-utils": "5.45.1",
-    "@strapi/utils": "5.45.1",
+    "@strapi/admin": "5.46.0",
+    "@strapi/database": "5.46.0",
+    "@strapi/generators": "5.46.0",
+    "@strapi/logger": "5.46.0",
+    "@strapi/permissions": "5.46.0",
+    "@strapi/types": "5.46.0",
+    "@strapi/typescript-utils": "5.46.0",
+    "@strapi/utils": "5.46.0",
     "@vercel/stega": "0.1.2",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
@@ -133,11 +133,11 @@
     "@types/node": "24.10.0",
     "@types/node-schedule": "2.1.7",
     "@types/statuses": "2.0.1",
-    "eslint-config-custom": "5.45.1",
+    "eslint-config-custom": "5.46.0",
     "supertest": "7.2.2",
-    "tsconfig": "5.45.1",
+    "tsconfig": "5.46.0",
     "vitest": "catalog:",
-    "vitest-config": "5.45.1"
+    "vitest-config": "5.46.0"
   },
   "engines": {
     "node": ">=20.0.0 <=24.x.x",