Consolidating api name camelcasing

nerdsupremacist · Dec 19, 2021 · 8134d59 · 8134d59
1 parent 98d4ffb
commit 8134d59
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 56 deletions.
diff --git a/Sources/Graphaello/Processing/Model/Schema/TypeReference.swift b/Sources/Graphaello/Processing/Model/Schema/TypeReference.swift
@@ -70,7 +70,7 @@ extension Schema.GraphQLType.Field.TypeReference {
                 return "Apollo\(api.upperCamelized).\(fragment.name.upperCamelized)?"
             }
 
-            return "\(api).\(name.upperCamelized)?"
+            return "\(api.upperCamelized).\(name.upperCamelized)?"
 
         case .complex(let definition, let ofType):
             switch definition.kind {

diff --git a/Sources/Graphaello/Processing/Pipeline/Component/Generation/BasicGenerator.swift b/Sources/Graphaello/Processing/Pipeline/Component/Generation/BasicGenerator.swift
@@ -3,8 +3,8 @@ import Foundation
 struct BasicGenerator: Generator {
 
     private let structureAPIVersion = 12
-    private let apiCodeGenVersion = 5
-    private let connectionFragmentCodeGenVersion = 2
+    private let apiCodeGenVersion = 6
+    private let connectionFragmentCodeGenVersion = 3
 
     func generate(prepared: Project.State<Stage.Prepared>, useFormatting: Bool) throws -> String {
         let usedTypesThatTriggerCacheMiss = prepared

diff --git a/...ng/Pipeline/Component/Preparation/Implementation/BasicApolloCodegenRequestProcessor.swift b/...ng/Pipeline/Component/Preparation/Implementation/BasicApolloCodegenRequestProcessor.swift
@@ -2,13 +2,16 @@ import Foundation
 import CLIKit
 
 struct BasicApolloCodegenRequestProcessor: ApolloCodegenRequestProcessor {
+    private let version = 2
+
     let instantiator: ApolloProcessInstantiator
 
     func process(request: ApolloCodeGenRequest,
                  using apollo: ApolloReference,
                  cache: PersistentCache<AnyHashable>?) throws -> ApolloCodeGenResponse {
 
-        let code = try cache.tryCache(key: request) {
+        let key = ComposedHashable(c0: request, c1: version)
+        let code = try cache.tryCache(key: key) {
             try process(request: request, using: apollo)
         }
 

diff --git a/...essing/Pipeline/Component/Preparation/Implementation/BasicApolloProcessInstantiator.swift b/...essing/Pipeline/Component/Preparation/Implementation/BasicApolloProcessInstantiator.swift
@@ -28,7 +28,7 @@ extension ApolloReference {
     fileprivate func arguments(api: API, graphql: Path, outputFile: Path) -> [String] {
         return [
             command,
-            "--namespace=Apollo\(api.name)",
+            "--namespace=Apollo\(api.name.upperCamelized)",
             "--target=swift",
             "--includes=\(graphql)",
             "--localSchemaFile=\(api.path)",

diff --git a/templates/swift/API.swift.stencil b/templates/swift/API.swift.stencil
@@ -1,18 +1,18 @@
-// MARK: - {{ api.name }}
+// MARK: - {{ api.name|upperCamelized }}
 
 #if {{ unifiedMacroFlag }}
 
-struct {{ api.name }}: API {
+struct {{ api.name|upperCamelized }}: API {
     let client: ApolloClient
 
-    typealias Query = {{ api.name }}
-    typealias Path<V> = GraphQLPath<{{ api.name }}, V>
-    typealias FragmentPath<V> = GraphQLFragmentPath<{{ api.name }}, V>
+    typealias Query = {{ api.name|upperCamelized }}
+    typealias Path<V> = GraphQLPath<{{ api.name|upperCamelized }}, V>
+    typealias FragmentPath<V> = GraphQLFragmentPath<{{ api.name|upperCamelized }}, V>
 
     {% if api.mutation %}
     enum Mutation: MutationTarget {
-        typealias Path<V> = GraphQLPath<{{ api.name }}.Mutation, V>
-        typealias FragmentPath<V> = GraphQLFragmentPath<{{ api.name }}.Mutation, V>
+        typealias Path<V> = GraphQLPath<{{ api.name|upperCamelized }}.Mutation, V>
+        typealias FragmentPath<V> = GraphQLFragmentPath<{{ api.name|upperCamelized }}.Mutation, V>
 
         {{ api.mutation.fields|code:"static" }}
     }
@@ -22,7 +22,7 @@ struct {{ api.name }}: API {
     {{ api.types|code }}
 }
 
-extension {{ api.name }} {
+extension {{ api.name|upperCamelized }} {
 
     init(url: URL{% if api.url %} = URL(string: "{{ api.url }}")!{% endif %},
          client: URLSessionClient = URLSessionClient(),
@@ -45,27 +45,27 @@ extension {{ api.name }} {
 }
 
 {% for type in api.types %}
-extension GraphQLFragmentPath where UnderlyingType == {{ api.name }}.{{ type.name|upperCamelized }} {
+extension GraphQLFragmentPath where UnderlyingType == {{ api.name|upperCamelized }}.{{ type.name|upperCamelized }} {
     {{ type.fields|code }}
 
     {% for interface in type.interfaces %}
-    var {{ interface.name|camelized|keywordProtected }}: FragmentPath<{{ api.name }}.{{ interface.name|upperCamelized }}> { .init() }
+    var {{ interface.name|camelized|keywordProtected }}: FragmentPath<{{ api.name|upperCamelized }}.{{ interface.name|upperCamelized }}> { .init() }
     {% endfor %}
 
     {% for possibleType in type.possibleTypes %}
-    var {{ possibleType.name|camelized|keywordProtected }}: FragmentPath<{{ api.name }}.{{ possibleType.name|upperCamelized }}?> { .init() }
+    var {{ possibleType.name|camelized|keywordProtected }}: FragmentPath<{{ api.name|upperCamelized }}.{{ possibleType.name|upperCamelized }}?> { .init() }
     {% endfor %}
 }
 
-extension GraphQLFragmentPath where UnderlyingType == {{ api.name }}.{{ type.name|upperCamelized }}? {
+extension GraphQLFragmentPath where UnderlyingType == {{ api.name|upperCamelized }}.{{ type.name|upperCamelized }}? {
     {{ type.fields|code:"optional" }}
 
     {% for interface in type.interfaces %}
-    var {{ interface.name|camelized|keywordProtected }}: FragmentPath<{{ api.name }}.{{ interface.name|upperCamelized }}?> { .init() }
+    var {{ interface.name|camelized|keywordProtected }}: FragmentPath<{{ api.name|upperCamelized }}.{{ interface.name|upperCamelized }}?> { .init() }
     {% endfor %}
 
     {% for possibleType in type.possibleTypes %}
-    var {{ possibleType.name|camelized|keywordProtected }}: FragmentPath<{{ api.name }}.{{ possibleType.name|upperCamelized }}?> { .init() }
+    var {{ possibleType.name|camelized|keywordProtected }}: FragmentPath<{{ api.name|upperCamelized }}.{{ possibleType.name|upperCamelized }}?> { .init() }
     {% endfor %}
 }
 {% endfor %}

diff --git a/templates/swift/FragmentPlaceholder.swift.stencil b/templates/swift/FragmentPlaceholder.swift.stencil
@@ -1,7 +1,7 @@
-extension Apollo{{ fragmentPlaceholder.api.name }}.{{ fragmentPlaceholder.fragmentName|upperCamelized }} {
+extension Apollo{{ fragmentPlaceholder.api.name|upperCamelized }}.{{ fragmentPlaceholder.fragmentName|upperCamelized }} {
     private static let placeholderMap: ResultMap = {{ placeholderCode }}
 
-    static let placeholder = Apollo{{ fragmentPlaceholder.api.name }}.{{ fragmentPlaceholder.fragmentName|upperCamelized }}(
-        unsafeResultMap: Apollo{{ fragmentPlaceholder.api.name }}.{{ fragmentPlaceholder.fragmentName|upperCamelized }}.placeholderMap
+    static let placeholder = Apollo{{ fragmentPlaceholder.api.name|upperCamelized }}.{{ fragmentPlaceholder.fragmentName|upperCamelized }}(
+        unsafeResultMap: Apollo{{ fragmentPlaceholder.api.name|upperCamelized }}.{{ fragmentPlaceholder.fragmentName|upperCamelized }}.placeholderMap
     )
 }
diff --git a/templates/swift/GraphQLConnectionFragment.swift.stencil b/templates/swift/GraphQLConnectionFragment.swift.stencil
@@ -1,14 +1,14 @@
-extension Apollo{{ graphQlConnectionFragment.fragment.api.name }}.{{ graphQlConnectionFragment.fragment.name|upperCamelized }} {
-    typealias Completion = (Result<Apollo{{ graphQlConnectionFragment.fragment.api.name }}.{{ graphQlConnectionFragment.fragment.name|upperCamelized }}?, Error>) -> Void
+extension Apollo{{ graphQlConnectionFragment.fragment.api.name|upperCamelized }}.{{ graphQlConnectionFragment.fragment.name|upperCamelized }} {
+    typealias Completion = (Result<Apollo{{ graphQlConnectionFragment.fragment.api.name|upperCamelized }}.{{ graphQlConnectionFragment.fragment.name|upperCamelized }}?, Error>) -> Void
     typealias Loader = (String, Int?, @escaping Completion) -> Void
 
-    private var response: Paging<Apollo{{ graphQlConnectionFragment.fragment.api.name }}.{{ graphQlConnectionFragment.nodeFragment.name|upperCamelized }}>.Response {
+    private var response: Paging<Apollo{{ graphQlConnectionFragment.fragment.api.name|upperCamelized }}.{{ graphQlConnectionFragment.nodeFragment.name|upperCamelized }}>.Response {
         return Paging.Response(values: edges{% if graphQlConnectionFragment.isEdgesArrayNullable %}?{% endif %}.compactMap { $0{% if graphQlConnectionFragment.areEdgesNullable %}?{% endif %}.node{% if graphQlConnectionFragment.areNodesNullable %}?{% endif %}.fragments.{{ graphQlConnectionFragment.nodeFragment.name|camelized }} }{% if graphQlConnectionFragment.isEdgesArrayNullable %} ?? []{% endif %},
                                cursor: pageInfo.endCursor,
                                hasMore: pageInfo.hasNextPage)
     }
 
-    fileprivate func paging(loader: @escaping Loader) -> Paging<Apollo{{ graphQlConnectionFragment.fragment.api.name }}.{{ graphQlConnectionFragment.nodeFragment.name|upperCamelized }}> {
+    fileprivate func paging(loader: @escaping Loader) -> Paging<Apollo{{ graphQlConnectionFragment.fragment.api.name|upperCamelized }}.{{ graphQlConnectionFragment.nodeFragment.name|upperCamelized }}> {
         return Paging(response) { cursor, pageSize, completion in
             loader(cursor, pageSize) { result in
                 completion(result.map { $0?.response ?? .empty })

diff --git a/templates/swift/GraphQLType.swift.stencil b/templates/swift/GraphQLType.swift.stencil
@@ -1,5 +1,5 @@
 {% if shouldBeTypealias %}
-typealias {{ graphQlType.name|upperCamelized }} = Apollo{{ api.name }}.{{ graphQlType.name }}
+typealias {{ graphQlType.name|upperCamelized }} = Apollo{{ api.name|upperCamelized }}.{{ graphQlType.name }}
 {% else %}
 {% if graphQlType.inputFields %}struct{% else %}enum{% endif %} {{ graphQlType.name|upperCamelized }}: {%if hasEnumValues %}String, {% endif %}Target{% if connectionNodeType %}, Connection{% endif %} {
 

diff --git a/templates/swift/MissingFragmentsStruct.swift.stencil b/templates/swift/MissingFragmentsStruct.swift.stencil
@@ -1,4 +1,4 @@
-extension Apollo{{ missingFragmentsStruct.api.name }}.{{ missingFragmentsStruct.path|join:"." }} {
+extension Apollo{{ missingFragmentsStruct.api.name|upperCamelized }}.{{ missingFragmentsStruct.path|join:"." }} {
     public struct Fragments {
         public private(set) var resultMap: ResultMap
 

diff --git a/templates/swift/MissingReferencedFragment.swift.stencil b/templates/swift/MissingReferencedFragment.swift.stencil
@@ -1,8 +1,8 @@
-extension Apollo{{ missingReferencedFragment.api.name }}.{{ missingReferencedFragment.path|join:"." }}.Fragments {
+extension Apollo{{ missingReferencedFragment.api.name|upperCamelized }}.{{ missingReferencedFragment.path|join:"." }}.Fragments {
 
-    public var {{ missingReferencedFragment.fragmentName|camelized }}: Apollo{{ missingReferencedFragment.api.name }}.{{ missingReferencedFragment.fragmentName }} {
+    public var {{ missingReferencedFragment.fragmentName|camelized }}: Apollo{{ missingReferencedFragment.api.name|upperCamelized }}.{{ missingReferencedFragment.fragmentName }} {
         get {
-            return Apollo{{ missingReferencedFragment.api.name }}.{{ missingReferencedFragment.fragmentName }}(unsafeResultMap: resultMap)
+            return Apollo{{ missingReferencedFragment.api.name|upperCamelized }}.{{ missingReferencedFragment.fragmentName }}(unsafeResultMap: resultMap)
         }
         set {
             resultMap += newValue.resultMap

diff --git a/templates/swift/MutationStruct.swift.stencil b/templates/swift/MutationStruct.swift.stencil
@@ -9,13 +9,13 @@ extension {{ structPrepared.name }} {
 
         @Published private var mutationCounter = 0
 
-        private let api: {{ mutationStruct.mutation.api.name }}
+        private let api: {{ mutationStruct.mutation.api.name|upperCamelized }}
 
         var isLoading: Bool {
             return mutationCounter > 0
         }
 
-        init(api: {{ mutationStruct.mutation.api.name }}) {
+        init(api: {{ mutationStruct.mutation.api.name|upperCamelized }}) {
             self.api = api
         }
     }
@@ -30,7 +30,7 @@ extension {{ structPrepared.name }}.{{ mutationStruct.mutation.name }} {
     @discardableResult
     func commit({{ queryRendererArguments|codeArray|join:", " }}, completion: ((Result<Value, Error>) -> Void)? = nil) -> Self {
         mutationCounter += 1
-        api.client.perform(mutation: Apollo{{ mutationStruct.mutation.api.name }}.{{ mutationStruct.mutation.parentName }}{{ mutationStruct.mutation.name }}Mutation({{ queryArgumentAssignments|codeArray|join:", " }})) { result in
+        api.client.perform(mutation: Apollo{{ mutationStruct.mutation.api.name|upperCamelized }}.{{ mutationStruct.mutation.parentName }}{{ mutationStruct.mutation.name }}Mutation({{ queryArgumentAssignments|codeArray|join:", " }})) { result in
             self.mutationCounter -= 1
             switch result {
             case let .success(response):

diff --git a/templates/swift/PagingFromFragment.swift.stencil b/templates/swift/PagingFromFragment.swift.stencil
@@ -1,5 +1,5 @@
 {{ pathExpression }}.paging { _cursor, _pageSize, _completion in
-    self.client.fetch(query: Apollo{{ pagingFromFragment.query.query.api.name }}.{{ pagingFromFragment.query.query.name|upperCamelized }}Query({{ queryArgumentAssignments|codeArray|join:", " }})) { result in
+    self.client.fetch(query: Apollo{{ pagingFromFragment.query.query.api.name|upperCamelized }}.{{ pagingFromFragment.query.query.name|upperCamelized }}Query({{ queryArgumentAssignments|codeArray|join:", " }})) { result in
         _completion(result.map { $0.{{ optionalPathExpression }} })
     }
 }
diff --git a/templates/swift/PlaceholderPagingFromFragment.swift.stencil b/templates/swift/PlaceholderPagingFromFragment.swift.stencil
@@ -1,3 +1,3 @@
-Apollo{{ placeholderPagingFromFragment.query.api.name }}.{{ placeholderPagingFromFragment.query.name|upperCamelized }}Query.Data.{{ pathExpression }}.paging { _, _, _ in
+Apollo{{ placeholderPagingFromFragment.query.api.name|upperCamelized }}.{{ placeholderPagingFromFragment.query.name|upperCamelized }}Query.Data.{{ pathExpression }}.paging { _, _, _ in
     // no-op
 }
diff --git a/templates/swift/QueryDataPlaceholder.swift.stencil b/templates/swift/QueryDataPlaceholder.swift.stencil
@@ -1,7 +1,7 @@
-extension Apollo{{ queryDataPlaceholder.api.name }}.{{ queryDataPlaceholder.queryName }}Query.Data  {
+extension Apollo{{ queryDataPlaceholder.api.name|upperCamelized }}.{{ queryDataPlaceholder.queryName }}Query.Data  {
     private static let placeholderMap: ResultMap = {{ placeholderCode }}
 
-    static let placeholder = Apollo{{ queryDataPlaceholder.api.name }}.{{ queryDataPlaceholder.queryName }}Query.Data(
-        unsafeResultMap: Apollo{{ queryDataPlaceholder.api.name }}.{{ queryDataPlaceholder.queryName }}Query.Data.placeholderMap
+    static let placeholder = Apollo{{ queryDataPlaceholder.api.name|upperCamelized }}.{{ queryDataPlaceholder.queryName }}Query.Data(
+        unsafeResultMap: Apollo{{ queryDataPlaceholder.api.name|upperCamelized }}.{{ queryDataPlaceholder.queryName }}Query.Data.placeholderMap
     )
 }