From 21e5f059ef8a9a5285f62eb07e6f672bc765a2f5 Mon Sep 17 00:00:00 2001 From: Honza Dvorsky Date: Mon, 16 Dec 2024 08:30:31 +0100 Subject: [PATCH] Reformatted --- .../Translator/Operations/OperationDescription.swift | 2 +- .../Translator/TypeAssignment/TypeAssigner.swift | 3 ++- Sources/swift-openapi-generator/Extensions.swift | 5 +---- .../Extensions/Test_SwiftSafeNames.swift | 12 ++++++++++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Sources/_OpenAPIGeneratorCore/Translator/Operations/OperationDescription.swift b/Sources/_OpenAPIGeneratorCore/Translator/Operations/OperationDescription.swift index 3626af27..50535d37 100644 --- a/Sources/_OpenAPIGeneratorCore/Translator/Operations/OperationDescription.swift +++ b/Sources/_OpenAPIGeneratorCore/Translator/Operations/OperationDescription.swift @@ -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) diff --git a/Sources/_OpenAPIGeneratorCore/Translator/TypeAssignment/TypeAssigner.swift b/Sources/_OpenAPIGeneratorCore/Translator/TypeAssignment/TypeAssigner.swift index 5ecf852c..6077a06f 100644 --- a/Sources/_OpenAPIGeneratorCore/Translator/TypeAssignment/TypeAssigner.swift +++ b/Sources/_OpenAPIGeneratorCore/Translator/TypeAssignment/TypeAssigner.swift @@ -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 diff --git a/Sources/swift-openapi-generator/Extensions.swift b/Sources/swift-openapi-generator/Extensions.swift index a3f27c2f..76f43361 100644 --- a/Sources/swift-openapi-generator/Extensions.swift +++ b/Sources/swift-openapi-generator/Extensions.swift @@ -47,10 +47,7 @@ extension _UserConfig { .init( generate: [.types, .client], accessModifier: .internal, - filter: .init(operations: [ - "listPets", - "createPet" - ]), + filter: .init(operations: ["listPets", "createPet"]), namingStrategy: .idiomatic ) } diff --git a/Tests/OpenAPIGeneratorCoreTests/Extensions/Test_SwiftSafeNames.swift b/Tests/OpenAPIGeneratorCoreTests/Extensions/Test_SwiftSafeNames.swift index 8142d5ec..55507a62 100644 --- a/Tests/OpenAPIGeneratorCoreTests/Extensions/Test_SwiftSafeNames.swift +++ b/Tests/OpenAPIGeneratorCoreTests/Extensions/Test_SwiftSafeNames.swift @@ -125,7 +125,11 @@ 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 { @@ -133,7 +137,11 @@ final class Test_SwiftSafeNames: Test_Core { 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)" + ) } } }