@fourlights/strapi-plugin-deep-populate 1.1.0 → 1.1.2

package/dist/server/index.js

@@ -25078,6 +25078,7 @@ async function _populateComponent({
   populate: populate2 = {},
   lookup,
   inDynamicZone = false,
+  resolvedRelations,
   omitEmpty
 }) {
   const attrName = lookup.pop();
@@ -25090,6 +25091,7 @@ async function _populateComponent({
     schema: schema2,
     populate: componentPopulate,
     lookup: componentLookup,
+    resolvedRelations,
     omitEmpty
   });
   return isEmpty(nestedPopulate) ? true : { populate: nestedPopulate };
@@ -25100,6 +25102,7 @@ async function _populateDynamicZone({
   components,
   populate: populate2,
   lookup,
+  resolvedRelations,
   omitEmpty
 }) {
   const resolvedPopulate = await components.reduce(async (prev, cur) => {
@@ -25110,6 +25113,7 @@ async function _populateDynamicZone({
       populate: populate2,
       lookup: [...lookup, cur],
       inDynamicZone: true,
+      resolvedRelations,
       omitEmpty
     });
     const newPop = await prev;
@@ -25149,20 +25153,31 @@ async function _populateRelation({
   return isEmpty(newPopulate) ? true : { populate: newPopulate };
 }
 const _resolveValue = ({ document: document2, lookup, attrName }) => {
-  if (lookup.find((l) => l === "on")) {
-    const attrLookup = lookup.filter((l) => l !== "on");
-    const parentAttr = attrLookup.pop();
-    const parentValue2 = (delve__default.default(document2, attrLookup) ?? []).filter((b) => b.__component === parentAttr) ?? [];
-    return (Array.isArray(parentValue2) ? parentValue2 : [parentValue2]).find((v) => hasValue(v[attrName]))?.[attrName];
-  }
-  if (lookup.find((l) => l === "populate")) {
-    const attrLookup = lookup.filter((l) => l !== "populate");
-    const parentValue2 = delve__default.default(document2, attrLookup) ?? [];
-    return (Array.isArray(parentValue2) ? parentValue2 : [parentValue2]).find((v) => hasValue(v[attrName]))?.[attrName];
+  const dynamicZoneIdx = Array.isArray(lookup) ? lookup.findIndex((l) => l === "on") : -1;
+  const populateIdx = Array.isArray(lookup) ? lookup.findIndex((l) => l === "populate") : -1;
+  if (dynamicZoneIdx !== -1) {
+    const dynamicZoneLookup = lookup.slice(0, dynamicZoneIdx);
+    const dynamicZoneComponent = lookup[dynamicZoneIdx + 1];
+    const componentLookup = lookup.slice(dynamicZoneIdx + 2);
+    if (componentLookup.find((l) => l === "on")) {
+      throw Error("Nested dynamic zones are not supported");
+    }
+    const dynamicZoneValue = delve__default.default(document2, dynamicZoneLookup) ?? [];
+    const componentValue = dynamicZoneValue.filter((b) => b.__component === dynamicZoneComponent).map((c) => _resolveValue({ document: c, lookup: componentLookup, attrName }));
+    return (Array.isArray(componentValue) ? componentValue : [componentValue]).find((v) => hasValue(v));
+  }
+  if (populateIdx !== -1) {
+    const parentLookup = lookup.slice(0, populateIdx);
+    const childLookup = lookup[populateIdx + 1];
+    const parentValue2 = delve__default.default(document2, parentLookup);
+    const childValue = (Array.isArray(parentValue2) ? parentValue2 : [parentValue2]).map(
+      (v) => _resolveValue({ document: parentValue2, lookup: childLookup, attrName })
+    );
+    return childValue.find((v) => hasValue(v));
   }
   const parentValue = delve__default.default(document2, lookup);
   if (Array.isArray(parentValue)) {
-    return parentValue.map((v) => v[attrName]);
+    return parentValue.map((v) => v[attrName]).filter((v) => hasValue(v));
   }
   return parentValue?.[attrName];
 };
@@ -25208,11 +25223,13 @@ async function _populate({
         mainDocumentId,
         components: relComponents,
         lookup: [...lookup, attrName],
+        resolvedRelations,
         omitEmpty
       });
     }
     if (contentTypes.isRelationalAttribute(attr)) {
       const { target: relContentType } = attr;
+      resolvedRelations.set(mainDocumentId, true);
       newPopulate[attrName] = await _populateRelation({
         contentType: relContentType,
         relation: value,
@@ -25226,6 +25243,7 @@ async function _populate({
         mainDocumentId,
         schema: attr.component,
         lookup: [...lookup, attrName],
+        resolvedRelations,
         omitEmpty
       });
     }

package/dist/server/index.mjs

@@ -25064,6 +25064,7 @@ async function _populateComponent({
   populate: populate2 = {},
   lookup,
   inDynamicZone = false,
+  resolvedRelations,
   omitEmpty
 }) {
   const attrName = lookup.pop();
@@ -25076,6 +25077,7 @@ async function _populateComponent({
     schema: schema2,
     populate: componentPopulate,
     lookup: componentLookup,
+    resolvedRelations,
     omitEmpty
   });
   return isEmpty(nestedPopulate) ? true : { populate: nestedPopulate };
@@ -25086,6 +25088,7 @@ async function _populateDynamicZone({
   components,
   populate: populate2,
   lookup,
+  resolvedRelations,
   omitEmpty
 }) {
   const resolvedPopulate = await components.reduce(async (prev, cur) => {
@@ -25096,6 +25099,7 @@ async function _populateDynamicZone({
       populate: populate2,
       lookup: [...lookup, cur],
       inDynamicZone: true,
+      resolvedRelations,
       omitEmpty
     });
     const newPop = await prev;
@@ -25135,20 +25139,31 @@ async function _populateRelation({
   return isEmpty(newPopulate) ? true : { populate: newPopulate };
 }
 const _resolveValue = ({ document: document2, lookup, attrName }) => {
-  if (lookup.find((l) => l === "on")) {
-    const attrLookup = lookup.filter((l) => l !== "on");
-    const parentAttr = attrLookup.pop();
-    const parentValue2 = (delve(document2, attrLookup) ?? []).filter((b) => b.__component === parentAttr) ?? [];
-    return (Array.isArray(parentValue2) ? parentValue2 : [parentValue2]).find((v) => hasValue(v[attrName]))?.[attrName];
-  }
-  if (lookup.find((l) => l === "populate")) {
-    const attrLookup = lookup.filter((l) => l !== "populate");
-    const parentValue2 = delve(document2, attrLookup) ?? [];
-    return (Array.isArray(parentValue2) ? parentValue2 : [parentValue2]).find((v) => hasValue(v[attrName]))?.[attrName];
+  const dynamicZoneIdx = Array.isArray(lookup) ? lookup.findIndex((l) => l === "on") : -1;
+  const populateIdx = Array.isArray(lookup) ? lookup.findIndex((l) => l === "populate") : -1;
+  if (dynamicZoneIdx !== -1) {
+    const dynamicZoneLookup = lookup.slice(0, dynamicZoneIdx);
+    const dynamicZoneComponent = lookup[dynamicZoneIdx + 1];
+    const componentLookup = lookup.slice(dynamicZoneIdx + 2);
+    if (componentLookup.find((l) => l === "on")) {
+      throw Error("Nested dynamic zones are not supported");
+    }
+    const dynamicZoneValue = delve(document2, dynamicZoneLookup) ?? [];
+    const componentValue = dynamicZoneValue.filter((b) => b.__component === dynamicZoneComponent).map((c) => _resolveValue({ document: c, lookup: componentLookup, attrName }));
+    return (Array.isArray(componentValue) ? componentValue : [componentValue]).find((v) => hasValue(v));
+  }
+  if (populateIdx !== -1) {
+    const parentLookup = lookup.slice(0, populateIdx);
+    const childLookup = lookup[populateIdx + 1];
+    const parentValue2 = delve(document2, parentLookup);
+    const childValue = (Array.isArray(parentValue2) ? parentValue2 : [parentValue2]).map(
+      (v) => _resolveValue({ document: parentValue2, lookup: childLookup, attrName })
+    );
+    return childValue.find((v) => hasValue(v));
   }
   const parentValue = delve(document2, lookup);
   if (Array.isArray(parentValue)) {
-    return parentValue.map((v) => v[attrName]);
+    return parentValue.map((v) => v[attrName]).filter((v) => hasValue(v));
   }
   return parentValue?.[attrName];
 };
@@ -25194,11 +25209,13 @@ async function _populate({
         mainDocumentId,
         components: relComponents,
         lookup: [...lookup, attrName],
+        resolvedRelations,
         omitEmpty
       });
     }
     if (contentTypes.isRelationalAttribute(attr)) {
       const { target: relContentType } = attr;
+      resolvedRelations.set(mainDocumentId, true);
       newPopulate[attrName] = await _populateRelation({
         contentType: relContentType,
         relation: value,
@@ -25212,6 +25229,7 @@ async function _populate({
         mainDocumentId,
         schema: attr.component,
         lookup: [...lookup, attrName],
+        resolvedRelations,
         omitEmpty
       });
     }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0",
+  "version": "1.1.2",
   "keywords": [
     "strapi",
     "strapi-plugin",