Squashed 'apollo-ios/' changes from 23904fc26..bf71e9c73

bf71e9c73 V1 selectionset equality merged fragment child fix (#833)
59319e8ab Merge branch 'v1' of https://github.com/apollographql/apollo-ios-dev into v1
4a0f032a8 Release 1.25.2 (#809)

git-subtree-dir: apollo-ios
git-subtree-split: bf71e9c7373f68b9f5b8d1b9cdf810ebb4e0bf68

Author: gh-action-runner

Sources/ApolloAPI/SelectionSet+Equatable.swift

@@ -55,40 +55,69 @@ public extension SelectionSet {
 
   private func fieldsForEquality() -> [String: FieldValue] {
     var fields: [String: FieldValue] = [:]
-    if let asTypeCase = self as? any InlineFragment {
-      self.addFulfilledSelections(of: type(of: asTypeCase.asRootEntityType), to: &fields)
+    var addedFragments: Set<ObjectIdentifier> = []
 
-    } else {
-      self.addFulfilledSelections(of: type(of: self), to: &fields)
+    for fragment in type(of: self).__fulfilledFragments {
+      self.addFulfilledSelections(of: fragment, to: &fields, addedFragments: &addedFragments)
     }
 
     return fields
   }
 
   private func addFulfilledSelections(
     of selectionSetType: any SelectionSet.Type,
-    to fields: inout [String: FieldValue]
+    to fields: inout [String: FieldValue],
+    addedFragments: inout Set<ObjectIdentifier>
   ) {
-    guard self.__data.fragmentIsFulfilled(selectionSetType) else {
+    let selectionSetTypeId = ObjectIdentifier(selectionSetType)
+    guard !addedFragments.contains(selectionSetTypeId),
+          self.__data.fragmentIsFulfilled(selectionSetType) else {
       return
     }
 
+    addedFragments.insert(selectionSetTypeId)
+
     for selection in selectionSetType.__selections {
       switch selection {
       case let .field(field):
         add(field: field, to: &fields)
 
       case let .inlineFragment(typeCase):
-        self.addFulfilledSelections(of: typeCase, to: &fields)
+        self.addFulfilledSelections(of: typeCase, to: &fields, addedFragments: &addedFragments)
 
       case let .conditional(_, selections):
-        self.addConditionalSelections(selections, to: &fields)
+        self.addConditionalSelections(selections, to: &fields, addedFragments: &addedFragments)
 
       case let .fragment(fragmentType):
-        self.addFulfilledSelections(of: fragmentType, to: &fields)
+        self.addFulfilledSelections(of: fragmentType, to: &fields, addedFragments: &addedFragments)
 
       case let .deferred(_, fragmentType, _):
-        self.addFulfilledSelections(of: fragmentType, to: &fields)
+        self.addFulfilledSelections(of: fragmentType, to: &fields, addedFragments: &addedFragments)
+      }
+    }
+  }
+
+  private func addConditionalSelections(
+    _ selections: [Selection],
+    to fields: inout [String: FieldValue],
+    addedFragments: inout Set<ObjectIdentifier>
+  ) {
+    for selection in selections {
+      switch selection {
+      case let .inlineFragment(typeCase):
+        self.addFulfilledSelections(of: typeCase, to: &fields, addedFragments: &addedFragments)
+
+      case let .fragment(fragment):
+        self.addFulfilledSelections(of: fragment, to: &fields, addedFragments: &addedFragments)
+
+      case let .deferred(_, fragment, _):
+        self.addFulfilledSelections(of: fragment, to: &fields, addedFragments: &addedFragments)
+
+      case let .conditional(_, selections):
+        addConditionalSelections(selections, to: &fields, addedFragments: &addedFragments)
+
+      case let .field(field):
+        add(field: field, to: &fields)
       }
     }
   }
@@ -177,30 +206,6 @@ public extension SelectionSet {
 
   }
 
-  private func addConditionalSelections(
-    _ selections: [Selection],
-    to fields: inout [String: FieldValue]
-  ) {
-    for selection in selections {
-      switch selection {
-      case let .inlineFragment(typeCase):
-        self.addFulfilledSelections(of: typeCase, to: &fields)
-
-      case let .fragment(fragment):
-        self.addFulfilledSelections(of: fragment, to: &fields)
-
-      case let .deferred(_, fragment, _):
-        self.addFulfilledSelections(of: fragment, to: &fields)
-
-      case let .conditional(_, selections):
-        addConditionalSelections(selections, to: &fields)
-
-      case let .field(field):
-        add(field: field, to: &fields)
-      }
-    }
-  }
-
 }
 
 extension Hasher {

Sources/ApolloAPI/SelectionSet.swift

@@ -49,7 +49,7 @@ public protocol CompositeInlineFragment: CompositeSelectionSet, InlineFragment {
 public protocol SelectionSet: Hashable, CustomDebugStringConvertible {
   associatedtype Schema: SchemaMetadata
 
-  /// A type representing all of the fragments the `SelectionSet` can be converted to.
+  /// A type representing all of the named fragments the `SelectionSet` can be converted to.
   /// Defaults to a stub type with no fragments.
   /// A `SelectionSet` with fragments should provide a type that conforms to `FragmentContainer`
   associatedtype Fragments = NoFragments
@@ -61,6 +61,12 @@ public protocol SelectionSet: Hashable, CustomDebugStringConvertible {
   /// This may be a concrete type (`Object`) or an abstract type (`Interface`, or `Union`).
   static var __parentType: any ParentType { get }
 
+  /// The fragments whose selections are always fulfilled on a valid instance of the `SelectionSet`.
+  static var __fulfilledFragments: [any SelectionSet.Type] { get }
+
+  /// The deferred fragments that may be fulfilled on a valid instance of the `SelectionSet`.
+  static var __deferredFragments: [any Deferrable.Type] { get }
+
   /// The data of the underlying GraphQL object represented by the generated selection set.
   var __data: DataDict { get }
 
@@ -86,6 +92,8 @@ extension SelectionSet {
 
   @inlinable public static var __selections: [Selection] { [] }
 
+  @inlinable public static var __deferredFragments: [any Deferrable.Type] { [] }
+
   @inlinable public var __objectType: Object? {
     guard let __typename else { return nil }
     return Schema.objectType(forTypename: __typename)
@@ -113,6 +121,27 @@ extension SelectionSet {
   public var debugDescription: String {
     return "\(self.__data._data as AnyObject)"
   }
+
+  // MARK: - Internal
+
+  @_spi(Internal)
+  @inlinable public static var __fulfilledFragmentIds: Set<ObjectIdentifier> {
+    Set(Self.__fulfilledFragments.map(ObjectIdentifier.init))
+  }
+
+  @_spi(Internal)
+  @inlinable public static var __deferredFragmentIds: Set<ObjectIdentifier> {
+    Set(Self.__fulfilledFragments.map(ObjectIdentifier.init))
+  }
+
+  public init(unsafelyWithData data: [String: JSONValue]) {
+    self.init(_dataDict: DataDict(
+      data: data,
+      fulfilledFragments: Self.__fulfilledFragmentIds,
+      deferredFragments: Self.__deferredFragmentIds
+    ))
+  }
+
 }
 
 extension SelectionSet where Fragments: FragmentContainer {