strapi-plugin-meilisearch 0.15.0 → 0.16.1

package/dist/_chunks/{App-DEDEzxD1.mjs → App-sobdRlxo.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-DuX8ujje.mjs";
+import { p as pluginId, P as PERMISSIONS } from "./index-CajY83vq.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) {

package/dist/_chunks/{App-DqXRl-ux.js → App-zelJ7Obw.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-D_Ao_M3T.js");
+const index = require("./index-KTMW2G6w.js");
 const designSystem = require("@strapi/design-system");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;

package/dist/_chunks/{index-DuX8ujje.mjs → index-CajY83vq.mjs}

@@ -18,7 +18,7 @@ const __variableDynamicImportRuntimeHelper = (glob, path, segs) => {
   });
 };
 const name$1 = "strapi-plugin-meilisearch";
-const version = "0.15.0";
+const version = "0.16.1";
 const description = "Synchronise and search in your Strapi content-types with Meilisearch";
 const scripts = {
   build: "strapi-plugin build",
@@ -82,6 +82,7 @@ const devDependencies = {
   "@strapi/strapi": "^5.6.0",
   "@types/jest": "^30.0.0",
   "babel-jest": "^30.2.0",
+  "better-sqlite3": "^12.8.0",
   concurrently: "^9.2.1",
   cypress: "^15.11.0",
   eslint: "^10.0.2",
@@ -214,7 +215,7 @@ const index = {
         defaultMessage: name
       },
       Component: async () => {
-        const { App } = await import("./App-DEDEzxD1.mjs");
+        const { App } = await import("./App-sobdRlxo.mjs");
         return App;
       },
       permissions: PERMISSIONS.main

package/dist/_chunks/{index-D_Ao_M3T.js → index-KTMW2G6w.js}

@@ -19,7 +19,7 @@ const __variableDynamicImportRuntimeHelper = (glob, path, segs) => {
   });
 };
 const name$1 = "strapi-plugin-meilisearch";
