appwrite-cli 8.2.2 → 9.0.0

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

@@ -3,7 +3,7 @@ const { AttributeType } = require('../attribute');
 const { LanguageMeta } = require("./language");
 
 class Swift extends LanguageMeta {
-  getType(attribute) {
+  getType(attribute, collections) {
     let type = "";
     switch (attribute.type) {
       case AttributeType.STRING:
@@ -24,7 +24,11 @@ class Swift extends LanguageMeta {
         type = "Bool";
         break;
       case AttributeType.RELATIONSHIP:
-        type = LanguageMeta.toPascalCase(attribute.relatedCollection);
+        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 = `[${type}]`;
         }
@@ -41,15 +45,11 @@ class Swift extends LanguageMeta {
     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()}\`.
+/// You can regenerate it by running \`appwrite ${process.argv.slice(2).join(' ')}\`.
 
 <% for (const attribute of collection.attributes) { -%>
 <% if (attribute.format === 'enum') { -%>
@@ -63,7 +63,7 @@ public enum <%- toPascalCase(attribute.key) %>: String, Codable, CaseIterable {
 <% } -%>
 public class <%- toPascalCase(collection.name) %>: Codable {
 <% for (const attribute of collection.attributes) { -%>
-    public let <%- strict ? toCamelCase(attribute.key) : attribute.key %>: <%- getType(attribute) %>
+    public let <%- strict ? toCamelCase(attribute.key) : attribute.key %>: <%- getType(attribute, collections) %>
 <% } %>
     enum CodingKeys: String, CodingKey {
 <% for (const attribute of collection.attributes) { -%>
@@ -73,7 +73,7 @@ public class <%- toPascalCase(collection.name) %>: Codable {
 
     public init(
 <% for (const [index, attribute] of Object.entries(collection.attributes)) { -%>
-        <%- strict ? toCamelCase(attribute.key) : attribute.key %>: <%- getType(attribute) %><% if (index < collection.attributes.length - 1) { %>,<% } %>
+        <%- strict ? toCamelCase(attribute.key) : attribute.key %>: <%- getType(attribute, collections) %><% if (index < collection.attributes.length - 1) { %>,<% } %>
 <% } -%>
     ) {
 <% for (const attribute of collection.attributes) { -%>
@@ -86,9 +86,9 @@ public class <%- toPascalCase(collection.name) %>: Codable {
 
 <% for (const attribute of collection.attributes) { -%>
 <% if (!(!attribute.required && attribute.default === null)) { -%>
-        self.<%- strict ? toCamelCase(attribute.key) : attribute.key %> = try container.decode(<%- getType(attribute).replace('?', '') %>.self, forKey: .<%- strict ? toCamelCase(attribute.key) : attribute.key %>)
+        self.<%- strict ? toCamelCase(attribute.key) : attribute.key %> = try container.decode(<%- getType(attribute, collections).replace('?', '') %>.self, forKey: .<%- strict ? toCamelCase(attribute.key) : attribute.key %>)
 <% } else { -%>
-        self.<%- strict ? toCamelCase(attribute.key) : attribute.key %> = try container.decodeIfPresent(<%- getType(attribute).replace('?', '') %>.self, forKey: .<%- strict ? toCamelCase(attribute.key) : attribute.key %>)
+        self.<%- strict ? toCamelCase(attribute.key) : attribute.key %> = try container.decodeIfPresent(<%- getType(attribute, collections).replace('?', '') %>.self, forKey: .<%- strict ? toCamelCase(attribute.key) : attribute.key %>)
 <% } -%>
 <% } -%>
     }
@@ -124,9 +124,9 @@ public class <%- toPascalCase(collection.name) %>: Codable {
 <% for (const [index, attribute] of Object.entries(collection.attributes)) { -%>
 <% if (attribute.type === 'relationship') { -%>
 <% if ((attribute.relationType === 'oneToMany' && attribute.side === 'parent') || (attribute.relationType === 'manyToOne' && attribute.side === 'child') || attribute.relationType === 'manyToMany') { -%>
-            <%- strict ? toCamelCase(attribute.key) : attribute.key %>: map["<%- attribute.key %>"] as<% if (!attribute.required) { %>?<% } else { %>!<% } %> [<%- toPascalCase(attribute.relatedCollection) %>]<% if (index < collection.attributes.length - 1) { %>,<% } %>
+            <%- strict ? toCamelCase(attribute.key) : attribute.key %>: map["<%- attribute.key %>"] as<% if (!attribute.required) { %>?<% } else { %>!<% } %> [<%- toPascalCase(collections.find(c => c.$id === attribute.relatedCollection).name) %>]<% if (index < collection.attributes.length - 1) { %>,<% } %>
 <% } else { -%>
-            <%- strict ? toCamelCase(attribute.key) : attribute.key %>: map["<%- attribute.key %>"] as<% if (!attribute.required) { %>?<% } else { %>!<% } %> <%- toPascalCase(attribute.relatedCollection) %><% if (index < collection.attributes.length - 1) { %>,<% } %>
+            <%- strict ? toCamelCase(attribute.key) : attribute.key %>: map["<%- attribute.key %>"] as<% if (!attribute.required) { %>?<% } else { %>!<% } %> <%- toPascalCase(collections.find(c => c.$id === attribute.relatedCollection).name) %><% if (index < collection.attributes.length - 1) { %>,<% } %>
 <% } -%>
 <% } else if (attribute.array) { -%>
 <% if (attribute.type === 'string') { -%>

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

@@ -6,7 +6,7 @@ const { AttributeType } = require('../attribute');
 const { LanguageMeta } = require("./language");
 
 class TypeScript extends LanguageMeta {
-  getType(attribute) {
+  getType(attribute, collections) {
     let type = ""
     switch (attribute.type) {
       case AttributeType.STRING:
@@ -29,7 +29,11 @@ class TypeScript extends LanguageMeta {
         type = "boolean";
         break;
       case AttributeType.RELATIONSHIP:
-        type = LanguageMeta.toPascalCase(attribute.relatedCollection);
+        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 = `${type}[]`;
         }
@@ -64,15 +68,11 @@ class TypeScript extends LanguageMeta {
     return "appwrite";
   }
 
-  getCurrentDirectory() {
-    return process.cwd();
-  }
-
   getTemplate() {
     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()}\`.
+// You can regenerate it by running \`appwrite ${process.argv.slice(2).join(' ')}\`.
 
 <% for (const collection of collections) { -%>
 <% for (const attribute of collection.attributes) { -%>
@@ -90,7 +90,7 @@ export enum <%- toPascalCase(attribute.key) %> {
 <% for (const [index, collection] of Object.entries(collections)) { -%>
 export type <%- toPascalCase(collection.name) %> = Models.Document & {
 <% for (const attribute of collection.attributes) { -%>
-    <%- strict ? toCamelCase(attribute.key) : attribute.key %>: <%- getType(attribute) %>;
+    <%- strict ? toCamelCase(attribute.key) : attribute.key %>: <%- getType(attribute, collections) %>;
 <% } -%>
 }<% if (index < collections.length - 1) { %>
 <% } %>

package/lib/utils.js

@@ -3,8 +3,43 @@ const path = require("path");
 const net = require("net");
 const childProcess = require('child_process');
 const chalk = require('chalk');
+const { fetch } = require("undici");
 const { localConfig, globalConfig } = require("./config");
 
+/**
+ * Get the latest version from npm registry
+ */
+async function getLatestVersion() {
+    try {
+        const response = await fetch('https://registry.npmjs.org/appwrite-cli/latest');
+        if (!response.ok) {
+            throw new Error(`HTTP ${response.status}`);
+        }
+        const data = await response.json();
+        return data.version;
+    } catch (e) {
+        throw new Error(`Failed to fetch latest version: ${e.message}`);
+    }
+}
+
+/**
+ * Compare versions using semantic versioning
+ */
+function compareVersions(current, latest) {
+    const currentParts = current.split('.').map(Number);
+    const latestParts = latest.split('.').map(Number);
+    
+    for (let i = 0; i < Math.max(currentParts.length, latestParts.length); i++) {
+        const currentPart = currentParts[i] || 0;
+        const latestPart = latestParts[i] || 0;
+        
+        if (latestPart > currentPart) return 1;  // Latest is newer
+        if (latestPart < currentPart) return -1; // Current is newer
+    }
+    
+    return 0; // Same version
+}
+
 function getAllFiles(folder) {
     const files = [];
     for (const pathDir of fs.readdirSync(folder)) {
@@ -60,7 +95,7 @@ function systemHasCommand(command) {
 
 const checkDeployConditions = (localConfig) => {
     if (Object.keys(localConfig.data).length === 0) {
-        throw new Error("No appwrite.json file found in the current directory. Please run this command again in the folder containing your appwrite.json file, or run 'appwrite init project' to link current directory to an Appwrite project.");
+        throw new Error("No appwrite.config.json file found in the current directory. Please run this command again in the folder containing your appwrite.config.json file, or run 'appwrite init project' to link current directory to an Appwrite project.");
     }
 }
 
@@ -285,5 +320,7 @@ module.exports = {
     systemHasCommand,
     checkDeployConditions,
     showConsoleLink,
-    isCloud
+    isCloud,
+    getLatestVersion,
+    compareVersions
 };

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

package/scoop/{appwrite.json → appwrite.config.json}

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

package/docs/examples/account/create-j-w-t.md

@@ -1 +0,0 @@
-appwrite account createJWT

package/docs/examples/account/create-magic-u-r-l-token.md

@@ -1,5 +0,0 @@
-appwrite account createMagicURLToken \
-        --userId <USER_ID> \
-        --email email@example.com \
-
-

package/docs/examples/account/create-o-auth2session.md

@@ -1,5 +0,0 @@
-appwrite account createOAuth2Session \
-        --provider amazon \
-
-
-

package/docs/examples/account/create-o-auth2token.md

@@ -1,5 +0,0 @@
-appwrite account createOAuth2Token \
-        --provider amazon \
-
-
-

package/docs/examples/account/update-m-f-a.md

@@ -1,2 +0,0 @@
-appwrite account updateMFA \
-        --mfa false

package/docs/examples/account/update-magic-u-r-l-session.md

@@ -1,3 +0,0 @@
-appwrite account updateMagicURLSession \
-        --userId <USER_ID> \
-        --secret <SECRET>

package/docs/examples/avatars/get-q-r.md

@@ -1,5 +0,0 @@
-appwrite avatars getQR \
-        --text <TEXT> \
-
-
-

package/docs/examples/databases/get-database-usage.md

@@ -1,3 +0,0 @@
-appwrite databases getDatabaseUsage \
-        --databaseId <DATABASE_ID> \
-

package/docs/examples/health/get-d-b.md

@@ -1 +0,0 @@
-appwrite health getDB

package/docs/examples/locale/list-countries-e-u.md

@@ -1 +0,0 @@
-appwrite locale listCountriesEU

package/docs/examples/messaging/create-msg91provider.md

@@ -1,7 +0,0 @@
-appwrite messaging createMsg91Provider \
-        --providerId <PROVIDER_ID> \
-        --name <NAME> \
-
-
-
-

package/docs/examples/messaging/update-msg91provider.md

@@ -1,7 +0,0 @@
-appwrite messaging updateMsg91Provider \
-        --providerId <PROVIDER_ID> \
-
-
-
-
-

package/docs/examples/projects/create-j-w-t.md

@@ -1,4 +0,0 @@
-appwrite projects createJWT \
-        --projectId <PROJECT_ID> \
-        --scopes one two three \
-

package/docs/examples/projects/update-o-auth2.md

@@ -1,6 +0,0 @@
-appwrite projects updateOAuth2 \
-        --projectId <PROJECT_ID> \
-        --provider amazon \
-
-
-

package/docs/examples/proxy/create-a-p-i-rule.md

@@ -1,2 +0,0 @@
-appwrite proxy createAPIRule \
-        --domain ''

package/docs/examples/users/create-argon2user.md

@@ -1,5 +0,0 @@
-appwrite users createArgon2User \
-        --userId <USER_ID> \
-        --email email@example.com \
-        --password password \
-

package/docs/examples/users/create-j-w-t.md

@@ -1,4 +0,0 @@
-appwrite users createJWT \
-        --userId <USER_ID> \
-
-

package/docs/examples/users/create-m-d5user.md

@@ -1,5 +0,0 @@
-appwrite users createMD5User \
-        --userId <USER_ID> \
-        --email email@example.com \
-        --password password \
-

package/docs/examples/users/create-p-h-pass-user.md

@@ -1,5 +0,0 @@
-appwrite users createPHPassUser \
-        --userId <USER_ID> \
-        --email email@example.com \
-        --password password \
-

package/docs/examples/users/create-s-h-a-user.md

@@ -1,6 +0,0 @@
-appwrite users createSHAUser \
-        --userId <USER_ID> \
-        --email email@example.com \
-        --password password \
-
-