appwrite-cli 6.0.0-rc.6 → 6.0.0-rc.7

package/lib/commands/users.js

@@ -35,7 +35,7 @@ function convertReadStreamToReadableStream(readStream) {
   });
 }
 
-const users = new Command("users").description(commandDescriptions['users']).configureHelp({
+const users = new Command("users").description(commandDescriptions['users'] ?? '').configureHelp({
     helpWidth: process.stdout.columns || 80
 })
 
@@ -74,7 +74,6 @@ const usersList = async ({queries,search,parseOutput = true, overrideForCli = fa
             showConsoleLink('users', 'list');
          } else {
             parse(response)
-            success()
         }
     }
 
@@ -126,7 +125,6 @@ const usersCreate = async ({userId,email,phone,password,name,parseOutput = true,
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -173,7 +171,6 @@ const usersCreateArgon2User = async ({userId,email,password,name,parseOutput = t
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -220,7 +217,6 @@ const usersCreateBcryptUser = async ({userId,email,password,name,parseOutput = t
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -259,7 +255,6 @@ const usersListIdentities = async ({queries,search,parseOutput = true, overrideF
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -291,7 +286,6 @@ const usersDeleteIdentity = async ({identityId,parseOutput = true, overrideForCl
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -338,7 +332,6 @@ const usersCreateMD5User = async ({userId,email,password,name,parseOutput = true
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -385,7 +378,6 @@ const usersCreatePHPassUser = async ({userId,email,password,name,parseOutput = t
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -452,7 +444,6 @@ const usersCreateScryptUser = async ({userId,email,password,passwordSalt,passwor
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -511,7 +502,6 @@ const usersCreateScryptModifiedUser = async ({userId,email,password,passwordSalt
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -562,7 +552,6 @@ const usersCreateSHAUser = async ({userId,email,password,passwordVersion,name,pa
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -597,7 +586,6 @@ const usersGetUsage = async ({range,parseOutput = true, overrideForCli = false,
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -632,7 +620,6 @@ const usersGet = async ({userId,parseOutput = true, overrideForCli = false, sdk
             showConsoleLink('users', 'get', userId);
          } else {
             parse(response)
-            success()
         }
     }
 
@@ -665,7 +652,6 @@ const usersDelete = async ({userId,parseOutput = true, overrideForCli = false, s
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -701,7 +687,6 @@ const usersUpdateEmail = async ({userId,email,parseOutput = true, overrideForCli
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -741,7 +726,6 @@ const usersCreateJWT = async ({userId,sessionId,duration,parseOutput = true, ove
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -778,7 +762,6 @@ const usersUpdateLabels = async ({userId,labels,parseOutput = true, overrideForC
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -814,7 +797,6 @@ const usersListLogs = async ({userId,queries,parseOutput = true, overrideForCli
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -846,7 +828,6 @@ const usersListMemberships = async ({userId,parseOutput = true, overrideForCli =
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -882,7 +863,6 @@ const usersUpdateMfa = async ({userId,mfa,parseOutput = true, overrideForCli = f
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -915,7 +895,6 @@ const usersDeleteMfaAuthenticator = async ({userId,type,parseOutput = true, over
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -947,7 +926,6 @@ const usersListMfaFactors = async ({userId,parseOutput = true, overrideForCli =
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -979,7 +957,6 @@ const usersGetMfaRecoveryCodes = async ({userId,parseOutput = true, overrideForC
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1011,7 +988,6 @@ const usersUpdateMfaRecoveryCodes = async ({userId,parseOutput = true, overrideF
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1043,7 +1019,6 @@ const usersCreateMfaRecoveryCodes = async ({userId,parseOutput = true, overrideF
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1079,7 +1054,6 @@ const usersUpdateName = async ({userId,name,parseOutput = true, overrideForCli =
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1115,7 +1089,6 @@ const usersUpdatePassword = async ({userId,password,parseOutput = true, override
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1151,7 +1124,6 @@ const usersUpdatePhone = async ({userId,number,parseOutput = true, overrideForCl
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1183,7 +1155,6 @@ const usersGetPrefs = async ({userId,parseOutput = true, overrideForCli = false,
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1219,7 +1190,6 @@ const usersUpdatePrefs = async ({userId,prefs,parseOutput = true, overrideForCli
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1254,7 +1224,6 @@ const usersListSessions = async ({userId,parseOutput = true, overrideForCli = fa
             showConsoleLink('users', 'listSessions', userId);
          } else {
             parse(response)
-            success()
         }
     }
 
@@ -1287,7 +1256,6 @@ const usersCreateSession = async ({userId,parseOutput = true, overrideForCli = f
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1319,7 +1287,6 @@ const usersDeleteSessions = async ({userId,parseOutput = true, overrideForCli =
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1352,7 +1319,6 @@ const usersDeleteSession = async ({userId,sessionId,parseOutput = true, override
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1388,7 +1354,6 @@ const usersUpdateStatus = async ({userId,status,parseOutput = true, overrideForC
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1424,7 +1389,6 @@ const usersListTargets = async ({userId,queries,parseOutput = true, overrideForC
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1476,7 +1440,6 @@ const usersCreateTarget = async ({userId,targetId,providerType,identifier,provid
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1509,7 +1472,6 @@ const usersGetTarget = async ({userId,targetId,parseOutput = true, overrideForCl
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1554,7 +1516,6 @@ const usersUpdateTarget = async ({userId,targetId,identifier,providerId,name,par
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1587,7 +1548,6 @@ const usersDeleteTarget = async ({userId,targetId,parseOutput = true, overrideFo
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1627,7 +1587,6 @@ const usersCreateToken = async ({userId,length,expire,parseOutput = true, overri
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1663,7 +1622,6 @@ const usersUpdateEmailVerification = async ({userId,emailVerification,parseOutpu
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1699,7 +1657,6 @@ const usersUpdatePhoneVerification = async ({userId,phoneVerification,parseOutpu
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;

package/lib/commands/vcs.js

@@ -35,7 +35,7 @@ function convertReadStreamToReadableStream(readStream) {
   });
 }
 
-const vcs = new Command("vcs").description(commandDescriptions['vcs']).configureHelp({
+const vcs = new Command("vcs").description(commandDescriptions['vcs'] ?? '').configureHelp({
     helpWidth: process.stdout.columns || 80
 })
 
@@ -68,7 +68,6 @@ const vcsListRepositories = async ({installationId,search,parseOutput = true, ov
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -108,7 +107,6 @@ const vcsCreateRepository = async ({installationId,name,xprivate,parseOutput = t
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -141,7 +139,6 @@ const vcsGetRepository = async ({installationId,providerRepositoryId,parseOutput
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -174,7 +171,6 @@ const vcsListRepositoryBranches = async ({installationId,providerRepositoryId,pa
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -211,7 +207,6 @@ const vcsGetRepositoryContents = async ({installationId,providerRepositoryId,pro
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -248,7 +243,6 @@ const vcsCreateRepositoryDetection = async ({installationId,providerRepositoryId
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -285,7 +279,6 @@ const vcsUpdateExternalDeployments = async ({installationId,repositoryId,provide
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -324,7 +317,6 @@ const vcsListInstallations = async ({queries,search,parseOutput = true, override
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -356,7 +348,6 @@ const vcsGetInstallation = async ({installationId,parseOutput = true, overrideFo
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -388,7 +379,6 @@ const vcsDeleteInstallation = async ({installationId,parseOutput = true, overrid
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;

package/lib/config.js

@@ -4,7 +4,8 @@ const _path = require("path");
 const process = require("process");
 const JSONbig = require("json-bigint")({ storeAsString: false });
 
-const KeysFunction = new Set(["path", "$id", "execute", "name", "enabled", "logging", "runtime", "scopes", "events", "schedule", "timeout", "entrypoint", "commands"]);
+const KeysVars = new Set(["key", "value"]);
+const KeysFunction = new Set(["path", "$id", "execute", "name", "enabled", "logging", "runtime", "scopes", "events", "schedule", "timeout", "entrypoint", "commands", "vars"]);
 const KeysDatabase = new Set(["$id", "name", "enabled"]);
 const KeysCollection = new Set(["$id", "$permissions", "databaseId", "name", "enabled", "documentSecurity", "attributes", "indexes"]);
 const KeysStorage = new Set(["$id", "$permissions", "fileSecurity", "name", "enabled", "maximumFileSize", "allowedFileExtensions", "compression", "encryption", "antivirus"]);
@@ -38,10 +39,10 @@ const KeysAttributes = new Set([
 const KeyIndexes = new Set(["key", "type", "status", "attributes", "orders"]);
 
 function whitelistKeys(value, keys, nestedKeys = {}) {
-    if(Array.isArray(value)) {
+    if (Array.isArray(value)) {
         const newValue = [];
 
-        for(const item of value) {
+        for (const item of value) {
             newValue.push(whitelistKeys(item, keys, nestedKeys));
         }
 
@@ -50,8 +51,8 @@ function whitelistKeys(value, keys, nestedKeys = {}) {
 
     const newValue = {};
     Object.keys(value).forEach((key) => {
-        if(keys.has(key)) {
-            if(nestedKeys[key]) {
+        if (keys.has(key)) {
+            if (nestedKeys[key]) {
                 newValue[key] = whitelistKeys(value[key], nestedKeys[key]);
             } else {
                 newValue[key] = value[key];
@@ -151,7 +152,9 @@ class Local extends Config {
     }
 
     addFunction(props) {
-        props = whitelistKeys(props, KeysFunction);
+        props = whitelistKeys(props, KeysFunction, {
+            vars: KeysVars
+        });
 
         if (!this.has("functions")) {
             this.set("functions", []);
@@ -403,7 +406,7 @@ class Local extends Config {
             return;
         }
 
-        this.set('settings', this.createSettingsObject(settings));
+        this.set('settings', this.createSettingsObject(projectSettings));
     }
 
     createSettingsObject(projectSettings) {
@@ -615,5 +618,6 @@ module.exports = {
     KeysTopics,
     KeysStorage,
     KeysTeams,
+    KeysCollection,
     whitelistKeys
 };

package/lib/emulation/docker.js

@@ -79,7 +79,6 @@ async function dockerBuild(func, variables) {
     const params = [ 'run' ];
     params.push('--name', id);
     params.push('-v', `${tmpBuildPath}/:/mnt/code:rw`);
-    params.push('-e', 'APPWRITE_ENV=development');
     params.push('-e', 'OPEN_RUNTIMES_ENV=development');
     params.push('-e', 'OPEN_RUNTIMES_SECRET=');
     params.push('-e', `OPEN_RUNTIMES_ENTRYPOINT=${func.entrypoint}`);
@@ -169,7 +168,6 @@ async function dockerStart(func, variables, port) {
     params.push('--rm');
     params.push('--name', id);
     params.push('-p', `${port}:3000`);
-    params.push('-e', 'APPWRITE_ENV=development');
     params.push('-e', 'OPEN_RUNTIMES_ENV=development');
     params.push('-e', 'OPEN_RUNTIMES_SECRET=');
 
@@ -254,7 +252,7 @@ function waitUntilPortOpen(port, iteration = 0) {
         });
 
         client.connect({port, host: '127.0.0.1'}, function() {});
-    }); 
+    });
 }
 
 module.exports = {

package/lib/paginate.js

@@ -1,14 +1,16 @@
-const paginate = async (action, args = {}, limit = 100, wrapper = '') => {
+const paginate = async (action, args = {}, limit = 100, wrapper = '', queries = []) => {
     let pageNumber = 0;
     let results = [];
     let total = 0;
 
     while (true) {
         const offset = pageNumber * limit;
+
         // Merge the limit and offset into the args
         const response = await action({
             ...args,
             queries: [
+                ...queries,
                 JSON.stringify({ method: 'limit', values: [limit] }),
                 JSON.stringify({ method: 'offset', values: [offset] })
             ]

package/lib/parser.js

@@ -120,7 +120,7 @@ const parseError = (err) => {
             } catch {
             }
 
-            const version = '6.0.0-rc.6';
+            const version = '6.0.0-rc.7';
             const stepsToReproduce = `Running \`appwrite ${cliConfig.reportData.data.args.join(' ')}\``;
             const yourEnvironment = `CLI version: ${version}\nOperation System: ${os.type()}\nAppwrite version: ${appwriteVersion}\nIs Cloud: ${isCloud}`;
 
@@ -203,29 +203,26 @@ 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.`,
-    "init": `The init command provides a convenient wrapper for creating and initializing project, functions, collections, buckets, teams and messaging in Appwrite.`,
-    "push": `The push command provides a convenient wrapper for pushing your functions, collections, buckets, teams and messaging.`,
-    "run": `The run command allows you to run project locally to allow easy development and quick debugging.`,
-    "functions": `The functions command allows you view, create and manage your Cloud Functions.`,
+    "databases": `The databases command allows you to create structured collections of documents and query and filter lists of documents.`,
+    "init": `The init command provides a convenient wrapper for creating and initializing projects, functions, collections, buckets, teams, and messaging-topics in  Appwrite.`,
+    "push": `The push command provides a convenient wrapper for pushing your functions, collections, buckets, teams, and messaging-topics.`,
+    "run": `The run command allows you to run the project locally to allow easy development and quick debugging.`,
+    "functions": `The functions command allows you to view, create, and manage your Cloud Functions.`,
     "health": `The health command allows you to both validate and monitor your Appwrite server's health.`,
-    "pull": `The pull command helps you pull your Appwrite project, functions, collections, buckets, teams and messaging`,
+    "pull": `The pull command helps you pull your Appwrite project, functions, collections, buckets, teams, and messaging-topics`,
     "locale": `The locale command allows you to customize your app based on your users' location.`,
-    "projects": `The projects command allows you to view, create and manage your Appwrite projects.`,
     "storage": `The storage command allows you to manage your project files.`,
-    "teams": `The teams command allows you to group users of your project and to enable them to share read and write access to your project resources`,
+    "teams": `The teams command allows you to group users of your project to enable them to share read and write access to your project resources.`,
     "users": `The users command allows you to manage your project users.`,
     "client": `The client command allows you to configure your CLI`,
     "login": `The login command allows you to authenticate and manage a user account.`,
-    "logout": `The logout command allows you to logout of your Appwrite account.`,
-    "whoami": `The whoami command gives information about the currently signed in user.`,
+    "logout": `The logout command allows you to log out of your Appwrite account.`,
+    "whoami": `The whomai command gives information about the currently logged-in user.`,
     "register": `Outputs the link to create an Appwrite account.`,
-    "console" : `The console command allows gives you access to the APIs used by the Appwrite console.`,
+    "console" : `The console command gives you access to the APIs used by the Appwrite Console.`,
     "assistant": `The assistant command allows you to interact with the Appwrite Assistant AI`,
-    "messaging": `The messaging command allows you to send messages.`,
+    "messaging": `The messaging command allows you to manage topics and targets and send messages.`,
     "migrations": `The migrations command allows you to migrate data between services.`,
-    "project": `The project command is for overall project administration.`,
-    "proxy": `The proxy command allows you to configure behavior for your attached domains.`,
     "vcs": `The vcs command allows you to interact with VCS providers and manage your code repositories.`,
     "main": chalk.redBright(`${logo}${description}`),
 }

package/lib/questions.js

@@ -189,11 +189,11 @@ const questionsInitProject = [
         message: "Choose your Appwrite project.",
         choices: async (answers) => {
             const queries = [
-                JSON.stringify({ method: 'equal', attribute: 'teamId', values: [answers.organization.id] }),
-                JSON.stringify({ method: 'orderDesc', attribute: 'Id' })
+                JSON.stringify({ method: 'equal', attribute: 'teamId', values: [answers.organization] }),
+                JSON.stringify({ method: 'orderDesc', attribute: '$id' })
             ]
 
-            const { projects } = await paginate(projectsList, { parseOutput: false, queries, }, 100, 'projects');
+            const { projects } = await paginate(projectsList, { parseOutput: false }, 100, 'projects', queries);
 
             let choices = projects.map((project) => {
                 return {
@@ -301,22 +301,7 @@ const questionsCreateFunction = [
             })
             return choices;
         },
-    },
-    {
-        type: "list",
-        name: "template",
-        message: "How would you like to start your function code?",
-        choices: [
-            {
-                name: `Start from scratch ${chalk.blackBright(`(starter)`)}`,
-                value: "starter"
-            },
-            {
-                name: "Pick a template",
-                value: "custom"
-            }
-        ]
-    },
+    }
 ];
 
 const questionsCreateFunctionSelectTemplate = (templates) => {
@@ -646,11 +631,6 @@ const questionsPushFunctions = [
             return choices;
         }
     },
-    {
-        type: "input",
-        name: "override",
-        message: 'Are you sure you want to override this function\'s variables? This can lead to loss of secrets! Type "YES" to confirm.'
-    },
 ]
 
 const questionsPushCollections = [
@@ -678,7 +658,15 @@ const questionPushChanges = [
     {
         type: "input",
         name: "changes",
-        message: `Would you like to apply these changes? Type "YES" to confirm.`
+        message: `Are you sure you want to apply these changes? (YES/NO)`
+    }
+];
+
+const questionPushChangesConfirmation = [
+    {
+        type: "input",
+        name: "changes",
+        message: `Please type 'YES' or 'NO':`
     }
 ];
 
@@ -708,6 +696,7 @@ const questionsPushMessagingTopics = [
         type: "checkbox",
         name: "topics",
         message: "Which messaging topic would you like to push?",
+        validate: (value) => validateRequired('topics', value),
         when: () => localConfig.getMessagingTopics().length > 0,
         choices: () => {
             let topics = localConfig.getMessagingTopics();
@@ -719,11 +708,6 @@ const questionsPushMessagingTopics = [
                 }
             });
         }
-    },
-    {
-        type: "input",
-        name: "override",
-        message: 'Would you like to override existing topics? This can lead to loss of data! Type "YES" to confirm.'
     }
 ]
 
@@ -862,5 +846,6 @@ module.exports = {
     questionGetEndpoint,
     questionsInitResources,
     questionsCreateTeam,
-    questionPushChanges
+    questionPushChanges,
+    questionPushChangesConfirmation
 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "appwrite-cli",
   "homepage": "https://appwrite.io/support",
   "description": "Appwrite is an open-source self-hosted backend server that abstract and simplify complex and repetitive development tasks behind a very simple REST API",
-  "version": "6.0.0-rc.6",
+  "version": "6.0.0-rc.7",
   "license": "BSD-3-Clause",
   "main": "index.js",
   "bin": {
@@ -35,7 +35,7 @@
     "ignore": "^5.2.0",
     "chokidar": "^3.6.0",
     "tail": "^2.2.6",
-    "dotenv": "^16.3.1"
+    "dotenv": "^16.4.5"
   },
   "devDependencies": {
     "pkg": "5.8.1"