base-layer/configkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Share import declaration preparation

Browse Source
This commit is contained in:
Eric Rakestraw
2026-11-09 18:45:51 +00:00
parent f0a4bf9bb2
commit e47960d377
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/roadmap/implementation.md
View File

@@ -111,6 +111,8 @@ Test selected and unused fallbacks. Defer the no-base path to Stages 3–4.
## Stage 3 — Share import declaration preparation ## Stage 3 — Share import declaration preparation
**Status:** Complete. Focused import and placement checks passed.
In `import_acquisition.go`, extract the context-independent first pass of In `import_acquisition.go`, extract the context-independent first pass of
`walkDeclarations` so both normal traversal and the contextless path can `walkDeclarations` so both normal traversal and the contextless path can
use it. Prepare from the already parsed declaration specs, apply use it. Prepare from the already parsed declaration specs, apply

16
internal/engine/import_acquisition.go
View File

@@ -242,19 +242,27 @@ func (s *importTraversal) checkInitialLimits() *Diagnostic {
return nil return nil
} }
func (s *importTraversal) walkDeclarations(basePath string, declarations []importDeclarationSpec, depth int, parentDestination Path, sourceIndex int) []Diagnostic { func prepareImportDeclarations(declarations []importDeclarationSpec, defaults ImportDefaults, parentDestination Path) ([]resolvedImportPolicy, []Diagnostic) {
policies := make([]resolvedImportPolicy, len(declarations)) policies := make([]resolvedImportPolicy, len(declarations))
for index, spec := range declarations { for index, spec := range declarations {
policy, diagnostics := resolveImportPolicy(spec, s.policy.importDefaults) policy, diagnostics := resolveImportPolicy(spec, defaults)
if len(diagnostics) != 0 { if len(diagnostics) != 0 {
return diagnostics return nil, diagnostics
} }
if policy.placement == PlacementModeSequenceItem && len(appendDestination(parentDestination, policy.destination).segments) == 0 { if policy.placement == PlacementModeSequenceItem && len(appendDestination(parentDestination, policy.destination).segments) == 0 {
site := spec.fieldSites["placement"] site := spec.fieldSites["placement"]
return []Diagnostic{{Code: CodeImportInvalid, Severity: SeverityError, Path: site.path.clone(), Message: "sequence-item placement requires a nonempty destination", Primary: cloneLocation(&site.location)}} return nil, []Diagnostic{{Code: CodeImportInvalid, Severity: SeverityError, Path: site.path.clone(), Message: "sequence-item placement requires a nonempty destination", Primary: cloneLocation(&site.location)}}
} }
policies[index] = policy policies[index] = policy
} }
return policies, nil
}
func (s *importTraversal) walkDeclarations(basePath string, declarations []importDeclarationSpec, depth int, parentDestination Path, sourceIndex int) []Diagnostic {
policies, diagnostics := prepareImportDeclarations(declarations, s.policy.importDefaults, parentDestination)
if len(diagnostics) != 0 {
return diagnostics
}
for index, spec := range declarations { for index, spec := range declarations {
policy := policies[index] policy := policies[index]
var selection importSelection var selection importSelection