Fix casing of generated services and methods #8
Conversation
Motivation: Given a method name, say `ImportCSV`, from a `.proto` file, the generated method name in upper and lower camel case is `ImportCsv` and `importCsv` respectively. The generated method name (which is already expected to be in upper camel case) in upper and lower camel case should be `ImportCSV` and `importCSV` respectively. Modifications: - Replace the method used for generating service and method names in lower camel case with a newly implemented method. - Do not convert the base names of services and methods to upper camel case as they are expected to already be in upper camel case. Result: The casing of service and method names will be preserved when generating stubs.
| 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 "" } |
There was a problem hiding this comment.
I don't think we need this check. If the string is empty then indexOfFirstLowerCase will be nil and we'll return s.lowercased() (which is fine)
|
|
||
| package struct CamelCaser { | ||
| /// Converts a string from upper camel case to lower camel case. | ||
| package static func toLowerCamelCase(_ s: String) -> String { |
There was a problem hiding this comment.
Single character names are rarely a good idea. input is fine here.
| package static func toLowerCamelCase(_ s: String) -> String { | ||
| if s.isEmpty { return "" } | ||
|
|
||
| let indexOfFirstLowerCase = s.firstIndex(where: { $0 != "_" && $0.lowercased() == String($0) }) |
There was a problem hiding this comment.
I don't think the "_" is relevant here. We also don't need to convert the character into a string, we can just do:
| let indexOfFirstLowerCase = s.firstIndex(where: { $0 != "_" && $0.lowercased() == String($0) }) | |
| let indexOfFirstLowerCase = s.firstIndex(where: { $0.isLowercase }) |
| package static func toLowerCamelCase(_ s: String) -> String { | ||
| if s.isEmpty { return "" } | ||
|
|
||
| let indexOfFirstLowerCase = s.firstIndex(where: { $0 != "_" && $0.lowercased() == String($0) }) |
There was a problem hiding this comment.
Also the correct casing of indexOfFirstLowerCase is indexOfFirstLowercase
| } else { | ||
| // `s` did not contain any lower case letter. | ||
| return s.lowercased() | ||
| } |
There was a problem hiding this comment.
We can do an early exit if indexOfFirstLowercase is nil:
guard let indexOfFirstLowerCase = s.firstIndex(where: { ... }) else {
return s.lowercased()
}| @@ -15,7 +15,6 @@ | |||
| */ | |||
|
|
|||
| internal import Foundation | |||
| internal import SwiftProtobuf | |||
There was a problem hiding this comment.
Was this import not used for anything?
There was a problem hiding this comment.
It was imported to access NamingUtils which is no longer used.
There was a problem hiding this comment.
NamingUtils comes from the SwiftProtobufPluginLibrary
There was a problem hiding this comment.
Oh yes. That means SwiftProtobuf was already not in use.
| @@ -15,7 +15,6 @@ | |||
| */ | |||
|
|
|||
| internal import Foundation | |||
| internal import SwiftProtobuf | |||
There was a problem hiding this comment.
NamingUtils comes from the SwiftProtobufPluginLibrary
| * limitations under the License. | ||
| */ | ||
|
|
||
| package struct CamelCaser { |
There was a problem hiding this comment.
This is just being used as a namespace so should be an enum:
| package struct CamelCaser { | |
| package enum CamelCaser { |
Motivation:
Given a method name, say
ImportCSV, from a.protofile, the generated method name in upper and lower camel case isImportCsvandimportCsvrespectively. The generated method name (which is already expected to be in upper camel case) in upper and lower camel case should beImportCSVandimportCSVrespectively.Modifications:
Result:
The casing of service and method names will be preserved when generating stubs.