diff --git a/docs/roadmap/implementation.md b/docs/roadmap/implementation.md index fc64012..1c9fd87 100644 --- a/docs/roadmap/implementation.md +++ b/docs/roadmap/implementation.md @@ -108,6 +108,10 @@ Do not publish, tag, push, or invoke the release script. ## Stage 2: Move Application Loading And Resolution To Native v1.2.0 +**Complete.** Application loading uses native search and v1.2.0 resolution; +`go build ./internal/config` passed with Go 1.27.4. Adapter and test migration +remain assigned below. + **Primary files:** `internal/config/document.go`, `load.go`, and `settings.go`. **Work** diff --git a/internal/config/document.go b/internal/config/document.go index 96d5221..de67b62 100644 --- a/internal/config/document.go +++ b/internal/config/document.go @@ -4,9 +4,9 @@ import ( "path/filepath" "strings" - configkit "gitea.maximumdirect.net/eric/ConfigKit" "gitea.maximumdirect.net/eric/scriptorium/internal/defaults" renderformat "gitea.maximumdirect.net/eric/scriptorium/internal/format" + "go.maximumdirect.net/configkit" ) // Document is Scriptorium's ConfigKit-native application configuration shape. @@ -58,16 +58,14 @@ func documentDefaults() Document { } func resolveDocument(document *Document, resolution *configkit.Resolution) error { - normalizePath := func(path configkit.Path, value *string) bool { + normalizePath := func(path configkit.Path, value *string) { cleaned := strings.TrimSpace(*value) if cleaned != "" { cleaned = filepath.Clean(cleaned) } if cleaned != *value { configkit.Normalize(resolution, path, value, cleaned, "normalized application path") - return true } - return false } normalizeString := func(path configkit.Path, value *string, normalized, reason string) { if normalized != *value { @@ -75,14 +73,10 @@ func resolveDocument(document *Document, resolution *configkit.Resolution) error } } - sourcePathsChanged := false for i := range document.PromptKitSources { path := configkit.Keys("promptkit_sources").Index(i) - sourcePathsChanged = normalizePath(path.Key("file"), &document.PromptKitSources[i].File) || sourcePathsChanged - sourcePathsChanged = normalizePath(path.Key("directory"), &document.PromptKitSources[i].Directory) || sourcePathsChanged - } - if sourcePathsChanged { - resolution.Record(configkit.Keys("promptkit_sources"), configkit.ChangeNormalization, "normalized selected source paths") + normalizePath(path.Key("file"), &document.PromptKitSources[i].File) + normalizePath(path.Key("directory"), &document.PromptKitSources[i].Directory) } normalizePath(configkit.Keys("schema_dir"), &document.SchemaDir) normalizePath(configkit.Keys("server", "artifact_root"), &document.Server.ArtifactRoot) diff --git a/internal/config/load.go b/internal/config/load.go index e7979bc..51f67b7 100644 --- a/internal/config/load.go +++ b/internal/config/load.go @@ -1,12 +1,10 @@ package config import ( - "errors" "fmt" - "os" - configkit "gitea.maximumdirect.net/eric/ConfigKit" renderformat "gitea.maximumdirect.net/eric/scriptorium/internal/format" + "go.maximumdirect.net/configkit" ) // LoadOptions selects one application source and explicit configuration values. @@ -20,35 +18,15 @@ type LoadOptions struct { // Load resolves one ConfigKit document and retains its inspection snapshot. func Load(options LoadOptions) (*configkit.Result[Document], error) { var source configkit.Source - fileBacked := false if options.Explicit { source = configkit.File(options.Path) - fileBacked = true } else { - selected := "" - for _, candidate := range defaultConfigSearchPaths { - if _, err := os.Stat(candidate); err == nil { - selected = candidate - break - } else if !errors.Is(err, os.ErrNotExist) { - reason := "filesystem error" - if errors.Is(err, os.ErrPermission) { - reason = "permission denied" - } - return nil, fmt.Errorf("cannot inspect configuration path %q: %s", candidate, reason) - } - } - if selected == "" { - source = configkit.NoSource() - } else { - source = configkit.File(selected) - fileBacked = true - } + source = configkit.SearchConfig("scriptorium", configkit.SearchPaths(defaultConfigSearchPaths...)) } result, err := configkit.Load(source, configkit.Options[Document]{ Definition: documentDefinition(), - Imports: fileBacked, + Imports: true, Overlay: options.Overlay, Overrides: options.Overrides, })