Merge pull request #108 from Four-Lights-NL/fix/component-populate-merging

fix(deep-populate): handle populate merging for all type combinations

Author: trijpstra-fourlights

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.13.0] - 2025-11-20
+
+### Fixed
+
+- Merging deeply nested dynamic zones in repeatable components will now be correctly merged ([`c1a4d02`](https://github.com/Four-Lights-NL/strapi-plugin-deep-populate/commit/c1a4d02)) (Thomas Rijpstra)
+
 ## [1.12.0] - 2025-11-20
 
 ### Fixed
@@ -283,3 +289,5 @@ _:seedling: Initial release._
 [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
+
+[1.13.0]: https://github.com/Four-Lights-NL/strapi-plugin-deep-populate/releases/tag/v1.13.0

package-lock.json

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

package.json

@@ -73,10 +73,19 @@ async function _populateDynamicZone<TContentType extends UID.ContentType>({
     })
 
     const currentPopulate = get(resolvedPopulate, [component])
-    const mergedComponentPopulate =
-      !currentPopulate && componentPopulate === true
-        ? componentPopulate
-        : merge({}, currentPopulate, sanitizeObject(componentPopulate))
+    let mergedComponentPopulate: boolean | unknown | undefined
+    if (currentPopulate === undefined) {
+      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(currentPopulate, sanitizeObject(componentPopulate))
+          : currentPopulate
+    }
     set(resolvedPopulate, [component], mergedComponentPopulate) // NOTE: We pass cur as `array` so that the dot notation is used as the key
   }