@strapi/core 0.0.0-experimental.22e8a4f31c0b65da00cc6c524a94de53fabc7a28 → 0.0.0-experimental.235f232c2d3f5110341c4933bf23785a81913797

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

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

@@ -3,7 +3,7 @@ import { IdMap } from '../../id-map';
 declare const transformDataIdsVisitor: (idMap: IdMap, data: Record<string, any>, opts: {
     uid: Common.UID.Schema;
     locale?: string | null;
-    isDraft?: boolean;
+    status?: 'draft' | 'published';
     allowMissingId?: boolean;
 }) => Promise<import("@strapi/utils/dist/types").Data>;
 export { transformDataIdsVisitor };

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":"AAAA,OAAO,EAA4B,MAAM,EAAE,MAAM,eAAe,CAAC;AAKjE,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AA4GrC,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,EAA4B,MAAM,EAAE,MAAM,eAAe,CAAC;AAKjE,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AA8JrC,QAAA,MAAM,uBAAuB,UACpB,KAAK,QACN,OAAO,MAAM,EAAE,GAAG,CAAC,QACnB;IACJ,GAAG,EAAE,OAAO,GAAG,CAAC,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,qDA6DF,CAAC;AAEF,OAAO,EAAE,uBAAuB,EAAE,CAAC"}

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

