Merge pull request #1100 from appwrite/pla-3171

chore: add type generation improvements for ts

Author: Meldiron

templates/cli/lib/commands/types.js.twig

@@ -66,7 +66,22 @@ const typesCommand = actionRunner(async (rawOutputDirectory, {language}) => {
 
   const meta = createLanguageMeta(language);
 
-  const outputDirectory = path.resolve(rawOutputDirectory);
+  const rawOutputPath = rawOutputDirectory;
+  const outputExt = path.extname(rawOutputPath);
+  const isFileOutput = !!outputExt;
+  let outputDirectory = rawOutputPath;
+  let singleFileDestination = null;
+
+  if (isFileOutput) {
+    if (meta.isSingleFile()) {
+      // Use the file path directly for single file languages
+      outputDirectory = path.dirname(rawOutputPath);
+      singleFileDestination = rawOutputPath;
+    } else {
+      throw new Error(`Invalid output path: ${rawOutputPath}. Output path must be a directory for languages that generate multiple files.`);
+    }
+  }
+
   if (!fs.existsSync(outputDirectory)) {
     log(`Directory: ${outputDirectory} does not exist, creating...`);
     fs.mkdirSync(outputDirectory, { recursive: true });
@@ -95,7 +110,7 @@ const typesCommand = actionRunner(async (rawOutputDirectory, {language}) => {
       getType: meta.getType
     });
 
-    const destination = path.join(outputDirectory, meta.getFileName());
+    const destination = singleFileDestination || path.join(outputDirectory, meta.getFileName());
 
     fs.writeFileSync(destination, content);
     log(`Added types to ${destination}`);

templates/cli/lib/type-generation/languages/typescript.js.twig

@@ -40,7 +40,7 @@ class TypeScript extends LanguageMeta {
     if (attribute.array) {
       type += "[]";
     }
-    if (!attribute.required) {
+    if (!attribute.required && attribute.default === null) {
       type += " | null";
     }
     return type;
@@ -64,15 +64,23 @@ class TypeScript extends LanguageMeta {
     return "appwrite";
   }
 
+  getCurrentDirectory() {
+    return process.cwd();
+  }
+
   getTemplate() {
-    return `import { 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 types -l ts ${this.getCurrentDirectory()}\`.
 
 <% for (const collection of collections) { -%>
 <% for (const attribute of collection.attributes) { -%>
 <% if (attribute.format === 'enum') { -%>
 export enum <%- toPascalCase(attribute.key) %> {
-<% for (const [index, element] of Object.entries(attribute.elements)) { -%>
-  <%- toUpperSnakeCase(element) %> = "<%- element %>",
+<% const entries = Object.entries(attribute.elements); -%>
+<% for (let i = 0; i < entries.length; i++) { -%>
+  <%- toUpperSnakeCase(entries[i][1]) %> = "<%- entries[i][1] %>"<% if (i !== entries.length - 1) { %>,<% } %>
 <% } -%>
 }