GraphQLExecutionSource/DataDict/ObjectData Refactor

Apollo.podspec

@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
   CMD
 
   s.subspec 'Core' do |ss|
-    ss.source_files = 'Sources/Apollo/*.swift','Sources/ApolloAPI/**/*.swift'
+    ss.source_files = 'Sources/Apollo/**/*.swift','Sources/ApolloAPI/**/*.swift'
   end
 
   # Apollo provides exactly one persistent cache out-of-the-box, as a reasonable default choice for

Apollo.xcodeproj/xcshareddata/xcbaselines/9F54C8B3255D760B0065AFD6.xcbaseline/338A066C-BE46-4734-9F59-1E548A68950C.plist

@@ -6,6 +6,16 @@
 	<dict>
 		<key>ParsingPerformanceTests</key>
 		<dict>
+			<key>testMultipartResponseParsingInterceptor()</key>
+			<dict>
+				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
+				<dict>
+					<key>baselineAverage</key>
+					<real>0.018400</real>
+					<key>baselineIntegrationDisplayName</key>
+					<string>Local Baseline</string>
+				</dict>
+			</dict>
 			<key>testParseResult()</key>
 			<dict>
 				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>

Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/ClassroomPetDetails.graphql.swift

@@ -53,12 +53,14 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
   public init(
     __typename: String
   ) {
-    self.init(_dataDict: DataDict(data: [
-      "__typename": __typename,
-      "__fulfilled": Set([
+    self.init(_dataDict: DataDict(
+      data: [
+        "__typename": __typename,
+      ],
+      fulfilledFragments: [
         ObjectIdentifier(Self.self)
-      ])
-    ]))
+      ]
+    ))
   }
 
   /// AsAnimal
@@ -80,14 +82,16 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
       __typename: String,
       species: String
     ) {
-      self.init(_dataDict: DataDict(data: [
-        "__typename": __typename,
-        "species": species,
-        "__fulfilled": Set([
+      self.init(_dataDict: DataDict(
+        data: [
+          "__typename": __typename,
+          "species": species,
+        ],
+        fulfilledFragments: [
           ObjectIdentifier(Self.self),
           ObjectIdentifier(ClassroomPetDetails.self)
-        ])
-      ]))
+        ]
+      ))
     }
   }
 
@@ -110,14 +114,16 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
       __typename: String,
       humanName: String? = nil
     ) {
-      self.init(_dataDict: DataDict(data: [
-        "__typename": __typename,
-        "humanName": humanName,
-        "__fulfilled": Set([
+      self.init(_dataDict: DataDict(
+        data: [
+          "__typename": __typename,
+          "humanName": humanName,
+        ],
+        fulfilledFragments: [
           ObjectIdentifier(Self.self),
           ObjectIdentifier(ClassroomPetDetails.self)
-        ])
-      ]))
+        ]
+      ))
     }
   }
 
@@ -142,15 +148,17 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
       laysEggs: Bool,
       species: String
     ) {
-      self.init(_dataDict: DataDict(data: [
-        "__typename": __typename,
-        "laysEggs": laysEggs,
-        "species": species,
-        "__fulfilled": Set([
+      self.init(_dataDict: DataDict(
+        data: [
+          "__typename": __typename,
+          "laysEggs": laysEggs,
+          "species": species,
+        ],
+        fulfilledFragments: [
           ObjectIdentifier(Self.self),
           ObjectIdentifier(ClassroomPetDetails.self)
-        ])
-      ]))
+        ]
+      ))
     }
   }
 
