Add typed spell validation strategies

2026-07-17 07:02:30 +00:00
parent 142ba36695
commit 52e6b31408
25 changed files with 708 additions and 410 deletions
--- a/internal/modules/dnd/validate/spells/shape/validator.go
+++ b/internal/modules/dnd/validate/spells/shape/validator.go
@@ -2,59 +2,104 @@ package shape

 import (
 	"context"
+	"fmt"
+	"strings"

 	"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"
 )

 const Key = "extract/dnd/spells/shape"
 const ReasonCode = "invalid_spell_shape"

-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 {
-		return rejection(err.Error()), nil
-	}
-	if err := spellpayload.ValidateShape(payload); err != nil {
+func (v *Validator) Validate(_ context.Context, req contracts.TypedValidationRequest[dnd.SpellList]) (contracts.ValidationResult, error) {
+	if err := Validate(req.Value); err != nil {
 		return rejection(err.Error()), nil
 	}
 	return contracts.ValidationResult{Approved: true}, nil
 }

-func Spec() pipeline.ValidatorSpec {
-	return pipeline.ValidatorSpec{
-		Key:            Key,
-		ExecutionClass: contracts.ExecutionClassDeterministic,
+func Validate(value dnd.SpellList) error {
+	if value.SpellCasts == nil {
+		return fmt.Errorf("spell_casts must be present")
 	}
+	for index, spell := range value.SpellCasts {
+		if strings.TrimSpace(spell.Caster) == "" {
+			return fmt.Errorf("spell_casts[%d].caster must not be empty", index)
+		}
+		if strings.TrimSpace(spell.Spell) == "" {
+			return fmt.Errorf("spell_casts[%d].spell must not be empty", index)
+		}
+		if strings.TrimSpace(spell.Effect) == "" {
+			return fmt.Errorf("spell_casts[%d].effect must not be empty", index)
+		}
+		if strings.TrimSpace(spell.NarrativeDescription) == "" {
+			return fmt.Errorf("spell_casts[%d].narrative_description must not be empty", index)
+		}
+		if len(spell.SourceRefs) == 0 {
+			return fmt.Errorf("spell_casts[%d].source_refs must not be empty", index)
+		}
+	}
+	return nil
 }

+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
+	}
+	return New(Options{}).Validate(ctx, contracts.TypedValidationRequest[dnd.SpellList]{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 shape 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}
 }
--- a/internal/modules/dnd/validate/spells/shape/validator_test.go
+++ b/internal/modules/dnd/validate/spells/shape/validator_test.go
@@ -4,12 +4,14 @@ import (
 	"context"
 	"testing"

+	"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"
 )

 func TestValidatorApprovesWellFormedSpellPayload(t *testing.T) {
-	result, err := New().Validate(context.Background(), requestWithPayload(`{"spell_casts":[{"caster":"Aria","spell":"Cure Wounds","effect":"heals","narrative_description":"Aria heals Borin.","source_refs":[{"source_id":"session","start_unit_id":1,"end_unit_id":1}]}]}`))
+	result, err := New(Options{}).Validate(context.Background(), requestWithValue(validSpellList()))
 	if err != nil {
 		t.Fatalf("Validate() error = %v, want nil", err)
 	}
@@ -18,8 +20,8 @@ func TestValidatorApprovesWellFormedSpellPayload(t *testing.T) {
 	}
 }

-func TestValidatorRejectsMalformedPayload(t *testing.T) {
-	result, err := New().Validate(context.Background(), requestWithPayload(`{"spell_casts":`))
+func TestValidatorRejectsMissingSpellList(t *testing.T) {
+	result, err := New(Options{}).Validate(context.Background(), requestWithValue(dnd.SpellList{}))
 	if err != nil {
 		t.Fatalf("Validate() error = %v, want nil", err)
 	}
@@ -32,7 +34,9 @@ func TestValidatorRejectsMalformedPayload(t *testing.T) {
 }

 func TestValidatorRejectsMissingRequiredSpellFields(t *testing.T) {
-	result, err := New().Validate(context.Background(), requestWithPayload(`{"spell_casts":[{"caster":"Aria","effect":"heals","narrative_description":"Aria heals Borin.","source_refs":[{"source_id":"session","start_unit_id":1,"end_unit_id":1}]}]}`))
+	value := validSpellList()
+	value.SpellCasts[0].Spell = ""
+	result, err := New(Options{}).Validate(context.Background(), requestWithValue(value))
 	if err != nil {
 		t.Fatalf("Validate() error = %v, want nil", err)
 	}
@@ -49,20 +53,15 @@ func TestSpecAndRegister(t *testing.T) {
 	if err := Register(registry); err != nil {
 		t.Fatalf("Register() error = %v, want nil", err)
 	}
-	validator, err := registry.BuildLegacyRaw(Key)
-	if err != nil {
-		t.Fatalf("Build(%q) error = %v, want nil", Key, err)
-	}
-	if validator.Name() != Key || validator.ExecutionClass() != contracts.ExecutionClassDeterministic {
-		t.Fatalf("validator = %q/%q, want key and deterministic execution", validator.Name(), validator.ExecutionClass())
+	if _, err := DecodeOptions(map[string]any{"unexpected": true}); err == nil {
+		t.Fatal("DecodeOptions() error = nil, want unknown option error")
 	}
 }

-func requestWithPayload(payload string) contracts.ValidationRequest {
-	return contracts.ValidationRequest{
-		Payload: contracts.RawPayload{
-			Content:   []byte(payload),
-			MediaType: "application/json",
-		},
-	}
+func requestWithValue(value dnd.SpellList) contracts.TypedValidationRequest[dnd.SpellList] {
+	return contracts.TypedValidationRequest[dnd.SpellList]{Value: value}
+}
+
+func validSpellList() dnd.SpellList {
+	return dnd.SpellList{SpellCasts: []dnd.SpellCast{{Caster: "Aria", Spell: "Cure Wounds", Effect: "heals", NarrativeDescription: "Aria heals Borin.", SourceRefs: []source.SourceRef{{SourceID: "session", StartUnitID: 1, EndUnitID: 1}}}}}
 }