@strapi/core 0.0.0-experimental.a407f3bc8fb79a53cf7975140864526b6ddbac4b → 0.0.0-experimental.e3e48deb89bd0a1b6cc69b698696566fa7854a95

package/dist/services/document-service/repository.mjs

@@ -0,0 +1,295 @@
+import { curry, assoc, omit, merge } from "lodash/fp";
+import { convertQueryParams, contentTypes, async } from "@strapi/utils";
+import { wrapInTransaction } from "./common.mjs";
+import { defaultToDraft as defaultToDraftCurry, statusToLookup as statusToLookupCurry, filterDataPublishedAt as filterDataPublishedAtCurry, setStatusToDraft as setStatusToDraftCurry, statusToData as statusToDataCurry, defaultStatus as defaultStatusCurry } from "./draft-and-publish.mjs";
+import { defaultLocale as defaultLocaleCurry, localeToLookup as localeToLookupCurry, multiLocaleToLookup as multiLocaleToLookupCurry, localeToData as localeToDataCurry } from "./internationalization.mjs";
+import { transformParamsDocumentId as curriedTransformParamsDocumentId } from "./transform/id-transform.mjs";
+import { updateComponents, omitComponentData, getComponents, deleteComponents, createComponents } from "../entity-service/components.mjs";
+import { pickSelectionParams } from "../entity-service/params.mjs";
+import entityValidator from "../entity-validator/index.mjs";
+import { applyTransforms } from "../entity-service/attributes/index.mjs";
+import { createDocumentId } from "../../utils/transform-content-types-to-models.mjs";
+import { getDeepPopulate } from "./utils/populate.mjs";
+import { transformData } from "./transform/data.mjs";
+const transformParamsToQuery = curry((uid, params) => {
+  const query = convertQueryParams.transformParamsToQuery(uid, params);
+  return assoc("where", { ...params?.lookup, ...query.where }, query);
+});
+const createContentTypeRepository = (uid) => {
+  const contentType = strapi.contentType(uid);
+  const hasDraftAndPublish = contentTypes.hasDraftAndPublish(contentType);
+  async function findMany(params = {}) {
+    const query = await async.pipe(
+      defaultToDraftCurry,
+      statusToLookupCurry(contentType),
+      defaultLocaleCurry(contentType),
+      localeToLookupCurry(contentType),
+      curriedTransformParamsDocumentId(uid),
+      transformParamsToQuery(uid)
+    )(params || {});
+    return strapi.db.query(uid).findMany(query);
+  }
+  async function findFirst(params = {}) {
+    const query = await async.pipe(
+      defaultToDraftCurry,
+      statusToLookupCurry(contentType),
+      defaultLocaleCurry(contentType),
+      localeToLookupCurry(contentType),
+      curriedTransformParamsDocumentId(uid),
+      transformParamsToQuery(uid)
+    )(params);
+    return strapi.db.query(uid).findOne(query);
+  }
+  async function findOne(documentId, params = {}) {
+    const query = await async.pipe(
+      defaultToDraftCurry,
+      statusToLookupCurry(contentType),
+      defaultLocaleCurry(contentType),
+      localeToLookupCurry(contentType),
+      curriedTransformParamsDocumentId(uid),
+      transformParamsToQuery(uid),
+      (query2) => assoc("where", { ...query2.where, documentId }, query2)
+    )(params);
+    return strapi.db.query(uid).findOne(query);
+  }
+  async function deleteEntry(id) {
+    const componentsToDelete = await getComponents(uid, { id });
+    await strapi.db.query(uid).delete({ where: { id } });
+    await deleteComponents(uid, componentsToDelete, { loadComponents: false });
+  }
+  async function deleteFn(documentId, params = {}) {
+    const query = await async.pipe(
+      omit("status"),
+      defaultLocaleCurry(contentType),
+      multiLocaleToLookupCurry(contentType),
+      transformParamsToQuery(uid),
+      (query2) => assoc("where", { ...query2.where, documentId }, query2)
+    )(params);
+    if (params.status === "draft") {
+      throw new Error("Cannot delete a draft document");
+    }
+    const entriesToDelete = await strapi.db.query(uid).findMany(query);
+    await async.map(entriesToDelete, (entryToDelete) => deleteEntry(entryToDelete.id));
+    return { deletedEntries: entriesToDelete };
+  }
+  async function createEntry(params = {}) {
+    const { data, ...restParams } = await curriedTransformParamsDocumentId(uid, params);
+    const query = transformParamsToQuery(uid, pickSelectionParams(restParams));
+    if (!params.data) {
+      throw new Error("Create requires data attribute");
+    }
+    const validData = await entityValidator.validateEntityCreation(contentType, data, {
+      // Note: publishedAt value will always be set when DP is disabled
+      isDraft: !params?.data?.publishedAt,
+      locale: params?.locale
+    });
+    const componentData = await createComponents(uid, validData);
+    const entryData = applyTransforms(
+      Object.assign(omitComponentData(contentType, validData), componentData),
+      { contentType }
+    );
+    const doc = await strapi.db.query(uid).create({ ...query, data: entryData });
+    return doc;
+  }
+  async function create(params = {}) {
+    const queryParams = await async.pipe(
+      filterDataPublishedAtCurry,
+      setStatusToDraftCurry(contentType),
+      statusToDataCurry(contentType),
+      defaultLocaleCurry(contentType),
+      localeToDataCurry(contentType)
+    )(params);
+    const doc = await createEntry(queryParams);
+    if (hasDraftAndPublish && params.status === "published") {
+      return publish(doc.documentId, params).then((doc2) => doc2.versions[0]);
+    }
+    return doc;
+  }
+  async function clone(documentId, params = {}) {
+    const queryParams = await async.pipe(
+      filterDataPublishedAtCurry,
+      defaultLocaleCurry(contentType),
+      multiLocaleToLookupCurry(contentType)
+    )(params);
+    const entriesToClone = await strapi.db?.query(uid).findMany({
+      where: {
+        ...queryParams?.lookup,
+        documentId,
+        // DP Enabled: Clone drafts
+        // DP Disabled: Clone only the existing version (published)
+        publishedAt: { $null: hasDraftAndPublish }
+      },
+      populate: getDeepPopulate(uid, { relationalFields: ["id"] })
+    });
+    const clonedEntries = await async.map(
+      entriesToClone,
+      async.pipe(
+        omit("id"),
+        // assign new documentId
+        assoc("documentId", createDocumentId()),
+        // Merge new data into it
+        (data) => merge(data, queryParams.data),
+        (data) => createEntry({ ...queryParams, data, status: "draft" })
+      )
+    );
+    return { documentId: clonedEntries.at(0)?.documentId, versions: clonedEntries };
+  }
+  async function update(documentId, params = {}) {
+    const queryParams = await async.pipe(
+      filterDataPublishedAtCurry,
+      setStatusToDraftCurry(contentType),
+      statusToLookupCurry(contentType),
+      statusToDataCurry(contentType),
+      // Default locale will be set if not provided
+      defaultLocaleCurry(contentType),
+      localeToLookupCurry(contentType),
+      localeToDataCurry(contentType)
+    )(params);
+    const { data, ...restParams } = await curriedTransformParamsDocumentId(uid, queryParams || {});
+    const query = transformParamsToQuery(uid, pickSelectionParams(restParams || {}));
+    const model = strapi.contentType(uid);
+    const entryToUpdate = await strapi.db.query(uid).findOne({ ...query, where: { ...queryParams?.lookup, ...query?.where, documentId } });
+    let updatedDraft = null;
+    if (entryToUpdate) {
+      const validData = await entityValidator.validateEntityUpdate(
+        model,
+        data,
+        {
+          isDraft: !queryParams?.data?.publishedAt,
+          // Always update the draft version
+          locale: queryParams?.locale
+        },
+        entryToUpdate
+      );
+      const componentData = await updateComponents(uid, entryToUpdate, validData);
+      const entryData = applyTransforms(
+        Object.assign(omitComponentData(model, validData), componentData),
+        { contentType: model }
+      );
+      updatedDraft = await strapi.db.query(uid).update({ ...query, where: { id: entryToUpdate.id }, data: entryData });
+    }
+    if (!updatedDraft) {
+      const documentExists = await strapi.db.query(contentType.uid).findOne({ where: { documentId } });
+      if (documentExists) {
+        updatedDraft = await createEntry({
+          ...queryParams,
+          data: { ...queryParams.data, documentId }
+        });
+      }
+    }
+    if (hasDraftAndPublish && updatedDraft && params.status === "published") {
+      return publish(documentId, params).then((doc) => doc.versions[0]);
+    }
+    return updatedDraft;
+  }
+  async function count(params = {}) {
+    const query = await async.pipe(
+      defaultStatusCurry(contentType),
+      statusToLookupCurry(contentType),
+      defaultLocaleCurry(contentType),
+      localeToLookupCurry(contentType),
+      transformParamsToQuery(uid)
+    )(params);
+    return strapi.db.query(uid).count(query);
+  }
+  async function publish(documentId, params = {}) {
+    const queryParams = await async.pipe(
+      defaultLocaleCurry(contentType),
+      multiLocaleToLookupCurry(contentType)
+    )(params);
+    await deleteFn(documentId, {
+      ...queryParams,
+      lookup: { ...queryParams?.lookup, publishedAt: { $ne: null } }
+    });
+    const entriesToPublish = await strapi.db?.query(uid).findMany({
+      where: {
+        ...queryParams?.lookup,
+        documentId,
+        publishedAt: null
+      },
+      populate: getDeepPopulate(uid, { relationalFields: ["documentId", "locale"] })
+    });
+    const publishedEntries = await async.map(
+      entriesToPublish,
+      async.pipe(
+        // Updated at value is used to know if draft has been modified
+        // If both versions share the same value, it means the draft has not been modified
+        (draft) => assoc("updatedAt", draft.updatedAt, draft),
+        assoc("publishedAt", /* @__PURE__ */ new Date()),
+        assoc("documentId", documentId),
+        omit("id"),
+        // Transform relations to target published versions
+        (entry) => {
+          const opts = { uid, locale: entry.locale, status: "published", allowMissingId: true };
+          return transformData(entry, opts);
+        },
+        // Create the published entry
+        (data) => createEntry({ ...queryParams, data, locale: data.locale, status: "published" })
+      )
+    );
+    return { versions: publishedEntries };
+  }
+  async function unpublish(documentId, params = {}) {
+    const queryParams = await async.pipe(
+      defaultLocaleCurry(contentType),
+      multiLocaleToLookupCurry(contentType)
+    )(params);
+    const { deletedEntries } = await deleteFn(documentId, {
+      ...params,
+      lookup: { ...queryParams?.lookup, publishedAt: { $ne: null } }
+    });
+    return { versions: deletedEntries };
+  }
+  async function discardDraft(documentId, params = {}) {
+    const queryParams = await async.pipe(
+      defaultLocaleCurry(contentType),
+      multiLocaleToLookupCurry(contentType)
+    )(params);
+    await deleteFn(documentId, {
+      ...queryParams,
+      // Delete all drafts that match query
+      lookup: { ...queryParams?.lookup, publishedAt: null }
+    });
+    const entriesToDraft = await strapi.db?.query(uid).findMany({
+      where: {
+        ...queryParams?.lookup,
+        documentId,
+        publishedAt: { $ne: null }
+      },
+      populate: getDeepPopulate(uid, { relationalFields: ["documentId", "locale"] })
+    });
+    const draftEntries = await async.map(
+      entriesToDraft,
+      async.pipe(
+        assoc("publishedAt", null),
+        assoc("documentId", documentId),
+        omit("id"),
+        // Transform relations to target draft versions
+        (entry) => {
+          const opts = { uid, locale: entry.locale, status: "draft", allowMissingId: true };
+          return transformData(entry, opts);
+        },
+        // Create the draft entry
+        (data) => createEntry({ ...queryParams, locale: data.locale, data, status: "draft" })
+      )
+    );
+    return { versions: draftEntries };
+  }
+  return {
+    findMany: wrapInTransaction(findMany),
+    findFirst: wrapInTransaction(findFirst),
+    findOne: wrapInTransaction(findOne),
+    delete: wrapInTransaction(deleteFn),
+    create: wrapInTransaction(create),
+    clone: wrapInTransaction(clone),
+    update: wrapInTransaction(update),
+    count: wrapInTransaction(count),
+    publish: hasDraftAndPublish ? wrapInTransaction(publish) : void 0,
+    unpublish: hasDraftAndPublish ? wrapInTransaction(unpublish) : void 0,
+    discardDraft: hasDraftAndPublish ? wrapInTransaction(discardDraft) : void 0
+  };
+};
+export {
+  createContentTypeRepository
+};
+//# sourceMappingURL=repository.mjs.map

