@adobe/helix-markdown-support 3.1.2 → 3.1.5

package/.github/workflows/semantic-release.yaml

@@ -9,9 +9,9 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Use Node.js 14.x
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: '14.x'
       - run: npm install

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [3.1.5](https://github.com/adobe/helix-markdown-support/compare/v3.1.4...v3.1.5) (2022-05-17)
+
+
+### Bug Fixes
+
+* (re)move breaks in links and headings ([621c85b](https://github.com/adobe/helix-markdown-support/commit/621c85b664621e56111e00e9cbb9cd7d648471d6)), closes [#106](https://github.com/adobe/helix-markdown-support/issues/106)
+
+## [3.1.4](https://github.com/adobe/helix-markdown-support/compare/v3.1.3...v3.1.4) (2022-05-10)
+
+
+### Bug Fixes
+
+* preserve spans ([#109](https://github.com/adobe/helix-markdown-support/issues/109)) ([9d6ba00](https://github.com/adobe/helix-markdown-support/commit/9d6ba00e2623349bf469ab56bb093f5dbed976fc))
+
+## [3.1.3](https://github.com/adobe/helix-markdown-support/compare/v3.1.2...v3.1.3) (2022-05-10)
+
+
+### Bug Fixes
+
+* keep html in table paragraphs ([#108](https://github.com/adobe/helix-markdown-support/issues/108)) ([9b3ea28](https://github.com/adobe/helix-markdown-support/commit/9b3ea28a1fd785e575a56bb99d47f1c07ef2a88e))
+
 ## [3.1.2](https://github.com/adobe/helix-markdown-support/compare/v3.1.1...v3.1.2) (2022-01-24)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-markdown-support",
-  "version": "3.1.2",
+  "version": "3.1.5",
   "description": "Helix Markdown Support",
   "type": "module",
   "scripts": {
@@ -41,22 +41,22 @@
     "@adobe/eslint-config-helix": "1.3.2",
     "@semantic-release/changelog": "6.0.1",
     "@semantic-release/git": "10.0.1",
-    "c8": "7.11.0",
+    "c8": "7.11.2",
     "codecov": "3.8.3",
-    "eslint": "8.7.0",
+    "eslint": "8.15.0",
     "eslint-plugin-header": "3.1.1",
-    "eslint-plugin-import": "2.25.4",
-    "husky": "7.0.4",
+    "eslint-plugin-import": "2.26.0",
+    "husky": "8.0.1",
     "junit-report-builder": "3.0.0",
-    "lint-staged": "12.3.1",
+    "lint-staged": "12.4.1",
     "mdast-builder": "1.1.1",
-    "mocha": "9.1.4",
+    "mocha": "10.0.0",
     "mocha-multi-reporters": "1.5.1",
     "remark-gfm": "3.0.1",
     "remark-parse": "10.0.1",
     "remark-stringify": "10.0.2",
     "semantic-release": "19.0.2",
-    "unified": "10.1.1",
+    "unified": "10.1.2",
     "unist-util-inspect": "7.0.0"
   },
   "lint-staged": {

package/src/mdast-robust-tables.js

@@ -29,20 +29,26 @@ export default function robustTables(tree) {
     (node.children /* c8 ignore next */ || []).forEach((row) => {
       html += '  <tr>\n';
       (row.children /* c8 ignore next */ || []).forEach((cell) => {
-        let align = '';
+        let attrs = '';
         if (cell.align === 'right') {
-          align = ' align="right"';
+          attrs = ' align="right"';
         } else if (cell.align === 'center') {
-          align = ' align="center"';
+          attrs = ' align="center"';
         } else if (cell.align === 'both') {
-          align = ' align="justify"';
+          attrs = ' align="justify"';
         }
         if (cell.valign === 'middle') {
-          align += ' valign="middle"';
+          attrs += ' valign="middle"';
         } else if (cell.valign === 'bottom') {
-          align += ' valign="bottom"';
+          attrs += ' valign="bottom"';
         }
-        html += `    <td${align}>`;
+        if (cell.rowSpan > 1) {
+          attrs += ` rowspan="${cell.rowSpan}"`;
+        }
+        if (cell.colSpan > 1) {
+          attrs += ` colspan="${cell.colSpan}"`;
+        }
+        html += `    <td${attrs}>`;
 
         // if cell contains only 1 single paragraph, unwrap it
         let { children } = cell;
@@ -54,7 +60,8 @@ export default function robustTables(tree) {
           if (child.type === 'html') {
             html += child.value;
           } else {
-            const cellHtml = hast2html(md2hast(child));
+            const hast = md2hast(child, { allowDangerousHtml: true });
+            const cellHtml = hast2html(hast, { allowDangerousHtml: true });
             if (child.type === 'code') {
               // code needs special treatment, otherwise the newlines disappear.
               html += cellHtml.replace(/\r?\n/g, '<br>');

package/src/mdast-sanitize-heading.js

@@ -14,6 +14,7 @@ import { visit } from 'unist-util-visit';
 /**
  * Sanitizes headings:
  * - (re)move images ('before', 'both', 'after')
+ * - converts BREAKs inside headings to <br>.
  *
  * @param {object} tree
  * @param {object} [opts] options
@@ -47,6 +48,9 @@ export default function sanitizeHeading(tree, opts = {}) {
             siblings.splice(after, 0, para);
             after += 1;
           }
+        } else if (child.type === 'break') {
+          child.type = 'html';
+          child.value = '<br>';
         }
       }
       // remove empty headings

package/src/mdast-sanitize-links.js

@@ -15,6 +15,8 @@ import find from 'unist-util-find';
 /**
  * Sanitizes links:
  * - unwraps formatting in links if possible. eg: [_text_](...) -> _[test](...)_
+ * - moves leading, trailing BREAKs out of link
+ * - converts BREAKs inside link to <br>.
  *
  * @param {object} tree
  * @returns {object} The modified (original) tree.
@@ -60,6 +62,31 @@ export default function sanitizeLinks(tree) {
           }
         }
       }
+    } else if (node.type === 'link' && children.length > 1) {
+      // move leading breaks outside of link
+      while (children[0]?.type === 'break') {
+        const brk = children.shift();
+        parent.children.splice(index, 0, brk);
+        // eslint-disable-next-line no-param-reassign
+        index += 1;
+      }
+      // move trailing breaks after link
+      let last = children.length - 1;
+      while (children[last]?.type === 'break') {
+        const brk = children.pop();
+        parent.children.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>',
+          };
+        }
+      }
+      return index + 1;
     }
     return CONTINUE;
   });