appwrite-cli 8.1.0 → 8.1.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 8.1.1
+
+* Fix circular dependency issue due to usage of `success` method in `utils.js` file from `parser.js` file
+* Type generation fixes:
+  * Add ability to generate types directly to a specific file by passing a file path to `appwrite types output_path`, instead of just a directory
+  * Fix non-required attributes to not be null if default value is provided
+  * Fix `Models` import error
+  * Improve formatting and add auto-generated comments
+
 ## 8.1.0
 
 * Add multi-region support to `init` command
@@ -15,7 +24,7 @@
 
 * Add Type generation fixes:
   * Properly handle enum attributes in dart, java and kotlin
-  * Fix initialisation of null attributes in dart's fromMap method
+  * Fix initialisation of null attributes in dart's fromMap method
   * Fix relationships and enums in swift
 
 ## 8.0.1

package/README.md

@@ -29,7 +29,7 @@ Once the installation is complete, you can verify the install using
 
 ```sh
 $ appwrite -v
-8.1.0
+8.1.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
-8.1.0
+8.1.1
 ```
 
 ## 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/8.1.0/appwrite-cli-win-x64.exe"
-$GITHUB_arm64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/8.1.0/appwrite-cli-win-arm64.exe"
+$GITHUB_x64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/8.1.1/appwrite-cli-win-x64.exe"
+$GITHUB_arm64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/8.1.1/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="8.1.0"
+    GITHUB_LATEST_VERSION="8.1.1"
     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': '8.1.0',
-      'user-agent' : `AppwriteCLI/8.1.0 (${os.type()} ${os.version()}; ${os.arch()})`,
+      'x-sdk-version': '8.1.1',
+      'user-agent' : `AppwriteCLI/8.1.1 (${os.type()} ${os.version()}; ${os.arch()})`,
       'X-Appwrite-Response-Format' : '1.7.0',
     };
   }

package/lib/commands/types.js

