fix: Defer metadata extensions (apollographql/apollo-ios-dev#581)

apollographql · Jan 22, 2025 · e4f12df · e4f12df
1 parent 4bc820e
commit e4f12df
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/Sources/ApolloCodegenLib/Templates/DeferredFragmentsMetadataTemplate.swift b/Sources/ApolloCodegenLib/Templates/DeferredFragmentsMetadataTemplate.swift
@@ -31,13 +31,11 @@ struct DeferredFragmentsMetadataTemplate {
 
     return """
 
-    // MARK: Deferred Fragment Metadata
+    // MARK: - Deferred Fragment Metadata
 
-    \(renderAccessControl())extension \(operation.generatedDefinitionName) {
-      \(DeferredFragmentIdentifiersTemplate(deferredFragmentPathTypeInfo))
+    \(DeferredFragmentIdentifiersTemplate(deferredFragmentPathTypeInfo))
 
-      \(DeferredFragmentsPropertyTemplate(deferredFragmentPathTypeInfo))
-    }
+    \(DeferredFragmentsPropertyTemplate(deferredFragmentPathTypeInfo))
     """
   }
 
@@ -61,7 +59,7 @@ struct DeferredFragmentsMetadataTemplate {
     _ deferredFragmentPathTypeInfo: [DeferredPathTypeInfo]
   ) -> TemplateString {
     """
-    static var deferredFragments: [DeferredFragmentIdentifier: any \(config.ApolloAPITargetName).SelectionSet.Type]? {[
+    public static var deferredFragments: [DeferredFragmentIdentifier: any \(config.ApolloAPITargetName).SelectionSet.Type]? {[
     \(deferredFragmentPathTypeInfo.map {
       return """
         DeferredFragmentIdentifiers.\($0.deferCondition.label): \($0.typeName).self,

diff --git a/Sources/ApolloCodegenLib/Templates/OperationDefinitionTemplate.swift b/Sources/ApolloCodegenLib/Templates/OperationDefinitionTemplate.swift
@@ -41,12 +41,12 @@ struct OperationDefinitionTemplate: OperationTemplateRenderer {
             renderAccessControl: { accessControlModifier(for: .member) }()
         ).renderBody())
       }
+      \(DeferredFragmentsMetadataTemplate(
+        operation: operation,
+        config: config,
+        renderAccessControl: { accessControlModifier(for: .parent) }()
+      ).render())
     }
-    \(DeferredFragmentsMetadataTemplate(
-      operation: operation,
-      config: config,
-      renderAccessControl: { accessControlModifier(for: .parent) }()
-    ).render())
 
     """)
   }