appwrite-cli 13.0.0-rc.1 → 13.0.0-rc.2

package/lib/commands/pull.ts

@@ -1,557 +1,668 @@
-import fs = require('fs');
-import chalk from 'chalk';
-import tar = require('tar');
-import { Command } from 'commander';
-import inquirer from 'inquirer';
-import { messagingListTopics } from './messaging';
-import { teamsList } from './teams';
-import { projectsGet } from './projects';
-import { functionsList, functionsGetDeploymentDownload, functionsListDeployments } from './functions';
-import { sitesList, sitesGetDeploymentDownload, sitesListDeployments } from './sites';
-import { databasesGet, databasesListCollections, databasesList } from './databases';
-import { tablesDBList, tablesDBGet, tablesDBListTables } from './tables-db';
-import { storageListBuckets } from './storage';
-import { localConfig } from '../config';
-import { paginate } from '../paginate';
-import { questionsPullCollection, questionsPullFunctions, questionsPullFunctionsCode, questionsPullSites, questionsPullSitesCode, questionsPullResources } from '../questions';
-import { cliConfig, success, log, warn, actionRunner, commandDescriptions } from '../parser';
+import fs from "fs";
+import chalk from "chalk";
+import tar from "tar";
+import { Command } from "commander";
+import inquirer from "inquirer";
+import {
+  getMessagingService,
+  getTeamsService,
+  getProjectsService,
+  getFunctionsService,
+  getSitesService,
+  getDatabasesService,
+  getTablesDBService,
+  getStorageService,
+} from "../services.js";
+import { localConfig } from "../config.js";
+import { paginate } from "../paginate.js";
+import {
+  questionsPullCollection,
+  questionsPullFunctions,
+  questionsPullFunctionsCode,
+  questionsPullSites,
+  questionsPullSitesCode,
+  questionsPullResources,
+} from "../questions.js";
+import {
+  cliConfig,
+  success,
+  log,
+  warn,
+  error,
+  actionRunner,
+  commandDescriptions,
+} from "../parser.js";
 
 interface PullResourcesOptions {
-    skipDeprecated?: boolean;
+  skipDeprecated?: boolean;
 }
 
 interface PullFunctionsOptions {
-    code?: boolean;
-    withVariables?: boolean;
+  code?: boolean;
+  withVariables?: boolean;
 }
 
 interface PullSitesOptions {
-    code?: boolean;
-    withVariables?: boolean;
+  code?: boolean;
+  withVariables?: boolean;
 }
 
 export const pullResources = async ({
-    skipDeprecated = false
+  skipDeprecated = false,
 }: PullResourcesOptions = {}): Promise<void> => {
-    const actions: Record<string, (options?: any) => Promise<void>> = {
-        settings: pullSettings,
-        functions: pullFunctions,
-        sites: pullSites,
-        collections: pullCollection,
-        tables: pullTable,
-        buckets: pullBucket,
-        teams: pullTeam,
-        messages: pullMessagingTopic
+  const project = localConfig.getProject();
+  if (!project.projectId) {
+    error(
+      "Project configuration not found. Please run 'appwrite init project' to initialize your project first.",
+    );
+    process.exit(1);
+  }
+
+  const actions: Record<string, (options?: any) => Promise<void>> = {
+    settings: pullSettings,
+    functions: pullFunctions,
+    sites: pullSites,
+    collections: pullCollection,
+    tables: pullTable,
+    buckets: pullBucket,
+    teams: pullTeam,
+    messages: pullMessagingTopic,
+  };
+
+  if (skipDeprecated) {
+    delete actions.collections;
+  }
+
+  if (cliConfig.all) {
+    for (let action of Object.values(actions)) {
+      cliConfig.all = true;
+      await action({ returnOnZero: true });
     }
+  } else {
+    const answers = await inquirer.prompt([questionsPullResources[0]]);
 
-    if (skipDeprecated) {
-        delete actions.collections;
-    }
-
-    if (cliConfig.all) {
-        for (let action of Object.values(actions)) {
-            cliConfig.all = true;
-            await action({ returnOnZero: true });
-        }
-    } else {
-        const answers = await inquirer.prompt(questionsPullResources[0]);
-
-        const action = actions[answers.resource];
-        if (action !== undefined) {
-            await action({ returnOnZero: true });
-        }
+    const action = actions[answers.resource];
+    if (action !== undefined) {
+      await action({ returnOnZero: true });
     }
+  }
 };
 
 const pullSettings = async (): Promise<void> => {
-    log("Pulling project settings ...");
+  log("Pulling project settings ...");
 
-    try {
-        let response = await projectsGet({
-            parseOutput: false,
-            projectId: localConfig.getProject().projectId
-        });
-
-        localConfig.setProject(response.$id, response.name, response);
-
-        success(`Successfully pulled ${chalk.bold('all')} project settings.`);
-    } catch (e) {
-        throw e;
-    }
-}
+  try {
+    const projectsService = await getProjectsService();
+    let response = await projectsService.get(
+      localConfig.getProject().projectId,
+    );
 
-const pullFunctions = async ({ code, withVariables }: PullFunctionsOptions = {}): Promise<void> => {
-    process.chdir(localConfig.configDirectoryPath)
+    localConfig.setProject(response.$id, response.name, response);
 
-    log("Fetching functions ...");
-    let total = 0;
+    success(`Successfully pulled ${chalk.bold("all")} project settings.`);
+  } catch (e) {
+    throw e;
+  }
+};
 
-    const fetchResponse = await functionsList({
-        queries: [JSON.stringify({ method: 'limit', values: [1] })],
-        parseOutput: false
-    });
-    if (fetchResponse["functions"].length <= 0) {
-        log("No functions found.");
-        success(`Successfully pulled ${chalk.bold(total)} functions.`);
-        return;
+const pullFunctions = async ({
+  code,
+  withVariables,
+}: PullFunctionsOptions = {}): Promise<void> => {
+  process.chdir(localConfig.configDirectoryPath);
+
+  log("Fetching functions ...");
+  let total = 0;
+
+  const functionsService = await getFunctionsService();
+  const fetchResponse = await functionsService.list([
+    JSON.stringify({ method: "limit", values: [1] }),
+  ]);
+  if (fetchResponse["functions"].length <= 0) {
+    log("No functions found.");
+    success(`Successfully pulled ${chalk.bold(total)} functions.`);
+    return;
+  }
+
+  const functions = cliConfig.all
+    ? (
+        await paginate(
+          async () => (await getFunctionsService()).list(),
+          {},
+          100,
+          "functions",
+        )
+      ).functions
+    : (await inquirer.prompt(questionsPullFunctions)).functions;
+
+  let allowCodePull: boolean | null = cliConfig.force === true ? true : null;
+
+  for (let func of functions) {
+    total++;
+    log(`Pulling function ${chalk.bold(func["name"])} ...`);
+
+    const localFunction = localConfig.getFunction(func.$id);
+
+    func["path"] = localFunction["path"];
+    if (!localFunction["path"]) {
+      func["path"] = `functions/${func.name}`;
     }
+    const holdingVars = func["vars"];
+    // We don't save var in to the config
+    delete func["vars"];
+    localConfig.addFunction(func);
 
-    const functions = cliConfig.all
-        ? (await paginate(functionsList, { parseOutput: false }, 100, 'functions')).functions
-        : (await inquirer.prompt(questionsPullFunctions)).functions;
-
-    let allowCodePull: boolean | null = cliConfig.force === true ? true : null;
-
-    for (let func of functions) {
-        total++;
-        log(`Pulling function ${chalk.bold(func['name'])} ...`);
-
-        const localFunction = localConfig.getFunction(func.$id);
-
-        func['path'] = localFunction['path'];
-        if (!localFunction['path']) {
-            func['path'] = `functions/${func.name}`;
-        }
-        const holdingVars = func['vars'];
-        // We don't save var in to the config
-        delete func['vars'];
-        localConfig.addFunction(func);
-
-        if (!fs.existsSync(func['path'])) {
-            fs.mkdirSync(func['path'], { recursive: true });
-        }
-
-        if (code === false) {
-            warn("Source code download skipped.");
-            continue;
-        }
-
-        if (allowCodePull === null) {
-            const codeAnswer = await inquirer.prompt(questionsPullFunctionsCode);
-            allowCodePull = codeAnswer.override;
-        }
-
-        if (!allowCodePull) {
-            continue;
-        }
-
-        let deploymentId: string | null = null;
-
-        try {
-            const fetchResponse = await functionsListDeployments({
-                functionId: func['$id'],
-                queries: [
-                    JSON.stringify({ method: 'limit', values: [1] }),
-                    JSON.stringify({ method: 'orderDesc', values: ['$id'] })
-                ],
-                parseOutput: false
-            });
-
-            if (fetchResponse['total'] > 0) {
-                deploymentId = fetchResponse['deployments'][0]['$id'];
-            }
-
-        } catch {
-        }
-
-        if (deploymentId === null) {
-            log("Source code download skipped because function doesn't have any available deployment");
-            continue;
-        }
-
-        log("Pulling latest deployment code ...");
-
-        const compressedFileName = `${func['$id']}-${+new Date()}.tar.gz`
-        await functionsGetDeploymentDownload({
-            functionId: func['$id'],
-            deploymentId,
-            destination: compressedFileName,
-            overrideForCli: true,
-            parseOutput: false
-        });
-
-        tar.extract({
-            sync: true,
-            cwd: func['path'],
-            file: compressedFileName,
-            strict: false,
-        });
-
-        fs.rmSync(compressedFileName);
-
-        if (withVariables) {
-            const envFileLocation = `${func['path']}/.env`
-            try {
-                fs.rmSync(envFileLocation);
-            } catch {
-            }
-
-            fs.writeFileSync(envFileLocation, holdingVars.map((r: any) => `${r.key}=${r.value}\n`).join(''))
-        }
+    if (!fs.existsSync(func["path"])) {
+      fs.mkdirSync(func["path"], { recursive: true });
     }
 
-    success(`Successfully pulled ${chalk.bold(total)} functions.`);
-}
-
-const pullSites = async ({ code, withVariables }: PullSitesOptions = {}): Promise<void> => {
-    process.chdir(localConfig.configDirectoryPath)
-
-    log("Fetching sites ...");
-    let total = 0;
+    if (code === false) {
+      warn("Source code download skipped.");
+      continue;
+    }
 
-    const fetchResponse = await sitesList({
-        queries: [JSON.stringify({ method: 'limit', values: [1] })],
-        parseOutput: false
-    });
-    if (fetchResponse["sites"].length <= 0) {
-        log("No sites found.");
-        success(`Successfully pulled ${chalk.bold(total)} sites.`);
-        return;
+    if (allowCodePull === null) {
+      const codeAnswer = await inquirer.prompt(questionsPullFunctionsCode);
+      allowCodePull = codeAnswer.override;
     }
 
-    const sites = cliConfig.all
-        ? (await paginate(sitesList, { parseOutput: false }, 100, 'sites')).sites
-        : (await inquirer.prompt(questionsPullSites)).sites;
-
-    let allowCodePull: boolean | null = cliConfig.force === true ? true : null;
-
-    for (let site of sites) {
-        total++;
-        log(`Pulling site ${chalk.bold(site['name'])} ...`);
-
-        const localSite = localConfig.getSite(site.$id);
-
-        site['path'] = localSite['path'];
-        if (!localSite['path']) {
-            site['path'] = `sites/${site.name}`;
-        }
-        const holdingVars = site['vars'];
-        // We don't save var in to the config
-        delete site['vars'];
-        localConfig.addSite(site);
-
-        if (!fs.existsSync(site['path'])) {
-            fs.mkdirSync(site['path'], { recursive: true });
-        }
-
-        if (code === false) {
-            warn("Source code download skipped.");
-            continue;
-        }
-
-        if (allowCodePull === null) {
-            const codeAnswer = await inquirer.prompt(questionsPullSitesCode);
-            allowCodePull = codeAnswer.override;
-        }
-
-        if (!allowCodePull) {
-            continue;
-        }
-
-        let deploymentId: string | null = null;
-
-        try {
-            const fetchResponse = await sitesListDeployments({
-                siteId: site['$id'],
-                queries: [
-                    JSON.stringify({ method: 'limit', values: [1] }),
-                    JSON.stringify({ method: 'orderDesc', values: ['$id'] })
-                ],
-                parseOutput: false
-            });
-
-            if (fetchResponse['total'] > 0) {
-                deploymentId = fetchResponse['deployments'][0]['$id'];
-            }
-
-        } catch {
-        }
-
-        if (deploymentId === null) {
-            log("Source code download skipped because site doesn't have any available deployment");
-            continue;
-        }
-
-        log("Pulling latest deployment code ...");
-
-        const compressedFileName = `${site['$id']}-${+new Date()}.tar.gz`
-        await sitesGetDeploymentDownload({
-            siteId: site['$id'],
-            deploymentId,
-            destination: compressedFileName,
-            overrideForCli: true,
-            parseOutput: false
-        });
-
-        tar.extract({
-            sync: true,
-            cwd: site['path'],
-            file: compressedFileName,
-            strict: false,
-        });
-
-        fs.rmSync(compressedFileName);
-
-        if (withVariables) {
-            const envFileLocation = `${site['path']}/.env`
-            try {
-                fs.rmSync(envFileLocation);
-            } catch {
-            }
-
-            fs.writeFileSync(envFileLocation, holdingVars.map((r: any) => `${r.key}=${r.value}\n`).join(''))
-        }
+    if (!allowCodePull) {
+      continue;
     }
 
-    success(`Successfully pulled ${chalk.bold(total)} sites.`);
-}
+    let deploymentId: string | null = null;
 
-const pullCollection = async (): Promise<void> => {
-    warn("appwrite pull collection has been deprecated. Please consider using 'appwrite pull tables' instead");
-    log("Fetching collections ...");
-    let totalDatabases = 0;
-    let totalCollections = 0;
-
-    const fetchResponse = await databasesList({
-        queries: [JSON.stringify({ method: 'limit', values: [1] })],
-        parseOutput: false
-    });
-    if (fetchResponse["databases"].length <= 0) {
-        log("No collections found.");
-        success(`Successfully pulled ${chalk.bold(totalCollections)} collections from ${chalk.bold(totalDatabases)} databases.`);
-        return;
+    try {
+      const fetchResponse = await functionsService.listDeployments({
+        functionId: func["$id"],
+        queries: [
+          JSON.stringify({ method: "limit", values: [1] }),
+          JSON.stringify({ method: "orderDesc", values: ["$id"] }),
+        ],
+      });
+
+      if (fetchResponse["total"] > 0) {
+        deploymentId = fetchResponse["deployments"][0]["$id"];
+      }
+    } catch {}
+
+    if (deploymentId === null) {
+      log(
+        "Source code download skipped because function doesn't have any available deployment",
+      );
+      continue;
     }
 
-    let databases: string[] = cliConfig.ids;
+    log("Pulling latest deployment code ...");
 
-    if (databases.length === 0) {
-        if (cliConfig.all) {
-            databases = (await paginate(databasesList, { parseOutput: false }, 100, 'databases')).databases.map((database: any) => database.$id);
-        } else {
-            databases = (await inquirer.prompt(questionsPullCollection)).databases;
-        }
-    }
+    const compressedFileName = `${func["$id"]}-${+new Date()}.tar.gz`;
+    const downloadUrl = functionsService.getDeploymentDownload({
+      functionId: func["$id"],
+      deploymentId: deploymentId,
+    });
 
-    for (const databaseId of databases) {
-        const database = await databasesGet({
-            databaseId,
-            parseOutput: false
-        });
-
-        totalDatabases++;
-        log(`Pulling all collections from ${chalk.bold(database['name'])} database ...`);
-
-        localConfig.addDatabase(database);
-
-        const { collections } = await paginate(databasesListCollections, {
-            databaseId,
-            parseOutput: false
-        }, 100, 'collections');
-
-        for (const collection of collections) {
-            totalCollections++;
-            localConfig.addCollection({
-                ...collection,
-                '$createdAt': undefined,
-                '$updatedAt': undefined
-            });
-        }
-    }
+    const client = (await getFunctionsService()).client;
+    const downloadBuffer = await client.call(
+      "get",
+      new URL(downloadUrl),
+      {},
+      {},
+      "arrayBuffer",
+    );
+
+    fs.writeFileSync(compressedFileName, Buffer.from(downloadBuffer as any));
+
+    tar.extract({
+      sync: true,
+      cwd: func["path"],
+      file: compressedFileName,
+      strict: false,
+    });
 
-    success(`Successfully pulled ${chalk.bold(totalCollections)} collections from ${chalk.bold(totalDatabases)} databases.`);
-}
+    fs.rmSync(compressedFileName);
 
-const pullTable = async (): Promise<void> => {
-    log("Fetching tables ...");
-    let totalTablesDBs = 0;
-    let totalTables = 0;
+    if (withVariables) {
+      const envFileLocation = `${func["path"]}/.env`;
+      try {
+        fs.rmSync(envFileLocation);
+      } catch {}
 
-    const fetchResponse = await tablesDBList({
-        queries: [JSON.stringify({ method: 'limit', values: [1] })],
-        parseOutput: false
-    });
-    if (fetchResponse["databases"].length <= 0) {
-        log("No tables found.");
-        success(`Successfully pulled ${chalk.bold(totalTables)} tables from ${chalk.bold(totalTablesDBs)} tableDBs.`);
-        return;
+      fs.writeFileSync(
+        envFileLocation,
+        holdingVars.map((r: any) => `${r.key}=${r.value}\n`).join(""),
+      );
     }
+  }
 
-    let databases: string[] = cliConfig.ids;
+  success(`Successfully pulled ${chalk.bold(total)} functions.`);
+};
 
-    if (databases.length === 0) {
-        if (cliConfig.all) {
-            databases = (await paginate(tablesDBList, { parseOutput: false }, 100, 'databases')).databases.map((database: any) => database.$id);
-        } else {
-            databases = (await inquirer.prompt(questionsPullCollection)).databases;
-        }
+const pullSites = async ({
+  code,
+  withVariables,
+}: PullSitesOptions = {}): Promise<void> => {
+  process.chdir(localConfig.configDirectoryPath);
+
+  log("Fetching sites ...");
+  let total = 0;
+
+  const sitesService = await getSitesService();
+  const fetchResponse = await sitesService.list([
+    JSON.stringify({ method: "limit", values: [1] }),
+  ]);
+  if (fetchResponse["sites"].length <= 0) {
+    log("No sites found.");
+    success(`Successfully pulled ${chalk.bold(total)} sites.`);
+    return;
+  }
+
+  const sites = cliConfig.all
+    ? (
+        await paginate(
+          async () => (await getSitesService()).list(),
+          {},
+          100,
+          "sites",
+        )
+      ).sites
+    : (await inquirer.prompt(questionsPullSites)).sites;
+
+  let allowCodePull: boolean | null = cliConfig.force === true ? true : null;
+
+  for (let site of sites) {
+    total++;
+    log(`Pulling site ${chalk.bold(site["name"])} ...`);
+
+    const localSite = localConfig.getSite(site.$id);
+
+    site["path"] = localSite["path"];
+    if (!localSite["path"]) {
+      site["path"] = `sites/${site.name}`;
     }
+    const holdingVars = site["vars"];
+    // We don't save var in to the config
+    delete site["vars"];
+    localConfig.addSite(site);
 
-    for (const databaseId of databases) {
-        const database = await tablesDBGet({
-            databaseId,
-            parseOutput: false
-        });
-
-        totalTablesDBs++;
-        log(`Pulling all tables from ${chalk.bold(database['name'])} database ...`);
-
-        localConfig.addTablesDB(database);
-
-        const { tables } = await paginate(tablesDBListTables, {
-            databaseId,
-            parseOutput: false
-        }, 100, 'tables');
-
-        for (const table of tables) {
-            totalTables++;
-            localConfig.addTable({
-                ...table,
-                '$createdAt': undefined,
-                '$updatedAt': undefined
-            });
-        }
+    if (!fs.existsSync(site["path"])) {
+      fs.mkdirSync(site["path"], { recursive: true });
     }
 
-    success(`Successfully pulled ${chalk.bold(totalTables)} tables from ${chalk.bold(totalTablesDBs)} tableDBs.`);
-}
+    if (code === false) {
+      warn("Source code download skipped.");
+      continue;
+    }
 
-const pullBucket = async (): Promise<void> => {
-    log("Fetching buckets ...");
-    let total = 0;
+    if (allowCodePull === null) {
+      const codeAnswer = await inquirer.prompt(questionsPullSitesCode);
+      allowCodePull = codeAnswer.override;
+    }
 
-    const fetchResponse = await storageListBuckets({
-        queries: [JSON.stringify({ method: 'limit', values: [1] })],
-        parseOutput: false
-    });
-    if (fetchResponse["buckets"].length <= 0) {
-        log("No buckets found.");
-        success(`Successfully pulled ${chalk.bold(total)} buckets.`);
-        return;
+    if (!allowCodePull) {
+      continue;
     }
 
-    const { buckets } = await paginate(storageListBuckets, { parseOutput: false }, 100, 'buckets');
+    let deploymentId: string | null = null;
 
-    for (const bucket of buckets) {
-        total++;
-        log(`Pulling bucket ${chalk.bold(bucket['name'])} ...`);
-        localConfig.addBucket(bucket);
+    try {
+      const fetchResponse = await sitesService.listDeployments({
+        siteId: site["$id"],
+        queries: [
+          JSON.stringify({ method: "limit", values: [1] }),
+          JSON.stringify({ method: "orderDesc", values: ["$id"] }),
+        ],
+      });
+
+      if (fetchResponse["total"] > 0) {
+        deploymentId = fetchResponse["deployments"][0]["$id"];
+      }
+    } catch {}
+
+    if (deploymentId === null) {
+      log(
+        "Source code download skipped because site doesn't have any available deployment",
+      );
+      continue;
     }
 
-    success(`Successfully pulled ${chalk.bold(total)} buckets.`);
-}
+    log("Pulling latest deployment code ...");
 
-const pullTeam = async (): Promise<void> => {
-    log("Fetching teams ...");
-    let total = 0;
+    const compressedFileName = `${site["$id"]}-${+new Date()}.tar.gz`;
+    const downloadUrl = sitesService.getDeploymentDownload({
+      siteId: site["$id"],
+      deploymentId: deploymentId,
+    });
 
-    const fetchResponse = await teamsList({
-        queries: [JSON.stringify({ method: 'limit', values: [1] })],
-        parseOutput: false
+    const client = (await getSitesService()).client;
+    const downloadBuffer = await client.call(
+      "get",
+      new URL(downloadUrl),
+      {},
+      {},
+      "arrayBuffer",
+    );
+
+    fs.writeFileSync(compressedFileName, Buffer.from(downloadBuffer as any));
+
+    tar.extract({
+      sync: true,
+      cwd: site["path"],
+      file: compressedFileName,
+      strict: false,
     });
-    if (fetchResponse["teams"].length <= 0) {
-        log("No teams found.");
-        success(`Successfully pulled ${chalk.bold(total)} teams.`);
-        return;
-    }
 
-    const { teams } = await paginate(teamsList, { parseOutput: false }, 100, 'teams');
+    fs.rmSync(compressedFileName);
 
-    for (const team of teams) {
-        total++;
-        log(`Pulling team ${chalk.bold(team['name'])} ...`);
-        localConfig.addTeam(team);
-    }
+    if (withVariables) {
+      const envFileLocation = `${site["path"]}/.env`;
+      try {
+        fs.rmSync(envFileLocation);
+      } catch {}
 
-    success(`Successfully pulled ${chalk.bold(total)} teams.`);
-}
+      fs.writeFileSync(
+        envFileLocation,
+        holdingVars.map((r: any) => `${r.key}=${r.value}\n`).join(""),
+      );
+    }
+  }
 
-const pullMessagingTopic = async (): Promise<void> => {
-    log("Fetching topics ...");
-    let total = 0;
+  success(`Successfully pulled ${chalk.bold(total)} sites.`);
+};
 
-    const fetchResponse = await messagingListTopics({
-        queries: [JSON.stringify({ method: 'limit', values: [1] })],
-        parseOutput: false
-    });
-    if (fetchResponse["topics"].length <= 0) {
-        log("No topics found.");
-        success(`Successfully pulled ${chalk.bold(total)} topics.`);
-        return;
+const pullCollection = async (): Promise<void> => {
+  warn(
+    "appwrite pull collection has been deprecated. Please consider using 'appwrite pull tables' instead",
+  );
+  log("Fetching collections ...");
+  let totalDatabases = 0;
+  let totalCollections = 0;
+
+  const databasesService = await getDatabasesService();
+  const fetchResponse = await databasesService.list([
+    JSON.stringify({ method: "limit", values: [1] }),
+  ]);
+  if (fetchResponse["databases"].length <= 0) {
+    log("No collections found.");
+    success(
+      `Successfully pulled ${chalk.bold(totalCollections)} collections from ${chalk.bold(totalDatabases)} databases.`,
+    );
+    return;
+  }
+
+  let databases: string[] = cliConfig.ids;
+
+  if (databases.length === 0) {
+    if (cliConfig.all) {
+      databases = (
+        await paginate(
+          async () => (await getDatabasesService()).list(),
+          {},
+          100,
+          "databases",
+        )
+      ).databases.map((database: any) => database.$id);
+    } else {
+      databases = (await inquirer.prompt(questionsPullCollection)).databases;
     }
+  }
+
+  for (const databaseId of databases) {
+    const database = await databasesService.get(databaseId);
+
+    totalDatabases++;
+    log(
+      `Pulling all collections from ${chalk.bold(database["name"])} database ...`,
+    );
+
+    localConfig.addDatabase(database);
+
+    const { collections } = await paginate(
+      async () => (await getDatabasesService()).listCollections(databaseId),
+      {},
+      100,
+      "collections",
+    );
+
+    for (const collection of collections) {
+      totalCollections++;
+      localConfig.addCollection({
+        ...collection,
+        $createdAt: undefined,
+        $updatedAt: undefined,
+      });
+    }
+  }
 
-    const { topics } = await paginate(messagingListTopics, { parseOutput: false }, 100, 'topics');
+  success(
+    `Successfully pulled ${chalk.bold(totalCollections)} collections from ${chalk.bold(totalDatabases)} databases.`,
+  );
+};
 
-    for (const topic of topics) {
-        total++;
-        log(`Pulling topic ${chalk.bold(topic['name'])} ...`);
-        localConfig.addMessagingTopic(topic);
+const pullTable = async (): Promise<void> => {
+  log("Fetching tables ...");
+  let totalTablesDBs = 0;
+  let totalTables = 0;
+
+  const tablesDBService = await getTablesDBService();
+  const fetchResponse = await tablesDBService.list([
+    JSON.stringify({ method: "limit", values: [1] }),
+  ]);
+  if (fetchResponse["databases"].length <= 0) {
+    log("No tables found.");
+    success(
+      `Successfully pulled ${chalk.bold(totalTables)} tables from ${chalk.bold(totalTablesDBs)} tableDBs.`,
+    );
+    return;
+  }
+
+  let databases: string[] = cliConfig.ids;
+
+  if (databases.length === 0) {
+    if (cliConfig.all) {
+      databases = (
+        await paginate(
+          async () => (await getTablesDBService()).list(),
+          {},
+          100,
+          "databases",
+        )
+      ).databases.map((database: any) => database.$id);
+    } else {
+      databases = (await inquirer.prompt(questionsPullCollection)).databases;
     }
+  }
+
+  for (const databaseId of databases) {
+    const database = await tablesDBService.get(databaseId);
+
+    totalTablesDBs++;
+    log(`Pulling all tables from ${chalk.bold(database["name"])} database ...`);
+
+    localConfig.addTablesDB(database);
+
+    const { tables } = await paginate(
+      async () => (await getTablesDBService()).listTables(databaseId),
+      {},
+      100,
+      "tables",
+    );
+
+    for (const table of tables) {
+      totalTables++;
+      localConfig.addTable({
+        ...table,
+        $createdAt: undefined,
+        $updatedAt: undefined,
+      });
+    }
+  }
+
+  success(
+    `Successfully pulled ${chalk.bold(totalTables)} tables from ${chalk.bold(totalTablesDBs)} tableDBs.`,
+  );
+};
+
+const pullBucket = async (): Promise<void> => {
+  log("Fetching buckets ...");
+  let total = 0;
+
+  const storageService = await getStorageService();
+  const fetchResponse = await storageService.listBuckets([
+    JSON.stringify({ method: "limit", values: [1] }),
+  ]);
+  if (fetchResponse["buckets"].length <= 0) {
+    log("No buckets found.");
+    success(`Successfully pulled ${chalk.bold(total)} buckets.`);
+    return;
+  }
+
+  const { buckets } = await paginate(
+    async () => (await getStorageService()).listBuckets(),
+    {},
+    100,
+    "buckets",
+  );
+
+  for (const bucket of buckets) {
+    total++;
+    log(`Pulling bucket ${chalk.bold(bucket["name"])} ...`);
+    localConfig.addBucket(bucket);
+  }
+
+  success(`Successfully pulled ${chalk.bold(total)} buckets.`);
+};
+
+const pullTeam = async (): Promise<void> => {
+  log("Fetching teams ...");
+  let total = 0;
+
+  const teamsService = await getTeamsService();
+  const fetchResponse = await teamsService.list([
+    JSON.stringify({ method: "limit", values: [1] }),
+  ]);
+  if (fetchResponse["teams"].length <= 0) {
+    log("No teams found.");
+    success(`Successfully pulled ${chalk.bold(total)} teams.`);
+    return;
+  }
+
+  const { teams } = await paginate(
+    async () => (await getTeamsService()).list(),
+    {},
+    100,
+    "teams",
+  );
+
+  for (const team of teams) {
+    total++;
+    log(`Pulling team ${chalk.bold(team["name"])} ...`);
+    localConfig.addTeam(team);
+  }
+
+  success(`Successfully pulled ${chalk.bold(total)} teams.`);
+};
 
+const pullMessagingTopic = async (): Promise<void> => {
+  log("Fetching topics ...");
+  let total = 0;
+
+  const messagingService = await getMessagingService();
+  const fetchResponse = await messagingService.listTopics([
+    JSON.stringify({ method: "limit", values: [1] }),
+  ]);
+  if (fetchResponse["topics"].length <= 0) {
+    log("No topics found.");
     success(`Successfully pulled ${chalk.bold(total)} topics.`);
-}
+    return;
+  }
+
+  const { topics } = await paginate(
+    async () => (await getMessagingService()).listTopics(),
+    {},
+    100,
+    "topics",
+  );
+
+  for (const topic of topics) {
+    total++;
+    log(`Pulling topic ${chalk.bold(topic["name"])} ...`);
+    localConfig.addMessagingTopic(topic);
+  }
+
+  success(`Successfully pulled ${chalk.bold(total)} topics.`);
+};
 
 export const pull = new Command("pull")
-    .description(commandDescriptions['pull'])
-    .action(actionRunner(() => pullResources({ skipDeprecated: true })));
+  .description(commandDescriptions["pull"])
+  .action(actionRunner(() => pullResources({ skipDeprecated: true })));
 
 pull
-    .command("all")
-    .description("Pull all resource.")
-    .action(actionRunner(() => {
-        cliConfig.all = true;
-        return pullResources({
-            skipDeprecated: true
-        });
-    }));
+  .command("all")
+  .description("Pull all resource.")
+  .action(
+    actionRunner(() => {
+      cliConfig.all = true;
+      return pullResources({
+        skipDeprecated: true,
+      });
+    }),
+  );
 
 pull
-    .command("settings")
-    .description("Pull your Appwrite project name, services and auth settings")
-    .action(actionRunner(pullSettings));
+  .command("settings")
+  .description("Pull your Appwrite project name, services and auth settings")
+  .action(actionRunner(pullSettings));
 
 pull
-    .command("function")
-    .alias("functions")
-    .description("Pull your Appwrite cloud function")
-    .option("--no-code", "Don't pull the function's code")
-    .option("--with-variables", `Pull function variables. ${chalk.red('recommend for testing purposes only')}`)
-    .action(actionRunner(pullFunctions))
+  .command("function")
+  .alias("functions")
+  .description("Pull your Appwrite cloud function")
+  .option("--no-code", "Don't pull the function's code")
+  .option(
+    "--with-variables",
+    `Pull function variables. ${chalk.red("recommend for testing purposes only")}`,
+  )
+  .action(actionRunner(pullFunctions));
 
 pull
-    .command("site")
-    .alias("sites")
-    .description("Pull your Appwrite site")
-    .option("--no-code", "Don't pull the site's code")
-    .option("--with-variables", `Pull site variables. ${chalk.red('recommend for testing purposes only')}`)
-    .action(actionRunner(pullSites))
+  .command("site")
+  .alias("sites")
+  .description("Pull your Appwrite site")
+  .option("--no-code", "Don't pull the site's code")
+  .option(
+    "--with-variables",
+    `Pull site variables. ${chalk.red("recommend for testing purposes only")}`,
+  )
+  .action(actionRunner(pullSites));
 
 pull
-    .command("collection")
-    .alias("collections")
-    .description("Pull your Appwrite collections (deprecated, please use 'pull tables' instead)")
-    .action(actionRunner(pullCollection))
+  .command("collection")
+  .alias("collections")
+  .description(
+    "Pull your Appwrite collections (deprecated, please use 'pull tables' instead)",
+  )
+  .action(actionRunner(pullCollection));
 
 pull
-    .command("table")
-    .alias("tables")
-    .description("Pull your Appwrite tables")
-    .action(actionRunner(pullTable))
+  .command("table")
+  .alias("tables")
+  .description("Pull your Appwrite tables")
+  .action(actionRunner(pullTable));
 
 pull
-    .command("bucket")
-    .alias("buckets")
-    .description("Pull your Appwrite buckets")
-    .action(actionRunner(pullBucket))
+  .command("bucket")
+  .alias("buckets")
+  .description("Pull your Appwrite buckets")
+  .action(actionRunner(pullBucket));
 
 pull
-    .command("team")
-    .alias("teams")
-    .description("Pull your Appwrite teams")
-    .action(actionRunner(pullTeam))
+  .command("team")
+  .alias("teams")
+  .description("Pull your Appwrite teams")
+  .action(actionRunner(pullTeam));
 
 pull
-    .command("topic")
-    .alias("topics")
-    .description("Pull your Appwrite messaging topics")
-    .action(actionRunner(pullMessagingTopic))
-
+  .command("topic")
+  .alias("topics")
+  .description("Pull your Appwrite messaging topics")
+  .action(actionRunner(pullMessagingTopic));