feat(prose): added horizontal rule to list parser

Commit `d201269`

Eric Bower · 2026-01-16 10:39:06 -0500 EST

parent b224595

feat(prose): added horizontal rule to list parser

refactor(prose): replace ul/li with custom list impl

2 files changed, +75, -53

M pkg/apps/prose/html/list.partial.tmpl

M pkg/shared/listparser.go

M pkg/apps/prose/html/list.partial.tmpl

+70, -49

......@@ -1,51 +1,72 @@
{{define "list"}}
{{$indent := 0}}
{{$mod := 0}}
<ul style="list-style-type: {{.ListType}};">
    {{range .Items}}
        {{if lt $indent .Indent}}
        <ul>
        {{else if gt $indent .Indent}}

        {{$mod = minus $indent .Indent}}
        {{range $y := intRange 1 $mod}}
        </li></ul>
        {{end}}

        {{else}}
        </li>
        {{end}}
        {{$indent = .Indent}}

        {{if .IsText}}
            {{if .Value}}
            <li>{{.Value}}
            {{end}}
        {{end}}

        {{if .IsURL}}
        <li><a href="{{.URL}}">{{.Value}}</a>
        {{end}}

        {{if .IsImg}}
        <li><img src="{{.URL}}" alt="{{.Value}}" />
        {{end}}

        {{if .IsBlock}}
        <li><blockquote>{{.Value}}</blockquote>
        {{end}}

        {{if .IsHeaderOne}}
        </ul><h2 class="text-xl font-bold">{{.Value}}</h2><ul style="list-style-type: {{$.ListType}};">
        {{end}}

        {{if .IsHeaderTwo}}
        </ul><h3 class="text-lg font-bold">{{.Value}}</h3><ul style="list-style-type: {{$.ListType}};">
        {{end}}

        {{if .IsPre}}
        <li><pre>{{.Value}}</pre>
        {{end}}
    {{end}}
</ul>
	{{$indent := 0}}
	{{$mod := 0}}

	<div role="list">
		{{range .Items}}
	    {{if lt $indent .Indent}}
	    	<div role="list">
	    {{else if gt $indent .Indent}}
	    	{{$mod = minus $indent .Indent}}
	    	{{range $y := intRange 1 $mod}}
	    		</div>
	    	{{end}}
	    {{end}}

	    {{$indent = .Indent}}

			{{if .IsText}}
				<div role="listitem">
					<div class="listitem-bullet">•</div>
					<div class="listitem-text">{{.Value}}</div>
				</div>
			{{end}}

			{{if .IsURL}}
				<div role="listitem">
					<div class="listitem-bullet">•</div>
					<a class="listitem-text" href="{{.URL}}">{{.Value}}</a>
				</div>
			{{end}}

	    {{if .IsImg}}
	    	<div role="listitem">
					<div class="listitem-bullet">•</div>
		    	<img class="listeitem-text" src="{{.URL}}" alt="{{.Value}}" />
		    </div>
	    {{end}}

	    {{if .IsBlock}}
	    	<div role="listitem">
					<div class="listitem-bullet">•</div>
		    	<blockquote class="listitem-text">{{.Value}}</blockquote>
		    </div>
	    {{end}}

	    {{if .IsPre}}
	    	<div role="listitem">
					<div class="listitem-bullet">•</div>
		    	<pre class="listitem-text">{{.Value}}</pre>
		    </div>
	    {{end}}

	    {{if .IsHeaderOne}}
	    	</div>
	    	<h2 class="text-xl font-bold">{{.Value}}</h2>
	    	<div role="list" aria-label="{{.Value}}">
	    {{end}}

	    {{if .IsHeaderTwo}}
	    	</div>
	    	<h3 class="text-lg font-bold">{{.Value}}</h3>
	    	<div role="list" aria-label="{{.Value}}">
	    {{end}}

	    {{if .IsHr}}
	    	</div>
	    	<hr />
	    	<div role="list" aria-label="{{.Value}}">
	    {{end}}
		{{end}}
	</div>
{{end}}

M pkg/shared/listparser.go

+5, -4

......@@ -39,6 +39,7 @@ type ListItem struct {
	IsHeaderTwo bool
	IsImg       bool
	IsPre       bool
	IsHr        bool
	Indent      int
}

