appwrite-cli 9.0.2 → 9.1.0

package/lib/parser.js

@@ -122,7 +122,7 @@ const parseError = (err) => {
             } catch {
             }
 
-            const version = '9.0.2';
+            const version = '9.1.0';
             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/questions.js

@@ -5,7 +5,7 @@ const { projectsList } = require('./commands/projects');
 const { organizationsList } = require('./commands/organizations');
 const { teamsList } = require('./commands/teams');
 const { functionsListRuntimes, functionsListSpecifications, functionsList } = require('./commands/functions');
-const { accountListMfaFactors } = require("./commands/account");
+const { accountListMFAFactors } = require("./commands/account");
 const { sdkForConsole } = require("./sdks");
 const { validateRequired } = require("./validations");
 const { paginate } = require('./paginate');
@@ -259,7 +259,7 @@ const questionsPullResources = [
             { name: `Buckets ${chalk.blackBright(`(Storage)`)}`, value: 'buckets' },
             { name: `Teams ${chalk.blackBright(`(Auth)`)}`, value: 'teams' },
             { name: `Topics ${chalk.blackBright(`(Messaging)`)}`, value: 'messages' },
-            { name: `Collections ${chalk.blackBright(`(Database)`)}`, value: 'collections' }
+            { name: `Collections ${chalk.blackBright(`(Legacy Databases)`)}`, value: 'collections' }
         ]
     }
 ]
@@ -671,7 +671,7 @@ const questionsPushResources = [
             { name: `Buckets ${chalk.blackBright(`(Storage)`)}`, value: 'buckets' },
             { name: `Teams ${chalk.blackBright(`(Auth)`)}`, value: 'teams' },
             { name: `Topics ${chalk.blackBright(`(Messaging)`)}`, value: 'messages' },
-            { name: `Collections ${chalk.blackBright(`(Database)`)}`, value: 'collections' }
+            { name: `Collections ${chalk.blackBright(`(Legacy Databases)`)}`, value: 'collections' }
         ]
     }
 ];
