Syntax fixes

Author: abnegate

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

@@ -30,7 +30,7 @@ class Query {
 
     fun endsWith(attribute: String, value: String) = Query.addQuery(attribute, "endsWith", value)
 
-    fun select(attributes: List<String>) = "select([${attributes.map { \"it\" }.joinToString(",")}])"
+    fun select(attributes: List<String>) = "select([${attributes.joinToString(",") { "\"it\"" }}])"
 
     fun orderAsc(attribute: String) = "orderAsc(\"${attribute}\")"
 

templates/dart/lib/query.dart.twig

@@ -28,13 +28,7 @@ class Query {
 
   static isNotNull(String attribute) => 'isNotNull("$attribute")';
 
-  static between(String attribute, int start, int end) =>
-      _addQuery(attribute, 'between', [start, end]);
-
-  static between(String attribute, double start, double end) =>
-      _addQuery(attribute, 'between', [start, end]);
-
-  static between(String attribute, String start, String end) =>
+  static between(String attribute, dynamic start, dynamic end) =>
       _addQuery(attribute, 'between', [start, end]);
 
   static startsWith(String attribute, String value) =>

templates/deno/src/query.ts.twig

@@ -30,8 +30,8 @@ export class Query {
   static isNotNull = (attribute: string): string =>
     `isNotNull("${attribute}")`;
 
-  static between = (attribute: string, value: QueryTypesList): string =>
-    Query.addQuery(attribute, "between", value);
+  static between = (attribute: string, start: string|number, end: string|number): string =>
+    Query.addQuery(attribute, "between", [start, end]);
 
   static startsWith = (attribute: string, value: string): string =>
     Query.addQuery(attribute, "startsWith", value);

templates/kotlin/src/main/kotlin/io/appwrite/Query.kt.twig

@@ -30,7 +30,7 @@ class Query {
 
     fun endsWith(attribute: String, value: String) = Query.addQuery(attribute, "endsWith", value)
 
-    fun select(attributes: List<String>) = "select([${attributes.map { \"it\" }.joinToString(",")}])"
+    fun select(attributes: List<String>) = "select([${attributes.joinToString(",") { "\"it\"" }}])"
 
     fun orderAsc(attribute: String) = "orderAsc(\"${attribute}\")"
 

templates/node/lib/query.js.twig

@@ -23,8 +23,8 @@ class Query {
   static isNotNull = (attribute) =>
     `isNotNull("${attribute}")`;
 
-  static between = (attribute, value) =>
-    Query.addQuery(attribute, "between", value);
+  static between = (attribute, start, end) =>
+    Query.addQuery(attribute, "between", [start, end]);
 
   static startsWith = (attribute, value) =>
     Query.addQuery(attribute, "startsWith", value);

templates/php/src/Query.php.twig

@@ -118,7 +118,7 @@ class Query
      * @param string|int|float $end
      * @return string
      */
-    public static function between(string $attribute, string|int|float $start, string|int|float $end): string
+    public static function between(string $attribute, mixed $start, mixed $end): string
     {
         return self::addQuery($attribute, 'between', [$start, $end]);
     }

templates/python/package/query.py.twig

@@ -36,11 +36,11 @@ class Query:
         return Query.add_query(attribute, "between", [start, end])
 
     @staticmethod
-    def starts_with(value):
+    def starts_with(attribute, value):
         return Query.add_query(attribute, "startsWith", value)
 
     @staticmethod
-    def ends_with(value):
+    def ends_with(attribute, value):
         return Query.add_query(attribute, "endsWith", value)
 
     @staticmethod

templates/ruby/lib/container/query.rb.twig

@@ -33,8 +33,8 @@ module {{spec.title | caseUcfirst}}
                 return "isNotNull(\"#{attribute}\")"
             end
 
-            def between(attribute, start, end)
-                return add_query(attribute, "between", [start, end])
+            def between(attribute, start, ending)
+                return add_query(attribute, "between", [start, ending])
             end
 
             def starts_with(attribute, value)

templates/web/src/query.ts.twig

@@ -27,8 +27,8 @@ export class Query {
   static isNotNull = (attribute: string): string =>
     `isNotNull("${attribute}")`;
 
-  static between = (attribute: string, value: QueryTypesList): string =>
-    Query.addQuery(attribute, "between", value);
+  static between = (attribute: string, start: string|number, end: string|number): string =>
+    Query.addQuery(attribute, "between", [start, end]);
 
   static startsWith = (attribute: string, value: string): string =>
     Query.addQuery(attribute, "startsWith", value);

tests/Base.php

@@ -69,9 +69,9 @@ abstract class Base extends TestCase
         'search("name", ["john"])',
         'isNull("name")',
         'isNotNull("name")',
-        'between("age", 50, 100)',
-        'between("age", 50.5, 100.5)',
-        'between("name", "Anna", "Brad")',
+        'between("age", [50,100])',
+        'between("age", [50.5,100.5])',
+        'between("name", ["Anna","Brad"])',
         'startsWith("name", "Ann")',
         'endsWith("name", "nne")',
         'select("name", "age")',