strapi-plugin-bulk-updater 1.5.8 → 1.5.9

package/dist/server/index.mjs

@@ -6174,12 +6174,6 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
           });
           continue;
         }
-        const updateArgs = {
-          documentId: resolvedDocId,
-          data: mergedPayload
-        };
-        if (effectiveLocale) updateArgs.locale = effectiveLocale;
-        await strapi.documents(uid).update(updateArgs);
         let pubRecord = effectiveLocale && publishedCounterparts.get(`${resolvedDocId}@@@${effectiveLocale}`) || publishedCounterparts.get(String(resolvedDocId));
         if (!pubRecord && isDraftAndPublish && resolvedDocId) {
           try {
@@ -6196,7 +6190,9 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
           } catch {
           }
         }
-        const inspectionExisting = row.status || row.publishedAt ? { ...existing, status: row.status, publishedAt: row.publishedAt } : existing;
+        const rowStatus = row.status || row.Status || row.STATUS || row["Published Status"] || row["published_status"] || row["strapi_status"];
+        const rowPubAt = row.publishedAt || row.published_at || row.PublishedAt;
+        const inspectionExisting = rowStatus || rowPubAt ? { ...existing, ...rowStatus ? { status: rowStatus } : {}, ...rowPubAt ? { publishedAt: rowPubAt } : {} } : existing;
         const { hadPublishedVersion } = resolveRecordPublicationStatus(
           inspectionExisting,
           pubRecord,
@@ -6210,6 +6206,12 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
           publishStrategy,
           unreviewedConsent: options.unreviewedConsent
         });
+        const updateArgs = {
+          documentId: resolvedDocId,
+          data: mergedPayload
+        };
+        if (effectiveLocale) updateArgs.locale = effectiveLocale;
+        await strapi.documents(uid).update(updateArgs);
         if (shouldPublish) {
           try {
             const pubArgs = { documentId: resolvedDocId };
@@ -6257,12 +6259,6 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
               mergedPayload[key] = deepMergeComponent(existing[key], payload[key]);
             }
           }
-          const updateArgs = {
-            documentId: resolvedDocId,
-            data: mergedPayload
-          };
-          if (effectiveLocale) updateArgs.locale = effectiveLocale;
-          await strapi.documents(uid).update(updateArgs);
           let pubRecord = effectiveLocale && publishedCounterparts.get(`${resolvedDocId}@@@${effectiveLocale}`) || publishedCounterparts.get(String(resolvedDocId));
           if (!pubRecord && isDraftAndPublish && resolvedDocId) {
             try {
@@ -6279,7 +6275,9 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
             } catch {
             }
           }
-          const inspectionExisting = row.status || row.publishedAt ? { ...existing, status: row.status, publishedAt: row.publishedAt } : existing;
+          const rowStatus = row.status || row.Status || row.STATUS || row["Published Status"] || row["published_status"] || row["strapi_status"];
+          const rowPubAt = row.publishedAt || row.published_at || row.PublishedAt;
+          const inspectionExisting = rowStatus || rowPubAt ? { ...existing, ...rowStatus ? { status: rowStatus } : {}, ...rowPubAt ? { publishedAt: rowPubAt } : {} } : existing;
           const { hadPublishedVersion } = resolveRecordPublicationStatus(
             inspectionExisting,
             pubRecord,
@@ -6293,6 +6291,12 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
             publishStrategy,
             unreviewedConsent: options.unreviewedConsent
           });
+          const updateArgs = {
+            documentId: resolvedDocId,
+            data: mergedPayload
+          };
+          if (effectiveLocale) updateArgs.locale = effectiveLocale;
+          await strapi.documents(uid).update(updateArgs);
           if (shouldPublish) {
             try {
               const pubArgs = { documentId: resolvedDocId };
@@ -6382,12 +6386,6 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
               mergedPayload[key] = deepMergeComponent(existing[key], payload[key]);
             }
           }
-          const updateArgs = {
-            documentId: resolvedDocId,
-            data: mergedPayload
-          };
-          if (effectiveLocale) updateArgs.locale = effectiveLocale;
-          await strapi.documents(uid).update(updateArgs);
           let pubRecord = effectiveLocale && publishedCounterparts.get(`${resolvedDocId}@@@${effectiveLocale}`) || publishedCounterparts.get(String(resolvedDocId));
           if (!pubRecord && isDraftAndPublish && resolvedDocId) {
             try {
@@ -6404,7 +6402,9 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
             } catch {
             }
           }
