strapi-plugin-meilisearch 0.16.2 → 0.16.4

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

package/dist/_chunks/{App-BmxrI4i3.mjs → App-DsNeH1hv.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-D0WRGIBD.mjs";
+import { p as pluginId, P as PERMISSIONS } from "./index-L3fjpmC9.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/{index-B13pYJxT.js → index-CAsW5hZR.js}

@@ -19,7 +19,7 @@ const __variableDynamicImportRuntimeHelper = (glob, path, segs) => {
   });
 };
 const name$1 = "strapi-plugin-meilisearch";
-const version = "0.16.2";
+const version = "0.16.4";
 const description = "Synchronise and search in your Strapi content-types with Meilisearch";
 const scripts = {
   build: "strapi-plugin build",
@@ -216,7 +216,7 @@ const index = {
         defaultMessage: name
       },
       Component: async () => {
-        const { App } = await Promise.resolve().then(() => require("./App-B3uJ14YG.js"));
+        const { App } = await Promise.resolve().then(() => require("./App-DN63hpzO.js"));
         return App;
       },
       permissions: PERMISSIONS.main

package/dist/_chunks/{index-D0WRGIBD.mjs → index-L3fjpmC9.mjs}

@@ -18,7 +18,7 @@ const __variableDynamicImportRuntimeHelper = (glob, path, segs) => {
   });
 };
 const name$1 = "strapi-plugin-meilisearch";
-const version = "0.16.2";
+const version = "0.16.4";
 const description = "Synchronise and search in your Strapi content-types with Meilisearch";
 const scripts = {
   build: "strapi-plugin build",
@@ -215,7 +215,7 @@ const index = {
         defaultMessage: name
       },
       Component: async () => {
-        const { App } = await import("./App-BmxrI4i3.mjs");
+        const { App } = await import("./App-DsNeH1hv.mjs");
         return App;
       },
       permissions: PERMISSIONS.main

package/dist/admin/index.js

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

package/dist/admin/index.mjs

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

package/dist/server/index.js

@@ -322,88 +322,290 @@ const configurationService = ({ strapi: strapi2 }) => {
     }
   };
 };
