appwrite-utils-cli 0.10.3 → 0.10.5

package/README.md

@@ -147,6 +147,8 @@ This updated CLI ensures that developers have robust tools at their fingertips t
 
 ## Changelog
 
+- 0.10.05: Made deploy function into deploy function(s) -- so you can do more than one at a time
+- 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

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

@@ -19,7 +19,7 @@ var CHOICES;
 (function (CHOICES) {
     CHOICES["CREATE_COLLECTION_CONFIG"] = "Create collection config file";
     CHOICES["CREATE_FUNCTION"] = "Create a new function, from scratch or using a template";
-    CHOICES["DEPLOY_FUNCTION"] = "Deploy function";
+    CHOICES["DEPLOY_FUNCTION"] = "Deploy function(s)";
     CHOICES["DELETE_FUNCTION"] = "Delete function";
     CHOICES["SETUP_DIRS_FILES"] = "Setup directories and files";
     CHOICES["SETUP_DIRS_FILES_WITH_EXAMPLE_DATA"] = "Setup directories and files with example data";
@@ -118,7 +118,7 @@ export class InteractiveCLI {
                     break;
                 case CHOICES.EXIT:
                     console.log(chalk.green("Goodbye!"));
-                    return;
+                    process.exit(0);
             }
         }
     }
@@ -369,74 +369,74 @@ export class InteractiveCLI {
             console.log(chalk.red("Failed to initialize controller or load config"));
             return;
         }
-        const functions = await this.selectFunctions("Select function to deploy:", false, true);
+        const functions = await this.selectFunctions("Select function(s) to deploy:", true, true);
         if (!functions?.length) {
             console.log(chalk.red("No function selected"));
             return;
         }
