@strapi/core 0.0.0-experimental.6dbac0c205b0f8495781db5706c18cac1a62e62b → 0.0.0-experimental.8294852592c0a1fb061c5d3576327fa0e80bab5b

package/dist/services/document-service/transform/id-map.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"id-map.mjs","sources":["../../../../src/services/document-service/transform/id-map.ts"],"sourcesContent":["import { Strapi, Entity } from '@strapi/types';\nimport { mapAsync } from '@strapi/utils';\n\n/**\n * TODO: Find a better way to encode keys than this\n * This converts an object into a string by joining its keys and values,\n * so it can be used as a key in a Map.\n *\n * @example\n * const obj = { a: 1, b: 2 };\n * const key = encodeKey(obj);\n *      ^ \"a:::1&&b:::2\"\n */\nconst encodeKey = (obj: any) => {\n  // Sort keys to always keep the same order when encoding\n  const keys = Object.keys(obj).sort();\n  return keys.map((key) => `${key}:::${obj[key]}`).join('&&');\n};\n\ninterface KeyFields {\n  uid: string;\n  documentId: Entity.ID;\n  locale?: string | null;\n  isDraft?: boolean;\n}\n\nexport interface IdMap {\n  loadedIds: Map<string, string>;\n  toLoadIds: Map<string, KeyFields>;\n  // Make the Keys type to be the params of add\n  add(keys: KeyFields): void;\n  load(): Promise<void>;\n  get(keys: KeyFields): string | undefined;\n  clear(): void;\n}\n\n/**\n * Holds a registry of document ids and their corresponding entity ids.\n */\nconst createIdMap = ({ strapi }: { strapi: Strapi }): IdMap => {\n  const loadedIds = new Map();\n  const toLoadIds = new Map();\n\n  return {\n    loadedIds,\n    toLoadIds,\n    /**\n     * Register a new document id and its corresponding entity id.\n     */\n    add(keyFields: KeyFields) {\n      const key = encodeKey({ isDraft: false, locale: null, ...keyFields });\n\n      // If the id is already loaded, do nothing\n      if (loadedIds.has(key)) return;\n      // If the id is already in the toLoadIds, do nothing\n      if (toLoadIds.has(key)) return;\n\n      // Add the id to the toLoadIds\n      toLoadIds.set(key, keyFields);\n    },\n\n    /**\n     * Load all ids from the registry.\n     */\n    async load() {\n      // Document Id to Entry Id queries are batched by its uid and locale\n      // TODO: Add publication state too\n      const loadIdValues = Array.from(toLoadIds.values());\n\n      // 1. Group ids to query together\n      const idsByUidAndLocale = loadIdValues.reduce((acc, { documentId, ...rest }) => {\n        const key = encodeKey(rest);\n        const ids = acc[key] || { ...rest, documentIds: [] };\n        ids.documentIds.push(documentId);\n        return { ...acc, [key]: ids };\n      }, {});\n\n      // 2. Query ids\n      await mapAsync(\n        Object.values(idsByUidAndLocale),\n        async ({ uid, locale, documentIds, isDraft }: any) => {\n          const result = await strapi?.db?.query(uid).findMany({\n            select: ['id', 'documentId', 'locale', 'publishedAt'],\n            where: {\n              documentId: { $in: documentIds },\n              locale,\n              publishedAt: isDraft ? null : { $ne: null },\n            },\n          });\n\n          // 3. Store result in loadedIds\n          result?.forEach(({ documentId, id, locale, publishedAt }: any) => {\n            const key = encodeKey({ documentId, uid, locale, isDraft: !publishedAt });\n            loadedIds.set(key, id);\n          });\n        }\n      );\n\n      // 4. Clear toLoadIds\n      toLoadIds.clear();\n    },\n\n    /**\n     * Get the entity id for a given document id.\n     */\n    get(keys: KeyFields) {\n      const key = encodeKey({ isDraft: false, locale: null, ...keys });\n      return loadedIds.get(key);\n    },\n\n    /**\n     * Clear the registry.\n     */\n    clear() {\n      loadedIds.clear();\n      toLoadIds.clear();\n    },\n  };\n};\n\nexport { createIdMap };\n"],"names":["locale"],"mappings":";AAaA,MAAM,YAAY,CAAC,QAAa;AAE9B,QAAM,OAAO,OAAO,KAAK,GAAG,EAAE,KAAK;AACnC,SAAO,KAAK,IAAI,CAAC,QAAQ,GAAG,GAAG,MAAM,IAAI,GAAG,CAAC,EAAE,EAAE,KAAK,IAAI;AAC5D;AAsBA,MAAM,cAAc,CAAC,EAAE,aAAwC;AACvD,QAAA,gCAAgB;AAChB,QAAA,gCAAgB;AAEf,SAAA;AAAA,IACL;AAAA,IACA;AAAA;AAAA;AAAA;AAAA,IAIA,IAAI,WAAsB;AAClB,YAAA,MAAM,UAAU,EAAE,SAAS,OAAO,QAAQ,MAAM,GAAG,UAAA,CAAW;AAGhE,UAAA,UAAU,IAAI,GAAG;AAAG;AAEpB,UAAA,UAAU,IAAI,GAAG;AAAG;AAGd,gBAAA,IAAI,KAAK,SAAS;AAAA,IAC9B;AAAA;AAAA;AAAA;AAAA,IAKA,MAAM,OAAO;AAGX,YAAM,eAAe,MAAM,KAAK,UAAU,OAAQ,CAAA;AAG5C,YAAA,oBAAoB,aAAa,OAAO,CAAC,KAAK,EAAE,YAAY,GAAG,WAAW;AACxE,cAAA,MAAM,UAAU,IAAI;AACpB,cAAA,MAAM,IAAI,GAAG,KAAK,EAAE,GAAG,MAAM,aAAa,CAAA;AAC5C,YAAA,YAAY,KAAK,UAAU;AAC/B,eAAO,EAAE,GAAG,KAAK,CAAC,GAAG,GAAG,IAAI;AAAA,MAC9B,GAAG,CAAE,CAAA;AAGC,YAAA;AAAA,QACJ,OAAO,OAAO,iBAAiB;AAAA,QAC/B,OAAO,EAAE,KAAK,QAAQ,aAAa,cAAmB;AACpD,gBAAM,SAAS,MAAM,QAAQ,IAAI,MAAM,GAAG,EAAE,SAAS;AAAA,YACnD,QAAQ,CAAC,MAAM,cAAc,UAAU,aAAa;AAAA,YACpD,OAAO;AAAA,cACL,YAAY,EAAE,KAAK,YAAY;AAAA,cAC/B;AAAA,cACA,aAAa,UAAU,OAAO,EAAE,KAAK,KAAK;AAAA,YAC5C;AAAA,UAAA,CACD;AAGO,kBAAA,QAAQ,CAAC,EAAE,YAAY,IAAI,QAAAA,SAAQ,kBAAuB;AAC1D,kBAAA,MAAM,UAAU,EAAE,YAAY,KAAK,QAAAA,SAAQ,SAAS,CAAC,YAAA,CAAa;AAC9D,sBAAA,IAAI,KAAK,EAAE;AAAA,UAAA,CACtB;AAAA,QACH;AAAA,MAAA;AAIF,gBAAU,MAAM;AAAA,IAClB;AAAA;AAAA;AAAA;AAAA,IAKA,IAAI,MAAiB;AACb,YAAA,MAAM,UAAU,EAAE,SAAS,OAAO,QAAQ,MAAM,GAAG,KAAA,CAAM;AACxD,aAAA,UAAU,IAAI,GAAG;AAAA,IAC1B;AAAA;AAAA;AAAA;AAAA,IAKA,QAAQ;AACN,gBAAU,MAAM;AAChB,gBAAU,MAAM;AAAA,IAClB;AAAA,EAAA;AAEJ;"}

