Fix to not drop brs in phrasing

Closes GH-83.

Author: wooorm

lib/handlers/heading.js

@@ -4,6 +4,8 @@
  * @import {Heading, PhrasingContent} from 'mdast'
  */
 
+import {dropSurroundingBreaks} from '../util/drop-surrounding-breaks.js'
+
 /**
  * @param {State} state
  *   State.
@@ -17,7 +19,9 @@ export function heading(state, node) {
     /* c8 ignore next */
     Number(node.tagName.charAt(1)) || 1
   )
-  const children = /** @type {Array<PhrasingContent>} */ (state.all(node))
+  const children = dropSurroundingBreaks(
+    /** @type {Array<PhrasingContent>} */ (state.all(node))
+  )
 
   /** @type {Heading} */
   const result = {type: 'heading', depth, children}

lib/handlers/p.js

@@ -4,6 +4,8 @@
  * @import {Paragraph, PhrasingContent} from 'mdast'
  */
 
+import {dropSurroundingBreaks} from '../util/drop-surrounding-breaks.js'
+
 /**
  * @param {State} state
  *   State.
@@ -13,9 +15,11 @@
  *   mdast node.
  */
 export function p(state, node) {
-  // Allow potentially “invalid” nodes, they might be unknown.
-  // We also support straddling later.
-  const children = /** @type {Array<PhrasingContent>} */ (state.all(node))
+  const children = dropSurroundingBreaks(
+    // Allow potentially “invalid” nodes, they might be unknown.
+    // We also support straddling later.
+    /** @type {Array<PhrasingContent>} */ (state.all(node))
+  )
 
   if (children.length > 0) {
     /** @type {Paragraph} */

lib/state.js

@@ -227,20 +227,7 @@ function all(parent) {
     }
   }
 
-  let start = 0
-  let end = results.length
-
-  while (start < end && results[start].type === 'break') {
-    start++
-  }
-
-  while (end > start && results[end - 1].type === 'break') {
-    end--
-  }
-
-  return start === 0 && end === results.length
-    ? results
-    : results.slice(start, end)
+  return results
 }
 
 /**

lib/util/drop-surrounding-breaks.js

@@ -0,0 +1,23 @@
+/**
+ * @import {Nodes} from 'mdast'
+ */
+
+/**
+ * Drop trailing initial and final `br`s.
+ *
+ * @template {Nodes} Node
+ *   Node type.
+ * @param {Array<Node>} nodes
+ *   List of nodes.
+ * @returns {Array<Node>}
+ *   List of nodes w/o `break`s.
+ */
+export function dropSurroundingBreaks(nodes) {
+  let start = 0
+  let end = nodes.length
+
+  while (start < end && nodes[start].type === 'break') start++
+  while (end > start && nodes[end - 1].type === 'break') end--
+
+  return start === 0 && end === nodes.length ? nodes : nodes.slice(start, end)
+}

lib/util/wrap.js

@@ -16,6 +16,7 @@ import structuredClone from '@ungap/structured-clone'
 import {phrasing as hastPhrasing} from 'hast-util-phrasing'
 import {whitespace} from 'hast-util-whitespace'
 import {phrasing as mdastPhrasing} from 'mdast-util-phrasing'
+import {dropSurroundingBreaks} from './drop-surrounding-breaks.js'
 
 /**
  * Check if there are phrasing mdast nodes.
@@ -63,7 +64,7 @@ export function wrap(nodes) {
       return d.type === 'text' ? whitespace(d.value) : false
     })
       ? []
-      : [{type: 'paragraph', children: nodes}]
+      : [{type: 'paragraph', children: dropSurroundingBreaks(nodes)}]
   }
 }
 

test/fixtures/br/index.html

@@ -10,3 +10,6 @@
 <h1><br>kilo</h1>
 <h1>lima<br></h1>
 <p>mike</p>november<br><p></p>
+<p>oscar<span><br></span>papa</p>
+<p><span><br></span>quebec</p>
+<p>romeo<span><br></span></p>

test/fixtures/br/index.md

@@ -25,3 +25,10 @@ juliett
 mike
 
 november
+
+oscar\
+papa
+
+quebec
+
+romeo