strapi-plugin-bulk-updater 1.5.4 → 1.5.6

package/dist/server/index.mjs

@@ -990,6 +990,88 @@ function formatEntryRecord(entry) {
   }
   return formatted;
 }
+function extractStageName(val) {
+  if (val === void 0 || val === null) return "";
+  if (typeof val === "object") {
+    const candidateProps = [
+      "strapi_stage",
+      "strapi_stage.name",
+      "strapiStage",
+      "Strapi Stage",
+      "strapi-stage",
+      "stage",
+      "Stage",
+      "review_stage"
+    ];
+    for (const prop of candidateProps) {
+      if (val[prop] !== void 0 && val[prop] !== null) {
+        const fromProp = extractStageName(val[prop]);
+        if (fromProp) return fromProp;
+      }
+    }
+    return String(val.name || val.title || val.status || val.label || "").trim();
+  }
+  if (typeof val === "string") {
+    const trimmed = val.trim();
+    if (trimmed.startsWith("{") && trimmed.endsWith("}")) {
+      try {
+        const parsed = JSON.parse(trimmed);
+        if (parsed && typeof parsed === "object") {
+          const fromParsed = String(parsed.name || parsed.title || parsed.status || parsed.label || "").trim();
+          if (fromParsed) return fromParsed;
+        }
+      } catch {
+      }
+    }
+    return trimmed;
+  }
+  return String(val).trim();
+}
+function isStageApproved(stageVal) {
+  const name = extractStageName(stageVal);
+  return name.toLowerCase() === "approved";
+}
+function isStageEditingOrPending(stageVal) {
+  const name = extractStageName(stageVal).toLowerCase();
+  return name === "editing" || name === "in review" || name === "in_review" || name === "pending review" || name === "pending_review";
+}
+function inspectPreUpdateStatus(entry) {
+  if (!entry || typeof entry !== "object") {
+    return { hadPublishedVersion: false, isModified: false };
+  }
+  const isModified = entry.status === "modified";
+  const isPublished = entry.status === "published" || Boolean(entry.publishedAt);
+  const hadPublishedVersion = isModified || isPublished;
+  return { hadPublishedVersion, isModified };
+}
+function determineShouldPublish({
+  isDraftAndPublish,
+  hadPublishedVersion,
+  isModified = false,
+  stageValue,
+  publish = true,
+  publishStrategy = "safe",
+  unreviewedConsent = false
+}) {
+  if (!isDraftAndPublish || !publish) {
+    return false;
+  }
+  if (!hadPublishedVersion) {
+    return false;
+  }
+  const isApproved = isStageApproved(stageValue);
+  const isEditingOrPending = isStageEditingOrPending(stageValue);
+  if (isApproved) {
+    return true;
+  }
+  if (isEditingOrPending) {
+    return false;
+  }
+  if (publishStrategy === "all" || unreviewedConsent) {
+    return true;
+  }
+  return hadPublishedVersion && !isModified;
+}
 async function populateDocumentLifecycleStatus(strapi, uid, entries) {
   if (!entries || !Array.isArray(entries) || entries.length === 0) {
     return entries;
@@ -1633,9 +1715,14 @@ async function executeBatchInternal(strapi, {
   const getDocumentDeduplicated = (uid, documentId) => {
     const loaderKey = `${uid}@@@${documentId}`;
     if (!documentLoader.has(loaderKey)) {
+      const ct = strapi.contentTypes[uid];
+      const findOneArgs = { documentId };
+      if (ct?.attributes?.strapi_stage) {
+        findOneArgs.populate = ["strapi_stage"];
+      }
       documentLoader.set(
         loaderKey,
-        strapi.documents(uid).findOne({ documentId })
+        strapi.documents(uid).findOne(findOneArgs)
       );
     }
     return documentLoader.get(loaderKey);
@@ -1693,13 +1780,24 @@ async function executeBatchInternal(strapi, {
               }
             });
             const isDraftAndPublishComp = Boolean(contentType?.options?.draftAndPublish);
-            const isApprovedComp = isDraftAndPublishComp && Boolean(currentEntry?.publishedAt) && currentEntry?.status !== "modified";
-            const shouldPublishComp = isDraftAndPublishComp && Boolean(publishOnApproval) && (publishStrategy === "all" ? true : isApprovedComp);
+            const { hadPublishedVersion: hadPubComp, isModified: isModComp } = inspectPreUpdateStatus(currentEntry);
+            const targetStageComp = attribute.toLowerCase() === "strapi_stage" || attribute.toLowerCase() === "stage" ? value : currentEntry?.strapi_stage ?? currentEntry?.stage ?? target?.strapi_stage ?? target?.stage;
+            const shouldPublishComp = determineShouldPublish({
+              isDraftAndPublish: isDraftAndPublishComp,
+              hadPublishedVersion: hadPubComp,
+              isModified: isModComp,
+              stageValue: targetStageComp,
+              publish: Boolean(publishOnApproval),
+              publishStrategy,
+              unreviewedConsent
+            });
             if (shouldPublishComp) {
               try {
-                await strapi.documents(target.uid).publish({
-                  documentId: target.documentId
-                });
+                const pubArgs = { documentId: target.documentId };
+                if (target.locale || currentEntry?.locale) {
+                  pubArgs.locale = target.locale || currentEntry?.locale;
+                }
+                await strapi.documents(target.uid).publish(pubArgs);
               } catch (publishErr) {
                 strapi.log.warn(`[bulk-updater] Failed to auto-publish ${target.uid}/${target.documentId}:`, publishErr);
               }
@@ -1709,7 +1807,7 @@ async function executeBatchInternal(strapi, {
               uid: target.uid,
               documentId: target.documentId,
               userId: currentUser?.id,
-              statusOverride: shouldPublishComp ? "published" : isDraftAndPublishComp ? "draft" : void 0
+              statusOverride: shouldPublishComp ? "published" : isDraftAndPublishComp ? hadPubComp ? "modified" : "draft" : void 0
             });
             const dzDiffs = isRootDz && affectedMatches.length > 0 ? affectedMatches.map((m) => ({
               index: m.index,
@@ -1792,13 +1890,24 @@ async function executeBatchInternal(strapi, {
               }
             });
             const isDraftAndPublishRel = Boolean(contentType?.options?.draftAndPublish);
-            const isApprovedRel = isDraftAndPublishRel && Boolean(currentEntry?.publishedAt) && currentEntry?.status !== "modified";
-            const shouldPublishRel = isDraftAndPublishRel && Boolean(publishOnApproval) && (publishStrategy === "all" ? true : isApprovedRel);
+            const { hadPublishedVersion: hadPubRel, isModified: isModRel } = inspectPreUpdateStatus(currentEntry);
+            const targetStageRel = attribute.toLowerCase() === "strapi_stage" || attribute.toLowerCase() === "stage" ? value : currentEntry?.strapi_stage ?? currentEntry?.stage ?? target?.strapi_stage ?? target?.stage;
+            const shouldPublishRel = determineShouldPublish({
+              isDraftAndPublish: isDraftAndPublishRel,
+              hadPublishedVersion: hadPubRel,
+              isModified: isModRel,
+              stageValue: targetStageRel,
+              publish: Boolean(publishOnApproval),
+              publishStrategy,
+              unreviewedConsent
+            });
             if (shouldPublishRel) {
               try {
-                await strapi.documents(target.uid).publish({
-                  documentId: target.documentId
-                });
+                const pubArgs = { documentId: target.documentId };
+                if (target.locale || currentEntry?.locale) {
+                  pubArgs.locale = target.locale || currentEntry?.locale;
+                }
+                await strapi.documents(target.uid).publish(pubArgs);
               } catch (publishErr) {
                 strapi.log.warn(`[bulk-updater] Failed to auto-publish ${target.uid}/${target.documentId}:`, publishErr);
               }
@@ -1811,7 +1920,7 @@ async function executeBatchInternal(strapi, {
               uid: target.uid,
               documentId: target.documentId,
               userId: currentUser?.id,
-              statusOverride: shouldPublishRel ? "published" : isDraftAndPublishRel ? "draft" : void 0
+              statusOverride: shouldPublishRel ? "published" : isDraftAndPublishRel ? hadPubRel ? "modified" : "draft" : void 0
             });
             return {
               uid: target.uid,
@@ -1837,13 +1946,24 @@ async function executeBatchInternal(strapi, {
             }
           });
           const isDraftAndPublishScalar = Boolean(contentType?.options?.draftAndPublish);
-          const isApprovedScalar = isDraftAndPublishScalar && Boolean(currentEntry?.publishedAt) && currentEntry?.status !== "modified";
-          const shouldPublishScalar = isDraftAndPublishScalar && Boolean(publishOnApproval) && (publishStrategy === "all" ? true : isApprovedScalar);
+          const { hadPublishedVersion: hadPubScalar, isModified: isModScalar } = inspectPreUpdateStatus(currentEntry);
+          const targetStageScalar = attribute.toLowerCase() === "strapi_stage" || attribute.toLowerCase() === "stage" ? value : currentEntry?.strapi_stage ?? currentEntry?.stage ?? target?.strapi_stage ?? target?.stage;
+          const shouldPublishScalar = determineShouldPublish({
+            isDraftAndPublish: isDraftAndPublishScalar,
+            hadPublishedVersion: hadPubScalar,
+            isModified: isModScalar,
+            stageValue: targetStageScalar,
+            publish: Boolean(publishOnApproval),
+            publishStrategy,
+            unreviewedConsent
+          });
           if (shouldPublishScalar) {
             try {
-              await strapi.documents(target.uid).publish({
-                documentId: target.documentId
-              });
+              const pubArgs = { documentId: target.documentId };
+              if (target.locale || currentEntry?.locale) {
+                pubArgs.locale = target.locale || currentEntry?.locale;
+              }
+              await strapi.documents(target.uid).publish(pubArgs);
             } catch (publishErr) {
               strapi.log.warn(`[bulk-updater] Failed to auto-publish ${target.uid}/${target.documentId}:`, publishErr);
             }
@@ -1852,7 +1972,7 @@ async function executeBatchInternal(strapi, {
             uid: target.uid,
             documentId: target.documentId,
             userId: currentUser?.id,
-            statusOverride: shouldPublishScalar ? "published" : isDraftAndPublishScalar ? "draft" : void 0
+            statusOverride: shouldPublishScalar ? "published" : isDraftAndPublishScalar ? hadPubScalar ? "modified" : "draft" : void 0
           });
           return {
             uid: target.uid,
@@ -5141,7 +5261,14 @@ const LIFECYCLE_STATUS_WORDS = /* @__PURE__ */ new Set([
   "published",
   "modified",
   "supported",
-  "ignored"
+  "ignored",
+  "editing",
+  "in review",
+  "in_review",
+  "ready to publish",
+  "ready_to_publish",
+  "null",
+  "undefined"
 ]);
 function isValidDocId(val) {
   if (!val || typeof val !== "string") return false;
@@ -5177,17 +5304,86 @@ function extractDocId(row) {
 }
 function extractLocale(row) {
   if (!row || typeof row !== "object") return void 0;
-  const candidates = [row.locale, row.Locale, row["locale"], row["Locale"]];
+  const candidates = [
+    row.locale,
+    row.Locale,
+    row["locale"],
+    row["Locale"],
+    row.strapi_locale,
+    row["strapi_locale"]
+  ];
   for (const c of candidates) {
     if (c !== void 0 && c !== null) {
       const str = String(c).trim();
-      if (str && str.toLowerCase() !== "null" && str.toLowerCase() !== "undefined") {
+      if (str && str.toLowerCase() !== "null" && str.toLowerCase() !== "undefined" && str.toLowerCase() !== "[null]" && str.toLowerCase() !== '""') {
         return str;
       }
     }
   }
   return void 0;
 }
+function getEffectiveLocale(ct, rowLocale) {
+  if (!ct?.pluginOptions?.i18n?.localized) {
+    return void 0;
+  }
+  if (!rowLocale) {
+    return void 0;
+  }
+  const trimmed = rowLocale.trim();
+  if (!trimmed || trimmed.toLowerCase() === "null" || trimmed.toLowerCase() === "undefined" || trimmed.toLowerCase() === "[null]" || trimmed.toLowerCase() === '""') {
+    return void 0;
+  }
+  return trimmed;
+}
+function isRowInEditingStage(row) {
+  if (!row || typeof row !== "object") return false;
+  const candidates = [
+    row.strapi_stage,
+    row["strapi_stage"],
+    row.strapiStage,
+    row["Strapi Stage"],
+    row["strapi-stage"],
+    row.stage,
+    row.Stage,
+    row.status,
+    row.Status
+  ];
+  for (const c of candidates) {
+    if (c !== void 0 && c !== null) {
+      let stageName = "";
+      if (typeof c === "object") {
+        stageName = String(c.name || c.title || c.status || c.documentId || c.id || "").trim();
+      } else if (typeof c === "string") {
+        const trimmed = c.trim();
+        if (trimmed.startsWith("{") && trimmed.endsWith("}")) {
+          try {
+            const parsed = JSON.parse(trimmed);
+            if (typeof parsed === "object" && parsed !== null) {
+              stageName = String(parsed.name || parsed.title || parsed.status || parsed.documentId || parsed.id || "").trim();
+            }
+          } catch {
+          }
+        }
+        if (!stageName) {
+          stageName = trimmed;
+        }
+      } else {
+        stageName = String(c).trim();
+      }
+      if (stageName) {
+        const s = stageName.toLowerCase();
+        if (s === "editing" || s === "in review" || s === "in_review" || s === "pending review" || s === "pending_review") {
+          return true;
+        }
+      }
+    }
+  }
+  return false;
+}
+function isRowInApprovedStage(row) {
+  if (!row || typeof row !== "object") return false;
+  return isStageApproved(row);
+}
 function extractDetailedErrorMessage(err) {
   if (!err) return "Error processing row";
   const detailsErrors = err.details?.errors || err.error?.details?.errors;
@@ -5322,19 +5518,26 @@ function getNestedExportValue(entry, path) {
     }
   }
   if (current === null || current === void 0) return "";
+  if (Array.isArray(current) && current.length > 0 && current[0]?.type && Array.isArray(current[0]?.children)) {
+    return JSON.stringify(current);
+  }
   if (typeof current === "object" && current.url) {
     return current.url;
   }
   if (typeof current === "object" && !Array.isArray(current)) {
-    if (current.documentId || current.name || current.title) {
-      return current.name || current.title || current.documentId;
+    if (current.name && (current.locale === null || !current.documentId)) {
+      return current.name;
+    }
+    if (current.documentId || current.id || current.name || current.title) {
+      return current.documentId || current.id || current.name || current.title;
     }
   }
   if (Array.isArray(current)) {
     return current.map((item) => {
       if (!item) return "";
       if (typeof item === "object") {
-        return item.name || item.title || item.documentId || JSON.stringify(item);
+        if (item.url) return item.url;
+        return item.documentId || item.id || item.name || item.title || JSON.stringify(item);
       }
       return String(item);
     }).filter(Boolean).join("; ");
@@ -5362,24 +5565,43 @@ const SYSTEM_FIELD_KEYS = /* @__PURE__ */ new Set([
   "updatedby",
   "localizations",
   "locale",
-  "status"
+  "status",
+  "strapistage",
+  "strapi_stage",
+  "strapiassignee",
+  "strapi_assignee",
+  "strapistatus",
+  "strapi_status"
 ]);
 async function findExistingDocument(strapi, uid, targetDocId, docLocale) {
   if (!targetDocId) return null;
+  const ct = strapi.contentTypes[uid];
+  const effectiveLocale = getEffectiveLocale(ct, docLocale);
   try {
     const queryArgs = { documentId: targetDocId };
-    if (docLocale) queryArgs.locale = docLocale;
+    if (effectiveLocale) queryArgs.locale = effectiveLocale;
+    if (ct?.attributes?.strapi_stage) queryArgs.populate = ["strapi_stage"];
     const found = await strapi.documents(uid).findOne(queryArgs);
     if (found) return found;
   } catch {
   }
+  if (ct?.pluginOptions?.i18n?.localized && !effectiveLocale) {
+    try {
+      const list = await strapi.documents(uid).findMany({
+        filters: { documentId: targetDocId },
+        limit: 1
+      });
+      if (list && list.length > 0) return list[0];
+    } catch {
+    }
+  }
   if (/^\d+$/.test(targetDocId)) {
     try {
       const queryArgs = {
         filters: { id: parseInt(targetDocId, 10) },
         limit: 1
       };
-      if (docLocale) queryArgs.locale = docLocale;
+      if (effectiveLocale) queryArgs.locale = effectiveLocale;
       const list = await strapi.documents(uid).findMany(queryArgs);
       if (list && list.length > 0) return list[0];
     } catch {
@@ -5404,12 +5626,129 @@ function deepMergeComponent(existingVal, newVal) {
   }
   return merged;
 }
+function parseNumberValue(rawVal, isInteger) {
+  const cleanStr = String(rawVal).replace(/[$€£,\s]/g, "");
+  if (isInteger) {
+    const n = parseInt(cleanStr, 10);
+    return isNaN(n) ? null : n;
+  } else {
+    const f = parseFloat(cleanStr);
+    return isNaN(f) ? null : f;
+  }
+}
+function parseBooleanValue(rawVal) {
+  const s = String(rawVal).trim().toLowerCase();
+  return s === "true" || s === "1" || s === "yes" || s === "y" || s === "on";
+}
+function parseBlocksValue(rawVal) {
+  try {
+    const parsed = JSON.parse(rawVal);
+    if (Array.isArray(parsed)) {
+      return parsed;
+    }
+  } catch {
+  }
+  const trimmed = String(rawVal).trim();
+  if (!trimmed) return [];
+  return [{ type: "paragraph", children: [{ type: "text", text: trimmed }] }];
+}
+function parseEnumValue(rawVal, allowedValues) {
+  const trimmed = String(rawVal).trim();
+  if (Array.isArray(allowedValues) && allowedValues.length > 0) {
+    const match = allowedValues.find((v) => v.toLowerCase() === trimmed.toLowerCase());
+    if (match) return match;
+  }
+  return trimmed;
+}
+function parseRelationValue(rawVal, relationType) {
+  const isToMany = relationType ? relationType.toLowerCase().endsWith("many") : false;
+  if (rawVal === null || rawVal === void 0) return isToMany ? [] : null;
+  let parsed = rawVal;
+  if (typeof rawVal === "string") {
+    const trimmed = rawVal.trim();
+    if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
+      try {
+        parsed = JSON.parse(trimmed);
+      } catch {
+      }
+    }
+  }
+  if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
+    if (parsed.name && (parsed.locale === null || LIFECYCLE_STATUS_WORDS.has(String(parsed.name).trim().toLowerCase()))) {
+      return isToMany ? [] : null;
+    }
+    const docId = parsed.documentId || parsed.id || null;
+    if (docId && isValidDocId(String(docId).trim())) {
+      const validStr = String(docId).trim();
+      return isToMany ? [validStr] : validStr;
+    }
+    return isToMany ? [] : null;
+  }
+  if (Array.isArray(parsed)) {
+    const ids = parsed.map((item) => {
+      if (typeof item === "object" && item !== null) {
+        if (item.name && (item.locale === null || LIFECYCLE_STATUS_WORDS.has(String(item.name).trim().toLowerCase()))) {
+          return null;
+        }
+        const id = item.documentId || item.id;
+        return id && isValidDocId(String(id).trim()) ? String(id).trim() : null;
+      }
+      return isValidDocId(String(item).trim()) ? String(item).trim() : null;
+    }).filter(Boolean);
+    return isToMany ? ids : ids[0] || null;
+  }
+  if (typeof rawVal === "string") {
+    if (rawVal.includes(";") || rawVal.includes(",")) {
+      const parts = rawVal.split(/[;,]/).map((s) => s.trim()).filter((p) => isValidDocId(p));
+      return isToMany ? parts : parts[0] || null;
+    }
+    const trimmed = rawVal.trim();
+    if (isValidDocId(trimmed)) {
+      return isToMany ? [trimmed] : trimmed;
+    }
+  }
+  return isToMany ? [] : null;
+}
+function parseMediaValue(rawVal, isMultiple = false) {
+  const trimmed = String(rawVal).trim();
+  if (trimmed.startsWith("[") || trimmed.startsWith("{")) {
+    try {
+      const parsed = JSON.parse(trimmed);
+      if (Array.isArray(parsed)) {
+        const ids = parsed.map((item) => typeof item === "object" && item !== null ? item.id || item.documentId : item).filter(Boolean);
+        return isMultiple ? ids : ids[0] || null;
+      }
+      if (typeof parsed === "number") {
+        return isMultiple ? [parsed] : parsed;
+      }
+      if (typeof parsed === "object" && parsed !== null) {
+        const id = parsed.id || parsed.documentId || parsed;
+        return isMultiple ? [id] : id;
+      }
+    } catch {
+    }
+  }
+  if (rawVal.includes(";") || rawVal.includes(",")) {
+    const parts = rawVal.split(/[;,]/).map((s) => s.trim()).filter(Boolean).map((s) => /^\d+$/.test(s) ? parseInt(s, 10) : s);
+    return isMultiple ? parts : parts[0] || null;
+  }
+  if (/^\d+$/.test(trimmed)) {
+    const numId = parseInt(trimmed, 10);
+    return isMultiple ? [numId] : numId;
+  }
+  if (isValidDocId(trimmed)) {
+    return isMultiple ? [trimmed] : trimmed;
+  }
+  return isMultiple ? [] : null;
+}
 function parseRowToPayload(strapi, attrs, row) {
   const payload = {};
   for (const [key, rawVal] of Object.entries(row)) {
     const normalizedKey = key.toLowerCase().replace(/[\s_-]/g, "");
     if (SYSTEM_FIELD_KEYS.has(normalizedKey)) continue;
     if (key.includes(".")) {
+      const topPart = key.split(".")[0].toLowerCase().replace(/[\s_-]/g, "");
+      if (SYSTEM_FIELD_KEYS.has(topPart)) continue;
       const parts = key.split(".");
       let currentAttrs = attrs;
       let currentTarget = payload;
@@ -5428,17 +5767,31 @@ function parseRowToPayload(strapi, attrs, row) {
             break;
           }
           if (rawVal === "" || rawVal === null || rawVal === void 0) {
-            if (leafDef.type !== "dynamiczone" && !(leafDef.type === "component" && leafDef.repeatable) && leafDef.type !== "relation") {
+            if (leafDef.type !== "dynamiczone" && !(leafDef.type === "component" && leafDef.repeatable) && leafDef.type !== "relation" && leafDef.type !== "password") {
               currentTarget[part] = null;
             }
           } else if (leafDef.type === "integer" || leafDef.type === "biginteger") {
-            const parsedInt = parseInt(rawVal, 10);
-            currentTarget[part] = isNaN(parsedInt) ? null : parsedInt;
+            currentTarget[part] = parseNumberValue(rawVal, true);
           } else if (leafDef.type === "float" || leafDef.type === "decimal") {
-            const parsedFloat = parseFloat(rawVal);
-            currentTarget[part] = isNaN(parsedFloat) ? null : parsedFloat;
+            currentTarget[part] = parseNumberValue(rawVal, false);
           } else if (leafDef.type === "boolean") {
-            currentTarget[part] = rawVal.toLowerCase() === "true" || rawVal === "1";
+            currentTarget[part] = parseBooleanValue(rawVal);
+          } else if (leafDef.type === "blocks") {
+            currentTarget[part] = parseBlocksValue(rawVal);
+          } else if (leafDef.type === "enumeration") {
+            currentTarget[part] = parseEnumValue(rawVal, leafDef.enum);
+          } else if (leafDef.type === "relation") {
+            currentTarget[part] = parseRelationValue(rawVal, leafDef.relation);
+          } else if (leafDef.type === "media") {
+            currentTarget[part] = parseMediaValue(rawVal, Boolean(leafDef.multiple));
+          } else if (leafDef.type === "date" || leafDef.type === "time" || leafDef.type === "datetime" || leafDef.type === "timestamp") {
+            currentTarget[part] = String(rawVal).trim() || null;
+          } else if (leafDef.type === "email" || leafDef.type === "uid") {
+            currentTarget[part] = String(rawVal).trim();
+          } else if (leafDef.type === "password") {
+            if (String(rawVal).trim()) {
+              currentTarget[part] = String(rawVal).trim();
+            }
           } else if (leafDef.type === "json") {
             try {
               currentTarget[part] = JSON.parse(rawVal);
@@ -5453,19 +5806,6 @@ function parseRowToPayload(strapi, attrs, row) {
               }
             } catch {
             }
-          } else if (leafDef.type === "relation") {
-            try {
-              const parsed = JSON.parse(rawVal);
-              if (Array.isArray(parsed) || typeof parsed === "object" && parsed !== null) {
-                currentTarget[part] = parsed;
-              } else if (isValidDocId(rawVal)) {
-                currentTarget[part] = rawVal;
-              }
-            } catch {
-              if (isValidDocId(rawVal)) {
-                currentTarget[part] = rawVal;
-              }
-            }
           } else {
             currentTarget[part] = rawVal;
           }
@@ -5504,27 +5844,53 @@ function parseRowToPayload(strapi, attrs, row) {
       }
     }
     if (!attrDef) continue;
+    if (attrDef?.target?.includes("review-workflow") || attrDef?.target === "admin::review-workflow-stage") {
+      continue;
+    }
     if (rawVal === "" || rawVal === null || rawVal === void 0) {
-      if (attrDef.type !== "dynamiczone" && !(attrDef.type === "component" && attrDef.repeatable)) {
+      if (attrDef.type !== "dynamiczone" && !(attrDef.type === "component" && attrDef.repeatable) && attrDef.type !== "relation" && attrDef.type !== "password") {
         payload[key] = null;
       }
       continue;
     }
     switch (attrDef.type) {
       case "integer":
-      case "biginteger": {
-        const parsedInt = parseInt(rawVal, 10);
-        payload[key] = isNaN(parsedInt) ? null : parsedInt;
+      case "biginteger":
+        payload[key] = parseNumberValue(rawVal, true);
         break;
-      }
       case "float":
-      case "decimal": {
-        const parsedFloat = parseFloat(rawVal);
-        payload[key] = isNaN(parsedFloat) ? null : parsedFloat;
+      case "decimal":
+        payload[key] = parseNumberValue(rawVal, false);
         break;
-      }
       case "boolean":
-        payload[key] = rawVal.toLowerCase() === "true" || rawVal === "1";
+        payload[key] = parseBooleanValue(rawVal);
+        break;
+      case "blocks":
+        payload[key] = parseBlocksValue(rawVal);
+        break;
+      case "enumeration":
+        payload[key] = parseEnumValue(rawVal, attrDef.enum);
+        break;
+      case "relation":
+        payload[key] = parseRelationValue(rawVal, attrDef.relation);
+        break;
+      case "media":
+        payload[key] = parseMediaValue(rawVal, Boolean(attrDef.multiple));
+        break;
+      case "date":
+      case "time":
+      case "datetime":
+      case "timestamp":
+        payload[key] = String(rawVal).trim() || null;
+        break;
+      case "email":
+      case "uid":
+        payload[key] = String(rawVal).trim();
+        break;
+      case "password":
+        if (String(rawVal).trim()) {
+          payload[key] = String(rawVal).trim();
+        }
         break;
       case "json":
         try {
@@ -5563,39 +5929,6 @@ function parseRowToPayload(strapi, attrs, row) {
         }
         break;
       }
-      case "relation": {
-        try {
-          const parsed = JSON.parse(rawVal);
-          if (Array.isArray(parsed) || typeof parsed === "object" && parsed !== null) {
-            payload[key] = parsed;
-            break;
-          }
-        } catch {
-        }
-        if (isValidDocId(rawVal)) {
-          payload[key] = rawVal;
-        } else if (rawVal.includes(";") || rawVal.includes(",")) {
-          const parts = rawVal.split(/[;,]/).map((s) => s.trim()).filter(Boolean);
-          if (parts.length > 0 && parts.every((p) => isValidDocId(p))) {
-            payload[key] = parts;
-          }
-        }
-        break;
-      }
-      case "media": {
-        if (/^\d+$/.test(rawVal.trim())) {
-          payload[key] = parseInt(rawVal.trim(), 10);
-        } else {
-          try {
-            const parsed = JSON.parse(rawVal);
-            if (typeof parsed === "number" || typeof parsed === "object") {
-              payload[key] = parsed;
-            }
-          } catch {
-          }
-        }
-        break;
-      }
       default:
         payload[key] = rawVal;
     }
@@ -5632,10 +5965,12 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
     const row = rows[i];
     let docId = extractDocId(row);
     const rowLocale = extractLocale(row);
+    const effectiveLocale = getEffectiveLocale(ct, rowLocale);
+    const isEditing = isRowInEditingStage(row);
     if (ct.kind === "singleType" && !docId) {
       try {
         const findSingleArgs = {};
-        if (rowLocale) findSingleArgs.locale = rowLocale;
+        if (effectiveLocale) findSingleArgs.locale = effectiveLocale;
         const singleDoc = await strapi.documents(uid).findFirst(findSingleArgs);
         if (singleDoc?.documentId) {
           docId = singleDoc.documentId;
@@ -5654,7 +5989,7 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
           });
           continue;
         }
-        const existing = await findExistingDocument(strapi, uid, docId, rowLocale);
+        const existing = await findExistingDocument(strapi, uid, docId, effectiveLocale);
         if (!existing) {
           stats.skipped++;
           stats.errors.push({
@@ -5690,14 +6025,23 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
           documentId: resolvedDocId,
           data: mergedPayload
         };
-        if (rowLocale) updateArgs.locale = rowLocale;
+        if (effectiveLocale) updateArgs.locale = effectiveLocale;
         await strapi.documents(uid).update(updateArgs);
-        const isApproved = isDraftAndPublish && Boolean(existing?.publishedAt) && existing?.status !== "modified";
-        const shouldPublish = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" || options.unreviewedConsent ? true : isApproved);
+        const { hadPublishedVersion, isModified } = inspectPreUpdateStatus(existing);
+        const stageVal = row.strapi_stage ?? row["strapi_stage"] ?? row.stage ?? existing?.strapi_stage;
+        const shouldPublish = determineShouldPublish({
+          isDraftAndPublish,
+          hadPublishedVersion,
+          isModified,
+          stageValue: stageVal,
+          publish: Boolean(publish),
+          publishStrategy,
+          unreviewedConsent: options.unreviewedConsent
+        });
         if (shouldPublish) {
           try {
             const pubArgs = { documentId: resolvedDocId };
-            if (rowLocale) pubArgs.locale = rowLocale;
+            if (effectiveLocale) pubArgs.locale = effectiveLocale;
             await strapi.documents(uid).publish(pubArgs);
           } catch (pubErr) {
             strapi.log.warn(`[bulk-updater] Auto-publish failed for ${resolvedDocId}:`, pubErr);
@@ -5708,7 +6052,7 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
             uid,
             documentId: resolvedDocId,
             userId: user?.id,
-            statusOverride: shouldPublish ? "published" : isDraftAndPublish ? "draft" : void 0
+            statusOverride: shouldPublish ? "published" : isDraftAndPublish ? hadPublishedVersion ? "modified" : "draft" : void 0
           });
         } catch {
         }
@@ -5731,7 +6075,7 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
       } else if (mode === "create_or_override") {
         let existing = null;
         if (docId) {
-          existing = await findExistingDocument(strapi, uid, docId, rowLocale);
+          existing = await findExistingDocument(strapi, uid, docId, effectiveLocale);
         }
         if (existing) {
           const resolvedDocId = existing.documentId || docId;
@@ -5745,14 +6089,23 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
             documentId: resolvedDocId,
             data: mergedPayload
           };
-          if (rowLocale) updateArgs.locale = rowLocale;
+          if (effectiveLocale) updateArgs.locale = effectiveLocale;
           await strapi.documents(uid).update(updateArgs);
-          const isApproved = isDraftAndPublish && Boolean(existing?.publishedAt) && existing?.status !== "modified";
-          const shouldPublish = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" || options.unreviewedConsent ? true : isApproved);
+          const { hadPublishedVersion, isModified } = inspectPreUpdateStatus(existing);
+          const stageVal = row.strapi_stage ?? row["strapi_stage"] ?? row.stage ?? existing?.strapi_stage;
+          const shouldPublish = determineShouldPublish({
+            isDraftAndPublish,
+            hadPublishedVersion,
+            isModified,
+            stageValue: stageVal,
+            publish: Boolean(publish),
+            publishStrategy,
+            unreviewedConsent: options.unreviewedConsent
+          });
           if (shouldPublish) {
             try {
               const pubArgs = { documentId: resolvedDocId };
-              if (rowLocale) pubArgs.locale = rowLocale;
+              if (effectiveLocale) pubArgs.locale = effectiveLocale;
               await strapi.documents(uid).publish(pubArgs);
             } catch (pubErr) {
               strapi.log.warn(`[bulk-updater] Auto-publish failed for ${resolvedDocId}:`, pubErr);
@@ -5763,7 +6116,7 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
               uid,
               documentId: resolvedDocId,
               userId: user?.id,
-              statusOverride: shouldPublish ? "published" : isDraftAndPublish ? "draft" : void 0
+              statusOverride: shouldPublish ? "published" : isDraftAndPublish ? hadPublishedVersion ? "modified" : "draft" : void 0
             });
           } catch {
           }
@@ -5786,14 +6139,15 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
           continue;
         }
         const createArgs = { data: payload };
-        if (rowLocale) createArgs.locale = rowLocale;
+        if (effectiveLocale) createArgs.locale = effectiveLocale;
         const created = await strapi.documents(uid).create(createArgs);
         const newDocId = created?.documentId || docId;
-        const shouldPublishNew = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" || options.unreviewedConsent ? true : false);
+        const isApprovedStage = isRowInApprovedStage(row);
+        const shouldPublishNew = !isEditing && !isApprovedStage && isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" || options.unreviewedConsent ? true : false);
         if (shouldPublishNew && newDocId) {
           try {
             const pubArgs = { documentId: newDocId };
-            if (rowLocale) pubArgs.locale = rowLocale;
+            if (effectiveLocale) pubArgs.locale = effectiveLocale;
             await strapi.documents(uid).publish(pubArgs);
           } catch (pubErr) {
             strapi.log.warn(`[bulk-updater] Auto-publish failed for ${newDocId}:`, pubErr);
@@ -5828,7 +6182,7 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
       } else {
         let existing = null;
         if (docId) {
-          existing = await findExistingDocument(strapi, uid, docId, rowLocale);
+          existing = await findExistingDocument(strapi, uid, docId, effectiveLocale);
         }
         if (existing) {
           const resolvedDocId = existing.documentId || docId;
@@ -5842,14 +6196,23 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
             documentId: resolvedDocId,
             data: mergedPayload
           };
-          if (rowLocale) updateArgs.locale = rowLocale;
+          if (effectiveLocale) updateArgs.locale = effectiveLocale;
           await strapi.documents(uid).update(updateArgs);
-          const isApproved = isDraftAndPublish && Boolean(existing?.publishedAt) && existing?.status !== "modified";
-          const shouldPublish = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" || options.unreviewedConsent ? true : isApproved);
+          const { hadPublishedVersion, isModified } = inspectPreUpdateStatus(existing);
+          const stageVal = row.strapi_stage ?? row["strapi_stage"] ?? row.stage ?? existing?.strapi_stage;
+          const shouldPublish = determineShouldPublish({
+            isDraftAndPublish,
+            hadPublishedVersion,
+            isModified,
+            stageValue: stageVal,
+            publish: Boolean(publish),
+            publishStrategy,
+            unreviewedConsent: options.unreviewedConsent
+          });
           if (shouldPublish) {
             try {
               const pubArgs = { documentId: resolvedDocId };
-              if (rowLocale) pubArgs.locale = rowLocale;
+              if (effectiveLocale) pubArgs.locale = effectiveLocale;
               await strapi.documents(uid).publish(pubArgs);
             } catch (pubErr) {
               strapi.log.warn(`[bulk-updater] Auto-publish failed for ${resolvedDocId}:`, pubErr);
@@ -5860,7 +6223,7 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
               uid,
               documentId: resolvedDocId,
               userId: user?.id,
-              statusOverride: shouldPublish ? "published" : isDraftAndPublish ? "draft" : void 0
+              statusOverride: shouldPublish ? "published" : isDraftAndPublish ? hadPublishedVersion ? "modified" : "draft" : void 0
             });
           } catch {
           }
@@ -5883,14 +6246,15 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
           continue;
         }
         const createArgs = { data: payload };
-        if (rowLocale) createArgs.locale = rowLocale;
+        if (effectiveLocale) createArgs.locale = effectiveLocale;
         const created = await strapi.documents(uid).create(createArgs);
         const newDocId = created?.documentId || docId;
-        const shouldPublishNew = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" || options.unreviewedConsent ? true : false);
+        const isApprovedStage = isRowInApprovedStage(row);
+        const shouldPublishNew = !isEditing && !isApprovedStage && isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" || options.unreviewedConsent ? true : false);
         if (shouldPublishNew && newDocId) {
           try {
             const pubArgs = { documentId: newDocId };
-            if (rowLocale) pubArgs.locale = rowLocale;
+            if (effectiveLocale) pubArgs.locale = effectiveLocale;
             await strapi.documents(uid).publish(pubArgs);
           } catch (pubErr) {
             strapi.log.warn(`[bulk-updater] Auto-publish failed for ${newDocId}:`, pubErr);
@@ -6485,22 +6849,36 @@ const csvService = ({ strapi }) => ({
       const row = rows[i];
       const docId = extractDocId(row);
       const rowLocale = extractLocale(row);
+      const effectiveLocale = getEffectiveLocale(ct, rowLocale);
+      isRowInEditingStage(row);
       let rowHasError = false;
       let existing = null;
       if (docId) {
-        existing = await findExistingDocument(strapi, uid, docId, rowLocale);
+        existing = await findExistingDocument(strapi, uid, docId, effectiveLocale);
       }
       if (existing && isDraftAndPublish) {
         lifecycleStats.totalChecked++;
-        const isApproved = Boolean(existing.publishedAt) && existing.status !== "modified";
-        if (isApproved) {
+        const { hadPublishedVersion, isModified } = inspectPreUpdateStatus(existing);
+        const stageVal = row.strapi_stage ?? row["strapi_stage"] ?? row.stage ?? existing?.strapi_stage;
+        const willPublish = determineShouldPublish({
+          isDraftAndPublish,
+          hadPublishedVersion,
+          isModified,
+          stageValue: stageVal,
+          publish: true,
+          publishStrategy: options.publishStrategy || "safe",
+          unreviewedConsent: options.unreviewedConsent
+        });
+        if (willPublish) {
           lifecycleStats.published++;
-        } else if (existing.status === "modified") {
+        } else if (hadPublishedVersion && (isModified || isRowInEditingStage(row))) {
           lifecycleStats.modified++;
           lifecycleStats.unreviewedCount++;
-        } else {
+        } else if (!hadPublishedVersion) {
           lifecycleStats.draft++;
           lifecycleStats.unreviewedCount++;
+        } else {
+          lifecycleStats.published++;
         }
       }
       if (mode === "update") {
@@ -6651,10 +7029,11 @@ const csvService = ({ strapi }) => ({
       const row = rows[i];
       let docId = extractDocId(row);
       const rowLocale = extractLocale(row);
+      const effectiveLocale = getEffectiveLocale(ct, rowLocale);
       if (ct.kind === "singleType" && !docId) {
         try {
           const findSingleArgs = {};
-          if (rowLocale) findSingleArgs.locale = rowLocale;
+          if (effectiveLocale) findSingleArgs.locale = effectiveLocale;
           const singleDoc = await strapi.documents(uid).findFirst(findSingleArgs);
           if (singleDoc?.documentId) {
             docId = singleDoc.documentId;
@@ -6664,7 +7043,7 @@ const csvService = ({ strapi }) => ({
       }
       let existing = null;
       if (docId) {
-        existing = await findExistingDocument(strapi, uid, docId, rowLocale);
+        existing = await findExistingDocument(strapi, uid, docId, effectiveLocale);
       }
       if (mode === "update" && (!docId || !existing)) {
         skippedCount++;