@strapi/core 0.0.0-experimental.90ca9123352ed07e0a9cedaf4bcad1475e74137f → 0.0.0-experimental.fc1ac2acd58c8a5a858679956b6d102ac5ee4011

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

@@ -1 +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;"}
+{"version":3,"file":"id-map.mjs","sources":["../../../../src/services/document-service/transform/id-map.ts"],"sourcesContent":["import { Strapi, Entity } from '@strapi/types';\nimport { async } 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  status?: 'draft' | 'published';\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({ status: 'published', 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 async.map(\n        Object.values(idsByUidAndLocale),\n        async ({ uid, locale, documentIds, status }: any) => {\n          const findParams = {\n            select: ['id', 'documentId', 'locale', 'publishedAt'],\n            where: {\n              documentId: { $in: documentIds },\n              locale: locale || null,\n              publishedAt: status === 'draft' ? null : { $ne: null },\n            },\n          } as any;\n\n          const result = await strapi?.db?.query(uid).findMany(findParams);\n\n          // 3. Store result in loadedIds\n          result?.forEach(({ documentId, id, locale, publishedAt }: any) => {\n            const key = encodeKey({\n              documentId,\n              uid,\n              locale,\n              status: publishedAt ? 'published' : 'draft',\n            });\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({ status: 'published', 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,QAAQ,aAAa,QAAQ,MAAM,GAAG,UAAA,CAAW;AAGrE,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;AAGL,YAAM,MAAM;AAAA,QACV,OAAO,OAAO,iBAAiB;AAAA,QAC/B,OAAO,EAAE,KAAK,QAAQ,aAAa,aAAkB;AACnD,gBAAM,aAAa;AAAA,YACjB,QAAQ,CAAC,MAAM,cAAc,UAAU,aAAa;AAAA,YACpD,OAAO;AAAA,cACL,YAAY,EAAE,KAAK,YAAY;AAAA,cAC/B,QAAQ,UAAU;AAAA,cAClB,aAAa,WAAW,UAAU,OAAO,EAAE,KAAK,KAAK;AAAA,YACvD;AAAA,UAAA;AAGI,gBAAA,SAAS,MAAM,QAAQ,IAAI,MAAM,GAAG,EAAE,SAAS,UAAU;AAGvD,kBAAA,QAAQ,CAAC,EAAE,YAAY,IAAI,QAAAA,SAAQ,kBAAuB;AAChE,kBAAM,MAAM,UAAU;AAAA,cACpB;AAAA,cACA;AAAA,cACA,QAAAA;AAAAA,cACA,QAAQ,cAAc,cAAc;AAAA,YAAA,CACrC;AACS,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,QAAQ,aAAa,QAAQ,MAAM,GAAG,KAAA,CAAM;AAC7D,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

@@ -1,26 +1,5 @@
-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;
-    filters?: any;
-    populate?: any;
-    sort?: any;
-}, opts: {
-    locale?: string | null;
-    isDraft: boolean;
-}): Promise<{
-    data: any;
-    fields: any;
-    filters: any;
-    populate: any;
-    sort: any;
-}>;
-/**
- * Transform response of a query to map entity ids to document ids.
- */
-declare function transformOutputDocumentId(uid: Common.UID.Schema, output: Record<string, any> | Record<string, any>[]): Promise<any>;
-export { transformParamsDocumentId, transformOutputDocumentId };
+/// <reference types="lodash" />
+import { Common, Documents } from '@strapi/types';
+declare const curriedTransformParamsDocumentId: import("lodash").CurriedFunction2<Common.UID.Schema, Documents.Params.All, Promise<Documents.Params.All>>;
+export { curriedTransformParamsDocumentId as transformParamsDocumentId };
 //# sourceMappingURL=id-transform.d.ts.map

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

@@ -1 +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;AAWvC;;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,OAAO,CAAC,EAAE,GAAG,CAAC;IAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;IAAC,IAAI,CAAC,EAAE,GAAG,CAAA;CAAE,EAC9E,IAAI,EAAE;IACJ,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;CAClB;;;;;;GAoCF;AAED;;GAEG;AACH,iBAAe,yBAAyB,CACtC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EACtB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,gBAepD;AAED,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,CAAC"}
+{"version":3,"file":"id-transform.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/id-transform.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AA0ClD,QAAA,MAAM,gCAAgC,2GAAmC,CAAC;AAE1E,OAAO,EAAE,gCAAgC,IAAI,yBAAyB,EAAE,CAAC"}

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

