diff --git a/Sources/GRPCProtobufCodeGen/CamelCaser.swift b/Sources/GRPCProtobufCodeGen/CamelCaser.swift new file mode 100644 index 0000000..eaee81f --- /dev/null +++ b/Sources/GRPCProtobufCodeGen/CamelCaser.swift @@ -0,0 +1,46 @@ +/* + * Copyright 2024, gRPC Authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package struct CamelCaser { + /// Converts a string from upper camel case to lower camel case. + package static func toLowerCamelCase(_ s: String) -> String { + if s.isEmpty { return "" } + + let indexOfFirstLowerCase = s.firstIndex(where: { $0 != "_" && $0.lowercased() == String($0) }) + + if let indexOfFirstLowerCase { + if indexOfFirstLowerCase == s.startIndex { + // `s` already begins with a lower case letter. As in: "importCSV". + return s + } else if indexOfFirstLowerCase == s.index(after: s.startIndex) { + // The second character in `s` is lower case. As in: "ImportCSV". + return s[s.startIndex].lowercased() + s[indexOfFirstLowerCase...] // -> "importCSV" + } else { + // The first lower case character is further within `s`. Tentatively, `s` begins with one or + // more abbreviations. Therefore, the last encountered upper case character could be the + // beginning of the next word. As in: "FOOBARImportCSV". + + let leadingAbbreviation = s[.. "foobarImportCSV" + } + } else { + // `s` did not contain any lower case letter. + return s.lowercased() + } + } +} diff --git a/Sources/GRPCProtobufCodeGen/ProtobufCodeGenParser.swift b/Sources/GRPCProtobufCodeGen/ProtobufCodeGenParser.swift index 837cb2c..ba2851f 100644 --- a/Sources/GRPCProtobufCodeGen/ProtobufCodeGenParser.swift +++ b/Sources/GRPCProtobufCodeGen/ProtobufCodeGenParser.swift @@ -15,7 +15,6 @@ */ internal import Foundation -internal import SwiftProtobuf internal import SwiftProtobufPluginLibrary internal import struct GRPCCodeGen.CodeGenerationRequest @@ -125,8 +124,8 @@ extension CodeGenerationRequest.ServiceDescriptor { } let name = CodeGenerationRequest.Name( base: descriptor.name, - generatedUpperCase: NamingUtils.toUpperCamelCase(descriptor.name), - generatedLowerCase: NamingUtils.toLowerCamelCase(descriptor.name) + generatedUpperCase: descriptor.name, // The service name from the '.proto' file is expected to be in upper camel case + generatedLowerCase: CamelCaser.toLowerCamelCase(descriptor.name) ) // Packages that are based on the path of the '.proto' file usually @@ -145,8 +144,8 @@ extension CodeGenerationRequest.ServiceDescriptor.MethodDescriptor { fileprivate init(descriptor: MethodDescriptor, protobufNamer: SwiftProtobufNamer) { let name = CodeGenerationRequest.Name( base: descriptor.name, - generatedUpperCase: NamingUtils.toUpperCamelCase(descriptor.name), - generatedLowerCase: NamingUtils.toLowerCamelCase(descriptor.name) + generatedUpperCase: descriptor.name, // The method name from the '.proto' file is expected to be in upper camel case + generatedLowerCase: CamelCaser.toLowerCamelCase(descriptor.name) ) let documentation = descriptor.protoSourceComments() self.init( diff --git a/Tests/GRPCProtobufCodeGenTests/CamelCaserTests.swift b/Tests/GRPCProtobufCodeGenTests/CamelCaserTests.swift new file mode 100644 index 0000000..39a5b1f --- /dev/null +++ b/Tests/GRPCProtobufCodeGenTests/CamelCaserTests.swift @@ -0,0 +1,46 @@ +/* + * Copyright 2024, gRPC Authors All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import GRPCProtobufCodeGen +import Testing + +@Suite("CamelCaser") +struct CamelCaserTests { + @Test( + "Convert to lower camel case", + arguments: [ + ("ImportCsv", "importCsv"), + ("ImportCSV", "importCSV"), + ("CSVImport", "csvImport"), + ("importCSV", "importCSV"), + ("FOOBARImport", "foobarImport"), + ("FOO_BARImport", "foo_barImport"), + ("My_CSVImport", "my_CSVImport"), + ("_CSVImport", "_csvImport"), + ("V2Request", "v2Request"), + ("V2_Request", "v2_Request"), + ("CSV", "csv"), + ("I", "i"), + ("i", "i"), + ("I_", "i_"), + ("_", "_"), + ("", ""), + ] + ) + func toLowerCamelCase(_ input: String, expectedOutput: String) async throws { + #expect(CamelCaser.toLowerCamelCase(input) == expectedOutput) + } +}