@@ -877,7 +877,7 @@ const questionsListFactors = [
         message: "Your account is protected by multi-factor authentication. Please choose one for verification.",
         choices: async () => {
             let client = await sdkForConsole(false);
-            const factors = await accountListMfaFactors({
+            const factors = await accountListMFAFactors({
                 sdk: client,
                 parseOutput: false
             });
@@ -906,7 +906,7 @@ const questionsListFactors = [
     }
 ];
 
-const questionsMfaChallenge = [
+const questionsMFAChallenge = [
     {
         type: "input",
         name: "otp",
@@ -1019,7 +1019,7 @@ module.exports = {
     questionsPushTeams,
     questionsGetEntrypoint,
     questionsListFactors,
-    questionsMfaChallenge,
+    questionsMFAChallenge,
     questionsRunFunctions,
     questionGetEndpoint,
     questionsInitResources,

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

@@ -0,0 +1,170 @@
+/** @typedef {import('../attribute').Attribute} Attribute */
+const { AttributeType } = require('../attribute');
+const { LanguageMeta } = require("./language");
+
+class CSharp extends LanguageMeta {
+  getType(attribute, collections) {
+    let type = "";
+    switch (attribute.type) {
+      case AttributeType.STRING:
+      case AttributeType.EMAIL:
+      case AttributeType.DATETIME:
+        type = "string";
+        if (attribute.format === AttributeType.ENUM) {
+          type = LanguageMeta.toPascalCase(attribute.key);
+        }
+        break;
+      case AttributeType.INTEGER:
+        type = "long";
+        break;
+      case AttributeType.FLOAT:
+        type = "double";
+        break;
+      case AttributeType.BOOLEAN:
+        type = "bool";
+        break;
+      case AttributeType.RELATIONSHIP:
+        const relatedCollection = collections.find(c => c.$id === attribute.relatedCollection);
+        if (!relatedCollection) {
+          throw new Error(`Related collection with ID '${attribute.relatedCollection}' not found.`);
+        }
+        type = LanguageMeta.toPascalCase(relatedCollection.name);
+        if ((attribute.relationType === 'oneToMany' && attribute.side === 'parent') || (attribute.relationType === 'manyToOne' && attribute.side === 'child') || attribute.relationType === 'manyToMany') {
+          type = `List<${type}>`;
+        }
+        break;
+      default:
+        throw new Error(`Unknown attribute type: ${attribute.type}`);
+    }
+    if (attribute.array) {
+      type = `List<${type}>`;
+    }
+    if (!attribute.required) {
+      type += "?";
+    }
+    return type;
+  }
+
+  getTemplate() {
+    return `/// This file is auto-generated by the Appwrite CLI. 
+/// You can regenerate it by running \`appwrite ${process.argv.slice(2).join(' ')}\`.
+
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Serialization;
+
+namespace Appwrite.Models
+{
+<% for (const attribute of collection.attributes) { -%>
+<% if (attribute.format === 'enum') { -%>
+
+public enum <%- toPascalCase(attribute.key) %> {
+<% for (const [index, element] of Object.entries(attribute.elements) ) { -%>
+    [JsonPropertyName("<%- element %>")]
+    <%- toPascalCase(element) %><% if (index < attribute.elements.length - 1) { %>,<% } %>
+<% } -%>
+}
+<% } -%>
+<% } %>
+public class <%= toPascalCase(collection.name) %>
+{
+<% for (const [index, attribute] of Object.entries(collection.attributes)) { -%>
+    [JsonPropertyName("<%- attribute.key %>")]
+    public <%- getType(attribute, collections) %> <%= toPascalCase(attribute.key) %> { get; private set; }
+
+<% } -%>
+
+    public <%= toPascalCase(collection.name) %>(
+<% for (const [index, attribute] of Object.entries(collection.attributes)) { -%>
+        <%- getType(attribute, collections) %> <%= toCamelCase(attribute.key) %><% if (index < collection.attributes.length - 1) { %>,<% } %>
+<% } -%>
+    )
+    {
+<% for (const [index, attribute] of Object.entries(collection.attributes)) { -%>
+        <%= toPascalCase(attribute.key) %> = <%= toCamelCase(attribute.key) %>;
+<% } -%>
+    }
+
+    public static <%= toPascalCase(collection.name) %> From(Dictionary<string, object> map) => new <%= toPascalCase(collection.name) %>(
+<% for (const [index, attribute] of Object.entries(collection.attributes)) { -%>
+        <%- toCamelCase(attribute.key) %>: <%
+            // ENUM
+            if (attribute.format === 'enum') {
+                if (attribute.array) {
+                    -%>((IEnumerable<object>)map["<%- attribute.key %>"]).Select(e => Enum.Parse<Models.<%- toPascalCase(attribute.key) %>>(e.ToString()!, true)).ToList()<%
+                } else {
+                    -%>Enum.Parse<Models.<%- toPascalCase(attribute.key) %>>(map["<%- attribute.key %>"].ToString()!, true)<%
+                }
+            // RELATIONSHIP
+            } else if (attribute.type === 'relationship') {
+                const relatedClass = toPascalCase(collections.find(c => c.$id === attribute.relatedCollection).name);
+                if ((attribute.relationType === 'oneToMany' && attribute.side === 'parent') || (attribute.relationType === 'manyToOne' && attribute.side === 'child') || attribute.relationType === 'manyToMany' || attribute.array) {
+                    -%>((IEnumerable<object>)map["<%- attribute.key %>"]).Select(it => Models.<%- relatedClass %>.From((Dictionary<string, object>)it)).ToList()<%
+                } else {
+                    -%>Models.<%- relatedClass %>.From((Dictionary<string, object>)map["<%- attribute.key %>"])<%
+                }
+            // ARRAY TYPES
+            } else if (attribute.array) {
+                if (attribute.type === 'string' || attribute.type === 'datetime' || attribute.type === 'email') {
+                    -%>((IEnumerable<object>)map["<%- attribute.key %>"]).Select(x => x?.ToString())<%- attribute.required ? '.Where(x => x != null)' : '' %>.ToList()!<%
+                } else if (attribute.type === 'integer') {
+                    -%>((IEnumerable<object>)map["<%- attribute.key %>"]).Select(x => <%- !attribute.required ? 'x == null ? (long?)null : ' : '' %>Convert.ToInt64(x)).ToList()<%
+                } else if (attribute.type === 'double') {
+                    -%>((IEnumerable<object>)map["<%- attribute.key %>"]).Select(x => <%- !attribute.required ? 'x == null ? (double?)null : ' : '' %>Convert.ToDouble(x)).ToList()<%
+                } else if (attribute.type === 'boolean') {
+                    -%>((IEnumerable<object>)map["<%- attribute.key %>"]).Select(x => <%- !attribute.required ? 'x == null ? (bool?)null : ' : '' %>(bool)x).ToList()<%
+                }
+            // SINGLE VALUE TYPES
+            } else if (attribute.type === 'integer') {
+                -%><%- !attribute.required ? 'map["' + attribute.key + '"] == null ? null : ' : '' %>Convert.ToInt64(map["<%- attribute.key %>"])<%
+            } else if (attribute.type === 'double') {
+                -%><%- !attribute.required ? 'map["' + attribute.key + '"] == null ? null : ' : '' %>Convert.ToDouble(map["<%- attribute.key %>"])<%
+            } else if (attribute.type === 'boolean') {
+                -%>(<%- getType(attribute, collections) %>)map["<%- attribute.key %>"]<%
+            } else if (attribute.type === 'string' || attribute.type === 'datetime' || attribute.type === 'email') {
+                -%>map["<%- attribute.key %>"]<%- !attribute.required ? '?' : '' %>.ToString()<%- attribute.required ? '!' : ''%><%
+            } else {
+                -%>default<%
+            }
+            -%><% if (index < collection.attributes.length - 1) { %>,<% } %>
+<% } -%>
+    );
+
+    public Dictionary<string, object?> ToMap() => new Dictionary<string, object?>()
+    {
+<% for (const [index, attribute] of Object.entries(collection.attributes)) { -%>
+        { "<%- attribute.key %>", <%
+        // ENUM
+        if (attribute.format === 'enum') {
+            if (attribute.array) {
+                -%><%= toPascalCase(attribute.key) %>?.Select(e => e.ToString()).ToList()<%
+            } else {
+                -%><%= toPascalCase(attribute.key) %>?.ToString()<%
+            }
+        // RELATIONSHIP
+        } else if (attribute.type === 'relationship') {
+            if ((attribute.relationType === 'oneToMany' && attribute.side === 'parent') || (attribute.relationType === 'manyToOne' && attribute.side === 'child') || attribute.relationType === 'manyToMany' || attribute.array) {
+                -%><%= toPascalCase(attribute.key) %>?.Select(e => e.ToMap()).ToList()<%
+            } else {
+                -%><%= toPascalCase(attribute.key) %>?.ToMap()<%
+            }
+        // OTHER
+        } else {
+            -%><%= toPascalCase(attribute.key) %><%
+        }
+        -%> }<% if (index < collection.attributes.length - 1) { %>,<% } %>
+<% } -%>
+    };
+}
+}
+`;
+  }
+
+  getFileName(collection) {
+    return LanguageMeta.toPascalCase(collection.name) + ".cs";
+  }
+}
+
+module.exports = { CSharp };

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

@@ -66,7 +66,7 @@ class JavaScript extends LanguageMeta {
 
   getTemplate() {
     return `/**
- * @typedef {import('${this._getAppwriteDependency()}').Models.Document} Document
+ * @typedef {import('${this._getAppwriteDependency()}').Models.Row} Row
  */
 
 // This file is auto-generated by the Appwrite CLI. 
@@ -83,7 +83,7 @@ class JavaScript extends LanguageMeta {
 <% } -%>
 <% } -%>
 <% for (const [index, collection] of Object.entries(collections)) { %>/**
- * @typedef {Document & {
+ * @typedef {Row & {
 <% for (const attribute of collection.attributes) { -%>
  *   <%- strict ? toCamelCase(attribute.key) : attribute.key %>: <%- getType(attribute, collections) %>;
 <% } -%>

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

@@ -88,7 +88,7 @@ export enum <%- toPascalCase(attribute.key) %> {
 <% } -%>
 <% } -%>
 <% for (const [index, collection] of Object.entries(collections)) { -%>
-export type <%- toPascalCase(collection.name) %> = Models.Document & {
+export type <%- toPascalCase(collection.name) %> = Models.Row & {
 <% for (const attribute of collection.attributes) { -%>
     <%- strict ? toCamelCase(attribute.key) : attribute.key %>: <%- getType(attribute, collections) %>;
 <% } -%>

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

package/scoop/appwrite.config.json

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