@strapi/content-releases 0.0.0-experimental.d8a676a242377cee820b59b21a05d47290d9ac73 → 0.0.0-experimental.e3e48deb89bd0a1b6cc69b698696566fa7854a95

package/dist/server/index.js

@@ -3,7 +3,6 @@ const utils = require("@strapi/utils");
 const isEqual = require("lodash/isEqual");
 const lodash = require("lodash");
 const _ = require("lodash/fp");
-const EE = require("@strapi/strapi/dist/utils/ee");
 const nodeSchedule = require("node-schedule");
 const yup = require("yup");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
@@ -27,7 +26,6 @@ function _interopNamespace(e) {
 }
 const isEqual__default = /* @__PURE__ */ _interopDefault(isEqual);
 const ___default = /* @__PURE__ */ _interopDefault(_);
-const EE__default = /* @__PURE__ */ _interopDefault(EE);
 const yup__namespace = /* @__PURE__ */ _interopNamespace(yup);
 const RELEASE_MODEL_UID = "plugin::content-releases.release";
 const RELEASE_ACTION_MODEL_UID = "plugin::content-releases.release-action";
@@ -84,7 +82,10 @@ const getService = (name, { strapi: strapi2 } = { strapi: global.strapi }) => {
 const getPopulatedEntry = async (contentTypeUid, entryId, { strapi: strapi2 } = { strapi: global.strapi }) => {
   const populateBuilderService = strapi2.plugin("content-manager").service("populate-builder");
   const populate = await populateBuilderService(contentTypeUid).populateDeep(Infinity).build();
-  const entry = await strapi2.entityService.findOne(contentTypeUid, entryId, { populate });
+  const entry = await strapi2.db.query(contentTypeUid).findOne({
+    where: { id: entryId },
+    populate
+  });
   return entry;
 };
 const getEntryValidStatus = async (contentTypeUid, entry, { strapi: strapi2 } = { strapi: global.strapi }) => {
@@ -101,28 +102,10 @@ const getEntryValidStatus = async (contentTypeUid, entry, { strapi: strapi2 } =
     return false;
   }
 };
-async function deleteActionsOnDisableDraftAndPublish({
-  oldContentTypes,
-  contentTypes: contentTypes2
-}) {
-  if (!oldContentTypes) {
-    return;
-  }
-  for (const uid in contentTypes2) {
-    if (!oldContentTypes[uid]) {
-      continue;
-    }
-    const oldContentType = oldContentTypes[uid];
-    const contentType = contentTypes2[uid];
-    if (utils.contentTypes.hasDraftAndPublish(oldContentType) && !utils.contentTypes.hasDraftAndPublish(contentType)) {
-      await strapi.db?.queryBuilder(RELEASE_ACTION_MODEL_UID).delete().where({ contentType: uid }).execute();
-    }
-  }
-}
 async function deleteActionsOnDeleteContentType({ oldContentTypes, contentTypes: contentTypes2 }) {
   const deletedContentTypes = lodash.difference(lodash.keys(oldContentTypes), lodash.keys(contentTypes2)) ?? [];
   if (deletedContentTypes.length) {
-    await utils.mapAsync(deletedContentTypes, async (deletedContentTypeUID) => {
+    await utils.async.map(deletedContentTypes, async (deletedContentTypeUID) => {
       return strapi.db?.queryBuilder(RELEASE_ACTION_MODEL_UID).delete().where({ contentType: deletedContentTypeUID }).execute();
     });
   }
@@ -141,7 +124,7 @@ async function migrateIsValidAndStatusReleases() {
       }
     }
   });
-  utils.mapAsync(releasesWithoutStatus, async (release2) => {
+  utils.async.map(releasesWithoutStatus, async (release2) => {
     const actions = release2.actions;
     const notValidatedActions = actions.filter((action) => action.isEntryValid === null);
     for (const action of notValidatedActions) {
@@ -172,7 +155,7 @@ async function migrateIsValidAndStatusReleases() {
       }
     }
   });
-  utils.mapAsync(publishedReleases, async (release2) => {
+  utils.async.map(publishedReleases, async (release2) => {
     return strapi.db.query(RELEASE_MODEL_UID).update({
       where: {
         id: release2.id
@@ -185,11 +168,9 @@ async function migrateIsValidAndStatusReleases() {
 }
 async function revalidateChangedContentTypes({ oldContentTypes, contentTypes: contentTypes2 }) {
   if (oldContentTypes !== void 0 && contentTypes2 !== void 0) {
-    const contentTypesWithDraftAndPublish = Object.keys(oldContentTypes).filter(
-      (uid) => oldContentTypes[uid]?.options?.draftAndPublish
-    );
+    const contentTypesWithDraftAndPublish = Object.keys(oldContentTypes);
     const releasesAffected = /* @__PURE__ */ new Set();
-    utils.mapAsync(contentTypesWithDraftAndPublish, async (contentTypeUID) => {
+    utils.async.map(contentTypesWithDraftAndPublish, async (contentTypeUID) => {
       const oldContentType = oldContentTypes[contentTypeUID];
       const contentType = contentTypes2[contentTypeUID];
       if (!isEqual__default.default(oldContentType?.attributes, contentType?.attributes)) {
@@ -202,8 +183,8 @@ async function revalidateChangedContentTypes({ oldContentTypes, contentTypes: co
             release: true
           }
         });
-        await utils.mapAsync(actions, async (action) => {
-          if (action.entry && action.release) {
+        await utils.async.map(actions, async (action) => {
+          if (action.entry) {
             const populatedEntry = await getPopulatedEntry(contentTypeUID, action.entry.id, {
               strapi
             });
@@ -225,71 +206,21 @@ async function revalidateChangedContentTypes({ oldContentTypes, contentTypes: co
         });
       }
     }).then(() => {
-      utils.mapAsync(releasesAffected, async (releaseId) => {
+      utils.async.map(releasesAffected, async (releaseId) => {
         return getService("release", { strapi }).updateReleaseStatus(releaseId);
       });
     });
   }
 }
-async function disableContentTypeLocalized({ oldContentTypes, contentTypes: contentTypes2 }) {
-  if (!oldContentTypes) {
-    return;
-  }
-  for (const uid in contentTypes2) {
-    if (!oldContentTypes[uid]) {
-      continue;
-    }
-    const oldContentType = oldContentTypes[uid];
-    const contentType = contentTypes2[uid];
-    const i18nPlugin = strapi.plugin("i18n");
-    const { isLocalizedContentType } = i18nPlugin.service("content-types");
-    if (isLocalizedContentType(oldContentType) && !isLocalizedContentType(contentType)) {
-      await strapi.db.queryBuilder(RELEASE_ACTION_MODEL_UID).update({
-        locale: null
-      }).where({ contentType: uid }).execute();
-    }
-  }
-}
-async function enableContentTypeLocalized({ oldContentTypes, contentTypes: contentTypes2 }) {
-  if (!oldContentTypes) {
-    return;
-  }
-  for (const uid in contentTypes2) {
-    if (!oldContentTypes[uid]) {
-      continue;
-    }
-    const oldContentType = oldContentTypes[uid];
-    const contentType = contentTypes2[uid];
-    const i18nPlugin = strapi.plugin("i18n");
-    const { isLocalizedContentType } = i18nPlugin.service("content-types");
-    const { getDefaultLocale } = i18nPlugin.service("locales");
-    if (!isLocalizedContentType(oldContentType) && isLocalizedContentType(contentType)) {
-      const defaultLocale = await getDefaultLocale();
-      await strapi.db.queryBuilder(RELEASE_ACTION_MODEL_UID).update({
-        locale: defaultLocale
-      }).where({ contentType: uid }).execute();
-    }
-  }
-}
-const { features: features$2 } = require("@strapi/strapi/dist/utils/ee");
 const register = async ({ strapi: strapi2 }) => {
-  if (features$2.isEnabled("cms-content-releases")) {
+  if (strapi2.ee.features.isEnabled("cms-content-releases")) {
     await strapi2.admin.services.permission.actionProvider.registerMany(ACTIONS);
-    strapi2.hook("strapi::content-types.beforeSync").register(deleteActionsOnDisableDraftAndPublish).register(disableContentTypeLocalized);
-    strapi2.hook("strapi::content-types.afterSync").register(deleteActionsOnDeleteContentType).register(enableContentTypeLocalized).register(revalidateChangedContentTypes).register(migrateIsValidAndStatusReleases);
-  }
-  if (strapi2.plugin("graphql")) {
-    const graphqlExtensionService = strapi2.plugin("graphql").service("extension");
-    graphqlExtensionService.shadowCRUD(RELEASE_MODEL_UID).disable();
-    graphqlExtensionService.shadowCRUD(RELEASE_ACTION_MODEL_UID).disable();
+    strapi2.hook("strapi::content-types.afterSync").register(deleteActionsOnDeleteContentType).register(revalidateChangedContentTypes).register(migrateIsValidAndStatusReleases);
   }
 };
-const { features: features$1 } = require("@strapi/strapi/dist/utils/ee");
 const bootstrap = async ({ strapi: strapi2 }) => {
-  if (features$1.isEnabled("cms-content-releases")) {
-    const contentTypesWithDraftAndPublish = Object.keys(strapi2.contentTypes).filter(
-      (uid) => strapi2.contentTypes[uid]?.options?.draftAndPublish
-    );
+  if (strapi2.ee.features.isEnabled("cms-content-releases")) {
+    const contentTypesWithDraftAndPublish = Object.keys(strapi2.contentTypes);
     strapi2.db.lifecycles.subscribe({
       models: contentTypesWithDraftAndPublish,
       async afterDelete(event) {
@@ -325,7 +256,7 @@ const bootstrap = async ({ strapi: strapi2 }) => {
        */
       async beforeDeleteMany(event) {
         const { model, params } = event;
-        if (model.kind === "collectionType" && model.options?.draftAndPublish) {
+        if (model.kind === "collectionType") {
           const { where } = params;
           const entriesToDelete = await strapi2.db.query(model.uid).findMany({ select: ["id"], where });
           event.state.entriesToDelete = entriesToDelete;
@@ -565,7 +496,7 @@ const createReleaseService = ({ strapi: strapi2 }) => {
         validateUniqueNameForPendingRelease(releaseWithCreatorFields.name),
         validateScheduledAtIsLaterThanNow(releaseWithCreatorFields.scheduledAt)
       ]);
-      const release2 = await strapi2.entityService.create(RELEASE_MODEL_UID, {
+      const release2 = await strapi2.db.query(RELEASE_MODEL_UID).create({
         data: {
           ...releaseWithCreatorFields,
           status: "empty"
@@ -579,17 +510,19 @@ const createReleaseService = ({ strapi: strapi2 }) => {
       return release2;
     },
     async findOne(id, query = {}) {
-      const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, id, {
-        ...query
+      const dbQuery = utils.convertQueryParams.transformParamsToQuery(RELEASE_MODEL_UID, query);
+      const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({
+        ...dbQuery,
+        where: { id }
       });
       return release2;
     },
     findPage(query) {
-      return strapi2.entityService.findPage(RELEASE_MODEL_UID, {
-        ...query,
+      const dbQuery = utils.convertQueryParams.transformParamsToQuery(RELEASE_MODEL_UID, query ?? {});
+      return strapi2.db.query(RELEASE_MODEL_UID).findPage({
+        ...dbQuery,
         populate: {
           actions: {
-            // @ts-expect-error Ignore missing properties
             count: true
           }
         }
@@ -681,19 +614,15 @@ const createReleaseService = ({ strapi: strapi2 }) => {
         validateUniqueNameForPendingRelease(releaseWithCreatorFields.name, id),
         validateScheduledAtIsLaterThanNow(releaseWithCreatorFields.scheduledAt)
       ]);
-      const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, id);
+      const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({ where: { id } });
       if (!release2) {
         throw new utils.errors.NotFoundError(`No release found for id ${id}`);
       }
       if (release2.releasedAt) {
         throw new utils.errors.ValidationError("Release already published");
       }
-      const updatedRelease = await strapi2.entityService.update(RELEASE_MODEL_UID, id, {
-        /*
-         * The type returned from the entity service: Partial<Input<"plugin::content-releases.release">>
-         * is not compatible with the type we are passing here: UpdateRelease.Request['body']
-         */
-        // @ts-expect-error see above
+      const updatedRelease = await strapi2.db.query(RELEASE_MODEL_UID).update({
+        where: { id },
         data: releaseWithCreatorFields
       });
       if (strapi2.features.future.isEnabled("contentReleasesScheduling")) {
@@ -716,7 +645,7 @@ const createReleaseService = ({ strapi: strapi2 }) => {
         validateEntryContentType(action.entry.contentType),
         validateUniqueEntry(releaseId, action)
       ]);
-      const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId);
+      const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({ where: { id: releaseId } });
       if (!release2) {
         throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
       }
@@ -726,7 +655,7 @@ const createReleaseService = ({ strapi: strapi2 }) => {
       const { entry, type } = action;
       const populatedEntry = await getPopulatedEntry(entry.contentType, entry.id, { strapi: strapi2 });
       const isEntryValid = await getEntryValidStatus(entry.contentType, populatedEntry, { strapi: strapi2 });
-      const releaseAction2 = await strapi2.entityService.create(RELEASE_ACTION_MODEL_UID, {
+      const releaseAction2 = await strapi2.db.query(RELEASE_ACTION_MODEL_UID).create({
         data: {
           type,
           contentType: entry.contentType,
@@ -739,32 +668,41 @@ const createReleaseService = ({ strapi: strapi2 }) => {
           },
           release: releaseId
         },
-        populate: { release: { fields: ["id"] }, entry: { fields: ["id"] } }
+        populate: { release: { select: ["id"] }, entry: { select: ["id"] } }
       });
       this.updateReleaseStatus(releaseId);
       return releaseAction2;
     },
     async findActions(releaseId, query) {
-      const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
-        fields: ["id"]
+      const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({
+        where: { id: releaseId },
+        select: ["id"]
       });
       if (!release2) {
         throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
       }
-      return strapi2.entityService.findPage(RELEASE_ACTION_MODEL_UID, {
-        ...query,
+      const dbQuery = utils.convertQueryParams.transformParamsToQuery(
+        RELEASE_ACTION_MODEL_UID,
+        query ?? {}
+      );
+      return strapi2.db.query(RELEASE_ACTION_MODEL_UID).findPage({
+        ...dbQuery,
         populate: {
           entry: {
             populate: "*"
           }
         },
-        filters: {
+        where: {
           release: releaseId
         }
       });
     },
     async countActions(query) {
-      return strapi2.entityService.count(RELEASE_ACTION_MODEL_UID, query);
+      const dbQuery = utils.convertQueryParams.transformParamsToQuery(
+        RELEASE_ACTION_MODEL_UID,
+        query ?? {}
+      );
+      return strapi2.db.query(RELEASE_ACTION_MODEL_UID).count(dbQuery);
     },
     async groupActions(actions, groupBy) {
       const contentTypeUids = actions.reduce((acc, action) => {
@@ -845,10 +783,11 @@ const createReleaseService = ({ strapi: strapi2 }) => {
       return componentsMap;
     },
     async delete(releaseId) {
-      const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
+      const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({
+        where: { id: releaseId },
         populate: {
           actions: {
-            fields: ["id"]
+            select: ["id"]
           }
         }
       });
@@ -866,7 +805,11 @@ const createReleaseService = ({ strapi: strapi2 }) => {
             }
           }
         });
-        await strapi2.entityService.delete(RELEASE_MODEL_UID, releaseId);
+        await strapi2.db.query(RELEASE_MODEL_UID).delete({
+          where: {
+            id: releaseId
+          }
+        });
       });
       if (strapi2.features.future.isEnabled("contentReleasesScheduling") && release2.scheduledAt) {
         const schedulingService = getService("scheduling", { strapi: strapi2 });
@@ -877,21 +820,18 @@ const createReleaseService = ({ strapi: strapi2 }) => {
     },
     async publish(releaseId) {
       try {
-        const releaseWithPopulatedActionEntries = await strapi2.entityService.findOne(
-          RELEASE_MODEL_UID,
-          releaseId,
-          {
-            populate: {
-              actions: {
-                populate: {
-                  entry: {
-                    fields: ["id"]
-                  }
+        const releaseWithPopulatedActionEntries = await strapi2.db.query(RELEASE_MODEL_UID).findOne({
+          where: { id: releaseId },
+          populate: {
+            actions: {
+              populate: {
+                entry: {
+                  select: ["id"]
                 }
               }
             }
           }
-        );
+        });
         if (!releaseWithPopulatedActionEntries) {
           throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
         }
@@ -930,7 +870,7 @@ const createReleaseService = ({ strapi: strapi2 }) => {
         await strapi2.db.transaction(async () => {
           for (const { uid, action, id } of singleTypeActions) {
             const populate = await populateBuilderService(uid).populateDeep(Infinity).build();
-            const entry = await strapi2.entityService.findOne(uid, id, { populate });
+            const entry = await strapi2.db.query(uid).findOne({ where: { id }, populate });
             try {
               if (action === "publish") {
                 await entityManagerService.publish(entry, uid);
@@ -947,28 +887,22 @@ const createReleaseService = ({ strapi: strapi2 }) => {
           for (const contentTypeUid of Object.keys(collectionTypeActions)) {
             const populate = await populateBuilderService(contentTypeUid).populateDeep(Infinity).build();
             const { entriestoPublishIds, entriesToUnpublishIds } = collectionTypeActions[contentTypeUid];
-            const entriesToPublish = await strapi2.entityService.findMany(
-              contentTypeUid,
-              {
-                filters: {
-                  id: {
-                    $in: entriestoPublishIds
-                  }
-                },
-                populate
-              }
-            );
-            const entriesToUnpublish = await strapi2.entityService.findMany(
-              contentTypeUid,
-              {
-                filters: {
-                  id: {
-                    $in: entriesToUnpublishIds
-                  }
-                },
-                populate
-              }
-            );
+            const entriesToPublish = await strapi2.db.query(contentTypeUid).findMany({
+              where: {
+                id: {
+                  $in: entriestoPublishIds
+                }
+              },
+              populate
+            });
+            const entriesToUnpublish = await strapi2.db.query(contentTypeUid).findMany({
+              where: {
+                id: {
+                  $in: entriesToUnpublishIds
+                }
+              },
+              populate
+            });
             if (entriesToPublish.length > 0) {
               await entityManagerService.publishMany(entriesToPublish, contentTypeUid);
             }
@@ -977,17 +911,13 @@ const createReleaseService = ({ strapi: strapi2 }) => {
             }
           }
         });
-        const release2 = await strapi2.entityService.update(RELEASE_MODEL_UID, releaseId, {
+        const release2 = await strapi2.db.query(RELEASE_MODEL_UID).update({
+          where: { id: releaseId },
           data: {
-            /*
-             * The type returned from the entity service: Partial<Input<"plugin::content-releases.release">> looks like it's wrong
-             */
-            // @ts-expect-error see above
             releasedAt: /* @__PURE__ */ new Date()
           },
           populate: {
             actions: {
-              // @ts-expect-error is not expecting count but it is working
               count: true
             }
           }
@@ -1103,8 +1033,11 @@ const createReleaseService = ({ strapi: strapi2 }) => {
 };
 const createReleaseValidationService = ({ strapi: strapi2 }) => ({
   async validateUniqueEntry(releaseId, releaseActionArgs) {
-    const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
-      populate: { actions: { populate: { entry: { fields: ["id"] } } } }
+    const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({
+      where: {
+        id: releaseId
+      },
+      populate: { actions: { populate: { entry: { select: ["id"] } } } }
     });
     if (!release2) {
       throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
@@ -1123,17 +1056,9 @@ const createReleaseValidationService = ({ strapi: strapi2 }) => ({
     if (!contentType) {
       throw new utils.errors.NotFoundError(`No content type found for uid ${contentTypeUid}`);
     }
-    if (!contentType.options?.draftAndPublish) {
-      throw new utils.errors.ValidationError(
-        `Content type with uid ${contentTypeUid} does not have draftAndPublish enabled`
-      );
-    }
   },
   async validatePendingReleasesLimit() {
-    const maximumPendingReleases = (
-      // @ts-expect-error - options is not typed into features
-      EE__default.default.features.get("cms-content-releases")?.options?.maximumReleases || 3
-    );
+    const maximumPendingReleases = strapi2.ee.features.get("cms-content-releases")?.options?.maximumReleases || 3;
     const [, pendingReleasesCount] = await strapi2.db.query(RELEASE_MODEL_UID).findWithCount({
       filters: {
         releasedAt: {
@@ -1146,8 +1071,8 @@ const createReleaseValidationService = ({ strapi: strapi2 }) => ({
     }
   },
   async validateUniqueNameForPendingRelease(name, id) {
-    const pendingReleases = await strapi2.entityService.findMany(RELEASE_MODEL_UID, {
-      filters: {
+    const pendingReleases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
+      where: {
         releasedAt: {
           $null: true
         },
@@ -1274,7 +1199,7 @@ const releaseController = {
           }
         };
       });
-      const pendingReleasesCount = await strapi.query(RELEASE_MODEL_UID).count({
+      const pendingReleasesCount = await strapi.db.query(RELEASE_MODEL_UID).count({
         where: {
           releasedAt: null
         }
@@ -1420,7 +1345,7 @@ const releaseActionController = {
       acc[action.contentType] = contentTypePermissionsManager.sanitizeOutput;
       return acc;
     }, {});
-    const sanitizedResults = await utils.mapAsync(results, async (action) => ({
+    const sanitizedResults = await utils.async.map(results, async (action) => ({
       ...action,
       entry: await contentTypeOutputSanitizers[action.contentType](action.entry)
     }));
@@ -1636,9 +1561,8 @@ const routes = {
   release,
   "release-action": releaseAction
 };
-const { features } = require("@strapi/strapi/dist/utils/ee");
 const getPlugin = () => {
-  if (features.isEnabled("cms-content-releases")) {
+  if (strapi.ee.features.isEnabled("cms-content-releases")) {
     return {
       register,
       bootstrap,
@@ -1650,9 +1574,6 @@ const getPlugin = () => {
     };
   }
   return {
-    // Always return register, it handles its own feature check
-    register,
-    // Always return contentTypes to avoid losing data when the feature is disabled
     contentTypes
   };
 };