package/dist/services/document-service/transform/id-transform.d.ts

@@ -0,0 +1,19 @@
+import { Common } from '@strapi/types';
+/**
+ * Transform input of a query to map document ids to entity ids.
+ */
+declare function transformParamsDocumentId(uid: Common.UID.Schema, input: {
+    data?: any;
+    fields?: any;
+    populate?: any;
+    [key: string]: any;
+}, opts: {
+    locale?: string | null;
+    isDraft: boolean;
+}): Promise<{
+    data: any;
+    fields: any;
+    populate: any;
+}>;
+export { transformParamsDocumentId };
+//# sourceMappingURL=id-transform.d.ts.map

package/dist/services/document-service/transform/id-transform.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"id-transform.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/id-transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAKvC;;GAEG;AACH,iBAAe,yBAAyB,CACtC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EACtB,KAAK,EAAE;IAAE,IAAI,CAAC,EAAE,GAAG,CAAC;IAAC,MAAM,CAAC,EAAE,GAAG,CAAC;IAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EACvE,IAAI,EAAE;IACJ,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;CAClB;;;;GAyBF;AAED,OAAO,EAAE,yBAAyB,EAAE,CAAC"}

package/dist/services/document-service/transform/id-transform.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const data = require("./data.js");
+const fields = require("./fields.js");
+const populate = require("./populate.js");
+async function transformParamsDocumentId(uid, input, opts) {
+  let data$1 = input.data;
+  if (input.data) {
+    data$1 = await data.transformData(input.data, { ...opts, uid });
+  }
+  let fields$1 = input.fields;
+  if (input.fields) {
+    fields$1 = fields.transformFields(input.fields);
+  }
+  let populate$1 = input.populate;
+  if (input.populate) {
+    populate$1 = await populate.transformPopulate(input.populate, { ...opts, uid });
+  }
+  return {
+    ...input,
+    data: data$1,
+    fields: fields$1,
+    populate: populate$1
+  };
+}
+exports.transformParamsDocumentId = transformParamsDocumentId;
+//# sourceMappingURL=id-transform.js.map

package/dist/services/document-service/transform/id-transform.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"id-transform.js","sources":["../../../../src/services/document-service/transform/id-transform.ts"],"sourcesContent":["import { Common } from '@strapi/types';\nimport { transformData } from './data';\nimport { transformFields } from './fields';\nimport { transformPopulate } from './populate';\n\n/**\n * Transform input of a query to map document ids to entity ids.\n */\nasync function transformParamsDocumentId(\n  uid: Common.UID.Schema,\n  input: { data?: any; fields?: any; populate?: any; [key: string]: any },\n  opts: {\n    locale?: string | null;\n    isDraft: boolean;\n  }\n) {\n  // Transform relational documentIds to entity ids\n  let data = input.data;\n  if (input.data) {\n    data = await transformData(input.data, { ...opts, uid });\n  }\n\n  // Make sure documentId is always present in the response\n  let fields = input.fields;\n  if (input.fields) {\n    fields = transformFields(input.fields);\n  }\n\n  let populate = input.populate;\n  if (input.populate) {\n    populate = await transformPopulate(input.populate, { ...opts, uid });\n  }\n\n  return {\n    ...input,\n    data,\n    fields,\n    populate,\n  };\n}\n\nexport { transformParamsDocumentId };\n"],"names":["data","transformData","fields","transformFields","populate","transformPopulate"],"mappings":";;;;;AAQA,eAAe,0BACb,KACA,OACA,MAIA;AAEA,MAAIA,SAAO,MAAM;AACjB,MAAI,MAAM,MAAM;AACPA,aAAA,MAAMC,mBAAc,MAAM,MAAM,EAAE,GAAG,MAAM,KAAK;AAAA,EACzD;AAGA,MAAIC,WAAS,MAAM;AACnB,MAAI,MAAM,QAAQ;AACPA,eAAAC,OAAA,gBAAgB,MAAM,MAAM;AAAA,EACvC;AAEA,MAAIC,aAAW,MAAM;AACrB,MAAI,MAAM,UAAU;AACPA,iBAAA,MAAMC,2BAAkB,MAAM,UAAU,EAAE,GAAG,MAAM,KAAK;AAAA,EACrE;AAEO,SAAA;AAAA,IACL,GAAG;AAAA,IAAA,MACHL;AAAAA,IAAA,QACAE;AAAAA,IAAA,UACAE;AAAAA,EAAA;AAEJ;;"}

package/dist/services/document-service/transform/id-transform.mjs

@@ -0,0 +1,27 @@
+import { transformData } from "./data.mjs";
+import { transformFields } from "./fields.mjs";
+import { transformPopulate } from "./populate.mjs";
+async function transformParamsDocumentId(uid, input, opts) {
+  let data = input.data;
+  if (input.data) {
+    data = await transformData(input.data, { ...opts, uid });
+  }
+  let fields = input.fields;
+  if (input.fields) {
+    fields = transformFields(input.fields);
+  }
+  let populate = input.populate;
+  if (input.populate) {
+    populate = await transformPopulate(input.populate, { ...opts, uid });
+  }
+  return {
+    ...input,
+    data,
+    fields,
+    populate
+  };
+}
+export {
+  transformParamsDocumentId
+};
+//# sourceMappingURL=id-transform.mjs.map

