Add typed spell validation strategies

internal/modules/dnd/validate/spells/source_refs/validator.go

@@ -7,38 +7,33 @@ import (
 	"gitea.maximumdirect.net/eric/notarius/internal/core/source"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/contracts"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline"
-	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/spells/spellpayload"
+	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd"
+	spellshape "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/spells/shape"
 )
 
 const Key = "extract/dnd/spells/source_refs"
 const ReasonCode = "invalid_source_refs"
 
-var _ contracts.LegacyRawValidator = (*Validator)(nil)
-
+type Options struct{}
 type Validator struct{}
-
-func New() *Validator {
-	return &Validator{}
+type legacyValidator struct{ codec decoder }
+type decoder interface {
+	DecodeCandidate([]byte) (dnd.SpellList, error)
 }
 
-func (v *Validator) Name() string {
-	return Key
-}
+var _ contracts.TypedValidator[dnd.SpellList] = (*Validator)(nil)
 
+func New(Options) *Validator      { return &Validator{} }
+func (v *Validator) Name() string { return Key }
 func (v *Validator) ExecutionClass() contracts.ExecutionClass {
 	return contracts.ExecutionClassDeterministic
 }
-
-func (v *Validator) Validate(ctx context.Context, req contracts.ValidationRequest) (contracts.ValidationResult, error) {
-	payload, err := spellpayload.ValidationRequestPayload(req)
-	if err != nil {
+func (v *Validator) Validate(_ context.Context, req contracts.TypedValidationRequest[dnd.SpellList]) (contracts.ValidationResult, error) {
+	if err := spellshape.Validate(req.Value); err != nil {
 		return rejection(err.Error()), nil
 	}
-	if err := spellpayload.ValidateShape(payload); err != nil {
-		return rejection(err.Error()), nil
-	}
-	for spellIndex, spell := range payload.SpellCasts {
-		for refIndex, ref := range spellpayload.SourceRefCandidates(req.Source, spell) {
+	for spellIndex, spell := range req.Value.SpellCasts {
+		for refIndex, ref := range spell.SourceRefs {
 			if err := source.ValidateRef(req.Source, ref); err != nil {
 				return rejection(fmt.Sprintf("spell_casts[%d].source_refs[%d]: %v", spellIndex, refIndex, err)), nil
 			}
@@ -46,24 +41,50 @@ func (v *Validator) Validate(ctx context.Context, req contracts.ValidationReques
 	}
 	return contracts.ValidationResult{Approved: true}, nil
 }
-
-func Spec() pipeline.ValidatorSpec {
-	return pipeline.ValidatorSpec{
-		Key:            Key,
-		ExecutionClass: contracts.ExecutionClassDeterministic,
-	}
+func (v *legacyValidator) Name() string { return Key }
+func (v *legacyValidator) ExecutionClass() contracts.ExecutionClass {
+	return contracts.ExecutionClassDeterministic
+}
+func (v *legacyValidator) Validate(ctx context.Context, req contracts.ValidationRequest) (contracts.ValidationResult, error) {
+	value, err := v.codec.DecodeCandidate(req.Payload.Content)
+	if err != nil {
+		return rejection(err.Error()), nil
+	}
+	if err := spellshape.Validate(value); err != nil {
+		return rejection(err.Error()), nil
+	}
+	return New(Options{}).Validate(ctx, contracts.TypedValidationRequest[dnd.SpellList]{Source: req.Source, Value: value})
+}
+func Spec() pipeline.ValidatorSpec {
+	return pipeline.ValidatorSpec{Key: Key, ExecutionClass: contracts.ExecutionClassDeterministic}
 }
-
 func Register(registry *pipeline.ValidatorRegistry) error {
-	return registry.RegisterLegacyRawWithSpec(Spec(), func() (contracts.LegacyRawValidator, error) {
-		return New(), nil
+	return pipeline.RegisterTypedValidatorBuilder(registry, dnd.SpellListKind, Spec(), validateOptions, func(request pipeline.BuildRequest) (contracts.TypedValidator[dnd.SpellList], error) {
+		options, err := DecodeOptions(request.Options)
+		if err != nil {
+			return nil, err
+		}
+		return New(options), nil
 	})
 }
-
-func rejection(message string) contracts.ValidationResult {
-	return contracts.ValidationResult{
-		Approved:   false,
-		ReasonCode: ReasonCode,
-		Message:    message,
+func RegisterLegacy(registry *pipeline.ValidatorRegistry, codec decoder) error {
+	if codec == nil {
+		return fmt.Errorf("spell source references validator codec must not be nil")
 	}
+	return registry.RegisterLegacyRawBuilderWithSpec(Spec(), validateOptions, func(request pipeline.BuildRequest) (contracts.LegacyRawValidator, error) {
+		if _, err := DecodeOptions(request.Options); err != nil {
+			return nil, err
+		}
+		return &legacyValidator{codec: codec}, nil
+	})
+}
+func DecodeOptions(options map[string]any) (Options, error) {
+	if err := pipeline.RejectUnknownOptions(options); err != nil {
+		return Options{}, err
+	}
+	return Options{}, nil
+}
+func validateOptions(options map[string]any) error { _, err := DecodeOptions(options); return err }
+func rejection(message string) contracts.ValidationResult {
+	return contracts.ValidationResult{Approved: false, ReasonCode: ReasonCode, Message: message}
 }