Skip to content
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

Jump to bottom

Refactor processSelectionSet field flattening to allow @client and @defer directives on fragment spreads #8951

Merged
merged 15 commits into from
Oct 22, 2021
Merged

Refactor processSelectionSet field flattening to allow @client and @defer directives on fragment spreads #8951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9cfe989
Improve error/warning detection in writeToStore.ts tests.
benjamn Oct 18, 2021
76266a1
Flatten selection set fields before processing them.
benjamn Oct 14, 2021
f8ccf8d
Generalize `@client` directive support to handle `@defer` too.
benjamn Oct 18, 2021
ac84361
Take full advantage of flattenFields returning only FieldNodes.
benjamn Oct 18, 2021
d88fdf2
Rename incomingFields variable to avoid confusion with fieldNodeSet.
benjamn Oct 18, 2021
90a1c40
Refactor writeToStore `@client` tests to make testing `@defer` easy.
benjamn Oct 20, 2021
aaeabb9
Test flattenFields with `@defer` (without `@client`).
benjamn Oct 20, 2021
7dc9e2e
Add tests of flattenFields mixing `@client` and `@defer` directives.
benjamn Oct 20, 2021
990f61b
Inline include and matchFragment callbacks into flattenFields.
benjamn Oct 21, 2021
065d33c
Pass WriteContext recursively through flatten function.
benjamn Oct 21, 2021
b8872b4
Respect `@defer(if: boolean)` argument in flattenFields.
benjamn Oct 21, 2021
be3e44c
Make flattenFields context type generic.
benjamn Oct 22, 2021
494b66c
Reset context.{clientOnly,deferred} for nested selection sets.
benjamn Oct 22, 2021
2b65237
Ensure `@defer(if: false)` leaves `context.deferred` unchanged.
benjamn Oct 22, 2021
8f5708a
Bump bundlesize limit to 28.25kB (now 28.23kB).
benjamn Oct 18, 2021
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
{
"name": "apollo-client",
"path": "./dist/apollo-client.min.cjs",
"maxSize": "28.0 kB"
"maxSize": "28.25 kB"
}
],
"engines": {
Expand Down
46 changes: 25 additions & 21 deletions src/cache/inmemory/__tests__/__snapshots__/writeToStore.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ Object {
}
`;

exports[`writing to the store "Cache data maybe lost..." warnings should not warn when scalar fields are updated 3`] = `[MockFunction]`;

exports[`writing to the store correctly merges fragment fields along multiple paths 1`] = `
Object {
"Item:0f47f85d-8081-466e-9121-c94069a77c3e": Object {
Expand Down Expand Up @@ -72,19 +74,6 @@ Object {
exports[`writing to the store should not keep reference when type of mixed inlined field changes to non-inlined field 1`] = `
[MockFunction] {
"calls": Array [
Array [
"Missing field 'price' while writing result {
\\"id\\": \\"1\\",
\\"name\\": \\"Todo 1\\",
\\"description\\": \\"Description 1\\",
\\"__typename\\": \\"ShoppingCartItem\\"
}",
],
Array [
"Missing field 'expensive' while writing result {
\\"id\\": 1
}",
],
Array [
"Missing field 'id' while writing result {
\\"__typename\\": \\"Cat\\",
Expand All @@ -97,14 +86,6 @@ exports[`writing to the store should not keep reference when type of mixed inlin
"type": "return",
"value": undefined,
},
Object {
"type": "return",
"value": undefined,
},
Object {
"type": "return",
"value": undefined,
},
],
}
`;
Expand Down Expand Up @@ -218,6 +199,29 @@ Object {
}
`;

exports[`writing to the store writeResultToStore shape checking should not warn if a field is defered 1`] = `[MockFunction]`;

exports[`writing to the store writeResultToStore shape checking should warn when it receives the wrong data inside a fragment 1`] = `
[MockFunction] {
"calls": Array [
Array [
"Missing field 'price' while writing result {
\\"id\\": \\"1\\",
\\"name\\": \\"Todo 1\\",
\\"description\\": \\"Description 1\\",
\\"__typename\\": \\"ShoppingCartItem\\"
}",
],
],
"results": Array [
Object {
"type": "return",
"value": undefined,
},
],
}
`;

exports[`writing to the store writeResultToStore shape checking should warn when it receives the wrong data with non-union fragments 1`] = `
[MockFunction] {
"calls": Array [
Expand Down
Loading