Foundational Work For Codegen Rewrite

Apollo.podspec

@@ -21,7 +21,8 @@ Pod::Spec.new do |s|
   s.watchos.deployment_target = '5.0'
 
   s.subspec 'Core' do |ss|
-    ss.source_files = 'Sources/Apollo/*.swift','Sources/ApolloCore/*.swift'
+    ss.source_files = 'Sources/Apollo/*.swift','Sources/ApolloUtils/*.swift','Sources/ApolloAPI/*.swift'
+    ss.exclude_files = 'Sources/ApolloAPI/CodegenV1/*.swift'
     ss.preserve_paths = [
       'scripts/run-bundled-codegen.sh',
     ]

Apollo.xcodeproj/xcshareddata/xcschemes/ApolloModels.xcscheme

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1250"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DE058606266978A100265760"
+               BuildableName = "ApolloAPI.framework"
+               BlueprintName = "ApolloAPI"
+               ReferencedContainer = "container:Apollo.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "DE058606266978A100265760"
+            BuildableName = "ApolloAPI.framework"
+            BlueprintName = "ApolloAPI"
+            ReferencedContainer = "container:Apollo.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Apollo.xcodeproj/xcshareddata/xcschemes/ApolloCore.xcscheme → Apollo.xcodeproj/xcshareddata/xcschemes/ApolloUtils.xcscheme

@@ -15,8 +15,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "9B68353D2463481A00337AE6"
-               BuildableName = "ApolloCore.framework"
-               BlueprintName = "ApolloCore"
+               BuildableName = "ApolloUtils.framework"
+               BlueprintName = "ApolloUtils"
                ReferencedContainer = "container:Apollo.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -61,8 +61,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "9B68353D2463481A00337AE6"
-            BuildableName = "ApolloCore.framework"
-            BlueprintName = "ApolloCore"
+            BuildableName = "ApolloUtils.framework"
+            BlueprintName = "ApolloUtils"
             ReferencedContainer = "container:Apollo.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

Configuration/Apollo/Apollo-Target-ApolloCore.xcconfig → Configuration/Apollo/Apollo-Target-ApolloAPI.xcconfig

@@ -1,3 +1,3 @@
 #include "../Shared/Workspace-Universal-Framework.xcconfig"
 
-INFOPLIST_FILE = Sources/ApolloCore/Info.plist
+INFOPLIST_FILE = Sources/ApolloAPI/Info.plist

Configuration/Apollo/Apollo-Target-ApolloUtils.xcconfig

@@ -0,0 +1,3 @@
+#include "../Shared/Workspace-Universal-Framework.xcconfig"
+
+INFOPLIST_FILE = Sources/ApolloUtils/Info.plist

Package.swift

