Separate application and framework configuration types

This commit is contained in:
2026-11-17 22:03:08 +00:00
parent d79e23739f
commit 5c780a4cc0
7 changed files with 31 additions and 16 deletions

View File

@@ -158,6 +158,10 @@ to preserve the old test setup.
## Stage 3: Separate Application And Framework Types In CLI Adapters ## Stage 3: Separate Application And Framework Types In CLI Adapters
**Complete.** CLI adapters retain each loader's types and diagnostic writer;
`go build ./cmd/scriptorium` passed with Go 1.27.4. Fixture and integration
coverage remains assigned below.
**Primary files:** `internal/adapter/cli/application_config.go`, `config.go`, **Primary files:** `internal/adapter/cli/application_config.go`, `config.go`,
`run.go`, `inspect.go`, and `framework_config.go`. `run.go`, `inspect.go`, and `framework_config.go`.

View File

@@ -6,8 +6,9 @@ import (
"fmt" "fmt"
"io" "io"
configkit "gitea.maximumdirect.net/eric/ConfigKit" legacyconfigkit "gitea.maximumdirect.net/eric/ConfigKit"
appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config" appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config"
"go.maximumdirect.net/configkit"
) )
// applicationOverrides keeps explicit application flags separate from invocation state. // applicationOverrides keeps explicit application flags separate from invocation state.
@@ -58,6 +59,13 @@ func writeApplicationError(output io.Writer, label string, err error) {
} }
return 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) _, _ = fmt.Fprintf(output, "%s error: %v\n", label, err)
} }

View File

@@ -6,8 +6,8 @@ import (
"fmt" "fmt"
"io" "io"
configkit "gitea.maximumdirect.net/eric/ConfigKit"
appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config" appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config"
"go.maximumdirect.net/configkit"
) )
type configurationSource struct { type configurationSource struct {

View File

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

View File

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

View File

@@ -9,8 +9,8 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
configkit "gitea.maximumdirect.net/eric/ConfigKit"
appformat "gitea.maximumdirect.net/eric/scriptorium/internal/format" appformat "gitea.maximumdirect.net/eric/scriptorium/internal/format"
"go.maximumdirect.net/configkit"
) )
type promptInspectionConfig struct { type promptInspectionConfig struct {

View File

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