Skip to content

filter objects in getter to only include known typenames #656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbaxleyiii merged 1 commit into from
Aug 5, 2019
Merged

filter objects in getter to only include known typenames #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions packages/apollo-codegen-swift/src/__tests__/__snapshots__/codeGeneration.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,9 @@ exports[`Swift code generation #structDeclarationForFragment() should generate a
/// The friends of the character, or an empty list if they have none
public var friends: [Friend?]? {
get {
return (resultMap[\\"friends\\"] as? [ResultMap?]).flatMap { (value: [ResultMap?]) -> [Friend?] in value.map { (value: ResultMap?) -> Friend? in value.flatMap { (value: ResultMap) -> Friend in Friend(unsafeResultMap: value) } } }
return (resultMap[\\"friends\\"] as? [ResultMap?]).flatMap { (value: [ResultMap?]) -> [Friend?] in value.map { (value: ResultMap?) -> Friend? in value.flatMap { (value: ResultMap) -> Friend in Friend(unsafeResultMap: value) } } }.filter({
Friend.possibleTypes.contains($0.__typename)
})
}
set {
resultMap.updateValue(newValue.flatMap { (value: [Friend?]) -> [ResultMap?] in value.map { (value: Friend?) -> ResultMap? in value.flatMap { (value: Friend) -> ResultMap in value.resultMap } } }, forKey: \\"friends\\")
Expand Down Expand Up @@ -967,7 +969,9 @@ exports[`Swift code generation #structDeclarationForSelectionSet() should genera
/// The friends of the character, or an empty list if they have none
public var friends: [Friend?]? {
get {
return (resultMap[\\"friends\\"] as? [ResultMap?]).flatMap { (value: [ResultMap?]) -> [Friend?] in value.map { (value: ResultMap?) -> Friend? in value.flatMap { (value: ResultMap) -> Friend in Friend(unsafeResultMap: value) } } }
return (resultMap[\\"friends\\"] as? [ResultMap?]).flatMap { (value: [ResultMap?]) -> [Friend?] in value.map { (value: ResultMap?) -> Friend? in value.flatMap { (value: ResultMap) -> Friend in Friend(unsafeResultMap: value) } } }.filter({
Friend.possibleTypes.contains($0.__typename)
})
}
set {
resultMap.updateValue(newValue.flatMap { (value: [Friend?]) -> [ResultMap?] in value.map { (value: Friend?) -> ResultMap? in value.flatMap { (value: Friend) -> ResultMap in value.resultMap } } }, forKey: \\"friends\\")
Expand Down
10 changes: 9 additions & 1 deletion packages/apollo-codegen-swift/src/codeGeneration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,15 @@ export class SwiftAPIGenerator extends SwiftGenerator<CompilerContext> {
expression,
"ResultMap",
structName
)}`
)}.filter`
);
this.withinBlock(
() =>
this.printOnNewline(
`${structName}.possibleTypes.contains($0.__typename)`
),
"({",
"})"
);
});
this.printOnNewline("set");
Expand Down
⚡