@strapi/core 0.0.0-experimental.90ca9123352ed07e0a9cedaf4bcad1475e74137f → 0.0.0-experimental.93181c8b900e97a04bf10785b368657101ec98d8

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

@@ -1 +1 @@
-{"version":3,"file":"data.js","sources":["../../../../src/services/document-service/transform/data.ts"],"sourcesContent":["import { createIdMap } from './id-map';\nimport { extractDataIds as extractDataRelationIds } from './relations/extract/data-ids';\nimport { transformDataIdsVisitor as transformRelationDataIds } from './relations/transform/data-ids';\n\n/**\n * Transforms input data, containing relation document ids, to entity ids.\n */\nexport const transformData = async (data: any, opts: any) => {\n  const idMap = createIdMap({ strapi });\n\n  // Extract any relation ids from the input\n  await extractDataRelationIds(idMap, data, opts);\n\n  // Load any relation the extract methods found\n  await idMap.load();\n\n  // Transform any relation ids to entity ids\n  return transformRelationDataIds(idMap, data, opts);\n};\n"],"names":["idMap","createIdMap","extractDataRelationIds","transformRelationDataIds"],"mappings":";;;;;AAOa,MAAA,gBAAgB,OAAO,MAAW,SAAc;AAC3D,QAAMA,UAAQC,MAAAA,YAAY,EAAE,OAAQ,CAAA;AAG9B,QAAAC,uBAAuBF,SAAO,MAAM,IAAI;AAG9C,QAAMA,QAAM;AAGL,SAAAG,kCAAyBH,SAAO,MAAM,IAAI;AACnD;;"}
+{"version":3,"file":"data.js","sources":["../../../../src/services/document-service/transform/data.ts"],"sourcesContent":["import { createIdMap } from './id-map';\nimport { extractDataIds as extractDataRelationIds } from './relations/extract/data-ids';\nimport { transformDataIdsVisitor as transformRelationDataIds } from './relations/transform/data-ids';\nimport { setDefaultLocaleToRelations } from './relations/transform/default-locale';\n\n/**\n * Transforms input data, containing relation document ids, to entity ids.\n */\nexport const transformData = async (data: any, opts: any) => {\n  const idMap = createIdMap({ strapi });\n\n  // Assign default locales\n  const transformedData = await setDefaultLocaleToRelations(data, opts.uid);\n\n  // Extract any relation ids from the input\n  await extractDataRelationIds(idMap, transformedData, opts);\n\n  // Load any relation the extract methods found\n  await idMap.load();\n\n  // Transform any relation ids to entity ids\n  return transformRelationDataIds(idMap, transformedData, opts);\n};\n"],"names":["idMap","createIdMap","setDefaultLocaleToRelations","extractDataRelationIds","transformRelationDataIds"],"mappings":";;;;;;AAQa,MAAA,gBAAgB,OAAO,MAAW,SAAc;AAC3D,QAAMA,UAAQC,MAAAA,YAAY,EAAE,OAAQ,CAAA;AAGpC,QAAM,kBAAkB,MAAMC,cAA4B,4BAAA,MAAM,KAAK,GAAG;AAGlE,QAAAC,uBAAuBH,SAAO,iBAAiB,IAAI;AAGzD,QAAMA,QAAM;AAGL,SAAAI,kCAAyBJ,SAAO,iBAAiB,IAAI;AAC9D;;"}

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

@@ -1,11 +1,13 @@
 import { createIdMap } from "./id-map.mjs";
 import { extractDataIds } from "./relations/extract/data-ids.mjs";
 import { transformDataIdsVisitor } from "./relations/transform/data-ids.mjs";
