Merge branch 'master' into feat-refactor-sdk-tests

lohanidamodar · lohanidamodar · commit f545f2eb63db · 2021-11-04T15:06:29.000+05:45
diff --git a/.gitignore b/.gitignore
@@ -10,7 +10,7 @@
 examples/*
 
 # exception to the rule
-!examples/.gitkeep 
+!examples/.gitkeep
 **/.DS_Store
 templates/swift/example/.build
 templates/swift/example/Example.xcodeproj/project.xcworkspace/xcuserdata
diff --git a/src/SDK/Language/Dart.php b/src/SDK/Language/Dart.php
@@ -363,12 +363,24 @@ public function getFiles()
 				'template'      => 'dart/lib/src/enums.dart.twig',
 				'minify'        => false,
 			],
+            [
+				'scope'         => 'default',
+				'destination'   => '/lib/models.dart',
+				'template'      => 'dart/lib/models.dart.twig',
+				'minify'        => false,
+			],
             [
                 'scope'         => 'service',
                 'destination'   => '/lib/services/{{service.name | caseDash}}.dart',
                 'template'      => 'dart/lib/services/service.dart.twig',
                 'minify'        => false,
             ],
+            [
+                'scope'         => 'definition',
+                'destination'   => '/lib/src/models/{{definition.name | caseSnake }}.dart',
+                'template'      => 'dart/lib/src/models/model.dart.twig',
+                'minify'        => false,
+            ],
             [
                 'scope'         => 'method',
                 'destination'   => 'docs/examples/{{service.name | caseLower}}/{{method.name | caseDash}}.md',
diff --git a/src/SDK/Language/Flutter.php b/src/SDK/Language/Flutter.php
@@ -223,6 +223,12 @@ public function getFiles()
                 'template'      => 'flutter/lib/src/service.dart.twig',
                 'minify'        => false,
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/lib/src/models/model.dart',
+                'template'      => 'flutter/lib/src/models/model_base.dart.twig',
+                'minify'        => false,
+            ],
             [
 				'scope'         => 'default',
 				'destination'   => '/lib/src/enums.dart',
diff --git a/src/SDK/Language/Kotlin.php b/src/SDK/Language/Kotlin.php
@@ -352,12 +352,6 @@ public function getFiles()
                 'template'      => '/kotlin/src/main/kotlin/io/appwrite/extensions/JsonExtensions.kt.twig',
                 'minify'        => false,
             ],
-            [
-                'scope'         => 'default',
-                'destination'   => '/src/main/kotlin/{{ sdk.namespace | caseSlash }}/models/Error.kt',
-                'template'      => '/kotlin/src/main/kotlin/io/appwrite/models/Error.kt.twig',
-                'minify'        => false,
-            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/src/main/kotlin/{{ sdk.namespace | caseSlash }}/services/BaseService.kt',
diff --git a/src/SDK/SDK.php b/src/SDK/SDK.php
@@ -197,6 +197,14 @@ public function __construct(Language $language, Spec $spec)
 
             return $value;
         }, ['is_safe' => ['html']]));
+        $this->twig->addFilter(new TwigFilter('ucFirstAndEscape', function ($value) use ($language) {
+            $value = ucfirst((string)$this->helperCamelCase($value));
+            if(in_array($value, $language->getKeywords())) {
+                $value = 'x' . $value;
+            }
+
+            return ucfirst((string)$this->helperCamelCase($value));
+        }, ['is_safe' => ['html']]));
         $this->twig->addFilter(new TwigFilter('caseHTML', function ($value) {
             return $value;
         }, ['is_safe' => ['html']]));
diff --git a/templates/android/library/src/main/java/io/appwrite/Client.kt.twig b/templates/android/library/src/main/java/io/appwrite/Client.kt.twig
@@ -314,16 +314,11 @@ class Client @JvmOverloads constructor(
 
                     val contentType: String = response.headers["content-type"] ?: ""
                     val error = if (contentType.contains("application/json", ignoreCase = true)) {
-                        bodyString.fromJson<{{ spec.title | caseUcfirst }}Exception>()
+                        bodyString.fromJson()
                     } else {
                         {{ spec.title | caseUcfirst }}Exception(bodyString, response.code)
                     }
-
-                    it.cancel(AppwriteException(
-                        error.message,
-                        error.code,
-                        bodyString
-                    ))
+                    it.cancel(error)
                 }
                 it.resume(response)
             }
