updated spec and fixes for testing

Author: lohanidamodar

src/SDK/Language/Dart.php

@@ -112,7 +112,7 @@ public function getKeywords()
      */
     public function getIdentifierOverrides()
     {
-        return ['Function' => 'Func'];
+        return ['Function' => 'Func', 'default' => 'xdefault', 'required' => 'xrequired'];
     }
 
     /**

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

@@ -1,15 +1,22 @@
 part of {{ language.params.packageName }};
-{% macro parameter(parameter) %}
-{% if parameter.required %}required {{ parameter.type | typeName }}{% else %}{{ parameter.type | typeName }}?{% endif %} {{ parameter.name | caseCamel | escapeKeyword }}{% endmacro %}
+{% macro parameter(parameter) %}{% if parameter.required %}required {{ parameter.type | typeName }}{% else %}{{ parameter.type | typeName }}?{% endif %} {{ parameter.name | caseCamel | overrideIdentifier }}{% endmacro %}
 {% macro method_parameters(parameters, consumes) %}
 {% if parameters|length > 0 %}{{ '{' }}{% for parameter in parameters %}{{ _self.parameter(parameter) }}{% if not loop.last %}, {% endif %}{% endfor %}{% if 'multipart/form-data' in consumes %}, Function(UploadProgress)? onProgress{% endif %}{{ '}' }}{% endif %}
 {% endmacro %}
+{% macro service_params(parameters) %}
+{% if parameters|length > 0 %}{{ ', {' }}{% for parameter in parameters %}{% if parameter.required %}required {% endif %}this.{{ parameter.name | caseCamel | overrideIdentifier }}{% if not loop.last %}, {% endif %}{% endfor %}{{ '}' }}{% endif %}
+{% endmacro %}
 
 {%if service.description %}
 {{ service.description|dartComment}}
 {% endif %}
 class {{ service.name | caseUcfirst }} extends Service {
-    {{ service.name | caseUcfirst }}(Client client{% if service.globalParams | length %}, {{ _self.method_parameters(service.globalParams, []) }}{% endif %}): super(client);
+    {{ service.name | caseUcfirst }}(Client client{{ _self.service_params(service.globalParams) }}): super(client);
+{% if service.globalParams | length %}
+{% for parameter in service.globalParams %}
+    {{ parameter.type | typeName }}{% if not parameter.required %}?{% endif %} {{ parameter.name | caseCamel | overrideIdentifier }};
+{% endfor %}
+{% endif %}
 {% for method in service.methods %}
 
      /// {{ method.title }}

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

@@ -1,14 +1,22 @@
 part of {{ language.params.packageName }};
-{% macro parameter(parameter) %}{% if parameter.required %}required {{ parameter.type | typeName }}{% else %}{{ parameter.type | typeName }}?{% endif %} {{ parameter.name | caseCamel | escapeKeyword }}{% endmacro %}
+{% macro parameter(parameter) %}{% if parameter.required %}required {{ parameter.type | typeName }}{% else %}{{ parameter.type | typeName }}?{% endif %} {{ parameter.name | caseCamel | overrideIdentifier }}{% endmacro %}
 {% macro method_parameters(parameters, consumes) %}
 {% if parameters|length > 0 %}{{ '{' }}{% for parameter in parameters %}{{ _self.parameter(parameter) }}{% if not loop.last %}, {% endif %}{% endfor %}{% if 'multipart/form-data' in consumes %}, Function(UploadProgress)? onProgress{% endif %}{{ '}' }}{% endif %}
 {% endmacro %}
+{% macro service_params(parameters) %}
+{% if parameters|length > 0 %}{{ ', {' }}{% for parameter in parameters %}{% if parameter.required %}required {% endif %}this.{{ parameter.name | caseCamel | overrideIdentifier }}{% if not loop.last %}, {% endif %}{% endfor %}{{ '}' }}{% endif %}
+{% endmacro %}
 
 {%if service.description %}
 {{ service.description|dartComment}}
 {% endif %}
 class {{ service.name | caseUcfirst }} extends Service {
-    {{ service.name | caseUcfirst }}(Client client{% if service.globalParams | length %}, {{ _self.method_parameters(service.globalParams, []) }}{% endif %}): super(client);
+    {{ service.name | caseUcfirst }}(Client client{{ _self.service_params(service.globalParams) }}): super(client);
+{% if service.globalParams | length %}
+{% for parameter in service.globalParams %}
+    {{ parameter.type | typeName }}{% if not parameter.required %}?{% endif %} {{ parameter.name | caseCamel | overrideIdentifier }};
+{% endfor %}
+{% endif %}
 {% for method in service.methods %}
 
      /// {{ method.title }}
@@ -18,7 +26,7 @@ class {{ service.name | caseUcfirst }} extends Service {
      ///
 {% endif %}
     {% if method.type == 'webAuth' %}Future{% elseif method.type == 'location' %} Future<Uint8List> {% else %} {% if method.responseModel and method.responseModel != 'any' %}Future<models.{{method.responseModel | caseUcfirst}}>{% else %}Future{% endif %}{% endif %} {{ method.name | caseCamel }}({{ _self.method_parameters(method.parameters.all | filter((param) => not param.isGlobal), method.consumes) }}) async {
-        {% if method.parameters.path | length > 0 %}final{% else %}const{% endif %} String path = '{{ method.path }}'{% for parameter in method.parameters.path %}.replaceAll('{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}', {{ parameter.name | caseCamel | escapeKeyword }}){% endfor %};
+        {% if method.parameters.path | length > 0 %}final{% else %}const{% endif %} String path = '{{ method.path }}'{% for parameter in method.parameters.path %}.replaceAll('{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}', {{ parameter.name | caseCamel | overrideIdentifier }}){% endfor %};
 
 {% if 'multipart/form-data' in method.consumes %}
 {{ include('flutter/base/requests/file.twig') }}

tests/languages/dart/tests.dart

@@ -3,7 +3,7 @@ import '../lib/models.dart';
 
 void main() async {
   Client client = Client();
-  Foo foo = Foo(client);
+  Foo foo = Foo(client, x: 'string');
   Bar bar = Bar(client);
   General general = General(client);
 
@@ -14,19 +14,19 @@ void main() async {
 
   // Foo Tests
   Mock response;
-  response = await foo.get(x: 'string', y: 123, z: ['string in array']);
+  response = await foo.get(y: 123, z: ['string in array']);
   print(response.result);
 
-  response = await foo.post(x: 'string', y: 123, z: ['string in array']);
+  response = await foo.post(y: 123, z: ['string in array']);
   print(response.result);
 
-  response = await foo.put(x: 'string', y: 123, z: ['string in array']);
+  response = await foo.put(y: 123, z: ['string in array']);
   print(response.result);
 
-  response = await foo.patch(x: 'string', y: 123, z: ['string in array']);
+  response = await foo.patch(y: 123, z: ['string in array']);
   print(response.result);
 
-  response = await foo.delete(x: 'string', y: 123, z: ['string in array']);
+  response = await foo.delete(y: 123, z: ['string in array']);
   print(response.result);
 
   // Bar Tests

tests/resources/spec.json

@@ -383,6 +383,7 @@
             "description": "Sample string param",
             "required": true,
             "type": "string",
+            "x-global": true,
             "x-example": "[]",
             "in": "query"
           },
@@ -445,6 +446,7 @@
                   "type": "string",
                   "description": "Sample string param",
                   "default": null,
+                  "x-global": true,
                   "x-example": "[]"
                 },
                 "y": {
@@ -506,6 +508,7 @@
                   "type": "string",
                   "description": "Sample string param",
                   "default": null,
+                  "x-global": true,
                   "x-example": "[]"
                 },
                 "y": {
@@ -567,6 +570,7 @@
                   "type": "string",
                   "description": "Sample string param",
                   "default": null,
+                  "x-global": true,
                   "x-example": "[]"
                 },
                 "y": {
@@ -628,6 +632,7 @@
                   "type": "string",
                   "description": "Sample string param",
                   "default": null,
+                  "x-global": true,
                   "x-example": "[]"
                 },
                 "y": {