+import { setDefaultLocaleToRelations } from "./relations/transform/default-locale.mjs";
 const transformData = async (data, opts) => {
   const idMap = createIdMap({ strapi });
-  await extractDataIds(idMap, data, opts);
+  const transformedData = await setDefaultLocaleToRelations(data, opts.uid);
+  await extractDataIds(idMap, transformedData, opts);
   await idMap.load();
-  return transformDataIdsVisitor(idMap, data, opts);
+  return transformDataIdsVisitor(idMap, transformedData, opts);
 };
 export {
   transformData

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

@@ -1 +1 @@
-{"version":3,"file":"data.mjs","sources":["../../../../src/services/document-service/transform/data.ts"],"sourcesContent":["import { createIdMap } from './id-map';\nimport { extractDataIds as extractDataRelationIds } from './relations/extract/data-ids';\nimport { transformDataIdsVisitor as transformRelationDataIds } from './relations/transform/data-ids';\n\n/**\n * Transforms input data, containing relation document ids, to entity ids.\n */\nexport const transformData = async (data: any, opts: any) => {\n  const idMap = createIdMap({ strapi });\n\n  // Extract any relation ids from the input\n  await extractDataRelationIds(idMap, data, opts);\n\n  // Load any relation the extract methods found\n  await idMap.load();\n\n  // Transform any relation ids to entity ids\n  return transformRelationDataIds(idMap, data, opts);\n};\n"],"names":["extractDataRelationIds","transformRelationDataIds"],"mappings":";;;AAOa,MAAA,gBAAgB,OAAO,MAAW,SAAc;AAC3D,QAAM,QAAQ,YAAY,EAAE,OAAQ,CAAA;AAG9B,QAAAA,eAAuB,OAAO,MAAM,IAAI;AAG9C,QAAM,MAAM;AAGL,SAAAC,wBAAyB,OAAO,MAAM,IAAI;AACnD;"}
+{"version":3,"file":"data.mjs","sources":["../../../../src/services/document-service/transform/data.ts"],"sourcesContent":["import { createIdMap } from './id-map';\nimport { extractDataIds as extractDataRelationIds } from './relations/extract/data-ids';\nimport { transformDataIdsVisitor as transformRelationDataIds } from './relations/transform/data-ids';\nimport { setDefaultLocaleToRelations } from './relations/transform/default-locale';\n\n/**\n * Transforms input data, containing relation document ids, to entity ids.\n */\nexport const transformData = async (data: any, opts: any) => {\n  const idMap = createIdMap({ strapi });\n\n  // Assign default locales\n  const transformedData = await setDefaultLocaleToRelations(data, opts.uid);\n\n  // Extract any relation ids from the input\n  await extractDataRelationIds(idMap, transformedData, opts);\n\n  // Load any relation the extract methods found\n  await idMap.load();\n\n  // Transform any relation ids to entity ids\n  return transformRelationDataIds(idMap, transformedData, opts);\n};\n"],"names":["extractDataRelationIds","transformRelationDataIds"],"mappings":";;;;AAQa,MAAA,gBAAgB,OAAO,MAAW,SAAc;AAC3D,QAAM,QAAQ,YAAY,EAAE,OAAQ,CAAA;AAGpC,QAAM,kBAAkB,MAAM,4BAA4B,MAAM,KAAK,GAAG;AAGlE,QAAAA,eAAuB,OAAO,iBAAiB,IAAI;AAGzD,QAAM,MAAM;AAGL,SAAAC,wBAAyB,OAAO,iBAAiB,IAAI;AAC9D;"}

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

@@ -1,5 +1,5 @@
-import { Documents, Common } from '@strapi/types';
-type Fields = Documents.Params.Pick<Common.UID.Schema, 'fields'>['fields'];
+import type { Modules, UID } from '@strapi/types';
+type Fields = Modules.Documents.Params.Pick<UID.Schema, 'fields'>['fields'];
 export declare const transformFields: (fields: Fields) => Fields;
 export {};
 //# sourceMappingURL=fields.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"fields.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/fields.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAElD,KAAK,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC;AAE3E,eAAO,MAAM,eAAe,WAAY,MAAM,KAAG,MA+BhD,CAAC"}
+{"version":3,"file":"fields.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/fields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAElD,KAAK,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC;AAE5E,eAAO,MAAM,eAAe,WAAY,MAAM,KAAG,MAgChD,CAAC"}

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

@@ -2,22 +2,23 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const transformFields = (fields) => {
   if (typeof fields === "string") {
-    if (fields === "*")
+    if (fields === "*") {
       return fields;
-    if (fields === "documentId" || fields.startsWith("documentId,"))
-      return fields;
-    if (fields === "id")
+    }
+    if (fields === "") {
       return "documentId";
-    return [fields, "documentId"];
+    }
+    if (!fields.split(",").includes("documentId")) {
+      return `${fields},documentId`;
+    }
   }
-  if (!fields || fields.length === 0) {
+  if (!fields || !Array.isArray(fields)) {
     return fields;
   }
-  const mappedFields = fields.map((field) => field === "id" ? "documentId" : field);
-  if (!mappedFields.includes("documentId")) {
-    mappedFields.push("documentId");
+  if (!fields.includes("documentId")) {
+    fields.push("documentId");
   }
-  return mappedFields;
+  return fields;
 };
 exports.transformFields = transformFields;
 //# sourceMappingURL=fields.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"fields.js","sources":["../../../../src/services/document-service/transform/fields.ts"],"sourcesContent":["import { Documents, Common } from '@strapi/types';\n\ntype Fields = Documents.Params.Pick<Common.UID.Schema, 'fields'>['fields'];\n\nexport const transformFields = (fields: Fields): Fields => {\n  // If  it's a string, and it doesn't contain documentId, should be an array\n  // '*' => '*'\n  // 'documentId' => 'documentId' , 'documentId,name' => 'documentId,name'\n  // 'name' => ['name', 'documentId']\n  // 'id' => 'documentId'\n  if (typeof fields === 'string') {\n    if (fields === '*') return fields;\n    if (fields === 'documentId' || fields.startsWith('documentId,')) return fields;\n    if (fields === 'id') return 'documentId';\n    return [fields, 'documentId'];\n  }\n\n  // It's an array\n  // [] => []\n  if (!fields || fields.length === 0) {\n    // If fields is empty, return it as is\n    return fields;\n  }\n\n  // Map any id fields to documentId\n  // ['id', 'name'] => ['documentId', 'name']\n  const mappedFields = fields.map((field) => (field === 'id' ? 'documentId' : field));\n\n  // Ensure we are always selecting the documentId\n  // ['name', 'description'] => ['name', 'description', 'documentId']\n  if (!mappedFields.includes('documentId')) {\n    mappedFields.push('documentId');\n  }\n\n  return mappedFields;\n};\n"],"names":[],"mappings":";;AAIa,MAAA,kBAAkB,CAAC,WAA2B;AAMrD,MAAA,OAAO,WAAW,UAAU;AAC9B,QAAI,WAAW;AAAY,aAAA;AAC3B,QAAI,WAAW,gBAAgB,OAAO,WAAW,aAAa;AAAU,aAAA;AACxE,QAAI,WAAW;AAAa,aAAA;AACrB,WAAA,CAAC,QAAQ,YAAY;AAAA,EAC9B;AAIA,MAAI,CAAC,UAAU,OAAO,WAAW,GAAG;AAE3B,WAAA;AAAA,EACT;AAIM,QAAA,eAAe,OAAO,IAAI,CAAC,UAAW,UAAU,OAAO,eAAe,KAAM;AAIlF,MAAI,CAAC,aAAa,SAAS,YAAY,GAAG;AACxC,iBAAa,KAAK,YAAY;AAAA,EAChC;AAEO,SAAA;AACT;;"}
+{"version":3,"file":"fields.js","sources":["../../../../src/services/document-service/transform/fields.ts"],"sourcesContent":["import type { Modules, UID } from '@strapi/types';\n\ntype Fields = Modules.Documents.Params.Pick<UID.Schema, 'fields'>['fields'];\n\nexport const transformFields = (fields: Fields): Fields => {\n  // If  it's a string, and it doesn't contain documentId, should be an array\n  if (typeof fields === 'string') {\n    // '*' => '*'\n    if (fields === '*') {\n      return fields;\n    }\n\n    // '' => 'documentId'\n    if (fields === '') {\n      return 'documentId';\n    }\n\n    // 'name,description' => 'name,description,documentId'\n    if (!fields.split(',').includes('documentId')) {\n      return `${fields},documentId`;\n    }\n  }\n\n  // It's not an array, ignore it\n  if (!fields || !Array.isArray(fields)) {\n    // If fields is empty, return it as is\n    return fields;\n  }\n\n  // Ensure we are always selecting the documentId\n  // ['name', 'description'] => ['name', 'description', 'documentId']\n  if (!fields.includes('documentId')) {\n    fields.push('documentId');\n  }\n\n  return fields;\n};\n"],"names":[],"mappings":";;AAIa,MAAA,kBAAkB,CAAC,WAA2B;AAErD,MAAA,OAAO,WAAW,UAAU;AAE9B,QAAI,WAAW,KAAK;AACX,aAAA;AAAA,IACT;AAGA,QAAI,WAAW,IAAI;AACV,aAAA;AAAA,IACT;AAGA,QAAI,CAAC,OAAO,MAAM,GAAG,EAAE,SAAS,YAAY,GAAG;AAC7C,aAAO,GAAG,MAAM;AAAA,IAClB;AAAA,EACF;AAGA,MAAI,CAAC,UAAU,CAAC,MAAM,QAAQ,MAAM,GAAG;AAE9B,WAAA;AAAA,EACT;AAIA,MAAI,CAAC,OAAO,SAAS,YAAY,GAAG;AAClC,WAAO,KAAK,YAAY;AAAA,EAC1B;AAEO,SAAA;AACT;;"}

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

@@ -1,21 +1,22 @@
 const transformFields = (fields) => {
   if (typeof fields === "string") {
-    if (fields === "*")
+    if (fields === "*") {
       return fields;
-    if (fields === "documentId" || fields.startsWith("documentId,"))
-      return fields;
-    if (fields === "id")
+    }
+    if (fields === "") {
       return "documentId";
-    return [fields, "documentId"];
+    }
+    if (!fields.split(",").includes("documentId")) {
+      return `${fields},documentId`;
+    }
   }
-  if (!fields || fields.length === 0) {
+  if (!fields || !Array.isArray(fields)) {
     return fields;
   }
-  const mappedFields = fields.map((field) => field === "id" ? "documentId" : field);
-  if (!mappedFields.includes("documentId")) {
-    mappedFields.push("documentId");
+  if (!fields.includes("documentId")) {
+    fields.push("documentId");
   }
-  return mappedFields;
+  return fields;
 };
 export {
   transformFields

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

@@ -1 +1 @@
-{"version":3,"file":"fields.mjs","sources":["../../../../src/services/document-service/transform/fields.ts"],"sourcesContent":["import { Documents, Common } from '@strapi/types';\n\ntype Fields = Documents.Params.Pick<Common.UID.Schema, 'fields'>['fields'];\n\nexport const transformFields = (fields: Fields): Fields => {\n  // If  it's a string, and it doesn't contain documentId, should be an array\n  // '*' => '*'\n  // 'documentId' => 'documentId' , 'documentId,name' => 'documentId,name'\n  // 'name' => ['name', 'documentId']\n  // 'id' => 'documentId'\n  if (typeof fields === 'string') {\n    if (fields === '*') return fields;\n    if (fields === 'documentId' || fields.startsWith('documentId,')) return fields;\n    if (fields === 'id') return 'documentId';\n    return [fields, 'documentId'];\n  }\n\n  // It's an array\n  // [] => []\n  if (!fields || fields.length === 0) {\n    // If fields is empty, return it as is\n    return fields;\n  }\n\n  // Map any id fields to documentId\n  // ['id', 'name'] => ['documentId', 'name']\n  const mappedFields = fields.map((field) => (field === 'id' ? 'documentId' : field));\n\n  // Ensure we are always selecting the documentId\n  // ['name', 'description'] => ['name', 'description', 'documentId']\n  if (!mappedFields.includes('documentId')) {\n    mappedFields.push('documentId');\n  }\n\n  return mappedFields;\n};\n"],"names":[],"mappings":"AAIa,MAAA,kBAAkB,CAAC,WAA2B;AAMrD,MAAA,OAAO,WAAW,UAAU;AAC9B,QAAI,WAAW;AAAY,aAAA;AAC3B,QAAI,WAAW,gBAAgB,OAAO,WAAW,aAAa;AAAU,aAAA;AACxE,QAAI,WAAW;AAAa,aAAA;AACrB,WAAA,CAAC,QAAQ,YAAY;AAAA,EAC9B;AAIA,MAAI,CAAC,UAAU,OAAO,WAAW,GAAG;AAE3B,WAAA;AAAA,EACT;AAIM,QAAA,eAAe,OAAO,IAAI,CAAC,UAAW,UAAU,OAAO,eAAe,KAAM;AAIlF,MAAI,CAAC,aAAa,SAAS,YAAY,GAAG;AACxC,iBAAa,KAAK,YAAY;AAAA,EAChC;AAEO,SAAA;AACT;"}
+{"version":3,"file":"fields.mjs","sources":["../../../../src/services/document-service/transform/fields.ts"],"sourcesContent":["import type { Modules, UID } from '@strapi/types';\n\ntype Fields = Modules.Documents.Params.Pick<UID.Schema, 'fields'>['fields'];\n\nexport const transformFields = (fields: Fields): Fields => {\n  // If  it's a string, and it doesn't contain documentId, should be an array\n  if (typeof fields === 'string') {\n    // '*' => '*'\n    if (fields === '*') {\n      return fields;\n    }\n\n    // '' => 'documentId'\n    if (fields === '') {\n      return 'documentId';\n    }\n\n    // 'name,description' => 'name,description,documentId'\n    if (!fields.split(',').includes('documentId')) {\n      return `${fields},documentId`;\n    }\n  }\n\n  // It's not an array, ignore it\n  if (!fields || !Array.isArray(fields)) {\n    // If fields is empty, return it as is\n    return fields;\n  }\n\n  // Ensure we are always selecting the documentId\n  // ['name', 'description'] => ['name', 'description', 'documentId']\n  if (!fields.includes('documentId')) {\n    fields.push('documentId');\n  }\n\n  return fields;\n};\n"],"names":[],"mappings":"AAIa,MAAA,kBAAkB,CAAC,WAA2B;AAErD,MAAA,OAAO,WAAW,UAAU;AAE9B,QAAI,WAAW,KAAK;AACX,aAAA;AAAA,IACT;AAGA,QAAI,WAAW,IAAI;AACV,aAAA;AAAA,IACT;AAGA,QAAI,CAAC,OAAO,MAAM,GAAG,EAAE,SAAS,YAAY,GAAG;AAC7C,aAAO,GAAG,MAAM;AAAA,IAClB;AAAA,EACF;AAGA,MAAI,CAAC,UAAU,CAAC,MAAM,QAAQ,MAAM,GAAG;AAE9B,WAAA;AAAA,EACT;AAIA,MAAI,CAAC,OAAO,SAAS,YAAY,GAAG;AAClC,WAAO,KAAK,YAAY;AAAA,EAC1B;AAEO,SAAA;AACT;"}

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

@@ -1,9 +1,9 @@
-import { Strapi, Entity } from '@strapi/types';
+import { Core, Data } from '@strapi/types';
 interface KeyFields {
     uid: string;
-    documentId: Entity.ID;
+    documentId: Data.ID;
     locale?: string | null;
-    isDraft?: boolean;
+    status?: 'draft' | 'published';
 }
 export interface IdMap {
     loadedIds: Map<string, string>;
@@ -17,7 +17,7 @@ export interface IdMap {
  * Holds a registry of document ids and their corresponding entity ids.
  */
 declare const createIdMap: ({ strapi }: {
-    strapi: Strapi;
+    strapi: Core.Strapi;
 }) => IdMap;
 export { createIdMap };
 //# sourceMappingURL=id-map.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"id-map.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/id-map.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAmB/C,UAAU,SAAS;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC,EAAE,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,KAAK;IACpB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAElC,GAAG,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI,CAAC;IAC3B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,GAAG,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;IACzC,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;GAEG;AACH,QAAA,MAAM,WAAW;YAA0B,MAAM;MAAK,KA+ErD,CAAC;AAEF,OAAO,EAAE,WAAW,EAAE,CAAC"}
+{"version":3,"file":"id-map.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/id-map.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAmB3C,UAAU,SAAS;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,IAAI,CAAC,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;CAChC;AAED,MAAM,WAAW,KAAK;IACpB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAElC,GAAG,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI,CAAC;IAC3B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,GAAG,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;IACzC,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;GAEG;AACH,QAAA,MAAM,WAAW,eAAgB;IAAE,MAAM,EAAE,KAAK,MAAM,CAAA;CAAE,KAAG,KAsF1D,CAAC;AAEF,OAAO,EAAE,WAAW,EAAE,CAAC"}

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

@@ -15,7 +15,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))
@@ -33,19 +33,25 @@ const createIdMap = ({ strapi }) => {
         ids.documentIds.push(documentId);
         return { ...acc, [key]: ids };
       }, {});
-      await strapiUtils.mapAsync(
+      await strapiUtils.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);
           });
         }
@@ -56,7 +62,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.js.map

@@ -1 +1 @@
-{"version":3,"file":"id-map.js","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":["mapAsync","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,YAAAA,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,QAAAC,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.js","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":["async","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,YAAMA,YAAM,MAAA;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,QAAAC,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-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,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 { 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;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,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,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 fp = require("lodash/fp");
+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 = 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 { 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 { 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,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 { 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;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,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"}