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

package/lib/commands/teams.js

@@ -35,7 +35,7 @@ function convertReadStreamToReadableStream(readStream) {
   });
 }
 
-const teams = new Command("teams").description(commandDescriptions['teams']).configureHelp({
+const teams = new Command("teams").description(commandDescriptions['teams'] ?? '').configureHelp({
     helpWidth: process.stdout.columns || 80
 })
 
@@ -74,7 +74,6 @@ const teamsList = async ({queries,search,parseOutput = true, overrideForCli = fa
             showConsoleLink('teams', 'list');
          } else {
             parse(response)
-            success()
         }
     }
 
@@ -119,7 +118,6 @@ const teamsCreate = async ({teamId,name,roles,parseOutput = true, overrideForCli
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -154,7 +152,6 @@ const teamsGet = async ({teamId,parseOutput = true, overrideForCli = false, sdk
             showConsoleLink('teams', 'get', teamId);
          } else {
             parse(response)
-            success()
         }
     }
 
@@ -191,7 +188,6 @@ const teamsUpdateName = async ({teamId,name,parseOutput = true, overrideForCli =
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -223,7 +219,6 @@ const teamsDelete = async ({teamId,parseOutput = true, overrideForCli = false, s
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -259,7 +254,6 @@ const teamsListLogs = async ({teamId,queries,parseOutput = true, overrideForCli
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -299,7 +293,6 @@ const teamsListMemberships = async ({teamId,queries,search,parseOutput = true, o
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -356,7 +349,6 @@ const teamsCreateMembership = async ({teamId,roles,email,userId,phone,url,name,p
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -389,7 +381,6 @@ const teamsGetMembership = async ({teamId,membershipId,parseOutput = true, overr
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -427,7 +418,6 @@ const teamsUpdateMembership = async ({teamId,membershipId,roles,parseOutput = tr
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -460,7 +450,6 @@ const teamsDeleteMembership = async ({teamId,membershipId,parseOutput = true, ov
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -501,7 +490,6 @@ const teamsUpdateMembershipStatus = async ({teamId,membershipId,userId,secret,pa
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -533,7 +521,6 @@ const teamsGetPrefs = async ({teamId,parseOutput = true, overrideForCli = false,
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -569,7 +556,6 @@ const teamsUpdatePrefs = async ({teamId,prefs,parseOutput = true, overrideForCli
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;

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

@@ -51,10 +51,34 @@ async function dockerBuild(func, variables) {
 
     const id = func.$id;
 
+    const ignorer = ignore();
+    ignorer.add('.appwrite');
+    if (func.ignore) {
+        ignorer.add(func.ignore);
+    } else if (fs.existsSync(path.join(functionDir, '.gitignore'))) {
+        ignorer.add(fs.readFileSync(path.join(functionDir, '.gitignore')).toString());
+    }
+    
+    const files = getAllFiles(functionDir).map((file) => path.relative(functionDir, file)).filter((file) => !ignorer.ignores(file));
+    const tmpBuildPath = path.join(functionDir, '.appwrite/tmp-build');
+    if (!fs.existsSync(tmpBuildPath)) {
+        fs.mkdirSync(tmpBuildPath, { recursive: true });
+    }
+
+    for(const f of files) {
+        const filePath = path.join(tmpBuildPath, f);
+        const fileDir = path.dirname(filePath);
+        if (!fs.existsSync(fileDir)) {
+            fs.mkdirSync(fileDir, { recursive: true });
+        }
+
+        const sourcePath = path.join(functionDir, f);
+        fs.copyFileSync(sourcePath, filePath);
+    }
+
     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}`);
@@ -131,47 +155,19 @@ async function dockerStart(func, variables, port) {
     // Pack function files
     const functionDir = path.join(process.cwd(), func.path);
 
-    const ignorer = ignore();
-    ignorer.add('.appwrite');
-    if (func.ignore) {
-        ignorer.add(func.ignore);
-    } else if (fs.existsSync(path.join(functionDir, '.gitignore'))) {
-        ignorer.add(fs.readFileSync(path.join(functionDir, '.gitignore')).toString());
-    }
-
-    const files = getAllFiles(functionDir).map((file) => path.relative(functionDir, file)).filter((file) => !ignorer.ignores(file));
-    const tmpBuildPath = path.join(functionDir, '.appwrite/tmp-build');
-    if (!fs.existsSync(tmpBuildPath)) {
-        fs.mkdirSync(tmpBuildPath, { recursive: true });
-    }
-
-    for(const f of files) {
-        const filePath = path.join(tmpBuildPath, f);
-        const fileDir = path.dirname(filePath);
-        if (!fs.existsSync(fileDir)) {
-            fs.mkdirSync(fileDir, { recursive: true });
-        }
-
-        const sourcePath = path.join(functionDir, f);
-        fs.copyFileSync(sourcePath, filePath);
-    }
-
-   const runtimeChunks = func.runtime.split("-");
-   const runtimeVersion = runtimeChunks.pop();
-   const runtimeName = runtimeChunks.join("-");
+    const runtimeChunks = func.runtime.split("-");
+    const runtimeVersion = runtimeChunks.pop();
+    const runtimeName = runtimeChunks.join("-");
     const imageName = `openruntimes/${runtimeName}:${openRuntimesVersion}-${runtimeVersion}`;
 
     const tool = systemTools[runtimeName];
 
-    const functionDir = path.join(process.cwd(), func.path);
-
     const id = func.$id;
 
     const params = [ 'run' ];
     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=');
 
@@ -256,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] })
             ]