strapi-plugin-meilisearch 0.13.3 → 0.14.0

package/README.md

@@ -19,7 +19,6 @@
   <a href="https://github.com/meilisearch/strapi-plugin-meilisearch/actions"><img src="https://github.com/meilisearch/strapi-plugin-meilisearch/workflows/Tests/badge.svg" alt="Tests"></a>
   <a href="https://github.com/prettier/prettier"><img src="https://img.shields.io/badge/styled_with-prettier-ff69b4.svg" alt="Prettier"></a>
   <a href="https://github.com/meilisearch/strapi-plugin-meilisearch/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MIT-informational" alt="License"></a>
-  <a href="https://ms-bors.herokuapp.com/repositories/7"><img src="https://bors.tech/images/badge_small.svg" alt="Bors enabled"></a>
 </p>
 
 <p align="center">⚡ The Meilisearch plugin for Strapi</p>
@@ -614,7 +613,7 @@ yarn playground:build # Build the playground
 yarn playground:dev # Start the development server
 ```
 
-This command will install the required dependencies and launch the app in development mode. You should be able to reach it on the [port 8000 of your localhost](http://localhost:8000/admin/).
+This command will install the required dependencies and launch the app in development mode. You should be able to reach it on the [port 1337 of your localhost](http://localhost:1337/admin/).
 
 ## 🤖 Compatibility with Meilisearch and Strapi
 

package/dist/_chunks/{App-Bx6jJvL9.js → App-Dn6EGme8.js}

@@ -4,7 +4,7 @@ const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
 const reactRouterDom = require("react-router-dom");
 const admin = require("@strapi/strapi/admin");
-const index = require("./index-MhpvuJMV.js");
+const index = require("./index-ClWytIVb.js");
 const designSystem = require("@strapi/design-system");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -456,6 +456,21 @@ function useAlert() {
     blockTransition = true,
     title
   }) {
+    const docsLabel = i18n(
+      "plugin.message.error.meilisearchDocsLink",
+      "See more"
+    );
+    let normalizedLink = link;
+    if (link && link.label && typeof link.label === "object") {
+      const { id, defaultMessage } = link.label;
+      const normalizedId = id?.replace(new RegExp(`^${index.pluginId}\\.`), "") || id;
+      normalizedLink = {
+        ...link,
+        label: i18n(normalizedId, defaultMessage)
+      };
+    } else if (link && link.url && !link.label) {
+      normalizedLink = { ...link, label: docsLabel };
+    }
     toggleNotification({
       // optional
       title,
@@ -465,7 +480,7 @@ function useAlert() {
       // required
       message: i18n("notification.meilisearch.message", message),
       // optional
-      link,
+      link: normalizedLink,
       // optional: default = false
       blockTransition,
       // optional

package/dist/_chunks/{App-B5q9mEPQ.mjs → App-d1i42zIj.mjs}

@@ -3,7 +3,7 @@ import * as React from "react";
 import { useState, useEffect, memo } from "react";
 import { Routes, Route } from "react-router-dom";
 import { useNotification, useFetchClient, useRBAC, private_useAutoReloadOverlayBlocker, private_AutoReloadOverlayBlockerProvider, Page, Layouts, BackButton } from "@strapi/strapi/admin";
-import { p as pluginId, P as PERMISSIONS } from "./index-EQZ5QLS6.mjs";
+import { p as pluginId, P as PERMISSIONS } from "./index-CpAkqqV6.mjs";
 import { Tr, Td, Checkbox, Typography, Flex, Box, Button, Thead, Th, VisuallyHidden, Table, Tbody, Field, Link, Tabs } from "@strapi/design-system";
 var __assign = function() {
   __assign = Object.assign || function __assign2(t) {
@@ -437,6 +437,21 @@ function useAlert() {
     blockTransition = true,
     title
   }) {
+    const docsLabel = i18n(
+      "plugin.message.error.meilisearchDocsLink",
+      "See more"
+    );
+    let normalizedLink = link;
+    if (link && link.label && typeof link.label === "object") {
+      const { id, defaultMessage } = link.label;
+      const normalizedId = id?.replace(new RegExp(`^${pluginId}\\.`), "") || id;
+      normalizedLink = {
+        ...link,
+        label: i18n(normalizedId, defaultMessage)
+      };
+    } else if (link && link.url && !link.label) {
+      normalizedLink = { ...link, label: docsLabel };
+    }
     toggleNotification({
       // optional
       title,
@@ -446,7 +461,7 @@ function useAlert() {
       // required
       message: i18n("notification.meilisearch.message", message),
       // optional
-      link,
+      link: normalizedLink,
       // optional: default = false
       blockTransition,
       // optional

package/dist/_chunks/{en-D4dIehJl.mjs → en-BKKKU9na.mjs}

@@ -31,7 +31,8 @@ const en = {
   "plugin.message.success.credentials": "Credentials successfully updated!",
   "plugin.message.something": "Something occurred in Meilisearch",
   "plugin.message.forbidden.title": "Forbidden",
-  "plugin.message.forbidden.description": "You do not have permission to do this action"
+  "plugin.message.forbidden.description": "You do not have permission to do this action",
+  "plugin.message.error.meilisearchDocsLink": "See more"
 };
 export {
   en as default

package/dist/_chunks/{en-CByedxRT.js → en-CQvxkk9b.js}

@@ -33,6 +33,7 @@ const en = {
   "plugin.message.success.credentials": "Credentials successfully updated!",
   "plugin.message.something": "Something occurred in Meilisearch",
   "plugin.message.forbidden.title": "Forbidden",
-  "plugin.message.forbidden.description": "You do not have permission to do this action"
+  "plugin.message.forbidden.description": "You do not have permission to do this action",
+  "plugin.message.error.meilisearchDocsLink": "See more"
 };
 exports.default = en;

package/dist/_chunks/{es-DA_jpbS7.js → es-D61ltG8N.js}

@@ -33,6 +33,7 @@ const es = {
   "plugin.message.success.credentials": "¡Credenciales actualizadas con éxito!",
   "plugin.message.something": "Algo ha ocurrido en Meilisearch",
   "plugin.message.forbidden.title": "Prohibido",
-  "plugin.message.forbidden.description": "No tiene permiso para realizar esta acción"
+  "plugin.message.forbidden.description": "No tiene permiso para realizar esta acción",
+  "plugin.message.error.meilisearchDocsLink": "Ver más"
 };
 exports.default = es;

package/dist/_chunks/{es-B-4TrEJr.mjs → es-DvPal5Gh.mjs}

@@ -31,7 +31,8 @@ const es = {
   "plugin.message.success.credentials": "¡Credenciales actualizadas con éxito!",
   "plugin.message.something": "Algo ha ocurrido en Meilisearch",
   "plugin.message.forbidden.title": "Prohibido",
-  "plugin.message.forbidden.description": "No tiene permiso para realizar esta acción"
+  "plugin.message.forbidden.description": "No tiene permiso para realizar esta acción",
+  "plugin.message.error.meilisearchDocsLink": "Ver más"
 };
 export {
   es as default

package/dist/_chunks/{index-MhpvuJMV.js → index-ClWytIVb.js}

@@ -19,21 +19,23 @@ const __variableDynamicImportRuntimeHelper = (glob, path, segs) => {
   });
 };
 const name$1 = "strapi-plugin-meilisearch";
-const version = "0.13.3";
+const version = "0.14.0";
 const description = "Synchronise and search in your Strapi content-types with Meilisearch";
 const scripts = {
   build: "strapi-plugin build",
   verify: "strapi-plugin verify",
   watch: "strapi-plugin watch",
   "watch:link": "strapi-plugin watch:link",
-  "playground:dev": "yarn --cwd ./playground && yarn --cwd ./playground dev",
+  "playground:setup": "yarn --cwd ./playground setup",
+  "playground:dev": "yarn --cwd ./playground dev",
   "playground:build": "yarn --cwd ./playground && yarn --cwd ./playground build",
   "playground:ci": "yarn --cwd ./playground ci",
   style: "eslint --ext .js,.test.js .",
   "style:fix": "eslint --ext .js,.test.js . --fix",
   test: "jest --testPathPattern=tests",
   "test:watch": "jest --watch --testPathPattern=tests --verbose",
-  "test:e2e:watch": 'concurrently --kill-others -s first "NODE_ENV=test yarn playground:dev" "cypress open --env env=watch"'
+  "test:e2e": 'concurrently --kill-others -s first "yarn playground:dev" "cypress run"',
+  "test:integrations": "jest -c jest.integration.config.js"
 };
 const strapi = {
   name: "meilisearch",
@@ -81,7 +83,7 @@ const devDependencies = {
   "@types/jest": "^29.5.12",
   "babel-jest": "^29.7.0",
   concurrently: "^8.2.2",
-  cypress: "^14.0.1",
+  cypress: "^15.3.0",
   eslint: "^8.2.0",
   "eslint-config-prettier": "^9.1.0",
   "eslint-plugin-cypress": "^2.12.1",
@@ -211,7 +213,7 @@ const index = {
         defaultMessage: name
       },
       Component: async () => {
-        const { App } = await Promise.resolve().then(() => require("./App-Bx6jJvL9.js"));
+        const { App } = await Promise.resolve().then(() => require("./App-Dn6EGme8.js"));
         return App;
       },
       permissions: PERMISSIONS.main
@@ -220,7 +222,7 @@ const index = {
   async registerTrads({ locales }) {
     const importedTranslations = await Promise.all(
       locales.map((locale) => {
-        return __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => Promise.resolve().then(() => require("./en-CByedxRT.js")), "./translations/es.json": () => Promise.resolve().then(() => require("./es-DA_jpbS7.js")) }), `./translations/${locale}.json`, 3).then(({ default: data }) => {
+        return __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => Promise.resolve().then(() => require("./en-CQvxkk9b.js")), "./translations/es.json": () => Promise.resolve().then(() => require("./es-D61ltG8N.js")) }), `./translations/${locale}.json`, 3).then(({ default: data }) => {
           return {
             data: getTranslation(data),
             locale

package/dist/_chunks/{index-EQZ5QLS6.mjs → index-CpAkqqV6.mjs}

@@ -18,21 +18,23 @@ const __variableDynamicImportRuntimeHelper = (glob, path, segs) => {
   });
 };
 const name$1 = "strapi-plugin-meilisearch";
-const version = "0.13.3";
+const version = "0.14.0";
 const description = "Synchronise and search in your Strapi content-types with Meilisearch";
 const scripts = {
   build: "strapi-plugin build",
   verify: "strapi-plugin verify",
   watch: "strapi-plugin watch",
   "watch:link": "strapi-plugin watch:link",
-  "playground:dev": "yarn --cwd ./playground && yarn --cwd ./playground dev",
+  "playground:setup": "yarn --cwd ./playground setup",
+  "playground:dev": "yarn --cwd ./playground dev",
   "playground:build": "yarn --cwd ./playground && yarn --cwd ./playground build",
   "playground:ci": "yarn --cwd ./playground ci",
   style: "eslint --ext .js,.test.js .",
   "style:fix": "eslint --ext .js,.test.js . --fix",
   test: "jest --testPathPattern=tests",
   "test:watch": "jest --watch --testPathPattern=tests --verbose",
-  "test:e2e:watch": 'concurrently --kill-others -s first "NODE_ENV=test yarn playground:dev" "cypress open --env env=watch"'
+  "test:e2e": 'concurrently --kill-others -s first "yarn playground:dev" "cypress run"',
+  "test:integrations": "jest -c jest.integration.config.js"
 };
 const strapi = {
   name: "meilisearch",
@@ -80,7 +82,7 @@ const devDependencies = {
   "@types/jest": "^29.5.12",
   "babel-jest": "^29.7.0",
   concurrently: "^8.2.2",
-  cypress: "^14.0.1",
+  cypress: "^15.3.0",
   eslint: "^8.2.0",
   "eslint-config-prettier": "^9.1.0",
   "eslint-plugin-cypress": "^2.12.1",
@@ -210,7 +212,7 @@ const index = {
         defaultMessage: name
       },
       Component: async () => {
-        const { App } = await import("./App-B5q9mEPQ.mjs");
+        const { App } = await import("./App-d1i42zIj.mjs");
         return App;
       },
       permissions: PERMISSIONS.main
@@ -219,7 +221,7 @@ const index = {
   async registerTrads({ locales }) {
     const importedTranslations = await Promise.all(
       locales.map((locale) => {
-        return __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => import("./en-D4dIehJl.mjs"), "./translations/es.json": () => import("./es-B-4TrEJr.mjs") }), `./translations/${locale}.json`, 3).then(({ default: data }) => {
+        return __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => import("./en-BKKKU9na.mjs"), "./translations/es.json": () => import("./es-DvPal5Gh.mjs") }), `./translations/${locale}.json`, 3).then(({ default: data }) => {
           return {
             data: getTranslation(data),
             locale

package/dist/admin/index.js

@@ -1,3 +1,3 @@
 "use strict";
-const index = require("../_chunks/index-MhpvuJMV.js");
+const index = require("../_chunks/index-ClWytIVb.js");
 module.exports = index.index;

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-import { i } from "../_chunks/index-EQZ5QLS6.mjs";
+import { i } from "../_chunks/index-CpAkqqV6.mjs";
 export {
   i as default
 };

package/dist/server/index.js

@@ -90,7 +90,84 @@ const bootstrap = async ({ strapi: strapi2 }) => {
 };
 const destroy = () => {
 };
-const register = () => {
+async function registerDocumentMiddleware({ strapi: strapi2 }) {
+  if (!strapi2?.documents || typeof strapi2.documents.use !== "function") {
+    return;
+  }
+  strapi2.documents.use(async (ctx, next) => {
+    let result;
+    try {
+      const plugin = strapi2.plugin("meilisearch");
+      const store2 = plugin.service("store");
+      const meilisearch2 = plugin.service("meilisearch");
+      const contentTypeService2 = plugin.service("contentType");
+      const listenedContentTypes2 = await store2.getListenedContentTypes();
+      if (!listenedContentTypes2.includes(ctx.uid)) {
+        return next();
+      }
+      const contentType2 = ctx.uid;
+      const updateActions = ["create", "update", "publish"];
+      const deleteActions = [
+        "delete",
+        "deleteMany",
+        "deleteOne",
+        "deleteDocument",
+        "unpublish",
+        "discardDraft"
+      ];
+      const preDeleteDocumentId = deleteActions.includes(ctx.action) && (ctx?.params?.documentId ?? ctx?.params?.id) ? ctx.params.documentId ?? ctx.params.id : null;
+      const preDeleteEntry = preDeleteDocumentId != null ? await contentTypeService2.getEntry({
+        contentType: contentType2,
+        documentId: preDeleteDocumentId,
+        entriesQuery: {}
+      }) : null;
+      result = await next();
+      const id = result?.id ?? preDeleteEntry?.id;
+      const documentId = result?.documentId ?? preDeleteEntry?.documentId ?? preDeleteDocumentId ?? null;
+      if (updateActions.includes(ctx.action) && documentId != null) {
+        const entriesQuery = meilisearch2.entriesQuery({ contentType: contentType2 });
+        const entry = await contentTypeService2.getEntry({
+          contentType: contentType2,
+          documentId,
+          entriesQuery: { ...entriesQuery }
+        });
+        if (entry) {
+          await meilisearch2.updateEntriesInMeilisearch({
+            contentType: contentType2,
+            entries: [{ ...entry, id, documentId }]
+          });
+        } else if (id != null) {
+          await meilisearch2.deleteEntriesFromMeiliSearch({
+            contentType: contentType2,
+            entriesId: [id]
+          });
+        }
+      } else if (deleteActions.includes(ctx.action)) {
+        if (id != null) {
+          strapi2.log.info(
+            `Meilisearch document middleware deleting ${contentType2} ids=${id}`
+          );
+          await meilisearch2.deleteEntriesFromMeiliSearch({
+            contentType: contentType2,
+            entriesId: [id]
+          });
+        } else {
+          strapi2.log.info(
+            `Meilisearch document middleware could not delete ${contentType2} for action ${ctx.action}: missing id`
+          );
+        }
+      }
+      return result;
+    } catch (error2) {
+      strapi2.log.error(
+        `Meilisearch document middleware error: ${error2.message}`
+      );
+      return result;
+    }
+  });
+}
+const register = async ({ strapi: strapi2 }) => {
+  await registerDocumentMiddleware({ strapi: strapi2 });
 };
 function isObject(elem) {
   return typeof elem === "object" && !Array.isArray(elem) && elem !== null;
@@ -724,20 +801,23 @@ const contentTypeService = ({ strapi: strapi2 }) => ({
    * @param  {object} [options.entriesQuery={}] - Options to apply when fetching entries from the database.
    * @param  {string | string[]} [options.entriesQuery.fields] - Fields present in the returned entry.
    * @param  {object} [options.entriesQuery.populate] - Relations, components and dynamic zones to populate.
-   * @param  {object} [options.entriesQuery.locale] - When using internalization, the language to fetch.
+   * @param  {string} [options.entriesQuery.status] - Publication state: draft or published.
+   * @param  {string} [options.entriesQuery.locale] - When using internationalization (i18n), the language to fetch.
    * @param  {string} options.contentType - Content type.
    *
    * @returns  {Promise<object>} - Entries.
    */
   async getEntry({ contentType: contentType2, documentId, entriesQuery = {} }) {
-    const { populate = "*", fields = "*" } = entriesQuery;
+    const {
+      populate = "*",
+      fields = "*",
+      status = "published",
+      locale
+    } = entriesQuery;
+    const queryOptions = { documentId, fields, populate, status, locale };
     const contentTypeUid = this.getContentTypeUid({ contentType: contentType2 });
     if (contentTypeUid === void 0) return {};
-    const entry = await strapi2.documents(contentTypeUid).findOne({
-      documentId,
-      fields,
-      populate
-    });
+    const entry = await strapi2.documents(contentTypeUid).findOne(queryOptions);
     if (entry == null) {
       strapi2.log.error(
         `Could not find entry with id ${documentId} in ${contentType2}`
@@ -758,7 +838,7 @@ const contentTypeService = ({ strapi: strapi2 }) => ({
    * @param  {object} [options.populate] - Relations, components and dynamic zones to populate.
    * @param  {object} [options.status] - Publication state: draft or published.
    * @param  {string} options.contentType - Content type.
-   * @param  {string} [options.locale] - When using internalization, the language to fetch.
+   * @param  {string} [options.locale] - When using internationalization (i18n), the language to fetch.
    *
    * @returns  {Promise<object[]>} - Entries.
    */
@@ -782,11 +862,9 @@ const contentTypeService = ({ strapi: strapi2 }) => ({
       filters,
       sort,
       populate,
-      status
+      status,
+      locale
     };
-    if (locale) {
-      queryOptions.locale = locale;
-    }
     const entries = await strapi2.documents(contentTypeUid).findMany(queryOptions);
     if (entries && !Array.isArray(entries)) return [entries];
     return entries || [];
@@ -1341,7 +1419,9 @@ const configurationService = ({ strapi: strapi2 }) => {
       if (entriesQuery.status === "draft") {
         return entries;
       } else {
-        return entries.filter((entry) => !(entry?.publishedAt === null));
+        return entries.filter(
+          (entry) => !(entry?.publishedAt === void 0 || entry?.publishedAt === null)
+        );
       }
     },
     /**
@@ -1369,7 +1449,7 @@ const configurationService = ({ strapi: strapi2 }) => {
     }
   };
 };
-const version = "0.13.3";
+const version = "0.14.0";
 const Meilisearch = (config2) => {
   return new meilisearch$1.MeiliSearch({
     ...config2,
@@ -1809,119 +1889,11 @@ const lifecycleService = ({ strapi: strapi2 }) => {
   const contentTypeService2 = strapi2.plugin("meilisearch").service("contentType");
   const store2 = strapi2.plugin("meilisearch").service("store");
   return {
-    /**
-     * Subscribe the content type to all required lifecycles
-     *
-     * @param  {object} options
-     * @param  {string} options.contentType
-     *
-     * @returns {Promise<object>}
-     */
     async subscribeContentType({ contentType: contentType2 }) {
       const contentTypeUid = contentTypeService2.getContentTypeUid({
         contentType: contentType2
       });
-      await strapi2.db.lifecycles.subscribe({
-        models: [contentTypeUid],
-        async afterCreate(event) {
-          const { result } = event;
-          const meilisearch2 = strapi2.plugin("meilisearch").service("meilisearch");
-          await meilisearch2.addEntriesToMeilisearch({
-            contentType: contentTypeUid,
-            entries: [result]
-          }).catch((e) => {
-            strapi2.log.error(
-              `Meilisearch could not add entry with id: ${result.id}: ${e.message}`
-            );
-          });
-        },
-        async afterCreateMany(event) {
-          const { result } = event;
-          const meilisearch2 = strapi2.plugin("meilisearch").service("meilisearch");
-          const nbrEntries = result.count;
-          const ids = result.ids;
-          const entries = [];
-          const BATCH_SIZE = 500;
-          for (let pos = 0; pos < nbrEntries; pos += BATCH_SIZE) {
-            const batch = await contentTypeService2.getEntries({
-              contentType: contentTypeUid,
-              start: pos,
-              limit: BATCH_SIZE,
-              filters: {
-                id: {
-                  $in: ids
-                }
-              }
-            });
-            entries.push(...batch);
-          }
-          meilisearch2.updateEntriesInMeilisearch({
-            contentType: contentTypeUid,
-            entries
-          }).catch((e) => {
-            strapi2.log.error(
-              `Meilisearch could not update the entries: ${e.message}`
-            );
-          });
-        },
-        async afterUpdate(event) {
-          const { result } = event;
-          const meilisearch2 = strapi2.plugin("meilisearch").service("meilisearch");
-          await meilisearch2.updateEntriesInMeilisearch({
-            contentType: contentTypeUid,
-            entries: [result]
-          }).catch((e) => {
-            strapi2.log.error(
-              `Meilisearch could not update entry with id: ${result.id}: ${e.message}`
-            );
-          });
-        },
-        async afterUpdateMany(event) {
-          const meilisearch2 = strapi2.plugin("meilisearch").service("meilisearch");
-          const nbrEntries = await contentTypeService2.numberOfEntries({
-            contentType: contentTypeUid,
-            filters: event.params.where
-          });
-          const entries = [];
-          const BATCH_SIZE = 500;
-          for (let pos = 0; pos < nbrEntries; pos += BATCH_SIZE) {
-            const batch = await contentTypeService2.getEntries({
-              contentType: contentTypeUid,
-              filters: event.params.where,
-              start: pos,
-              limit: BATCH_SIZE
-            });
-            entries.push(...batch);
-          }
-          meilisearch2.updateEntriesInMeilisearch({
-            contentType: contentTypeUid,
-            entries
-          }).catch((e) => {
-            strapi2.log.error(
-              `Meilisearch could not update the entries: ${e.message}`
-            );
-          });
-        },
-        async afterDelete(event) {
-          const { result, params } = event;
-          const meilisearch2 = strapi2.plugin("meilisearch").service("meilisearch");
-          let entriesId = [];
-          if (params?.where?.$and && params?.where?.$and[0] && params?.where?.$and[0].id?.$in)
-            entriesId = params?.where?.$and[0].id.$in;
-          else entriesId = [result.id];
-          meilisearch2.deleteEntriesFromMeiliSearch({
-            contentType: contentTypeUid,
-            entriesId
-          }).catch((e) => {
-            strapi2.log.error(
-              `Meilisearch could not delete entry with id: ${result.id}: ${e.message}`
-            );
-          });
-        },
-        async afterDeleteMany(event) {
-          this.afterDelete(event);
-        }
-      });
+      if (!contentTypeUid) return;
       return store2.addListenedContentType({
         contentType: contentTypeUid
       });
@@ -1943,13 +1915,7 @@ const error$1 = ({ strapi: strapi2 }) => {
         return {
           error: {
             message: e.message,
-            link: {
-              url: e.link || "https://www.meilisearch.com/docs",
-              label: {
-                id: "notification.meilisearch",
-                defaultMessage: "See more"
-              }
-            }
+            link: e.link ? { url: e.link } : { url: "https://www.meilisearch.com/docs" }
           }
         };
       } else if (e.type === "MeiliSearchCommunicationError") {

package/dist/server/index.mjs

@@ -89,7 +89,84 @@ const bootstrap = async ({ strapi: strapi2 }) => {
 };
 const destroy = () => {
 };
-const register = () => {
+async function registerDocumentMiddleware({ strapi: strapi2 }) {
+  if (!strapi2?.documents || typeof strapi2.documents.use !== "function") {
+    return;
+  }
+  strapi2.documents.use(async (ctx, next) => {
+    let result;
+    try {
+      const plugin = strapi2.plugin("meilisearch");
+      const store2 = plugin.service("store");
+      const meilisearch2 = plugin.service("meilisearch");
+      const contentTypeService2 = plugin.service("contentType");
+      const listenedContentTypes2 = await store2.getListenedContentTypes();
+      if (!listenedContentTypes2.includes(ctx.uid)) {
+        return next();
+      }
+      const contentType2 = ctx.uid;
+      const updateActions = ["create", "update", "publish"];
+      const deleteActions = [
+        "delete",
+        "deleteMany",
+        "deleteOne",
+        "deleteDocument",
+        "unpublish",
+        "discardDraft"
+      ];
+      const preDeleteDocumentId = deleteActions.includes(ctx.action) && (ctx?.params?.documentId ?? ctx?.params?.id) ? ctx.params.documentId ?? ctx.params.id : null;
+      const preDeleteEntry = preDeleteDocumentId != null ? await contentTypeService2.getEntry({
+        contentType: contentType2,
+        documentId: preDeleteDocumentId,
+        entriesQuery: {}
+      }) : null;
+      result = await next();
+      const id = result?.id ?? preDeleteEntry?.id;
+      const documentId = result?.documentId ?? preDeleteEntry?.documentId ?? preDeleteDocumentId ?? null;
+      if (updateActions.includes(ctx.action) && documentId != null) {
+        const entriesQuery = meilisearch2.entriesQuery({ contentType: contentType2 });
+        const entry = await contentTypeService2.getEntry({
+          contentType: contentType2,
+          documentId,
+          entriesQuery: { ...entriesQuery }
+        });
+        if (entry) {
+          await meilisearch2.updateEntriesInMeilisearch({
+            contentType: contentType2,
+            entries: [{ ...entry, id, documentId }]
+          });
+        } else if (id != null) {
+          await meilisearch2.deleteEntriesFromMeiliSearch({
+            contentType: contentType2,
+            entriesId: [id]
+          });
+        }
+      } else if (deleteActions.includes(ctx.action)) {
+        if (id != null) {
+          strapi2.log.info(
+            `Meilisearch document middleware deleting ${contentType2} ids=${id}`
+          );
+          await meilisearch2.deleteEntriesFromMeiliSearch({
+            contentType: contentType2,
+            entriesId: [id]
+          });
+        } else {
+          strapi2.log.info(
+            `Meilisearch document middleware could not delete ${contentType2} for action ${ctx.action}: missing id`
+          );
+        }
+      }
+      return result;
+    } catch (error2) {
+      strapi2.log.error(
+        `Meilisearch document middleware error: ${error2.message}`
+      );
+      return result;
+    }
+  });
+}
+const register = async ({ strapi: strapi2 }) => {
+  await registerDocumentMiddleware({ strapi: strapi2 });
 };
 function isObject(elem) {
   return typeof elem === "object" && !Array.isArray(elem) && elem !== null;
@@ -723,20 +800,23 @@ const contentTypeService = ({ strapi: strapi2 }) => ({
    * @param  {object} [options.entriesQuery={}] - Options to apply when fetching entries from the database.
    * @param  {string | string[]} [options.entriesQuery.fields] - Fields present in the returned entry.
    * @param  {object} [options.entriesQuery.populate] - Relations, components and dynamic zones to populate.
-   * @param  {object} [options.entriesQuery.locale] - When using internalization, the language to fetch.
+   * @param  {string} [options.entriesQuery.status] - Publication state: draft or published.
+   * @param  {string} [options.entriesQuery.locale] - When using internationalization (i18n), the language to fetch.
    * @param  {string} options.contentType - Content type.
    *
    * @returns  {Promise<object>} - Entries.
    */
   async getEntry({ contentType: contentType2, documentId, entriesQuery = {} }) {
-    const { populate = "*", fields = "*" } = entriesQuery;
+    const {
+      populate = "*",
+      fields = "*",
+      status = "published",
+      locale
+    } = entriesQuery;
+    const queryOptions = { documentId, fields, populate, status, locale };
     const contentTypeUid = this.getContentTypeUid({ contentType: contentType2 });
     if (contentTypeUid === void 0) return {};
-    const entry = await strapi2.documents(contentTypeUid).findOne({
-      documentId,
-      fields,
-      populate
-    });
+    const entry = await strapi2.documents(contentTypeUid).findOne(queryOptions);
     if (entry == null) {
       strapi2.log.error(
         `Could not find entry with id ${documentId} in ${contentType2}`
@@ -757,7 +837,7 @@ const contentTypeService = ({ strapi: strapi2 }) => ({
    * @param  {object} [options.populate] - Relations, components and dynamic zones to populate.
    * @param  {object} [options.status] - Publication state: draft or published.
    * @param  {string} options.contentType - Content type.
-   * @param  {string} [options.locale] - When using internalization, the language to fetch.
+   * @param  {string} [options.locale] - When using internationalization (i18n), the language to fetch.
    *
    * @returns  {Promise<object[]>} - Entries.
    */
@@ -781,11 +861,9 @@ const contentTypeService = ({ strapi: strapi2 }) => ({
       filters,
       sort,
       populate,
-      status
+      status,
+      locale
     };
-    if (locale) {
-      queryOptions.locale = locale;
-    }
     const entries = await strapi2.documents(contentTypeUid).findMany(queryOptions);
     if (entries && !Array.isArray(entries)) return [entries];
     return entries || [];
@@ -1340,7 +1418,9 @@ const configurationService = ({ strapi: strapi2 }) => {
       if (entriesQuery.status === "draft") {
         return entries;
       } else {
-        return entries.filter((entry) => !(entry?.publishedAt === null));
+        return entries.filter(
+          (entry) => !(entry?.publishedAt === void 0 || entry?.publishedAt === null)
+        );
       }
     },
     /**
@@ -1368,7 +1448,7 @@ const configurationService = ({ strapi: strapi2 }) => {
     }
   };
 };
-const version = "0.13.3";
+const version = "0.14.0";
 const Meilisearch = (config2) => {
   return new MeiliSearch({
     ...config2,
@@ -1808,119 +1888,11 @@ const lifecycleService = ({ strapi: strapi2 }) => {
   const contentTypeService2 = strapi2.plugin("meilisearch").service("contentType");
   const store2 = strapi2.plugin("meilisearch").service("store");
   return {
-    /**
-     * Subscribe the content type to all required lifecycles
-     *
-     * @param  {object} options
-     * @param  {string} options.contentType
-     *
-     * @returns {Promise<object>}
-     */
     async subscribeContentType({ contentType: contentType2 }) {
       const contentTypeUid = contentTypeService2.getContentTypeUid({
         contentType: contentType2
       });
-      await strapi2.db.lifecycles.subscribe({
-        models: [contentTypeUid],
-        async afterCreate(event) {
-          const { result } = event;
-          const meilisearch2 = strapi2.plugin("meilisearch").service("meilisearch");
-          await meilisearch2.addEntriesToMeilisearch({
-            contentType: contentTypeUid,
-            entries: [result]
-          }).catch((e) => {
-            strapi2.log.error(
-              `Meilisearch could not add entry with id: ${result.id}: ${e.message}`
-            );
-          });
-        },
-        async afterCreateMany(event) {
-          const { result } = event;
-          const meilisearch2 = strapi2.plugin("meilisearch").service("meilisearch");
-          const nbrEntries = result.count;
-          const ids = result.ids;
-          const entries = [];
-          const BATCH_SIZE = 500;
-          for (let pos = 0; pos < nbrEntries; pos += BATCH_SIZE) {
-            const batch = await contentTypeService2.getEntries({
-              contentType: contentTypeUid,
-              start: pos,
-              limit: BATCH_SIZE,
-              filters: {
-                id: {
-                  $in: ids
-                }
-              }
-            });
-            entries.push(...batch);
-          }
-          meilisearch2.updateEntriesInMeilisearch({
-            contentType: contentTypeUid,
-            entries
-          }).catch((e) => {
-            strapi2.log.error(
-              `Meilisearch could not update the entries: ${e.message}`
-            );
-          });
-        },
-        async afterUpdate(event) {
-          const { result } = event;
-          const meilisearch2 = strapi2.plugin("meilisearch").service("meilisearch");
-          await meilisearch2.updateEntriesInMeilisearch({
-            contentType: contentTypeUid,
-            entries: [result]
-          }).catch((e) => {
-            strapi2.log.error(
-              `Meilisearch could not update entry with id: ${result.id}: ${e.message}`
-            );
-          });
-        },
-        async afterUpdateMany(event) {
-          const meilisearch2 = strapi2.plugin("meilisearch").service("meilisearch");
-          const nbrEntries = await contentTypeService2.numberOfEntries({
-            contentType: contentTypeUid,
-            filters: event.params.where
-          });
-          const entries = [];
-          const BATCH_SIZE = 500;
-          for (let pos = 0; pos < nbrEntries; pos += BATCH_SIZE) {
-            const batch = await contentTypeService2.getEntries({
-              contentType: contentTypeUid,
-              filters: event.params.where,
-              start: pos,
-              limit: BATCH_SIZE
-            });
-            entries.push(...batch);
-          }
-          meilisearch2.updateEntriesInMeilisearch({
-            contentType: contentTypeUid,
-            entries
-          }).catch((e) => {
-            strapi2.log.error(
-              `Meilisearch could not update the entries: ${e.message}`
-            );
-          });
-        },
-        async afterDelete(event) {
-          const { result, params } = event;
-          const meilisearch2 = strapi2.plugin("meilisearch").service("meilisearch");
-          let entriesId = [];
-          if (params?.where?.$and && params?.where?.$and[0] && params?.where?.$and[0].id?.$in)
-            entriesId = params?.where?.$and[0].id.$in;
-          else entriesId = [result.id];
-          meilisearch2.deleteEntriesFromMeiliSearch({
-            contentType: contentTypeUid,
-            entriesId
-          }).catch((e) => {
-            strapi2.log.error(
-              `Meilisearch could not delete entry with id: ${result.id}: ${e.message}`
-            );
-          });
-        },
-        async afterDeleteMany(event) {
-          this.afterDelete(event);
-        }
-      });
+      if (!contentTypeUid) return;
       return store2.addListenedContentType({
         contentType: contentTypeUid
       });
@@ -1942,13 +1914,7 @@ const error$1 = ({ strapi: strapi2 }) => {
         return {
           error: {
             message: e.message,
-            link: {
-              url: e.link || "https://www.meilisearch.com/docs",
-              label: {
-                id: "notification.meilisearch",
-                defaultMessage: "See more"
-              }
-            }
+            link: e.link ? { url: e.link } : { url: "https://www.meilisearch.com/docs" }
           }
         };
       } else if (e.type === "MeiliSearchCommunicationError") {

package/package.json

@@ -1,20 +1,22 @@
 {
   "name": "strapi-plugin-meilisearch",
-  "version": "0.13.3",
+  "version": "0.14.0",
   "description": "Synchronise and search in your Strapi content-types with Meilisearch",
   "scripts": {
     "build": "strapi-plugin build",
     "verify": "strapi-plugin verify",
     "watch": "strapi-plugin watch",
     "watch:link": "strapi-plugin watch:link",
-    "playground:dev": "yarn --cwd ./playground && yarn --cwd ./playground dev",
+    "playground:setup": "yarn --cwd ./playground setup",
+    "playground:dev": "yarn --cwd ./playground dev",
     "playground:build": "yarn --cwd ./playground && yarn --cwd ./playground build",
     "playground:ci": "yarn --cwd ./playground ci",
     "style": "eslint --ext .js,.test.js .",
     "style:fix": "eslint --ext .js,.test.js . --fix",
     "test": "jest --testPathPattern=tests",
     "test:watch": "jest --watch --testPathPattern=tests --verbose",
-    "test:e2e:watch": "concurrently --kill-others -s first \"NODE_ENV=test yarn playground:dev\" \"cypress open --env env=watch\""
+    "test:e2e": "concurrently --kill-others -s first \"yarn playground:dev\" \"cypress run\"",
+    "test:integrations": "jest -c jest.integration.config.js"
   },
   "strapi": {
     "name": "meilisearch",
@@ -62,7 +64,7 @@
     "@types/jest": "^29.5.12",
     "babel-jest": "^29.7.0",
     "concurrently": "^8.2.2",
-    "cypress": "^14.0.1",
+    "cypress": "^15.3.0",
     "eslint": "^8.2.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-cypress": "^2.12.1",