strapi-plugin-bulk-updater 1.5.0 → 1.5.2

package/dist/server/index.mjs

@@ -1113,14 +1113,15 @@ function discoverComponentAttributes(strapi, compUid, prefix, currentDepth, maxD
 }
 function parseDynamicZonePath(path) {
   if (!path) return { cleanPath: "", rootKey: "", subPath: "" };
-  const bracketMatch = path.match(/^([^.[]+)\[([^\]]+)\]\.(.+)$/);
+  const bracketMatch = path.match(/^([^.[]+)\[([^\]]+)\](?:\.(.+))?$/);
   if (bracketMatch) {
     const rootKey = bracketMatch[1];
-    const selector = bracketMatch[2];
-    const subPath = bracketMatch[3];
-    const cleanPath = `${rootKey}.${subPath}`;
-    if (/^\d+$/.test(selector)) {
-      return { cleanPath, rootKey, subPath, targetIndex: parseInt(selector, 10) };
+    const selector = bracketMatch[2].trim();
+    const subPath = bracketMatch[3] || "";
+    const cleanPath = subPath ? `${rootKey}.${subPath}` : rootKey;
+    const numMatch = selector.match(/^#?(\d+)/);
+    if (numMatch) {
+      return { cleanPath, rootKey, subPath, targetIndex: parseInt(numMatch[1], 10) };
     }
     return { cleanPath, rootKey, subPath, targetComponentUid: selector };
   }
@@ -4273,42 +4274,74 @@ const auditService = ({ strapi }) => ({
     for (const item of diffs) {
       if (item.status === "updated" && item.uid && item.documentId && item.attribute) {
         try {
+          const ct = strapi.contentTypes[item.uid];
+          if (!ct) {
+            throw new Error(`Content type "${item.uid}" does not exist in schema.`);
+          }
           const isRel = item.oldValue && typeof item.oldValue === "object" && item.oldValue.isRelation;
           let rollbackPayload;
           if (isRel) {
             const oldDocIds = Array.isArray(item.oldValue.documentIds) ? item.oldValue.documentIds : [];
             rollbackPayload = { set: oldDocIds };
           } else {
-            rollbackPayload = item.oldValue;
+            rollbackPayload = item.oldValue ?? null;
           }
-          if (item.attribute.includes(".")) {
-            const [parentKey, childKey] = item.attribute.split(".");
-            const ct2 = strapi.contentTypes[item.uid];
-            if (ct2?.attributes?.[parentKey]?.type === "component") {
-              const currentDoc = await strapi.documents(item.uid).findOne({
-                documentId: item.documentId,
-                populate: [parentKey]
-              });
-              const currentParent = currentDoc?.[parentKey] || {};
-              const restoredParent = {
-                ...currentParent,
-                [childKey]: rollbackPayload
-              };
-              await strapi.documents(item.uid).update({
-                documentId: item.documentId,
-                data: {
-                  [parentKey]: restoredParent
-                }
-              });
+          const parsed = parseDynamicZonePath(item.attribute);
+          const rootKey = parsed.rootKey;
+          const rootAttrDef = ct.attributes?.[rootKey];
+          const isComponent = rootAttrDef?.type === "component";
+          const isDynamicZone = rootAttrDef?.type === "dynamiczone";
+          const isNested = item.attribute.includes(".") || item.attribute.includes("[") || isComponent || isDynamicZone || isDeepComponentField(ct, strapi.components, item.attribute);
+          let wasPublished = false;
+          if (isNested && (isComponent || isDynamicZone || rootAttrDef)) {
+            const populateOption = buildDeepPopulate$1(ct.attributes, strapi.components);
+            const findOneArgs = { documentId: item.documentId };
+            if (populateOption) {
+              findOneArgs.populate = populateOption;
+            }
+            const currentDoc = await strapi.documents(item.uid).findOne(findOneArgs);
+            if (!currentDoc) {
+              throw new Error(`Document "${item.documentId}" not found in collection "${item.uid}".`);
+            }
+            wasPublished = Boolean(currentDoc?.publishedAt);
+            const isRootDz = isDynamicZone;
+            const existingRoot = currentDoc?.[rootKey] || (isRootDz ? [] : {});
+            let restoredRoot;
+            if (Array.isArray(item.dynamicZoneDiffs) && item.dynamicZoneDiffs.length > 0) {
+              let workingRoot = existingRoot;
+              for (const dzDiff of item.dynamicZoneDiffs) {
+                const parsedDz = parseDynamicZonePath(dzDiff.attribute || item.attribute);
+                const dzParts = parsedDz.cleanPath.split(".").slice(1);
+                const targetIndexes = dzDiff.index !== void 0 ? [dzDiff.index] : parsedDz.targetIndex !== void 0 ? [parsedDz.targetIndex] : void 0;
+                workingRoot = setDeepProperty(workingRoot, dzParts, dzDiff.oldValue ?? null, {
+                  targetIndexes,
+                  targetComponentUid: dzDiff.componentUid || parsedDz.targetComponentUid,
+                  strapi
+                });
+              }
+              restoredRoot = workingRoot;
             } else {
-              await strapi.documents(item.uid).update({
-                documentId: item.documentId,
-                data: {
-                  [item.attribute]: rollbackPayload
-                }
+              const parts = parsed.cleanPath.split(".");
+              const pathParts = parts.slice(1);
+              const targetIndexes = parsed.targetIndex !== void 0 ? [parsed.targetIndex] : void 0;
+              const targetComponentUid = parsed.targetComponentUid;
+              restoredRoot = setDeepProperty(existingRoot, pathParts, rollbackPayload, {
+                targetIndexes,
+                targetComponentUid,
+                strapi
               });
             }
+            await strapi.documents(item.uid).update({
+              documentId: item.documentId,
+              data: {
+                [rootKey]: restoredRoot
+              }
+            });
           } else {
+            const currentDoc = await strapi.documents(item.uid).findOne({
+              documentId: item.documentId
+            });
+            wasPublished = Boolean(currentDoc?.publishedAt);
             await strapi.documents(item.uid).update({
               documentId: item.documentId,
               data: {
@@ -4316,13 +4349,13 @@ const auditService = ({ strapi }) => ({
               }
             });
           }
-          const ct = strapi.contentTypes[item.uid];
-          if (ct?.options?.draftAndPublish) {
+          if (ct?.options?.draftAndPublish && wasPublished) {
             try {
               await strapi.documents(item.uid).publish({
                 documentId: item.documentId
               });
-            } catch {
+            } catch (publishErr) {
+              strapi.log.warn(`[bulk-updater] Failed to auto-publish rollback for ${item.uid}/${item.documentId}:`, publishErr?.message);
             }
           }
           try {
@@ -4330,7 +4363,7 @@ const auditService = ({ strapi }) => ({
               uid: item.uid,
               documentId: item.documentId,
               userId,
-              statusOverride: ct?.options?.draftAndPublish ? "published" : void 0
+              statusOverride: ct?.options?.draftAndPublish ? wasPublished ? "published" : "draft" : void 0
             });
           } catch {
           }