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

package/README.md

@@ -29,7 +29,7 @@ Once the installation is complete, you can verify the install using
 
 ```sh
 $ appwrite -v
-6.0.0-rc.5
+6.0.0-rc.6
 ```
 
 ### Install using prebuilt binaries
@@ -60,7 +60,7 @@ $ scoop install https://raw.githubusercontent.com/appwrite/sdk-for-cli/master/sc
 Once the installation completes, you can verify your install using
 ```
 $ appwrite -v
-6.0.0-rc.5
+6.0.0-rc.6
 ```
 
 ## Getting Started 

package/install.ps1

@@ -13,8 +13,8 @@
 # You can use "View source" of this page to see the full script.
 
 # REPO
-$GITHUB_x64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.5/appwrite-cli-win-x64.exe"
-$GITHUB_arm64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.5/appwrite-cli-win-arm64.exe"
+$GITHUB_x64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.6/appwrite-cli-win-x64.exe"
+$GITHUB_arm64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.6/appwrite-cli-win-arm64.exe"
 
 $APPWRITE_BINARY_NAME = "appwrite.exe"
 

package/install.sh

@@ -97,7 +97,7 @@ printSuccess() {
 downloadBinary() {
     echo "[2/4] Downloading executable for $OS ($ARCH) ..."
 
-    GITHUB_LATEST_VERSION="6.0.0-rc.5"
+    GITHUB_LATEST_VERSION="6.0.0-rc.6"
     GITHUB_FILE="appwrite-cli-${OS}-${ARCH}"
     GITHUB_URL="https://github.com/$GITHUB_REPOSITORY_NAME/releases/download/$GITHUB_LATEST_VERSION/$GITHUB_FILE"
 

package/lib/client.js

@@ -16,8 +16,8 @@ class Client {
       'x-sdk-name': 'Command Line',
       'x-sdk-platform': 'console',
       'x-sdk-language': 'cli',
-      'x-sdk-version': '6.0.0-rc.5',
-      'user-agent' : `AppwriteCLI/6.0.0-rc.5 (${os.type()} ${os.version()}; ${os.arch()})`,
+      'x-sdk-version': '6.0.0-rc.6',
+      'user-agent' : `AppwriteCLI/6.0.0-rc.6 (${os.type()} ${os.version()}; ${os.arch()})`,
       'X-Appwrite-Response-Format' : '1.5.0',
     };
   }

package/lib/commands/push.js

@@ -341,7 +341,7 @@ const awaitPools = {
 }
 
 const approveChanges = async (resource, resourceGetFunction, keys, resourceName, resourcePlural) => {
-    log('Checking for changes');
+    log('Checking for changes ...');
     const changes = [];
 
     await Promise.all(resource.map(async (localResource) => {
@@ -881,7 +881,7 @@ const pushSettings = async () => {
         const remoteSettings = localConfig.createSettingsObject(response ?? {});
         const localSettings = localConfig.getProject().projectSettings ?? {};
 
-        log('Checking for changes');
+        log('Checking for changes ...');
         const changes = [];
 
         changes.push(...(getObjectChanges(remoteSettings, localSettings, 'services', 'Service')));

package/lib/commands/run.js

@@ -17,7 +17,9 @@ const { systemHasCommand, isPortTaken, getAllFiles } = require('../utils');
 const { runtimeNames, systemTools, JwtManager, Queue } = require('../emulation/utils');
 const { dockerStop, dockerCleanup, dockerStart, dockerBuild, dockerPull } = require('../emulation/docker');
 
-const runFunction = async ({ port, functionId, noVariables, noReload, userId } = {}) => {
+const runFunction = async ({ port, functionId, variables, reload, userId } = {}) => {
+    console.log(variables);
+    console.log(reload);
     // Selection
     if(!functionId) {
         const answers = await inquirer.prompt(questionsRunFunctions[0]);
@@ -113,9 +115,9 @@ const runFunction = async ({ port, functionId, noVariables, noReload, userId } =
     }
 
     const userVariables = {};
-    const variables = {};
+    const allVariables = {};
 
-    if(!noVariables) {
+    if(variables) {
         try {
             const { variables: remoteVariables } = await paginate(functionsListVariables, {
                 functionId: func['$id'],
@@ -123,7 +125,7 @@ const runFunction = async ({ port, functionId, noVariables, noReload, userId } =
             }, 100, 'variables');
 
             remoteVariables.forEach((v) => {
-                variables[v.key] = v.value;
+                allVariables[v.key] = v.value;
                 userVariables[v.key] = v.value;
             });
         } catch(err) {
@@ -137,18 +139,18 @@ const runFunction = async ({ port, functionId, noVariables, noReload, userId } =
         const env = parseDotenv(fs.readFileSync(envPath).toString() ?? '');
 
         Object.keys(env).forEach((key) => {
-            variables[key] = env[key];
+            allVariables[key] = env[key];
             userVariables[key] = env[key];
         });
     }
 
-    variables['APPWRITE_FUNCTION_API_ENDPOINT'] = globalConfig.getFrom('endpoint');
-    variables['APPWRITE_FUNCTION_ID'] = func.$id;
-    variables['APPWRITE_FUNCTION_NAME'] = func.name;
-    variables['APPWRITE_FUNCTION_DEPLOYMENT'] = ''; // TODO: Implement when relevant
-    variables['APPWRITE_FUNCTION_PROJECT_ID'] = localConfig.getProject().projectId;
-    variables['APPWRITE_FUNCTION_RUNTIME_NAME'] = runtimeNames[runtimeName] ?? '';
-    variables['APPWRITE_FUNCTION_RUNTIME_VERSION'] = func.runtime;
+    allVariables['APPWRITE_FUNCTION_API_ENDPOINT'] = globalConfig.getFrom('endpoint');
+    allVariables['APPWRITE_FUNCTION_ID'] = func.$id;
+    allVariables['APPWRITE_FUNCTION_NAME'] = func.name;
+    allVariables['APPWRITE_FUNCTION_DEPLOYMENT'] = ''; // TODO: Implement when relevant
+    allVariables['APPWRITE_FUNCTION_PROJECT_ID'] = localConfig.getProject().projectId;
+    allVariables['APPWRITE_FUNCTION_RUNTIME_NAME'] = runtimeNames[runtimeName] ?? '';
+    allVariables['APPWRITE_FUNCTION_RUNTIME_VERSION'] = func.runtime;
 
     try {
         await JwtManager.setup(userId, func.scopes ?? []);
@@ -162,7 +164,7 @@ const runFunction = async ({ port, functionId, noVariables, noReload, userId } =
     headers['x-appwrite-event'] = '';
     headers['x-appwrite-user-id'] = userId ?? '';
     headers['x-appwrite-user-jwt'] = JwtManager.userJwt ?? '';
-    variables['OPEN_RUNTIMES_HEADERS'] = JSON.stringify(headers);
+    allVariables['OPEN_RUNTIMES_HEADERS'] = JSON.stringify(headers);
 
     if(Object.keys(userVariables).length > 0) {
         drawTable(Object.keys(userVariables).map((key) => ({
@@ -180,7 +182,7 @@ const runFunction = async ({ port, functionId, noVariables, noReload, userId } =
         process.stdout.write(chalk.white(`${data}\n`));
     });
 
-    if(!noReload) {
+    if(reload) {
         const ignorer = ignore();
         ignorer.add('.appwrite');
         ignorer.add('code.tar.gz');

package/lib/emulation/docker.js

@@ -51,6 +51,31 @@ 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`);
@@ -131,40 +156,13 @@ 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' ];

package/lib/parser.js

@@ -120,7 +120,7 @@ const parseError = (err) => {
             } catch {
             }
 
-            const version = '6.0.0-rc.5';
+            const version = '6.0.0-rc.6';
             const stepsToReproduce = `Running \`appwrite ${cliConfig.reportData.data.args.join(' ')}\``;
             const yourEnvironment = `CLI version: ${version}\nOperation System: ${os.type()}\nAppwrite version: ${appwriteVersion}\nIs Cloud: ${isCloud}`;
 

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.5",
+  "version": "6.0.0-rc.6",
   "license": "BSD-3-Clause",
   "main": "index.js",
   "bin": {
@@ -34,7 +34,8 @@
     "tar": "^6.1.11",
     "ignore": "^5.2.0",
     "chokidar": "^3.6.0",
-    "tail": "^2.2.6"
+    "tail": "^2.2.6",
+    "dotenv": "^16.3.1"
   },
   "devDependencies": {
     "pkg": "5.8.1"

package/scoop/appwrite.json

@@ -1,12 +1,12 @@
 {
 	"$schema": "https://raw.githubusercontent.com/ScoopInstaller/Scoop/master/schema.json",
-	"version": "6.0.0-rc.5",
+	"version": "6.0.0-rc.6",
 	"description": "The Appwrite CLI is a command-line application that allows you to interact with Appwrite and perform server-side tasks using your terminal.",
 	"homepage": "https://github.com/appwrite/sdk-for-cli",
 	"license": "BSD-3-Clause",
 	"architecture": {
 		"64bit": {
-			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.5/appwrite-cli-win-x64.exe",
+			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.6/appwrite-cli-win-x64.exe",
 			"bin": [
 				[
 					"appwrite-cli-win-x64.exe",
@@ -15,7 +15,7 @@
 			]
 		},
 		"arm64": {
-			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.5/appwrite-cli-win-arm64.exe",
+			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.6/appwrite-cli-win-arm64.exe",
 			"bin": [
 				[
 					"appwrite-cli-win-arm64.exe",