Update Apollo to 1.0.0 and use via SPM Plugins

MateeDevs · Oct 4, 2022 · d439931 · d439931
1 parent 6da926c
commit d439931
Show file tree

Hide file tree

Showing 24 changed files with 196 additions and 1,784 deletions.
diff --git a/ios/.gitignore b/ios/.gitignore
@@ -18,6 +18,8 @@ Localizable.strings
 
 ## Generated code
 *.generated.swift
+*.graphql.swift
+*.graphqls
 
 ## Various settings
 *.pbxuser

diff --git a/ios/.swiftlint.yml b/ios/.swiftlint.yml
@@ -2,8 +2,10 @@ excluded:
   - Carthage
   - Pods
   - vendor
-  - DataLayer/Toolkits/RocketToolkit/Sources/RocketToolkit/NetworkModels/NETModels.generated.swift
-
+  - DataLayer/Providers/GraphQLProvider/.build
+  - DataLayer/Toolkits/RocketToolkit/Sources/RocketToolkit/NetworkModels/Apollo
+  - DataLayer/Toolkits/RocketToolkit/Sources/RocketToolkitMocks
+
 indentation: 2
 cyclomatic_complexity: 10
 file_length: 200

diff --git a/ios/DataLayer/Providers/GraphQLProvider/Package.resolved b/ios/DataLayer/Providers/GraphQLProvider/Package.resolved
@@ -0,0 +1,50 @@
+{
+  "pins" : [
+    {
+      "identity" : "apollo-ios",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apollographql/apollo-ios",
+      "state" : {
+        "revision" : "33065d3b3c97fc35ac42bf28f826cac6c61c779e",
+        "version" : "1.0.0"
+      }
+    },
+    {
+      "identity" : "inflectorkit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/mattt/InflectorKit",
+      "state" : {
+        "revision" : "d8cbcc04972690aaa5fc760a2b9ddb3e9f0decd7",
+        "version" : "1.0.0"
+      }
+    },
+    {
+      "identity" : "sqlite.swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/stephencelis/SQLite.swift.git",
+      "state" : {
+        "revision" : "4d543d811ee644fa4cc4bfa0be996b4dd6ba0f54",
+        "version" : "0.13.3"
+      }
+    },
+    {
+      "identity" : "swift-argument-parser",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-argument-parser.git",
+      "state" : {
+        "revision" : "9f39744e025c7d377987f30b03770805dcb0bcd1",
+        "version" : "1.1.4"
+      }
+    },
+    {
+      "identity" : "swift-collections",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-collections",
+      "state" : {
+        "revision" : "f504716c27d2e5d4144fa4794b12129301d17729",
+        "version" : "1.0.3"
+      }
+    }
+  ],
+  "version" : 2
+}
diff --git a/ios/DataLayer/Providers/GraphQLProvider/Package.swift b/ios/DataLayer/Providers/GraphQLProvider/Package.swift
@@ -5,7 +5,10 @@ import PackageDescription
 
 let package = Package(
     name: "GraphQLProvider",
-    platforms: [.iOS(.v14)],
+    platforms: [
+        .iOS(.v14),
+        .macOS(.v10_14)
+    ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
@@ -20,7 +23,7 @@ let package = Package(
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         // .package(url: /* package url */, from: "1.0.0"),
-        .package(url: "https://github.com/apollographql/apollo-ios", .upToNextMajor(from: "0.0.0"))
+        .package(url: "https://github.com/apollographql/apollo-ios", .upToNextMajor(from: "1.0.0"))
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.

diff --git a/ios/DataLayer/Providers/GraphQLProvider/Sources/GraphQLProvider/ApolloClient+Async.swift b/ios/DataLayer/Providers/GraphQLProvider/Sources/GraphQLProvider/ApolloClient+Async.swift
@@ -4,6 +4,7 @@
 //
 
 import Apollo
+import ApolloAPI
 import Foundation
 
 // Extension which adds async/await support to Apollo

diff --git a/ios/DataLayer/Providers/GraphQLProvider/Sources/GraphQLProvider/ApolloGraphQLProvider.swift b/ios/DataLayer/Providers/GraphQLProvider/Sources/GraphQLProvider/ApolloGraphQLProvider.swift
@@ -4,6 +4,7 @@
 //
 
 import Apollo
+import ApolloAPI
 import Foundation
 
 public struct ApolloGraphQLProvider {

diff --git a/ios/DataLayer/Providers/GraphQLProvider/Sources/GraphQLProvider/GraphQLProvider.swift b/ios/DataLayer/Providers/GraphQLProvider/Sources/GraphQLProvider/GraphQLProvider.swift
@@ -4,6 +4,7 @@
 //
 
 import Apollo
+import ApolloAPI
 import Foundation
 
 // sourcery: AutoMockable

diff --git a/...ataLayer/Providers/GraphQLProvider/Sources/GraphQLProviderMocks/GraphQLProviderMock.swift b/...ataLayer/Providers/GraphQLProvider/Sources/GraphQLProviderMocks/GraphQLProviderMock.swift
@@ -6,6 +6,7 @@
 // swiftlint:disable all
 
 import Apollo
+import ApolloAPI
 import Foundation
 import GraphQLProvider
 

diff --git a/ios/DataLayer/Toolkits/RocketToolkit/Package.swift b/ios/DataLayer/Toolkits/RocketToolkit/Package.swift
@@ -18,7 +18,7 @@ let package = Package(
         // .package(url: /* package url */, from: "1.0.0"),
         .package(name: "SharedDomain", path: "../../DomainLayer/SharedDomain"),
         .package(name: "GraphQLProvider", path: "../Providers/GraphQLProvider"),
-        .package(url: "https://github.com/apollographql/apollo-ios", .upToNextMajor(from: "0.0.0"))
+        .package(url: "https://github.com/apollographql/apollo-ios", .upToNextMajor(from: "1.0.0"))
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -34,14 +34,23 @@ let package = Package(
               .process("NetworkQueries")
             ]
         ),
+        .target(
+            name: "RocketToolkitMocks",
+            dependencies: [
+                "RocketToolkit",
+                .product(name: "ApolloTestSupport", package: "apollo-ios")
+            ]
+        ),
         .testTarget(
             name: "RocketToolkitTests",
             dependencies: [
                 "RocketToolkit",
+                "RocketToolkitMocks",
                 .product(name: "SharedDomain", package: "SharedDomain"),
                 .product(name: "SharedDomainMocks", package: "SharedDomain"),
                 .product(name: "GraphQLProvider", package: "GraphQLProvider"),
-                .product(name: "GraphQLProviderMocks", package: "GraphQLProvider")
+                .product(name: "GraphQLProviderMocks", package: "GraphQLProvider"),
+                .product(name: "ApolloTestSupport", package: "apollo-ios")
             ]
         )
     ]

diff --git a/...RocketToolkit/Sources/RocketToolkit/NetworkModels/Apollo/Schema/SchemaConfiguration.swift b/...RocketToolkit/Sources/RocketToolkit/NetworkModels/Apollo/Schema/SchemaConfiguration.swift
@@ -0,0 +1,15 @@
+// @generated
+// This file was automatically generated and can be edited to
+// provide custom configuration for a generated GraphQL schema.
+//
+// Any changes to this file will not be overwritten by future
+// code generation execution.
+
+import ApolloAPI
+
+enum SchemaConfiguration: ApolloAPI.SchemaConfiguration {
+  static func cacheKeyInfo(for type: Object, object: JSONObject) -> CacheKeyInfo? {
+    // Implement this function to configure cache key resolution for your schema types.
+    return nil
+  }
+}
diff --git a/.../Toolkits/RocketToolkit/Sources/RocketToolkit/NetworkModels/RocketLaunch+Conversion.swift b/.../Toolkits/RocketToolkit/Sources/RocketToolkit/NetworkModels/RocketLaunch+Conversion.swift
@@ -3,24 +3,15 @@
 //  Copyright © 2022 Matee. All rights reserved.
 //
 
+import ApolloAPI
 import SharedDomain
 
 // Conversion from NetworkModel to DomainModel
-extension RocketLaunchListQuery.Data.Launch.Launch {
+extension Rocket.RocketLaunchListQuery.Data.Launches.Launch {
     var domainModel: RocketLaunch {
-        RocketLaunch(
-            id: id,
-            site: site ?? ""
-        )
-    }
-}
-
-// Conversion from DomainModel to NetworkModel
-extension RocketLaunch {
-    var networkModel: RocketLaunchListQuery.Data.Launch.Launch {
         .init(
             id: id,
-            site: site
+            site: site ?? ""
         )
     }
 }
diff --git a/...er/Toolkits/RocketToolkit/Sources/RocketToolkit/Repositories/RocketLaunchRepository.swift b/...er/Toolkits/RocketToolkit/Sources/RocketToolkit/Repositories/RocketLaunchRepository.swift
@@ -14,11 +14,11 @@ public struct RocketLaunchRepositoryImpl: RocketLaunchRepository {
         self.graphQL = graphQLProvider
     }
 
-    public func read() -> AsyncThrowingStream<[RocketLaunch], Error> {
+    public func list() -> AsyncThrowingStream<[RocketLaunch], Error> {
         AsyncThrowingStream { continuation in
             Task {
                 do {
-                    for try await result in graphQL.fetch(query: RocketLaunchListQuery()) {
+                    for try await result in graphQL.fetch(query: Rocket.RocketLaunchListQuery()) {
                         guard let data = result.data else { return }
                         continuation.yield(data.launches.launches.compactMap { $0?.domainModel })
                     }

diff --git a/...taLayer/Toolkits/RocketToolkit/Tests/RocketToolkitTests/RocketLaunchRepositoryTests.swift b/...taLayer/Toolkits/RocketToolkit/Tests/RocketToolkitTests/RocketLaunchRepositoryTests.swift
@@ -4,9 +4,12 @@
 //
 
 import Apollo
+import ApolloAPI
+import ApolloTestSupport
 import GraphQLProvider
 import GraphQLProviderMocks
 @testable import RocketToolkit
+import RocketToolkitMocks
 import SharedDomain
 import SharedDomainMocks
 import XCTest
@@ -15,22 +18,25 @@ final class RocketLaunchRepositoryTests: XCTestCase {
 
     // MARK: Dependencies
 
-    private let graphQLProvider = GraphQLProviderMock<RocketLaunchListQuery>()
+    private let graphQLProvider = GraphQLProviderMock<Rocket.RocketLaunchListQuery>()
 
     private func createRepository() -> RocketLaunchRepository {
         RocketLaunchRepositoryImpl(graphQLProvider: graphQLProvider)
     }
 
     // MARK: Tests
 
-    func testRead() async throws {
+    func testList() async throws {
         let repository = createRepository()
-        let rocketLaunches = [RocketLaunch].stub.map { $0.networkModel }
-        let queryData = RocketLaunchListQuery.Data(launches: .init(cursor: "0", hasMore: true, launches: rocketLaunches))
+        let queryData = Rocket.RocketLaunchListQuery.Data.from(Mock<Query>(
+            launches: Mock<LaunchConnection>(
+                launches: [RocketLaunch].stub.map { Mock<Launch>(id: $0.id, site: $0.site) }
+            )
+        ))
         let queryResult = GraphQLResult(data: queryData, extensions: nil, errors: nil, source: .server, dependentKeys: nil)
         graphQLProvider.fetchReturnValues = [queryResult]
 
-        let rocketLaunchesStream = repository.read()
+        let rocketLaunchesStream = repository.list()
 
         for try await rocketLaunches in rocketLaunchesStream {
             XCTAssertEqual(rocketLaunches, [RocketLaunch].stub)

diff --git a/ios/DataLayer/Toolkits/RocketToolkit/apollo-codegen-config.json b/ios/DataLayer/Toolkits/RocketToolkit/apollo-codegen-config.json
@@ -0,0 +1,44 @@
+{
+  "schemaName": "rocket",
+  "schemaDownloadConfiguration": {
+    "downloadMethod": {
+      "introspection": {
+        "endpointURL": "https://apollo-fullstack-tutorial.herokuapp.com/graphql",
+        "httpMethod": {
+          "POST": {}
+        },
+        "includeDeprecatedInputValues": false,
+        "outputFormat": "SDL"
+      }
+    },
+    "downloadTimeout": 60,
+    "headers": [],
+    "outputPath": "../../Toolkits/RocketToolkit/schema.graphqls"
+  },
+  "input": {
+    "operationSearchPaths": [
+      "./Sources/RocketToolkit/NetworkQueries/*.graphql"
+    ],
+    "schemaSearchPaths": [
+      "./schema.graphqls"
+    ]
+  },
+  "output": {
+    "schemaTypes": {
+      "path": "./Sources/RocketToolkit/NetworkModels/Apollo",
+      "moduleType": {
+        "embeddedInTarget": {
+          "name": "RocketToolkit"
+        }
+      }
+    },
+    "operations": {
+      "inSchemaModule": {}
+    },
+    "testMocks": {
+      "absolute": {
+        "path": "./Sources/RocketToolkitMocks"
+      }
+    }
+  }
+}