Add more nodes, and refactor tests to be more scalable

wooorm · wooorm · commit b28f105050d3 · 2017-01-29T12:37:10.000+01:00
diff --git a/handlers/emphasis.js b/handlers/emphasis.js
@@ -0,0 +1,8 @@
+module.exports = emphasis
+
+var u = require('unist-builder')
+var all = require('../all')
+
+function emphasis (h, node) {
+  return h(node, 'emphasis', all(h, node))
+}
diff --git a/handlers/heading.js b/handlers/heading.js
@@ -1,12 +1,9 @@
-module.exports = function (depth) {
-  return heading(depth)
-}
+module.exports = heading
 
 var u = require('unist-builder')
 var all = require('../all')
 
-function heading (depth) {
-  return function (h, node) {
-    return h(node, 'heading', { depth: depth }, all(h, node))
-  }
+function heading (h, node) {
+  var depth = Number(node.tagName.charAt(1)) || 1;
+  return h(node, 'heading', {depth: depth}, all(h, node))
 }
diff --git a/handlers/index.js b/handlers/index.js
@@ -1,7 +1,11 @@
-module.exports = {
-  heading: require('./heading'),
-  text: require('./text'),
-  root: require('./root'),
-  strong: require('./strong'),
-  p: require('./p')
-}
+exports.root = require('./root')
+
+exports.text = require('./text')
+
+exports.strong = exports.b = require('./strong')
+exports.em = exports.i = require('./emphasis')
+exports.code = exports.kbd = exports.samp = exports.var = require('./inline-code')
+
+exports.p = require('./paragraph')
+exports.h1 = exports.h2 = exports.h3 =
+  exports.h4 = exports.h5 = exports.h6 = require('./heading')
diff --git a/handlers/inline-code.js b/handlers/inline-code.js
@@ -0,0 +1,9 @@
+module.exports = inlineCode
+
+var toString = require('hast-util-to-string');
+var u = require('unist-builder')
+var all = require('../all')
+
+function inlineCode (h, node) {
+  return h(node, 'inlineCode', toString(node))
+}
diff --git a/handlers/paragraph.js b/handlers/paragraph.js
diff --git a/package.json b/package.json
@@ -26,15 +26,21 @@
   "homepage": "https://github.com/syntax-tree/hast-util-to-mdast#readme",
   "dependencies": {
     "has": "^1.0.1",
+    "hast-util-to-string": "^1.0.0",
     "trim": "0.0.1",
     "trim-lines": "^1.1.0",
     "unist-builder": "^1.0.2",
     "xtend": "^4.0.1"
   },
   "devDependencies": {
+    "is-hidden": "^1.1.0",
+    "mdast-util-assert": "^1.0.0",
+    "negate": "^1.0.0",
     "rehype-parse": "^2.0.1",
+    "remark-parse": "^2.2.0",
     "remark-stringify": "^2.3.0",
     "tape": "^4.6.3",
-    "unified": "^5.1.0"
+    "unified": "^5.1.0",
+    "unist-util-remove-position": "^1.1.0"
   }
 }
diff --git a/tests/fixtures/b/index.html b/tests/fixtures/b/index.html
@@ -0,0 +1 @@
+<p><b>Hello World.</b></p>
diff --git a/tests/fixtures/b/index.json b/tests/fixtures/b/index.json
@@ -0,0 +1,3 @@
+{
+  "fragment": true
+}
diff --git a/tests/fixtures/b/index.md b/tests/fixtures/b/index.md
@@ -0,0 +1 @@
+**Hello World.**
diff --git a/tests/fixtures/code/index.html b/tests/fixtures/code/index.html
@@ -0,0 +1 @@
+<p>Regular. <code>toString()</code>. Regular.</p>
diff --git a/tests/fixtures/code/index.json b/tests/fixtures/code/index.json
@@ -0,0 +1,3 @@
+{
+  "fragment": true
+}
diff --git a/tests/fixtures/code/index.md b/tests/fixtures/code/index.md
@@ -0,0 +1 @@
+Regular. `toString()`. Regular.
diff --git a/tests/fixtures/em/index.html b/tests/fixtures/em/index.html
@@ -0,0 +1 @@
+<p><em>Hello World.</em></p>
diff --git a/tests/fixtures/em/index.json b/tests/fixtures/em/index.json
@@ -0,0 +1,3 @@
+{
+  "fragment": true
+}
diff --git a/tests/fixtures/em/index.md b/tests/fixtures/em/index.md
@@ -0,0 +1 @@
+_Hello World._
diff --git a/tests/fixtures/heading/index.json b/tests/fixtures/heading/index.json
@@ -0,0 +1,3 @@
+{
+  "fragment": true
+}
diff --git a/tests/fixtures/i/index.html b/tests/fixtures/i/index.html
@@ -0,0 +1 @@
+<p><i>Hello World.</i></p>
diff --git a/tests/fixtures/i/index.json b/tests/fixtures/i/index.json
@@ -0,0 +1,3 @@
+{
+  "fragment": true
+}
diff --git a/tests/fixtures/i/index.md b/tests/fixtures/i/index.md
@@ -0,0 +1 @@
+_Hello World._
diff --git a/tests/fixtures/kbd/index.html b/tests/fixtures/kbd/index.html
@@ -0,0 +1 @@
+<p>Type the following in the Run dialog: <kbd>cmd</kbd>.</p>
diff --git a/tests/fixtures/kbd/index.json b/tests/fixtures/kbd/index.json
@@ -0,0 +1,3 @@
+{
+  "fragment": true
+}
diff --git a/tests/fixtures/kbd/index.md b/tests/fixtures/kbd/index.md
@@ -0,0 +1 @@
+Type the following in the Run dialog: `cmd`.
diff --git a/tests/fixtures/paragraph/index.json b/tests/fixtures/paragraph/index.json
@@ -0,0 +1,3 @@
+{
+  "fragment": true
+}
diff --git a/tests/fixtures/root/index.html b/tests/fixtures/root/index.html
diff --git a/tests/fixtures/root/index.md b/tests/fixtures/root/index.md
diff --git a/tests/fixtures/samp/index.html b/tests/fixtures/samp/index.html
@@ -0,0 +1 @@
+<p>Regular. <samp>Sample text.</samp> Regular.</p>
diff --git a/tests/fixtures/samp/index.json b/tests/fixtures/samp/index.json
@@ -0,0 +1,3 @@
+{
+  "fragment": true
+}
diff --git a/tests/fixtures/samp/index.md b/tests/fixtures/samp/index.md
@@ -0,0 +1 @@
+Regular. `Sample text.` Regular.
diff --git a/tests/fixtures/strong/index.json b/tests/fixtures/strong/index.json
@@ -0,0 +1,3 @@
+{
+  "fragment": true
+}
diff --git a/tests/fixtures/var/index.html b/tests/fixtures/var/index.html
@@ -0,0 +1 @@
+<p>A simple equation: <var>x</var> = <var>y</var> + 2.</p>
diff --git a/tests/fixtures/var/index.json b/tests/fixtures/var/index.json
@@ -0,0 +1,3 @@
+{
+  "fragment": true
+}
diff --git a/tests/fixtures/var/index.md b/tests/fixtures/var/index.md
@@ -0,0 +1 @@
+A simple equation: `x` = `y` + 2.
diff --git a/tests/index.js b/tests/index.js
@@ -2,62 +2,62 @@ var fs = require('fs')
 var path = require('path')
 
 var test = require('tape')
