Skip to content

Commit

Permalink
Reformatted
Browse files Browse the repository at this point in the history
  • Loading branch information
czechboy0 committed Dec 16, 2024
1 parent d5ace32 commit 21e5f05
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ extension OperationDescription {
}
let newPath = OpenAPI.Path(newComponents, trailingSlash: path.trailingSlash)
let names: [Expression] = orderedPathParameters.map { param in
.identifierPattern("input").dot("path").dot(context.asSwiftSafeName(param, .noncapitalized))
.identifierPattern("input").dot("path").dot(context.asSwiftSafeName(param, .noncapitalized))
}
let arrayExpr: Expression = .literal(.array(names))
return (newPath.rawValue, arrayExpr)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,8 @@ struct TypeAssigner {
guard !params.isEmpty else { return prefix }
let safedParams =
params.map { pair in
pair.split(separator: "=").map { context.asSwiftSafeName(String($0), .noncapitalized) }.joined(separator: "_")
pair.split(separator: "=").map { context.asSwiftSafeName(String($0), .noncapitalized) }
.joined(separator: "_")
}
.joined(separator: "_")
return prefix + "_" + safedParams
Expand Down
5 changes: 1 addition & 4 deletions Sources/swift-openapi-generator/Extensions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@ extension _UserConfig {
.init(
generate: [.types, .client],
accessModifier: .internal,
filter: .init(operations: [
"listPets",
"createPet"
]),
filter: .init(operations: ["listPets", "createPet"]),
namingStrategy: .idiomatic
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,23 @@ final class Test_SwiftSafeNames: Test_Core {
let translator = makeTranslator(nameOverrides: ["MEGA": "m_e_g_a"])
let asSwiftSafeName: (String, SwiftNameOptions) -> String = translator.context.asSwiftSafeName
for (input, sanitizedDefensive, _, _) in cases {
XCTAssertEqual(asSwiftSafeName(input, .noncapitalized), sanitizedDefensive, "Defensive, input: \(input)")
XCTAssertEqual(
asSwiftSafeName(input, .noncapitalized),
sanitizedDefensive,
"Defensive, input: \(input)"
)
}
}
do {
let translator = makeTranslator(namingStrategy: .idiomatic, nameOverrides: ["MEGA": "m_e_g_a"])
let asSwiftSafeName: (String, SwiftNameOptions) -> String = translator.context.asSwiftSafeName
for (input, _, idiomaticUpper, idiomaticLower) in cases {
XCTAssertEqual(asSwiftSafeName(input, .capitalized), idiomaticUpper, "Idiomatic upper, input: \(input)")
XCTAssertEqual(asSwiftSafeName(input, .noncapitalized), idiomaticLower, "Idiomatic lower, input: \(input)")
XCTAssertEqual(
asSwiftSafeName(input, .noncapitalized),
idiomaticLower,
"Idiomatic lower, input: \(input)"
)
}
}
}
Expand Down

0 comments on commit 21e5f05

Please sign in to comment.