Merge pull request #368 from appwrite/feat-upgrade-twig-package

Author: lohanidamodar

composer.json

@@ -20,7 +20,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';

templates/deno/src/services/service.ts.twig

@@ -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,10 +33,10 @@
             {{_self.get_generics_sub(spec.definitions[property.sub_schema], spec, true)}}
         {% endif %}
     {% endfor %}
-{% endspaceless %}
+{% endapply %}
 {% endmacro %}
 {% macro get_generics_method(definition, spec, output = false, first = false) %}
-{% spaceless %}
+{% apply spaceless %}
     {% if first and definition.additionalProperties %}
         {{definition.name | caseUcfirst}} extends Models.{{definition.name | caseUcfirst}}
     {% endif %}
@@ -48,10 +48,10 @@
             {{_self.get_generics_method(spec.definitions[property.sub_schema], spec, true)}}
         {% endif %}
     {% endfor %}
-{% endspaceless %}
+{% endapply %}
 {% endmacro %}
 {% macro get_generics_method_return(definition, spec) %}
-{% spaceless %}
+{% apply spaceless %}
     {% for property in definition.properties %}
         {% if spec.definitions[property.sub_schema].additionalProperties %}
             {{property.sub_schema | caseUcfirst}}
@@ -60,7 +60,7 @@
             {{_self.get_generics_method_return(spec.definitions[property.sub_schema], spec)}}
         {% endif %}
     {% endfor %}
-{% endspaceless %}
+{% endapply %}
 {% endmacro %}
 declare module "{{ language.params.npmPackage|caseDash }}" {
   export namespace Models {