Merge remote-tracking branch 'origin' into spatial-type-queries

Author: ArnabChatterjee20k

composer.lock

@@ -231,6 +231,11 @@ public function getFiles(): array
                 'destination'   => 'lib/type-generation/languages/dart.js',
                 'template'      => 'cli/lib/type-generation/languages/dart.js.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'lib/type-generation/languages/csharp.js',
+                'template'      => 'cli/lib/type-generation/languages/csharp.js.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => 'lib/questions.js',

src/SDK/Language/CLI.php

@@ -254,6 +254,15 @@ class Query(
          */
         fun createdAfter(value: String) = Query("createdAfter", null, listOf(value)).toJson()
 
+        /**
+         * Filter resources where document was created between start and end dates (inclusive).
+         *
+         * @param start The start date value.
+         * @param end The end date value.
+         * @returns The query string.
+         */
+        fun createdBetween(start: String, end: String) = Query("createdBetween", null, listOf(start, end)).toJson()
+
         /**
          * Filter resources where document was updated before date.
          *
@@ -270,6 +279,15 @@ class Query(
          */
         fun updatedAfter(value: String) = Query("updatedAfter", null, listOf(value)).toJson()
 
+        /**
+         * Filter resources where document was updated between start and end dates (inclusive).
+         *
+         * @param start The start date value.
+         * @param end The end date value.
+         * @returns The query string.
+         */
+        fun updatedBetween(start: String, end: String) = Query("updatedBetween", null, listOf(start, end)).toJson()
+
         /**
          * Combine multiple queries using logical OR operator.
          *

templates/android/library/src/main/java/io/package/Query.kt.twig

@@ -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 });
@@ -99,7 +100,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;
 

templates/cli/lib/client.js.twig

@@ -6,8 +6,8 @@ const { globalConfig, localConfig } = require("../config");
 const { actionRunner, success, parseBool, commandDescriptions, error, parse, hint, log, drawTable, cliConfig } = require("../parser");
 const ID = require("../id");
 {% if sdk.test != "true" %}
-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 = '{{ spec.endpoint }}';
 
@@ -72,15 +72,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,

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

@@ -124,7 +124,9 @@ const initProject = async ({ organizationId, projectId, projectName } = {}) => {
         if(answers.autopull) {
             cliConfig.all = true;
             cliConfig.force = true;
-            await pullResources();
+            await pullResources({
+                skipDeprecated: true
+            });
         } else {
             log("You can run 'appwrite pull all' to synchronize all of your existing resources.");
         }

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

@@ -16,7 +16,9 @@ const { paginate } = require("../paginate");
 const { questionsPullCollection, questionsPullFunctions, questionsPullFunctionsCode, questionsPullSites, questionsPullSitesCode, questionsPullResources } = require("../questions");
 const { cliConfig, success, log, warn, actionRunner, commandDescriptions } = require("../parser");
 
-const pullResources = async () => {
+const pullResources = async ({
+    skipDeprecated = false
+} = {}) => {
     const actions = {
         settings: pullSettings,
         functions: pullFunctions,
@@ -28,6 +30,10 @@ const pullResources = async () => {
         messages: pullMessagingTopic
     }
 
+    if (skipDeprecated) {
+        delete actions.collections;
+    }
+
     if (cliConfig.all) {
         for (let action of Object.values(actions)) {
             cliConfig.all = true;
@@ -372,7 +378,7 @@ const pullTable = async () => {
         total++;
         log(`Pulling all tables from ${chalk.bold(database['name'])} database ...`);
 
-        localConfig.addDatabase(database);
+        localConfig.addTablesDB(database);
 
         const { tables } = await paginate(tablesDBListTables, {
             databaseId,

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

@@ -51,7 +51,9 @@ const {
 } = require("./databases");
 const {
     tablesDBGet,
-    tablesDBGetTable
+    tablesDBGetTable,
+    tablesDBUpdateTable,
+    tablesDBCreateTable
 } = require("./tables-db");
 const {
     storageGetBucket, storageUpdateBucket, storageCreateBucket
@@ -892,7 +894,7 @@ const createIndexes = async (indexes, collection) => {
     );
 
     if (!result) {
-        throw new Error("Index creation timed out.");
+        throw new Error('Index creation timed out.');
     }
 
     success(`Created ${indexes.length} indexes`);
@@ -916,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 = {
@@ -1711,7 +1732,7 @@ const pushTable = async ({ returnOnZero, attempts } = { returnOnZero: false }) =
 
     // Parallel db actions
     await Promise.all(databases.map(async (databaseId) => {
-        const localDatabase = localConfig.getDatabase(databaseId);
+        const localDatabase = localConfig.getTablesDB(databaseId);
 
         try {
             const database = await tablesDBGet({
@@ -1753,11 +1774,10 @@ const pushTable = async ({ returnOnZero, attempts } = { returnOnZero: false }) =
             });
 
             if (remoteTable.name !== table.name) {
-                await databasesUpdateTable({
+                await tablesDBUpdateTable({
                     databaseId: table['databaseId'],
                     tableId: table['$id'],
                     name: table.name,
-                    name: table.name,
                     parseOutput: false
                 })
 
@@ -1770,7 +1790,7 @@ const pushTable = async ({ returnOnZero, attempts } = { returnOnZero: false }) =
             (e) {
             if (Number(e.code) === 404) {
                 log(`Table ${table.name} does not exist in the project. Creating ... `);
-                await databasesCreateTable({
+                await tablesDBCreateTable({
                     databaseId: table['databaseId'],
                     tableId: table['$id'],
                     name: table.name,
@@ -1796,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;
         }
@@ -1900,7 +1919,6 @@ const pushCollection = async ({ returnOnZero, attempts } = { returnOnZero: false
                     databaseId: collection['databaseId'],
                     collectionId: collection['$id'],
                     name: collection.name,
-                    name: collection.name,
                     parseOutput: false
                 })
 

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

@@ -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")