Preserve configuration diagnostics from request builders
This commit is contained in:
@@ -196,7 +196,8 @@ func WithRequestValidation[I, S any](
|
||||
if build != nil {
|
||||
built, err := build(ctx, request, input, state)
|
||||
if err != nil {
|
||||
return commandkit.Acquired[struct{}]{}, err
|
||||
messages := promptKitLoadErrorDiagnostics(err, "")
|
||||
return commandkit.Acquired[struct{}]{Diagnostics: messages.diagnostics, Explanation: messages.explanation}, err
|
||||
}
|
||||
concreteRequest = built
|
||||
}
|
||||
@@ -476,12 +477,7 @@ func loadPromptKitEngine[I, S any](
|
||||
) (*promptkit.Engine, *promptkit.ConfigurationInspection, promptKitAcquisition, error) {
|
||||
engine, err := load(ctx, selection, input, state)
|
||||
if err != nil {
|
||||
var loadErr *configkit.LoadError
|
||||
if errors.As(err, &loadErr) {
|
||||
messages := promptKitDiagnostics("promptkit", side, loadErr.Sources(), loadErr.Diagnostics())
|
||||
return nil, nil, messages, err
|
||||
}
|
||||
return nil, nil, promptKitAcquisition{}, err
|
||||
return nil, nil, promptKitLoadErrorDiagnostics(err, side), err
|
||||
}
|
||||
if engine == nil {
|
||||
return nil, nil, promptKitAcquisition{}, errors.New("PromptKit configuration loader returned a nil engine")
|
||||
@@ -509,6 +505,14 @@ func appendPromptKitAcquisition(left, right promptKitAcquisition) promptKitAcqui
|
||||
return left
|
||||
}
|
||||
|
||||
func promptKitLoadErrorDiagnostics(err error, side string) promptKitAcquisition {
|
||||
var loadErr *configkit.LoadError
|
||||
if errors.As(err, &loadErr) && loadErr != nil {
|
||||
return promptKitDiagnostics("promptkit", side, loadErr.Sources(), loadErr.Diagnostics())
|
||||
}
|
||||
return promptKitAcquisition{}
|
||||
}
|
||||
|
||||
func promptKitDiagnostics(scope, side string, sources []configkit.SourceInfo, records []configkit.Diagnostic) promptKitAcquisition {
|
||||
heading := "Configuration scope " + strconv.Quote(scope)
|
||||
if side != "" {
|
||||
|
||||
Reference in New Issue
Block a user