fix: markdown breaking on bracketed text between hyperlinks (RocketChat#38629)

Co-authored-by: Guilherme Gazzo <guilherme@gazzo.xyz>

Author: 2 people

.changeset/fix-markdown-between-links.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/message-parser": patch
+---
+
+Fixes markdown breaking when text in square brackets appears between hyperlinks. This resolves issues #31418 and #31766 where typing `[text]` between links would incorrectly parse the markdown structure.

packages/message-parser/src/grammar.pegjs

@@ -278,7 +278,7 @@ References
   = "[" title:LinkTitle* "](" href:LinkRef ")" { return title.length ? link(href, reducePlainTexts(title)) : link(href); }
   / "<" href:LinkRef "|" title:LinkTitle2 ">" { return link(href, [plain(title)]); }
 
-LinkTitle = (Whitespace / Emphasis) / anyTitle:$(!("](" .) .) { return plain(anyTitle) }
+LinkTitle = (Whitespace / Emphasis) / anyTitle:$(!("](" .) !("] [" [^\]]* "](") .) { return plain(anyTitle) }
 
 LinkTitle2 = $([\x20-\x3B\x3D\x3F-\x60\x61-\x7B\x7D-\xFF] / NonASCII)+
 
@@ -323,7 +323,7 @@ DomainName
 
 DomainNameLabel = $(DomainChar+ ("-" DomainChar+)*)
 
-DomainChar = !Extra ([\__-] / !Safe) !EndOfLine !Space ![\\/|><%`] .
+DomainChar = !Extra ([\__-] / !Safe) !EndOfLine !Space ![\\/|><%`\[\]] .
 
 /**
  *

packages/message-parser/tests/link.test.ts

@@ -385,6 +385,26 @@ Text after line break`,
 		'[test **bold with __italic__**](https://rocket.chat)',
 		[paragraph([link('https://rocket.chat', [plain('test '), bold([plain('bold with '), italic([plain('italic')])])])])],
 	],
+	// Test case for issue #31418 - text in brackets between two links should not break markdown
+	[
+		'[Rocket.Chat] [New release](https://www.rocket.chat/blog/new-starter-pro-plans)',
+		[paragraph([plain('[Rocket.Chat] '), link('https://www.rocket.chat/blog/new-starter-pro-plans', [plain('New release')])])],
+	],
+	// Test case for issue #31766 - multiple links with bracketed text between them
+	[
+		'[BUG #11111](https://github.com/) - [BACK] changelog description',
+		[paragraph([link('https://github.com/', [plain('BUG #11111')]), plain(' - [BACK] changelog description')])],
+	],
+	[
+		'[BUG #11111](https://github.com/) - [BACK] [Another link](https://github.com/)',
+		[
+			paragraph([
+				link('https://github.com/', [plain('BUG #11111')]),
+				plain(' - [BACK] '),
+				link('https://github.com/', [plain('Another link')]),
+			]),
+		],
+	],
 ])('parses %p', (input, output) => {
 	expect(parse(input)).toMatchObject(output);
 });

yarn.lock

@@ -8583,7 +8583,7 @@ __metadata:
     "@rocket.chat/css-in-js": "*"
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-tokens": "*"
-    "@rocket.chat/message-parser": 0.31.33-rc.0
+    "@rocket.chat/message-parser": 0.31.33
     "@rocket.chat/styled": "*"
     "@rocket.chat/ui-client": "workspace:^"
     "@rocket.chat/ui-contexts": "workspace:^"
@@ -10435,7 +10435,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.4
-    "@rocket.chat/ui-contexts": 27.0.0-rc.2
+    "@rocket.chat/ui-contexts": 27.0.0
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"