@@ -66,7 +66,22 @@ const typesCommand = actionRunner(async (rawOutputDirectory, {language}) => {
 
   const meta = createLanguageMeta(language);
 
-  const outputDirectory = path.resolve(rawOutputDirectory);
+  const rawOutputPath = rawOutputDirectory;
+  const outputExt = path.extname(rawOutputPath);
+  const isFileOutput = !!outputExt;
+  let outputDirectory = rawOutputPath;
+  let singleFileDestination = null;
+
+  if (isFileOutput) {
+    if (meta.isSingleFile()) {
+      // Use the file path directly for single file languages
+      outputDirectory = path.dirname(rawOutputPath);
+      singleFileDestination = rawOutputPath;
+    } else {
+      throw new Error(`Invalid output path: ${rawOutputPath}. Output path must be a directory for languages that generate multiple files.`);
+    }
+  }
+
   if (!fs.existsSync(outputDirectory)) {
     log(`Directory: ${outputDirectory} does not exist, creating...`);
     fs.mkdirSync(outputDirectory, { recursive: true });
@@ -95,7 +110,7 @@ const typesCommand = actionRunner(async (rawOutputDirectory, {language}) => {
       getType: meta.getType
     });
 
-    const destination = path.join(outputDirectory, meta.getFileName());
+    const destination = singleFileDestination || path.join(outputDirectory, meta.getFileName());
 
     fs.writeFileSync(destination, content);
     log(`Added types to ${destination}`);

package/lib/parser.js

@@ -120,7 +120,7 @@ const parseError = (err) => {
             } catch {
             }
 
-            const version = '8.1.0';
+            const version = '8.1.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()}`;
 

package/lib/type-generation/languages/dart.js

@@ -41,6 +41,10 @@ class Dart extends LanguageMeta {
     return type;
   }
 
+  getCurrentDirectory() {
+    return process.cwd();
+  }
+
   getTemplate() {
     return `<% for (const attribute of collection.attributes) { -%>
 <% if (attribute.type === 'relationship') { -%>
@@ -48,11 +52,16 @@ import '<%- attribute.relatedCollection.toLowerCase() %>.dart';
 
 <% } -%>
 <% } -%>
+/**
+ * This file is auto-generated by the Appwrite CLI. 
+ * You can regenerate it by running \`appwrite types -l dart ${this.getCurrentDirectory()}\`.
+ */
+
 <% for (const attribute of collection.attributes) { -%>
 <% if (attribute.format === 'enum') { -%>
 enum <%- toPascalCase(attribute.key) %> {
-<% for (const element of attribute.elements) { -%>
-  <%- toSnakeCase(element) %>,
+<% for (const [index, element] of Object.entries(attribute.elements)) { -%>
+  <%- toSnakeCase(element) %><% if (index < attribute.elements.length - 1) { %>,<% } %>
 <% } -%>
 }
 
@@ -65,7 +74,7 @@ class <%= toPascalCase(collection.name) %> {
 
   <%= toPascalCase(collection.name) %>({
   <% for (const [index, attribute] of Object.entries(collection.attributes)) { -%>
-  <% if (attribute.required) { %>required <% } %>this.<%= toCamelCase(attribute.key) %>,
+  <% if (attribute.required) { %>required <% } %>this.<%= toCamelCase(attribute.key) %><% if (index < collection.attributes.length - 1) { %>,<% } %>
   <% } -%>
 });
 
@@ -114,7 +123,7 @@ map['<%= attribute.key %>']<% if (!attribute.required) { %> ?? null<% } -%>
 map['<%= attribute.key %>'] != null ? <%- toPascalCase(attribute.relatedCollection) %>.fromMap(map['<%= attribute.key %>']) : null<% } else { -%>
 <%- toPascalCase(attribute.relatedCollection) %>.fromMap(map['<%= attribute.key %>'])<% } -%>
 <% } -%>
-<% } -%>,
+<% } -%><% if (index < collection.attributes.length - 1) { %>,<% } %>
 <% } -%>
     );
   }
@@ -136,7 +145,7 @@ map['<%= attribute.key %>'] != null ? <%- toPascalCase(attribute.relatedCollecti
 <% } -%>
 <% } else { -%>
 <%= toCamelCase(attribute.key) -%>
-<% } -%>,
+<% } -%><% if (index < collection.attributes.length - 1) { %>,<% } %>
 <% } -%>
     };
   }

package/lib/type-generation/languages/java.js

@@ -38,9 +38,18 @@ class Java extends LanguageMeta {
     return type;
   }
 
+  getCurrentDirectory() {
+    return process.cwd();
+  }
+
   getTemplate() {
     return `package io.appwrite.models;
 
+/**
+ * This file is auto-generated by the Appwrite CLI. 
+ * You can regenerate it by running \`appwrite types -l java ${this.getCurrentDirectory()}\`.
+ */
+
 import java.util.*;
 <% for (const attribute of collection.attributes) { -%>
 <% if (attribute.type === 'relationship') { -%>

package/lib/type-generation/languages/javascript.js

@@ -40,8 +40,8 @@ class JavaScript extends LanguageMeta {
     if (attribute.array) {
       type += "[]";
     }
-    if (!attribute.required) {
-      type += "|null|undefined";
+    if (!attribute.required && attribute.default === null) {
+      type += "|null";
     }
     return type;
   }
@@ -60,11 +60,19 @@ class JavaScript extends LanguageMeta {
     return "appwrite";
   }
 
+  getCurrentDirectory() {
+    return process.cwd();
+  }
+
   getTemplate() {
     return `/**
  * @typedef {import('${this._getAppwriteDependency()}').Models.Document} Document
  */
 
+/**
+ * This file is auto-generated by the Appwrite CLI. 
+ * You can regenerate it by running \`appwrite types -l js ${this.getCurrentDirectory()}\`.
+ */
 <% for (const collection of collections) { %>
 /**
  * @typedef {Object} <%- toPascalCase(collection.name) %>
@@ -72,7 +80,6 @@ class JavaScript extends LanguageMeta {
  * @property {<%- getType(attribute) %>} <%- toCamelCase(attribute.key) %>
 <% } -%>
  */
-
 <% } %>`;
   }
 

package/lib/type-generation/languages/kotlin.js

@@ -35,12 +35,16 @@ class Kotlin extends LanguageMeta {
     if (attribute.array) {
       type = "List<" + type + ">";
     }
-    if (!attribute.required) {
+    if (!attribute.required && attribute.default === null) {
       type += "?";
     }
     return type;
   }
 
+  getCurrentDirectory() {
+    return process.cwd();
+  }
+
   getTemplate() {
     return `package io.appwrite.models
 
@@ -50,6 +54,11 @@ import <%- toPascalCase(attribute.relatedCollection) %>
 
 <% } -%>
 <% } -%>
+/**
+ * This file is auto-generated by the Appwrite CLI. 
+ * You can regenerate it by running \`appwrite types -l kotlin ${this.getCurrentDirectory()}\`.
+ */
+
 <% for (const attribute of collection.attributes) { -%>
 <% if (attribute.format === 'enum') { -%>
 enum class <%- toPascalCase(attribute.key) %> {
@@ -61,8 +70,8 @@ enum class <%- toPascalCase(attribute.key) %> {
 <% } -%>
 <% } -%>
 data class <%- toPascalCase(collection.name) %>(
-<% for (const attribute of collection.attributes) { -%>
-    val <%- toCamelCase(attribute.key) %>: <%- getType(attribute) %>,
+<% for (const [index, attribute] of Object.entries(collection.attributes)) { -%>
+    val <%- toCamelCase(attribute.key) %>: <%- getType(attribute) %><% if (index < collection.attributes.length - 1) { %>,<% } %>
 <% } -%>
 )`;
   }

package/lib/type-generation/languages/php.js

@@ -35,16 +35,25 @@ class PHP extends LanguageMeta {
       default:
         throw new Error(`Unknown attribute type: ${attribute.type}`);
     }
-    if (!attribute.required) {
+    if (!attribute.required && attribute.default === null) {
       type += "|null";
     }
     return type;
   }
 
+  getCurrentDirectory() {
+    return process.cwd();
+  }
+
   getTemplate() {
     return `<?php
 namespace Appwrite\\Models;
 
+/**
+ * This file is auto-generated by the Appwrite CLI. 
+ * You can regenerate it by running \`appwrite types -l php ${this.getCurrentDirectory()}\`.
+ */
+
 <% for (const attribute of collection.attributes) { -%>
 <% if (attribute.type === 'relationship' && !(attribute.relationType === 'manyToMany') && !(attribute.relationType === 'oneToMany' && attribute.side === 'parent')) { -%>
 use Appwrite\\Models\\<%- toPascalCase(attribute.relatedCollection) %>;

package/lib/type-generation/languages/swift.js

@@ -35,15 +35,22 @@ class Swift extends LanguageMeta {
     if (attribute.array) {
       type = "[" + type + "]";
     }
-    if (!attribute.required) {
+    if (!attribute.required && attribute.default === null) {
       type += "?";
     }
     return type;
   }
 
+  getCurrentDirectory() {
+    return process.cwd();
+  }
+
   getTemplate() {
     return `import Foundation
 
+/// This file is auto-generated by the Appwrite CLI. 
+/// You can regenerate it by running \`appwrite types -l swift ${this.getCurrentDirectory()}\`.
+
 <% for (const attribute of collection.attributes) { -%>
 <% if (attribute.format === 'enum') { -%>
 public enum <%- toPascalCase(attribute.key) %>: String, Codable, CaseIterable {

package/lib/type-generation/languages/typescript.js

@@ -40,7 +40,7 @@ class TypeScript extends LanguageMeta {
     if (attribute.array) {
       type += "[]";
     }
-    if (!attribute.required) {
+    if (!attribute.required && attribute.default === null) {
       type += " | null";
     }
     return type;
@@ -64,15 +64,25 @@ class TypeScript extends LanguageMeta {
     return "appwrite";
   }
 
+  getCurrentDirectory() {
+    return process.cwd();
+  }
+
   getTemplate() {
-    return `import { Models } from '${this._getAppwriteDependency()}';
+    return `import { type Models } from '${this._getAppwriteDependency()}';
+
+/**
+ * This file is auto-generated by the Appwrite CLI. 
+ * You can regenerate it by running \`appwrite types -l ts ${this.getCurrentDirectory()}\`.
+ */
 
 <% for (const collection of collections) { -%>
 <% for (const attribute of collection.attributes) { -%>
 <% if (attribute.format === 'enum') { -%>
 export enum <%- toPascalCase(attribute.key) %> {
-<% for (const [index, element] of Object.entries(attribute.elements)) { -%>
-  <%- toUpperSnakeCase(element) %> = "<%- element %>",
+<% const entries = Object.entries(attribute.elements); -%>
+<% for (let i = 0; i < entries.length; i++) { -%>
+  <%- toUpperSnakeCase(entries[i][1]) %> = "<%- entries[i][1] %>"<% if (i !== entries.length - 1) { %>,<% } %>
 <% } -%>
 }
 

package/lib/utils.js

@@ -2,8 +2,8 @@ const fs = require("fs");
 const path = require("path");
 const net = require("net");
 const childProcess = require('child_process');
+const chalk = require('chalk');
 const { localConfig, globalConfig } = require("./config");
-const { success } = require('./parser')
 
 function getAllFiles(folder) {
     const files = [];
@@ -105,8 +105,7 @@ function showConsoleLink(serviceName, action, ...ids) {
             return;
     }
 
-
-    success(url);
+    console.log(`${chalk.green.bold("✓ Success:")} ${chalk.green(url)}`);
 }
 
 function getAccountPath(action) {

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": "8.1.0",
+  "version": "8.1.1",
   "license": "BSD-3-Clause",
   "main": "index.js",
   "bin": {

package/scoop/appwrite.json

@@ -1,12 +1,12 @@
 {
 	"$schema": "https://raw.githubusercontent.com/ScoopInstaller/Scoop/master/schema.json",
-	"version": "8.1.0",
+	"version": "8.1.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/8.1.0/appwrite-cli-win-x64.exe",
+			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/8.1.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/8.1.0/appwrite-cli-win-arm64.exe",
+			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/8.1.1/appwrite-cli-win-arm64.exe",
 			"bin": [
 				[
 					"appwrite-cli-win-arm64.exe",