......@@ -50,7 +51,6 @@ type ListMetaData struct {
	Image       string
	ImageCard   string
	Layout      string
	ListType    string // https://developer.mozilla.org/en-US/docs/Web/CSS/list-style-type
	PublishAt   *time.Time
	Tags        []string
	Title       string

......@@ -69,6 +69,7 @@ var imgToken = "=<"
var headerOneToken = "#"
var headerTwoToken = "##"
var preToken = "```"
var hrToken = "=="

type SplitToken struct {
	Key   string

......@@ -121,8 +122,6 @@ func TokenToMetaField(meta *ListMetaData, token *SplitToken) error {
		meta.Image = token.Value
	case "image_card":
		meta.ImageCard = token.Value
	case "list_type":
		meta.ListType = token.Value
	case "draft":
		if token.Value == "true" {
			meta.Hidden = true

......@@ -210,6 +209,9 @@ func parseItem(meta *ListMetaData, li *ListItem, prevItem *ListItem, pre bool, m
	} else if strings.HasPrefix(li.Value, headerOneToken) {
		li.IsHeaderOne = true
		li.Value = strings.Replace(li.Value, headerOneToken, "", 1)
	} else if strings.HasPrefix(li.Value, hrToken) {
		li.IsHr = true
		li.Value = ""
	} else if reIndent.MatchString(li.Value) {
		trim := reIndent.ReplaceAllString(li.Value, "")
		old := len(li.Value)

......@@ -241,7 +243,6 @@ func ListParseText(text string) *ListParsedText {
		Aliases:       []string{},
		InlineContent: true,
		Layout:        "default",
		ListType:      "disc",
		PublishAt:     &time.Time{},
		Tags:          []string{},
		Hidden:        false,

...	...		@@ -1,51 +1,72 @@
1	1		{{define "list"}}
2		-	{{$indent := 0}}
3		-	{{$mod := 0}}
4		-	<ul style="list-style-type: {{.ListType}};">
5		-	{{range .Items}}
6		-	{{if lt $indent .Indent}}
7		-	<ul>
8		-	{{else if gt $indent .Indent}}
9		-
10		-	{{$mod = minus $indent .Indent}}
11		-	{{range $y := intRange 1 $mod}}
12		-	</li></ul>
13		-	{{end}}
14		-
15		-	{{else}}
16		-	</li>
17		-	{{end}}
18		-	{{$indent = .Indent}}
19		-
20		-	{{if .IsText}}
21		-	{{if .Value}}
22		-	<li>{{.Value}}
23		-	{{end}}
24		-	{{end}}
25		-
26		-	{{if .IsURL}}
27		-	<li><a href="{{.URL}}">{{.Value}}</a>
28		-	{{end}}
29		-
30		-	{{if .IsImg}}
31		-	<li><img src="{{.URL}}" alt="{{.Value}}" />
32		-	{{end}}
33		-
34		-	{{if .IsBlock}}
35		-	<li><blockquote>{{.Value}}</blockquote>
36		-	{{end}}
37		-
38		-	{{if .IsHeaderOne}}
39		-	</ul><h2 class="text-xl font-bold">{{.Value}}</h2><ul style="list-style-type: {{$.ListType}};">
40		-	{{end}}
41		-
42		-	{{if .IsHeaderTwo}}
43		-	</ul><h3 class="text-lg font-bold">{{.Value}}</h3><ul style="list-style-type: {{$.ListType}};">
44		-	{{end}}
45		-
46		-	{{if .IsPre}}
47		-	<li><pre>{{.Value}}</pre>
48		-	{{end}}
49		-	{{end}}
50		-	</ul>
	2	+	{{$indent := 0}}
	3	+	{{$mod := 0}}
	4	+
	5	+	<div role="list">
	6	+	{{range .Items}}
	7	+	{{if lt $indent .Indent}}
	8	+	<div role="list">
	9	+	{{else if gt $indent .Indent}}
	10	+	{{$mod = minus $indent .Indent}}
	11	+	{{range $y := intRange 1 $mod}}
	12	+	</div>
	13	+	{{end}}
	14	+	{{end}}
	15	+
	16	+	{{$indent = .Indent}}
	17	+
	18	+	{{if .IsText}}
	19	+	<div role="listitem">
	20	+	<div class="listitem-bullet">•</div>
	21	+	<div class="listitem-text">{{.Value}}</div>
	22	+	</div>
	23	+	{{end}}
	24	+
	25	+	{{if .IsURL}}
	26	+	<div role="listitem">
	27	+	<div class="listitem-bullet">•</div>
	28	+	<a class="listitem-text" href="{{.URL}}">{{.Value}}</a>
	29	+	</div>
	30	+	{{end}}
	31	+
	32	+	{{if .IsImg}}
	33	+	<div role="listitem">
	34	+	<div class="listitem-bullet">•</div>
	35	+	<img class="listeitem-text" src="{{.URL}}" alt="{{.Value}}" />
	36	+	</div>
	37	+	{{end}}
	38	+
	39	+	{{if .IsBlock}}
	40	+	<div role="listitem">
	41	+	<div class="listitem-bullet">•</div>
	42	+	<blockquote class="listitem-text">{{.Value}}</blockquote>
	43	+	</div>
	44	+	{{end}}
	45	+
	46	+	{{if .IsPre}}
	47	+	<div role="listitem">
	48	+	<div class="listitem-bullet">•</div>
	49	+	<pre class="listitem-text">{{.Value}}</pre>
	50	+	</div>
	51	+	{{end}}
	52	+
	53	+	{{if .IsHeaderOne}}
	54	+	</div>
	55	+	<h2 class="text-xl font-bold">{{.Value}}</h2>
	56	+	<div role="list" aria-label="{{.Value}}">
	57	+	{{end}}
	58	+
	59	+	{{if .IsHeaderTwo}}
	60	+	</div>
	61	+	<h3 class="text-lg font-bold">{{.Value}}</h3>
	62	+	<div role="list" aria-label="{{.Value}}">
	63	+	{{end}}
	64	+
	65	+	{{if .IsHr}}
	66	+	</div>
	67	+	<hr />
	68	+	<div role="list" aria-label="{{.Value}}">
	69	+	{{end}}
	70	+	{{end}}
	71	+	</div>
51	72		{{end}}

...	...		@@ -39,6 +39,7 @@ type ListItem struct {
39	39		IsHeaderTwo bool
40	40		IsImg bool
41	41		IsPre bool
	42	+	IsHr bool
42	43		Indent int
43	44		}
44	45

...	...		@@ -50,7 +51,6 @@ type ListMetaData struct {
50	51		Image string
51	52		ImageCard string
52	53		Layout string
53		-	ListType string // https://developer.mozilla.org/en-US/docs/Web/CSS/list-style-type
54	54		PublishAt *time.Time
55	55		Tags []string
56	56		Title string

...	...		@@ -69,6 +69,7 @@ var imgToken = "=<"
69	69		var headerOneToken = "#"
70	70		var headerTwoToken = "##"
71	71		var preToken = "```"
	72	+	var hrToken = "=="
72	73
73	74		type SplitToken struct {
74	75		Key string

...	...		@@ -121,8 +122,6 @@ func TokenToMetaField(meta ListMetaData, token SplitToken) error {
121	122		meta.Image = token.Value
122	123		case "image_card":
123	124		meta.ImageCard = token.Value
124		-	case "list_type":
125		-	meta.ListType = token.Value
126	125		case "draft":
127	126		if token.Value == "true" {
128	127		meta.Hidden = true

...	...		@@ -210,6 +209,9 @@ func parseItem(meta ListMetaData, li ListItem, prevItem *ListItem, pre bool, m
210	209		} else if strings.HasPrefix(li.Value, headerOneToken) {
211	210		li.IsHeaderOne = true
212	211		li.Value = strings.Replace(li.Value, headerOneToken, "", 1)
	212	+	} else if strings.HasPrefix(li.Value, hrToken) {
	213	+	li.IsHr = true
	214	+	li.Value = ""
213	215		} else if reIndent.MatchString(li.Value) {
214	216		trim := reIndent.ReplaceAllString(li.Value, "")
215	217		old := len(li.Value)

...	...		@@ -241,7 +243,6 @@ func ListParseText(text string) *ListParsedText {
241	243		Aliases: []string{},
242	244		InlineContent: true,
243	245		Layout: "default",
244		-	ListType: "disc",
245	246		PublishAt: &time.Time{},
246	247		Tags: []string{},
247	248		Hidden: false,

Commit d201269

Commit `d201269`