Merge branch 'master' of https://github.com/appwrite/sdk-generator into feat-dotnet-exceptions

Author: TorstenDittmann

.travis.yml

@@ -1,3 +1,11 @@
+
+dist: xenial
+
+arch:
+  - amd64
+
+os: linux
+
 language: php
 
 php:
@@ -24,4 +32,4 @@ install:
   - composer install
 
 script:
-  - vendor/bin/phpunit
+  - vendor/bin/phpunit

src/SDK/Language/CLI.php

@@ -226,6 +226,12 @@ public function getFiles()
                 'template'      => '/cli/app/services/init.php.twig',
                 'minify'        => false,
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => '.travis.yml',
+                'template'      => '/cli/.travis.yml.twig',
+                'minify'        => false,
+            ],
         ];
     }
 

src/SDK/Language/Deno.php

@@ -36,6 +36,12 @@ public function getFiles()
                 'template'      => '/deno/src/service.ts.twig',
                 'minify'        => false,
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/src/exception.ts',
+                'template'      => '/deno/src/exception.ts.twig',
+                'minify'        => false,
+            ],
             [
                 'scope'         => 'service',
                 'destination'   => '/src/services/{{service.name | caseDash}}.ts',

src/SDK/Language/Node.php

@@ -66,6 +66,12 @@ public function getFiles()
                 'template'      => '/node/package.json.twig',
                 'minify'        => false,
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'lib/exception.js',
+                'template'      => '/node/lib/exception.js.twig',
+                'minify'        => false,
+            ],
             [
                 'scope'         => 'method',
                 'destination'   => 'docs/examples/{{service.name | caseLower}}/{{method.name | caseDash}}.md',

src/SDK/SDK.php

@@ -54,6 +54,7 @@ class SDK
         'shareVia' => '',
         'shareTags' => '',
         'warning' => '',
+        'gettingStarted' => '',
         'readme' => '',
         'changelog' => '',
         'examples' => '',
@@ -193,6 +194,8 @@ public function __construct(Language $language, Spec $spec)
      */
     public function setDefaultHeaders($headers) {
         $this->defaultHeaders = $headers;
+        
+        return $this;
     }
 
     /**
@@ -393,6 +396,17 @@ public function setWarning($message)
         return $this;
     }
 
+    /**
+     * @param $message string
+     * @return $this
+     */
+    public function setGettingStarted($message)
+    {
+        $this->setParam('gettingStarted', $message);
+
+        return $this;
+    }
+
     /**
      * @param $text string
      * @return $this

templates/cli/.travis.yml.twig

@@ -0,0 +1,31 @@
+os: linux
+dist: xenial
+
+language: shell
+
+services:
+- docker
+
+before_install:
+- curl -fsSL https://get.docker.com | sh
+- echo '{"experimental":"enabled"}' | sudo tee /etc/docker/daemon.json
+- mkdir -p $HOME/.docker
+- echo '{"experimental":"enabled"}' | sudo tee $HOME/.docker/config.json
+- sudo service docker start
+- >
+  if [ ! -z "${DOCKERHUB_PULL_USERNAME:-}" ]; then
+    echo "${DOCKERHUB_PULL_PASSWORD}" | docker login --username "${DOCKERHUB_PULL_USERNAME}" --password-stdin
+  fi
+- docker --version
+- docker run --rm --privileged linuxkit/binfmt:v0.8
+- docker buildx create --use
+
+script:
+- docker ps; docker buildx ls
+
+deploy:
+  - provider: script
+    edge: true
+    script: docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/ppc64le,linux/s390x -t appwrite/cli:$TRAVIS_TAG ./ --push
+    on:
+      tags: true

templates/dart/README.md.twig

@@ -31,6 +31,11 @@ You can install packages from the command line:
 pub get {{ language.params.packageName }}
 ```
 
+{% if sdk.gettingStarted %}
+
+{{ sdk.gettingStarted|raw }}
+{% endif %}
+
 ## Contribution
 
 This library is auto-generated by Appwrite custom [SDK Generator](https://github.com/appwrite/sdk-generator). To learn more about how you can help us improve this SDK, please check the [contribution guide](https://github.com/appwrite/sdk-generator/blob/master/CONTRIBUTING.md) before sending a pull-request.

templates/dart/lib/client.dart.twig

@@ -3,13 +3,13 @@ part of {{ language.params.packageName }};
 class Client {
     String endPoint;
     String type = 'unknown';
-    Map<String, String> headers;
-    Map<String, String> config;
+    Map<String, String>? headers;
+    late Map<String, String> config;
     bool selfSigned;
     bool initialized = false;
     Dio http;
 
-    Client({this.endPoint = '{{spec.endpoint}}', this.selfSigned = false, Dio http}) : this.http = http ?? Dio() {
+    Client({this.endPoint = '{{spec.endpoint}}', this.selfSigned = false, Dio? http}) : this.http = http ?? Dio() {
 
         this.headers = {
             'content-type': 'application/json',
@@ -48,19 +48,19 @@ class Client {
     }
 
     Client addHeader(String key, String value) {
-        headers[key] = value;
+        headers![key] = value;
 
         return this;
     }
 
     Future init() async {
         if(!initialized) {
           this.http.options.baseUrl = this.endPoint;
-          this.http.options.validateStatus = (status) => status < 400;
+          this.http.options.validateStatus = (status) => status! < 400;
         }
     }
 
-    Future<Response> call(HttpMethod method, {String path = '', Map<String, String> headers = const {}, Map<String, dynamic> params = const {}, ResponseType responseType}) async {
+    Future<Response> call(HttpMethod method, {String path = '', Map<String, String> headers = const {}, Map<String, dynamic> params = const {}, ResponseType? responseType}) async {
         if(selfSigned) {
             // Allow self signed requests
             (http.httpClientAdapter as DefaultHttpClientAdapter).onHttpClientCreate = (HttpClient client) {
@@ -73,14 +73,15 @@ class Client {
 
         // Origin is hardcoded for testing
         Options options = Options(
-            headers: {...this.headers, ...headers},
+            headers: {...this.headers!, ...headers},
             method: method.name(),
-            responseType: responseType
+            responseType: responseType,
+            listFormat: ListFormat.multiCompatible,
         );
         try {
 
             if(headers['content-type'] == 'multipart/form-data') {
-                return await http.request(path, data: FormData.fromMap(params), options: options);
+                return await http.request(path, data: FormData.fromMap(params,ListFormat.multiCompatible), options: options);
             }
 
             if (method == HttpMethod.get) {
@@ -96,9 +97,17 @@ class Client {
           if(e.response == null) {
             throw {{spec.title | caseUcfirst}}Exception(e.message);
           }
-          throw {{spec.title | caseUcfirst}}Exception(e.response.data['message'],e.response.data['code'], e.response.data);
+          if(responseType == ResponseType.bytes) {
+            if(e.response!.headers['content-type']?.contains('application/json') ?? false) {
+              final res = json.decode(utf8.decode(e.response!.data));
+              throw {{spec.title | caseUcfirst}}Exception(res['message'],res['code'], res);
+            } else {
+              throw {{spec.title | caseUcfirst}}Exception(e.message);
+            }
+          }
+          throw {{spec.title | caseUcfirst}}Exception(e.response?.data['message'],e.response?.data['code'], e.response?.data);
         } catch(e) {
-          throw {{spec.title | caseUcfirst}}Exception(e.message);
+          throw {{spec.title | caseUcfirst}}Exception(e.toString());
         }
     }
 }

templates/dart/lib/exception.dart.twig

@@ -1,8 +1,8 @@
 part of {{ language.params.packageName }};
 
 class {{spec.title | caseUcfirst}}Exception implements Exception {
-  final String message;
-  final int code;
+  final String? message;
+  final int? code;
   final dynamic response;
 
   {{spec.title | caseUcfirst}}Exception([this.message = "", this.code, this.response]);

templates/dart/lib/package.dart.twig

@@ -1,6 +1,7 @@
 library {{ language.params.packageName }};
 
 import 'dart:io';
+import 'dart:convert';
 import 'package:dio/dio.dart';
 import 'package:meta/meta.dart';
 import 'package:dio/adapter.dart';