Cache source directories during configuration normalization

This commit is contained in:
2026-11-18 00:36:26 +00:00
parent 1c93aa0947
commit 76364a7b7e
4 changed files with 81 additions and 10 deletions

View File

@@ -70,8 +70,8 @@ func initializeDocumentMainDirectory(resolution *configkit.Resolution, state *do
}
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)
if directory := state.sourceDirectory(info.Origin.Locations[0].SourceID, resolution.Source); directory != "" {
state.mainDirectory = directory
return
}
}
@@ -166,14 +166,35 @@ func documentPathBase(resolution *configkit.Resolution, state *documentLoadState
if len(info.Origin.Locations) != 1 {
return "", false
}
source, ok := resolution.Source(info.Origin.Locations[0].SourceID)
if !ok || source.Path == "" {
directory := state.sourceDirectory(info.Origin.Locations[0].SourceID, resolution.Source)
if directory == "" {
if state != nil && state.mainDirectory != "" {
return state.mainDirectory, true
}
return "", false
}
return filepath.Dir(source.Path), true
return directory, true
}
return "", false
}
// Source evidence is fixed during resolution. Cache only the directory needed
// by paths, avoiding repeated copies of unrelated import-selection evidence.
func (state *documentLoadState) sourceDirectory(id string, lookup func(string) (configkit.SourceInfo, bool)) string {
if state != nil {
if directory, ok := state.sourceDirectories[id]; ok {
return directory
}
}
directory := ""
if source, ok := lookup(id); ok && source.Path != "" {
directory = filepath.Dir(source.Path)
}
if state != nil {
if state.sourceDirectories == nil {
state.sourceDirectories = make(map[string]string)
}
state.sourceDirectories[id] = directory
}
return directory
}