appwrite-utils-cli 0.10.2 → 0.10.4

package/README.md

@@ -147,6 +147,8 @@ This updated CLI ensures that developers have robust tools at their fingertips t
 
 ## Changelog
 
+- 0.10.04: Fixed stupid progress bar not updating -- also fixed double text
+- 0.10.03: Fixed `syncDb` to push the configurations properly, accidentally hurt it during `synchronizeConfigurations`
 - 0.10.02: Updated `wipeCollection` to handle errors gracefully
 - 0.10.01: Fixed `predeployCommands` to work
 - 0.10.001: Updated `deployFunction` to not updateConfig if it's already present

package/dist/functions/deployments.js

@@ -47,25 +47,33 @@ export const deployFunction = async (client, functionId, codePath, activate = tr
     const fileObject = InputFile.fromBuffer(new Uint8Array(fileBuffer), `function-${functionId}.tar.gz`);
     try {
         console.log(chalk.blue("🚀 Creating deployment..."));
+        // Start with 1 as default total since we don't know the chunk size yet
         progressBar.start(1, 0);
         const functionResponse = await functions.createDeployment(functionId, fileObject, activate, entrypoint, commands, (progress) => {
             const chunks = progress.chunksUploaded;
             const total = progress.chunksTotal;
-            if (chunks !== undefined && total) {
-                if (chunks === 0 && total !== 0) {
-                    progressBar.start(total, 0);
+            if (chunks !== undefined && total !== undefined) {
+                // First chunk, initialize the bar with correct total
+                if (chunks === 0) {
+                    progressBar.start(total || 100, 0);
                 }
                 else {
                     progressBar.update(chunks);
+                    // Check if upload is complete
                     if (chunks === total) {
+                        progressBar.update(total);
                         progressBar.stop();
                         console.log(chalk.green("✅ Upload complete!"));
                     }
                 }
             }
         });
+        // Ensure progress bar completes even if callback never fired
+        if (progressBar.getProgress() === 0) {
+            progressBar.update(1);
+            progressBar.stop();
+        }
         await fs.promises.unlink(tarPath);
-        console.log(chalk.green("✨ Function deployed successfully!"));
         return functionResponse;
     }
     catch (error) {

package/dist/interactiveCLI.js

@@ -118,7 +118,7 @@ export class InteractiveCLI {
                     break;
                 case CHOICES.EXIT:
                     console.log(chalk.green("Goodbye!"));
-                    return;
+                    process.exit(0);
             }
         }
     }
@@ -388,7 +388,6 @@ export class InteractiveCLI {
             console.log(chalk.yellow(`Function not found in primary location, searching subdirectories...`));
             const foundPath = await this.findFunctionInSubdirectories(this.controller.getAppwriteFolderPath(), functionConfig.name.toLowerCase());
             if (foundPath) {
-                console.log(chalk.green(`Found function at: ${foundPath}`));
                 functionPath = foundPath;
                 functionConfig.dirPath = foundPath;
             }
@@ -718,28 +717,46 @@ export class InteractiveCLI {
         }, bucketId.length > 0 ? bucketId : ulid());
     }
     async syncDb() {
-        console.log(chalk.yellow("Syncing database..."));
-        const functionsClient = new Functions(this.controller.appwriteServer);
-        const databases = await this.selectDatabases(await fetchAllDatabases(this.controller.database), chalk.blue("Select databases to synchronize:"), true);
-        const collections = await this.selectCollections(databases[0], this.controller.database, chalk.blue("Select collections to synchronize:"), true, true // prefer local
+        console.log(chalk.blue("Pushing local configuration to Appwrite..."));
+        const databases = await this.selectDatabases(this.getLocalDatabases(), chalk.blue("Select local databases to push:"), true);
+        if (!databases.length) {
+            console.log(chalk.yellow("No databases selected. Skipping database sync."));
+            return;
+        }
+        const collections = await this.selectCollections(databases[0], this.controller.database, chalk.blue("Select local collections to push:"), true, true // prefer local
         );
-        const answer = await inquirer.prompt([
+        const { syncFunctions } = await inquirer.prompt([
             {
                 type: "confirm",
                 name: "syncFunctions",
-                message: "Do you want to synchronize functions?",
+                message: "Do you want to push local functions to remote?",
                 default: false,
             },
         ]);
-        if (answer.syncFunctions) {
-            const functions = await this.selectFunctions(chalk.blue("Select functions to synchronize:"), true, true // prefer local
-            );
+        try {
+            // First sync databases and collections
             await this.controller.syncDb(databases, collections);
-            for (const func of functions) {
-                await deployLocalFunction(this.controller.appwriteServer, func.dirPath || `functions/${func.name}`, func);
+            console.log(chalk.green("Database and collections pushed successfully"));
+            // Then handle functions if requested
+            if (syncFunctions && this.controller.config?.functions?.length) {
+                const functions = await this.selectFunctions(chalk.blue("Select local functions to push:"), true, true // prefer local
+                );
+                for (const func of functions) {
+                    try {
+                        await this.controller.deployFunction(func.name);
+                        console.log(chalk.green(`Function ${func.name} deployed successfully`));
+                    }
+                    catch (error) {
+                        console.error(chalk.red(`Failed to deploy function ${func.name}:`), error);
+                    }
+                }
             }
+            console.log(chalk.green("Local configuration push completed successfully!"));
+        }
+        catch (error) {
+            console.error(chalk.red("Failed to push local configuration:"), error);
+            throw error;
         }
-        console.log(chalk.green("Database sync completed."));
     }
     async synchronizeConfigurations() {
         console.log(chalk.blue("Synchronizing configurations..."));

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

package/src/functions/deployments.ts

@@ -77,7 +77,9 @@ export const deployFunction = async (
 
   try {
     console.log(chalk.blue("🚀 Creating deployment..."));
+    // Start with 1 as default total since we don't know the chunk size yet
     progressBar.start(1, 0);
+
     const functionResponse = await functions.createDeployment(
       functionId,
       fileObject,
@@ -87,12 +89,17 @@ export const deployFunction = async (
       (progress) => {
         const chunks = progress.chunksUploaded;
         const total = progress.chunksTotal;
-        if (chunks !== undefined && total) {
-          if (chunks === 0 && total !== 0) {
-            progressBar.start(total, 0);
+
+        if (chunks !== undefined && total !== undefined) {
+          // First chunk, initialize the bar with correct total
+          if (chunks === 0) {
+            progressBar.start(total || 100, 0);
           } else {
             progressBar.update(chunks);
+
+            // Check if upload is complete
             if (chunks === total) {
+              progressBar.update(total);
               progressBar.stop();
               console.log(chalk.green("✅ Upload complete!"));
             }
@@ -101,8 +108,13 @@ export const deployFunction = async (
       }
     );
 
+    // Ensure progress bar completes even if callback never fired
+    if (progressBar.getProgress() === 0) {
+      progressBar.update(1);
+      progressBar.stop();
+    }
+
     await fs.promises.unlink(tarPath);
-    console.log(chalk.green("✨ Function deployed successfully!"));
     return functionResponse;
   } catch (error) {
     progressBar.stop();

package/src/interactiveCLI.ts

@@ -154,7 +154,7 @@ export class InteractiveCLI {
           break;
         case CHOICES.EXIT:
           console.log(chalk.green("Goodbye!"));
-          return;
+          process.exit(0);
       }
     }
   }
@@ -533,7 +533,6 @@ export class InteractiveCLI {
       );
 
       if (foundPath) {
-        console.log(chalk.green(`Found function at: ${foundPath}`));
         functionPath = foundPath;
         functionConfig.dirPath = foundPath;
       } else {
@@ -977,44 +976,73 @@ export class InteractiveCLI {
   }
 
   private async syncDb(): Promise<void> {
-    console.log(chalk.yellow("Syncing database..."));
-    const functionsClient = new Functions(this.controller!.appwriteServer!);
+    console.log(chalk.blue("Pushing local configuration to Appwrite..."));
+
     const databases = await this.selectDatabases(
-      await fetchAllDatabases(this.controller!.database!),
-      chalk.blue("Select databases to synchronize:"),
+      this.getLocalDatabases(),
+      chalk.blue("Select local databases to push:"),
       true
     );
+
+    if (!databases.length) {
+      console.log(
+        chalk.yellow("No databases selected. Skipping database sync.")
+      );
+      return;
+    }
+
     const collections = await this.selectCollections(
       databases[0],
       this.controller!.database!,
-      chalk.blue("Select collections to synchronize:"),
+      chalk.blue("Select local collections to push:"),
       true,
       true // prefer local
     );
-    const answer = await inquirer.prompt([
+
+    const { syncFunctions } = await inquirer.prompt([
       {
         type: "confirm",
         name: "syncFunctions",
-        message: "Do you want to synchronize functions?",
+        message: "Do you want to push local functions to remote?",
         default: false,
       },
     ]);
-    if (answer.syncFunctions) {
-      const functions = await this.selectFunctions(
-        chalk.blue("Select functions to synchronize:"),
-        true,
-        true // prefer local
-      );
+
+    try {
+      // First sync databases and collections
       await this.controller!.syncDb(databases, collections);
-      for (const func of functions) {
-        await deployLocalFunction(
-          this.controller!.appwriteServer!,
-          func.dirPath || `functions/${func.name}`,
-          func
+      console.log(chalk.green("Database and collections pushed successfully"));
+
+      // Then handle functions if requested
+      if (syncFunctions && this.controller!.config?.functions?.length) {
+        const functions = await this.selectFunctions(
+          chalk.blue("Select local functions to push:"),
+          true,
+          true // prefer local
         );
+
+        for (const func of functions) {
+          try {
+            await this.controller!.deployFunction(func.name);
+            console.log(
+              chalk.green(`Function ${func.name} deployed successfully`)
+            );
+          } catch (error) {
+            console.error(
+              chalk.red(`Failed to deploy function ${func.name}:`),
+              error
+            );
+          }
+        }
       }
+
+      console.log(
+        chalk.green("Local configuration push completed successfully!")
+      );
+    } catch (error) {
+      console.error(chalk.red("Failed to push local configuration:"), error);
+      throw error;
     }
-    console.log(chalk.green("Database sync completed."));
   }
 
   private async synchronizeConfigurations(): Promise<void> {