@@ -181,18 +189,20 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
       humanName: String? = nil,
       laysEggs: Bool
     ) {
-      self.init(_dataDict: DataDict(data: [
-        "__typename": AnimalKingdomAPI.Objects.Cat.typename,
-        "bodyTemperature": bodyTemperature,
-        "isJellicle": isJellicle,
-        "species": species,
-        "humanName": humanName,
-        "laysEggs": laysEggs,
-        "__fulfilled": Set([
+      self.init(_dataDict: DataDict(
+        data: [
+          "__typename": AnimalKingdomAPI.Objects.Cat.typename,
+          "bodyTemperature": bodyTemperature,
+          "isJellicle": isJellicle,
+          "species": species,
+          "humanName": humanName,
+          "laysEggs": laysEggs,
+        ],
+        fulfilledFragments: [
           ObjectIdentifier(Self.self),
           ObjectIdentifier(ClassroomPetDetails.self)
-        ])
-      ]))
+        ]
+      ))
     }
   }
 
@@ -220,17 +230,19 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
       humanName: String? = nil,
       laysEggs: Bool
     ) {
-      self.init(_dataDict: DataDict(data: [
-        "__typename": AnimalKingdomAPI.Objects.Bird.typename,
-        "wingspan": wingspan,
-        "species": species,
-        "humanName": humanName,
-        "laysEggs": laysEggs,
-        "__fulfilled": Set([
+      self.init(_dataDict: DataDict(
+        data: [
+          "__typename": AnimalKingdomAPI.Objects.Bird.typename,
+          "wingspan": wingspan,
+          "species": species,
+          "humanName": humanName,
+          "laysEggs": laysEggs,
+        ],
+        fulfilledFragments: [
           ObjectIdentifier(Self.self),
           ObjectIdentifier(ClassroomPetDetails.self)
-        ])
-      ]))
+        ]
+      ))
     }
   }
 
@@ -254,15 +266,17 @@ public struct ClassroomPetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
       favoriteToy: String,
       humanName: String? = nil
     ) {
-      self.init(_dataDict: DataDict(data: [
-        "__typename": AnimalKingdomAPI.Objects.PetRock.typename,
-        "favoriteToy": favoriteToy,
-        "humanName": humanName,
-        "__fulfilled": Set([
+      self.init(_dataDict: DataDict(
+        data: [
+          "__typename": AnimalKingdomAPI.Objects.PetRock.typename,
+          "favoriteToy": favoriteToy,
+          "humanName": humanName,
+        ],
+        fulfilledFragments: [
           ObjectIdentifier(Self.self),
           ObjectIdentifier(ClassroomPetDetails.self)
-        ])
-      ]))
+        ]
+      ))
     }
   }
 }

Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/ClassroomPetDetailsCCN.graphql.swift

@@ -30,12 +30,14 @@ public struct ClassroomPetDetailsCCN: AnimalKingdomAPI.SelectionSet, Fragment {
   public init(
     __typename: String
   ) {
-    self.init(_dataDict: DataDict(data: [
-      "__typename": __typename,
-      "__fulfilled": Set([
+    self.init(_dataDict: DataDict(
+      data: [
+        "__typename": __typename,
+      ],
+      fulfilledFragments: [
         ObjectIdentifier(Self.self)
-      ])
-    ]))
+      ]
+    ))
   }
 
   /// AsAnimal
@@ -57,14 +59,16 @@ public struct ClassroomPetDetailsCCN: AnimalKingdomAPI.SelectionSet, Fragment {
       __typename: String,
       height: Height
     ) {
-      self.init(_dataDict: DataDict(data: [
-        "__typename": __typename,
-        "height": height._fieldData,
-        "__fulfilled": Set([
+      self.init(_dataDict: DataDict(
+        data: [
+          "__typename": __typename,
+          "height": height._fieldData,
+        ],
+        fulfilledFragments: [
           ObjectIdentifier(Self.self),
           ObjectIdentifier(ClassroomPetDetailsCCN.self)
-        ])
-      ]))
+        ]
+      ))
     }
 
     /// AsAnimal.Height
@@ -85,13 +89,15 @@ public struct ClassroomPetDetailsCCN: AnimalKingdomAPI.SelectionSet, Fragment {
       public init(
         inches: Int
       ) {
-        self.init(_dataDict: DataDict(data: [
-          "__typename": AnimalKingdomAPI.Objects.Height.typename,
-          "inches": inches,
-          "__fulfilled": Set([
+        self.init(_dataDict: DataDict(
+          data: [
+            "__typename": AnimalKingdomAPI.Objects.Height.typename,
+            "inches": inches,
+          ],
+          fulfilledFragments: [
             ObjectIdentifier(Self.self)
-          ])
-        ]))
+          ]
+        ))
       }
     }
   }

Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/DogFragment.graphql.swift

