From 19690db66cc315ffc72ef2071c2c6fe1aa62cf71 Mon Sep 17 00:00:00 2001 From: Hugo Costa Date: Fri, 31 Mar 2023 08:35:39 -0300 Subject: [PATCH] refactor: grammar optmization (#1013) --- packages/message-parser/package.json | 2 +- packages/message-parser/src/grammar.pegjs | 831 ++++++++++----------- packages/message-parser/tests/link.test.ts | 46 ++ packages/message-parser/tests/url.test.ts | 18 + packages/peggy-loader/package.json | 2 +- yarn.lock | 23 +- 6 files changed, 461 insertions(+), 461 deletions(-) diff --git a/packages/message-parser/package.json b/packages/message-parser/package.json index b09d123185..01bead84d7 100644 --- a/packages/message-parser/package.json +++ b/packages/message-parser/package.json @@ -67,7 +67,7 @@ "lint-all": "workspace:~", "lint-staged": "~12.3.8", "npm-run-all": "^4.1.5", - "peggy": "^2.0.1", + "peggy": "3.0.2", "prettier": "~2.7.1", "prettier-plugin-pegjs": "~0.5.3", "rimraf": "^3.0.2", diff --git a/packages/message-parser/src/grammar.pegjs b/packages/message-parser/src/grammar.pegjs index 9edcbd0969..2c56731ec5 100644 --- a/packages/message-parser/src/grammar.pegjs +++ b/packages/message-parser/src/grammar.pegjs @@ -1,4 +1,4 @@ -{ +{{ const { autoEmail, autoLink, @@ -32,523 +32,403 @@ tasks, unorderedList, } = require('./utils'); -} +}} -start - = b:BigEmoji !. { return b; } +Start + = @BigEmoji !. / (Blocks / Paragraph / EndOfLine { return paragraph([plain('')]); })+ -BigEmoji - = _ - e1:(Emoji / emoticon) - _ - e2:(Emoji / emoticon)? - _ - e3:(Emoji / emoticon)? - _ { return [bigEmoji([e1, e2, e3].filter(Boolean))]; } - -_ = (EndOfLine / Space)* - +/** + * + * Blocks + * + */ Blocks = Blockquote / Code / Heading - / tasks + / Tasks / OrderedList / UnorderedList - / katex + / Katex / LineBreak -Blockquote = b:Blockquote_line+ { return quote(b); } +/** + * + * Blockquote + * e.g: > This is a blockquote + * + */ +Blockquote = b:BlockquoteLine+ { return quote(b); } -Blockquote_line = ">" [ \t]* p:Paragraph { return p; } +BlockquoteLine = ">" [ \t]* @Paragraph -Code - = "```" language:Code_language? EndOfLine lines:Code_line+ EndOfLine "```" { - return code(lines, language); - } +/** + * + * Code Chunk + * e.g: + * ```js + * console.log('hello world'); + * ``` + */ +Code = "```" language:CodeLanguage? EndOfLine lines:CodeLine+ EndOfLine "```" { return code(lines, language); } -Code_language = $[a-zA-Z0-9 \_\-.]+ +CodeLanguage = $[a-zA-Z0-9 \_\-.]+ -Code_line - = chunk:Code_chunk { return codeLine(chunk); } - / "\n" chunk:Code_chunk { return codeLine(chunk); } +CodeLine + = chunk:CodeChunk { return codeLine(chunk); } + / "\n" chunk:CodeChunk { return codeLine(chunk); } / "\n" !"```" { return codeLine(plain('')); } -Code_chunk = text:$(!EndOfLine !"```" .)+ { return plain(text); } - -Heading - = "#" [ \t]+ text:Heading_chunk { return heading([text], 1); } - / "##" [ \t]+ text:Heading_chunk { return heading([text], 2); } - / "###" [ \t]+ text:Heading_chunk { return heading([text], 3); } - / "####" [ \t]+ text:Heading_chunk { return heading([text], 4); } - -Heading_chunk = text:$(!EndOfLine .)+ { return plain(text); } - -OrderedList = items:OrderedList_item+ { return orderedList(items); } - -OrderedList_item - = number:digits "." [ \t]+ text:Inline { - return listItem(text, parseInt(number, 10)); - } - -UnorderedList - = items:UnorderedList_hyphenItem+ { return unorderedList(items); } - / items:UnorderedList_asteriskItem+ { return unorderedList(items); } - -UnorderedList_hyphenItem = "-" [ \t]+ text:Inline { return listItem(text); } - -UnorderedList_asteriskItem - = "*" [ \t]+ text:UnorderedList_itemContent { return listItem(text); } - -UnorderedList_itemContent - = value:( - Whitespace - / Emoji - / References - / InlineCode - / AutolinkedPhone - / AutolinkedURL - / AutolinkedEmail - / Emphasis - / color - / emoticon - / UserMention - / ChannelMention - / !"*" a:Any { return a; } - )+ - !"*" - EndOfLine? { return reducePlainTexts(value); } - -LineBreak = (Space* EndOfLine) { return lineBreak(); } - -Emphasis - = Bold - / Italic - / Strikethrough - -Paragraph = value:Inline { return paragraph(value); } - -Inline - = value:( - Whitespace - / Emoji - / InlineCode - / inlineKatex - / Image - / References - / AutolinkedPhone - / AutolinkedEmail - / AutolinkedURL - / Emphasis - / color - / emoticon - / UserMention - / ChannelMention - / Escaped - / Any - )+ - EndOfLine? { return reducePlainTexts(value); } - -Whitespace = w:$Space+ { return plain(w); } - -Escaped = "\\" t:$("*" / "_" / "~" / "`" / "#" / ".") { return plain(t); } +CodeChunk = text:$(!EndOfLine !"```" .)+ { return plain(text); } -Any = !EndOfLine t:$. p:$AutolinkedPhone? u:$URL? { return plain(t + p + u); } +/** + * + * Heading: h1, h2, h3, h4 + * e.g: + * # Heading 1 + * ## Heading 2 + * ### Heading 3 + * #### Heading 4 + * +*/ +Heading = count:HeadingStart [ \t]+ text:HeadingChunk { return heading([text], count); } -// = Line +HeadingStart = value:"#" |1..4| { return value.length; } -Line = t:line { return plain(t); } +HeadingChunk = text:$(!EndOfLine .)+ { return plain(text); } -Text = text:anyText { return plain(text); } +/** + * + * Tasks + * e.g: + * - [x] Task One (checked) + * - [ ] Task two + * - [x] Task three (checked) + * + */ +Tasks = items:Task+ { return tasks(items); } -line = head:$Space* text:$anyText+ tail:$Space* { return head + text + tail; } +Task = "- [" flag:TaskFlag "]" [ \t]+ text:Inline { return task(text, flag); } -EndOfLine - = "\r\n" - / "\n" - / "\r" +TaskFlag = "x" { return true; } / " " { return false; } -Space - = " "+ - / "\t" +/** + * + * Ordered List + * e.g: + * 1. Item One + * 2. Item Two + * 3. Item Three + * + */ +OrderedList = items:OrderedListItem+ { return orderedList(items); } -anyText - = [\x20-\x27] // ! " # $ % & ' - / [\x2B-\x40] // + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = > ? @ - / [\x41-\x5A] // A B C D E F G H I J K L M N O P Q R S T U V W X Y Z - / [\x61-\x7A] // a b c d e f g h i j k l m n o p q r s t u v w x y z - / nonascii +OrderedListItem = number:Digits "." [ \t]+ text:Inline { return listItem(text, parseInt(number, 10)); } -utf8_names_validation = $([-_.] / alphaChar / decimalNumberChar)+ +/** + * + * Unordered List + * e.g: + * - Item One + * - Item Two + * * Item Three + * * Item Four + * + */ +UnorderedList = items:(UnorderedListHyphenItem+ / UnorderedListAsteriskItem+) { return unorderedList(items); } -username_matrix_server_validation = ":" utf8_names_validation +UnorderedListHyphenItem = "-" [ \t]+ text:Inline { return listItem(text); } -username_email_validation = "@" utf8_names_validation +UnorderedListAsteriskItem = "*" [ \t]+ text:UnorderedListItemContent { return listItem(text); } -UserMention - = t:Text "@"+ user:utf8_names_validation { - return reducePlainTexts([t, plain('@' + user)])[0]; - } - / "@"+ user:$(utf8_names_validation username_matrix_server_validation) { - return mentionUser(user); - } - / "@"+ user:$(utf8_names_validation username_email_validation) { - return mentionUser(user); - } - / "@"+ user:utf8_names_validation { return mentionUser(user); } +UnorderedListItemContent = value:UnorderedListItemContentItem+ !"*" EndOfLine? { return reducePlainTexts(value); } -ChannelMention - = t:Text "#" channel:utf8_names_validation { - return reducePlainTexts([t, plain('#' + channel)])[0]; - } - / "#" channel:utf8_names_validation { return mentionChannel(channel); } +UnorderedListItemContentItem = InlineItem / !"*" @Any -emoji_shortCode_name = $[0-9a-zA-Z-_+.]+ +/** + * + * KaTex + * e.g: \[ KATEX_HERE \] OR $$ KATEX_HERE $$ + * $$x = \begin{cases} + * a &\text{if } b \\ + * c &\text{if } d + * \end{cases}$$ + * + */ +Katex = KatexStart content:$(!KatexEnd .)* KatexEnd { return katex(content); } -Emoji - = Emoji_shortCode - / ch:unicodeEmoji { return emojiUnicode(ch); } +KatexStart + = & { return options.katex?.parenthesisSyntax; } "\\[" + / & { return options.katex?.dollarSyntax; } "$$" -Emoji_shortCode - = ":" shortCode:$(text:emoji_shortCode_name) ":" { return emoji(shortCode); } +KatexEnd + = & { return options.katex?.parenthesisSyntax; } "\\]" + / & { return options.katex?.dollarSyntax; } "$$" -/* __Italic__ */ -/* _Italic_ */ -Italic - = t:$[a-zA-Z0-9]+ tail:$([\x5F] [\x5F]?) { return plain(t + tail); } - / [\x5F] [\x5F] i:italic_Content [\x5F] [\x5F] t:$[a-zA-Z0-9]+ { - return reducePlainTexts([plain('__'), ...i, plain('__'), plain(t)])[0]; - } - / [\x5F] i:italic_Content [\x5F] t:$[a-zA-Z]+ { - return reducePlainTexts([plain('_'), ...i, plain('_'), plain(t)])[0]; +KatexInline + = KatexInlineStart content:$(!KatexInlineEnd .)* KatexInlineEnd { + return inlineKatex(content); } - / [\x5F] [\x5F] i:Italic_Content [\x5F] [\x5F] { return i; } - / [\x5F] i:Italic_Content [\x5F] { return i; } - -Italic_Content = text:italic_Content { return italic(text); } -italic_Content - = text:(References / Bold / Strikethrough / Line / AnyItalic)+ { - return reducePlainTexts(text); - } +KatexInlineStart + = & { return options.katex?.parenthesisSyntax; } "\\(" + / & { return options.katex?.dollarSyntax; } "$" -/* **Bold** */ -/* *Bold* */ -Bold - = [\x2A] [\x2A] b:Bold_Content [\x2A] [\x2A] { return b; } - / [\x2A] b:Bold_Content [\x2A] { return b; } +KatexInlineEnd + = & { return options.katex?.parenthesisSyntax; } "\\)" + / & { return options.katex?.dollarSyntax; } "$" -Bold_Content - = text:(References / Italic / Strikethrough / Line / AnyBold)+ { - return bold(reducePlainTexts(text)); - } +/** + * + * LineBreak + * e.g: \n + * +*/ +LineBreak = Space* EndOfLine { return lineBreak(); } -/* ~~Mistaken text.~~ */ -/* ~Mistaken text.~ */ -Strikethrough - = [\x7E] [\x7E] s:Strikethrough_Content [\x7E] [\x7E] { return s; } - / [\x7E] s:Strikethrough_Content [\x7E] { return s; } +/** + * + * Paragraph + * e.g: This is a paragraph +*/ +Paragraph = value:Inline { return paragraph(value); } -Strikethrough_Content - = text:(References / Italic / Bold / Line / AnyStrike)+ { - return strike(reducePlainTexts(text)); - } +/** + * + * Inline + * +*/ +Inline = value:(InlineItem / Any)+ EndOfLine? { return reducePlainTexts(value); } + +InlineItem = Whitespace + / References + / AutolinkedPhone + / AutolinkedEmail + / AutolinkedURL + / Emphasis + / UserMention + / ChannelMention + / Emoji + / InlineCode + / Image + / Emoticon + / Color + / KatexInline + / Escaped -AnyBold = t:[^\x0a\* ] { return plain(t); } +/** + * + * URL + * e.g: + * Reference: [Rocket.Chat Website](https://rocket.chat), [](https://rocket.chat), + * Image: ![](https://rocket.chat/logo.png) + * + */ +References + = "[" title:LinkTitle* "](" href:LinkRef ")" { return title.length ? link(href, reducePlainTexts(title)) : link(href); } + / "<" href:LinkRef "|" title:LinkTitle2 ">" { return link(href, [plain(title)]); } -AnyStrike = t:[^\x0a\~ ] { return plain(t); } +LinkTitle = (Whitespace / Emphasis) / anyTitle:$(!("](" .) .) { return plain(anyTitle) } -AnyItalic = t:[^\x0a\_ ] { return plain(t); } +LinkTitle2 = $([\x20-\x3B\x3D\x3F-\x60\x61-\x7B\x7D-\xFF] / NonASCII)+ -InlineCode = "`" text:$InlineCode__+ "`" { return inlineCode(plain(text)); } +LinkRef = URL / FilePath / p:Phone { return 'tel:' + p.number; } // TODO: Accept parenthesis -InlineCode__ = $(!"`" !"\n" $:.) +FilePath = $(URLScheme URLBody+) -FilePath = $(URL_scheme URL_body+) +Image = "![" title:Line? "](" href:LinkRef ")" { return title ? image(href, title) : image(href); } -LinkTitle = text:(Emphasis / Line / Whitespace) { return text; } +URL + = $(URLScheme URLAuthority URLBody*) + / $(URLAuthorityHost URLBody*) -LinkRef - = text:(URL / FilePath / p:Phone { return 'tel:' + p.number; }) { - return text; - } +URLScheme = $([A-Za-z0-9+-] |1..32| ":") -Image - = "![](" href:LinkRef ")" { return image(href); } - / "![" title:LinkTitle "](" href:LinkRef ")" { return image(href, title); } - -LinkTitle2 - = $( - [\x20-\x3C] // ! " # $ % & ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; - / [\x3D\x3F-\x60] // = ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _ ` - / [\x61-\x7B] // a b c d e f g h i j k l m n o p q r s t u v w x y z { - / [\x7D-\xFF] // } ~  €  ‚ ƒ „ … † ‡ ˆ ‰ Š ‹ Œ  Ž   ‘ ’ “ ” • – — ˜ ™ š › œ  ž Ÿ   ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ­ ® ¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ ÿ - / nonascii +URLBody + = ( + !(Extra+ (Whitespace / EndOfLine) / Whitespace) + (AnyText / [*\[\/\]\^_`{}~(]) )+ -References - = "[](" href:LinkRef ")" { return link(href); } - / "[" title:LinkTitle* "](" href:LinkRef ")" { - return link(href, reducePlainTexts(title)); - } - / "<" href:LinkRef "|" title:LinkTitle2 ">" { - return link(href, [plain(title)]); - } +URLAuthority = $("//" URLAuthorityUserInfo? URLAuthorityHost) -/* Macros */ +URLAuthorityUserInfo = $(URLAuthorityUser (":" URLAuthorityPassword)? "@") -h = [0-9a-f]i +URLAuthorityUser = $(AlphaDigit / ![@/] Safe)+ -nonascii = [\x80-\uFFFF] +URLAuthorityPassword = $(AlphaDigit / ![@/] Safe)+ -unicode - = "\\" digits:$(h h? h? h? h? h?) ("\r\n" / [ \t\r\n\f])? { - return String.fromCharCode(parseInt(digits, 16)); - } +URLAuthorityHost = URLAuthorityHostName (":" URLAuthorityPort)? -AutolinkedPhone = p:Phone { return phoneChecker(p.text, p.number); } - -AutolinkedURL = u:URL { return autoLink(u); } +URLAuthorityHostName + = DomainName + / $(Digits |4, "."|) // TODO: IPv4 and IPv6 -AutolinkedEmail = e:Email { return autoEmail(e); } +URLAuthorityPort + = Digits // TODO: from "0" to "65535" -alpha = [a-zA-Z] - -digit = [0-9] - -alpha_digit - = alpha - / digit - -digits = d:$digit+ - -safe - = "$" - / "@" - / "&" - / "+" - / "\_" - / "_" - / "-" - / "#" - / "?" - -extra - = "." - / "," - / "!" - / "%" - / "~" - / "*" - / "\"" - / "'" - / ":" - / ";" - / "(" - / ")" - / "=" - / "~" - -hexdigit = [0-9A-Fa-f] - -hexNible = a:hexdigit { return parseInt(a + a, 16); } - -hexByte = a:hexdigit b:hexdigit { return parseInt(a + b, 16); } - -domainName +DomainName = "localhost" - / $(domainNameLabel ("." domainChar domainNameLabel*)+) - -domainNameLabel = $(domainChar+ $("-" domainChar+)*) - -domainChar - = !extra - ("\_" / "_" / "-" / !safe) - !EndOfLine - !Space - !"\\" - !"/" - !"|" - !">" - !"<" - !"%" - !"`" - . + / $(DomainNameLabel ("." DomainChar DomainNameLabel*)+) + +DomainNameLabel = $(DomainChar+ ("-" DomainChar+)*) + +DomainChar = !Extra ([\__-] / !Safe) !EndOfLine !Space ![\\/|><%`] . /** * * Phone + * e.g: 075-63546725 * */ +Phone = "+" p:PhoneNumber { return { text: '+' + p.text, number: p.number }; } -Phone = "+" p:phoneNumber { return { text: '+' + p.text, number: p.number }; } - -phoneNumber - = p:phonePrefix "-" d:digits { +PhoneNumber + = p:PhonePrefix "-" d:Digits { return { text: p.text + '-' + d, number: p.number + d }; } - / p:phonePrefix d1:digits "-" d2:digits { + / p:PhonePrefix d1:Digits "-" d2:Digits { return { text: p.text + d1 + '-' + d2, number: p.number + d1 + d2 }; } - / p:phonePrefix d:digits { + / p:PhonePrefix d:Digits { return { text: p.text + d, number: p.number + d }; } - / d:digits { return { text: d, number: d }; } + / d:Digits { return { text: d, number: d }; } -phonePrefix - = d:digits { return { text: d, number: d }; } - / "(" d:digits ")" { return { text: '(' + d + ')', number: d }; } +PhonePrefix + = d:Digits { return { text: d, number: d }; } + / "(" d:Digits ")" { return { text: '(' + d + ')', number: d }; } + +AutolinkedPhone = p:Phone { return phoneChecker(p.text, p.number); } /** * - * URL + * Email + * e.g: contact@rocket.chat * */ +Email = "mailto:"? @$(LocalPart "@" DomainName) -URL - = $(URL_scheme URL_authority URL_body*) - / $(URL_authorityHost URL_body*) - -URL_scheme - = $( - [A-Za-z0-9+-] - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? - [A-Za-z0-9+-]? // up to 32 characters - ":" - ) +LocalPart = $(LocalPartChar+ ("." LocalPartChar+)*) -URL_body - = ( - !(extra+ (Whitespace / EndOfLine) / Whitespace) - ( - anyText - / "*" - / "[" - / "\/" - / "]" - / "^" - / "_" - / "`" - / "{" - / "}" - / "~" - / "(" - ) - )+ - -URL_authority = $("//" URL_authorityUserInfo? URL_authorityHost) +LocalPartChar = AlphaNumericOrMarkChar / [!#$%&'*+/=?^_\`{|}~-] -URL_authorityUserInfo = $(URL_authorityUser (":" URL_authorityPassword)? "@") - -URL_authorityUser = $(alpha_digit / !"@" !"/" safe)+ +AutolinkedEmail = e:Email { return autoEmail(e); } -URL_authorityPassword = $(alpha_digit / !"@" !"/" safe)+ +/** + * + * Auto Link URL + * e.g: rocket.chat, https://rocket.chat, + * with customDomains options as intranet: protocol://internaltool.intranet + * + */ +AutolinkedURL = u:AutoLinkURL { return autoLink(u); } -URL_authorityHost = t:URL_authorityHostName (":" URL_authorityPort)? +AutoLinkURL + = $(URLScheme URLAuthority AutoLinkURLBody*) + / $(URLAuthorityHost AutoLinkURLBody*) -URL_authorityHostName - = domainName - / $(digits "." digits "." digits "." digits) // TODO: IPv4 and IPv6 +AutoLinkURLBody = !(Extra* (Whitespace / EndOfLine)) . -URL_authorityPort - = digits // TODO: from "0" to "65535" +/** + * + * Emphasis + * +*/ +Emphasis = Bold / Italic / Strikethrough /** * - * Email + * Italic, Bold and Strike + * e.g: __italic__, _italic_, **bold**, __*bold italic*__, ~~strikethrough~~ * */ -Email - = "mailto:" e:$(localPart "@" domainName) { return e; } - / $(localPart "@" domainName) +/* Italic */ +Italic + = value:$([a-zA-Z0-9]+ [\x5F] [\x5F]?) { return plain(value); } + / [\x5F] [\x5F] i:ItalicContentItems [\x5F] [\x5F] t:$[a-zA-Z0-9]+ { + return reducePlainTexts([plain('__'), ...i, plain('__'), plain(t)])[0]; + } + / [\x5F] i:ItalicContentItems [\x5F] t:$[a-zA-Z]+ { + return reducePlainTexts([plain('_'), ...i, plain('_'), plain(t)])[0]; + } + / [\x5F] [\x5F] @ItalicContent [\x5F] [\x5F] + / [\x5F] @ItalicContent [\x5F] -localPart = $(localPartChar+ $("." localPartChar+)*) +ItalicContent = text:ItalicContentItems { return italic(text); } -localPartChar - = alphaNumericOrMarkChar - / [!#$%&'*+/=?^_\`{|}~-] +ItalicContentItems = text:ItalicContentItem+ { return reducePlainTexts(text); } -alphaNumericOrMarkChar - = alphaOrMarkChar - / decimalNumberChar +ItalicContentItem + = References + / Bold + / Strikethrough + / Line + / AnyItalic -alphaOrMarkChar - = alphaChar - / emojiChar - / markChar +/* Bold */ +Bold = [\x2A] [\x2A] @BoldContent [\x2A] [\x2A] / [\x2A] @BoldContent [\x2A] -alphaChar - = [A-Za-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B4\u08B6-\u08BD\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16F1-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u1884\u1887-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1C80-\u1C88\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AE\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC] +BoldContent = text:BoldContentItem+ { return bold(reducePlainTexts(text)); } -emojiChar - = [\u2700-\u27bf\udde6-\uddff\ud800-\udbff\udc00-\udfff\ufe0e\ufe0f\u0300-\u036f\ufe20-\ufe23\u20d0-\u20f0\ud83c\udffb-\udfff\u200d\u3299\u3297\u303d\u3030\u24c2\ud83c\udd70-\udd71\udd7e-\udd7f\udd8e\udd91-\udd9a\udde6-\uddff\ude01-\ude02\ude1a\ude2f\ude32-\ude3a\ude50-\ude51\u203c\u2049\u25aa-\u25ab\u25b6\u25c0\u25fb-\u25fe\u00a9\u00ae\u2122\u2139\udc04\u2600-\u26FF\u2b05\u2b06\u2b07\u2b1b\u2b1c\u2b50\u2b55\u231a\u231b\u2328\u23cf\u23e9-\u23f3\u23f8-\u23fa\udccf\u2935\u2934\u2190-\u21ff] +BoldContentItem = References / Italic / Strikethrough / Line / AnyBold -markChar - = [\u0300-\u036F\u0483-\u0489\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u0610-\u061A\u064B-\u065F\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7\u06E8\u06EA-\u06ED\u0711\u0730-\u074A\u07A6-\u07B0\u07EB-\u07F3\u0816-\u0819\u081B-\u0823\u0825-\u0827\u0829-\u082D\u0859-\u085B\u08D4-\u08E1\u08E3-\u0903\u093A-\u093C\u093E-\u094F\u0951-\u0957\u0962\u0963\u0981-\u0983\u09BC\u09BE-\u09C4\u09C7\u09C8\u09CB-\u09CD\u09D7\u09E2\u09E3\u0A01-\u0A03\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A70\u0A71\u0A75\u0A81-\u0A83\u0ABC\u0ABE-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AE2\u0AE3\u0B01-\u0B03\u0B3C\u0B3E-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B62\u0B63\u0B82\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD7\u0C00-\u0C03\u0C3E-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C62\u0C63\u0C81-\u0C83\u0CBC\u0CBE-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CE2\u0CE3\u0D01-\u0D03\u0D3E-\u0D44\u0D46-\u0D48\u0D4A-\u0D4D\u0D57\u0D62\u0D63\u0D82\u0D83\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DF2\u0DF3\u0E31\u0E34-\u0E3A\u0E47-\u0E4E\u0EB1\u0EB4-\u0EB9\u0EBB\u0EBC\u0EC8-\u0ECD\u0F18\u0F19\u0F35\u0F37\u0F39\u0F3E\u0F3F\u0F71-\u0F84\u0F86\u0F87\u0F8D-\u0F97\u0F99-\u0FBC\u0FC6\u102B-\u103E\u1056-\u1059\u105E-\u1060\u1062-\u1064\u1067-\u106D\u1071-\u1074\u1082-\u108D\u108F\u109A-\u109D\u135D-\u135F\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17B4-\u17D3\u17DD\u180B-\u180D\u1885\u1886\u18A9\u1920-\u192B\u1930-\u193B\u1A17-\u1A1B\u1A55-\u1A5E\u1A60-\u1A7C\u1A7F\u1AB0-\u1ABE\u1B00-\u1B04\u1B34-\u1B44\u1B6B-\u1B73\u1B80-\u1B82\u1BA1-\u1BAD\u1BE6-\u1BF3\u1C24-\u1C37\u1CD0-\u1CD2\u1CD4-\u1CE8\u1CED\u1CF2-\u1CF4\u1CF8\u1CF9\u1DC0-\u1DF5\u1DFB-\u1DFF\u20D0-\u20F0\u2CEF-\u2CF1\u2D7F\u2DE0-\u2DFF\u302A-\u302F\u3099\u309A\uA66F-\uA672\uA674-\uA67D\uA69E\uA69F\uA6F0\uA6F1\uA802\uA806\uA80B\uA823-\uA827\uA880\uA881\uA8B4-\uA8C5\uA8E0-\uA8F1\uA926-\uA92D\uA947-\uA953\uA980-\uA983\uA9B3-\uA9C0\uA9E5\uAA29-\uAA36\uAA43\uAA4C\uAA4D\uAA7B-\uAA7D\uAAB0\uAAB2-\uAAB4\uAAB7\uAAB8\uAABE\uAABF\uAAC1\uAAEB-\uAAEF\uAAF5\uAAF6\uABE3-\uABEA\uABEC\uABED\uFB1E\uFE00-\uFE0F\uFE20-\uFE2F] +/* Strike */ +Strikethrough = [\x7E] [\x7E] @StrikethroughContent [\x7E] [\x7E] / [\x7E] @StrikethroughContent [\x7E] -decimalNumberChar - = [0-9\u0660-\u0669\u06F0-\u06F9\u07C0-\u07C9\u0966-\u096F\u09E6-\u09EF\u0A66-\u0A6F\u0AE6-\u0AEF\u0B66-\u0B6F\u0BE6-\u0BEF\u0C66-\u0C6F\u0CE6-\u0CEF\u0D66-\u0D6F\u0DE6-\u0DEF\u0E50-\u0E59\u0ED0-\u0ED9\u0F20-\u0F29\u1040-\u1049\u1090-\u1099\u17E0-\u17E9\u1810-\u1819\u1946-\u194F\u19D0-\u19D9\u1A80-\u1A89\u1A90-\u1A99\u1B50-\u1B59\u1BB0-\u1BB9\u1C40-\u1C49\u1C50-\u1C59\uA620-\uA629\uA8D0-\uA8D9\uA900-\uA909\uA9D0-\uA9D9\uA9F0-\uA9F9\uAA50-\uAA59\uABF0-\uABF9\uFF10-\uFF19] +StrikethroughContent = text:(References / Italic / Bold / Line / AnyStrike)+ { + return strike(reducePlainTexts(text)); + } -/* KaTeX */ +AnyBold = t:[^\x0a\* ] { return plain(t); } -katex = katexStart content:$(!katexEnd .)* katexEnd { return katex(content); } +AnyStrike = t:[^\x0a\~ ] { return plain(t); } -katexStart - = & { return options.katex?.parenthesisSyntax; } "\\[" - / & { return options.katex?.dollarSyntax; } "$$" +AnyItalic = t:[^\x0a\_ ] { return plain(t); } -katexEnd - = & { return options.katex?.parenthesisSyntax; } "\\]" - / & { return options.katex?.dollarSyntax; } "$$" +/** + * + * Mentions + * e.g: @user, #channel + * +*/ +UserMention + = t:Text "@"+ user:UTF8NamesValidation { + return reducePlainTexts([t, plain('@' + user)])[0]; + } + / "@"+ user:$(UTF8NamesValidation ([:@] UTF8NamesValidation)?) { + return mentionUser(user); + } -inlineKatex - = inlineKatexStart content:$(!inlineKatexEnd .)* inlineKatexEnd { - return inlineKatex(content); +ChannelMention + = t:Text "#" channel:UTF8NamesValidation { + return reducePlainTexts([t, plain('#' + channel)])[0]; } + / "#" channel:UTF8NamesValidation { return mentionChannel(channel); } -inlineKatexStart - = & { return options.katex?.parenthesisSyntax; } "\\(" - / & { return options.katex?.dollarSyntax; } "$" +/** + * + * EMOJIS + * e.g: + * BigEmoji (min: 1 | max: 3 without text) and ShortCode :smile: :+1: :heart: + * Unicode: 😀 🚀 🌈 + * Emoticon: :D :P :( :/ + * + */ +BigEmoji = (EndOfLine / Space)* es:(@(Emoji / Emoticon) (EndOfLine / Space)*) |1..3| { return [bigEmoji(es)]; } -inlineKatexEnd - = & { return options.katex?.parenthesisSyntax; } "\\)" - / & { return options.katex?.dollarSyntax; } "$" +Emoji = EmojiShortCode / ch:UnicodeEmoji { return emojiUnicode(ch); } + +EmojiShortCode = ":" shortCode:EmojiShortCodeName ":" { return emoji(shortCode); } + +EmojiShortCodeName = $[0-9a-zA-Z-_+.]+ /* Emoticons */ -emoticon = & { return options.emoticons; } e:emoticonPattern { return e; } +Emoticon = & { return options.emoticons; } @EmoticonPattern -emoticonPattern +EmoticonPattern = e:$"<3" { return emoticon(e, 'heart'); } / e:$" { expect(parse(input)).toMatchObject(output); }); diff --git a/packages/peggy-loader/package.json b/packages/peggy-loader/package.json index 1f3bd24eae..78c920730a 100644 --- a/packages/peggy-loader/package.json +++ b/packages/peggy-loader/package.json @@ -53,7 +53,7 @@ "lint-all": "workspace:~", "lint-staged": "~12.3.8", "npm-run-all": "^4.1.5", - "peggy": "^2.0.1", + "peggy": "3.0.2", "prettier": "~2.7.1", "rimraf": "^3.0.2", "ts-jest": "~27.1.5", diff --git a/yarn.lock b/yarn.lock index f4df3432e0..6fae56b082 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5801,7 +5801,7 @@ __metadata: lint-all: "workspace:~" lint-staged: ~12.3.8 npm-run-all: ^4.1.5 - peggy: ^2.0.1 + peggy: 3.0.2 prettier: ~2.7.1 prettier-plugin-pegjs: ~0.5.3 rimraf: ^3.0.2 @@ -5910,7 +5910,7 @@ __metadata: lint-all: "workspace:~" lint-staged: ~12.3.8 npm-run-all: ^4.1.5 - peggy: ^2.0.1 + peggy: 3.0.2 prettier: ~2.7.1 rimraf: ^3.0.2 ts-jest: ~27.1.5 @@ -11752,6 +11752,13 @@ __metadata: languageName: node linkType: hard +"commander@npm:^10.0.0": + version: 10.0.0 + resolution: "commander@npm:10.0.0" + checksum: 9f6495651f878213005ac744dd87a85fa3d9f2b8b90d1c19d0866d666bda7f735adfd7c2f10dfff345782e2f80ea258f98bb4efcef58e4e502f25f883940acfd + languageName: node + linkType: hard + "commander@npm:^2.18.0, commander@npm:^2.19.0, commander@npm:^2.20.0": version: 2.20.3 resolution: "commander@npm:2.20.3" @@ -11787,7 +11794,7 @@ __metadata: languageName: node linkType: hard -"commander@npm:^9.3.0, commander@npm:^9.4.0": +"commander@npm:^9.4.0": version: 9.4.1 resolution: "commander@npm:9.4.1" checksum: bfb18e325a5bdf772763c2213d5c7d9e77144d944124e988bcd8e5e65fb6d45d5d4e86b09155d0f2556c9a59c31e428720e57968bcd050b2306e910a0bf3cf13 @@ -21722,15 +21729,15 @@ fsevents@^1.2.7: languageName: node linkType: hard -"peggy@npm:^2.0.1": - version: 2.0.1 - resolution: "peggy@npm:2.0.1" +"peggy@npm:3.0.2": + version: 3.0.2 + resolution: "peggy@npm:3.0.2" dependencies: - commander: ^9.3.0 + commander: ^10.0.0 source-map-generator: 0.8.0 bin: peggy: bin/peggy.js - checksum: 0ce0ee8f9f872bc96183bfcb7ce9ccabcad6d1df1e4ff9b1b7ebaf57f3996dcb1016b7610013f6a8a1bd8b135a8b3b15ccff914bdd88ab2264bdcbca5b36f2f1 + checksum: bdca2291a2453e35fb9499bd414f25d44093aecaeb992ef90151ab126514c053c30d4bf5b54f68cbce22a4420eef75219a6deb1209b300630bff38e7640115d9 languageName: node linkType: hard