Skip to content

Eliminate unreachable default branch in Output accessors for default-only responses #816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Eliminate unreachable default branch in Output accessors for default-only responses #816

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef2c033
Emit switch without fallback for single-case Output enums (default-on…
alxxndrv Aug 25, 2025
c43c85c
Made throwing-getter default-case check inline; remove `let isSingleC…
alxxndrv Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 34 additions & 25 deletions Sources/_OpenAPIGeneratorCore/Translator/Responses/translateResponseOutcome.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,39 @@ extension TypesFileTranslator {
staticMemberDecl = nil
}

let isSingleCaseOutput = operation.containsDefaultResponse && operation.responseOutcomes.count == 1

var throwingGetterCases: [SwitchCaseDescription] = [
SwitchCaseDescription(
kind: .case(
.dot(responseKind.identifier),
responseKind.wantsStatusCode ? ["_", "response"] : ["response"]
),
body: [.expression(.return(.identifierPattern("response")))]
)
]
if !isSingleCaseOutput {
throwingGetterCases.append(
SwitchCaseDescription(
kind: .default,
body: [
.expression(
.try(
.identifierPattern("throwUnexpectedResponseStatus")
.call([
.init(
label: "expectedStatus",
expression: .literal(.string(responseKind.prettyName))
),
.init(label: "response", expression: .identifierPattern("self")),
])
)
)
]
)
)
}

let throwingGetterDesc = VariableDescription(
accessModifier: config.access,
kind: .var,
Expand All @@ -96,31 +129,7 @@ extension TypesFileTranslator {
.expression(
.switch(
switchedExpression: .identifierPattern("self"),
cases: [
SwitchCaseDescription(
kind: .case(
.dot(responseKind.identifier),
responseKind.wantsStatusCode ? ["_", "response"] : ["response"]
),
body: [.expression(.return(.identifierPattern("response")))]
),
SwitchCaseDescription(
kind: .default,
body: [
.expression(
.try(
.identifierPattern("throwUnexpectedResponseStatus")
.call([
.init(
label: "expectedStatus",
expression: .literal(.string(responseKind.prettyName))
), .init(label: "response", expression: .identifierPattern("self")),
])
)
)
]
),
]
cases: throwingGetterCases
)
)
],
Expand Down
5 changes: 0 additions & 5 deletions Tests/OpenAPIGeneratorReferenceTests/SnippetBasedReferenceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3416,11 +3416,6 @@ final class SnippetBasedReferenceTests: XCTestCase {
switch self {
case let .`default`(_, response):
return response
default:
try throwUnexpectedResponseStatus(
expectedStatus: "default",
response: self
)
}
}
}
Expand Down
Loading