-
Notifications
You must be signed in to change notification settings - Fork 2.9k
fix: apply query variable defaults when undefined is passed explicitly #13364
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.
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
jerelmiller
merged 4 commits into
apollographql:main
from
atharv-sys32:fix/undefined-variable-defaults
Jul 29, 2026
+62
−4
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
4411bea
fix: apply query variable defaults when undefined is passed explicitly
atharv-sys32 60ae980
fix: use compact utility, add tests for omitted variables, add changeset
atharv-sys32 96b76ec
Update .changeset/pink-shoes-cheer.md
jerelmiller ecd2e19
Formatting
jerelmiller File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -204,9 +204,12 @@ export class StoreReader { | |||||||||||||||||||||||||
| }: DiffQueryAgainstStoreOptions): Cache.DiffResult<T> { | ||||||||||||||||||||||||||
| const policies = this.config.cache.policies; | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| const rawVariables = variables ?? {}; | ||||||||||||||||||||||||||
| variables = { | ||||||||||||||||||||||||||
| ...getDefaultValues(getQueryDefinition(query)), | ||||||||||||||||||||||||||
| ...variables!, | ||||||||||||||||||||||||||
| ...Object.fromEntries( | ||||||||||||||||||||||||||
| Object.entries(rawVariables).filter(([, v]) => v !== undefined) | ||||||||||||||||||||||||||
| ), | ||||||||||||||||||||||||||
| }; | ||||||||||||||||||||||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Rather than spreading variables, then spreading it again (with a filter applied), lets instead use the
Suggested change
|
||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| const rootRef = makeReference(rootId); | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great test! Can we also verify it correctly uses defaults if
showis omitted altogether as well? I don't think we have any other test in this suite that verifies that. That just makes sure we don't add any regressions there as well 🙂There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the test doesn't work at all since the
fieldhas no value in thestore. So even ifshow: truewas used (or defaulted), the query would return only{ id: "abcd" }as the result?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ab-pm the
readQueryFromStorehelper that this test uses setsreturnPartialData: falseby default so if@includereally weren't evaluated, the result would benullinstead of{ id: "abcd" }due to the result being a partial result. I think its ok 🙂