Refactor code-style

Author: wooorm

.editorconfig

@@ -2,14 +2,8 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 4
+indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-
-[*.{json,svg,remarkrc,eslintrc}]
-indent_size = 2
-
-[*.md]
-trim_trailing_whitespace = false

index.js

@@ -1,188 +1,116 @@
-/**
- * @author Titus Wormer
- * @copyright 2015 Titus Wormer
- * @license MIT
- * @module mdast:util:heading-range
- * @fileoverview Markdown heading as ranges in mdast.
- */
-
 'use strict';
 
-/* eslint-env commonjs */
-
-/*
- * Dependencies.
- */
-
+/* Dependencies. */
 var toString = require('mdast-util-to-string');
 
-/*
- * Methods.
- */
+/* Expose. */
+module.exports = headingRange;
 
+/* Methods. */
 var splice = [].splice;
 
-/**
- * Transform a string into an applicable expression.
- *
- * @param {string} value - Value to transform.
- * @return {RegExp} - Expression.
- */
-function toExpression(value) {
-    return new RegExp('^(' + value + ')$', 'i');
-}
-
-/**
- * Wrap an expression into an assertion function.
- *
- * @param {RegExp} expression - Expression to test.
- * @return {Function} - Assertion.
- */
-function wrapExpression(expression) {
-    /**
-     * Assert `value` matches the bound `expression`.
-     *
-     * @param {string} value - Value to check.
-     * @return {boolean} - Whether `value` matches.
-     */
-    function assertion(value) {
-        return expression.test(value);
-    }
-
-    return assertion;
-}
+/* Search `node` for `heading` and invoke `callback`. */
+function headingRange(node, heading, callback) {
+  var test = heading;
 
-/**
- * Check if `node` is a heading.
- *
- * @param {Node} node - Node to check.
- * @return {boolean} - Whether `node` is a heading.
- */
-function isHeading(node) {
-    return node && node.type === 'heading';
-}
+  if (typeof test === 'string') {
+    test = toExpression(test);
+  }
 
-/**
- * Check if `node` is the main heading.
- *
- * @param {Node} node - Node to check.
- * @param {number?} depth - Depth to search for.
- * @param {function(string): boolean} test - Tester.
- * @return {boolean} - Whether `node` is an opening
- *   heading.
- */
-function isOpeningHeading(node, depth, test) {
-    return depth === null && isHeading(node) && test(toString(node), node);
-}
+  if ('test' in test) {
+    test = wrapExpression(test);
+  }
 
-/**
- * Check if `node` is the next heading.
- *
- * @param {Node} node - Node to check.
- * @param {number?} depth - Depth of the opening heading.
- * @return {boolean} - Whether `node` is a closing
- *   heading.
- */
-function isClosingHeading(node, depth) {
-    return depth && isHeading(node) && node.depth <= depth;
+  search(node, test, callback);
 }
 
-/**
- * Search a node for heading range.
- *
- * @param {Node} root - Node to search.
- * @param {Function} test - Assertion.
- * @param {Function} callback - Callback invoked when
- *   found.
- */
+/* Search a node for heading range. */
 function search(root, test, callback) {
-    var index = -1;
-    var children = root.children;
-    var length = children.length;
-    var depth = null;
-    var start = null;
-    var end = null;
-    var nodes;
-    var clean;
-    var child;
+  var index = -1;
+  var children = root.children;
+  var length = children.length;
+  var depth = null;
+  var start = null;
+  var end = null;
+  var nodes;
+  var clean;
+  var child;
+
+  while (++index < length) {
+    child = children[index];
+
+    if (isClosingHeading(child, depth)) {
+      end = index;
+      break;
+    }
 
-    while (++index < length) {
-        child = children[index];
+    if (isOpeningHeading(child, depth, test)) {
+      start = index;
+      depth = child.depth;
+    }
+  }
 
-        if (isClosingHeading(child, depth)) {
-            end = index;
-            break;
-        }
+  if (start !== null) {
+    if (end === null) {
+      end = length + 1;
+    }
 
-        if (isOpeningHeading(child, depth, test)) {
-            start = index;
-            depth = child.depth;
-        }
+    nodes = callback(
+      children[start],
+      children.slice(start + 1, end),
+      children[end],
+      {
+        parent: root,
+        start: start,
+        end: end in children ? end : null
+      }
+    );
+
+    clean = [];
+    index = -1;
+    length = nodes && nodes.length;
+
+    /* Ensure no empty nodes are inserted. This could
+     * be the case if `end` is in `nodes` but no `end`
+     * node exists. */
+    while (++index < length) {
+      if (nodes[index]) {
+        clean.push(nodes[index]);
+      }
     }
 
-    if (start !== null) {
-        if (end === null) {
-            end = length + 1;
-        }
-
-        nodes = callback(
-            children[start],
-            children.slice(start + 1, end),
-            children[end],
-            {
-                'parent': root,
-                'start': start,
-                'end': end in children ? end : null
-            }
-        );
-
-        clean = [];
-        index = -1;
-        length = nodes && nodes.length;
-
-        /*
-         * Ensure no empty nodes are inserted. This could
-         * be the case if `end` is in `nodes` but no `end`
-         * node exists.
-         */
-
-        while (++index < length) {
-            if (nodes[index]) {
-                clean.push(nodes[index]);
-            }
-        }
-
-        if (nodes) {
-            splice.apply(children, [start, end - start + 1].concat(clean));
-        }
+    if (nodes) {
+      splice.apply(children, [start, end - start + 1].concat(clean));
     }
+  }
 }
 
-/**
- * Search `node` for `heading` and invoke `callback`.
- *
- * @param {Node} node - Node to search in.
- * @param {string|RegExp|Function} heading - Heading to
- *   search for.
- * @param {Function} callback - Callback invoked when
- *   found.
- */
-function headingRange(node, heading, callback) {
-    var test = heading;
+/* Transform a string into an applicable expression. */
+function toExpression(value) {
+  return new RegExp('^(' + value + ')$', 'i');
+}
 
-    if (typeof test === 'string') {
-        test = toExpression(test);
-    }
+/* Wrap an expression into an assertion function. */
+function wrapExpression(expression) {
+  return assertion;
 
-    if ('test' in test) {
-        test = wrapExpression(test);
-    }
+  /* Assert `value` matches the bound `expression`. */
+  function assertion(value) {
+    return expression.test(value);
+  }
+}
 
-    search(node, test, callback);
+/* Check if `node` is a heading. */
+function isHeading(node) {
+  return node && node.type === 'heading';
 }
 
-/*
- * Expose.
- */
+/* Check if `node` is the main heading. */
+function isOpeningHeading(node, depth, test) {
+  return depth === null && isHeading(node) && test(toString(node), node);
+}
 
-module.exports = headingRange;
+/* Check if `node` is the next heading. */
+function isClosingHeading(node, depth) {
+  return depth && isHeading(node) && node.depth <= depth;
+}

package.json

@@ -26,11 +26,8 @@
   ],
   "devDependencies": {
     "browserify": "^13.0.0",
-    "eslint": "^2.0.0",
     "esmangle": "^1.0.0",
     "istanbul": "^0.4.0",
-    "jscs": "^3.0.0",
-    "jscs-jsdoc": "^2.0.0",
     "remark": "^5.0.0",
     "remark-cli": "^1.0.0",
     "remark-comment-config": "^4.0.0",
@@ -39,18 +36,23 @@
     "remark-toc": "^3.0.0",
     "remark-usage": "^4.0.0",
     "remark-validate-links": "^4.0.0",
-    "tape": "^4.4.0"
+    "tape": "^4.4.0",
+    "xo": "^0.17.1"
   },
   "scripts": {
     "build-md": "remark . --quiet --frail",
     "build-bundle": "browserify index.js --no-builtins -s mdastUtilHeadingRange > mdast-util-heading-range.js",
     "build-mangle": "esmangle mdast-util-heading-range.js > mdast-util-heading-range.min.js",
     "build": "npm run build-md && npm run build-bundle && npm run build-mangle",
-    "lint-api": "eslint .",
-    "lint-style": "jscs --reporter inline .",
-    "lint": "npm run lint-api && npm run lint-style",
+    "lint": "xo",
     "test-api": "node test.js",
     "test-coverage": "istanbul cover test.js",
     "test": "npm run build && npm run lint && npm run test-coverage"
+  },
+  "xo": {
+    "space": true,
+    "ignore": [
+      "mdast-util-heading-range.js"
+    ]
   }
 }