@xyo-network/archivist-mongodb 2.84.3 → 2.85.0

package/dist/node/index.js

@@ -66,23 +66,23 @@ var _MongoDBArchivist = class _MongoDBArchivist extends MongoDBArchivistBase {
     const dataPayloads = (await Promise.all(remainingHashes.map((_$hash) => this.payloads.findOne({
       _$hash
     })))).filter(exists);
-    const dataPayloadsHashes = dataPayloads.map((payload) => payload._$hash);
-    remainingHashes = remainingHashes.filter((hash) => !dataPayloadsHashes.includes(hash));
+    const dataPayloadsHashes = new Set(dataPayloads.map((payload) => payload._$hash));
+    remainingHashes = remainingHashes.filter((hash) => !dataPayloadsHashes.has(hash));
     const dataBws = (await Promise.all(remainingHashes.map((_$hash) => this.boundWitnesses.findOne({
       _$hash
     })))).filter(exists);
-    const dataBwsHashes = dataBws.map((payload) => payload._$hash);
-    remainingHashes = remainingHashes.filter((hash) => !dataBwsHashes.includes(hash));
+    const dataBwsHashes = new Set(dataBws.map((payload) => payload._$hash));
+    remainingHashes = remainingHashes.filter((hash) => !dataBwsHashes.has(hash));
     const payloads = (await Promise.all(remainingHashes.map((_hash) => this.payloads.findOne({
       _hash
     })))).filter(exists);
-    const payloadsHashes = payloads.map((payload) => payload._hash);
-    remainingHashes = remainingHashes.filter((hash) => !payloadsHashes.includes(hash));
+    const payloadsHashes = new Set(payloads.map((payload) => payload._hash));
+    remainingHashes = remainingHashes.filter((hash) => !payloadsHashes.has(hash));
     const bws = (await Promise.all(remainingHashes.map((_hash) => this.boundWitnesses.findOne({
       _hash
     })))).filter(exists);
-    const bwsHashes = bws.map((payload) => payload._hash);
-    remainingHashes = remainingHashes.filter((hash) => !bwsHashes.includes(hash));
+    const bwsHashes = new Set(bws.map((payload) => payload._hash));
+    remainingHashes = remainingHashes.filter((hash) => !bwsHashes.has(hash));
     const foundPayloads = [
       ...dataPayloads,
       ...dataBws,
@@ -94,13 +94,13 @@ var _MongoDBArchivist = class _MongoDBArchivist extends MongoDBArchivistBase {
   async insertHandler(payloads) {
     const [bw, p] = await validByType(payloads);
     const payloadsWithExternalMeta = await Promise.all(p.map(toDbRepresentation));
-    if (payloadsWithExternalMeta.length) {
+    if (payloadsWithExternalMeta.length > 0) {
       const payloadsResult = await this.payloads.insertMany(payloadsWithExternalMeta);
       if (!payloadsResult.acknowledged || payloadsResult.insertedCount !== payloadsWithExternalMeta.length)
         throw new Error("MongoDBDeterministicArchivist: Error inserting Payloads");
     }
     const boundWitnessesWithExternalMeta = await Promise.all(bw.map(toDbRepresentation));
-    if (boundWitnessesWithExternalMeta.length) {
+    if (boundWitnessesWithExternalMeta.length > 0) {
       const boundWitnessesResult = await this.boundWitnesses.insertMany(boundWitnessesWithExternalMeta);
       if (!boundWitnessesResult.acknowledged || boundWitnessesResult.insertedCount !== boundWitnessesWithExternalMeta.length)
         throw new Error("MongoDBDeterministicArchivist: Error inserting BoundWitnesses");

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Archivist.ts","../../src/lib/validByType.ts","../../src/index.ts"],"sourcesContent":["import { exists } from '@xylabs/exists'\nimport { Hash } from '@xylabs/hex'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport { ArchivistConfigSchema, ArchivistInsertQuerySchema } from '@xyo-network/archivist-model'\nimport { MongoDBArchivistConfigSchema } from '@xyo-network/archivist-model-mongodb'\nimport { MongoDBModuleMixin } from '@xyo-network/module-abstract-mongodb'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload, WithMeta } from '@xyo-network/payload-model'\nimport { fromDbRepresentation, PayloadWithMongoMeta, toDbRepresentation } from '@xyo-network/payload-mongodb'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nimport { validByType } from './lib'\n\nconst MongoDBArchivistBase = MongoDBModuleMixin(AbstractArchivist)\n\nexport class MongoDBArchivist extends MongoDBArchivistBase {\n  static override configSchemas = [MongoDBArchivistConfigSchema, ArchivistConfigSchema]\n\n  override readonly queries: string[] = [ArchivistInsertQuerySchema, ...super.queries]\n\n  override async head(): Promise<Payload | undefined> {\n    const head = await (await this.payloads.find({})).sort({ _timestamp: -1 }).limit(1).toArray()\n    return head[0] ? PayloadWrapper.wrap(head[0]).payload : undefined\n  }\n\n  protected override async getHandler(hashes: string[]): Promise<WithMeta<Payload>[]> {\n    let remainingHashes = [...hashes]\n\n    const dataPayloads = (await Promise.all(remainingHashes.map((_$hash) => this.payloads.findOne({ _$hash })))).filter(exists)\n    const dataPayloadsHashes = dataPayloads.map((payload) => payload._$hash)\n    remainingHashes = remainingHashes.filter((hash) => !dataPayloadsHashes.includes(hash))\n\n    const dataBws = (await Promise.all(remainingHashes.map((_$hash) => this.boundWitnesses.findOne({ _$hash })))).filter(exists)\n    const dataBwsHashes = dataBws.map((payload) => payload._$hash)\n    remainingHashes = remainingHashes.filter((hash) => !dataBwsHashes.includes(hash))\n\n    const payloads = (await Promise.all(remainingHashes.map((_hash) => this.payloads.findOne({ _hash })))).filter(exists)\n    const payloadsHashes = payloads.map((payload) => payload._hash)\n    remainingHashes = remainingHashes.filter((hash) => !payloadsHashes.includes(hash))\n\n    const bws = (await Promise.all(remainingHashes.map((_hash) => this.boundWitnesses.findOne({ _hash })))).filter(exists)\n    const bwsHashes = bws.map((payload) => payload._hash)\n    remainingHashes = remainingHashes.filter((hash) => !bwsHashes.includes(hash))\n\n    const foundPayloads = [...dataPayloads, ...dataBws, ...payloads, ...bws] as PayloadWithMongoMeta<Payload & { _$hash: Hash; _$meta?: unknown }>[]\n    return await PayloadBuilder.build(foundPayloads.map(fromDbRepresentation))\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<WithMeta<Payload>[]> {\n    const [bw, p] = await validByType(payloads)\n    const payloadsWithExternalMeta = await Promise.all(p.map(toDbRepresentation))\n    if (payloadsWithExternalMeta.length) {\n      const payloadsResult = await this.payloads.insertMany(payloadsWithExternalMeta)\n      if (!payloadsResult.acknowledged || payloadsResult.insertedCount !== payloadsWithExternalMeta.length)\n        throw new Error('MongoDBDeterministicArchivist: Error inserting Payloads')\n    }\n    const boundWitnessesWithExternalMeta = await Promise.all(bw.map(toDbRepresentation))\n    if (boundWitnessesWithExternalMeta.length) {\n      const boundWitnessesResult = await this.boundWitnesses.insertMany(boundWitnessesWithExternalMeta)\n      if (!boundWitnessesResult.acknowledged || boundWitnessesResult.insertedCount !== boundWitnessesWithExternalMeta.length)\n        throw new Error('MongoDBDeterministicArchivist: Error inserting BoundWitnesses')\n    }\n\n    return await PayloadBuilder.build([...boundWitnessesWithExternalMeta, ...payloadsWithExternalMeta])\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    await this.ensureIndexes()\n    return true\n  }\n}\n","import { BoundWitness, isBoundWitness, isQueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessWrapper, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { Payload } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nexport const validByType = async (payloads: Payload[] = []) => {\n  const results: [BoundWitness[], Payload[]] = [[], []]\n  await Promise.all(\n    payloads.map(async (payload) => {\n      if (isBoundWitness(payload)) {\n        const wrapper = isQueryBoundWitness(payload) ? QueryBoundWitnessWrapper : BoundWitnessWrapper\n        const bw = await wrapper.parse(payload)\n        if (await bw.getValid()) {\n          results[0].push(bw.payload)\n        } else {\n          const errors = await bw.getErrors()\n          console.log(`validByType.Error: ${JSON.stringify(errors, null, 2)}`)\n        }\n      } else {\n        const payloadWrapper = PayloadWrapper.wrap(payload)\n        if (await payloadWrapper.getValid()) {\n          results[1].push(payloadWrapper.payload)\n        }\n      }\n      return\n    }),\n  )\n  return results\n}\n","export * from './Archivist'\nexport * from '@xyo-network/archivist-model-mongodb'\n"],"mappings":"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","names":["exists","AbstractArchivist","ArchivistConfigSchema","ArchivistInsertQuerySchema","MongoDBArchivistConfigSchema","MongoDBModuleMixin","PayloadBuilder","fromDbRepresentation","toDbRepresentation","PayloadWrapper","isBoundWitness","isQueryBoundWitness","BoundWitnessWrapper","QueryBoundWitnessWrapper","PayloadWrapper","validByType","payloads","results","Promise","all","map","payload","isBoundWitness","wrapper","isQueryBoundWitness","QueryBoundWitnessWrapper","BoundWitnessWrapper","bw","parse","getValid","push","errors","getErrors","console","log","JSON","stringify","payloadWrapper","PayloadWrapper","wrap","MongoDBArchivistBase","MongoDBModuleMixin","AbstractArchivist","MongoDBArchivist","queries","ArchivistInsertQuerySchema","head","payloads","find","sort","_timestamp","limit","toArray","PayloadWrapper","wrap","payload","undefined","getHandler","hashes","remainingHashes","dataPayloads","Promise","all","map","_$hash","findOne","filter","exists","dataPayloadsHashes","hash","includes","dataBws","boundWitnesses","dataBwsHashes","_hash","payloadsHashes","bws","bwsHashes","foundPayloads","PayloadBuilder","build","fromDbRepresentation","insertHandler","bw","p","validByType","payloadsWithExternalMeta","toDbRepresentation","length","payloadsResult","insertMany","acknowledged","insertedCount","Error","boundWitnessesWithExternalMeta","boundWitnessesResult","startHandler","ensureIndexes","configSchemas","MongoDBArchivistConfigSchema","ArchivistConfigSchema"]}
+{"version":3,"sources":["../../src/Archivist.ts","../../src/lib/validByType.ts","../../src/index.ts"],"sourcesContent":["import { exists } from '@xylabs/exists'\nimport { Hash } from '@xylabs/hex'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport { ArchivistConfigSchema, ArchivistInsertQuerySchema } from '@xyo-network/archivist-model'\nimport { MongoDBArchivistConfigSchema } from '@xyo-network/archivist-model-mongodb'\nimport { MongoDBModuleMixin } from '@xyo-network/module-abstract-mongodb'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload, WithMeta } from '@xyo-network/payload-model'\nimport { fromDbRepresentation, PayloadWithMongoMeta, toDbRepresentation } from '@xyo-network/payload-mongodb'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nimport { validByType } from './lib'\n\nconst MongoDBArchivistBase = MongoDBModuleMixin(AbstractArchivist)\n\nexport class MongoDBArchivist extends MongoDBArchivistBase {\n  static override configSchemas = [MongoDBArchivistConfigSchema, ArchivistConfigSchema]\n\n  override readonly queries: string[] = [ArchivistInsertQuerySchema, ...super.queries]\n\n  override async head(): Promise<Payload | undefined> {\n    const head = await (await this.payloads.find({})).sort({ _timestamp: -1 }).limit(1).toArray()\n    return head[0] ? PayloadWrapper.wrap(head[0]).payload : undefined\n  }\n\n  protected override async getHandler(hashes: Hash[]): Promise<WithMeta<Payload>[]> {\n    let remainingHashes = [...hashes]\n\n    const dataPayloads = (await Promise.all(remainingHashes.map((_$hash) => this.payloads.findOne({ _$hash })))).filter(exists)\n    const dataPayloadsHashes = new Set(dataPayloads.map((payload) => payload._$hash))\n    remainingHashes = remainingHashes.filter((hash) => !dataPayloadsHashes.has(hash))\n\n    const dataBws = (await Promise.all(remainingHashes.map((_$hash) => this.boundWitnesses.findOne({ _$hash })))).filter(exists)\n    const dataBwsHashes = new Set(dataBws.map((payload) => payload._$hash))\n    remainingHashes = remainingHashes.filter((hash) => !dataBwsHashes.has(hash))\n\n    const payloads = (await Promise.all(remainingHashes.map((_hash) => this.payloads.findOne({ _hash })))).filter(exists)\n    const payloadsHashes = new Set(payloads.map((payload) => payload._hash))\n    remainingHashes = remainingHashes.filter((hash) => !payloadsHashes.has(hash))\n\n    const bws = (await Promise.all(remainingHashes.map((_hash) => this.boundWitnesses.findOne({ _hash })))).filter(exists)\n    const bwsHashes = new Set(bws.map((payload) => payload._hash))\n    remainingHashes = remainingHashes.filter((hash) => !bwsHashes.has(hash))\n\n    const foundPayloads = [...dataPayloads, ...dataBws, ...payloads, ...bws] as PayloadWithMongoMeta<Payload & { _$hash: Hash; _$meta?: unknown }>[]\n    return await PayloadBuilder.build(foundPayloads.map(fromDbRepresentation))\n  }\n\n  protected override async insertHandler(payloads: Payload[]): Promise<WithMeta<Payload>[]> {\n    const [bw, p] = await validByType(payloads)\n    const payloadsWithExternalMeta = await Promise.all(p.map(toDbRepresentation))\n    if (payloadsWithExternalMeta.length > 0) {\n      const payloadsResult = await this.payloads.insertMany(payloadsWithExternalMeta)\n      if (!payloadsResult.acknowledged || payloadsResult.insertedCount !== payloadsWithExternalMeta.length)\n        throw new Error('MongoDBDeterministicArchivist: Error inserting Payloads')\n    }\n    const boundWitnessesWithExternalMeta = await Promise.all(bw.map(toDbRepresentation))\n    if (boundWitnessesWithExternalMeta.length > 0) {\n      const boundWitnessesResult = await this.boundWitnesses.insertMany(boundWitnessesWithExternalMeta)\n      if (!boundWitnessesResult.acknowledged || boundWitnessesResult.insertedCount !== boundWitnessesWithExternalMeta.length)\n        throw new Error('MongoDBDeterministicArchivist: Error inserting BoundWitnesses')\n    }\n\n    return await PayloadBuilder.build([...boundWitnessesWithExternalMeta, ...payloadsWithExternalMeta])\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    await this.ensureIndexes()\n    return true\n  }\n}\n","import { BoundWitness, isBoundWitness, isQueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessWrapper, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { Payload } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nexport const validByType = async (payloads: Payload[] = []) => {\n  const results: [BoundWitness[], Payload[]] = [[], []]\n  await Promise.all(\n    payloads.map(async (payload) => {\n      if (isBoundWitness(payload)) {\n        const wrapper = isQueryBoundWitness(payload) ? QueryBoundWitnessWrapper : BoundWitnessWrapper\n        const bw = await wrapper.parse(payload)\n        if (await bw.getValid()) {\n          results[0].push(bw.payload)\n        } else {\n          const errors = await bw.getErrors()\n          console.log(`validByType.Error: ${JSON.stringify(errors, null, 2)}`)\n        }\n      } else {\n        const payloadWrapper = PayloadWrapper.wrap(payload)\n        if (await payloadWrapper.getValid()) {\n          results[1].push(payloadWrapper.payload)\n        }\n      }\n      return\n    }),\n  )\n  return results\n}\n","export * from './Archivist'\nexport * from '@xyo-network/archivist-model-mongodb'\n"],"mappings":"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","names":["exists","AbstractArchivist","ArchivistConfigSchema","ArchivistInsertQuerySchema","MongoDBArchivistConfigSchema","MongoDBModuleMixin","PayloadBuilder","fromDbRepresentation","toDbRepresentation","PayloadWrapper","isBoundWitness","isQueryBoundWitness","BoundWitnessWrapper","QueryBoundWitnessWrapper","PayloadWrapper","validByType","payloads","results","Promise","all","map","payload","isBoundWitness","wrapper","isQueryBoundWitness","QueryBoundWitnessWrapper","BoundWitnessWrapper","bw","parse","getValid","push","errors","getErrors","console","log","JSON","stringify","payloadWrapper","PayloadWrapper","wrap","MongoDBArchivistBase","MongoDBModuleMixin","AbstractArchivist","MongoDBArchivist","queries","ArchivistInsertQuerySchema","head","payloads","find","sort","_timestamp","limit","toArray","PayloadWrapper","wrap","payload","undefined","getHandler","hashes","remainingHashes","dataPayloads","Promise","all","map","_$hash","findOne","filter","exists","dataPayloadsHashes","Set","hash","has","dataBws","boundWitnesses","dataBwsHashes","_hash","payloadsHashes","bws","bwsHashes","foundPayloads","PayloadBuilder","build","fromDbRepresentation","insertHandler","bw","p","validByType","payloadsWithExternalMeta","toDbRepresentation","length","payloadsResult","insertMany","acknowledged","insertedCount","Error","boundWitnessesWithExternalMeta","boundWitnessesResult","startHandler","ensureIndexes","configSchemas","MongoDBArchivistConfigSchema","ArchivistConfigSchema"]}

package/package.json

@@ -10,29 +10,29 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/exists": "^2.14.3",
-    "@xylabs/hex": "^2.14.3",
-    "@xyo-network/archivist-abstract": "^2.90.23",
-    "@xyo-network/archivist-model": "^2.90.23",
-    "@xyo-network/archivist-model-mongodb": "~2.84.3",
-    "@xyo-network/boundwitness-model": "^2.90.23",
-    "@xyo-network/boundwitness-wrapper": "^2.90.23",
-    "@xyo-network/module-abstract-mongodb": "~2.84.3",
-    "@xyo-network/payload-builder": "^2.90.23",
-    "@xyo-network/payload-model": "^2.90.23",
-    "@xyo-network/payload-mongodb": "~2.84.3",
-    "@xyo-network/payload-wrapper": "^2.90.23"
+    "@xylabs/exists": "^3.0.1",
+    "@xylabs/hex": "^3.0.1",
+    "@xyo-network/archivist-abstract": "^2.91.0",
+    "@xyo-network/archivist-model": "^2.91.0",
+    "@xyo-network/archivist-model-mongodb": "~2.85.0",
+    "@xyo-network/boundwitness-model": "^2.91.0",
+    "@xyo-network/boundwitness-wrapper": "^2.91.0",
+    "@xyo-network/module-abstract-mongodb": "~2.85.0",
+    "@xyo-network/payload-builder": "^2.91.0",
+    "@xyo-network/payload-model": "^2.91.0",
+    "@xyo-network/payload-mongodb": "~2.85.0",
+    "@xyo-network/payload-wrapper": "^2.91.0"
   },
   "devDependencies": {
-    "@xylabs/arraybuffer": "^2.14.3",
-    "@xylabs/jest-helpers": "^2.14.3",
-    "@xylabs/ts-scripts-yarn3": "^3.2.42",
-    "@xylabs/tsconfig": "^3.2.42",
-    "@xyo-network/account": "^2.90.23",
-    "@xyo-network/account-model": "^2.90.23",
-    "@xyo-network/archivist-wrapper": "^2.90.23",
-    "@xyo-network/boundwitness-builder": "^2.90.23",
-    "@xyo-network/sdk-xyo-mongo-js": "~2.84.3",
+    "@xylabs/arraybuffer": "^3.0.1",
+    "@xylabs/jest-helpers": "^3.0.1",
+    "@xylabs/ts-scripts-yarn3": "^3.4.1",
+    "@xylabs/tsconfig": "^3.4.1",
+    "@xyo-network/account": "^2.91.0",
+    "@xyo-network/account-model": "^2.91.0",
+    "@xyo-network/archivist-wrapper": "^2.91.0",
+    "@xyo-network/boundwitness-builder": "^2.91.0",
+    "@xyo-network/sdk-xyo-mongo-js": "~2.85.0",
     "fake-indexeddb": "^4.0.2",
     "jest": "^29.7.0",
     "typescript": "^5.3.3"
@@ -76,6 +76,6 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.84.3",
+  "version": "2.85.0",
   "type": "module"
 }

package/src/Archivist.ts

@@ -23,24 +23,24 @@ export class MongoDBArchivist extends MongoDBArchivistBase {
     return head[0] ? PayloadWrapper.wrap(head[0]).payload : undefined
   }
 
-  protected override async getHandler(hashes: string[]): Promise<WithMeta<Payload>[]> {
+  protected override async getHandler(hashes: Hash[]): Promise<WithMeta<Payload>[]> {
     let remainingHashes = [...hashes]
 
     const dataPayloads = (await Promise.all(remainingHashes.map((_$hash) => this.payloads.findOne({ _$hash })))).filter(exists)
-    const dataPayloadsHashes = dataPayloads.map((payload) => payload._$hash)
-    remainingHashes = remainingHashes.filter((hash) => !dataPayloadsHashes.includes(hash))
+    const dataPayloadsHashes = new Set(dataPayloads.map((payload) => payload._$hash))
+    remainingHashes = remainingHashes.filter((hash) => !dataPayloadsHashes.has(hash))
 
     const dataBws = (await Promise.all(remainingHashes.map((_$hash) => this.boundWitnesses.findOne({ _$hash })))).filter(exists)
-    const dataBwsHashes = dataBws.map((payload) => payload._$hash)
-    remainingHashes = remainingHashes.filter((hash) => !dataBwsHashes.includes(hash))
+    const dataBwsHashes = new Set(dataBws.map((payload) => payload._$hash))
+    remainingHashes = remainingHashes.filter((hash) => !dataBwsHashes.has(hash))
 
     const payloads = (await Promise.all(remainingHashes.map((_hash) => this.payloads.findOne({ _hash })))).filter(exists)
-    const payloadsHashes = payloads.map((payload) => payload._hash)
-    remainingHashes = remainingHashes.filter((hash) => !payloadsHashes.includes(hash))
+    const payloadsHashes = new Set(payloads.map((payload) => payload._hash))
+    remainingHashes = remainingHashes.filter((hash) => !payloadsHashes.has(hash))
 
     const bws = (await Promise.all(remainingHashes.map((_hash) => this.boundWitnesses.findOne({ _hash })))).filter(exists)
-    const bwsHashes = bws.map((payload) => payload._hash)
-    remainingHashes = remainingHashes.filter((hash) => !bwsHashes.includes(hash))
+    const bwsHashes = new Set(bws.map((payload) => payload._hash))
+    remainingHashes = remainingHashes.filter((hash) => !bwsHashes.has(hash))
 
     const foundPayloads = [...dataPayloads, ...dataBws, ...payloads, ...bws] as PayloadWithMongoMeta<Payload & { _$hash: Hash; _$meta?: unknown }>[]
     return await PayloadBuilder.build(foundPayloads.map(fromDbRepresentation))
@@ -49,13 +49,13 @@ export class MongoDBArchivist extends MongoDBArchivistBase {
   protected override async insertHandler(payloads: Payload[]): Promise<WithMeta<Payload>[]> {
     const [bw, p] = await validByType(payloads)
     const payloadsWithExternalMeta = await Promise.all(p.map(toDbRepresentation))
-    if (payloadsWithExternalMeta.length) {
+    if (payloadsWithExternalMeta.length > 0) {
       const payloadsResult = await this.payloads.insertMany(payloadsWithExternalMeta)
       if (!payloadsResult.acknowledged || payloadsResult.insertedCount !== payloadsWithExternalMeta.length)
         throw new Error('MongoDBDeterministicArchivist: Error inserting Payloads')
     }
     const boundWitnessesWithExternalMeta = await Promise.all(bw.map(toDbRepresentation))
-    if (boundWitnessesWithExternalMeta.length) {
+    if (boundWitnessesWithExternalMeta.length > 0) {
       const boundWitnessesResult = await this.boundWitnesses.insertMany(boundWitnessesWithExternalMeta)
       if (!boundWitnessesResult.acknowledged || boundWitnessesResult.insertedCount !== boundWitnessesWithExternalMeta.length)
         throw new Error('MongoDBDeterministicArchivist: Error inserting BoundWitnesses')