eric/notarius
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reuse indexes for D&D citation validation

Browse Source
This commit is contained in:
Eric Rakestraw
2026-07-25 12:53:48 +00:00
parent 9d1356a20e
commit 7a66095912
7 changed files with 55 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
internal/modules/dnd/shared/citations.go
View File

@@ -7,27 +7,37 @@ import (
"gitea.maximumdirect.net/eric/notarius/internal/core/source"
)
// CitationResolver resolves cited ranges against one source document.
type CitationResolver struct {
doc *source.SourceDocument
index source.DocumentIndex
}
// NewCitationResolver prepares citation resolution for doc.
func NewCitationResolver(doc *source.SourceDocument) (*CitationResolver, error) {
if doc == nil {
return nil, fmt.Errorf("source document must not be nil")
}
return &CitationResolver{doc: doc, index: source.NewDocumentIndex(doc)}, nil
}
// CitedText resolves cited source ranges in document order, including each
// source unit once, and joins the resulting text with newlines.
func CitedText(doc *source.SourceDocument, refs []source.SourceRef) (string, error) {
if doc == nil {
return "", fmt.Errorf("source document must not be nil")
}
included := make([]bool, len(doc.Units))
func (r *CitationResolver) CitedText(refs []source.SourceRef) (string, error) {
included := make([]bool, len(r.doc.Units))
for _, ref := range refs {
if err := source.ValidateRef(doc, ref); err != nil {
if err := r.index.ValidateRef(ref); err != nil {
return "", fmt.Errorf("resolve cited source range: %w", err)
}
start, _ := source.UnitIndex(doc, ref.StartUnitID)
end, _ := source.UnitIndex(doc, ref.EndUnitID)
start, _ := r.index.Position(ref.StartUnitID)
end, _ := r.index.Position(ref.EndUnitID)
for index := start; index <= end; index++ {
included[index] = true
}
}
parts := make([]string, 0, len(doc.Units))
for index, unit := range doc.Units {
parts := make([]string, 0, len(r.doc.Units))
for index, unit := range r.doc.Units {
if included[index] {
parts = append(parts, unit.Text)
}

14
internal/modules/dnd/shared/citations_test.go
View File

@@ -7,8 +7,12 @@ import (
"gitea.maximumdirect.net/eric/notarius/internal/core/source"
)
func TestCitedText(t *testing.T) {
func TestCitationResolver(t *testing.T) {
doc := citationDocument()
resolver, err := NewCitationResolver(doc)
if err != nil {
t.Fatalf("NewCitationResolver() error = %v", err)
}
tests := []struct {
name string
refs []source.SourceRef
@@ -51,7 +55,7 @@ func TestCitedText(t *testing.T) {
t.Run(test.name, func(t *testing.T) {
beforeUnits := append([]source.SourceUnit(nil), doc.Units...)
refs := append([]source.SourceRef(nil), test.refs...)
got, err := CitedText(doc, refs)
got, err := resolver.CitedText(refs)
if (err != nil) != test.wantErr {
t.Fatalf("CitedText() error = %v, want error = %t", err, test.wantErr)
}
@@ -65,9 +69,9 @@ func TestCitedText(t *testing.T) {
}
}
func TestCitedTextRejectsNilDocument(t *testing.T) {
if _, err := CitedText(nil, nil); err == nil {
t.Fatal("CitedText() error = nil, want nil-document error")
func TestNewCitationResolverRejectsNilDocument(t *testing.T) {
if _, err := NewCitationResolver(nil); err == nil {
t.Fatal("NewCitationResolver() error = nil, want nil-document error")
}
}