strapi-plugin-bulk-updater 1.3.0 → 1.3.1

package/dist/server/index.js

@@ -694,15 +694,20 @@ const MAX_QUERY_CACHE_SIZE = 500;
 const CACHE_TTL_MS = 60 * 1e3;
 let staticSchemaCache = null;
 function buildDeepPopulate$1(attributes, allComponents, depth2 = 0) {
-  if (depth2 > 5) return true;
+  if (depth2 > 5) return void 0;
   const populate2 = {};
   for (const [key, def] of Object.entries(attributes || {})) {
     if (def.type === "component" && def.component) {
       const comp = allComponents[def.component];
       if (comp?.attributes) {
-        populate2[key] = {
-          populate: buildDeepPopulate$1(comp.attributes, allComponents, depth2 + 1)
-        };
+        const subPopulate = buildDeepPopulate$1(comp.attributes, allComponents, depth2 + 1);
+        if (subPopulate && Object.keys(subPopulate).length > 0) {
+          populate2[key] = {
+            populate: subPopulate
+          };
+        } else {
+          populate2[key] = true;
+        }
       } else {
         populate2[key] = true;
       }
@@ -712,7 +717,7 @@ function buildDeepPopulate$1(attributes, allComponents, depth2 = 0) {
       populate2[key] = true;
     }
   }
-  return Object.keys(populate2).length > 0 ? populate2 : true;
+  return Object.keys(populate2).length > 0 ? populate2 : void 0;
 }
 function discoverComponentAttributes(strapi2, compUid, prefix, currentDepth, maxDepth, systemFields, allContentTypes, relationsByAttr, allRelationsMeta, attributesMeta) {
   if (currentDepth > maxDepth || !compUid) return [];
@@ -1029,10 +1034,12 @@ async function executeBatchInternal(strapi2, {
         const hasAttribute = Boolean(attrDef) || isComponentNested;
         if (hasAttribute) {
           if (isComponentNested) {
-            const currentEntryWithPopulate = await strapi2.documents(target.uid).findOne({
-              documentId: target.documentId,
-              populate: buildDeepPopulate$1(contentType.attributes, strapi2.components)
-            });
+            const populateOption = buildDeepPopulate$1(contentType.attributes, strapi2.components);
+            const findOneArgs = { documentId: target.documentId };
+            if (populateOption) {
+              findOneArgs.populate = populateOption;
+            }
+            const currentEntryWithPopulate = await strapi2.documents(target.uid).findOne(findOneArgs);
             const existingRoot = currentEntryWithPopulate?.[rootKey] || {};
             const currentVal2 = getDeepProperty(existingRoot, parts.slice(1).join("."));
             let newValue2 = value;
@@ -1585,20 +1592,25 @@ const bulkUpdaterService = ({ strapi: strapi2 }) => {
             try {
               const populateOption = buildDeepPopulate$1(allContentTypes[uid]?.attributes || {}, strapi2.components);
               if (meta.isSingleType) {
-                const singleDoc = await strapi2.documents(uid).findFirst({
-                  populate: populateOption
-                });
+                const singleArgs = {};
+                if (populateOption) {
+                  singleArgs.populate = populateOption;
+                }
+                const singleDoc = await strapi2.documents(uid).findFirst(singleArgs);
                 if (singleDoc) {
                   entries = [singleDoc];
                   totalCount = 1;
                 }
               } else {
                 totalCount = await strapi2.documents(uid).count();
-                entries = await strapi2.documents(uid).findMany({
+                const findArgs = {
                   limit: 10,
-                  sort: { createdAt: "desc" },
-                  populate: populateOption
-                });
+                  sort: { createdAt: "desc" }
+                };
+                if (populateOption) {
+                  findArgs.populate = populateOption;
+                }
+                entries = await strapi2.documents(uid).findMany(findArgs);
               }
             } catch (err) {
               strapi2.log.error(`[bulk-updater] Failed to fetch entries for ${uid}:`, err);
@@ -1797,10 +1809,13 @@ const bulkUpdaterService = ({ strapi: strapi2 }) => {
       if (isSingleType) {
         let singleDoc = null;
         try {
-          singleDoc = await strapi2.documents(uid).findFirst({
-            filters: Object.keys(filters2).length > 0 ? filters2 : void 0,
-            populate: populateOption
-          });
+          const singleArgs = {
+            filters: Object.keys(filters2).length > 0 ? filters2 : void 0
+          };
+          if (populateOption) {
+            singleArgs.populate = populateOption;
+          }
+          singleDoc = await strapi2.documents(uid).findFirst(singleArgs);
         } catch {
           singleDoc = null;
         }
@@ -1831,14 +1846,17 @@ const bulkUpdaterService = ({ strapi: strapi2 }) => {
         } else {
           sortClause["createdAt"] = "desc";
         }
+        const findManyArgs = {
+          start,
+          limit,
+          filters: Object.keys(filters2).length > 0 ? filters2 : void 0,
+          sort: sortClause
+        };
+        if (populateOption) {
+          findManyArgs.populate = populateOption;
+        }
         const [entries, totalEntries] = await Promise.all([
-          strapi2.documents(uid).findMany({
-            start,
-            limit,
-            filters: Object.keys(filters2).length > 0 ? filters2 : void 0,
-            sort: sortClause,
-            populate: populateOption
-          }),
+          strapi2.documents(uid).findMany(findManyArgs),
           strapi2.documents(uid).count({
             filters: Object.keys(filters2).length > 0 ? filters2 : void 0
           })
@@ -1975,10 +1993,12 @@ const bulkUpdaterService = ({ strapi: strapi2 }) => {
           }
           let currentEntry;
           if (isComponentNested) {
-            currentEntry = await strapi2.documents(target.uid).findOne({
-              documentId: target.documentId,
-              populate: buildDeepPopulate$1(contentType.attributes, strapi2.components)
-            });
+            const findOneArgs = { documentId: target.documentId };
+            const populateOption = buildDeepPopulate$1(contentType.attributes, strapi2.components);
+            if (populateOption) {
+              findOneArgs.populate = populateOption;
+            }
+            currentEntry = await strapi2.documents(target.uid).findOne(findOneArgs);
           } else if (attrDef?.type === "relation") {
             currentEntry = await strapi2.documents(target.uid).findOne({
               documentId: target.documentId,
@@ -3727,15 +3747,20 @@ function discoverExportFields(ct, allComponents, maxDepth = 4) {
   return fields2;
 }
 function buildDeepPopulate(attributes, allComponents, depth2 = 0) {
-  if (depth2 > 4) return true;
+  if (depth2 > 5) return void 0;
   const populate2 = {};
   for (const [key, def] of Object.entries(attributes || {})) {
     if (def.type === "component" && def.component) {
       const comp = allComponents[def.component];
       if (comp?.attributes) {
-        populate2[key] = {
-          populate: buildDeepPopulate(comp.attributes, allComponents, depth2 + 1)
-        };
+        const subPopulate = buildDeepPopulate(comp.attributes, allComponents, depth2 + 1);
+        if (subPopulate && Object.keys(subPopulate).length > 0) {
+          populate2[key] = {
+            populate: subPopulate
+          };
+        } else {
+          populate2[key] = true;
+        }
       } else {
         populate2[key] = true;
       }
@@ -3745,7 +3770,7 @@ function buildDeepPopulate(attributes, allComponents, depth2 = 0) {
       populate2[key] = true;
     }
   }
-  return Object.keys(populate2).length > 0 ? populate2 : true;
+  return Object.keys(populate2).length > 0 ? populate2 : void 0;
 }
 function getNestedExportValue(entry, path2) {
   if (!entry || !path2) return "";
@@ -3912,17 +3937,22 @@ const csvService = ({ strapi: strapi2 }) => ({
     const deepPopulate = buildDeepPopulate(ct.attributes || {}, allComponents);
     let entries = [];
     if (ct.kind === "singleType") {
-      const doc = await strapi2.documents(uid).findFirst({
-        populate: deepPopulate
-      });
+      const findFirstArgs = {};
+      if (deepPopulate) {
+        findFirstArgs.populate = deepPopulate;
+      }
+      const doc = await strapi2.documents(uid).findFirst(findFirstArgs);
       entries = doc ? [doc] : [];
     } else {
-      entries = await strapi2.documents(uid).findMany({
+      const findManyArgs = {
         filters: Object.keys(filters2).length > 0 ? filters2 : void 0,
         limit: options.limit || 5e3,
-        sort: { createdAt: "desc" },
-        populate: deepPopulate
-      });
+        sort: { createdAt: "desc" }
+      };
+      if (deepPopulate) {
+        findManyArgs.populate = deepPopulate;
+      }
+      entries = await strapi2.documents(uid).findMany(findManyArgs);
     }
     const lines = [];
     lines.push(fields2.map((f) => escapeCsvValue(f.key)).join(","));