strapi-plugin-bulk-updater 1.4.9 → 1.5.0

package/dist/server/index.js

@@ -111,6 +111,22 @@ const routes = {
           policies: []
         }
       },
+      {
+        method: "GET",
+        path: "/batches/:batchId/diffs",
+        handler: "bulkUpdater.getPendingBatchDiffs",
+        config: {
+          policies: []
+        }
+      },
+      {
+        method: "GET",
+        path: "/batches/:batchId/diffs/export",
+        handler: "bulkUpdater.exportPendingBatchDiffs",
+        config: {
+          policies: []
+        }
+      },
       {
         method: "GET",
         path: "/audit/history",
@@ -474,6 +490,28 @@ const bulkUpdaterController = ({ strapi }) => ({
       ctx.body = { success: false, error: err.message };
     }
   },
+  async getPendingBatchDiffs(ctx) {
+    try {
+      const { batchId } = ctx.params;
+      const service = strapi.plugin("bulk-updater").service("bulkUpdater");
+      const result = await service.getPendingBatchDiffs(batchId);
+      ctx.body = result;
+    } catch (err) {
+      ctx.status = err.message?.includes("not found") ? 404 : 500;
+      ctx.body = { success: false, error: err.message };
+    }
+  },
+  async exportPendingBatchDiffs(ctx) {
+    try {
+      const { batchId } = ctx.params;
+      const service = strapi.plugin("bulk-updater").service("bulkUpdater");
+      const result = await service.getPendingBatchDiffsCsv(batchId);
+      ctx.body = result;
+    } catch (err) {
+      ctx.status = err.message?.includes("not found") ? 404 : 500;
+      ctx.body = { success: false, error: err.message };
+    }
+  },
   async getRecentBatches(ctx) {
     try {
       const service = strapi.plugin("bulk-updater").service("bulkUpdater");
@@ -2374,7 +2412,7 @@ const bulkUpdaterService = ({ strapi }) => {
               } else if (normOp === "endswith") {
                 orConditions.push({ [k]: { $endsWithi: q } });
               } else if (normOp === "notequals") {
-                orConditions.push({ [k]: { $ne: q } });
+                orConditions.push({ [k]: { $nei: q } });
               } else if (normOp === "notcontains") {
                 orConditions.push({ [k]: { $notContainsi: q } });
               } else {
@@ -2392,12 +2430,21 @@ const bulkUpdaterService = ({ strapi }) => {
         } else if (normOp === "notempty") {
           condition = isStringLike ? { $and: [{ $notNull: true }, { $ne: "" }] } : { $notNull: true };
         } else if (q !== "") {
+          let typedVal = q;
+          const isNumeric = ["integer", "biginteger", "float", "decimal", "number"].includes(targetAttrSchema?.type);
+          const isBoolean = targetAttrSchema?.type === "boolean";
+          if (isNumeric && /^-?\d+(\.\d+)?$/.test(q)) {
+            typedVal = Number(q);
+          } else if (isBoolean) {
+            if (q.toLowerCase() === "true") typedVal = true;
+            else if (q.toLowerCase() === "false") typedVal = false;
+          }
           switch (normOp) {
             case "equals":
-              condition = { $containsi: q };
+              condition = isStringLike ? { $eqi: q } : { $eq: typedVal };
               break;
             case "notequals":
-              condition = { $notContainsi: q };
+              condition = isStringLike ? { $nei: q } : { $ne: typedVal };
               break;
             case "contains":
               condition = { $containsi: q };
@@ -2406,10 +2453,10 @@ const bulkUpdaterService = ({ strapi }) => {
               condition = { $notContainsi: q };
               break;
             case "startswith":
-              condition = { $startsWith: q };
+              condition = { $startsWithi: q };
               break;
             case "endswith":
-              condition = { $endsWith: q };
+              condition = { $endsWithi: q };
               break;
           }
         }
@@ -2535,7 +2582,7 @@ const bulkUpdaterService = ({ strapi }) => {
               if (typeof v === "object") {
                 return testSingleValue(v.name) || testSingleValue(v.title) || testSingleValue(v.email) || testSingleValue(v.username) || testSingleValue(v.documentId) || testSingleValue(v.id) || testSingleValue(v.slug);
               }
-              const valStr = String(v).toLowerCase();
+              const valStr = String(v).trim().toLowerCase();
               switch (normOp) {
                 case "equals":
                   return valStr === qVal;
@@ -3619,6 +3666,198 @@ const bulkUpdaterService = ({ strapi }) => {
         batch
       };
     },
+    /**
+     * Inspect batch changes item-by-item for Maker-Checker 4-Eyes review
+     */
+    async getPendingBatchDiffs(batchId) {
+      if (!batchId) throw new Error("batchId is required");
+      const batch = pendingBatches.get(batchId);
+      if (!batch) {
+        throw new Error(`Pending batch "${batchId}" not found.`);
+      }
+      let previewRes = null;
+      if (batch.payload?.action === "csv_import" || batch.id.startsWith("csv_")) {
+        const csvService2 = strapi.plugin("bulk-updater").service("csv");
+        previewRes = await csvService2.previewCsvBatch(
+          batch.payload.uid,
+          batch.payload.rows || [],
+          batch.payload.options || {}
+        );
+      } else if (batch.payload?.action === "publish") {
+        const selectedEntries = batch.payload.selectedEntries || [];
+        const selectedCollections = batch.payload.selectedCollections || [];
+        const targetsMap = /* @__PURE__ */ new Map();
+        for (const colUid of selectedCollections) {
+          if (!strapi.contentTypes[colUid]) continue;
+          const entries = await strapi.documents(colUid).findMany();
+          for (const entry of entries || []) {
+            targetsMap.set(`${colUid}@@@${entry.documentId}`, { uid: colUid, documentId: entry.documentId });
+          }
+        }
+        for (const item of selectedEntries) {
+          if (!item.uid || !item.documentId) continue;
+          targetsMap.set(`${item.uid}@@@${item.documentId}`, { uid: item.uid, documentId: item.documentId });
+        }
+        const diffs = [];
+        let willUpdate = 0;
+        let unchanged = 0;
+        for (const target of targetsMap.values()) {
+          const ct = strapi.contentTypes[target.uid];
+          const displayName = ct?.info?.displayName || target.uid;
+          try {
+            const doc = await strapi.documents(target.uid).findOne({
+              documentId: target.documentId
+            });
+            const label = doc ? doc.title || doc.name || doc.slug || doc.documentId : target.documentId;
+            const isLive = Boolean(doc?.publishedAt) && doc?.status !== "modified";
+            const currentStatus = isLive ? "published" : doc?.status === "modified" ? "modified draft" : "draft";
+            const hasChange = !isLive;
+            if (hasChange) willUpdate++;
+            else unchanged++;
+            diffs.push({
+              uid: target.uid,
+              collectionName: displayName,
+              documentId: target.documentId,
+              label,
+              attribute: "status",
+              oldValue: currentStatus,
+              newValue: "published",
+              oldDisplay: currentStatus,
+              newDisplay: "published live",
+              hasChange,
+              status: hasChange ? "will_update" : "unchanged",
+              action: "publish",
+              message: hasChange ? "Record will be published live" : "Already published live"
+            });
+          } catch (err) {
+            diffs.push({
+              uid: target.uid,
+              collectionName: displayName,
+              documentId: target.documentId,
+              label: target.documentId,
+              attribute: "status",
+              oldValue: null,
+              newValue: null,
+              oldDisplay: "—",
+              newDisplay: "—",
+              hasChange: false,
+              status: "will_skip",
+              action: "skip",
+              message: `Error inspecting document: ${err.message}`
+            });
+          }
+        }
+        previewRes = {
+          success: true,
+          summary: {
+            total: targetsMap.size,
+            willUpdate,
+            willCreate: 0,
+            unchanged,
+            skipped: 0
+          },
+          diffs
+        };
+      } else {
+        const preview = await this.previewBatch({
+          attribute: batch.payload.attribute,
+          value: batch.payload.value,
+          selectedEntries: batch.payload.selectedEntries,
+          selectedCollections: batch.payload.selectedCollections,
+          isRegex: batch.payload.isRegex,
+          regexPattern: batch.payload.regexPattern
+        });
+        previewRes = {
+          success: true,
+          summary: {
+            total: preview.summary?.total ?? 0,
+            willUpdate: preview.summary?.willUpdate ?? 0,
+            willCreate: 0,
+            unchanged: preview.summary?.unchanged ?? 0,
+            skipped: preview.summary?.skipped ?? 0
+          },
+          diffs: (preview.diffs || []).map((d) => ({
+            ...d,
+            action: "update"
+          }))
+        };
+      }
+      return {
+        success: true,
+        batchId: batch.id,
+        createdAt: batch.createdAt,
+        createdBy: batch.createdBy,
+        makerNotes: batch.makerNotes,
+        batchSummary: batch.summary,
+        payload: {
+          action: batch.payload?.action || "bulk_update",
+          attribute: batch.payload?.attribute,
+          value: batch.payload?.value,
+          publishOnApproval: batch.summary?.publishOnApproval,
+          publishStrategy: batch.summary?.publishStrategy
+        },
+        summary: previewRes.summary,
+        diffs: previewRes.diffs
+      };
+    },
+    /**
+     * Export batch diffs to CSV for offline audit review
+     */
+    async getPendingBatchDiffsCsv(batchId) {
+      const data = await this.getPendingBatchDiffs(batchId);
+      function escapeVal(val) {
+        if (val === null || val === void 0) return "";
+        let str = typeof val === "object" ? JSON.stringify(val) : String(val);
+        str = str.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+        if (/^[=+@-]$/.test(str.charAt(0))) {
+          str = `'${str}`;
+        }
+        if (str.includes(",") || str.includes('"') || str.includes("\n")) {
+          return `"${str.replace(/"/g, '""')}"`;
+        }
+        return str;
+      }
+      const headers = [
+        "Batch ID",
+        "Action",
+        "Collection UID",
+        "Collection Name",
+        "Document ID",
+        "Record Identifier",
+        "Attribute Name",
+        "Original Value (Before)",
+        "Proposed Value (After)",
+        "Change Status",
+        "Details / Message"
+      ];
+      const rows = [headers.join(",")];
+      for (const diff of data.diffs || []) {
+        const row = [
+          escapeVal(data.batchId),
+          escapeVal(diff.action || "update"),
+          escapeVal(diff.uid),
+          escapeVal(diff.collectionName),
+          escapeVal(diff.documentId),
+          escapeVal(diff.label),
+          escapeVal(diff.attribute),
+          escapeVal(diff.oldDisplay ?? diff.oldValue),
+          escapeVal(diff.newDisplay ?? diff.newValue),
+          escapeVal(
+            diff.status === "will_update" ? "Will Update" : diff.status === "will_create" ? "Will Create" : diff.status === "unchanged" ? "Unchanged" : "Skipped"
+          ),
+          escapeVal(diff.message)
+        ];
+        rows.push(row.join(","));
+      }
+      const safeBatchId = batchId.replace(/[^a-zA-Z0-9_-]/g, "_");
+      const filename = `pending_batch_review_${safeBatchId}_${(/* @__PURE__ */ new Date()).toISOString().slice(0, 10)}.csv`;
+      return {
+        success: true,
+        filename,
+        csvContent: "\uFEFF" + rows.join("\r\n") + "\r\n",
+        count: data.diffs?.length || 0
+      };
+    },
     /**
      * Get recent batch jobs for the processing dashboard
      */
@@ -4990,176 +5229,263 @@ async function findExistingDocument(strapi, uid, targetDocId, docLocale) {
   }
   return null;
 }
-async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
-  const attrs = ct.attributes || {};
-  const { mode = "auto", publish = true, publishStrategy = "safe", user } = options;
-  const isDraftAndPublish = Boolean(ct.options?.draftAndPublish);
-  const stats = {
-    total: rows.length,
-    created: 0,
-    updated: 0,
-    skipped: 0,
-    newWithoutDocId: 0,
-    errors: [],
-    diffs: []
-  };
-  for (let i = 0; i < rows.length; i++) {
-    const rowNumber = startRowNumber + i;
-    const row = rows[i];
-    let docId = extractDocId(row);
-    const rowLocale = extractLocale(row);
-    if (ct.kind === "singleType" && !docId) {
-      try {
-        const findSingleArgs = {};
-        if (rowLocale) findSingleArgs.locale = rowLocale;
-        const singleDoc = await strapi.documents(uid).findFirst(findSingleArgs);
-        if (singleDoc?.documentId) {
-          docId = singleDoc.documentId;
-        }
-      } catch {
-      }
+function deepMergeComponent(existingVal, newVal) {
+  if (!existingVal || typeof existingVal !== "object" || Array.isArray(existingVal)) {
+    return newVal;
+  }
+  if (!newVal || typeof newVal !== "object" || Array.isArray(newVal)) {
+    return newVal;
+  }
+  const merged = { ...existingVal };
+  for (const k of Object.keys(newVal)) {
+    if (newVal[k] && typeof newVal[k] === "object" && !Array.isArray(newVal[k])) {
+      merged[k] = deepMergeComponent(existingVal[k], newVal[k]);
+    } else if (newVal[k] !== void 0) {
+      merged[k] = newVal[k];
     }
-    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 [parent, child] = key.split(".");
-        const parentDef = attrs[parent];
-        if (parentDef?.type === "component" && !parentDef.repeatable && parentDef.component) {
-          const comp = strapi.components[parentDef.component];
-          const childDef = comp?.attributes?.[child];
-          if (childDef) {
-            if (!payload[parent]) payload[parent] = {};
-            let val = rawVal;
-            if (rawVal === "" || rawVal === null || rawVal === void 0) {
-              val = null;
-            } else if (childDef.type === "integer" || childDef.type === "biginteger") {
-              const parsedInt = parseInt(rawVal, 10);
-              val = isNaN(parsedInt) ? null : parsedInt;
-            } else if (childDef.type === "float" || childDef.type === "decimal") {
-              const parsedFloat = parseFloat(rawVal);
-              val = isNaN(parsedFloat) ? null : parsedFloat;
-            } else if (childDef.type === "boolean") {
-              val = rawVal.toLowerCase() === "true" || rawVal === "1";
-            } else if (childDef.type === "json") {
-              try {
-                val = JSON.parse(rawVal);
-              } catch {
-                val = rawVal;
+  }
+  return merged;
+}
+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 parts = key.split(".");
+      let currentAttrs = attrs;
+      let currentTarget = payload;
+      for (let pIdx = 0; pIdx < parts.length; pIdx++) {
+        const part = parts[pIdx];
+        const isLeaf = pIdx === parts.length - 1;
+        if (isLeaf) {
+          let leafDef = currentAttrs[part];
+          if (!leafDef) {
+            const match = Object.keys(currentAttrs).find(
+              (k) => k.toLowerCase() === part.toLowerCase() || k.toLowerCase() === part.toLowerCase().replace(/\s+/g, "")
+            );
+            if (match) leafDef = currentAttrs[match];
+          }
+          if (!leafDef) {
+            break;
+          }
+          if (rawVal === "" || rawVal === null || rawVal === void 0) {
+            if (leafDef.type !== "dynamiczone" && !(leafDef.type === "component" && leafDef.repeatable) && leafDef.type !== "relation") {
+              currentTarget[part] = null;
+            }
+          } else if (leafDef.type === "integer" || leafDef.type === "biginteger") {
+            const parsedInt = parseInt(rawVal, 10);
+            currentTarget[part] = isNaN(parsedInt) ? null : parsedInt;
+          } else if (leafDef.type === "float" || leafDef.type === "decimal") {
+            const parsedFloat = parseFloat(rawVal);
+            currentTarget[part] = isNaN(parsedFloat) ? null : parsedFloat;
+          } else if (leafDef.type === "boolean") {
+            currentTarget[part] = rawVal.toLowerCase() === "true" || rawVal === "1";
+          } else if (leafDef.type === "json") {
+            try {
+              currentTarget[part] = JSON.parse(rawVal);
+            } catch {
+              currentTarget[part] = rawVal;
+            }
+          } else if (leafDef.type === "component" && leafDef.repeatable) {
+            try {
+              const parsed = JSON.parse(rawVal);
+              if (Array.isArray(parsed)) {
+                currentTarget[part] = parsed;
+              }
+            } 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;
               }
             }
-            payload[parent][child] = val;
+          } else {
+            currentTarget[part] = rawVal;
+          }
+        } else {
+          let compDef = currentAttrs[part];
+          if (!compDef) {
+            const match = Object.keys(currentAttrs).find(
+              (k) => k.toLowerCase() === part.toLowerCase() || k.toLowerCase() === part.toLowerCase().replace(/\s+/g, "")
+            );
+            if (match) compDef = currentAttrs[match];
+          }
+          if (compDef?.type === "component" && !compDef.repeatable && compDef.component) {
+            const comp = strapi.components[compDef.component];
+            if (!comp?.attributes) {
+              break;
+            }
+            if (!currentTarget[part] || typeof currentTarget[part] !== "object" || Array.isArray(currentTarget[part])) {
+              currentTarget[part] = {};
+            }
+            currentTarget = currentTarget[part];
+            currentAttrs = comp.attributes;
+          } else {
+            break;
           }
         }
-        continue;
       }
-      let attrDef = attrs[key];
-      if (!attrDef) {
-        const matchKey = Object.keys(attrs).find(
-          (k) => k.toLowerCase() === key.toLowerCase() || k.toLowerCase() === key.toLowerCase().replace(/\s+/g, "")
-        );
-        if (matchKey) {
-          attrDef = attrs[matchKey];
-        }
+      continue;
+    }
+    let attrDef = attrs[key];
+    if (!attrDef) {
+      const matchKey = Object.keys(attrs).find(
+        (k) => k.toLowerCase() === key.toLowerCase() || k.toLowerCase() === key.toLowerCase().replace(/\s+/g, "")
+      );
+      if (matchKey) {
+        attrDef = attrs[matchKey];
       }
-      if (!attrDef) continue;
-      if (rawVal === "" || rawVal === null || rawVal === void 0) {
-        if (attrDef.type !== "dynamiczone" && !(attrDef.type === "component" && attrDef.repeatable)) {
-          payload[key] = null;
-        }
-        continue;
+    }
+    if (!attrDef) continue;
+    if (rawVal === "" || rawVal === null || rawVal === void 0) {
+      if (attrDef.type !== "dynamiczone" && !(attrDef.type === "component" && attrDef.repeatable)) {
+        payload[key] = null;
       }
-      switch (attrDef.type) {
-        case "integer":
-        case "biginteger": {
-          const parsedInt = parseInt(rawVal, 10);
-          payload[key] = isNaN(parsedInt) ? null : parsedInt;
-          break;
+      continue;
+    }
+    switch (attrDef.type) {
+      case "integer":
+      case "biginteger": {
+        const parsedInt = parseInt(rawVal, 10);
+        payload[key] = isNaN(parsedInt) ? null : parsedInt;
+        break;
+      }
+      case "float":
+      case "decimal": {
+        const parsedFloat = parseFloat(rawVal);
+        payload[key] = isNaN(parsedFloat) ? null : parsedFloat;
+        break;
+      }
+      case "boolean":
+        payload[key] = rawVal.toLowerCase() === "true" || rawVal === "1";
+        break;
+      case "json":
+        try {
+          payload[key] = JSON.parse(rawVal);
+        } catch {
+          payload[key] = rawVal;
         }
-        case "float":
-        case "decimal": {
-          const parsedFloat = parseFloat(rawVal);
-          payload[key] = isNaN(parsedFloat) ? null : parsedFloat;
-          break;
+        break;
+      case "dynamiczone": {
+        try {
+          const parsed = JSON.parse(rawVal);
+          if (Array.isArray(parsed) && parsed.every((item) => item && typeof item === "object" && typeof item.__component === "string")) {
+            payload[key] = parsed;
+          }
+        } catch {
         }
-        case "boolean":
-          payload[key] = rawVal.toLowerCase() === "true" || rawVal === "1";
-          break;
-        case "json":
+        break;
+      }
+      case "component": {
+        if (attrDef.repeatable) {
           try {
-            payload[key] = JSON.parse(rawVal);
+            const parsed = JSON.parse(rawVal);
+            if (Array.isArray(parsed) && parsed.every((item) => item && typeof item === "object")) {
+              payload[key] = parsed;
+            }
           } catch {
-            payload[key] = rawVal;
           }
-          break;
-        case "dynamiczone": {
+        } else {
           try {
             const parsed = JSON.parse(rawVal);
-            if (Array.isArray(parsed) && parsed.every((item) => item && typeof item === "object" && typeof item.__component === "string")) {
+            if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
               payload[key] = parsed;
             }
           } catch {
           }
-          break;
         }
-        case "component": {
-          if (attrDef.repeatable) {
-            try {
-              const parsed = JSON.parse(rawVal);
-              if (Array.isArray(parsed) && parsed.every((item) => item && typeof item === "object")) {
-                payload[key] = parsed;
-              }
-            } catch {
-            }
-          } else {
-            try {
-              const parsed = JSON.parse(rawVal);
-              if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
-                payload[key] = parsed;
-              }
-            } catch {
-            }
+        break;
+      }
+      case "relation": {
+        try {
+          const parsed = JSON.parse(rawVal);
+          if (Array.isArray(parsed) || typeof parsed === "object" && parsed !== null) {
+            payload[key] = parsed;
+            break;
           }
-          break;
+        } catch {
         }
-        case "relation": {
+        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 (Array.isArray(parsed) || typeof parsed === "object" && parsed !== null) {
+            if (typeof parsed === "number" || typeof parsed === "object") {
               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;
+        break;
+      }
+      default:
+        payload[key] = rawVal;
+    }
+  }
+  return payload;
+}
+function formatValueDisplay(val) {
+  if (val === null || val === void 0) return "(empty)";
+  if (typeof val === "object") {
+    try {
+      return JSON.stringify(val);
+    } catch {
+      return String(val);
+    }
+  }
+  const s = String(val).trim();
+  return s === "" ? "(empty)" : s;
+}
+async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
+  const attrs = ct.attributes || {};
+  const { mode = "auto", publish = true, publishStrategy = "safe", user } = options;
+  const isDraftAndPublish = Boolean(ct.options?.draftAndPublish);
+  const stats = {
+    total: rows.length,
+    created: 0,
+    updated: 0,
+    skipped: 0,
+    newWithoutDocId: 0,
+    errors: [],
+    diffs: []
+  };
+  for (let i = 0; i < rows.length; i++) {
+    const rowNumber = startRowNumber + i;
+    const row = rows[i];
+    let docId = extractDocId(row);
+    const rowLocale = extractLocale(row);
+    if (ct.kind === "singleType" && !docId) {
+      try {
+        const findSingleArgs = {};
+        if (rowLocale) findSingleArgs.locale = rowLocale;
+        const singleDoc = await strapi.documents(uid).findFirst(findSingleArgs);
+        if (singleDoc?.documentId) {
+          docId = singleDoc.documentId;
         }
-        default:
-          payload[key] = rawVal;
+      } catch {
       }
     }
+    const payload = parseRowToPayload(strapi, attrs, row);
     try {
       if (mode === "update") {
         if (!docId) {
@@ -5184,7 +5510,7 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
         const mergedPayload = { ...payload };
         for (const key of Object.keys(payload)) {
           if (attrs[key]?.type === "component" && typeof payload[key] === "object" && payload[key] !== null) {
-            mergedPayload[key] = { ...existing[key] || {}, ...payload[key] };
+            mergedPayload[key] = deepMergeComponent(existing[key], payload[key]);
           }
         }
         if (Object.keys(mergedPayload).length === 0) {
@@ -5209,7 +5535,7 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
         if (rowLocale) updateArgs.locale = rowLocale;
         await strapi.documents(uid).update(updateArgs);
         const isApproved = isDraftAndPublish && Boolean(existing?.publishedAt) && existing?.status !== "modified";
-        const shouldPublish = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" ? true : isApproved);
+        const shouldPublish = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" || options.unreviewedConsent ? true : isApproved);
         if (shouldPublish) {
           try {
             const pubArgs = { documentId: resolvedDocId };
@@ -5254,7 +5580,7 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
           const mergedPayload = { ...payload };
           for (const key of Object.keys(payload)) {
             if (attrs[key]?.type === "component" && typeof payload[key] === "object" && payload[key] !== null) {
-              mergedPayload[key] = { ...existing[key] || {}, ...payload[key] };
+              mergedPayload[key] = deepMergeComponent(existing[key], payload[key]);
             }
           }
           const updateArgs = {
@@ -5264,7 +5590,7 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
           if (rowLocale) updateArgs.locale = rowLocale;
           await strapi.documents(uid).update(updateArgs);
           const isApproved = isDraftAndPublish && Boolean(existing?.publishedAt) && existing?.status !== "modified";
-          const shouldPublish = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" ? true : isApproved);
+          const shouldPublish = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" || options.unreviewedConsent ? true : isApproved);
           if (shouldPublish) {
             try {
               const pubArgs = { documentId: resolvedDocId };
@@ -5305,7 +5631,7 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
         if (rowLocale) createArgs.locale = rowLocale;
         const created = await strapi.documents(uid).create(createArgs);
         const newDocId = created?.documentId || docId;
-        const shouldPublishNew = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" ? true : false);
+        const shouldPublishNew = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" || options.unreviewedConsent ? true : false);
         if (shouldPublishNew && newDocId) {
           try {
             const pubArgs = { documentId: newDocId };
@@ -5351,7 +5677,7 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
           const mergedPayload = { ...payload };
           for (const key of Object.keys(payload)) {
             if (attrs[key]?.type === "component" && typeof payload[key] === "object" && payload[key] !== null) {
-              mergedPayload[key] = { ...existing[key] || {}, ...payload[key] };
+              mergedPayload[key] = deepMergeComponent(existing[key], payload[key]);
             }
           }
           const updateArgs = {
@@ -5361,7 +5687,7 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
           if (rowLocale) updateArgs.locale = rowLocale;
           await strapi.documents(uid).update(updateArgs);
           const isApproved = isDraftAndPublish && Boolean(existing?.publishedAt) && existing?.status !== "modified";
-          const shouldPublish = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" ? true : isApproved);
+          const shouldPublish = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" || options.unreviewedConsent ? true : isApproved);
           if (shouldPublish) {
             try {
               const pubArgs = { documentId: resolvedDocId };
@@ -5402,7 +5728,7 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
         if (rowLocale) createArgs.locale = rowLocale;
         const created = await strapi.documents(uid).create(createArgs);
         const newDocId = created?.documentId || docId;
-        const shouldPublishNew = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" ? true : false);
+        const shouldPublishNew = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" || options.unreviewedConsent ? true : false);
         if (shouldPublishNew && newDocId) {
           try {
             const pubArgs = { documentId: newDocId };
@@ -6146,6 +6472,174 @@ const csvService = ({ strapi }) => ({
       totalWarningCount: warnings.length
     };
   },
+  /**
+   * Previews CSV batch changes item-by-item without mutating the database.
+   * Compares proposed CSV rows against existing documents to compute exact diffs for Maker-Checker review.
+   */
+  async previewCsvBatch(uid, rows, options = {}) {
+    const ct = strapi.contentTypes[uid];
+    if (!ct) {
+      throw new Error(`Content type "${uid}" not found`);
+    }
+    const attrs = ct.attributes || {};
+    const { mode = "auto" } = options;
+    const diffs = [];
+    let willUpdateCount = 0;
+    let willCreateCount = 0;
+    let unchangedCount = 0;
+    let skippedCount = 0;
+    for (let i = 0; i < rows.length; i++) {
+      const rowNumber = i + 2;
+      const row = rows[i];
+      let docId = extractDocId(row);
+      const rowLocale = extractLocale(row);
+      if (ct.kind === "singleType" && !docId) {
+        try {
+          const findSingleArgs = {};
+          if (rowLocale) findSingleArgs.locale = rowLocale;
+          const singleDoc = await strapi.documents(uid).findFirst(findSingleArgs);
+          if (singleDoc?.documentId) {
+            docId = singleDoc.documentId;
+          }
+        } catch {
+        }
+      }
+      let existing = null;
+      if (docId) {
+        existing = await findExistingDocument(strapi, uid, docId, rowLocale);
+      }
+      if (mode === "update" && (!docId || !existing)) {
+        skippedCount++;
+        diffs.push({
+          uid,
+          collectionName: ct.info?.displayName || uid,
+          documentId: docId || `(Row #${rowNumber})`,
+          label: `Row #${rowNumber}`,
+          attribute: "(record)",
+          oldValue: null,
+          newValue: null,
+          oldDisplay: "—",
+          newDisplay: "—",
+          hasChange: false,
+          status: "will_skip",
+          action: "skip",
+          message: !docId ? "Missing documentId in update mode" : `Document "${docId}" not found in database`
+        });
+        continue;
+      }
+      const payload = parseRowToPayload(strapi, attrs, row);
+      if (existing) {
+        const resolvedDocId = existing.documentId || docId;
+        const entryLabel = existing.title || existing.name || existing.slug || `Entry #${resolvedDocId}`;
+        let rowHasChanges = false;
+        const payloadKeys = Object.keys(payload);
+        if (payloadKeys.length === 0) {
+          unchangedCount++;
+          diffs.push({
+            uid,
+            collectionName: ct.info?.displayName || uid,
+            documentId: resolvedDocId,
+            label: entryLabel,
+            attribute: "(no fields)",
+            oldValue: null,
+            newValue: null,
+            oldDisplay: "—",
+            newDisplay: "—",
+            hasChange: false,
+            status: "unchanged",
+            action: "update",
+            message: "No modified attributes in CSV row"
+          });
+        } else {
+          for (const attrKey of payloadKeys) {
+            const oldVal = existing?.[attrKey] ?? null;
+            let newVal = payload[attrKey];
+            if (attrs[attrKey]?.type === "component" && typeof newVal === "object" && newVal !== null) {
+              newVal = deepMergeComponent(existing[attrKey], newVal);
+            }
+            const oldDisplay = formatValueDisplay(oldVal);
+            const newDisplay = formatValueDisplay(newVal);
+            const hasChange = String(oldVal ?? "") !== String(newVal ?? "");
+            if (hasChange) {
+              rowHasChanges = true;
+            }
+            diffs.push({
+              uid,
+              collectionName: ct.info?.displayName || uid,
+              documentId: resolvedDocId,
+              label: entryLabel,
+              attribute: attrKey,
+              oldValue: oldVal,
+              newValue: newVal,
+              oldDisplay,
+              newDisplay,
+              hasChange,
+              status: hasChange ? "will_update" : "unchanged",
+              action: "update",
+              message: hasChange ? `Will update "${attrKey}" from CSV` : `Already matches CSV value`
+            });
+          }
+          if (rowHasChanges) {
+            willUpdateCount++;
+          } else {
+            unchangedCount++;
+          }
+        }
+      } else {
+        willCreateCount++;
+        const resolvedDocId = docId || `(Auto-generated)`;
+        const entryLabel = payload.title || payload.name || payload.slug || `New Entry (Row #${rowNumber})`;
+        const payloadKeys = Object.keys(payload);
+        if (payloadKeys.length === 0) {
+          diffs.push({
+            uid,
+            collectionName: ct.info?.displayName || uid,
+            documentId: resolvedDocId,
+            label: entryLabel,
+            attribute: "(all fields)",
+            oldValue: null,
+            newValue: null,
+            oldDisplay: "(new entry)",
+            newDisplay: "(empty record)",
+            hasChange: true,
+            status: "will_create",
+            action: "create",
+            message: "Will create new record"
+          });
+        } else {
+          for (const attrKey of payloadKeys) {
+            const newVal = payload[attrKey];
+            diffs.push({
+              uid,
+              collectionName: ct.info?.displayName || uid,
+              documentId: resolvedDocId,
+              label: entryLabel,
+              attribute: attrKey,
+              oldValue: null,
+              newValue: newVal,
+              oldDisplay: "(new entry)",
+              newDisplay: formatValueDisplay(newVal),
+              hasChange: true,
+              status: "will_create",
+              action: "create",
+              message: `Will create new record with attribute "${attrKey}"`
+            });
+          }
+        }
+      }
+    }
+    return {
+      success: true,
+      summary: {
+        total: rows.length,
+        willUpdate: willUpdateCount,
+        willCreate: willCreateCount,
+        unchanged: unchangedCount,
+        skipped: skippedCount
+      },
+      diffs
+    };
+  },
   /**
    * Submits a CSV batch with Guardrails: Maker-Checker (4-Eyes), Execution Windows, Off-Peak Scheduling
    */