-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"));
+const resolveDocumentIdsFromActionParams = (actionParams) => {
+  const explicitDocumentIds = Array.isArray(actionParams?.documentIds) ? actionParams.documentIds.filter(
+    (documentId) => typeof documentId === "string" && documentId.length > 0
+  ) : [];
+  const singleDocumentId = typeof actionParams?.documentId === "string" && actionParams.documentId.length > 0 ? [actionParams.documentId] : [];
+  return [.../* @__PURE__ */ new Set([...explicitDocumentIds, ...singleDocumentId])];
+};
+const resolveDocumentIds = ({
+  actionParams,
+  result,
+  preActionSnapshots
+}) => {
+  const ids = [...resolveDocumentIdsFromActionParams(actionParams)];
+  const appendDocumentId = (documentId) => {
+    if (typeof documentId === "string" && documentId.length > 0) {
+      ids.push(documentId);
     }
-    if (result.entry != null) {
-      appendCandidate(result.entry, "entry");
+  };
+  const inspectCandidate = (candidate) => {
+    if (!candidate || typeof candidate !== "object") return;
+    appendDocumentId(candidate.documentId);
+  };
+  if (Array.isArray(result)) {
+    result.forEach(inspectCandidate);
+  } else {
+    inspectCandidate(result);
+  }
+  (preActionSnapshots || []).forEach(
+    (snapshot) => appendDocumentId(snapshot?.documentId)
+  );
+  return [...new Set(ids)];
+};
+const extractStrapiEntryCandidates = (result) => {
+  if (result == null) return [];
+  const candidates = [];
+  const appendCandidate = (data, source) => {
+    if (data != null && typeof data === "object") {
+      candidates.push({ data, source });
     }
-    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;
-    });
+  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 isPublishedStrapiEntry = (entry) => !(entry?.publishedAt === void 0 || entry?.publishedAt === null);
+const rankStrapiEntryCandidates = (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 getActionLocale = (actionParams) => {
+  return typeof actionParams?.locale === "string" && actionParams.locale.length > 0 ? actionParams.locale : null;
+};
+const resolveLocaleScopedRefetchQuery = ({
+  indexingQuery,
+  actionParams
+}) => {
+  const actionLocale = getActionLocale(actionParams);
+  const baseQuery = { ...indexingQuery || {} };
+  if (!isWildcardLocale(baseQuery.locale) || actionLocale == null) {
+    return baseQuery;
+  }
+  return {
+    ...baseQuery,
+    locale: actionLocale
   };
-  const getEntryFromResult = ({
-    resultCandidates,
-    documentId,
-    entriesQuery
-  }) => {
-    const documentCandidates = (resultCandidates || []).filter(
-      (candidate) => candidate?.data?.documentId === documentId
+};
+const resolveLocaleCodesToRemoveFromIndex = ({
+  actionParams,
+  preDeleteStrapiEntry,
+  localeVariants
+}) => {
+  const actionLocale = getActionLocale(actionParams);
+  if (actionLocale && !isWildcardLocale(actionLocale)) {
+    return [actionLocale];
+  }
+  if (actionLocale == null) {
+    return typeof preDeleteStrapiEntry?.locale === "string" && preDeleteStrapiEntry.locale.length > 0 ? [preDeleteStrapiEntry.locale] : [];
+  }
+  return [
+    ...new Set(
+      (localeVariants || []).map((entry) => entry?.locale).filter((locale) => typeof locale === "string" && locale.length > 0)
+    )
+  ];
+};
+const collectLocaleCodesFromEntries = (entries) => {
+  return [
+    ...new Set(
+      (entries || []).map((entry) => entry?.locale).filter((locale) => typeof locale === "string" && locale.length > 0)
+    )
+  ];
+};
+const selectDraftEntriesForDiscardDraftResult = ({
+  resultCandidates,
+  documentId,
+  actionParams
+}) => {
+  const actionLocale = getActionLocale(actionParams);
+  const rankedDraftEntryCandidates = rankStrapiEntryCandidates(
+    (resultCandidates || []).filter(
+      (candidate) => candidate?.data?.documentId === documentId && !isPublishedStrapiEntry(candidate.data)
+    )
+  );
+  const rankedLocalizedDraftEntryCandidates = rankedDraftEntryCandidates.filter(
+    (candidate) => typeof candidate?.data?.locale === "string" && candidate.data.locale.length > 0
+  );
+  if (rankedDraftEntryCandidates.length === 0) return [];
+  if (actionLocale && !isWildcardLocale(actionLocale)) {
+    const localeCandidate = rankedLocalizedDraftEntryCandidates.find(
+      (candidate) => candidate?.data?.locale === actionLocale
     );
-    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;
+    return localeCandidate ? [localeCandidate.data] : [];
+  }
+  if (actionLocale && isWildcardLocale(actionLocale)) {
+    const entriesByLocale = /* @__PURE__ */ new Map();
+    rankedLocalizedDraftEntryCandidates.forEach((candidate) => {
+      const locale = candidate.data.locale;
+      if (!entriesByLocale.has(locale)) {
+        entriesByLocale.set(locale, candidate.data);
+      }
+    });
+    return [...entriesByLocale.values()];
+  }
+  return [
+    rankedLocalizedDraftEntryCandidates[0]?.data || rankedDraftEntryCandidates[0].data
+  ];
+};
+const fetchSingleEntryAfterTransaction = ({
+  contentTypeService: contentTypeService2,
+  contentType: contentType2,
+  documentId,
+  indexingQuery
+}) => new Promise((resolve, reject) => {
+  setImmediate(async () => {
+    try {
+      const strapiEntry = await contentTypeService2.getEntry({
+        contentType: contentType2,
+        documentId,
+        entriesQuery: { ...indexingQuery || {} }
+      });
+      resolve(strapiEntry);
+    } catch (error2) {
+      reject(error2);
     }
-    const publishedCandidate = rankedCandidates.find(
-      (candidate) => isPublishedEntry(candidate.data)
-    );
-    return publishedCandidate?.data || null;
-  };
-  const getEntryOutsideTransaction = ({
-    contentTypeService: contentTypeService2,
+  });
+});
+const fetchWildcardLocaleEntriesForIndexing = ({
+  contentTypeService: contentTypeService2,
+  contentType: contentType2,
+  documentId,
+  indexingQuery
+}) => {
+  const baseIndexingQuery = indexingQuery || {};
+  return contentTypeService2.getEntries({
+    contentType: contentType2,
+    ...baseIndexingQuery,
+    locale: "*",
+    filters: {
+      ...baseIndexingQuery.filters || {},
+      documentId
+    }
+  });
+};
+const buildPreActionSnapshot = async ({
+  contentTypeService: contentTypeService2,
+  contentType: contentType2,
+  documentId,
+  indexingStatusFilter,
+  actionParams,
+  indexingQueryUsesWildcardLocale
+}) => {
+  const preDeleteStrapiEntry = await contentTypeService2.getEntry({
     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);
-      }
+    entriesQuery: { ...indexingStatusFilter || {} }
+  });
+  const shouldFetchLocaleVariants = indexingQueryUsesWildcardLocale && isWildcardLocale(actionParams?.locale);
+  const localeVariants = shouldFetchLocaleVariants ? await contentTypeService2.getEntries({
+    contentType: contentType2,
+    fields: ["documentId", "locale"],
+    locale: "*",
+    ...indexingStatusFilter || {},
+    filters: {
+      documentId
+    }
+  }) : [];
+  const localeCodesToRemove = indexingQueryUsesWildcardLocale ? resolveLocaleCodesToRemoveFromIndex({
+    actionParams,
+    preDeleteStrapiEntry,
+    localeVariants
+  }) : [];
+  return {
+    documentId,
+    preDeleteStrapiEntry,
+    localeVariants,
+    localeCodesToRemove
+  };
+};
+const collectPreActionSnapshots = async ({
+  documentIds,
+  contentTypeService: contentTypeService2,
+  contentType: contentType2,
+  indexingStatusFilter,
+  actionParams,
+  indexingQueryUsesWildcardLocale
+}) => {
+  return Promise.all(
+    documentIds.map(
+      (documentId) => buildPreActionSnapshot({
+        contentTypeService: contentTypeService2,
+        contentType: contentType2,
+        documentId,
+        indexingStatusFilter,
+        actionParams,
+        indexingQueryUsesWildcardLocale
+      })
+    )
+  );
+};
+const normalizeLocaleCodes = (localeCodes) => {
+  return [
+    ...new Set(
+      (localeCodes || []).filter((locale) => typeof locale === "string" && locale.length > 0).map((locale) => locale.trim())
+    )
+  ];
+};
+const dispatchDeleteTargets = async ({
+  meilisearch: meilisearch2,
+  contentType: contentType2,
+  indexingQuery,
+  indexingQueryUsesWildcardLocale,
+  targets
+}) => {
+  const validTargets = (targets || []).filter(
+    (target) => target && typeof target.documentId === "string" && target.documentId.length > 0
+  );
+  if (validTargets.length === 0) return;
+  const groupedTargets = /* @__PURE__ */ new Map();
+  validTargets.forEach((target) => {
+    const localeCodes = indexingQueryUsesWildcardLocale ? normalizeLocaleCodes(target.localeCodes) : [];
+    const groupKey = localeCodes.length > 0 ? [...localeCodes].sort().join("|") : "__no-locales__";
+    const currentGroup = groupedTargets.get(groupKey);
+    if (currentGroup) {
+      currentGroup.documentIds.push(target.documentId);
+      return;
+    }
+    groupedTargets.set(groupKey, {
+      documentIds: [target.documentId],
+      localeCodes
     });
   });
+  for (const group of groupedTargets.values()) {
+    await meilisearch2.deleteEntriesFromMeiliSearch({
+      contentType: contentType2,
+      documentIds: [...new Set(group.documentIds)],
+      entriesQuery: indexingQuery,
+      locales: indexingQueryUsesWildcardLocale && group.localeCodes.length > 0 ? group.localeCodes : void 0
+    });
+  }
+};
+async function registerDocumentMiddleware({ strapi: strapi2 }) {
+  if (!strapi2?.documents || typeof strapi2.documents.use !== "function") {
+    return;
+  }
   strapi2.documents.use(async (ctx, next) => {
     let result;
     try {
@@ -425,83 +627,183 @@ async function registerDocumentMiddleware({ strapi: strapi2 }) {
         "unpublish",
         "discardDraft"
       ];
-      const entriesQuery = meilisearch2.entriesQuery({ contentType: contentType2 });
-      const shouldDeleteByLocale = isWildcardLocale(entriesQuery.locale);
-      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;
-      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
-              )
-            )
-          ];
-        }
-      }
+      const indexingQuery = meilisearch2.entriesQuery({ contentType: contentType2 });
+      const indexingQueryUsesWildcardLocale = isWildcardLocale(
+        indexingQuery.locale
+      );
+      const { status } = indexingQuery || {};
+      const indexingStatusFilter = typeof status === "string" && status.length > 0 ? { status } : {};
+      const isDraftIndex = status === "draft";
+      const isPublishedIndex = status === "published";
+      const shouldSkipDeleteAction = ctx.action === "unpublish" && isDraftIndex || ctx.action === "discardDraft" && isPublishedIndex;
+      const shouldProcessAsRefetchFirstIndexingAction = updateActions.includes(ctx.action) || ctx.action === "discardDraft" && isDraftIndex;
+      const shouldProcessAsDeleteAction = deleteActions.includes(ctx.action) && !shouldProcessAsRefetchFirstIndexingAction && !shouldSkipDeleteAction;
+      const preActionDocumentIds = resolveDocumentIdsFromActionParams(
+        ctx?.params
+      );
+      const shouldCollectPreActionSnapshots = shouldProcessAsDeleteAction || ctx.action === "discardDraft" && isDraftIndex;
+      const preActionSnapshots = shouldCollectPreActionSnapshots ? await collectPreActionSnapshots({
+        documentIds: preActionDocumentIds,
+        contentTypeService: contentTypeService2,
+        contentType: contentType2,
+        indexingStatusFilter,
+        actionParams: ctx?.params,
+        indexingQueryUsesWildcardLocale
+      }) : [];
+      const preActionSnapshotsByDocumentId = new Map(
+        preActionSnapshots.map((snapshot) => [snapshot.documentId, snapshot])
+      );
       result = await next();
-      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 resultCandidates = extractEntryCandidates(result);
-        let entry = getEntryFromResult({
-          resultCandidates,
-          documentId,
-          entriesQuery
-        });
-        if (!entry) {
-          entry = await getEntryOutsideTransaction({
-            contentTypeService: contentTypeService2,
-            contentType: contentType2,
-            documentId,
-            entriesQuery
+      const documentIds = resolveDocumentIds({
+        actionParams: ctx?.params,
+        result,
+        preActionSnapshots
+      });
+      if (shouldProcessAsRefetchFirstIndexingAction && documentIds.length > 0) {
+        const actionResultCandidates = extractStrapiEntryCandidates(result);
+        const entriesToIndex = [];
+        const deleteTargets = [];
+        for (const documentId of documentIds) {
+          if (ctx.action === "discardDraft" && isDraftIndex) {
+            const preActionSnapshot = preActionSnapshotsByDocumentId.get(documentId) || null;
+            const actionLocale2 = getActionLocale(ctx?.params);
+            const shouldLoadDraftEntriesAcrossLocales = indexingQueryUsesWildcardLocale && isWildcardLocale(actionLocale2);
+            const draftEntriesFromActionResult = selectDraftEntriesForDiscardDraftResult({
+              resultCandidates: actionResultCandidates,
+              documentId,
+              actionParams: ctx?.params
+            });
+            let draftEntriesToIndex = shouldLoadDraftEntriesAcrossLocales ? await contentTypeService2.getEntries({
+              contentType: contentType2,
+              locale: "*",
+              ...indexingStatusFilter,
+              filters: {
+                documentId
+              }
+            }) : draftEntriesFromActionResult;
+            draftEntriesToIndex = (draftEntriesToIndex || []).filter(
+              (entry) => entry && !isPublishedStrapiEntry(entry)
+            );
+            if (draftEntriesToIndex.length === 0 && shouldLoadDraftEntriesAcrossLocales) {
+              draftEntriesToIndex = draftEntriesFromActionResult;
+            }
+            if (draftEntriesToIndex.length === 0 && !shouldLoadDraftEntriesAcrossLocales) {
+              const refetchedDraftEntry = await fetchSingleEntryAfterTransaction({
+                contentTypeService: contentTypeService2,
+                contentType: contentType2,
+                documentId,
+                indexingQuery: resolveLocaleScopedRefetchQuery({
+                  indexingQuery,
+                  actionParams: ctx?.params
+                })
+              });
+              if (refetchedDraftEntry && !isPublishedStrapiEntry(refetchedDraftEntry)) {
+                draftEntriesToIndex = [refetchedDraftEntry];
+              }
+            }
+            if (draftEntriesToIndex.length > 0) {
+              const normalizedDraftEntries = draftEntriesToIndex.map(
+                (entry) => entry.documentId === documentId ? entry : { ...entry, documentId }
+              );
+              entriesToIndex.push(...normalizedDraftEntries);
+            }
+            const preActionLocaleCodes = resolveLocaleCodesToRemoveFromIndex({
+              actionParams: ctx?.params,
+              preDeleteStrapiEntry: preActionSnapshot?.preDeleteStrapiEntry || null,
+              localeVariants: preActionSnapshot?.localeVariants || []
+            });
+            const remainingLocaleCodes = collectLocaleCodesFromEntries(draftEntriesToIndex);
+            const localeCodesToDelete = preActionLocaleCodes.filter(
+              (localeCode) => !remainingLocaleCodes.includes(localeCode)
+            );
+            if (localeCodesToDelete.length > 0) {
+              deleteTargets.push({
+                documentId,
+                localeCodes: localeCodesToDelete
+              });
+            }
+            continue;
+          }
+          let refetchedEntriesForDocument = [];
+          const actionLocale = getActionLocale(ctx?.params);
+          const localeScopedRefetchQuery = resolveLocaleScopedRefetchQuery({
+            indexingQuery,
+            actionParams: ctx?.params
           });
+          const indexingQueryStoresDrafts = indexingQuery?.status === "draft";
+          const shouldRefetchAllLocales = indexingQueryUsesWildcardLocale && isWildcardLocale(actionLocale) && isWildcardLocale(indexingQuery?.locale) && !indexingQueryStoresDrafts;
+          if (shouldRefetchAllLocales) {
+            refetchedEntriesForDocument = await fetchWildcardLocaleEntriesForIndexing({
+              contentTypeService: contentTypeService2,
+              contentType: contentType2,
+              documentId,
+              indexingQuery
+            });
+          } else {
+            const refetchedStrapiEntry = await fetchSingleEntryAfterTransaction(
+              {
+                contentTypeService: contentTypeService2,
+                contentType: contentType2,
+                documentId,
+                indexingQuery: localeScopedRefetchQuery
+              }
+            );
+            if (refetchedStrapiEntry) {
+              refetchedEntriesForDocument = [refetchedStrapiEntry];
+            }
+          }
+          if (refetchedEntriesForDocument.length > 0) {
+            const normalizedEntries = refetchedEntriesForDocument.map(
+              (entry) => entry.documentId === documentId ? entry : { ...entry, documentId }
+            );
+            entriesToIndex.push(...normalizedEntries);
+          } else if (ctx.action === "create" || ctx.action === "publish") {
+            const createPublishLocaleCodesToRemove = indexingQueryUsesWildcardLocale && typeof localeScopedRefetchQuery?.locale === "string" && localeScopedRefetchQuery.locale.length > 0 && !isWildcardLocale(localeScopedRefetchQuery.locale) ? [localeScopedRefetchQuery.locale] : [];
+            if (createPublishLocaleCodesToRemove.length > 0) {
+              deleteTargets.push({
+                documentId,
+                localeCodes: createPublishLocaleCodesToRemove
+              });
+            }
+          } else {
+            strapi2.log.info(
+              `Meilisearch document middleware skipped indexing ${contentType2} documentId=${documentId} for action ${ctx.action}: no indexable Strapi entry after refetch`
+            );
+          }
         }
-        if (entry) {
-          const normalizedEntry = entry.documentId === documentId ? entry : { ...entry, documentId };
+        if (entriesToIndex.length > 0) {
           await meilisearch2.updateEntriesInMeilisearch({
             contentType: contentType2,
-            entries: [normalizedEntry]
+            entries: entriesToIndex
           });
-        } else if (ctx.action === "create" || ctx.action === "publish") {
-          await meilisearch2.deleteEntriesFromMeiliSearch({
+        }
+        if (deleteTargets.length > 0) {
+          await dispatchDeleteTargets({
+            meilisearch: meilisearch2,
             contentType: contentType2,
-            documentIds: [documentId],
-            entriesQuery
+            indexingQuery,
+            indexingQueryUsesWildcardLocale,
+            targets: deleteTargets
           });
-        } 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) {
+      } else if (shouldProcessAsDeleteAction) {
+        if (documentIds.length > 0) {
+          const deleteTargets = documentIds.map((documentId) => {
+            const preActionSnapshot = preActionSnapshotsByDocumentId.get(documentId) || null;
+            return {
+              documentId,
+              localeCodes: indexingQueryUsesWildcardLocale ? preActionSnapshot?.localeCodesToRemove || [] : []
+            };
+          });
           strapi2.log.info(
-            `Meilisearch document middleware deleting ${contentType2} documentId=${documentId}`
+            `Meilisearch document middleware deleting ${contentType2} documentIds=${documentIds.join(",")}`
           );
-          await meilisearch2.deleteEntriesFromMeiliSearch({
+          await dispatchDeleteTargets({
+            meilisearch: meilisearch2,
             contentType: contentType2,
-            documentIds: [documentId],
-            entriesQuery,
-            locales: shouldDeleteByLocale && preDeleteLocales.length > 0 ? preDeleteLocales : void 0
+            indexingQuery,
+            indexingQueryUsesWildcardLocale,
+            targets: deleteTargets
           });
         } else {
           strapi2.log.info(
@@ -1636,7 +1938,7 @@ const store = ({ strapi: strapi2 }) => {
     ...createStoreConnector({ strapi: strapi2 })
   };
 };
-const version = "0.16.2";
+const version = "0.16.4";
 const Meilisearch = (config2) => {
   return new meilisearch$1.MeiliSearch({
     ...config2,

package/dist/server/index.mjs

@@ -321,88 +321,290 @@ const configurationService = ({ strapi: strapi2 }) => {
     }
   };
 };
-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"));
+const resolveDocumentIdsFromActionParams = (actionParams) => {
+  const explicitDocumentIds = Array.isArray(actionParams?.documentIds) ? actionParams.documentIds.filter(
+    (documentId) => typeof documentId === "string" && documentId.length > 0
+  ) : [];
+  const singleDocumentId = typeof actionParams?.documentId === "string" && actionParams.documentId.length > 0 ? [actionParams.documentId] : [];
+  return [.../* @__PURE__ */ new Set([...explicitDocumentIds, ...singleDocumentId])];
+};
+const resolveDocumentIds = ({
+  actionParams,
+  result,
+  preActionSnapshots
+}) => {
+  const ids = [...resolveDocumentIdsFromActionParams(actionParams)];
+  const appendDocumentId = (documentId) => {
+    if (typeof documentId === "string" && documentId.length > 0) {
+      ids.push(documentId);
     }
-    if (result.entry != null) {
-      appendCandidate(result.entry, "entry");
+  };
+  const inspectCandidate = (candidate) => {
+    if (!candidate || typeof candidate !== "object") return;
+    appendDocumentId(candidate.documentId);
+  };
+  if (Array.isArray(result)) {
+    result.forEach(inspectCandidate);
+  } else {
+    inspectCandidate(result);
+  }
+  (preActionSnapshots || []).forEach(
+    (snapshot) => appendDocumentId(snapshot?.documentId)
+  );
+  return [...new Set(ids)];
+};
+const extractStrapiEntryCandidates = (result) => {
+  if (result == null) return [];
+  const candidates = [];
+  const appendCandidate = (data, source) => {
+    if (data != null && typeof data === "object") {
+      candidates.push({ data, source });
     }
-    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;
-    });
+  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 isPublishedStrapiEntry = (entry) => !(entry?.publishedAt === void 0 || entry?.publishedAt === null);
+const rankStrapiEntryCandidates = (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 getActionLocale = (actionParams) => {
+  return typeof actionParams?.locale === "string" && actionParams.locale.length > 0 ? actionParams.locale : null;
+};
+const resolveLocaleScopedRefetchQuery = ({
+  indexingQuery,
+  actionParams
+}) => {
+  const actionLocale = getActionLocale(actionParams);
+  const baseQuery = { ...indexingQuery || {} };
+  if (!isWildcardLocale(baseQuery.locale) || actionLocale == null) {
+    return baseQuery;
+  }
+  return {
+    ...baseQuery,
+    locale: actionLocale
   };
-  const getEntryFromResult = ({
-    resultCandidates,
-    documentId,
-    entriesQuery
-  }) => {
-    const documentCandidates = (resultCandidates || []).filter(
-      (candidate) => candidate?.data?.documentId === documentId
+};
+const resolveLocaleCodesToRemoveFromIndex = ({
+  actionParams,
+  preDeleteStrapiEntry,
+  localeVariants
+}) => {
+  const actionLocale = getActionLocale(actionParams);
+  if (actionLocale && !isWildcardLocale(actionLocale)) {
+    return [actionLocale];
+  }
+  if (actionLocale == null) {
+    return typeof preDeleteStrapiEntry?.locale === "string" && preDeleteStrapiEntry.locale.length > 0 ? [preDeleteStrapiEntry.locale] : [];
+  }
+  return [
+    ...new Set(
+      (localeVariants || []).map((entry) => entry?.locale).filter((locale) => typeof locale === "string" && locale.length > 0)
+    )
+  ];
+};
+const collectLocaleCodesFromEntries = (entries) => {
+  return [
+    ...new Set(
+      (entries || []).map((entry) => entry?.locale).filter((locale) => typeof locale === "string" && locale.length > 0)
+    )
+  ];
+};
+const selectDraftEntriesForDiscardDraftResult = ({
+  resultCandidates,
+  documentId,
+  actionParams
+}) => {
+  const actionLocale = getActionLocale(actionParams);
+  const rankedDraftEntryCandidates = rankStrapiEntryCandidates(
+    (resultCandidates || []).filter(
+      (candidate) => candidate?.data?.documentId === documentId && !isPublishedStrapiEntry(candidate.data)
+    )
+  );
+  const rankedLocalizedDraftEntryCandidates = rankedDraftEntryCandidates.filter(
+    (candidate) => typeof candidate?.data?.locale === "string" && candidate.data.locale.length > 0
+  );
+  if (rankedDraftEntryCandidates.length === 0) return [];
+  if (actionLocale && !isWildcardLocale(actionLocale)) {
+    const localeCandidate = rankedLocalizedDraftEntryCandidates.find(
+      (candidate) => candidate?.data?.locale === actionLocale
     );
-    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;
+    return localeCandidate ? [localeCandidate.data] : [];
+  }
+  if (actionLocale && isWildcardLocale(actionLocale)) {
+    const entriesByLocale = /* @__PURE__ */ new Map();
+    rankedLocalizedDraftEntryCandidates.forEach((candidate) => {
+      const locale = candidate.data.locale;
+      if (!entriesByLocale.has(locale)) {
+        entriesByLocale.set(locale, candidate.data);
+      }
+    });
+    return [...entriesByLocale.values()];
+  }
+  return [
+    rankedLocalizedDraftEntryCandidates[0]?.data || rankedDraftEntryCandidates[0].data
+  ];
+};
+const fetchSingleEntryAfterTransaction = ({
+  contentTypeService: contentTypeService2,
+  contentType: contentType2,
+  documentId,
+  indexingQuery
+}) => new Promise((resolve, reject) => {
+  setImmediate(async () => {
+    try {
+      const strapiEntry = await contentTypeService2.getEntry({
+        contentType: contentType2,
+        documentId,
+        entriesQuery: { ...indexingQuery || {} }
+      });
+      resolve(strapiEntry);
+    } catch (error2) {
+      reject(error2);
     }
-    const publishedCandidate = rankedCandidates.find(
-      (candidate) => isPublishedEntry(candidate.data)
-    );
-    return publishedCandidate?.data || null;
-  };
-  const getEntryOutsideTransaction = ({
-    contentTypeService: contentTypeService2,
+  });
+});
+const fetchWildcardLocaleEntriesForIndexing = ({
+  contentTypeService: contentTypeService2,
+  contentType: contentType2,
+  documentId,
+  indexingQuery
+}) => {
+  const baseIndexingQuery = indexingQuery || {};
+  return contentTypeService2.getEntries({
+    contentType: contentType2,
+    ...baseIndexingQuery,
+    locale: "*",
+    filters: {
+      ...baseIndexingQuery.filters || {},
+      documentId
+    }
+  });
+};
+const buildPreActionSnapshot = async ({
+  contentTypeService: contentTypeService2,
+  contentType: contentType2,
+  documentId,
+  indexingStatusFilter,
+  actionParams,
+  indexingQueryUsesWildcardLocale
+}) => {
+  const preDeleteStrapiEntry = await contentTypeService2.getEntry({
     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);
-      }
+    entriesQuery: { ...indexingStatusFilter || {} }
+  });
+  const shouldFetchLocaleVariants = indexingQueryUsesWildcardLocale && isWildcardLocale(actionParams?.locale);
+  const localeVariants = shouldFetchLocaleVariants ? await contentTypeService2.getEntries({
+    contentType: contentType2,
+    fields: ["documentId", "locale"],
+    locale: "*",
+    ...indexingStatusFilter || {},
+    filters: {
+      documentId
+    }
+  }) : [];
+  const localeCodesToRemove = indexingQueryUsesWildcardLocale ? resolveLocaleCodesToRemoveFromIndex({
+    actionParams,
+    preDeleteStrapiEntry,
+    localeVariants
+  }) : [];
+  return {
+    documentId,
+    preDeleteStrapiEntry,
+    localeVariants,
+    localeCodesToRemove
+  };
+};
+const collectPreActionSnapshots = async ({
+  documentIds,
+  contentTypeService: contentTypeService2,
+  contentType: contentType2,
+  indexingStatusFilter,
+  actionParams,
+  indexingQueryUsesWildcardLocale
+}) => {
+  return Promise.all(
+    documentIds.map(
+      (documentId) => buildPreActionSnapshot({
+        contentTypeService: contentTypeService2,
+        contentType: contentType2,
+        documentId,
+        indexingStatusFilter,
+        actionParams,
+        indexingQueryUsesWildcardLocale
+      })
+    )
+  );
+};
+const normalizeLocaleCodes = (localeCodes) => {
+  return [
+    ...new Set(
+      (localeCodes || []).filter((locale) => typeof locale === "string" && locale.length > 0).map((locale) => locale.trim())
+    )
+  ];
+};
+const dispatchDeleteTargets = async ({
+  meilisearch: meilisearch2,
+  contentType: contentType2,
+  indexingQuery,
+  indexingQueryUsesWildcardLocale,
+  targets
+}) => {
+  const validTargets = (targets || []).filter(
+    (target) => target && typeof target.documentId === "string" && target.documentId.length > 0
+  );
+  if (validTargets.length === 0) return;
+  const groupedTargets = /* @__PURE__ */ new Map();
+  validTargets.forEach((target) => {
+    const localeCodes = indexingQueryUsesWildcardLocale ? normalizeLocaleCodes(target.localeCodes) : [];
+    const groupKey = localeCodes.length > 0 ? [...localeCodes].sort().join("|") : "__no-locales__";
+    const currentGroup = groupedTargets.get(groupKey);
+    if (currentGroup) {
+      currentGroup.documentIds.push(target.documentId);
+      return;
+    }
+    groupedTargets.set(groupKey, {
+      documentIds: [target.documentId],
+      localeCodes
     });
   });
+  for (const group of groupedTargets.values()) {
+    await meilisearch2.deleteEntriesFromMeiliSearch({
+      contentType: contentType2,
+      documentIds: [...new Set(group.documentIds)],
+      entriesQuery: indexingQuery,
+      locales: indexingQueryUsesWildcardLocale && group.localeCodes.length > 0 ? group.localeCodes : void 0
+    });
+  }
+};
+async function registerDocumentMiddleware({ strapi: strapi2 }) {
+  if (!strapi2?.documents || typeof strapi2.documents.use !== "function") {
+    return;
+  }
   strapi2.documents.use(async (ctx, next) => {
     let result;
     try {
@@ -424,83 +626,183 @@ async function registerDocumentMiddleware({ strapi: strapi2 }) {
         "unpublish",
         "discardDraft"
       ];
-      const entriesQuery = meilisearch2.entriesQuery({ contentType: contentType2 });
-      const shouldDeleteByLocale = isWildcardLocale(entriesQuery.locale);
-      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;
-      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
-              )
-            )
-          ];
-        }
-      }
+      const indexingQuery = meilisearch2.entriesQuery({ contentType: contentType2 });
+      const indexingQueryUsesWildcardLocale = isWildcardLocale(
+        indexingQuery.locale
+      );
+      const { status } = indexingQuery || {};
+      const indexingStatusFilter = typeof status === "string" && status.length > 0 ? { status } : {};
+      const isDraftIndex = status === "draft";
+      const isPublishedIndex = status === "published";
+      const shouldSkipDeleteAction = ctx.action === "unpublish" && isDraftIndex || ctx.action === "discardDraft" && isPublishedIndex;
+      const shouldProcessAsRefetchFirstIndexingAction = updateActions.includes(ctx.action) || ctx.action === "discardDraft" && isDraftIndex;
+      const shouldProcessAsDeleteAction = deleteActions.includes(ctx.action) && !shouldProcessAsRefetchFirstIndexingAction && !shouldSkipDeleteAction;
+      const preActionDocumentIds = resolveDocumentIdsFromActionParams(
+        ctx?.params
+      );
+      const shouldCollectPreActionSnapshots = shouldProcessAsDeleteAction || ctx.action === "discardDraft" && isDraftIndex;
+      const preActionSnapshots = shouldCollectPreActionSnapshots ? await collectPreActionSnapshots({
+        documentIds: preActionDocumentIds,
+        contentTypeService: contentTypeService2,
+        contentType: contentType2,
+        indexingStatusFilter,
+        actionParams: ctx?.params,
+        indexingQueryUsesWildcardLocale
+      }) : [];
+      const preActionSnapshotsByDocumentId = new Map(
+        preActionSnapshots.map((snapshot) => [snapshot.documentId, snapshot])
+      );
       result = await next();
-      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 resultCandidates = extractEntryCandidates(result);
-        let entry = getEntryFromResult({
-          resultCandidates,
-          documentId,
-          entriesQuery
-        });
-        if (!entry) {
-          entry = await getEntryOutsideTransaction({
-            contentTypeService: contentTypeService2,
-            contentType: contentType2,
-            documentId,
-            entriesQuery
+      const documentIds = resolveDocumentIds({
+        actionParams: ctx?.params,
+        result,
+        preActionSnapshots
+      });
+      if (shouldProcessAsRefetchFirstIndexingAction && documentIds.length > 0) {
+        const actionResultCandidates = extractStrapiEntryCandidates(result);
+        const entriesToIndex = [];
+        const deleteTargets = [];
+        for (const documentId of documentIds) {
+          if (ctx.action === "discardDraft" && isDraftIndex) {
+            const preActionSnapshot = preActionSnapshotsByDocumentId.get(documentId) || null;
+            const actionLocale2 = getActionLocale(ctx?.params);
+            const shouldLoadDraftEntriesAcrossLocales = indexingQueryUsesWildcardLocale && isWildcardLocale(actionLocale2);
+            const draftEntriesFromActionResult = selectDraftEntriesForDiscardDraftResult({
+              resultCandidates: actionResultCandidates,
+              documentId,
+              actionParams: ctx?.params
+            });
+            let draftEntriesToIndex = shouldLoadDraftEntriesAcrossLocales ? await contentTypeService2.getEntries({
+              contentType: contentType2,
+              locale: "*",
+              ...indexingStatusFilter,
+              filters: {
+                documentId
+              }
+            }) : draftEntriesFromActionResult;
+            draftEntriesToIndex = (draftEntriesToIndex || []).filter(
+              (entry) => entry && !isPublishedStrapiEntry(entry)
+            );
+            if (draftEntriesToIndex.length === 0 && shouldLoadDraftEntriesAcrossLocales) {
+              draftEntriesToIndex = draftEntriesFromActionResult;
+            }
+            if (draftEntriesToIndex.length === 0 && !shouldLoadDraftEntriesAcrossLocales) {
+              const refetchedDraftEntry = await fetchSingleEntryAfterTransaction({
+                contentTypeService: contentTypeService2,
+                contentType: contentType2,
+                documentId,
+                indexingQuery: resolveLocaleScopedRefetchQuery({
+                  indexingQuery,
+                  actionParams: ctx?.params
+                })
+              });
+              if (refetchedDraftEntry && !isPublishedStrapiEntry(refetchedDraftEntry)) {
+                draftEntriesToIndex = [refetchedDraftEntry];
+              }
+            }
+            if (draftEntriesToIndex.length > 0) {
+              const normalizedDraftEntries = draftEntriesToIndex.map(
+                (entry) => entry.documentId === documentId ? entry : { ...entry, documentId }
+              );
+              entriesToIndex.push(...normalizedDraftEntries);
+            }
+            const preActionLocaleCodes = resolveLocaleCodesToRemoveFromIndex({
+              actionParams: ctx?.params,
+              preDeleteStrapiEntry: preActionSnapshot?.preDeleteStrapiEntry || null,
+              localeVariants: preActionSnapshot?.localeVariants || []
+            });
+            const remainingLocaleCodes = collectLocaleCodesFromEntries(draftEntriesToIndex);
+            const localeCodesToDelete = preActionLocaleCodes.filter(
+              (localeCode) => !remainingLocaleCodes.includes(localeCode)
+            );
+            if (localeCodesToDelete.length > 0) {
+              deleteTargets.push({
+                documentId,
+                localeCodes: localeCodesToDelete
+              });
+            }
+            continue;
+          }
+          let refetchedEntriesForDocument = [];
+          const actionLocale = getActionLocale(ctx?.params);
+          const localeScopedRefetchQuery = resolveLocaleScopedRefetchQuery({
+            indexingQuery,
+            actionParams: ctx?.params
           });
+          const indexingQueryStoresDrafts = indexingQuery?.status === "draft";
+          const shouldRefetchAllLocales = indexingQueryUsesWildcardLocale && isWildcardLocale(actionLocale) && isWildcardLocale(indexingQuery?.locale) && !indexingQueryStoresDrafts;
+          if (shouldRefetchAllLocales) {
+            refetchedEntriesForDocument = await fetchWildcardLocaleEntriesForIndexing({
+              contentTypeService: contentTypeService2,
+              contentType: contentType2,
+              documentId,
+              indexingQuery
+            });
+          } else {
+            const refetchedStrapiEntry = await fetchSingleEntryAfterTransaction(
+              {
+                contentTypeService: contentTypeService2,
+                contentType: contentType2,
+                documentId,
+                indexingQuery: localeScopedRefetchQuery
+              }
+            );
+            if (refetchedStrapiEntry) {
+              refetchedEntriesForDocument = [refetchedStrapiEntry];
+            }
+          }
+          if (refetchedEntriesForDocument.length > 0) {
+            const normalizedEntries = refetchedEntriesForDocument.map(
+              (entry) => entry.documentId === documentId ? entry : { ...entry, documentId }
+            );
+            entriesToIndex.push(...normalizedEntries);
+          } else if (ctx.action === "create" || ctx.action === "publish") {
+            const createPublishLocaleCodesToRemove = indexingQueryUsesWildcardLocale && typeof localeScopedRefetchQuery?.locale === "string" && localeScopedRefetchQuery.locale.length > 0 && !isWildcardLocale(localeScopedRefetchQuery.locale) ? [localeScopedRefetchQuery.locale] : [];
+            if (createPublishLocaleCodesToRemove.length > 0) {
+              deleteTargets.push({
+                documentId,
+                localeCodes: createPublishLocaleCodesToRemove
+              });
+            }
+          } else {
+            strapi2.log.info(
+              `Meilisearch document middleware skipped indexing ${contentType2} documentId=${documentId} for action ${ctx.action}: no indexable Strapi entry after refetch`
+            );
+          }
         }
-        if (entry) {
-          const normalizedEntry = entry.documentId === documentId ? entry : { ...entry, documentId };
+        if (entriesToIndex.length > 0) {
           await meilisearch2.updateEntriesInMeilisearch({
             contentType: contentType2,
-            entries: [normalizedEntry]
+            entries: entriesToIndex
           });
-        } else if (ctx.action === "create" || ctx.action === "publish") {
-          await meilisearch2.deleteEntriesFromMeiliSearch({
+        }
+        if (deleteTargets.length > 0) {
+          await dispatchDeleteTargets({
+            meilisearch: meilisearch2,
             contentType: contentType2,
-            documentIds: [documentId],
-            entriesQuery
+            indexingQuery,
+            indexingQueryUsesWildcardLocale,
+            targets: deleteTargets
           });
-        } 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) {
+      } else if (shouldProcessAsDeleteAction) {
+        if (documentIds.length > 0) {
+          const deleteTargets = documentIds.map((documentId) => {
+            const preActionSnapshot = preActionSnapshotsByDocumentId.get(documentId) || null;
+            return {
+              documentId,
+              localeCodes: indexingQueryUsesWildcardLocale ? preActionSnapshot?.localeCodesToRemove || [] : []
+            };
+          });
           strapi2.log.info(
-            `Meilisearch document middleware deleting ${contentType2} documentId=${documentId}`
+            `Meilisearch document middleware deleting ${contentType2} documentIds=${documentIds.join(",")}`
           );
-          await meilisearch2.deleteEntriesFromMeiliSearch({
+          await dispatchDeleteTargets({
+            meilisearch: meilisearch2,
             contentType: contentType2,
-            documentIds: [documentId],
-            entriesQuery,
-            locales: shouldDeleteByLocale && preDeleteLocales.length > 0 ? preDeleteLocales : void 0
+            indexingQuery,
+            indexingQueryUsesWildcardLocale,
+            targets: deleteTargets
           });
         } else {
           strapi2.log.info(
@@ -1635,7 +1937,7 @@ const store = ({ strapi: strapi2 }) => {
     ...createStoreConnector({ strapi: strapi2 })
   };
 };
-const version = "0.16.2";
+const version = "0.16.4";
 const Meilisearch = (config2) => {
   return new MeiliSearch({
     ...config2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-meilisearch",
-  "version": "0.16.2",
+  "version": "0.16.4",
   "description": "Synchronise and search in your Strapi content-types with Meilisearch",
   "scripts": {
     "build": "strapi-plugin build",