The final slice: land the format-neutral document model with REAL consumers
and unify the Markdown parser — no duplication, byte-identical output.
Neutral model (pkg/docforge/model.go): Document / Block / InlineSpan.
BlockKind values are the stylemap keys. A hyperlink is a span with Link set
+ Children (the label's spans), preserving link boundaries so adjacent
same-URL links stay distinct — byte-exact with the pre-model walker.
Markdown importer (pkg/docforge/markdown): Import(md) → Document. The SINGLE
Markdown parser for docforge — block split, marker detection, inline
bold/italic/link tokenisation, {{placeholder}} pass-through (the b78a984
fix). Relocated out of the docx walker.
docx renderer (pkg/docforge/docx/markdown.go): now RENDERS a Document →
OOXML (RenderDocumentToOOXML); RenderMarkdownToOOXML[WithStyles] = render(
markdown.Import(md)). The shipped submission walker routes through the model,
so there is one parser, not two. The comprehensive byte-exact render tests
(RenderMarkdownToOOXML_*) all PASS unchanged = output identical.
Exporter interface (pkg/docforge/exporter.go, PRD §4 B4): Exporter{Format,
MIMEType, RenderBody(Document)} with the .docx impl (pkg/docforge/docx/
exporter.go). The seam a future PDF/HTML exporter slots into.
Tests: parser tests relocated to the markdown pkg (parseSpans/detectBlockMarker)
+ new importer Document tests + exporter conformance test.
Verification: go build/vet clean; gofmt clean; full NO-DB test suite GREEN
(authoritative — proves no regression); docforge byte-exact render oracle
PASS; composer live test renders through the rewired walker (PASS); bun build
+ bun test 274/274. The shared-DB live run fails ~85 tests across unrelated
services from a harness pq-42P08 $1-type seeding quirk + a stale
deadline_rules test — systemic/environmental (the no-DB run is clean), not
this change.
docforge train complete: 8 slices, the engine extracted + cleaned + a working
author→generate→export loop on uploaded templates, plus the neutral model +
importer + exporter seam for future formats/consumers.
m/paliad#157
35 lines
1.0 KiB
Go
35 lines
1.0 KiB
Go
package docx
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
|
|
"mgit.msbls.de/m/paliad/pkg/docforge"
|
|
"mgit.msbls.de/m/paliad/pkg/docforge/markdown"
|
|
)
|
|
|
|
func TestExporter_RenderBodyMatchesWalker(t *testing.T) {
|
|
exp := NewExporter(map[string]string{"paragraph": "Body"}, nil)
|
|
if exp.Format() != "docx" {
|
|
t.Errorf("Format = %q; want docx", exp.Format())
|
|
}
|
|
if !strings.Contains(exp.MIMEType(), "wordprocessingml.document") {
|
|
t.Errorf("MIMEType = %q", exp.MIMEType())
|
|
}
|
|
|
|
md := "Hello **world**\n\n- item"
|
|
// The Exporter must produce exactly what the walker entry point does
|
|
// for the same input (both go markdown.Import → RenderDocumentToOOXML).
|
|
body, err := exp.RenderBody(markdown.Import(md))
|
|
if err != nil {
|
|
t.Fatalf("RenderBody: %v", err)
|
|
}
|
|
want := RenderMarkdownToOOXMLWithStyles(md, map[string]string{"paragraph": "Body"}, nil)
|
|
if string(body) != want {
|
|
t.Errorf("RenderBody mismatch:\n got %q\nwant %q", body, want)
|
|
}
|
|
}
|
|
|
|
// satisfies the interface (compile-time check mirrored at runtime).
|
|
var _ docforge.Exporter = Exporter{}
|