Additional 'case' blocks cannot appear after the 'default' block of a…

… 'switch' (#212)
apple · Aug 20, 2023 · a0333f6 · a0333f6
1 parent 3ffeaba
commit a0333f6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/Sources/_OpenAPIGeneratorCore/Translator/ClientTranslator/translateClientMethod.swift b/Sources/_OpenAPIGeneratorCore/Translator/ClientTranslator/translateClientMethod.swift
@@ -123,7 +123,6 @@ extension ClientFileTranslator {
     ) throws -> Expression {
         var cases: [SwitchCaseDescription] =
             try description
-            .operation
             .responseOutcomes
             .map { outcome in
                 try translateResponseOutcomeInClient(

diff --git a/Sources/_OpenAPIGeneratorCore/Translator/Operations/OperationDescription.swift b/Sources/_OpenAPIGeneratorCore/Translator/Operations/OperationDescription.swift
@@ -317,4 +317,17 @@ extension OperationDescription {
     var containsDefaultResponse: Bool {
         operation.responses.contains(key: .default)
     }
+
+    /// Returns the operation.responseOutcomes while ensuring if a `.default`
+    /// responseOutcome is present, then it is the last element in the returned array
+    var responseOutcomes: [OpenAPI.Operation.ResponseOutcome] {
+        var outcomes = operation.responseOutcomes
+        // if .default is present and not already last
+        if let index = outcomes.firstIndex(where: { $0.status == .default }), index != (outcomes.count - 1) {
+            //then we move it to be last
+            let defaultResp = outcomes.remove(at: index)
+            outcomes.append(defaultResp)
+        }
+        return outcomes
+    }
 }
diff --git a/Sources/_OpenAPIGeneratorCore/Translator/Responses/acceptHeaderContentTypes.swift b/Sources/_OpenAPIGeneratorCore/Translator/Responses/acceptHeaderContentTypes.swift
@@ -27,7 +27,6 @@ extension FileTranslator {
     ) throws -> [ContentType] {
         let contentTypes =
             try description
-            .operation
             .responseOutcomes
             .flatMap { outcome in
                 let response = try outcome.response.resolve(in: components)

diff --git a/Sources/_OpenAPIGeneratorCore/Translator/ServerTranslator/translateServerMethod.swift b/Sources/_OpenAPIGeneratorCore/Translator/ServerTranslator/translateServerMethod.swift
@@ -119,7 +119,6 @@ extension ServerFileTranslator {
     func translateServerSerializer(_ description: OperationDescription) throws -> Expression {
         var cases: [SwitchCaseDescription] =
             try description
-            .operation
             .responseOutcomes
             .map { outcome in
                 try translateResponseOutcomeInServer(

diff --git a/Sources/_OpenAPIGeneratorCore/Translator/TypesTranslator/translateOperations.swift b/Sources/_OpenAPIGeneratorCore/Translator/TypesTranslator/translateOperations.swift
@@ -123,7 +123,6 @@ extension TypesFileTranslator {
 
         let documentedOutcomes =
             try description
-            .operation
             .responseOutcomes
             .map { outcome in
                 try translateResponseOutcomeInTypes(