appwrite-cli 1.1.1 → 2.0.0

package/lib/commands/init.js

@@ -3,206 +3,268 @@ const path = require("path");
 const childProcess = require('child_process');
 const { Command } = require("commander");
 const inquirer = require("inquirer");
-const { teamsCreate } = require("./teams");
+const { teamsCreate, teamsList } = require("./teams");
 const { projectsCreate } = require("./projects");
 const { functionsCreate } = require("./functions");
-const { databasesListCollections, databasesList } = require("./databases");
+const { databasesGet, databasesListCollections, databasesList } = require("./databases");
+const { storageListBuckets } = require("./storage");
 const { sdkForConsole } = require("../sdks");
 const { localConfig } = require("../config");
 const { questionsInitProject, questionsInitFunction, questionsInitCollection } = require("../questions");
 const { success, log, actionRunner, commandDescriptions } = require("../parser");
 
 const init = new Command("init")
-  .description(commandDescriptions['init'])
-  .action(actionRunner(async (_options, command) => {
-    command.help();
-  }));
+    .description(commandDescriptions['init'])
+    .configureHelp({
+        helpWidth: process.stdout.columns || 80
+    })
+    .action(actionRunner(async (_options, command) => {
+        command.help();
+    }));
 
 const initProject = async () => {
-  let response = {}
-  let answers = await inquirer.prompt(questionsInitProject)
-  if (!answers.project) process.exit(1)
-
-  let sdk = await sdkForConsole();
-  if (answers.start == "new") {
-    response = await teamsCreate({
-      teamId: 'unique()',
-      name: answers.project,
-      sdk,
-      parseOutput: false
-    })
+    let response = {}
+    let answers = await inquirer.prompt(questionsInitProject)
+    if (!answers.project) process.exit(1)
+
+    let sdk = await sdkForConsole();
+    if (answers.start == "new") {
+        response = await teamsCreate({
+            teamId: 'unique()',
+            name: answers.project,
+            sdk,
+            parseOutput: false
+        })
+
+        let teamId = response['$id'];
+        response = await projectsCreate({
+            projectId: answers.id,
+            name: answers.project,
+            teamId,
+            parseOutput: false
+        })
+
+        localConfig.setProject(response['$id'], response.name);
+    } else {
+        localConfig.setProject(answers.project.id, answers.project.name);
+    }
+    success();
+}
+
+const initFunction = async () => {
+    // TODO: Add CI/CD support (ID, name, runtime)
+    let answers = await inquirer.prompt(questionsInitFunction)
+    let functionFolder = path.join(process.cwd(), 'functions');
+
+    if (!fs.existsSync(functionFolder)) {
+        fs.mkdirSync(functionFolder, {
+            recursive: true
+        });
+    }
+
+    const functionDir = path.join(functionFolder, answers.name);
+
+    if (fs.existsSync(functionDir)) {
+        throw new Error(`( ${answers.name} ) already exists in the current directory. Please choose another name.`);
+    }
 
-    let teamId = response['$id'];
-    response = await projectsCreate({
-      projectId: answers.id,
-      name: answers.project,
-      teamId,
-      parseOutput: false
+    if (!answers.runtime.entrypoint) {
+        log(`Entrypoint for this runtime not found. You will be asked to configure entrypoint when you first deploy the function.`);
+    }
+
+    let response = await functionsCreate({
+        functionId: answers.id,
+        name: answers.name,
+        runtime: answers.runtime.id,
+        parseOutput: false
     })
 
-    localConfig.setProject(response['$id'], response.name);
-  } else {
-    localConfig.setProject(answers.project.id, answers.project.name);
-  }
-  success();
-}
+    fs.mkdirSync(functionDir, "777");
 
-const initFunction = async () => {
-  // TODO: Add CI/CD support (ID, name, runtime)
-  let answers = await inquirer.prompt(questionsInitFunction)
-  let functionFolder = path.join(process.cwd(), 'functions');
+    let gitInitCommands = "git clone --depth 1 --sparse https://github.com/appwrite/functions-starter ."; // depth prevents fetching older commits reducing the amount fetched
 
-  if (!fs.existsSync(functionFolder)) {
-    fs.mkdirSync(functionFolder, {
-      recursive: true
-    });
-  }
-
-  const functionDir = path.join(functionFolder, answers.name);
-
-  if (fs.existsSync(functionDir)) {
-    throw new Error(`( ${answers.name} ) already exists in the current directory. Please choose another name.`);
-  }
-
-  if(!answers.runtime.entrypoint) {
-    log(`Entrypoint for this runtime not found. You will be asked to configure entrypoint when you first deploy the function.`);
-  }
-
-  let response = await functionsCreate({
-    functionId: answers.id,
-    name: answers.name,
-    runtime: answers.runtime.id,
-    parseOutput: false
-  })
-
-  fs.mkdirSync(functionDir, "777");
-
-  let gitInitCommands = "git clone --depth 1 --sparse https://github.com/appwrite/functions-starter ."; // depth prevents fetching older commits reducing the amount fetched
-
-  let gitPullCommands = `git sparse-checkout add ${answers.runtime.id}`;
-
-  /* Force use CMD as powershell does not support && */
-  if (process.platform == 'win32') {
-    gitInitCommands = 'cmd /c "' + gitInitCommands + '"';
-    gitPullCommands = 'cmd /c "' + gitPullCommands + '"';
-  }
-
-  /*  Execute the child process but do not print any std output */
-  try {
-    childProcess.execSync(gitInitCommands, { stdio: 'pipe', cwd: functionDir });
-    childProcess.execSync(gitPullCommands, { stdio: 'pipe', cwd: functionDir });
-  } catch (error) {
-    /* Specialised errors with recommended actions to take */
-    if (error.message.includes('error: unknown option')) {
-      throw new Error(`${error.message} \n\nSuggestion: Try updating your git to the latest version, then trying to run this command again.`)
-    } else if (error.message.includes('is not recognized as an internal or external command,') || error.message.includes('command not found')) {
-      throw new Error(`${error.message} \n\nSuggestion: It appears that git is not installed, try installing git then trying to run this command again.`)
-    } else {
-      throw error;
+    let gitPullCommands = `git sparse-checkout add ${answers.runtime.id}`;
+
+    /* Force use CMD as powershell does not support && */
+    if (process.platform == 'win32') {
+        gitInitCommands = 'cmd /c "' + gitInitCommands + '"';
+        gitPullCommands = 'cmd /c "' + gitPullCommands + '"';
     }
-  }
-
-  fs.rmSync(path.join(functionDir, ".git"), { recursive: true });
-  const copyRecursiveSync = (src, dest) => {
-    let exists = fs.existsSync(src);
-    let stats = exists && fs.statSync(src);
-    let isDirectory = exists && stats.isDirectory();
-    if (isDirectory) {
-      if (!fs.existsSync(dest)) {
-        fs.mkdirSync(dest);
-      }
-
-      fs.readdirSync(src).forEach(function(childItemName) {
-        copyRecursiveSync(path.join(src, childItemName), path.join(dest, childItemName));
-      });
-    } else {
-      fs.copyFileSync(src, dest);
+
+    /*  Execute the child process but do not print any std output */
+    try {
+        childProcess.execSync(gitInitCommands, { stdio: 'pipe', cwd: functionDir });
+        childProcess.execSync(gitPullCommands, { stdio: 'pipe', cwd: functionDir });
+    } catch (error) {
+        /* Specialised errors with recommended actions to take */
+        if (error.message.includes('error: unknown option')) {
+            throw new Error(`${error.message} \n\nSuggestion: Try updating your git to the latest version, then trying to run this command again.`)
+        } else if (error.message.includes('is not recognized as an internal or external command,') || error.message.includes('command not found')) {
+            throw new Error(`${error.message} \n\nSuggestion: It appears that git is not installed, try installing git then trying to run this command again.`)
+        } else {
+            throw error;
+        }
     }
-  };
-  copyRecursiveSync(path.join(functionDir, answers.runtime.id), functionDir);
-
-  fs.rmSync(`${functionDir}/${answers.runtime.id}`, { recursive: true, force: true });
-
-  const readmePath = path.join(process.cwd(), 'functions', answers.name, 'README.md');
-  const readmeFile = fs.readFileSync(readmePath).toString();
-  const newReadmeFile = readmeFile.split('\n');
-  newReadmeFile[0] = `# ${answers.name}`;
-  newReadmeFile.splice(1, 2);
-  fs.writeFileSync(readmePath, newReadmeFile.join('\n'));
-
-  let data = {
-    $id: response['$id'],
-    name: response.name,
-    runtime: response.runtime,
-    path: `functions/${answers.name}`,
-    entrypoint: answers.runtime.entrypoint || '',
-    ignore: answers.runtime.ignore || null,
-    execute: response.execute,
-    events: response.events,
-    schedule: response.schedule,
-    timeout: response.timeout,
-  };
-
-  localConfig.addFunction(data);
-  success();
+
+    fs.rmSync(path.join(functionDir, ".git"), { recursive: true });
+    const copyRecursiveSync = (src, dest) => {
+        let exists = fs.existsSync(src);
+        let stats = exists && fs.statSync(src);
+        let isDirectory = exists && stats.isDirectory();
+        if (isDirectory) {
+            if (!fs.existsSync(dest)) {
+                fs.mkdirSync(dest);
+            }
+
+            fs.readdirSync(src).forEach(function (childItemName) {
+                copyRecursiveSync(path.join(src, childItemName), path.join(dest, childItemName));
+            });
+        } else {
+            fs.copyFileSync(src, dest);
+        }
+    };
+    copyRecursiveSync(path.join(functionDir, answers.runtime.id), functionDir);
+
+    fs.rmSync(`${functionDir}/${answers.runtime.id}`, { recursive: true, force: true });
+
+    const readmePath = path.join(process.cwd(), 'functions', answers.name, 'README.md');
+    const readmeFile = fs.readFileSync(readmePath).toString();
+    const newReadmeFile = readmeFile.split('\n');
+    newReadmeFile[0] = `# ${answers.name}`;
+    newReadmeFile.splice(1, 2);
+    fs.writeFileSync(readmePath, newReadmeFile.join('\n'));
+
+    let data = {
+        $id: response['$id'],
+        name: response.name,
+        runtime: response.runtime,
+        path: `functions/${answers.name}`,
+        entrypoint: answers.runtime.entrypoint || '',
+        ignore: answers.runtime.ignore || null,
+        execute: response.execute,
+        events: response.events,
+        schedule: response.schedule,
+        timeout: response.timeout,
+    };
+
+    localConfig.addFunction(data);
+    success();
 }
 
 const initCollection = async ({ all, databaseId } = {}) => {
-  const databaseIds = [];
+    const databaseIds = [];
+
+    if (databaseId) {
+        databaseIds.push(databaseId);
+    } else if (all) {
+        let allDatabases = await databasesList({
+            parseOutput: false
+        })
+
+        databaseIds.push(...allDatabases.databases.map((d) => d.$id));
+    }
+
+    if (databaseIds.length <= 0) {
+        let answers = await inquirer.prompt(questionsInitCollection)
+        if (!answers.databases) process.exit(1)
+        databaseIds.push(...answers.databases);
+    }
+
+    for (const databaseId of databaseIds) {
+        const database = await databasesGet({
+            databaseId,
+            parseOutput: false
+        });
+
+        localConfig.addDatabase(database);
+
+        // TODO: Pagination?
+        let response = await databasesListCollections({
+            databaseId,
+            queries: ['limit(100)'],
+            parseOutput: false
+        })
+
+        let collections = response.collections;
+        log(`Found ${collections.length} collections`);
+
+        collections.forEach(async collection => {
+            log(`Fetching ${collection.name} ...`);
+            localConfig.addCollection({
+                ...collection,
+                '$createdAt': undefined,
+                '$updatedAt': undefined,
+            });
+        });
+    }
+
+    success();
+}
 
-  if(databaseId) {
-    databaseIds.push(databaseId);
-  } else if(all) {
-      let allDatabases = await databasesList({
+const initBucket = async () => {
+    // TODO: Pagination?
+    let response = await storageListBuckets({
+        queries: ['limit(100)'],
         parseOutput: false
-      })
+    })
 
-      databaseIds.push(...allDatabases.databases.map((d) => d.$id));
-  }
+    let buckets = response.buckets;
+    log(`Found ${buckets.length} buckets`);
 
-  if(databaseIds.length <= 0) {
-      let answers = await inquirer.prompt(questionsInitCollection)
-      if (!answers.databases) process.exit(1)
-      databaseIds.push(...answers.databases);
-  }
+    buckets.forEach(async bucket => {
+        log(`Fetching ${bucket.name} ...`);
+        localConfig.addBucket(bucket);
+    });
+
+    success();
+}
 
-  for(const databaseId of databaseIds) {
+const initTeam = async () => {
     // TODO: Pagination?
-    let response = await databasesListCollections({
-      databaseId,
-      queries: [ 'limit(100)' ],
-      parseOutput: false
+    let response = await teamsList({
+        queries: ['limit(100)'],
+        parseOutput: false
     })
 
-    let collections = response.collections;
-    log(`Found ${collections.length} collections`);
+    let teams = response.teams;
+    log(`Found ${teams.length} teams`);
 
-    collections.forEach(async collection => {
-      log(`Fetching ${collection.name} ...`);
-      localConfig.addCollection(collection);
+    teams.forEach(async team => {
+        log(`Fetching ${team.name} ...`);
+        const { total, $updatedAt, $createdAt, prefs, ...rest } = team;
+        localConfig.addTeam(rest);
     });
-  }
 
-  success();
+    success();
 }
 
 init
-  .command("project")
-  .description("Initialise your Appwrite project")
-  .action(actionRunner(initProject));
+    .command("project")
+    .description("Initialise your Appwrite project")
+    .action(actionRunner(initProject));
+
+init
+    .command("function")
+    .description("Initialise your Appwrite cloud function")
+    .action(actionRunner(initFunction))
+
+init
+    .command("collection")
+    .description("Initialise your Appwrite collections")
+    .option(`--databaseId <databaseId>`, `Database ID`)
+    .option(`--all`, `Flag to initialize all databases`)
+    .action(actionRunner(initCollection))
 
 init
-  .command("function")
-  .description("Initialise your Appwrite cloud function")
-  .action(actionRunner(initFunction))
+    .command("bucket")
+    .description("Initialise your Appwrite buckets")
+    .action(actionRunner(initBucket))
 
 init
-  .command("collection")
-  .description("Initialise your Appwrite collections")
-  .option(`--databaseId <databaseId>`, `Database ID`)
-  .option(`--all`, `Flag to initialize all databases`)
-  .action(actionRunner(initCollection))
+    .command("team")
+    .description("Initialise your Appwrite teams")
+    .action(actionRunner(initTeam))
 
 module.exports = {
-  init,
+    init,
 };

package/lib/commands/locale.js

@@ -10,7 +10,9 @@ const { sdkForProject, sdkForConsole } = require('../sdks')
 const { parse, actionRunner, parseInteger, parseBool, commandDescriptions, success, log } = require('../parser')
 const { localConfig, globalConfig } = require("../config");
 
-const locale = new Command("locale").description(commandDescriptions['locale'])
+const locale = new Command("locale").description(commandDescriptions['locale']).configureHelp({
+    helpWidth: process.stdout.columns || 80
+  })
 
 const localeGet = async ({ parseOutput = true, sdk = undefined}) => {