Add spec to type name filter

abnegate · abnegate · commit cb7a6ada890b · 2023-10-04T15:49:11.000+13:00
diff --git a/src/SDK/Language.php b/src/SDK/Language.php
@@ -41,7 +41,7 @@ abstract public function getFiles(): array;
      * @param array $parameter
      * @return string
      */
-    abstract public function getTypeName(array $parameter): string;
+    abstract public function getTypeName(array $parameter, array $spec = []): string;
 
     /**
      * @param array $param
diff --git a/src/SDK/Language/Dart.php b/src/SDK/Language/Dart.php
@@ -125,7 +125,7 @@ public function getIdentifierOverrides(): array
      * @param array $parameter
      * @return string
      */
-    public function getTypeName(array $parameter): string
+    public function getTypeName(array $parameter, array $spec = []): string
     {
         if (isset($parameter['enumName'])) {
             return 'enums.' . \ucfirst($parameter['enumName']);
diff --git a/src/SDK/Language/Deno.php b/src/SDK/Language/Deno.php
@@ -105,7 +105,7 @@ public function getFiles(): array
      * @param array $parameter
      * @return string
      */
-    public function getTypeName(array $parameter): string
+    public function getTypeName(array $parameter, array $spec = []): string
     {
         if (isset($parameter['enumName'])) {
             return \ucfirst($parameter['enumName']);
diff --git a/src/SDK/Language/DotNet.php b/src/SDK/Language/DotNet.php
@@ -149,7 +149,7 @@ public function getIdentifierOverrides(): array
      * @param array $parameter
      * @return string
      */
-    public function getTypeName(array $parameter): string
+    public function getTypeName(array $parameter, array $spec = []): string
     {
         if (isset($parameter['enumName'])) {
             return \ucfirst($parameter['enumName']);
diff --git a/src/SDK/Language/Go.php b/src/SDK/Language/Go.php
@@ -106,7 +106,7 @@ public function getFiles(): array
      * @param array $nestedTypes
      * @return string
      */
-    public function getTypeName(array $parameter): string
+    public function getTypeName(array $parameter, array $spec = []): string
     {
         if (isset($parameter['enumName'])) {
             return \ucfirst($parameter['enumName']);
diff --git a/src/SDK/Language/GraphQL.php b/src/SDK/Language/GraphQL.php
@@ -16,7 +16,7 @@ public function getName(): string
      * @param $type
      * @return string
      */
-    public function getTypeName(array $parameter): string
+    public function getTypeName(array $parameter, array $spec = []): string
     {
         $type = '';
 
diff --git a/src/SDK/Language/HTTP.php b/src/SDK/Language/HTTP.php
@@ -30,7 +30,7 @@ public function getIdentifierOverrides(): array
      * @return string
      * @throws Exception
      */
-    public function getTypeName(array $parameter): string
+    public function getTypeName(array $parameter, array $spec = []): string
     {
         throw new Exception('Method not supported for HTTP APIs');
     }
diff --git a/src/SDK/Language/JS.php b/src/SDK/Language/JS.php
@@ -122,7 +122,7 @@ public function getIdentifierOverrides(): array
      * @param array $nestedTypes
      * @return string
      */
-    public function getTypeName(array $parameter): string
+    public function getTypeName(array $parameter, array $spec = []): string
     {
         if (isset($parameter['enumName'])) {
             return \ucfirst($parameter['enumName']);
diff --git a/src/SDK/Language/Kotlin.php b/src/SDK/Language/Kotlin.php
@@ -103,7 +103,7 @@ public function getIdentifierOverrides(): array
      * @param $type
      * @return string
      */
-    public function getTypeName(array $parameter): string
+    public function getTypeName(array $parameter, array $spec = []): string
     {
         if (isset($parameter['enumName'])) {
             return \ucfirst($parameter['enumName']);
diff --git a/src/SDK/Language/Node.php b/src/SDK/Language/Node.php
@@ -17,7 +17,7 @@ public function getName(): string
      * @param array $nestedTypes
      * @return string
      */
-    public function getTypeName(array $parameter): string
+    public function getTypeName(array $parameter, array $spec = []): string
     {
         if (isset($parameter['enumName'])) {
             return \ucfirst($parameter['enumName']);
diff --git a/src/SDK/Language/PHP.php b/src/SDK/Language/PHP.php
@@ -225,7 +225,7 @@ public function getFiles(): array
      * @param array $nestedTypes
      * @return string
      */
-    public function getTypeName(array $parameter): string
+    public function getTypeName(array $parameter, array $spec = []): string
     {
         if (isset($parameter['enumName'])) {
             return \ucfirst($parameter['enumName']);
diff --git a/src/SDK/Language/Python.php b/src/SDK/Language/Python.php
@@ -212,7 +212,7 @@ public function getFiles(): array
      * @return string
      * @throws Exception
      */
-    public function getTypeName(array $parameter): string
+    public function getTypeName(array $parameter, array $spec = []): string
     {
         if (isset($parameter['enumName'])) {
             return \ucfirst($parameter['enumName']);
diff --git a/src/SDK/Language/Ruby.php b/src/SDK/Language/Ruby.php
@@ -195,7 +195,7 @@ public function getFiles(): array
      * @param array $nestedTypes
      * @return string
      */
-    public function getTypeName(array $parameter): string
+    public function getTypeName(array $parameter, array $spec = []): string
     {
         if (isset($parameter['enumName'])) {
             return \ucfirst($parameter['enumName']);
diff --git a/src/SDK/Language/Swift.php b/src/SDK/Language/Swift.php
@@ -298,13 +298,13 @@ public function getFiles(): array
      * @param array $parameter
      * @return string
      */
-    public function getTypeName(array $parameter): string
+    public function getTypeName(array $parameter, array $spec = []): string
     {
         if (isset($parameter['enumName'])) {
-            return \ucfirst($parameter['enumName']);
+            return ($spec['title'] ?? '') . 'Enums.' . \ucfirst($parameter['enumName']);
         }
         if (!empty($parameter['enumValues'])) {
-            return \ucfirst($parameter['name']);
+            return ($spec['title'] ?? '') . 'Enums.' . \ucfirst($parameter['name']);
         }
         return match ($parameter['type']) {
             self::TYPE_INTEGER => 'Int',
diff --git a/src/SDK/SDK.php b/src/SDK/SDK.php
@@ -137,8 +137,8 @@ public function __construct(Language $language, Spec $spec)
         $this->twig->addFilter(new TwigFilter('caseArray', function ($value) {
             return (is_array($value)) ? json_encode($value) : '[]';
         }, ['is_safe' => ['html']]));
-        $this->twig->addFilter(new TwigFilter('typeName', function ($value) {
-            return $this->language->getTypeName($value);
+        $this->twig->addFilter(new TwigFilter('typeName', function ($value, $spec = []) {
+            return $this->language->getTypeName($value, $spec);
         }, ['is_safe' => ['html']]));
         $this->twig->addFilter(new TwigFilter('paramDefault', function ($value) {
             return $this->language->getParamDefault($value);
diff --git a/templates/swift/Sources/Services/Service.swift.twig b/templates/swift/Sources/Services/Service.swift.twig
@@ -17,7 +17,7 @@ open class {{ service.name | caseUcfirst | overrideIdentifier }}: Service {
     ///
     {%~ endif %}
     {%~ for parameter in method.parameters.all %}
-    /// @param {{ parameter | typeName | raw}} {{ parameter.name | caseCamel }}
+    /// @param {{ parameter | typeName(spec) | raw}} {{ parameter.name | caseCamel }}
     {%~ endfor %}
     /// @throws Exception
     /// @return array
@@ -27,7 +27,7 @@ open class {{ service.name | caseUcfirst | overrideIdentifier }}: Service {
     {%~ endif %}
     open func {{ method.name | caseCamel | overrideIdentifier }}{% if method.responseModel | hasGenericType(spec) %}<T>{% endif %}(
         {%~ for parameter in method.parameters.all %}
-        {{ parameter.name | caseCamel | escapeSwiftKeyword }}: {{ parameter | typeName | raw }}{% if not parameter.required or parameter.nullable %}? = nil{% endif %}{% if not loop.last or 'multipart/form-data' in method.consumes or method.responseModel | hasGenericType(spec) %},{% endif %}
+        {{ parameter.name | caseCamel | escapeSwiftKeyword }}: {{ parameter | typeName(spec) | raw }}{% if not parameter.required or parameter.nullable %}? = nil{% endif %}{% if not loop.last or 'multipart/form-data' in method.consumes or method.responseModel | hasGenericType(spec) %},{% endif %}
 
         {%~ endfor %}
         {%~ if method.responseModel | hasGenericType(spec) %}
@@ -83,7 +83,7 @@ open class {{ service.name | caseUcfirst | overrideIdentifier }}: Service {
     ///
     {%~ endif %}
     {%~ for parameter in method.parameters.all %}
-    /// @param {{ parameter | typeName | raw}} {{ parameter.name | caseCamel }}
+    /// @param {{ parameter | typeName(spec) | raw}} {{ parameter.name | caseCamel }}
     {%~ endfor %}
     /// @throws Exception
     /// @return array
@@ -93,7 +93,7 @@ open class {{ service.name | caseUcfirst | overrideIdentifier }}: Service {
     {%~ endif %}
     open func {{ method.name | caseCamel }}(
         {%~ for parameter in method.parameters.all %}
-        {{ parameter.name | caseCamel | escapeSwiftKeyword }}: {{ parameter | typeName | raw }}{% if not parameter.required or parameter.nullable %}? = nil{% endif %}{% if not loop.last or 'multipart/form-data' in method.consumes %},{% endif %}
+        {{ parameter.name | caseCamel | escapeSwiftKeyword }}: {{ parameter | typeName(spec) | raw }}{% if not parameter.required or parameter.nullable %}? = nil{% endif %}{% if not loop.last or 'multipart/form-data' in method.consumes %},{% endif %}
 
         {%~ endfor %}
         {%~ if 'multipart/form-data' in method.consumes %}

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public function getIdentifierOverrides(): array`
`125`	`125`	`* @param array $parameter`
`126`	`126`	`* @return string`
`127`	`127`	`*/`
`128`		`- public function getTypeName(array $parameter): string`
	`128`	`+ public function getTypeName(array $parameter, array $spec = []): string`
`129`	`129`	`{`
`130`	`130`	`if (isset($parameter['enumName'])) {`
`131`	`131`	`return 'enums.' . \ucfirst($parameter['enumName']);`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function getFiles(): array`
`105`	`105`	`* @param array $parameter`
`106`	`106`	`* @return string`
`107`	`107`	`*/`
`108`		`- public function getTypeName(array $parameter): string`
	`108`	`+ public function getTypeName(array $parameter, array $spec = []): string`
`109`	`109`	`{`
`110`	`110`	`if (isset($parameter['enumName'])) {`
`111`	`111`	`return \ucfirst($parameter['enumName']);`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public function getIdentifierOverrides(): array`
`149`	`149`	`* @param array $parameter`
`150`	`150`	`* @return string`
`151`	`151`	`*/`
`152`		`- public function getTypeName(array $parameter): string`
	`152`	`+ public function getTypeName(array $parameter, array $spec = []): string`
`153`	`153`	`{`
`154`	`154`	`if (isset($parameter['enumName'])) {`
`155`	`155`	`return \ucfirst($parameter['enumName']);`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public function getFiles(): array`
`106`	`106`	`* @param array $nestedTypes`
`107`	`107`	`* @return string`
`108`	`108`	`*/`
`109`		`- public function getTypeName(array $parameter): string`
	`109`	`+ public function getTypeName(array $parameter, array $spec = []): string`
`110`	`110`	`{`
`111`	`111`	`if (isset($parameter['enumName'])) {`
`112`	`112`	`return \ucfirst($parameter['enumName']);`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public function getName(): string`
`16`	`16`	`* @param $type`
`17`	`17`	`* @return string`
`18`	`18`	`*/`
`19`		`- public function getTypeName(array $parameter): string`
	`19`	`+ public function getTypeName(array $parameter, array $spec = []): string`
`20`	`20`	`{`
`21`	`21`	`$type = '';`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function getIdentifierOverrides(): array`
`30`	`30`	`* @return string`
`31`	`31`	`* @throws Exception`
`32`	`32`	`*/`
`33`		`- public function getTypeName(array $parameter): string`
	`33`	`+ public function getTypeName(array $parameter, array $spec = []): string`
`34`	`34`	`{`
`35`	`35`	`throw new Exception('Method not supported for HTTP APIs');`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public function getIdentifierOverrides(): array`
`122`	`122`	`* @param array $nestedTypes`
`123`	`123`	`* @return string`
`124`	`124`	`*/`
`125`		`- public function getTypeName(array $parameter): string`
	`125`	`+ public function getTypeName(array $parameter, array $spec = []): string`
`126`	`126`	`{`
`127`	`127`	`if (isset($parameter['enumName'])) {`
`128`	`128`	`return \ucfirst($parameter['enumName']);`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function getIdentifierOverrides(): array`
`103`	`103`	`* @param $type`
`104`	`104`	`* @return string`
`105`	`105`	`*/`
`106`		`- public function getTypeName(array $parameter): string`
	`106`	`+ public function getTypeName(array $parameter, array $spec = []): string`
`107`	`107`	`{`
`108`	`108`	`if (isset($parameter['enumName'])) {`
`109`	`109`	`return \ucfirst($parameter['enumName']);`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public function getName(): string`
`17`	`17`	`* @param array $nestedTypes`
`18`	`18`	`* @return string`
`19`	`19`	`*/`
`20`		`- public function getTypeName(array $parameter): string`
	`20`	`+ public function getTypeName(array $parameter, array $spec = []): string`
`21`	`21`	`{`
`22`	`22`	`if (isset($parameter['enumName'])) {`
`23`	`23`	`return \ucfirst($parameter['enumName']);`