Add support for <table> (#17)

Author: wooorm

handlers/index.js

@@ -1,13 +1,29 @@
 'use strict';
 
+var all = require('../all');
+
 exports.root = require('./root');
 exports.text = require('./text');
 exports.comment = require('./comment');
 
-exports.head = exports.math = exports.script = exports.style = exports.svg =
-  exports.template = exports.title = ignore;
+exports.caption =
+exports.colgroup =
+exports.head =
+exports.math =
+exports.script =
+exports.style =
+exports.svg =
+exports.template =
+exports.title = ignore;
+
+exports.thead =
+exports.tbody =
+exports.tfoot = children;
 
 exports.ol = exports.ul = require('./list');
+exports.table = require('./table');
+exports.tr = require('./table-row');
+exports.th = exports.td = require('./table-cell');
 exports.li = require('./list-item');
 exports.strong = exports.b = require('./strong');
 exports.em = exports.i = require('./emphasis');
@@ -27,3 +43,7 @@ exports.h1 = exports.h2 = exports.h3 =
 exports.a = require('./link');
 
 function ignore() {}
+
+function children(h, node) {
+  return all(h, node);
+}

handlers/table-cell.js

@@ -0,0 +1,9 @@
+'use strict';
+
+module.exports = cell;
+
+var all = require('../all');
+
+function cell(h, node) {
+  return h(node, 'tableCell', all(h, node));
+}

handlers/table-row.js

@@ -0,0 +1,9 @@
+'use strict';
+
+module.exports = row;
+
+var all = require('../all');
+
+function row(h, node) {
+  return h(node, 'tableRow', all(h, node));
+}

handlers/table.js

@@ -0,0 +1,86 @@
+'use strict';
+
+module.exports = table;
+
+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));
+}
+
+/* Infer the alignment of the table. */
+function alignment(node) {
+  var align = [];
+
+  visit(node, visitor);
+
+  return align;
+
+  function visitor(child, index, parent) {
+    var pos;
+
+    if (cell(child)) {
+      pos = cellsBefore(parent, child);
+      if (!align[pos]) {
+        align[pos] = infer(child) || null;
+      }
+    }
+  }
+}
+
+/* Get the alignment of a cell. */
+function infer(node) {
+  return node.properties.align;
+}
+
+/* Count cells in `parent` before `node`. */
+function cellsBefore(parent, node) {
+  var children = parent.children;
+  var length = children.length;
+  var index = -1;
+  var child;
+  var pos = 0;
+
+  while (++index < length) {
+    child = children[index];
+
+    if (child === node) {
+      break;
+    }
+
+    if (cell(child)) {
+      pos++;
+    }
+  }
+
+  return pos;
+}
+
+/* Check if `node` is a cell. */
+function cell(node) {
+  return node.tagName === 'th' || node.tagName === 'td';
+}
+
+/* Ensure the amount of cells in a row matches `align.left`. */
+function patch(rows, count) {
+  var length = rows.length;
+  var index = -1;
+
+  while (++index < length) {
+    one(rows[index], count);
+  }
+
+  return rows;
+}
+
+function one(row, count) {
+  var children = row.children;
+  var length = count + 1;
+  var index = children.length;
+
+  while (++index < length) {
+    children.push({type: 'tableCell', children: []});
+  }
+}

package.json

@@ -32,6 +32,7 @@
     "hast-util-to-string": "^1.0.0",
     "trim-lines": "^1.1.0",
     "unist-builder": "^1.0.2",
+    "unist-util-visit": "^1.1.1",
     "xtend": "^4.0.1"
   },
   "devDependencies": {

tests/fixtures/table/index.html

@@ -0,0 +1,83 @@
+<table>
+  <thead>
+    <tr>
+      <th>Heading 1</th>
+      <th>Heading 2</th>
+      <th>Heading 3</th>
+      <th>Heading 4</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Cell 1</td>
+      <td>Cell 2</td>
+      <td>Cell 3</td>
+      <td>Cell 4</td>
+    </tr>
+    <tr>
+      <td>Cell 5</td>
+      <td>Cell 6</td>
+      <td>Cell 7</td>
+      <td>Cell 8</td>
+    </tr>
+  </tbody>
+</table>
+
+<table>
+  <thead>
+    <tr>
+      <th>Heading 1</th>
+      <th>Heading 2</th>
+      <th>Heading 3</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Cell 1</td>
+      <td>Cell 2</td>
+      <td>Cell 3</td>
+      <td>Cell 4</td>
+    </tr>
+    <tr>
+      <td>Cell 5</td>
+      <td>Cell 6</td>
+    </tr>
+  </tbody>
+</table>
+
+<table>
+  <thead>
+    <tr>
+      <th align="left">Heading 1</th>
+      <th align="right">Heading 2</th>
+      <th align="center">Heading 3</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td align="left">Cell 1</td>
+      <td align="right">Cell 2</td>
+      <td align="center">Cell 3</td>
+    </tr>
+    <tr>
+      <td align="left">Cell 4</td>
+      <td align="right">Cell 5</td>
+      <td align="center">Cell 6</td>
+    </tr>
+  </tbody>
+</table>
+
+<table>
+  <tr>
+    <th align="left">Heading 1</th>
+    <th align="right">Heading 2</th>
+  </tr>
+  <tr>
+    <td align="left">Cell 1</td>
+    <td align="right">Cell 2</td>
+  </tr>
+  <tr>
+    <td align="left">Cell 3</td>
+    <td align="right">Cell 4</td>
+  </tr>
+</table>

tests/fixtures/table/index.json

@@ -0,0 +1,3 @@
+{
+  "fragment": true
+}

tests/fixtures/table/index.md

@@ -0,0 +1,19 @@
+| Heading 1 | Heading 2 | Heading 3 | Heading 4 |
+| --------- | --------- | --------- | --------- |
+| Cell 1    | Cell 2    | Cell 3    | Cell 4    |
+| Cell 5    | Cell 6    | Cell 7    | Cell 8    |
+
+| Heading 1 | Heading 2 | Heading 3 |        |
+| --------- | --------- | --------- | ------ |
+| Cell 1    | Cell 2    | Cell 3    | Cell 4 |
+| Cell 5    | Cell 6    |           |        |
+
+| Heading 1 | Heading 2 | Heading 3 |
+| :-------- | --------: | :-------: |
+| Cell 1    |    Cell 2 |   Cell 3  |
+| Cell 4    |    Cell 5 |   Cell 6  |
+
+| Heading 1 | Heading 2 |
+| :-------- | --------: |
+| Cell 1    |    Cell 2 |
+| Cell 3    |    Cell 4 |