appwrite-utils-cli 0.0.10 → 0.0.12

package/dist/migrations/importController.js

@@ -119,8 +119,8 @@ export class ImportController {
                 continue;
             console.log(`Processing update definitions for collection ID: ${collection.$id}`);
             await this.processBatch(db, collection, importDef, dataToImport);
+            await setAllPendingAfterImportActionsToReady(this.database, db.$id, collection.$id);
         }
-        await setAllPendingAfterImportActionsToReady(this.database, db.$id, collection.$id);
     }
     async loadData(importDef) {
         const filePath = path.resolve(this.appwriteFolderPath, importDef.filePath);
@@ -191,29 +191,23 @@ export class ImportController {
                     logger.error(`Skipping user & contact creation for ${item} due to lack of email...`);
                 }
                 context = { ...context, ...finalItem };
-                if (!(await this.importDataActions.validateItem(finalItem, importDef.attributeMappings, context))) {
+                const validated = await this.importDataActions.validateItem(finalItem, importDef.attributeMappings, context);
+                if (!validated) {
                     console.error("Validation failed for item:", finalItem);
+                    logger.error("Validation failed for item:", finalItem);
                     return;
                 }
-                let afterContext;
                 if ((importDef.type === "create" || !importDef.type) &&
                     !associatedDoc) {
                     const createdContext = await this.handleCreate(context, finalItem, updateDefs, createIdToUse);
-                    if (createdContext) {
-                        afterContext = createdContext;
-                    }
+                    context = { ...context, ...createdContext };
                     logger.info(`Handled create for ${context.docId}}`);
                 }
                 else {
                     const updatedContext = await this.handleUpdate(context, finalItem, importDef);
-                    if (updatedContext) {
-                        afterContext = updatedContext;
-                    }
+                    context = { ...context, ...updatedContext };
                     logger.info(`Handled update for ${context.docId}`);
                 }
-                if (afterContext) {
-                    context = { ...context, ...afterContext };
-                }
                 const afterImportActionContext = structuredClone(context);
                 const attributeMappingsWithActions = this.getAttributeMappingsWithActions(importDef.attributeMappings, context, finalItem);
                 if (attributeMappingsWithActions.some((m) => m.postImportActions)) {
@@ -364,10 +358,6 @@ export class ImportController {
                     await this.importDataActions.executeAfterImportActions(finalItem, attributeMappings, context);
                     // Mark batch as processed
                     await this.database.deleteDocument("migrations", "batches", batch.$id);
-                    await updateOperation(this.database, operation.$id, {
-                        status: "completed",
-                        batches: [],
-                    });
                 }
                 catch (error) {
                     logger.error(`Failed to execute batch ${batch.$id}:`, error);

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

package/src/migrations/importController.ts

@@ -113,7 +113,6 @@ export class ImportController {
   async importCollections(db: ConfigDatabase) {
     const maxParallel = 3; // Maximum number of collections to process in parallel
     let activePromises: Promise<void>[] = []; // Array to keep track of active promises
-
     for (const collection of this.config.collections) {
       // Function that returns a promise for processing a single collection
       const processCollection = async (col: ConfigCollection) => {
@@ -200,13 +199,12 @@ export class ImportController {
         `Processing update definitions for collection ID: ${collection.$id}`
       );
       await this.processBatch(db, collection, importDef, dataToImport);
+      await setAllPendingAfterImportActionsToReady(
+        this.database,
+        db.$id,
+        collection.$id
+      );
     }
-
-    await setAllPendingAfterImportActionsToReady(
-      this.database,
-      db.$id,
-      collection.$id
-    );
   }
 
   async loadData(importDef: ImportDef): Promise<any[]> {
@@ -321,19 +319,17 @@ export class ImportController {
           }
 
           context = { ...context, ...finalItem };
-
-          if (
-            !(await this.importDataActions.validateItem(
-              finalItem,
-              importDef.attributeMappings,
-              context
-            ))
-          ) {
+          const validated = await this.importDataActions.validateItem(
+            finalItem,
+            importDef.attributeMappings,
+            context
+          );
+          if (!validated) {
             console.error("Validation failed for item:", finalItem);
+            logger.error("Validation failed for item:", finalItem);
             return;
           }
 
-          let afterContext;
           if (
             (importDef.type === "create" || !importDef.type) &&
             !associatedDoc
@@ -344,9 +340,7 @@ export class ImportController {
               updateDefs,
               createIdToUse
             );
-            if (createdContext) {
-              afterContext = createdContext;
-            }
+            context = { ...context, ...createdContext };
             logger.info(`Handled create for ${context.docId}}`);
           } else {
             const updatedContext = await this.handleUpdate(
@@ -354,14 +348,9 @@ export class ImportController {
               finalItem,
               importDef
             );
-            if (updatedContext) {
-              afterContext = updatedContext;
-            }
+            context = { ...context, ...updatedContext };
             logger.info(`Handled update for ${context.docId}`);
           }
-          if (afterContext) {
-            context = { ...context, ...afterContext };
-          }
           const afterImportActionContext = structuredClone(context);
           const attributeMappingsWithActions =
             this.getAttributeMappingsWithActions(
@@ -586,10 +575,6 @@ export class ImportController {
             "batches",
             batch.$id
           );
-          await updateOperation(this.database, operation.$id, {
-            status: "completed",
-            batches: [],
-          });
         } catch (error) {
           logger.error(`Failed to execute batch ${batch.$id}:`, error);
         }