@adobe/helix-markdown-support 3.1.5 → 3.1.6

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [3.1.6](https://github.com/adobe/helix-markdown-support/compare/v3.1.5...v3.1.6) (2022-05-30)
+
+
+### Bug Fixes
+
+* move leading and trailing breaks out of heading ([#112](https://github.com/adobe/helix-markdown-support/issues/112)) ([87775dc](https://github.com/adobe/helix-markdown-support/commit/87775dcf189f024ccf789f8c883ab90d296c8d0d))
+
 ## [3.1.5](https://github.com/adobe/helix-markdown-support/compare/v3.1.4...v3.1.5) (2022-05-17)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-markdown-support",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "description": "Helix Markdown Support",
   "type": "module",
   "scripts": {
@@ -41,14 +41,14 @@
     "@adobe/eslint-config-helix": "1.3.2",
     "@semantic-release/changelog": "6.0.1",
     "@semantic-release/git": "10.0.1",
-    "c8": "7.11.2",
+    "c8": "7.11.3",
     "codecov": "3.8.3",
-    "eslint": "8.15.0",
+    "eslint": "8.16.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.26.0",
     "husky": "8.0.1",
     "junit-report-builder": "3.0.0",
-    "lint-staged": "12.4.1",
+    "lint-staged": "12.4.2",
     "mdast-builder": "1.1.1",
     "mocha": "10.0.0",
     "mocha-multi-reporters": "1.5.1",

package/src/mdast-sanitize-heading.js

@@ -42,24 +42,49 @@ export default function sanitizeHeading(tree, opts = {}) {
             siblings.splice(index, 0, para);
             // eslint-disable-next-line no-param-reassign
             index += 1;
-            after = index + 1;
+            after += 1;
           } else {
             // move after heading
             siblings.splice(after, 0, para);
             after += 1;
           }
-        } else if (child.type === 'break') {
-          child.type = 'html';
-          child.value = '<br>';
         }
       }
+
+      // move leading breaks before heading
+      while (children[0]?.type === 'break') {
+        const brk = children.shift();
+        siblings.splice(index, 0, brk);
+        // eslint-disable-next-line no-param-reassign
+        index += 1;
+      }
+      // move trailing breaks after heading
+      let last = children.length - 1;
+      while (children[last]?.type === 'break') {
+        const brk = children.pop();
+        siblings.splice(index + 1, 0, brk);
+        last -= 1;
+      }
+      // convert inline breaks to <br>
+      for (let i = 0; i < children.length; i += 1) {
+        if (children[i].type === 'break') {
+          children[i] = {
+            type: 'html',
+            value: '<br>',
+          };
+        }
+      }
+
       // remove empty headings
       if (!children.length) {
         siblings.splice(index, 1);
-        after -= 1;
+        // eslint-disable-next-line no-param-reassign
+        index -= 1;
       }
+      return index + 1;
     }
-    return after;
+
+    return index + 1;
   });
   return tree;
 }