event-storage 1.2.0 → 1.3.0

package/README.md

@@ -1,4 +1,4 @@
-![event-storage](logo/color.png)
+![event-storage](logo/color.svg)
 
 [![build](https://github.com/albe/node-event-storage/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/albe/node-event-storage/actions/workflows/build.yml)
 [![npm version](https://badge.fury.io/js/event-storage.svg)](https://badge.fury.io/js/event-storage)
@@ -62,8 +62,8 @@ eventstore.on('ready', () => {
 | **Optimistic concurrency** | Pass `expectedVersion` to `commit()` to guarantee conflict-free writes. |
 | **Flexible stream reading** | Range queries, reverse iteration, and a fluent builder API. |
 | **Derived streams** | Filter or combine events into new read-only streams. |
-| **Multi-value matchers** | Object matchers support array values (OR semantics) and still benefit from O(1) discriminant routing on writes. |
-| **DCB / `typeAccessor`** | Configure `typeAccessor` to have per-type stream indexes maintained automatically, and use `query()` / `Condition` for fine-grained, query-scoped optimistic concurrency (Dynamic Consistency Boundaries). |
+| **Object matchers** | Support nested equality, array values (OR semantics), and scalar operators like `$gt` / `$gte` / `$lt` / `$lte` / `$eq` / `$ne`, while still benefiting from O(1) discriminant routing on writes. |
+| **DCB** | Configure `typeAccessor` to have per-type stream indexes maintained automatically, and use `query()` / `Condition` for fine-grained, query-scoped optimistic concurrency (Dynamic Consistency Boundaries). |
 | **Stream categories** | Name streams `<category>-<id>` and query the whole category at once. |
 | **Durable consumers** | At-least-once (and exactly-once with `setState`) event delivery with automatic position tracking. |
 | **Consistency guards** | Build aggregates that enforce business invariants with built-in snapshotting. |
@@ -75,6 +75,30 @@ eventstore.on('ready', () => {
 
 ---
 
+## DCB Example
+
+```javascript
+const { stream, condition } = store.query(['OrderPlaced'], { payload: { customerId: 'cust-1' } });
+const hasOpenOrder = stream.some((event) => event.status === 'open');
+
+if (!hasOpenOrder) {
+    store.commit('orders-cust-1', [{ type: 'OrderPlaced', customerId: 'cust-1' }], condition);
+}
+```
+
+---
+
+## Object Matcher Syntax
+
+Object matchers support nested equality, array values, and scalar operators like `$gt`, `$gte`, `$lt`, `$lte`, `$eq`, and `$ne`.
+
+```javascript
+{ payload: { type: ['OrderPlaced', 'OrderCancelled'] } }
+{ payload: { amount: { $gte: 100, $lt: 1000 } } }
+```
+
+---
+
 ## HTTP API
 
 To expose an event store over HTTP, see the companion package **[event-storage-http](https://github.com/albe/node-event-storage-http)**:
@@ -102,7 +126,7 @@ The full documentation is hosted at **<https://node-event-storage.readthedocs.io
 
 - [Getting Started](https://node-event-storage.readthedocs.io/en/latest/getting-started/) — installation, constructor options, basic usage.
 - [Event Streams](https://node-event-storage.readthedocs.io/en/latest/streams/) — writing, reading, optimistic concurrency, fluent API, joining streams, categories, and event metadata.
-- [Dynamic Consistency Boundaries (DCB)](https://node-event-storage.readthedocs.io/en/latest/dcb/) — `typeAccessor`, multi-value matchers, consistency tokens, and the full DCB workflow.
+- [Dynamic Consistency Boundaries (DCB)](https://node-event-storage.readthedocs.io/en/latest/dcb/) — `typeAccessor`, query matchers, consistency tokens, and the full DCB workflow.
 - [Consumers](https://node-event-storage.readthedocs.io/en/latest/consumers/) — at-least-once and exactly-once delivery, consumer state, consistency guards, and read-only mode.
 - [Advanced Topics](https://node-event-storage.readthedocs.io/en/latest/advanced/) — ACID properties, reliability and crash-safety guarantees, storage configuration, partitioning, custom serialization, compression, security, and access control hooks.
 

package/index.js

@@ -3,3 +3,4 @@ export { default as EventStream } from './src/EventStream.js';
 export { default as Storage, StorageLockedError } from './src/Storage.js';
 export { default as Index } from './src/Index.js';
 export { default as Consumer } from './src/Consumer.js';
+export { matches, buildRawBufferMatcher } from './src/utils/metadataUtil.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "event-storage",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "type": "module",
   "description": "An optimized embedded event store for node.js",
   "keywords": [
@@ -26,6 +26,7 @@
   },
   "scripts": {
     "test": "c8 --reporter=lcov --reporter=text mocha test/*.spec.js",
+    "test:grep": "c8 --reporter=lcov --reporter=text mocha test/*.spec.js --grep",
     "coverage": "c8 report --reporter=text-lcov | coveralls"
   },
   "files": [

package/src/Consumer.js

@@ -3,6 +3,7 @@ import fs from 'fs';
 import path from 'path';
 import { assert } from './utils/util.js';
 import { ensureDirectory } from './utils/fsUtil.js';
+import { normalizeConsumerStateArgs } from './utils/apiHelpers.js';
 import Storage from './Storage/ReadableStorage.js';
 const MAX_CATCHUP_BATCH = 10;
 
@@ -11,7 +12,7 @@ const MAX_CATCHUP_BATCH = 10;
  * @param {string} filename
  */
 const safeUnlink = (filename) => {
-    /* istanbul ignore next */
+    /* c8 ignore next */
     try {
         fs.unlinkSync(filename);
     } catch (e) {
@@ -84,14 +85,11 @@ class Consumer extends stream.Readable {
      * @param {number} startFrom The revision to start from within the index to consume.
      */
     restoreState(initialState, startFrom) {
-        /* istanbul ignore if */
+        /* c8 ignore next 3 */
         if (!this.fileName) {
             return;
         }
-        if (typeof initialState === 'number') {
-            startFrom = initialState;
-            initialState = {};
-        }
+        ({ initialState, startFrom } = normalizeConsumerStateArgs(initialState, startFrom));
         try {
             const consumerData = fs.readFileSync(this.fileName);
             this.position = consumerData.readInt32LE(0);
@@ -137,7 +135,6 @@ class Consumer extends stream.Readable {
             return;
         }
 
-        /* istanbul ignore if */
         if (this.position !== position - 1) {
             return;
         }
@@ -171,7 +168,7 @@ class Consumer extends stream.Readable {
             consumerData.write(consumerState, 4, consumerState.length, 'utf-8');
             const tmpFile = this.fileName + '.' + this.position;
             this.persisting = null;
-            /* istanbul ignore if */
+            /* c8 ignore next 3 */
             if (fs.existsSync(tmpFile)) {
                 throw new Error(`Trying to update consumer ${this.name} concurrently. Keep each single consumer within a single process.`);
             }
@@ -181,7 +178,7 @@ class Consumer extends stream.Readable {
                 fs.renameSync(tmpFile, this.fileName);
                 this.emit('persisted', consumerState);
             } catch (e) {
-                /* istanbul ignore next */
+                /* c8 ignore next */
                 safeUnlink(tmpFile);
             }
         });
@@ -274,10 +271,7 @@ class Consumer extends stream.Readable {
      * @api
      */
     reset(initialState = {}, startFrom = 0) {
-        if (typeof initialState === 'number') {
-            startFrom = initialState;
-            initialState = {};
-        }
+        ({ initialState, startFrom } = normalizeConsumerStateArgs(initialState, startFrom));
         const restart = this.consuming;
         this.stop();
         this.state = Object.freeze(initialState);

package/src/EventStore.js

@@ -9,6 +9,7 @@ import Consumer from './Consumer.js';
 import { assert, getPropertyAtPath } from './utils/util.js';
 import { ensureDirectory, scanForFiles } from './utils/fsUtil.js';
 import { buildTypeMatcherFn } from './utils/metadataUtil.js';
+import { fixCommitArgumentTypes, parseStreamFromIndexName, normalizePredicateRaw } from './utils/apiHelpers.js';
 
 const ExpectedVersion = {
     Any: -1,
@@ -185,7 +186,6 @@ class EventStore extends events.EventEmitter {
      * @param {string} name The full stream name, including the `stream-` prefix (and optional `.closed` suffix).
      */
     registerStream(name) {
-        /* istanbul ignore if */
         if (!name.startsWith('stream-')) {
             return;
         }
@@ -343,39 +343,6 @@ class EventStore extends events.EventEmitter {
         return this.storage.length;
     }
 
-    /**
-     * This method makes it so the last three arguments can be given either as:
-     *  - expectedVersion, metadata, callback
-     *  - expectedVersion, callback
-     *  - metadata, callback
-     *  - callback
-     *
-     * @private
-     * @param {Array<object>|object} events
-     * @param {number|CommitCondition} [expectedVersion]
-     * @param {object|function} [metadata]
-     * @param {function} [callback]
-     * @returns {{events: Array<object>, metadata: object, callback: function, expectedVersion: number|CommitCondition}}
-     */
-    static fixArgumentTypes(events, expectedVersion, metadata, callback) {
-        if (!(events instanceof Array)) {
-            events = [events];
-        }
-        if (typeof expectedVersion !== 'number' && !(expectedVersion instanceof CommitCondition)) {
-            callback = metadata;
-            metadata = expectedVersion;
-            expectedVersion = ExpectedVersion.Any;
-        }
-        if (typeof metadata !== 'object') {
-            callback = metadata;
-            metadata = {};
-        }
-        if (typeof callback !== 'function') {
-            callback = () => {};
-        }
-        return { events, expectedVersion, metadata, callback };
-    }
-
     /**
      * Check a {@link CommitCondition} against the current state of the store.
      * Iterates a join stream over all condition type streams starting from
@@ -383,6 +350,7 @@ class EventStore extends events.EventEmitter {
      * {@link OptimisticConcurrencyError} when a new event of a listed type satisfies
      * `condition.matcher(payload, metadata)` (or any such event when no matcher is provided).
      *
+     * @private
      * @param {CommitCondition} condition
      * @throws {OptimisticConcurrencyError}
      */
@@ -410,6 +378,7 @@ class EventStore extends events.EventEmitter {
      * Ensure a dedicated type stream exists for each event's type, creating it if needed.
      * Must be called before the entity stream is created to guarantee correct index routing.
      *
+     * @private
      * @param {Array<object>} events The events to process.
      */
     ensureTypeStreams(events) {
@@ -425,6 +394,11 @@ class EventStore extends events.EventEmitter {
         }
     }
 
+    /**
+     * @private
+     * @param {object} event
+     * @returns {string|null}
+     */
     resolveValidatedTypeStreamName(event) {
         const type = this.typeAccessor(event);
         if (type === undefined || type === null || type === '') {
@@ -435,6 +409,11 @@ class EventStore extends events.EventEmitter {
         return type;
     }
 
+    /**
+     * @private
+     * @param {string[]} types
+     * @returns {string[]}
+     */
     getExistingQueryTypes(types) {
         const queryTypes = [];
         for (const type of types) {
@@ -469,7 +448,14 @@ class EventStore extends events.EventEmitter {
         assert(typeof streamName === 'string' && streamName !== '', 'Must specify a stream name for commit.');
         assert(typeof events !== 'undefined' && events !== null, 'No events specified for commit.');
 
-        ({ events, expectedVersion, metadata, callback } = EventStore.fixArgumentTypes(events, expectedVersion, metadata, callback));
+        ({ events, expectedVersion, metadata, callback } = fixCommitArgumentTypes(
+            events,
+            expectedVersion,
+            metadata,
+            callback,
+            ExpectedVersion.Any,
+            CommitCondition
+        ));
 
         // Perform DCB-style concurrency check when a CommitCondition is provided.
         if (expectedVersion instanceof CommitCondition) {
@@ -782,7 +768,13 @@ class EventStore extends events.EventEmitter {
         }
         const streamName = streamNameOrIdentifier;
         if (this.consumers.has(identifier)) {
-            return this.consumers.get(identifier);
+            const existingConsumer = this.consumers.get(identifier);
+            if (existingConsumer.streamName === streamName) {
+                return existingConsumer;
+            }
+            // Rebind identifier to the requested stream when a consumer with the same
+            // identifier already exists for another stream.
+            existingConsumer.stop();
         }
         const consumer = new Consumer(this.storage, streamName === '_all' ? '_all' : 'stream-' + streamName, identifier, initialState, since);
         consumer.streamName = streamName;
@@ -829,22 +821,6 @@ class EventStore extends events.EventEmitter {
     }
 }
 
-function parseStreamFromIndexName(indexName) {
-    if (indexName === '_all') {
-        return '_all';
-    }
-    if (indexName.startsWith('stream-')) {
-        return indexName.slice(7);
-    }
-    return indexName;
-}
-
-function normalizePredicateRaw(predicate, raw) {
-    if (typeof predicate === 'boolean' && raw === false) {
-        return { predicate: null, raw: predicate };
-    }
-    return { predicate, raw };
-}
 
 EventStore.Storage = Storage;
 EventStore.Index = Index;

package/src/EventStream.js

@@ -1,30 +1,10 @@
 import stream from 'stream';
 import { assert } from './utils/util.js';
 import { buildRawBufferMatcher, matches } from './utils/metadataUtil.js';
+import { normalizeRevision, normalizeMaxRevision } from './utils/apiHelpers.js';
 
 const NDJSON_NEWLINE = Buffer.from('\n');
 
-/**
- * Calculate the actual version number from a possibly relative (negative) version number.
- *
- * @param {number} version The version to normalize.
- * @param {number} length The maximum version number
- * @returns {number} The absolute version number.
- */
-function normalizeVersion(version, length) {
-    return version < 0 ? version + length + 1 : version;
-}
-
-/**
- * Return the lower absolute version given a version and a maxVersion constraint.
- * @param {number} version
- * @param {number} maxVersion
- * @returns {number}
- */
-function minVersion(version, maxVersion) {
-    return Math.min(version, maxVersion < 0 ? version + maxVersion + 1 : maxVersion);
-}
-
 /**
  * An event stream is a simple wrapper around an iterator over storage documents.
  * It implements a node readable stream interface.
@@ -56,9 +36,9 @@ class EventStream extends stream.Readable {
         this.rawMatcher = null;
         if (eventStore.streams[name]) {
             this.streamIndex = eventStore.streams[name].index;
-            this.minRevision = normalizeVersion(minRevision, this.streamIndex.length);
-            this.maxRevision = normalizeVersion(maxRevision, this.streamIndex.length);
-            this.version = minVersion(this.streamIndex.length, maxRevision);
+            this.minRevision = normalizeRevision(minRevision, this.streamIndex.length);
+            this.maxRevision = normalizeRevision(maxRevision, this.streamIndex.length);
+            this.version = normalizeMaxRevision(this.streamIndex.length, maxRevision);
             this._iterator = null;
             this.fetch = () => eventStore.storage.readRange(this.minRevision, this.maxRevision, this.streamIndex, raw);
         } else {
@@ -74,7 +54,7 @@ class EventStream extends stream.Readable {
      * @returns {EventStream}
      */
     from(revision) {
-        this.minRevision = normalizeVersion(revision, this.streamIndex.length);
+        this.minRevision = normalizeRevision(revision, this.streamIndex.length);
         return this;
     }
 
@@ -84,8 +64,8 @@ class EventStream extends stream.Readable {
      * @returns {EventStream}
      */
     until(revision) {
-        this.maxRevision = normalizeVersion(revision, this.streamIndex.length);
-        this.version = minVersion(this.streamIndex.length, this.maxRevision);
+        this.maxRevision = normalizeRevision(revision, this.streamIndex.length);
+        this.version = normalizeMaxRevision(this.streamIndex.length, this.maxRevision);
         return this;
     }
 
@@ -169,7 +149,7 @@ class EventStream extends stream.Readable {
         let tmp = this.maxRevision;
         this.maxRevision = this.minRevision;
         this.minRevision = tmp;
-        this.version = minVersion(this.streamIndex.length, this.maxRevision);
+        this.version = normalizeMaxRevision(this.streamIndex.length, this.maxRevision);
         return this;
     }
 

package/src/Index/ReadOnlyIndex.js

@@ -20,7 +20,7 @@ class ReadOnlyIndex extends watchesFile(ReadableIndex) {
      * @param {string} filename
      */
     onChange(filename) {
-        /* istanbul ignore if */
+        /* c8 ignore next 3 */
         if (!this.fd) {
             return;
         }

package/src/Index/ReadableIndex.js

@@ -3,6 +3,7 @@ import path from 'path';
 import events from 'events';
 import Entry, { assertValidEntryClass } from '../IndexEntry.js';
 import { assert, wrapAndCheck, binarySearch } from '../utils/util.js';
+import { normalizeNamedCtorArgs } from '../utils/apiHelpers.js';
 
 // node-event-store-index V01
 const HEADER_MAGIC = "nesidx01";
@@ -44,10 +45,7 @@ class ReadableIndex extends events.EventEmitter {
      */
     constructor(name = '.index', options = {}) {
         super();
-        if (typeof name !== 'string') {
-            options = name;
-            name = '.index';
-        }
+        ({ name, options } = normalizeNamedCtorArgs(name, options, '.index'));
         let defaults = {
             dataDirectory: '.',
             EntryClass: Entry

package/src/Index/WritableIndex.js

@@ -3,6 +3,7 @@ import ReadableIndex, { Entry, CorruptedIndexError, HEADER_MAGIC } from './Reada
 import { assert, assertEqual } from '../utils/util.js';
 import { buildMetadataHeader } from '../utils/metadataUtil.js';
 import { ensureDirectory } from '../utils/fsUtil.js';
+import { normalizeNamedCtorArgs } from '../utils/apiHelpers.js';
 
 /**
  * An index is a simple append-only file that stores an ordered list of entry elements pointing to the actual file position
@@ -27,10 +28,7 @@ class WritableIndex extends ReadableIndex {
      * @param {object} [options.metadata] An object containing the metadata information for this index. Will be written on initial creation and checked on subsequent openings.
      */
     constructor(name = '.index', options = {}) {
-        if (typeof name !== 'string') {
-            options = name;
-            name = '.index';
-        }
+        ({ name, options } = normalizeNamedCtorArgs(name, options, '.index'));
         let defaults = {
             writeBufferSize: 4096,
             flushDelay: 100,

package/src/JoinEventStream.js

@@ -1,20 +1,10 @@
 import EventStream from './EventStream.js';
 import { assert, kWayMerge } from './utils/util.js';
+import { normalizeRevision } from './utils/apiHelpers.js';
 
 /** Reusable sentinel used for missing or empty per-stream iterators. */
 const emptyIterator = Object.freeze({ next() { return { done: true }; } });
 
-/**
- * Calculate the actual version number from a possibly relative (negative) version number.
- *
- * @param {number} version The version to normalize.
- * @param {number} length The maximum version number
- * @returns {number} The absolute version number.
- */
-function normalizeVersion(version, length) {
-    return version < 0 ? version + length + 1 : version;
-}
-
 /**
  * An event stream is a simple wrapper around an iterator over storage documents.
  * It implements a node readable stream interface.
@@ -36,8 +26,8 @@ class JoinEventStream extends EventStream {
 
         this.streamIndex = eventStore.storage.index;
         // Translate revisions to index numbers (1-based) and wrap around negatives
-        this.minRevision = normalizeVersion(minRevision, eventStore.length);
-        this.maxRevision = normalizeVersion(maxRevision, eventStore.length);
+        this.minRevision = normalizeRevision(minRevision, eventStore.length);
+        this.maxRevision = normalizeRevision(maxRevision, eventStore.length);
         this.fetch = function() {
             return streams.map(streamName => {
                 const streamIndex = eventStore.streams[streamName]?.index;

package/src/Partition/ReadOnlyPartition.js

@@ -18,7 +18,7 @@ class ReadOnlyPartition extends WatchesFile(ReadablePartition) {
      * @param {string} filename
      */
     onChange(filename) {
-        /* istanbul ignore if */
+        /* c8 ignore next 3 */
         if (!this.fd) {
             return;
         }

package/src/Partition/ReadablePartition.js

@@ -130,7 +130,7 @@ class ReadablePartition extends events.EventEmitter {
         const metadata = metadataBuffer.toString('utf8').trim();
         try {
             this.metadata = JSON.parse(metadata);
-            this.metadata.epoch = this.metadata.epoch /* istanbul ignore next */|| NES_EPOCH.getTime();
+            this.metadata.epoch = this.metadata.epoch /* c8 ignore next */|| NES_EPOCH.getTime();
         } catch (e) {
             throw new Error('Invalid metadata.');
         }
@@ -373,13 +373,13 @@ class ReadablePartition extends events.EventEmitter {
      */
     readDocumentBefore(position) {
         const docPos = this.findDocumentPositionBefore(position);
-        /* istanbul ignore if */
+        /* c8 ignore next */
         if (docPos === false || docPos < 0) return null;
         const reader = this.prepareReadBufferBackwards(Math.min(docPos + (this.readBuffer.byteLength >> 1), this.size));
-        /* istanbul ignore if */
+        /* c8 ignore next */
         if (!reader.buffer) return null;
         const cursor = docPos - this.readBufferPos;
-        /* istanbul ignore if */
+        /* c8 ignore next */
         if (cursor < 0 || cursor + DOCUMENT_HEADER_SIZE > reader.length) return null;
         const header = this.readDocumentHeader(reader.buffer, cursor, docPos);
         return { header, position: docPos };
@@ -436,7 +436,7 @@ class ReadablePartition extends events.EventEmitter {
 
         const header = {};
         const data = this.readFrom(position, 0, header);
-        /* istanbul ignore if */
+        /* c8 ignore next 3 */
         if (data === false) {
             return null;
         }

package/src/Partition/WritablePartition.js

@@ -178,7 +178,7 @@ class WritablePartition extends ReadablePartition {
      */
     writeDocumentHeader(buffer, offset, dataSize, sequenceNumber = null, time64 = null) {
         ({ sequenceNumber, time64 } = this.normalizeWriteMetadata(sequenceNumber, time64));
-        /* istanbul ignore if */
+        /* c8 ignore next */
         assert(time64 >= 0, 'Time may not be negative!');
 
         buffer.writeUInt32BE(dataSize, offset);

package/src/Storage/ReadOnlyStorage.js

@@ -91,7 +91,7 @@ class ReadOnlyStorage extends ReadableStorage {
                 return;
             }
             const entries = index.range(prevLength + 1, newLength);
-            /* istanbul ignore if */
+            /* c8 ignore next 3 */
             if (entries === false) {
                 return;
             }

package/src/Storage/ReadableStorage.js

@@ -1,16 +1,16 @@
 import fs from 'fs';
 import path from 'path';
 import events from 'events';
-import Partition, { ReadOnly as ReadOnlyPartition } from '../Partition.js';
-import Index, { ReadOnly as ReadOnlyIndex } from '../Index.js';
+import { ReadOnly as ReadOnlyPartition } from '../Partition.js';
+import { ReadOnly as ReadOnlyIndex } from '../Index.js';
 import { assert, wrapAndCheck, iterate, kWayMerge } from '../utils/util.js';
 import { scanForFiles } from '../utils/fsUtil.js';
 import { createHmac, matches, buildMetadataForMatcher } from '../utils/metadataUtil.js';
+import { normalizeNamedCtorArgs } from '../utils/apiHelpers.js';
 import IndexMatcher from '../IndexMatcher.js';
 import PartitionPool from '../PartitionPool.js';
 
 const DEFAULT_READ_BUFFER_SIZE = 4 * 1024;
-const NDJSON_NEWLINE = Buffer.from('\n');
 
 /**
  * Default ordered list of document property paths used as discriminant keys when
@@ -60,10 +60,7 @@ class ReadableStorage extends events.EventEmitter {
      */
     constructor(storageName = 'storage', config = {}) {
         super();
-        if (typeof storageName !== 'string') {
-            config = storageName;
-            storageName = undefined;
-        }
+        ({ name: storageName, options: config } = normalizeNamedCtorArgs(storageName, config));
 
         this.storageFile = storageName || 'storage';
         const defaults = {
@@ -158,7 +155,7 @@ class ReadableStorage extends events.EventEmitter {
             const partition = this.createPartition(file, this.partitionConfig);
             this.partitions.add(partition.id, partition);
         }, (partErr) => {
-            /* istanbul ignore if */
+            /* c8 ignore next */
             if (partErr) throw partErr;
 
             // Scan was cancelled by close() between the two scan phases.
@@ -173,7 +170,7 @@ class ReadableStorage extends events.EventEmitter {
                 this.emit('index-created', name);
             }, (indexErr) => {
                 // The directory could disappear between existsSync and readdir (e.g. test cleanup).
-                /* istanbul ignore if */
+                /* c8 ignore next */
                 if (indexErr && indexErr.code !== 'ENOENT') throw indexErr;
                 done();
             });
@@ -481,7 +478,7 @@ class ReadableStorage extends events.EventEmitter {
      * @param {boolean} [noIndex=false] When true, bypasses the index and iterates partitions directly.
      */
     forEachDocument(iterationHandler, noIndex = false) {
-        /* istanbul ignore if  */
+        /* c8 ignore next 3  */
         if (typeof iterationHandler !== 'function') {
             return;
         }
@@ -512,7 +509,7 @@ class ReadableStorage extends events.EventEmitter {
      * @param {object} [matchDocument] If supplied, only indexes the document matches on will be iterated.
      */
     forEachSecondaryIndex(iterationHandler, matchDocument) {
-        /* istanbul ignore if  */
+        /* c8 ignore next 3  */
         if (typeof iterationHandler !== 'function') {
             return;
         }
@@ -537,7 +534,7 @@ class ReadableStorage extends events.EventEmitter {
      * @param {function(ReadablePartition)} iterationHandler
      */
     forEachPartition(iterationHandler) {
-        /* istanbul ignore if  */
+        /* c8 ignore next 3  */
         if (typeof iterationHandler !== 'function') {
             return;
         }