appwrite-cli 13.6.0 → 13.6.1

package/lib/commands/push.ts

@@ -439,7 +439,7 @@ export class Push {
 
     if (settings.services) {
       this.log("Applying service statuses ...");
-      for (let [service, status] of Object.entries(settings.services)) {
+      for (const [service, status] of Object.entries(settings.services)) {
         await projectsService.updateServiceStatus({
           projectId: projectId,
           service: service as ApiService,
@@ -487,7 +487,7 @@ export class Push {
 
       if (settings.auth.methods) {
         this.log("Applying auth methods statuses ...");
-        for (let [method, status] of Object.entries(settings.auth.methods)) {
+        for (const [method, status] of Object.entries(settings.auth.methods)) {
           await projectsService.updateAuthStatus({
             projectId,
             method: method as AuthMethod,
@@ -861,7 +861,7 @@ export class Push {
                 ([key, value]) => ({ key, value }),
               );
             }
-          } catch (error) {
+          } catch (_error) {
             envVariables = [];
           }
           await Promise.all(
@@ -1223,7 +1223,7 @@ export class Push {
                 ([key, value]) => ({ key, value }),
               );
             }
-          } catch (error) {
+          } catch (_error) {
             envVariables = [];
           }
           await Promise.all(
@@ -1424,7 +1424,7 @@ export class Push {
       this.projectClient,
     );
 
-    let tablesChanged = new Set();
+    const tablesChanged = new Set();
     const errors: any[] = [];
 
     // Parallel tables actions
@@ -1492,7 +1492,7 @@ export class Push {
     );
 
     // Serialize attribute actions
-    for (let table of tables) {
+    for (const table of tables) {
       let columns = table.columns;
       let indexes = table.indexes;
       let hadChanges = false;
@@ -1843,7 +1843,7 @@ const pushSettings = async (): Promise<void> => {
 
   try {
     const projectsService = await getProjectsService();
-    let response = await projectsService.get(
+    const response = await projectsService.get(
       localConfig.getProject().projectId,
     );
 
@@ -1880,7 +1880,7 @@ const pushSettings = async (): Promise<void> => {
         return;
       }
     }
-  } catch (e) {}
+  } catch (_e) {}
 
   try {
     log("Pushing project settings ...");
@@ -1939,7 +1939,7 @@ const pushSite = async ({
     return;
   }
 
-  let sites = siteIds.map((id: string) => {
+  const sites = siteIds.map((id: string) => {
     const sites = localConfig.getSites();
     const site = sites.find((s: any) => s.$id === id);
 
@@ -1952,7 +1952,7 @@ const pushSite = async ({
 
   log("Validating sites ...");
   // Validation is done BEFORE pushing so the deployment process can be run in async with progress update
-  for (let site of sites) {
+  for (const site of sites) {
     if (!site.buildCommand) {
       log(`Site ${site.name} is missing build command.`);
       const answers = await inquirer.prompt(questionsGetEntrypoint);
@@ -2081,7 +2081,7 @@ const pushFunction = async ({
     return;
   }
 
-  let functions = functionIds.map((id: string) => {
+  const functions = functionIds.map((id: string) => {
     const functions = localConfig.getFunctions();
     const func = functions.find((f: any) => f.$id === id);
 
@@ -2093,7 +2093,7 @@ const pushFunction = async ({
   });
 
   log("Validating functions ...");
-  for (let func of functions) {
+  for (const func of functions) {
     if (!func.entrypoint) {
       log(`Function ${func.name} is missing an entrypoint.`);
       const answers = await inquirer.prompt(questionsGetEntrypoint);
@@ -2258,7 +2258,7 @@ const pushTable = async ({
           });
         }
       }
-    } catch (e) {
+    } catch (_e) {
       // Skip if database doesn't exist or other errors
     }
   }
@@ -2432,7 +2432,7 @@ const pushCollection = async (): Promise<void> => {
 };
 
 const pushBucket = async (): Promise<void> => {
-  let bucketIds: string[] = [];
+  const bucketIds: string[] = [];
   const configBuckets = localConfig.getBuckets();
 
   if (cliConfig.all) {
@@ -2455,7 +2455,7 @@ const pushBucket = async (): Promise<void> => {
     return;
   }
 
-  let buckets: any[] = [];
+  const buckets: any[] = [];
 
   for (const bucketId of bucketIds) {
     const idBuckets = configBuckets.filter((b: any) => b.$id === bucketId);
@@ -2496,7 +2496,7 @@ const pushBucket = async (): Promise<void> => {
 };
 
 const pushTeam = async (): Promise<void> => {
-  let teamIds: string[] = [];
+  const teamIds: string[] = [];
   const configTeams = localConfig.getTeams();
 
   if (cliConfig.all) {
@@ -2519,7 +2519,7 @@ const pushTeam = async (): Promise<void> => {
     return;
   }
 
-  let teams: any[] = [];
+  const teams: any[] = [];
 
   for (const teamId of teamIds) {
     const idTeams = configTeams.filter((t: any) => t.$id === teamId);
@@ -2560,7 +2560,7 @@ const pushTeam = async (): Promise<void> => {
 };
 
 const pushMessagingTopic = async (): Promise<void> => {
-  let topicsIds: string[] = [];
+  const topicsIds: string[] = [];
   const configTopics = localConfig.getMessagingTopics();
 
   if (cliConfig.all) {
@@ -2583,7 +2583,7 @@ const pushMessagingTopic = async (): Promise<void> => {
     return;
   }
 
-  let topics: any[] = [];
+  const topics: any[] = [];
 
   for (const topicId of topicsIds) {
     const idTopic = configTopics.filter((b: any) => b.$id === topicId);

package/lib/commands/run.ts

@@ -3,7 +3,8 @@ import { parse as parseDotenv } from "dotenv";
 import chalk from "chalk";
 import ignoreModule from "ignore";
 const ignore: typeof ignoreModule =
-  (ignoreModule as any).default ?? ignoreModule;
+  (ignoreModule as unknown as { default?: typeof ignoreModule }).default ??
+  ignoreModule;
 import tar from "tar";
 import fs from "fs";
 import chokidar from "chokidar";
@@ -24,7 +25,12 @@ import {
   commandDescriptions,
   drawTable,
 } from "../parser.js";
-import { systemHasCommand, isPortTaken, getAllFiles } from "../utils.js";
+import {
+  systemHasCommand,
+  isPortTaken,
+  getAllFiles,
+  getErrorMessage,
+} from "../utils.js";
 import {
   runtimeNames,
   systemTools,
@@ -62,7 +68,7 @@ const runFunction = async ({
   }
 
   const functions = localConfig.getFunctions();
-  const func = functions.find((f: any) => f.$id === functionId);
+  const func = functions.find((f) => f.$id === functionId);
   if (!func) {
     throw new Error("Function '" + functionId + "' not found.");
   }
@@ -178,14 +184,14 @@ const runFunction = async ({
         "variables",
       );
 
-      remoteVariables.forEach((v: any) => {
+      remoteVariables.forEach((v) => {
         allVariables[v.key] = v.value;
         userVariables[v.key] = v.value;
       });
-    } catch (err: any) {
+    } catch (err: unknown) {
       warn(
         "Remote variables not fetched. Production environment variables will not be available. Reason: " +
-          err.message,
+          getErrorMessage(err),
       );
     }
   }
@@ -214,10 +220,10 @@ const runFunction = async ({
 
   try {
     await JwtManager.setup(userId, (func.scopes as Scopes[]) ?? []);
-  } catch (err: any) {
+  } catch (err: unknown) {
     warn(
       "Dynamic API key not generated. Header x-appwrite-key will not be set. Reason: " +
-        err.message,
+        getErrorMessage(err),
     );
   }
 
@@ -394,7 +400,7 @@ export const run = new Command("run")
     helpWidth: process.stdout.columns || 80,
   })
   .action(
-    actionRunner(async (_options: any, command: Command) => {
+    actionRunner(async (_options: unknown, command: Command) => {
       command.help();
     }),
   );

package/lib/commands/types.ts

@@ -83,6 +83,16 @@ interface TypesOptions {
   strict: boolean;
 }
 
+type TypeAttribute = Record<string, unknown> & {
+  relatedTable?: string;
+};
+
+type TypeDataItem = Record<string, unknown> & {
+  name: string;
+  attributes?: TypeAttribute[];
+  columns?: TypeAttribute[];
+};
+
 const typesCommand = actionRunner(
   async (rawOutputDirectory: string, { language, strict }: TypesOptions) => {
     if (language === "auto") {
@@ -126,13 +136,11 @@ const typesCommand = actionRunner(
     }
 
     // Try tables first, fallback to collections
-    let tables = localConfig.getTables();
-    let collections: any[] = [];
-    let dataSource = "tables";
+    const tables = localConfig.getTables();
+    let collections: TypeDataItem[] = [];
 
     if (tables.length === 0) {
       collections = localConfig.getCollections();
-      dataSource = "collections";
 
       if (collections.length === 0) {
         const configFileName = path.basename(localConfig.path);
@@ -143,7 +151,8 @@ const typesCommand = actionRunner(
     }
 
     // Use tables if available, otherwise use collections
-    let dataItems: any[] = tables.length > 0 ? tables : collections;
+    let dataItems: TypeDataItem[] =
+      tables.length > 0 ? (tables as TypeDataItem[]) : collections;
     const itemType = tables.length > 0 ? "tables" : "collections";
 
     // Normalize tables data: rename 'columns' to 'attributes' for template compatibility
@@ -152,7 +161,7 @@ const typesCommand = actionRunner(
         const { columns, ...rest } = table;
         return {
           ...rest,
-          attributes: (columns || []).map((column: any) => {
+          attributes: (columns || []).map((column: TypeAttribute) => {
             if (column.relatedTable) {
               const { relatedTable, ...columnRest } = column;
               return {
@@ -167,14 +176,15 @@ const typesCommand = actionRunner(
     }
 
     log(
-      `Found ${dataItems.length} ${itemType}: ${dataItems.map((c: any) => c.name).join(", ")}`,
+      `Found ${dataItems.length} ${itemType}: ${dataItems.map((c) => c.name).join(", ")}`,
     );
 
     // Use columns if available, otherwise use attributes
     const resourceType = tables.length > 0 ? "columns" : "attributes";
 
     const totalAttributes = dataItems.reduce(
-      (count: number, item: any) => count + (item.attributes || []).length,
+      (count: number, item: TypeDataItem) =>
+        count + (item.attributes || []).length,
       0,
     );
     log(`Found ${totalAttributes} ${resourceType} across all ${itemType}`);

package/lib/commands/update.ts

@@ -3,7 +3,11 @@ import { Command } from "commander";
 import chalk from "chalk";
 import inquirer from "inquirer";
 import { success, log, warn, error, hint, actionRunner } from "../parser.js";
-import { getLatestVersion, compareVersions } from "../utils.js";
+import {
+  getLatestVersion,
+  compareVersions,
+  getErrorMessage,
+} from "../utils.js";
 import {
   GITHUB_RELEASES_URL,
   NPM_PACKAGE_NAME,
@@ -12,6 +16,8 @@ import {
 import packageJson from "../../package.json" with { type: "json" };
 const { version } = packageJson;
 
+type ExecCommandOptions = Exclude<Parameters<typeof spawn>[2], undefined>;
+
 /**
  * Check if the CLI was installed via npm
  */
@@ -36,7 +42,7 @@ const isInstalledViaNpm = (): boolean => {
     }
 
     return false;
-  } catch (e) {
+  } catch (_e) {
     return false;
   }
 };
@@ -51,7 +57,7 @@ const isInstalledViaHomebrew = (): boolean => {
       scriptPath.includes("/opt/homebrew/") ||
       scriptPath.includes("/usr/local/Cellar/")
     );
-  } catch (e) {
+  } catch (_e) {
     return false;
   }
 };
@@ -62,7 +68,7 @@ const isInstalledViaHomebrew = (): boolean => {
 const execCommand = (
   command: string,
   args: string[] = [],
-  options: any = {},
+  options: ExecCommandOptions = {},
 ): Promise<void> => {
   return new Promise((resolve, reject) => {
     const child = spawn(command, args, {
@@ -94,17 +100,16 @@ const updateViaNpm = async (): Promise<void> => {
     console.log("");
     success("Updated to latest version via npm!");
     hint("Run 'appwrite --version' to verify the new version.");
-  } catch (e: any) {
-    if (
-      e.message.includes("EEXIST") ||
-      e.message.includes("file already exists")
-    ) {
+  } catch (e: unknown) {
+    const message = getErrorMessage(e);
+
+    if (message.includes("EEXIST") || message.includes("file already exists")) {
       console.log("");
       success("Latest version is already installed via npm!");
       hint("The CLI is up to date. Run 'appwrite --version' to verify.");
     } else {
       console.log("");
-      error(`Failed to update via npm: ${e.message}`);
+      error(`Failed to update via npm: ${message}`);
       hint(`Try running: npm install -g ${NPM_PACKAGE_NAME}@latest --force`);
     }
   }
@@ -119,17 +124,19 @@ const updateViaHomebrew = async (): Promise<void> => {
     console.log("");
     success("Updated to latest version via Homebrew!");
     hint("Run 'appwrite --version' to verify the new version.");
-  } catch (e: any) {
+  } catch (e: unknown) {
+    const message = getErrorMessage(e);
+
     if (
-      e.message.includes("already installed") ||
-      e.message.includes("up-to-date")
+      message.includes("already installed") ||
+      message.includes("up-to-date")
     ) {
       console.log("");
       success("Latest version is already installed via Homebrew!");
       hint("The CLI is up to date. Run 'appwrite --version' to verify.");
     } else {
       console.log("");
-      error(`Failed to update via Homebrew: ${e.message}`);
+      error(`Failed to update via Homebrew: ${message}`);
       hint("Try running: brew upgrade appwrite");
     }
   }
@@ -230,9 +237,10 @@ const updateCli = async ({ manual }: UpdateOptions = {}): Promise<void> => {
     } else {
       await chooseUpdateMethod(latestVersion);
     }
-  } catch (e: any) {
+  } catch (e: unknown) {
+    const message = getErrorMessage(e);
     console.log("");
-    error(`Failed to check for updates: ${e.message}`);
+    error(`Failed to check for updates: ${message}`);
     hint(`You can manually check for updates at: ${GITHUB_RELEASES_URL}`);
   }
 };

package/lib/commands/utils/attributes.ts

@@ -76,7 +76,7 @@ export class Attributes {
       return answers.changes;
     }
 
-    let answers = await inquirer.prompt(questionPushChanges);
+    const answers = await inquirer.prompt(questionPushChanges);
 
     if (answers.changes !== "YES" && answers.changes !== "NO") {
       answers.changes = await fixConfirmation();
@@ -148,9 +148,9 @@ export class Attributes {
     const keyName = `${chalk.yellow(local.key)} in ${collection.name} (${collection["$id"]})`;
     const action = chalk.cyan(recreating ? "recreating" : "changing");
     let reason = "";
-    let attribute = recreating ? remote : local;
+    const attribute = recreating ? remote : local;
 
-    for (let key of Object.keys(remote)) {
+    for (const key of Object.keys(remote)) {
       if (!KeysAttributes.has(key)) {
         continue;
       }
@@ -737,7 +737,7 @@ export class Attributes {
     log(`Creating indexes ...`);
 
     const databasesService = await getDatabasesService(this.client);
-    for (let index of indexes) {
+    for (const index of indexes) {
       await databasesService.createIndex({
         databaseId: collection["databaseId"],
         collectionId: collection["$id"],
@@ -769,7 +769,7 @@ export class Attributes {
   ): Promise<void> => {
     log(`Creating attributes ...`);
 
-    for (let attribute of attributes) {
+    for (const attribute of attributes) {
       if (attribute.side !== "child") {
         await this.createAttribute(
           collection["databaseId"],
@@ -803,7 +803,7 @@ export class Attributes {
   ): Promise<void> => {
     log(`Creating columns ...`);
 
-    for (let column of columns) {
+    for (const column of columns) {
       if (column.side !== "child") {
         await this.createAttribute(table["databaseId"], table["$id"], column);
       }

package/lib/commands/utils/change-approval.ts

@@ -1,5 +1,6 @@
 import chalk from "chalk";
 import inquirer from "inquirer";
+import { AppwriteException } from "@appwrite.io/console";
 import { cliConfig, success, warn, log, drawTable } from "../../parser.js";
 import { whitelistKeys } from "../../config.js";
 import {
@@ -10,7 +11,7 @@ import {
 /**
  * Check if a value is considered empty
  */
-export const isEmpty = (value: any): boolean =>
+export const isEmpty = (value: unknown): boolean =>
   value === null ||
   value === undefined ||
   (typeof value === "string" && value.trim().length === 0) ||
@@ -33,7 +34,7 @@ export const getConfirmation = async (): Promise<boolean> => {
     return answers.changes;
   }
 
-  let answers = await inquirer.prompt(questionPushChanges);
+  const answers = await inquirer.prompt(questionPushChanges);
 
   if (answers.changes !== "YES" && answers.changes !== "NO") {
     answers.changes = await fixConfirmation();
@@ -57,9 +58,9 @@ interface ObjectChange {
   local: string;
 }
 
-type ComparableValue = boolean | number | string | any[] | undefined;
+type ComparableValue = boolean | number | string | unknown[] | undefined;
 
-export const getObjectChanges = <T extends Record<string, any>>(
+export const getObjectChanges = <T extends Record<string, unknown>>(
   remote: T,
   local: T,
   index: keyof T,
@@ -110,8 +111,10 @@ export const getObjectChanges = <T extends Record<string, any>>(
  * Compares local resources with remote resources and prompts user for confirmation
  */
 export const approveChanges = async (
-  resource: any[],
-  resourceGetFunction: Function,
+  resource: Array<Record<string, unknown>>,
+  resourceGetFunction: (
+    options: Record<string, unknown>,
+  ) => Promise<Record<string, unknown>>,
   keys: Set<string>,
   resourceName: string,
   resourcePlural: string,
@@ -120,12 +123,12 @@ export const approveChanges = async (
   secondResourceName: string = "",
 ): Promise<boolean> => {
   log("Checking for changes ...");
-  const changes: any[] = [];
+  const changes: Array<Record<string, unknown>> = [];
 
   await Promise.all(
     resource.map(async (localResource) => {
       try {
-        const options: Record<string, any> = {
+        const options: Record<string, unknown> = {
           [resourceName]: localResource["$id"],
         };
 
@@ -135,7 +138,7 @@ export const approveChanges = async (
 
         const remoteResource = await resourceGetFunction(options);
 
-        for (let [key, value] of Object.entries(
+        for (const [key, value] of Object.entries(
           whitelistKeys(remoteResource, keys),
         )) {
           if (skipKeys.includes(key)) {
@@ -146,28 +149,32 @@ export const approveChanges = async (
             continue;
           }
 
-          if (Array.isArray(value) && Array.isArray(localResource[key])) {
-            if (JSON.stringify(value) !== JSON.stringify(localResource[key])) {
+          const localValue = localResource[key];
+
+          if (Array.isArray(value) && Array.isArray(localValue)) {
+            if (JSON.stringify(value) !== JSON.stringify(localValue)) {
               changes.push({
                 id: localResource["$id"],
                 key,
                 remote: chalk.red((value as string[]).join("\n")),
-                local: chalk.green(localResource[key].join("\n")),
+                local: chalk.green(
+                  localValue.map((entry) => String(entry)).join("\n"),
+                ),
               });
             }
-          } else if (value !== localResource[key]) {
+          } else if (value !== localValue) {
             changes.push({
               id: localResource["$id"],
               key,
-              remote: chalk.red(value),
-              local: chalk.green(localResource[key]),
+              remote: chalk.red(String(value ?? "")),
+              local: chalk.green(String(localValue ?? "")),
             });
           }
         }
-      } catch (e: any) {
-        if (Number(e.code) !== 404) {
-          throw e;
-        }
+      } catch (e: unknown) {
+        const isNotFound =
+          e instanceof AppwriteException && Number(e.code) === 404;
+        if (!isNotFound) throw e;
       }
     }),
   );