strapi-plugin-bulk-updater 1.4.9 → 1.4.10

package/dist/server/index.mjs

@@ -4987,6 +4987,23 @@ async function findExistingDocument(strapi, uid, targetDocId, docLocale) {
   }
   return null;
 }
+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];
+    }
+  }
+  return merged;
+}
 async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
   const attrs = ct.attributes || {};
   const { mode = "auto", publish = true, publishStrategy = "safe", user } = options;
@@ -5021,32 +5038,86 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
       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;
+        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) {
-              val = null;
-            } else if (childDef.type === "integer" || childDef.type === "biginteger") {
+              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);
-              val = isNaN(parsedInt) ? null : parsedInt;
-            } else if (childDef.type === "float" || childDef.type === "decimal") {
+              currentTarget[part] = isNaN(parsedInt) ? null : parsedInt;
+            } else if (leafDef.type === "float" || leafDef.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") {
+              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 {
-                val = JSON.parse(rawVal);
+                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 {
-                val = rawVal;
+                if (isValidDocId(rawVal)) {
+                  currentTarget[part] = rawVal;
+                }
               }
+            } 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;
             }
-            payload[parent][child] = val;
           }
         }
         continue;
@@ -5181,7 +5252,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) {
@@ -5251,7 +5322,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 = {
@@ -5348,7 +5419,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 = {