Migrate application configuration to the new ConfigKit API

This commit is contained in:
2026-11-17 20:42:25 +00:00
parent ae0e410875
commit 6da4d070e5
19 changed files with 88 additions and 29 deletions

View File

@@ -3,7 +3,7 @@ package config
import (
"path/filepath"
configkit "gitea.maximumdirect.net/eric/ConfigKit"
configkit "go.maximumdirect.net/configkit"
)
func normalizeDocumentPaths(document *Document, context *configkit.Resolution, state *documentLoadState) {
@@ -63,7 +63,7 @@ func initializeDocumentMainDirectory(resolution documentNormalizer, state *docum
if state == nil || state.mainDirectory != "" {
return
}
info, ok := resolution.InputInfo(configkit.Keys("version"))
info, ok := resolution.EntryInfo(configkit.Keys("version"))
if ok && len(info.Origin.Locations) == 1 {
if source, sourceOK := resolution.Source(info.Origin.Locations[0].SourceID); sourceOK && source.Path != "" {
state.mainDirectory = filepath.Dir(source.Path)
@@ -102,7 +102,7 @@ func normalizeDocumentReferencePaths(references map[string]ReferenceDocument, pa
} else {
value := filepath.Clean(filepath.Join(base, *source.Path))
if value != *source.Path {
resolution.Record(sourcePath, configkit.ChangeNormalization, "resolved external reference path")
resolution.RecordNormalization(sourcePath, "resolved external reference path")
source.Path = documentValue(value)
}
}
@@ -134,7 +134,7 @@ func documentPathBase(resolution documentNormalizer, state *documentLoadState, p
if state != nil {
original = state.originalPath(path)
}
info, ok := resolution.InputInfo(original)
info, ok := resolution.EntryInfo(original)
if !ok {
if state != nil && state.mainDirectory != "" {
return state.mainDirectory, true