%s
", html.EscapeString(content))) - } - return template.HTML(buf.String()) - }, "imgTag": func(src, alt, class string) template.HTML { return template.HTML(fmt.Sprintf(`%s
", html.EscapeString(s))) + } + htmlStr, err := prosemirror.RenderHTML(node) + if err != nil { + return template.HTML(fmt.Sprintf("%s
", html.EscapeString(s))) + } + return template.HTML(htmlStr) +} + func RenderHTML(data DocumentData) ([]byte, error) { data.MermaidJS = template.JS(mermaidJSSource) + page := struct { + DocumentData + BodyHTML template.HTML + }{ + DocumentData: data, + BodyHTML: ProseMirrorJSONToHTML(data.Content), + } + var buf bytes.Buffer - if err := documentTemplate.Execute(&buf, data); err != nil { + if err := documentTemplate.Execute(&buf, page); err != nil { return nil, fmt.Errorf("cannot execute template: %w", err) } diff --git a/pkg/docgen/generator_test.go b/pkg/docgen/generator_test.go index c029829b9..95095f935 100644 --- a/pkg/docgen/generator_test.go +++ b/pkg/docgen/generator_test.go @@ -38,7 +38,7 @@ func TestRenderHTML(t *testing.T) { name: "basic document with all fields", data: DocumentData{ Title: "Test Document", - Content: "# Main Title\n\nThis is **bold** text with *italic* formatting.", + Content: `{"type":"doc","content":[{"type":"heading","attrs":{"level":1},"content":[{"type":"text","text":"Main Title"}]},{"type":"paragraph","content":[{"type":"text","text":"This is "},{"type":"text","marks":[{"type":"bold"}],"text":"bold"},{"type":"text","text":" text with "},{"type":"text","marks":[{"type":"italic"}],"text":"italic"},{"type":"text","text":" formatting."}]}]}`, Major: 1, Classification: ClassificationPublic, Approvers: []string{"John Doe"}, @@ -87,20 +87,32 @@ func TestRenderHTML(t *testing.T) { }, }, { - name: "document with markdown content", + name: "document with prosemirror content", data: DocumentData{ - Title: "Markdown Test", - Content: "## Section 1\n\n- Item 1\n- Item 2\n\n**Bold text** and *italic text*\n\n```code block```", + Title: "ProseMirror Test", + Content: `{"type":"doc","content":[` + + `{"type":"heading","attrs":{"level":2},"content":[{"type":"text","text":"Section 1"}]},` + + `{"type":"bulletList","content":[` + + `{"type":"listItem","content":[{"type":"paragraph","content":[{"type":"text","text":"Item 1"}]}]},` + + `{"type":"listItem","content":[{"type":"paragraph","content":[{"type":"text","text":"Item 2"}]}]}` + + `]},` + + `{"type":"paragraph","content":[` + + `{"type":"text","marks":[{"type":"bold"}],"text":"Bold text"},` + + `{"type":"text","text":" and "},` + + `{"type":"text","marks":[{"type":"italic"}],"text":"italic text"}` + + `]},` + + `{"type":"codeBlock","content":[{"type":"text","text":"code block"}]}` + + `]}`, }, wantContains: []string{ "Item 1
Item 2
code block",
+ "code blocksimple text
") - // Test empty content - goldmark produces empty output for empty input - result = formatFunc("") - // Empty content should produce empty result from goldmark + result = ProseMirrorJSONToHTML("**not** json") + assert.Contains(t, string(result), "**not** json
") + + result = ProseMirrorJSONToHTML("") assert.Equal(t, template.HTML(""), result) }) } @@ -276,44 +288,62 @@ func TestHTMLEscaping(t *testing.T) { assert.Contains(t, resultStr, "'") } -func TestMarkdownRendering(t *testing.T) { +func TestProseMirrorContentRendering(t *testing.T) { tests := []struct { - name string - markdown string - want []string + name string + content string + want []string }{ { - name: "headers", - markdown: "# H1\n## H2\n### H3", - want: []string{"Item 1
Item 2
Paragraph 1
", "Paragraph 2
"}, + name: "paragraphs", + content: `{"type":"doc","content":[` + + `{"type":"paragraph","content":[{"type":"text","text":"Paragraph 1"}]},` + + `{"type":"paragraph","content":[{"type":"text","text":"Paragraph 2"}]}` + + `]}`, + want: []string{"Paragraph 1
", "Paragraph 2
"}, }, { - name: "code", - markdown: "`inline code` and\n```\ncode block\n```", - want: []string{"inline code", "code block"},
+ name: "code",
+ content: `{"type":"doc","content":[` +
+ `{"type":"paragraph","content":[{"type":"text","marks":[{"type":"code"}],"text":"inline code"}]},` +
+ `{"type":"paragraph","content":[{"type":"text","text":" and "}]},` +
+ `{"type":"codeBlock","content":[{"type":"text","text":"code block"}]}` +
+ `]}`,
+ want: []string{"inline code", "code block
"},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
data := DocumentData{
- Title: "Markdown Test",
- Content: tt.markdown,
+ Title: "ProseMirror Test",
+ Content: tt.content,
}
result, err := RenderHTML(data)
@@ -357,14 +387,29 @@ func TestDocumentVersionSignatureStates(t *testing.T) {
}
func TestLargeContent(t *testing.T) {
- // Create a large markdown content
var largeContent strings.Builder
+ largeContent.WriteString(`{"type":"doc","content":[`)
for i := range 1000 {
- largeContent.WriteString("# Section ")
- largeContent.WriteString(string(rune('A' + i%26)))
- largeContent.WriteString("\n\nThis is a paragraph with **bold** and *italic* text.\n\n")
- largeContent.WriteString("- List item 1\n- List item 2\n- List item 3\n\n")
+ if i > 0 {
+ largeContent.WriteByte(',')
+ }
+ largeContent.WriteString(`{"type":"heading","attrs":{"level":1},"content":[{"type":"text","text":"Section `)
+ largeContent.WriteByte(byte('A' + i%26))
+ largeContent.WriteString(`"}]},`)
+ largeContent.WriteString(`{"type":"paragraph","content":[` +
+ `{"type":"text","text":"This is a paragraph with "},` +
+ `{"type":"text","marks":[{"type":"bold"}],"text":"bold"},` +
+ `{"type":"text","text":" and "},` +
+ `{"type":"text","marks":[{"type":"italic"}],"text":"italic"},` +
+ `{"type":"text","text":" text."}` +
+ `]},`)
+ largeContent.WriteString(`{"type":"bulletList","content":[` +
+ `{"type":"listItem","content":[{"type":"paragraph","content":[{"type":"text","text":"List item 1"}]}]},` +
+ `{"type":"listItem","content":[{"type":"paragraph","content":[{"type":"text","text":"List item 2"}]}]},` +
+ `{"type":"listItem","content":[{"type":"paragraph","content":[{"type":"text","text":"List item 3"}]}]}` +
+ `]}`)
}
+ largeContent.WriteString(`]}`)
data := DocumentData{
Title: "Large Document",
@@ -381,8 +426,21 @@ func BenchmarkGenerateHTML(b *testing.B) {
now := time.Now()
data := DocumentData{
- Title: "Benchmark Document",
- Content: "# Title\n\nThis is **bold** text with *italic* formatting.\n\n- Item 1\n- Item 2",
+ Title: "Benchmark Document",
+ Content: `{"type":"doc","content":[` +
+ `{"type":"heading","attrs":{"level":1},"content":[{"type":"text","text":"Title"}]},` +
+ `{"type":"paragraph","content":[` +
+ `{"type":"text","text":"This is "},` +
+ `{"type":"text","marks":[{"type":"bold"}],"text":"bold"},` +
+ `{"type":"text","text":" text with "},` +
+ `{"type":"text","marks":[{"type":"italic"}],"text":"italic"},` +
+ `{"type":"text","text":" formatting."}` +
+ `]},` +
+ `{"type":"bulletList","content":[` +
+ `{"type":"listItem","content":[{"type":"paragraph","content":[{"type":"text","text":"Item 1"}]}]},` +
+ `{"type":"listItem","content":[{"type":"paragraph","content":[{"type":"text","text":"Item 2"}]}]}` +
+ `]}` +
+ `]}`,
Major: 1,
Classification: ClassificationPublic,
Approvers: []string{"John Doe"},
diff --git a/pkg/docgen/template.html b/pkg/docgen/template.html
index 3aef8cfac..4d70965eb 100644
--- a/pkg/docgen/template.html
+++ b/pkg/docgen/template.html
@@ -1,5 +1,6 @@
+
@@ -9,6 +10,7 @@
@page {
size: A4;
margin: 2.5cm;
+
@bottom-right {
content: "Page " counter(page) " of " counter(pages);
font-family: Arial, sans-serif;
@@ -32,14 +34,15 @@
width: 21cm;
margin: 0 auto;
background: white;
- box-shadow: 0 0 10px rgba(0,0,0,0.1);
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
}
/* Individual page sections */
.page-section {
padding: 2.5cm;
position: relative;
- min-height: 24.7cm; /* A4 height minus padding */
+ min-height: 24.7cm;
+ /* A4 height minus padding */
border-bottom: 2px dashed #ddd;
page-break-after: always;
}
@@ -75,7 +78,7 @@
text-align: left;
}
- .company-header + .document-title {
+ .company-header+.document-title {
margin-top: 30px;
}
@@ -248,16 +251,23 @@
}
/* Prevent bad page breaks */
- h1, h2, h3, h4, h5, h6 {
+ h1,
+ h2,
+ h3,
+ h4,
+ h5,
+ h6 {
page-break-after: avoid;
page-break-inside: avoid;
}
- p, li {
+ p,
+ li {
page-break-inside: avoid;
}
- table, .signatures-section {
+ table,
+ .signatures-section {
page-break-inside: avoid;
}
@@ -367,6 +377,7 @@
});
+
@@ -394,9 +405,9 @@
{{index .Approvers 0}}
{{- else}}
- {{- range .Approvers}}
+ {{- range .Approvers}}
- {{.}}
- {{- end}}
+ {{- end}}
{{- end}}
@@ -417,7 +428,7 @@
- {{.Content | formatContent}}
+ {{.BodyHTML}}
{{- if .Signatures}}
@@ -460,4 +471,5 @@
-
+
+