Separate application and framework configuration types
This commit is contained in:
@@ -13,13 +13,14 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
configkit "gitea.maximumdirect.net/eric/ConfigKit"
|
||||
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"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -543,12 +544,12 @@ func (c serveConfig) engineSettings() engineSettings {
|
||||
}
|
||||
|
||||
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 {
|
||||
var inputs []configkit.Input
|
||||
var inputs []legacyconfigkit.Input
|
||||
switch {
|
||||
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 == "":
|
||||
var err error
|
||||
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)
|
||||
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{
|
||||
Sources: promptkit.ConfigurationSources{Underlays: underlays},
|
||||
|
||||
Reference in New Issue
Block a user