-          const inspectionExisting = row.status || row.publishedAt ? { ...existing, status: row.status, publishedAt: row.publishedAt } : existing;
+          const rowStatus = row.status || row.Status || row.STATUS || row["Published Status"] || row["published_status"] || row["strapi_status"];
+          const rowPubAt = row.publishedAt || row.published_at || row.PublishedAt;
+          const inspectionExisting = rowStatus || rowPubAt ? { ...existing, ...rowStatus ? { status: rowStatus } : {}, ...rowPubAt ? { publishedAt: rowPubAt } : {} } : existing;
           const { hadPublishedVersion } = resolveRecordPublicationStatus(
             inspectionExisting,
             pubRecord,
@@ -6418,6 +6418,12 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
             publishStrategy,
             unreviewedConsent: options.unreviewedConsent
           });
+          const updateArgs = {
+            documentId: resolvedDocId,
+            data: mergedPayload
+          };
+          if (effectiveLocale) updateArgs.locale = effectiveLocale;
+          await strapi.documents(uid).update(updateArgs);
           if (shouldPublish) {
             try {
               const pubArgs = { documentId: resolvedDocId };
@@ -6834,10 +6840,23 @@ const csvService = ({ strapi }) => ({
         filters: { documentId: { $in: docIds } },
         limit: docIds.length
       });
+      let pubSet = /* @__PURE__ */ new Set();
+      if (Boolean(ct.options?.draftAndPublish)) {
+        try {
+          const pubDocs = await strapi.documents(uid).findMany({
+            status: "published",
+            filters: { documentId: { $in: docIds } },
+            fields: ["documentId"],
+            limit: docIds.length
+          });
+          pubSet = new Set((pubDocs || []).map((p) => String(p.documentId)));
+        } catch {
+        }
+      }
       for (const entry of entries || []) {
         const titleOrName = entry.title || entry.name || entry.subject || entry.email || `Entry #${entry.documentId}`;
         const identifier = entry.slug || entry.email || entry.username || entry.documentId;
-        const isPublished = Boolean(entry.publishedAt);
+        const isPublished = Boolean(entry.publishedAt) || pubSet.has(String(entry.documentId));
         const row = [
           uid,
           displayName,
@@ -7052,6 +7071,27 @@ const csvService = ({ strapi }) => ({
     };
     const errors2 = [];
     const warnings = [];
+    const docIdsInPreflight = rows.map((r) => extractDocId(r)).filter(Boolean);
+    const publishedCounterparts = /* @__PURE__ */ new Map();
+    if (isDraftAndPublish && docIdsInPreflight.length > 0) {
+      try {
+        const pubDocs = await strapi.documents(uid).findMany({
+          status: "published",
+          filters: { documentId: { $in: docIdsInPreflight } },
+          fields: ["documentId", "updatedAt", "publishedAt", "locale"],
+          limit: Math.max(docIdsInPreflight.length, 100)
+        });
+        for (const pub of pubDocs || []) {
+          if (pub?.documentId) {
+            publishedCounterparts.set(String(pub.documentId), pub);
+            if (pub.locale) {
+              publishedCounterparts.set(`${pub.documentId}@@@${pub.locale}`, pub);
+            }
+          }
+        }
+      } catch {
+      }
+    }
     for (let i = 0; i < rows.length; i++) {
       const rowNumber = i + 2;
       const row = rows[i];
@@ -7066,14 +7106,16 @@ const csvService = ({ strapi }) => ({
       }
       if (existing && isDraftAndPublish) {
         lifecycleStats.totalChecked++;
-        const inspectionExisting = row.status || row.publishedAt ? { ...existing, status: row.status, publishedAt: row.publishedAt } : existing;
+        const pubRecord = effectiveLocale && publishedCounterparts.get(`${docId}@@@${effectiveLocale}`) || publishedCounterparts.get(String(docId));
+        const rowStatus = row.status || row.Status || row.STATUS || row["Published Status"] || row["published_status"] || row["strapi_status"];
+        const rowPubAt = row.publishedAt || row.published_at || row.PublishedAt;
+        const inspectionExisting = rowStatus || rowPubAt ? { ...existing, ...rowStatus ? { status: rowStatus } : {}, ...rowPubAt ? { publishedAt: rowPubAt } : {} } : existing;
         const { status: preStatus, hadPublishedVersion } = resolveRecordPublicationStatus(
           inspectionExisting,
-          void 0,
+          pubRecord,
           isDraftAndPublish
         );
-        const isApproved = !isEditing && hadPublishedVersion;
-        if (isApproved) {
+        if (!isEditing && preStatus === "published") {
           lifecycleStats.published++;
         } else if (preStatus === "modified" || hadPublishedVersion && isEditing) {
           lifecycleStats.modified++;