appwrite-cli 13.5.0 → 13.6.1

package/lib/commands/init.ts

@@ -31,11 +31,57 @@ import {
 } from "../parser.js";
 import { sdkForConsole } from "../sdks.js";
 import { isCloud } from "../utils.js";
-import { Account, UseCases } from "@appwrite.io/console";
+import { Account, UseCases, AppwriteException } from "@appwrite.io/console";
 import { DEFAULT_ENDPOINT, EXECUTABLE_NAME } from "../constants.js";
 
+type InitResourceAction = (_options?: unknown) => Promise<void>;
+type ProjectsService = Awaited<ReturnType<typeof getProjectsService>>;
+type ProjectCreateRegion = Parameters<ProjectsService["create"]>[3];
+
+interface ExistingProjectSummary {
+  $id: string;
+  name?: string;
+  region?: string;
+}
+
+interface InitProjectAnswers {
+  start: "new" | "existing";
+  override?: boolean;
+  id?: string;
+  project: string | ExistingProjectSummary;
+  organization: string;
+  region?: ProjectCreateRegion;
+}
+
+interface InitProjectAutopullAnswer {
+  autopull?: boolean;
+}
+
+interface SiteTemplateFramework {
+  providerRootDirectory: string;
+  adapter?: string;
+  buildRuntime?: string;
+  installCommand?: string;
+  buildCommand?: string;
+  outputDirectory?: string;
+  fallbackFile?: string;
+}
+
+interface SiteTemplateVariable {
+  name: string;
+  value?: string;
+}
+
+interface SiteTemplateDetails {
+  providerOwner: string;
+  providerRepositoryId: string;
+  providerVersion: string;
+  frameworks: SiteTemplateFramework[];
+  variables?: SiteTemplateVariable[];
+}
+
 const initResources = async (): Promise<void> => {
-  const actions: Record<string, (options?: any) => Promise<void>> = {
+  const actions: Record<string, InitResourceAction> = {
     function: initFunction,
     site: initSite,
     table: initTable,
@@ -64,8 +110,6 @@ const initProject = async ({
   projectId,
   projectName,
 }: InitProjectOptions = {}): Promise<void> => {
-  let response: any = {};
-
   try {
     if (globalConfig.getEndpoint() === "" || globalConfig.getCookie() === "") {
       throw new Error(
@@ -76,14 +120,14 @@ const initProject = async ({
     const accountClient = new Account(client);
 
     await accountClient.get();
-  } catch (e) {
+  } catch (_e) {
     error(
       `Error Session not found. Please run '${EXECUTABLE_NAME} login' to create a session`,
     );
     process.exit(1);
   }
 
-  let answers: any = {};
+  let answers: InitProjectAnswers;
 
   if (!organizationId && !projectId && !projectName) {
     answers = await inquirer.prompt(questionsInitProject);
@@ -91,26 +135,33 @@ const initProject = async ({
       process.exit(1);
     }
   } else {
-    answers.start = "existing";
-    answers.project = {};
-    answers.organization = {};
-
-    answers.organization =
+    const selectedOrganization =
       organizationId ??
       (await inquirer.prompt([questionsInitProject[2]])).organization;
-    answers.project.name =
+    const selectedProjectName =
       projectName ?? (await inquirer.prompt([questionsInitProject[3]])).project;
-    answers.project =
+    const selectedProjectId =
       projectId ?? (await inquirer.prompt([questionsInitProject[4]])).id;
 
+    answers = {
+      start: "existing",
+      project: selectedProjectId,
+      organization: selectedOrganization,
+    };
+
     try {
       const projectsService = await getProjectsService();
-      await projectsService.get(projectId);
-    } catch (e: any) {
-      if (e.code === 404) {
-        answers.start = "new";
-        answers.id = answers.project;
-        answers.project = answers.project.name;
+      const existingProject: ExistingProjectSummary =
+        await projectsService.get(selectedProjectId);
+      answers.project = existingProject;
+    } catch (e) {
+      if (e instanceof AppwriteException && e.code === 404) {
+        answers = {
+          start: "new",
+          id: selectedProjectId,
+          project: selectedProjectName,
+          organization: selectedOrganization,
+        };
       } else {
         throw e;
       }
@@ -121,10 +172,28 @@ const initProject = async ({
   const url = new URL(DEFAULT_ENDPOINT);
 
   if (answers.start === "new") {
+    let projectIdToCreate;
+    let projectNameToCreate;
+
+    switch (typeof answers.project) {
+      case "string":
+        projectIdToCreate = answers.id ?? answers.project;
+        projectNameToCreate = answers.project;
+        break;
+      case "object":
+        projectIdToCreate = answers.id ?? answers.project.$id;
+        projectNameToCreate = answers.project.name ?? answers.project.$id;
+        break;
+      default:
+        projectIdToCreate = answers.id;
+        projectNameToCreate = "";
+        break;
+    }
+
     const projectsService = await getProjectsService();
-    response = await projectsService.create(
-      answers.id,
-      answers.project,
+    const response = await projectsService.create(
+      projectIdToCreate,
+      projectNameToCreate,
       answers.organization,
       answers.region,
     );
@@ -136,10 +205,25 @@ const initProject = async ({
       );
     }
   } else {
-    localConfig.setProject(answers.project["$id"]);
-    if (isCloud()) {
+    let selectedProject;
+
+    switch (typeof answers.project) {
+      case "string":
+        selectedProject = { $id: answers.project };
+        break;
+      case "object":
+        selectedProject = answers.project;
+        break;
+      default:
+        selectedProject = { $id: "" };
+        break;
+    }
+
+    localConfig.setProject(selectedProject.$id);
+
+    if (isCloud() && selectedProject.region) {
       localConfig.setEndpoint(
-        `https://${answers.project["region"]}.${url.host}${url.pathname}`,
+        `https://${selectedProject.region}.${url.host}${url.pathname}`,
       );
     }
   }
@@ -149,8 +233,10 @@ const initProject = async ({
   );
 
   if (answers.start === "existing") {
-    answers = await inquirer.prompt(questionsInitProjectAutopull);
-    if (answers.autopull) {
+    const autopullAnswers: InitProjectAutopullAnswer = await inquirer.prompt(
+      questionsInitProjectAutopull,
+    );
+    if (autopullAnswers.autopull) {
       cliConfig.all = true;
       cliConfig.force = true;
       await pullResources({
@@ -322,7 +408,6 @@ const initFunction = async (): Promise<void> => {
   fs.mkdirSync(functionDir, { mode: 0o777 });
   fs.mkdirSync(templatesDir, { mode: 0o777 });
   const repo = "https://github.com/appwrite/templates";
-  const api = `https://api.github.com/repos/appwrite/templates/contents/${answers.runtime.name}`;
   let selected: { template: string } = { template: "starter" };
 
   const sparse = (
@@ -351,20 +436,21 @@ const initFunction = async (): Promise<void> => {
       stdio: "pipe",
       cwd: templatesDir,
     });
-  } catch (err: any) {
+  } catch (err) {
     /* Specialised errors with recommended actions to take */
-    if (err.message.includes("error: unknown option")) {
+    const errorMessage = err instanceof Error ? err.message : String(err);
+    if (errorMessage.includes("error: unknown option")) {
       throw new Error(
-        `${err.message} \n\nSuggestion: Try updating your git to the latest version, then trying to run this command again.`,
+        `${errorMessage} \n\nSuggestion: Try updating your git to the latest version, then trying to run this command again.`,
       );
     } else if (
-      err.message.includes(
+      errorMessage.includes(
         "is not recognized as an internal or external command,",
       ) ||
-      err.message.includes("command not found")
+      errorMessage.includes("command not found")
     ) {
       throw new Error(
-        `${err.message} \n\nSuggestion: It appears that git is not installed, try installing git then trying to run this command again.`,
+        `${errorMessage} \n\nSuggestion: It appears that git is not installed, try installing git then trying to run this command again.`,
       );
     } else {
       throw err;
@@ -390,9 +476,9 @@ const initFunction = async (): Promise<void> => {
   }
 
   const copyRecursiveSync = (src: string, dest: string): void => {
-    let exists = fs.existsSync(src);
-    let stats = exists && fs.statSync(src);
-    let isDirectory = exists && stats && stats.isDirectory();
+    const exists = fs.existsSync(src);
+    const stats = exists && fs.statSync(src);
+    const isDirectory = exists && stats && stats.isDirectory();
     if (isDirectory) {
       if (!fs.existsSync(dest)) {
         fs.mkdirSync(dest);
@@ -424,7 +510,7 @@ const initFunction = async (): Promise<void> => {
   newReadmeFile.splice(1, 2);
   fs.writeFileSync(readmePath, newReadmeFile.join("\n"));
 
-  let data = {
+  const data = {
     $id: functionId,
     name: answers.name,
     runtime: answers.runtime.id,
@@ -472,7 +558,7 @@ const initSite = async (): Promise<void> => {
     );
   }
 
-  let templateDetails: any;
+  let templateDetails: SiteTemplateDetails;
   try {
     const sitesService = await getSitesService();
     const response = await sitesService.listTemplates(
@@ -486,16 +572,17 @@ const initSite = async (): Promise<void> => {
       );
     }
     templateDetails = response.templates[0];
-  } catch (err: any) {
+  } catch (err) {
+    const errorMessage = err instanceof Error ? err.message : String(err);
     throw new Error(
-      `Failed to fetch template for framework ${answers.framework.key}: ${err.message}`,
+      `Failed to fetch template for framework ${answers.framework.key}: ${errorMessage}`,
     );
   }
 
   fs.mkdirSync(siteDir, { mode: 0o777 });
   fs.mkdirSync(templatesDir, { mode: 0o777 });
   const repo = `https://github.com/${templateDetails.providerOwner}/${templateDetails.providerRepositoryId}`;
-  let selected = {
+  const selected = {
     template: templateDetails.frameworks[0].providerRootDirectory,
   };
 
@@ -526,12 +613,12 @@ const initSite = async (): Promise<void> => {
             git config remote.origin.tagopt --no-tags
         `.trim();
   }
-  let windowsGitCloneCommands = `
+  const windowsGitCloneCommands = `
             $tag = (git ls-remote --tags origin "${templateDetails.providerVersion}" | Select-Object -Last 1) -replace '.*refs/tags/', ''
             git fetch --depth=1 origin "refs/tags/$tag"
             git checkout FETCH_HEAD
             `.trim();
-  let unixGitCloneCommands = `
+  const unixGitCloneCommands = `
             git fetch --depth=1 origin refs/tags/$(git ls-remote --tags origin "${templateDetails.providerVersion}" | tail -n 1 | awk -F '/' '{print $3}')
             git checkout FETCH_HEAD
             `.trim();
@@ -551,20 +638,21 @@ const initSite = async (): Promise<void> => {
       cwd: templatesDir,
       shell: usedShell,
     });
-  } catch (err: any) {
+  } catch (err) {
     /* Specialised errors with recommended actions to take */
-    if (err.message.includes("error: unknown option")) {
+    const errorMessage = err instanceof Error ? err.message : String(err);
+    if (errorMessage.includes("error: unknown option")) {
       throw new Error(
-        `${err.message} \n\nSuggestion: Try updating your git to the latest version, then trying to run this command again.`,
+        `${errorMessage} \n\nSuggestion: Try updating your git to the latest version, then trying to run this command again.`,
       );
     } else if (
-      err.message.includes(
+      errorMessage.includes(
         "is not recognized as an internal or external command,",
       ) ||
-      err.message.includes("command not found")
+      errorMessage.includes("command not found")
     ) {
       throw new Error(
-        `${err.message} \n\nSuggestion: It appears that git is not installed, try installing git then trying to run this command again.`,
+        `${errorMessage} \n\nSuggestion: It appears that git is not installed, try installing git then trying to run this command again.`,
       );
     } else {
       throw err;
@@ -590,27 +678,25 @@ const initSite = async (): Promise<void> => {
   newReadmeFile.splice(1, 2);
   fs.writeFileSync(readmePath, newReadmeFile.join("\n"));
 
-  let vars = (templateDetails.variables ?? []).map((variable: any) => {
-    let value = variable.value;
+  const vars: Record<string, string> = {};
+  for (const variable of templateDetails.variables ?? []) {
+    let value = variable.value ?? "";
     const replacements: Record<string, string> = {
       "{apiEndpoint}": globalConfig.getEndpoint(),
-      "{projectId}": localConfig.getProject().projectId,
-      "{projectName}": localConfig.getProject().projectName,
+      "{projectId}": localConfig.getProject().projectId ?? "",
+      "{projectName}": localConfig.getProject().projectName ?? "",
     };
 
     for (const placeholder in replacements) {
-      if (value?.includes(placeholder)) {
+      if (value.includes(placeholder)) {
         value = value.replace(placeholder, replacements[placeholder]);
       }
     }
 
-    return {
-      key: variable.name,
-      value: value,
-    };
-  });
+    vars[variable.name] = value;
+  }
 
-  let data = {
+  const data = {
     $id: siteId,
     name: answers.name,
     framework: answers.framework.key,

package/lib/commands/pull.ts

@@ -719,7 +719,7 @@ export const pullResources = async ({
   }
 
   if (cliConfig.all) {
-    for (let action of Object.values(actions)) {
+    for (const action of Object.values(actions)) {
       cliConfig.all = true;
       await action({ returnOnZero: true });
     }

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/schema.ts

@@ -4,13 +4,11 @@ import { ConfigSchema } from "./config.js";
 import { Pull, PullOptions } from "./pull.js";
 import { Push, PushOptions } from "./push.js";
 import { parseWithBetterErrors } from "./utils/error-formatter.js";
-import JSONbig from "json-bigint";
+import { JSONBig } from "../json.js";
 import * as fs from "fs";
 import * as path from "path";
 import { TypeScriptDatabasesGenerator } from "./generators/typescript/databases.js";
 
-const JSONBig = JSONbig({ useNativeBigInt: true });
-
 export class Schema {
   private pullCommand: Pull;
   private pushCommand: Push;