appwrite-utils-cli 0.0.52 → 0.0.54

package/README.md

@@ -132,6 +132,7 @@ This setup ensures that developers have robust tools at their fingertips to mana
 
 ### Changelog
 
+- 0.0.54: Various fixes in here
 - 0.0.50: Actually fixed the slight bug, it was really in the `mergeObjects`
 - 0.0.49: Fixed a slight bug with `dataLoader` not mapping updates correctly with `updateMapping`
 - 0.0.48: Added `--transfer`, `--fromdb <targetDatabaseId>`, `--targetdb <targetDatabaseId>`, `--transferendpoint <transferEndpoint>`, `--transferproject <transferProjectId>`, `--transferkey <transferApiKey>`. Additionally, I've added `--fromcoll <collectionId>` and `--targetcoll <collectionId>`. These allow you to do a few things. First, you can now transfer databases in the same project, and from local to a remote project. Second, you can now specify specific collections to transfer from one place to another, with all of their data. If `--fromcoll` and `--targetcoll` are ommitted, it will transfer the databases. During the database transfer, it will create any missing collections, attributes, and indices.

package/dist/migrations/backup.d.ts

@@ -295,6 +295,7 @@ export declare const getMigrationCollectionSchemas: () => {
                     targetKey: string;
                     oldKey?: string | undefined;
                     oldKeys?: string[] | undefined;
+                    valueToSet?: any;
                     fileData?: {
                         path: string;
                         name: string;
@@ -548,6 +549,7 @@ export declare const getMigrationCollectionSchemas: () => {
                     targetKey: string;
                     oldKey?: string | undefined;
                     oldKeys?: string[] | undefined;
+                    valueToSet?: any;
                     fileData?: {
                         path: string;
                         name: string;

package/dist/migrations/collections.js

@@ -88,7 +88,7 @@ export const fetchAndCacheCollectionByName = async (db, dbId, collectionName) =>
 };
 export const wipeDatabase = async (database, databaseId) => {
     console.log(`Wiping database: ${databaseId}`);
-    const { collections: existingCollections } = await tryAwaitWithRetry(async () => await database.listCollections(databaseId));
+    const existingCollections = await fetchAllCollections(databaseId, database);
     let collectionsDeleted = [];
     for (const { $id: collectionId, name: name } of existingCollections) {
         console.log(`Deleting collection: ${collectionId}`);

package/dist/migrations/converters.d.ts

@@ -32,6 +32,7 @@ export declare const convertObjectByAttributeMappings: (obj: Record<string, any>
     targetKey: string;
     oldKey?: string | undefined;
     oldKeys?: string[] | undefined;
+    valueToSet?: any;
     fileData?: {
         path: string;
         name: string;

package/dist/migrations/converters.js

@@ -89,7 +89,10 @@ export const convertObjectByAttributeMappings = (obj, attributeMappings) => {
         return current;
     };
     for (const mapping of attributeMappings) {
-        if (Array.isArray(mapping.oldKeys)) {
+        if (mapping.valueToSet !== undefined) {
+            result[mapping.targetKey] = mapping.valueToSet;
+        }
+        else if (Array.isArray(mapping.oldKeys)) {
             // Collect and flatten values from multiple oldKeys
             const values = mapping.oldKeys
                 .map((oldKey) => resolveValue(obj, oldKey))

package/dist/migrations/dataLoader.d.ts

@@ -192,14 +192,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
             type: z.ZodLiteral<"ip">;
             error: z.ZodOptional<z.ZodDefault<z.ZodString>>;
             required: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
-            array: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>; /**
-             * Prepares the data for creating documents in a collection.
-             * This involves loading the data, transforming it, and handling ID mappings.
-             *
-             * @param db - The database configuration.
-             * @param collection - The collection configuration.
-             * @param importDef - The import definition containing the attribute mappings and other relevant info.
-             */
+            array: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
             xdefault: z.ZodOptional<z.ZodNullable<z.ZodString>>;
             description: z.ZodOptional<z.ZodNullable<z.ZodUnion<[z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>]>>>;
         }, "strip", z.ZodTypeAny, {
@@ -401,6 +394,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 oldKey: z.ZodOptional<z.ZodString>;
                 oldKeys: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
                 targetKey: z.ZodString;
+                valueToSet: z.ZodOptional<z.ZodAny>;
                 fileData: z.ZodOptional<z.ZodObject<{
                     name: z.ZodString;
                     path: z.ZodString;
@@ -436,6 +430,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 targetKey: string;
                 oldKey?: string | undefined;
                 oldKeys?: string[] | undefined;
+                valueToSet?: any;
                 fileData?: {
                     path: string;
                     name: string;
@@ -453,6 +448,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 targetKey: string;
                 oldKey?: string | undefined;
                 oldKeys?: string[] | undefined;
+                valueToSet?: any;
                 fileData?: {
                     path: string;
                     name: string;
@@ -474,6 +470,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 targetKey: string;
                 oldKey?: string | undefined;
                 oldKeys?: string[] | undefined;
+                valueToSet?: any;
                 fileData?: {
                     path: string;
                     name: string;
@@ -507,6 +504,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 targetKey: string;
                 oldKey?: string | undefined;
                 oldKeys?: string[] | undefined;
+                valueToSet?: any;
                 fileData?: {
                     path: string;
                     name: string;
@@ -657,6 +655,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 targetKey: string;
                 oldKey?: string | undefined;
                 oldKeys?: string[] | undefined;
+                valueToSet?: any;
                 fileData?: {
                     path: string;
                     name: string;
@@ -811,6 +810,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 targetKey: string;
                 oldKey?: string | undefined;
                 oldKeys?: string[] | undefined;
+                valueToSet?: any;
                 fileData?: {
                     path: string;
                     name: string;
@@ -884,6 +884,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 oldKey: z.ZodOptional<z.ZodString>;
                 oldKeys: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
                 targetKey: z.ZodString;
+                valueToSet: z.ZodOptional<z.ZodAny>;
                 fileData: z.ZodOptional<z.ZodObject<{
                     name: z.ZodString;
                     path: z.ZodString;
@@ -919,6 +920,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 targetKey: string;
                 oldKey?: string | undefined;
                 oldKeys?: string[] | undefined;
+                valueToSet?: any;
                 fileData?: {
                     path: string;
                     name: string;
@@ -936,6 +938,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 targetKey: string;
                 oldKey?: string | undefined;
                 oldKeys?: string[] | undefined;
+                valueToSet?: any;
                 fileData?: {
                     path: string;
                     name: string;
@@ -957,6 +960,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 targetKey: string;
                 oldKey?: string | undefined;
                 oldKeys?: string[] | undefined;
+                valueToSet?: any;
                 fileData?: {
                     path: string;
                     name: string;
@@ -990,6 +994,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 targetKey: string;
                 oldKey?: string | undefined;
                 oldKeys?: string[] | undefined;
+                valueToSet?: any;
                 fileData?: {
                     path: string;
                     name: string;
@@ -1030,6 +1035,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 targetKey: string;
                 oldKey?: string | undefined;
                 oldKeys?: string[] | undefined;
+                valueToSet?: any;
                 fileData?: {
                     path: string;
                     name: string;
@@ -1068,6 +1074,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 targetKey: string;
                 oldKey?: string | undefined;
                 oldKeys?: string[] | undefined;
+                valueToSet?: any;
                 fileData?: {
                     path: string;
                     name: string;
@@ -1110,6 +1117,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 targetKey: string;
                 oldKey?: string | undefined;
                 oldKeys?: string[] | undefined;
+                valueToSet?: any;
                 fileData?: {
                     path: string;
                     name: string;
@@ -1259,6 +1267,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 targetKey: string;
                 oldKey?: string | undefined;
                 oldKeys?: string[] | undefined;
+                valueToSet?: any;
                 fileData?: {
                     path: string;
                     name: string;
@@ -1303,6 +1312,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 targetKey: string;
                 oldKey?: string | undefined;
                 oldKeys?: string[] | undefined;
+                valueToSet?: any;
                 fileData?: {
                     path: string;
                     name: string;
@@ -1455,6 +1465,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 targetKey: string;
                 oldKey?: string | undefined;
                 oldKeys?: string[] | undefined;
+                valueToSet?: any;
                 fileData?: {
                     path: string;
                     name: string;
@@ -1506,6 +1517,7 @@ export declare class DataLoader {
                     targetKey: string;
                     oldKey?: string | undefined;
                     oldKeys?: string[] | undefined;
+                    valueToSet?: any;
                     fileData?: {
                         path: string;
                         name: string;
@@ -1655,6 +1667,7 @@ export declare class DataLoader {
                     targetKey: string;
                     oldKey?: string | undefined;
                     oldKeys?: string[] | undefined;
+                    valueToSet?: any;
                     fileData?: {
                         path: string;
                         name: string;
@@ -1726,7 +1739,15 @@ export declare class DataLoader {
     setupMaps(dbId: string): Promise<void>;
     getAllUsers(): Promise<import("node-appwrite").Models.User<import("node-appwrite").Models.Preferences>[]>;
     start(dbId: string): Promise<void>;
-    dealWithMergedUsers(): void;
+    /**
+     * Deals with merged users by iterating through all collections in the configuration.
+     * We have merged users if there are duplicate emails or phones in the import data.
+     * This function will iterate through all collections that are the same name as the
+     * users collection and pull out their primaryKeyField's. It will then loop through
+     * each collection and find any documents that have a
+     *
+     * @return {void} This function does not return anything.
+     */
     updateOldReferencesForNew(): void;
     private writeMapsToJsonFile;
     /**
@@ -1791,6 +1812,7 @@ export declare class DataLoader {
         targetKey: string;
         oldKey?: string | undefined;
         oldKeys?: string[] | undefined;
+        valueToSet?: any;
         fileData?: {
             path: string;
             name: string;
@@ -1812,6 +1834,7 @@ export declare class DataLoader {
         targetKey: string;
         oldKey?: string | undefined;
         oldKeys?: string[] | undefined;
+        valueToSet?: any;
         fileData?: {
             path: string;
             name: string;

package/dist/migrations/dataLoader.js

@@ -348,83 +348,54 @@ export class DataLoader {
             this.writeMapsToJsonFile();
         }
     }
-    dealWithMergedUsers() {
-        const usersCollectionKey = this.getCollectionKey(this.config.usersCollectionName);
-        const usersCollectionPrimaryKeyFields = new Set();
-        if (!this.config.collections) {
-            console.log("No collections found in configuration.");
-            return;
-        }
-        let needsUpdate = false;
-        let numUpdates = 0;
-        // Collect primary key fields from the users collection definitions
-        this.config.collections.forEach((collection) => {
-            if (this.getCollectionKey(collection.name) === usersCollectionKey) {
-                const collectionImportDefs = collection.importDefs;
-                if (!collectionImportDefs || !collectionImportDefs.length) {
-                    return;
-                }
-                collectionImportDefs.forEach((importDef) => {
-                    if (importDef.primaryKeyField) {
-                        usersCollectionPrimaryKeyFields.add(importDef.primaryKeyField);
-                    }
-                });
-            }
-        });
-        console.log(`Primary key fields collected for users collection: ${[
-            ...usersCollectionPrimaryKeyFields,
-        ]}`);
-        // Iterate over all collections to update references based on merged users
-        this.config.collections.forEach((collection) => {
-            const collectionData = this.importMap.get(this.getCollectionKey(collection.name));
-            if (!collectionData || !collectionData.data) {
-                console.log(`No data found for collection ${collection.name}`);
-                return;
-            }
-            const collectionImportDefs = collection.importDefs;
-            if (!collectionImportDefs || !collectionImportDefs.length) {
-                console.log(`No import definitions found for collection ${collection.name}`);
-                return;
-            }
-            collectionImportDefs.forEach((importDef) => {
-                importDef.idMappings?.forEach((idMapping) => {
-                    if (this.getCollectionKey(idMapping.targetCollection) ===
-                        usersCollectionKey) {
-                        const fieldToSetKey = idMapping.fieldToSet || idMapping.sourceField;
-                        const targetFieldKey = idMapping.targetFieldToMatch || idMapping.targetField;
-                        if (usersCollectionPrimaryKeyFields.has(targetFieldKey)) {
-                            console.log(`Processing collection ${collection.name} with target field ${targetFieldKey}`);
-                            // Process each item in the collection
-                            collectionData.data.forEach((item) => {
-                                const oldId = item.finalData[idMapping.sourceField] ||
-                                    item.context[idMapping.sourceField];
-                                if (oldId === undefined || oldId === null) {
-                                    console.log(`Skipping item with undefined or null oldId in collection ${collection.name}`);
-                                    return;
-                                }
-                                const newId = this.mergedUserMap.get(`${oldId}`);
-                                if (newId) {
-                                    needsUpdate = true;
-                                    numUpdates++;
-                                    console.log(`Updating old ID ${oldId} to new ID ${newId} in collection ${collection.name}`);
-                                    // Update context to use new user ID
-                                    item.finalData[fieldToSetKey] = newId;
-                                    item.context[fieldToSetKey] = newId;
-                                }
-                                else {
-                                    console.log(`No new ID found for old ID ${oldId} in mergedUserMap.`);
-                                }
-                            });
-                        }
-                    }
-                });
-            });
-            if (needsUpdate) {
-                console.log(`Updated ${numUpdates} references for collection ${collection.name}`);
-                this.importMap.set(this.getCollectionKey(collection.name), collectionData);
-            }
-        });
-    }
+    /**
+     * Deals with merged users by iterating through all collections in the configuration.
+     * We have merged users if there are duplicate emails or phones in the import data.
+     * This function will iterate through all collections that are the same name as the
+     * users collection and pull out their primaryKeyField's. It will then loop through
+     * each collection and find any documents that have a
+     *
+     * @return {void} This function does not return anything.
+     */
+    // dealWithMergedUsers() {
+    //   const usersCollectionKey = this.getCollectionKey(
+    //     this.config.usersCollectionName
+    //   );
+    //   const usersCollectionData = this.importMap.get(usersCollectionKey);
+    //   if (!this.config.collections) {
+    //     console.log("No collections found in configuration.");
+    //     return;
+    //   }
+    //   let needsUpdate = false;
+    //   let numUpdates = 0;
+    //   for (const collectionConfig of this.config.collections) {
+    //     const collectionKey = this.getCollectionKey(collectionConfig.name);
+    //     const collectionData = this.importMap.get(collectionKey);
+    //     const collectionImportDefs = collectionConfig.importDefs;
+    //     const collectionIdMappings = collectionImportDefs
+    //       .map((importDef) => importDef.idMappings)
+    //       .flat()
+    //       .filter((idMapping) => idMapping !== undefined && idMapping !== null);
+    //     if (!collectionData || !collectionData.data) continue;
+    //     for (const dataItem of collectionData.data) {
+    //       for (const idMapping of collectionIdMappings) {
+    //         // We know it's the users collection here
+    //         if (this.getCollectionKey(idMapping.targetCollection) === usersCollectionKey) {
+    //           const targetFieldKey = idMapping.targetFieldToMatch || idMapping.targetField;
+    //           if (targetFieldKey === )
+    //           const targetValue = dataItem.finalData[targetFieldKey];
+    //           const targetCollectionData = this.importMap.get(this.getCollectionKey(idMapping.targetCollection));
+    //           if (!targetCollectionData || !targetCollectionData.data) continue;
+    //           const foundData = targetCollectionData.data.filter(({ context }) => {
+    //             const targetValue = context[targetFieldKey];
+    //             const isMatch = `${targetValue}` === `${valueToMatch}`;
+    //             return isMatch && targetValue !== undefined && targetValue !== null;
+    //           });
+    //         }
+    //       }
+    //     }
+    //   }
+    // }
     updateOldReferencesForNew() {
         if (!this.config.collections) {
             return;
@@ -491,7 +462,12 @@ export class DataLoader {
                                     else {
                                         // Merge arrays if new data is non-empty array and filter for uniqueness
                                         collectionData.data[i].finalData[fieldToSetKey] = [
-                                            ...new Set([...currentDataFiltered, ...newData].filter((value) => `${value}` !== `${valueToMatch}`)),
+                                            ...new Set([
+                                                ...(Array.isArray(currentDataFiltered)
+                                                    ? currentDataFiltered
+                                                    : [currentDataFiltered]),
+                                                ...newData,
+                                            ].filter((value) => `${value}` !== `${valueToMatch}`)),
                                         ];
                                     }
                                 }

package/dist/migrations/migrationHelper.d.ts

@@ -19,6 +19,7 @@ export declare const ContextObject: z.ZodObject<{
         oldKey: z.ZodOptional<z.ZodString>;
         oldKeys: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
         targetKey: z.ZodString;
+        valueToSet: z.ZodOptional<z.ZodAny>;
         fileData: z.ZodOptional<z.ZodObject<{
             name: z.ZodString;
             path: z.ZodString;
@@ -54,6 +55,7 @@ export declare const ContextObject: z.ZodObject<{
         targetKey: string;
         oldKey?: string | undefined;
         oldKeys?: string[] | undefined;
+        valueToSet?: any;
         fileData?: {
             path: string;
             name: string;
@@ -71,6 +73,7 @@ export declare const ContextObject: z.ZodObject<{
         targetKey: string;
         oldKey?: string | undefined;
         oldKeys?: string[] | undefined;
+        valueToSet?: any;
         fileData?: {
             path: string;
             name: string;
@@ -93,6 +96,7 @@ export declare const ContextObject: z.ZodObject<{
         targetKey: string;
         oldKey?: string | undefined;
         oldKeys?: string[] | undefined;
+        valueToSet?: any;
         fileData?: {
             path: string;
             name: string;
@@ -116,6 +120,7 @@ export declare const ContextObject: z.ZodObject<{
         targetKey: string;
         oldKey?: string | undefined;
         oldKeys?: string[] | undefined;
+        valueToSet?: any;
         fileData?: {
             path: string;
             name: string;

package/dist/migrations/setupDatabase.js

@@ -136,6 +136,9 @@ export const startSetup = async (database, storage, config, setupOptions, appwri
                 await backupDatabase(database, db.$id, storage);
             }
             deletedCollections = await wipeDatabase(database, db.$id);
+            // Add a delay to ensure the deletion process completes
+            await new Promise((resolve) => setTimeout(resolve, 5000));
+            console.log(`Waited a few seconds to let the database wipe complete...`);
         }
         if (processDatabase) {
             await createOrUpdateCollections(database, db.$id, config, deletedCollections);

package/dist/utils/helperFunctions.js

@@ -105,6 +105,7 @@ export const tryAwaitWithRetry = async (createFunction, attemptNum = 0, throwErr
         if (throwError) {
             throw error;
         }
+        console.error("Error during retryAwait function: " + error);
         // @ts-ignore
         return Promise.resolve();
     }

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.52",
+  "version": "0.0.54",
   "main": "src/main.ts",
   "type": "module",
   "repository": {
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@types/inquirer": "^9.0.7",
-    "appwrite-utils": "^0.2.7",
+    "appwrite-utils": "^0.2.8",
     "commander": "^12.0.0",
     "inquirer": "^9.2.20",
     "js-yaml": "^4.1.0",

package/src/migrations/collections.ts

@@ -129,9 +129,7 @@ export const wipeDatabase = async (
   databaseId: string
 ): Promise<{ collectionId: string; collectionName: string }[]> => {
   console.log(`Wiping database: ${databaseId}`);
-  const { collections: existingCollections } = await tryAwaitWithRetry(
-    async () => await database.listCollections(databaseId)
-  );
+  const existingCollections = await fetchAllCollections(databaseId, database);
   let collectionsDeleted: { collectionId: string; collectionName: string }[] =
     [];
   for (const { $id: collectionId, name: name } of existingCollections) {

package/src/migrations/converters.ts

@@ -103,7 +103,9 @@ export const convertObjectByAttributeMappings = (
   };
 
   for (const mapping of attributeMappings) {
-    if (Array.isArray(mapping.oldKeys)) {
+    if (mapping.valueToSet !== undefined) {
+      result[mapping.targetKey] = mapping.valueToSet;
+    } else if (Array.isArray(mapping.oldKeys)) {
       // Collect and flatten values from multiple oldKeys
       const values = mapping.oldKeys
         .map((oldKey) => resolveValue(obj, oldKey))

package/src/migrations/dataLoader.ts

@@ -428,122 +428,57 @@ export class DataLoader {
     }
   }
 
-  dealWithMergedUsers() {
-    const usersCollectionKey = this.getCollectionKey(
-      this.config.usersCollectionName
-    );
-    const usersCollectionPrimaryKeyFields = new Set();
-
-    if (!this.config.collections) {
-      console.log("No collections found in configuration.");
-      return;
-    }
-
-    let needsUpdate = false;
-    let numUpdates = 0;
-
-    // Collect primary key fields from the users collection definitions
-    this.config.collections.forEach((collection) => {
-      if (this.getCollectionKey(collection.name) === usersCollectionKey) {
-        const collectionImportDefs = collection.importDefs;
-        if (!collectionImportDefs || !collectionImportDefs.length) {
-          return;
-        }
-        collectionImportDefs.forEach((importDef) => {
-          if (importDef.primaryKeyField) {
-            usersCollectionPrimaryKeyFields.add(importDef.primaryKeyField);
-          }
-        });
-      }
-    });
-
-    console.log(
-      `Primary key fields collected for users collection: ${[
-        ...usersCollectionPrimaryKeyFields,
-      ]}`
-    );
-
-    // Iterate over all collections to update references based on merged users
-    this.config.collections.forEach((collection) => {
-      const collectionData = this.importMap.get(
-        this.getCollectionKey(collection.name)
-      );
-
-      if (!collectionData || !collectionData.data) {
-        console.log(`No data found for collection ${collection.name}`);
-        return;
-      }
-
-      const collectionImportDefs = collection.importDefs;
-      if (!collectionImportDefs || !collectionImportDefs.length) {
-        console.log(
-          `No import definitions found for collection ${collection.name}`
-        );
-        return;
-      }
-
-      collectionImportDefs.forEach((importDef) => {
-        importDef.idMappings?.forEach((idMapping) => {
-          if (
-            this.getCollectionKey(idMapping.targetCollection) ===
-            usersCollectionKey
-          ) {
-            const fieldToSetKey = idMapping.fieldToSet || idMapping.sourceField;
-            const targetFieldKey =
-              idMapping.targetFieldToMatch || idMapping.targetField;
-
-            if (usersCollectionPrimaryKeyFields.has(targetFieldKey)) {
-              console.log(
-                `Processing collection ${collection.name} with target field ${targetFieldKey}`
-              );
-
-              // Process each item in the collection
-              collectionData.data.forEach((item) => {
-                const oldId =
-                  item.finalData[idMapping.sourceField] ||
-                  item.context[idMapping.sourceField];
-
-                if (oldId === undefined || oldId === null) {
-                  console.log(
-                    `Skipping item with undefined or null oldId in collection ${collection.name}`
-                  );
-                  return;
-                }
-
-                const newId = this.mergedUserMap.get(`${oldId}`);
-
-                if (newId) {
-                  needsUpdate = true;
-                  numUpdates++;
-                  console.log(
-                    `Updating old ID ${oldId} to new ID ${newId} in collection ${collection.name}`
-                  );
-
-                  // Update context to use new user ID
-                  item.finalData[fieldToSetKey] = newId;
-                  item.context[fieldToSetKey] = newId;
-                } else {
-                  console.log(
-                    `No new ID found for old ID ${oldId} in mergedUserMap.`
-                  );
-                }
-              });
-            }
-          }
-        });
-      });
-
-      if (needsUpdate) {
-        console.log(
-          `Updated ${numUpdates} references for collection ${collection.name}`
-        );
-        this.importMap.set(
-          this.getCollectionKey(collection.name),
-          collectionData
-        );
-      }
-    });
-  }
+  /**
+   * Deals with merged users by iterating through all collections in the configuration.
+   * We have merged users if there are duplicate emails or phones in the import data.
+   * This function will iterate through all collections that are the same name as the
+   * users collection and pull out their primaryKeyField's. It will then loop through
+   * each collection and find any documents that have a
+   *
+   * @return {void} This function does not return anything.
+   */
+  // dealWithMergedUsers() {
+  //   const usersCollectionKey = this.getCollectionKey(
+  //     this.config.usersCollectionName
+  //   );
+  //   const usersCollectionData = this.importMap.get(usersCollectionKey);
+
+  //   if (!this.config.collections) {
+  //     console.log("No collections found in configuration.");
+  //     return;
+  //   }
+
+  //   let needsUpdate = false;
+  //   let numUpdates = 0;
+
+  //   for (const collectionConfig of this.config.collections) {
+  //     const collectionKey = this.getCollectionKey(collectionConfig.name);
+  //     const collectionData = this.importMap.get(collectionKey);
+  //     const collectionImportDefs = collectionConfig.importDefs;
+  //     const collectionIdMappings = collectionImportDefs
+  //       .map((importDef) => importDef.idMappings)
+  //       .flat()
+  //       .filter((idMapping) => idMapping !== undefined && idMapping !== null);
+  //     if (!collectionData || !collectionData.data) continue;
+  //     for (const dataItem of collectionData.data) {
+  //       for (const idMapping of collectionIdMappings) {
+  //         // We know it's the users collection here
+  //         if (this.getCollectionKey(idMapping.targetCollection) === usersCollectionKey) {
+  //           const targetFieldKey = idMapping.targetFieldToMatch || idMapping.targetField;
+  //           if (targetFieldKey === )
+  //           const targetValue = dataItem.finalData[targetFieldKey];
+  //           const targetCollectionData = this.importMap.get(this.getCollectionKey(idMapping.targetCollection));
+  //           if (!targetCollectionData || !targetCollectionData.data) continue;
+  //           const foundData = targetCollectionData.data.filter(({ context }) => {
+  //             const targetValue = context[targetFieldKey];
+  //             const isMatch = `${targetValue}` === `${valueToMatch}`;
+  //             return isMatch && targetValue !== undefined && targetValue !== null;
+  //           });
+  //         }
+  //       }
+  //     }
+  //   }
+  // }
 
   updateOldReferencesForNew() {
     if (!this.config.collections) {
@@ -655,7 +590,12 @@ export class DataLoader {
                     // Merge arrays if new data is non-empty array and filter for uniqueness
                     collectionData.data[i].finalData[fieldToSetKey] = [
                       ...new Set(
-                        [...currentDataFiltered, ...newData].filter(
+                        [
+                          ...(Array.isArray(currentDataFiltered)
+                            ? currentDataFiltered
+                            : [currentDataFiltered]),
+                          ...newData,
+                        ].filter(
                           (value: any) => `${value}` !== `${valueToMatch}`
                         )
                       ),

package/src/migrations/setupDatabase.ts

@@ -216,6 +216,9 @@ export const startSetup = async (
         await backupDatabase(database, db.$id, storage);
       }
       deletedCollections = await wipeDatabase(database, db.$id);
+      // Add a delay to ensure the deletion process completes
+      await new Promise((resolve) => setTimeout(resolve, 5000));
+      console.log(`Waited a few seconds to let the database wipe complete...`);
     }
 
     if (processDatabase) {

package/src/utils/helperFunctions.ts

@@ -163,6 +163,7 @@ export const tryAwaitWithRetry = async <T>(
     if (throwError) {
       throw error;
     }
+    console.error("Error during retryAwait function: " + error);
     // @ts-ignore
     return Promise.resolve();
   }