Refactor to externalise utilities

Author: wooorm

component.json

@@ -12,6 +12,9 @@
     "marker",
     "mdast"
   ],
+  "dependencies": {
+    "wooorm/mdast-util-visit": "^0.1.1"
+  },
   "repository": "wooorm/mdast-zone",
   "scripts": [
     "index.js"

index.js

@@ -1,5 +1,11 @@
 'use strict';
 
+/*
+ * Dependencies.
+ */
+
+var visit = require('mdast-util-visit');
+
 /*
  * Methods.
  */
@@ -83,32 +89,6 @@ function marker(name) {
     );
 }
 
-/**
- * Visit.
- *
- * @param {Node} tree
- * @param {function(node, parent)} callback
- */
-function visit(tree, callback) {
-    /**
-     * Visit one node.
-     *
-     * @param {Node} node
-     * @param {number} index
-     */
-    function one(node, index) {
-        var parent = this || null;
-
-        callback(node, parent, index);
-
-        if (node.children) {
-            node.children.forEach(one, node);
-        }
-    }
-
-    one(tree);
-}
-
 /**
  * Parse `value` into an object.
  *
@@ -266,10 +246,10 @@ function run(settings) {
      * Passed intto `visit`.
      *
      * @param {Node} node
-     * @param {Node} parent
      * @param {number} index
+     * @param {Node} parent
      */
-    function gather(node, parent, index) {
+    function gather(node, index, parent) {
         var result = test(node);
         var type = result && result.type;
 

mdast-zone.js

@@ -1,6 +1,12 @@
 (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.mdastZone = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 'use strict';
 
+/*
+ * Dependencies.
+ */
+
+var visit = require('mdast-util-visit');
+
 /*
  * Methods.
  */
@@ -84,32 +90,6 @@ function marker(name) {
     );
 }
 
-/**
- * Visit.
- *
- * @param {Node} tree
- * @param {function(node, parent)} callback
- */
-function visit(tree, callback) {
-    /**
-     * Visit one node.
-     *
-     * @param {Node} node
-     * @param {number} index
-     */
-    function one(node, index) {
-        var parent = this || null;
-
-        callback(node, parent, index);
-
-        if (node.children) {
-            node.children.forEach(one, node);
-        }
-    }
-
-    one(tree);
-}
-
 /**
  * Parse `value` into an object.
  *
@@ -267,10 +247,10 @@ function run(settings) {
      * Passed intto `visit`.
      *
      * @param {Node} node
-     * @param {Node} parent
      * @param {number} index
+     * @param {Node} parent
      */
-    function gather(node, parent, index) {
+    function gather(node, index, parent) {
         var result = test(node);
         var type = result && result.type;
 
@@ -377,5 +357,120 @@ function wrapper(options) {
 
 module.exports = wrapper;
 
+},{"mdast-util-visit":2}],2:[function(require,module,exports){
+/**
+ * @author Titus Wormer
+ * @copyright 2015 Titus Wormer. All rights reserved.
+ * @module mdast-util-visit
+ * @fileoverview Utility to recursively walk over mdast nodes.
+ */
+
+'use strict';
+
+/**
+ * Walk forwards.
+ *
+ * @param {Array.<*>} values - Things to iterate over,
+ *   forwards.
+ * @param {function(*, number): boolean} callback - Function
+ *   to invoke.
+ * @return {boolean} - False if iteration stopped.
+ */
+function forwards(values, callback) {
+    var index = -1;
+    var length = values.length;
+
+    while (++index < length) {
+        if (callback(values[index], index) === false) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+/**
+ * Walk backwards.
+ *
+ * @param {Array.<*>} values - Things to iterate over,
+ *   backwards.
+ * @param {function(*, number): boolean} callback - Function
+ *   to invoke.
+ * @return {boolean} - False if iteration stopped.
+ */
+function backwards(values, callback) {
+    var index = values.length;
+    var length = -1;
+
+    while (--index > length) {
+        if (callback(values[index], index) === false) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+/**
+ * Visit.
+ *
+ * @param {Node} tree - Root node
+ * @param {string} [type] - Node type.
+ * @param {function(node): boolean?} callback - Invoked
+ *   with each found node.  Can return `false` to stop.
+ * @param {boolean} [reverse] - By default, `visit` will
+ *   walk forwards, when `reverse` is `true`, `visit`
+ *   walks backwards.
+ */
+function visit(tree, type, callback, reverse) {
+    var iterate;
+    var one;
+    var all;
+
+    if (typeof type === 'function') {
+        reverse = callback;
+        callback = type;
+        type = null;
+    }
+
+    iterate = reverse ? backwards : forwards;
+
+    /**
+     * Visit `children` in `parent`.
+     */
+    all = function (children, parent) {
+        return iterate(children, function (child, index) {
+            return child && one(child, index, parent);
+        });
+    };
+
+    /**
+     * Visit a single node.
+     */
+    one = function (node, index, parent) {
+        var result;
+
+        index = index || (parent ? 0 : null);
+
+        if (!type || node.type === type) {
+            result = callback(node, index, parent || null);
+        }
+
+        if (node.children && result !== false) {
+            return all(node.children, node);
+        }
+
+        return result;
+    };
+
+    one(tree);
+}
+
+/*
+ * Expose.
+ */
+
+module.exports = visit;
+
 },{}]},{},[1])(1)
 });

mdast-zone.min.js

@@ -12,6 +12,9 @@
     "marker",
     "mdast"
   ],
+  "dependencies": {
+    "mdast-util-visit": "^0.1.1"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/wooorm/mdast-zone.git"