Finish native completion and retire legacy command machinery

This commit is contained in:
2026-11-20 06:32:47 +00:00
parent 7db626781e
commit faa8cb5822
72 changed files with 841 additions and 2966 deletions

View File

@@ -1,8 +1,10 @@
package app
import (
"bytes"
"context"
"errors"
"io"
"gitea.maximumdirect.net/eric/narratio/internal/config"
"go.maximumdirect.net/ckconfig"
@@ -11,9 +13,10 @@ import (
)
type configurationInspectionState struct {
deps commandDependencies
independent bool
acquisitions map[configurationSelection]*configurationAcquisition
pendingDiagnostics *bytes.Buffer
deps commandDependencies
independent bool
acquisitions map[configurationSelection]*configurationAcquisition
}
func (s *configurationInspectionState) acquisition(selection ckconfig.Selection, input configurationSelection) *configurationAcquisition {
@@ -70,18 +73,28 @@ func configurationCommand(deps commandDependencies) commandkit.Command {
scopes := []ckconfig.Scope[configurationSelection, *configurationInspectionState]{app, campaign, session, party}
// Comparison sides share bootstrap services, but always load their own results.
for index := range scopes {
acquire := scopes[index].Acquire
scopes[index].Acquire = func(ctx context.Context, request ckconfig.Request, input configurationSelection, state *configurationInspectionState) (commandkit.Acquired[ckconfig.View], error) {
result, err := acquire(ctx, request, input, state)
result.Diagnostics = append(result.Diagnostics, state.bootstrapDiagnostics()...)
return result, err
}
compare := scopes[index].Compare
scopes[index].Compare = func(ctx context.Context, request ckconfig.ComparisonRequest[configurationSelection], state *configurationInspectionState) (commandkit.Acquired[[]configkit.Difference], error) {
separate := *state
separate.independent = true
return compare(ctx, request, &separate)
result, err := compare(ctx, request, &separate)
result.Diagnostics = append(result.Diagnostics, state.bootstrapDiagnostics()...)
return result, err
}
}
return ckconfig.Command(ckconfig.Suite[configurationSelection, *configurationInspectionState]{
NewState: func() *configurationInspectionState {
invocationDeps := normalizeCommandDependencies(deps)
invocationDeps.secretsBootstrap = &secretsBootstrap{}
return &configurationInspectionState{deps: invocationDeps, acquisitions: make(map[configurationSelection]*configurationAcquisition)}
pending := &bytes.Buffer{}
invocationDeps.diagnostics = pending
return &configurationInspectionState{deps: invocationDeps, pendingDiagnostics: pending, acquisitions: make(map[configurationSelection]*configurationAcquisition)}
},
CheckInput: func(_ string, selection ckconfig.Selection, input configurationSelection) error {
input.Config, input.Overlay = selection.Config, selection.Overlay
@@ -98,3 +111,12 @@ func configurationCommand(deps commandDependencies) commandkit.Command {
Scopes: scopes,
})
}
func (s *configurationInspectionState) bootstrapDiagnostics() []commandkit.Diagnostic {
if s.pendingDiagnostics == nil || s.pendingDiagnostics.Len() == 0 {
return nil
}
text := s.pendingDiagnostics.String()
s.pendingDiagnostics.Reset()
return []commandkit.Diagnostic{{Severity: commandkit.SeverityInfo, Write: func(w io.Writer) error { _, err := io.WriteString(w, text); return err }}}
}