appwrite-utils-cli 0.0.9 → 0.0.11

package/dist/migrations/importController.js

@@ -151,7 +151,7 @@ export class ImportController {
     async processBatch(db, collection, importDef, dataToImport, updateDefs = [], isMembersCollection = false) {
         for (let i = 0; i < dataToImport.length; i += this.batchLimit) {
             const batch = dataToImport.slice(i, i + this.batchLimit);
-            const results = await Promise.allSettled(batch.map(async (item) => {
+            batch.map(async (item) => {
                 let context = this.createContext(db, collection, item);
                 let finalItem = await this.transformData(item, importDef.attributeMappings);
                 let createIdToUse = undefined;
@@ -232,13 +232,13 @@ export class ImportController {
                     //   attributeMappings: attributeMappingsWithActions,
                     // });
                 }
-            }));
-            results.forEach((result) => {
-                if (result.status === "rejected") {
-                    console.error("A process batch promise was rejected:", result.reason);
-                    logger.error("An error occurred during creation: ", result.reason);
-                }
             });
+            // results.forEach((result) => {
+            //   if (result.status === "rejected") {
+            //     console.error("A process batch promise was rejected:", result.reason);
+            //     logger.error("An error occurred during creation: ", result.reason);
+            //   }
+            // });
         }
     }
     async handleCreate(context, finalItem, updateDefs, id) {

package/dist/migrations/migrationHelper.d.ts

@@ -1,5 +1,4 @@
 import { type Databases } from "node-appwrite";
-import { type Operation } from "./backup.js";
 import { z } from "zod";
 /**
  * Object that contains the context for an action that needs to be executed after import
@@ -136,7 +135,7 @@ export declare const ContextObject: z.ZodObject<{
 }>;
 export type ContextObject = z.infer<typeof ContextObject>;
 export declare const createOrFindAfterImportOperation: (database: Databases, collectionId: string, context: ContextObject) => Promise<void>;
-export declare const addBatch: (database: Databases, operation: Operation, data: string) => Promise<string>;
+export declare const addBatch: (database: Databases, data: string) => Promise<string>;
 export declare const getAfterImportOperations: (database: Databases, collectionId: string) => Promise<{
     error: string;
     status: "error" | "pending" | "ready" | "in_progress" | "completed" | "cancelled";

package/dist/migrations/migrationHelper.js

@@ -29,19 +29,16 @@ export const createOrFindAfterImportOperation = async (database, collectionId, c
     // Directly create a new batch for the context without checking for an existing batch
     const contextData = JSON.stringify(context);
     // Create a new batch with the contextData
-    const newBatchId = await addBatch(database, operation, contextData);
+    const newBatchId = await addBatch(database, contextData);
     // Update the operation with the new batch's $id
-    operation.batches.push(newBatchId);
+    operation.batches = [...operation.batches, newBatchId];
     await database.updateDocument("migrations", "currentOperations", operation.$id, { batches: operation.batches });
 };
-export const addBatch = async (database, operation, data) => {
+export const addBatch = async (database, data) => {
     const batch = await database.createDocument("migrations", "batches", ID.unique(), {
         data,
         processed: false,
     });
-    await database.updateDocument("migrations", "currentOperations", operation.$id, {
-        batches: [...(operation.batches || []), batch.$id],
-    });
     return batch.$id;
 };
 export const getAfterImportOperations = async (database, collectionId) => {

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

package/src/migrations/importController.ts

@@ -258,147 +258,145 @@ export class ImportController {
   ) {
     for (let i = 0; i < dataToImport.length; i += this.batchLimit) {
       const batch = dataToImport.slice(i, i + this.batchLimit);
-      const results = await Promise.allSettled(
-        batch.map(async (item: any) => {
-          let context = this.createContext(db, collection, item);
-          let finalItem = await this.transformData(
-            item,
-            importDef.attributeMappings
+      batch.map(async (item: any) => {
+        let context = this.createContext(db, collection, item);
+        let finalItem = await this.transformData(
+          item,
+          importDef.attributeMappings
+        );
+        let createIdToUse: string | undefined = undefined;
+        let associatedDoc: Models.Document | undefined;
+        if (
+          isMembersCollection &&
+          (finalItem.hasOwnProperty("email") || item.hasOwnProperty("phone"))
+        ) {
+          console.log("Found members collection, creating user...");
+          const usersController = new UsersController(
+            this.config,
+            this.database
           );
-          let createIdToUse: string | undefined = undefined;
-          let associatedDoc: Models.Document | undefined;
-          if (
-            isMembersCollection &&
-            (finalItem.hasOwnProperty("email") || item.hasOwnProperty("phone"))
-          ) {
-            console.log("Found members collection, creating user...");
-            const usersController = new UsersController(
-              this.config,
-              this.database
-            );
-            const userToCreate = AuthUserCreateSchema.safeParse({
-              ...finalItem,
-            });
-            if (!userToCreate.success) {
-              console.error(userToCreate.error);
-              logger.error(userToCreate.error);
-              return;
-            }
-            const user = await usersController.createUserAndReturn(
-              userToCreate.data
-            );
-            createIdToUse = user.$id;
-            context.docId = createIdToUse;
-            context = { ...context, ...user };
-            console.log(
-              "Created user, deleting keys in finalItem that exist in user..."
-            );
-            const associatedDocFound = await this.database.listDocuments(
-              db.$id,
-              context.collId,
-              [Query.equal("$id", createIdToUse)]
-            );
-            if (associatedDocFound.documents.length > 0) {
-              associatedDoc = associatedDocFound.documents[0];
-            }
-            // Delete keys in finalItem that also exist in user
-            let deletedKeys: string[] = [];
-            Object.keys(finalItem).forEach((key) => {
-              if (user.hasOwnProperty(key)) {
-                delete finalItem[key];
-                deletedKeys.push(key);
-              }
-            });
-            console.log(
-              `Set createIdToUse to ${createIdToUse}. Deleted keys: ${deletedKeys.join(
-                ", "
-              )}.`
-            );
-          } else if (isMembersCollection) {
-            logger.error(
-              `Skipping user & contact creation for ${item} due to lack of email...`
-            );
+          const userToCreate = AuthUserCreateSchema.safeParse({
+            ...finalItem,
+          });
+          if (!userToCreate.success) {
+            console.error(userToCreate.error);
+            logger.error(userToCreate.error);
+            return;
           }
+          const user = await usersController.createUserAndReturn(
+            userToCreate.data
+          );
+          createIdToUse = user.$id;
+          context.docId = createIdToUse;
+          context = { ...context, ...user };
+          console.log(
+            "Created user, deleting keys in finalItem that exist in user..."
+          );
+          const associatedDocFound = await this.database.listDocuments(
+            db.$id,
+            context.collId,
+            [Query.equal("$id", createIdToUse)]
+          );
+          if (associatedDocFound.documents.length > 0) {
+            associatedDoc = associatedDocFound.documents[0];
+          }
+          // Delete keys in finalItem that also exist in user
+          let deletedKeys: string[] = [];
+          Object.keys(finalItem).forEach((key) => {
+            if (user.hasOwnProperty(key)) {
+              delete finalItem[key];
+              deletedKeys.push(key);
+            }
+          });
+          console.log(
+            `Set createIdToUse to ${createIdToUse}. Deleted keys: ${deletedKeys.join(
+              ", "
+            )}.`
+          );
+        } else if (isMembersCollection) {
+          logger.error(
+            `Skipping user & contact creation for ${item} due to lack of email...`
+          );
+        }
 
-          context = { ...context, ...finalItem };
+        context = { ...context, ...finalItem };
 
-          if (
-            !(await this.importDataActions.validateItem(
-              finalItem,
-              importDef.attributeMappings,
-              context
-            ))
-          ) {
-            console.error("Validation failed for item:", finalItem);
-            return;
-          }
+        if (
+          !(await this.importDataActions.validateItem(
+            finalItem,
+            importDef.attributeMappings,
+            context
+          ))
+        ) {
+          console.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;
-            }
-            logger.info(`Handled create for ${context.docId}}`);
-          } else {
-            const updatedContext = await this.handleUpdate(
-              context,
-              finalItem,
-              importDef
-            );
-            if (updatedContext) {
-              afterContext = updatedContext;
-            }
-            logger.info(`Handled update for ${context.docId}`);
-          }
-          if (afterContext) {
-            context = { ...context, ...afterContext };
+        let afterContext;
+        if (
+          (importDef.type === "create" || !importDef.type) &&
+          !associatedDoc
+        ) {
+          const createdContext = await this.handleCreate(
+            context,
+            finalItem,
+            updateDefs,
+            createIdToUse
+          );
+          if (createdContext) {
+            afterContext = createdContext;
           }
-          const afterImportActionContext = structuredClone(context);
-          const attributeMappingsWithActions =
-            this.getAttributeMappingsWithActions(
-              importDef.attributeMappings,
-              context,
-              finalItem
-            );
-          if (attributeMappingsWithActions.some((m) => m.postImportActions)) {
-            logger.info(
-              `Pushing to post-import actions queue for ${context.docId}`
-            );
-            const afterImportOperationContext = ContextObject.parse({
-              dbId: db.$id,
-              collectionId: collection.$id,
-              finalItem: finalItem,
-              attributeMappings: attributeMappingsWithActions,
-              context: afterImportActionContext,
-            });
-            await createOrFindAfterImportOperation(
-              this.database,
-              context.collId,
-              afterImportOperationContext
-            );
-            // this.postImportActionsQueue.push({
-            //   context: afterImportActionContext,
-            //   finalItem: finalItem,
-            //   attributeMappings: attributeMappingsWithActions,
-            // });
+          logger.info(`Handled create for ${context.docId}}`);
+        } else {
+          const updatedContext = await this.handleUpdate(
+            context,
+            finalItem,
+            importDef
+          );
+          if (updatedContext) {
+            afterContext = updatedContext;
           }
-        })
-      );
-      results.forEach((result) => {
-        if (result.status === "rejected") {
-          console.error("A process batch promise was rejected:", result.reason);
-          logger.error("An error occurred during creation: ", result.reason);
+          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)) {
+          logger.info(
+            `Pushing to post-import actions queue for ${context.docId}`
+          );
+          const afterImportOperationContext = ContextObject.parse({
+            dbId: db.$id,
+            collectionId: collection.$id,
+            finalItem: finalItem,
+            attributeMappings: attributeMappingsWithActions,
+            context: afterImportActionContext,
+          });
+          await createOrFindAfterImportOperation(
+            this.database,
+            context.collId,
+            afterImportOperationContext
+          );
+          // this.postImportActionsQueue.push({
+          //   context: afterImportActionContext,
+          //   finalItem: finalItem,
+          //   attributeMappings: attributeMappingsWithActions,
+          // });
         }
       });
+      // results.forEach((result) => {
+      //   if (result.status === "rejected") {
+      //     console.error("A process batch promise was rejected:", result.reason);
+      //     logger.error("An error occurred during creation: ", result.reason);
+      //   }
+      // });
     }
   }
 

package/src/migrations/migrationHelper.ts

@@ -42,9 +42,9 @@ export const createOrFindAfterImportOperation = async (
   // Directly create a new batch for the context without checking for an existing batch
   const contextData = JSON.stringify(context);
   // Create a new batch with the contextData
-  const newBatchId = await addBatch(database, operation, contextData);
+  const newBatchId = await addBatch(database, contextData);
   // Update the operation with the new batch's $id
-  operation.batches.push(newBatchId);
+  operation.batches = [...operation.batches, newBatchId];
   await database.updateDocument(
     "migrations",
     "currentOperations",
@@ -53,11 +53,7 @@ export const createOrFindAfterImportOperation = async (
   );
 };
 
-export const addBatch = async (
-  database: Databases,
-  operation: Operation,
-  data: string
-) => {
+export const addBatch = async (database: Databases, data: string) => {
   const batch = await database.createDocument(
     "migrations",
     "batches",
@@ -67,14 +63,6 @@ export const addBatch = async (
       processed: false,
     }
   );
-  await database.updateDocument(
-    "migrations",
-    "currentOperations",
-    operation.$id,
-    {
-      batches: [...(operation.batches || []), batch.$id],
-    }
-  );
   return batch.$id;
 };