@@ -1,14 +1,17 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const strapiUtils = require("@strapi/utils");
 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, getId) => {
+const transformPrimitive = (relation, getIds) => {
   if (isNumeric(relation)) {
     return relation;
   }
@@ -16,48 +19,64 @@ const transformPrimitive = (relation, getId) => {
     return relation;
   }
   if (data.isShortHand(relation)) {
-    return getId(relation);
+    const ids = getIds(relation);
+    if (ids?.length === 1)
+      return ids[0];
+    return ids;
   }
   if (data.isLongHand(relation)) {
-    if (isNumeric(relation.id))
+    if (!("documentId" in relation))
       return relation;
-    const id = getId(relation.id, relation.locale);
-    if (!id)
+    const ids = getIds(relation.documentId, relation.locale, relation.status);
+    if (!ids?.length)
       return void 0;
-    return { ...relation, id };
+    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.map((item) => transformPrimitive(item, getId)).filter(Boolean);
+    return relation.flatMap((item) => transformPrimitive(item, getIds)).filter(Boolean);
   }
   return void 0;
 };
-const transformRelationIdsVisitor = (relation, getId) => {
-  const map = transformPrimitive(relation, getId);
+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, getId);
+    relation.set = transformPrimitive(relation.set, getIds);
   }
   if ("disconnect" in relation) {
-    relation.disconnect = transformPrimitive(relation.disconnect, getId);
+    relation.disconnect = transformPrimitive(relation.disconnect, getIds);
   }
   if ("connect" in relation) {
-    relation.connect = transformPrimitive(relation.connect, getId);
+    relation.connect = transformPrimitive(relation.connect, getIds);
     const mapPosition = (relation2) => {
       if (data.isShortHand(relation2) || !("position" in relation2))
         return relation2;
-      const { position } = relation2;
+      const position = { ...relation2?.position };
       if (position?.before) {
-        const { id } = transformPrimitive({ ...position, id: position.before }, getId);
-        position.before = id;
+        const result = transformPrimitive({ ...position, documentId: position.before }, getIds);
+        if (Array.isArray(result)) {
+          position.before = result[0]?.id;
+        } else {
+          position.before = result?.id;
+        }
       }
       if (position?.after) {
-        const { id } = transformPrimitive({ ...position, id: position.after }, getId);
-        position.after = id;
+        const result = transformPrimitive({ ...position, documentId: position.after }, getIds);
+        if (Array.isArray(result)) {
+          position.after = result[0]?.id;
+        } else {
+          position.after = result?.id;
+        }
       }
-      return relation2;
+      return { ...relation2, position };
     };
     if (Array.isArray(relation.connect)) {
       relation.connect = relation.connect.map(mapPosition);
@@ -83,27 +102,34 @@ const transformDataIdsVisitor = (idMap, data2, opts) => {
           return;
         if (EXCLUDED_FIELDS.includes(key))
           return;
-        const getId = (documentId, locale) => {
-          const entryId = idMap.get({
-            uid: target,
-            documentId,
-            locale: i18n.getRelationTargetLocale(
-              { id: documentId, locale },
-              {
-                targetUid: target,
-                sourceUid: opts.uid,
-                sourceLocale: opts.locale
-              }
-            ),
-            isDraft: opts.isDraft
-          });
-          if (entryId)
-            return entryId;
-          if (opts.allowMissingId)
-            return null;
-          throw new Error(`Document with id "${documentId}" not found`);
+        const getIds = (documentId, locale, status) => {
+          const targetLocale = i18n.getRelationTargetLocale(
+            { documentId, locale },
+            { targetUid: target, sourceUid: opts.uid, sourceLocale: opts.locale }
+          );
+          const targetStatuses = dp.getRelationTargetStatus(
+            { documentId, status },
+            { targetUid: target, sourceUid: opts.uid, sourceStatus: opts.status }
+          );
+          const ids = [];
+          for (const targetStatus of targetStatuses) {
+            const entryId = idMap.get({
+              uid: target,
+              documentId,
+              locale: targetLocale,
+              status: targetStatus
+            });
+            if (entryId)
+              ids.push(entryId);
+          }
+          if (!ids.length && !opts.allowMissingId) {
+            throw new strapiUtils.errors.ValidationError(
+              `Document with id "${documentId}", locale "${targetLocale}" not found`
+            );
+          }
+          return ids;
         };
-        const newRelation = transformRelationIdsVisitor(value, getId);
+        const newRelation = transformRelationIdsVisitor(value, getIds);
         set(key, newRelation);
       }
     },

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 { EntityService, Attribute, Common } from '@strapi/types';\nimport { traverseEntity } from '@strapi/utils';\nimport { isObject, isNil } from 'lodash/fp';\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  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  // 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    // It's already an entry id\n    if (isNumeric(relation.id)) return relation;\n\n    // @ts-expect-error - TODO: Add relation type\n    const id = getId(relation.id, relation.locale) as T;\n\n    // If the id is not found, return undefined\n    if (!id) return undefined;\n\n    return { ...(relation as object), id } 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, id: 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, id: 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: documentId as string,\n            locale: getRelationTargetLocale(\n              { id: 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 Error(`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"],"mappings":"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"}
+{"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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"}

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

@@ -1,12 +1,15 @@
-import { traverseEntity } from "@strapi/utils";
-import { isObject, isNil } from "lodash/fp";
+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, getId) => {
+const transformPrimitive = (relation, getIds) => {
   if (isNumeric(relation)) {
     return relation;
   }
@@ -14,48 +17,64 @@ const transformPrimitive = (relation, getId) => {
     return relation;
   }
   if (isShortHand(relation)) {
-    return getId(relation);
+    const ids = getIds(relation);
+    if (ids?.length === 1)
+      return ids[0];
+    return ids;
   }
   if (isLongHand(relation)) {
-    if (isNumeric(relation.id))
+    if (!("documentId" in relation))
       return relation;
-    const id = getId(relation.id, relation.locale);
-    if (!id)
+    const ids = getIds(relation.documentId, relation.locale, relation.status);
+    if (!ids?.length)
       return void 0;
-    return { ...relation, id };
+    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.map((item) => transformPrimitive(item, getId)).filter(Boolean);
+    return relation.flatMap((item) => transformPrimitive(item, getIds)).filter(Boolean);
   }
   return void 0;
 };
-const transformRelationIdsVisitor = (relation, getId) => {
-  const map = transformPrimitive(relation, getId);
+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, getId);
+    relation.set = transformPrimitive(relation.set, getIds);
   }
   if ("disconnect" in relation) {
-    relation.disconnect = transformPrimitive(relation.disconnect, getId);
+    relation.disconnect = transformPrimitive(relation.disconnect, getIds);
   }
   if ("connect" in relation) {
-    relation.connect = transformPrimitive(relation.connect, getId);
+    relation.connect = transformPrimitive(relation.connect, getIds);
     const mapPosition = (relation2) => {
       if (isShortHand(relation2) || !("position" in relation2))
         return relation2;
-      const { position } = relation2;
+      const position = { ...relation2?.position };
       if (position?.before) {
-        const { id } = transformPrimitive({ ...position, id: position.before }, getId);
-        position.before = id;
+        const result = transformPrimitive({ ...position, documentId: position.before }, getIds);
+        if (Array.isArray(result)) {
+          position.before = result[0]?.id;
+        } else {
+          position.before = result?.id;
+        }
       }
       if (position?.after) {
-        const { id } = transformPrimitive({ ...position, id: position.after }, getId);
-        position.after = id;
+        const result = transformPrimitive({ ...position, documentId: position.after }, getIds);
+        if (Array.isArray(result)) {
+          position.after = result[0]?.id;
+        } else {
+          position.after = result?.id;
+        }
       }
-      return relation2;
+      return { ...relation2, position };
     };
     if (Array.isArray(relation.connect)) {
       relation.connect = relation.connect.map(mapPosition);
@@ -81,27 +100,34 @@ const transformDataIdsVisitor = (idMap, data, opts) => {
           return;
         if (EXCLUDED_FIELDS.includes(key))
           return;
-        const getId = (documentId, locale) => {
-          const entryId = idMap.get({
-            uid: target,
-            documentId,
-            locale: getRelationTargetLocale(
-              { id: documentId, locale },
-              {
-                targetUid: target,
-                sourceUid: opts.uid,
-                sourceLocale: opts.locale
-              }
-            ),
-            isDraft: opts.isDraft
-          });
-          if (entryId)
-            return entryId;
-          if (opts.allowMissingId)
-            return null;
-          throw new Error(`Document with id "${documentId}" not found`);
+        const getIds = (documentId, locale, status) => {
+          const targetLocale = getRelationTargetLocale(
+            { documentId, locale },
+            { targetUid: target, sourceUid: opts.uid, sourceLocale: opts.locale }
+          );
+          const targetStatuses = getRelationTargetStatus(
+            { documentId, status },
+            { targetUid: target, sourceUid: opts.uid, sourceStatus: opts.status }
+          );
+          const ids = [];
+          for (const targetStatus of targetStatuses) {
+            const entryId = idMap.get({
+              uid: target,
+              documentId,
+              locale: targetLocale,
+              status: targetStatus
+            });
+            if (entryId)
+              ids.push(entryId);
+          }
+          if (!ids.length && !opts.allowMissingId) {
+            throw new errors.ValidationError(
+              `Document with id "${documentId}", locale "${targetLocale}" not found`
+            );
+          }
+          return ids;
         };
-        const newRelation = transformRelationIdsVisitor(value, getId);
+        const newRelation = transformRelationIdsVisitor(value, getIds);
         set(key, newRelation);
       }
     },

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 { EntityService, Attribute, Common } from '@strapi/types';\nimport { traverseEntity } from '@strapi/utils';\nimport { isObject, isNil } from 'lodash/fp';\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  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  // 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    // It's already an entry id\n    if (isNumeric(relation.id)) return relation;\n\n    // @ts-expect-error - TODO: Add relation type\n    const id = getId(relation.id, relation.locale) as T;\n\n    // If the id is not found, return undefined\n    if (!id) return undefined;\n\n    return { ...(relation as object), id } 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, id: 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, id: 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: documentId as string,\n            locale: getRelationTargetLocale(\n              { id: 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 Error(`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":["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 { 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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"}

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

@@ -1,6 +1,4 @@
-import { ID } from './types';
+import { ID, LongHand } from './types';
 export declare const isShortHand: (relation: any) => relation is ID;
-export declare const isLongHand: (relation: any) => relation is {
-    id: ID;
-};
+export declare const isLongHand: (relation: any) => relation is LongHand;
 //# sourceMappingURL=data.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../../../../src/services/document-service/transform/relations/utils/data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAE7B,eAAO,MAAM,WAAW,aAAc,GAAG,mBAExC,CAAC;AAEF,eAAO,MAAM,UAAU,aAAc,GAAG;QAAqB,EAAE;CAE9D,CAAC"}
+{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../../../../src/services/document-service/transform/relations/utils/data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEvC,eAAO,MAAM,WAAW,aAAc,GAAG,mBAExC,CAAC;AAEF,eAAO,MAAM,UAAU,aAAc,GAAG,yBAEvC,CAAC"}

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

@@ -5,7 +5,7 @@ const isShortHand = (relation) => {
   return typeof relation === "string" || typeof relation === "number";
 };
 const isLongHand = (relation) => {
-  return _.isObject(relation) && "id" in relation;
+  return _.isObject(relation) && ("id" in relation || "documentId" in relation);
 };
 exports.isLongHand = isLongHand;
 exports.isShortHand = isShortHand;

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

@@ -1 +1 @@
-{"version":3,"file":"data.js","sources":["../../../../../../src/services/document-service/transform/relations/utils/data.ts"],"sourcesContent":["import { isObject } from 'lodash/fp';\nimport { ID } from './types';\n\nexport const isShortHand = (relation: any): relation is ID => {\n  return typeof relation === 'string' || typeof relation === 'number';\n};\n\nexport const isLongHand = (relation: any): relation is { id: ID } => {\n  return isObject(relation) && 'id' in relation;\n};\n"],"names":["isObject"],"mappings":";;;AAGa,MAAA,cAAc,CAAC,aAAkC;AAC5D,SAAO,OAAO,aAAa,YAAY,OAAO,aAAa;AAC7D;AAEa,MAAA,aAAa,CAAC,aAA0C;AAC5D,SAAAA,WAAS,QAAQ,KAAK,QAAQ;AACvC;;;"}
+{"version":3,"file":"data.js","sources":["../../../../../../src/services/document-service/transform/relations/utils/data.ts"],"sourcesContent":["import { isObject } from 'lodash/fp';\nimport { ID, LongHand } from './types';\n\nexport const isShortHand = (relation: any): relation is ID => {\n  return typeof relation === 'string' || typeof relation === 'number';\n};\n\nexport const isLongHand = (relation: any): relation is LongHand => {\n  return isObject(relation) && ('id' in relation || 'documentId' in relation);\n};\n"],"names":["isObject"],"mappings":";;;AAGa,MAAA,cAAc,CAAC,aAAkC;AAC5D,SAAO,OAAO,aAAa,YAAY,OAAO,aAAa;AAC7D;AAEa,MAAA,aAAa,CAAC,aAAwC;AACjE,SAAOA,EAAAA,SAAS,QAAQ,MAAM,QAAQ,YAAY,gBAAgB;AACpE;;;"}

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

@@ -3,7 +3,7 @@ const isShortHand = (relation) => {
   return typeof relation === "string" || typeof relation === "number";
 };
 const isLongHand = (relation) => {
-  return isObject(relation) && "id" in relation;
+  return isObject(relation) && ("id" in relation || "documentId" in relation);
 };
 export {
   isLongHand,

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

@@ -1 +1 @@
-{"version":3,"file":"data.mjs","sources":["../../../../../../src/services/document-service/transform/relations/utils/data.ts"],"sourcesContent":["import { isObject } from 'lodash/fp';\nimport { ID } from './types';\n\nexport const isShortHand = (relation: any): relation is ID => {\n  return typeof relation === 'string' || typeof relation === 'number';\n};\n\nexport const isLongHand = (relation: any): relation is { id: ID } => {\n  return isObject(relation) && 'id' in relation;\n};\n"],"names":[],"mappings":";AAGa,MAAA,cAAc,CAAC,aAAkC;AAC5D,SAAO,OAAO,aAAa,YAAY,OAAO,aAAa;AAC7D;AAEa,MAAA,aAAa,CAAC,aAA0C;AAC5D,SAAA,SAAS,QAAQ,KAAK,QAAQ;AACvC;"}
+{"version":3,"file":"data.mjs","sources":["../../../../../../src/services/document-service/transform/relations/utils/data.ts"],"sourcesContent":["import { isObject } from 'lodash/fp';\nimport { ID, LongHand } from './types';\n\nexport const isShortHand = (relation: any): relation is ID => {\n  return typeof relation === 'string' || typeof relation === 'number';\n};\n\nexport const isLongHand = (relation: any): relation is LongHand => {\n  return isObject(relation) && ('id' in relation || 'documentId' in relation);\n};\n"],"names":[],"mappings":";AAGa,MAAA,cAAc,CAAC,aAAkC;AAC5D,SAAO,OAAO,aAAa,YAAY,OAAO,aAAa;AAC7D;AAEa,MAAA,aAAa,CAAC,aAAwC;AACjE,SAAO,SAAS,QAAQ,MAAM,QAAQ,YAAY,gBAAgB;AACpE;"}

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

@@ -0,0 +1,10 @@
+import { Common } from '@strapi/types';
+import { LongHandDocument } from './types';
+type Status = 'draft' | 'published';
+export declare const getRelationTargetStatus: (relation: Pick<LongHandDocument, 'documentId' | 'status'>, opts: {
+    targetUid: Common.UID.Schema;
+    sourceUid: Common.UID.Schema;
+    sourceStatus?: Status;
+}) => Status[];
+export {};
+//# sourceMappingURL=dp.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"dp.d.ts","sourceRoot":"","sources":["../../../../../../src/services/document-service/transform/relations/utils/dp.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE3C,KAAK,MAAM,GAAG,OAAO,GAAG,WAAW,CAAC;AAEpC,eAAO,MAAM,uBAAuB,aACxB,KAAK,gBAAgB,EAAE,YAAY,GAAG,QAAQ,CAAC,QACnD;IACJ,SAAS,EAAE,OAAO,GAAG,CAAC,MAAM,CAAC;IAC7B,SAAS,EAAE,OAAO,GAAG,CAAC,MAAM,CAAC;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,KACA,MAAM,EA6BR,CAAC"}

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

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const _ = require("lodash/fp");
+const strapiUtils = require("@strapi/utils");
+const getRelationTargetStatus = (relation, opts) => {
+  const targetContentType = strapi.getModel(opts.targetUid);
+  const sourceContentType = strapi.getModel(opts.sourceUid);
+  const targetHasDP = strapiUtils.contentTypes.hasDraftAndPublish(targetContentType);
+  const sourceHasDP = strapiUtils.contentTypes.hasDraftAndPublish(sourceContentType);
+  if (!targetHasDP) {
+    return ["published"];
+  }
+  if (relation.status) {
+    return [relation.status];
+  }
+  if (!sourceHasDP) {
+    return ["draft", "published"];
+  }
+  if (!_.isNil(opts.sourceStatus)) {
+    return [opts.sourceStatus];
+  }
+  return ["draft"];
+};
+exports.getRelationTargetStatus = getRelationTargetStatus;
+//# sourceMappingURL=dp.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"dp.js","sources":["../../../../../../src/services/document-service/transform/relations/utils/dp.ts"],"sourcesContent":["import { isNil } from 'lodash/fp';\n\nimport { contentTypes } from '@strapi/utils';\nimport { Common } from '@strapi/types';\n\nimport { LongHandDocument } from './types';\n\ntype Status = 'draft' | 'published';\n\nexport const getRelationTargetStatus = (\n  relation: Pick<LongHandDocument, 'documentId' | 'status'>,\n  opts: {\n    targetUid: Common.UID.Schema;\n    sourceUid: Common.UID.Schema;\n    sourceStatus?: Status;\n  }\n): Status[] => {\n  // Ignore if the target content type does not have draft and publish enabled\n  const targetContentType = strapi.getModel(opts.targetUid);\n  const sourceContentType = strapi.getModel(opts.sourceUid);\n\n  const targetHasDP = contentTypes.hasDraftAndPublish(targetContentType);\n  const sourceHasDP = contentTypes.hasDraftAndPublish(sourceContentType);\n\n  if (!targetHasDP) {\n    return ['published'];\n  }\n\n  // priority:\n  // DP Enabled 'relation status' -> 'source status' -> 'draft'\n  // DP Disabled 'relation status' -> 'draft' and 'published'\n  if (relation.status) {\n    return [relation.status];\n  }\n\n  // Connect to both draft and published versions if dp is disabled and relation does not specify a status\n  if (!sourceHasDP) {\n    return ['draft', 'published'];\n  }\n\n  if (!isNil(opts.sourceStatus)) {\n    return [opts.sourceStatus];\n  }\n\n  return ['draft'];\n};\n"],"names":["contentTypes","isNil"],"mappings":";;;;AASa,MAAA,0BAA0B,CACrC,UACA,SAKa;AAEb,QAAM,oBAAoB,OAAO,SAAS,KAAK,SAAS;AACxD,QAAM,oBAAoB,OAAO,SAAS,KAAK,SAAS;AAElD,QAAA,cAAcA,YAAAA,aAAa,mBAAmB,iBAAiB;AAC/D,QAAA,cAAcA,YAAAA,aAAa,mBAAmB,iBAAiB;AAErE,MAAI,CAAC,aAAa;AAChB,WAAO,CAAC,WAAW;AAAA,EACrB;AAKA,MAAI,SAAS,QAAQ;AACZ,WAAA,CAAC,SAAS,MAAM;AAAA,EACzB;AAGA,MAAI,CAAC,aAAa;AACT,WAAA,CAAC,SAAS,WAAW;AAAA,EAC9B;AAEA,MAAI,CAACC,EAAA,MAAM,KAAK,YAAY,GAAG;AACtB,WAAA,CAAC,KAAK,YAAY;AAAA,EAC3B;AAEA,SAAO,CAAC,OAAO;AACjB;;"}

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

@@ -0,0 +1,25 @@
+import { isNil } from "lodash/fp";
+import { contentTypes } from "@strapi/utils";
+const getRelationTargetStatus = (relation, opts) => {
+  const targetContentType = strapi.getModel(opts.targetUid);
+  const sourceContentType = strapi.getModel(opts.sourceUid);
+  const targetHasDP = contentTypes.hasDraftAndPublish(targetContentType);
+  const sourceHasDP = contentTypes.hasDraftAndPublish(sourceContentType);
+  if (!targetHasDP) {
+    return ["published"];
+  }
+  if (relation.status) {
+    return [relation.status];
+  }
+  if (!sourceHasDP) {
+    return ["draft", "published"];
+  }
+  if (!isNil(opts.sourceStatus)) {
+    return [opts.sourceStatus];
+  }
+  return ["draft"];
+};
+export {
+  getRelationTargetStatus
+};
+//# sourceMappingURL=dp.mjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"dp.mjs","sources":["../../../../../../src/services/document-service/transform/relations/utils/dp.ts"],"sourcesContent":["import { isNil } from 'lodash/fp';\n\nimport { contentTypes } from '@strapi/utils';\nimport { Common } from '@strapi/types';\n\nimport { LongHandDocument } from './types';\n\ntype Status = 'draft' | 'published';\n\nexport const getRelationTargetStatus = (\n  relation: Pick<LongHandDocument, 'documentId' | 'status'>,\n  opts: {\n    targetUid: Common.UID.Schema;\n    sourceUid: Common.UID.Schema;\n    sourceStatus?: Status;\n  }\n): Status[] => {\n  // Ignore if the target content type does not have draft and publish enabled\n  const targetContentType = strapi.getModel(opts.targetUid);\n  const sourceContentType = strapi.getModel(opts.sourceUid);\n\n  const targetHasDP = contentTypes.hasDraftAndPublish(targetContentType);\n  const sourceHasDP = contentTypes.hasDraftAndPublish(sourceContentType);\n\n  if (!targetHasDP) {\n    return ['published'];\n  }\n\n  // priority:\n  // DP Enabled 'relation status' -> 'source status' -> 'draft'\n  // DP Disabled 'relation status' -> 'draft' and 'published'\n  if (relation.status) {\n    return [relation.status];\n  }\n\n  // Connect to both draft and published versions if dp is disabled and relation does not specify a status\n  if (!sourceHasDP) {\n    return ['draft', 'published'];\n  }\n\n  if (!isNil(opts.sourceStatus)) {\n    return [opts.sourceStatus];\n  }\n\n  return ['draft'];\n};\n"],"names":[],"mappings":";;AASa,MAAA,0BAA0B,CACrC,UACA,SAKa;AAEb,QAAM,oBAAoB,OAAO,SAAS,KAAK,SAAS;AACxD,QAAM,oBAAoB,OAAO,SAAS,KAAK,SAAS;AAElD,QAAA,cAAc,aAAa,mBAAmB,iBAAiB;AAC/D,QAAA,cAAc,aAAa,mBAAmB,iBAAiB;AAErE,MAAI,CAAC,aAAa;AAChB,WAAO,CAAC,WAAW;AAAA,EACrB;AAKA,MAAI,SAAS,QAAQ;AACZ,WAAA,CAAC,SAAS,MAAM;AAAA,EACzB;AAGA,MAAI,CAAC,aAAa;AACT,WAAA,CAAC,SAAS,WAAW;AAAA,EAC9B;AAEA,MAAI,CAAC,MAAM,KAAK,YAAY,GAAG;AACtB,WAAA,CAAC,KAAK,YAAY;AAAA,EAC3B;AAEA,SAAO,CAAC,OAAO;AACjB;"}

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

@@ -1,8 +1,8 @@
 import { Common } from '@strapi/types';
-import { LongHand } from './types';
+import { LongHandDocument } from './types';
 export declare const isLocalizedContentType: (uid: Common.UID.Schema) => any;
 export declare const getDefaultLocale: () => string;
-export declare const getRelationTargetLocale: (relation: LongHand, opts: {
+export declare const getRelationTargetLocale: (relation: LongHandDocument, opts: {
     targetUid: Common.UID.Schema;
     sourceUid: Common.UID.Schema;
     sourceLocale?: string | null;

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

@@ -1 +1 @@
-{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../../../../../../src/services/document-service/transform/relations/utils/i18n.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,eAAO,MAAM,sBAAsB,QAAS,OAAO,GAAG,CAAC,MAAM,QAG5D,CAAC;AAEF,eAAO,MAAM,gBAAgB,cAI5B,CAAC;AAEF,eAAO,MAAM,uBAAuB,aACxB,QAAQ,QACZ;IACJ,SAAS,EAAE,OAAO,GAAG,CAAC,MAAM,CAAC;IAC7B,SAAS,EAAE,OAAO,GAAG,CAAC,MAAM,CAAC;IAC7B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,kBAuBF,CAAC"}
+{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../../../../../../src/services/document-service/transform/relations/utils/i18n.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE3C,eAAO,MAAM,sBAAsB,QAAS,OAAO,GAAG,CAAC,MAAM,QAG5D,CAAC;AAEF,eAAO,MAAM,gBAAgB,cAI5B,CAAC;AAEF,eAAO,MAAM,uBAAuB,aACxB,gBAAgB,QACpB;IACJ,SAAS,EAAE,OAAO,GAAG,CAAC,MAAM,CAAC;IAC7B,SAAS,EAAE,OAAO,GAAG,CAAC,MAAM,CAAC;IAC7B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,kBAuBF,CAAC"}