diff --git a/templates/android/library/src/main/java/io/appwrite/exceptions/Exception.kt.twig b/templates/android/library/src/main/java/io/appwrite/exceptions/Exception.kt.twig
@@ -3,7 +3,7 @@ package {{ sdk.namespace | caseDot }}.exceptions
 import java.lang.Exception
 
 class {{spec.title | caseUcfirst}}Exception(
-    message: String? = null,
+    override val message: String? = null,
     val code: Int? = null,
     val response: String? = null
 ) : Exception(message)
diff --git a/templates/dart/lib/models.dart.twig b/templates/dart/lib/models.dart.twig
@@ -0,0 +1,5 @@
+library {{ language.params.packageName }}.models;
+
+{% for definition in spec.definitions %}
+part 'src/models/{{definition.name | caseSnake}}.dart';
+{% endfor %}
diff --git a/templates/dart/lib/package.dart.twig b/templates/dart/lib/package.dart.twig
@@ -1,11 +1,12 @@
 library {{ language.params.packageName }};
 
 import 'dart:async';
+import 'dart:typed_data';
 import 'package:http/http.dart' as http;
 import 'src/enums.dart';
 import 'src/client.dart';
-import 'src/response.dart';
 import 'src/service.dart';
+import 'models.dart' as models;
 
 export 'src/response.dart';
 export 'src/client.dart';