@@ -4,35 +4,38 @@
 import PackageDescription
 
 let package = Package(
-    name: "Apollo",
-    platforms: [
-      .iOS(.v12),
-      .macOS(.v10_14),
-      .tvOS(.v12),
-      .watchOS(.v5)
-    ],
-    products: [
-    .library(
-      name: "ApolloCore",
-      targets: ["ApolloCore"]),
+  name: "Apollo",
+  platforms: [
+    .iOS(.v12),
+    .macOS(.v10_14),
+    .tvOS(.v12),
+    .watchOS(.v5)
+  ],
+  products: [
     .library(
       name: "Apollo",
       targets: ["Apollo"]),
     .library(
-        name: "Apollo-Dynamic",
-        type: .dynamic,
-        targets: ["Apollo"]),
+      name: "ApolloAPI",
+      targets: ["ApolloAPI"]),
+    .library(
+      name: "ApolloUtils",
+      targets: ["ApolloUtils"]),
+    .library(
+      name: "Apollo-Dynamic",
+      type: .dynamic,
+      targets: ["Apollo"]),
     .library(
       name: "ApolloCodegenLib",
       targets: ["ApolloCodegenLib"]),
     .library(
-        name: "ApolloSQLite",
-        targets: ["ApolloSQLite"]),
+      name: "ApolloSQLite",
+      targets: ["ApolloSQLite"]),
     .library(
-        name: "ApolloWebSocket",
-        targets: ["ApolloWebSocket"]),
-    ],
-    dependencies: [
+      name: "ApolloWebSocket",
+      targets: ["ApolloWebSocket"]),
+  ],
+  dependencies: [
     .package(
       url: "https://github.com/stephencelis/SQLite.swift.git",
       .upToNextMinor(from: "0.12.2")),
@@ -45,26 +48,34 @@ let package = Package(
     .package(
       url: "https://github.com/apollographql/InflectorKit",
       .upToNextMinor(from: "0.0.2")),
-    ],
-    targets: [
+  ],
+  targets: [
     .target(
-      name: "ApolloCore",
-      dependencies: [],
+      name: "Apollo",
+      dependencies: [
+        "ApolloAPI",
+        "ApolloUtils"
+      ],
       exclude: [
         "Info.plist"
       ]),
     .target(
-      name: "Apollo",
-      dependencies: [
-        "ApolloCore",
-      ],
+      name: "ApolloAPI",
+      dependencies: [],
+      exclude: [
+        "Info.plist",
+        "CodegenV1"
+      ]),
+    .target(
+      name: "ApolloUtils",
+      dependencies: [],
       exclude: [
         "Info.plist"
       ]),
     .target(
       name: "ApolloCodegenLib",
       dependencies: [
-        "ApolloCore",
+        "ApolloUtils",
         .product(name: "InflectorKit", package: "InflectorKit"),
         .product(name: "Stencil", package: "Stencil"),
       ],
@@ -89,11 +100,11 @@ let package = Package(
       name: "ApolloWebSocket",
       dependencies: [
         "Apollo",
-        "ApolloCore",
+        "ApolloUtils",
         .product(name: "Starscream", package: "Starscream"),
       ],
       exclude: [
         "Info.plist"
       ])
-    ]
+  ]
 )

Sources/Apollo/Bundle+Helpers.swift

@@ -1,6 +1,6 @@
 import Foundation
 #if !COCOAPODS
-import ApolloCore
+import ApolloUtils
 #endif
 
 extension Bundle: ApolloCompatible {}

Sources/Apollo/CacheReference.swift

@@ -0,0 +1,22 @@
+import Foundation
+
+/// A reference to a cache record.
+public struct CacheReference {
+  public let key: String
+
+  public init(key: String) {
+    self.key = key
+  }
+}
+
+extension CacheReference: Equatable {
+  public static func ==(lhs: CacheReference, rhs: CacheReference) -> Bool {
+    return lhs.key == rhs.key
+  }
+}
+
+extension CacheReference: CustomStringConvertible {
+  public var description: String {
+    return "-> #\(key)"
+  }
+}

Sources/Apollo/Decoding.swift

@@ -34,7 +34,7 @@ private func decode(groupedFields: GroupedFields,
     fieldEntries.append((responseName, fieldEntry))
   }
 
-  return ResultMap(fieldEntries)
+  return ResultMap(fieldEntries, uniquingKeysWith: { (_, last) in last })
 }
 
 /// Before execution, the selection set is converted to a grouped field set. Each entry in the grouped field set is a list of fields that share a response key. This ensures all fields with the same response key (alias or field name) included via referenced fragments are executed at the same time.

Sources/Apollo/Dictionary+Helpers.swift

@@ -3,12 +3,3 @@ public extension Dictionary {
     lhs.merge(rhs) { (_, new) in new }
   }
 }
-
-extension Dictionary {
-  init<S: Sequence>(_ entries: S) where S.Iterator.Element == Element {
-    self = Dictionary(minimumCapacity: entries.underestimatedCount)
-    for (key, value) in entries {
-      self[key] = value
-    }
-  }
-}

Sources/Apollo/DispatchQueue+Optional.swift

@@ -1,6 +1,6 @@
 import Foundation
 #if !COCOAPODS
-import ApolloCore
+import ApolloUtils
 #endif
 
 extension DispatchQueue: ApolloCompatible {}

Sources/Apollo/GraphQLExecutor.swift

@@ -1,6 +1,6 @@
 import Foundation
 #if !COCOAPODS
-import ApolloCore
+import ApolloUtils
 #endif
 
 /// A field resolver is responsible for resolving a value for a field.