package/dist/services/document-service/repository.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"repository.mjs","sources":["../../../src/services/document-service/repository.ts"],"sourcesContent":["import { omit, assoc, curry, merge } from 'lodash/fp';\n\nimport { async, convertQueryParams, contentTypes as contentTypesUtils } from '@strapi/utils';\nimport { Common } from '@strapi/types';\n\nimport { wrapInTransaction, type RepositoryFactoryMethod } from './common';\nimport * as DP from './draft-and-publish';\nimport * as i18n from './internationalization';\nimport { transformParamsDocumentId } from './transform/id-transform';\n\nimport {\n  createComponents,\n  deleteComponents,\n  getComponents,\n  omitComponentData,\n  updateComponents,\n} from '../entity-service/components';\n\nimport { pickSelectionParams } from './params';\nimport entityValidator from '../entity-validator';\nimport { applyTransforms } from '../entity-service/attributes';\nimport { createDocumentId } from '../../utils/transform-content-types-to-models';\nimport { getDeepPopulate } from './utils/populate';\nimport { transformData } from './transform/data';\n\nconst transformParamsToQuery = curry((uid: Common.UID.Schema, params: any) => {\n  const query = convertQueryParams.transformParamsToQuery(uid, params);\n\n  return assoc('where', { ...params?.lookup, ...query.where }, query);\n});\n\nexport const createContentTypeRepository: RepositoryFactoryMethod = (uid) => {\n  const contentType = strapi.contentType(uid);\n  const hasDraftAndPublish = contentTypesUtils.hasDraftAndPublish(contentType);\n\n  async function findMany(params = {} as any) {\n    const query = await async.pipe(\n      DP.defaultToDraft,\n      DP.statusToLookup(contentType),\n      i18n.defaultLocale(contentType),\n      i18n.localeToLookup(contentType),\n      transformParamsDocumentId(uid),\n      transformParamsToQuery(uid)\n    )(params || {});\n\n    return strapi.db.query(uid).findMany(query);\n  }\n\n  async function findFirst(params = {} as any) {\n    const query = await async.pipe(\n      DP.defaultToDraft,\n      DP.statusToLookup(contentType),\n      i18n.defaultLocale(contentType),\n      i18n.localeToLookup(contentType),\n      transformParamsDocumentId(uid),\n      transformParamsToQuery(uid)\n    )(params);\n\n    return strapi.db.query(uid).findOne(query);\n  }\n\n  // TODO: do we really want to add filters on the findOne now that we have findFirst ?\n  async function findOne(documentId: string, params = {} as any) {\n    const query = await async.pipe(\n      DP.defaultToDraft,\n      DP.statusToLookup(contentType),\n      i18n.defaultLocale(contentType),\n      i18n.localeToLookup(contentType),\n      transformParamsDocumentId(uid),\n      transformParamsToQuery(uid),\n      (query) => assoc('where', { ...query.where, documentId }, query)\n    )(params);\n\n    return strapi.db.query(uid).findOne(query);\n  }\n\n  async function deleteEntry(id: number) {\n    const componentsToDelete = await getComponents(uid, { id });\n\n    await strapi.db.query(uid).delete({ where: { id } });\n\n    await deleteComponents(uid, componentsToDelete as any, { loadComponents: false });\n  }\n\n  async function deleteFn(documentId: string, params = {} as any) {\n    const query = await async.pipe(\n      omit('status'),\n      i18n.defaultLocale(contentType),\n      i18n.multiLocaleToLookup(contentType),\n      transformParamsToQuery(uid),\n      (query) => assoc('where', { ...query.where, documentId }, query)\n    )(params);\n\n    if (params.status === 'draft') {\n      throw new Error('Cannot delete a draft document');\n    }\n\n    const entriesToDelete = await strapi.db.query(uid).findMany(query);\n\n    // Delete all matched entries and its components\n    await async.map(entriesToDelete, (entryToDelete: any) => deleteEntry(entryToDelete.id));\n\n    return { deletedEntries: entriesToDelete };\n  }\n\n  async function createEntry(params = {} as any) {\n    const { data, ...restParams } = await transformParamsDocumentId(uid, params);\n\n    const query = transformParamsToQuery(uid, pickSelectionParams(restParams) as any); // select / populate\n\n    // Validation\n    if (!params.data) {\n      throw new Error('Create requires data attribute');\n    }\n\n    const validData = await entityValidator.validateEntityCreation(contentType, data as object, {\n      // Note: publishedAt value will always be set when DP is disabled\n      isDraft: !params?.data?.publishedAt,\n      locale: params?.locale,\n    });\n\n    // Component handling\n    const componentData = await createComponents(uid, validData as any);\n    const entryData = applyTransforms(\n      Object.assign(omitComponentData(contentType, validData), componentData),\n      { contentType }\n    );\n\n    const doc = await strapi.db.query(uid).create({ ...query, data: entryData });\n\n    return doc;\n  }\n\n  async function create(params = {} as any) {\n    const queryParams = await async.pipe(\n      DP.filterDataPublishedAt,\n      DP.setStatusToDraft(contentType),\n      DP.statusToData(contentType),\n      i18n.defaultLocale(contentType),\n      i18n.localeToData(contentType)\n    )(params);\n\n    const doc = await createEntry(queryParams);\n\n    if (hasDraftAndPublish && params.status === 'published') {\n      return publish(doc.documentId, params).then((doc) => doc.versions[0]);\n    }\n\n    return doc;\n  }\n\n  async function clone(documentId: string, params = {} as any) {\n    const queryParams = await async.pipe(\n      DP.filterDataPublishedAt,\n      i18n.defaultLocale(contentType),\n      i18n.multiLocaleToLookup(contentType)\n    )(params);\n\n    // Get deep populate\n    const entriesToClone = await strapi.db?.query(uid).findMany({\n      where: {\n        ...queryParams?.lookup,\n        documentId,\n        // DP Enabled: Clone drafts\n        // DP Disabled: Clone only the existing version (published)\n        publishedAt: { $null: hasDraftAndPublish },\n      },\n      populate: getDeepPopulate(uid, { relationalFields: ['id'] }),\n    });\n\n    const clonedEntries = await async.map(\n      entriesToClone,\n      async.pipe(\n        omit('id'),\n        // assign new documentId\n        assoc('documentId', createDocumentId()),\n        // Merge new data into it\n        (data) => merge(data, queryParams.data),\n        (data) => createEntry({ ...queryParams, data, status: 'draft' })\n      )\n    );\n\n    return { documentId: clonedEntries.at(0)?.documentId, versions: clonedEntries };\n  }\n\n  async function update(documentId: string, params = {} as any) {\n    const queryParams = await async.pipe(\n      DP.filterDataPublishedAt,\n      DP.setStatusToDraft(contentType),\n      DP.statusToLookup(contentType),\n      DP.statusToData(contentType),\n      // Default locale will be set if not provided\n      i18n.defaultLocale(contentType),\n      i18n.localeToLookup(contentType),\n      i18n.localeToData(contentType)\n    )(params);\n\n    const { data, ...restParams } = await transformParamsDocumentId(uid, queryParams || {});\n    const query = transformParamsToQuery(uid, pickSelectionParams(restParams || {}) as any);\n\n    // Validation\n    const model = strapi.contentType(uid);\n    // Find if document exists\n    const entryToUpdate = await strapi.db\n      .query(uid)\n      .findOne({ ...query, where: { ...queryParams?.lookup, ...query?.where, documentId } });\n\n    let updatedDraft = null;\n    if (entryToUpdate) {\n      const validData = await entityValidator.validateEntityUpdate(\n        model,\n        data,\n        {\n          isDraft: !queryParams?.data?.publishedAt, // Always update the draft version\n          locale: queryParams?.locale,\n        },\n        entryToUpdate\n      );\n\n      // Component handling\n      const componentData = await updateComponents(uid, entryToUpdate, validData as any);\n      const entryData = applyTransforms(\n        Object.assign(omitComponentData(model, validData), componentData),\n        { contentType: model }\n      );\n\n      updatedDraft = await strapi.db\n        .query(uid)\n        .update({ ...query, where: { id: entryToUpdate.id }, data: entryData });\n    }\n\n    if (!updatedDraft) {\n      const documentExists = await strapi.db\n        .query(contentType.uid)\n        .findOne({ where: { documentId } });\n\n      if (documentExists) {\n        updatedDraft = await createEntry({\n          ...queryParams,\n          data: { ...queryParams.data, documentId },\n        });\n      }\n    }\n\n    if (hasDraftAndPublish && updatedDraft && params.status === 'published') {\n      return publish(documentId, params).then((doc) => doc.versions[0]);\n    }\n\n    return updatedDraft;\n  }\n\n  async function count(params = {} as any) {\n    const query = await async.pipe(\n      DP.defaultStatus(contentType),\n      DP.statusToLookup(contentType),\n      i18n.defaultLocale(contentType),\n      i18n.localeToLookup(contentType),\n      transformParamsToQuery(uid)\n    )(params);\n\n    return strapi.db.query(uid).count(query);\n  }\n\n  async function publish(documentId: string, params = {} as any) {\n    const queryParams = await async.pipe(\n      i18n.defaultLocale(contentType),\n      i18n.multiLocaleToLookup(contentType)\n    )(params);\n\n    await deleteFn(documentId, {\n      ...queryParams,\n      lookup: { ...queryParams?.lookup, publishedAt: { $ne: null } },\n    });\n\n    // Get deep populate\n    const entriesToPublish = await strapi.db?.query(uid).findMany({\n      where: {\n        ...queryParams?.lookup,\n        documentId,\n        publishedAt: null,\n      },\n      populate: getDeepPopulate(uid, { relationalFields: ['documentId', 'locale'] }),\n    });\n\n    // Transform draft entry data and create published versions\n    const publishedEntries = await async.map(\n      entriesToPublish,\n      async.pipe(\n        // Updated at value is used to know if draft has been modified\n        // If both versions share the same value, it means the draft has not been modified\n        (draft) => assoc('updatedAt', draft.updatedAt, draft),\n        assoc('publishedAt', new Date()),\n        assoc('documentId', documentId),\n        omit('id'),\n        // Transform relations to target published versions\n        (entry) => {\n          const opts = { uid, locale: entry.locale, status: 'published', allowMissingId: true };\n          return transformData(entry, opts);\n        },\n        // Create the published entry\n        (data) => createEntry({ ...queryParams, data, locale: data.locale, status: 'published' })\n      )\n    );\n\n    return { versions: publishedEntries };\n  }\n\n  async function unpublish(documentId: string, params = {} as any) {\n    const queryParams = await async.pipe(\n      i18n.defaultLocale(contentType),\n      i18n.multiLocaleToLookup(contentType)\n    )(params);\n\n    const { deletedEntries } = await deleteFn(documentId, {\n      ...params,\n      lookup: { ...queryParams?.lookup, publishedAt: { $ne: null } },\n    });\n\n    return { versions: deletedEntries };\n  }\n\n  async function discardDraft(documentId: string, params = {} as any) {\n    const queryParams = await async.pipe(\n      i18n.defaultLocale(contentType),\n      i18n.multiLocaleToLookup(contentType)\n    )(params);\n\n    await deleteFn(documentId, {\n      ...queryParams,\n      // Delete all drafts that match query\n      lookup: { ...queryParams?.lookup, publishedAt: null },\n    });\n\n    // Get deep populate of published versions\n    const entriesToDraft = await strapi.db?.query(uid).findMany({\n      where: {\n        ...queryParams?.lookup,\n        documentId,\n        publishedAt: { $ne: null },\n      },\n      populate: getDeepPopulate(uid, { relationalFields: ['documentId', 'locale'] }),\n    });\n\n    // Transform published entry data and create draft versions\n    const draftEntries = await async.map(\n      entriesToDraft,\n      async.pipe(\n        assoc('publishedAt', null),\n        assoc('documentId', documentId),\n        omit('id'),\n        // Transform relations to target draft versions\n        (entry) => {\n          const opts = { uid, locale: entry.locale, status: 'draft', allowMissingId: true };\n          return transformData(entry, opts);\n        },\n        // Create the draft entry\n        (data) => createEntry({ ...queryParams, locale: data.locale, data, status: 'draft' })\n      )\n    );\n\n    return { versions: draftEntries };\n  }\n\n  return {\n    findMany: wrapInTransaction(findMany),\n    findFirst: wrapInTransaction(findFirst),\n    findOne: wrapInTransaction(findOne),\n    delete: wrapInTransaction(deleteFn),\n    create: wrapInTransaction(create),\n    clone: wrapInTransaction(clone),\n    update: wrapInTransaction(update),\n    count: wrapInTransaction(count),\n    publish: hasDraftAndPublish ? wrapInTransaction(publish) : (undefined as any),\n    unpublish: hasDraftAndPublish ? wrapInTransaction(unpublish) : (undefined as any),\n    discardDraft: hasDraftAndPublish ? wrapInTransaction(discardDraft) : (undefined as any),\n  };\n};\n"],"names":["contentTypesUtils","DP.defaultToDraft","DP.statusToLookup","i18n.defaultLocale","i18n.localeToLookup","transformParamsDocumentId","query","i18n.multiLocaleToLookup","DP.filterDataPublishedAt","DP.setStatusToDraft","DP.statusToData","i18n.localeToData","doc","DP.defaultStatus"],"mappings":"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"}

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

