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.joinToString(",") { "\"it\"" }}])"
+    fun select(attributes: List<String>) = "select([${attributes.joinToString(",") { "\"$it\"" }}])"
 
     fun orderAsc(attribute: String) = "orderAsc(\"${attribute}\")"
 

templates/deno/src/query.ts.twig

@@ -30,8 +30,8 @@ export class Query {
   static isNotNull = (attribute: string): string =>
     `isNotNull("${attribute}")`;
 
-  static between = (attribute: string, start: QueryTypesSingle, end: QueryTypesSingle): string =>
-    Query.addQuery(attribute, "between", [start, end]);
+  static between = (attribute: string, start: string|number, end: string|number): string =>
+    `between("${attribute}", [${Query.parseValues(start)},${Query.parseValues(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.joinToString(",") { "\"it\"" }}])"
+    fun select(attributes: List<String>) = "select([${attributes.joinToString(",") { "\"$it\"" }}])"
 
     fun orderAsc(attribute: String) = "orderAsc(\"${attribute}\")"
 

templates/web/src/query.ts.twig

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

tests/languages/flutter/tests.dart

@@ -128,14 +128,14 @@ void main() async {
   print(Query.lessThan('releasedYear', 1990));
   print(Query.greaterThan('releasedYear', 1990));
   print(Query.search('name', 'john'));
-  print(Query.isNull("name"))
-  print(Query.isNotNull("name"))
-  print(Query.between("age", 50, 100))
-  print(Query.between("age", 50.5, 100.5))
-  print(Query.between("name", "Anna", "Brad"))
-  print(Query.startsWith("name", "Ann"))
-  print(Query.endsWith("name", "nne"))
-  print(Query.select(["name", "age"]))
+  print(Query.isNull("name"));
+  print(Query.isNotNull("name"));
+  print(Query.between("age", 50, 100));
+  print(Query.between("age", 50.5, 100.5));
+  print(Query.between("name", "Anna", "Brad"));
+  print(Query.startsWith("name", "Ann"));
+  print(Query.endsWith("name", "nne"));
+  print(Query.select(["name", "age"]));
   print(Query.orderAsc("title"));
   print(Query.orderDesc("title"));
   print(Query.cursorAfter("my_movie_id"));