Merge pull request #86 from TorstenDittmann/master

fix(dotnet): nullish optional datatype

Author: eldadfux

src/SDK/Language/DotNet.php

@@ -141,21 +141,22 @@ public function getTypeName($type)
         switch ($type) {
             case self::TYPE_INTEGER:
                 return 'int';
-            break;
+                break;
             case self::TYPE_STRING:
                 return 'string';
-            break;
+                break;
             case self::TYPE_FILE:
                 return 'FileInfo';
-            break;
+                break;
             case self::TYPE_BOOLEAN:
                 return 'bool';
-            break;
+                break;
             case self::TYPE_ARRAY:
-            	return 'List<object>';
-			case self::TYPE_OBJECT:
-				return 'object';
-            break;
+                return 'List<object>';
+                break;
+            case self::TYPE_OBJECT:
+                return 'object';
+                break;
         }
 
         return $type;
@@ -179,28 +180,20 @@ public function getParamDefault(array $param)
 
         if(empty($default) && $default !== 0 && $default !== false) {
             switch ($type) {
-                case self::TYPE_NUMBER:
                 case self::TYPE_INTEGER:
+                case self::TYPE_ARRAY:
+                case self::TYPE_OBJECT:
                 case self::TYPE_BOOLEAN:
                     $output .= 'null';
                     break;
                 case self::TYPE_STRING:
                     $output .= '""';
                     break;
-                case self::TYPE_ARRAY:
-                    $output .= '[]';
-                    break;
-                case self::TYPE_OBJECT:
-                    $output .= '{}';
-                    break;
             }
         }
         else {
             switch ($type) {
-                case self::TYPE_NUMBER:
                 case self::TYPE_INTEGER:
-                case self::TYPE_ARRAY:
-                case self::TYPE_OBJECT:
                     $output .= $default;
                     break;
                 case self::TYPE_BOOLEAN:
@@ -209,6 +202,10 @@ public function getParamDefault(array $param)
                 case self::TYPE_STRING:
                     $output .= "\"{$default}\"";
                     break;
+                case self::TYPE_ARRAY:
+                case self::TYPE_OBJECT:
+                    $output .= 'null';
+                    break;
             }
         }
 

templates/dotnet/src/Appwrite/Services/ServiceTemplate.cs.twig

@@ -1,6 +1,6 @@
 {% macro parameter(parameter) %}
-{% if parameter.name == 'orderType' %}{{ 'OrderType orderType' }}{% else %}
-{{ parameter.type | typeName }} {{ parameter.name | caseCamel | escapeKeyword }}{{ parameter | escapeDollarSign | paramDefault }}{% endif %}
+{% if parameter.name == 'orderType' %}{{ 'OrderType orderType = OrderType.ASC' }}{% else %}
+{{ parameter.type | typeName }}{% if not parameter.required and (parameter.type == 'boolean' or parameter.type == 'integer') %}?{% endif %} {{ parameter.name | caseCamel | escapeKeyword }}{{ parameter | paramDefault }}{% endif %}
 {% endmacro %}
 {% macro method_parameters(parameters) %}
 {% if parameters.all|length > 0 %}{% for parameter in parameters.all %}{{ _self.parameter(parameter) }}{% if not loop.last %}{{ ', ' }}{% endif %}{% endfor %}{% endif %}
@@ -34,7 +34,7 @@ namespace {{ spec.title | caseUcfirst }}
     {{ method.description|comment1 }}
         */
     {% endif %}
-    public async Task<{% if method.type == "location" %}string{% else %}HttpResponseMessage{% endif %}> {{ method.name | caseUcfirst }}({{ _self.method_parameters(method.parameters) }}) 
+    public {% if method.type == "location" %}string{% else %}async Task<HttpResponseMessage>{% endif %} {{ method.name | caseUcfirst }}({{ _self.method_parameters(method.parameters) }}) 
         {
             string path = "{{ method.path }}"{% for parameter in method.parameters.path %}.Replace("{{ '{' ~ parameter.name | caseCamel ~ '}' }}", {{ parameter.name | caseCamel }}){% endfor %};