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/find-selected-options.js

@@ -44,7 +44,7 @@ export function findSelectedOptions(node, explicitProperties) {
   }
 
   const list = selectedOptions.length > 0 ? selectedOptions : options
-  const max = list.length > size ? size : list.length
+  const max = Math.min(list.length, size)
   index = -1
 
   while (++index < max) {

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)}]
   }
 }
 

package.json

@@ -36,12 +36,12 @@
     "micromark-extension-gfm": "^3.0.0",
     "prettier": "^3.0.0",
     "remark-cli": "^12.0.0",
-    "remark-preset-wooorm": "^10.0.0",
+    "remark-preset-wooorm": "^11.0.0",
     "type-coverage": "^2.0.0",
     "typescript": "^5.0.0",
     "unist-builder": "^4.0.0",
     "unist-util-remove-position": "^5.0.0",
-    "xo": "^0.59.0"
+    "xo": "^0.60.0"
   },
   "exports": "./index.js",
   "files": [
@@ -103,7 +103,7 @@
     "strict": true
   },
   "type": "module",
-  "version": "10.1.1",
+  "version": "10.1.2",
   "xo": {
     "overrides": [
       {

readme.md

@@ -438,100 +438,100 @@ Use of `hast-util-to-mdast` is safe by default.
 
 ## Contribute
 
-See [`contributing.md` in `syntax-tree/.github`][contributing] for ways to get
-started.
-See [`support.md`][support] for ways to get help.
+See [`contributing.md` in `syntax-tree/.github`][health-contributing] for ways
+to get started.
+See [`support.md`][health-support] for ways to get help.
 
-This project has a [code of conduct][coc].
+This project has a [code of conduct][health-coc].
 By interacting with this repository, organization, or community you agree to
 abide by its terms.
 
 ## License
 
-[MIT][license] © [Titus Wormer][author]
+[MIT][file-license] © [Titus Wormer][author]
 
 <!-- Definitions -->
 
-[build-badge]: https://github.com/syntax-tree/hast-util-to-mdast/workflows/main/badge.svg
-
-[build]: https://github.com/syntax-tree/hast-util-to-mdast/actions
+[api-default-handlers]: #defaulthandlers
 
-[coverage-badge]: https://img.shields.io/codecov/c/github/syntax-tree/hast-util-to-mdast.svg
+[api-default-node-handlers]: #defaultnodehandlers
 
-[coverage]: https://codecov.io/github/syntax-tree/hast-util-to-mdast
+[api-handle]: #handle
 
-[downloads-badge]: https://img.shields.io/npm/dm/hast-util-to-mdast.svg
+[api-node-handle]: #nodehandle
 
-[downloads]: https://www.npmjs.com/package/hast-util-to-mdast
+[api-options]: #options
 
-[size-badge]: https://img.shields.io/badge/dynamic/json?label=minzipped%20size&query=$.size.compressedSize&url=https://deno.bundlejs.com/?q=hast-util-to-mdast
+[api-state]: #state
 
-[size]: https://bundlejs.com/?q=hast-util-to-mdast
+[api-to-mdast]: #tomdasttree-options
 
-[sponsors-badge]: https://opencollective.com/unified/sponsors/badge.svg
+[author]: https://wooorm.com
 
 [backers-badge]: https://opencollective.com/unified/backers/badge.svg
 
-[collective]: https://opencollective.com/unified
+[build]: https://github.com/syntax-tree/hast-util-to-mdast/actions
 
-[chat-badge]: https://img.shields.io/badge/chat-discussions-success.svg
+[build-badge]: https://github.com/syntax-tree/hast-util-to-mdast/workflows/main/badge.svg
 
 [chat]: https://github.com/syntax-tree/unist/discussions
 
-[esm]: https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c
+[chat-badge]: https://img.shields.io/badge/chat-discussions-success.svg
 
-[npm]: https://docs.npmjs.com/cli/install
+[collective]: https://opencollective.com/unified
 
-[esmsh]: https://esm.sh
+[commonmark]: https://commonmark.org
 
-[license]: license
+[coverage]: https://codecov.io/github/syntax-tree/hast-util-to-mdast
 
-[author]: https://wooorm.com
+[coverage-badge]: https://img.shields.io/codecov/c/github/syntax-tree/hast-util-to-mdast.svg
 
-[typescript]: https://www.typescriptlang.org
+[downloads]: https://www.npmjs.com/package/hast-util-to-mdast
 
-[contributing]: https://github.com/syntax-tree/.github/blob/main/contributing.md
+[downloads-badge]: https://img.shields.io/npm/dm/hast-util-to-mdast.svg
 
-[support]: https://github.com/syntax-tree/.github/blob/main/support.md
+[element]: https://github.com/syntax-tree/hast#element
 
-[coc]: https://github.com/syntax-tree/.github/blob/main/code-of-conduct.md
+[esm]: https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c
 
-[mdast]: https://github.com/syntax-tree/mdast
+[esmsh]: https://esm.sh
 
-[mdast-node]: https://github.com/syntax-tree/mdast#nodes
+[file-license]: license
 
-[phrasing]: https://github.com/syntax-tree/mdast#phrasingcontent
+[gfm]: https://github.github.com/gfm/
 
 [hast]: https://github.com/syntax-tree/hast
 
 [hast-node]: https://github.com/syntax-tree/hast#nodes
 
 [hast-parent]: https://github.com/syntax-tree/hast#parent
 
-[element]: https://github.com/syntax-tree/hast#element
+[health-coc]: https://github.com/syntax-tree/.github/blob/main/code-of-conduct.md
 
-[html]: https://html.spec.whatwg.org/multipage/
+[health-contributing]: https://github.com/syntax-tree/.github/blob/main/contributing.md
 
-[gfm]: https://github.github.com/gfm/
+[health-support]: https://github.com/syntax-tree/.github/blob/main/support.md
 
-[commonmark]: https://commonmark.org
+[html]: https://html.spec.whatwg.org/multipage/
 
 [html-paragraphs]: https://html.spec.whatwg.org/multipage/dom.html#paragraphs
 
-[mdast-util-to-hast]: https://github.com/syntax-tree/mdast-util-to-hast
+[mdast]: https://github.com/syntax-tree/mdast
 
-[rehype-remark]: https://github.com/rehypejs/rehype-remark
+[mdast-node]: https://github.com/syntax-tree/mdast#nodes
 
-[api-default-handlers]: #defaulthandlers
+[mdast-util-to-hast]: https://github.com/syntax-tree/mdast-util-to-hast
 
-[api-default-node-handlers]: #defaultnodehandlers
+[npm]: https://docs.npmjs.com/cli/install
 
-[api-to-mdast]: #tomdasttree-options
+[phrasing]: https://github.com/syntax-tree/mdast#phrasingcontent
 
-[api-options]: #options
+[rehype-remark]: https://github.com/rehypejs/rehype-remark
 
-[api-state]: #state
+[size]: https://bundlejs.com/?q=hast-util-to-mdast
 
-[api-handle]: #handle
+[size-badge]: https://img.shields.io/badge/dynamic/json?label=minzipped%20size&query=$.size.compressedSize&url=https://deno.bundlejs.com/?q=hast-util-to-mdast
 
-[api-node-handle]: #nodehandle
+[sponsors-badge]: https://opencollective.com/unified/sponsors/badge.svg
+
+[typescript]: https://www.typescriptlang.org

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