package/dist/services/document-service/transform/id-transform.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"id-transform.mjs","sources":["../../../../src/services/document-service/transform/id-transform.ts"],"sourcesContent":["import { Common } from '@strapi/types';\nimport { transformData } from './data';\nimport { transformFields } from './fields';\nimport { transformPopulate } from './populate';\n\n/**\n * Transform input of a query to map document ids to entity ids.\n */\nasync function transformParamsDocumentId(\n  uid: Common.UID.Schema,\n  input: { data?: any; fields?: any; populate?: any; [key: string]: any },\n  opts: {\n    locale?: string | null;\n    isDraft: boolean;\n  }\n) {\n  // Transform relational documentIds to entity ids\n  let data = input.data;\n  if (input.data) {\n    data = await transformData(input.data, { ...opts, uid });\n  }\n\n  // Make sure documentId is always present in the response\n  let fields = input.fields;\n  if (input.fields) {\n    fields = transformFields(input.fields);\n  }\n\n  let populate = input.populate;\n  if (input.populate) {\n    populate = await transformPopulate(input.populate, { ...opts, uid });\n  }\n\n  return {\n    ...input,\n    data,\n    fields,\n    populate,\n  };\n}\n\nexport { transformParamsDocumentId };\n"],"names":[],"mappings":";;;AAQA,eAAe,0BACb,KACA,OACA,MAIA;AAEA,MAAI,OAAO,MAAM;AACjB,MAAI,MAAM,MAAM;AACP,WAAA,MAAM,cAAc,MAAM,MAAM,EAAE,GAAG,MAAM,KAAK;AAAA,EACzD;AAGA,MAAI,SAAS,MAAM;AACnB,MAAI,MAAM,QAAQ;AACP,aAAA,gBAAgB,MAAM,MAAM;AAAA,EACvC;AAEA,MAAI,WAAW,MAAM;AACrB,MAAI,MAAM,UAAU;AACP,eAAA,MAAM,kBAAkB,MAAM,UAAU,EAAE,GAAG,MAAM,KAAK;AAAA,EACrE;AAEO,SAAA;AAAA,IACL,GAAG;AAAA,IACH;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEJ;"}

package/dist/services/document-service/transform/populate.d.ts

@@ -0,0 +1,3 @@
+import { type Data, type Options } from './types';
+export declare const transformPopulate: (data: Data, opts: Options) => Promise<unknown>;
+//# sourceMappingURL=populate.d.ts.map

package/dist/services/document-service/transform/populate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"populate.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/populate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,IAAI,EAAE,KAAK,OAAO,EAAE,MAAM,SAAS,CAAC;AAGlD,eAAO,MAAM,iBAAiB,SAAgB,IAAI,QAAQ,OAAO,qBAqBhE,CAAC"}

package/dist/services/document-service/transform/populate.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const strapiUtils = require("@strapi/utils");
+const fields = require("./fields.js");
+const transformPopulate = async (data, opts) => {
+  return strapiUtils.traverse.traverseQueryPopulate(
+    async ({ attribute, key, value }, { set }) => {
+      if (!value || typeof value !== "object" || attribute?.type !== "relation") {
+        return;
+      }
+      if ("fields" in value && Array.isArray(value.fields)) {
+        value.fields = fields.transformFields(value.fields);
+      }
+      set(key, value);
+    },
+    { schema: strapi.getModel(opts.uid) },
+    data
+  );
+};
+exports.transformPopulate = transformPopulate;
+//# sourceMappingURL=populate.js.map

package/dist/services/document-service/transform/populate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"populate.js","sources":["../../../../src/services/document-service/transform/populate.ts"],"sourcesContent":["import { traverse } from '@strapi/utils';\nimport { type Data, type Options } from './types';\nimport { transformFields } from './fields';\n\nexport const transformPopulate = async (data: Data, opts: Options) => {\n  return traverse.traverseQueryPopulate(\n    async ({ attribute, key, value }, { set }) => {\n      if (!value || typeof value !== 'object' || attribute?.type !== 'relation') {\n        return;\n      }\n\n      /*\n        If the attribute is a relation\n        Look for fields in the value\n        and apply the relevant transformation to these objects\n      */\n      if ('fields' in value && Array.isArray(value.fields)) {\n        value.fields = transformFields(value.fields);\n      }\n\n      set(key, value);\n    },\n    { schema: strapi.getModel(opts.uid) },\n    data\n  );\n};\n"],"names":["traverse","transformFields"],"mappings":";;;;AAIa,MAAA,oBAAoB,OAAO,MAAY,SAAkB;AACpE,SAAOA,YAAS,SAAA;AAAA,IACd,OAAO,EAAE,WAAW,KAAK,SAAS,EAAE,UAAU;AAC5C,UAAI,CAAC,SAAS,OAAO,UAAU,YAAY,WAAW,SAAS,YAAY;AACzE;AAAA,MACF;AAOA,UAAI,YAAY,SAAS,MAAM,QAAQ,MAAM,MAAM,GAAG;AAC9C,cAAA,SAASC,OAAAA,gBAAgB,MAAM,MAAM;AAAA,MAC7C;AAEA,UAAI,KAAK,KAAK;AAAA,IAChB;AAAA,IACA,EAAE,QAAQ,OAAO,SAAS,KAAK,GAAG,EAAE;AAAA,IACpC;AAAA,EAAA;AAEJ;;"}

package/dist/services/document-service/transform/populate.mjs

@@ -0,0 +1,21 @@
+import { traverse } from "@strapi/utils";
+import { transformFields } from "./fields.mjs";
+const transformPopulate = async (data, opts) => {
+  return traverse.traverseQueryPopulate(
+    async ({ attribute, key, value }, { set }) => {
+      if (!value || typeof value !== "object" || attribute?.type !== "relation") {
+        return;
+      }
+      if ("fields" in value && Array.isArray(value.fields)) {
+        value.fields = transformFields(value.fields);
+      }
+      set(key, value);
+    },
+    { schema: strapi.getModel(opts.uid) },
+    data
+  );
+};
+export {
+  transformPopulate
+};
+//# sourceMappingURL=populate.mjs.map

package/dist/services/document-service/transform/populate.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"populate.mjs","sources":["../../../../src/services/document-service/transform/populate.ts"],"sourcesContent":["import { traverse } from '@strapi/utils';\nimport { type Data, type Options } from './types';\nimport { transformFields } from './fields';\n\nexport const transformPopulate = async (data: Data, opts: Options) => {\n  return traverse.traverseQueryPopulate(\n    async ({ attribute, key, value }, { set }) => {\n      if (!value || typeof value !== 'object' || attribute?.type !== 'relation') {\n        return;\n      }\n\n      /*\n        If the attribute is a relation\n        Look for fields in the value\n        and apply the relevant transformation to these objects\n      */\n      if ('fields' in value && Array.isArray(value.fields)) {\n        value.fields = transformFields(value.fields);\n      }\n\n      set(key, value);\n    },\n    { schema: strapi.getModel(opts.uid) },\n    data\n  );\n};\n"],"names":[],"mappings":";;AAIa,MAAA,oBAAoB,OAAO,MAAY,SAAkB;AACpE,SAAO,SAAS;AAAA,IACd,OAAO,EAAE,WAAW,KAAK,SAAS,EAAE,UAAU;AAC5C,UAAI,CAAC,SAAS,OAAO,UAAU,YAAY,WAAW,SAAS,YAAY;AACzE;AAAA,MACF;AAOA,UAAI,YAAY,SAAS,MAAM,QAAQ,MAAM,MAAM,GAAG;AAC9C,cAAA,SAAS,gBAAgB,MAAM,MAAM;AAAA,MAC7C;AAEA,UAAI,KAAK,KAAK;AAAA,IAChB;AAAA,IACA,EAAE,QAAQ,OAAO,SAAS,KAAK,GAAG,EAAE;AAAA,IACpC;AAAA,EAAA;AAEJ;"}

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

