chirag-appwrite-cli 0.1.0 → 0.1.1

package/lib/commands/teams.js

@@ -7,7 +7,7 @@ const libClient = require('../client.js');
 const { getAllFiles, showConsoleLink } = require('../utils.js');
 const { Command } = require('commander');
 const { sdkForProject, sdkForConsole } = require('../sdks')
-const { parse, actionRunner, parseInteger, parseBool, commandDescriptions, success, log } = require('../parser')
+const { parse, actionRunner, parseInteger, parseBool, commandDescriptions, success, log, warn } = require('../parser')
 const { localConfig, globalConfig } = require("../config");
 const { File } = require('undici');
 const { ReadableStream } = require('stream/web');

package/lib/commands/tokens.js

@@ -7,7 +7,7 @@ const libClient = require('../client.js');
 const { getAllFiles, showConsoleLink } = require('../utils.js');
 const { Command } = require('commander');
 const { sdkForProject, sdkForConsole } = require('../sdks')
-const { parse, actionRunner, parseInteger, parseBool, commandDescriptions, success, log } = require('../parser')
+const { parse, actionRunner, parseInteger, parseBool, commandDescriptions, success, log, warn } = require('../parser')
 const { localConfig, globalConfig } = require("../config");
 const { File } = require('undici');
 const { ReadableStream } = require('stream/web');

package/lib/commands/types.js

@@ -4,7 +4,7 @@ const path = require("path");
 const { LanguageMeta, detectLanguage } = require("../type-generation/languages/language");
 const { Command, Option, Argument } = require("commander");
 const { localConfig } = require("../config");
-const { success, log, actionRunner } = require("../parser");
+const { success, log, warn, actionRunner } = require("../parser");
 const { PHP } = require("../type-generation/languages/php");
 const { TypeScript } = require("../type-generation/languages/typescript");
 const { Kotlin } = require("../type-generation/languages/kotlin");
@@ -12,6 +12,7 @@ const { Swift } = require("../type-generation/languages/swift");
 const { Java } = require("../type-generation/languages/java");
 const { Dart } = require("../type-generation/languages/dart");
 const { JavaScript } = require("../type-generation/languages/javascript");
