@fourlights/strapi-plugin-deep-populate 1.11.1 → 1.13.0-rc.0

package/dist/server/index.js

@@ -18467,11 +18467,11 @@ const register = async ({ strapi: strapi2 }) => {
       context.fields = ["documentId", "status", "locale"];
     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: locale2 } = result;
       const status = publishedAt !== null ? "published" : "draft";
-      if (useCache && context.action === "update")
-        await cacheService.clear({ ...context.params, contentType: context.uid });
+      const refreshCache = useCache && ["update", "publish"].includes(context.action);
+      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: locale2 });
         if (returnDeeplyPopulated)
@@ -18508,7 +18508,7 @@ const register = async ({ strapi: strapi2 }) => {
     return result;
   });
 };
-const version = "1.11.1";
+const version = "1.13.0-rc.0";
 const name = "@fourlights/strapi-plugin-deep-populate";
 const error = (msg, context = void 0) => strapi.log.error(`[${name}] ${msg}`, context);
 const warn = (msg, context = void 0) => strapi.log.warn(`[${name}] ${msg}`, context);
@@ -18615,8 +18615,9 @@ const cache = ({ strapi: strapi2 }) => ({
     await this.refreshDependents(params.documentId);
     return retval;
   },
-  async refreshDependents(documentId) {
-    const entries = await strapi2.documents("plugin::deep-populate.cache").findMany({ filters: { dependencies: { $contains: documentId } }, fields: ["documentId", "params"] });
+  async refreshDependents(documentId, status) {
+    let entries = await strapi2.documents("plugin::deep-populate.cache").findMany({ filters: { dependencies: { $contains: documentId } }, fields: ["documentId", "params"] });
+    if (status !== void 0) entries = entries.filter((entry) => entry.params.status === status);
     const deleted = await strapi2.db.query("plugin::deep-populate.cache").deleteMany({
       where: {
         documentId: { $in: entries.map((x) => x.documentId) }
@@ -18680,7 +18681,14 @@ async function _populateDynamicZone({
       ...params
     });
     const currentPopulate = get__default.default(resolvedPopulate, [component]);
-    const mergedComponentPopulate = !currentPopulate && componentPopulate === true ? componentPopulate : merge__default.default({}, currentPopulate, sanitizeObject(componentPopulate));
+    let mergedComponentPopulate;
+    if (currentPopulate === void 0) {
+      mergedComponentPopulate = typeof componentPopulate === "boolean" ? componentPopulate : sanitizeObject(componentPopulate);
+    } else if (typeof currentPopulate === "boolean") {
+      mergedComponentPopulate = typeof componentPopulate === "boolean" ? currentPopulate || componentPopulate : currentPopulate;
+    } else if (typeof currentPopulate === "object") {
+      mergedComponentPopulate = typeof componentPopulate === "object" ? merge__default.default(currentPopulate, sanitizeObject(componentPopulate)) : currentPopulate;
+    }
     set__default.default(resolvedPopulate, [component], mergedComponentPopulate);
   }
   if (isEmpty(resolvedPopulate)) return void 0;
@@ -18900,7 +18908,8 @@ async function populate$1(params) {
   });
   populated.__deepPopulated = true;
   populated.__deepPopulateConfig = config2;
-  return { populate: populated, dependencies: [...resolvedRelations.keys()] };
+  const dependencies = [...resolvedRelations.keys()].filter((r) => !r.startsWith("api::"));
+  return { populate: populated, dependencies };
 }
 const populate = ({ strapi: strapi2 }) => ({
   async get(params) {

package/dist/server/index.mjs

@@ -18439,11 +18439,11 @@ const register = async ({ strapi: strapi2 }) => {
       context.fields = ["documentId", "status", "locale"];
     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: locale2 } = result;
       const status = publishedAt !== null ? "published" : "draft";
-      if (useCache && context.action === "update")
-        await cacheService.clear({ ...context.params, contentType: context.uid });
+      const refreshCache = useCache && ["update", "publish"].includes(context.action);
+      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: locale2 });
         if (returnDeeplyPopulated)
@@ -18480,7 +18480,7 @@ const register = async ({ strapi: strapi2 }) => {
     return result;
   });
 };
-const version = "1.11.1";
+const version = "1.13.0-rc.0";
 const name = "@fourlights/strapi-plugin-deep-populate";
 const error = (msg, context = void 0) => strapi.log.error(`[${name}] ${msg}`, context);
 const warn = (msg, context = void 0) => strapi.log.warn(`[${name}] ${msg}`, context);
@@ -18587,8 +18587,9 @@ const cache = ({ strapi: strapi2 }) => ({
     await this.refreshDependents(params.documentId);
     return retval;
   },
-  async refreshDependents(documentId) {
-    const entries = await strapi2.documents("plugin::deep-populate.cache").findMany({ filters: { dependencies: { $contains: documentId } }, fields: ["documentId", "params"] });
+  async refreshDependents(documentId, status) {
+    let entries = await strapi2.documents("plugin::deep-populate.cache").findMany({ filters: { dependencies: { $contains: documentId } }, fields: ["documentId", "params"] });
+    if (status !== void 0) entries = entries.filter((entry) => entry.params.status === status);
     const deleted = await strapi2.db.query("plugin::deep-populate.cache").deleteMany({
       where: {
         documentId: { $in: entries.map((x) => x.documentId) }
@@ -18652,7 +18653,14 @@ async function _populateDynamicZone({
       ...params
     });
     const currentPopulate = get$2(resolvedPopulate, [component]);
-    const mergedComponentPopulate = !currentPopulate && componentPopulate === true ? componentPopulate : merge$2({}, currentPopulate, sanitizeObject(componentPopulate));
+    let mergedComponentPopulate;
+    if (currentPopulate === void 0) {
+      mergedComponentPopulate = typeof componentPopulate === "boolean" ? componentPopulate : sanitizeObject(componentPopulate);
+    } else if (typeof currentPopulate === "boolean") {
+      mergedComponentPopulate = typeof componentPopulate === "boolean" ? currentPopulate || componentPopulate : currentPopulate;
+    } else if (typeof currentPopulate === "object") {
+      mergedComponentPopulate = typeof componentPopulate === "object" ? merge$2(currentPopulate, sanitizeObject(componentPopulate)) : currentPopulate;
+    }
     set$2(resolvedPopulate, [component], mergedComponentPopulate);
   }
   if (isEmpty(resolvedPopulate)) return void 0;
@@ -18872,7 +18880,8 @@ async function populate$1(params) {
   });
   populated.__deepPopulated = true;
   populated.__deepPopulateConfig = config2;
-  return { populate: populated, dependencies: [...resolvedRelations.keys()] };
+  const dependencies = [...resolvedRelations.keys()].filter((r) => !r.startsWith("api::"));
+  return { populate: populated, dependencies };
 }
 const populate = ({ strapi: strapi2 }) => ({
   async get(params) {

package/dist/server/src/index.d.ts

@@ -81,7 +81,7 @@ declare const _default: {
                 dependencies: string[];
             }): Promise<import("@strapi/types/dist/modules/documents").AnyDocument>;
             clear(params: import("./services/populate").PopulateParams): Promise<any>;
-            refreshDependents(documentId: string): Promise<void>;
+            refreshDependents(documentId: string, status?: "published" | "draft"): Promise<void>;
         };
     };
     register: ({ strapi }: {

package/dist/server/src/services/cache.d.ts

@@ -9,6 +9,6 @@ declare const _default: ({ strapi }: {
     get(params: PopulateParams): Promise<any>;
     set({ populate, dependencies, ...params }: SetPopulateParams): Promise<Modules.Documents.AnyDocument>;
     clear(params: PopulateParams): Promise<any>;
-    refreshDependents(documentId: string): Promise<void>;
+    refreshDependents(documentId: string, status?: "draft" | "published" | undefined): Promise<void>;
 };
 export default _default;

package/dist/server/src/services/index.d.ts

@@ -22,7 +22,7 @@ declare const _default: {
             dependencies: string[];
         }): Promise<import("@strapi/types/dist/modules/documents").AnyDocument>;
         clear(params: import("./populate").PopulateParams): Promise<any>;
-        refreshDependents(documentId: string): Promise<void>;
+        refreshDependents(documentId: string, status?: "published" | "draft"): Promise<void>;
     };
 };
 export default _default;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.11.1",
+  "version": "1.13.0-rc.0",
   "keywords": [
     "strapi",
     "strapi-plugin",