@@ -1,57 +1,33 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const strapiUtils = require("@strapi/utils");
 const _ = require("lodash/fp");
-const outputIds = require("./relations/transform/output-ids.js");
-const utils = require("./utils.js");
-const filters = require("./filters.js");
-const sort = require("./sort.js");
+const data = require("./data.js");
 const fields = require("./fields.js");
 const populate = require("./populate.js");
-const data = require("./data.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);
+async function transformParamsDocumentId(uid, query) {
+  let data$1 = query.data;
+  if (query.data) {
+    data$1 = await data.transformData(query.data, {
+      locale: query.locale,
+      status: query.status,
+      uid
+    });
   }
-  let filters$1 = input.filters;
-  if (input.filters) {
-    filters$1 = await filters.transformFilters(input.filters, { ...opts, uid });
+  let fields$1 = query.fields;
+  if (query.fields) {
+    fields$1 = fields.transformFields(query.fields);
   }
-  let populate$1 = input.populate;
-  if (input.populate) {
-    populate$1 = await populate.transformPopulate(input.populate, { ...opts, uid });
-  }
-  let sort$1 = input.sort;
-  if (input.sort) {
-    sort$1 = await sort.transformSort(input.sort, { ...opts, uid });
+  let populate$1 = query.populate;
+  if (query.populate) {
+    populate$1 = await populate.transformPopulate(query.populate, { uid });
   }
   return {
-    ...input,
+    ...query,
     data: data$1,
     fields: fields$1,
-    filters: filters$1,
-    populate: populate$1,
-    sort: sort$1
+    populate: populate$1
   };
 }
-async function transformOutputDocumentId(uid, output) {
-  if (Array.isArray(output)) {
-    return strapiUtils.mapAsync(output, (o) => transformOutputDocumentId(uid, o));
-  }
-  if (!_.isObject(output) || !output?.documentId)
-    return output;
-  return strapiUtils.pipeAsync(
-    // Switch top level id -> documentId
-    utils.switchIdForDocumentId,
-    // Switch relations id -> documentId
-    (output2) => outputIds.transformOutputIds(uid, output2)
-  )(output);
-}
-exports.transformOutputDocumentId = transformOutputDocumentId;
-exports.transformParamsDocumentId = transformParamsDocumentId;
+const curriedTransformParamsDocumentId = _.curry(transformParamsDocumentId);
+exports.transformParamsDocumentId = curriedTransformParamsDocumentId;
 //# sourceMappingURL=id-transform.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"id-transform.js","sources":["../../../../src/services/document-service/transform/id-transform.ts"],"sourcesContent":["import { Common } from '@strapi/types';\nimport { mapAsync, pipeAsync } from '@strapi/utils';\nimport { isObject } from 'lodash/fp';\nimport { transformOutputIds as transformRelationOutputIds } from './relations/transform/output-ids';\nimport { switchIdForDocumentId } from './utils';\nimport { transformFilters } from './filters';\nimport { transformSort } from './sort';\nimport { transformFields } from './fields';\nimport { transformPopulate } from './populate';\nimport { transformData } from './data';\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; filters?: any; populate?: any; sort?: any },\n  opts: {\n    locale?: string | null;\n    isDraft: boolean;\n  }\n) {\n  let data = input.data;\n  if (input.data) {\n    data = await transformData(input.data, { ...opts, uid });\n  }\n\n  // Transform any relation ids to entity ids\n  let fields = input.fields;\n  if (input.fields) {\n    fields = transformFields(input.fields);\n  }\n\n  let filters = input.filters;\n  if (input.filters) {\n    filters = await transformFilters(input.filters, { ...opts, uid });\n  }\n\n  let populate = input.populate;\n  if (input.populate) {\n    populate = await transformPopulate(input.populate, { ...opts, uid });\n  }\n\n  let sort = input.sort;\n  if (input.sort) {\n    sort = await transformSort(input.sort, { ...opts, uid });\n  }\n\n  return {\n    ...input,\n    data,\n    fields,\n    filters,\n    populate,\n    sort,\n  };\n}\n\n/**\n * Transform response of a query to map entity ids to document ids.\n */\nasync function transformOutputDocumentId(\n  uid: Common.UID.Schema,\n  output: Record<string, any> | Record<string, any>[]\n) {\n  if (Array.isArray(output)) {\n    return mapAsync(output, (o: Record<string, any>) => transformOutputDocumentId(uid, o));\n  }\n\n  // TODO: Ensure we always have documentId on output\n  if (!isObject(output) || !output?.documentId) return output;\n\n  return pipeAsync(\n    // Switch top level id -> documentId\n    switchIdForDocumentId,\n    // Switch relations id -> documentId\n    (output) => transformRelationOutputIds(uid, output)\n  )(output);\n}\n\nexport { transformParamsDocumentId, transformOutputDocumentId };\n"],"names":["data","transformData","fields","transformFields","filters","transformFilters","populate","transformPopulate","sort","transformSort","mapAsync","isObject","pipeAsync","switchIdForDocumentId","output","transformRelationOutputIds"],"mappings":";;;;;;;;;;;AAcA,eAAe,0BACb,KACA,OACA,MAIA;AACA,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,YAAU,MAAM;AACpB,MAAI,MAAM,SAAS;AACPA,gBAAA,MAAMC,yBAAiB,MAAM,SAAS,EAAE,GAAG,MAAM,KAAK;AAAA,EAClE;AAEA,MAAIC,aAAW,MAAM;AACrB,MAAI,MAAM,UAAU;AACPA,iBAAA,MAAMC,2BAAkB,MAAM,UAAU,EAAE,GAAG,MAAM,KAAK;AAAA,EACrE;AAEA,MAAIC,SAAO,MAAM;AACjB,MAAI,MAAM,MAAM;AACPA,aAAA,MAAMC,mBAAc,MAAM,MAAM,EAAE,GAAG,MAAM,KAAK;AAAA,EACzD;AAEO,SAAA;AAAA,IACL,GAAG;AAAA,IAAA,MACHT;AAAAA,IAAA,QACAE;AAAAA,IAAA,SACAE;AAAAA,IAAA,UACAE;AAAAA,IAAA,MACAE;AAAAA,EAAA;AAEJ;AAKA,eAAe,0BACb,KACA,QACA;AACI,MAAA,MAAM,QAAQ,MAAM,GAAG;AACzB,WAAOE,YAAAA,SAAS,QAAQ,CAAC,MAA2B,0BAA0B,KAAK,CAAC,CAAC;AAAA,EACvF;AAGA,MAAI,CAACC,EAAAA,SAAS,MAAM,KAAK,CAAC,QAAQ;AAAmB,WAAA;AAE9C,SAAAC,YAAA;AAAA;AAAA,IAELC,MAAA;AAAA;AAAA,IAEA,CAACC,YAAWC,UAAAA,mBAA2B,KAAKD,OAAM;AAAA,IAClD,MAAM;AACV;;;"}
+{"version":3,"file":"id-transform.js","sources":["../../../../src/services/document-service/transform/id-transform.ts"],"sourcesContent":["import { curry } from 'lodash/fp';\n\nimport { Common, Documents } from '@strapi/types';\n\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  query: Documents.Params.All\n): Promise<Documents.Params.All> {\n  // Transform relational documentIds to entity ids\n  let data = query.data;\n  if (query.data) {\n    data = await transformData(query.data, {\n      locale: query.locale,\n      status: query.status,\n      uid,\n    });\n  }\n\n  // Make sure documentId is always present in the response\n  let fields = query.fields;\n  if (query.fields) {\n    fields = transformFields(query.fields) as typeof query.fields;\n  }\n\n  let populate = query.populate;\n  if (query.populate) {\n    populate = (await transformPopulate(query.populate, { uid })) as typeof query.populate;\n  }\n\n  return {\n    ...query,\n    data,\n    fields,\n    populate,\n  };\n}\n\nconst curriedTransformParamsDocumentId = curry(transformParamsDocumentId);\n\nexport { curriedTransformParamsDocumentId as transformParamsDocumentId };\n"],"names":["data","transformData","fields","transformFields","populate","transformPopulate","curry"],"mappings":";;;;;;AAWA,eAAe,0BACb,KACA,OAC+B;AAE/B,MAAIA,SAAO,MAAM;AACjB,MAAI,MAAM,MAAM;AACPA,aAAA,MAAMC,KAAAA,cAAc,MAAM,MAAM;AAAA,MACrC,QAAQ,MAAM;AAAA,MACd,QAAQ,MAAM;AAAA,MACd;AAAA,IAAA,CACD;AAAA,EACH;AAGA,MAAIC,WAAS,MAAM;AACnB,MAAI,MAAM,QAAQ;AACPA,eAAAC,OAAA,gBAAgB,MAAM,MAAM;AAAA,EACvC;AAEA,MAAIC,aAAW,MAAM;AACrB,MAAI,MAAM,UAAU;AAClBA,iBAAY,MAAMC,SAAAA,kBAAkB,MAAM,UAAU,EAAE,KAAK;AAAA,EAC7D;AAEO,SAAA;AAAA,IACL,GAAG;AAAA,IAAA,MACHL;AAAAA,IAAA,QACAE;AAAAA,IAAA,UACAE;AAAAA,EAAA;AAEJ;AAEM,MAAA,mCAAmCE,QAAM,yBAAyB;;"}

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

@@ -1,57 +1,33 @@
-import { mapAsync, pipeAsync } from "@strapi/utils";
-import { isObject } from "lodash/fp";
-import { transformOutputIds } from "./relations/transform/output-ids.mjs";
-import { switchIdForDocumentId } from "./utils.mjs";
-import { transformFilters } from "./filters.mjs";
-import { transformSort } from "./sort.mjs";
+import { curry } from "lodash/fp";
+import { transformData } from "./data.mjs";
 import { transformFields } from "./fields.mjs";
 import { transformPopulate } from "./populate.mjs";
-import { transformData } from "./data.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);
+async function transformParamsDocumentId(uid, query) {
+  let data = query.data;
+  if (query.data) {
+    data = await transformData(query.data, {
+      locale: query.locale,
+      status: query.status,
+      uid
+    });
   }
-  let filters = input.filters;
-  if (input.filters) {
-    filters = await transformFilters(input.filters, { ...opts, uid });
+  let fields = query.fields;
+  if (query.fields) {
+    fields = transformFields(query.fields);
   }
-  let populate = input.populate;
-  if (input.populate) {
-    populate = await transformPopulate(input.populate, { ...opts, uid });
-  }
-  let sort = input.sort;
-  if (input.sort) {
-    sort = await transformSort(input.sort, { ...opts, uid });
+  let populate = query.populate;
+  if (query.populate) {
+    populate = await transformPopulate(query.populate, { uid });
   }
   return {
-    ...input,
+    ...query,
     data,
     fields,
-    filters,
-    populate,
-    sort
+    populate
   };
 }
-async function transformOutputDocumentId(uid, output) {
-  if (Array.isArray(output)) {
-    return mapAsync(output, (o) => transformOutputDocumentId(uid, o));
-  }
-  if (!isObject(output) || !output?.documentId)
-    return output;
-  return pipeAsync(
-    // Switch top level id -> documentId
-    switchIdForDocumentId,
-    // Switch relations id -> documentId
-    (output2) => transformOutputIds(uid, output2)
-  )(output);
-}
+const curriedTransformParamsDocumentId = curry(transformParamsDocumentId);
 export {
-  transformOutputDocumentId,
-  transformParamsDocumentId
+  curriedTransformParamsDocumentId as transformParamsDocumentId
 };
 //# sourceMappingURL=id-transform.mjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"id-transform.mjs","sources":["../../../../src/services/document-service/transform/id-transform.ts"],"sourcesContent":["import { Common } from '@strapi/types';\nimport { mapAsync, pipeAsync } from '@strapi/utils';\nimport { isObject } from 'lodash/fp';\nimport { transformOutputIds as transformRelationOutputIds } from './relations/transform/output-ids';\nimport { switchIdForDocumentId } from './utils';\nimport { transformFilters } from './filters';\nimport { transformSort } from './sort';\nimport { transformFields } from './fields';\nimport { transformPopulate } from './populate';\nimport { transformData } from './data';\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; filters?: any; populate?: any; sort?: any },\n  opts: {\n    locale?: string | null;\n    isDraft: boolean;\n  }\n) {\n  let data = input.data;\n  if (input.data) {\n    data = await transformData(input.data, { ...opts, uid });\n  }\n\n  // Transform any relation ids to entity ids\n  let fields = input.fields;\n  if (input.fields) {\n    fields = transformFields(input.fields);\n  }\n\n  let filters = input.filters;\n  if (input.filters) {\n    filters = await transformFilters(input.filters, { ...opts, uid });\n  }\n\n  let populate = input.populate;\n  if (input.populate) {\n    populate = await transformPopulate(input.populate, { ...opts, uid });\n  }\n\n  let sort = input.sort;\n  if (input.sort) {\n    sort = await transformSort(input.sort, { ...opts, uid });\n  }\n\n  return {\n    ...input,\n    data,\n    fields,\n    filters,\n    populate,\n    sort,\n  };\n}\n\n/**\n * Transform response of a query to map entity ids to document ids.\n */\nasync function transformOutputDocumentId(\n  uid: Common.UID.Schema,\n  output: Record<string, any> | Record<string, any>[]\n) {\n  if (Array.isArray(output)) {\n    return mapAsync(output, (o: Record<string, any>) => transformOutputDocumentId(uid, o));\n  }\n\n  // TODO: Ensure we always have documentId on output\n  if (!isObject(output) || !output?.documentId) return output;\n\n  return pipeAsync(\n    // Switch top level id -> documentId\n    switchIdForDocumentId,\n    // Switch relations id -> documentId\n    (output) => transformRelationOutputIds(uid, output)\n  )(output);\n}\n\nexport { transformParamsDocumentId, transformOutputDocumentId };\n"],"names":["output","transformRelationOutputIds"],"mappings":";;;;;;;;;AAcA,eAAe,0BACb,KACA,OACA,MAIA;AACA,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,UAAU,MAAM;AACpB,MAAI,MAAM,SAAS;AACP,cAAA,MAAM,iBAAiB,MAAM,SAAS,EAAE,GAAG,MAAM,KAAK;AAAA,EAClE;AAEA,MAAI,WAAW,MAAM;AACrB,MAAI,MAAM,UAAU;AACP,eAAA,MAAM,kBAAkB,MAAM,UAAU,EAAE,GAAG,MAAM,KAAK;AAAA,EACrE;AAEA,MAAI,OAAO,MAAM;AACjB,MAAI,MAAM,MAAM;AACP,WAAA,MAAM,cAAc,MAAM,MAAM,EAAE,GAAG,MAAM,KAAK;AAAA,EACzD;AAEO,SAAA;AAAA,IACL,GAAG;AAAA,IACH;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEJ;AAKA,eAAe,0BACb,KACA,QACA;AACI,MAAA,MAAM,QAAQ,MAAM,GAAG;AACzB,WAAO,SAAS,QAAQ,CAAC,MAA2B,0BAA0B,KAAK,CAAC,CAAC;AAAA,EACvF;AAGA,MAAI,CAAC,SAAS,MAAM,KAAK,CAAC,QAAQ;AAAmB,WAAA;AAE9C,SAAA;AAAA;AAAA,IAEL;AAAA;AAAA,IAEA,CAACA,YAAWC,mBAA2B,KAAKD,OAAM;AAAA,IAClD,MAAM;AACV;"}
+{"version":3,"file":"id-transform.mjs","sources":["../../../../src/services/document-service/transform/id-transform.ts"],"sourcesContent":["import { curry } from 'lodash/fp';\n\nimport { Common, Documents } from '@strapi/types';\n\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  query: Documents.Params.All\n): Promise<Documents.Params.All> {\n  // Transform relational documentIds to entity ids\n  let data = query.data;\n  if (query.data) {\n    data = await transformData(query.data, {\n      locale: query.locale,\n      status: query.status,\n      uid,\n    });\n  }\n\n  // Make sure documentId is always present in the response\n  let fields = query.fields;\n  if (query.fields) {\n    fields = transformFields(query.fields) as typeof query.fields;\n  }\n\n  let populate = query.populate;\n  if (query.populate) {\n    populate = (await transformPopulate(query.populate, { uid })) as typeof query.populate;\n  }\n\n  return {\n    ...query,\n    data,\n    fields,\n    populate,\n  };\n}\n\nconst curriedTransformParamsDocumentId = curry(transformParamsDocumentId);\n\nexport { curriedTransformParamsDocumentId as transformParamsDocumentId };\n"],"names":[],"mappings":";;;;AAWA,eAAe,0BACb,KACA,OAC+B;AAE/B,MAAI,OAAO,MAAM;AACjB,MAAI,MAAM,MAAM;AACP,WAAA,MAAM,cAAc,MAAM,MAAM;AAAA,MACrC,QAAQ,MAAM;AAAA,MACd,QAAQ,MAAM;AAAA,MACd;AAAA,IAAA,CACD;AAAA,EACH;AAGA,MAAI,SAAS,MAAM;AACnB,MAAI,MAAM,QAAQ;AACP,aAAA,gBAAgB,MAAM,MAAM;AAAA,EACvC;AAEA,MAAI,WAAW,MAAM;AACrB,MAAI,MAAM,UAAU;AAClB,eAAY,MAAM,kBAAkB,MAAM,UAAU,EAAE,KAAK;AAAA,EAC7D;AAEO,SAAA;AAAA,IACL,GAAG;AAAA,IACH;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEJ;AAEM,MAAA,mCAAmC,MAAM,yBAAyB;"}

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

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

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

@@ -1 +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;AAKlD,eAAO,MAAM,iBAAiB,SAAgB,IAAI,QAAQ,OAAO,qBAkChE,CAAC"}
+{"version":3,"file":"populate.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/populate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,SAAS,CAAC;AAGpC,eAAO,MAAM,iBAAiB,SAAgB,IAAI,QAAQ;IAAE,GAAG,EAAE,OAAO,GAAG,CAAC,MAAM,CAAA;CAAE,qBAqBnF,CAAC"}

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

@@ -1,23 +1,13 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const strapiUtils = require("@strapi/utils");
-const utils = require("./utils.js");
-const filters = require("./filters.js");
 const fields = require("./fields.js");
 const transformPopulate = async (data, opts) => {
-  utils.switchDocumentIdForId(data);
-  const allKeysAreDocumentId = Object.keys(data).every((key) => key === "documentId");
-  if (allKeysAreDocumentId) {
-    return data;
-  }
   return strapiUtils.traverse.traverseQueryPopulate(
     async ({ attribute, key, value }, { set }) => {
       if (!value || typeof value !== "object" || attribute?.type !== "relation") {
         return;
       }
-      if ("filters" in value) {
-        value.filters = await filters.transformFilters(value.filters, opts);
-      }
       if ("fields" in value && Array.isArray(value.fields)) {
         value.fields = fields.transformFields(value.fields);
       }

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

@@ -1 +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 { switchDocumentIdForId } from './utils';\nimport { transformFilters } from './filters';\nimport { transformFields } from './fields';\n\nexport const transformPopulate = async (data: Data, opts: Options) => {\n  // Before doing the filters traversal change any top level 'id' properties to 'documentId'\n  switchDocumentIdForId(data);\n\n  const allKeysAreDocumentId = Object.keys(data).every((key) => key === 'documentId');\n  if (allKeysAreDocumentId) {\n    // If every key is a documentId, skip the traversal\n    return data;\n  }\n\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 filters or fields in the value \n        and apply the relevant transformation to these objects\n      */\n      if ('filters' in value) {\n        value.filters = await transformFilters(value.filters as Data, opts);\n      }\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":["switchDocumentIdForId","traverse","transformFilters","transformFields"],"mappings":";;;;;;AAMa,MAAA,oBAAoB,OAAO,MAAY,SAAkB;AAEpEA,QAAA,sBAAsB,IAAI;AAEpB,QAAA,uBAAuB,OAAO,KAAK,IAAI,EAAE,MAAM,CAAC,QAAQ,QAAQ,YAAY;AAClF,MAAI,sBAAsB;AAEjB,WAAA;AAAA,EACT;AAEA,SAAOC,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,aAAa,OAAO;AACtB,cAAM,UAAU,MAAMC,QAAAA,iBAAiB,MAAM,SAAiB,IAAI;AAAA,MACpE;AAEA,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;;"}
+{"version":3,"file":"populate.js","sources":["../../../../src/services/document-service/transform/populate.ts"],"sourcesContent":["import { traverse } from '@strapi/utils';\nimport type { Common } from '@strapi/types';\n\nimport { type Data } from './types';\nimport { transformFields } from './fields';\n\nexport const transformPopulate = async (data: Data, opts: { uid: Common.UID.Schema }) => {\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":";;;;AAMa,MAAA,oBAAoB,OAAO,MAAY,SAAqC;AACvF,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

@@ -1,21 +1,11 @@
 import { traverse } from "@strapi/utils";
-import { switchDocumentIdForId } from "./utils.mjs";
-import { transformFilters } from "./filters.mjs";
 import { transformFields } from "./fields.mjs";
 const transformPopulate = async (data, opts) => {
-  switchDocumentIdForId(data);
-  const allKeysAreDocumentId = Object.keys(data).every((key) => key === "documentId");
-  if (allKeysAreDocumentId) {
-    return data;
-  }
   return traverse.traverseQueryPopulate(
     async ({ attribute, key, value }, { set }) => {
       if (!value || typeof value !== "object" || attribute?.type !== "relation") {
         return;
       }
-      if ("filters" in value) {
-        value.filters = await transformFilters(value.filters, opts);
-      }
       if ("fields" in value && Array.isArray(value.fields)) {
         value.fields = transformFields(value.fields);
       }

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

@@ -1 +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 { switchDocumentIdForId } from './utils';\nimport { transformFilters } from './filters';\nimport { transformFields } from './fields';\n\nexport const transformPopulate = async (data: Data, opts: Options) => {\n  // Before doing the filters traversal change any top level 'id' properties to 'documentId'\n  switchDocumentIdForId(data);\n\n  const allKeysAreDocumentId = Object.keys(data).every((key) => key === 'documentId');\n  if (allKeysAreDocumentId) {\n    // If every key is a documentId, skip the traversal\n    return data;\n  }\n\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 filters or fields in the value \n        and apply the relevant transformation to these objects\n      */\n      if ('filters' in value) {\n        value.filters = await transformFilters(value.filters as Data, opts);\n      }\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":";;;;AAMa,MAAA,oBAAoB,OAAO,MAAY,SAAkB;AAEpE,wBAAsB,IAAI;AAEpB,QAAA,uBAAuB,OAAO,KAAK,IAAI,EAAE,MAAM,CAAC,QAAQ,QAAQ,YAAY;AAClF,MAAI,sBAAsB;AAEjB,WAAA;AAAA,EACT;AAEA,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,aAAa,OAAO;AACtB,cAAM,UAAU,MAAM,iBAAiB,MAAM,SAAiB,IAAI;AAAA,MACpE;AAEA,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;"}
+{"version":3,"file":"populate.mjs","sources":["../../../../src/services/document-service/transform/populate.ts"],"sourcesContent":["import { traverse } from '@strapi/utils';\nimport type { Common } from '@strapi/types';\n\nimport { type Data } from './types';\nimport { transformFields } from './fields';\n\nexport const transformPopulate = async (data: Data, opts: { uid: Common.UID.Schema }) => {\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":";;AAMa,MAAA,oBAAoB,OAAO,MAAY,SAAqC;AACvF,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

@@ -7,7 +7,7 @@ import { IdMap } from '../../id-map';
 declare const extractDataIds: (idMap: IdMap, data: Record<string, any>, opts: {
     uid: Common.UID.Schema;
     locale?: string | null;
-    isDraft?: boolean;
+    status?: 'draft' | 'published';
 }) => 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

@@ -1 +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;AAoErC;;;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"}
+{"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;AA4ErC;;;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,MAAM,CAAC,EAAE,OAAO,GAAG,WAAW,CAAA;CAAE,qDAwCzF,CAAC;AAEF,OAAO,EAAE,cAAc,EAAE,CAAC"}

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

@@ -4,18 +4,24 @@ 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 handlePrimitive = (relation) => {
   if (!relation) {
     return [];
   }
   if (data.isShortHand(relation)) {
-    return [{ id: relation }];
+    return [{ documentId: relation }];
   }
   if (data.isLongHand(relation)) {
-    return [{ id: relation.id, locale: relation.locale }];
+    if ("documentId" in relation) {
+      return [
+        { documentId: relation.documentId, locale: relation.locale, status: relation.status }
+      ];
+    }
+    return [];
   }
   if (Array.isArray(relation)) {
-    return relation.map((item) => data.isShortHand(item) ? { id: item } : item);
+    return relation.map((item) => data.isShortHand(item) ? { documentId: item } : item);
   }
   return [];
 };
@@ -37,10 +43,10 @@ const extractRelationIds = (relation) => {
         return;
       const { position } = relation2;
       if (position?.before) {
-        ids.push(...handlePrimitive({ ...position, id: position.before }));
+        ids.push(...handlePrimitive({ ...position, documentId: position.before }));
       }
       if (position?.after) {
-        ids.push(...handlePrimitive({ ...position, id: position.after }));
+        ids.push(...handlePrimitive({ ...position, documentId: position.after }));
       }
     });
   }
@@ -55,15 +61,23 @@ const extractDataIds = (idMap, data2, opts) => {
         if (!target)
           return;
         extractedIds.forEach((relation) => {
-          idMap.add({
-            uid: target,
-            documentId: relation.id,
-            locale: i18n.getRelationTargetLocale(relation, {
-              targetUid: target,
-              sourceUid: opts.uid,
-              sourceLocale: opts.locale
-            }),
-            isDraft: opts.isDraft
+          const targetLocale = i18n.getRelationTargetLocale(relation, {
+            targetUid: target,
+            sourceUid: opts.uid,
+            sourceLocale: opts.locale
+          });
+          const targetStatus = dp.getRelationTargetStatus(relation, {
+            targetUid: target,
+            sourceUid: opts.uid,
+            sourceStatus: opts.status
+          });
+          targetStatus.forEach((status) => {
+            idMap.add({
+              uid: target,
+              documentId: relation.documentId,
+              locale: targetLocale,
+              status
+            });
           });
         });
       }

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

@@ -1 +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, 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":["isShortHand","isLongHand","isObject","relation","data","traverseEntity","getRelationTargetLocale"],"mappings":";;;;;;AAaA,MAAM,kBAAkB,CACtB,aACe;AACf,MAAI,CAAC,UAAU;AACb,WAAO;EACT;AACI,MAAAA,KAAAA,YAAY,QAAQ,GAAG;AACzB,WAAO,CAAC,EAAE,IAAI,SAAA,CAAU;AAAA,EAC1B;AACI,MAAAC,KAAAA,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,SAAUD,KAAA,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,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;;"}
+{"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';\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":["isShortHand","isLongHand","isObject","relation","data","traverseEntity","getRelationTargetLocale","getRelationTargetStatus"],"mappings":";;;;;;;AAYA,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;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,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,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,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;AAGA,qBAAA,QAAQ,CAAC,aAAa;AAC3B,gBAAA,eAAeC,6BAAwB,UAAU;AAAA,YACrD,WAAW;AAAA,YACX,WAAW,KAAK;AAAA,YAChB,cAAc,KAAK;AAAA,UAAA,CACpB;AAEK,gBAAA,eAAeC,2BAAwB,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,IACpCH;AAAA,EAAA;AAEJ;;"}

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

@@ -2,18 +2,24 @@ import { isObject } from "lodash/fp";
 import { traverseEntity } from "@strapi/utils";
 import { isShortHand, isLongHand } from "../utils/data.mjs";
 import { getRelationTargetLocale } from "../utils/i18n.mjs";
+import { getRelationTargetStatus } from "../utils/dp.mjs";
 const handlePrimitive = (relation) => {
   if (!relation) {
     return [];
   }
   if (isShortHand(relation)) {
-    return [{ id: relation }];
+    return [{ documentId: relation }];
   }
   if (isLongHand(relation)) {
-    return [{ id: relation.id, locale: relation.locale }];
+    if ("documentId" in relation) {
+      return [
+        { documentId: relation.documentId, locale: relation.locale, status: relation.status }
+      ];
+    }
+    return [];
   }
   if (Array.isArray(relation)) {
-    return relation.map((item) => isShortHand(item) ? { id: item } : item);
+    return relation.map((item) => isShortHand(item) ? { documentId: item } : item);
   }
   return [];
 };
@@ -35,10 +41,10 @@ const extractRelationIds = (relation) => {
         return;
       const { position } = relation2;
       if (position?.before) {
-        ids.push(...handlePrimitive({ ...position, id: position.before }));
+        ids.push(...handlePrimitive({ ...position, documentId: position.before }));
       }
       if (position?.after) {
-        ids.push(...handlePrimitive({ ...position, id: position.after }));
+        ids.push(...handlePrimitive({ ...position, documentId: position.after }));
       }
     });
   }
@@ -53,15 +59,23 @@ const extractDataIds = (idMap, data, opts) => {
         if (!target)
           return;
         extractedIds.forEach((relation) => {
-          idMap.add({
-            uid: target,
-            documentId: relation.id,
-            locale: getRelationTargetLocale(relation, {
-              targetUid: target,
-              sourceUid: opts.uid,
-              sourceLocale: opts.locale
-            }),
-            isDraft: opts.isDraft
+          const targetLocale = getRelationTargetLocale(relation, {
+            targetUid: target,
+            sourceUid: opts.uid,
+            sourceLocale: opts.locale
+          });
+          const targetStatus = getRelationTargetStatus(relation, {
+            targetUid: target,
+            sourceUid: opts.uid,
+            sourceStatus: opts.status
+          });
+          targetStatus.forEach((status) => {
+            idMap.add({
+              uid: target,
+              documentId: relation.documentId,
+              locale: targetLocale,
+              status
+            });
           });
         });
       }

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"}