@@ -25,12 +25,14 @@ public struct DogFragment: AnimalKingdomAPI.SelectionSet, Fragment {
   public init(
     species: String
   ) {
-    self.init(_dataDict: DataDict(data: [
-      "__typename": AnimalKingdomAPI.Objects.Dog.typename,
-      "species": species,
-      "__fulfilled": Set([
+    self.init(_dataDict: DataDict(
+      data: [
+        "__typename": AnimalKingdomAPI.Objects.Dog.typename,
+        "species": species,
+      ],
+      fulfilledFragments: [
         ObjectIdentifier(Self.self)
-      ])
-    ]))
+      ]
+    ))
   }
 }

Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/HeightInMeters.graphql.swift

@@ -29,13 +29,15 @@ public struct HeightInMeters: AnimalKingdomAPI.SelectionSet, Fragment {
     __typename: String,
     height: Height
   ) {
-    self.init(_dataDict: DataDict(data: [
-      "__typename": __typename,
-      "height": height._fieldData,
-      "__fulfilled": Set([
+    self.init(_dataDict: DataDict(
+      data: [
+        "__typename": __typename,
+        "height": height._fieldData,
+      ],
+      fulfilledFragments: [
         ObjectIdentifier(Self.self)
-      ])
-    ]))
+      ]
+    ))
   }
 
   /// Height
@@ -56,13 +58,15 @@ public struct HeightInMeters: AnimalKingdomAPI.SelectionSet, Fragment {
     public init(
       meters: Int
     ) {
-      self.init(_dataDict: DataDict(data: [
-        "__typename": AnimalKingdomAPI.Objects.Height.typename,
-        "meters": meters,
-        "__fulfilled": Set([
+      self.init(_dataDict: DataDict(
+        data: [
+          "__typename": AnimalKingdomAPI.Objects.Height.typename,
+          "meters": meters,
+        ],
+        fulfilledFragments: [
           ObjectIdentifier(Self.self)
-        ])
-      ]))
+        ]
+      ))
     }
   }
 }

Sources/AnimalKingdomAPI/AnimalKingdomAPI/Sources/Fragments/PetDetails.graphql.swift

@@ -37,15 +37,17 @@ public struct PetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
     favoriteToy: String,
     owner: Owner? = nil
   ) {
-    self.init(_dataDict: DataDict(data: [
-      "__typename": __typename,
-      "humanName": humanName,
-      "favoriteToy": favoriteToy,
-      "owner": owner._fieldData,
-      "__fulfilled": Set([
+    self.init(_dataDict: DataDict(
+      data: [
+        "__typename": __typename,
+        "humanName": humanName,
+        "favoriteToy": favoriteToy,
+        "owner": owner._fieldData,
+      ],
+      fulfilledFragments: [
         ObjectIdentifier(Self.self)
-      ])
-    ]))
+      ]
+    ))
   }
 
   /// Owner
@@ -66,13 +68,15 @@ public struct PetDetails: AnimalKingdomAPI.SelectionSet, Fragment {
     public init(
       firstName: String
     ) {
-      self.init(_dataDict: DataDict(data: [
-        "__typename": AnimalKingdomAPI.Objects.Human.typename,
-        "firstName": firstName,
-        "__fulfilled": Set([
+      self.init(_dataDict: DataDict(
+        data: [
+          "__typename": AnimalKingdomAPI.Objects.Human.typename,
+          "firstName": firstName,
+        ],
+        fulfilledFragments: [
           ObjectIdentifier(Self.self)
-        ])
-      ]))
+        ]
+      ))
     }
   }
 }