+var hidden = require('is-hidden')
+var negate = require('negate')
 var unified = require('unified')
-var parse = require('rehype-parse')
+var markdown = require('remark-parse')
+var html = require('rehype-parse')
 var stringify = require('remark-stringify')
+var assert = require('mdast-util-assert')
+var remove = require('unist-util-remove-position')
 var toMDAST = require('../index')
 
 var fixtures = path.join(__dirname, 'fixtures')
 
-test('root', function (t) {
-  var result = unified()
-    .use(parse)
+test('fixtures', function (t) {
+  var fromHTML = unified()
+    .use(html)
     .use(function () { return toMDAST })
     .use(stringify)
-    .process('', { fragment: true }).contents
 
-  t.ok(result)
-  t.end()
-})
+  var remark = unified().use(markdown).use(stringify)
 
-test('paragraph', function (t) {
-  var html = fs.readFileSync(path.join(fixtures, 'paragraph', 'index.html'), 'utf8')
-  var md = fs.readFileSync(path.join(fixtures, 'paragraph', 'index.md'), 'utf8')
-
-  var result = unified()
-    .use(parse)
-    .use(function () { return toMDAST })
-    .use(stringify)
-    .process(html, { fragment: true }).contents
+  fs
+    .readdirSync(fixtures)
+    .filter(negate(hidden))
+    .forEach(check)
 
-  t.equal(result, md)
   t.end()
-})
 
-test('strong', function (t) {
-  var html = fs.readFileSync(path.join(fixtures, 'strong', 'index.html'), 'utf8')
-  var md = fs.readFileSync(path.join(fixtures, 'strong', 'index.md'), 'utf8')
+  function check(name) {
+    t.test(name, function (st) {
+      var input = fs.readFileSync(path.join(fixtures, name, 'index.html'), 'utf8')
+      var output = fs.readFileSync(path.join(fixtures, name, 'index.md'), 'utf8')
+      var config
 
-  var result = unified()
-    .use(parse)
-    .use(function () { return toMDAST })
-    .use(stringify)
-    .process(html, { fragment: true }).contents
+      try {
+        config = fs.readFileSync(path.join(fixtures, name, 'index.json'), 'utf8')
+      } catch (err) {}
 
-  t.equal(result, md)
-  t.end()
-})
+      if (config) {
+        config = JSON.parse(config)
+      }
 
-test('heading', function (t) {
-  var html = fs.readFileSync(path.join(fixtures, 'heading', 'index.html'), 'utf8')
-  var md = fs.readFileSync(path.join(fixtures, 'heading', 'index.md'), 'utf8')
+      var tree = remove(fromHTML.run(fromHTML.parse(input, config)), true)
 
-  var result = unified()
-    .use(parse)
-    .use(function () { return toMDAST })
-    .use(stringify)
-    .process(html, { fragment: true }).contents
+      st.doesNotThrow(function () {
+        assert(tree)
+      }, 'should produce valid MDAST nodes')
 
-  t.equal(result, md)
-  t.end()
+      st.deepEqual(remark.stringify(tree), output || '\n', 'should produce the same documents');
+
+      st.deepEqual(
+        tree,
+        remove(remark.run(remark.parse(output)), true),
+        'should produce the same tree as remark'
+      );
+
+      st.end();
+    })
+  }
 })

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<p>Regular. <code>toString()</code>. Regular.</p>`