@strapi/core 0.0.0-experimental.8294852592c0a1fb061c5d3576327fa0e80bab5b → 0.0.0-experimental.8f5736f39974781dca58cef1d1dea9d54580fbf1

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

@@ -1,4 +1,4 @@
-import { mapAsync } from "@strapi/utils";
+import { async } from "@strapi/utils";
 const encodeKey = (obj) => {
   const keys = Object.keys(obj).sort();
   return keys.map((key) => `${key}:::${obj[key]}`).join("&&");
@@ -13,7 +13,7 @@ const createIdMap = ({ strapi }) => {
      * Register a new document id and its corresponding entity id.
      */
     add(keyFields) {
-      const key = encodeKey({ isDraft: false, locale: null, ...keyFields });
+      const key = encodeKey({ status: "published", locale: null, ...keyFields });
       if (loadedIds.has(key))
         return;
       if (toLoadIds.has(key))
@@ -31,19 +31,25 @@ const createIdMap = ({ strapi }) => {
         ids.documentIds.push(documentId);
         return { ...acc, [key]: ids };
       }, {});
-      await mapAsync(
+      await async.map(
         Object.values(idsByUidAndLocale),
-        async ({ uid, locale, documentIds, isDraft }) => {
-          const result = await strapi?.db?.query(uid).findMany({
+        async ({ uid, locale, documentIds, status }) => {
+          const findParams = {
             select: ["id", "documentId", "locale", "publishedAt"],
             where: {
               documentId: { $in: documentIds },
-              locale,
-              publishedAt: isDraft ? null : { $ne: null }
+              locale: locale || null,
+              publishedAt: status === "draft" ? null : { $ne: null }
             }
-          });
+          };
+          const result = await strapi?.db?.query(uid).findMany(findParams);
           result?.forEach(({ documentId, id, locale: locale2, publishedAt }) => {
-            const key = encodeKey({ documentId, uid, locale: locale2, isDraft: !publishedAt });
+            const key = encodeKey({
+              documentId,
+              uid,
+              locale: locale2,
+              status: publishedAt ? "published" : "draft"
+            });
             loadedIds.set(key, id);
           });
         }
@@ -54,7 +60,7 @@ const createIdMap = ({ strapi }) => {
      * Get the entity id for a given document id.
      */
     get(keys) {
-      const key = encodeKey({ isDraft: false, locale: null, ...keys });
+      const key = encodeKey({ status: "published", locale: null, ...keys });
       return loadedIds.get(key);
     },
     /**

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 { Core, Data } 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: Data.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: Core.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,aAA6C;AAC5D,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,19 +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;
-    populate?: any;
-    [key: string]: any;
-}, opts: {
-    locale?: string | null;
-    isDraft: boolean;
-}): Promise<{
-    data: any;
-    fields: any;
-    populate: any;
-}>;
-export { transformParamsDocumentId };
+/// <reference types="lodash" />
+import { UID, Modules } from '@strapi/types';
+declare const curriedTransformParamsDocumentId: import("lodash").CurriedFunction2<UID.Schema, Modules.Documents.Params.All, Promise<Modules.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;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"}
+{"version":3,"file":"id-transform.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/id-transform.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AA0C7C,QAAA,MAAM,gCAAgC,oHAAmC,CAAC;AAE1E,OAAO,EAAE,gCAAgC,IAAI,yBAAyB,EAAE,CAAC"}

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

@@ -1,27 +1,33 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const fp = require("lodash/fp");
 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 });
+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 fields$1 = input.fields;
-  if (input.fields) {
-    fields$1 = fields.transformFields(input.fields);
+  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 populate$1 = query.populate;
+  if (query.populate) {
+    populate$1 = await populate.transformPopulate(query.populate, { uid });
   }
   return {
-    ...input,
+    ...query,
     data: data$1,
     fields: fields$1,
     populate: populate$1
   };
 }
-exports.transformParamsDocumentId = transformParamsDocumentId;
+const curriedTransformParamsDocumentId = fp.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 { 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;;"}
+{"version":3,"file":"id-transform.js","sources":["../../../../src/services/document-service/transform/id-transform.ts"],"sourcesContent":["import { curry } from 'lodash/fp';\n\nimport { UID, Modules } 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: UID.Schema,\n  query: Modules.Documents.Params.All\n): Promise<Modules.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,OACuC;AAEvC,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,SAAM,yBAAyB;;"}

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

@@ -1,27 +1,33 @@
+import { curry } from "lodash/fp";
 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 });
+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 fields = input.fields;
-  if (input.fields) {
-    fields = transformFields(input.fields);
+  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 populate = query.populate;
+  if (query.populate) {
+    populate = await transformPopulate(query.populate, { uid });
   }
   return {
-    ...input,
+    ...query,
     data,
     fields,
     populate
   };
 }
+const curriedTransformParamsDocumentId = curry(transformParamsDocumentId);
 export {
-  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 { 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;"}
+{"version":3,"file":"id-transform.mjs","sources":["../../../../src/services/document-service/transform/id-transform.ts"],"sourcesContent":["import { curry } from 'lodash/fp';\n\nimport { UID, Modules } 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: UID.Schema,\n  query: Modules.Documents.Params.All\n): Promise<Modules.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,OACuC;AAEvC,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 { UID } from '@strapi/types';
+import { type Data } from './types';
+export declare const transformPopulate: (data: Data, opts: {
+    uid: 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;AAGlD,eAAO,MAAM,iBAAiB,SAAgB,IAAI,QAAQ,OAAO,qBAqBhE,CAAC"}
+{"version":3,"file":"populate.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/populate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,SAAS,CAAC;AAGpC,eAAO,MAAM,iBAAiB,SAAgB,IAAI,QAAQ;IAAE,GAAG,EAAE,IAAI,MAAM,CAAA;CAAE,qBAqB5E,CAAC"}

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

@@ -13,7 +13,7 @@ const transformPopulate = async (data, opts) => {
       }
       set(key, value);
     },
-    { schema: strapi.getModel(opts.uid) },
+    { schema: strapi.getModel(opts.uid), getModel: strapi.getModel.bind(strapi) },
     data
   );
 };

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 { 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;;"}
+{"version":3,"file":"populate.js","sources":["../../../../src/services/document-service/transform/populate.ts"],"sourcesContent":["import { traverse } from '@strapi/utils';\nimport type { UID } from '@strapi/types';\n\nimport { type Data } from './types';\nimport { transformFields } from './fields';\n\nexport const transformPopulate = async (data: Data, opts: { uid: 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), getModel: strapi.getModel.bind(strapi) },\n    data\n  );\n};\n"],"names":["traverse","transformFields"],"mappings":";;;;AAMa,MAAA,oBAAoB,OAAO,MAAY,SAA8B;AAChF,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,GAAG,UAAU,OAAO,SAAS,KAAK,MAAM,EAAE;AAAA,IAC5E;AAAA,EAAA;AAEJ;;"}

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

@@ -11,7 +11,7 @@ const transformPopulate = async (data, opts) => {
       }
       set(key, value);
     },
-    { schema: strapi.getModel(opts.uid) },
+    { schema: strapi.getModel(opts.uid), getModel: strapi.getModel.bind(strapi) },
     data
   );
 };

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 { 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;"}
+{"version":3,"file":"populate.mjs","sources":["../../../../src/services/document-service/transform/populate.ts"],"sourcesContent":["import { traverse } from '@strapi/utils';\nimport type { UID } from '@strapi/types';\n\nimport { type Data } from './types';\nimport { transformFields } from './fields';\n\nexport const transformPopulate = async (data: Data, opts: { uid: 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), getModel: strapi.getModel.bind(strapi) },\n    data\n  );\n};\n"],"names":[],"mappings":";;AAMa,MAAA,oBAAoB,OAAO,MAAY,SAA8B;AAChF,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,GAAG,UAAU,OAAO,SAAS,KAAK,MAAM,EAAE;AAAA,IAC5E;AAAA,EAAA;AAEJ;"}

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

@@ -0,0 +1,5 @@
+/// <reference types="lodash" />
+import type { UID } from '@strapi/types';
+declare const transformParamsToQuery: import("lodash").CurriedFunction2<UID.Schema, any, any>;
+export { transformParamsToQuery };
+//# sourceMappingURL=query.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/query.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAIzC,QAAA,MAAM,sBAAsB,yDAI1B,CAAC;AAEH,OAAO,EAAE,sBAAsB,EAAE,CAAC"}

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

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const fp = require("lodash/fp");
+const transformParamsToQuery = fp.curry((uid, params) => {
+  const query = strapi.get("query-params").transform(uid, params);
+  return fp.assoc("where", { ...params?.lookup, ...query.where }, query);
+});
+exports.transformParamsToQuery = transformParamsToQuery;
+//# sourceMappingURL=query.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"query.js","sources":["../../../../src/services/document-service/transform/query.ts"],"sourcesContent":["import type { UID } from '@strapi/types';\n\nimport { curry, assoc } from 'lodash/fp';\n\nconst transformParamsToQuery = curry((uid: UID.Schema, params: any) => {\n  const query = strapi.get('query-params').transform(uid, params);\n\n  return assoc('where', { ...params?.lookup, ...query.where }, query);\n});\n\nexport { transformParamsToQuery };\n"],"names":["curry","assoc"],"mappings":";;;AAIA,MAAM,yBAAyBA,GAAA,MAAM,CAAC,KAAiB,WAAgB;AACrE,QAAM,QAAQ,OAAO,IAAI,cAAc,EAAE,UAAU,KAAK,MAAM;AAEvD,SAAAC,GAAA,MAAM,SAAS,EAAE,GAAG,QAAQ,QAAQ,GAAG,MAAM,SAAS,KAAK;AACpE,CAAC;;"}

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

@@ -0,0 +1,9 @@
+import { curry, assoc } from "lodash/fp";
+const transformParamsToQuery = curry((uid, params) => {
+  const query = strapi.get("query-params").transform(uid, params);
+  return assoc("where", { ...params?.lookup, ...query.where }, query);
+});
+export {
+  transformParamsToQuery
+};
+//# sourceMappingURL=query.mjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"query.mjs","sources":["../../../../src/services/document-service/transform/query.ts"],"sourcesContent":["import type { UID } from '@strapi/types';\n\nimport { curry, assoc } from 'lodash/fp';\n\nconst transformParamsToQuery = curry((uid: UID.Schema, params: any) => {\n  const query = strapi.get('query-params').transform(uid, params);\n\n  return assoc('where', { ...params?.lookup, ...query.where }, query);\n});\n\nexport { transformParamsToQuery };\n"],"names":[],"mappings":";AAIA,MAAM,yBAAyB,MAAM,CAAC,KAAiB,WAAgB;AACrE,QAAM,QAAQ,OAAO,IAAI,cAAc,EAAE,UAAU,KAAK,MAAM;AAEvD,SAAA,MAAM,SAAS,EAAE,GAAG,QAAQ,QAAQ,GAAG,MAAM,SAAS,KAAK;AACpE,CAAC;"}

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

@@ -1,13 +1,14 @@
-import { Common } from '@strapi/types';
+import { UID } from '@strapi/types';
 import { IdMap } from '../../id-map';
+interface Options {
+    uid: UID.Schema;
+    locale?: string | null;
+    status?: 'draft' | 'published';
+}
 /**
- * Iterate over all attributes of a Data object and extract all relational document ids.
+ * Iterate over all relations 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>;
+declare const extractDataIds: (idMap: IdMap, data: Record<string, any>, source: Options) => 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;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"}
+{"version":3,"file":"data-ids.d.ts","sourceRoot":"","sources":["../../../../../../src/services/document-service/transform/relations/extract/data-ids.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEpC,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAMrC,UAAU,OAAO;IACf,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;CAChC;AA8BD;;;GAGG;AACH,QAAA,MAAM,cAAc,UAAW,KAAK,QAAQ,OAAO,MAAM,EAAE,GAAG,CAAC,UAAU,OAAO,qDAkC/E,CAAC;AAEF,OAAO,EAAE,cAAc,EAAE,CAAC"}

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

@@ -1,78 +1,56 @@
 "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 fp = require("lodash/fp");
 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 }));
-      }
+const dp = require("../utils/dp.js");
+const mapRelation = require("../utils/map-relation.js");
+const addRelationDocId = fp.curry(
+  (idMap, targetUid, source, relation) => {
+    const targetLocale = i18n.getRelationTargetLocale(relation, {
+      targetUid,
+      sourceUid: source.uid,
+      sourceLocale: source.locale
+    });
+    const targetStatus = dp.getRelationTargetStatus(relation, {
+      targetUid,
+      sourceUid: source.uid,
+      sourceStatus: source.status
+    });
+    targetStatus.forEach((status) => {
+      idMap.add({
+        uid: targetUid,
+        documentId: relation.documentId,
+        locale: targetLocale,
+        status
+      });
     });
   }
-  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
-          });
-        });
+);
+const extractDataIds = (idMap, data, source) => {
+  return mapRelation.traverseEntityRelations(
+    async ({ attribute, value }) => {
+      if (!attribute) {
+        return;
       }
+      const targetUid = attribute.target;
+      const addDocId = addRelationDocId(idMap, targetUid, source);
+      return mapRelation.mapRelation((relation) => {
+        if (!relation || !relation.documentId) {
+          return relation;
+        }
+        addDocId(relation);
+        const position = relation.position;
+        if (position?.before) {
+          addDocId({ ...relation, ...position, documentId: position.before });
+        }
+        if (position?.after) {
+          addDocId({ ...relation, ...position, documentId: position.after });
+        }
+        return relation;
+      }, value);
     },
-    { schema: strapi.getModel(opts.uid) },
-    data2
+    { schema: strapi.getModel(source.uid), getModel: strapi.getModel.bind(strapi) },
+    data
   );
 };
 exports.extractDataIds = extractDataIds;

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, 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;;"}
+{"version":3,"file":"data-ids.js","sources":["../../../../../../src/services/document-service/transform/relations/extract/data-ids.ts"],"sourcesContent":["import { curry } from 'lodash/fp';\n\nimport { UID } from '@strapi/types';\n\nimport { IdMap } from '../../id-map';\nimport { getRelationTargetLocale } from '../utils/i18n';\nimport { getRelationTargetStatus } from '../utils/dp';\nimport { mapRelation, traverseEntityRelations } from '../utils/map-relation';\nimport { LongHandDocument } from '../utils/types';\n\ninterface Options {\n  uid: UID.Schema;\n  locale?: string | null;\n  status?: 'draft' | 'published';\n}\n\n/**\n * Load a relation documentId into the idMap.\n */\nconst addRelationDocId = curry(\n  (idMap: IdMap, targetUid: UID.Schema, source: Options, relation: LongHandDocument) => {\n    const targetLocale = getRelationTargetLocale(relation, {\n      targetUid,\n      sourceUid: source.uid,\n      sourceLocale: source.locale,\n    });\n\n    const targetStatus = getRelationTargetStatus(relation, {\n      targetUid,\n      sourceUid: source.uid,\n      sourceStatus: source.status,\n    });\n\n    targetStatus.forEach((status) => {\n      idMap.add({\n        uid: targetUid,\n        documentId: relation.documentId,\n        locale: targetLocale,\n        status,\n      });\n    });\n  }\n);\n\n/**\n * Iterate over all relations of a data object and extract all relational document ids.\n * Those will later be transformed to entity ids.\n */\nconst extractDataIds = (idMap: IdMap, data: Record<string, any>, source: Options) => {\n  return traverseEntityRelations(\n    async ({ attribute, value }) => {\n      if (!attribute) {\n        return;\n      }\n\n      const targetUid = attribute.target!;\n      const addDocId = addRelationDocId(idMap, targetUid, source);\n\n      return mapRelation((relation) => {\n        if (!relation || !relation.documentId) {\n          return relation;\n        }\n\n        addDocId(relation);\n\n        // Handle positional arguments\n        const position = relation.position;\n\n        if (position?.before) {\n          addDocId({ ...relation, ...position, documentId: position.before });\n        }\n\n        if (position?.after) {\n          addDocId({ ...relation, ...position, documentId: position.after });\n        }\n\n        return relation;\n      }, value as any);\n    },\n    { schema: strapi.getModel(source.uid), getModel: strapi.getModel.bind(strapi) },\n    data\n  );\n};\n\nexport { extractDataIds };\n"],"names":["curry","getRelationTargetLocale","getRelationTargetStatus","traverseEntityRelations","mapRelation"],"mappings":";;;;;;AAmBA,MAAM,mBAAmBA,GAAA;AAAA,EACvB,CAAC,OAAc,WAAuB,QAAiB,aAA+B;AAC9E,UAAA,eAAeC,6BAAwB,UAAU;AAAA,MACrD;AAAA,MACA,WAAW,OAAO;AAAA,MAClB,cAAc,OAAO;AAAA,IAAA,CACtB;AAEK,UAAA,eAAeC,2BAAwB,UAAU;AAAA,MACrD;AAAA,MACA,WAAW,OAAO;AAAA,MAClB,cAAc,OAAO;AAAA,IAAA,CACtB;AAEY,iBAAA,QAAQ,CAAC,WAAW;AAC/B,YAAM,IAAI;AAAA,QACR,KAAK;AAAA,QACL,YAAY,SAAS;AAAA,QACrB,QAAQ;AAAA,QACR;AAAA,MAAA,CACD;AAAA,IAAA,CACF;AAAA,EACH;AACF;AAMA,MAAM,iBAAiB,CAAC,OAAc,MAA2B,WAAoB;AAC5E,SAAAC,YAAA;AAAA,IACL,OAAO,EAAE,WAAW,YAAY;AAC9B,UAAI,CAAC,WAAW;AACd;AAAA,MACF;AAEA,YAAM,YAAY,UAAU;AAC5B,YAAM,WAAW,iBAAiB,OAAO,WAAW,MAAM;AAEnD,aAAAC,YAAAA,YAAY,CAAC,aAAa;AAC/B,YAAI,CAAC,YAAY,CAAC,SAAS,YAAY;AAC9B,iBAAA;AAAA,QACT;AAEA,iBAAS,QAAQ;AAGjB,cAAM,WAAW,SAAS;AAE1B,YAAI,UAAU,QAAQ;AACX,mBAAA,EAAE,GAAG,UAAU,GAAG,UAAU,YAAY,SAAS,QAAQ;AAAA,QACpE;AAEA,YAAI,UAAU,OAAO;AACV,mBAAA,EAAE,GAAG,UAAU,GAAG,UAAU,YAAY,SAAS,OAAO;AAAA,QACnE;AAEO,eAAA;AAAA,SACN,KAAY;AAAA,IACjB;AAAA,IACA,EAAE,QAAQ,OAAO,SAAS,OAAO,GAAG,GAAG,UAAU,OAAO,SAAS,KAAK,MAAM,EAAE;AAAA,IAC9E;AAAA,EAAA;AAEJ;;"}