@strapi/content-releases 0.0.0-experimental.ec089c69ff953942fb39de032c12daafaf7176e6 → 0.0.0-experimental.f75e3c6d67cc47c64ab37479efdbb7b43be50b78

package/dist/server/index.mjs

@@ -1,8 +1,7 @@
-import { contentTypes as contentTypes$1, mapAsync, setCreatorFields, errors, validateYupSchema, yup as yup$1 } from "@strapi/utils";
+import { contentTypes as contentTypes$1, async, setCreatorFields, errors, validateYupSchema, yup as yup$1 } from "@strapi/utils";
 import isEqual from "lodash/isEqual";
 import { difference, keys } from "lodash";
 import _ from "lodash/fp";
-import EE from "@strapi/strapi/dist/utils/ee";
 import { scheduleJob } from "node-schedule";
 import * as yup from "yup";
 const RELEASE_MODEL_UID = "plugin::content-releases.release";
@@ -54,16 +53,19 @@ const ACTIONS = [
 const ALLOWED_WEBHOOK_EVENTS = {
   RELEASES_PUBLISH: "releases.publish"
 };
-const getService = (name, { strapi: strapi2 } = { strapi: global.strapi }) => {
+const getService = (name, { strapi: strapi2 }) => {
   return strapi2.plugin("content-releases").service(name);
 };
-const getPopulatedEntry = async (contentTypeUid, entryId, { strapi: strapi2 } = { strapi: global.strapi }) => {
+const getPopulatedEntry = async (contentTypeUid, entryId, { strapi: strapi2 }) => {
   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 }) => {
+const getEntryValidStatus = async (contentTypeUid, entry, { strapi: strapi2 }) => {
   try {
     await strapi2.entityValidator.validateEntityCreation(
       strapi2.getModel(contentTypeUid),
@@ -98,7 +100,7 @@ async function deleteActionsOnDisableDraftAndPublish({
 async function deleteActionsOnDeleteContentType({ oldContentTypes, contentTypes: contentTypes2 }) {
   const deletedContentTypes = difference(keys(oldContentTypes), keys(contentTypes2)) ?? [];
   if (deletedContentTypes.length) {
-    await mapAsync(deletedContentTypes, async (deletedContentTypeUID) => {
+    await async.map(deletedContentTypes, async (deletedContentTypeUID) => {
       return strapi.db?.queryBuilder(RELEASE_ACTION_MODEL_UID).delete().where({ contentType: deletedContentTypeUID }).execute();
     });
   }
@@ -117,7 +119,7 @@ async function migrateIsValidAndStatusReleases() {
       }
     }
   });
-  mapAsync(releasesWithoutStatus, async (release2) => {
+  async.map(releasesWithoutStatus, async (release2) => {
     const actions = release2.actions;
     const notValidatedActions = actions.filter((action) => action.isEntryValid === null);
     for (const action of notValidatedActions) {
@@ -148,7 +150,7 @@ async function migrateIsValidAndStatusReleases() {
       }
     }
   });
-  mapAsync(publishedReleases, async (release2) => {
+  async.map(publishedReleases, async (release2) => {
     return strapi.db.query(RELEASE_MODEL_UID).update({
       where: {
         id: release2.id
@@ -165,7 +167,7 @@ async function revalidateChangedContentTypes({ oldContentTypes, contentTypes: co
       (uid) => oldContentTypes[uid]?.options?.draftAndPublish
     );
     const releasesAffected = /* @__PURE__ */ new Set();
-    mapAsync(contentTypesWithDraftAndPublish, async (contentTypeUID) => {
+    async.map(contentTypesWithDraftAndPublish, async (contentTypeUID) => {
       const oldContentType = oldContentTypes[contentTypeUID];
       const contentType = contentTypes2[contentTypeUID];
       if (!isEqual(oldContentType?.attributes, contentType?.attributes)) {
@@ -178,7 +180,7 @@ async function revalidateChangedContentTypes({ oldContentTypes, contentTypes: co
             release: true
           }
         });
-        await mapAsync(actions, async (action) => {
+        await async.map(actions, async (action) => {
           if (action.entry && action.release) {
             const populatedEntry = await getPopulatedEntry(contentTypeUID, action.entry.id, {
               strapi
@@ -201,7 +203,7 @@ async function revalidateChangedContentTypes({ oldContentTypes, contentTypes: co
         });
       }
     }).then(() => {
-      mapAsync(releasesAffected, async (releaseId) => {
+      async.map(releasesAffected, async (releaseId) => {
         return getService("release", { strapi }).updateReleaseStatus(releaseId);
       });
     });
@@ -253,11 +255,10 @@ async function enableContentTypeLocalized({ oldContentTypes, contentTypes: conte
     }
   }
 }
-const { features: features$2 } = require("@strapi/strapi/dist/utils/ee");
 const register = async ({ strapi: strapi2 }) => {
-  if (features$2.isEnabled("cms-content-releases")) {
-    await strapi2.admin.services.permission.actionProvider.registerMany(ACTIONS);
-    strapi2.hook("strapi::content-types.beforeSync").register(deleteActionsOnDisableDraftAndPublish).register(disableContentTypeLocalized);
+  if (strapi2.ee.features.isEnabled("cms-content-releases")) {
+    await strapi2.service("admin::permission").actionProvider.registerMany(ACTIONS);
+    strapi2.hook("strapi::content-types.beforeSync").register(disableContentTypeLocalized).register(deleteActionsOnDisableDraftAndPublish);
     strapi2.hook("strapi::content-types.afterSync").register(deleteActionsOnDeleteContentType).register(enableContentTypeLocalized).register(revalidateChangedContentTypes).register(migrateIsValidAndStatusReleases);
   }
   if (strapi2.plugin("graphql")) {
@@ -266,9 +267,8 @@ const register = async ({ strapi: strapi2 }) => {
     graphqlExtensionService.shadowCRUD(RELEASE_ACTION_MODEL_UID).disable();
   }
 };
-const { features: features$1 } = require("@strapi/strapi/dist/utils/ee");
 const bootstrap = async ({ strapi: strapi2 }) => {
-  if (features$1.isEnabled("cms-content-releases")) {
+  if (strapi2.ee.features.isEnabled("cms-content-releases")) {
     const contentTypesWithDraftAndPublish = Object.keys(strapi2.contentTypes).filter(
       (uid) => strapi2.contentTypes[uid]?.options?.draftAndPublish
     );
@@ -327,9 +327,7 @@ const bootstrap = async ({ strapi: strapi2 }) => {
                 actions: {
                   target_type: model.uid,
                   target_id: {
-                    $in: entriesToDelete.map(
-                      (entry) => entry.id
-                    )
+                    $in: entriesToDelete.map((entry) => entry.id)
                   }
                 }
               }
@@ -356,13 +354,9 @@ const bootstrap = async ({ strapi: strapi2 }) => {
         try {
           const { model, result } = event;
           if (model.kind === "collectionType" && model.options?.draftAndPublish) {
-            const isEntryValid = await getEntryValidStatus(
-              model.uid,
-              result,
-              {
-                strapi: strapi2
-              }
-            );
+            const isEntryValid = await getEntryValidStatus(model.uid, result, {
+              strapi: strapi2
+            });
             await strapi2.db.query(RELEASE_ACTION_MODEL_UID).update({
               where: {
                 target_type: model.uid,
@@ -396,7 +390,7 @@ const bootstrap = async ({ strapi: strapi2 }) => {
       throw err;
     });
     Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
-      strapi2.webhookStore.addAllowedEvent(key, value);
+      strapi2.get("webhookStore").addAllowedEvent(key, value);
     });
   }
 };
@@ -631,7 +625,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"
@@ -645,17 +639,19 @@ const createReleaseService = ({ strapi: strapi2 }) => {
       return release2;
     },
     async findOne(id, query = {}) {
-      const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, id, {
-        ...query
+      const dbQuery = strapi2.get("query-params").transform(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 = strapi2.get("query-params").transform(RELEASE_MODEL_UID, query ?? {});
+      return strapi2.db.query(RELEASE_MODEL_UID).findPage({
+        ...dbQuery,
         populate: {
           actions: {
-            // @ts-expect-error Ignore missing properties
             count: true
           }
         }
@@ -760,19 +756,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 errors.NotFoundError(`No release found for id ${id}`);
       }
       if (release2.releasedAt) {
         throw new 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
       });
       const schedulingService = getService("scheduling", { strapi: strapi2 });
@@ -793,7 +785,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 errors.NotFoundError(`No release found for id ${releaseId}`);
       }
@@ -803,7 +795,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,
@@ -816,32 +808,35 @@ 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 errors.NotFoundError(`No release found for id ${releaseId}`);
       }
-      return strapi2.entityService.findPage(RELEASE_ACTION_MODEL_UID, {
-        ...query,
+      const dbQuery = strapi2.get("query-params").transform(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 = strapi2.get("query-params").transform(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) => {
@@ -850,9 +845,7 @@ const createReleaseService = ({ strapi: strapi2 }) => {
         }
         return acc;
       }, []);
-      const allReleaseContentTypesDictionary = await this.getContentTypesDataForActions(
-        contentTypeUids
-      );
+      const allReleaseContentTypesDictionary = await this.getContentTypesDataForActions(contentTypeUids);
       const allLocalesDictionary = await this.getLocalesDataForActions();
       const formattedData = actions.map((action) => {
         const { mainField, displayName } = allReleaseContentTypesDictionary[action.contentType];
@@ -922,10 +915,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"]
           }
         }
       });
@@ -943,7 +937,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 (release2.scheduledAt) {
         const schedulingService = getService("scheduling", { strapi: strapi2 });
@@ -969,9 +967,7 @@ const createReleaseService = ({ strapi: strapi2 }) => {
         }
         try {
           strapi2.log.info(`[Content Releases] Starting to publish release ${lockedRelease.name}`);
-          const { collectionTypeActions, singleTypeActions } = await getFormattedActions(
-            releaseId
-          );
+          const { collectionTypeActions, singleTypeActions } = await getFormattedActions(releaseId);
           await strapi2.db.transaction(async () => {
             for (const { uid, action, id } of singleTypeActions) {
               await publishSingleTypeAction(uid, action, id);
@@ -1014,7 +1010,7 @@ const createReleaseService = ({ strapi: strapi2 }) => {
           };
         }
       });
-      if (error) {
+      if (error instanceof Error) {
         throw error;
       }
       return release2;
@@ -1112,8 +1108,11 @@ class AlreadyOnReleaseError extends errors.ApplicationError {
 }
 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 errors.NotFoundError(`No release found for id ${releaseId}`);
@@ -1139,10 +1138,8 @@ const createReleaseValidationService = ({ strapi: strapi2 }) => ({
     }
   },
   async validatePendingReleasesLimit() {
-    const maximumPendingReleases = (
-      // @ts-expect-error - options is not typed into features
-      EE.features.get("cms-content-releases")?.options?.maximumReleases || 3
-    );
+    const featureCfg = strapi2.ee.features.get("cms-content-releases");
+    const maximumPendingReleases = typeof featureCfg === "object" && featureCfg?.options?.maximumReleases || 3;
     const [, pendingReleasesCount] = await strapi2.db.query(RELEASE_MODEL_UID).findWithCount({
       filters: {
         releasedAt: {
@@ -1155,8 +1152,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
         },
@@ -1185,7 +1182,7 @@ const createSchedulingService = ({ strapi: strapi2 }) => {
       }
       const job = scheduleJob(scheduleDate, async () => {
         try {
-          await getService("release").publish(releaseId);
+          await getService("release", { strapi: strapi2 }).publish(releaseId);
         } catch (error) {
         }
         this.cancel(releaseId);
@@ -1255,7 +1252,7 @@ const RELEASE_SCHEMA = yup.object().shape({
 const validateRelease = validateYupSchema(RELEASE_SCHEMA);
 const releaseController = {
   async findMany(ctx) {
-    const permissionsManager = strapi.admin.services.permission.createPermissionsManager({
+    const permissionsManager = strapi.service("admin::permission").createPermissionsManager({
       ability: ctx.state.userAbility,
       model: RELEASE_MODEL_UID
     });
@@ -1283,7 +1280,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
         }
@@ -1305,7 +1302,7 @@ const releaseController = {
     });
     const sanitizedRelease = {
       ...release2,
-      createdBy: release2.createdBy ? strapi.admin.services.user.sanitizeUser(release2.createdBy) : null
+      createdBy: release2.createdBy ? strapi.service("admin::user").sanitizeUser(release2.createdBy) : null
     };
     const data = {
       ...sanitizedRelease,
@@ -1328,6 +1325,7 @@ const releaseController = {
       entriesIds
     );
     const mappedEntriesInReleases = releasesWithActions.reduce(
+      // TODO: Fix for v5 removed mappedEntriedToRelease
       (acc, release2) => {
         release2.actions.forEach((action) => {
           if (!acc[action.entry.id]) {
@@ -1338,6 +1336,7 @@ const releaseController = {
         });
         return acc;
       },
+      // TODO: Fix for v5 removed mappedEntriedToRelease
       {}
     );
     ctx.body = {
@@ -1350,13 +1349,13 @@ const releaseController = {
     await validateRelease(releaseArgs);
     const releaseService = getService("release", { strapi });
     const release2 = await releaseService.create(releaseArgs, { user });
-    const permissionsManager = strapi.admin.services.permission.createPermissionsManager({
+    const permissionsManager = strapi.service("admin::permission").createPermissionsManager({
       ability: ctx.state.userAbility,
       model: RELEASE_MODEL_UID
     });
-    ctx.body = {
+    ctx.created({
       data: await permissionsManager.sanitizeOutput(release2)
-    };
+    });
   },
   async update(ctx) {
     const user = ctx.state.user;
@@ -1365,7 +1364,7 @@ const releaseController = {
     await validateRelease(releaseArgs);
     const releaseService = getService("release", { strapi });
     const release2 = await releaseService.update(id, releaseArgs, { user });
-    const permissionsManager = strapi.admin.services.permission.createPermissionsManager({
+    const permissionsManager = strapi.service("admin::permission").createPermissionsManager({
       ability: ctx.state.userAbility,
       model: RELEASE_MODEL_UID
     });
@@ -1429,9 +1428,9 @@ const releaseActionController = {
     await validateReleaseAction(releaseActionArgs);
     const releaseService = getService("release", { strapi });
     const releaseAction2 = await releaseService.createAction(releaseId, releaseActionArgs);
-    ctx.body = {
+    ctx.created({
       data: releaseAction2
-    };
+    });
   },
   async createMany(ctx) {
     const releaseId = ctx.params.releaseId;
@@ -1457,17 +1456,17 @@ const releaseActionController = {
       return releaseActions2;
     });
     const newReleaseActions = releaseActions.filter((action) => action !== null);
-    ctx.body = {
+    ctx.created({
       data: newReleaseActions,
       meta: {
         entriesAlreadyInRelease: releaseActions.length - newReleaseActions.length,
         totalEntries: releaseActions.length
       }
-    };
+    });
   },
   async findMany(ctx) {
     const releaseId = ctx.params.releaseId;
-    const permissionsManager = strapi.admin.services.permission.createPermissionsManager({
+    const permissionsManager = strapi.service("admin::permission").createPermissionsManager({
       ability: ctx.state.userAbility,
       model: RELEASE_ACTION_MODEL_UID
     });
@@ -1481,14 +1480,14 @@ const releaseActionController = {
       if (acc[action.contentType]) {
         return acc;
       }
-      const contentTypePermissionsManager = strapi.admin.services.permission.createPermissionsManager({
+      const contentTypePermissionsManager = strapi.service("admin::permission").createPermissionsManager({
         ability: ctx.state.userAbility,
         model: action.contentType
       });
       acc[action.contentType] = contentTypePermissionsManager.sanitizeOutput;
       return acc;
     }, {});
-    const sanitizedResults = await mapAsync(results, async (action) => ({
+    const sanitizedResults = await async.map(results, async (action) => ({
       ...action,
       entry: await contentTypeOutputSanitizers[action.contentType](action.entry)
     }));
@@ -1736,9 +1735,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,