Remove support for passing a list of nodes

Author: wooorm

README.md

@@ -7,6 +7,7 @@
 Remove one or more nodes from [Unist] tree, mutating it.
 
 [unist]: https://github.com/wooorm/unist
+[is]: https://github.com/syntax-tree/unist-util-is#api
 
 [travis]: https://travis-ci.org/eush77/unist-util-remove
 [travis-badge]: https://travis-ci.org/eush77/unist-util-remove.svg?branch=master
@@ -80,10 +81,7 @@ remove(ast, ast)
 ### `remove(ast, [opts], predicate)`
 
 - `ast` — [Unist] tree.
-- `predicate` — one of:
-    - [Unist] node or array of nodes,
-    - node type (string),
-    - function invoked with arguments `(node, index?, parent?)`.
+- `predicate` — any `test` as given to [`unist-util-is`][is].
 
 Iterates over `ast` in preorder traversal and removes all nodes matching `predicate` from `ast`. Returns a modified [Unist] tree.
 

index.js

@@ -9,9 +9,6 @@ module.exports = function (ast, opts, predicate) {
     opts = {};
   }
 
-  if (Array.isArray(predicate)) {
-    predicate = arrayPredicate(predicate);
-  }
   opts.cascade = opts.cascade || opts.cascade === undefined;
 
   // Check and remove nodes recursively in preorder.
@@ -45,10 +42,3 @@ module.exports = function (ast, opts, predicate) {
     return node;
   }(ast, null, null));
 };
-
-
-function arrayPredicate (nodes) {
-  return function (node) {
-    return nodes.indexOf(node) >= 0;
-  };
-}

package.json

@@ -5,7 +5,8 @@
   "author": "Eugene Sharygin <eush77@gmail.com>",
   "license": "MIT",
   "scripts": {
-    "test": "tape test/*.js"
+    "test": "tape test/*.js",
+    "cov": "nyc --reporter lcov tape test/*.js"
   },
   "files": [
     "index.js"

test/example.js

@@ -20,18 +20,6 @@ test('example from README', function (t) {
   var one = ast.children[0];
   var four = ast.children[2];
 
-  var newAst = remove(ast, [
-    ast.children[1].children[0],
-    ast.children[1].children[1]
-  ]);
-  t.equal(ast, newAst);
-  t.deepEqual(ast, u('root', [
-    u('leaf', 1),
-    u('leaf', 4)
-  ]));
-  t.equal(ast.children[0], one);
-  t.equal(ast.children[1], four);
-
   t.equal(remove(ast, ast), null);
 
   t.end();

test/opts.js

@@ -15,10 +15,9 @@ test('opts.cascade', function (t) {
       u('leaf', 2)
     ]);
 
-    var newAst = remove(ast, { cascade: true }, [
-      ast.children[0].children[0],
-      ast.children[1]
-    ]);
+    var newAst = remove(ast, { cascade: true }, function (node) {
+      return node === ast.children[0].children[0] || node === ast.children[1];
+    });
 
     t.equal(newAst, null);
     t.end();
@@ -35,10 +34,9 @@ test('opts.cascade', function (t) {
     var innerNode = ast.children[0];
     var grandChildren = ast.children[0].children;
 
-    var newAst = remove(ast, { cascade: false }, [
-      ast.children[0].children[0],
-      ast.children[1]
-    ]);
+    var newAst = remove(ast, { cascade: false }, function (node) {
+      return node === ast.children[0].children[0] || node === ast.children[1];
+    });
 
     t.equal(newAst, ast);
     t.deepEqual(ast, u('root', [

test/test.js

@@ -59,30 +59,6 @@ it('should return `null` if root node is removed', function (t) {
 });
 
 
-it('should accept array of nodes', function (t) {
-  var ast = u('root', [
-    u('leaf', 1),
-    u('leaf', 2),
-    u('leaf', 3),
-    u('leaf', 4)
-  ]);
-  var children = ast.children;
-  var secondLeaf = ast.children[1];
-
-  var newAst = remove(ast, [
-    ast.children[0],
-    ast.children[2],
-    ast.children[3]
-  ]);
-
-  t.equal(newAst, ast);
-  t.deepEqual(ast, u('root', [secondLeaf]));
-  t.equal(ast.children, children);
-  t.equal(ast.children[0], secondLeaf);
-  t.end();
-});
-
-
 it('should cascade remove parent nodes', function (t) {
   t.test(function (t) {
     var ast = u('root', [
@@ -111,10 +87,9 @@ it('should cascade remove parent nodes', function (t) {
       u('leaf', 2)
     ]);
 
-    var newAst = remove(ast, [
-      ast.children[0].children[0],
-      ast.children[1]
-    ]);
+    var newAst = remove(ast, function (node) {
+      return node === ast.children[0].children[0] || node === ast.children[1];
+    });
 
     t.equal(newAst, null);
     t.end();