@@ -0,0 +1,13 @@
+import { Common } from '@strapi/types';
+import { IdMap } from '../../id-map';
+/**
+ * Iterate over all attributes of a Data object and extract all relational document ids.
+ * Those will later be transformed to entity ids.
+ */
+declare const extractDataIds: (idMap: IdMap, data: Record<string, any>, opts: {
+    uid: Common.UID.Schema;
+    locale?: string | null;
+    isDraft?: boolean;
+}) => Promise<import("@strapi/utils/dist/types").Data>;
+export { extractDataIds };
+//# sourceMappingURL=data-ids.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"data-ids.d.ts","sourceRoot":"","sources":["../../../../../../src/services/document-service/transform/relations/extract/data-ids.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,MAAM,EAAE,MAAM,eAAe,CAAC;AAEjE,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAyErC;;;GAGG;AACH,QAAA,MAAM,cAAc,UACX,KAAK,QACN,OAAO,MAAM,EAAE,GAAG,CAAC,QACnB;IAAE,GAAG,EAAE,OAAO,GAAG,CAAC,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,qDA6B5E,CAAC;AAEF,OAAO,EAAE,cAAc,EAAE,CAAC"}

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

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const _ = require("lodash/fp");
+const strapiUtils = require("@strapi/utils");
+const data = require("../utils/data.js");
+const i18n = require("../utils/i18n.js");
+const handlePrimitive = (relation) => {
+  if (!relation) {
+    return [];
+  }
+  if (data.isShortHand(relation)) {
+    return [{ documentId: relation }];
+  }
+  if (data.isLongHand(relation)) {
+    if ("documentId" in relation) {
+      return [{ documentId: relation.documentId, locale: relation.locale }];
+    }
+    return [];
+  }
+  if (Array.isArray(relation)) {
+    return relation.map((item) => data.isShortHand(item) ? { documentId: item } : item);
+  }
+  return [];
+};
+const extractRelationIds = (relation) => {
+  const ids = handlePrimitive(relation);
+  if (!_.isObject(relation))
+    return ids;
+  if ("set" in relation)
+    ids.push(...handlePrimitive(relation.set));
+  if ("disconnect" in relation)
+    ids.push(...handlePrimitive(relation.disconnect));
+  if ("connect" in relation) {
+    if (!relation.connect)
+      return [];
+    ids.push(...handlePrimitive(relation.connect));
+    const connect = Array.isArray(relation.connect) ? relation.connect : [relation.connect];
+    connect.forEach((relation2) => {
+      if (data.isShortHand(relation2) || !("position" in relation2))
+        return;
+      const { position } = relation2;
+      if (position?.before) {
+        ids.push(...handlePrimitive({ ...position, id: position.before }));
+      }
+      if (position?.after) {
+        ids.push(...handlePrimitive({ ...position, id: position.after }));
+      }
+    });
+  }
+  return ids;
+};
+const extractDataIds = (idMap, data2, opts) => {
+  return strapiUtils.traverseEntity(
+    ({ value, attribute }) => {
+      if (attribute.type === "relation") {
+        const extractedIds = extractRelationIds(value);
+        const target = attribute.target;
+        if (!target)
+          return;
+        extractedIds.forEach((relation) => {
+          idMap.add({
+            uid: target,
+            documentId: relation.documentId,
+            locale: i18n.getRelationTargetLocale(relation, {
+              targetUid: target,
+              sourceUid: opts.uid,
+              sourceLocale: opts.locale
+            }),
+            isDraft: opts.isDraft
+          });
+        });
+      }
+    },
+    { schema: strapi.getModel(opts.uid) },
+    data2
+  );
+};
+exports.extractDataIds = extractDataIds;
+//# sourceMappingURL=data-ids.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"data-ids.js","sources":["../../../../../../src/services/document-service/transform/relations/extract/data-ids.ts"],"sourcesContent":["import { isObject } from 'lodash/fp';\nimport { EntityService, Attribute, Common } from '@strapi/types';\nimport { traverseEntity } from '@strapi/utils';\nimport { IdMap } from '../../id-map';\nimport { ShortHand, LongHand, LongHandDocument } from '../utils/types';\nimport { isShortHand, isLongHand } from '../utils/data';\nimport { getRelationTargetLocale } from '../utils/i18n';\n\n/**\n *  Get relation ids from primitive representation (id, id[], {id}, {id}[])\n */\nconst handlePrimitive = (\n  relation: ShortHand | LongHand | ShortHand[] | LongHand[] | null | undefined | any\n): LongHandDocument[] => {\n  if (!relation) {\n    return []; // null\n  }\n\n  if (isShortHand(relation)) {\n    return [{ documentId: relation }]; // id\n  }\n\n  if (isLongHand(relation)) {\n    // { documentId, locale? }\n    if ('documentId' in relation) {\n      return [{ documentId: relation.documentId, locale: relation.locale }];\n    }\n    // { id }\n    return [];\n  }\n\n  if (Array.isArray(relation)) {\n    return relation.map((item) => (isShortHand(item) ? { documentId: item } : item)); // id[]\n  }\n\n  return [];\n};\n\n/**\n * Get all relations document ids from a relation input value\n */\nconst extractRelationIds = <T extends Attribute.RelationKind.Any>(\n  relation: EntityService.Params.Attribute.RelationInputValue<T>\n): LongHandDocument[] => {\n  const ids = handlePrimitive(relation);\n  if (!isObject(relation)) return ids;\n\n  if ('set' in relation) ids.push(...handlePrimitive(relation.set)); // set: id[]\n  if ('disconnect' in relation) ids.push(...handlePrimitive(relation.disconnect)); // disconnect: id[]\n  if ('connect' in relation) {\n    // connect: id[] | { id } | ...\n    if (!relation.connect) return [];\n    ids.push(...handlePrimitive(relation.connect));\n\n    // handle positional arguments\n    const connect = Array.isArray(relation.connect) ? relation.connect : [relation.connect];\n    connect.forEach((relation) => {\n      if (isShortHand(relation) || !('position' in relation)) return;\n\n      const { position } = relation;\n\n      // { connect: { id: id, position: { before: id } } }\n      if (position?.before) {\n        ids.push(...handlePrimitive({ ...position, id: position.before }));\n      }\n\n      // { connect: { id: id, position: { after: id } } }\n      if (position?.after) {\n        ids.push(...handlePrimitive({ ...position, id: position.after }));\n      }\n    });\n  }\n\n  return ids;\n};\n\n/**\n * Iterate over all attributes of a Data object and extract all relational document ids.\n * Those will later be transformed to entity ids.\n */\nconst extractDataIds = (\n  idMap: IdMap,\n  data: Record<string, any>,\n  opts: { uid: Common.UID.Schema; locale?: string | null; isDraft?: boolean }\n) => {\n  return traverseEntity(\n    ({ value, attribute }) => {\n      // Find relational attributes, and return the document ids\n      if (attribute.type === 'relation') {\n        const extractedIds = extractRelationIds(value as any);\n\n        // TODO: Handle morph relations (they have multiple targets)\n        const target = attribute.target;\n        if (!target) return;\n\n        extractedIds.forEach((relation) => {\n          idMap.add({\n            uid: target,\n            documentId: relation.documentId,\n            locale: getRelationTargetLocale(relation, {\n              targetUid: target as Common.UID.Schema,\n              sourceUid: opts.uid,\n              sourceLocale: opts.locale,\n            }),\n            isDraft: opts.isDraft,\n          });\n        });\n      }\n    },\n    { schema: strapi.getModel(opts.uid) },\n    data\n  );\n};\n\nexport { extractDataIds };\n"],"names":["isShortHand","isLongHand","isObject","relation","data","traverseEntity","getRelationTargetLocale"],"mappings":";;;;;;AAWA,MAAM,kBAAkB,CACtB,aACuB;AACvB,MAAI,CAAC,UAAU;AACb,WAAO;EACT;AAEI,MAAAA,KAAAA,YAAY,QAAQ,GAAG;AACzB,WAAO,CAAC,EAAE,YAAY,SAAA,CAAU;AAAA,EAClC;AAEI,MAAAC,KAAAA,WAAW,QAAQ,GAAG;AAExB,QAAI,gBAAgB,UAAU;AACrB,aAAA,CAAC,EAAE,YAAY,SAAS,YAAY,QAAQ,SAAS,QAAQ;AAAA,IACtE;AAEA,WAAO;EACT;AAEI,MAAA,MAAM,QAAQ,QAAQ,GAAG;AACpB,WAAA,SAAS,IAAI,CAAC,SAAUD,KAAA,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,CAACE,WAAS,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,CAACC,cAAa;AAC5B,UAAIH,KAAYG,YAAAA,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,OACAC,OACA,SACG;AACI,SAAAC,YAAA;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,QAAQC,6BAAwB,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,IACpCF;AAAA,EAAA;AAEJ;;"}

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

