Merge pull request #107 from Four-Lights-NL/fix/cache-invalidation-cascade

fix: cache invalidation cascade

Author: trijpstra-fourlights

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.12.0] - 2025-11-20
+
+### Fixed
+
+- Cache invalidation now properly triggers when publishing an document ([#107](https://github.com/Four-Lights-NL/strapi-plugin-deep-populate/pull/107)) (Thomas Rijpstra)
+
 ## [1.11.1] - 2025-11-19
 
 ### Changed
@@ -275,3 +281,5 @@ _:seedling: Initial release._
 [1.11.0]: https://github.com/Four-Lights-NL/strapi-plugin-deep-populate/releases/tag/v1.11.0
 
 [1.11.1]: https://github.com/Four-Lights-NL/strapi-plugin-deep-populate/releases/tag/v1.11.1
+
+[1.12.0]: https://github.com/Four-Lights-NL/strapi-plugin-deep-populate/releases/tag/v1.12.0

server/src/register.ts

@@ -87,12 +87,12 @@ export default async ({ strapi }) => {
     const result = await next()
     if (!result) return result
 
-    if (["create", "update"].includes(context.action)) {
+    if (["create", "update", "publish"].includes(context.action)) {
       const { documentId, publishedAt, locale } = result
       const status = publishedAt !== null ? "published" : "draft"
+      const refreshCache = useCache && ["update", "publish"].includes(context.action)
 
-      if (useCache && context.action === "update")
-        await cacheService.clear({ ...context.params, contentType: context.uid })
+      if (refreshCache) await cacheService.clear({ ...context.params, status, contentType: context.uid })
 
       if (useCache || returnDeeplyPopulated) {
         const deepPopulate = await populateService.get({ contentType: context.uid, documentId, status, locale })

server/src/services/cache.ts

@@ -76,12 +76,15 @@ export default ({ strapi }: { strapi: Core.Strapi }) => ({
     return retval
   },
 
-  async refreshDependents(documentId: string) {
+  async refreshDependents(documentId: string, status?: "draft" | "published" | undefined) {
     // Get all cached entries that are dependent on the document
-    const entries = await strapi
+    let entries = await strapi
       .documents("plugin::deep-populate.cache")
       .findMany({ filters: { dependencies: { $contains: documentId } }, fields: ["documentId", "params"] })
 
+    // Filter on requested status
+    if (status !== undefined) entries = entries.filter((entry) => entry.params.status === status)
+
     // Delete the cached entries
     const deleted = await strapi.db.query("plugin::deep-populate.cache").deleteMany({
       where: {

server/src/services/deep-populate/index.ts

@@ -375,5 +375,7 @@ export default async function populate(params: PopulateParams) {
   populated.__deepPopulated = true
   populated.__deepPopulateConfig = config
 
-  return { populate: populated, dependencies: [...resolvedRelations.keys()] }
+  // Remove content-types from resolvedRelations
+  const dependencies = [...resolvedRelations.keys()].filter((r) => !r.startsWith("api::"))
+  return { populate: populated, dependencies }
 }