appwrite-cli 9.1.0 → 10.0.1

package/lib/commands/tables-db.js

@@ -1185,7 +1185,7 @@ const tablesDBUpdateIpColumn = async ({databaseId,tableId,key,required,xdefault,
  * @property {string} tableId Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).
  * @property {string} key Column Key.
  * @property {boolean} required Is column required?
- * @property {string} xdefault Default value for column when not provided, as JSON string. Cannot be set when column is required.
+ * @property {any[]} xdefault Default value for column when not provided, two-dimensional array of coordinate pairs, [[longitude, latitude], [longitude, latitude], …], listing the vertices of the line in order. Cannot be set when column is required.
  * @property {boolean} overrideForCli
  * @property {boolean} parseOutput
  * @property {libClient | undefined} sdk
@@ -1205,6 +1205,7 @@ const tablesDBCreateLineColumn = async ({databaseId,tableId,key,required,xdefaul
     if (typeof required !== 'undefined') {
         payload['required'] = required;
     }
+    xdefault = xdefault === true ? [] : xdefault;
     if (typeof xdefault !== 'undefined') {
         payload['default'] = xdefault;
     }
@@ -1228,7 +1229,7 @@ const tablesDBCreateLineColumn = async ({databaseId,tableId,key,required,xdefaul
  * @property {string} tableId Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).
  * @property {string} key Column Key.
  * @property {boolean} required Is column required?
- * @property {string} xdefault Default value for column when not provided, as JSON string. Cannot be set when column is required.
+ * @property {any[]} xdefault Default value for column when not provided, two-dimensional array of coordinate pairs, [[longitude, latitude], [longitude, latitude], …], listing the vertices of the line in order. Cannot be set when column is required.
  * @property {string} newKey New Column Key.
  * @property {boolean} overrideForCli
  * @property {boolean} parseOutput
@@ -1246,6 +1247,7 @@ const tablesDBUpdateLineColumn = async ({databaseId,tableId,key,required,xdefaul
     if (typeof required !== 'undefined') {
         payload['required'] = required;
     }
+    xdefault = xdefault === true ? [] : xdefault;
     if (typeof xdefault !== 'undefined') {
         payload['default'] = xdefault;
     }
@@ -1272,7 +1274,7 @@ const tablesDBUpdateLineColumn = async ({databaseId,tableId,key,required,xdefaul
  * @property {string} tableId Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).
  * @property {string} key Column Key.
  * @property {boolean} required Is column required?
- * @property {string} xdefault Default value for column when not provided, as JSON string. Cannot be set when column is required.
+ * @property {any[]} xdefault Default value for column when not provided, array of two numbers [longitude, latitude], representing a single coordinate. Cannot be set when column is required.
  * @property {boolean} overrideForCli
  * @property {boolean} parseOutput
  * @property {libClient | undefined} sdk
@@ -1292,6 +1294,7 @@ const tablesDBCreatePointColumn = async ({databaseId,tableId,key,required,xdefau
     if (typeof required !== 'undefined') {
         payload['required'] = required;
     }
+    xdefault = xdefault === true ? [] : xdefault;
     if (typeof xdefault !== 'undefined') {
         payload['default'] = xdefault;
     }
@@ -1315,7 +1318,7 @@ const tablesDBCreatePointColumn = async ({databaseId,tableId,key,required,xdefau
  * @property {string} tableId Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).
  * @property {string} key Column Key.
  * @property {boolean} required Is column required?
- * @property {string} xdefault Default value for column when not provided, as JSON string. Cannot be set when column is required.
+ * @property {any[]} xdefault Default value for column when not provided, array of two numbers [longitude, latitude], representing a single coordinate. Cannot be set when column is required.
  * @property {string} newKey New Column Key.
  * @property {boolean} overrideForCli
  * @property {boolean} parseOutput
@@ -1333,6 +1336,7 @@ const tablesDBUpdatePointColumn = async ({databaseId,tableId,key,required,xdefau
     if (typeof required !== 'undefined') {
         payload['required'] = required;
     }
+    xdefault = xdefault === true ? [] : xdefault;
     if (typeof xdefault !== 'undefined') {
         payload['default'] = xdefault;
     }
@@ -1359,7 +1363,7 @@ const tablesDBUpdatePointColumn = async ({databaseId,tableId,key,required,xdefau
  * @property {string} tableId Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).
  * @property {string} key Column Key.
  * @property {boolean} required Is column required?
- * @property {string} xdefault Default value for column when not provided, as JSON string. Cannot be set when column is required.
+ * @property {any[]} xdefault Default value for column when not provided, three-dimensional array where the outer array holds one or more linear rings, [[[longitude, latitude], …], …], the first ring is the exterior boundary, any additional rings are interior holes, and each ring must start and end with the same coordinate pair. Cannot be set when column is required.
  * @property {boolean} overrideForCli
  * @property {boolean} parseOutput
  * @property {libClient | undefined} sdk
@@ -1379,6 +1383,7 @@ const tablesDBCreatePolygonColumn = async ({databaseId,tableId,key,required,xdef
     if (typeof required !== 'undefined') {
         payload['required'] = required;
     }
+    xdefault = xdefault === true ? [] : xdefault;
     if (typeof xdefault !== 'undefined') {
         payload['default'] = xdefault;
     }
@@ -1402,7 +1407,7 @@ const tablesDBCreatePolygonColumn = async ({databaseId,tableId,key,required,xdef
  * @property {string} tableId Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).
  * @property {string} key Column Key.
  * @property {boolean} required Is column required?
- * @property {string} xdefault Default value for column when not provided, as JSON string. Cannot be set when column is required.
+ * @property {any[]} xdefault Default value for column when not provided, three-dimensional array where the outer array holds one or more linear rings, [[[longitude, latitude], …], …], the first ring is the exterior boundary, any additional rings are interior holes, and each ring must start and end with the same coordinate pair. Cannot be set when column is required.
  * @property {string} newKey New Column Key.
  * @property {boolean} overrideForCli
  * @property {boolean} parseOutput
@@ -1420,6 +1425,7 @@ const tablesDBUpdatePolygonColumn = async ({databaseId,tableId,key,required,xdef
     if (typeof required !== 'undefined') {
         payload['required'] = required;
     }
+    xdefault = xdefault === true ? [] : xdefault;
     if (typeof xdefault !== 'undefined') {
         payload['default'] = xdefault;
     }
@@ -2075,7 +2081,7 @@ const tablesDBCreateRow = async ({databaseId,tableId,rowId,data,permissions,pars
  * @typedef {Object} TablesDBCreateRowsRequestParams
  * @property {string} databaseId Database ID.
  * @property {string} tableId Table ID. You can create a new table using the Database service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate). Make sure to define columns before creating rows.
- * @property {object[]} rows Array of documents data as JSON objects.
+ * @property {object[]} rows Array of rows data as JSON objects.
  * @property {boolean} overrideForCli
  * @property {boolean} parseOutput
  * @property {libClient | undefined} sdk
@@ -2829,64 +2835,64 @@ tablesDB
 
 tablesDB
     .command(`create-line-column`)
-    .description(`Create a geometric line attribute.`)
+    .description(`Create a geometric line column.`)
     .requiredOption(`--database-id <database-id>`, `Database ID.`)
     .requiredOption(`--table-id <table-id>`, `Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).`)
     .requiredOption(`--key <key>`, `Column Key.`)
     .requiredOption(`--required [value]`, `Is column required?`, (value) => value === undefined ? true : parseBool(value))
-    .option(`--xdefault <xdefault>`, `Default value for column when not provided, as JSON string. Cannot be set when column is required.`)
+    .option(`--xdefault <xdefault>`, `Default value for column when not provided, two-dimensional array of coordinate pairs, [[longitude, latitude], [longitude, latitude], …], listing the vertices of the line in order. Cannot be set when column is required.`)
     .action(actionRunner(tablesDBCreateLineColumn))
 
 tablesDB
     .command(`update-line-column`)
-    .description(`Update a line column. Changing the 'default' value will not update already existing documents.`)
+    .description(`Update a line column. Changing the 'default' value will not update already existing rows.`)
     .requiredOption(`--database-id <database-id>`, `Database ID.`)
     .requiredOption(`--table-id <table-id>`, `Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).`)
     .requiredOption(`--key <key>`, `Column Key.`)
     .requiredOption(`--required [value]`, `Is column required?`, (value) => value === undefined ? true : parseBool(value))
-    .option(`--xdefault <xdefault>`, `Default value for column when not provided, as JSON string. Cannot be set when column is required.`)
+    .option(`--xdefault <xdefault>`, `Default value for column when not provided, two-dimensional array of coordinate pairs, [[longitude, latitude], [longitude, latitude], …], listing the vertices of the line in order. Cannot be set when column is required.`)
     .option(`--new-key <new-key>`, `New Column Key.`)
     .action(actionRunner(tablesDBUpdateLineColumn))
 
 tablesDB
     .command(`create-point-column`)
-    .description(`Create a geometric point attribute.`)
+    .description(`Create a geometric point column.`)
     .requiredOption(`--database-id <database-id>`, `Database ID.`)
     .requiredOption(`--table-id <table-id>`, `Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).`)
     .requiredOption(`--key <key>`, `Column Key.`)
     .requiredOption(`--required [value]`, `Is column required?`, (value) => value === undefined ? true : parseBool(value))
-    .option(`--xdefault <xdefault>`, `Default value for column when not provided, as JSON string. Cannot be set when column is required.`)
+    .option(`--xdefault <xdefault>`, `Default value for column when not provided, array of two numbers [longitude, latitude], representing a single coordinate. Cannot be set when column is required.`)
     .action(actionRunner(tablesDBCreatePointColumn))
 
 tablesDB
     .command(`update-point-column`)
-    .description(`Update a point column. Changing the 'default' value will not update already existing documents.`)
+    .description(`Update a point column. Changing the 'default' value will not update already existing rows.`)
     .requiredOption(`--database-id <database-id>`, `Database ID.`)
     .requiredOption(`--table-id <table-id>`, `Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).`)
     .requiredOption(`--key <key>`, `Column Key.`)
     .requiredOption(`--required [value]`, `Is column required?`, (value) => value === undefined ? true : parseBool(value))
-    .option(`--xdefault <xdefault>`, `Default value for column when not provided, as JSON string. Cannot be set when column is required.`)
+    .option(`--xdefault <xdefault>`, `Default value for column when not provided, array of two numbers [longitude, latitude], representing a single coordinate. Cannot be set when column is required.`)
     .option(`--new-key <new-key>`, `New Column Key.`)
     .action(actionRunner(tablesDBUpdatePointColumn))
 
 tablesDB
     .command(`create-polygon-column`)
-    .description(`Create a geometric polygon attribute.`)
+    .description(`Create a geometric polygon column.`)
     .requiredOption(`--database-id <database-id>`, `Database ID.`)
     .requiredOption(`--table-id <table-id>`, `Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).`)
     .requiredOption(`--key <key>`, `Column Key.`)
     .requiredOption(`--required [value]`, `Is column required?`, (value) => value === undefined ? true : parseBool(value))
-    .option(`--xdefault <xdefault>`, `Default value for column when not provided, as JSON string. Cannot be set when column is required.`)
+    .option(`--xdefault <xdefault>`, `Default value for column when not provided, three-dimensional array where the outer array holds one or more linear rings, [[[longitude, latitude], …], …], the first ring is the exterior boundary, any additional rings are interior holes, and each ring must start and end with the same coordinate pair. Cannot be set when column is required.`)
     .action(actionRunner(tablesDBCreatePolygonColumn))
 
 tablesDB
     .command(`update-polygon-column`)
-    .description(`Update a polygon column. Changing the 'default' value will not update already existing documents.`)
+    .description(`Update a polygon column. Changing the 'default' value will not update already existing rows.`)
     .requiredOption(`--database-id <database-id>`, `Database ID.`)
     .requiredOption(`--table-id <table-id>`, `Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).`)
     .requiredOption(`--key <key>`, `Column Key.`)
     .requiredOption(`--required [value]`, `Is column required?`, (value) => value === undefined ? true : parseBool(value))
-    .option(`--xdefault <xdefault>`, `Default value for column when not provided, as JSON string. Cannot be set when column is required.`)
+    .option(`--xdefault <xdefault>`, `Default value for column when not provided, three-dimensional array where the outer array holds one or more linear rings, [[[longitude, latitude], …], …], the first ring is the exterior boundary, any additional rings are interior holes, and each ring must start and end with the same coordinate pair. Cannot be set when column is required.`)
     .option(`--new-key <new-key>`, `New Column Key.`)
     .action(actionRunner(tablesDBUpdatePolygonColumn))
 
@@ -3047,7 +3053,7 @@ tablesDB
     .description(`Create new Rows. Before using this route, you should create a new table resource using either a [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreateTable) API or directly from your database console.`)
     .requiredOption(`--database-id <database-id>`, `Database ID.`)
     .requiredOption(`--table-id <table-id>`, `Table ID. You can create a new table using the Database service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate). Make sure to define columns before creating rows.`)
-    .requiredOption(`--rows [rows...]`, `Array of documents data as JSON objects.`)
+    .requiredOption(`--rows [rows...]`, `Array of rows data as JSON objects.`)
     .action(actionRunner(tablesDBCreateRows))
 
 tablesDB

package/lib/config.js

@@ -9,7 +9,7 @@ const KeysSite = new Set(["path", "$id", "name", "enabled", "logging", "timeout"
 const KeysFunction = new Set(["path", "$id", "execute", "name", "enabled", "logging", "runtime", "specification", "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 KeysTable = new Set(["$id", "$permissions", "databaseId", "name", "enabled", "documentSecurity", "columns", "indexes"]);
+const KeysTable = new Set(["$id", "$permissions", "databaseId", "name", "enabled", "rowSecurity", "columns", "indexes"]);
 const KeysStorage = new Set(["$id", "$permissions", "fileSecurity", "name", "enabled", "maximumFileSize", "allowedFileExtensions", "compression", "encryption", "antivirus"]);
 const KeysTopics = new Set(["$id", "name", "subscribe"]);
 const KeysTeams = new Set(["$id", "name"]);
@@ -62,12 +62,13 @@ const KeysColumns = new Set([
     "onDelete",
     "side",
     // Indexes
-    "attributes",
+    "columns",
     "orders",
     // Strings
     "encrypt",
 ]);
 const KeyIndexes = new Set(["key", "type", "status", "attributes", "orders"]);
+const KeyIndexesColumns = new Set(["key", "type", "status", "columns", "orders"]);
 
 function whitelistKeys(value, keys, nestedKeys = {}) {
     if (Array.isArray(value)) {
@@ -404,7 +405,7 @@ class Local extends Config {
     addTable(props) {
         props = whitelistKeys(props, KeysTable, {
             columns: KeysColumns,
-            indexes: KeyIndexes
+            indexes: KeyIndexesColumns
         });
 
         if (!this.has("tables")) {

package/lib/parser.js

@@ -122,7 +122,7 @@ const parseError = (err) => {
             } catch {
             }
 
-            const version = '9.1.0';
+            const version = '10.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()}`;
 
@@ -205,7 +205,8 @@ const commandDescriptions = {
     "account": `The account command allows you to authenticate and manage a user account.`,
     "graphql": `The graphql command allows you to query and mutate any resource type on your Appwrite server.`,
     "avatars": `The avatars command aims to help you complete everyday tasks related to your app image, icons, and avatars.`,
-    "databases": `The databases command allows you to create structured collections of documents and query and filter lists of documents.`,
+    "databases": `(Legacy) The databases command allows you to create structured collections of documents and query and filter lists of documents.`,
+    'tables-db': `The tables-db command allows you to create structured tables of columns and query and filter lists of rows.`,
     "init": `The init command provides a convenient wrapper for creating and initializing projects, functions, collections, buckets, teams, and messaging-topics in  Appwrite.`,
     "push": `The push command provides a convenient wrapper for pushing your functions, collections, buckets, teams, and messaging-topics.`,
     "run": `The run command allows you to run the project locally to allow easy development and quick debugging.`,
@@ -218,6 +219,8 @@ const commandDescriptions = {
     "teams": `The teams command allows you to group users of your project to enable them to share read and write access to your project resources.`,
     "update": `The update command allows you to update the Appwrite CLI to the latest version.`,
     "users": `The users command allows you to manage your project users.`,
+    "projects": `The projects command allows you to manage your projects, add platforms, manage API keys, Dev Keys etc.`,
+    "project": `The project command allows you to manage project related resources like usage, variables, etc.`,
     "client": `The client command allows you to configure your CLI`,
     "login": `The login command allows you to authenticate and manage a user account.`,
     "logout": `The logout command allows you to log out of your Appwrite account.`,

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

@@ -83,104 +83,101 @@ class Dart extends LanguageMeta {
   }
 
   getTemplate() {
-    return `<% for (const attribute of collection.attributes) { -%>
-<% if (attribute.type === 'relationship') { -%>
-import '<%- toSnakeCase(collections.find(c => c.$id === attribute.relatedCollection).name) %>.dart';
-
-<% } -%>
-<% } -%>
-/// This file is auto-generated by the Appwrite CLI. 
-/// You can regenerate it by running \`appwrite ${process.argv.slice(2).join(' ')}\`.
-
-<% for (const attribute of collection.attributes) { -%>
-<% if (attribute.format === 'enum') { -%>
+  return `// This file is auto-generated by the Appwrite CLI. 
+// You can regenerate it by running \`appwrite ${process.argv.slice(2).join(' ')}\`.
+<% const __relatedImportsSeen = new Set();
+   const sortedAttributes = collection.attributes.slice().sort((a, b) => {
+     if (a.required === b.required) return 0;
+     return a.required ? -1 : 1;
+   }); -%>
+<% const __attrs = sortedAttributes; -%>
+<% for (const attribute of __attrs) { -%>
+<%   if (attribute.type === '${AttributeType.RELATIONSHIP}') { -%>
+<%     const related = collections.find(c => c.$id === attribute.relatedCollection); -%>
+<%     if (related && !__relatedImportsSeen.has(toSnakeCase(related.name))) { -%>
+import '<%- toSnakeCase(related.name) %>.dart';
+<%       __relatedImportsSeen.add(toSnakeCase(related.name)); -%>
+<%     } -%>
+<%   } -%>
+<% } -%>
+
+<% for (const attribute of __attrs) { -%>
+<% if (attribute.format === '${AttributeType.ENUM}') { -%>
 enum <%- toPascalCase(attribute.key) %> {
 <% for (const [index, element] of Object.entries(attribute.elements)) { -%>
-  <%- strict ? toCamelCase(element) : element %><% if (index < attribute.elements.length - 1) { %>,<% } %>
+  <%- strict ? toCamelCase(element) : element %><% if (index < attribute.elements.length - 1) { -%>,<% } %>
 <% } -%>
 }
 
 <% } -%>
 <% } -%>
 class <%= toPascalCase(collection.name) %> {
-<% for (const [index, attribute] of Object.entries(collection.attributes)) { -%>
+<% for (const [index, attribute] of Object.entries(__attrs)) { -%>
   <%- getType(attribute, collections) %> <%= strict ? toCamelCase(attribute.key) : attribute.key %>;
 <% } -%>
 
   <%= toPascalCase(collection.name) %>({
-  <% for (const [index, attribute] of Object.entries(collection.attributes)) { -%>
-  <% if (attribute.required) { %>required <% } %>this.<%= strict ? toCamelCase(attribute.key) : attribute.key %><% if (index < collection.attributes.length - 1) { %>,<% } %>
+  <% for (const [index, attribute] of Object.entries(__attrs)) { -%>
+  <% if (attribute.required) { %>required <% } %>this.<%= strict ? toCamelCase(attribute.key) : attribute.key %><% if (index < __attrs.length - 1) { -%>,<% } %>
   <% } -%>
 });
 
   factory <%= toPascalCase(collection.name) %>.fromMap(Map<String, dynamic> map) {
     return <%= toPascalCase(collection.name) %>(
-<% for (const [index, attribute] of Object.entries(collection.attributes)) { -%>
-      <%= strict ? toCamelCase(attribute.key) : attribute.key %>: <% if (attribute.type === 'string' || attribute.type === 'email' || attribute.type === 'datetime') { -%>
-<% if (attribute.format === 'enum') { -%>
+<% for (const [index, attribute] of Object.entries(__attrs)) { -%>
+  <%= strict ? toCamelCase(attribute.key) : attribute.key %>: <% if (attribute.type === '${AttributeType.STRING}' || attribute.type === '${AttributeType.EMAIL}' || attribute.type === '${AttributeType.DATETIME}') { -%>
+<% if (attribute.format === '${AttributeType.ENUM}') { -%>
 <% if (attribute.array) { -%>
-(map['<%= attribute.key %>'] as List<dynamic>?)?.map((e) => <%- toPascalCase(attribute.key) %>.values.firstWhere((element) => element.name == e)).toList()<% if (!attribute.required) { %> ?? []<% } -%>
-<% } else { -%>
+(map['<%= attribute.key %>'] as List<dynamic>?)?.map((e) => <%- toPascalCase(attribute.key) %>.values.firstWhere((element) => element.name == e)).toList()<% } else { -%>
 <% if (!attribute.required) { -%>
 map['<%= attribute.key %>'] != null ? <%- toPascalCase(attribute.key) %>.values.where((e) => e.name == map['<%= attribute.key %>']).firstOrNull : null<% } else { -%>
 <%- toPascalCase(attribute.key) %>.values.firstWhere((e) => e.name == map['<%= attribute.key %>'])<% } -%>
 <% } -%>
 <% } else { -%>
 <% if (attribute.array) { -%>
-List<String>.from(map['<%= attribute.key %>'] ?? [])<% if (!attribute.required) { %> ?? []<% } -%>
-<% } else { -%>
-map['<%= attribute.key %>']<% if (!attribute.required) { %>?<% } %>.toString()<% if (!attribute.required) { %> ?? null<% } -%>
+List<String>.from(map['<%= attribute.key %>'] ?? [])<% } else { -%>
+map['<%= attribute.key %>']<% if (!attribute.required) { %>?<% } %>.toString()<% } -%>
 <% } -%>
-<% } -%>
-<% } else if (attribute.type === 'integer') { -%>
+<% } else if (attribute.type === '${AttributeType.INTEGER}') { -%>
 <% if (attribute.array) { -%>
-List<int>.from(map['<%= attribute.key %>'] ?? [])<% if (!attribute.required) { %> ?? []<% } -%>
-<% } else { -%>
-map['<%= attribute.key %>']<% if (!attribute.required) { %> ?? null<% } -%>
-<% } -%>
-<% } else if (attribute.type === 'float') { -%>
+List<int>.from(map['<%= attribute.key %>'] ?? [])<% } else { -%>
+map['<%= attribute.key %>']<% } -%>
+<% } else if (attribute.type === '${AttributeType.FLOAT}') { -%>
 <% if (attribute.array) { -%>
-List<double>.from(map['<%= attribute.key %>'] ?? [])<% if (!attribute.required) { %> ?? []<% } -%>
-<% } else { -%>
-map['<%= attribute.key %>']<% if (!attribute.required) { %> ?? null<% } -%>
-<% } -%>
-<% } else if (attribute.type === 'boolean') { -%>
+List<double>.from(map['<%= attribute.key %>'] ?? [])<% } else { -%>
+map['<%= attribute.key %>']<% } -%>
+<% } else if (attribute.type === '${AttributeType.BOOLEAN}') { -%>
 <% if (attribute.array) { -%>
-List<bool>.from(map['<%= attribute.key %>'] ?? [])<% if (!attribute.required) { %> ?? []<% } -%>
-<% } else { -%>
-map['<%= attribute.key %>']<% if (!attribute.required) { %> ?? null<% } -%>
-<% } -%>
-<% } else if (attribute.type === 'relationship') { -%>
+List<bool>.from(map['<%= attribute.key %>'] ?? [])<% } else { -%>
+map['<%= attribute.key %>']<% } -%>
+<% } else if (attribute.type === '${AttributeType.RELATIONSHIP}') { -%>
 <% if ((attribute.relationType === 'oneToMany' && attribute.side === 'parent') || (attribute.relationType === 'manyToOne' && attribute.side === 'child') || attribute.relationType === 'manyToMany') { -%>
-(map['<%= attribute.key %>'] as List<dynamic>?)?.map((e) => <%- toPascalCase(collections.find(c => c.$id === attribute.relatedCollection).name) %>.fromMap(e)).toList()<% if (!attribute.required) { %> ?? []<% } -%>
+(map['<%= attribute.key %>'] as List<dynamic>?)?.map((e) => <%- toPascalCase(collections.find(c => c.$id === attribute.relatedCollection).name) %>.fromMap(e)).toList()
 <% } else { -%>
 <% if (!attribute.required) { -%>
 map['<%= attribute.key %>'] != null ? <%- toPascalCase(collections.find(c => c.$id === attribute.relatedCollection).name) %>.fromMap(map['<%= attribute.key %>']) : null<% } else { -%>
 <%- toPascalCase(collections.find(c => c.$id === attribute.relatedCollection).name) %>.fromMap(map['<%= attribute.key %>'])<% } -%>
 <% } -%>
-<% } -%><% if (index < collection.attributes.length - 1) { %>,<% } %>
+<% } -%><% if (index < __attrs.length - 1) { -%>,<% } %>
 <% } -%>
     );
   }
 
   Map<String, dynamic> toMap() {
     return {
-<% for (const [index, attribute] of Object.entries(collection.attributes)) { -%>
-      "<%= attribute.key %>": <% if (attribute.type === 'relationship') { -%>
+<% for (const [index, attribute] of Object.entries(__attrs)) { -%>
+  '<%= attribute.key %>': <% if (attribute.type === '${AttributeType.RELATIONSHIP}') { -%>
 <% if ((attribute.relationType === 'oneToMany' && attribute.side === 'parent') || (attribute.relationType === 'manyToOne' && attribute.side === 'child') || attribute.relationType === 'manyToMany') { -%>
-<%= strict ? toCamelCase(attribute.key) : attribute.key %><% if (!attribute.required) { %>?<% } %>.map((e) => e.toMap()).toList()<% if (!attribute.required) { %> ?? []<% } -%>
+<%= strict ? toCamelCase(attribute.key) : attribute.key %><% if (!attribute.required) { %>?<% } %>.map((e) => e.toMap()).toList()
 <% } else { -%>
-<%= strict ? toCamelCase(attribute.key) : attribute.key %><% if (!attribute.required) { %>?<% } %>.toMap()<% if (!attribute.required) { %> ?? {}<% } -%>
-<% } -%>
-<% } else if (attribute.format === 'enum') { -%>
+<%= strict ? toCamelCase(attribute.key) : attribute.key %><% if (!attribute.required) { %>?<% } %>.toMap()<% } -%>
+<% } else if (attribute.format === '${AttributeType.ENUM}') { -%>
 <% if (attribute.array) { -%>
-<%= strict ? toCamelCase(attribute.key) : attribute.key %><% if (!attribute.required) { %>?<% } %>.map((e) => e.name).toList()<% if (!attribute.required) { %> ?? []<% } -%>
-<% } else { -%>
-<%= strict ? toCamelCase(attribute.key) : attribute.key %><% if (!attribute.required) { %>?<% } %>.name<% if (!attribute.required) { %> ?? null<% } -%>
-<% } -%>
+<%= strict ? toCamelCase(attribute.key) : attribute.key %><% if (!attribute.required) { %>?<% } %>.map((e) => e.name).toList()<% } else { -%>
+<%= strict ? toCamelCase(attribute.key) : attribute.key %><% if (!attribute.required) { %>?<% } %>.name<% } -%>
 <% } else { -%>
 <%= strict ? toCamelCase(attribute.key) : attribute.key -%>
-<% } -%><% if (index < collection.attributes.length - 1) { %>,<% } %>
+<% } -%><% if (index < __attrs.length - 1) { -%>,<% } %>
 <% } -%>
     };
   }

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

@@ -69,7 +69,7 @@ class TypeScript extends LanguageMeta {
   }
 
   getTemplate() {
-    return `import { type 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 ${process.argv.slice(2).join(' ')}\`.
@@ -90,7 +90,9 @@ export enum <%- toPascalCase(attribute.key) %> {
 <% for (const [index, collection] of Object.entries(collections)) { -%>
 export type <%- toPascalCase(collection.name) %> = Models.Row & {
 <% for (const attribute of collection.attributes) { -%>
-    <%- strict ? toCamelCase(attribute.key) : attribute.key %>: <%- getType(attribute, collections) %>;
+<% const propertyName = strict ? toCamelCase(attribute.key) : attribute.key; -%>
+<% const isValidIdentifier = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(propertyName); -%>
+    <% if (isValidIdentifier) { %><%- propertyName %><% } else { %>"<%- propertyName %>"<% } %>: <%- getType(attribute, collections) %>;
 <% } -%>
 }<% if (index < collections.length - 1) { %>
 <% } %>

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.1.0",
+  "version": "10.0.1",
   "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.1.0",
+	"version": "10.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/9.1.0/appwrite-cli-win-x64.exe",
+			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/10.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/9.1.0/appwrite-cli-win-arm64.exe",
+			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/10.0.1/appwrite-cli-win-arm64.exe",
 			"bin": [
 				[
 					"appwrite-cli-win-arm64.exe",

package/docs/examples/avatars/get-browser.md

@@ -1,2 +0,0 @@
-appwrite avatars get-browser \
-    --code aa

package/docs/examples/avatars/get-credit-card.md

@@ -1,2 +0,0 @@
-appwrite avatars get-credit-card \
-    --code amex

package/docs/examples/avatars/get-favicon.md

@@ -1,2 +0,0 @@
-appwrite avatars get-favicon \
-    --url https://example.com

package/docs/examples/avatars/get-flag.md

@@ -1,2 +0,0 @@
-appwrite avatars get-flag \
-    --code af

package/docs/examples/avatars/get-image.md

@@ -1,2 +0,0 @@
-appwrite avatars get-image \
-    --url https://example.com

package/docs/examples/avatars/get-initials.md

@@ -1 +0,0 @@
-appwrite avatars get-initials

package/docs/examples/avatars/get-qr.md

@@ -1,2 +0,0 @@
-appwrite avatars get-qr \
-    --text <TEXT>