Skip to content

Commit ddbe228

Browse files
gh-action-runnergh-action-runner
authored andcommitted
Squashed 'apollo-ios-codegen/' changes from 4bc820e4..e4f12df6
e4f12df6 fix: Defer metadata extensions (#581) git-subtree-dir: apollo-ios-codegen git-subtree-split: e4f12df6f713fd15c19e734c9c6300fb0c1e4db5
1 parent b5ec699 commit ddbe228

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

Sources/ApolloCodegenLib/Templates/DeferredFragmentsMetadataTemplate.swift

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,11 @@ struct DeferredFragmentsMetadataTemplate {
3131

3232
return """
3333
34-
// MARK: Deferred Fragment Metadata
34+
// MARK: - Deferred Fragment Metadata
3535
36-
\(renderAccessControl())extension \(operation.generatedDefinitionName) {
37-
\(DeferredFragmentIdentifiersTemplate(deferredFragmentPathTypeInfo))
36+
\(DeferredFragmentIdentifiersTemplate(deferredFragmentPathTypeInfo))
3837
39-
\(DeferredFragmentsPropertyTemplate(deferredFragmentPathTypeInfo))
40-
}
38+
\(DeferredFragmentsPropertyTemplate(deferredFragmentPathTypeInfo))
4139
"""
4240
}
4341

@@ -61,7 +59,7 @@ struct DeferredFragmentsMetadataTemplate {
6159
_ deferredFragmentPathTypeInfo: [DeferredPathTypeInfo]
6260
) -> TemplateString {
6361
"""
64-
static var deferredFragments: [DeferredFragmentIdentifier: any \(config.ApolloAPITargetName).SelectionSet.Type]? {[
62+
public static var deferredFragments: [DeferredFragmentIdentifier: any \(config.ApolloAPITargetName).SelectionSet.Type]? {[
6563
\(deferredFragmentPathTypeInfo.map {
6664
return """
6765
DeferredFragmentIdentifiers.\($0.deferCondition.label): \($0.typeName).self,

Sources/ApolloCodegenLib/Templates/OperationDefinitionTemplate.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ struct OperationDefinitionTemplate: OperationTemplateRenderer {
4141
renderAccessControl: { accessControlModifier(for: .member) }()
4242
).renderBody())
4343
}
44+
\(DeferredFragmentsMetadataTemplate(
45+
operation: operation,
46+
config: config,
47+
renderAccessControl: { accessControlModifier(for: .parent) }()
48+
).render())
4449
}
45-
\(DeferredFragmentsMetadataTemplate(
46-
operation: operation,
47-
config: config,
48-
renderAccessControl: { accessControlModifier(for: .parent) }()
49-
).render())
5050
5151
""")
5252
}

0 commit comments

Comments
 (0)