@strapi/core 0.0.0-next.7051057497777a23c7418e675330d2fb69c89fec → 0.0.0-next.70576132e2aa188340b9b78ba8a932926b045374

package/dist/services/document-service/entries.js

@@ -1,95 +1,155 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const strapiUtils = require("@strapi/utils");
-const fp = require("lodash/fp");
-const components = require("./components.js");
-const idTransform = require("./transform/id-transform.js");
-const query = require("./transform/query.js");
-const params = require("./params.js");
-const index = require("./attributes/index.js");
-const data = require("./transform/data.js");
-const createEntriesService = (uid, entityValidator) => {
-  const contentType = strapi.contentType(uid);
-  async function createEntry(params$1 = {}) {
-    const { data: data2, ...restParams } = await idTransform.transformParamsDocumentId(uid, params$1);
-    const query$1 = query.transformParamsToQuery(uid, params.pickSelectionParams(restParams));
-    if (!data2) {
-      throw new Error("Create requires data attribute");
+'use strict';
+
+var strapiUtils = require('@strapi/utils');
+var fp = require('lodash/fp');
+var components = require('./components.js');
+var idTransform = require('./transform/id-transform.js');
+var query = require('./transform/query.js');
+var params = require('./params.js');
+var index = require('./attributes/index.js');
+var data = require('./transform/data.js');
+
+const createEntriesService = (uid, entityValidator)=>{
+    const contentType = strapi.contentType(uid);
+    async function createEntry(params$1 = {}) {
+        const { data, ...restParams } = await idTransform.transformParamsDocumentId(uid, params$1);
+        const query$1 = query.transformParamsToQuery(uid, params.pickSelectionParams(restParams)); // select / populate
+        // Validation
+        if (!data) {
+            throw new Error('Create requires data attribute');
+        }
+        // Check for uniqueness based on documentId and locale (if localized)
+        if (data.documentId) {
+            const i18nService = strapi.plugin('i18n')?.service('content-types');
+            const isLocalized = i18nService?.isLocalizedContentType(contentType) ?? false;
+            const hasDraftAndPublish = contentType.options?.draftAndPublish === true;
+            const whereClause = {
+                documentId: data.documentId
+            };
+            if (isLocalized) {
+                whereClause.locale = data.locale;
+            }
+            let publishedStateDescription = '';
+            if (hasDraftAndPublish) {
+                if (data.publishedAt) {
+                    // Current entry is published, check for existing published entry
+                    whereClause.publishedAt = {
+                        $notNull: true
+                    };
+                    publishedStateDescription = 'published';
+                } else {
+                    // Current entry is a draft, check for existing draft entry
+                    whereClause.publishedAt = {
+                        $null: true
+                    };
+                    publishedStateDescription = 'draft';
+                }
+            }
+            const existingEntry = await strapi.db.query(uid).findOne({
+                select: [
+                    'id'
+                ],
+                where: whereClause
+            });
+            if (existingEntry) {
+                let errorMsg = `A ${publishedStateDescription} entry with documentId "${data.documentId}"`;
+                if (isLocalized && data.locale) {
+                    errorMsg += ` and locale "${data.locale}"`;
+                }
+                errorMsg += ` already exists for UID "${uid}". This combination must be unique.`;
+                throw new strapiUtils.errors.ApplicationError(errorMsg);
+            }
+        }
+        const validData = await entityValidator.validateEntityCreation(contentType, data, {
+            // Note: publishedAt value will always be set when DP is disabled
+            isDraft: !params$1?.data?.publishedAt,
+            locale: params$1?.locale
+        });
+        // Component handling
+        const componentData = await components.createComponents(uid, validData);
+        const dataWithComponents = components.assignComponentData(contentType, componentData, validData);
+        const entryData = index.applyTransforms(contentType, dataWithComponents);
+        const doc = await strapi.db.query(uid).create({
+            ...query$1,
+            data: entryData
+        });
+        return doc;
     }
-    const validData = await entityValidator.validateEntityCreation(contentType, data2, {
-      // Note: publishedAt value will always be set when DP is disabled
-      isDraft: !params$1?.data?.publishedAt,
-      locale: params$1?.locale
-    });
-    const componentData = await components.createComponents(uid, validData);
-    const dataWithComponents = components.assignComponentData(
-      contentType,
-      componentData,
-      validData
-    );
-    const entryData = index.applyTransforms(contentType, dataWithComponents);
-    const doc = await strapi.db.query(uid).create({ ...query$1, data: entryData });
-    return doc;
-  }
-  async function deleteEntry(id) {
-    const componentsToDelete = await components.getComponents(uid, { id });
-    const deletedEntry = await strapi.db.query(uid).delete({ where: { id } });
-    await components.deleteComponents(uid, componentsToDelete, { loadComponents: false });
-    return deletedEntry;
-  }
-  async function updateEntry(entryToUpdate, params$1 = {}) {
-    const { data: data2, ...restParams } = await idTransform.transformParamsDocumentId(uid, params$1);
-    const query$1 = query.transformParamsToQuery(uid, params.pickSelectionParams(restParams));
-    const validData = await entityValidator.validateEntityUpdate(
-      contentType,
-      data2,
-      {
-        isDraft: !params$1?.data?.publishedAt,
-        // Always update the draft version
-        locale: params$1?.locale
-      },
-      entryToUpdate
-    );
-    const componentData = await components.updateComponents(uid, entryToUpdate, validData);
-    const dataWithComponents = components.assignComponentData(
-      contentType,
-      componentData,
-      validData
-    );
-    const entryData = index.applyTransforms(contentType, dataWithComponents);
-    return strapi.db.query(uid).update({ ...query$1, where: { id: entryToUpdate.id }, data: entryData });
-  }
-  async function publishEntry(entry, params2 = {}) {
-    return strapiUtils.async.pipe(
-      fp.omit("id"),
-      fp.assoc("publishedAt", /* @__PURE__ */ new Date()),
-      (draft) => {
-        const opts = { uid, locale: draft.locale, status: "published", allowMissingId: true };
-        return data.transformData(draft, opts);
-      },
-      // Create the published entry
-      (draft) => createEntry({ ...params2, data: draft, locale: draft.locale, status: "published" })
-    )(entry);
-  }
-  async function discardDraftEntry(entry, params2 = {}) {
-    return strapiUtils.async.pipe(
-      fp.omit("id"),
-      fp.assoc("publishedAt", null),
-      (entry2) => {
-        const opts = { uid, locale: entry2.locale, status: "draft", allowMissingId: true };
-        return data.transformData(entry2, opts);
-      },
-      // Create the draft entry
-      (data2) => createEntry({ ...params2, locale: data2.locale, data: data2, status: "draft" })
-    )(entry);
-  }
-  return {
-    create: createEntry,
-    delete: deleteEntry,
-    update: updateEntry,
-    publish: publishEntry,
-    discardDraft: discardDraftEntry
-  };
+    async function deleteEntry(id) {
+        const componentsToDelete = await components.getComponents(uid, {
+            id
+        });
+        const deletedEntry = await strapi.db.query(uid).delete({
+            where: {
+                id
+            }
+        });
+        await components.deleteComponents(uid, componentsToDelete, {
+            loadComponents: false
+        });
+        return deletedEntry;
+    }
+    async function updateEntry(entryToUpdate, params$1 = {}) {
+        const { data, ...restParams } = await idTransform.transformParamsDocumentId(uid, params$1);
+        const query$1 = query.transformParamsToQuery(uid, params.pickSelectionParams(restParams)); // select / populate
+        const validData = await entityValidator.validateEntityUpdate(contentType, data, {
+            isDraft: !params$1?.data?.publishedAt,
+            locale: params$1?.locale
+        }, entryToUpdate);
+        // Component handling
+        const componentData = await components.updateComponents(uid, entryToUpdate, validData);
+        const dataWithComponents = components.assignComponentData(contentType, componentData, validData);
+        const entryData = index.applyTransforms(contentType, dataWithComponents);
+        return strapi.db.query(uid).update({
+            ...query$1,
+            where: {
+                id: entryToUpdate.id
+            },
+            data: entryData
+        });
+    }
+    async function publishEntry(entry, params = {}) {
+        return strapiUtils.async.pipe(fp.omit('id'), fp.assoc('publishedAt', new Date()), (draft)=>{
+            const opts = {
+                uid,
+                locale: draft.locale,
+                status: 'published',
+                allowMissingId: true
+            };
+            return data.transformData(draft, opts);
+        }, // Create the published entry
+        (draft)=>createEntry({
+                ...params,
+                data: draft,
+                locale: draft.locale,
+                status: 'published'
+            }))(entry);
+    }
+    async function discardDraftEntry(entry, params = {}) {
+        return strapiUtils.async.pipe(fp.omit('id'), fp.assoc('publishedAt', null), (entry)=>{
+            const opts = {
+                uid,
+                locale: entry.locale,
+                status: 'draft',
+                allowMissingId: true
+            };
+            return data.transformData(entry, opts);
+        }, // Create the draft entry
+        (data)=>createEntry({
+                ...params,
+                locale: data.locale,
+                data,
+                status: 'draft'
+            }))(entry);
+    }
+    return {
+        create: createEntry,
+        delete: deleteEntry,
+        update: updateEntry,
+        publish: publishEntry,
+        discardDraft: discardDraftEntry
+    };
 };
+
 exports.createEntriesService = createEntriesService;
 //# sourceMappingURL=entries.js.map

package/dist/services/document-service/entries.js.map

@@ -1 +1 @@
-{"version":3,"file":"entries.js","sources":["../../../src/services/document-service/entries.ts"],"sourcesContent":["import type { UID, Modules } from '@strapi/types';\nimport { async } from '@strapi/utils';\nimport { assoc, omit } from 'lodash/fp';\n\nimport * as components from './components';\n\nimport { transformParamsDocumentId } from './transform/id-transform';\nimport { transformParamsToQuery } from './transform/query';\nimport { pickSelectionParams } from './params';\nimport { applyTransforms } from './attributes';\nimport { transformData } from './transform/data';\n\nconst createEntriesService = (\n  uid: UID.ContentType,\n  entityValidator: Modules.EntityValidator.EntityValidator\n) => {\n  const contentType = strapi.contentType(uid);\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 (!data) {\n      throw new Error('Create requires data attribute');\n    }\n\n    const validData = await entityValidator.validateEntityCreation(contentType, data, {\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 components.createComponents(uid, validData);\n    const dataWithComponents = components.assignComponentData(\n      contentType,\n      componentData,\n      validData\n    );\n\n    const entryData = applyTransforms(contentType, dataWithComponents);\n\n    const doc = await strapi.db.query(uid).create({ ...query, data: entryData });\n\n    return doc;\n  }\n\n  async function deleteEntry(id: number) {\n    const componentsToDelete = await components.getComponents(uid, { id });\n\n    const deletedEntry = await strapi.db.query(uid).delete({ where: { id } });\n\n    await components.deleteComponents(uid, componentsToDelete as any, { loadComponents: false });\n\n    return deletedEntry;\n  }\n\n  async function updateEntry(entryToUpdate: any, params = {} as any) {\n    const { data, ...restParams } = await transformParamsDocumentId(uid, params);\n    const query = transformParamsToQuery(uid, pickSelectionParams(restParams) as any); // select / populate\n\n    const validData = await entityValidator.validateEntityUpdate(\n      contentType,\n      data,\n      {\n        isDraft: !params?.data?.publishedAt, // Always update the draft version\n        locale: params?.locale,\n      },\n      entryToUpdate\n    );\n    // Component handling\n    const componentData = await components.updateComponents(uid, entryToUpdate, validData as any);\n    const dataWithComponents = components.assignComponentData(\n      contentType,\n      componentData,\n      validData\n    );\n\n    const entryData = applyTransforms(contentType, dataWithComponents);\n\n    return strapi.db\n      .query(uid)\n      .update({ ...query, where: { id: entryToUpdate.id }, data: entryData });\n  }\n\n  async function publishEntry(entry: any, params = {} as any) {\n    return async.pipe(\n      omit('id'),\n      assoc('publishedAt', new Date()),\n      (draft) => {\n        const opts = { uid, locale: draft.locale, status: 'published', allowMissingId: true };\n        return transformData(draft, opts);\n      },\n      // Create the published entry\n      (draft) => createEntry({ ...params, data: draft, locale: draft.locale, status: 'published' })\n    )(entry);\n  }\n\n  async function discardDraftEntry(entry: any, params = {} as any) {\n    return async.pipe(\n      omit('id'),\n      assoc('publishedAt', null),\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({ ...params, locale: data.locale, data, status: 'draft' })\n    )(entry);\n  }\n\n  return {\n    create: createEntry,\n    delete: deleteEntry,\n    update: updateEntry,\n    publish: publishEntry,\n    discardDraft: discardDraftEntry,\n  };\n};\n\nexport { createEntriesService };\n"],"names":["params","data","transformParamsDocumentId","query","transformParamsToQuery","pickSelectionParams","components.createComponents","components.assignComponentData","applyTransforms","components.getComponents","components.deleteComponents","components.updateComponents","async","omit","assoc","transformData","entry"],"mappings":"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"}
+{"version":3,"file":"entries.js","sources":["../../../src/services/document-service/entries.ts"],"sourcesContent":["import type { UID, Modules } from '@strapi/types';\nimport { async, errors } from '@strapi/utils';\nimport { assoc, omit } from 'lodash/fp';\n\nimport * as components from './components';\n\nimport { transformParamsDocumentId } from './transform/id-transform';\nimport { transformParamsToQuery } from './transform/query';\nimport { pickSelectionParams } from './params';\nimport { applyTransforms } from './attributes';\nimport { transformData } from './transform/data';\n\nconst createEntriesService = (\n  uid: UID.ContentType,\n  entityValidator: Modules.EntityValidator.EntityValidator\n) => {\n  const contentType = strapi.contentType(uid);\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 (!data) {\n      throw new Error('Create requires data attribute');\n    }\n\n    // Check for uniqueness based on documentId and locale (if localized)\n    if (data.documentId) {\n      const i18nService = strapi.plugin('i18n')?.service('content-types');\n      const isLocalized = i18nService?.isLocalizedContentType(contentType) ?? false;\n      const hasDraftAndPublish = contentType.options?.draftAndPublish === true;\n\n      const whereClause: Record<string, unknown> = { documentId: data.documentId };\n\n      if (isLocalized) {\n        whereClause.locale = data.locale;\n      }\n\n      let publishedStateDescription = '';\n\n      if (hasDraftAndPublish) {\n        if (data.publishedAt) {\n          // Current entry is published, check for existing published entry\n          whereClause.publishedAt = { $notNull: true };\n          publishedStateDescription = 'published';\n        } else {\n          // Current entry is a draft, check for existing draft entry\n          whereClause.publishedAt = { $null: true };\n          publishedStateDescription = 'draft';\n        }\n      }\n\n      const existingEntry = await strapi.db.query(uid).findOne({\n        select: ['id'],\n        where: whereClause,\n      });\n\n      if (existingEntry) {\n        let errorMsg = `A ${publishedStateDescription} entry with documentId \"${data.documentId}\"`;\n        if (isLocalized && data.locale) {\n          errorMsg += ` and locale \"${data.locale}\"`;\n        }\n        errorMsg += ` already exists for UID \"${uid}\". This combination must be unique.`;\n        throw new errors.ApplicationError(errorMsg);\n      }\n    }\n\n    const validData = await entityValidator.validateEntityCreation(contentType, data, {\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 components.createComponents(uid, validData);\n    const dataWithComponents = components.assignComponentData(\n      contentType,\n      componentData,\n      validData\n    );\n\n    const entryData = applyTransforms(contentType, dataWithComponents);\n\n    const doc = await strapi.db.query(uid).create({ ...query, data: entryData });\n\n    return doc;\n  }\n\n  async function deleteEntry(id: number) {\n    const componentsToDelete = await components.getComponents(uid, { id });\n\n    const deletedEntry = await strapi.db.query(uid).delete({ where: { id } });\n\n    await components.deleteComponents(uid, componentsToDelete as any, { loadComponents: false });\n\n    return deletedEntry;\n  }\n\n  async function updateEntry(entryToUpdate: any, params = {} as any) {\n    const { data, ...restParams } = await transformParamsDocumentId(uid, params);\n    const query = transformParamsToQuery(uid, pickSelectionParams(restParams) as any); // select / populate\n\n    const validData = await entityValidator.validateEntityUpdate(\n      contentType,\n      data,\n      {\n        isDraft: !params?.data?.publishedAt, // Always update the draft version\n        locale: params?.locale,\n      },\n      entryToUpdate\n    );\n    // Component handling\n    const componentData = await components.updateComponents(uid, entryToUpdate, validData as any);\n    const dataWithComponents = components.assignComponentData(\n      contentType,\n      componentData,\n      validData\n    );\n\n    const entryData = applyTransforms(contentType, dataWithComponents);\n\n    return strapi.db\n      .query(uid)\n      .update({ ...query, where: { id: entryToUpdate.id }, data: entryData });\n  }\n\n  async function publishEntry(entry: any, params = {} as any) {\n    return async.pipe(\n      omit('id'),\n      assoc('publishedAt', new Date()),\n      (draft) => {\n        const opts = { uid, locale: draft.locale, status: 'published', allowMissingId: true };\n        return transformData(draft, opts);\n      },\n      // Create the published entry\n      (draft) => createEntry({ ...params, data: draft, locale: draft.locale, status: 'published' })\n    )(entry);\n  }\n\n  async function discardDraftEntry(entry: any, params = {} as any) {\n    return async.pipe(\n      omit('id'),\n      assoc('publishedAt', null),\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({ ...params, locale: data.locale, data, status: 'draft' })\n    )(entry);\n  }\n\n  return {\n    create: createEntry,\n    delete: deleteEntry,\n    update: updateEntry,\n    publish: publishEntry,\n    discardDraft: discardDraftEntry,\n  };\n};\n\nexport { createEntriesService };\n"],"names":["createEntriesService","uid","entityValidator","contentType","strapi","createEntry","params","data","restParams","transformParamsDocumentId","query","transformParamsToQuery","pickSelectionParams","Error","documentId","i18nService","plugin","service","isLocalized","isLocalizedContentType","hasDraftAndPublish","options","draftAndPublish","whereClause","locale","publishedStateDescription","publishedAt","$notNull","$null","existingEntry","db","findOne","select","where","errorMsg","errors","ApplicationError","validData","validateEntityCreation","isDraft","componentData","components","dataWithComponents","entryData","applyTransforms","doc","create","deleteEntry","id","componentsToDelete","deletedEntry","delete","loadComponents","updateEntry","entryToUpdate","validateEntityUpdate","update","publishEntry","entry","async","pipe","omit","assoc","Date","draft","opts","status","allowMissingId","transformData","discardDraftEntry","publish","discardDraft"],"mappings":"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"}

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

@@ -1,95 +1,153 @@
-import { async } from "@strapi/utils";
-import { omit, assoc } from "lodash/fp";
-import { createComponents, assignComponentData, getComponents, deleteComponents, updateComponents } from "./components.mjs";
-import { transformParamsDocumentId as curriedTransformParamsDocumentId } from "./transform/id-transform.mjs";
-import { transformParamsToQuery } from "./transform/query.mjs";
-import { pickSelectionParams } from "./params.mjs";
-import { applyTransforms } from "./attributes/index.mjs";
-import { transformData } from "./transform/data.mjs";
-const createEntriesService = (uid, entityValidator) => {
-  const contentType = strapi.contentType(uid);
-  async function createEntry(params = {}) {
-    const { data, ...restParams } = await curriedTransformParamsDocumentId(uid, params);
-    const query = transformParamsToQuery(uid, pickSelectionParams(restParams));
-    if (!data) {
-      throw new Error("Create requires data attribute");
+import { errors, async } from '@strapi/utils';
+import { omit, assoc } from 'lodash/fp';
+import { createComponents, assignComponentData, getComponents, deleteComponents, updateComponents } from './components.mjs';
+import { transformParamsDocumentId as curriedTransformParamsDocumentId } from './transform/id-transform.mjs';
+import { transformParamsToQuery } from './transform/query.mjs';
+import { pickSelectionParams } from './params.mjs';
+import { applyTransforms } from './attributes/index.mjs';
+import { transformData } from './transform/data.mjs';
+
+const createEntriesService = (uid, entityValidator)=>{
+    const contentType = strapi.contentType(uid);
+    async function createEntry(params = {}) {
+        const { data, ...restParams } = await curriedTransformParamsDocumentId(uid, params);
+        const query = transformParamsToQuery(uid, pickSelectionParams(restParams)); // select / populate
+        // Validation
+        if (!data) {
+            throw new Error('Create requires data attribute');
+        }
+        // Check for uniqueness based on documentId and locale (if localized)
+        if (data.documentId) {
+            const i18nService = strapi.plugin('i18n')?.service('content-types');
+            const isLocalized = i18nService?.isLocalizedContentType(contentType) ?? false;
+            const hasDraftAndPublish = contentType.options?.draftAndPublish === true;
+            const whereClause = {
+                documentId: data.documentId
+            };
+            if (isLocalized) {
+                whereClause.locale = data.locale;
+            }
+            let publishedStateDescription = '';
+            if (hasDraftAndPublish) {
+                if (data.publishedAt) {
+                    // Current entry is published, check for existing published entry
+                    whereClause.publishedAt = {
+                        $notNull: true
+                    };
+                    publishedStateDescription = 'published';
+                } else {
+                    // Current entry is a draft, check for existing draft entry
+                    whereClause.publishedAt = {
+                        $null: true
+                    };
+                    publishedStateDescription = 'draft';
+                }
+            }
+            const existingEntry = await strapi.db.query(uid).findOne({
+                select: [
+                    'id'
+                ],
+                where: whereClause
+            });
+            if (existingEntry) {
+                let errorMsg = `A ${publishedStateDescription} entry with documentId "${data.documentId}"`;
+                if (isLocalized && data.locale) {
+                    errorMsg += ` and locale "${data.locale}"`;
+                }
+                errorMsg += ` already exists for UID "${uid}". This combination must be unique.`;
+                throw new errors.ApplicationError(errorMsg);
+            }
+        }
+        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
+        });
+        // Component handling
+        const componentData = await createComponents(uid, validData);
+        const dataWithComponents = assignComponentData(contentType, componentData, validData);
+        const entryData = applyTransforms(contentType, dataWithComponents);
+        const doc = await strapi.db.query(uid).create({
+            ...query,
+            data: entryData
+        });
+        return doc;
     }
-    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 dataWithComponents = assignComponentData(
-      contentType,
-      componentData,
-      validData
-    );
-    const entryData = applyTransforms(contentType, dataWithComponents);
-    const doc = await strapi.db.query(uid).create({ ...query, data: entryData });
-    return doc;
-  }
-  async function deleteEntry(id) {
-    const componentsToDelete = await getComponents(uid, { id });
-    const deletedEntry = await strapi.db.query(uid).delete({ where: { id } });
-    await deleteComponents(uid, componentsToDelete, { loadComponents: false });
-    return deletedEntry;
-  }
-  async function updateEntry(entryToUpdate, params = {}) {
-    const { data, ...restParams } = await curriedTransformParamsDocumentId(uid, params);
-    const query = transformParamsToQuery(uid, pickSelectionParams(restParams));
-    const validData = await entityValidator.validateEntityUpdate(
-      contentType,
-      data,
-      {
-        isDraft: !params?.data?.publishedAt,
-        // Always update the draft version
-        locale: params?.locale
-      },
-      entryToUpdate
-    );
-    const componentData = await updateComponents(uid, entryToUpdate, validData);
-    const dataWithComponents = assignComponentData(
-      contentType,
-      componentData,
-      validData
-    );
-    const entryData = applyTransforms(contentType, dataWithComponents);
-    return strapi.db.query(uid).update({ ...query, where: { id: entryToUpdate.id }, data: entryData });
-  }
-  async function publishEntry(entry, params = {}) {
-    return async.pipe(
-      omit("id"),
-      assoc("publishedAt", /* @__PURE__ */ new Date()),
-      (draft) => {
-        const opts = { uid, locale: draft.locale, status: "published", allowMissingId: true };
-        return transformData(draft, opts);
-      },
-      // Create the published entry
-      (draft) => createEntry({ ...params, data: draft, locale: draft.locale, status: "published" })
-    )(entry);
-  }
-  async function discardDraftEntry(entry, params = {}) {
-    return async.pipe(
-      omit("id"),
-      assoc("publishedAt", null),
-      (entry2) => {
-        const opts = { uid, locale: entry2.locale, status: "draft", allowMissingId: true };
-        return transformData(entry2, opts);
-      },
-      // Create the draft entry
-      (data) => createEntry({ ...params, locale: data.locale, data, status: "draft" })
-    )(entry);
-  }
-  return {
-    create: createEntry,
-    delete: deleteEntry,
-    update: updateEntry,
-    publish: publishEntry,
-    discardDraft: discardDraftEntry
-  };
-};
-export {
-  createEntriesService
+    async function deleteEntry(id) {
+        const componentsToDelete = await getComponents(uid, {
+            id
+        });
+        const deletedEntry = await strapi.db.query(uid).delete({
+            where: {
+                id
+            }
+        });
+        await deleteComponents(uid, componentsToDelete, {
+            loadComponents: false
+        });
+        return deletedEntry;
+    }
+    async function updateEntry(entryToUpdate, params = {}) {
+        const { data, ...restParams } = await curriedTransformParamsDocumentId(uid, params);
+        const query = transformParamsToQuery(uid, pickSelectionParams(restParams)); // select / populate
+        const validData = await entityValidator.validateEntityUpdate(contentType, data, {
+            isDraft: !params?.data?.publishedAt,
+            locale: params?.locale
+        }, entryToUpdate);
+        // Component handling
+        const componentData = await updateComponents(uid, entryToUpdate, validData);
+        const dataWithComponents = assignComponentData(contentType, componentData, validData);
+        const entryData = applyTransforms(contentType, dataWithComponents);
+        return strapi.db.query(uid).update({
+            ...query,
+            where: {
+                id: entryToUpdate.id
+            },
+            data: entryData
+        });
+    }
+    async function publishEntry(entry, params = {}) {
+        return async.pipe(omit('id'), assoc('publishedAt', new Date()), (draft)=>{
+            const opts = {
+                uid,
+                locale: draft.locale,
+                status: 'published',
+                allowMissingId: true
+            };
+            return transformData(draft, opts);
+        }, // Create the published entry
+        (draft)=>createEntry({
+                ...params,
+                data: draft,
+                locale: draft.locale,
+                status: 'published'
+            }))(entry);
+    }
+    async function discardDraftEntry(entry, params = {}) {
+        return async.pipe(omit('id'), assoc('publishedAt', null), (entry)=>{
+            const opts = {
+                uid,
+                locale: entry.locale,
+                status: 'draft',
+                allowMissingId: true
+            };
+            return transformData(entry, opts);
+        }, // Create the draft entry
+        (data)=>createEntry({
+                ...params,
+                locale: data.locale,
+                data,
+                status: 'draft'
+            }))(entry);
+    }
+    return {
+        create: createEntry,
+        delete: deleteEntry,
+        update: updateEntry,
+        publish: publishEntry,
+        discardDraft: discardDraftEntry
+    };
 };
+
+export { createEntriesService };
 //# sourceMappingURL=entries.mjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"entries.mjs","sources":["../../../src/services/document-service/entries.ts"],"sourcesContent":["import type { UID, Modules } from '@strapi/types';\nimport { async } from '@strapi/utils';\nimport { assoc, omit } from 'lodash/fp';\n\nimport * as components from './components';\n\nimport { transformParamsDocumentId } from './transform/id-transform';\nimport { transformParamsToQuery } from './transform/query';\nimport { pickSelectionParams } from './params';\nimport { applyTransforms } from './attributes';\nimport { transformData } from './transform/data';\n\nconst createEntriesService = (\n  uid: UID.ContentType,\n  entityValidator: Modules.EntityValidator.EntityValidator\n) => {\n  const contentType = strapi.contentType(uid);\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 (!data) {\n      throw new Error('Create requires data attribute');\n    }\n\n    const validData = await entityValidator.validateEntityCreation(contentType, data, {\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 components.createComponents(uid, validData);\n    const dataWithComponents = components.assignComponentData(\n      contentType,\n      componentData,\n      validData\n    );\n\n    const entryData = applyTransforms(contentType, dataWithComponents);\n\n    const doc = await strapi.db.query(uid).create({ ...query, data: entryData });\n\n    return doc;\n  }\n\n  async function deleteEntry(id: number) {\n    const componentsToDelete = await components.getComponents(uid, { id });\n\n    const deletedEntry = await strapi.db.query(uid).delete({ where: { id } });\n\n    await components.deleteComponents(uid, componentsToDelete as any, { loadComponents: false });\n\n    return deletedEntry;\n  }\n\n  async function updateEntry(entryToUpdate: any, params = {} as any) {\n    const { data, ...restParams } = await transformParamsDocumentId(uid, params);\n    const query = transformParamsToQuery(uid, pickSelectionParams(restParams) as any); // select / populate\n\n    const validData = await entityValidator.validateEntityUpdate(\n      contentType,\n      data,\n      {\n        isDraft: !params?.data?.publishedAt, // Always update the draft version\n        locale: params?.locale,\n      },\n      entryToUpdate\n    );\n    // Component handling\n    const componentData = await components.updateComponents(uid, entryToUpdate, validData as any);\n    const dataWithComponents = components.assignComponentData(\n      contentType,\n      componentData,\n      validData\n    );\n\n    const entryData = applyTransforms(contentType, dataWithComponents);\n\n    return strapi.db\n      .query(uid)\n      .update({ ...query, where: { id: entryToUpdate.id }, data: entryData });\n  }\n\n  async function publishEntry(entry: any, params = {} as any) {\n    return async.pipe(\n      omit('id'),\n      assoc('publishedAt', new Date()),\n      (draft) => {\n        const opts = { uid, locale: draft.locale, status: 'published', allowMissingId: true };\n        return transformData(draft, opts);\n      },\n      // Create the published entry\n      (draft) => createEntry({ ...params, data: draft, locale: draft.locale, status: 'published' })\n    )(entry);\n  }\n\n  async function discardDraftEntry(entry: any, params = {} as any) {\n    return async.pipe(\n      omit('id'),\n      assoc('publishedAt', null),\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({ ...params, locale: data.locale, data, status: 'draft' })\n    )(entry);\n  }\n\n  return {\n    create: createEntry,\n    delete: deleteEntry,\n    update: updateEntry,\n    publish: publishEntry,\n    discardDraft: discardDraftEntry,\n  };\n};\n\nexport { createEntriesService };\n"],"names":["transformParamsDocumentId","components.createComponents","components.assignComponentData","components.getComponents","components.deleteComponents","components.updateComponents","entry"],"mappings":"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"}
+{"version":3,"file":"entries.mjs","sources":["../../../src/services/document-service/entries.ts"],"sourcesContent":["import type { UID, Modules } from '@strapi/types';\nimport { async, errors } from '@strapi/utils';\nimport { assoc, omit } from 'lodash/fp';\n\nimport * as components from './components';\n\nimport { transformParamsDocumentId } from './transform/id-transform';\nimport { transformParamsToQuery } from './transform/query';\nimport { pickSelectionParams } from './params';\nimport { applyTransforms } from './attributes';\nimport { transformData } from './transform/data';\n\nconst createEntriesService = (\n  uid: UID.ContentType,\n  entityValidator: Modules.EntityValidator.EntityValidator\n) => {\n  const contentType = strapi.contentType(uid);\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 (!data) {\n      throw new Error('Create requires data attribute');\n    }\n\n    // Check for uniqueness based on documentId and locale (if localized)\n    if (data.documentId) {\n      const i18nService = strapi.plugin('i18n')?.service('content-types');\n      const isLocalized = i18nService?.isLocalizedContentType(contentType) ?? false;\n      const hasDraftAndPublish = contentType.options?.draftAndPublish === true;\n\n      const whereClause: Record<string, unknown> = { documentId: data.documentId };\n\n      if (isLocalized) {\n        whereClause.locale = data.locale;\n      }\n\n      let publishedStateDescription = '';\n\n      if (hasDraftAndPublish) {\n        if (data.publishedAt) {\n          // Current entry is published, check for existing published entry\n          whereClause.publishedAt = { $notNull: true };\n          publishedStateDescription = 'published';\n        } else {\n          // Current entry is a draft, check for existing draft entry\n          whereClause.publishedAt = { $null: true };\n          publishedStateDescription = 'draft';\n        }\n      }\n\n      const existingEntry = await strapi.db.query(uid).findOne({\n        select: ['id'],\n        where: whereClause,\n      });\n\n      if (existingEntry) {\n        let errorMsg = `A ${publishedStateDescription} entry with documentId \"${data.documentId}\"`;\n        if (isLocalized && data.locale) {\n          errorMsg += ` and locale \"${data.locale}\"`;\n        }\n        errorMsg += ` already exists for UID \"${uid}\". This combination must be unique.`;\n        throw new errors.ApplicationError(errorMsg);\n      }\n    }\n\n    const validData = await entityValidator.validateEntityCreation(contentType, data, {\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 components.createComponents(uid, validData);\n    const dataWithComponents = components.assignComponentData(\n      contentType,\n      componentData,\n      validData\n    );\n\n    const entryData = applyTransforms(contentType, dataWithComponents);\n\n    const doc = await strapi.db.query(uid).create({ ...query, data: entryData });\n\n    return doc;\n  }\n\n  async function deleteEntry(id: number) {\n    const componentsToDelete = await components.getComponents(uid, { id });\n\n    const deletedEntry = await strapi.db.query(uid).delete({ where: { id } });\n\n    await components.deleteComponents(uid, componentsToDelete as any, { loadComponents: false });\n\n    return deletedEntry;\n  }\n\n  async function updateEntry(entryToUpdate: any, params = {} as any) {\n    const { data, ...restParams } = await transformParamsDocumentId(uid, params);\n    const query = transformParamsToQuery(uid, pickSelectionParams(restParams) as any); // select / populate\n\n    const validData = await entityValidator.validateEntityUpdate(\n      contentType,\n      data,\n      {\n        isDraft: !params?.data?.publishedAt, // Always update the draft version\n        locale: params?.locale,\n      },\n      entryToUpdate\n    );\n    // Component handling\n    const componentData = await components.updateComponents(uid, entryToUpdate, validData as any);\n    const dataWithComponents = components.assignComponentData(\n      contentType,\n      componentData,\n      validData\n    );\n\n    const entryData = applyTransforms(contentType, dataWithComponents);\n\n    return strapi.db\n      .query(uid)\n      .update({ ...query, where: { id: entryToUpdate.id }, data: entryData });\n  }\n\n  async function publishEntry(entry: any, params = {} as any) {\n    return async.pipe(\n      omit('id'),\n      assoc('publishedAt', new Date()),\n      (draft) => {\n        const opts = { uid, locale: draft.locale, status: 'published', allowMissingId: true };\n        return transformData(draft, opts);\n      },\n      // Create the published entry\n      (draft) => createEntry({ ...params, data: draft, locale: draft.locale, status: 'published' })\n    )(entry);\n  }\n\n  async function discardDraftEntry(entry: any, params = {} as any) {\n    return async.pipe(\n      omit('id'),\n      assoc('publishedAt', null),\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({ ...params, locale: data.locale, data, status: 'draft' })\n    )(entry);\n  }\n\n  return {\n    create: createEntry,\n    delete: deleteEntry,\n    update: updateEntry,\n    publish: publishEntry,\n    discardDraft: discardDraftEntry,\n  };\n};\n\nexport { createEntriesService };\n"],"names":["createEntriesService","uid","entityValidator","contentType","strapi","createEntry","params","data","restParams","transformParamsDocumentId","query","transformParamsToQuery","pickSelectionParams","Error","documentId","i18nService","plugin","service","isLocalized","isLocalizedContentType","hasDraftAndPublish","options","draftAndPublish","whereClause","locale","publishedStateDescription","publishedAt","$notNull","$null","existingEntry","db","findOne","select","where","errorMsg","errors","ApplicationError","validData","validateEntityCreation","isDraft","componentData","components","dataWithComponents","entryData","applyTransforms","doc","create","deleteEntry","id","componentsToDelete","deletedEntry","delete","loadComponents","updateEntry","entryToUpdate","validateEntityUpdate","update","publishEntry","entry","async","pipe","omit","assoc","Date","draft","opts","status","allowMissingId","transformData","discardDraftEntry","publish","discardDraft"],"mappings":"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"}

package/dist/services/document-service/events.d.ts

@@ -1,4 +1,4 @@
-import { UID, Utils, Modules, Core } from '@strapi/types';
+import type { UID, Utils, Modules, Core } from '@strapi/types';
 declare const EVENTS: {
     ENTRY_CREATE: string;
     ENTRY_UPDATE: string;

package/dist/services/document-service/events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../src/services/document-service/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAK1D,QAAA,MAAM,MAAM;;;;;;;CAOX,CAAC;AAEF,KAAK,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;AAEpD;;;;;GAKG;AACH,QAAA,MAAM,kBAAkB,WAAY,KAAK,MAAM,OAAO,IAAI,MAAM;IA2B5D;;;OAGG;yBACkB,SAAS,SAAS,QAAQ,SAAS,CAAC,WAAW;CAMvE,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../src/services/document-service/events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAK/D,QAAA,MAAM,MAAM;;;;;;;CAOX,CAAC;AAEF,KAAK,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC;AAEpD;;;;;GAKG;AACH,QAAA,MAAM,kBAAkB,WAAY,KAAK,MAAM,OAAO,IAAI,MAAM;IA2B5D;;;OAGG;yBACkB,SAAS,SAAS,QAAQ,SAAS,CAAC,WAAW;CAMvE,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,CAAC"}