@@ -0,0 +1,79 @@
+import { isObject } from "lodash/fp";
+import { traverseEntity } from "@strapi/utils";
+import { isShortHand, isLongHand } from "../utils/data.mjs";
+import { getRelationTargetLocale } from "../utils/i18n.mjs";
+const handlePrimitive = (relation) => {
+  if (!relation) {
+    return [];
+  }
+  if (isShortHand(relation)) {
+    return [{ documentId: relation }];
+  }
+  if (isLongHand(relation)) {
+    if ("documentId" in relation) {
+      return [{ documentId: relation.documentId, locale: relation.locale }];
+    }
+    return [];
+  }
+  if (Array.isArray(relation)) {
+    return relation.map((item) => isShortHand(item) ? { documentId: item } : item);
+  }
+  return [];
+};
+const extractRelationIds = (relation) => {
+  const ids = handlePrimitive(relation);
+  if (!isObject(relation))
+    return ids;
+  if ("set" in relation)
+    ids.push(...handlePrimitive(relation.set));
+  if ("disconnect" in relation)
+    ids.push(...handlePrimitive(relation.disconnect));
+  if ("connect" in relation) {
+    if (!relation.connect)
+      return [];
+    ids.push(...handlePrimitive(relation.connect));
+    const connect = Array.isArray(relation.connect) ? relation.connect : [relation.connect];
+    connect.forEach((relation2) => {
+      if (isShortHand(relation2) || !("position" in relation2))
+        return;
+      const { position } = relation2;
+      if (position?.before) {
+        ids.push(...handlePrimitive({ ...position, id: position.before }));
+      }
+      if (position?.after) {
+        ids.push(...handlePrimitive({ ...position, id: position.after }));
+      }
+    });
+  }
+  return ids;
+};
+const extractDataIds = (idMap, data, opts) => {
+  return traverseEntity(
+    ({ value, attribute }) => {
+      if (attribute.type === "relation") {
+        const extractedIds = extractRelationIds(value);
+        const target = attribute.target;
+        if (!target)
+          return;
+        extractedIds.forEach((relation) => {
+          idMap.add({
+            uid: target,
+            documentId: relation.documentId,
+            locale: getRelationTargetLocale(relation, {
+              targetUid: target,
+              sourceUid: opts.uid,
+              sourceLocale: opts.locale
+            }),
+            isDraft: opts.isDraft
+          });
+        });
+      }
+    },
+    { schema: strapi.getModel(opts.uid) },
+    data
+  );
+};
+export {
+  extractDataIds
+};
+//# sourceMappingURL=data-ids.mjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"data-ids.mjs","sources":["../../../../../../src/services/document-service/transform/relations/extract/data-ids.ts"],"sourcesContent":["import { isObject } from 'lodash/fp';\nimport { EntityService, Attribute, Common } from '@strapi/types';\nimport { traverseEntity } from '@strapi/utils';\nimport { IdMap } from '../../id-map';\nimport { ShortHand, LongHand, LongHandDocument } from '../utils/types';\nimport { isShortHand, isLongHand } from '../utils/data';\nimport { getRelationTargetLocale } from '../utils/i18n';\n\n/**\n *  Get relation ids from primitive representation (id, id[], {id}, {id}[])\n */\nconst handlePrimitive = (\n  relation: ShortHand | LongHand | ShortHand[] | LongHand[] | null | undefined | any\n): LongHandDocument[] => {\n  if (!relation) {\n    return []; // null\n  }\n\n  if (isShortHand(relation)) {\n    return [{ documentId: relation }]; // id\n  }\n\n  if (isLongHand(relation)) {\n    // { documentId, locale? }\n    if ('documentId' in relation) {\n      return [{ documentId: relation.documentId, locale: relation.locale }];\n    }\n    // { id }\n    return [];\n  }\n\n  if (Array.isArray(relation)) {\n    return relation.map((item) => (isShortHand(item) ? { documentId: item } : item)); // id[]\n  }\n\n  return [];\n};\n\n/**\n * Get all relations document ids from a relation input value\n */\nconst extractRelationIds = <T extends Attribute.RelationKind.Any>(\n  relation: EntityService.Params.Attribute.RelationInputValue<T>\n): LongHandDocument[] => {\n  const ids = handlePrimitive(relation);\n  if (!isObject(relation)) return ids;\n\n  if ('set' in relation) ids.push(...handlePrimitive(relation.set)); // set: id[]\n  if ('disconnect' in relation) ids.push(...handlePrimitive(relation.disconnect)); // disconnect: id[]\n  if ('connect' in relation) {\n    // connect: id[] | { id } | ...\n    if (!relation.connect) return [];\n    ids.push(...handlePrimitive(relation.connect));\n\n    // handle positional arguments\n    const connect = Array.isArray(relation.connect) ? relation.connect : [relation.connect];\n    connect.forEach((relation) => {\n      if (isShortHand(relation) || !('position' in relation)) return;\n\n      const { position } = relation;\n\n      // { connect: { id: id, position: { before: id } } }\n      if (position?.before) {\n        ids.push(...handlePrimitive({ ...position, id: position.before }));\n      }\n\n      // { connect: { id: id, position: { after: id } } }\n      if (position?.after) {\n        ids.push(...handlePrimitive({ ...position, id: position.after }));\n      }\n    });\n  }\n\n  return ids;\n};\n\n/**\n * Iterate over all attributes of a Data object and extract all relational document ids.\n * Those will later be transformed to entity ids.\n */\nconst extractDataIds = (\n  idMap: IdMap,\n  data: Record<string, any>,\n  opts: { uid: Common.UID.Schema; locale?: string | null; isDraft?: boolean }\n) => {\n  return traverseEntity(\n    ({ value, attribute }) => {\n      // Find relational attributes, and return the document ids\n      if (attribute.type === 'relation') {\n        const extractedIds = extractRelationIds(value as any);\n\n        // TODO: Handle morph relations (they have multiple targets)\n        const target = attribute.target;\n        if (!target) return;\n\n        extractedIds.forEach((relation) => {\n          idMap.add({\n            uid: target,\n            documentId: relation.documentId,\n            locale: getRelationTargetLocale(relation, {\n              targetUid: target as Common.UID.Schema,\n              sourceUid: opts.uid,\n              sourceLocale: opts.locale,\n            }),\n            isDraft: opts.isDraft,\n          });\n        });\n      }\n    },\n    { schema: strapi.getModel(opts.uid) },\n    data\n  );\n};\n\nexport { extractDataIds };\n"],"names":["relation"],"mappings":";;;;AAWA,MAAM,kBAAkB,CACtB,aACuB;AACvB,MAAI,CAAC,UAAU;AACb,WAAO;EACT;AAEI,MAAA,YAAY,QAAQ,GAAG;AACzB,WAAO,CAAC,EAAE,YAAY,SAAA,CAAU;AAAA,EAClC;AAEI,MAAA,WAAW,QAAQ,GAAG;AAExB,QAAI,gBAAgB,UAAU;AACrB,aAAA,CAAC,EAAE,YAAY,SAAS,YAAY,QAAQ,SAAS,QAAQ;AAAA,IACtE;AAEA,WAAO;EACT;AAEI,MAAA,MAAM,QAAQ,QAAQ,GAAG;AACpB,WAAA,SAAS,IAAI,CAAC,SAAU,YAAY,IAAI,IAAI,EAAE,YAAY,KAAK,IAAI,IAAK;AAAA,EACjF;AAEA,SAAO;AACT;AAKA,MAAM,qBAAqB,CACzB,aACuB;AACjB,QAAA,MAAM,gBAAgB,QAAQ;AAChC,MAAA,CAAC,SAAS,QAAQ;AAAU,WAAA;AAEhC,MAAI,SAAS;AAAU,QAAI,KAAK,GAAG,gBAAgB,SAAS,GAAG,CAAC;AAChE,MAAI,gBAAgB;AAAU,QAAI,KAAK,GAAG,gBAAgB,SAAS,UAAU,CAAC;AAC9E,MAAI,aAAa,UAAU;AAEzB,QAAI,CAAC,SAAS;AAAS,aAAO;AAC9B,QAAI,KAAK,GAAG,gBAAgB,SAAS,OAAO,CAAC;AAGvC,UAAA,UAAU,MAAM,QAAQ,SAAS,OAAO,IAAI,SAAS,UAAU,CAAC,SAAS,OAAO;AAC9E,YAAA,QAAQ,CAACA,cAAa;AAC5B,UAAI,YAAYA,SAAQ,KAAK,EAAE,cAAcA;AAAW;AAElD,YAAA,EAAE,SAAaA,IAAAA;AAGrB,UAAI,UAAU,QAAQ;AAChB,YAAA,KAAK,GAAG,gBAAgB,EAAE,GAAG,UAAU,IAAI,SAAS,OAAQ,CAAA,CAAC;AAAA,MACnE;AAGA,UAAI,UAAU,OAAO;AACf,YAAA,KAAK,GAAG,gBAAgB,EAAE,GAAG,UAAU,IAAI,SAAS,MAAO,CAAA,CAAC;AAAA,MAClE;AAAA,IAAA,CACD;AAAA,EACH;AAEO,SAAA;AACT;AAMA,MAAM,iBAAiB,CACrB,OACA,MACA,SACG;AACI,SAAA;AAAA,IACL,CAAC,EAAE,OAAO,gBAAgB;AAEpB,UAAA,UAAU,SAAS,YAAY;AAC3B,cAAA,eAAe,mBAAmB,KAAY;AAGpD,cAAM,SAAS,UAAU;AACzB,YAAI,CAAC;AAAQ;AAEA,qBAAA,QAAQ,CAAC,aAAa;AACjC,gBAAM,IAAI;AAAA,YACR,KAAK;AAAA,YACL,YAAY,SAAS;AAAA,YACrB,QAAQ,wBAAwB,UAAU;AAAA,cACxC,WAAW;AAAA,cACX,WAAW,KAAK;AAAA,cAChB,cAAc,KAAK;AAAA,YAAA,CACpB;AAAA,YACD,SAAS,KAAK;AAAA,UAAA,CACf;AAAA,QAAA,CACF;AAAA,MACH;AAAA,IACF;AAAA,IACA,EAAE,QAAQ,OAAO,SAAS,KAAK,GAAG,EAAE;AAAA,IACpC;AAAA,EAAA;AAEJ;"}

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

