-
Notifications
You must be signed in to change notification settings - Fork 56
fix(requestflag): preserve CLI precedence for inner flags #116
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
Open
sylvesterkaczmarek
wants to merge
2
commits into
openai:main
Choose a base branch
from
sylvesterkaczmarek:fix/inner-flag-stdin-precedence
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+80
−6
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package requestflag | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/urfave/cli/v3" | ||
| ) | ||
|
|
||
| func TestInnerFlagCLIValueBeatsPipedData(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| outer := &Flag[map[string]any]{ | ||
| Name: "address", | ||
| BodyPath: "address", | ||
| } | ||
| assert.NoError(t, outer.PreParse()) | ||
|
|
||
| cityInner := &InnerFlag[string]{ | ||
| Name: "address.city", | ||
| InnerField: "city", | ||
| OuterFlag: outer, | ||
| } | ||
| assert.NoError(t, cityInner.Set("address.city", "cli-value")) | ||
| assert.True(t, cityInner.IsSet()) | ||
|
|
||
| data := map[string]any{ | ||
| "address": map[string]any{"city": "piped-value"}, | ||
| } | ||
| cmd := &cli.Command{Flags: []cli.Flag{outer, cityInner}} | ||
| assert.NoError(t, ApplyStdinDataToFlags(cmd, data)) | ||
|
|
||
| outerVal, ok := outer.Get().(map[string]any) | ||
| assert.True(t, ok) | ||
| assert.Equal(t, "cli-value", outerVal["city"]) | ||
| } |
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
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.
When a repeatable array-of-objects flag creates a second element, an inner flag used on the first element remains globally set. For example, after setting
context-management.compact-thresholdon the first entry and starting a second entry with anothercontext-management.type, pipedcontext_management.compact_thresholdis now skipped becauseapplyStdinDataToFlagschecksIsSet()beforeinnerFieldIsSet()can see that the trailing element lacks the field. This regresses the existing per-trailing-element merge behavior; track explicit state per element or retain theinnerFieldIsSetdecision for array-backed inner flags.AGENTS.md reference: AGENTS.md:L15-L18
Useful? React with 👍 / 👎.
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.
Fixed in 65a9973. Inner flags now check per-element outer state before the generic
IsSet()gate, so stdin can fill an unset field on a later array element without overriding an explicitly set field on that element. Added a two-element regression; focused requestflag tests pass.