-const version = "0.15.0";
+const version = "0.16.1";
 const description = "Synchronise and search in your Strapi content-types with Meilisearch";
 const scripts = {
   build: "strapi-plugin build",
@@ -83,6 +83,7 @@ const devDependencies = {
   "@strapi/strapi": "^5.6.0",
   "@types/jest": "^30.0.0",
   "babel-jest": "^30.2.0",
+  "better-sqlite3": "^12.8.0",
   concurrently: "^9.2.1",
   cypress: "^15.11.0",
   eslint: "^10.0.2",
@@ -215,7 +216,7 @@ const index = {
         defaultMessage: name
       },
       Component: async () => {
-        const { App } = await Promise.resolve().then(() => require("./App-DqXRl-ux.js"));
+        const { App } = await Promise.resolve().then(() => require("./App-zelJ7Obw.js"));
         return App;
       },
       permissions: PERMISSIONS.main

package/dist/admin/index.js

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

package/dist/admin/index.mjs

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

package/dist/server/index.js

@@ -94,6 +94,84 @@ async function registerDocumentMiddleware({ strapi: strapi2 }) {
   if (!strapi2?.documents || typeof strapi2.documents.use !== "function") {
     return;
   }
+  const extractEntryCandidates = (result) => {
+    if (result == null) return [];
+    const candidates = [];
+    const appendCandidate = (data, source) => {
+      if (data != null && typeof data === "object") {
+        candidates.push({ data, source });
+      }
+    };
+    if (Array.isArray(result)) {
+      result.forEach((data) => appendCandidate(data, "root"));
+      return candidates;
+    }
+    appendCandidate(result, "root");
+    if (Array.isArray(result.versions)) {
+      result.versions.forEach((data) => appendCandidate(data, "versions"));
+    }
+    if (Array.isArray(result.entries)) {
+      result.entries.forEach((data) => appendCandidate(data, "entries"));
+    }
+    if (result.entry != null) {
+      appendCandidate(result.entry, "entry");
+    }
+    return candidates;
+  };
+  const isPublishedEntry = (entry) => !(entry?.publishedAt === void 0 || entry?.publishedAt === null);
+  const rankEntryCandidates = (candidates) => {
+    return [...candidates].sort((a, b) => {
+      const aHasPrimaryKey = a.data?.id != null;
+      const bHasPrimaryKey = b.data?.id != null;
+      if (aHasPrimaryKey && !bHasPrimaryKey) return -1;
+      if (!aHasPrimaryKey && bHasPrimaryKey) return 1;
+      const aIsRoot = a.source === "root";
+      const bIsRoot = b.source === "root";
+      if (!aIsRoot && bIsRoot) return -1;
+      if (aIsRoot && !bIsRoot) return 1;
+      return 0;
+    });
+  };
+  const getEntryFromResult = ({
+    resultCandidates,
+    documentId,
+    entriesQuery
+  }) => {
+    const documentCandidates = (resultCandidates || []).filter(
+      (candidate) => candidate?.data?.documentId === documentId
+    );
+    if (documentCandidates.length === 0) return null;
+    const rankedCandidates = rankEntryCandidates(documentCandidates);
+    if (entriesQuery?.status === "draft") {
+      const draftCandidate = rankedCandidates.find(
+        (candidate) => !isPublishedEntry(candidate.data)
+      );
+      return draftCandidate?.data || rankedCandidates[0]?.data || null;
+    }
+    const publishedCandidate = rankedCandidates.find(
+      (candidate) => isPublishedEntry(candidate.data)
+    );
+    return publishedCandidate?.data || null;
+  };
+  const getEntryOutsideTransaction = ({
+    contentTypeService: contentTypeService2,
+    contentType: contentType2,
+    documentId,
+    entriesQuery
+  }) => new Promise((resolve, reject) => {
+    setImmediate(async () => {
+      try {
+        const entry = await contentTypeService2.getEntry({
+          contentType: contentType2,
+          documentId,
+          entriesQuery: { ...entriesQuery }
+        });
+        resolve(entry);
+      } catch (error2) {
+        reject(error2);
+      }
+    });
+  });
   strapi2.documents.use(async (ctx, next) => {
     let result;
     try {
@@ -115,31 +193,72 @@ async function registerDocumentMiddleware({ strapi: strapi2 }) {
         "unpublish",
         "discardDraft"
       ];
+      const entriesQuery = meilisearch2.entriesQuery({ contentType: contentType2 });
+      const shouldDeleteByLocale = entriesQuery.locale === "*" || entriesQuery.locale === "all";
+      const { status } = entriesQuery || {};
+      const statusFilter = typeof status === "string" && status.length > 0 ? { status } : {};
       const preDeleteDocumentId = deleteActions.includes(ctx.action) && ctx?.params?.documentId ? ctx.params.documentId : null;
-      const preDeleteEntry = preDeleteDocumentId != null ? await contentTypeService2.getEntry({
-        contentType: contentType2,
-        documentId: preDeleteDocumentId,
-        entriesQuery: {}
-      }) : null;
+      let preDeleteEntry = null;
+      let preDeleteLocales = [];
+      if (preDeleteDocumentId != null) {
+        preDeleteEntry = await contentTypeService2.getEntry({
+          contentType: contentType2,
+          documentId: preDeleteDocumentId,
+          entriesQuery: { ...statusFilter }
+        });
+        if (shouldDeleteByLocale) {
+          const localeVariants = await contentTypeService2.getEntries({
+            contentType: contentType2,
+            fields: ["documentId", "locale"],
+            locale: "*",
+            ...statusFilter,
+            filters: {
+              documentId: preDeleteDocumentId
+            }
+          });
+          preDeleteLocales = [
+            ...new Set(
+              localeVariants.map((entry) => entry?.locale).filter(
+                (locale) => typeof locale === "string" && locale.length > 0
+              )
+            )
+          ];
+        }
+      }
       result = await next();
-      const documentId = result?.documentId ?? preDeleteEntry?.documentId ?? preDeleteDocumentId ?? null;
+      const contextDocumentId = typeof ctx?.params?.documentId === "string" && ctx.params.documentId.length > 0 ? ctx.params.documentId : null;
+      const documentId = contextDocumentId ?? 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,
+        const resultCandidates = extractEntryCandidates(result);
+        let entry = getEntryFromResult({
+          resultCandidates,
           documentId,
-          entriesQuery: { ...entriesQuery }
+          entriesQuery
         });
+        if (!entry) {
+          entry = await getEntryOutsideTransaction({
+            contentTypeService: contentTypeService2,
+            contentType: contentType2,
+            documentId,
+            entriesQuery
+          });
+        }
         if (entry) {
+          const normalizedEntry = entry.documentId === documentId ? entry : { ...entry, documentId };
           await meilisearch2.updateEntriesInMeilisearch({
             contentType: contentType2,
-            entries: [entry]
+            entries: [normalizedEntry]
           });
-        } else {
+        } else if (ctx.action === "create" || ctx.action === "publish") {
           await meilisearch2.deleteEntriesFromMeiliSearch({
             contentType: contentType2,
-            documentIds: [documentId]
+            documentIds: [documentId],
+            entriesQuery
           });
+        } else {
+          strapi2.log.info(
+            `Meilisearch document middleware skipped indexing ${contentType2} documentId=${documentId} for action ${ctx.action}: no indexable entry in result payload`
+          );
         }
       } else if (deleteActions.includes(ctx.action)) {
         if (documentId != null) {
@@ -148,7 +267,9 @@ async function registerDocumentMiddleware({ strapi: strapi2 }) {
           );
           await meilisearch2.deleteEntriesFromMeiliSearch({
             contentType: contentType2,
-            documentIds: [documentId]
+            documentIds: [documentId],
+            entriesQuery,
+            locales: shouldDeleteByLocale && preDeleteLocales.length > 0 ? preDeleteLocales : void 0
           });
         } else {
           strapi2.log.info(
@@ -1233,6 +1354,7 @@ const store = ({ strapi: strapi2 }) => {
     ...createStoreConnector({ strapi: strapi2 })
   };
 };
+const isWildcardLocale = (locale) => locale === "all" || locale === "*";
 const aborted = ({ contentType: contentType2, action }) => {
   strapi.log.error(
     `Indexing of ${contentType2} aborted as the data could not be ${action}`
@@ -1441,7 +1563,7 @@ const configurationService = ({ strapi: strapi2 }) => {
       const collection = contentTypeService2.getCollectionName({ contentType: contentType2 });
       const contentTypeConfig = meilisearchConfig[collection] || {};
       const entriesQuery = contentTypeConfig.entriesQuery || {};
-      if (!entriesQuery.locale || entriesQuery.locale === "all" || entriesQuery.locale === "*") {
+      if (!entriesQuery.locale || isWildcardLocale(entriesQuery.locale)) {
         return entries;
       } else {
         return entries.filter((entry) => entry.locale === entriesQuery.locale);
@@ -1449,7 +1571,7 @@ const configurationService = ({ strapi: strapi2 }) => {
     }
   };
 };
-const version = "0.15.0";
+const version = "0.16.1";
 const Meilisearch = (config2) => {
   return new meilisearch$1.MeiliSearch({
     ...config2,
@@ -1516,26 +1638,82 @@ const connectorService = ({ strapi: strapi2, adapter, config: config2 }) => {
      * @param  {object} options
      * @param  {string} options.contentType - ContentType name.
      * @param  {string[]} options.documentIds - Entry documentIds.
+     * @param  {object} options.entriesQuery - Entries query.
      *
      * @returns  { Promise<import("meilisearch").Task>} p - Task body returned by Meilisearch API.
      */
     deleteEntriesFromMeiliSearch: async function({
       contentType: contentType2,
-      documentIds
+      documentIds,
+      entriesQuery = {},
+      locales
     }) {
       const { apiKey, host } = await store2.getCredentials();
       const client = Meilisearch({ apiKey, host });
       const indexUids = config2.getIndexNamesOfContentType({ contentType: contentType2 });
-      const validDocumentIds = documentIds.filter((id) => id != null);
+      const validDocumentIds = [
+        ...new Set(documentIds.filter((id) => id != null))
+      ];
       if (validDocumentIds.length === 0) return [];
-      const documentsIds = validDocumentIds.map(
-        (entryDocumentId) => adapter.addCollectionNamePrefixToId({ entryDocumentId, contentType: contentType2 })
+      const resolvedEntriesQuery = Object.keys(entriesQuery).length > 0 ? entriesQuery : config2.entriesQuery({ contentType: contentType2 });
+      const shouldDeleteAllLocaleVariants = isWildcardLocale(
+        resolvedEntriesQuery.locale
+      );
+      const resolvedLocales = Array.isArray(locales) ? [
+        ...new Set(
+          locales.filter(
+            (locale) => typeof locale === "string" && locale.trim().length > 0
+          ).map((locale) => locale.trim())
+        )
+      ] : [];
+      const meilisearchDocumentIds = shouldDeleteAllLocaleVariants && resolvedLocales.length > 0 ? validDocumentIds.flatMap(
+        (entryDocumentId) => resolvedLocales.map(
+          (resolvedLocale) => adapter.addCollectionNamePrefixToId({
+            contentType: contentType2,
+            entryDocumentId,
+            locale: resolvedLocale
+          })
+        )
+      ) : shouldDeleteAllLocaleVariants ? (await Promise.all(
+        validDocumentIds.map(async (entryDocumentId) => {
+          const baseFilters = resolvedEntriesQuery.filters != null ? resolvedEntriesQuery.filters : {};
+          const localizedEntries = await contentTypeService2.getEntries({
+            contentType: contentType2,
+            fields: ["documentId", "locale"],
+            locale: "*",
+            ...resolvedEntriesQuery.status ? { status: resolvedEntriesQuery.status } : {},
+            filters: {
+              ...baseFilters,
+              documentId: entryDocumentId
+            }
+          });
+          return localizedEntries.length > 0 ? localizedEntries.map(
+            (entry) => adapter.addCollectionNamePrefixToId({
+              contentType: contentType2,
+              entryDocumentId,
+              locale: entry.locale
+            })
+          ) : [
+            // Fallback: delete the non-localized document when no localized variants exist.
+            adapter.addCollectionNamePrefixToId({
+              contentType: contentType2,
+              entryDocumentId
+            })
+          ];
+        })
+      )).flat() : validDocumentIds.map(
+        (entryDocumentId) => adapter.addCollectionNamePrefixToId({
+          entryDocumentId,
+          contentType: contentType2,
+          locale: resolvedEntriesQuery.locale
+        })
       );
+      const uniqueDocumentIds = [...new Set(meilisearchDocumentIds)];
       const tasks = await Promise.all(
         indexUids.map(async (indexUid) => {
-          const task = await client.index(indexUid).deleteDocuments(documentsIds);
+          const task = await client.index(indexUid).deleteDocuments(uniqueDocumentIds);
           strapi2.log.info(
-            `A task to delete ${documentsIds.length} documents of the index "${indexUid}" in Meilisearch has been enqueued (Task uid: ${task.taskUid}).`
+            `A task to delete ${uniqueDocumentIds.length} documents of the index "${indexUid}" in Meilisearch has been enqueued (Task uid: ${task.taskUid}).`
           );
           return task;
         })
@@ -1562,19 +1740,27 @@ const connectorService = ({ strapi: strapi2, adapter, config: config2 }) => {
         config: config2,
         adapter
       });
-      const deleteDocuments = entries.filter(
-        (entry) => entry.documentId != null && !addDocuments.map((document) => document.documentId).includes(entry.documentId)
+      const addDocumentIds = addDocuments.map(
+        (document) => document._meilisearch_id
+      );
+      const deleteDocuments = entries.map((entry) => {
+        if (entry.documentId == null) return null;
+        return {
+          ...entry,
+          _meilisearch_id: adapter.addCollectionNamePrefixToId({
+            contentType: contentType2,
+            entryDocumentId: entry.documentId,
+            locale: entry.locale
+          })
+        };
+      }).filter(
+        (entry) => entry && entry._meilisearch_id != null && !addDocumentIds.includes(entry._meilisearch_id)
       );
       const deleteTasks = await Promise.all(
         indexUids.map(async (indexUid) => {
           const tasks = await Promise.all(
             deleteDocuments.map(async (document) => {
-              const task = await client.index(indexUid).deleteDocument(
-                adapter.addCollectionNamePrefixToId({
-                  contentType: contentType2,
-                  entryDocumentId: document.documentId
-                })
-              );
+              const task = await client.index(indexUid).deleteDocument(document._meilisearch_id);
               strapi2.log.info(
                 `A task to delete one document from the Meilisearch index "${indexUid}" has been enqueued (Task uid: ${task.taskUid}).`
               );
@@ -1796,7 +1982,8 @@ const connectorService = ({ strapi: strapi2, adapter, config: config2 }) => {
         const deleteEntries = async ({ entries, contentType: contentType3 }) => {
           await this.deleteEntriesFromMeiliSearch({
             contentType: contentType3,
-            documentIds: entries.map((entry) => entry.documentId)
+            documentIds: entries.map((entry) => entry.documentId),
+            entriesQuery: config2.entriesQuery({ contentType: contentType3 })
           });
         };
         await contentTypeService2.actionInBatches({
@@ -1839,12 +2026,18 @@ const connectorService = ({ strapi: strapi2, adapter, config: config2 }) => {
 };
 const adapterService = ({ strapi: strapi2 }) => {
   const contentTypeService2 = strapi2.plugin("meilisearch").service("contentType");
+  const buildMeilisearchId = ({ collectionName, entryDocumentId, locale }) => {
+    if (locale) return `${collectionName}-${entryDocumentId}-${locale}`;
+    return `${collectionName}-${entryDocumentId}`;
+  };
   return {
     /**
      * Add the prefix of the contentType in front of the documentId of its entry.
      *
      * We do this to avoid id's conflict in case of composite indexes.
-     * It returns the id in the following format: `[collectionName]-[documentId]`
+     * It returns the id in the following format:
+     * - `[collectionName]-[documentId]` for non-localized entries
+     * - `[collectionName]-[documentId]-[locale]` for localized entries
      *
      * Uses documentId (stable across draft/published) instead of the internal
      * database id to prevent duplicate entries in Meilisearch when Draft & Publish
@@ -1853,20 +2046,27 @@ const adapterService = ({ strapi: strapi2 }) => {
      * @param  {object} options
      * @param  {string} options.contentType - ContentType name.
      * @param  {string} options.entryDocumentId - Entry documentId.
+     * @param  {string} options.locale - Entry locale.
      *
      * @returns {string} - Formatted id
      */
-    addCollectionNamePrefixToId: function({ contentType: contentType2, entryDocumentId }) {
+    addCollectionNamePrefixToId: function({
+      contentType: contentType2,
+      entryDocumentId,
+      locale
+    }) {
       const collectionName = contentTypeService2.getCollectionName({
         contentType: contentType2
       });
-      return `${collectionName}-${entryDocumentId}`;
+      return buildMeilisearchId({ collectionName, entryDocumentId, locale });
     },
     /**
      * Add the prefix of the contentType on a list of entries using documentId.
      *
      * We do this to avoid id's conflict in case of composite indexes.
-     * The ids are transformed in the following format: `[collectionName]-[documentId]`
+     * The ids are transformed in the following format:
+     * - `[collectionName]-[documentId]` for non-localized entries
+     * - `[collectionName]-[documentId]-[locale]` for localized entries
      *
      * @param  {object} options
      * @param  {string} options.contentType - ContentType name.
@@ -1886,7 +2086,8 @@ const adapterService = ({ strapi: strapi2 }) => {
           ...entry,
           _meilisearch_id: this.addCollectionNamePrefixToId({
             entryDocumentId: entry.documentId,
-            contentType: contentType2
+            contentType: contentType2,
+            locale: entry.locale
           })
         });
         return acc;

package/dist/server/index.mjs

@@ -93,6 +93,84 @@ async function registerDocumentMiddleware({ strapi: strapi2 }) {
   if (!strapi2?.documents || typeof strapi2.documents.use !== "function") {
     return;
   }
+  const extractEntryCandidates = (result) => {
+    if (result == null) return [];
+    const candidates = [];
+    const appendCandidate = (data, source) => {
+      if (data != null && typeof data === "object") {
+        candidates.push({ data, source });
+      }
+    };
+    if (Array.isArray(result)) {
+      result.forEach((data) => appendCandidate(data, "root"));
+      return candidates;
+    }
+    appendCandidate(result, "root");
+    if (Array.isArray(result.versions)) {
+      result.versions.forEach((data) => appendCandidate(data, "versions"));
+    }
+    if (Array.isArray(result.entries)) {
+      result.entries.forEach((data) => appendCandidate(data, "entries"));
+    }
+    if (result.entry != null) {
+      appendCandidate(result.entry, "entry");
+    }
+    return candidates;
+  };
+  const isPublishedEntry = (entry) => !(entry?.publishedAt === void 0 || entry?.publishedAt === null);
+  const rankEntryCandidates = (candidates) => {
+    return [...candidates].sort((a, b) => {
+      const aHasPrimaryKey = a.data?.id != null;
+      const bHasPrimaryKey = b.data?.id != null;
+      if (aHasPrimaryKey && !bHasPrimaryKey) return -1;
+      if (!aHasPrimaryKey && bHasPrimaryKey) return 1;
+      const aIsRoot = a.source === "root";
+      const bIsRoot = b.source === "root";
+      if (!aIsRoot && bIsRoot) return -1;
+      if (aIsRoot && !bIsRoot) return 1;
+      return 0;
+    });
+  };
+  const getEntryFromResult = ({
+    resultCandidates,
+    documentId,
+    entriesQuery
+  }) => {
+    const documentCandidates = (resultCandidates || []).filter(
+      (candidate) => candidate?.data?.documentId === documentId
+    );
+    if (documentCandidates.length === 0) return null;
+    const rankedCandidates = rankEntryCandidates(documentCandidates);
+    if (entriesQuery?.status === "draft") {
+      const draftCandidate = rankedCandidates.find(
+        (candidate) => !isPublishedEntry(candidate.data)
+      );
+      return draftCandidate?.data || rankedCandidates[0]?.data || null;
+    }
+    const publishedCandidate = rankedCandidates.find(
+      (candidate) => isPublishedEntry(candidate.data)
+    );
+    return publishedCandidate?.data || null;
+  };
+  const getEntryOutsideTransaction = ({
+    contentTypeService: contentTypeService2,
+    contentType: contentType2,
+    documentId,
+    entriesQuery
+  }) => new Promise((resolve, reject) => {
+    setImmediate(async () => {
+      try {
+        const entry = await contentTypeService2.getEntry({
+          contentType: contentType2,
+          documentId,
+          entriesQuery: { ...entriesQuery }
+        });
+        resolve(entry);
+      } catch (error2) {
+        reject(error2);
+      }
+    });
+  });
   strapi2.documents.use(async (ctx, next) => {
     let result;
     try {
@@ -114,31 +192,72 @@ async function registerDocumentMiddleware({ strapi: strapi2 }) {
         "unpublish",
         "discardDraft"
       ];
+      const entriesQuery = meilisearch2.entriesQuery({ contentType: contentType2 });
+      const shouldDeleteByLocale = entriesQuery.locale === "*" || entriesQuery.locale === "all";
+      const { status } = entriesQuery || {};
+      const statusFilter = typeof status === "string" && status.length > 0 ? { status } : {};
       const preDeleteDocumentId = deleteActions.includes(ctx.action) && ctx?.params?.documentId ? ctx.params.documentId : null;
-      const preDeleteEntry = preDeleteDocumentId != null ? await contentTypeService2.getEntry({
-        contentType: contentType2,
-        documentId: preDeleteDocumentId,
-        entriesQuery: {}
-      }) : null;
+      let preDeleteEntry = null;
+      let preDeleteLocales = [];
+      if (preDeleteDocumentId != null) {
+        preDeleteEntry = await contentTypeService2.getEntry({
+          contentType: contentType2,
+          documentId: preDeleteDocumentId,
+          entriesQuery: { ...statusFilter }
+        });
+        if (shouldDeleteByLocale) {
+          const localeVariants = await contentTypeService2.getEntries({
+            contentType: contentType2,
+            fields: ["documentId", "locale"],
+            locale: "*",
+            ...statusFilter,
+            filters: {
+              documentId: preDeleteDocumentId
+            }
+          });
+          preDeleteLocales = [
+            ...new Set(
+              localeVariants.map((entry) => entry?.locale).filter(
+                (locale) => typeof locale === "string" && locale.length > 0
+              )
+            )
+          ];
+        }
+      }
       result = await next();
-      const documentId = result?.documentId ?? preDeleteEntry?.documentId ?? preDeleteDocumentId ?? null;
+      const contextDocumentId = typeof ctx?.params?.documentId === "string" && ctx.params.documentId.length > 0 ? ctx.params.documentId : null;
+      const documentId = contextDocumentId ?? 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,
+        const resultCandidates = extractEntryCandidates(result);
+        let entry = getEntryFromResult({
+          resultCandidates,
           documentId,
-          entriesQuery: { ...entriesQuery }
+          entriesQuery
         });
+        if (!entry) {
+          entry = await getEntryOutsideTransaction({
+            contentTypeService: contentTypeService2,
+            contentType: contentType2,
+            documentId,
+            entriesQuery
+          });
+        }
         if (entry) {
+          const normalizedEntry = entry.documentId === documentId ? entry : { ...entry, documentId };
           await meilisearch2.updateEntriesInMeilisearch({
             contentType: contentType2,
-            entries: [entry]
+            entries: [normalizedEntry]
           });
-        } else {
+        } else if (ctx.action === "create" || ctx.action === "publish") {
           await meilisearch2.deleteEntriesFromMeiliSearch({
             contentType: contentType2,
-            documentIds: [documentId]
+            documentIds: [documentId],
+            entriesQuery
           });
+        } else {
+          strapi2.log.info(
+            `Meilisearch document middleware skipped indexing ${contentType2} documentId=${documentId} for action ${ctx.action}: no indexable entry in result payload`
+          );
         }
       } else if (deleteActions.includes(ctx.action)) {
         if (documentId != null) {
@@ -147,7 +266,9 @@ async function registerDocumentMiddleware({ strapi: strapi2 }) {
           );
           await meilisearch2.deleteEntriesFromMeiliSearch({
             contentType: contentType2,
-            documentIds: [documentId]
+            documentIds: [documentId],
+            entriesQuery,
+            locales: shouldDeleteByLocale && preDeleteLocales.length > 0 ? preDeleteLocales : void 0
           });
         } else {
           strapi2.log.info(
@@ -1232,6 +1353,7 @@ const store = ({ strapi: strapi2 }) => {
     ...createStoreConnector({ strapi: strapi2 })
   };
 };
+const isWildcardLocale = (locale) => locale === "all" || locale === "*";
 const aborted = ({ contentType: contentType2, action }) => {
   strapi.log.error(
     `Indexing of ${contentType2} aborted as the data could not be ${action}`
@@ -1440,7 +1562,7 @@ const configurationService = ({ strapi: strapi2 }) => {
       const collection = contentTypeService2.getCollectionName({ contentType: contentType2 });
       const contentTypeConfig = meilisearchConfig[collection] || {};
       const entriesQuery = contentTypeConfig.entriesQuery || {};
-      if (!entriesQuery.locale || entriesQuery.locale === "all" || entriesQuery.locale === "*") {
+      if (!entriesQuery.locale || isWildcardLocale(entriesQuery.locale)) {
         return entries;
       } else {
         return entries.filter((entry) => entry.locale === entriesQuery.locale);
@@ -1448,7 +1570,7 @@ const configurationService = ({ strapi: strapi2 }) => {
     }
   };
 };
-const version = "0.15.0";
+const version = "0.16.1";
 const Meilisearch = (config2) => {
   return new MeiliSearch({
     ...config2,
@@ -1515,26 +1637,82 @@ const connectorService = ({ strapi: strapi2, adapter, config: config2 }) => {
      * @param  {object} options
      * @param  {string} options.contentType - ContentType name.
      * @param  {string[]} options.documentIds - Entry documentIds.
+     * @param  {object} options.entriesQuery - Entries query.
      *
      * @returns  { Promise<import("meilisearch").Task>} p - Task body returned by Meilisearch API.
      */
     deleteEntriesFromMeiliSearch: async function({
       contentType: contentType2,
-      documentIds
+      documentIds,
+      entriesQuery = {},
+      locales
     }) {
       const { apiKey, host } = await store2.getCredentials();
       const client = Meilisearch({ apiKey, host });
       const indexUids = config2.getIndexNamesOfContentType({ contentType: contentType2 });
-      const validDocumentIds = documentIds.filter((id) => id != null);
+      const validDocumentIds = [
+        ...new Set(documentIds.filter((id) => id != null))
+      ];
       if (validDocumentIds.length === 0) return [];
-      const documentsIds = validDocumentIds.map(
-        (entryDocumentId) => adapter.addCollectionNamePrefixToId({ entryDocumentId, contentType: contentType2 })
+      const resolvedEntriesQuery = Object.keys(entriesQuery).length > 0 ? entriesQuery : config2.entriesQuery({ contentType: contentType2 });
+      const shouldDeleteAllLocaleVariants = isWildcardLocale(
+        resolvedEntriesQuery.locale
+      );
+      const resolvedLocales = Array.isArray(locales) ? [
+        ...new Set(
+          locales.filter(
+            (locale) => typeof locale === "string" && locale.trim().length > 0
+          ).map((locale) => locale.trim())
+        )
+      ] : [];
+      const meilisearchDocumentIds = shouldDeleteAllLocaleVariants && resolvedLocales.length > 0 ? validDocumentIds.flatMap(
+        (entryDocumentId) => resolvedLocales.map(
+          (resolvedLocale) => adapter.addCollectionNamePrefixToId({
+            contentType: contentType2,
+            entryDocumentId,
+            locale: resolvedLocale
+          })
+        )
+      ) : shouldDeleteAllLocaleVariants ? (await Promise.all(
+        validDocumentIds.map(async (entryDocumentId) => {
+          const baseFilters = resolvedEntriesQuery.filters != null ? resolvedEntriesQuery.filters : {};
+          const localizedEntries = await contentTypeService2.getEntries({
+            contentType: contentType2,
+            fields: ["documentId", "locale"],
+            locale: "*",
+            ...resolvedEntriesQuery.status ? { status: resolvedEntriesQuery.status } : {},
+            filters: {
+              ...baseFilters,
+              documentId: entryDocumentId
+            }
+          });
+          return localizedEntries.length > 0 ? localizedEntries.map(
+            (entry) => adapter.addCollectionNamePrefixToId({
+              contentType: contentType2,
+              entryDocumentId,
+              locale: entry.locale
+            })
+          ) : [
+            // Fallback: delete the non-localized document when no localized variants exist.
+            adapter.addCollectionNamePrefixToId({
+              contentType: contentType2,
+              entryDocumentId
+            })
+          ];
+        })
+      )).flat() : validDocumentIds.map(
+        (entryDocumentId) => adapter.addCollectionNamePrefixToId({
+          entryDocumentId,
+          contentType: contentType2,
+          locale: resolvedEntriesQuery.locale
+        })
       );
+      const uniqueDocumentIds = [...new Set(meilisearchDocumentIds)];
       const tasks = await Promise.all(
         indexUids.map(async (indexUid) => {
-          const task = await client.index(indexUid).deleteDocuments(documentsIds);
+          const task = await client.index(indexUid).deleteDocuments(uniqueDocumentIds);
           strapi2.log.info(
-            `A task to delete ${documentsIds.length} documents of the index "${indexUid}" in Meilisearch has been enqueued (Task uid: ${task.taskUid}).`
+            `A task to delete ${uniqueDocumentIds.length} documents of the index "${indexUid}" in Meilisearch has been enqueued (Task uid: ${task.taskUid}).`
           );
           return task;
         })
@@ -1561,19 +1739,27 @@ const connectorService = ({ strapi: strapi2, adapter, config: config2 }) => {
         config: config2,
         adapter
       });
-      const deleteDocuments = entries.filter(
-        (entry) => entry.documentId != null && !addDocuments.map((document) => document.documentId).includes(entry.documentId)
+      const addDocumentIds = addDocuments.map(
+        (document) => document._meilisearch_id
+      );
+      const deleteDocuments = entries.map((entry) => {
+        if (entry.documentId == null) return null;
+        return {
+          ...entry,
+          _meilisearch_id: adapter.addCollectionNamePrefixToId({
+            contentType: contentType2,
+            entryDocumentId: entry.documentId,
+            locale: entry.locale
+          })
+        };
+      }).filter(
+        (entry) => entry && entry._meilisearch_id != null && !addDocumentIds.includes(entry._meilisearch_id)
       );
       const deleteTasks = await Promise.all(
         indexUids.map(async (indexUid) => {
           const tasks = await Promise.all(
             deleteDocuments.map(async (document) => {
-              const task = await client.index(indexUid).deleteDocument(
-                adapter.addCollectionNamePrefixToId({
-                  contentType: contentType2,
-                  entryDocumentId: document.documentId
-                })
-              );
+              const task = await client.index(indexUid).deleteDocument(document._meilisearch_id);
               strapi2.log.info(
                 `A task to delete one document from the Meilisearch index "${indexUid}" has been enqueued (Task uid: ${task.taskUid}).`
               );
@@ -1795,7 +1981,8 @@ const connectorService = ({ strapi: strapi2, adapter, config: config2 }) => {
         const deleteEntries = async ({ entries, contentType: contentType3 }) => {
           await this.deleteEntriesFromMeiliSearch({
             contentType: contentType3,
-            documentIds: entries.map((entry) => entry.documentId)
+            documentIds: entries.map((entry) => entry.documentId),
+            entriesQuery: config2.entriesQuery({ contentType: contentType3 })
           });
         };
         await contentTypeService2.actionInBatches({
@@ -1838,12 +2025,18 @@ const connectorService = ({ strapi: strapi2, adapter, config: config2 }) => {
 };
 const adapterService = ({ strapi: strapi2 }) => {
   const contentTypeService2 = strapi2.plugin("meilisearch").service("contentType");
+  const buildMeilisearchId = ({ collectionName, entryDocumentId, locale }) => {
+    if (locale) return `${collectionName}-${entryDocumentId}-${locale}`;
+    return `${collectionName}-${entryDocumentId}`;
+  };
   return {
     /**
      * Add the prefix of the contentType in front of the documentId of its entry.
      *
      * We do this to avoid id's conflict in case of composite indexes.
-     * It returns the id in the following format: `[collectionName]-[documentId]`
+     * It returns the id in the following format:
+     * - `[collectionName]-[documentId]` for non-localized entries
+     * - `[collectionName]-[documentId]-[locale]` for localized entries
      *
      * Uses documentId (stable across draft/published) instead of the internal
      * database id to prevent duplicate entries in Meilisearch when Draft & Publish
@@ -1852,20 +2045,27 @@ const adapterService = ({ strapi: strapi2 }) => {
      * @param  {object} options
      * @param  {string} options.contentType - ContentType name.
      * @param  {string} options.entryDocumentId - Entry documentId.
+     * @param  {string} options.locale - Entry locale.
      *
      * @returns {string} - Formatted id
      */
-    addCollectionNamePrefixToId: function({ contentType: contentType2, entryDocumentId }) {
+    addCollectionNamePrefixToId: function({
+      contentType: contentType2,
+      entryDocumentId,
+      locale
+    }) {
       const collectionName = contentTypeService2.getCollectionName({
         contentType: contentType2
       });
-      return `${collectionName}-${entryDocumentId}`;
+      return buildMeilisearchId({ collectionName, entryDocumentId, locale });
     },
     /**
      * Add the prefix of the contentType on a list of entries using documentId.
      *
      * We do this to avoid id's conflict in case of composite indexes.
-     * The ids are transformed in the following format: `[collectionName]-[documentId]`
+     * The ids are transformed in the following format:
+     * - `[collectionName]-[documentId]` for non-localized entries
+     * - `[collectionName]-[documentId]-[locale]` for localized entries
      *
      * @param  {object} options
      * @param  {string} options.contentType - ContentType name.
@@ -1885,7 +2085,8 @@ const adapterService = ({ strapi: strapi2 }) => {
           ...entry,
           _meilisearch_id: this.addCollectionNamePrefixToId({
             entryDocumentId: entry.documentId,
-            contentType: contentType2
+            contentType: contentType2,
+            locale: entry.locale
           })
         });
         return acc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-meilisearch",
-  "version": "0.15.0",
+  "version": "0.16.1",
   "description": "Synchronise and search in your Strapi content-types with Meilisearch",
   "scripts": {
     "build": "strapi-plugin build",
@@ -64,6 +64,7 @@
     "@strapi/strapi": "^5.6.0",
     "@types/jest": "^30.0.0",
     "babel-jest": "^30.2.0",
+    "better-sqlite3": "^12.8.0",
     "concurrently": "^9.2.1",
     "cypress": "^15.11.0",
     "eslint": "^10.0.2",