Merge branch 'main' into feature/defer-execution-networking

Author: calvincestari

Sources/CodegenCLI/Constants.swift

@@ -1,6 +1,6 @@
 import Foundation
 
 public enum Constants {
-  public static let CLIVersion: String = "1.9.2"
+  public static let CLIVersion: String = "1.9.3"
   static let defaultFilePath: String = "./apollo-codegen-config.json"
 }

Sources/CodegenCLI/Extensions/VersionChecker.swift

@@ -158,13 +158,14 @@ struct PackageResolvedModel {
   enum FileFormatVersion: Int {
     case v1 = 1
     case v2 = 2
+    case v3 = 3
 
     func getPackageList(fromPackageResolvedJSON json: [String: Any]) -> ObjectList? {
       switch self {
       case .v1:
         return (json["object"] as? Object)?["pins"] as? ObjectList
 
-      case .v2:
+      case .v2, .v3:
         return json["pins"] as? ObjectList
       }
     }
@@ -174,7 +175,7 @@ struct PackageResolvedModel {
       case .v1:
         return package["package"] as? String
 
-      case .v2:
+      case .v2, .v3:
         return package["identity"] as? String
       }
     }

Sources/GraphQLCompiler/JavaScript/package.json

@@ -24,9 +24,9 @@
     "@types/jest": "29.5.12",
     "common-tags": "1.8.2",
     "jest": "29.7.0",
-    "rollup": "4.13.0",
+    "rollup": "4.13.2",
     "@rollup/plugin-terser": "0.4.4",
     "ts-jest": "29.1.2",
-    "typescript": "5.4.2"
+    "typescript": "5.4.3"
   }
 }

Sources/IR/IR+EntitySelectionTree.swift

@@ -224,23 +224,6 @@ class EntitySelectionTree {
           targetSelections.mergeIn(scopeSelections, from: source)
         }
 
-        if let conditionalScopes = scopeConditions {
-          for (condition, node) in conditionalScopes {
-            guard !node.scope.isDeferred else { continue }
-
-            if scopePathNode.value.matches(condition) {
-              node.mergeSelections(
-                matchingScopePath: scopePathNode,
-                into: targetSelections,
-                transformingSelections: transformingSelections
-              )
-
-            } else {
-              targetSelections.addMergedInlineFragment(with: condition)
-            }
-          }
-        }
-
       case .none: break
       }
 
@@ -254,6 +237,8 @@ class EntitySelectionTree {
               into: targetSelections,
               transformingSelections: transformingSelections
             )
+          } else if case .selections = child {
+            targetSelections.addMergedInlineFragment(with: condition)
           }
         }
       }