From 3b5622d0f4cf44801e35794f4d2bf0a8519d79a1 Mon Sep 17 00:00:00 2001 From: tsutsuken Date: Wed, 6 Aug 2025 15:58:51 +0900 Subject: [PATCH 1/5] [swift5] Support x-enum-descriptions --- .../src/main/resources/swift5/modelEnum.mustache | 3 +++ .../main/resources/swift5/modelInlineEnumDeclaration.mustache | 3 +++ 2 files changed, 6 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/swift5/modelEnum.mustache b/modules/openapi-generator/src/main/resources/swift5/modelEnum.mustache index 060a14ce74c7..e343b8103067 100644 --- a/modules/openapi-generator/src/main/resources/swift5/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/modelEnum.mustache @@ -1,6 +1,9 @@ {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{classname}}: {{dataType}}, {{#useVapor}}Content, Hashable{{/useVapor}}{{^useVapor}}Codable{{^isString}}{{^isInteger}}{{^isFloat}}{{^isDouble}}, JSONEncodable{{/isDouble}}{{/isFloat}}{{/isInteger}}{{/isString}}{{/useVapor}}, CaseIterable{{#enumUnknownDefaultCase}}{{#isInteger}}, CaseIterableDefaultsLast{{/isInteger}}{{#isFloat}}, CaseIterableDefaultsLast{{/isFloat}}{{#isDouble}}, CaseIterableDefaultsLast{{/isDouble}}{{#isString}}, CaseIterableDefaultsLast{{/isString}}{{/enumUnknownDefaultCase}} { {{#allowableValues}} {{#enumVars}} + {{#enumDescription}} + /// {{enumDescription}} + {{/enumDescription}} case {{{name}}} = {{{value}}} {{/enumVars}} {{/allowableValues}} diff --git a/modules/openapi-generator/src/main/resources/swift5/modelInlineEnumDeclaration.mustache b/modules/openapi-generator/src/main/resources/swift5/modelInlineEnumDeclaration.mustache index 27f1e51a979b..5f2d2ff21aa6 100644 --- a/modules/openapi-generator/src/main/resources/swift5/modelInlineEnumDeclaration.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/modelInlineEnumDeclaration.mustache @@ -1,6 +1,9 @@ {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{enumName}}: {{^isContainer}}{{dataType}}{{/isContainer}}{{#isContainer}}String{{/isContainer}}, {{#useVapor}}Content, Hashable{{/useVapor}}{{^useVapor}}Codable{{^isContainer}}{{^isString}}{{^isInteger}}{{^isFloat}}{{^isDouble}}, JSONEncodable{{/isDouble}}{{/isFloat}}{{/isInteger}}{{/isString}}{{/isContainer}}{{/useVapor}}, CaseIterable{{#enumUnknownDefaultCase}}{{#isInteger}}, CaseIterableDefaultsLast{{/isInteger}}{{#isFloat}}, CaseIterableDefaultsLast{{/isFloat}}{{#isDouble}}, CaseIterableDefaultsLast{{/isDouble}}{{#isString}}, CaseIterableDefaultsLast{{/isString}}{{#isContainer}}, CaseIterableDefaultsLast{{/isContainer}}{{/enumUnknownDefaultCase}} { {{#allowableValues}} {{#enumVars}} + {{#enumDescription}} + /// {{enumDescription}} + {{/enumDescription}} case {{{name}}} = {{{value}}} {{/enumVars}} {{/allowableValues}} From 96f156949a70108de7aab302b2d4a90f6c342b4e Mon Sep 17 00:00:00 2001 From: tsutsuken Date: Wed, 6 Aug 2025 17:33:23 +0900 Subject: [PATCH 2/5] [swift5] Add x-enum-descriptions to test YAML --- .../petstore-with-fake-endpoints-models-for-testing.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml index 27e1524dab47..da252dfc4e5d 100644 --- a/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml @@ -1362,6 +1362,9 @@ definitions: enum: - 1.1 - -1.2 + x-enum-descriptions: + - Description for 1.1 + - Description for -1.2 outerEnum: $ref: '#/definitions/OuterEnum' AdditionalPropertiesClass: @@ -1547,6 +1550,10 @@ definitions: - "placed" - "approved" - "delivered" + x-enum-descriptions: + - Description for placed + - Description for approved + - Description for delivered OuterComposite: type: object properties: From 7a7f50e1c247471693c7e8fd1f55aee496ca9e14 Mon Sep 17 00:00:00 2001 From: tsutsuken Date: Wed, 6 Aug 2025 17:36:00 +0900 Subject: [PATCH 3/5] [swift5] Regenerate samples --- .../PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift | 2 ++ .../PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift | 3 +++ .../PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift | 2 ++ .../PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift | 3 +++ .../PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift | 2 ++ .../PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift | 3 +++ .../PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift | 2 ++ .../PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift | 3 +++ .../PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift | 2 ++ .../PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift | 3 +++ .../PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift | 2 ++ .../PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift | 3 +++ .../PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift | 2 ++ .../PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift | 3 +++ .../Sources/PetstoreClient/Models/EnumTest.swift | 2 ++ .../Sources/PetstoreClient/Models/OuterEnum.swift | 3 +++ 16 files changed, 40 insertions(+) diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift index 3a9edb08ea78..6a52e8bc8851 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift @@ -27,7 +27,9 @@ public struct EnumTest: Codable, JSONEncodable, Hashable { case number1 = -1 } public enum EnumNumber: Double, Codable, CaseIterable { + /// Description for 1.1 case _11 = 1.1 + /// Description for -1.2 case number12 = -1.2 } public var enumString: EnumString? diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift index 76c34b3c2ce6..a7c4562dc290 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift @@ -11,7 +11,10 @@ import AnyCodable #endif public enum OuterEnum: String, Codable, CaseIterable { + /// Description for placed case placed = "placed" + /// Description for approved case approved = "approved" + /// Description for delivered case delivered = "delivered" } diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift index 3a9edb08ea78..6a52e8bc8851 100644 --- a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift +++ b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift @@ -27,7 +27,9 @@ public struct EnumTest: Codable, JSONEncodable, Hashable { case number1 = -1 } public enum EnumNumber: Double, Codable, CaseIterable { + /// Description for 1.1 case _11 = 1.1 + /// Description for -1.2 case number12 = -1.2 } public var enumString: EnumString? diff --git a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift index 76c34b3c2ce6..a7c4562dc290 100644 --- a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift +++ b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift @@ -11,7 +11,10 @@ import AnyCodable #endif public enum OuterEnum: String, Codable, CaseIterable { + /// Description for placed case placed = "placed" + /// Description for approved case approved = "approved" + /// Description for delivered case delivered = "delivered" } diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift index 3a9edb08ea78..6a52e8bc8851 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift @@ -27,7 +27,9 @@ public struct EnumTest: Codable, JSONEncodable, Hashable { case number1 = -1 } public enum EnumNumber: Double, Codable, CaseIterable { + /// Description for 1.1 case _11 = 1.1 + /// Description for -1.2 case number12 = -1.2 } public var enumString: EnumString? diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift index 76c34b3c2ce6..a7c4562dc290 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift @@ -11,7 +11,10 @@ import AnyCodable #endif public enum OuterEnum: String, Codable, CaseIterable { + /// Description for placed case placed = "placed" + /// Description for approved case approved = "approved" + /// Description for delivered case delivered = "delivered" } diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift index f6c43aeb5a8d..5cbbf86fa139 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift @@ -27,7 +27,9 @@ import AnyCodable case number1 = -1 } public enum EnumNumber: Double, Codable, CaseIterable { + /// Description for 1.1 case _11 = 1.1 + /// Description for -1.2 case number12 = -1.2 } public var enumString: EnumString? diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift index 76c34b3c2ce6..a7c4562dc290 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift @@ -11,7 +11,10 @@ import AnyCodable #endif public enum OuterEnum: String, Codable, CaseIterable { + /// Description for placed case placed = "placed" + /// Description for approved case approved = "approved" + /// Description for delivered case delivered = "delivered" } diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift index 3a9edb08ea78..6a52e8bc8851 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift @@ -27,7 +27,9 @@ public struct EnumTest: Codable, JSONEncodable, Hashable { case number1 = -1 } public enum EnumNumber: Double, Codable, CaseIterable { + /// Description for 1.1 case _11 = 1.1 + /// Description for -1.2 case number12 = -1.2 } public var enumString: EnumString? diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift index 76c34b3c2ce6..a7c4562dc290 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift @@ -11,7 +11,10 @@ import AnyCodable #endif public enum OuterEnum: String, Codable, CaseIterable { + /// Description for placed case placed = "placed" + /// Description for approved case approved = "approved" + /// Description for delivered case delivered = "delivered" } diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift index f3415b314e14..aef79e53cc61 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift @@ -30,7 +30,9 @@ internal struct EnumTest: Codable, JSONEncodable { case unknownDefaultOpenApi = 11184809 } internal enum EnumNumber: Double, Codable, CaseIterable, CaseIterableDefaultsLast { + /// Description for 1.1 case _11 = 1.1 + /// Description for -1.2 case number12 = -1.2 case unknownDefaultOpenApi = 11184809 } diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift index 65ba7de3dd39..1d7f53eadb4b 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift @@ -11,8 +11,11 @@ import AnyCodable #endif internal enum OuterEnum: String, Codable, CaseIterable, CaseIterableDefaultsLast { + /// Description for placed case placed = "placed" + /// Description for approved case approved = "approved" + /// Description for delivered case delivered = "delivered" case unknownDefaultOpenApi = "unknown_default_open_api" } diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift index 3a9edb08ea78..6a52e8bc8851 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift @@ -27,7 +27,9 @@ public struct EnumTest: Codable, JSONEncodable, Hashable { case number1 = -1 } public enum EnumNumber: Double, Codable, CaseIterable { + /// Description for 1.1 case _11 = 1.1 + /// Description for -1.2 case number12 = -1.2 } public var enumString: EnumString? diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift index 76c34b3c2ce6..a7c4562dc290 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift @@ -11,7 +11,10 @@ import AnyCodable #endif public enum OuterEnum: String, Codable, CaseIterable { + /// Description for placed case placed = "placed" + /// Description for approved case approved = "approved" + /// Description for delivered case delivered = "delivered" } diff --git a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/Models/EnumTest.swift b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/Models/EnumTest.swift index b0a4756d3e8b..954cfaa3bf66 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/Models/EnumTest.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/Models/EnumTest.swift @@ -32,7 +32,9 @@ public final class EnumTest: Codable, JSONEncodable, Hashable { case number1 = -1 } public enum EnumNumber: Double, Codable, CaseIterable { + /// Description for 1.1 case _11 = 1.1 + /// Description for -1.2 case number12 = -1.2 } public var enumString: EnumString? diff --git a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/Models/OuterEnum.swift b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/Models/OuterEnum.swift index 2a16e08330a0..38273f37a31e 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/Models/OuterEnum.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/Models/OuterEnum.swift @@ -16,8 +16,11 @@ public typealias OuterEnum = PetstoreClientAPI.OuterEnum extension PetstoreClientAPI { public enum OuterEnum: String, Codable, CaseIterable { + /// Description for placed case placed = "placed" + /// Description for approved case approved = "approved" + /// Description for delivered case delivered = "delivered" } } From 4f5b03e0249c7ba22944c5c94d01087ffbb64e7f Mon Sep 17 00:00:00 2001 From: tsutsuken Date: Wed, 6 Aug 2025 18:17:21 +0900 Subject: [PATCH 4/5] [swift6] Support x-enum-descriptions --- .../src/main/resources/swift6/modelEnum.mustache | 3 +++ .../main/resources/swift6/modelInlineEnumDeclaration.mustache | 3 +++ 2 files changed, 6 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/swift6/modelEnum.mustache b/modules/openapi-generator/src/main/resources/swift6/modelEnum.mustache index 1c844b6fa4b1..6673dc2f6aa8 100644 --- a/modules/openapi-generator/src/main/resources/swift6/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/modelEnum.mustache @@ -1,6 +1,9 @@ {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{classname}}: {{dataType}}, Sendable, {{#useVapor}}Content, Hashable{{/useVapor}}{{^useVapor}}Codable{{^isString}}{{^isInteger}}{{^isFloat}}{{^isDouble}}{{#useParameterConvertible}}, ParameterConvertible{{/useParameterConvertible}}{{/isDouble}}{{/isFloat}}{{/isInteger}}{{/isString}}{{/useVapor}}, CaseIterable{{#enumUnknownDefaultCase}}{{#isInteger}}, CaseIterableDefaultsLast{{/isInteger}}{{#isFloat}}, CaseIterableDefaultsLast{{/isFloat}}{{#isDouble}}, CaseIterableDefaultsLast{{/isDouble}}{{#isString}}, CaseIterableDefaultsLast{{/isString}}{{/enumUnknownDefaultCase}} { {{#allowableValues}} {{#enumVars}} + {{#enumDescription}} + /// {{enumDescription}} + {{/enumDescription}} case {{{name}}} = {{{value}}} {{/enumVars}} {{/allowableValues}} diff --git a/modules/openapi-generator/src/main/resources/swift6/modelInlineEnumDeclaration.mustache b/modules/openapi-generator/src/main/resources/swift6/modelInlineEnumDeclaration.mustache index 61ef017ce9aa..3c75296aba18 100644 --- a/modules/openapi-generator/src/main/resources/swift6/modelInlineEnumDeclaration.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/modelInlineEnumDeclaration.mustache @@ -1,6 +1,9 @@ {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum {{enumName}}: {{^isContainer}}{{dataType}}{{/isContainer}}{{#isContainer}}String{{/isContainer}}, Sendable, {{#useVapor}}Content, Hashable{{/useVapor}}{{^useVapor}}Codable{{^isContainer}}{{^isString}}{{^isInteger}}{{^isFloat}}{{^isDouble}}{{#useParameterConvertible}}, ParameterConvertible{{/useParameterConvertible}}{{/isDouble}}{{/isFloat}}{{/isInteger}}{{/isString}}{{/isContainer}}{{/useVapor}}, CaseIterable{{#enumUnknownDefaultCase}}{{#isInteger}}, CaseIterableDefaultsLast{{/isInteger}}{{#isFloat}}, CaseIterableDefaultsLast{{/isFloat}}{{#isDouble}}, CaseIterableDefaultsLast{{/isDouble}}{{#isString}}, CaseIterableDefaultsLast{{/isString}}{{#isContainer}}, CaseIterableDefaultsLast{{/isContainer}}{{/enumUnknownDefaultCase}} { {{#allowableValues}} {{#enumVars}} + {{#enumDescription}} + /// {{enumDescription}} + {{/enumDescription}} case {{{name}}} = {{{value}}} {{/enumVars}} {{/allowableValues}} From 19ed3f0e7fa352f84881f4c27db2d7af82e72577 Mon Sep 17 00:00:00 2001 From: tsutsuken Date: Wed, 6 Aug 2025 18:18:29 +0900 Subject: [PATCH 5/5] [swift6] Regenerate samples --- .../Sources/PetstoreClient/Models/EnumTest.swift | 2 ++ .../Sources/PetstoreClient/Models/OuterEnum.swift | 3 +++ .../Sources/PetstoreClient/Models/EnumTest.swift | 2 ++ .../Sources/PetstoreClient/Models/OuterEnum.swift | 3 +++ .../Sources/PetstoreClient/Models/EnumTest.swift | 2 ++ .../Sources/PetstoreClient/Models/OuterEnum.swift | 3 +++ .../PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift | 2 ++ .../PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift | 3 +++ .../Sources/CombineLibrary/Models/EnumTest.swift | 2 ++ .../Sources/CombineLibrary/Models/OuterEnum.swift | 3 +++ .../Sources/PetstoreClient/Models/EnumTest.swift | 2 ++ .../Sources/PetstoreClient/Models/OuterEnum.swift | 3 +++ .../PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift | 2 ++ .../PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift | 3 +++ .../PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift | 2 ++ .../PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift | 3 +++ .../PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift | 2 ++ .../PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift | 3 +++ .../Sources/PetstoreClient/Models/EnumTest.swift | 2 ++ .../Sources/PetstoreClient/Models/OuterEnum.swift | 3 +++ 20 files changed, 50 insertions(+) diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumTest.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumTest.swift index 9472c599e8be..8ec02f6fd0ff 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/EnumTest.swift @@ -24,7 +24,9 @@ public struct EnumTest: Sendable, Codable, ParameterConvertible, Hashable { case number1 = -1 } public enum EnumNumber: Double, Sendable, Codable, CaseIterable { + /// Description for 1.1 case _11 = 1.1 + /// Description for -1.2 case number12 = -1.2 } public var enumString: EnumString? diff --git a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/OuterEnum.swift b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/OuterEnum.swift index 9bcdaab8b218..2b7fa5d544b2 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/OuterEnum.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Models/OuterEnum.swift @@ -8,7 +8,10 @@ import Foundation public enum OuterEnum: String, Sendable, Codable, CaseIterable { + /// Description for placed case placed = "placed" + /// Description for approved case approved = "approved" + /// Description for delivered case delivered = "delivered" } diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumTest.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumTest.swift index 9472c599e8be..8ec02f6fd0ff 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/EnumTest.swift @@ -24,7 +24,9 @@ public struct EnumTest: Sendable, Codable, ParameterConvertible, Hashable { case number1 = -1 } public enum EnumNumber: Double, Sendable, Codable, CaseIterable { + /// Description for 1.1 case _11 = 1.1 + /// Description for -1.2 case number12 = -1.2 } public var enumString: EnumString? diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/OuterEnum.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/OuterEnum.swift index 9bcdaab8b218..2b7fa5d544b2 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/OuterEnum.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Models/OuterEnum.swift @@ -8,7 +8,10 @@ import Foundation public enum OuterEnum: String, Sendable, Codable, CaseIterable { + /// Description for placed case placed = "placed" + /// Description for approved case approved = "approved" + /// Description for delivered case delivered = "delivered" } diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/EnumTest.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/EnumTest.swift index 9472c599e8be..8ec02f6fd0ff 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/EnumTest.swift @@ -24,7 +24,9 @@ public struct EnumTest: Sendable, Codable, ParameterConvertible, Hashable { case number1 = -1 } public enum EnumNumber: Double, Sendable, Codable, CaseIterable { + /// Description for 1.1 case _11 = 1.1 + /// Description for -1.2 case number12 = -1.2 } public var enumString: EnumString? diff --git a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/OuterEnum.swift b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/OuterEnum.swift index 9bcdaab8b218..2b7fa5d544b2 100644 --- a/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/OuterEnum.swift +++ b/samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Models/OuterEnum.swift @@ -8,7 +8,10 @@ import Foundation public enum OuterEnum: String, Sendable, Codable, CaseIterable { + /// Description for placed case placed = "placed" + /// Description for approved case approved = "approved" + /// Description for delivered case delivered = "delivered" } diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift index 9472c599e8be..8ec02f6fd0ff 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift @@ -24,7 +24,9 @@ public struct EnumTest: Sendable, Codable, ParameterConvertible, Hashable { case number1 = -1 } public enum EnumNumber: Double, Sendable, Codable, CaseIterable { + /// Description for 1.1 case _11 = 1.1 + /// Description for -1.2 case number12 = -1.2 } public var enumString: EnumString? diff --git a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift index 9bcdaab8b218..2b7fa5d544b2 100644 --- a/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift +++ b/samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift @@ -8,7 +8,10 @@ import Foundation public enum OuterEnum: String, Sendable, Codable, CaseIterable { + /// Description for placed case placed = "placed" + /// Description for approved case approved = "approved" + /// Description for delivered case delivered = "delivered" } diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/EnumTest.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/EnumTest.swift index 9472c599e8be..8ec02f6fd0ff 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/EnumTest.swift @@ -24,7 +24,9 @@ public struct EnumTest: Sendable, Codable, ParameterConvertible, Hashable { case number1 = -1 } public enum EnumNumber: Double, Sendable, Codable, CaseIterable { + /// Description for 1.1 case _11 = 1.1 + /// Description for -1.2 case number12 = -1.2 } public var enumString: EnumString? diff --git a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/OuterEnum.swift b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/OuterEnum.swift index 9bcdaab8b218..2b7fa5d544b2 100644 --- a/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/OuterEnum.swift +++ b/samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Models/OuterEnum.swift @@ -8,7 +8,10 @@ import Foundation public enum OuterEnum: String, Sendable, Codable, CaseIterable { + /// Description for placed case placed = "placed" + /// Description for approved case approved = "approved" + /// Description for delivered case delivered = "delivered" } diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/EnumTest.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/EnumTest.swift index d8c630d29d31..bca9c2b1f67e 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/EnumTest.swift @@ -24,7 +24,9 @@ import Foundation case number1 = -1 } public enum EnumNumber: Double, Sendable, Codable, CaseIterable { + /// Description for 1.1 case _11 = 1.1 + /// Description for -1.2 case number12 = -1.2 } public var enumString: EnumString? diff --git a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/OuterEnum.swift b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/OuterEnum.swift index 9bcdaab8b218..2b7fa5d544b2 100644 --- a/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/OuterEnum.swift +++ b/samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Models/OuterEnum.swift @@ -8,7 +8,10 @@ import Foundation public enum OuterEnum: String, Sendable, Codable, CaseIterable { + /// Description for placed case placed = "placed" + /// Description for approved case approved = "approved" + /// Description for delivered case delivered = "delivered" } diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift index 9472c599e8be..8ec02f6fd0ff 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift @@ -24,7 +24,9 @@ public struct EnumTest: Sendable, Codable, ParameterConvertible, Hashable { case number1 = -1 } public enum EnumNumber: Double, Sendable, Codable, CaseIterable { + /// Description for 1.1 case _11 = 1.1 + /// Description for -1.2 case number12 = -1.2 } public var enumString: EnumString? diff --git a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift index 9bcdaab8b218..2b7fa5d544b2 100644 --- a/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift +++ b/samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift @@ -8,7 +8,10 @@ import Foundation public enum OuterEnum: String, Sendable, Codable, CaseIterable { + /// Description for placed case placed = "placed" + /// Description for approved case approved = "approved" + /// Description for delivered case delivered = "delivered" } diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift index 380f8a56187c..0f27781edc32 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift @@ -27,7 +27,9 @@ internal struct EnumTest: Sendable, Codable, ParameterConvertible { case unknownDefaultOpenApi = 11184809 } internal enum EnumNumber: Double, Sendable, Codable, CaseIterable, CaseIterableDefaultsLast { + /// Description for 1.1 case _11 = 1.1 + /// Description for -1.2 case number12 = -1.2 case unknownDefaultOpenApi = 11184809 } diff --git a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift index 37a718aed18d..b3b34786e7eb 100644 --- a/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift +++ b/samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift @@ -8,8 +8,11 @@ import Foundation internal enum OuterEnum: String, Sendable, Codable, CaseIterable, CaseIterableDefaultsLast { + /// Description for placed case placed = "placed" + /// Description for approved case approved = "approved" + /// Description for delivered case delivered = "delivered" case unknownDefaultOpenApi = "unknown_default_open_api" } diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift index 9472c599e8be..8ec02f6fd0ff 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift @@ -24,7 +24,9 @@ public struct EnumTest: Sendable, Codable, ParameterConvertible, Hashable { case number1 = -1 } public enum EnumNumber: Double, Sendable, Codable, CaseIterable { + /// Description for 1.1 case _11 = 1.1 + /// Description for -1.2 case number12 = -1.2 } public var enumString: EnumString? diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift index 9bcdaab8b218..2b7fa5d544b2 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift @@ -8,7 +8,10 @@ import Foundation public enum OuterEnum: String, Sendable, Codable, CaseIterable { + /// Description for placed case placed = "placed" + /// Description for approved case approved = "approved" + /// Description for delivered case delivered = "delivered" } diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/EnumTest.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/EnumTest.swift index 375e78fcb7c3..90ab44dc707d 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/EnumTest.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/EnumTest.swift @@ -29,7 +29,9 @@ public final class EnumTest: @unchecked Sendable, Codable, ParameterConvertible, case number1 = -1 } public enum EnumNumber: Double, Sendable, Codable, CaseIterable { + /// Description for 1.1 case _11 = 1.1 + /// Description for -1.2 case number12 = -1.2 } public private(set) var enumString: EnumString? diff --git a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/OuterEnum.swift b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/OuterEnum.swift index 93a456e750ca..1041670443b5 100644 --- a/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/OuterEnum.swift +++ b/samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Models/OuterEnum.swift @@ -13,8 +13,11 @@ public typealias OuterEnum = PetstoreClientAPI.OuterEnum extension PetstoreClientAPI { public enum OuterEnum: String, Sendable, Codable, CaseIterable { + /// Description for placed case placed = "placed" + /// Description for approved case approved = "approved" + /// Description for delivered case delivered = "delivered" } }