small adjustments for swift

Author: tbarbugli

modules/openapi-generator/src/main/resources/swift5/modelObject.mustache

@@ -1,4 +1,4 @@
-{{^objcCompatible}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} {{#useClasses}}final class{{/useClasses}}{{^useClasses}}struct{{/useClasses}} {{{classname}}}: {{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable{{#useJsonEncodable}}, JSONEncodable{{/useJsonEncodable}}{{/useVapor}}{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}}{{#vendorExtensions.x-stream-event-call-type}}, WSCallEvent{{/vendorExtensions.x-stream-event-call-type}}{{#vendorExtensions.x-stream-event-client-type}}, WSClientEvent{{/vendorExtensions.x-stream-event-client-type}} {
+{{^objcCompatible}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} {{#useClasses}}final class{{/useClasses}}{{^useClasses}}struct{{/useClasses}} {{{classname}}}:{{#vendorExtensions.x-stream-event-client-type}} @unchecked Sendable, Event,{{/vendorExtensions.x-stream-event-client-type}}{{#vendorExtensions.x-stream-event-call-type}} @unchecked Sendable, Event,{{/vendorExtensions.x-stream-event-call-type}} {{#useVapor}}Content{{/useVapor}}{{^useVapor}}Codable{{#useJsonEncodable}}, JSONEncodable{{/useJsonEncodable}}{{/useVapor}}{{#vendorExtensions.x-swift-hashable}}, Hashable{{/vendorExtensions.x-swift-hashable}}{{#vendorExtensions.x-stream-event-call-type}}, WSCallEvent{{/vendorExtensions.x-stream-event-call-type}}{{#vendorExtensions.x-stream-event-client-type}}, WSClientEvent{{/vendorExtensions.x-stream-event-client-type}} {
 {{/objcCompatible}}{{#objcCompatible}}@objc {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class {{classname}}: NSObject, Codable{{#useJsonEncodable}}, JSONEncodable{{/useJsonEncodable}} {
 {{/objcCompatible}}
 {{#allVars}}

modules/openapi-generator/src/main/resources/swift5/modelOneOf.mustache

@@ -8,7 +8,25 @@ internal class {{classname}}Mapping: Decodable {
     {{#oneOf}}
     case type{{.}}({{.}})
     {{/oneOf}}
-
+    {{#discriminator}}
+    public var type: String {
+        switch self {
+        {{#oneOf}}
+        case .type{{.}}(let value):
+            return value.type
+        {{/oneOf}}
+        }
+    }
+    {{! HACK: to make event handling simpler in Swift, the rawValue has Event hardcoded }}
+    public var rawValue: Event {
+        switch self {
+        {{#oneOf}}
+        case .type{{.}}(let value):
+            return value
+        {{/oneOf}}
+        }
+    }
+    {{/discriminator}}
     public func encode(to encoder: Encoder) throws {
         var container = encoder.singleValueContainer()
         switch self {