Merge pull request #143 from appwrite/dev

Deno fixes among others
appwrite · Oct 14, 2024 · 4736056 · 4736056
2 parents aa69621 + 5e55d29
commit 4736056
Show file tree

Hide file tree

Showing 24 changed files with 114 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ Once the installation is complete, you can verify the install using
 
 ```sh
 $ appwrite -v
-6.0.0
+6.0.1
 ```
 
 ### 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
+6.0.1
 ```
 
 ## Getting Started 

diff --git a/docs/examples/databases/update-boolean-attribute.md b/docs/examples/databases/update-boolean-attribute.md
@@ -3,4 +3,5 @@ appwrite databases updateBooleanAttribute \
         --collectionId <COLLECTION_ID> \
         --key '' \
         --required false \
-        --default false
+        --default false \
+
diff --git a/docs/examples/databases/update-datetime-attribute.md b/docs/examples/databases/update-datetime-attribute.md
@@ -3,4 +3,5 @@ appwrite databases updateDatetimeAttribute \
         --collectionId <COLLECTION_ID> \
         --key '' \
         --required false \
-        --default ''
+        --default '' \
+
diff --git a/docs/examples/databases/update-email-attribute.md b/docs/examples/databases/update-email-attribute.md
@@ -3,4 +3,5 @@ appwrite databases updateEmailAttribute \
         --collectionId <COLLECTION_ID> \
         --key '' \
         --required false \
-        --default [email protected]
+        --default [email protected] \
+
diff --git a/docs/examples/databases/update-enum-attribute.md b/docs/examples/databases/update-enum-attribute.md
@@ -4,4 +4,5 @@ appwrite databases updateEnumAttribute \
         --key '' \
         --elements one two three \
         --required false \
-        --default <DEFAULT>
+        --default <DEFAULT> \
+
diff --git a/docs/examples/databases/update-float-attribute.md b/docs/examples/databases/update-float-attribute.md
@@ -5,4 +5,5 @@ appwrite databases updateFloatAttribute \
         --required false \
         --min null \
         --max null \
-        --default null
+        --default null \
+
diff --git a/docs/examples/databases/update-integer-attribute.md b/docs/examples/databases/update-integer-attribute.md
@@ -5,4 +5,5 @@ appwrite databases updateIntegerAttribute \
         --required false \
         --min null \
         --max null \
-        --default null
+        --default null \
+
diff --git a/docs/examples/databases/update-ip-attribute.md b/docs/examples/databases/update-ip-attribute.md
@@ -3,4 +3,5 @@ appwrite databases updateIpAttribute \
         --collectionId <COLLECTION_ID> \
         --key '' \
         --required false \
-        --default ''
+        --default '' \
+
diff --git a/docs/examples/databases/update-relationship-attribute.md b/docs/examples/databases/update-relationship-attribute.md
@@ -3,3 +3,4 @@ appwrite databases updateRelationshipAttribute \
         --collectionId <COLLECTION_ID> \
         --key '' \
 
+
diff --git a/docs/examples/databases/update-string-attribute.md b/docs/examples/databases/update-string-attribute.md
@@ -3,4 +3,6 @@ appwrite databases updateStringAttribute \
         --collectionId <COLLECTION_ID> \
         --key '' \
         --required false \
-        --default <DEFAULT>
+        --default <DEFAULT> \
+
+
diff --git a/docs/examples/databases/update-url-attribute.md b/docs/examples/databases/update-url-attribute.md
@@ -3,4 +3,5 @@ appwrite databases updateUrlAttribute \
         --collectionId <COLLECTION_ID> \
         --key '' \
         --required false \
-        --default https://example.com
+        --default https://example.com \
+
diff --git a/install.ps1 b/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/appwrite-cli-win-x64.exe"
-$GITHUB_arm64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0/appwrite-cli-win-arm64.exe"
+$GITHUB_x64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.1/appwrite-cli-win-x64.exe"
+$GITHUB_arm64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.1/appwrite-cli-win-arm64.exe"
 
 $APPWRITE_BINARY_NAME = "appwrite.exe"
 

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

diff --git a/lib/client.js b/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',
-      'user-agent' : `AppwriteCLI/6.0.0 (${os.type()} ${os.version()}; ${os.arch()})`,
+      'x-sdk-version': '6.0.1',
+      'user-agent' : `AppwriteCLI/6.0.1 (${os.type()} ${os.version()}; ${os.arch()})`,
       'X-Appwrite-Response-Format' : '1.6.0',
     };
   }

diff --git a/lib/commands/databases.js b/lib/commands/databases.js
diff --git a/lib/commands/generic.js b/lib/commands/generic.js
@@ -13,7 +13,7 @@ const DEFAULT_ENDPOINT = 'https://cloud.appwrite.io/v1';
 const loginCommand = async ({ email, password, endpoint, mfa, code }) => {
     const oldCurrent = globalConfig.getCurrentSession();
 
-    const configEndpoint = endpoint ?? globalConfig.getEndpoint() ?? DEFAULT_ENDPOINT;
+    const configEndpoint = (endpoint ?? globalConfig.getEndpoint()) || DEFAULT_ENDPOINT;
 
     if (globalConfig.getCurrentSession() !== '') {
         log('You are currently signed in as ' + globalConfig.getEmail());

diff --git a/lib/commands/run.js b/lib/commands/run.js
@@ -97,8 +97,8 @@ const runFunction = async ({ port, functionId, withVariables, reload, userId } =
         process.exit();
     });
 
-    const logsPath = path.join(process.cwd(), func.path, '.appwrite/logs.txt');
-    const errorsPath = path.join(process.cwd(), func.path, '.appwrite/errors.txt');
+    const logsPath = path.join(localConfig.getDirname(), func.path, '.appwrite/logs.txt');
+    const errorsPath = path.join(localConfig.getDirname(), func.path, '.appwrite/errors.txt');
 
     if(!fs.existsSync(path.dirname(logsPath))) {
         fs.mkdirSync(path.dirname(logsPath), { recursive: true });
@@ -131,7 +131,7 @@ const runFunction = async ({ port, functionId, withVariables, reload, userId } =
         }
     }
 
-    const functionPath = path.join(process.cwd(), func.path);
+    const functionPath = path.join(localConfig.getDirname(), func.path);
     const envPath = path.join(functionPath, '.env');
     if(fs.existsSync(envPath)) {
         const env = parseDotenv(fs.readFileSync(envPath).toString() ?? '');
@@ -192,7 +192,7 @@ const runFunction = async ({ port, functionId, withVariables, reload, userId } =
         }
 
         chokidar.watch('.', {
-            cwd: path.join(process.cwd(), func.path),
+            cwd: path.join(localConfig.getDirname(), func.path),
             ignoreInitial: true,
             ignored: (xpath) => {
                 const relativePath = path.relative(functionPath, xpath);

diff --git a/lib/config.js b/lib/config.js
@@ -145,6 +145,10 @@ class Local extends Config {
         this.configDirectoryPath =_path.dirname(absolutePath);
     }
 
+    getDirname() {
+        return _path.dirname(this.path)
+    }
+
     getFunctions() {
         if (!this.has("functions")) {
             return [];

diff --git a/lib/emulation/docker.js b/lib/emulation/docker.js
@@ -47,7 +47,7 @@ async function dockerBuild(func, variables) {
     const runtimeName = runtimeChunks.join("-");
     const imageName = `openruntimes/${runtimeName}:${openRuntimesVersion}-${runtimeVersion}`;
 
-    const functionDir = path.join(process.cwd(), func.path);
+    const functionDir = path.join(localConfig.getDirname(), func.path);
 
     const id = func.$id;
 
@@ -124,7 +124,7 @@ async function dockerBuild(func, variables) {
         return;
     }
 
-    const copyPath = path.join(process.cwd(), func.path, '.appwrite', 'build.tar.gz');
+    const copyPath = path.join(localConfig.getDirname(), func.path, '.appwrite', 'build.tar.gz');
     const copyDir = path.dirname(copyPath);
     if (!fs.existsSync(copyDir)) {
         fs.mkdirSync(copyDir, { recursive: true });
@@ -143,7 +143,7 @@ async function dockerBuild(func, variables) {
 
     await dockerStop(id);
 
-    const tempPath = path.join(process.cwd(), func.path, 'code.tar.gz');
+    const tempPath = path.join(localConfig.getDirname(), func.path, 'code.tar.gz');
     if (fs.existsSync(tempPath)) {
         fs.rmSync(tempPath, { force: true });
     }
@@ -153,7 +153,7 @@ async function dockerBuild(func, variables) {
 
 async function dockerStart(func, variables, port) {
     // Pack function files
-    const functionDir = path.join(process.cwd(), func.path);
+    const functionDir = path.join(localConfig.getDirname(), func.path);
 
     const runtimeChunks = func.runtime.split("-");
     const runtimeVersion = runtimeChunks.pop();
@@ -211,12 +211,12 @@ async function dockerCleanup(functionId) {
     await dockerStop(functionId);
 
     const func = localConfig.getFunction(functionId);
-    const appwritePath = path.join(process.cwd(), func.path, '.appwrite');
+    const appwritePath = path.join(localConfig.getDirname(), func.path, '.appwrite');
     if (fs.existsSync(appwritePath)) {
         fs.rmSync(appwritePath, { recursive: true, force: true });
     }
 
-    const tempPath = path.join(process.cwd(), func.path, 'code.tar.gz');
+    const tempPath = path.join(localConfig.getDirname(), func.path, 'code.tar.gz');
     if (fs.existsSync(tempPath)) {
         fs.rmSync(tempPath, { force: true });
     }

diff --git a/lib/emulation/utils.js b/lib/emulation/utils.js
@@ -50,7 +50,7 @@ const systemTools = {
     },
     'deno': {
         isCompiled: false,
-        startCommand: "deno start",
+        startCommand: "deno run --allow-run --allow-net --allow-write --allow-read --allow-env src/server.ts",
         dependencyFiles: [ ]
     },
     'dart': {

diff --git a/lib/parser.js b/lib/parser.js
@@ -120,7 +120,7 @@ const parseError = (err) => {
             } catch {
             }
 
-            const version = '6.0.0';
+            const version = '6.0.1';
             const stepsToReproduce = `Running \`appwrite ${cliConfig.reportData.data.args.join(' ')}\``;
             const yourEnvironment = `CLI version: ${version}\nOperation System: ${os.type()}\nAppwrite version: ${appwriteVersion}\nIs Cloud: ${isCloud}`;
 

diff --git a/lib/questions.js b/lib/questions.js
@@ -94,7 +94,7 @@ const getInstallCommand = (runtime) => {
         case 'dart':
             return 'dart pub get';
         case 'deno':
-            return "deno install";
+            return "deno cache src/main.ts";
         case 'node':
             return 'npm install';
         case 'bun':

diff --git a/package.json b/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",
+  "version": "6.0.1",
   "license": "BSD-3-Clause",
   "main": "index.js",
   "bin": {

diff --git a/scoop/appwrite.json b/scoop/appwrite.json
@@ -1,12 +1,12 @@
 {
 	"$schema": "https://raw.githubusercontent.com/ScoopInstaller/Scoop/master/schema.json",
-	"version": "6.0.0",
+	"version": "6.0.1",
 	"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/appwrite-cli-win-x64.exe",
+			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.1/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/appwrite-cli-win-arm64.exe",
+			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.1/appwrite-cli-win-arm64.exe",
 			"bin": [
 				[
 					"appwrite-cli-win-arm64.exe",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,4 @@ appwrite databases updateRelationshipAttribute \
		--collectionId <COLLECTION_ID> \
		--key '' \