@adobe/helix-docx2md 1.0.14 → 1.0.15

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.0.15](https://github.com/adobe/helix-docx2md/compare/v1.0.14...v1.0.15) (2022-05-10)
+
+
+### Bug Fixes
+
+* lists in consecutive rows ([#67](https://github.com/adobe/helix-docx2md/issues/67)) ([01a76e2](https://github.com/adobe/helix-docx2md/commit/01a76e2a47f1a51c2c23b42fa7d0d6d61705f1dd)), closes [#54](https://github.com/adobe/helix-docx2md/issues/54)
+
 ## [1.0.14](https://github.com/adobe/helix-docx2md/compare/v1.0.13...v1.0.14) (2022-05-10)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-docx2md",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "Helix library that converts word documents to markdown",
   "type": "module",
   "main": "./src/index.js",

package/src/dast2mdast/dast2mdast.js

@@ -15,6 +15,19 @@ import one from './one.js';
 import handlers from './handlers/index.js';
 
 /**
+ * @typedef {Node} List
+ *
+ * Stack of List entries (i.e. the <LI>s), where the last is the tail of the list
+ * @typedef {List[]} ListStack
+ *
+ * The containers for a list stack. eg the table-cell or just the document.
+ * This is to track the lists within the individual parents.
+ *
+ * Currently, we only create a new list container for the table-cell.
+ *
+ * Note: that the stack is reversed, i.e. the first is the deepest one.
+ * @typedef {ListStack[]} ListContainers
+ *
  * Converts the docx AST to markdown ast.
  * @param {object} tree the docx ast
  * @return {object} the markdown ast
@@ -45,8 +58,10 @@ export default async function dast2mdast(tree) {
   h.baseFound = false;
   h.frozenBaseUrl = null;
   h.handlers = handlers;
-  h.lists = [];
   h.numbering = {};
 
+  /** @type {ListContainers} */
+  h.listContainers = [[]];
+
   return one(h, tree, null);
 }

package/src/dast2mdast/handlers/paragraph.js

@@ -81,6 +81,7 @@ export default function paragraph(h, node, parent, siblings) {
   }
 
   // check for list
+  const [lists] = h.listContainers;
   if (isListParagraph(node)) {
     const numbering = node.numbering || {};
     const { numId = 0, isOrdered = false, level = '0' } = numbering;
@@ -89,9 +90,9 @@ export default function paragraph(h, node, parent, siblings) {
 
     // find correct parent
     let tail;
-    while (h.lists.length > 0) {
-      tail = h.lists.pop();
-      if (tail.ordered === isOrdered && h.lists.length <= lvl) {
+    while (lists.length > 0) {
+      tail = lists.pop();
+      if (tail.ordered === isOrdered && lists.length <= lvl) {
         break;
       }
       tail = null;
@@ -100,8 +101,8 @@ export default function paragraph(h, node, parent, siblings) {
       tail = h('list', { ordered: isOrdered, spread: false }, []);
       result = tail;
     }
-    h.lists.push(tail);
-    while (h.lists.length <= lvl) {
+    lists.push(tail);
+    while (lists.length <= lvl) {
       const newList = h('list', { ordered: isOrdered, spread: false }, []);
       if (tail.children.length > 0) {
         // append new list to end of the last list item
@@ -114,7 +115,7 @@ export default function paragraph(h, node, parent, siblings) {
         });
       }
       tail = newList;
-      h.lists.push(tail);
+      lists.push(tail);
     }
     const listItem = {
       type: 'listItem',
@@ -147,7 +148,7 @@ export default function paragraph(h, node, parent, siblings) {
   }
   // clear lists list marker
   // eslint-disable-next-line no-param-reassign
-  h.lists = [];
+  h.listContainers[0] = [];
 
   // check for heading
   let depth = getHeadingDepth(node);

package/src/dast2mdast/handlers/table-cell.js

@@ -23,5 +23,8 @@ export default function cell(h, node) {
   if (node.colSpan > 1) {
     props.colSpan = node.colSpan;
   }
-  return h('tableCell', props, all(h, node));
+  h.listContainers.unshift([]);
+  const c = h('tableCell', props, all(h, node));
+  h.listContainers.shift();
+  return c;
 }