@@ -0,0 +1,10 @@
+import { Common } from '@strapi/types';
+import { IdMap } from '../../id-map';
+declare const transformDataIdsVisitor: (idMap: IdMap, data: Record<string, any>, opts: {
+    uid: Common.UID.Schema;
+    locale?: string | null;
+    isDraft?: boolean;
+    allowMissingId?: boolean;
+}) => Promise<import("@strapi/utils/dist/types").Data>;
+export { transformDataIdsVisitor };
+//# sourceMappingURL=data-ids.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"data-ids.d.ts","sourceRoot":"","sources":["../../../../../../src/services/document-service/transform/relations/transform/data-ids.ts"],"names":[],"mappings":"AAEA,OAAO,EAA4B,MAAM,EAAE,MAAM,eAAe,CAAC;AAKjE,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AA8GrC,QAAA,MAAM,uBAAuB,UACpB,KAAK,QACN,OAAO,MAAM,EAAE,GAAG,CAAC,QACnB;IACJ,GAAG,EAAE,OAAO,GAAG,CAAC,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,qDAwCF,CAAC;AAEF,OAAO,EAAE,uBAAuB,EAAE,CAAC"}

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

@@ -0,0 +1,117 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const _ = require("lodash/fp");
+const strapiUtils = require("@strapi/utils");
+const data = require("../utils/data.js");
+const i18n = require("../utils/i18n.js");
+const isNumeric = (value) => {
+  if (Array.isArray(value))
+    return false;
+  const parsed = parseInt(value, 10);
+  return !Number.isNaN(parsed);
+};
+const transformPrimitive = (relation, getId) => {
+  if (isNumeric(relation)) {
+    return relation;
+  }
+  if (_.isNil(relation)) {
+    return relation;
+  }
+  if (data.isShortHand(relation)) {
+    return getId(relation);
+  }
+  if (data.isLongHand(relation)) {
+    if (!("documentId" in relation))
+      return relation;
+    const entryId = getId(relation.documentId, relation.locale);
+    if (!entryId)
+      return void 0;
+    return { ...relation, id: entryId };
+  }
+  if (Array.isArray(relation)) {
+    return relation.map((item) => transformPrimitive(item, getId)).filter(Boolean);
+  }
+  return void 0;
+};
+const transformRelationIdsVisitor = (relation, getId) => {
+  const map = transformPrimitive(relation, getId);
+  if (map)
+    return map;
+  if (!_.isObject(relation))
+    return relation;
+  if ("set" in relation) {
+    relation.set = transformPrimitive(relation.set, getId);
+  }
+  if ("disconnect" in relation) {
+    relation.disconnect = transformPrimitive(relation.disconnect, getId);
+  }
+  if ("connect" in relation) {
+    relation.connect = transformPrimitive(relation.connect, getId);
+    const mapPosition = (relation2) => {
+      if (data.isShortHand(relation2) || !("position" in relation2))
+        return relation2;
+      const { position } = relation2;
+      if (position?.before) {
+        const { id } = transformPrimitive({ ...position, documentId: position.before }, getId);
+        position.before = id;
+      }
+      if (position?.after) {
+        const { id } = transformPrimitive({ ...position, documentId: position.after }, getId);
+        position.after = id;
+      }
+      return relation2;
+    };
+    if (Array.isArray(relation.connect)) {
+      relation.connect = relation.connect.map(mapPosition);
+    } else {
+      relation.connect = mapPosition(relation.connect);
+    }
+  }
+  return relation;
+};
+const EXCLUDED_FIELDS = [
+  "createdBy",
+  "updatedBy",
+  "localizations",
+  "strapi_stage",
+  "strapi_assignee"
+];
+const transformDataIdsVisitor = (idMap, data2, opts) => {
+  return strapiUtils.traverseEntity(
+    ({ key, value, attribute }, { set }) => {
+      if (attribute.type === "relation") {
+        const target = attribute.target;
+        if (!target)
+          return;
+        if (EXCLUDED_FIELDS.includes(key))
+          return;
+        const getId = (documentId, locale) => {
+          const entryId = idMap.get({
+            uid: target,
+            documentId,
+            locale: i18n.getRelationTargetLocale(
+              { documentId, locale },
+              {
+                targetUid: target,
+                sourceUid: opts.uid,
+                sourceLocale: opts.locale
+              }
+            ),
+            isDraft: opts.isDraft
+          });
+          if (entryId)
+            return entryId;
+          if (opts.allowMissingId)
+            return null;
+          throw new strapiUtils.errors.ValidationError(`Document with id "${documentId}" not found`);
+        };
+        const newRelation = transformRelationIdsVisitor(value, getId);
+        set(key, newRelation);
+      }
+    },
+    { schema: strapi.getModel(opts.uid) },
+    data2
+  );
+};
+exports.transformDataIdsVisitor = transformDataIdsVisitor;
+//# sourceMappingURL=data-ids.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"data-ids.js","sources":["../../../../../../src/services/document-service/transform/relations/transform/data-ids.ts"],"sourcesContent":["import { isObject, isNil } from 'lodash/fp';\n\nimport { EntityService, Attribute, Common } from '@strapi/types';\nimport { traverseEntity, errors } from '@strapi/utils';\n\nimport { ShortHand, LongHand, ID, GetId } from '../utils/types';\nimport { isShortHand, isLongHand } from '../utils/data';\nimport { IdMap } from '../../id-map';\nimport { getRelationTargetLocale } from '../utils/i18n';\n\nconst isNumeric = (value: any): value is number => {\n  if (Array.isArray(value)) return false; // Handle [1, 'docId'] case\n  const parsed = parseInt(value, 10);\n  return !Number.isNaN(parsed);\n};\n\nconst transformPrimitive = <T extends ShortHand | LongHand>(\n  relation: T | T[] | null | undefined,\n  getId: GetId\n): T | T[] | undefined => {\n  // TODO: Remove this, we should use the long hand version with 'id' for this case\n  // If id value is a number, return it as is, it's already an entry id\n  if (isNumeric(relation)) {\n    return relation;\n  }\n\n  // null\n  if (isNil(relation)) {\n    return relation as T | undefined;\n  }\n\n  // id\n  if (isShortHand(relation)) {\n    return getId(relation) as T;\n  }\n\n  // { id }\n  if (isLongHand(relation)) {\n    // If the id is already an entry id, return it as is\n    if (!('documentId' in relation)) return relation;\n\n    // @ts-expect-error - TODO: Add relation type\n    const entryId = getId(relation.documentId, relation.locale) as T;\n\n    // If the id is not found, return undefined\n    if (!entryId) return undefined;\n\n    return { ...(relation as object), id: entryId } as T;\n  }\n\n  // id[]\n  if (Array.isArray(relation)) {\n    return relation.map((item) => transformPrimitive(item, getId)).filter(Boolean) as T[];\n  }\n  return undefined;\n};\n\nconst transformRelationIdsVisitor = <T extends Attribute.RelationKind.Any>(\n  relation: EntityService.Params.Attribute.RelationInputValue<T>,\n  getId: GetId\n): EntityService.Params.Attribute.RelationInputValue<T> => {\n  const map = transformPrimitive(relation as any, getId);\n  if (map) return map;\n\n  if (!isObject(relation)) return relation;\n\n  // set: id[]\n  // what if result of mapPrimitive is undefined?\n  if ('set' in relation) {\n    relation.set = transformPrimitive(relation.set as any, getId);\n  }\n  if ('disconnect' in relation) {\n    relation.disconnect = transformPrimitive(relation.disconnect as any, getId);\n  }\n\n  if ('connect' in relation) {\n    // connect: id[] | { id } | ...\n    relation.connect = transformPrimitive(relation.connect as any, getId);\n\n    const mapPosition = (relation: any) => {\n      if (isShortHand(relation) || !('position' in relation)) return relation;\n\n      const { position } = relation;\n\n      // { connect: { id: id, position: { before: id } } }\n      if (position?.before) {\n        const { id } = transformPrimitive({ ...position, documentId: position.before }, getId);\n        position.before = id;\n      }\n\n      // { connect: { id: id, position: { after: id } } }\n      if (position?.after) {\n        const { id } = transformPrimitive({ ...position, documentId: position.after }, getId);\n        position.after = id;\n      }\n\n      return relation;\n    };\n\n    if (Array.isArray(relation.connect)) {\n      relation.connect = relation.connect.map(mapPosition);\n    } else {\n      relation.connect = mapPosition(relation.connect);\n    }\n  }\n\n  return relation;\n};\n\nconst EXCLUDED_FIELDS = [\n  'createdBy',\n  'updatedBy',\n  'localizations',\n  'strapi_stage',\n  'strapi_assignee',\n];\n\nconst transformDataIdsVisitor = (\n  idMap: IdMap,\n  data: Record<string, any>,\n  opts: {\n    uid: Common.UID.Schema;\n    locale?: string | null;\n    isDraft?: boolean;\n    allowMissingId?: boolean; // Whether to ignore missing ids and not throw any error\n  }\n) => {\n  return traverseEntity(\n    ({ key, value, attribute }, { set }) => {\n      // Find relational attributes, and return the document ids\n      if (attribute.type === 'relation') {\n        const target = attribute.target;\n        // TODO: Handle polymorphic relations\n        if (!target) return;\n        // TODO: Handle this differently\n        if (EXCLUDED_FIELDS.includes(key)) return;\n\n        const getId = (documentId: ID, locale?: string): ID | null => {\n          const entryId = idMap.get({\n            uid: target,\n            documentId,\n            locale: getRelationTargetLocale(\n              { documentId, locale },\n              {\n                targetUid: target as Common.UID.Schema,\n                sourceUid: opts.uid,\n                sourceLocale: opts.locale,\n              }\n            ),\n            isDraft: opts.isDraft,\n          });\n\n          if (entryId) return entryId;\n          if (opts.allowMissingId) return null;\n\n          throw new errors.ValidationError(`Document with id \"${documentId}\" not found`);\n        };\n\n        const newRelation = transformRelationIdsVisitor(value as any, getId);\n        set(key, newRelation as any);\n      }\n    },\n    { schema: strapi.getModel(opts.uid) },\n    data\n  );\n};\n\nexport { transformDataIdsVisitor };\n"],"names":["isNil","isShortHand","isLongHand","isObject","relation","data","traverseEntity","getRelationTargetLocale","errors"],"mappings":"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"}

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

