appwrite-utils-cli 0.0.43 → 0.0.45

package/dist/migrations/importController.js

@@ -154,20 +154,26 @@ export class ImportController {
                 const batches = dataSplit[i];
                 console.log(`Processing batch ${i + 1} of ${dataSplit.length}`);
                 const batchPromises = batches.map((item) => {
-                    const id = item.finalData.docId ||
-                        item.finalData.userId ||
-                        item.context.docId ||
-                        item.context.userId;
-                    if (item.finalData.hasOwnProperty("userId")) {
-                        delete item.finalData.userId;
-                    }
-                    if (item.finalData.hasOwnProperty("docId")) {
-                        delete item.finalData.docId;
+                    try {
+                        const id = item.finalData.docId ||
+                            item.finalData.userId ||
+                            item.context.docId ||
+                            item.context.userId;
+                        if (item.finalData.hasOwnProperty("userId")) {
+                            delete item.finalData.userId;
+                        }
+                        if (item.finalData.hasOwnProperty("docId")) {
+                            delete item.finalData.docId;
+                        }
+                        if (!item.finalData) {
+                            return Promise.resolve();
+                        }
+                        return tryAwaitWithRetry(async () => await this.database.createDocument(db.$id, collection.$id, id, item.finalData));
                     }
-                    if (!item.finalData) {
+                    catch (error) {
+                        console.error(error);
                         return Promise.resolve();
                     }
-                    return tryAwaitWithRetry(async () => await this.database.createDocument(db.$id, collection.$id, id, item.finalData));
                 });
                 // Wait for all promises in the current batch to resolve
                 await Promise.all(batchPromises);

package/dist/utils/helperFunctions.d.ts

@@ -43,4 +43,4 @@ export declare let numTimesFailedTotal: number;
  * @param {number} [attemptNum=0] - The number of attempts made so far (default: 0).
  * @return {Promise<any>} - A promise that resolves to the result of the createFunction or rejects with an error if it fails after 5 attempts.
  */
-export declare const tryAwaitWithRetry: <T>(createFunction: () => Promise<T>, attemptNum?: number) => Promise<T>;
+export declare const tryAwaitWithRetry: <T>(createFunction: () => Promise<T>, attemptNum?: number, throwError?: boolean) => Promise<T>;

package/dist/utils/helperFunctions.js

@@ -87,7 +87,7 @@ export let numTimesFailedTotal = 0;
  * @param {number} [attemptNum=0] - The number of attempts made so far (default: 0).
  * @return {Promise<any>} - A promise that resolves to the result of the createFunction or rejects with an error if it fails after 5 attempts.
  */
-export const tryAwaitWithRetry = async (createFunction, attemptNum = 0) => {
+export const tryAwaitWithRetry = async (createFunction, attemptNum = 0, throwError = false) => {
     try {
         return await createFunction();
     }
@@ -102,6 +102,10 @@ export const tryAwaitWithRetry = async (createFunction, attemptNum = 0) => {
             }
             return tryAwaitWithRetry(createFunction, attemptNum + 1);
         }
-        throw error;
+        if (throwError) {
+            throw 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.43",
+  "version": "0.0.45",
   "main": "src/main.ts",
   "type": "module",
   "repository": {

package/src/migrations/importController.ts

@@ -220,29 +220,34 @@ export class ImportController {
         const batches = dataSplit[i];
         console.log(`Processing batch ${i + 1} of ${dataSplit.length}`);
         const batchPromises = batches.map((item) => {
-          const id =
-            item.finalData.docId ||
-            item.finalData.userId ||
-            item.context.docId ||
-            item.context.userId;
-          if (item.finalData.hasOwnProperty("userId")) {
-            delete item.finalData.userId;
-          }
-          if (item.finalData.hasOwnProperty("docId")) {
-            delete item.finalData.docId;
-          }
-          if (!item.finalData) {
+          try {
+            const id =
+              item.finalData.docId ||
+              item.finalData.userId ||
+              item.context.docId ||
+              item.context.userId;
+            if (item.finalData.hasOwnProperty("userId")) {
+              delete item.finalData.userId;
+            }
+            if (item.finalData.hasOwnProperty("docId")) {
+              delete item.finalData.docId;
+            }
+            if (!item.finalData) {
+              return Promise.resolve();
+            }
+            return tryAwaitWithRetry(
+              async () =>
+                await this.database.createDocument(
+                  db.$id,
+                  collection.$id,
+                  id,
+                  item.finalData
+                )
+            );
+          } catch (error) {
+            console.error(error);
             return Promise.resolve();
           }
-          return tryAwaitWithRetry(
-            async () =>
-              await this.database.createDocument(
-                db.$id,
-                collection.$id,
-                id,
-                item.finalData
-              )
-          );
         });
         // Wait for all promises in the current batch to resolve
         await Promise.all(batchPromises);

package/src/utils/helperFunctions.ts

@@ -137,7 +137,8 @@ export let numTimesFailedTotal = 0;
  */
 export const tryAwaitWithRetry = async <T>(
   createFunction: () => Promise<T>,
-  attemptNum: number = 0
+  attemptNum: number = 0,
+  throwError: boolean = false
 ): Promise<T> => {
   try {
     return await createFunction();
@@ -154,6 +155,10 @@ export const tryAwaitWithRetry = async <T>(
       }
       return tryAwaitWithRetry(createFunction, attemptNum + 1);
     }
-    throw error;
+    if (throwError) {
+      throw error;
+    }
+    // @ts-ignore
+    return Promise.resolve();
   }
 };