@strapi/content-releases 0.0.0-experimental.d362bf200f5f9359a4bbd4a549603de5ee1f04ca → 0.0.0-experimental.d5b46d578a5c055b8dcc66939e1b5d540976fafb

package/dist/server/index.mjs

@@ -1,7 +1,8 @@
-import { contentTypes as contentTypes$1, async, setCreatorFields, errors, validateYupSchema, yup as yup$1 } from "@strapi/utils";
+import { contentTypes as contentTypes$1, mapAsync, 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";
@@ -59,10 +60,7 @@ 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.db.query(contentTypeUid).findOne({
-    where: { id: entryId },
-    populate
-  });
+  const entry = await strapi2.entityService.findOne(contentTypeUid, entryId, { populate });
   return entry;
 };
 const getEntryValidStatus = async (contentTypeUid, entry, { strapi: strapi2 } = { strapi: global.strapi }) => {
@@ -100,7 +98,7 @@ async function deleteActionsOnDisableDraftAndPublish({
 async function deleteActionsOnDeleteContentType({ oldContentTypes, contentTypes: contentTypes2 }) {
   const deletedContentTypes = difference(keys(oldContentTypes), keys(contentTypes2)) ?? [];
   if (deletedContentTypes.length) {
-    await async.map(deletedContentTypes, async (deletedContentTypeUID) => {
+    await mapAsync(deletedContentTypes, async (deletedContentTypeUID) => {
       return strapi.db?.queryBuilder(RELEASE_ACTION_MODEL_UID).delete().where({ contentType: deletedContentTypeUID }).execute();
     });
   }
@@ -119,7 +117,7 @@ async function migrateIsValidAndStatusReleases() {
       }
     }
   });
-  async.map(releasesWithoutStatus, async (release2) => {
+  mapAsync(releasesWithoutStatus, async (release2) => {
     const actions = release2.actions;
     const notValidatedActions = actions.filter((action) => action.isEntryValid === null);
     for (const action of notValidatedActions) {
@@ -150,7 +148,7 @@ async function migrateIsValidAndStatusReleases() {
       }
     }
   });
-  async.map(publishedReleases, async (release2) => {
+  mapAsync(publishedReleases, async (release2) => {
     return strapi.db.query(RELEASE_MODEL_UID).update({
       where: {
         id: release2.id
@@ -167,7 +165,7 @@ async function revalidateChangedContentTypes({ oldContentTypes, contentTypes: co
       (uid) => oldContentTypes[uid]?.options?.draftAndPublish
     );
     const releasesAffected = /* @__PURE__ */ new Set();
-    async.map(contentTypesWithDraftAndPublish, async (contentTypeUID) => {
+    mapAsync(contentTypesWithDraftAndPublish, async (contentTypeUID) => {
       const oldContentType = oldContentTypes[contentTypeUID];
       const contentType = contentTypes2[contentTypeUID];
       if (!isEqual(oldContentType?.attributes, contentType?.attributes)) {
@@ -180,7 +178,7 @@ async function revalidateChangedContentTypes({ oldContentTypes, contentTypes: co
             release: true
           }
         });
-        await async.map(actions, async (action) => {
+        await mapAsync(actions, async (action) => {
           if (action.entry && action.release) {
             const populatedEntry = await getPopulatedEntry(contentTypeUID, action.entry.id, {
               strapi
@@ -203,7 +201,7 @@ async function revalidateChangedContentTypes({ oldContentTypes, contentTypes: co
         });
       }
     }).then(() => {
-      async.map(releasesAffected, async (releaseId) => {
+      mapAsync(releasesAffected, async (releaseId) => {
         return getService("release", { strapi }).updateReleaseStatus(releaseId);
       });
     });
@@ -249,10 +247,11 @@ async function enableContentTypeLocalized({ oldContentTypes, contentTypes: conte
     }
   }
 }
+const { features: features$2 } = require("@strapi/strapi/dist/utils/ee");
 const register = async ({ strapi: strapi2 }) => {
-  if (strapi2.ee.features.isEnabled("cms-content-releases")) {
+  if (features$2.isEnabled("cms-content-releases")) {
     await strapi2.admin.services.permission.actionProvider.registerMany(ACTIONS);
-    strapi2.hook("strapi::content-types.beforeSync").register(disableContentTypeLocalized).register(deleteActionsOnDisableDraftAndPublish);
+    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")) {
@@ -261,8 +260,9 @@ 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 (strapi2.ee.features.isEnabled("cms-content-releases")) {
+  if (features$1.isEnabled("cms-content-releases")) {
     const contentTypesWithDraftAndPublish = Object.keys(strapi2.contentTypes).filter(
       (uid) => strapi2.contentTypes[uid]?.options?.draftAndPublish
     );
@@ -321,7 +321,9 @@ const bootstrap = async ({ strapi: strapi2 }) => {
                 actions: {
                   target_type: model.uid,
                   target_id: {
-                    $in: entriesToDelete.map((entry) => entry.id)
+                    $in: entriesToDelete.map(
+                      (entry) => entry.id
+                    )
                   }
                 }
               }
@@ -348,9 +350,13 @@ 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,
@@ -619,7 +625,7 @@ const createReleaseService = ({ strapi: strapi2 }) => {
         validateUniqueNameForPendingRelease(releaseWithCreatorFields.name),
         validateScheduledAtIsLaterThanNow(releaseWithCreatorFields.scheduledAt)
       ]);
-      const release2 = await strapi2.db.query(RELEASE_MODEL_UID).create({
+      const release2 = await strapi2.entityService.create(RELEASE_MODEL_UID, {
         data: {
           ...releaseWithCreatorFields,
           status: "empty"
@@ -633,19 +639,17 @@ const createReleaseService = ({ strapi: strapi2 }) => {
       return release2;
     },
     async findOne(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 }
+      const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, id, {
+        ...query
       });
       return release2;
     },
     findPage(query) {
-      const dbQuery = strapi2.get("query-params").transform(RELEASE_MODEL_UID, query ?? {});
-      return strapi2.db.query(RELEASE_MODEL_UID).findPage({
-        ...dbQuery,
+      return strapi2.entityService.findPage(RELEASE_MODEL_UID, {
+        ...query,
         populate: {
           actions: {
+            // @ts-expect-error Ignore missing properties
             count: true
           }
         }
@@ -737,15 +741,19 @@ const createReleaseService = ({ strapi: strapi2 }) => {
         validateUniqueNameForPendingRelease(releaseWithCreatorFields.name, id),
         validateScheduledAtIsLaterThanNow(releaseWithCreatorFields.scheduledAt)
       ]);
-      const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({ where: { id } });
+      const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, 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.db.query(RELEASE_MODEL_UID).update({
-        where: { id },
+      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
         data: releaseWithCreatorFields
       });
       const schedulingService = getService("scheduling", { strapi: strapi2 });
@@ -766,7 +774,7 @@ const createReleaseService = ({ strapi: strapi2 }) => {
         validateEntryContentType(action.entry.contentType),
         validateUniqueEntry(releaseId, action)
       ]);
-      const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({ where: { id: releaseId } });
+      const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId);
       if (!release2) {
         throw new errors.NotFoundError(`No release found for id ${releaseId}`);
       }
@@ -776,7 +784,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.db.query(RELEASE_ACTION_MODEL_UID).create({
+      const releaseAction2 = await strapi2.entityService.create(RELEASE_ACTION_MODEL_UID, {
         data: {
           type,
           contentType: entry.contentType,
@@ -789,35 +797,32 @@ const createReleaseService = ({ strapi: strapi2 }) => {
           },
           release: releaseId
         },
-        populate: { release: { select: ["id"] }, entry: { select: ["id"] } }
+        populate: { release: { fields: ["id"] }, entry: { fields: ["id"] } }
       });
       this.updateReleaseStatus(releaseId);
       return releaseAction2;
     },
     async findActions(releaseId, query) {
-      const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({
-        where: { id: releaseId },
-        select: ["id"]
+      const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
+        fields: ["id"]
       });
       if (!release2) {
         throw new errors.NotFoundError(`No release found for id ${releaseId}`);
       }
-      const dbQuery = strapi2.get("query-params").transform(RELEASE_ACTION_MODEL_UID, query ?? {});
-      return strapi2.db.query(RELEASE_ACTION_MODEL_UID).findPage({
-        ...dbQuery,
+      return strapi2.entityService.findPage(RELEASE_ACTION_MODEL_UID, {
+        ...query,
         populate: {
           entry: {
             populate: "*"
           }
         },
-        where: {
+        filters: {
           release: releaseId
         }
       });
     },
     async countActions(query) {
-      const dbQuery = strapi2.get("query-params").transform(RELEASE_ACTION_MODEL_UID, query ?? {});
-      return strapi2.db.query(RELEASE_ACTION_MODEL_UID).count(dbQuery);
+      return strapi2.entityService.count(RELEASE_ACTION_MODEL_UID, query);
     },
     async groupActions(actions, groupBy) {
       const contentTypeUids = actions.reduce((acc, action) => {
@@ -898,11 +903,10 @@ const createReleaseService = ({ strapi: strapi2 }) => {
       return componentsMap;
     },
     async delete(releaseId) {
-      const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({
-        where: { id: releaseId },
+      const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
         populate: {
           actions: {
-            select: ["id"]
+            fields: ["id"]
           }
         }
       });
@@ -920,11 +924,7 @@ const createReleaseService = ({ strapi: strapi2 }) => {
             }
           }
         });
-        await strapi2.db.query(RELEASE_MODEL_UID).delete({
-          where: {
-            id: releaseId
-          }
-        });
+        await strapi2.entityService.delete(RELEASE_MODEL_UID, releaseId);
       });
       if (release2.scheduledAt) {
         const schedulingService = getService("scheduling", { strapi: strapi2 });
@@ -995,7 +995,7 @@ const createReleaseService = ({ strapi: strapi2 }) => {
           };
         }
       });
-      if (error instanceof Error) {
+      if (error) {
         throw error;
       }
       return release2;
@@ -1093,11 +1093,8 @@ class AlreadyOnReleaseError extends errors.ApplicationError {
 }
 const createReleaseValidationService = ({ strapi: strapi2 }) => ({
   async validateUniqueEntry(releaseId, releaseActionArgs) {
-    const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({
-      where: {
-        id: releaseId
-      },
-      populate: { actions: { populate: { entry: { select: ["id"] } } } }
+    const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
+      populate: { actions: { populate: { entry: { fields: ["id"] } } } }
     });
     if (!release2) {
       throw new errors.NotFoundError(`No release found for id ${releaseId}`);
@@ -1123,7 +1120,10 @@ const createReleaseValidationService = ({ strapi: strapi2 }) => ({
     }
   },
   async validatePendingReleasesLimit() {
-    const maximumPendingReleases = strapi2.ee.features.get("cms-content-releases")?.options?.maximumReleases || 3;
+    const maximumPendingReleases = (
+      // @ts-expect-error - options is not typed into features
+      EE.features.get("cms-content-releases")?.options?.maximumReleases || 3
+    );
     const [, pendingReleasesCount] = await strapi2.db.query(RELEASE_MODEL_UID).findWithCount({
       filters: {
         releasedAt: {
@@ -1136,8 +1136,8 @@ const createReleaseValidationService = ({ strapi: strapi2 }) => ({
     }
   },
   async validateUniqueNameForPendingRelease(name, id) {
-    const pendingReleases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
-      where: {
+    const pendingReleases = await strapi2.entityService.findMany(RELEASE_MODEL_UID, {
+      filters: {
         releasedAt: {
           $null: true
         },
@@ -1264,7 +1264,7 @@ const releaseController = {
           }
         };
       });
-      const pendingReleasesCount = await strapi.db.query(RELEASE_MODEL_UID).count({
+      const pendingReleasesCount = await strapi.query(RELEASE_MODEL_UID).count({
         where: {
           releasedAt: null
         }
@@ -1442,7 +1442,7 @@ const releaseActionController = {
       acc[action.contentType] = contentTypePermissionsManager.sanitizeOutput;
       return acc;
     }, {});
-    const sanitizedResults = await async.map(results, async (action) => ({
+    const sanitizedResults = await mapAsync(results, async (action) => ({
       ...action,
       entry: await contentTypeOutputSanitizers[action.contentType](action.entry)
     }));
@@ -1674,8 +1674,9 @@ const routes = {
   release,
   "release-action": releaseAction
 };
+const { features } = require("@strapi/strapi/dist/utils/ee");
 const getPlugin = () => {
-  if (strapi.ee.features.isEnabled("cms-content-releases")) {
+  if (features.isEnabled("cms-content-releases")) {
     return {
       register,
       bootstrap,