@@ -3,7 +3,7 @@ interface KeyFields {
     uid: string;
     documentId: Entity.ID;
     locale?: string | null;
-    isDraft?: boolean;
+    status?: 'draft' | 'published';
 }
 export interface IdMap {
     loadedIds: Map<string, string>;

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

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

@@ -1,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 { Common, Documents } from '@strapi/types';
+declare const curriedTransformParamsDocumentId: import("lodash").CurriedFunction2<Common.UID.Schema, Documents.Params.All, Promise<Documents.Params.All>>;
+export { curriedTransformParamsDocumentId as transformParamsDocumentId };
 //# sourceMappingURL=id-transform.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"id-transform.d.ts","sourceRoot":"","sources":["../../../../src/services/document-service/transform/id-transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;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,MAAM,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AA0ClD,QAAA,MAAM,gCAAgC,2GAAmC,CAAC;AAE1E,OAAO,EAAE,gCAAgC,IAAI,yBAAyB,EAAE,CAAC"}

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

@@ -1,27 +1,33 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const _ = 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 = _.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 { Common, Documents } from '@strapi/types';\n\nimport { transformData } from './data';\nimport { transformFields } from './fields';\nimport { transformPopulate } from './populate';\n\n/**\n * Transform input of a query to map document ids to entity ids.\n */\nasync function transformParamsDocumentId(\n  uid: Common.UID.Schema,\n  query: Documents.Params.All\n): Promise<Documents.Params.All> {\n  // Transform relational documentIds to entity ids\n  let data = query.data;\n  if (query.data) {\n    data = await transformData(query.data, {\n      locale: query.locale,\n      status: query.status,\n      uid,\n    });\n  }\n\n  // Make sure documentId is always present in the response\n  let fields = query.fields;\n  if (query.fields) {\n    fields = transformFields(query.fields) as typeof query.fields;\n  }\n\n  let populate = query.populate;\n  if (query.populate) {\n    populate = (await transformPopulate(query.populate, { uid })) as typeof query.populate;\n  }\n\n  return {\n    ...query,\n    data,\n    fields,\n    populate,\n  };\n}\n\nconst curriedTransformParamsDocumentId = curry(transformParamsDocumentId);\n\nexport { curriedTransformParamsDocumentId as transformParamsDocumentId };\n"],"names":["data","transformData","fields","transformFields","populate","transformPopulate","curry"],"mappings":";;;;;;AAWA,eAAe,0BACb,KACA,OAC+B;AAE/B,MAAIA,SAAO,MAAM;AACjB,MAAI,MAAM,MAAM;AACPA,aAAA,MAAMC,KAAAA,cAAc,MAAM,MAAM;AAAA,MACrC,QAAQ,MAAM;AAAA,MACd,QAAQ,MAAM;AAAA,MACd;AAAA,IAAA,CACD;AAAA,EACH;AAGA,MAAIC,WAAS,MAAM;AACnB,MAAI,MAAM,QAAQ;AACPA,eAAAC,OAAA,gBAAgB,MAAM,MAAM;AAAA,EACvC;AAEA,MAAIC,aAAW,MAAM;AACrB,MAAI,MAAM,UAAU;AAClBA,iBAAY,MAAMC,SAAAA,kBAAkB,MAAM,UAAU,EAAE,KAAK;AAAA,EAC7D;AAEO,SAAA;AAAA,IACL,GAAG;AAAA,IAAA,MACHL;AAAAA,IAAA,QACAE;AAAAA,IAAA,UACAE;AAAAA,EAAA;AAEJ;AAEM,MAAA,mCAAmCE,QAAM,yBAAyB;;"}