appwrite-cli 8.2.2 → 9.0.0

package/lib/config.js

@@ -9,6 +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 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"]);
@@ -39,6 +40,33 @@ const KeysAttributes = new Set([
     // Strings
     "encrypt",
 ]);
+const KeysColumns = new Set([
+    "key",
+    "type",
+    "required",
+    "array",
+    "size",
+    "default",
+    // integer and float
+    "min",
+    "max",
+    // email, enum, URL, IP, and datetime
+    "format",
+    // enum
+    "elements",
+    // relationship
+    "relatedCollection",
+    "relationType",
+    "twoWay",
+    "twoWayKey",
+    "onDelete",
+    "side",
+    // Indexes
+    "attributes",
+    "orders",
+    // Strings
+    "encrypt",
+]);
 const KeyIndexes = new Set(["key", "type", "status", "attributes", "orders"]);
 
 function whitelistKeys(value, keys, nestedKeys = {}) {
@@ -125,27 +153,39 @@ class Config {
 }
 
 class Local extends Config {
-    static CONFIG_FILE_PATH = "appwrite.json";
+    static CONFIG_FILE_PATH = "appwrite.config.json";
+    static CONFIG_FILE_PATH_LEGACY = "appwrite.json";
     configDirectoryPath = ""
 
-    constructor(path = Local.CONFIG_FILE_PATH) {
+    constructor(path = Local.CONFIG_FILE_PATH, legacyPath = Local.CONFIG_FILE_PATH_LEGACY) {
+        let absolutePath = Local.findConfigFile(path) || Local.findConfigFile(legacyPath);
+        
+        if (!absolutePath) {
+            absolutePath = `${process.cwd()}/${path}`;
+        }
+
+        super(absolutePath);
+        this.configDirectoryPath = _path.dirname(absolutePath);
+    }
+
+    static findConfigFile(filename) {
         let currentPath = process.cwd();
-        let absolutePath = `${currentPath}/${path}`;
 
         while (true) {
-            if (fs.existsSync(`${currentPath}/${path}`)) {
-                absolutePath = `${currentPath}/${path}`;
-                break
-            } else {
-                const parentDirectory = _path.dirname(currentPath);
-                if (parentDirectory === currentPath) { // we hit the top directory
-                    break;
-                }
-                currentPath = parentDirectory
+            const filePath = `${currentPath}/${filename}`;
+            
+            if (fs.existsSync(filePath)) {
+                return filePath;
+            }
+            
+            const parentDirectory = _path.dirname(currentPath);
+            if (parentDirectory === currentPath) {
+                break;
             }
+            currentPath = parentDirectory;
         }
-        super(absolutePath);
-        this.configDirectoryPath =_path.dirname(absolutePath);
+
+        return null;
     }
 
     getDirname() {
@@ -298,6 +338,50 @@ class Local extends Config {
         this.set("collections", collections);
     }
 
+    getTables() {
+        if (!this.has("tables")) {
+            return [];
+        }
+        return this.get("tables");
+    }
+
+    getTable($id) {
+        if (!this.has("tables")) {
+            return {};
+        }
+
+        let tables = this.get("tables");
+        for (let i = 0; i < tables.length; i++) {
+            if (tables[i]['$id'] == $id) {
+                return tables[i];
+            }
+        }
+
+        return {};
+    }
+
+    addTable(props) {
+        props = whitelistKeys(props, KeysTable, {
+            columns: KeysColumns,
+            indexes: KeyIndexes
+        });
+
+        if (!this.has("tables")) {
+            this.set("tables", []);
+        }
+
+        let tables = this.get("tables");
+        for (let i = 0; i < tables.length; i++) {
+            if (tables[i]['$id'] == props['$id'] && tables[i]['databaseId'] == props['databaseId']) {
+                tables[i] = props;
+                this.set("tables", tables);
+                return;
+            }
+        }
+        tables.push(props);
+        this.set("tables", tables);
+    }
+
     getBuckets() {
         if (!this.has("buckets")) {
             return [];
@@ -701,5 +785,6 @@ module.exports = {
     KeysStorage,
     KeysTeams,
     KeysCollection,
+    KeysTable,
     whitelistKeys
 };

package/lib/parser.js

@@ -122,7 +122,7 @@ const parseError = (err) => {
             } catch {
             }
 
-            const version = '8.2.2';
+            const version = '9.0.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()}`;
 
@@ -216,6 +216,7 @@ const commandDescriptions = {
     "sites": `The sites command allows you to view, create and manage your Appwrite Sites.`,
     "storage": `The storage command allows you to manage your project files.`,
     "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.`,
     "client": `The client command allows you to configure your CLI`,
     "login": `The login command allows you to authenticate and manage a user account.`,

package/lib/questions.js

@@ -255,10 +255,11 @@ const questionsPullResources = [
         choices: [
             { name: `Settings ${chalk.blackBright(`(Project)`)}`, value: 'settings' },
             { name: `Functions ${chalk.blackBright(`(Deployment)`)}`, value: 'functions' },
-            { name: `Collections ${chalk.blackBright(`(Databases)`)}`, value: 'collections' },
+            { name: `Tables ${chalk.blackBright(`(Grids)`)}`, value: 'tables' },
             { name: `Buckets ${chalk.blackBright(`(Storage)`)}`, value: 'buckets' },
             { name: `Teams ${chalk.blackBright(`(Auth)`)}`, value: 'teams' },
-            { name: `Topics ${chalk.blackBright(`(Messaging)`)}`, value: 'messages' }
+            { name: `Topics ${chalk.blackBright(`(Messaging)`)}`, value: 'messages' },
+            { name: `Collections ${chalk.blackBright(`(Database)`)}`, value: 'collections' }
         ]
     }
 ]
@@ -666,10 +667,11 @@ const questionsPushResources = [
         choices: [
             { name: `Settings ${chalk.blackBright(`(Project)`)}`, value: 'settings' },
             { name: `Functions ${chalk.blackBright(`(Deployment)`)}`, value: 'functions' },
-            { name: `Collections ${chalk.blackBright(`(Databases)`)}`, value: 'collections' },
+            { name: `Tables ${chalk.blackBright(`(Grids)`)}`, value: 'tables' },
             { name: `Buckets ${chalk.blackBright(`(Storage)`)}`, value: 'buckets' },
             { name: `Teams ${chalk.blackBright(`(Auth)`)}`, value: 'teams' },
-            { name: `Topics ${chalk.blackBright(`(Messaging)`)}`, value: 'messages' }
+            { name: `Topics ${chalk.blackBright(`(Messaging)`)}`, value: 'messages' },
+            { name: `Collections ${chalk.blackBright(`(Database)`)}`, value: 'collections' }
         ]
     }
 ];
@@ -682,10 +684,11 @@ const questionsInitResources = [
         choices: [
             { name: 'Function', value: 'function' },
             { name: 'Site', value: 'site' },
-            { name: 'Collection', value: 'collection' },
+            { name: 'Table', value: 'table' },
             { name: 'Bucket', value: 'bucket' },
             { name: 'Team', value: 'team' },
-            { name: 'Topic', value: 'message' }
+            { name: 'Topic', value: 'message' },
+            { name: 'Collection', value: 'collection' }
         ]
     }
 ];
@@ -753,6 +756,27 @@ const questionsPushCollections = [
     }
 ];
 
+const questionsPushTables = [
+    {
+        type: "checkbox",
+        name: "tables",
+        message: "Which tables would you like to push?",
+        validate: (value) => validateRequired('table', value),
+        when: () => localConfig.getTables().length > 0,
+        choices: () => {
+            let tables = localConfig.getTables();
+            checkDeployConditions(localConfig)
+
+            return tables.map(table => {
+                return {
+                    name: `${table.name} (${table['databaseId']} - ${table['$id']})`,
+                    value: `${table['databaseId']}|${table['$id']}`
+                }
+            });
+        }
+    }
+];
+
 const questionPushChanges = [
     {
         type: "input",
@@ -1002,5 +1026,6 @@ module.exports = {
     questionsCreateTeam,
     questionPushChanges,
     questionPushChangesConfirmation,
-    questionsCreateSite
+    questionsCreateSite,
+    questionsPushTables
 };

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

@@ -6,7 +6,7 @@ const path = require('path');
 
 class Dart extends LanguageMeta {
   getPackageName() {
-    const pubspecPath = path.join(this.getCurrentDirectory(), 'pubspec.yaml');
+    const pubspecPath = path.join(process.cwd(), 'pubspec.yaml');
     if (fs.existsSync(pubspecPath)) {
         const pubspecContent = fs.readFileSync(pubspecPath, 'utf8');
         const lines = pubspecContent.split('\n');
@@ -40,7 +40,7 @@ class Dart extends LanguageMeta {
     return 'appwrite';
   }
 
-  getType(attribute) {
+  getType(attribute, collections) {
     let type = "";
     switch (attribute.type) {
       case AttributeType.STRING:
@@ -61,7 +61,11 @@ class Dart 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 = `List<${type}>`;
         }
@@ -78,19 +82,15 @@ class Dart extends LanguageMeta {
     return type;
   }
 
-  getCurrentDirectory() {
-    return process.cwd();
-  }
-
   getTemplate() {
     return `<% for (const attribute of collection.attributes) { -%>
 <% if (attribute.type === 'relationship') { -%>
-import '<%- toSnakeCase(attribute.relatedCollection) %>.dart';
+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 types -l dart ${this.getCurrentDirectory()}\`.
+/// You can regenerate it by running \`appwrite ${process.argv.slice(2).join(' ')}\`.
 
 <% for (const attribute of collection.attributes) { -%>
 <% if (attribute.format === 'enum') { -%>
@@ -104,7 +104,7 @@ enum <%- toPascalCase(attribute.key) %> {
 <% } -%>
 class <%= toPascalCase(collection.name) %> {
 <% for (const [index, attribute] of Object.entries(collection.attributes)) { -%>
-  <%- getType(attribute) %> <%= strict ? toCamelCase(attribute.key) : attribute.key %>;
+  <%- getType(attribute, collections) %> <%= strict ? toCamelCase(attribute.key) : attribute.key %>;
 <% } -%>
 
   <%= toPascalCase(collection.name) %>({
@@ -152,11 +152,11 @@ map['<%= attribute.key %>']<% if (!attribute.required) { %> ?? null<% } -%>
 <% } -%>
 <% } else if (attribute.type === '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(attribute.relatedCollection) %>.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()<% if (!attribute.required) { %> ?? []<% } -%>
 <% } else { -%>
 <% if (!attribute.required) { -%>
-map['<%= attribute.key %>'] != null ? <%- toPascalCase(attribute.relatedCollection) %>.fromMap(map['<%= attribute.key %>']) : null<% } else { -%>
-<%- toPascalCase(attribute.relatedCollection) %>.fromMap(map['<%= attribute.key %>'])<% } -%>
+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) { %>,<% } %>
 <% } -%>

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

@@ -3,7 +3,7 @@ const { AttributeType } = require('../attribute');
 const { LanguageMeta } = require("./language");
 
 class Java extends LanguageMeta {
-  getType(attribute) {
+  getType(attribute, collections) {
     let type = "";
     switch (attribute.type) {
       case AttributeType.STRING:
@@ -24,7 +24,11 @@ class Java 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 = "List<" + type + ">";
         }
@@ -38,25 +42,21 @@ 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()}\`.
+ * You can regenerate it by running \`appwrite ${process.argv.slice(2).join(' ')}\`.
  */
 
 import java.util.Objects;
 <% for (const attribute of collection.attributes) { -%>
 <% if (attribute.type === 'relationship') { -%>
-import io.appwrite.models.<%- toPascalCase(attribute.relatedCollection) %>;
-
+import io.appwrite.models.<%- toPascalCase(collections.find(c => c.$id === attribute.relatedCollection).name) %>;
 <% } -%>
 <% } -%>
+
 public class <%- toPascalCase(collection.name) %> {
 <% for (const attribute of collection.attributes) { -%>
 <% if (attribute.format === 'enum') { -%>
@@ -70,7 +70,7 @@ public class <%- toPascalCase(collection.name) %> {
 <% } -%>
 <% } -%>
 <% for (const attribute of collection.attributes) { -%>
-    private <%- getType(attribute) %> <%- strict ? toCamelCase(attribute.key) : attribute.key %>;
+    private <%- getType(attribute, collections) %> <%- strict ? toCamelCase(attribute.key) : attribute.key %>;
 <% } -%>
 
     public <%- toPascalCase(collection.name) %>() {
@@ -78,7 +78,7 @@ public class <%- toPascalCase(collection.name) %> {
 
     public <%- toPascalCase(collection.name) %>(
 <% for (const [index, attribute] of Object.entries(collection.attributes)) { -%>
-        <%- getType(attribute) %> <%= strict ? toCamelCase(attribute.key) : attribute.key %><%- index < collection.attributes.length - 1 ? ',' : '' %>
+        <%- getType(attribute, collections) %> <%= strict ? toCamelCase(attribute.key) : attribute.key %><%- index < collection.attributes.length - 1 ? ',' : '' %>
 <% } -%>
     ) {
 <% for (const attribute of collection.attributes) { -%>
@@ -87,11 +87,11 @@ public class <%- toPascalCase(collection.name) %> {
     }
 
 <% for (const attribute of collection.attributes) { -%>
-    public <%- getType(attribute) %> get<%- toPascalCase(attribute.key) %>() {
+    public <%- getType(attribute, collections) %> get<%- toPascalCase(attribute.key) %>() {
         return <%= strict ? toCamelCase(attribute.key) : attribute.key %>;
     }
 
-    public void set<%- toPascalCase(attribute.key) %>(<%- getType(attribute) %> <%= strict ? toCamelCase(attribute.key) : attribute.key %>) {
+    public void set<%- toPascalCase(attribute.key) %>(<%- getType(attribute, collections) %> <%= strict ? toCamelCase(attribute.key) : attribute.key %>) {
         this.<%= strict ? toCamelCase(attribute.key) : attribute.key %> = <%= strict ? toCamelCase(attribute.key) : attribute.key %>;
     }
 

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

@@ -6,7 +6,7 @@ const { AttributeType } = require('../attribute');
 const { LanguageMeta } = require("./language");
 
 class JavaScript extends LanguageMeta {
-  getType(attribute) {
+  getType(attribute, collections) {
     let type = ""
     switch (attribute.type) {
       case AttributeType.STRING:
@@ -29,7 +29,11 @@ class JavaScript 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}[]`;
         }
@@ -60,19 +64,14 @@ class JavaScript extends LanguageMeta {
     return "appwrite";
   }
 
-  getCurrentDirectory() {
-    return process.cwd();
-  }
-
   getTemplate() {
-    return `
-// This file is auto-generated by the Appwrite CLI. 
-// You can regenerate it by running \`appwrite types -l js ${this.getCurrentDirectory()}\`.
-
-/**
+    return `/**
  * @typedef {import('${this._getAppwriteDependency()}').Models.Document} Document
  */
 
+// This file is auto-generated by the Appwrite CLI. 
+// You can regenerate it by running \`appwrite ${process.argv.slice(2).join(' ')}\`.
+
 <% for (const collection of collections) { -%>
 <% for (const attribute of collection.attributes) { -%>
 <% if (attribute.format === 'enum') { -%>
@@ -83,14 +82,15 @@ class JavaScript extends LanguageMeta {
 <% } -%>
 <% } -%>
 <% } -%>
-<% for (const collection of collections) { %>/**
+<% for (const [index, collection] of Object.entries(collections)) { %>/**
  * @typedef {Document & {
 <% for (const attribute of collection.attributes) { -%>
- *   <%- strict ? toCamelCase(attribute.key) : attribute.key %>: <%- getType(attribute) %>;
+ *   <%- strict ? toCamelCase(attribute.key) : attribute.key %>: <%- getType(attribute, collections) %>;
 <% } -%>
  * }} <%- toPascalCase(collection.name) %>
  */
-
+<% if (index < collections.length - 1) { %>
+<% } -%>
 <% } %>`;
   }
 

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

@@ -3,7 +3,7 @@ const { AttributeType } = require('../attribute');
 const { LanguageMeta } = require("./language");
 
 class Kotlin extends LanguageMeta {
-  getType(attribute) {
+  getType(attribute, collections) {
     let type = "";
     switch (attribute.type) {
       case AttributeType.STRING:
@@ -24,7 +24,11 @@ class Kotlin 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 = `List<${type}>`;
         }
@@ -41,22 +45,18 @@ class Kotlin extends LanguageMeta {
     return type;
   }
 
-  getCurrentDirectory() {
-    return process.cwd();
-  }
-
   getTemplate() {
     return `package io.appwrite.models
 
 <% for (const attribute of collection.attributes) { -%>
 <% if (attribute.type === 'relationship') { -%>
-import <%- toPascalCase(attribute.relatedCollection) %>
+import <%- toPascalCase(collections.find(c => c.$id === attribute.relatedCollection).name) %>
 
 <% } -%>
 <% } -%>
 /**
  * This file is auto-generated by the Appwrite CLI. 
- * You can regenerate it by running \`appwrite types -l kotlin ${this.getCurrentDirectory()}\`.
+ * You can regenerate it by running \`appwrite ${process.argv.slice(2).join(' ')}\`.
  */
 
 <% for (const attribute of collection.attributes) { -%>
@@ -71,9 +71,10 @@ enum class <%- toPascalCase(attribute.key) %> {
 <% } -%>
 data class <%- toPascalCase(collection.name) %>(
 <% for (const [index, attribute] of Object.entries(collection.attributes)) { -%>
-    val <%- strict ? toCamelCase(attribute.key) : attribute.key %>: <%- getType(attribute) %><% if (index < collection.attributes.length - 1) { %>,<% } %>
+    val <%- strict ? toCamelCase(attribute.key) : attribute.key %>: <%- getType(attribute, collections) %><% if (index < collection.attributes.length - 1) { %>,<% } %>
 <% } -%>
-)`;
+)
+`;
   }
 
   getFileName(collection) {

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

@@ -3,7 +3,7 @@ const { AttributeType } = require('../attribute');
 const { LanguageMeta } = require("./language");
 
 class PHP extends LanguageMeta {
-  getType(attribute) {
+  getType(attribute, collections) {
     if (attribute.array) {
       return "array";
     }
@@ -27,7 +27,11 @@ class PHP 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 = "array";
         }
@@ -41,20 +45,16 @@ class PHP extends LanguageMeta {
     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()}\`.
+// You can regenerate it by running \`appwrite ${process.argv.slice(2).join(' ')}\`.
 
 <% 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) %>;
+use Appwrite\\Models\\<%- toPascalCase(collections.find(c => c.$id === attribute.relatedCollection).name) %>;
 
 <% } -%>
 <% } -%>
@@ -70,15 +70,15 @@ enum <%- toPascalCase(attribute.key) %>: string {
 <% } -%>
 class <%- toPascalCase(collection.name) %> {
 <% for (const attribute of collection.attributes ){ -%>
-    private <%- getType(attribute) %> $<%- strict ? toCamelCase(attribute.key) : attribute.key %>;
+    private <%- getType(attribute, collections) %> $<%- strict ? toCamelCase(attribute.key) : attribute.key %>;
 <% } -%>
 
     public function __construct(
 <% for (const attribute of collection.attributes ){ -%>
 <% if (attribute.required) { -%>
-        <%- getType(attribute).replace('|null', '') %> $<%- strict ? toCamelCase(attribute.key) : attribute.key %><% if (collection.attributes.indexOf(attribute) < collection.attributes.length - 1) { %>,<% } %>
+        <%- getType(attribute, collections).replace('|null', '') %> $<%- strict ? toCamelCase(attribute.key) : attribute.key %><% if (collection.attributes.indexOf(attribute) < collection.attributes.length - 1) { %>,<% } %>
 <% } else { -%>
-        ?<%- getType(attribute).replace('|null', '') %> $<%- strict ? toCamelCase(attribute.key) : attribute.key %> = null<% if (collection.attributes.indexOf(attribute) < collection.attributes.length - 1) { %>,<% } %>
+        ?<%- getType(attribute, collections).replace('|null', '') %> $<%- strict ? toCamelCase(attribute.key) : attribute.key %> = null<% if (collection.attributes.indexOf(attribute) < collection.attributes.length - 1) { %>,<% } %>
 <% } -%>
 <% } -%>
     ) {
@@ -88,17 +88,18 @@ class <%- toPascalCase(collection.name) %> {
     }
 
 <% for (const [index, attribute] of Object.entries(collection.attributes)) { -%>
-    public function get<%- toPascalCase(attribute.key) %>(): <%- getType(attribute) %> {
+    public function get<%- toPascalCase(attribute.key) %>(): <%- getType(attribute, collections) %> {
         return $this-><%- strict ? toCamelCase(attribute.key) : attribute.key %>;
     }
 
-    public function set<%- toPascalCase(attribute.key) %>(<%- getType(attribute) %> $<%- strict ? toCamelCase(attribute.key) : attribute.key %>): void {
+    public function set<%- toPascalCase(attribute.key) %>(<%- getType(attribute, collections) %> $<%- strict ? toCamelCase(attribute.key) : attribute.key %>): void {
         $this-><%- strict ? toCamelCase(attribute.key) : attribute.key %> = $<%- strict ? toCamelCase(attribute.key) : attribute.key %>;
     }
 <% if (index < collection.attributes.length - 1) { %>
 <% } -%>
 <% } -%>
-}`;
+}
+`;
   }
 
   getFileName(collection) {