@adobe/helix-markdown-support 4.0.0 → 4.0.3

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [4.0.3](https://github.com/adobe/helix-markdown-support/compare/v4.0.2...v4.0.3) (2022-09-05)
+
+
+### Bug Fixes
+
+* more improvements ([7d348e0](https://github.com/adobe/helix-markdown-support/commit/7d348e0cfdde11ab04f26c40fa7f9739787b9030))
+
+## [4.0.2](https://github.com/adobe/helix-markdown-support/compare/v4.0.1...v4.0.2) (2022-09-03)
+
+
+### Bug Fixes
+
+* empty cell with v-align throws ([#132](https://github.com/adobe/helix-markdown-support/issues/132)) ([14510b2](https://github.com/adobe/helix-markdown-support/commit/14510b27fbed96c2845527f3cb4c7e7896e1bf9c))
+
+## [4.0.1](https://github.com/adobe/helix-markdown-support/compare/v4.0.0...v4.0.1) (2022-09-02)
+
+
+### Bug Fixes
+
+* clean cell contents ([#131](https://github.com/adobe/helix-markdown-support/issues/131)) ([f422e97](https://github.com/adobe/helix-markdown-support/commit/f422e97ac0094f0c3448eba88c68476c8f3415cd))
+
 # [4.0.0](https://github.com/adobe/helix-markdown-support/compare/v3.1.8...v4.0.0) (2022-09-02)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-markdown-support",
-  "version": "4.0.0",
+  "version": "4.0.3",
   "description": "Helix Markdown Support",
   "type": "module",
   "scripts": {

package/src/gridtable/mdast2hast-handler.js

@@ -10,6 +10,7 @@
  * governing permissions and limitations under the License.
  */
 import { all } from 'mdast-util-to-hast';
+import { CONTINUE, SKIP, visit } from 'unist-util-visit';
 import {
   TYPE_BODY, TYPE_CELL, TYPE_FOOTER, TYPE_HEADER, TYPE_ROW,
 } from './types.js';
@@ -33,7 +34,24 @@ function handleRow(h, node, cellElementName) {
           props[p] = child[p];
         }
       }
-      cells.push(h(child, cellElementName, props, all(h, child)));
+      // if cell contains only 1 single paragraph, unwrap it
+      if (child.children?.length === 1 && child.children[0].type === 'paragraph') {
+        child.children = child.children[0].children;
+      }
+      const cell = h(child, cellElementName, props, all(h, child));
+      cells.push(cell);
+
+      // clean text elements
+      visit(cell, (n) => {
+        if (n.tagName === 'code') {
+          return SKIP;
+        }
+        if (n.type === 'text') {
+          // eslint-disable-next-line no-param-reassign
+          n.value = n.value.replace(/\r?\n/mg, ' ');
+        }
+        return CONTINUE;
+      });
     }
   }
 

package/src/gridtable/to-markdown.js

@@ -41,7 +41,7 @@ function spanWidth(cols, idx, cell) {
 export function lineWrapTextHandler(node, parent, context, safeOptions) {
   const textNode = {
     ...node,
-    value: node.value.replace(/\s/g, ' '),
+    value: node.value.replace(/[ \t\v\r\n]/g, ' '),
   };
   let value = textHandler(textNode, parent, context, safeOptions);
   const { lineWidth } = context.options;
@@ -123,11 +123,9 @@ class Table {
     row = row || this.lastRow;
     row.cells.push(cell);
     for (let i = 1; i < cell.colSpan; i += 1) {
-      row.cells.push({});
-    }
-    // remember align for last span
-    if (cell.colSpan > 1) {
-      row.cells[row.cells.length - 1].align = cell.align;
+      row.cells.push({
+        align: cell.align,
+      });
     }
   }
 
@@ -166,6 +164,7 @@ class Table {
   toMarkdown(context) {
     // populate the matrix with the rowspans and compute max width
     // (the empty cells for the colspans are already created during insert).
+    let realNumCols = 0;
     const cols = [];
     for (let y = 0; y < this.rows.length; y += 1) {
       const row = this.rows[y];
@@ -173,11 +172,14 @@ class Table {
         let col = cols[x];
         if (!col) {
           col = {
-            width: 0,
+            width: 3,
           };
           cols[x] = col;
         }
         const cell = row.cells[x];
+        if (cell.tree) {
+          realNumCols = Math.max(realNumCols, x + 1);
+        }
         if (cell.rowSpan > 1) {
           // insert colspan amount of null cells below
           for (let i = 1; i < cell.rowSpan; i += 1) {
@@ -190,6 +192,25 @@ class Table {
         }
       }
     }
+
+    // now trim tailing colspans
+    if (cols.length > realNumCols) {
+      cols.length = realNumCols;
+      for (const { cells } of this.rows) {
+        if (cells.length > realNumCols) {
+          cells.length = realNumCols;
+          // find trailing colspan
+          let x = cells.length - 1;
+          while (x >= 0 && !cells[x].tree) {
+            x -= 1;
+          }
+          if (x >= 0) {
+            cells[x].colSpan = realNumCols - x;
+          }
+        }
+      }
+    }
+
     const numCols = cols.length;
 
     // add empty cells if needed
@@ -220,6 +241,10 @@ class Table {
             const col = cols[x + idx];
             col.width = Math.max(col.width, avgColWidth);
           }
+          // if valign, the col needs to be at least 4 (3 + delim) wide
+          if (cell.valign) {
+            cols[x].width = Math.max(4, cols[x].width);
+          }
         }
       }
     }
@@ -381,17 +406,18 @@ class Table {
     }
 
     // add last grid line
+    const d = this.rows.length === this.headerSize ? '=' : '-'; // special case: only header
     const grid = [];
     const lastRow = this.rows[this.rows.length - 1];
     for (let x = 0; x < cols.length; x += 1) {
       const col = cols[x];
       // if the cell above was a colspan, and we are on the last line, don't draw the `+`
       const aboveCell = lastRow.cells[x];
-      let c = aboveCell.tree || aboveCell.linked ? gtVLineEnds : '-';
+      let c = aboveCell.tree || aboveCell.linked ? gtVLineEnds : d;
       if (x === 0) {
         c = '+';
       }
-      grid.push(`${c}${'-'.repeat(col.width - 1)}`);
+      grid.push(`${c}${d.repeat(col.width - 1)}`);
     }
     lines.push(`${grid.join('')}+`);