appwrite-utils-cli 0.0.258 → 0.0.260

package/dist/migrations/dataLoader.d.ts

@@ -1562,6 +1562,17 @@ export declare class DataLoader {
     private shouldWriteFile;
     constructor(appwriteFolderPath: string, importDataActions: ImportDataActions, database: Databases, config: AppwriteConfig, shouldWriteFile?: boolean);
     getCollectionKey(name: string): string;
+    /**
+     * Merges two objects by updating the source object with the target object's values.
+     * It iterates through the target object's keys and updates the source object if:
+     * - The source object has the key.
+     * - The target object's value for that key is not null, undefined, or an empty string.
+     *
+     * @param source - The source object to be updated.
+     * @param target - The target object with values to update the source object.
+     * @returns The updated source object.
+     */
+    mergeObjects(source: Record<string, any>, target: Record<string, any>): Record<string, any>;
     loadData(importDef: ImportDef): Promise<any[]>;
     checkMapValuesForId(newId: string, collectionName: string): string | false;
     getTrueUniqueId(collectionName: string): string;

package/dist/migrations/dataLoader.js

@@ -59,6 +59,28 @@ export class DataLoader {
     getCollectionKey(name) {
         return name.toLowerCase().replace(" ", "");
     }
+    /**
+     * Merges two objects by updating the source object with the target object's values.
+     * It iterates through the target object's keys and updates the source object if:
+     * - The source object has the key.
+     * - The target object's value for that key is not null, undefined, or an empty string.
+     *
+     * @param source - The source object to be updated.
+     * @param target - The target object with values to update the source object.
+     * @returns The updated source object.
+     */
+    mergeObjects(source, target) {
+        Object.keys(target).forEach((key) => {
+            const targetValue = target[key];
+            if (source.hasOwnProperty(key) &&
+                targetValue !== null &&
+                targetValue !== undefined &&
+                targetValue !== "") {
+                source[key] = targetValue;
+            }
+        });
+        return source;
+    }
     // Method to load data from a file specified in the import definition
     async loadData(importDef) {
         // Resolve the file path and check if the file exists
@@ -414,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],
         });
@@ -495,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);
                         }
                     }
                 }
@@ -511,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);
                 }
@@ -528,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);
@@ -656,7 +670,7 @@ export class DataLoader {
         }
         for (const item of rawData) {
             // Transform the item data based on the attribute mappings
-            const transformedData = await this.transformData(item, importDef.attributeMappings);
+            let transformedData = await this.transformData(item, importDef.attributeMappings);
             let newId;
             let oldId;
             // Determine the new ID for the item based on the primary key field or update mapping
@@ -688,9 +702,17 @@ export class DataLoader {
                 logger.error(`No new id found for collection ${collection.name} for updateDef ${JSON.stringify(item, null, 2)} but it says it's supposed to have one...`);
                 continue;
             }
+            const itemDataToUpdate = this.importMap
+                .get(this.getCollectionKey(collection.name))
+                ?.data.find((data) => data.rawData[importDef.primaryKeyField] === oldId);
+            if (!itemDataToUpdate) {
+                logger.error(`No data found for collection ${collection.name} for updateDef ${JSON.stringify(item, null, 2)} but it says it's supposed to have one...`);
+                continue;
+            }
+            transformedData = this.mergeObjects(itemDataToUpdate.finalData, transformedData);
             // Create a context object for the item, including the new ID and transformed data
             let context = this.createContext(db, collection, item, newId);
-            context = { ...context, ...transformedData };
+            context = this.mergeObjects(context, transformedData);
             // Validate the item before proceeding
             const isValid = await this.importDataActions.validateItem(item, importDef.attributeMappings, context);
             // Log info and continue to the next item if it's invalid

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.258",
+  "version": "0.0.260",
   "main": "src/main.ts",
   "type": "module",
   "repository": {

package/src/migrations/dataLoader.ts

@@ -86,6 +86,34 @@ export class DataLoader {
     return name.toLowerCase().replace(" ", "");
   }
 
+  /**
+   * Merges two objects by updating the source object with the target object's values.
+   * It iterates through the target object's keys and updates the source object if:
+   * - The source object has the key.
+   * - The target object's value for that key is not null, undefined, or an empty string.
+   *
+   * @param source - The source object to be updated.
+   * @param target - The target object with values to update the source object.
+   * @returns The updated source object.
+   */
+  mergeObjects(
+    source: Record<string, any>,
+    target: Record<string, any>
+  ): Record<string, any> {
+    Object.keys(target).forEach((key) => {
+      const targetValue = target[key];
+      if (
+        source.hasOwnProperty(key) &&
+        targetValue !== null &&
+        targetValue !== undefined &&
+        targetValue !== ""
+      ) {
+        source[key] = targetValue;
+      }
+    });
+    return source;
+  }
+
   // Method to load data from a file specified in the import definition
   async loadData(importDef: ImportDef): Promise<any[]> {
     // Resolve the file path and check if the file exists
@@ -522,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],
     });
@@ -644,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 {
@@ -662,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);
         }
@@ -686,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),
@@ -874,7 +903,7 @@ export class DataLoader {
     }
     for (const item of rawData) {
       // Transform the item data based on the attribute mappings
-      const transformedData = await this.transformData(
+      let transformedData = await this.transformData(
         item,
         importDef.attributeMappings
       );
@@ -921,9 +950,30 @@ export class DataLoader {
         );
         continue;
       }
+      const itemDataToUpdate = this.importMap
+        .get(this.getCollectionKey(collection.name))
+        ?.data.find(
+          (data) => data.rawData[importDef.primaryKeyField] === oldId
+        );
+      if (!itemDataToUpdate) {
+        logger.error(
+          `No data found for collection ${
+            collection.name
+          } for updateDef ${JSON.stringify(
+            item,
+            null,
+            2
+          )} but it says it's supposed to have one...`
+        );
+        continue;
+      }
+      transformedData = this.mergeObjects(
+        itemDataToUpdate.finalData,
+        transformedData
+      );
       // Create a context object for the item, including the new ID and transformed data
       let context = this.createContext(db, collection, item, newId);
-      context = { ...context, ...transformedData };
+      context = this.mergeObjects(context, transformedData);
       // Validate the item before proceeding
       const isValid = await this.importDataActions.validateItem(
         item,