@@ -10,7 +10,7 @@ typealias GraphQLFieldResolver = (_ object: JSONObject, _ info: GraphQLResolveIn
 /// Because data may be loaded from a database, these loads are batched for performance reasons.
 /// By returning a `PossiblyDeferred` wrapper, we allow `ApolloStore` to use a `DataLoader` that
 /// will defer loading the next batch of records from the cache until they are needed.
-typealias ReferenceResolver = (Reference) -> PossiblyDeferred<JSONObject>
+typealias ReferenceResolver = (CacheReference) -> PossiblyDeferred<JSONObject>
 
 struct GraphQLResolveInfo {
   let variables: GraphQLMap?
@@ -312,7 +312,7 @@ final class GraphQLExecutor {
         try accumulator.accept(list: $0, info: info)
       }
     case .object:
-      if let reference = value as? Reference, let resolveReference = resolveReference {
+      if let reference = value as? CacheReference, let resolveReference = resolveReference {
         return resolveReference(reference).flatMap {
           self.complete(value: $0,
                         ofType: returnType,

Sources/Apollo/GraphQLGETTransformer.swift

@@ -1,6 +1,6 @@
 import Foundation
 #if !COCOAPODS
-import ApolloCore
+import ApolloUtils
 #endif
 
 public struct GraphQLGETTransformer {

Sources/Apollo/GraphQLQueryWatcher.swift

@@ -1,6 +1,6 @@
 import Foundation
 #if !COCOAPODS
-import ApolloCore
+import ApolloUtils
 #endif
 
 /// A `GraphQLQueryWatcher` is responsible for watching the store, and calling the result handler with a new result whenever any of the data the previous result depends on changes.

Sources/Apollo/GraphQLResponseGenerator.swift

@@ -1,5 +1,3 @@
-import Foundation
-
 final class GraphQLResponseGenerator: GraphQLResultAccumulator {
   func accept(scalar: JSONValue, info: GraphQLResolveInfo) -> JSONValue {
     return scalar
@@ -18,7 +16,7 @@ final class GraphQLResponseGenerator: GraphQLResultAccumulator {
   }
 
   func accept(fieldEntries: [(key: String, value: JSONValue)], info: GraphQLResolveInfo) -> JSONValue {
-    return JSONObject(fieldEntries)
+    return JSONObject(fieldEntries, uniquingKeysWith: { (_, last) in last })
   }
 
   func finish(rootValue: JSONValue, info: GraphQLResolveInfo) throws -> JSONObject {

Sources/Apollo/GraphQLResultNormalizer.swift

@@ -1,5 +1,3 @@
-import Foundation
-
 final class GraphQLResultNormalizer: GraphQLResultAccumulator {
   private var records: RecordSet = [:]
 
@@ -22,10 +20,10 @@ final class GraphQLResultNormalizer: GraphQLResultAccumulator {
   func accept(fieldEntries: [(key: String, value: JSONValue)], info: GraphQLResolveInfo) throws -> JSONValue {
     let cachePath = info.cachePath.joined
 
-    let object = JSONObject(fieldEntries)
+    let object = JSONObject(fieldEntries, uniquingKeysWith: { (_, last) in last })
     records.merge(record: Record(key: cachePath, object))
 
-    return Reference(key: cachePath)
+    return CacheReference(key: cachePath)
   }
 
   func finish(rootValue: JSONValue, info: GraphQLResolveInfo) throws -> RecordSet {

Sources/Apollo/GraphQLSelectionSet.swift

@@ -1,5 +1,5 @@
 #if !COCOAPODS
-import ApolloCore
+import ApolloAPI
 #endif
 
 public typealias ResultMap = [String: Any?]
@@ -29,6 +29,12 @@ extension GraphQLSelectionSet {
   }
 }
 
+/// For backwards compatibility with legacy codegen.
+/// The `GraphQLVariable` class has been replaced by `InputValue.variable`
+public func GraphQLVariable(_ name: String) -> InputValue {
+  return .variable(name)
+}
+
 public protocol GraphQLSelection {
 }
 
@@ -71,7 +77,7 @@ public struct FieldArguments: ExpressibleByDictionaryLiteral {
   let arguments: InputValue
 
   public init(dictionaryLiteral elements: (String, InputValue)...) {
-    arguments = .object(Dictionary(elements))
+    arguments = .object(Dictionary(elements, uniquingKeysWith: { (_, last) in last }))
   }
 
   public func evaluate(with variables: [String: JSONEncodable]?) throws -> JSONValue {