Merge pull request #2 from syntax-tree/moar-tags

Moar tags

Author: sethvincent

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))
+}

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))
 }

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')

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))
+}

handlers/p.js renamed to handlers/paragraph.js

@@ -17,21 +17,24 @@ function factory (tree, options) {
   return h
 
   function h (node, type, props, children) {
-    if (children === null &&typeof props === 'object' && props.length) {
+    if (!children && ((typeof props === 'object' && 'length' in props) || typeof props === 'string')) {
       children = props
       props = {}
     }
 
-    var result = augment(node, {
-      type: type,
-      children: children
-    })
+    var result = augment(node, {type: type})
+
+    if (typeof children === 'string') {
+      result.value = children;
+    } else if (children) {
+      result.children = children;
+    }
 
     return xtend(result, props)
   }
 
-  /* `right` is the finalized MDAST node, 
-  created from `left`, an HAST node */
+  /* `right` is the finalized MDAST node,
+  created from `left`, a HAST node */
   function augment (left, right) {
     var data
     var ctx

index.js

@@ -8,21 +8,9 @@ var handlers = require('./handlers')
 
 function one (h, node, parent) {
   var fn = null
-
-  var tagName = node && node.tagName && node.tagName !== undefined 
-    ? node.tagName
-    : null
-
-  if (tagName && has(handlers, tagName)) {
-    fn = has(handlers, tagName) ? handlers[tagName] : null
-  } else if (tagName) {
-    var matchHeader = tagName.match(/h([1-6?])/g)
-
-    if (matchHeader) {
-      var depth = tagName.split('h')[1]
-      fn = handlers.heading(depth)
-    }
-  } else if (node.type && has(handlers, node.type)) {
+  if (node.type === 'element' && has(handlers, node.tagName)) {
+    fn = handlers[node.tagName]
+  } else if (has(handlers, node.type)) {
     fn = handlers[node.type]
   }
 
@@ -35,5 +23,5 @@ function unknown (h, node) {
     return h.augment(node, u('text', node.value))
   }
 
-  return h(node, all(h, node))
+  return all(h, node)
 }

one.js

@@ -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"
   }
 }

package.json

@@ -0,0 +1 @@
+<p><b>Hello World.</b></p>

tests/fixtures/b/index.html

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