bl 3.0.1 → 4.0.3

package/test/indexOf.js

@@ -1,62 +1,83 @@
 'use strict'
 
-var tape       = require('tape')
-  , BufferList = require('../')
-  , Buffer     = require('safe-buffer').Buffer
+const tape = require('tape')
+const BufferList = require('../')
+const { Buffer } = require('buffer')
 
-tape('indexOf single byte needle', t => {
+tape('indexOf single byte needle', (t) => {
   const bl = new BufferList(['abcdefg', 'abcdefg', '12345'])
+
   t.equal(bl.indexOf('e'), 4)
   t.equal(bl.indexOf('e', 5), 11)
   t.equal(bl.indexOf('e', 12), -1)
   t.equal(bl.indexOf('5'), 18)
+
   t.end()
 })
 
-tape('indexOf multiple byte needle', t => {
+tape('indexOf multiple byte needle', (t) => {
   const bl = new BufferList(['abcdefg', 'abcdefg'])
+
   t.equal(bl.indexOf('ef'), 4)
   t.equal(bl.indexOf('ef', 5), 11)
+
   t.end()
 })
 
-tape('indexOf multiple byte needles across buffer boundaries', t => {
+tape('indexOf multiple byte needles across buffer boundaries', (t) => {
   const bl = new BufferList(['abcdefg', 'abcdefg'])
+
   t.equal(bl.indexOf('fgabc'), 5)
+
   t.end()
 })
 
-tape('indexOf takes a buffer list search', t => {
+tape('indexOf takes a Uint8Array search', (t) => {
+  const bl = new BufferList(['abcdefg', 'abcdefg'])
+  const search = new Uint8Array([102, 103, 97, 98, 99]) // fgabc
+
+  t.equal(bl.indexOf(search), 5)
+
+  t.end()
+})
+
+tape('indexOf takes a buffer list search', (t) => {
   const bl = new BufferList(['abcdefg', 'abcdefg'])
   const search = new BufferList('fgabc')
+
   t.equal(bl.indexOf(search), 5)
+
   t.end()
 })
 
-tape('indexOf a zero byte needle', t => {
+tape('indexOf a zero byte needle', (t) => {
   const b = new BufferList('abcdef')
-  const buf_empty = Buffer.from('')
+  const bufEmpty = Buffer.from('')
+
   t.equal(b.indexOf(''), 0)
   t.equal(b.indexOf('', 1), 1)
   t.equal(b.indexOf('', b.length + 1), b.length)
   t.equal(b.indexOf('', Infinity), b.length)
-  t.equal(b.indexOf(buf_empty), 0)
-  t.equal(b.indexOf(buf_empty, 1), 1)
-  t.equal(b.indexOf(buf_empty, b.length + 1), b.length)
-  t.equal(b.indexOf(buf_empty, Infinity), b.length)
+  t.equal(b.indexOf(bufEmpty), 0)
+  t.equal(b.indexOf(bufEmpty, 1), 1)
+  t.equal(b.indexOf(bufEmpty, b.length + 1), b.length)
+  t.equal(b.indexOf(bufEmpty, Infinity), b.length)
+
   t.end()
 })
 
-tape('indexOf buffers smaller and larger than the needle', t => {
+tape('indexOf buffers smaller and larger than the needle', (t) => {
   const bl = new BufferList(['abcdefg', 'a', 'bcdefg', 'a', 'bcfgab'])
+
   t.equal(bl.indexOf('fgabc'), 5)
   t.equal(bl.indexOf('fgabc', 6), 12)
   t.equal(bl.indexOf('fgabc', 13), -1)
+
   t.end()
 })
 
 // only present in node 6+
-;(process.version.substr(1).split('.')[0] >= 6) && tape('indexOf latin1 and binary encoding', t => {
+;(process.version.substr(1).split('.')[0] >= 6) && tape('indexOf latin1 and binary encoding', (t) => {
   const b = new BufferList('abcdef')
 
   // test latin1 encoding
@@ -112,15 +133,16 @@ tape('indexOf buffers smaller and larger than the needle', t => {
       .indexOf(Buffer.from('\u00e8', 'binary'), 'binary'),
     0
   )
+
   t.end()
 })
 
-tape('indexOf the entire nodejs10 buffer test suite', t => {
+tape('indexOf the entire nodejs10 buffer test suite', (t) => {
   const b = new BufferList('abcdef')
-  const buf_a = Buffer.from('a')
-  const buf_bc = Buffer.from('bc')
-  const buf_f = Buffer.from('f')
-  const buf_z = Buffer.from('z')
+  const bufA = Buffer.from('a')
+  const bufBc = Buffer.from('bc')
+  const bufF = Buffer.from('f')
+  const bufZ = Buffer.from('z')
 
   const stringComparison = 'abcdef'
 
@@ -142,25 +164,26 @@ tape('indexOf the entire nodejs10 buffer test suite', t => {
   t.equal(b.indexOf('bc', Infinity), -1)
   t.equal(b.indexOf('f'), b.length - 1)
   t.equal(b.indexOf('z'), -1)
+
   // empty search tests
-  t.equal(b.indexOf(buf_a), 0)
-  t.equal(b.indexOf(buf_a, 1), -1)
-  t.equal(b.indexOf(buf_a, -1), -1)
-  t.equal(b.indexOf(buf_a, -4), -1)
-  t.equal(b.indexOf(buf_a, -b.length), 0)
-  t.equal(b.indexOf(buf_a, NaN), 0)
-  t.equal(b.indexOf(buf_a, -Infinity), 0)
-  t.equal(b.indexOf(buf_a, Infinity), -1)
-  t.equal(b.indexOf(buf_bc), 1)
-  t.equal(b.indexOf(buf_bc, 2), -1)
-  t.equal(b.indexOf(buf_bc, -1), -1)
-  t.equal(b.indexOf(buf_bc, -3), -1)
-  t.equal(b.indexOf(buf_bc, -5), 1)
-  t.equal(b.indexOf(buf_bc, NaN), 1)
-  t.equal(b.indexOf(buf_bc, -Infinity), 1)
-  t.equal(b.indexOf(buf_bc, Infinity), -1)
-  t.equal(b.indexOf(buf_f), b.length - 1)
-  t.equal(b.indexOf(buf_z), -1)
+  t.equal(b.indexOf(bufA), 0)
+  t.equal(b.indexOf(bufA, 1), -1)
+  t.equal(b.indexOf(bufA, -1), -1)
+  t.equal(b.indexOf(bufA, -4), -1)
+  t.equal(b.indexOf(bufA, -b.length), 0)
+  t.equal(b.indexOf(bufA, NaN), 0)
+  t.equal(b.indexOf(bufA, -Infinity), 0)
+  t.equal(b.indexOf(bufA, Infinity), -1)
+  t.equal(b.indexOf(bufBc), 1)
+  t.equal(b.indexOf(bufBc, 2), -1)
+  t.equal(b.indexOf(bufBc, -1), -1)
+  t.equal(b.indexOf(bufBc, -3), -1)
+  t.equal(b.indexOf(bufBc, -5), 1)
+  t.equal(b.indexOf(bufBc, NaN), 1)
+  t.equal(b.indexOf(bufBc, -Infinity), 1)
+  t.equal(b.indexOf(bufBc, Infinity), -1)
+  t.equal(b.indexOf(bufF), b.length - 1)
+  t.equal(b.indexOf(bufZ), -1)
   t.equal(b.indexOf(0x61), 0)
   t.equal(b.indexOf(0x61, 1), -1)
   t.equal(b.indexOf(0x61, -1), -1)
@@ -244,6 +267,7 @@ tape('indexOf the entire nodejs10 buffer test suite', t => {
 
   const mixedByteStringUcs2 =
       Buffer.from('\u039a\u0391abc\u03a3\u03a3\u0395', 'ucs2')
+
   t.equal(6, mixedByteStringUcs2.indexOf('bc', 0, 'ucs2'))
   t.equal(10, mixedByteStringUcs2.indexOf('\u03a3', 0, 'ucs2'))
   t.equal(-1, mixedByteStringUcs2.indexOf('\u0396', 0, 'ucs2'))
@@ -283,17 +307,17 @@ tape('indexOf the entire nodejs10 buffer test suite', t => {
   }
 
   const mixedByteStringUtf8 = Buffer.from('\u039a\u0391abc\u03a3\u03a3\u0395')
+
   t.equal(5, mixedByteStringUtf8.indexOf('bc'))
   t.equal(5, mixedByteStringUtf8.indexOf('bc', 5))
   t.equal(5, mixedByteStringUtf8.indexOf('bc', -8))
   t.equal(7, mixedByteStringUtf8.indexOf('\u03a3'))
   t.equal(-1, mixedByteStringUtf8.indexOf('\u0396'))
 
-
   // Test complex string indexOf algorithms. Only trigger for long strings.
   // Long string that isn't a simple repeat of a shorter string.
   let longString = 'A'
-  for (let i = 66; i < 76; i++) {  // from 'B' to 'K'
+  for (let i = 66; i < 76; i++) { // from 'B' to 'K'
     longString = longString + String.fromCharCode(i) + longString
   }
 
@@ -304,7 +328,7 @@ tape('indexOf the entire nodejs10 buffer test suite', t => {
   for (let i = 0; i < longBufferString.length - pattern.length; i += 7) {
     const index = longBufferString.indexOf(pattern, i)
     t.equal((i + 15) & ~0xf, index,
-                      `Long ABACABA...-string at index ${i}`)
+      `Long ABACABA...-string at index ${i}`)
   }
 
   let index = longBufferString.indexOf('AJABACA')
@@ -321,13 +345,16 @@ tape('indexOf the entire nodejs10 buffer test suite', t => {
 
   // Search for a non-ASCII string in a pure ASCII string.
   const asciiString = Buffer.from(
-    'arglebargleglopglyfarglebargleglopglyfarglebargleglopglyf')
+    'somethingnotatallsinisterwhichalsoworks')
   t.equal(-1, asciiString.indexOf('\x2061'))
-  t.equal(3, asciiString.indexOf('leb', 0))
+  t.equal(3, asciiString.indexOf('eth', 0))
 
   // Search in string containing many non-ASCII chars.
   const allCodePoints = []
-  for (let i = 0; i < 65536; i++) allCodePoints[i] = i
+  for (let i = 0; i < 65536; i++) {
+    allCodePoints[i] = i
+  }
+
   const allCharsString = String.fromCharCode.apply(String, allCodePoints)
   const allCharsBufferUtf8 = Buffer.from(allCharsString)
   const allCharsBufferUcs2 = Buffer.from(allCharsString, 'ucs2')
@@ -348,7 +375,7 @@ tape('indexOf the entire nodejs10 buffer test suite', t => {
 
   {
     // Find substrings in Utf8.
-    const lengths = [1, 3, 15];  // Single char, simple and complex.
+    const lengths = [1, 3, 15] // Single char, simple and complex.
     const indices = [0x5, 0x60, 0x400, 0x680, 0x7ee, 0xFF02, 0x16610, 0x2f77b]
     for (let lengthIndex = 0; lengthIndex < lengths.length; lengthIndex++) {
       for (let i = 0; i < indices.length; i++) {
@@ -378,8 +405,9 @@ tape('indexOf the entire nodejs10 buffer test suite', t => {
 
   {
     // Find substrings in Usc2.
-    const lengths = [2, 4, 16];  // Single char, simple and complex.
+    const lengths = [2, 4, 16] // Single char, simple and complex.
     const indices = [0x5, 0x65, 0x105, 0x205, 0x285, 0x2005, 0x2085, 0xfff0]
+
     for (let lengthIndex = 0; lengthIndex < lengths.length; lengthIndex++) {
       for (let i = 0; i < indices.length; i++) {
         const index = indices[i] * 2
@@ -401,8 +429,7 @@ tape('indexOf the entire nodejs10 buffer test suite', t => {
     () => {},
     {},
     []
-  ].forEach(val => {
-    debugger
+  ].forEach((val) => {
     t.throws(() => b.indexOf(val), TypeError, `"${JSON.stringify(val)}" should throw`)
   })
 
@@ -440,6 +467,7 @@ tape('indexOf the entire nodejs10 buffer test suite', t => {
   // test truncation of Number arguments to uint8
   {
     const buf = Buffer.from('this is a test')
+
     t.equal(buf.indexOf(0x6973), 3)
     t.equal(buf.indexOf(0x697320), 4)
     t.equal(buf.indexOf(0x69732069), 2)
@@ -455,9 +483,10 @@ tape('indexOf the entire nodejs10 buffer test suite', t => {
 
   // Test that Uint8Array arguments are okay.
   {
-    const needle = new Uint8Array([ 0x66, 0x6f, 0x6f ])
+    const needle = new Uint8Array([0x66, 0x6f, 0x6f])
     const haystack = new BufferList(Buffer.from('a foo b foo'))
     t.equal(haystack.indexOf(needle), 2)
   }
+
   t.end()
 })

package/test/isBufferList.js

@@ -0,0 +1,32 @@
+'use strict'
+
+const tape = require('tape')
+const { BufferList, BufferListStream } = require('../')
+const { Buffer } = require('buffer')
+
+tape('isBufferList positives', (t) => {
+  t.ok(BufferList.isBufferList(new BufferList()))
+  t.ok(BufferList.isBufferList(new BufferListStream()))
+
+  t.end()
+})
+
+tape('isBufferList negatives', (t) => {
+  const types = [
+    null,
+    undefined,
+    NaN,
+    true,
+    false,
+    {},
+    [],
+    Buffer.alloc(0),
+    [Buffer.alloc(0)]
+  ]
+
+  for (const obj of types) {
+    t.notOk(BufferList.isBufferList(obj))
+  }
+
+  t.end()
+})