fix: Line break fix

RocketChat · May 11, 2022 · 7afa65a · 7afa65a
1 parent 88bebf2
commit 7afa65a
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 8 deletions.
diff --git a/packages/message-parser/src/definitions.ts b/packages/message-parser/src/definitions.ts
@@ -98,6 +98,11 @@ export type Plain = {
   value: string;
 };
 
+export type LineBreak = {
+  type: 'LINE_BREAK';
+  value: string;
+};
+
 export type Paragraph = {
   type: 'PARAGRAPH';
   value: Array<Exclude<Inlines, Paragraph>>;
@@ -152,6 +157,7 @@ export type Types = {
   ORDERED_LIST: OrderedList;
   LIST_ITEM: ListItem;
   IMAGE: Image;
+  LINE_BREAK: LineBreak;
 };
 
 export type ASTNode =
@@ -195,6 +201,7 @@ export type Blocks =
   | ListItem
   | Tasks
   | OrderedList
-  | UnorderedList;
+  | UnorderedList
+  | LineBreak;
 
 export type MarkdownAST = Array<Paragraph | Blocks> | [BigEmoji];
diff --git a/packages/message-parser/src/grammar.pegjs b/packages/message-parser/src/grammar.pegjs
@@ -23,6 +23,7 @@
     orderedList,
     listItem,
     unorderedList,
+    lineBreak,
   } = require('./utils');
 }
 
@@ -32,6 +33,8 @@ start
 
 b = (EndOfLine / Space)*
 
+LineBreak = (Space* EndOfLine) { return lineBreak(''); }
+
 BigEmoji
   = b e1:Emoji b e2:Emoji? b e3:Emoji? b {
       return [bigEmoji([e1, e2, e3].filter(Boolean))];
@@ -44,6 +47,7 @@ Blocks
   / TaskList
   / OrderedList
   / UnorderedList
+  / LineBreak
 
 // / Section
 
@@ -96,13 +100,6 @@ line
 
 EOF = !.
 
-crlf
-  = "\r\n"
-  / "\r"
-  / "\n"
-
-EatLine = (!crlf !EOF .)*
-
 EndOfLine
   = "\r\n"
   / "\n"

diff --git a/packages/message-parser/src/utils.ts b/packages/message-parser/src/utils.ts
@@ -112,3 +112,5 @@ export const reducePlainTexts = (
 
     return [...result, item];
   }, [] as Paragraph['value']);
+
+export const lineBreak = generate('LINE_BREAK');
diff --git a/packages/message-parser/tests/lineBreak.test.ts b/packages/message-parser/tests/lineBreak.test.ts
@@ -0,0 +1,35 @@
+import { parser } from '../src';
+import { lineBreak, paragraph, plain } from '../src/utils';
+
+test.each([
+  [
+    `test
+
+test2`,
+    [paragraph([plain('test')]), lineBreak(''), paragraph([plain('test2')])],
+  ],
+  [
+    `test
+
+test2
+`,
+    [paragraph([plain('test')]), lineBreak(''), paragraph([plain('test2')])],
+  ],
+  [
+    `test
+
+
+
+test2
+`,
+    [
+      paragraph([plain('test')]),
+      lineBreak(''),
+      lineBreak(''),
+      lineBreak(''),
+      paragraph([plain('test2')]),
+    ],
+  ],
+])('parses %p', (input, output) => {
+  expect(parser(input)).toMatchObject(output);
+});