Unify PromptKit and ConfigKit source wiring

This commit is contained in:
2026-11-18 19:01:17 +00:00
parent ae5344a77d
commit e7a8b0db04
21 changed files with 53 additions and 54 deletions

View File

@@ -6,7 +6,6 @@ import (
"fmt"
"io"
legacyconfigkit "gitea.maximumdirect.net/eric/ConfigKit"
appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config"
"go.maximumdirect.net/configkit"
)
@@ -54,18 +53,12 @@ func loadApplicationSettings(configPath, overlay string, explicit bool, override
func writeApplicationError(output io.Writer, label string, err error) {
var loadError *configkit.LoadError
if errors.As(err, &loadError) {
_, _ = fmt.Fprintf(output, "%s error:\n", label)
if writeErr := configkit.WriteDiagnostics(output, loadError.Diagnostics()); writeErr != nil {
_, _ = fmt.Fprintf(output, "%s diagnostic write error: %v\n", label, writeErr)
}
return
}
var legacyLoadError *legacyconfigkit.LoadError
if errors.As(err, &legacyLoadError) {
if writeErr := legacyconfigkit.WriteDiagnostics(output, legacyLoadError.Diagnostics()); writeErr != nil {
_, _ = fmt.Fprintf(output, "%s diagnostic write error: %v\n", label, writeErr)
}
return
}
_, _ = fmt.Fprintf(output, "%s error: %v\n", label, err)
}

View File

@@ -7,7 +7,6 @@ import (
"fmt"
"io"
legacyconfigkit "gitea.maximumdirect.net/eric/ConfigKit"
"go.maximumdirect.net/configkit"
)
@@ -23,8 +22,8 @@ type frameworkConfigurationConfig struct {
type frameworkConfigurationSource struct {
ID string `json:"id"`
Label string `json:"label"`
Layer legacyconfigkit.Layer `json:"layer"`
Kind legacyconfigkit.SourceKind `json:"kind"`
Layer configkit.Layer `json:"layer"`
Kind configkit.SourceKind `json:"kind"`
UnderlayIndex int `json:"underlay_index"`
Path string `json:"path,omitempty"`
ImportedFrom *frameworkConfigurationLocation `json:"imported_from,omitempty"`
@@ -42,9 +41,9 @@ func inspectFrameworkConfigurationCommand(args []string, stdout, stderr io.Write
writeApplicationError(stderr, "inspect configuration parse", err)
return ExitRuntimeError
}
var explanationPath legacyconfigkit.Path
var explanationPath configkit.Path
if cfg.mode == "explain" {
explanationPath, err = legacyconfigkit.ParsePath(cfg.path)
explanationPath, err = configkit.ParsePath(cfg.path)
if err != nil {
writeApplicationError(stderr, "inspect configuration path", err)
return ExitRuntimeError
@@ -68,7 +67,7 @@ func inspectFrameworkConfigurationCommand(args []string, stdout, stderr io.Write
writeApplicationError(stderr, "inspect configuration", err)
return ExitRuntimeError
}
if err := legacyconfigkit.WriteDiagnostics(stderr, view.Diagnostics()); err != nil {
if err := configkit.WriteDiagnostics(stderr, view.Diagnostics()); err != nil {
return ExitRuntimeError
}
if cfg.mode == "validate" {
@@ -147,7 +146,7 @@ func resolveAppSettingsForFrameworkConfiguration(cfg *frameworkConfigurationConf
}, nil
}
func frameworkConfigurationSources(sources []legacyconfigkit.SourceInfo) []frameworkConfigurationSource {
func frameworkConfigurationSources(sources []configkit.SourceInfo) []frameworkConfigurationSource {
result := make([]frameworkConfigurationSource, 0, len(sources))
for _, source := range sources {
item := frameworkConfigurationSource{

View File

@@ -10,8 +10,8 @@ import (
"strings"
"testing"
configkit "gitea.maximumdirect.net/eric/ConfigKit"
renderformat "gitea.maximumdirect.net/eric/scriptorium/internal/format"
configkit "go.maximumdirect.net/configkit"
)
func TestFrameworkConfigurationCommandsNeedNoPromptOrCredential(t *testing.T) {

View File

@@ -8,8 +8,8 @@ import (
"path/filepath"
"strings"
legacyconfigkit "gitea.maximumdirect.net/eric/ConfigKit"
"gitea.maximumdirect.net/eric/promptkit"
"go.maximumdirect.net/configkit"
"go.maximumdirect.net/promptkit"
)
type promptKitSourceFlagEntry struct {
@@ -71,5 +71,5 @@ func writeFrameworkDiagnostics(output io.Writer, engine *promptkit.Engine) error
if err != nil {
return fmt.Errorf("inspect captured PromptKit diagnostics: %w", err)
}
return legacyconfigkit.WriteDiagnostics(output, view.Diagnostics())
return configkit.WriteDiagnostics(output, view.Diagnostics())
}

View File

@@ -10,9 +10,9 @@ import (
"reflect"
"testing"
configkit "gitea.maximumdirect.net/eric/ConfigKit"
"gitea.maximumdirect.net/eric/promptkit"
appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config"
configkit "go.maximumdirect.net/configkit"
"go.maximumdirect.net/promptkit"
)
func TestFrameworkSourceGroupsComposeAndValidateEffectiveDefinitions(t *testing.T) {

View File

@@ -13,14 +13,13 @@ import (
"strings"
"time"
legacyconfigkit "gitea.maximumdirect.net/eric/ConfigKit"
"gitea.maximumdirect.net/eric/promptkit"
httpadapter "gitea.maximumdirect.net/eric/scriptorium/internal/adapter/http"
appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config"
"gitea.maximumdirect.net/eric/scriptorium/internal/defaults"
renderformat "gitea.maximumdirect.net/eric/scriptorium/internal/format"
executionreport "gitea.maximumdirect.net/eric/scriptorium/internal/report"
"go.maximumdirect.net/configkit"
"go.maximumdirect.net/promptkit"
)
const (
@@ -544,12 +543,12 @@ func (c serveConfig) engineSettings() engineSettings {
}
func newEngine(settings engineSettings, options ...promptkit.Option) (*promptkit.Engine, error) {
underlays := make([]legacyconfigkit.Underlay, 0, len(settings.promptkitSources))
underlays := make([]configkit.Underlay, 0, len(settings.promptkitSources))
for index, selection := range settings.promptkitSources {
var inputs []legacyconfigkit.Input
var inputs []configkit.Input
switch {
case selection.File != "" && selection.Directory == "":
inputs = []legacyconfigkit.Input{{Source: legacyconfigkit.File(selection.File), Imports: true}}
inputs = []configkit.Input{{Source: configkit.File(selection.File), Imports: true}}
case selection.Directory != "" && selection.File == "":
var err error
inputs, err = promptkit.DirectoryInputs(selection.Directory)
@@ -561,7 +560,7 @@ func newEngine(settings engineSettings, options ...promptkit.Option) (*promptkit
cause := fmt.Errorf("PromptKit source %d must select exactly one file or directory", index+1)
return nil, fmt.Errorf("engine initialization from application configuration: %w", errors.Join(promptkit.ErrInvalidConfig, cause))
}
underlays = append(underlays, legacyconfigkit.Underlay{Inputs: inputs})
underlays = append(underlays, configkit.Underlay{Inputs: inputs})
}
engine, err := promptkit.NewEngine(promptkit.Config{
Sources: promptkit.ConfigurationSources{Underlays: underlays},

View File

@@ -18,12 +18,11 @@ import (
"testing"
"time"
legacyconfigkit "gitea.maximumdirect.net/eric/ConfigKit"
"gitea.maximumdirect.net/eric/promptkit"
appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config"
"gitea.maximumdirect.net/eric/scriptorium/internal/defaults"
renderformat "gitea.maximumdirect.net/eric/scriptorium/internal/format"
"go.maximumdirect.net/configkit"
"go.maximumdirect.net/promptkit"
)
func TestParseMappingsSingleAndRepeated(t *testing.T) {
@@ -569,9 +568,9 @@ func TestConfigurationErrorsUseTheirNativeDiagnosticWriters(t *testing.T) {
}
}
_, err := newEngine(engineSettings{promptkitSources: []appconfig.SourceSelection{{File: framework}}})
var legacyError *legacyconfigkit.LoadError
if !errors.As(err, &legacyError) {
t.Fatalf("framework load lost legacy diagnostic identity: %v", err)
var loadError *configkit.LoadError
if !errors.As(err, &loadError) {
t.Fatalf("framework load lost diagnostic identity: %v", err)
}
}