chore: update inline parser

plugin/gomark/ast/inline.go

@@ -18,8 +18,8 @@ type Bold struct {
 	BaseInline
 
 	// Symbol is "*" or "_".
-	Symbol  string
+	Symbol   string
-	Content string
+	Children []Node
 }
 
 func (*Bold) Type() NodeType {

plugin/gomark/parser/bold.go

@@ -53,8 +53,12 @@ func (p *BoldParser) Parse(tokens []*tokenizer.Token) (ast.Node, error) {
 
 	prefixTokenType := tokens[0].Type
 	contentTokens := tokens[2 : size-2]
+	children, err := ParseInlineWithParsers(contentTokens, []InlineParser{NewLinkParser(), NewTextParser()})
+	if err != nil {
+		return nil, err
+	}
 	return &ast.Bold{
-		Symbol:  prefixTokenType,
+		Symbol:   prefixTokenType,
-		Content: tokenizer.Stringify(contentTokens),
+		Children: children,
 	}, nil
 }

plugin/gomark/parser/bold_test.go

@@ -21,15 +21,23 @@ func TestBoldParser(t *testing.T) {
 		{
 			text: "**Hello**",
 			bold: &ast.Bold{
-				Symbol:  "*",
+				Symbol: "*",
-				Content: "Hello",
+				Children: []ast.Node{
+					&ast.Text{
+						Content: "Hello",
+					},
+				},
 			},
 		},
 		{
 			text: "** Hello **",
 			bold: &ast.Bold{
-				Symbol:  "*",
+				Symbol: "*",
-				Content: " Hello ",
+				Children: []ast.Node{
+					&ast.Text{
+						Content: " Hello ",
+					},
+				},
 			},
 		},
 		{

plugin/gomark/parser/heading_test.go

@@ -63,8 +63,12 @@ Hello World`,
 				Level: 3,
 				Children: []ast.Node{
 					&ast.Bold{
-						Symbol:  "*",
+						Symbol: "*",
-						Content: "Hello",
+						Children: []ast.Node{
+							&ast.Text{
+								Content: "Hello",
+							},
+						},
 					},
 					&ast.Text{
 						Content: " World",

plugin/gomark/parser/link_test.go

@@ -29,6 +29,13 @@ func TestLinkParser(t *testing.T) {
 			text: "[alte]( htt ps :/ /example.com)",
 			link: nil,
 		},
+		{
+			text: "[your/slash](https://example.com)",
+			link: &ast.Link{
+				Text: "your/slash",
+				URL:  "https://example.com",
+			},
+		},
 		{
 			text: "[hello world](https://example.com)",
 			link: &ast.Link{

plugin/gomark/parser/parser.go

@@ -76,10 +76,14 @@ var defaultInlineParsers = []InlineParser{
 }
 
 func ParseInline(tokens []*tokenizer.Token) ([]ast.Node, error) {
+	return ParseInlineWithParsers(tokens, defaultInlineParsers)
+}
+
+func ParseInlineWithParsers(tokens []*tokenizer.Token, inlineParsers []InlineParser) ([]ast.Node, error) {
 	nodes := []ast.Node{}
 	var prevNode ast.Node
 	for len(tokens) > 0 {
-		for _, inlineParser := range defaultInlineParsers {
+		for _, inlineParser := range inlineParsers {
 			size, matched := inlineParser.Match(tokens)
 			if matched {
 				node, err := inlineParser.Parse(tokens)

plugin/gomark/parser/parser_test.go

@@ -32,8 +32,12 @@ func TestParser(t *testing.T) {
 				&ast.Paragraph{
 					Children: []ast.Node{
 						&ast.Bold{
-							Symbol:  "*",
+							Symbol: "*",
-							Content: "Hello",
+							Children: []ast.Node{
+								&ast.Text{
+									Content: "Hello",
+								},
+							},
 						},
 						&ast.Text{
 							Content: " world!",
@@ -51,8 +55,12 @@ func TestParser(t *testing.T) {
 							Content: "Hello ",
 						},
 						&ast.Bold{
-							Symbol:  "*",
+							Symbol: "*",
-							Content: "world",
+							Children: []ast.Node{
+								&ast.Text{
+									Content: "world",
+								},
+							},
 						},
 						&ast.Text{
 							Content: "!",
@@ -78,8 +86,12 @@ func TestParser(t *testing.T) {
 							Content: "Hello ",
 						},
 						&ast.Bold{
-							Symbol:  "*",
+							Symbol: "*",
-							Content: "world",
+							Children: []ast.Node{
+								&ast.Text{
+									Content: "world",
+								},
+							},
 						},
 						&ast.Text{
 							Content: "!",
@@ -150,7 +162,7 @@ func StringifyNode(node ast.Node) string {
 	case *ast.Text:
 		return "Text(" + n.Content + ")"
 	case *ast.Bold:
-		return "Bold(" + n.Symbol + n.Content + n.Symbol + ")"
+		return "Bold(" + n.Symbol + StringifyNodes(n.Children) + n.Symbol + ")"
 	case *ast.Italic:
 		return "Italic(" + n.Symbol + n.Content + n.Symbol + ")"
 	case *ast.BoldItalic:

plugin/gomark/parser/unordered_list_test.go

@@ -35,8 +35,12 @@ func TestUnorderedListParser(t *testing.T) {
 				Symbol: tokenizer.Asterisk,
 				Children: []ast.Node{
 					&ast.Bold{
-						Symbol:  "*",
+						Symbol: "*",
-						Content: "Hello",
+						Children: []ast.Node{
+							&ast.Text{
+								Content: "Hello",
+							},
+						},
 					},
 				},
 			},

plugin/gomark/render/html/html.go

@@ -149,7 +149,7 @@ func (r *HTMLRender) renderText(node *ast.Text) {
 
 func (r *HTMLRender) renderBold(node *ast.Bold) {
 	r.output.WriteString("<strong>")
-	r.output.WriteString(node.Content)
+	r.RenderNodes(node.Children)
 	r.output.WriteString("</strong>")
 }
 

plugin/gomark/render/string/string.go

@@ -134,7 +134,7 @@ func (r *StringRender) renderText(node *ast.Text) {
 }
 
 func (r *StringRender) renderBold(node *ast.Bold) {
-	r.output.WriteString(node.Content)
+	r.RenderNodes(node.Children)
 }
 
 func (r *StringRender) renderItalic(node *ast.Italic) {
@@ -151,12 +151,12 @@ func (r *StringRender) renderCode(node *ast.Code) {
 	r.output.WriteString("`")
 }
 
-func (*StringRender) renderImage(*ast.Image) {
+func (r *StringRender) renderImage(node *ast.Image) {
-	// Do nothing.
+	r.output.WriteString(node.AltText)
 }
 
-func (*StringRender) renderLink(*ast.Link) {
+func (r *StringRender) renderLink(node *ast.Link) {
-	// Do nothing.
+	r.output.WriteString(node.Text)
 }
 
 func (r *StringRender) renderTag(node *ast.Tag) {

plugin/gomark/render/string/string_test.go

@@ -22,6 +22,10 @@ func TestStringRender(t *testing.T) {
 			text:     "**Hello** world!",
 			expected: `Hello world!`,
 		},
+		{
+			text:     "**[your/slash](https://example.com)** world!",
+			expected: `your/slash world!`,
+		},
 	}
 
 	for _, test := range tests {

store/db/mysql/seed/10001__user.sql

@@ -1,45 +0,0 @@
-INSERT INTO
-  user (
-    `id`,
-    `username`,
-    `role`,
-    `email`,
-    `nickname`,
-	`row_status`,
-	`avatar_url`,
-    `password_hash`
-  )
-VALUES
-  (
-    101,
-    'memos-demo',
-    'HOST',
-    'demo@usememos.com',
-    'Derobot',
-	'NORMAL',
-	'',
-    -- raw password: secret
-    '$2a$14$ajq8Q7fbtFRQvXpdCq7Jcuy.Rx1h/L4J60Otx.gyNLbAYctGMJ9tK'
-  ),
-  (
-    102,
-    'jack',
-    'USER',
-    'jack@usememos.com',
-    'Jack',
-	'NORMAL',
-	'',
-    -- raw password: secret
-    '$2a$14$ajq8Q7fbtFRQvXpdCq7Jcuy.Rx1h/L4J60Otx.gyNLbAYctGMJ9tK'
-  ),
-  (
-    103,
-    'bob',
-    'USER',
-    'bob@usememos.com',
-    'Bob',
-    'ARCHIVED',
-	'',
-    -- raw password: secret
-    '$2a$14$ajq8Q7fbtFRQvXpdCq7Jcuy.Rx1h/L4J60Otx.gyNLbAYctGMJ9tK'
-  );

store/db/mysql/seed/10002__memo.sql

@@ -1,51 +0,0 @@
-INSERT INTO
-  memo (`id`, `content`, `creator_id`)
-VALUES
-  (
-    1,
-    "#Hello 👋 Welcome to memos.",
-    101
-  );
-
-INSERT INTO
-  memo (
-    `id`,
-    `content`,
-    `creator_id`,
-    `visibility`
-  )
-VALUES
-  (
-    2,
-    '#TODO 
-- [x] Take more photos about **🌄 sunset**
-- [x] Clean the room
-- [ ] Read *📖 The Little Prince*
-(👆 click to toggle status)',
-    101,
-    'PROTECTED'
-  ),
-  (
-    3,
-    "**[Slash](https://github.com/yourselfhosted/slash)**: A bookmarking and url shortener, save and share your links very easily.
-**[SQL Chat](https://www.sqlchat.ai)**: Chat-based SQL Client",
-    101,
-    'PUBLIC'
-  ),
-  (
-    4,
-    '#TODO 
-- [x] Take more photos about **🌄 sunset**
-- [ ] Clean the classroom
-- [ ] Watch *👦 The Boys*
-(👆 click to toggle status)
-',
-    102,
-    'PROTECTED'
-  ),
-  (
-    5,
-    '三人行，必有我师焉！👨‍🏫',
-    102,
-    'PUBLIC'
-  );

store/db/mysql/seed/10003__memo_organizer.sql

@@ -1,5 +0,0 @@
-INSERT INTO
-  memo_organizer (`memo_id`, `user_id`, `pinned`)
-VALUES
-  (1, 101, 1),
-  (3, 101, 1);

store/db/mysql/seed/10004__tag.sql

@@ -1,6 +0,0 @@
-INSERT INTO
-  tag (`name`, `creator_id`)
-VALUES
-  ('Hello', 101),
-  ('TODO', 101),
-  ('TODO', 102);

store/db/postgres/seed/10001__user.sql

@@ -1,44 +0,0 @@
-INSERT INTO "user" (
-    id,
-    username,
-    role,
-    email,
-    nickname,
-    row_status,
-    avatar_url,
-    password_hash
-)
-VALUES
-  (
-    101,
-    'memos-demo',
-    'HOST',
-    'demo@usememos.com',
-    'Derobot',
-    'NORMAL',
-    '',
-    -- raw password: secret
-    '$2a$14$ajq8Q7fbtFRQvXpdCq7Jcuy.Rx1h/L4J60Otx.gyNLbAYctGMJ9tK'
-  ),
-  (
-    102,
-    'jack',
-    'USER',
-    'jack@usememos.com',
-    'Jack',
-    'NORMAL',
-    '',
-    -- raw password: secret
-    '$2a$14$ajq8Q7fbtFRQvXpdCq7Jcuy.Rx1h/L4J60Otx.gyNLbAYctGMJ9tK'
-  ),
-  (
-    103,
-    'bob',
-    'USER',
-    'bob@usememos.com',
-    'Bob',
-    'ARCHIVED',
-    '',
-    -- raw password: secret
-    '$2a$14$ajq8Q7fbtFRQvXpdCq7Jcuy.Rx1h/L4J60Otx.gyNLbAYctGMJ9tK'
-  );

store/db/postgres/seed/10002__memo.sql

@@ -1,34 +0,0 @@
-INSERT INTO memo (id, content, creator_id)
-VALUES
-  (
-    1,
-    '#Hello 👋 Welcome to memos.',
-    101
-  );
-
-INSERT INTO memo (id, content, creator_id, visibility)
-VALUES
-  (
-    2,
-    E'#TODO\n- [x] Take more photos about **🌄 sunset**\n- [x] Clean the room\n- [ ] Read *📖 The Little Prince*\n(👆 click to toggle status)',
-    101,
-    'PROTECTED'
-  ),
-  (
-    3,
-    E'**[Slash](https://github.com/yourselfhosted/slash)**: A bookmarking and url shortener, save and share your links very easily.\n**[SQL Chat](https://www.sqlchat.ai)**: Chat-based SQL Client',
-    101,
-    'PUBLIC'
-  ),
-  (
-    4,
-    E'#TODO\n- [x] Take more photos about **🌄 sunset**\n- [ ] Clean the classroom\n- [ ] Watch *👦 The Boys*\n(👆 click to toggle status)',
-    102,
-    'PROTECTED'
-  ),
-  (
-    5,
-    '三人行，必有我师焉！👨‍🏫',
-    102,
-    'PUBLIC'
-  );

store/db/postgres/seed/10003__memo_organizer.sql

@@ -1,5 +0,0 @@
-INSERT INTO
-  memo_organizer (memo_id, user_id, pinned)
-VALUES
-  (1, 101, 1),
-  (3, 101, 1);

store/db/postgres/seed/10004__tag.sql

@@ -1,6 +0,0 @@
-INSERT INTO
-  tag (name, creator_id)
-VALUES
-  ('Hello', 101),
-  ('TODO', 101),
-  ('TODO', 102);