chore: switch from tap to node:test and Borp

.github/workflows/node.js.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.17.1, 18.17.1, 20.x]
+        node-version: [18.17.1, 20.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

index.js

@@ -126,7 +126,7 @@ class MultiCoreIndexer extends TypedEmitter {
   /** @param {Entry<T>[]} entries */
   async #handleEntries(entries) {
     this.#emitState()
-    /* istanbul ignore if - not sure this is necessary, but better safe than sorry */
+    /* c8 ignore next - not sure this is necessary, but better safe than sorry */
     if (!entries.length) return
     await this.#batch(entries)
     for (const { key, index } of entries) {

lib/bitfield.js

@@ -4,7 +4,7 @@
 const BigSparseArray = require('big-sparse-array')
 const b4a = require('b4a')
 
-/* istanbul ignore next */
+/* c8 ignore start */
 class FixedBitfield {
   /**
    * @param {number} index
@@ -41,8 +41,9 @@ class FixedBitfield {
     return true
   }
 }
+/* c8 ignore stop */
 
-/* istanbul ignore next */
+/* c8 ignore start */
 class Bitfield {
   /**
    *
@@ -177,6 +178,7 @@ class Bitfield {
     })
   }
 }
+/* c8 ignore stop */
 
 module.exports = Bitfield
 
@@ -185,11 +187,9 @@ module.exports = Bitfield
  * @param {number} size
  */
 function ensureSize(uint32, size) {
-  /* istanbul ignore else */
   if (uint32.length === size) return uint32
-  else {
-    const a = new Uint32Array(1024)
-    a.set(uint32, 0)
-    return a
-  }
+  /* c8 ignore next 3 */
+  const a = new Uint32Array(1024)
+  a.set(uint32, 0)
+  return a
 }

lib/core-index-stream.js

@@ -60,7 +60,7 @@ class CoreIndexStream extends Readable {
     this.#createStorage = async () => {
       await this.#core.ready()
       const { discoveryKey } = this.#core
-      /* istanbul ignore next: just to keep TS happy - after core.ready() this is set */
+      /* c8 ignore next: just to keep TS happy - after core.ready() this is set */
       if (!discoveryKey) throw new Error('Missing discovery key')
       return createStorage(getStorageName(discoveryKey))
     }
@@ -155,15 +155,15 @@ class CoreIndexStream extends Readable {
         this.#downloaded.delete(index)
         didPush =
           (await this.#pushEntry(index)) ||
-          /* istanbul ignore next - TODO: Test when hypercore-next supports a core.clear() method */
+          /* c8 ignore next - TODO: Test when hypercore-next supports a core.clear() method */
           didPush
         // This is for back-pressure, for which there is not a good test yet.
         // The faster streamx state machine in https://github.com/mafintosh/streamx/pull/77
         // caused this stream's read buffer to never fill with the current tests,
         // so that this line is currently uncovered by tests.
         // TODO: Add a test similar to 'Appends from a replicated core are indexed' in core-index-stream.test.js
         // but pipe to a slow stream, to test back-pressure, which should result in coverage of this line.
-        /* istanbul ignore next */
+        /* c8 ignore next */
         if (!this.#readBufferAvailable) break
       }
     }
@@ -188,7 +188,7 @@ class CoreIndexStream extends Readable {
     if (block === null) return false
     this.#inProgressBitfield?.set(index, true)
     this.#inProgress++
-    /* istanbul ignore next: this should always be set at this point */
+    /* c8 ignore next: this should always be set at this point */
     if (!this.#core.key) throw new Error('Missing core key')
     const entry = { key: this.#core.key, block, index }
     this.#readBufferAvailable = this.push(entry)

lib/multi-core-index-stream.js

@@ -72,7 +72,7 @@ class MultiCoreIndexStream extends Readable {
    */
   setIndexed(streamId, index) {
     const stream = this.#streamsById.get(streamId)
-    /* istanbul ignore next: this should always be true */
+    /* c8 ignore next: this should always be true */
     if (!stream) return
     stream.setIndexed(index)
   }
@@ -92,7 +92,7 @@ class MultiCoreIndexStream extends Readable {
       .ready()
       .then(() => {
         const coreKey = stream.core.key
-        /* istanbul ignore next: this is set after ready */
+        /* c8 ignore next: this is set after ready */
         if (!coreKey) return
         this.#streamsById.set(coreKey.toString('hex'), stream)
       })
@@ -201,5 +201,5 @@ class MultiCoreIndexStream extends Readable {
 
 exports.MultiCoreIndexStream = MultiCoreIndexStream
 
-/* istanbul ignore next: TODO add test for adding broken cores */
+/* c8 ignore next: TODO add test for adding broken cores */
 function noop() {}