Refactor code-style

Author: wooorm

index.js

@@ -1,85 +1,89 @@
-'use strict';
+'use strict'
 
-var Map = require('es6-map'),
-    is = require('unist-util-is');
+var Map = require('es6-map')
+var visit = require('unist-util-visit')
 
+module.exports = Index
 
-var IndexPrototype = {
-  get: function (key) {
-    return this.index.get(key) || [];
-  },
+Index.prototype.get = get
+Index.prototype.add = add
+Index.prototype.remove = remove
 
-  add: function (node) {
-    var key = this.keyfn(node);
+function Index(tree, filter, prop) {
+  var key
+  var self
 
-    if (!this.index.has(key)) {
-      this.index.set(key, []);
-    }
-
-    var nodes = this.index.get(key);
+  if (!(this instanceof Index)) {
+    return new Index(tree, filter, prop)
+  }
 
-    if (nodes.indexOf(node) < 0) {
-      nodes.push(node);
+  if (prop === null || prop === undefined) {
+    if (filter === null || filter === undefined) {
+      prop = tree
+      tree = null
+    } else {
+      prop = filter
     }
 
-    return this;
-  },
+    filter = trueConst
+  }
 
-  remove: function (node) {
-    var key = this.keyfn(node);
-    var nodes = this.index.get(key);
-    var nodeIndex;
+  self = this
+  key = typeof prop === 'string' ? pluck : prop
 
-    if (nodes && (nodeIndex = nodes.indexOf(node)) >= 0) {
-      nodes.splice(nodeIndex, 1);
-    }
+  this.index = new Map()
+  this.keyfn = key
 
-    return this;
+  if (tree) {
+    visit(tree, filter, add)
   }
-};
 
+  return this
 
-module.exports = function Index (ast, filter, keyfn) {
-  if (arguments.length == 1) {
-    return Index(null, trueConst, arguments[0]);
+  function pluck(node) {
+    return node[prop]
   }
-  if (arguments.length == 2) {
-    return Index(arguments[0], trueConst, arguments[1]);
+
+  function add(node) {
+    self.add(node)
   }
-  if (typeof keyfn == 'string') {
-    keyfn = (function (prop) {
-      return function (node) { return node[prop] };
-    }(keyfn));
+}
+
+function get(key) {
+  return this.index.get(key) || []
+}
+
+function add(node) {
+  var self = this
+  var key = self.keyfn(node)
+  var nodes
+
+  if (!self.index.has(key)) {
+    self.index.set(key, [])
   }
 
-  var index = Object.create(IndexPrototype, {
-    index: {
-      value: new Map
-    },
-    keyfn: {
-      value: keyfn
-    }
-  });
+  nodes = self.index.get(key)
 
-  if (!ast) {
-    return index;
+  if (nodes.indexOf(node) === -1) {
+    nodes.push(node)
   }
 
-  // Initialize in preorder traversal.
-  (function preorder (node, nodeIndex, parent) {
-    if (is(filter, node, nodeIndex, parent)) {
-      index.add(node);
-    }
+  return self
+}
 
-    node.children && node.children.forEach(function (child, childIndex) {
-      preorder(child, childIndex, node);
-    });
-  }(ast, null, null));
+function remove(node) {
+  var self = this
+  var key = self.keyfn(node)
+  var nodes = self.index.get(key)
+  var pos = nodes ? nodes.indexOf(node) : -1
 
-  return index;
-};
+  if (pos !== -1) {
+    nodes.splice(pos, 1)
+  }
 
+  return self
+}
 
-function trueConst () {
-  return true;
+function trueConst() {
+  return true
 }

package.json

@@ -32,14 +32,29 @@
   ],
   "dependencies": {
     "es6-map": "^0.1.3",
-    "unist-util-is": "^2.0.0"
+    "unist-util-visit": "^1.4.0"
   },
   "devDependencies": {
+    "prettier": "^1.14.2",
     "tape": "^4.4.0",
     "unist-builder": "^1.0.1",
-    "unist-util-select": "^1.5.0"
+    "unist-util-select": "^1.5.0",
+    "xo": "^0.22.0"
   },
   "scripts": {
+    "format": "prettier --write \"**/*.js\" && xo --fix",
     "test": "tape test/*.js"
+  },
+  "prettier": {
+    "tabWidth": 2,
+    "useTabs": false,
+    "singleQuote": true,
+    "bracketSpacing": false,
+    "semi": false,
+    "trailingComma": "none"
+  },
+  "xo": {
+    "prettier": true,
+    "esnext": false
   }
 }

test/add.js

@@ -1,44 +1,31 @@
-'use strict';
-
-var Index = require('..');
-
-var test = require('tape'),
-    u = require('unist-builder'),
-    select = require('unist-util-select');
-
-
-test('index.add', function (t) {
-  var ast = u('root', [
-    u('node', { word: 'foo' }),
-    u('node', { word: 'bar' })
-  ]);
-  var extraNode = u('node', { word: 'foo' });
-  var $ = select.one(ast);
-
-  var index = Index(ast, 'word');
-  t.deepEqual(index.get('foo'), [
-    $('[word=foo]')
-  ]);
-
-  var result = index.add(extraNode);
-  t.deepEqual(index.get('foo'), [
-    $('[word=foo]'),
-    extraNode
-  ]);
-
-  t.equal(result, index, 'returns this');
-
-  index.add($('[word=foo]'));
-  t.deepEqual(index.get('foo'), [
-    $('[word=foo]'),
-    extraNode
-  ]);
-
-  index.add(extraNode);
-  t.deepEqual(index.get('foo'), [
-    $('[word=foo]'),
-    extraNode
-  ]);
-
-  t.end();
-});
+'use strict'
+
+var Index = require('..')
+
+var test = require('tape')
+
+var u = require('unist-builder')
+
+var select = require('unist-util-select')
+
+test('index.add', function(t) {
+  var ast = u('root', [u('node', {word: 'foo'}), u('node', {word: 'bar'})])
+  var extraNode = u('node', {word: 'foo'})
+  var $ = select.one(ast)
+
+  var index = new Index(ast, 'word')
+  t.deepEqual(index.get('foo'), [$('[word=foo]')])
+
+  var result = index.add(extraNode)
+  t.deepEqual(index.get('foo'), [$('[word=foo]'), extraNode])
+
+  t.equal(result, index, 'returns this')
+
+  index.add($('[word=foo]'))
+  t.deepEqual(index.get('foo'), [$('[word=foo]'), extraNode])
+
+  index.add(extraNode)
+  t.deepEqual(index.get('foo'), [$('[word=foo]'), extraNode])
+
+  t.end()
+})