@@ -0,0 +1,117 @@
+import { isObject, isNil } from "lodash/fp";
+import { traverseEntity, errors } from "@strapi/utils";
+import { isShortHand, isLongHand } from "../utils/data.mjs";
+import { getRelationTargetLocale } from "../utils/i18n.mjs";
+const isNumeric = (value) => {
+  if (Array.isArray(value))
+    return false;
+  const parsed = parseInt(value, 10);
+  return !Number.isNaN(parsed);
+};
+const transformPrimitive = (relation, getId) => {
+  if (isNumeric(relation)) {
+    return relation;
+  }
+  if (isNil(relation)) {
+    return relation;
+  }
+  if (isShortHand(relation)) {
+    return getId(relation);
+  }
+  if (isLongHand(relation)) {
+    if (!("documentId" in relation))
+      return relation;
+    const entryId = getId(relation.documentId, relation.locale);
+    if (!entryId)
+      return void 0;
+    return { ...relation, id: entryId };
+  }
+  if (Array.isArray(relation)) {
+    return relation.map((item) => transformPrimitive(item, getId)).filter(Boolean);
+  }
+  return void 0;
+};
+const transformRelationIdsVisitor = (relation, getId) => {
+  const map = transformPrimitive(relation, getId);
+  if (map)
+    return map;
+  if (!isObject(relation))
+    return relation;
+  if ("set" in relation) {
+    relation.set = transformPrimitive(relation.set, getId);
+  }
+  if ("disconnect" in relation) {
+    relation.disconnect = transformPrimitive(relation.disconnect, getId);
+  }
+  if ("connect" in relation) {
+    relation.connect = transformPrimitive(relation.connect, getId);
+    const mapPosition = (relation2) => {
+      if (isShortHand(relation2) || !("position" in relation2))
+        return relation2;
+      const { position } = relation2;
+      if (position?.before) {
+        const { id } = transformPrimitive({ ...position, documentId: position.before }, getId);
+        position.before = id;
+      }
+      if (position?.after) {
+        const { id } = transformPrimitive({ ...position, documentId: position.after }, getId);
+        position.after = id;
+      }
+      return relation2;
+    };
+    if (Array.isArray(relation.connect)) {
+      relation.connect = relation.connect.map(mapPosition);
+    } else {
+      relation.connect = mapPosition(relation.connect);
+    }
+  }
+  return relation;
+};
+const EXCLUDED_FIELDS = [
+  "createdBy",
+  "updatedBy",
+  "localizations",
+  "strapi_stage",
+  "strapi_assignee"
+];
+const transformDataIdsVisitor = (idMap, data, opts) => {
+  return traverseEntity(
+    ({ key, value, attribute }, { set }) => {
+      if (attribute.type === "relation") {
+        const target = attribute.target;
+        if (!target)
+          return;
+        if (EXCLUDED_FIELDS.includes(key))
+          return;
+        const getId = (documentId, locale) => {
+          const entryId = idMap.get({
+            uid: target,
+            documentId,
+            locale: getRelationTargetLocale(
+              { documentId, locale },
+              {
+                targetUid: target,
+                sourceUid: opts.uid,
+                sourceLocale: opts.locale
+              }
+            ),
+            isDraft: opts.isDraft
+          });
+          if (entryId)
+            return entryId;
+          if (opts.allowMissingId)
+            return null;
+          throw new errors.ValidationError(`Document with id "${documentId}" not found`);
+        };
+        const newRelation = transformRelationIdsVisitor(value, getId);
+        set(key, newRelation);
+      }
+    },
+    { schema: strapi.getModel(opts.uid) },
+    data
+  );
+};
+export {
+  transformDataIdsVisitor
+};
+//# sourceMappingURL=data-ids.mjs.map