appwrite-utils-cli 0.0.250 → 0.0.252

package/dist/migrations/dataLoader.d.ts

@@ -4,14 +4,6 @@ import { z } from "zod";
 import { type Databases } from "node-appwrite";
 export declare const CollectionImportDataSchema: z.ZodObject<{
     collection: z.ZodOptional<z.ZodObject<Omit<{
-        /**
-         * Prepares user data by checking for duplicates based on email or phone, adding to a duplicate map if found,
-         * and then returning the transformed item without user-specific keys.
-         *
-         * @param item - The raw item to be processed.
-         * @param attributeMappings - The attribute mappings for the item.
-         * @returns The transformed item with user-specific keys removed.
-         */
         $id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
         $createdAt: z.ZodString;
         $updatedAt: z.ZodString;
@@ -1586,6 +1578,7 @@ export declare class DataLoader {
     getAllUsers(): Promise<import("node-appwrite").Models.User<import("node-appwrite").Models.Preferences>[]>;
     start(dbId: string): Promise<void>;
     updateReferencesInRelatedCollections(): Promise<void>;
+    updateObjectWithNonNullishValues(sourceObject: Record<string, any>, inputObject: Record<string, any>): void;
     /**
      * Prepares user data by checking for duplicates based on email or phone, adding to a duplicate map if found,
      * and then returning the transformed item without user-specific keys.

package/dist/migrations/dataLoader.js

@@ -299,6 +299,24 @@ export class DataLoader {
             }
         }
     }
+    updateObjectWithNonNullishValues(sourceObject, inputObject) {
+        // Iterate through the keys of the inputObject
+        for (const key of Object.keys(inputObject)) {
+            const inputValue = inputObject[key];
+            const sourceValue = sourceObject[key];
+            // Check if the inputObject's value for the current key is non-nullish
+            // and either the key doesn't exist in the sourceObject or its value is nullish
+            if (inputValue !== null &&
+                inputValue !== undefined &&
+                inputValue !== "" &&
+                (sourceValue === null ||
+                    sourceValue === undefined ||
+                    sourceValue === "")) {
+                // Update the sourceObject with the inputObject's value for the current key
+                sourceObject[key] = inputValue;
+            }
+        }
+    }
     // async updateReferencesInRelatedCollections() {
     //   // Process each collection defined in the config
     //   for (const collection of this.config.collections) {
@@ -481,7 +499,6 @@ export class DataLoader {
             this.oldIdToNewIdPerCollectionMap
                 .set(this.getCollectionKey(collection.name), oldIdToNewIdMap)
                 .get(this.getCollectionKey(collection.name));
-        console.log(`${collection.name} -- collectionOldIdToNewIdMap: ${collectionOldIdToNewIdMap}`);
         if (!operationId) {
             throw new Error(`No import operation found for collection ${collection.name}`);
         }
@@ -511,6 +528,7 @@ export class DataLoader {
                 // No existing user ID, generate a new unique ID
                 existingId = this.getTrueUniqueId(this.getCollectionKey("users"));
                 transformedItem.userId = existingId; // Assign the new ID to the transformed data's userId field
+                transformedItem.docId = existingId;
             }
             // Create a context object for the item, including the new ID
             let context = this.createContext(db, collection, item, existingId);
@@ -524,12 +542,7 @@ export class DataLoader {
                     .get(this.getCollectionKey(collection.name))
                     ?.has(`${oldId}`)) {
                     // Found a duplicate oldId, now decide how to merge or handle these duplicates
-                    for (const data of currentData.data) {
-                        if (data.finalData.docId === oldId ||
-                            data.finalData.userId === oldId) {
-                            Object.assign(data.finalData, transformedItem);
-                        }
-                    }
+                    this.updateObjectWithNonNullishValues(currentData.data[0].finalData, transformedItem);
                 }
                 else {
                     // No duplicate found, simply map the oldId to the new itemId
@@ -543,8 +556,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.updateObjectWithNonNullishValues(currentUserData.data[i].finalData, userData.finalData);
                     console.log("Merging user data", currentUserData.data[i].finalData);
                     this.importMap.set(this.getCollectionKey("users"), currentUserData);
                 }
@@ -560,10 +572,7 @@ 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,
-                    };
+                    this.updateObjectWithNonNullishValues(currentData.data[i].finalData, transformedItem);
                     currentData.data[i].importDef = newImportDef;
                     this.importMap.set(this.getCollectionKey(collection.name), currentData);
                     this.oldIdToNewIdPerCollectionMap.set(this.getCollectionKey(collection.name), collectionOldIdToNewIdMap);
@@ -713,8 +722,9 @@ export class DataLoader {
                 }
             }
             else {
-                logger.error(`No old ID found (to update another document with) in prepareUpdateData for ${collection.name}, ${JSON.stringify(item, null, 2)}`);
-                continue;
+                const currentCollectionData = this.importMap.get(this.getCollectionKey(collection.name));
+                const foundItem = currentCollectionData?.data.find((dataItem) => dataItem.rawData[importDef.primaryKeyField] === oldId);
+                newId = foundItem ? oldIdToNewIdMap?.get(`${oldId}`) : undefined;
             }
             // Log an error and continue to the next item if no new ID is found
             if (!newId) {

package/dist/migrations/importController.js

@@ -109,6 +109,9 @@ export class ImportController {
                                             throw error;
                                         });
                                     }
+                                    else {
+                                        return Promise.resolve();
+                                    }
                                 }
                             }
                         })

package/dist/migrations/importDataActions.js

@@ -103,7 +103,6 @@ export class ImportDataActions {
         for (const mapping of attributeMap) {
             const { postImportActions } = mapping;
             if (!postImportActions || !Array.isArray(postImportActions)) {
-                console.warn(`No post-import actions defined for attribute: ${mapping.targetKey}`, postImportActions);
                 continue; // Skip to the next attribute if no actions are defined
             }
             for (const actionDef of postImportActions) {

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

package/src/migrations/dataLoader.ts

@@ -389,6 +389,31 @@ export class DataLoader {
     }
   }
 
+  updateObjectWithNonNullishValues(
+    sourceObject: Record<string, any>,
+    inputObject: Record<string, any>
+  ): void {
+    // Iterate through the keys of the inputObject
+    for (const key of Object.keys(inputObject)) {
+      const inputValue = inputObject[key];
+      const sourceValue = sourceObject[key];
+
+      // Check if the inputObject's value for the current key is non-nullish
+      // and either the key doesn't exist in the sourceObject or its value is nullish
+      if (
+        inputValue !== null &&
+        inputValue !== undefined &&
+        inputValue !== "" &&
+        (sourceValue === null ||
+          sourceValue === undefined ||
+          sourceValue === "")
+      ) {
+        // Update the sourceObject with the inputObject's value for the current key
+        sourceObject[key] = inputValue;
+      }
+    }
+  }
+
   // async updateReferencesInRelatedCollections() {
   //   // Process each collection defined in the config
   //   for (const collection of this.config.collections) {
@@ -605,9 +630,6 @@ export class DataLoader {
       this.oldIdToNewIdPerCollectionMap
         .set(this.getCollectionKey(collection.name), oldIdToNewIdMap)
         .get(this.getCollectionKey(collection.name));
-    console.log(
-      `${collection.name} -- collectionOldIdToNewIdMap: ${collectionOldIdToNewIdMap}`
-    );
     if (!operationId) {
       throw new Error(
         `No import operation found for collection ${collection.name}`
@@ -657,6 +679,7 @@ export class DataLoader {
         // No existing user ID, generate a new unique ID
         existingId = this.getTrueUniqueId(this.getCollectionKey("users"));
         transformedItem.userId = existingId; // Assign the new ID to the transformed data's userId field
+        transformedItem.docId = existingId;
       }
 
       // Create a context object for the item, including the new ID
@@ -676,14 +699,10 @@ export class DataLoader {
             ?.has(`${oldId}`)
         ) {
           // Found a duplicate oldId, now decide how to merge or handle these duplicates
-          for (const data of currentData.data) {
-            if (
-              data.finalData.docId === oldId ||
-              data.finalData.userId === oldId
-            ) {
-              Object.assign(data.finalData, transformedItem);
-            }
-          }
+          this.updateObjectWithNonNullishValues(
+            currentData.data[0].finalData,
+            transformedItem
+          );
         } else {
           // No duplicate found, simply map the oldId to the new itemId
           collectionOldIdToNewIdMap?.set(`${oldId}`, `${existingId}`);
@@ -699,8 +718,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.updateObjectWithNonNullishValues(
+            currentUserData.data[i].finalData,
+            userData.finalData
+          );
           console.log("Merging user data", currentUserData.data[i].finalData);
           this.importMap.set(this.getCollectionKey("users"), currentUserData);
         }
@@ -723,10 +744,10 @@ export class DataLoader {
           currentData.data[i].finalData.docId === existingId ||
           currentData.data[i].finalData.userId === existingId
         ) {
-          currentData.data[i].finalData = {
-            ...currentData.data[i].finalData,
-            ...transformedItem,
-          };
+          this.updateObjectWithNonNullishValues(
+            currentData.data[i].finalData,
+            transformedItem
+          );
           currentData.data[i].importDef = newImportDef;
           this.importMap.set(
             this.getCollectionKey(collection.name),
@@ -941,12 +962,13 @@ export class DataLoader {
           }
         }
       } else {
-        logger.error(
-          `No old ID found (to update another document with) in prepareUpdateData for ${
-            collection.name
-          }, ${JSON.stringify(item, null, 2)}`
+        const currentCollectionData = this.importMap.get(
+          this.getCollectionKey(collection.name)
         );
-        continue;
+        const foundItem = currentCollectionData?.data.find(
+          (dataItem) => dataItem.rawData[importDef.primaryKeyField] === oldId
+        );
+        newId = foundItem ? oldIdToNewIdMap?.get(`${oldId}`) : undefined;
       }
       // Log an error and continue to the next item if no new ID is found
       if (!newId) {

package/src/migrations/importController.ts

@@ -172,6 +172,8 @@ export class ImportController {
                           );
                           throw error;
                         });
+                    } else {
+                      return Promise.resolve();
                     }
                   }
                 }

package/src/migrations/importDataActions.ts

@@ -161,10 +161,6 @@ export class ImportDataActions {
     for (const mapping of attributeMap) {
       const { postImportActions } = mapping;
       if (!postImportActions || !Array.isArray(postImportActions)) {
-        console.warn(
-          `No post-import actions defined for attribute: ${mapping.targetKey}`,
-          postImportActions
-        );
         continue; // Skip to the next attribute if no actions are defined
       }
       for (const actionDef of postImportActions) {