+const { TypeScriptClient } = require("../client-generation/languages/typescript");
 
 /**
  * @param {string} language
@@ -64,14 +65,28 @@ const typesStrictOption = new Option(
 )
   .default(false);
 
-const typesCommand = actionRunner(async (rawOutputDirectory, {language, strict}) => {
+const typesIncludeClientOption = new Option(
+  "-c, --include-client",
+  "Generate a Prisma-style client file (TypeScript only)"
+)
+  .default(false);
+
+const typesCommand = actionRunner(async (rawOutputDirectory, {language, strict, includeClient}) => {
   if (language === "auto") {
     language = detectLanguage();
     log(`Detected language: ${language}`);
   }
 
+  if (includeClient && language !== "ts") {
+    throw new Error("Client generation is only supported for TypeScript. Please use --language ts or ensure TypeScript is auto-detected.");
+  }
+
   if (strict) {
-    log(`Strict mode enabled: Field names will be converted to follow ${language} conventions`);
+    warn(`Strict mode enabled: Field names will be converted to follow ${language} conventions`);
+  }
+
+  if (includeClient) {
+    log("Client generation enabled: Will generate appwrite.db.ts file");
   }
 
   const meta = createLanguageMeta(language);
@@ -97,13 +112,10 @@ const typesCommand = actionRunner(async (rawOutputDirectory, {language, strict})
     fs.mkdirSync(outputDirectory, { recursive: true });
   }
 
-  if (!fs.existsSync("appwrite.json")) {
-    throw new Error("appwrite.json not found in current directory");
-  }
-
   const collections = localConfig.getCollections();
   if (collections.length === 0) {
-    throw new Error("No collections found in appwrite.json");
+    const configFileName = path.basename(localConfig.path);
+    throw new Error(`No collections found in configuration. Make sure ${configFileName} exists and contains collections.`);
   }
 
   log(`Found ${collections.length} collections: ${collections.map(c => c.name).join(", ")}`);
@@ -117,7 +129,6 @@ const typesCommand = actionRunner(async (rawOutputDirectory, {language, strict})
     const content = templater({
       collections,
       strict,
-      path: rawOutputDirectory ?? '',
       ...templateHelpers,
       getType: meta.getType,
     });
@@ -126,12 +137,30 @@ const typesCommand = actionRunner(async (rawOutputDirectory, {language, strict})
 
     fs.writeFileSync(destination, content);
     log(`Added types to ${destination}`);
+
+    // Generate client file if requested and language is TypeScript
+    if (includeClient && language === "ts") {
+      const clientMeta = new TypeScriptClient();
+      const clientTemplate = ejs.compile(clientMeta.getTemplate());
+      const clientContent = clientTemplate({
+        collections,
+        strict,
+        projectId: localConfig.getProject()['projectId'],
+        endpoint: localConfig.getEndpoint(),
+        ...templateHelpers,
+        typesFileName: meta.getFileName(),
+      });
+
+      const clientDestination = path.join(outputDirectory, clientMeta.getFileName());
+      fs.writeFileSync(clientDestination, clientContent);
+      log(`Added client to ${clientDestination}`);
+    }
   } else {
     for (const collection of collections) {
       const content = templater({
+        collections,
         collection,
         strict,
-        path: rawOutputDirectory ?? '',
         ...templateHelpers,
         getType: meta.getType,
       });
@@ -141,6 +170,11 @@ const typesCommand = actionRunner(async (rawOutputDirectory, {language, strict})
       fs.writeFileSync(destination, content);
       log(`Added types for ${collection.name} to ${destination}`);
     }
+
+    // Client generation for multi-file languages not supported yet
+    if (includeClient) {
+      warn("Client generation for multi-file languages is not yet supported");
+    }
   }
   
   success(`Generated types for all the listed collections`);
@@ -151,6 +185,7 @@ const types = new Command("types")
   .addArgument(typesOutputArgument)
   .addOption(typesLanguageOption)
   .addOption(typesStrictOption)
+  .addOption(typesIncludeClientOption)
   .action(actionRunner(typesCommand));
 
 module.exports = { types };

package/lib/commands/users.js

@@ -7,7 +7,7 @@ const libClient = require('../client.js');
 const { getAllFiles, showConsoleLink } = require('../utils.js');
 const { Command } = require('commander');
 const { sdkForProject, sdkForConsole } = require('../sdks')
-const { parse, actionRunner, parseInteger, parseBool, commandDescriptions, success, log } = require('../parser')
+const { parse, actionRunner, parseInteger, parseBool, commandDescriptions, success, log, warn } = require('../parser')
 const { localConfig, globalConfig } = require("../config");
 const { File } = require('undici');
 const { ReadableStream } = require('stream/web');

package/lib/commands/vcs.js

@@ -7,7 +7,7 @@ const libClient = require('../client.js');
 const { getAllFiles, showConsoleLink } = require('../utils.js');
 const { Command } = require('commander');
 const { sdkForProject, sdkForConsole } = require('../sdks')
-const { parse, actionRunner, parseInteger, parseBool, commandDescriptions, success, log } = require('../parser')
+const { parse, actionRunner, parseInteger, parseBool, commandDescriptions, success, log, warn } = require('../parser')
 const { localConfig, globalConfig } = require("../config");
 const { File } = require('undici');
 const { ReadableStream } = require('stream/web');
@@ -435,7 +435,7 @@ vcs
 
 vcs
     .command(`get-repository-contents`)
-    .description(`Get a list of files and directories from a GitHub repository connected to your project. This endpoint returns the contents of a specified repository path, including file names, sizes, and whether each item is a file or directory. The GitHub installation must be properly configured and the repository must be accessible through your installation for this endpoint to work. `)
+    .description(`Get a list of files and directories from a GitHub repository connected to your project. This endpoint returns the contents of a specified repository path, including file names, sizes, and whether each item is a file or directory. The GitHub installation must be properly configured and the repository must be accessible through your installation for this endpoint to work.`)
     .requiredOption(`--installation-id <installation-id>`, `Installation Id`)
     .requiredOption(`--provider-repository-id <provider-repository-id>`, `Repository Id`)
     .option(`--provider-root-directory <provider-root-directory>`, `Path to get contents of nested directory`)

package/lib/config.js

@@ -125,27 +125,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() {

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 <%- strict ? '--strict ' : '' %>dart <%- path %>\`.
+/// 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 <%- strict ? '--strict ' : '' %>java <%- path %>\`.
+ * 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 <%- strict ? '--strict ' : '' %>js <%- path %>\`.
-
-/**
+    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 <%- strict ? '--strict ' : '' %>kotlin <%- path %>\`.
+ * 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 <%- strict ? '--strict ' : '' %>php <%- path %>\`.
+// 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) {