Merge branch 'master' into feat-improve-tests

Author: lohanidamodar

README.md

@@ -26,13 +26,13 @@ composer update --ignore-platform-reqs --optimize-autoloader
 **Docker (UNIX)**
 
 ```bash
-docker run --rm --interactive --tty --volume "$(pwd)":/app composer install
+docker run --rm --interactive --tty --volume "$(pwd)":/app composer install --ignore-platform-reqs
 ```
 
 **Docker (Windows)**
 
 ```bash
-docker run --rm --interactive --tty --volume "%cd%":/app composer install
+docker run --rm --interactive --tty --volume "%cd%":/app composer install --ignore-platform-reqs
 ```
 
 Create language and SDK instances and generate code to target directory.
@@ -87,7 +87,7 @@ $sdk->generate(__DIR__ . '/examples/php'); // Generate source code
 | Web                    | ES5+                | [NPM Coding Style]     | NPM, Yarn,         | [@eldadfux]    |
 | Flutter                |                     | [Effective Dart]       | pub tool           | [@bartektartanus] [@Almoullim] [@lohanidamodar]   |
 | Android (Kotlin, Java) | 5.0+                | [Android style guide]  | Gradle, Maven      | [@abnegate]    |
-| iOS (Swift)            |                     |                        | Swift Pkg Manager  | [@armino-dev]  |
+| iOS, macOS (Swift)     | iOS 15+, macOS 11+  | [Swift Style Guide]    | Swift Pkg Manager  | [@abnegate]    |
 | Unity (Csharp)         |                     |                        | ?                  | [You?](https://github.com/appwrite/sdk-generator/issues/20) |
 
 ## Supported Server SDKs
@@ -97,15 +97,15 @@ $sdk->generate(__DIR__ . '/examples/php'); // Generate source code
 | TypeScript |                     | [NPM Coding Style]     | NPM, Yarn          | [@eldadfux]    |
 | NodeJS     | 8, 10, 12           | [NPM Coding Style]     | NPM, Yarn          | [@eldadfux]    |
 | PHP        | 7.0+                | [PHP FIG]              | Composer           | [@eldadfux]    |
-| Ruby       | 2.4+                | [Ruby Style Guide]     | GEM                | [@eldadfux]    |
-| Python     | 3.5+                | [PEP8]                 | PIP                | [@eldadfux]    |
+| Ruby       | 2.4+                | [Ruby Style Guide]     | GEM                | [@eldadfux] [@abnegate] |
+| Python     | 3.5+                | [PEP8]                 | PIP                | [@eldadfux] [@abnegate] |
 | Dart       | 2.7+                | [Effective Dart]       | pub                | [@lohanidamodar] |
 | Go         |                     | [Effective Go]         | go get             | [@panz3r]      |
 | .NET       | .NET core 3.1       | [C# Coding Conventions]| NuGet              | [@komemi] [@TorstenDittmann]     |
 | D          |                     |                        | ?                  | [You?](https://github.com/appwrite/sdk-generator/issues/20) |
 | Kotlin     | 1.4.31+             | [Kotlin style guide]   | Gradle, Maven      | [@abnegate]    |
 | Java       | 8+                  | [Google style guide]   | Gradle, Maven      | [@abnegate]    |
-| Swift      |                     |                        | Swift Pkg Manager  | [@armino-dev]  |
+| Swift      | 5.5+                | [Swift Style Guide]    | Swift Pkg Manager  | [@abnegate]    |
 | Docker CLI |                     |                        | Docker Hub         | [@christyjacob4]  |
 
 [@Almoullim]:           https://github.com/Almoullim

composer.json

@@ -23,7 +23,7 @@
         "ext-curl": "*",
         "ext-mbstring": "*",
         "ext-json": "*",
-        "twig/twig": "^2.14",
+        "twig/twig": "^3.3",
         "matthiasmullie/minify": "^1.3"
     },
     "require-dev": {

composer.lock

@@ -1,5 +1,5 @@
 {% macro sub_schema(property, definition, spec) %}
-{% spaceless %}
+{% apply spaceless %}
     {% if property.sub_schema %}
         {% if _self.get_generics_sub(definition, spec) %}
             {{property.sub_schema | caseUcfirst}}<{{ _self.get_generics_sub(definition, spec) }}>{% if property.type == 'array' %}[]{% endif %}
@@ -9,10 +9,10 @@
     {% else %}
         {{property.type | typeName}}
     {% endif %}
-{% endspaceless %}
+{% endapply %}
 {% endmacro %}
 {% macro get_generics(definition, spec) %}
-{% spaceless %}
+{% apply spaceless %}
     {% for property in definition.properties %}
         {% if spec.definitions[property.sub_schema].additionalProperties %}
             {{property.sub_schema | caseUcfirst}} extends Models.{{property.sub_schema | caseUcfirst}}
@@ -21,10 +21,10 @@
             {{_self.get_generics(spec.definitions[property.sub_schema], spec)}}
         {% endif %}
     {% endfor %}
-{% endspaceless %}
+{% endapply %}
 {% endmacro %}
 {% macro get_generics_sub(definition, spec, output = false) %}
-{% spaceless %}
+{% apply spaceless %}
     {% for property in definition.properties %}
         {% if spec.definitions[property.sub_schema].additionalProperties and output %}
             {{property.sub_schema | caseUcfirst}}
@@ -33,7 +33,7 @@
             {{_self.get_generics_sub(spec.definitions[property.sub_schema], spec, true)}}
         {% endif %}
     {% endfor %}
-{% endspaceless %}
+{% endapply %}
 {% endmacro %}
 export namespace Models {
 {% for definition in spec.definitions %}

templates/deno/src/models.d.ts.twig

@@ -1,5 +1,5 @@
 {% macro get_generics(definition, spec, output = false, first = false) %}
-{% spaceless %}
+{% apply spaceless %}
     {% if first and definition.additionalProperties %}
         {{definition.name | caseUcfirst}} extends Models.{{definition.name | caseUcfirst}}
     {% endif %}
@@ -11,10 +11,10 @@
             {{_self.get_generics(spec.definitions[property.sub_schema], spec, true)}}
         {% endif %}
     {% endfor %}
-{% endspaceless %}
+{% endapply %}
 {% endmacro %}
 {% macro get_generics_return(definition, spec) %}
-{% spaceless %}
+{% apply spaceless %}
     {% for property in definition.properties %}
         {% if spec.definitions[property.sub_schema].additionalProperties %}
             {{property.sub_schema | caseUcfirst}}
@@ -23,7 +23,7 @@
             {{_self.get_generics_return(spec.definitions[property.sub_schema], spec)}}
         {% endif %}
     {% endfor %}
-{% endspaceless %}
+{% endapply %}
 {% endmacro %}
 import { Service } from '../service.ts';
 import { Payload } from '../client.ts';