Merge remote-tracking branch 'origin/master' into feat-ruby-input-file

Author: abnegate

specs/swagger2-latest-console.json

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

src/SDK/Language/Dart.php

@@ -26,7 +26,7 @@ public function getTypeName($type)
             case self::TYPE_ARRAY:
                 return 'string[]';
             case self::TYPE_FILE:
-                return 'string';
+                return 'InputFile';
             break;
         }
 
@@ -63,6 +63,12 @@ public function getFiles()
                 'template'      => 'node/lib/query.js.twig',
                 'minify'        => false,
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'lib/inputFile.js',
+                'template'      => 'node/lib/inputFile.js.twig',
+                'minify'        => false,
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/lib/service.js',

src/SDK/Language/Node.php

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

src/SDK/SDK.php

@@ -6,6 +6,10 @@
 
 class Swagger2 extends Spec
 {
+    /**
+     * @var array
+     */
+    private array $serviceParams = [];
 
     /**
      * @return string
@@ -104,9 +108,11 @@ public function getServices()
                 if (isset($method['tags'])) {
                     foreach ($method['tags'] as $tag) {
                         if (!array_key_exists($tag, $list)) {
+                            $methods = $this->getMethods($tag);
                             $list[$tag] = [
                                 'name' => $tag,
-                                'methods' => $this->getMethods($tag),
+                                'methods' => $methods,
+                                'globalParams' => $this->serviceParams[$tag] ?? [],
                             ];
                         }
                     }
@@ -132,7 +138,7 @@ public function getServices()
     public function getMethods($service)
     {
         $list = [];
-
+        $serviceParams= [];
         $security = $this->getAttribute('securityDefinitions', []);
         $paths = $this->getAttribute('paths', []);
 
@@ -204,6 +210,7 @@ public function getMethods($service)
                             'default' => $parameter['default'] ?? null,
                             'example' => $parameter['x-example'] ?? null,
                             'isUploadID' => $parameter['x-upload-id'] ?? false,
+                            'isGlobal' => $parameter['x-global'] ?? false,
                             'array' => [
                                 'type' => $parameter['items']['type'] ?? '',
                             ],
@@ -215,6 +222,10 @@ public function getMethods($service)
 
                         $param['default'] = (is_array($param['default'])) ? json_encode($param['default']) : $param['default'];
 
+                        if(($parameter['x-global'] ?? false)) {
+                            $serviceParams[$param['name']] = $param;
+                        }
+
                         switch ($parameter['in']) {
                             case 'header':
                                 $output['parameters']['header'][] = $param;
@@ -239,6 +250,7 @@ public function getMethods($service)
                                     $param['required'] = (in_array($key, $bodyRequired));
                                     $param['default'] = $value['default'] ?? null;
                                     $param['example'] = $value['x-example'] ?? null;
+                                    $param['isGlobal'] = $value['x-global'] ?? false;
                                     $param['isUploadID'] = $value['x-upload-id'] ?? false;
                                     $param['array'] = [
                                         'type' => $value['items']['type'] ?? '',
@@ -270,6 +282,8 @@ public function getMethods($service)
             }
         }
 
+        $this->serviceParams[$service] = $serviceParams;
+
         return $list;
     }
 

src/Spec/Swagger2.php

@@ -1,4 +1,4 @@
-{% import 'flutter/base/utils.twig' as utils %}
+{% import 'dart/base/utils.twig' as utils %}
         final Map<String, dynamic> params = {
             {{ utils.map_parameter(method.parameters.query) }}
             {{ utils.map_parameter(method.parameters.body) }}

templates/dart/base/requests/api.twig

@@ -1,4 +1,4 @@
-      {% import 'flutter/base/utils.twig' as utils %}
+{% import 'dart/base/utils.twig' as utils %}
         final Map<String, dynamic> params = {
             {{ utils.map_parameter(method.parameters.query) }}
             {{ utils.map_parameter(method.parameters.body) }}

templates/dart/base/requests/file.twig

@@ -1,4 +1,4 @@
-{% import 'flutter/base/utils.twig' as utils %}
+{% import 'dart/base/utils.twig' as utils %}
         final Map<String, dynamic> params = {
             {{ utils.map_parameter(method.parameters.query) }}
             {{ utils.map_parameter(method.parameters.body) }}

templates/dart/base/requests/location.twig

@@ -1,4 +1,4 @@
-{% import 'flutter/base/utils.twig' as utils %}
+{% import 'dart/base/utils.twig' as utils %}
         final Map<String, dynamic> params = {
             {{ utils.map_parameter(method.parameters.query) }}
             {{ utils.map_parameter(method.parameters.body) }}

templates/dart/base/requests/oauth.twig

@@ -8,4 +8,4 @@
 {% for key, header in headers %}
 '{{ key }}': '{{ header }}',
 {% endfor %}
-{% endmacro %}
+{% endmacro %}