chore: add builder for keeping track of references found #76
There are no files selected for viewing
This file contains 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 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 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 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 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,96 @@ | ||
| package flags | ||
|
|
||
| import ( | ||
| "sort" | ||
| "strings" | ||
| ) | ||
|
|
||
| type ReferenceBuilder struct { | ||
| max int // maximum number of flags to find | ||
| flagsAdded map[string][]string | ||
| flagsRemoved map[string][]string | ||
| foundFlags map[string]struct{} | ||
| } | ||
|
|
||
| func NewReferenceBuilder(max int) *ReferenceBuilder { | ||
| return &ReferenceBuilder{ | ||
| flagsAdded: make(map[string][]string), | ||
| flagsRemoved: make(map[string][]string), | ||
| foundFlags: make(map[string]struct{}), | ||
| max: max, | ||
| } | ||
| } | ||
|
|
||
| func (b *ReferenceBuilder) MaxReferences() bool { | ||
| return len(b.foundFlags) >= b.max | ||
| } | ||
|
|
||
| func (b *ReferenceBuilder) AddReference(flagKey string, op string, aliases []string) { | ||
| if op == "+" { | ||
| b.AddedFlag(flagKey, aliases) | ||
| } else if op == "-" { | ||
| b.RemovedFlag(flagKey, aliases) | ||
| } | ||
| // ignore | ||
jazanne marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| func (b *ReferenceBuilder) AddedFlag(flagKey string, aliases []string) { | ||
| b.foundFlags[flagKey] = struct{}{} | ||
| if _, ok := b.flagsAdded[flagKey]; !ok { | ||
| b.flagsAdded[flagKey] = make([]string, 0, len(aliases)) | ||
| } | ||
| b.flagsAdded[flagKey] = append(b.flagsAdded[flagKey], aliases...) | ||
| } | ||
|
|
||
| func (b *ReferenceBuilder) RemovedFlag(flagKey string, aliases []string) { | ||
| b.foundFlags[flagKey] = struct{}{} | ||
| if _, ok := b.flagsRemoved[flagKey]; !ok { | ||
| b.flagsRemoved[flagKey] = make([]string, 0, len(aliases)) | ||
| } | ||
| b.flagsRemoved[flagKey] = append(b.flagsRemoved[flagKey], aliases...) | ||
| } | ||
|
|
||
| func (b *ReferenceBuilder) Build() FlagsRef { | ||
| added := make(map[string][]string, len(b.flagsAdded)) | ||
| removed := make(map[string][]string, len(b.flagsRemoved)) | ||
|
|
||
| for flagKey := range b.foundFlags { | ||
| if aliases, ok := b.flagsAdded[flagKey]; ok { | ||
| // if there are any removed aliases, we should add them | ||
| aliases := append(aliases, b.flagsRemoved[flagKey]...) | ||
| aliases = uniqueStrs(aliases) | ||
| sort.Strings(aliases) | ||
| added[flagKey] = aliases | ||
| } else if aliases, ok := b.flagsRemoved[flagKey]; ok { | ||
| // only add to removed if it wasn't also added | ||
| aliases := uniqueStrs(aliases) | ||
| sort.Strings(aliases) | ||
| removed[flagKey] = aliases | ||
| } | ||
| } | ||
|
|
||
| return FlagsRef{ | ||
| FlagsAdded: added, | ||
| FlagsRemoved: removed, | ||
| } | ||
| } | ||
|
|
||
| // get slice with unique, non-empty strings | ||
| func uniqueStrs(s []string) []string { | ||
| if len(s) <= 1 { | ||
| return s | ||
| } | ||
| keys := make(map[string]struct{}, len(s)) | ||
| ret := make([]string, 0, len(s)) | ||
| for _, elem := range s { | ||
| trimmed := strings.TrimSpace(elem) | ||
| if len(trimmed) == 0 { | ||
| continue | ||
| } | ||
| if _, ok := keys[trimmed]; !ok { | ||
| keys[trimmed] = struct{}{} | ||
| ret = append(ret, trimmed) | ||
| } | ||
| } | ||
| return ret | ||
| } | ||
This file contains 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 |
|---|---|---|
| @@ -1,8 +1,6 @@ | ||
| package flags | ||
|
|
||
| type FlagAliasMap = map[string][]string | ||
|
|
||
| type FlagsRef struct { | ||
| FlagsAdded FlagAliasMap | ||
|
|
||
This file contains 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
Oops, something went wrong.
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.
deduping "modified" flags now happens in
Build()