Repository navigation
feat(mcpx): make script.check canonical with legacy aliases #5660
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
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
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
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
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
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
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,90 @@ | ||
| package settings_test | ||
|
|
||
| import ( | ||
| "flag" | ||
| "strings" | ||
| "testing" | ||
|
|
||
| "github.com/developing-today/code/pkgs/mcpx/internal/settings" | ||
| ) | ||
|
|
||
| func pathAliasSchema(t *testing.T) *settings.Schema { | ||
| t.Helper() | ||
| s, err := settings.New([]settings.Setting{{ | ||
| Path: "new.name", PathAliases: []string{"old.name"}, | ||
| Kind: settings.KindEnum, Enum: []string{"off", "types"}, | ||
| EnumAliases: map[string][]string{"types": {"on"}}, Default: "off", | ||
| FlagAliases: []string{"old-name"}, EnvAliases: []string{"MCPX_OLD_NAME"}, | ||
| Name: "Name", Short: "name", | ||
| }}) | ||
| if err != nil { | ||
| t.Fatalf("build alias schema: %v", err) | ||
| } | ||
| return s | ||
| } | ||
|
|
||
| func TestPathAliasNormalizesAndStoresCanonicalPathFromEverySource(t *testing.T) { | ||
| s := pathAliasSchema(t) | ||
| sources := map[string]func(*settings.Set) error{ | ||
| "file": func(set *settings.Set) error { | ||
| return s.ApplyFile(set, map[string]any{"old": map[string]any{"name": "on"}}, "/x/.mcpx.json", 0) | ||
| }, | ||
| "env": func(set *settings.Set) error { | ||
| return s.ApplyEnv(set, []string{"MCPX_OLD_NAME=on"}) | ||
| }, | ||
| "flag": func(set *settings.Set) error { | ||
| fs := flag.NewFlagSet("run", flag.ContinueOnError) | ||
| fs.SetOutput(nopWriter{}) | ||
| b := s.Bind(fs, "run") | ||
| if err := fs.Parse([]string{"--old-name", "on"}); err != nil { | ||
| return err | ||
| } | ||
| return b.ApplyTo(set) | ||
| }, | ||
| "runtime": func(set *settings.Set) error { return set.SetRuntime("old.name", "on") }, | ||
| } | ||
| for name, apply := range sources { | ||
| t.Run(name, func(t *testing.T) { | ||
| set := settings.NewSet(s) | ||
| if err := apply(set); err != nil { | ||
| t.Fatalf("apply alias: %v", err) | ||
| } | ||
| if got := set.String("new.name"); got != "types" { | ||
| t.Errorf("canonical path = %q, want types", got) | ||
| } | ||
| if got := set.String("old.name"); got != "types" { | ||
| t.Errorf("alias lookup = %q, want types", got) | ||
| } | ||
| if value, ok := set.Value("old.name"); !ok || value.Path != "new.name" { | ||
| t.Errorf("value = %#v, %v; want canonical path", value, ok) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestPathAliasCanonicalizesCallOverrides(t *testing.T) { | ||
| s := pathAliasSchema(t) | ||
| base := settings.NewSet(s) | ||
| view := base.WithOverrides(map[string]string{"old.name": "types"}, "request") | ||
| if got := view.String("new.name"); got != "types" { | ||
| t.Errorf("canonical path = %q, want types", got) | ||
| } | ||
| if got := view.String("old.name"); got != "types" { | ||
| t.Errorf("alias lookup = %q, want types", got) | ||
| } | ||
| } | ||
|
|
||
| func TestPathAliasesCannotCollideWithCanonicalOrOtherAliasPaths(t *testing.T) { | ||
| base := settings.Setting{Path: "new.name", PathAliases: []string{"old.name"}, Kind: settings.KindString, Name: "Name", Short: "name"} | ||
| for name, list := range map[string][]settings.Setting{ | ||
| "canonical path": {base, {Path: "old.name", Kind: settings.KindString, Name: "Old", Short: "old"}}, | ||
| "another alias": {base, {Path: "other.name", PathAliases: []string{"old.name"}, Kind: settings.KindString, Name: "Other", Short: "other"}}, | ||
| "empty alias": {{Path: "new.name", PathAliases: []string{""}, Kind: settings.KindString, Name: "Name", Short: "name"}}, | ||
| } { | ||
| t.Run(name, func(t *testing.T) { | ||
| if _, err := settings.New(list); err == nil || !strings.Contains(err.Error(), "path") { | ||
| t.Errorf("invalid alias declaration accepted: %v", err) | ||
| } | ||
| }) | ||
| } | ||
| } |
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
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.
When an existing project config contains
{"script":{"typecheck":"on"}}, runningmcpx settings set script.typecheck off --persist projectagainst a running daemon now leaves the configuration with conflicting values.handleSettingsSetininternal/daemon/routes_settings.gowritesdecl.Path, nowscript.check, whileconfig.SetKeyonly updates that leaf without removingscript.typecheck. Subsequent invocations fail settings resolution becauseApplyFilereads both spellings andSet.Applyrejects their differing values at the same layer. Persistent writes need to replace or remove existing alias entries when writing the canonical setting.Useful? React with 👍 / 👎.