appwrite-utils-cli 0.0.13 → 0.0.14

package/dist/migrations/afterImportActions.js

@@ -2,6 +2,7 @@ import { Databases, Storage, InputFile, Query, ID, Client, } from "node-appwrite
 import path from "path";
 import fs from "fs";
 import os from "os";
+import { logger } from "./logging.js";
 const getDatabaseFromConfig = (config) => {
     if (!config.appwriteClient) {
         config.appwriteClient = new Client()
@@ -307,6 +308,7 @@ export const afterImportActions = {
             }
         }
         catch (error) {
+            logger.error(`Error creating file and updating field, params were:\ndbId: ${dbId}, collId: ${collId}, docId: ${docId}, fieldName: ${fieldName}, filePath: ${filePath}, fileName: ${fileName}\n\nError: ${error}`);
             console.error("Error creating file and updating field: ", error);
             console.log(`Params were: dbId: ${dbId}, collId: ${collId}, docId: ${docId}, fieldName: ${fieldName}, filePath: ${filePath}, fileName: ${fileName}`);
         }

package/dist/migrations/importController.js

@@ -346,7 +346,8 @@ export class ImportController {
                 const actionOperation = ContextObject.parse(JSON.parse(batch.data));
                 const { context, finalItem, attributeMappings } = actionOperation;
                 if (finalItem.$id && !context.docId) {
-                    context.docId = finalItem.$id;
+                    context.docId =
+                        finalItem.$id || context.createdDoc.$id || context.$id || undefined;
                     logger.info(`Setting docId to ${finalItem.$id} because docId not found in context, batch ${batch.$id}, context is ${JSON.stringify(context)}`);
                 }
                 try {

package/dist/migrations/importDataActions.js

@@ -58,7 +58,6 @@ export class ImportDataActions {
         const convertedItem = convertObjectBySchema(item, conversionSchema);
         // Merge the converted item back into the original item object
         Object.assign(item, convertedItem);
-        console.log("Converted item:", item);
         return item;
     }
     /**
@@ -73,7 +72,6 @@ export class ImportDataActions {
             if (!validationActions ||
                 !Array.isArray(validationActions) ||
                 !validationActions.length) {
-                console.warn("No validation actions defined for the item, assuming true");
                 return true; // Assume items without validation actions as valid.
             }
             for (const ruleDef of validationActions) {
@@ -137,7 +135,7 @@ export class ImportDataActions {
                 await actionMethod(this.config, ...resolvedParams);
             }
             catch (error) {
-                logger.error(`Error executing action '${actionName}':`, error);
+                logger.error(`Error executing action '${actionName}' with context:`, context, error);
                 throw new Error(`Execution failed for action '${actionName}': ${error.message}`);
             }
         }

package/dist/migrations/users.js

@@ -40,7 +40,6 @@ export class UsersController {
         }
     }
     async createUserAndReturn(item) {
-        console.log("Creating user with item", item);
         // Attempt to find an existing user by email or phone.
         let foundUsers = [];
         if (item.email) {
@@ -59,13 +58,11 @@ export class UsersController {
         }
         let userToReturn = foundUsers[0] || undefined;
         if (!userToReturn) {
-            console.log("Creating user cause not found");
             userToReturn = await this.users.create(item.userId || ID.unique(), item.email || undefined, item.phone && item.phone.length < 15 && item.phone.startsWith("+")
                 ? item.phone
                 : undefined, item.password?.toLowerCase() || `changeMe${item.email}`.toLowerCase(), item.name || undefined);
         }
         else {
-            console.log("Updating user cause found");
             // Update user details as necessary, ensuring email uniqueness if attempting an update.
             if (item.email &&
                 item.email !== userToReturn.email &&

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

package/src/migrations/afterImportActions.ts

@@ -11,6 +11,7 @@ import type { AppwriteConfig } from "./schema.js";
 import path from "path";
 import fs from "fs";
 import os from "os";
+import { logger } from "./logging.js";
 
 const getDatabaseFromConfig = (config: AppwriteConfig) => {
   if (!config.appwriteClient) {
@@ -481,6 +482,9 @@ export const afterImportActions = {
         console.log("Created file from path: ", file.$id);
       }
     } catch (error) {
+      logger.error(
+        `Error creating file and updating field, params were:\ndbId: ${dbId}, collId: ${collId}, docId: ${docId}, fieldName: ${fieldName}, filePath: ${filePath}, fileName: ${fileName}\n\nError: ${error}`
+      );
       console.error("Error creating file and updating field: ", error);
       console.log(
         `Params were: dbId: ${dbId}, collId: ${collId}, docId: ${docId}, fieldName: ${fieldName}, filePath: ${filePath}, fileName: ${fileName}`

package/src/migrations/importController.ts

@@ -548,7 +548,8 @@ export class ImportController {
         const actionOperation = ContextObject.parse(JSON.parse(batch.data));
         const { context, finalItem, attributeMappings } = actionOperation;
         if (finalItem.$id && !context.docId) {
-          context.docId = finalItem.$id;
+          context.docId =
+            finalItem.$id || context.createdDoc.$id || context.$id || undefined;
           logger.info(
             `Setting docId to ${
               finalItem.$id

package/src/migrations/importDataActions.ts

@@ -92,7 +92,6 @@ export class ImportDataActions {
     const convertedItem = convertObjectBySchema(item, conversionSchema);
     // Merge the converted item back into the original item object
     Object.assign(item, convertedItem);
-    console.log("Converted item:", item);
     return item;
   }
 
@@ -114,9 +113,6 @@ export class ImportDataActions {
         !Array.isArray(validationActions) ||
         !validationActions.length
       ) {
-        console.warn(
-          "No validation actions defined for the item, assuming true"
-        );
         return true; // Assume items without validation actions as valid.
       }
       for (const ruleDef of validationActions) {
@@ -223,7 +219,11 @@ export class ImportDataActions {
         );
         await (actionMethod as any)(this.config, ...resolvedParams);
       } catch (error: any) {
-        logger.error(`Error executing action '${actionName}':`, error);
+        logger.error(
+          `Error executing action '${actionName}' with context:`,
+          context,
+          error
+        );
         throw new Error(
           `Execution failed for action '${actionName}': ${error.message}`
         );

package/src/migrations/users.ts

@@ -49,8 +49,6 @@ export class UsersController {
   }
 
   async createUserAndReturn(item: AuthUserCreate) {
-    console.log("Creating user with item", item);
-
     // Attempt to find an existing user by email or phone.
     let foundUsers: Models.User<Models.Preferences>[] = [];
     if (item.email) {
@@ -71,7 +69,6 @@ export class UsersController {
     let userToReturn = foundUsers[0] || undefined;
 
     if (!userToReturn) {
-      console.log("Creating user cause not found");
       userToReturn = await this.users.create(
         item.userId || ID.unique(),
         item.email || undefined,
@@ -82,7 +79,6 @@ export class UsersController {
         item.name || undefined
       );
     } else {
-      console.log("Updating user cause found");
       // Update user details as necessary, ensuring email uniqueness if attempting an update.
       if (
         item.email &&