-        const functionConfig = functions[0];
-        if (!functionConfig) {
-            console.log(chalk.red("Invalid function configuration"));
-            return;
-        }
-        // Ensure functions array exists
-        if (!this.controller.config.functions) {
-            this.controller.config.functions = [];
-        }
-        let functionPath = join(this.controller.getAppwriteFolderPath(), "functions", functionConfig.name);
-        if (!fs.existsSync(functionPath)) {
-            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;
+        for (const functionConfig of functions) {
+            if (!functionConfig) {
+                console.log(chalk.red("Invalid function configuration"));
+                return;
             }
-            else {
-                const { shouldDownload } = await inquirer.prompt([
-                    {
-                        type: "confirm",
-                        name: "shouldDownload",
-                        message: "Function not found locally. Would you like to download the latest deployment?",
-                        default: false,
-                    },
-                ]);
-                if (shouldDownload) {
-                    try {
-                        console.log(chalk.blue("Downloading latest deployment..."));
-                        const { path: downloadedPath, function: remoteFunction } = await downloadLatestFunctionDeployment(this.controller.appwriteServer, functionConfig.$id, join(this.controller.getAppwriteFolderPath(), "functions"));
-                        console.log(chalk.green(`✨ Function downloaded to ${downloadedPath}`));
-                        const existingIndex = this.controller.config.functions.findIndex((f) => f?.$id === remoteFunction.$id);
-                        if (existingIndex >= 0) {
-                            // Only update the dirPath if function exists
-                            this.controller.config.functions[existingIndex].dirPath =
-                                downloadedPath;
+            // Ensure functions array exists
+            if (!this.controller.config.functions) {
+                this.controller.config.functions = [];
+            }
+            let functionPath = join(this.controller.getAppwriteFolderPath(), "functions", functionConfig.name);
+            if (!fs.existsSync(functionPath)) {
+                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) {
+                    functionPath = foundPath;
+                    functionConfig.dirPath = foundPath;
+                }
+                else {
+                    const { shouldDownload } = await inquirer.prompt([
+                        {
+                            type: "confirm",
+                            name: "shouldDownload",
+                            message: "Function not found locally. Would you like to download the latest deployment?",
+                            default: false,
+                        },
+                    ]);
+                    if (shouldDownload) {
+                        try {
+                            console.log(chalk.blue("Downloading latest deployment..."));
+                            const { path: downloadedPath, function: remoteFunction } = await downloadLatestFunctionDeployment(this.controller.appwriteServer, functionConfig.$id, join(this.controller.getAppwriteFolderPath(), "functions"));
+                            console.log(chalk.green(`✨ Function downloaded to ${downloadedPath}`));
+                            const existingIndex = this.controller.config.functions.findIndex((f) => f?.$id === remoteFunction.$id);
+                            if (existingIndex >= 0) {
+                                // Only update the dirPath if function exists
+                                this.controller.config.functions[existingIndex].dirPath =
+                                    downloadedPath;
+                            }
+                            await this.controller.reloadConfig();
+                            functionConfig.dirPath = downloadedPath;
+                            functionPath = downloadedPath;
+                        }
+                        catch (error) {
+                            console.error(chalk.red("Failed to download function deployment:"), error);
+                            return;
                         }
-                        await this.controller.reloadConfig();
-                        functionConfig.dirPath = downloadedPath;
-                        functionPath = downloadedPath;
                     }
-                    catch (error) {
-                        console.error(chalk.red("Failed to download function deployment:"), error);
+                    else {
+                        console.log(chalk.red(`Function ${functionConfig.name} not found locally. Cannot deploy.`));
                         return;
                     }
                 }
-                else {
-                    console.log(chalk.red(`Function ${functionConfig.name} not found locally. Cannot deploy.`));
-                    return;
-                }
             }
-        }
-        if (!this.controller.appwriteServer) {
-            console.log(chalk.red("Appwrite server not initialized"));
-            return;
-        }
-        try {
-            await deployLocalFunction(this.controller.appwriteServer, functionConfig.name, functionConfig);
-            console.log(chalk.green("✨ Function deployed successfully!"));
-        }
-        catch (error) {
-            console.error(chalk.red("Failed to deploy function:"), error);
+            if (!this.controller.appwriteServer) {
+                console.log(chalk.red("Appwrite server not initialized"));
+                return;
+            }
+            try {
+                await deployLocalFunction(this.controller.appwriteServer, functionConfig.name, functionConfig);
+                console.log(chalk.green("✨ Function deployed successfully!"));
+            }
+            catch (error) {
+                console.error(chalk.red("Failed to deploy function:"), error);
+            }
         }
     }
     async deleteFunction() {

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.03",
+  "version": "0.10.05",
   "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

@@ -47,7 +47,7 @@ import { SchemaGenerator } from "./migrations/schemaStrings.js";
 enum CHOICES {
   CREATE_COLLECTION_CONFIG = "Create collection config file",
   CREATE_FUNCTION = "Create a new function, from scratch or using a template",
-  DEPLOY_FUNCTION = "Deploy function",
+  DEPLOY_FUNCTION = "Deploy function(s)",
   DELETE_FUNCTION = "Delete function",
   SETUP_DIRS_FILES = "Setup directories and files",
   SETUP_DIRS_FILES_WITH_EXAMPLE_DATA = "Setup directories and files with example data",
@@ -154,7 +154,7 @@ export class InteractiveCLI {
           break;
         case CHOICES.EXIT:
           console.log(chalk.green("Goodbye!"));
-          return;
+          process.exit(0);
       }
     }
   }
@@ -494,8 +494,8 @@ export class InteractiveCLI {
     }
 
     const functions = await this.selectFunctions(
-      "Select function to deploy:",
-      false,
+      "Select function(s) to deploy:",
+      true,
       true
     );
 
@@ -504,107 +504,107 @@ export class InteractiveCLI {
       return;
     }
 
-    const functionConfig = functions[0];
-    if (!functionConfig) {
-      console.log(chalk.red("Invalid function configuration"));
-      return;
-    }
-
-    // Ensure functions array exists
-    if (!this.controller.config.functions) {
-      this.controller.config.functions = [];
-    }
+    for (const functionConfig of functions) {
+      if (!functionConfig) {
+        console.log(chalk.red("Invalid function configuration"));
+        return;
+      }
 
-    let functionPath = join(
-      this.controller.getAppwriteFolderPath(),
-      "functions",
-      functionConfig.name
-    );
+      // Ensure functions array exists
+      if (!this.controller.config.functions) {
+        this.controller.config.functions = [];
+      }
 
-    if (!fs.existsSync(functionPath)) {
-      console.log(
-        chalk.yellow(
-          `Function not found in primary location, searching subdirectories...`
-        )
-      );
-      const foundPath = await this.findFunctionInSubdirectories(
+      let functionPath = join(
         this.controller.getAppwriteFolderPath(),
-        functionConfig.name.toLowerCase()
+        "functions",
+        functionConfig.name
       );
 
-      if (foundPath) {
-        console.log(chalk.green(`Found function at: ${foundPath}`));
-        functionPath = foundPath;
-        functionConfig.dirPath = foundPath;
-      } else {
-        const { shouldDownload } = await inquirer.prompt([
-          {
-            type: "confirm",
-            name: "shouldDownload",
-            message:
-              "Function not found locally. Would you like to download the latest deployment?",
-            default: false,
-          },
-        ]);
+      if (!fs.existsSync(functionPath)) {
+        console.log(
+          chalk.yellow(
+            `Function not found in primary location, searching subdirectories...`
+          )
+        );
+        const foundPath = await this.findFunctionInSubdirectories(
+          this.controller.getAppwriteFolderPath(),
+          functionConfig.name.toLowerCase()
+        );
 
-        if (shouldDownload) {
-          try {
-            console.log(chalk.blue("Downloading latest deployment..."));
-            const { path: downloadedPath, function: remoteFunction } =
-              await downloadLatestFunctionDeployment(
-                this.controller.appwriteServer!,
-                functionConfig.$id,
-                join(this.controller.getAppwriteFolderPath(), "functions")
+        if (foundPath) {
+          functionPath = foundPath;
+          functionConfig.dirPath = foundPath;
+        } else {
+          const { shouldDownload } = await inquirer.prompt([
+            {
+              type: "confirm",
+              name: "shouldDownload",
+              message:
+                "Function not found locally. Would you like to download the latest deployment?",
+              default: false,
+            },
+          ]);
+
+          if (shouldDownload) {
+            try {
+              console.log(chalk.blue("Downloading latest deployment..."));
+              const { path: downloadedPath, function: remoteFunction } =
+                await downloadLatestFunctionDeployment(
+                  this.controller.appwriteServer!,
+                  functionConfig.$id,
+                  join(this.controller.getAppwriteFolderPath(), "functions")
+                );
+              console.log(
+                chalk.green(`✨ Function downloaded to ${downloadedPath}`)
               );
-            console.log(
-              chalk.green(`✨ Function downloaded to ${downloadedPath}`)
-            );
 
-            const existingIndex = this.controller.config.functions.findIndex(
-              (f) => f?.$id === remoteFunction.$id
-            );
+              const existingIndex = this.controller.config.functions.findIndex(
+                (f) => f?.$id === remoteFunction.$id
+              );
 
-            if (existingIndex >= 0) {
-              // Only update the dirPath if function exists
-              this.controller.config.functions[existingIndex].dirPath =
-                downloadedPath;
+              if (existingIndex >= 0) {
+                // Only update the dirPath if function exists
+                this.controller.config.functions[existingIndex].dirPath =
+                  downloadedPath;
+              }
+
+              await this.controller.reloadConfig();
+              functionConfig.dirPath = downloadedPath;
+              functionPath = downloadedPath;
+            } catch (error) {
+              console.error(
+                chalk.red("Failed to download function deployment:"),
+                error
+              );
+              return;
             }
-
-            await this.controller.reloadConfig();
-            functionConfig.dirPath = downloadedPath;
-            functionPath = downloadedPath;
-          } catch (error) {
-            console.error(
-              chalk.red("Failed to download function deployment:"),
-              error
+          } else {
+            console.log(
+              chalk.red(
+                `Function ${functionConfig.name} not found locally. Cannot deploy.`
+              )
             );
             return;
           }
-        } else {
-          console.log(
-            chalk.red(
-              `Function ${functionConfig.name} not found locally. Cannot deploy.`
-            )
-          );
-          return;
         }
       }
-    }
 
-    if (!this.controller.appwriteServer) {
-      console.log(chalk.red("Appwrite server not initialized"));
-      return;
-    }
+      if (!this.controller.appwriteServer) {
+        console.log(chalk.red("Appwrite server not initialized"));
+        return;
+      }
 
-    try {
-      await deployLocalFunction(
-        this.controller.appwriteServer,
-        functionConfig.name,
-        functionConfig
-      );
-      console.log(chalk.green("✨ Function deployed successfully!"));
-    } catch (error) {
-      console.error(chalk.red("Failed to deploy function:"), error);
+      try {
+        await deployLocalFunction(
+          this.controller.appwriteServer,
+          functionConfig.name,
+          functionConfig
+        );
+        console.log(chalk.green("✨ Function deployed successfully!"));
+      } catch (error) {
+        console.error(chalk.red("Failed to deploy function:"), error);
+      }
     }
   }