hot fixes

Author: ChiragAgg5k

README.md

@@ -29,7 +29,7 @@ Once the installation is complete, you can verify the install using
 
 ```sh
 $ appwrite -v
-10.0.0
+9.0.3
 ```
 
 ### Install using prebuilt binaries
@@ -60,7 +60,7 @@ $ scoop install https://raw.githubusercontent.com/appwrite/sdk-for-cli/master/sc
 Once the installation completes, you can verify your install using
 ```
 $ appwrite -v
-10.0.0
+9.0.3
 ```
 
 ## Getting Started 

install.ps1

@@ -13,8 +13,8 @@
 # You can use "View source" of this page to see the full script.
 
 # REPO
-$GITHUB_x64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/10.0.0/appwrite-cli-win-x64.exe"
-$GITHUB_arm64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/10.0.0/appwrite-cli-win-arm64.exe"
+$GITHUB_x64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/9.0.3/appwrite-cli-win-x64.exe"
+$GITHUB_arm64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/9.0.3/appwrite-cli-win-arm64.exe"
 
 $APPWRITE_BINARY_NAME = "appwrite.exe"
 

install.sh

@@ -97,7 +97,7 @@ printSuccess() {
 downloadBinary() {
     echo "[2/4] Downloading executable for $OS ($ARCH) ..."
 
-    GITHUB_LATEST_VERSION="10.0.0"
+    GITHUB_LATEST_VERSION="9.0.3"
     GITHUB_FILE="appwrite-cli-${OS}-${ARCH}"
     GITHUB_URL="https://github.com/$GITHUB_REPOSITORY_NAME/releases/download/$GITHUB_LATEST_VERSION/$GITHUB_FILE"
 

lib/client.js

@@ -1,4 +1,5 @@
 const os = require('os');
+const join = require('path').join;
 const https = require("https");
 const { fetch, FormData, Agent } = require("undici");
 const JSONbig = require("json-bigint")({ storeAsString: false });
@@ -16,8 +17,8 @@ class Client {
       'x-sdk-name': 'Command Line',
       'x-sdk-platform': 'console',
       'x-sdk-language': 'cli',
-      'x-sdk-version': '10.0.0',
-      'user-agent' : `AppwriteCLI/10.0.0 (${os.type()} ${os.version()}; ${os.arch()})`,
+      'x-sdk-version': '9.0.3',
+      'user-agent' : `AppwriteCLI/9.0.3 (${os.type()} ${os.version()}; ${os.arch()})`,
       'X-Appwrite-Response-Format' : '1.8.0',
     };
   }
@@ -149,7 +150,7 @@ class Client {
 
   async call(method, path = "", headers = {}, params = {}, responseType = "json") {
     headers = {...this.headers, ...headers};
-    const url = new URL(this.endpoint + path);
+    const url = new URL(join(this.endpoint + path));
 
     let body = undefined;
 

lib/commands/generic.js

@@ -5,8 +5,8 @@ const { sdkForConsole } = require("../sdks");
 const { globalConfig, localConfig } = require("../config");
 const { actionRunner, success, parseBool, commandDescriptions, error, parse, hint, log, drawTable, cliConfig } = require("../parser");
 const ID = require("../id");
-const { questionsLogin, questionsLogout, questionsListFactors, questionsMfaChallenge } = require("../questions");
-const { accountUpdateMfaChallenge, accountCreateMfaChallenge, accountGet, accountCreateEmailPasswordSession, accountDeleteSession } = require("./account");
+const { questionsLogin, questionsLogout, questionsListFactors, questionsMFAChallenge } = require("../questions");
+const { accountUpdateMFAChallenge, accountCreateMFAChallenge, accountGet, accountCreateEmailPasswordSession, accountDeleteSession } = require("./account");
 
 const DEFAULT_ENDPOINT = 'https://cloud.appwrite.io/v1';
 
@@ -71,15 +71,15 @@ const loginCommand = async ({ email, password, endpoint, mfa, code }) => {
         if (error.response === 'user_more_factors_required') {
             const { factor } = mfa ? { factor: mfa } : await inquirer.prompt(questionsListFactors);
 
-            const challenge = await accountCreateMfaChallenge({
+            const challenge = await accountCreateMFAChallenge({
                 factor,
                 parseOutput: false,
                 sdk: client
             });
 
-            const { otp } = code ? { otp: code } : await inquirer.prompt(questionsMfaChallenge);
+            const { otp } = code ? { otp: code } : await inquirer.prompt(questionsMFAChallenge);
 
-            await accountUpdateMfaChallenge({
+            await accountUpdateMFAChallenge({
                 challengeId: challenge.$id,
                 otp,
                 parseOutput: false,

lib/commands/push.js

@@ -918,6 +918,25 @@ const createAttributes = async (attributes, collection) => {
 
     success(`Created ${attributes.length} attributes`);
 }
+const createColumns = async (columns, table) => {
+    for (let column of columns) {
+        if (column.side !== 'child') {
+            await createAttribute(table['databaseId'], table['$id'], column);
+        }
+    }
+
+    const result = await awaitPools.expectAttributes(
+        table['databaseId'],
+        table['$id'],
+        table.columns.filter(column => column.side !== 'child').map(column => column.key)
+    );
+
+    if (!result) {
+        throw new Error(`Column creation timed out.`);
+    }
+
+    success(`Created ${columns.length} columns`);
+}
 
 const pushResources = async () => {
     const actions = {
@@ -1797,13 +1816,12 @@ const pushTable = async ({ returnOnZero, attempts } = { returnOnZero: false }) =
             if ((Array.isArray(columns) && columns.length <= 0) && (Array.isArray(indexes) && indexes.length <= 0)) {
                 continue;
             }
-
         }
 
         log(`Pushing table ${table.name} ( ${table['databaseId']} - ${table['$id']} ) attributes`)
 
         try {
-            await createAttributes(columns, table)
+            await createColumns(columns, table)
         } catch (e) {
             throw e;
         }

lib/commands/types.js

@@ -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 { CSharp } = require("../type-generation/languages/csharp");
 
 /**
  * @param {string} language
@@ -33,6 +34,8 @@ function createLanguageMeta(language) {
       return new Java();
     case "dart":
       return new Dart();
+    case "cs":
+      return new CSharp();
     default:
       throw new Error(`Language '${language}' is not supported`);
   }
@@ -55,7 +58,7 @@ const typesLanguageOption = new Option(
   "-l, --language <language>",
   "The language of the types"
 )
-  .choices(["auto", "ts", "js", "php", "kotlin", "swift", "java", "dart"])
+  .choices(["auto", "ts", "js", "php", "kotlin", "swift", "java", "dart", "cs"])
   .default("auto");
 
 const typesStrictOption = new Option(
@@ -97,22 +100,58 @@ const typesCommand = actionRunner(async (rawOutputDirectory, {language, strict})
     fs.mkdirSync(outputDirectory, { recursive: true });
   }
 
-  const collections = localConfig.getCollections();
-  if (collections.length === 0) {
-    const configFileName = path.basename(localConfig.path);
-    throw new Error(`No collections found in configuration. Make sure ${configFileName} exists and contains collections.`);
+  // Try tables first, fallback to collections
+  let tables = localConfig.getTables();
+  let collections = [];
+  let dataSource = 'tables';
+  
+  if (tables.length === 0) {
+    collections = localConfig.getCollections();
+    dataSource = 'collections';
+    
+    if (collections.length === 0) {
+      const configFileName = path.basename(localConfig.path);
+      throw new Error(`No tables or collections found in configuration. Make sure ${configFileName} exists and contains tables or collections.`);
+    }
+  }
+
+  // Use tables if available, otherwise use collections
+  let dataItems = tables.length > 0 ? tables : collections;
+  const itemType = tables.length > 0 ? 'tables' : 'collections';
+
+  // Normalize tables data: rename 'columns' to 'attributes' for template compatibility
+  if (tables.length > 0) {
+    dataItems = dataItems.map(table => {
+      const { columns, ...rest } = table;
+      return {
+        ...rest,
+        attributes: (columns || []).map(column => {
+          if (column.relatedTable) {
+            const { relatedTable, ...columnRest } = column;
+            return {
+              ...columnRest,
+              relatedCollection: relatedTable
+            };
+          }
+          return column;
+        })
+      };
+    });
   }
 
-  log(`Found ${collections.length} collections: ${collections.map(c => c.name).join(", ")}`);
+  log(`Found ${dataItems.length} ${itemType}: ${dataItems.map(c => c.name).join(", ")}`);
+
+  // Use columns if available, otherwise use attributes
+  const resourceType = tables.length > 0 ? 'columns' : 'attributes';
 
-  const totalAttributes = collections.reduce((count, collection) => count + collection.attributes.length, 0);
-  log(`Found ${totalAttributes} attributes across all collections`);
+  const totalAttributes = dataItems.reduce((count, item) => count + (item.attributes || []).length, 0);
+  log(`Found ${totalAttributes} ${resourceType} across all ${itemType}`);
 
   const templater = ejs.compile(meta.getTemplate());
 
   if (meta.isSingleFile()) {
     const content = templater({
-      collections,
+      collections: dataItems,
       strict,
       ...templateHelpers,
       getType: meta.getType,
@@ -123,23 +162,23 @@ const typesCommand = actionRunner(async (rawOutputDirectory, {language, strict})
     fs.writeFileSync(destination, content);
     log(`Added types to ${destination}`);
   } else {
-    for (const collection of collections) {
+    for (const item of dataItems) {
       const content = templater({
-        collections,
-        collection,
+        collections: dataItems,
+        collection: item,
         strict,
         ...templateHelpers,
         getType: meta.getType,
       });
 
-      const destination = path.join(outputDirectory, meta.getFileName(collection));
+      const destination = path.join(outputDirectory, meta.getFileName(item));
 
       fs.writeFileSync(destination, content);
-      log(`Added types for ${collection.name} to ${destination}`);
+      log(`Added types for ${item.name} to ${destination}`);
     }
   }
 
-  success(`Generated types for all the listed collections`);
+  success(`Generated types for all the listed ${itemType}`);
 });
 
 const types = new Command("types")

lib/config.js

@@ -55,7 +55,7 @@ const KeysColumns = new Set([
     // enum
     "elements",
     // relationship
-    "relatedCollection",
+    "relatedTable",
     "relationType",
     "twoWay",
     "twoWayKey",

lib/parser.js

@@ -122,7 +122,7 @@ const parseError = (err) => {
             } catch {
             }
 
-            const version = '10.0.0';
+            const version = '9.0.3';
             const stepsToReproduce = `Running \`appwrite ${cliConfig.reportData.data.args.join(' ')}\``;
             const yourEnvironment = `CLI version: ${version}\nOperation System: ${os.type()}\nAppwrite version: ${appwriteVersion}\nIs Cloud: ${isCloud()}`;
 

lib/questions.js

@@ -5,7 +5,7 @@ const { projectsList } = require('./commands/projects');
 const { organizationsList } = require('./commands/organizations');
 const { teamsList } = require('./commands/teams');
 const { functionsListRuntimes, functionsListSpecifications, functionsList } = require('./commands/functions');
-const { accountListMfaFactors } = require("./commands/account");
+const { accountListMFAFactors } = require("./commands/account");
 const { sdkForConsole } = require("./sdks");
 const { validateRequired } = require("./validations");
 const { paginate } = require('./paginate');
@@ -877,7 +877,7 @@ const questionsListFactors = [
         message: "Your account is protected by multi-factor authentication. Please choose one for verification.",
         choices: async () => {
             let client = await sdkForConsole(false);
-            const factors = await accountListMfaFactors({
+            const factors = await accountListMFAFactors({
                 sdk: client,
                 parseOutput: false
             });
@@ -906,7 +906,7 @@ const questionsListFactors = [
     }
 ];
 
-const questionsMfaChallenge = [
+const questionsMFAChallenge = [
     {
         type: "input",
         name: "otp",
@@ -1019,7 +1019,7 @@ module.exports = {
     questionsPushTeams,
     questionsGetEntrypoint,
     questionsListFactors,
-    questionsMfaChallenge,
+    questionsMFAChallenge,
     questionsRunFunctions,
     questionGetEndpoint,
     questionsInitResources,