Refactor to improve bundle size

syntax-tree · Nov 3, 2020 · 2a656f6 · 2a656f6
1 parent 7d4b219
commit 2a656f6
Show file tree

Hide file tree

Showing 2 changed files with 133 additions and 80 deletions.
diff --git a/index.js b/index.js
@@ -6,33 +6,31 @@ module.exports = findBefore
 
 function findBefore(parent, index, test) {
   var is = convert(test)
-  var children
-  var child
 
   if (!parent || !parent.type || !parent.children) {
     throw new Error('Expected parent node')
   }
 
-  children = parent.children
-
-  if (index && index.type) {
-    index = children.indexOf(index)
-  }
+  if (typeof index === 'number') {
+    if (index < 0 || index === Infinity) {
+      throw new Error('Expected positive finite number as index')
+    }
+  } else {
+    index = parent.children.indexOf(index)
 
-  if (isNaN(index) || index < 0 || index === Infinity) {
-    throw new Error('Expected positive finite index or child node')
+    if (index < 0) {
+      throw new Error('Expected child node or index')
+    }
   }
 
   // Performance.
-  if (index > children.length) {
-    index = children.length
+  if (index > parent.children.length) {
+    index = parent.children.length
   }
 
   while (index--) {
-    child = children[index]
-
-    if (is(child, index, parent)) {
-      return child
+    if (is(parent.children[index], index, parent)) {
+      return parent.children[index]
     }
   }
 

diff --git a/test.js b/test.js
@@ -1,6 +1,5 @@
 'use strict'
 
-var assert = require('assert')
 var test = require('tape')
 var remark = require('remark')
 var findBefore = require('.')
@@ -28,82 +27,138 @@ test('unist-util-find-before', function (t) {
     'should fail without parent node'
   )
 
-  t.doesNotThrow(function () {
-    assert.throws(function () {
+  t.throws(
+    function () {
       findBefore({type: 'foo', children: []})
-    }, /Expected positive finite index or child node/)
+    },
+    /Expected child node or index/,
+    'should fail without index (#1)'
+  )
 
-    assert.throws(function () {
+  t.throws(
+    function () {
       findBefore({type: 'foo', children: []}, -1)
-    }, /Expected positive finite index or child node/)
+    },
+    /Expected positive finite number as index/,
+    'should fail without index (#2)'
+  )
 
-    assert.throws(function () {
+  t.throws(
+    function () {
       findBefore({type: 'foo', children: []}, {type: 'bar'})
-    }, /Expected positive finite index or child node/)
-  }, 'should fail without index')
+    },
+    /Expected child node or index/,
+    'should fail without index (#3)'
+  )
 
-  t.doesNotThrow(function () {
-    assert.throws(function () {
-      findBefore(
-        {
-          type: 'foo',
-          children: [{type: 'bar'}]
-        },
-        1,
-        false
-      )
-    }, /Expected function, string, or object as test/)
+  t.throws(
+    function () {
+      findBefore({type: 'foo', children: [{type: 'bar'}]}, 1, false)
+    },
+    /Expected function, string, or object as test/,
+    'should fail for invalid `test` (#1)'
+  )
 
-    assert.throws(function () {
-      findBefore(
-        {
-          type: 'foo',
-          children: [{type: 'bar'}]
-        },
-        1,
-        true
-      )
-    }, /Expected function, string, or object as test/)
-  }, 'should fail for invalid `test`')
+  t.throws(
+    function () {
+      findBefore({type: 'foo', children: [{type: 'bar'}]}, 1, true)
+    },
+    /Expected function, string, or object as test/,
+    'should fail for invalid `test` (#2)'
+  )
 
-  t.doesNotThrow(function () {
-    assert.strictEqual(findBefore(paragraph, children[1]), children[0])
-    assert.strictEqual(findBefore(paragraph, 1), children[0])
-    assert.strictEqual(findBefore(paragraph, 0), null)
-  }, 'should return the preceding node when without `test`')
+  t.strictEqual(
+    findBefore(paragraph, children[1]),
+    children[0],
+    'should return the preceding node when without `test` (#1)'
+  )
+  t.strictEqual(
+    findBefore(paragraph, 1),
+    children[0],
+    'should return the preceding node when without `test` (#2)'
+  )
+  t.strictEqual(
+    findBefore(paragraph, 0),
+    null,
+    'should return the preceding node when without `test` (#3)'
+  )
 
-  t.doesNotThrow(function () {
-    assert.strictEqual(findBefore(paragraph, 100, children[0]), children[0])
-    assert.strictEqual(
-      findBefore(paragraph, children[1], children[0]),
-      children[0]
-    )
-    assert.strictEqual(findBefore(paragraph, 1, children[0]), children[0])
-    assert.strictEqual(findBefore(paragraph, children[0], children[0]), null)
-    assert.strictEqual(findBefore(paragraph, 0, children[0]), null)
-    assert.strictEqual(findBefore(paragraph, 1, children[1]), null)
-  }, 'should return `node` when given a `node` and existing')
+  t.strictEqual(
+    findBefore(paragraph, 100, children[0]),
+    children[0],
+    'should return `node` when given a `node` and existing (#1)'
+  )
+  t.strictEqual(
+    findBefore(paragraph, children[1], children[0]),
+    children[0],
+    'should return `node` when given a `node` and existing (#2)'
+  )
+  t.strictEqual(
+    findBefore(paragraph, 1, children[0]),
+    children[0],
+    'should return `node` when given a `node` and existing (#3)'
+  )
+  t.strictEqual(
+    findBefore(paragraph, children[0], children[0]),
+    null,
+    'should return `node` when given a `node` and existing (#4)'
+  )
+  t.strictEqual(
+    findBefore(paragraph, 0, children[0]),
+    null,
+    'should return `node` when given a `node` and existing (#5)'
+  )
+  t.strictEqual(
+    findBefore(paragraph, 1, children[1]),
+    null,
+    'should return `node` when given a `node` and existing (#6)'
+  )
 
-  t.doesNotThrow(function () {
-    assert.strictEqual(findBefore(paragraph, 100, 'strong'), children[3])
-    assert.strictEqual(findBefore(paragraph, 3, 'strong'), null)
-    assert.strictEqual(
-      findBefore(paragraph, children[4], 'strong'),
-      children[3]
-    )
-    assert.strictEqual(findBefore(paragraph, children[3], 'strong'), null)
-  }, 'should return a child when given a `type` and existing')
+  t.strictEqual(
+    findBefore(paragraph, 100, 'strong'),
+    children[3],
+    'should return a child when given a `type` and existing (#1)'
+  )
+  t.strictEqual(
+    findBefore(paragraph, 3, 'strong'),
+    null,
+    'should return a child when given a `type` and existing (#2)'
+  )
+  t.strictEqual(
+    findBefore(paragraph, children[4], 'strong'),
+    children[3],
+    'should return a child when given a `type` and existing (#3)'
+  )
+  t.strictEqual(
+    findBefore(paragraph, children[3], 'strong'),
+    null,
+    'should return a child when given a `type` and existing (#4)'
+  )
 
-  t.doesNotThrow(function () {
-    assert.strictEqual(findBefore(paragraph, 100, test), children[3])
-    assert.strictEqual(findBefore(paragraph, 3, test), null)
-    assert.strictEqual(findBefore(paragraph, children[4], test), children[3])
-    assert.strictEqual(findBefore(paragraph, children[3], test), null)
+  t.strictEqual(
+    findBefore(paragraph, 100, test),
+    children[3],
+    'should return a child when given a `test` and existing (#1)'
+  )
+  t.strictEqual(
+    findBefore(paragraph, 3, test),
+    null,
+    'should return a child when given a `test` and existing (#2)'
+  )
+  t.strictEqual(
+    findBefore(paragraph, children[4], test),
+    children[3],
+    'should return a child when given a `test` and existing (#3)'
+  )
+  t.strictEqual(
+    findBefore(paragraph, children[3], test),
+    null,
+    'should return a child when given a `test` and existing (#4)'
+  )
 
-    function test(node, n) {
-      return n === 3
-    }
-  }, 'should return a child when given a `test` and existing')
+  function test(node, n) {
+    return n === 3
+  }
 
   t.end()
 })