Fix support for tables without rows, cells

wooorm · web-flow · commit 614bc8033d49 · 2019-08-05T09:03:50.000+02:00
Closes GH-53. Closes GH-54. Closes GH-55. Co-authored-by: Titus Wormer <tituswormer@gmail.com>
diff --git a/lib/handlers/table.js b/lib/handlers/table.js
@@ -2,12 +2,13 @@
 
 module.exports = table
 
+var xtend = require('xtend')
 var visit = require('unist-util-visit')
 var all = require('../all')
 
 function table(h, node) {
   var align = alignment(node)
-  return h(node, 'table', {align: align}, patch(all(h, node), align.length))
+  return h(node, 'table', {align: align}, toRows(all(h, node), align.length))
 }
 
 // Infer the alignment of the table.
@@ -60,23 +61,74 @@ function cell(node) {
 }
 
 // Ensure the amount of cells in a row matches `align.left`.
-function patch(rows, count) {
+function toRows(rows, count) {
+  var nodes = []
   var length = rows.length
   var index = -1
+  var node
+  var queue
 
   while (++index < length) {
-    one(rows[index], count)
+    node = rows[index]
+
+    if (node.type === 'tableRow') {
+      flush()
+      add(node)
+    } else {
+      queue = (queue || []).concat(node)
+    }
+  }
+
+  flush()
+
+  return nodes
+
+  function flush() {
+    if (queue) {
+      add({type: 'tableRow', children: queue})
+      queue = undefined
+    }
   }
 
-  return rows
+  function add(node) {
+    nodes.push(cells(node, count))
+  }
 }
 
-function one(row, count) {
-  var children = row.children
-  var length = count + 1
-  var index = children.length
+function cells(row, count) {
+  var nodes = []
+  var cells = row.children
+  var length = cells.length
+  var index = -1
+  var node
+  var queue
+
+  while (++index < length) {
+    node = cells[index]
+
+    if (node.type === 'tableCell') {
+      flush()
+      nodes.push(node)
+    } else {
+      queue = (queue || []).concat(node)
+    }
+  }
+
+  flush()
+
+  index = nodes.length
+  length = count + 1
 
   while (++index < length) {
-    children.push({type: 'tableCell', children: []})
+    nodes.push({type: 'tableCell', children: []})
+  }
+
+  return xtend(row, {children: nodes})
+
+  function flush() {
+    if (queue) {
+      nodes.push({type: 'tableCell', children: queue})
+      queue = undefined
+    }
   }
 }
diff --git a/test/fixtures/table-missing-elements/index.html b/test/fixtures/table-missing-elements/index.html
@@ -0,0 +1,6 @@
+<!doctype html>
+<table>
+  <tr><th>Things</th></tr>
+  <!-- alpha -->
+  <input type="hidden" name="search_to" />
+</table>
diff --git a/test/fixtures/table-missing-elements/index.md b/test/fixtures/table-missing-elements/index.md
@@ -0,0 +1,3 @@
+| Things         |
+| -------------- |
+| <!-- alpha --> |

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+\| Things \|`
	`2`	`+\| -------------- \|`
	`3`	`+\| <!-- alpha --> \|`