diff --git a/templates/dart/lib/services/service.dart.twig b/templates/dart/lib/services/service.dart.twig
@@ -16,7 +16,7 @@ class {{ service.name | caseUcfirst }} extends Service {
 {{ method.description|dartComment }}
      ///
 {% endif %}
-    Future<Response> {{ method.name | caseCamel }}({{ _self.method_parameters(method.parameters) }}) {
+    {% if method.type == 'webAuth' %}Future{% elseif method.type == 'location' %} Future<Uint8List> {% else %} {% if method.responseModel and method.responseModel != 'any' %}Future<models.{{method.responseModel | ucFirstAndEscape}}>{% else %}Future{% endif %}{% endif %} {{ method.name | caseCamel }}({{ _self.method_parameters(method.parameters) }}) async {
         final String path = '{{ method.path }}'{% for parameter in method.parameters.path %}.replaceAll(RegExp('{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}'), {{ parameter.name | caseCamel | escapeKeyword }}){% endfor %};
 
         final Map<String, dynamic> params = {
@@ -42,15 +42,17 @@ class {{ service.name | caseUcfirst }} extends Service {
           params[key] = params[key].toString();
         }});
         
-        return client.call(HttpMethod.{{ method.method | caseLower }}, path: path, params: params, responseType: ResponseType.bytes);
+        final res = await client.call(HttpMethod.{{ method.method | caseLower }}, path: path, params: params, responseType: ResponseType.bytes);
+        return res.data;
 {% else %}
         final Map<String, String> headers = {
 {% for key, header in method.headers %}
             '{{ key }}': '{{ header }}',
 {% endfor %}
         };
 
-        return client.call(HttpMethod.{{ method.method | caseLower }}, path: path, params: params, headers: headers);
+        final res = await client.call(HttpMethod.{{ method.method | caseLower }}, path: path, params: params, headers: headers);
+        return {% if method.responseModel and method.responseModel != 'any' %}models.{{method.responseModel | ucFirstAndEscape}}.fromMap(res.data){% else %} res.data{% endif %};
 {% endif %}
     }
 {% endfor %}
diff --git a/templates/dart/lib/src/models/model.dart.twig b/templates/dart/lib/src/models/model.dart.twig
@@ -0,0 +1,59 @@
+{% macro sub_schema(property) %}{% if property.sub_schema %}{% if property.type == 'array' %}List<{{property.sub_schema | ucFirstAndEscape}}>{% else %}{{property.sub_schema | ucFirstAndEscape }}{% endif %}{% else %}{{property.type | typeName}}{% endif %}{% endmacro %}
+part of {{ language.params.packageName }}.models;
+
+/// {{ definition.description }}
+class {{ definition.name | ucFirstAndEscape }} {
+{% for property in definition.properties %}
+    /// {{ property.description }}
+    final {% if not property.required %}{{_self.sub_schema(property)}}? {{ property.name | escapeKeyword }}{% else %}{{_self.sub_schema(property)}} {{ property.name | escapeKeyword }}{% endif %};
+{% endfor %}
+{% if definition.additionalProperties %}
+    final Map<String, dynamic> data;
+{% endif %}
+
+    {{ definition.name | ucFirstAndEscape}}({
+{% for property in definition.properties %}{% if property.required %}
+        required {% endif %}this.{{ property.name | escapeKeyword }},
+{% endfor %}
+{% if definition.additionalProperties %}
+        required this.data,
+{% endif %}
+    });
+
+    factory {{ definition.name | ucFirstAndEscape}}.fromMap(Map<String, dynamic> map) {
+        return {{ definition.name | ucFirstAndEscape }}(
+{% for property in definition.properties %}
+            {{ property.name | escapeKeyword }}: {% if property.sub_schema %}{% if property.type == 'array' %}List<{{property.sub_schema | ucFirstAndEscape}}>.from(map['{{property.name | escapeDollarSign }}'].map((p) => {{property.sub_schema | ucFirstAndEscape}}.fromMap(p))){% else %}{{property.sub_schema | ucFirstAndEscape}}.fromMap(map['{{property.name | escapeDollarSign }}']){% endif %}{% else %}map['{{property.name | escapeDollarSign }}']{% if property.type == "number" %}.toDouble(){% endif %}{% if property.type == "string" %}.toString(){% endif %}{% endif %},
+{% endfor %}
+{% if definition.additionalProperties %}
+            data: map,
+{% endif %}
+        );
+    }
+
+    Map<String, dynamic> toMap() {
+        return {
+{% for property in definition.properties %}
+            "{{ property.name | escapeDollarSign }}": {% if property.sub_schema %}{% if property.type == 'array' %}{{property.name | escapeKeyword}}.map((p) => p.toMap()){% else %}{{property.name | escapeKeyword}}.toMap(){% endif %}{% else %}{{property.name | escapeKeyword }}{% endif %},
+{% endfor %}
+{% if definition.additionalProperties %}
+            "data": data,
+{% endif %}
+        };
+    }
+{% if definition.additionalProperties %}
+
+    T convertTo<T>(T Function(Map) fromJson) => fromJson(data);
+{% endif %}
+{% for property in definition.properties %}
+{% if property.sub_schema %}
+{% for def in spec.definitions %}
+{% if def.name == property.sub_schema and def.additionalProperties and property.type == 'array' %}
+
+    List<T> convertTo<T>(T Function(Map) fromJson) =>
+        {{property.name}}.map((d) => d.convertTo<T>(fromJson)).toList();
+{% endif %}
+{% endfor %}
+{% endif %}
+{% endfor %}
+}
diff --git a/templates/flutter/lib/models.dart.twig b/templates/flutter/lib/models.dart.twig
@@ -1,5 +1,6 @@
 library {{ language.params.packageName }}.models;
 
+part 'src/models/model.dart';
 {% for definition in spec.definitions %}
 part 'src/models/{{definition.name | caseSnake}}.dart';
 {% endfor %}
diff --git a/templates/flutter/lib/src/models/model.dart.twig b/templates/flutter/lib/src/models/model.dart.twig
@@ -2,7 +2,7 @@
 part of {{ language.params.packageName }}.models;
 
 /// {{ definition.description }}
-class {{ definition.name | caseUcfirst }} {
+class {{ definition.name | caseUcfirst }} implements Model {
 {% for property in definition.properties %}
     /// {{ property.description }}
     final {% if not property.required %}{{_self.sub_schema(property)}}? {{ property.name | escapeKeyword }}{% else %}{{_self.sub_schema(property)}} {{ property.name | escapeKeyword }}{% endif %};
@@ -31,6 +31,7 @@ class {{ definition.name | caseUcfirst }} {
         );
     }
 
+    @override
     Map<String, dynamic> toMap() {
         return {
 {% for property in definition.properties %}
diff --git a/templates/flutter/lib/src/models/model_base.dart.twig b/templates/flutter/lib/src/models/model_base.dart.twig
@@ -0,0 +1,5 @@
+part of {{ language.params.packageName }}.models;
+
+abstract class Model {
+  Map<String, dynamic> toMap();
+}
diff --git a/templates/kotlin/src/main/kotlin/io/appwrite/Client.kt.twig b/templates/kotlin/src/main/kotlin/io/appwrite/Client.kt.twig
@@ -2,8 +2,7 @@ package {{ sdk.namespace | caseDot }}
 
 import com.google.gson.Gson
 import {{ sdk.namespace | caseDot }}.exceptions.{{ spec.title | caseUcfirst }}Exception
-import {{ sdk.namespace | caseDot }}.extensions.JsonExtensions.fromJson
-import {{ sdk.namespace | caseDot }}.models.Error
+import {{ sdk.namespace | caseDot }}.extensions.fromJson
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -273,16 +272,11 @@ class Client @JvmOverloads constructor(
 
                     val contentType: String = response.headers["content-type"] ?: ""
                     val error = if (contentType.contains("application/json", ignoreCase = true)) {
-                        bodyString.fromJson(Error::class.java)
+                        bodyString.fromJson()
                     } else {
-                        Error(bodyString, response.code)
+                        {{ spec.title | caseUcfirst }}Exception(bodyString, response.code)
                     }
-
-                    it.cancel(AppwriteException(
-                        error.message,
-                        error.code,
-                        bodyString
-                    ))
+                    it.cancel(error)
                 }
                 it.resume(response)
             }
diff --git a/templates/kotlin/src/main/kotlin/io/appwrite/exceptions/Exception.kt.twig b/templates/kotlin/src/main/kotlin/io/appwrite/exceptions/Exception.kt.twig
@@ -3,7 +3,7 @@ package {{ sdk.namespace | caseDot }}.exceptions
 import java.lang.Exception
 
 class {{spec.title | caseUcfirst}}Exception(
-    message: String? = null,
+    override val message: String? = null,
     val code: Int? = null,
     val response: String? = null
 ) : Exception(message)
diff --git a/templates/kotlin/src/main/kotlin/io/appwrite/extensions/JsonExtensions.kt.twig b/templates/kotlin/src/main/kotlin/io/appwrite/extensions/JsonExtensions.kt.twig
@@ -2,11 +2,33 @@ package {{ sdk.namespace | caseDot }}.extensions
 
 import com.google.gson.Gson
 
-object JsonExtensions {
+val gson = Gson()
 
-    fun Any.toJson(): String =
-        Gson().toJson(this)
+fun Any.toJson(): String =
+    gson.toJson(this)
 
-    fun <T> String.fromJson(clazz: Class<T>): T =
-        Gson().fromJson(this, clazz)
+fun <T> String.fromJson(clazz: Class<T>): T =
+    gson.fromJson(this, clazz)
+
+inline fun <reified T> String.fromJson(): T =
+    gson.fromJson(this, T::class.java)
+
+fun <T> Any.jsonCast(to: Class<T>): T =
+    toJson().fromJson(to)
+
+inline fun <reified T> Any.jsonCast(): T =
+    toJson().fromJson(T::class.java)
+
+fun <T> Any.tryJsonCast(to: Class<T>): T? = try {
+    toJson().fromJson(to)
+} catch (ex: Exception) {
+    ex.printStackTrace()
+    null
+}
+
+inline fun <reified T> Any.tryJsonCast(): T? = try {
+    toJson().fromJson(T::class.java)
+} catch (ex: Exception) {
+    ex.printStackTrace()
+    null
 }
diff --git a/templates/kotlin/src/main/kotlin/io/appwrite/models/Error.kt.twig b/templates/kotlin/src/main/kotlin/io/appwrite/models/Error.kt.twig
diff --git a/tests/languages/dart/tests.dart b/tests/languages/dart/tests.dart

Original file line number	Diff line number	Diff line change
`@@ -314,16 +314,11 @@ class Client @JvmOverloads constructor(`
`314`	`314`
`315`	`315`	`val contentType: String = response.headers["content-type"] ?: ""`
`316`	`316`	`val error = if (contentType.contains("application/json", ignoreCase = true)) {`
`317`		`- bodyString.fromJson<{{ spec.title \| caseUcfirst }}Exception>()`
	`317`	`+ bodyString.fromJson()`
`318`	`318`	`} else {`
`319`	`319`	`{{ spec.title \| caseUcfirst }}Exception(bodyString, response.code)`
`320`	`320`	`}`
`321`		`-`
`322`		`- it.cancel(AppwriteException(`
`323`		`- error.message,`
`324`		`- error.code,`
`325`		`- bodyString`
`326`		`- ))`
	`321`	`+ it.cancel(error)`
`327`	`322`	`}`
`328`	`323`	`it.resume(response)`
`329`	`324`	`}`