fix: correctly parse text content after comments

jake-low · jake-low · commit 818e2f5dea43 · 2021-04-10T17:50:48.000-07:00
diff --git a/src/index.ts b/src/index.ts
@@ -133,7 +133,7 @@ const parser = (html: string, options: Options = {}): Node[] => {
     if (typeof last === 'object') {
       if (last.content && last.content.length > 0) {
         const lastContentNode = last.content[last.content.length - 1];
-        if (typeof lastContentNode === 'string') {
+        if (typeof lastContentNode === 'string' && !lastContentNode.startsWith('<!--')) {
           last.content[last.content.length - 1] = `${lastContentNode}${text}`;
           return;
         }
diff --git a/test/test-core.spec.ts b/test/test-core.spec.ts
@@ -68,12 +68,30 @@ test.skip('should be parse tag with object in attribute data escape', t => {
   t.deepEqual(tree, expected);
 });
 
-test('should be parse comment in content', t => {
+test('should be parse isolated comment', t => {
   const tree = parser('<div><!--comment--></div>');
   const expected = [{tag: 'div', content: ['<!--comment-->']}];
   t.deepEqual(tree, expected);
 });
 
+test('should be parse comment before text content', t => {
+  const tree = parser('<div><!--comment-->Text after comment</div>');
+  const expected = [{tag: 'div', content: ['<!--comment-->', 'Text after comment']}];
+  t.deepEqual(tree, expected);
+});
+
+test('should be parse comment after text content', t => {
+  const tree = parser('<div>Text before comment.<!--comment--></div>');
+  const expected = [{tag: 'div', content: ['Text before comment.', '<!--comment-->']}];
+  t.deepEqual(tree, expected);
+});
+
+test('should be parse comment in the middle of text content', t => {
+  const tree = parser('<div>Text surrounding <!--comment--> a comment.</div>');
+  const expected = [{tag: 'div', content: ['Text surrounding ', '<!--comment-->', ' a comment.']}];
+  t.deepEqual(tree, expected);
+});
+
 test('should be parse doctype', t => {
   const tree = parser('<!doctype html>');
   const expected = ['<!doctype html>'];

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ const parser = (html: string, options: Options = {}): Node[] => {`
`133`	`133`	`if (typeof last === 'object') {`
`134`	`134`	`if (last.content && last.content.length > 0) {`
`135`	`135`	`const lastContentNode = last.content[last.content.length - 1];`
`136`		`- if (typeof lastContentNode === 'string') {`
	`136`	`+ if (typeof lastContentNode === 'string' && !lastContentNode.startsWith('<!--')) {`
`137`	`137`	last.content[last.content.length - 1] = `${lastContentNode}${text}`;
`138`	`138`	`return;`
`139`	`139`	`}`