appwrite-utils-cli 0.0.259 → 0.0.261

package/dist/migrations/dataLoader.js

@@ -436,16 +436,11 @@ export class DataLoader {
             }
         });
         const usersMap = this.importMap.get(this.getCollectionKey("users"));
-        if (usersMap) {
-            usersMap.data.push({
-                rawData: item,
-                finalData: userData.data,
-            });
-        }
         const userDataToAdd = {
             rawData: item,
             finalData: userData.data,
         };
+        // Directly update the importMap with the new user data, without pushing to usersMap.data first
         this.importMap.set(this.getCollectionKey("users"), {
             data: [...(usersMap?.data || []), userDataToAdd],
         });
@@ -517,7 +512,7 @@ export class DataLoader {
                     for (const data of currentData.data) {
                         if (data.finalData.docId === oldId ||
                             data.finalData.userId === oldId) {
-                            Object.assign(data.finalData, transformedItem);
+                            transformedItem = this.mergeObjects(data.finalData, transformedItem);
                         }
                     }
                 }
@@ -533,8 +528,7 @@ export class DataLoader {
                 if ((currentUserData.data[i].finalData.docId === existingId ||
                     currentUserData.data[i].finalData.userId === existingId) &&
                     !_.isEqual(currentUserData.data[i], userData)) {
-                    Object.assign(currentUserData.data[i].finalData, transformedItem);
-                    Object.assign(currentUserData.data[i].rawData, item);
+                    this.mergeObjects(currentUserData.data[i].finalData, userData.finalData);
                     console.log("Merging user data", currentUserData.data[i].finalData);
                     this.importMap.set(this.getCollectionKey("users"), currentUserData);
                 }
@@ -550,10 +544,8 @@ export class DataLoader {
             for (let i = 0; i < currentData.data.length; i++) {
                 if (currentData.data[i].finalData.docId === existingId ||
                     currentData.data[i].finalData.userId === existingId) {
-                    currentData.data[i].finalData = {
-                        ...currentData.data[i].finalData,
-                        ...transformedItem,
-                    };
+                    currentData.data[i].finalData = this.mergeObjects(currentData.data[i].finalData, transformedItem);
+                    currentData.data[i].context = context;
                     currentData.data[i].importDef = newImportDef;
                     this.importMap.set(this.getCollectionKey(collection.name), currentData);
                     this.oldIdToNewIdPerCollectionMap.set(this.getCollectionKey(collection.name), collectionOldIdToNewIdMap);
@@ -736,15 +728,23 @@ export class DataLoader {
                 attributeMappings: mappingsWithActions,
             };
             // Add the item with its context and final data to the current collection data
-            if (currentData) {
+            if (itemDataToUpdate) {
+                // Update the existing item's finalData and context in place
+                itemDataToUpdate.finalData = this.mergeObjects(itemDataToUpdate.finalData, transformedData);
+                itemDataToUpdate.context = context;
+                itemDataToUpdate.importDef = newImportDef;
+            }
+            else {
+                // If no existing item matches, then add the new item
                 currentData.data.push({
                     rawData: item,
                     context: context,
                     importDef: newImportDef,
                     finalData: transformedData,
                 });
-                this.importMap.set(this.getCollectionKey(collection.name), currentData);
             }
+            // Since we're modifying currentData in place, we ensure no duplicates are added
+            this.importMap.set(this.getCollectionKey(collection.name), currentData);
         }
     }
     updateReferencesBasedOnAttributeMappings() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "appwrite-utils-cli",
   "description": "Appwrite Utility Functions to help with database management, data conversion, data import, migrations, and much more. Meant to be used as a CLI tool, I do not recommend installing this in frontend environments.",
-  "version": "0.0.259",
+  "version": "0.0.261",
   "main": "src/main.ts",
   "type": "module",
   "repository": {

package/src/migrations/dataLoader.ts

@@ -550,16 +550,11 @@ export class DataLoader {
       }
     });
     const usersMap = this.importMap.get(this.getCollectionKey("users"));
-    if (usersMap) {
-      usersMap.data.push({
-        rawData: item,
-        finalData: userData.data,
-      });
-    }
     const userDataToAdd = {
       rawData: item,
       finalData: userData.data,
     };
+    // Directly update the importMap with the new user data, without pushing to usersMap.data first
     this.importMap.set(this.getCollectionKey("users"), {
       data: [...(usersMap?.data || []), userDataToAdd],
     });
@@ -672,7 +667,10 @@ export class DataLoader {
               data.finalData.docId === oldId ||
               data.finalData.userId === oldId
             ) {
-              Object.assign(data.finalData, transformedItem);
+              transformedItem = this.mergeObjects(
+                data.finalData,
+                transformedItem
+              );
             }
           }
         } else {
@@ -690,8 +688,10 @@ export class DataLoader {
             currentUserData.data[i].finalData.userId === existingId) &&
           !_.isEqual(currentUserData.data[i], userData)
         ) {
-          Object.assign(currentUserData.data[i].finalData, transformedItem);
-          Object.assign(currentUserData.data[i].rawData, item);
+          this.mergeObjects(
+            currentUserData.data[i].finalData,
+            userData.finalData
+          );
           console.log("Merging user data", currentUserData.data[i].finalData);
           this.importMap.set(this.getCollectionKey("users"), currentUserData);
         }
@@ -714,10 +714,11 @@ export class DataLoader {
           currentData.data[i].finalData.docId === existingId ||
           currentData.data[i].finalData.userId === existingId
         ) {
-          currentData.data[i].finalData = {
-            ...currentData.data[i].finalData,
-            ...transformedItem,
-          };
+          currentData.data[i].finalData = this.mergeObjects(
+            currentData.data[i].finalData,
+            transformedItem
+          );
+          currentData.data[i].context = context;
           currentData.data[i].importDef = newImportDef;
           this.importMap.set(
             this.getCollectionKey(collection.name),
@@ -998,15 +999,25 @@ export class DataLoader {
         attributeMappings: mappingsWithActions,
       };
       // Add the item with its context and final data to the current collection data
-      if (currentData) {
-        currentData.data.push({
+      if (itemDataToUpdate) {
+        // Update the existing item's finalData and context in place
+        itemDataToUpdate.finalData = this.mergeObjects(
+          itemDataToUpdate.finalData,
+          transformedData
+        );
+        itemDataToUpdate.context = context;
+        itemDataToUpdate.importDef = newImportDef;
+      } else {
+        // If no existing item matches, then add the new item
+        currentData!.data.push({
           rawData: item,
           context: context,
           importDef: newImportDef,
           finalData: transformedData,
         });
-        this.importMap.set(this.getCollectionKey(collection.name), currentData);
       }
+      // Since we're modifying currentData in place, we ensure no duplicates are added
+      this.importMap.set(this.getCollectionKey(collection.name), currentData!);
     }
   }