Merge remote-tracking branch 'origin/master' into feat-swift-async-await

# Conflicts:
#	composer.lock
#	templates/swift/Sources/Client.swift.twig
#	tests/languages/swift-client/Tests.swift

Author: abnegate

composer.lock

@@ -217,7 +217,7 @@ public function getParamExample(array $param)
         if(empty($example) && $example !== 0 && $example !== false) {
             switch ($type) {
                 case self::TYPE_FILE:
-                    $output .= 'await MultipartFile.fromPath(\''.$param['name'].'\', \'./path-to-files/image.jpg\', \'image.jpg\')';
+                    $output .= 'InputFile(path: \'./path-to-files/image.jpg\', filename: \'image.jpg\')';
                     break;
                 case self::TYPE_NUMBER:
                 case self::TYPE_INTEGER:

src/SDK/Language/Dart.php

@@ -605,6 +605,7 @@ public function generate($target)
                     foreach ($this->spec->getServices() as $key => $service) {
                         $methods = $this->spec->getMethods($key);
                         $params['service'] = [
+                            'description' => $service['description'] ?? '',
                             'name' => $key,
                             'features' => [
                                 'upload' => $this->hasUploads($methods),

src/SDK/SDK.php

@@ -22,12 +22,12 @@
     "windows-arm64": "pkg -t node16-win-arm64 -o build/appwrite-cli-win-arm64.exe package.json"
   },
   "dependencies": {
-    "axios": "^0.24.0",
+    "axios": "^0.26.1",
     "chalk": "4.1.2",
     "cli-table3": "^0.6.1",
-    "commander": "^8.3.0",
+    "commander": "^9.0.0",
     "form-data": "^4.0.0",
-    "inquirer": "^8.2.0",
+    "inquirer": "^8.2.1",
     "tar": "^6.1.11"
   },
   "devDependencies": {

templates/cli/package.json.twig

@@ -6,6 +6,9 @@ part of {{ language.params.packageName }};
 {% endmacro %}
 {% macro map_parameter(parameter) %}'{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},{% endmacro %}
 
+{%if service.description %}
+{{ service.description|dartComment}}
+{% endif %}
 class {{ service.name | caseUcfirst }} extends Service {
     {{ service.name | caseUcfirst }}(Client client): super(client);
 {% for method in service.methods %}

templates/dart/lib/services/service.dart.twig

@@ -26,7 +26,7 @@ Future<Response> chunkedUpload({
 
   late Response res;
   if (size <= Client.CHUNK_SIZE) {
-    params[paramName] = await http.MultipartFile.fromPath(paramName, file.path!, filename: file.fileName);
+    params[paramName] = await http.MultipartFile.fromPath(paramName, file.path!, filename: file.filename);
     return client.call(
       HttpMethod.post,
       path: path,
@@ -55,7 +55,7 @@ Future<Response> chunkedUpload({
     raf.setPositionSync(offset);
     final chunk = raf.readSync(Client.CHUNK_SIZE);
     params[paramName] =
-        http.MultipartFile.fromBytes(paramName, chunk, filename: file.fileName);
+        http.MultipartFile.fromBytes(paramName, chunk, filename: file.filename);
     headers['content-range'] =
         'bytes $offset-${min<int>(((offset + Client.CHUNK_SIZE) - 1), size)}/$size';
     res = await client.call(HttpMethod.post,

templates/dart/lib/src/chunked_upload_io.dart.twig

@@ -3,7 +3,7 @@ import 'package:http/http.dart' show MultipartFile;
 class InputFile {
   final MultipartFile? file;
   final String? path;
-  final String? fileName;
+  final String? filename;
 
-  InputFile({this.file, this.path, this.fileName});
+  InputFile({this.file, this.path, this.filename});
 }

templates/dart/lib/src/input_file.dart.twig

@@ -23,7 +23,7 @@ class {{ definition.name | caseUcfirst | overrideIdentifier }} {
     factory {{ definition.name | caseUcfirst | overrideIdentifier}}.fromMap(Map<String, dynamic> map) {
         return {{ definition.name | caseUcfirst | overrideIdentifier }}(
 {% for property in definition.properties %}
-            {{ property.name | escapeKeyword }}: {% if property.sub_schema %}{% if property.type == 'array' %}List<{{property.sub_schema | caseUcfirst | overrideIdentifier}}>.from(map['{{property.name | escapeDollarSign }}'].map((p) => {{property.sub_schema | caseUcfirst | overrideIdentifier}}.fromMap(p))){% else %}{{property.sub_schema | caseUcfirst | overrideIdentifier}}.fromMap(map['{{property.name | escapeDollarSign }}']){% endif %}{% else %}map['{{property.name | escapeDollarSign }}']{% if property.type == "number" %}.toDouble(){% endif %}{% if property.type == "string" %}.toString(){% endif %}{% endif %},
+            {{ property.name | escapeKeyword }}: {% if property.sub_schema %}{% if property.type == 'array' %}List<{{property.sub_schema | caseUcfirst | overrideIdentifier}}>.from(map['{{property.name | escapeDollarSign }}'].map((p) => {{property.sub_schema | caseUcfirst | overrideIdentifier}}.fromMap(p))){% else %}{{property.sub_schema | caseUcfirst | overrideIdentifier}}.fromMap(map['{{property.name | escapeDollarSign }}']){% endif %}{% else %}map['{{property.name | escapeDollarSign }}']{% if property.type == "number" %}{% if not property.required %}?{% endif %}.toDouble(){% endif %}{% if property.type == "string" %}{% if not property.required %}?{% endif %}.toString(){% endif %}{% endif %},
 {% endfor %}
 {% if definition.additionalProperties %}
             data: map,

templates/dart/lib/src/models/model.dart.twig

@@ -2,7 +2,6 @@ library {{ language.params.packageName }};
 
 import 'dart:async';
 import 'dart:typed_data';
-import 'package:http/http.dart' as http;
 import 'package:flutter/foundation.dart';
 import 'src/chunked_upload_stub.dart'
     if (dart.library.io) 'src/chunked_upload_io.dart';

templates/flutter/lib/package.dart.twig

@@ -5,6 +5,10 @@ part of {{ language.params.packageName }};
 {% if parameters.all|length > 0 %}{{ '{' }}{% for parameter in parameters.all %}{{ _self.parameter(parameter) }}{% if not loop.last %}, {% endif %}{% endfor %}{% if 'multipart/form-data' in consumes %}, Function(UploadProgress)? onProgress{% endif %}{{ '}' }}{% endif %}
 {% endmacro %}
 {% macro map_parameter(parameter) %}'{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},{% endmacro %}
+
+{%if service.description %}
+{{ service.description|dartComment}}
+{% endif %}
 class {{ service.name | caseUcfirst }} extends Service {
     {{ service.name | caseUcfirst }}(Client client): super(client);
 {% for method in service.methods %}