appwrite-cli 1.1.1 → 2.0.0

package/lib/commands/users.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 users = new Command("users").description(commandDescriptions['users'])
+const users = new Command("users").description(commandDescriptions['users']).configureHelp({
+    helpWidth: process.stdout.columns || 80
+  })
 
 const usersList = async ({ queries, search, parseOutput = true, sdk = undefined}) => {
     /* @param {string[]} queries */
@@ -51,22 +53,27 @@ const usersCreate = async ({ userId, email, phone, password, name, parseOutput =
     let payload = {};
     
     /** Body Params */
+
     if (typeof userId !== 'undefined') {
         payload['userId'] = userId;
     }
 
+
     if (typeof email !== 'undefined') {
         payload['email'] = email;
     }
 
+
     if (typeof phone !== 'undefined') {
         payload['phone'] = phone;
     }
 
+
     if (typeof password !== 'undefined') {
         payload['password'] = password;
     }
 
+
     if (typeof name !== 'undefined') {
         payload['name'] = name;
     }
@@ -94,18 +101,22 @@ const usersCreateArgon2User = async ({ userId, email, password, name, parseOutpu
     let payload = {};
     
     /** Body Params */
+
     if (typeof userId !== 'undefined') {
         payload['userId'] = userId;
     }
 
+
     if (typeof email !== 'undefined') {
         payload['email'] = email;
     }
 
+
     if (typeof password !== 'undefined') {
         payload['password'] = password;
     }
 
+
     if (typeof name !== 'undefined') {
         payload['name'] = name;
     }
@@ -133,18 +144,22 @@ const usersCreateBcryptUser = async ({ userId, email, password, name, parseOutpu
     let payload = {};
     
     /** Body Params */
+
     if (typeof userId !== 'undefined') {
         payload['userId'] = userId;
     }
 
+
     if (typeof email !== 'undefined') {
         payload['email'] = email;
     }
 
+
     if (typeof password !== 'undefined') {
         payload['password'] = password;
     }
 
+
     if (typeof name !== 'undefined') {
         payload['name'] = name;
     }
@@ -172,18 +187,22 @@ const usersCreateMD5User = async ({ userId, email, password, name, parseOutput =
     let payload = {};
     
     /** Body Params */
+
     if (typeof userId !== 'undefined') {
         payload['userId'] = userId;
     }
 
+
     if (typeof email !== 'undefined') {
         payload['email'] = email;
     }
 
+
     if (typeof password !== 'undefined') {
         payload['password'] = password;
     }
 
+
     if (typeof name !== 'undefined') {
         payload['name'] = name;
     }
@@ -211,18 +230,22 @@ const usersCreatePHPassUser = async ({ userId, email, password, name, parseOutpu
     let payload = {};
     
     /** Body Params */
+
     if (typeof userId !== 'undefined') {
         payload['userId'] = userId;
     }
 
+
     if (typeof email !== 'undefined') {
         payload['email'] = email;
     }
 
+
     if (typeof password !== 'undefined') {
         payload['password'] = password;
     }
 
+
     if (typeof name !== 'undefined') {
         payload['name'] = name;
     }
@@ -255,38 +278,47 @@ const usersCreateScryptUser = async ({ userId, email, password, passwordSalt, pa
     let payload = {};
     
     /** Body Params */
+
     if (typeof userId !== 'undefined') {
         payload['userId'] = userId;
     }
 
+
     if (typeof email !== 'undefined') {
         payload['email'] = email;
     }
 
+
     if (typeof password !== 'undefined') {
         payload['password'] = password;
     }
 
+
     if (typeof passwordSalt !== 'undefined') {
         payload['passwordSalt'] = passwordSalt;
     }
 
+
     if (typeof passwordCpu !== 'undefined') {
         payload['passwordCpu'] = passwordCpu;
     }
 
+
     if (typeof passwordMemory !== 'undefined') {
         payload['passwordMemory'] = passwordMemory;
     }
 
+
     if (typeof passwordParallel !== 'undefined') {
         payload['passwordParallel'] = passwordParallel;
     }
 
+
     if (typeof passwordLength !== 'undefined') {
         payload['passwordLength'] = passwordLength;
     }
 
+
     if (typeof name !== 'undefined') {
         payload['name'] = name;
     }
@@ -317,30 +349,37 @@ const usersCreateScryptModifiedUser = async ({ userId, email, password, password
     let payload = {};
     
     /** Body Params */
+
     if (typeof userId !== 'undefined') {
         payload['userId'] = userId;
     }
 
+
     if (typeof email !== 'undefined') {
         payload['email'] = email;
     }
 
+
     if (typeof password !== 'undefined') {
         payload['password'] = password;
     }
 
+
     if (typeof passwordSalt !== 'undefined') {
         payload['passwordSalt'] = passwordSalt;
     }
 
+
     if (typeof passwordSaltSeparator !== 'undefined') {
         payload['passwordSaltSeparator'] = passwordSaltSeparator;
     }
 
+
     if (typeof passwordSignerKey !== 'undefined') {
         payload['passwordSignerKey'] = passwordSignerKey;
     }
 
+
     if (typeof name !== 'undefined') {
         payload['name'] = name;
     }
@@ -369,22 +408,27 @@ const usersCreateSHAUser = async ({ userId, email, password, passwordVersion, na
     let payload = {};
     
     /** Body Params */
+
     if (typeof userId !== 'undefined') {
         payload['userId'] = userId;
     }
 
+
     if (typeof email !== 'undefined') {
         payload['email'] = email;
     }
 
+
     if (typeof password !== 'undefined') {
         payload['password'] = password;
     }
 
+
     if (typeof passwordVersion !== 'undefined') {
         payload['passwordVersion'] = passwordVersion;
     }
 
+
     if (typeof name !== 'undefined') {
         payload['name'] = name;
     }
@@ -473,6 +517,7 @@ const usersUpdateEmail = async ({ userId, email, parseOutput = true, sdk = undef
     let payload = {};
     
     /** Body Params */
+
     if (typeof email !== 'undefined') {
         payload['email'] = email;
     }
@@ -540,6 +585,7 @@ const usersUpdateName = async ({ userId, name, parseOutput = true, sdk = undefin
     let payload = {};
     
     /** Body Params */
+
     if (typeof name !== 'undefined') {
         payload['name'] = name;
     }
@@ -565,6 +611,7 @@ const usersUpdatePassword = async ({ userId, password, parseOutput = true, sdk =
     let payload = {};
     
     /** Body Params */
+
     if (typeof password !== 'undefined') {
         payload['password'] = password;
     }
@@ -590,6 +637,7 @@ const usersUpdatePhone = async ({ userId, number, parseOutput = true, sdk = unde
     let payload = {};
     
     /** Body Params */
+
     if (typeof number !== 'undefined') {
         payload['number'] = number;
     }
@@ -713,6 +761,7 @@ const usersUpdateStatus = async ({ userId, status, parseOutput = true, sdk = und
     let payload = {};
     
     /** Body Params */
+
     if (typeof status !== 'undefined') {
         payload['status'] = status;
     }
@@ -738,6 +787,7 @@ const usersUpdateEmailVerification = async ({ userId, emailVerification, parseOu
     let payload = {};
     
     /** Body Params */
+
     if (typeof emailVerification !== 'undefined') {
         payload['emailVerification'] = emailVerification;
     }
@@ -763,6 +813,7 @@ const usersUpdatePhoneVerification = async ({ userId, phoneVerification, parseOu
     let payload = {};
     
     /** Body Params */
+
     if (typeof phoneVerification !== 'undefined') {
         payload['phoneVerification'] = phoneVerification;
     }
@@ -783,14 +834,14 @@ const usersUpdatePhoneVerification = async ({ userId, phoneVerification, parseOu
 users
     .command(`list`)
     .description(`Get a list of all the project's users. You can use the query params to filter your results.`)
-    .option(`--queries <queries...>`, `Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of 100 queries are allowed, each 4096 characters long. You may filter on the following attributes: name, email, phone, status, passwordUpdate, registration, emailVerification, phoneVerification`)
+    .option(`--queries [queries...]`, `Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of 100 queries are allowed, each 4096 characters long. You may filter on the following attributes: name, email, phone, status, passwordUpdate, registration, emailVerification, phoneVerification`)
     .option(`--search <search>`, `Search term to filter your list results. Max length: 256 chars.`)
     .action(actionRunner(usersList))
 
 users
     .command(`create`)
     .description(`Create a new user.`)
-    .requiredOption(`--userId <userId>`, `User ID. Choose your own unique ID or pass the string "unique()" to auto generate it. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.`)
+    .requiredOption(`--userId <userId>`, `User ID. Choose a custom ID or generate a random ID with 'ID.unique()'. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.`)
     .option(`--email <email>`, `User email.`)
     .option(`--phone <phone>`, `Phone number. Format this number with a leading '+' and a country code, e.g., +16175551212.`)
     .option(`--password <password>`, `Plain text user password. Must be at least 8 chars.`)
@@ -800,7 +851,7 @@ users
 users
     .command(`createArgon2User`)
     .description(`Create a new user. Password provided must be hashed with the [Argon2](https://en.wikipedia.org/wiki/Argon2) algorithm. Use the [POST /users](/docs/server/users#usersCreate) endpoint to create users with a plain text password.`)
-    .requiredOption(`--userId <userId>`, `User ID. Choose your own unique ID or pass the string "unique()" to auto generate it. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.`)
+    .requiredOption(`--userId <userId>`, `User ID. Choose a custom ID or generate a random ID with 'ID.unique()'. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.`)
     .requiredOption(`--email <email>`, `User email.`)
     .requiredOption(`--password <password>`, `User password hashed using Argon2.`)
     .option(`--name <name>`, `User name. Max length: 128 chars.`)
@@ -809,7 +860,7 @@ users
 users
     .command(`createBcryptUser`)
     .description(`Create a new user. Password provided must be hashed with the [Bcrypt](https://en.wikipedia.org/wiki/Bcrypt) algorithm. Use the [POST /users](/docs/server/users#usersCreate) endpoint to create users with a plain text password.`)
-    .requiredOption(`--userId <userId>`, `User ID. Choose your own unique ID or pass the string "unique()" to auto generate it. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.`)
+    .requiredOption(`--userId <userId>`, `User ID. Choose a custom ID or generate a random ID with 'ID.unique()'. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.`)
     .requiredOption(`--email <email>`, `User email.`)
     .requiredOption(`--password <password>`, `User password hashed using Bcrypt.`)
     .option(`--name <name>`, `User name. Max length: 128 chars.`)
@@ -818,7 +869,7 @@ users
 users
     .command(`createMD5User`)
     .description(`Create a new user. Password provided must be hashed with the [MD5](https://en.wikipedia.org/wiki/MD5) algorithm. Use the [POST /users](/docs/server/users#usersCreate) endpoint to create users with a plain text password.`)
-    .requiredOption(`--userId <userId>`, `User ID. Choose your own unique ID or pass the string "unique()" to auto generate it. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.`)
+    .requiredOption(`--userId <userId>`, `User ID. Choose a custom ID or generate a random ID with 'ID.unique()'. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.`)
     .requiredOption(`--email <email>`, `User email.`)
     .requiredOption(`--password <password>`, `User password hashed using MD5.`)
     .option(`--name <name>`, `User name. Max length: 128 chars.`)
@@ -827,7 +878,7 @@ users
 users
     .command(`createPHPassUser`)
     .description(`Create a new user. Password provided must be hashed with the [PHPass](https://www.openwall.com/phpass/) algorithm. Use the [POST /users](/docs/server/users#usersCreate) endpoint to create users with a plain text password.`)
-    .requiredOption(`--userId <userId>`, `User ID. Choose your own unique ID or pass the string "unique()" to auto generate it. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.`)
+    .requiredOption(`--userId <userId>`, `User ID. Choose a custom ID or pass the string 'ID.unique()'to auto generate it. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.`)
     .requiredOption(`--email <email>`, `User email.`)
     .requiredOption(`--password <password>`, `User password hashed using PHPass.`)
     .option(`--name <name>`, `User name. Max length: 128 chars.`)
@@ -836,7 +887,7 @@ users
 users
     .command(`createScryptUser`)
     .description(`Create a new user. Password provided must be hashed with the [Scrypt](https://github.com/Tarsnap/scrypt) algorithm. Use the [POST /users](/docs/server/users#usersCreate) endpoint to create users with a plain text password.`)
-    .requiredOption(`--userId <userId>`, `User ID. Choose your own unique ID or pass the string "unique()" to auto generate it. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.`)
+    .requiredOption(`--userId <userId>`, `User ID. Choose a custom ID or generate a random ID with 'ID.unique()'. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.`)
     .requiredOption(`--email <email>`, `User email.`)
     .requiredOption(`--password <password>`, `User password hashed using Scrypt.`)
     .requiredOption(`--passwordSalt <passwordSalt>`, `Optional salt used to hash password.`)
@@ -850,7 +901,7 @@ users
 users
     .command(`createScryptModifiedUser`)
     .description(`Create a new user. Password provided must be hashed with the [Scrypt Modified](https://gist.github.com/Meldiron/eecf84a0225eccb5a378d45bb27462cc) algorithm. Use the [POST /users](/docs/server/users#usersCreate) endpoint to create users with a plain text password.`)
-    .requiredOption(`--userId <userId>`, `User ID. Choose your own unique ID or pass the string "unique()" to auto generate it. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.`)
+    .requiredOption(`--userId <userId>`, `User ID. Choose a custom ID or generate a random ID with 'ID.unique()'. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.`)
     .requiredOption(`--email <email>`, `User email.`)
     .requiredOption(`--password <password>`, `User password hashed using Scrypt Modified.`)
     .requiredOption(`--passwordSalt <passwordSalt>`, `Salt used to hash password.`)
@@ -862,7 +913,7 @@ users
 users
     .command(`createSHAUser`)
     .description(`Create a new user. Password provided must be hashed with the [SHA](https://en.wikipedia.org/wiki/Secure_Hash_Algorithm) algorithm. Use the [POST /users](/docs/server/users#usersCreate) endpoint to create users with a plain text password.`)
-    .requiredOption(`--userId <userId>`, `User ID. Choose your own unique ID or pass the string "unique()" to auto generate it. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.`)
+    .requiredOption(`--userId <userId>`, `User ID. Choose a custom ID or generate a random ID with 'ID.unique()'. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can't start with a special char. Max length is 36 chars.`)
     .requiredOption(`--email <email>`, `User email.`)
     .requiredOption(`--password <password>`, `User password hashed using SHA.`)
     .option(`--passwordVersion <passwordVersion>`, `Optional SHA version used to hash password. Allowed values are: 'sha1', 'sha224', 'sha256', 'sha384', 'sha512/224', 'sha512/256', 'sha512', 'sha3-224', 'sha3-256', 'sha3-384', 'sha3-512'`)
@@ -899,7 +950,7 @@ users
     .command(`listLogs`)
     .description(`Get the user activity logs list by its unique ID.`)
     .requiredOption(`--userId <userId>`, `User ID.`)
-    .option(`--queries <queries...>`, `Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Only supported methods are limit and offset`)
+    .option(`--queries [queries...]`, `Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset`)
     .action(actionRunner(usersListLogs))
 
 users

package/lib/config.js

@@ -22,7 +22,7 @@ class Config {
 
     write() {
         let dir = _path.dirname(this.path)
-        if (!fs.existsSync(dir)){
+        if (!fs.existsSync(dir)) {
             fs.mkdirSync(dir, { recursive: true });
         }
         fs.writeFileSync(this.path, JSONbig.stringify(this.data, null, 4));
@@ -135,7 +135,7 @@ class Local extends Config {
     }
 
     getCollection($id) {
-        if (!this.has("collection")) {
+        if (!this.has("collections")) {
             return {};
         }
 
@@ -156,7 +156,7 @@ class Local extends Config {
 
         let collections = this.get("collections");
         for (let i = 0; i < collections.length; i++) {
-            if (collections[i]['$id'] == props['$id']) {
+            if (collections[i]['$id'] == props['$id'] && collections[i]['databaseId'] == props['databaseId']) {
                 collections[i] = props;
                 this.set("collections", collections);
                 return;
@@ -166,6 +166,123 @@ class Local extends Config {
         this.set("collections", collections);
     }
 
+    getBuckets() {
+        if (!this.has("buckets")) {
+            return [];
+        }
+        return this.get("buckets");
+    }
+
+    getBucket($id) {
+        if (!this.has("buckets")) {
+            return {};
+        }
+
+        let buckets = this.get("buckets");
+        for (let i = 0; i < buckets.length; i++) {
+            if (buckets[i]['$id'] == $id) {
+                return buckets[i];
+            }
+        }
+
+        return {};
+    }
+
+    addBucket(props) {
+        if (!this.has("buckets")) {
+            this.set("buckets", []);
+        }
+
+        let buckets = this.get("buckets");
+        for (let i = 0; i < buckets.length; i++) {
+            if (buckets[i]['$id'] == props['$id']) {
+                buckets[i] = props;
+                this.set("buckets", buckets);
+                return;
+            }
+        }
+        buckets.push(props);
+        this.set("buckets", buckets);
+    }
+
+    getDatabases() {
+        if (!this.has("databases")) {
+            return [];
+        }
+        return this.get("databases");
+    }
+
+    getDatabase($id) {
+        if (!this.has("databases")) {
+            return {};
+        }
+
+        let databases = this.get("databases");
+        for (let i = 0; i < databases.length; i++) {
+            if (databases[i]['$id'] == $id) {
+                return databases[i];
+            }
+        }
+
+        return {};
+    }
+
+    addDatabase(props) {
+        if (!this.has("databases")) {
+            this.set("databases", []);
+        }
+
+        let databases = this.get("databases");
+        for (let i = 0; i < databases.length; i++) {
+            if (databases[i]['$id'] == props['$id']) {
+                databases[i] = props;
+                this.set("databases", databases);
+                return;
+            }
+        }
+        databases.push(props);
+        this.set("databases", databases);
+    }
+
+    getTeams() {
+        if (!this.has("teams")) {
+            return [];
+        }
+        return this.get("teams");
+    }
+
+    getTeam($id) {
+        if (!this.has("teams")) {
+            return {};
+        }
+
+        let teams = this.get("teams");
+        for (let i = 0; i < teams.length; i++) {
+            if (teams[i]['$id'] == $id) {
+                return teams[i];
+            }
+        }
+
+        return {};
+    }
+
+    addTeam(props) {
+        if (!this.has("teams")) {
+            this.set("teams", []);
+        }
+
+        let teams = this.get("teams");
+        for (let i = 0; i < teams.length; i++) {
+            if (teams[i]['$id'] == props['$id']) {
+                teams[i] = props;
+                this.set("teams", teams);
+                return;
+            }
+        }
+        teams.push(props);
+        this.set("teams", teams);
+    }
+
     getProject() {
         if (!this.has("projectId") || !this.has("projectName")) {
             return {};
@@ -261,6 +378,6 @@ class Global extends Config {
 }
 
 module.exports = {
-    localConfig : new Local(),
-    globalConfig : new Global(),
+    localConfig: new Local(),
+    globalConfig: new Global(),
 };

package/lib/parser.js

@@ -23,8 +23,12 @@ const parse = (data) => {
                 drawJSON(data[key]);
             }
         } else if (typeof data[key] === 'object') {
-            console.log(`${chalk.yellow.bold.underline(key)}`)
-            parse(data[key]);
+            if (data[key] && data[key].constructor.name === 'BigNumber') {
+                console.log(`${chalk.yellow.bold(key)} : ${data[key]}`);
+            } else {
+                console.log(`${chalk.yellow.bold.underline(key)}`)
+                parse(data[key]);
+            }
         } else {
             console.log(`${chalk.yellow.bold(key)} : ${data[key]}`);
         }
@@ -149,6 +153,7 @@ const logo = "\n    _                            _ _           ___   __   _____
 
 const commandDescriptions = {
     "account": `The account command allows you to authenticate and manage a user account.`,
+    "graphql": `The graphql command allows you to query and mutate any resource type on your Appwrite server.`,
     "avatars": `The avatars command aims to help you complete everyday tasks related to your app image, icons, and avatars.`,
     "databases": `The databases command allows you to create structured collections of documents, query and filter lists of documents.`,
     "deploy": `The deploy command provides a convenient wrapper for deploying your functions and collections.`,