appwrite-utils-cli 0.0.257 → 0.0.259

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
@@ -405,8 +427,6 @@ export class DataLoader {
             const mergedUsers = this.mergedUserMap.get(existingId) || [];
             mergedUsers.push(`${item[primaryKeyField]}`);
             this.mergedUserMap.set(existingId, mergedUsers);
-            transformedItem["userId"] = existingId;
-            transformedItem["docId"] = existingId;
         }
         // Remove user-specific keys from the transformed item
         const userKeys = ["email", "phone", "name", "labels", "prefs"];
@@ -658,7 +678,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
@@ -690,9 +710,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.257",
+  "version": "0.0.259",
   "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
@@ -512,8 +540,6 @@ export class DataLoader {
       const mergedUsers = this.mergedUserMap.get(existingId) || [];
       mergedUsers.push(`${item[primaryKeyField]}`);
       this.mergedUserMap.set(existingId, mergedUsers);
-      transformedItem["userId"] = existingId;
-      transformedItem["docId"] = existingId;
     }
 
     // Remove user-specific keys from the transformed item
@@ -876,7 +902,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
       );
@@ -923,9 +949,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,