@xyo-network/archivist-mongodb 5.3.22 → 5.3.25

package/dist/node/Archivist.d.ts

@@ -17,10 +17,10 @@ declare const MongoDBArchivistBase: (abstract new (...args: any[]) => {
     id: string;
     modName?: import("@xyo-network/module-model").ModuleName;
     params: import("@xyo-network/module-model-mongodb").MongoDBModuleParams;
-    previousHash: () => import("@xylabs/promise").Promisable<string | undefined>;
+    previousHash: () => import("@xylabs/sdk-js").Promisable<string | undefined>;
     queries: string[];
-    query: <T extends import("@xyo-network/boundwitness-model").QueryBoundWitness = import("@xyo-network/boundwitness-model").QueryBoundWitness, TConf extends import("@xyo-network/module-model").ModuleConfig = import("@xyo-network/module-model").ModuleConfig>(query: T, payloads?: import("@xyo-network/payload-model").Payload[], queryConfig?: TConf) => import("@xylabs/promise").Promisable<import("@xyo-network/module-model").ModuleQueryResult>;
-    queryable: <T extends import("@xyo-network/boundwitness-model").QueryBoundWitness = import("@xyo-network/boundwitness-model").QueryBoundWitness, TConf_1 extends import("@xyo-network/module-model").ModuleConfig = import("@xyo-network/module-model").ModuleConfig>(query: T, payloads?: import("@xyo-network/payload-model").Payload[], queryConfig?: TConf_1) => import("@xylabs/promise").Promisable<boolean>;
+    query: <T extends import("@xyo-network/boundwitness-model").QueryBoundWitness = import("@xyo-network/boundwitness-model").QueryBoundWitness, TConf extends import("@xyo-network/module-model").ModuleConfig = import("@xyo-network/module-model").ModuleConfig>(query: T, payloads?: import("@xyo-network/payload-model").Payload[], queryConfig?: TConf) => import("@xylabs/sdk-js").Promisable<import("@xyo-network/module-model").ModuleQueryResult>;
+    queryable: <T extends import("@xyo-network/boundwitness-model").QueryBoundWitness = import("@xyo-network/boundwitness-model").QueryBoundWitness, TConf_1 extends import("@xyo-network/module-model").ModuleConfig = import("@xyo-network/module-model").ModuleConfig>(query: T, payloads?: import("@xyo-network/payload-model").Payload[], queryConfig?: TConf_1) => import("@xylabs/sdk-js").Promisable<boolean>;
     eventData: import("@xyo-network/module-model").ModuleEventData<object>;
     name: import("@xylabs/sdk-js").CreatableName;
     start: () => Promise<boolean>;

package/dist/node/Archivist.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Archivist.d.ts","sourceRoot":"","sources":["../../src/Archivist.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAE1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AAKxE,OAAO,KAAK,EACV,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,EAC3C,MAAM,4BAA4B,CAAA;AACnC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AAMxE,QAAA,MAAM,oBAAoB;;;;;;;;;;;;;;;;sRAsBe,CAAC,6DAEhC,CAAA;4RAca,CAAC,6DAClB,CAAF;;;;;;;;;;;;;;;;4BAvC8D,CAAA;AAElE,qBAAa,gBAAiB,SAAQ,oBAAoB;IACxD,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAyD;IACzG,gBAAyB,mBAAmB,EAAE,MAAM,CAA+B;IAE1E,OAAO;;SAA2E;IAE3F;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,kBAAkB,SAAS;cAE9B,aAAa,CAAC,IAAI,EAAE,IAAI;cAoBxB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ;cAU3B,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cA6B/D,aAAa,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cAmBxF,WAAW,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cAkEhF,YAAY;CAItC"}
+{"version":3,"file":"Archivist.d.ts","sourceRoot":"","sources":["../../src/Archivist.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAE1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AAKxE,OAAO,KAAK,EACV,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,EAC3C,MAAM,4BAA4B,CAAA;AACnC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AAMxE,QAAA,MAAM,oBAAoB;;;;;;;;;;;;;;;;sRAsBc,CAAC,6DAE/B,CAAD;4RAcY,CAAC,6DAChB,CAAJ;;;;;;;;;;;;;;;;4BAvCgE,CAAA;AAElE,qBAAa,gBAAiB,SAAQ,oBAAoB;IACxD,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAyD;IACzG,gBAAyB,mBAAmB,EAAE,MAAM,CAA+B;IAE1E,OAAO;;SAA2E;IAE3F;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,kBAAkB,SAAS;cAE9B,aAAa,CAAC,IAAI,EAAE,IAAI;cAoBxB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ;cAU3B,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cA6B/D,aAAa,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cAmBxF,WAAW,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cAkEhF,YAAY;CAItC"}

package/dist/node/ArchivistV2.d.ts

@@ -14,10 +14,10 @@ declare const MongoDBArchivistBaseV2: (abstract new (...args: any[]) => {
     id: string;
     modName?: import("@xyo-network/module-model").ModuleName;
     params: import("@xyo-network/module-model-mongodb").MongoDBModuleParamsV2<import("@xyo-network/module-model").AnyConfigSchema<import("@xyo-network/module-model-mongodb").MongoDBModuleConfigV2>>;
-    previousHash: () => import("@xylabs/promise").Promisable<string | undefined>;
+    previousHash: () => import("@xylabs/sdk-js").Promisable<string | undefined>;
     queries: string[];
-    query: <T extends import("@xyo-network/boundwitness-model").QueryBoundWitness = import("@xyo-network/boundwitness-model").QueryBoundWitness, TConf extends import("@xyo-network/module-model").ModuleConfig = import("@xyo-network/module-model").ModuleConfig>(query: T, payloads?: import("@xyo-network/payload-model").Payload[], queryConfig?: TConf) => import("@xylabs/promise").Promisable<import("@xyo-network/module-model").ModuleQueryResult>;
-    queryable: <T extends import("@xyo-network/boundwitness-model").QueryBoundWitness = import("@xyo-network/boundwitness-model").QueryBoundWitness, TConf_1 extends import("@xyo-network/module-model").ModuleConfig = import("@xyo-network/module-model").ModuleConfig>(query: T, payloads?: import("@xyo-network/payload-model").Payload[], queryConfig?: TConf_1) => import("@xylabs/promise").Promisable<boolean>;
+    query: <T extends import("@xyo-network/boundwitness-model").QueryBoundWitness = import("@xyo-network/boundwitness-model").QueryBoundWitness, TConf extends import("@xyo-network/module-model").ModuleConfig = import("@xyo-network/module-model").ModuleConfig>(query: T, payloads?: import("@xyo-network/payload-model").Payload[], queryConfig?: TConf) => import("@xylabs/sdk-js").Promisable<import("@xyo-network/module-model").ModuleQueryResult>;
+    queryable: <T extends import("@xyo-network/boundwitness-model").QueryBoundWitness = import("@xyo-network/boundwitness-model").QueryBoundWitness, TConf_1 extends import("@xyo-network/module-model").ModuleConfig = import("@xyo-network/module-model").ModuleConfig>(query: T, payloads?: import("@xyo-network/payload-model").Payload[], queryConfig?: TConf_1) => import("@xylabs/sdk-js").Promisable<boolean>;
     eventData: import("@xyo-network/module-model").ModuleEventData<object>;
     name: import("@xylabs/sdk-js").CreatableName;
     start: () => Promise<boolean>;

package/dist/node/ArchivistV2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArchivistV2.d.ts","sourceRoot":"","sources":["../../src/ArchivistV2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAE1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AAOxE,OAAO,EACL,KAAK,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,QAAQ,EACxC,KAAK,eAAe,EACrB,MAAM,4BAA4B,CAAA;AACnC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AAIxE,QAAA,MAAM,sBAAsB;;;;;;;;;;;;;sRAeb,CAAC,6DAA6D,CAAC;4RAWnE,CAAA,6DACiD,CAAA;;;;;;;;;;;;;;;;4BA3BU,CAAA;AAItE,qBAAa,kBAAmB,SAAQ,sBAAsB;IAC5D,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAyD;IACzG,gBAAyB,mBAAmB,EAAE,MAAM,CAA+B;IAEnF,SAAkB,OAAO,EAAE,MAAM,EAAE,CAA2E;IAE9G;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,kBAAkB,SAAS;cAErB,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cAO3E,aAAa,CAAC,IAAI,EAAE,IAAI;cAYxB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ;cAO3B,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cAiB/D,aAAa,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cAgBxF,WAAW,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cAwDhF,YAAY;CAItC;AAED,qBAAa,2BAA4B,SAAQ,kBAAkB;IACjE,SAAkB,OAAO,EAAE,MAAM,EAAE,CAMlC;CACF"}
+{"version":3,"file":"ArchivistV2.d.ts","sourceRoot":"","sources":["../../src/ArchivistV2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAE1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AAOxE,OAAO,EACL,KAAK,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,QAAQ,EACxC,KAAK,eAAe,EACrB,MAAM,4BAA4B,CAAA;AACnC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AAIxE,QAAA,MAAM,sBAAsB;;;;;;;;;;;;;sRAed,CAAC,6DAA6D,CAAC;4RAWrE,CAAC,6DACgD,CAAC;;;;;;;;;;;;;;;;4BA3BY,CAAA;AAItE,qBAAa,kBAAmB,SAAQ,sBAAsB;IAC5D,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAyD;IACzG,gBAAyB,mBAAmB,EAAE,MAAM,CAA+B;IAEnF,SAAkB,OAAO,EAAE,MAAM,EAAE,CAA2E;IAE9G;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,kBAAkB,SAAS;cAErB,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cAO3E,aAAa,CAAC,IAAI,EAAE,IAAI;cAYxB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ;cAO3B,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cAiB/D,aAAa,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cAgBxF,WAAW,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cAwDhF,YAAY;CAItC;AAED,qBAAa,2BAA4B,SAAQ,kBAAkB;IACjE,SAAkB,OAAO,EAAE,MAAM,EAAE,CAMlC;CACF"}

package/dist/node/index.d.ts

@@ -1,4 +1,4 @@
-export * from './Archivist.js';
+export * from './Archivist.ts';
 export * from './ArchivistV2.ts';
 export * from '@xyo-network/archivist-model-mongodb';
 //# sourceMappingURL=index.d.ts.map

package/dist/node/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Archivist.ts","../../src/lib/validByType.ts","../../src/ArchivistV2.ts","../../src/index.ts"],"sourcesContent":["import type { Hash } from '@xylabs/sdk-js'\nimport { exists } from '@xylabs/sdk-js'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport type { ArchivistNextOptions } from '@xyo-network/archivist-model'\nimport { ArchivistInsertQuerySchema, ArchivistNextQuerySchema } from '@xyo-network/archivist-model'\nimport { MongoDBArchivistConfigSchema } from '@xyo-network/archivist-model-mongodb'\nimport type { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { MongoDBModuleMixin } from '@xyo-network/module-abstract-mongodb'\nimport type {\n  Payload, Schema, Sequence, WithStorageMeta,\n} from '@xyo-network/payload-model'\nimport type { PayloadWithMongoMeta } from '@xyo-network/payload-mongodb'\nimport { fromDbRepresentation, toDbRepresentation } from '@xyo-network/payload-mongodb'\nimport { ObjectId } from 'mongodb'\n\nimport { validByType } from './lib/index.js'\n\nconst MongoDBArchivistBase = MongoDBModuleMixin(AbstractArchivist)\n\nexport class MongoDBArchivist extends MongoDBArchivistBase {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, MongoDBArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = MongoDBArchivistConfigSchema\n\n  override queries = [ArchivistInsertQuerySchema, ArchivistNextQuerySchema, ...super.queries]\n\n  /**\n   * The amount of time to allow the aggregate query to execute\n   */\n  protected readonly aggregateTimeoutMs = 10_000\n\n  protected async findOneByHash(hash: Hash) {\n    const dataPayload = (await this.payloads.findOne({ _$hash: hash }))\n    if (dataPayload) {\n      return dataPayload\n    } else {\n      const dataBw = (await this.boundWitnesses.findOne({ _$hash: hash }))\n      if (dataBw) {\n        return dataBw\n      } else {\n        const payload = (await this.payloads.findOne({ _hash: hash }))\n        if (payload) {\n          return payload\n        } else {\n          const bw = (await this.boundWitnesses.findOne({ _hash: hash }))\n          return bw ?? undefined\n        }\n      }\n    }\n  }\n\n  protected async findOneBySequence(sequence: Sequence) {\n    const dataPayload = (await this.payloads.findOne({ _sequence: sequence }))\n    if (dataPayload) {\n      return dataPayload\n    } else {\n      const dataBw = (await this.boundWitnesses.findOne({ _sequence: sequence }))\n      return dataBw\n    }\n  }\n\n  protected override async getHandler(hashes: Hash[]): Promise<WithStorageMeta<Payload>[]> {\n    let remainingHashes = [...hashes]\n\n    const dataPayloads: WithStorageMeta<Payload>[] = (await Promise.all(remainingHashes.map(_dataHash => this.payloads.findOne({ _dataHash })))).filter(exists)\n    const dataPayloadsHashes = new Set(dataPayloads.map(payload => payload._dataHash))\n    remainingHashes = remainingHashes.filter(hash => !dataPayloadsHashes.has(hash))\n\n    const dataBws: WithStorageMeta<BoundWitness>[] = (await Promise.all(remainingHashes.map(\n      _dataHash => this.boundWitnesses.findOne({ _dataHash }),\n    ))).filter(exists)\n\n    const dataBwsHashes = new Set(dataBws.map(payload => payload._dataHash))\n    remainingHashes = remainingHashes.filter(hash => !dataBwsHashes.has(hash))\n\n    const payloads: WithStorageMeta<Payload>[] = (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: WithStorageMeta<BoundWitness>[] = (await Promise.all(remainingHashes.map(_hash => this.boundWitnesses.findOne({ _hash })))).filter(exists)\n    const bwsHashes = new Set(bws.map(payload => payload._hash))\n    // eslint-disable-next-line sonarjs/no-dead-store\n    remainingHashes = remainingHashes.filter(hash => !bwsHashes.has(hash))\n\n    const foundPayloads = [...dataPayloads, ...dataBws, ...payloads, ...bws] as PayloadWithMongoMeta<Payload>[]\n    const result = foundPayloads.map(fromDbRepresentation)\n    // console.log(`getHandler: ${JSON.stringify(hashes, null, 2)}:${JSON.stringify(result, null, 2)}`)\n    return result\n  }\n\n  protected override async insertHandler(payloads: WithStorageMeta<Payload>[]): Promise<WithStorageMeta<Payload>[]> {\n    const [bw, p] = await validByType(payloads)\n    const payloadsWithExternalMeta = p.map(value => toDbRepresentation(value))\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('MongoDBArchivist: Error inserting Payloads')\n    }\n\n    const boundWitnessesWithExternalMeta = bw.map(value => toDbRepresentation(value))\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('MongoDBArchivist: Error inserting BoundWitnesses')\n    }\n\n    return [...boundWitnessesWithExternalMeta, ...payloadsWithExternalMeta].map(fromDbRepresentation)\n  }\n\n  protected override async nextHandler(options?: ArchivistNextOptions): Promise<WithStorageMeta<Payload>[]> {\n    // Sanitize inputs and set defaults\n    let {\n      limit, cursor, order, open,\n    } = options ?? { limit: 10, order: 'desc' }\n\n    if (!limit) limit = 10\n    if (limit > 100) limit = 100\n\n    if (order != 'asc') order = 'desc'\n\n    let id: ObjectId | undefined\n    if (cursor) {\n      const payload = await this.findOneBySequence(cursor)\n      // TODO: Should we throw an error if the requested payload is not found?\n      if (payload) id = payload._id\n    } else {\n      id = order === 'asc'\n      // If ascending, start from the beginning of time\n        ? ObjectId.createFromTime(0)\n        // If descending, start from now (plus a bit more in the future to ensure\n        // them most recent ObjectIds are included)\n        : ObjectId.createFromTime((Date.now() + 10_000) / 1000)\n    }\n    if (!id) return []\n\n    // Create aggregate criteria\n    const sort = order === 'asc' ? 1 : -1\n    // TODO: How to handle random component of ID across multiple collections\n    // to ensure we don't skip some payloads\n    const match = order === 'asc' ? (open ? { _id: { $gte: id } } : { _id: { $gt: id } }) : (open ? { _id: { $lte: id } } : { _id: { $lt: id } })\n\n    // Run the aggregate query\n    const foundPayloads = await this.payloads.useCollection((collection) => {\n      return collection\n        .aggregate<PayloadWithMongoMeta>([\n          // Pre-filter payloads collection\n          { $match: match },\n          // Sort payloads by _id\n          { $sort: { _id: sort } },\n          // Limit payloads to the first N payloads\n          { $limit: limit },\n          // Combine with filtered boundWitnesses collection\n          {\n            $unionWith: {\n              coll: this.boundWitnessSdkConfig.collection,\n              pipeline: [\n                { $match: match }, // Pre-filter boundWitnesses\n                { $sort: { _id: sort } }, // Sort boundWitnesses by _id\n                { $limit: limit }, // Limit boundWitnesses to the first N boundWitnesses\n              ],\n            },\n          },\n          // Sort the combined result by _id\n          { $sort: { _id: sort } },\n          // Limit the final result to N documents\n          { $limit: limit },\n        ])\n        .maxTimeMS(this.aggregateTimeoutMs)\n        .toArray()\n    })\n\n    // Convert from DB representation to Payloads\n    return foundPayloads.map(fromDbRepresentation)\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    await this.ensureIndexes()\n  }\n}\n","import type { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { isBoundWitness, isQueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessWrapper, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport type { Payload, WithStorageMeta } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nexport const validByType = async (payloads: WithStorageMeta<Payload>[] = []) => {\n  const results: [WithStorageMeta<BoundWitness>[], WithStorageMeta<Payload>[]] = [[], []]\n  await Promise.all(\n    payloads.map(async (payload) => {\n      if (isBoundWitness(payload)) {\n        const wrapper = isQueryBoundWitness(payload) ? QueryBoundWitnessWrapper : BoundWitnessWrapper\n        const bw = wrapper.parse(payload)\n        if (await bw.getValid()) {\n          results[0].push(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(payload)\n        }\n      }\n    }),\n  )\n  return results\n}\n","import type { Hash } from '@xylabs/sdk-js'\nimport { exists } from '@xylabs/sdk-js'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport type { ArchivistNextOptions } from '@xyo-network/archivist-model'\nimport {\n  ArchivistDeleteQuerySchema, ArchivistGetQuerySchema, ArchivistInsertQuerySchema, ArchivistNextQuerySchema,\n} from '@xyo-network/archivist-model'\nimport { MongoDBArchivistConfigSchema } from '@xyo-network/archivist-model-mongodb'\nimport { DefaultModuleQueries } from '@xyo-network/module-abstract'\nimport { MongoDBModuleMixinV2 } from '@xyo-network/module-abstract-mongodb'\nimport {\n  type Payload, type Schema, type Sequence, SequenceConstants,\n  type WithStorageMeta,\n} from '@xyo-network/payload-model'\nimport type { PayloadWithMongoMeta } from '@xyo-network/payload-mongodb'\nimport { fromDbRepresentation, toDbRepresentation } from '@xyo-network/payload-mongodb'\nimport type { MongoError } from 'mongodb'\n\nconst MongoDBArchivistBaseV2 = MongoDBModuleMixinV2(AbstractArchivist)\n\nconst MONGODB_DUPLICATE_KEY_ERROR = 11_000\n\nexport class MongoDBArchivistV2 extends MongoDBArchivistBaseV2 {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, MongoDBArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = MongoDBArchivistConfigSchema\n\n  override readonly queries: Schema[] = [ArchivistInsertQuerySchema, ArchivistNextQuerySchema, ...super.queries]\n\n  /**\n   * The amount of time to allow the aggregate query to execute\n   */\n  protected readonly aggregateTimeoutMs = 10_000\n\n  protected override async deleteHandler(hashes: Hash[]): Promise<WithStorageMeta<Payload>[]> {\n    const payloads = await this.getHandler(hashes)\n    const foundHashes = payloads.map(p => p._hash)\n    await this.payloads.deleteMany({ _hash: { $in: foundHashes } })\n    return payloads\n  }\n\n  protected async findOneByHash(hash: Hash) {\n    const dataPayload = (await this.payloads.findOne({ _$hash: hash }))\n    if (dataPayload) {\n      return dataPayload\n    } else {\n      const payload = (await this.payloads.findOne({ _hash: hash }))\n      if (payload) {\n        return payload\n      }\n    }\n  }\n\n  protected async findOneBySequence(sequence: Sequence) {\n    const dataPayload = (await this.payloads.findOne({ _sequence: sequence }))\n    if (dataPayload) {\n      return dataPayload\n    }\n  }\n\n  protected override async getHandler(hashes: Hash[]): Promise<WithStorageMeta<Payload>[]> {\n    let remainingHashes = [...hashes]\n\n    const dataPayloads: WithStorageMeta<Payload>[] = (await Promise.all(remainingHashes.map(_dataHash => this.payloads.findOne({ _dataHash })))).filter(exists)\n    const dataPayloadsHashes = new Set(dataPayloads.map(payload => payload._dataHash))\n    remainingHashes = remainingHashes.filter(hash => !dataPayloadsHashes.has(hash))\n\n    const payloads: WithStorageMeta<Payload>[] = (await Promise.all(remainingHashes.map(_hash => this.payloads.findOne({ _hash })))).filter(exists)\n    const payloadsHashes = new Set(payloads.map(payload => payload._hash))\n    // eslint-disable-next-line sonarjs/no-dead-store\n    remainingHashes = remainingHashes.filter(hash => !payloadsHashes.has(hash))\n\n    const foundPayloads = [...dataPayloads, ...payloads] as PayloadWithMongoMeta<Payload>[]\n    const result = foundPayloads.map(fromDbRepresentation)\n    return result\n  }\n\n  protected override async insertHandler(payloads: WithStorageMeta<Payload>[]): Promise<WithStorageMeta<Payload>[]> {\n    const payloadsWithExternalMeta = payloads.map(value => toDbRepresentation(value))\n    if (payloadsWithExternalMeta.length > 0) {\n      try {\n        const payloadsResult = await this.payloads.insertMany(payloadsWithExternalMeta, { ordered: false })\n        if (!payloadsResult.acknowledged) throw new Error('MongoDBArchivist: Error inserting Payloads')\n      } catch (error) {\n        const mongoError = error as MongoError\n        // Intentional coercive equality since Mongo error codes are\n        // of type string | number\n        if (mongoError?.code != MONGODB_DUPLICATE_KEY_ERROR) throw error\n      }\n    }\n    return [...payloadsWithExternalMeta].map(fromDbRepresentation)\n  }\n\n  protected override async nextHandler(options?: ArchivistNextOptions): Promise<WithStorageMeta<Payload>[]> {\n    // Sanitize inputs and set defaults\n    let {\n      limit, cursor, order, open = true,\n    } = options ?? { limit: 10, order: 'desc' }\n\n    if (!limit) limit = 10\n    if (limit > 100) limit = 100\n\n    if (order != 'asc') order = 'desc'\n\n    let sequence: Sequence | undefined\n    if (cursor) {\n      const payload = await this.findOneBySequence(cursor)\n      // TODO: Should we throw an error if the requested payload is not found?\n      if (payload) sequence = payload._sequence\n    } else {\n      sequence = order === 'asc'\n      // If ascending, start from the beginning of time\n        ? SequenceConstants.minLocalSequence\n        // If descending, start from now (plus a bit more in the future to ensure\n        // them most recent ObjectIds are included)\n        : SequenceConstants.maxLocalSequence\n    }\n    if (!sequence) return []\n\n    // Create find criteria\n    const sort = order === 'asc' ? 1 : -1\n\n    const match = order === 'asc'\n      ? (open\n          ? { _sequence: { $gt: sequence } }\n          : { _sequence: { $gte: sequence } })\n      : (open\n          ? { _sequence: { $lt: sequence } }\n          : { _sequence: { $lte: sequence } })\n\n    // Run the aggregate query\n    const foundPayloads = await this.payloads.useCollection((collection) => {\n      return collection\n        .aggregate<PayloadWithMongoMeta>([\n          // Pre-filter payloads collection\n          { $match: match },\n          // Sort payloads by _sequence\n          { $sort: { _sequence: sort } },\n          // Limit payloads to the first N payloads\n          { $limit: limit },\n        ])\n        .maxTimeMS(this.aggregateTimeoutMs)\n        .toArray()\n    })\n\n    // Convert from DB representation to Payloads\n    return foundPayloads.map(fromDbRepresentation)\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    await this.ensureCollection()\n  }\n}\n\nexport class MongoDBArchivistV2Deletable extends MongoDBArchivistV2 {\n  override readonly queries: Schema[] = [\n    ArchivistDeleteQuerySchema,\n    ArchivistGetQuerySchema,\n    ArchivistInsertQuerySchema,\n    ArchivistNextQuerySchema,\n    ...DefaultModuleQueries,\n  ]\n}\n","export * from './Archivist.js'\nexport * from './ArchivistV2.ts'\nexport * from '@xyo-network/archivist-model-mongodb'\n"],"mappings":"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","names":["exists","AbstractArchivist","ArchivistInsertQuerySchema","ArchivistNextQuerySchema","MongoDBArchivistConfigSchema","fromDbRepresentation","toDbRepresentation"]}
+{"version":3,"sources":["../../src/Archivist.ts","../../src/lib/validByType.ts","../../src/ArchivistV2.ts","../../src/index.ts"],"sourcesContent":["import type { Hash } from '@xylabs/sdk-js'\nimport { exists } from '@xylabs/sdk-js'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport type { ArchivistNextOptions } from '@xyo-network/archivist-model'\nimport { ArchivistInsertQuerySchema, ArchivistNextQuerySchema } from '@xyo-network/archivist-model'\nimport { MongoDBArchivistConfigSchema } from '@xyo-network/archivist-model-mongodb'\nimport type { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { MongoDBModuleMixin } from '@xyo-network/module-abstract-mongodb'\nimport type {\n  Payload, Schema, Sequence, WithStorageMeta,\n} from '@xyo-network/payload-model'\nimport type { PayloadWithMongoMeta } from '@xyo-network/payload-mongodb'\nimport { fromDbRepresentation, toDbRepresentation } from '@xyo-network/payload-mongodb'\nimport { ObjectId } from 'mongodb'\n\nimport { validByType } from './lib/index.ts'\n\nconst MongoDBArchivistBase = MongoDBModuleMixin(AbstractArchivist)\n\nexport class MongoDBArchivist extends MongoDBArchivistBase {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, MongoDBArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = MongoDBArchivistConfigSchema\n\n  override queries = [ArchivistInsertQuerySchema, ArchivistNextQuerySchema, ...super.queries]\n\n  /**\n   * The amount of time to allow the aggregate query to execute\n   */\n  protected readonly aggregateTimeoutMs = 10_000\n\n  protected async findOneByHash(hash: Hash) {\n    const dataPayload = (await this.payloads.findOne({ _$hash: hash }))\n    if (dataPayload) {\n      return dataPayload\n    } else {\n      const dataBw = (await this.boundWitnesses.findOne({ _$hash: hash }))\n      if (dataBw) {\n        return dataBw\n      } else {\n        const payload = (await this.payloads.findOne({ _hash: hash }))\n        if (payload) {\n          return payload\n        } else {\n          const bw = (await this.boundWitnesses.findOne({ _hash: hash }))\n          return bw ?? undefined\n        }\n      }\n    }\n  }\n\n  protected async findOneBySequence(sequence: Sequence) {\n    const dataPayload = (await this.payloads.findOne({ _sequence: sequence }))\n    if (dataPayload) {\n      return dataPayload\n    } else {\n      const dataBw = (await this.boundWitnesses.findOne({ _sequence: sequence }))\n      return dataBw\n    }\n  }\n\n  protected override async getHandler(hashes: Hash[]): Promise<WithStorageMeta<Payload>[]> {\n    let remainingHashes = [...hashes]\n\n    const dataPayloads: WithStorageMeta<Payload>[] = (await Promise.all(remainingHashes.map(_dataHash => this.payloads.findOne({ _dataHash })))).filter(exists)\n    const dataPayloadsHashes = new Set(dataPayloads.map(payload => payload._dataHash))\n    remainingHashes = remainingHashes.filter(hash => !dataPayloadsHashes.has(hash))\n\n    const dataBws: WithStorageMeta<BoundWitness>[] = (await Promise.all(remainingHashes.map(\n      _dataHash => this.boundWitnesses.findOne({ _dataHash }),\n    ))).filter(exists)\n\n    const dataBwsHashes = new Set(dataBws.map(payload => payload._dataHash))\n    remainingHashes = remainingHashes.filter(hash => !dataBwsHashes.has(hash))\n\n    const payloads: WithStorageMeta<Payload>[] = (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: WithStorageMeta<BoundWitness>[] = (await Promise.all(remainingHashes.map(_hash => this.boundWitnesses.findOne({ _hash })))).filter(exists)\n    const bwsHashes = new Set(bws.map(payload => payload._hash))\n    // eslint-disable-next-line sonarjs/no-dead-store\n    remainingHashes = remainingHashes.filter(hash => !bwsHashes.has(hash))\n\n    const foundPayloads = [...dataPayloads, ...dataBws, ...payloads, ...bws] as PayloadWithMongoMeta<Payload>[]\n    const result = foundPayloads.map(fromDbRepresentation)\n    // console.log(`getHandler: ${JSON.stringify(hashes, null, 2)}:${JSON.stringify(result, null, 2)}`)\n    return result\n  }\n\n  protected override async insertHandler(payloads: WithStorageMeta<Payload>[]): Promise<WithStorageMeta<Payload>[]> {\n    const [bw, p] = await validByType(payloads)\n    const payloadsWithExternalMeta = p.map(value => toDbRepresentation(value))\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('MongoDBArchivist: Error inserting Payloads')\n    }\n\n    const boundWitnessesWithExternalMeta = bw.map(value => toDbRepresentation(value))\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('MongoDBArchivist: Error inserting BoundWitnesses')\n    }\n\n    return [...boundWitnessesWithExternalMeta, ...payloadsWithExternalMeta].map(fromDbRepresentation)\n  }\n\n  protected override async nextHandler(options?: ArchivistNextOptions): Promise<WithStorageMeta<Payload>[]> {\n    // Sanitize inputs and set defaults\n    let {\n      limit, cursor, order, open,\n    } = options ?? { limit: 10, order: 'desc' }\n\n    if (!limit) limit = 10\n    if (limit > 100) limit = 100\n\n    if (order != 'asc') order = 'desc'\n\n    let id: ObjectId | undefined\n    if (cursor) {\n      const payload = await this.findOneBySequence(cursor)\n      // TODO: Should we throw an error if the requested payload is not found?\n      if (payload) id = payload._id\n    } else {\n      id = order === 'asc'\n      // If ascending, start from the beginning of time\n        ? ObjectId.createFromTime(0)\n        // If descending, start from now (plus a bit more in the future to ensure\n        // them most recent ObjectIds are included)\n        : ObjectId.createFromTime((Date.now() + 10_000) / 1000)\n    }\n    if (!id) return []\n\n    // Create aggregate criteria\n    const sort = order === 'asc' ? 1 : -1\n    // TODO: How to handle random component of ID across multiple collections\n    // to ensure we don't skip some payloads\n    const match = order === 'asc' ? (open ? { _id: { $gte: id } } : { _id: { $gt: id } }) : (open ? { _id: { $lte: id } } : { _id: { $lt: id } })\n\n    // Run the aggregate query\n    const foundPayloads = await this.payloads.useCollection((collection) => {\n      return collection\n        .aggregate<PayloadWithMongoMeta>([\n          // Pre-filter payloads collection\n          { $match: match },\n          // Sort payloads by _id\n          { $sort: { _id: sort } },\n          // Limit payloads to the first N payloads\n          { $limit: limit },\n          // Combine with filtered boundWitnesses collection\n          {\n            $unionWith: {\n              coll: this.boundWitnessSdkConfig.collection,\n              pipeline: [\n                { $match: match }, // Pre-filter boundWitnesses\n                { $sort: { _id: sort } }, // Sort boundWitnesses by _id\n                { $limit: limit }, // Limit boundWitnesses to the first N boundWitnesses\n              ],\n            },\n          },\n          // Sort the combined result by _id\n          { $sort: { _id: sort } },\n          // Limit the final result to N documents\n          { $limit: limit },\n        ])\n        .maxTimeMS(this.aggregateTimeoutMs)\n        .toArray()\n    })\n\n    // Convert from DB representation to Payloads\n    return foundPayloads.map(fromDbRepresentation)\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    await this.ensureIndexes()\n  }\n}\n","import type { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { isBoundWitness, isQueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessWrapper, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport type { Payload, WithStorageMeta } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nexport const validByType = async (payloads: WithStorageMeta<Payload>[] = []) => {\n  const results: [WithStorageMeta<BoundWitness>[], WithStorageMeta<Payload>[]] = [[], []]\n  await Promise.all(\n    payloads.map(async (payload) => {\n      if (isBoundWitness(payload)) {\n        const wrapper = isQueryBoundWitness(payload) ? QueryBoundWitnessWrapper : BoundWitnessWrapper\n        const bw = wrapper.parse(payload)\n        if (await bw.getValid()) {\n          results[0].push(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(payload)\n        }\n      }\n    }),\n  )\n  return results\n}\n","import type { Hash } from '@xylabs/sdk-js'\nimport { exists } from '@xylabs/sdk-js'\nimport { AbstractArchivist } from '@xyo-network/archivist-abstract'\nimport type { ArchivistNextOptions } from '@xyo-network/archivist-model'\nimport {\n  ArchivistDeleteQuerySchema, ArchivistGetQuerySchema, ArchivistInsertQuerySchema, ArchivistNextQuerySchema,\n} from '@xyo-network/archivist-model'\nimport { MongoDBArchivistConfigSchema } from '@xyo-network/archivist-model-mongodb'\nimport { DefaultModuleQueries } from '@xyo-network/module-abstract'\nimport { MongoDBModuleMixinV2 } from '@xyo-network/module-abstract-mongodb'\nimport {\n  type Payload, type Schema, type Sequence, SequenceConstants,\n  type WithStorageMeta,\n} from '@xyo-network/payload-model'\nimport type { PayloadWithMongoMeta } from '@xyo-network/payload-mongodb'\nimport { fromDbRepresentation, toDbRepresentation } from '@xyo-network/payload-mongodb'\nimport type { MongoError } from 'mongodb'\n\nconst MongoDBArchivistBaseV2 = MongoDBModuleMixinV2(AbstractArchivist)\n\nconst MONGODB_DUPLICATE_KEY_ERROR = 11_000\n\nexport class MongoDBArchivistV2 extends MongoDBArchivistBaseV2 {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, MongoDBArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = MongoDBArchivistConfigSchema\n\n  override readonly queries: Schema[] = [ArchivistInsertQuerySchema, ArchivistNextQuerySchema, ...super.queries]\n\n  /**\n   * The amount of time to allow the aggregate query to execute\n   */\n  protected readonly aggregateTimeoutMs = 10_000\n\n  protected override async deleteHandler(hashes: Hash[]): Promise<WithStorageMeta<Payload>[]> {\n    const payloads = await this.getHandler(hashes)\n    const foundHashes = payloads.map(p => p._hash)\n    await this.payloads.deleteMany({ _hash: { $in: foundHashes } })\n    return payloads\n  }\n\n  protected async findOneByHash(hash: Hash) {\n    const dataPayload = (await this.payloads.findOne({ _$hash: hash }))\n    if (dataPayload) {\n      return dataPayload\n    } else {\n      const payload = (await this.payloads.findOne({ _hash: hash }))\n      if (payload) {\n        return payload\n      }\n    }\n  }\n\n  protected async findOneBySequence(sequence: Sequence) {\n    const dataPayload = (await this.payloads.findOne({ _sequence: sequence }))\n    if (dataPayload) {\n      return dataPayload\n    }\n  }\n\n  protected override async getHandler(hashes: Hash[]): Promise<WithStorageMeta<Payload>[]> {\n    let remainingHashes = [...hashes]\n\n    const dataPayloads: WithStorageMeta<Payload>[] = (await Promise.all(remainingHashes.map(_dataHash => this.payloads.findOne({ _dataHash })))).filter(exists)\n    const dataPayloadsHashes = new Set(dataPayloads.map(payload => payload._dataHash))\n    remainingHashes = remainingHashes.filter(hash => !dataPayloadsHashes.has(hash))\n\n    const payloads: WithStorageMeta<Payload>[] = (await Promise.all(remainingHashes.map(_hash => this.payloads.findOne({ _hash })))).filter(exists)\n    const payloadsHashes = new Set(payloads.map(payload => payload._hash))\n    // eslint-disable-next-line sonarjs/no-dead-store\n    remainingHashes = remainingHashes.filter(hash => !payloadsHashes.has(hash))\n\n    const foundPayloads = [...dataPayloads, ...payloads] as PayloadWithMongoMeta<Payload>[]\n    const result = foundPayloads.map(fromDbRepresentation)\n    return result\n  }\n\n  protected override async insertHandler(payloads: WithStorageMeta<Payload>[]): Promise<WithStorageMeta<Payload>[]> {\n    const payloadsWithExternalMeta = payloads.map(value => toDbRepresentation(value))\n    if (payloadsWithExternalMeta.length > 0) {\n      try {\n        const payloadsResult = await this.payloads.insertMany(payloadsWithExternalMeta, { ordered: false })\n        if (!payloadsResult.acknowledged) throw new Error('MongoDBArchivist: Error inserting Payloads')\n      } catch (error) {\n        const mongoError = error as MongoError\n        // Intentional coercive equality since Mongo error codes are\n        // of type string | number\n        if (mongoError?.code != MONGODB_DUPLICATE_KEY_ERROR) throw error\n      }\n    }\n    return [...payloadsWithExternalMeta].map(fromDbRepresentation)\n  }\n\n  protected override async nextHandler(options?: ArchivistNextOptions): Promise<WithStorageMeta<Payload>[]> {\n    // Sanitize inputs and set defaults\n    let {\n      limit, cursor, order, open = true,\n    } = options ?? { limit: 10, order: 'desc' }\n\n    if (!limit) limit = 10\n    if (limit > 100) limit = 100\n\n    if (order != 'asc') order = 'desc'\n\n    let sequence: Sequence | undefined\n    if (cursor) {\n      const payload = await this.findOneBySequence(cursor)\n      // TODO: Should we throw an error if the requested payload is not found?\n      if (payload) sequence = payload._sequence\n    } else {\n      sequence = order === 'asc'\n      // If ascending, start from the beginning of time\n        ? SequenceConstants.minLocalSequence\n        // If descending, start from now (plus a bit more in the future to ensure\n        // them most recent ObjectIds are included)\n        : SequenceConstants.maxLocalSequence\n    }\n    if (!sequence) return []\n\n    // Create find criteria\n    const sort = order === 'asc' ? 1 : -1\n\n    const match = order === 'asc'\n      ? (open\n          ? { _sequence: { $gt: sequence } }\n          : { _sequence: { $gte: sequence } })\n      : (open\n          ? { _sequence: { $lt: sequence } }\n          : { _sequence: { $lte: sequence } })\n\n    // Run the aggregate query\n    const foundPayloads = await this.payloads.useCollection((collection) => {\n      return collection\n        .aggregate<PayloadWithMongoMeta>([\n          // Pre-filter payloads collection\n          { $match: match },\n          // Sort payloads by _sequence\n          { $sort: { _sequence: sort } },\n          // Limit payloads to the first N payloads\n          { $limit: limit },\n        ])\n        .maxTimeMS(this.aggregateTimeoutMs)\n        .toArray()\n    })\n\n    // Convert from DB representation to Payloads\n    return foundPayloads.map(fromDbRepresentation)\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    await this.ensureCollection()\n  }\n}\n\nexport class MongoDBArchivistV2Deletable extends MongoDBArchivistV2 {\n  override readonly queries: Schema[] = [\n    ArchivistDeleteQuerySchema,\n    ArchivistGetQuerySchema,\n    ArchivistInsertQuerySchema,\n    ArchivistNextQuerySchema,\n    ...DefaultModuleQueries,\n  ]\n}\n","export * from './Archivist.ts'\nexport * from './ArchivistV2.ts'\nexport * from '@xyo-network/archivist-model-mongodb'\n"],"mappings":";AACA,SAAS,cAAc;AACvB,SAAS,yBAAyB;AAElC,SAAS,4BAA4B,gCAAgC;AACrE,SAAS,oCAAoC;AAE7C,SAAS,0BAA0B;AAKnC,SAAS,sBAAsB,0BAA0B;AACzD,SAAS,gBAAgB;;;ACZzB,SAAS,gBAAgB,2BAA2B;AACpD,SAAS,qBAAqB,gCAAgC;AAE9D,SAAS,sBAAsB;AAExB,IAAM,cAAc,OAAO,WAAuC,CAAC,MAAM;AAC9E,QAAM,UAAyE,CAAC,CAAC,GAAG,CAAC,CAAC;AACtF,QAAM,QAAQ;AAAA,IACZ,SAAS,IAAI,OAAO,YAAY;AAC9B,UAAI,eAAe,OAAO,GAAG;AAC3B,cAAM,UAAU,oBAAoB,OAAO,IAAI,2BAA2B;AAC1E,cAAM,KAAK,QAAQ,MAAM,OAAO;AAChC,YAAI,MAAM,GAAG,SAAS,GAAG;AACvB,kBAAQ,CAAC,EAAE,KAAK,OAAO;AAAA,QACzB,OAAO;AACL,gBAAM,SAAS,MAAM,GAAG,UAAU;AAClC,kBAAQ,IAAI,sBAAsB,KAAK,UAAU,QAAQ,MAAM,CAAC,CAAC,EAAE;AAAA,QACrE;AAAA,MACF,OAAO;AACL,cAAM,iBAAiB,eAAe,KAAK,OAAO;AAClD,YAAI,MAAM,eAAe,SAAS,GAAG;AACnC,kBAAQ,CAAC,EAAE,KAAK,OAAO;AAAA,QACzB;AAAA,MACF;AAAA,IACF,CAAC;AAAA,EACH;AACA,SAAO;AACT;;;ADXA,IAAM,uBAAuB,mBAAmB,iBAAiB;AAE1D,IAAM,mBAAN,cAA+B,qBAAqB;AAAA,EACzD,OAAyB,gBAA0B,CAAC,GAAG,MAAM,eAAe,4BAA4B;AAAA,EACxG,OAAyB,sBAA8B;AAAA,EAE9C,UAAU,CAAC,4BAA4B,0BAA0B,GAAG,MAAM,OAAO;AAAA;AAAA;AAAA;AAAA,EAKvE,qBAAqB;AAAA,EAExC,MAAgB,cAAc,MAAY;AACxC,UAAM,cAAe,MAAM,KAAK,SAAS,QAAQ,EAAE,QAAQ,KAAK,CAAC;AACjE,QAAI,aAAa;AACf,aAAO;AAAA,IACT,OAAO;AACL,YAAM,SAAU,MAAM,KAAK,eAAe,QAAQ,EAAE,QAAQ,KAAK,CAAC;AAClE,UAAI,QAAQ;AACV,eAAO;AAAA,MACT,OAAO;AACL,cAAM,UAAW,MAAM,KAAK,SAAS,QAAQ,EAAE,OAAO,KAAK,CAAC;AAC5D,YAAI,SAAS;AACX,iBAAO;AAAA,QACT,OAAO;AACL,gBAAM,KAAM,MAAM,KAAK,eAAe,QAAQ,EAAE,OAAO,KAAK,CAAC;AAC7D,iBAAO,MAAM;AAAA,QACf;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAgB,kBAAkB,UAAoB;AACpD,UAAM,cAAe,MAAM,KAAK,SAAS,QAAQ,EAAE,WAAW,SAAS,CAAC;AACxE,QAAI,aAAa;AACf,aAAO;AAAA,IACT,OAAO;AACL,YAAM,SAAU,MAAM,KAAK,eAAe,QAAQ,EAAE,WAAW,SAAS,CAAC;AACzE,aAAO;AAAA,IACT;AAAA,EACF;AAAA,EAEA,MAAyB,WAAW,QAAqD;AACvF,QAAI,kBAAkB,CAAC,GAAG,MAAM;AAEhC,UAAM,gBAA4C,MAAM,QAAQ,IAAI,gBAAgB,IAAI,eAAa,KAAK,SAAS,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM;AAC1J,UAAM,qBAAqB,IAAI,IAAI,aAAa,IAAI,aAAW,QAAQ,SAAS,CAAC;AACjF,sBAAkB,gBAAgB,OAAO,UAAQ,CAAC,mBAAmB,IAAI,IAAI,CAAC;AAE9E,UAAM,WAA4C,MAAM,QAAQ,IAAI,gBAAgB;AAAA,MAClF,eAAa,KAAK,eAAe,QAAQ,EAAE,UAAU,CAAC;AAAA,IACxD,CAAC,GAAG,OAAO,MAAM;AAEjB,UAAM,gBAAgB,IAAI,IAAI,QAAQ,IAAI,aAAW,QAAQ,SAAS,CAAC;AACvE,sBAAkB,gBAAgB,OAAO,UAAQ,CAAC,cAAc,IAAI,IAAI,CAAC;AAEzE,UAAM,YAAwC,MAAM,QAAQ,IAAI,gBAAgB,IAAI,WAAS,KAAK,SAAS,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM;AAC9I,UAAM,iBAAiB,IAAI,IAAI,SAAS,IAAI,aAAW,QAAQ,KAAK,CAAC;AACrE,sBAAkB,gBAAgB,OAAO,UAAQ,CAAC,eAAe,IAAI,IAAI,CAAC;AAE1E,UAAM,OAAwC,MAAM,QAAQ,IAAI,gBAAgB,IAAI,WAAS,KAAK,eAAe,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM;AACpJ,UAAM,YAAY,IAAI,IAAI,IAAI,IAAI,aAAW,QAAQ,KAAK,CAAC;AAE3D,sBAAkB,gBAAgB,OAAO,UAAQ,CAAC,UAAU,IAAI,IAAI,CAAC;AAErE,UAAM,gBAAgB,CAAC,GAAG,cAAc,GAAG,SAAS,GAAG,UAAU,GAAG,GAAG;AACvE,UAAM,SAAS,cAAc,IAAI,oBAAoB;AAErD,WAAO;AAAA,EACT;AAAA,EAEA,MAAyB,cAAc,UAA2E;AAChH,UAAM,CAAC,IAAI,CAAC,IAAI,MAAM,YAAY,QAAQ;AAC1C,UAAM,2BAA2B,EAAE,IAAI,WAAS,mBAAmB,KAAK,CAAC;AACzE,QAAI,yBAAyB,SAAS,GAAG;AACvC,YAAM,iBAAiB,MAAM,KAAK,SAAS,WAAW,wBAAwB;AAC9E,UAAI,CAAC,eAAe,gBAAgB,eAAe,kBAAkB,yBAAyB;AAC5F,cAAM,IAAI,MAAM,4CAA4C;AAAA,IAChE;AAEA,UAAM,iCAAiC,GAAG,IAAI,WAAS,mBAAmB,KAAK,CAAC;AAChF,QAAI,+BAA+B,SAAS,GAAG;AAC7C,YAAM,uBAAuB,MAAM,KAAK,eAAe,WAAW,8BAA8B;AAChG,UAAI,CAAC,qBAAqB,gBAAgB,qBAAqB,kBAAkB,+BAA+B;AAC9G,cAAM,IAAI,MAAM,kDAAkD;AAAA,IACtE;AAEA,WAAO,CAAC,GAAG,gCAAgC,GAAG,wBAAwB,EAAE,IAAI,oBAAoB;AAAA,EAClG;AAAA,EAEA,MAAyB,YAAY,SAAqE;AAExG,QAAI;AAAA,MACF;AAAA,MAAO;AAAA,MAAQ;AAAA,MAAO;AAAA,IACxB,IAAI,WAAW,EAAE,OAAO,IAAI,OAAO,OAAO;AAE1C,QAAI,CAAC,MAAO,SAAQ;AACpB,QAAI,QAAQ,IAAK,SAAQ;AAEzB,QAAI,SAAS,MAAO,SAAQ;AAE5B,QAAI;AACJ,QAAI,QAAQ;AACV,YAAM,UAAU,MAAM,KAAK,kBAAkB,MAAM;AAEnD,UAAI,QAAS,MAAK,QAAQ;AAAA,IAC5B,OAAO;AACL,WAAK,UAAU,QAEX,SAAS,eAAe,CAAC,IAGzB,SAAS,gBAAgB,KAAK,IAAI,IAAI,OAAU,GAAI;AAAA,IAC1D;AACA,QAAI,CAAC,GAAI,QAAO,CAAC;AAGjB,UAAM,OAAO,UAAU,QAAQ,IAAI;AAGnC,UAAM,QAAQ,UAAU,QAAS,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,GAAG,EAAE,IAAM,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,GAAG,EAAE;AAG3I,UAAM,gBAAgB,MAAM,KAAK,SAAS,cAAc,CAAC,eAAe;AACtE,aAAO,WACJ,UAAgC;AAAA;AAAA,QAE/B,EAAE,QAAQ,MAAM;AAAA;AAAA,QAEhB,EAAE,OAAO,EAAE,KAAK,KAAK,EAAE;AAAA;AAAA,QAEvB,EAAE,QAAQ,MAAM;AAAA;AAAA,QAEhB;AAAA,UACE,YAAY;AAAA,YACV,MAAM,KAAK,sBAAsB;AAAA,YACjC,UAAU;AAAA,cACR,EAAE,QAAQ,MAAM;AAAA;AAAA,cAChB,EAAE,OAAO,EAAE,KAAK,KAAK,EAAE;AAAA;AAAA,cACvB,EAAE,QAAQ,MAAM;AAAA;AAAA,YAClB;AAAA,UACF;AAAA,QACF;AAAA;AAAA,QAEA,EAAE,OAAO,EAAE,KAAK,KAAK,EAAE;AAAA;AAAA,QAEvB,EAAE,QAAQ,MAAM;AAAA,MAClB,CAAC,EACA,UAAU,KAAK,kBAAkB,EACjC,QAAQ;AAAA,IACb,CAAC;AAGD,WAAO,cAAc,IAAI,oBAAoB;AAAA,EAC/C;AAAA,EAEA,MAAyB,eAAe;AACtC,UAAM,MAAM,aAAa;AACzB,UAAM,KAAK,cAAc;AAAA,EAC3B;AACF;;;AEjLA,SAAS,UAAAA,eAAc;AACvB,SAAS,qBAAAC,0BAAyB;AAElC;AAAA,EACE;AAAA,EAA4B;AAAA,EAAyB,8BAAAC;AAAA,EAA4B,4BAAAC;AAAA,OAC5E;AACP,SAAS,gCAAAC,qCAAoC;AAC7C,SAAS,4BAA4B;AACrC,SAAS,4BAA4B;AACrC;AAAA,EAC4C;AAAA,OAErC;AAEP,SAAS,wBAAAC,uBAAsB,sBAAAC,2BAA0B;AAGzD,IAAM,yBAAyB,qBAAqBL,kBAAiB;AAErE,IAAM,8BAA8B;AAE7B,IAAM,qBAAN,cAAiC,uBAAuB;AAAA,EAC7D,OAAyB,gBAA0B,CAAC,GAAG,MAAM,eAAeG,6BAA4B;AAAA,EACxG,OAAyB,sBAA8BA;AAAA,EAErC,UAAoB,CAACF,6BAA4BC,2BAA0B,GAAG,MAAM,OAAO;AAAA;AAAA;AAAA;AAAA,EAK1F,qBAAqB;AAAA,EAExC,MAAyB,cAAc,QAAqD;AAC1F,UAAM,WAAW,MAAM,KAAK,WAAW,MAAM;AAC7C,UAAM,cAAc,SAAS,IAAI,OAAK,EAAE,KAAK;AAC7C,UAAM,KAAK,SAAS,WAAW,EAAE,OAAO,EAAE,KAAK,YAAY,EAAE,CAAC;AAC9D,WAAO;AAAA,EACT;AAAA,EAEA,MAAgB,cAAc,MAAY;AACxC,UAAM,cAAe,MAAM,KAAK,SAAS,QAAQ,EAAE,QAAQ,KAAK,CAAC;AACjE,QAAI,aAAa;AACf,aAAO;AAAA,IACT,OAAO;AACL,YAAM,UAAW,MAAM,KAAK,SAAS,QAAQ,EAAE,OAAO,KAAK,CAAC;AAC5D,UAAI,SAAS;AACX,eAAO;AAAA,MACT;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAgB,kBAAkB,UAAoB;AACpD,UAAM,cAAe,MAAM,KAAK,SAAS,QAAQ,EAAE,WAAW,SAAS,CAAC;AACxE,QAAI,aAAa;AACf,aAAO;AAAA,IACT;AAAA,EACF;AAAA,EAEA,MAAyB,WAAW,QAAqD;AACvF,QAAI,kBAAkB,CAAC,GAAG,MAAM;AAEhC,UAAM,gBAA4C,MAAM,QAAQ,IAAI,gBAAgB,IAAI,eAAa,KAAK,SAAS,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAOH,OAAM;AAC1J,UAAM,qBAAqB,IAAI,IAAI,aAAa,IAAI,aAAW,QAAQ,SAAS,CAAC;AACjF,sBAAkB,gBAAgB,OAAO,UAAQ,CAAC,mBAAmB,IAAI,IAAI,CAAC;AAE9E,UAAM,YAAwC,MAAM,QAAQ,IAAI,gBAAgB,IAAI,WAAS,KAAK,SAAS,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,OAAOA,OAAM;AAC9I,UAAM,iBAAiB,IAAI,IAAI,SAAS,IAAI,aAAW,QAAQ,KAAK,CAAC;AAErE,sBAAkB,gBAAgB,OAAO,UAAQ,CAAC,eAAe,IAAI,IAAI,CAAC;AAE1E,UAAM,gBAAgB,CAAC,GAAG,cAAc,GAAG,QAAQ;AACnD,UAAM,SAAS,cAAc,IAAIK,qBAAoB;AACrD,WAAO;AAAA,EACT;AAAA,EAEA,MAAyB,cAAc,UAA2E;AAChH,UAAM,2BAA2B,SAAS,IAAI,WAASC,oBAAmB,KAAK,CAAC;AAChF,QAAI,yBAAyB,SAAS,GAAG;AACvC,UAAI;AACF,cAAM,iBAAiB,MAAM,KAAK,SAAS,WAAW,0BAA0B,EAAE,SAAS,MAAM,CAAC;AAClG,YAAI,CAAC,eAAe,aAAc,OAAM,IAAI,MAAM,4CAA4C;AAAA,MAChG,SAAS,OAAO;AACd,cAAM,aAAa;AAGnB,YAAI,YAAY,QAAQ,4BAA6B,OAAM;AAAA,MAC7D;AAAA,IACF;AACA,WAAO,CAAC,GAAG,wBAAwB,EAAE,IAAID,qBAAoB;AAAA,EAC/D;AAAA,EAEA,MAAyB,YAAY,SAAqE;AAExG,QAAI;AAAA,MACF;AAAA,MAAO;AAAA,MAAQ;AAAA,MAAO,OAAO;AAAA,IAC/B,IAAI,WAAW,EAAE,OAAO,IAAI,OAAO,OAAO;AAE1C,QAAI,CAAC,MAAO,SAAQ;AACpB,QAAI,QAAQ,IAAK,SAAQ;AAEzB,QAAI,SAAS,MAAO,SAAQ;AAE5B,QAAI;AACJ,QAAI,QAAQ;AACV,YAAM,UAAU,MAAM,KAAK,kBAAkB,MAAM;AAEnD,UAAI,QAAS,YAAW,QAAQ;AAAA,IAClC,OAAO;AACL,iBAAW,UAAU,QAEjB,kBAAkB,mBAGlB,kBAAkB;AAAA,IACxB;AACA,QAAI,CAAC,SAAU,QAAO,CAAC;AAGvB,UAAM,OAAO,UAAU,QAAQ,IAAI;AAEnC,UAAM,QAAQ,UAAU,QACnB,OACG,EAAE,WAAW,EAAE,KAAK,SAAS,EAAE,IAC/B,EAAE,WAAW,EAAE,MAAM,SAAS,EAAE,IACnC,OACG,EAAE,WAAW,EAAE,KAAK,SAAS,EAAE,IAC/B,EAAE,WAAW,EAAE,MAAM,SAAS,EAAE;AAGxC,UAAM,gBAAgB,MAAM,KAAK,SAAS,cAAc,CAAC,eAAe;AACtE,aAAO,WACJ,UAAgC;AAAA;AAAA,QAE/B,EAAE,QAAQ,MAAM;AAAA;AAAA,QAEhB,EAAE,OAAO,EAAE,WAAW,KAAK,EAAE;AAAA;AAAA,QAE7B,EAAE,QAAQ,MAAM;AAAA,MAClB,CAAC,EACA,UAAU,KAAK,kBAAkB,EACjC,QAAQ;AAAA,IACb,CAAC;AAGD,WAAO,cAAc,IAAIA,qBAAoB;AAAA,EAC/C;AAAA,EAEA,MAAyB,eAAe;AACtC,UAAM,MAAM,aAAa;AACzB,UAAM,KAAK,iBAAiB;AAAA,EAC9B;AACF;AAEO,IAAM,8BAAN,cAA0C,mBAAmB;AAAA,EAChD,UAAoB;AAAA,IACpC;AAAA,IACA;AAAA,IACAH;AAAA,IACAC;AAAA,IACA,GAAG;AAAA,EACL;AACF;;;AChKA,cAAc;","names":["exists","AbstractArchivist","ArchivistInsertQuerySchema","ArchivistNextQuerySchema","MongoDBArchivistConfigSchema","fromDbRepresentation","toDbRepresentation"]}

package/dist/node/lib/index.d.ts

@@ -1,2 +1,2 @@
-export * from './validByType.js';
+export * from './validByType.ts';
 //# sourceMappingURL=index.d.ts.map

package/dist/node/lib/validByType.d.ts

@@ -8,15 +8,15 @@ export declare const validByType: (payloads?: WithStorageMeta<Payload>[]) => Pro
     } & {
         readonly __address: true;
     })[];
-    payload_hashes: import("@xylabs/hex").BrandedHash[];
+    payload_hashes: import("@xylabs/sdk-js").BrandedHash[];
     payload_schemas: import("@xyo-network/payload-model").BrandedSchema<string>[];
-    previous_hashes: (import("@xylabs/hex").BrandedHash | null)[];
-    $signatures: (import("@xylabs/hex").BrandedHex | null)[];
+    previous_hashes: (import("@xylabs/sdk-js").BrandedHash | null)[];
+    $signatures: (import("@xylabs/sdk-js").BrandedHex | null)[];
     $destination?: (Lowercase<string> & {
         readonly __hex: true;
     } & {
         readonly __address: true;
     }) | undefined;
-    $sourceQuery?: import("@xylabs/hex").BrandedHash | undefined;
+    $sourceQuery?: import("@xylabs/sdk-js").BrandedHash | undefined;
 }>[], WithStorageMeta<Payload>[]]>;
 //# sourceMappingURL=validByType.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/archivist-mongodb",
-  "version": "5.3.22",
+  "version": "5.3.25",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -33,62 +33,58 @@
   "types": "dist/node/index.d.ts",
   "files": [
     "dist",
-    "src",
     "!**/*.bench.*",
     "!**/*.spec.*",
     "!**/*.test.*",
     "README.md"
   ],
   "dependencies": {
-    "@xyo-network/archivist-abstract": "~5.3.22",
-    "@xyo-network/archivist-model": "~5.3.22",
-    "@xyo-network/archivist-model-mongodb": "~5.3.22",
-    "@xyo-network/boundwitness-model": "~5.3.22",
-    "@xyo-network/boundwitness-wrapper": "~5.3.22",
-    "@xyo-network/module-abstract": "~5.3.22",
-    "@xyo-network/module-abstract-mongodb": "~5.3.22",
-    "@xyo-network/payload-model": "~5.3.22",
-    "@xyo-network/payload-mongodb": "~5.3.22",
-    "@xyo-network/payload-wrapper": "~5.3.22"
+    "@xyo-network/archivist-abstract": "~5.3.25",
+    "@xyo-network/archivist-model": "~5.3.25",
+    "@xyo-network/archivist-model-mongodb": "~5.3.25",
+    "@xyo-network/boundwitness-wrapper": "~5.3.25",
+    "@xyo-network/boundwitness-model": "~5.3.25",
+    "@xyo-network/module-abstract": "~5.3.25",
+    "@xyo-network/module-abstract-mongodb": "~5.3.25",
+    "@xyo-network/payload-model": "~5.3.25",
+    "@xyo-network/payload-mongodb": "~5.3.25",
+    "@xyo-network/payload-wrapper": "~5.3.25"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.9.1",
     "@types/node": "^25.5.0",
-    "@xylabs/mongo": "~5.0.91",
-    "@xylabs/sdk-js": "^5.0.91",
-    "@xylabs/ts-scripts-common": "~7.6.8",
-    "@xylabs/ts-scripts-yarn3": "~7.6.8",
-    "@xylabs/tsconfig": "~7.6.8",
-    "@xylabs/vitest-extended": "~5.0.91",
-    "@xyo-network/account": "~5.3.22",
-    "@xyo-network/archivist-abstract": "~5.3.22",
-    "@xyo-network/archivist-acceptance-tests": "~5.3.22",
-    "@xyo-network/archivist-model": "~5.3.22",
-    "@xyo-network/archivist-model-mongodb": "~5.3.22",
-    "@xyo-network/archivist-wrapper": "~5.3.22",
-    "@xyo-network/boundwitness-builder": "~5.3.22",
-    "@xyo-network/boundwitness-model": "~5.3.22",
-    "@xyo-network/boundwitness-wrapper": "~5.3.22",
-    "@xyo-network/module-abstract": "~5.3.22",
-    "@xyo-network/module-abstract-mongodb": "~5.3.22",
-    "@xyo-network/module-model": "~5.3.22",
-    "@xyo-network/payload-builder": "~5.3.22",
-    "@xyo-network/payload-model": "~5.3.22",
-    "@xyo-network/payload-mongodb": "~5.3.22",
-    "@xyo-network/payload-wrapper": "~5.3.22",
+    "@xylabs/mongo": "~5.0.93",
+    "@xylabs/sdk-js": "^5.0.93",
+    "@xylabs/ts-scripts-common": "~7.6.16",
+    "@xylabs/ts-scripts-pnpm": "~7.6.16",
+    "@xylabs/tsconfig": "~7.6.16",
+    "@xylabs/vitest-extended": "~5.0.93",
     "acorn": "^8.16.0",
     "axios": "^1.14.0",
-    "cosmiconfig": "^9.0.1",
-    "esbuild": "^0.27.4",
-    "eslint": "^10.1.0",
+    "esbuild": "^0.28.0",
     "ethers": "^6.16.0",
     "mongodb": "~7.1.1",
-    "rollup": "^4.60.1",
     "tslib": "^2.8.1",
     "typescript": "~5.9.3",
     "vite": "^8.0.3",
     "vitest": "~4.1.2",
-    "zod": "^4.3.6"
+    "zod": "^4.3.6",
+    "@xyo-network/archivist-abstract": "~5.3.25",
+    "@xyo-network/account": "~5.3.25",
+    "@xyo-network/archivist-acceptance-tests": "~5.3.25",
+    "@xyo-network/archivist-model-mongodb": "~5.3.25",
+    "@xyo-network/archivist-model": "~5.3.25",
+    "@xyo-network/boundwitness-model": "~5.3.25",
+    "@xyo-network/archivist-wrapper": "~5.3.25",
+    "@xyo-network/boundwitness-wrapper": "~5.3.25",
+    "@xyo-network/boundwitness-builder": "~5.3.25",
+    "@xyo-network/module-abstract-mongodb": "~5.3.25",
+    "@xyo-network/module-abstract": "~5.3.25",
+    "@xyo-network/payload-model": "~5.3.25",
+    "@xyo-network/payload-builder": "~5.3.25",
+    "@xyo-network/module-model": "~5.3.25",
+    "@xyo-network/payload-mongodb": "~5.3.25",
+    "@xyo-network/payload-wrapper": "~5.3.25"
   },
   "peerDependencies": {
     "@xylabs/sdk-js": "^5",
@@ -103,4 +99,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/src/Archivist.ts

@@ -1,179 +0,0 @@
-import type { Hash } from '@xylabs/sdk-js'
-import { exists } from '@xylabs/sdk-js'
-import { AbstractArchivist } from '@xyo-network/archivist-abstract'
-import type { ArchivistNextOptions } from '@xyo-network/archivist-model'
-import { ArchivistInsertQuerySchema, ArchivistNextQuerySchema } from '@xyo-network/archivist-model'
-import { MongoDBArchivistConfigSchema } from '@xyo-network/archivist-model-mongodb'
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-import { MongoDBModuleMixin } from '@xyo-network/module-abstract-mongodb'
-import type {
-  Payload, Schema, Sequence, WithStorageMeta,
-} from '@xyo-network/payload-model'
-import type { PayloadWithMongoMeta } from '@xyo-network/payload-mongodb'
-import { fromDbRepresentation, toDbRepresentation } from '@xyo-network/payload-mongodb'
-import { ObjectId } from 'mongodb'
-
-import { validByType } from './lib/index.js'
-
-const MongoDBArchivistBase = MongoDBModuleMixin(AbstractArchivist)
-
-export class MongoDBArchivist extends MongoDBArchivistBase {
-  static override readonly configSchemas: Schema[] = [...super.configSchemas, MongoDBArchivistConfigSchema]
-  static override readonly defaultConfigSchema: Schema = MongoDBArchivistConfigSchema
-
-  override queries = [ArchivistInsertQuerySchema, ArchivistNextQuerySchema, ...super.queries]
-
-  /**
-   * The amount of time to allow the aggregate query to execute
-   */
-  protected readonly aggregateTimeoutMs = 10_000
-
-  protected async findOneByHash(hash: Hash) {
-    const dataPayload = (await this.payloads.findOne({ _$hash: hash }))
-    if (dataPayload) {
-      return dataPayload
-    } else {
-      const dataBw = (await this.boundWitnesses.findOne({ _$hash: hash }))
-      if (dataBw) {
-        return dataBw
-      } else {
-        const payload = (await this.payloads.findOne({ _hash: hash }))
-        if (payload) {
-          return payload
-        } else {
-          const bw = (await this.boundWitnesses.findOne({ _hash: hash }))
-          return bw ?? undefined
-        }
-      }
-    }
-  }
-
-  protected async findOneBySequence(sequence: Sequence) {
-    const dataPayload = (await this.payloads.findOne({ _sequence: sequence }))
-    if (dataPayload) {
-      return dataPayload
-    } else {
-      const dataBw = (await this.boundWitnesses.findOne({ _sequence: sequence }))
-      return dataBw
-    }
-  }
-
-  protected override async getHandler(hashes: Hash[]): Promise<WithStorageMeta<Payload>[]> {
-    let remainingHashes = [...hashes]
-
-    const dataPayloads: WithStorageMeta<Payload>[] = (await Promise.all(remainingHashes.map(_dataHash => this.payloads.findOne({ _dataHash })))).filter(exists)
-    const dataPayloadsHashes = new Set(dataPayloads.map(payload => payload._dataHash))
-    remainingHashes = remainingHashes.filter(hash => !dataPayloadsHashes.has(hash))
-
-    const dataBws: WithStorageMeta<BoundWitness>[] = (await Promise.all(remainingHashes.map(
-      _dataHash => this.boundWitnesses.findOne({ _dataHash }),
-    ))).filter(exists)
-
-    const dataBwsHashes = new Set(dataBws.map(payload => payload._dataHash))
-    remainingHashes = remainingHashes.filter(hash => !dataBwsHashes.has(hash))
-
-    const payloads: WithStorageMeta<Payload>[] = (await Promise.all(remainingHashes.map(_hash => this.payloads.findOne({ _hash })))).filter(exists)
-    const payloadsHashes = new Set(payloads.map(payload => payload._hash))
-    remainingHashes = remainingHashes.filter(hash => !payloadsHashes.has(hash))
-
-    const bws: WithStorageMeta<BoundWitness>[] = (await Promise.all(remainingHashes.map(_hash => this.boundWitnesses.findOne({ _hash })))).filter(exists)
-    const bwsHashes = new Set(bws.map(payload => payload._hash))
-    // eslint-disable-next-line sonarjs/no-dead-store
-    remainingHashes = remainingHashes.filter(hash => !bwsHashes.has(hash))
-
-    const foundPayloads = [...dataPayloads, ...dataBws, ...payloads, ...bws] as PayloadWithMongoMeta<Payload>[]
-    const result = foundPayloads.map(fromDbRepresentation)
-    // console.log(`getHandler: ${JSON.stringify(hashes, null, 2)}:${JSON.stringify(result, null, 2)}`)
-    return result
-  }
-
-  protected override async insertHandler(payloads: WithStorageMeta<Payload>[]): Promise<WithStorageMeta<Payload>[]> {
-    const [bw, p] = await validByType(payloads)
-    const payloadsWithExternalMeta = p.map(value => toDbRepresentation(value))
-    if (payloadsWithExternalMeta.length > 0) {
-      const payloadsResult = await this.payloads.insertMany(payloadsWithExternalMeta)
-      if (!payloadsResult.acknowledged || payloadsResult.insertedCount !== payloadsWithExternalMeta.length)
-        throw new Error('MongoDBArchivist: Error inserting Payloads')
-    }
-
-    const boundWitnessesWithExternalMeta = bw.map(value => toDbRepresentation(value))
-    if (boundWitnessesWithExternalMeta.length > 0) {
-      const boundWitnessesResult = await this.boundWitnesses.insertMany(boundWitnessesWithExternalMeta)
-      if (!boundWitnessesResult.acknowledged || boundWitnessesResult.insertedCount !== boundWitnessesWithExternalMeta.length)
-        throw new Error('MongoDBArchivist: Error inserting BoundWitnesses')
-    }
-
-    return [...boundWitnessesWithExternalMeta, ...payloadsWithExternalMeta].map(fromDbRepresentation)
-  }
-
-  protected override async nextHandler(options?: ArchivistNextOptions): Promise<WithStorageMeta<Payload>[]> {
-    // Sanitize inputs and set defaults
-    let {
-      limit, cursor, order, open,
-    } = options ?? { limit: 10, order: 'desc' }
-
-    if (!limit) limit = 10
-    if (limit > 100) limit = 100
-
-    if (order != 'asc') order = 'desc'
-
-    let id: ObjectId | undefined
-    if (cursor) {
-      const payload = await this.findOneBySequence(cursor)
-      // TODO: Should we throw an error if the requested payload is not found?
-      if (payload) id = payload._id
-    } else {
-      id = order === 'asc'
-      // If ascending, start from the beginning of time
-        ? ObjectId.createFromTime(0)
-        // If descending, start from now (plus a bit more in the future to ensure
-        // them most recent ObjectIds are included)
-        : ObjectId.createFromTime((Date.now() + 10_000) / 1000)
-    }
-    if (!id) return []
-
-    // Create aggregate criteria
-    const sort = order === 'asc' ? 1 : -1
-    // TODO: How to handle random component of ID across multiple collections
-    // to ensure we don't skip some payloads
-    const match = order === 'asc' ? (open ? { _id: { $gte: id } } : { _id: { $gt: id } }) : (open ? { _id: { $lte: id } } : { _id: { $lt: id } })
-
-    // Run the aggregate query
-    const foundPayloads = await this.payloads.useCollection((collection) => {
-      return collection
-        .aggregate<PayloadWithMongoMeta>([
-          // Pre-filter payloads collection
-          { $match: match },
-          // Sort payloads by _id
-          { $sort: { _id: sort } },
-          // Limit payloads to the first N payloads
-          { $limit: limit },
-          // Combine with filtered boundWitnesses collection
-          {
-            $unionWith: {
-              coll: this.boundWitnessSdkConfig.collection,
-              pipeline: [
-                { $match: match }, // Pre-filter boundWitnesses
-                { $sort: { _id: sort } }, // Sort boundWitnesses by _id
-                { $limit: limit }, // Limit boundWitnesses to the first N boundWitnesses
-              ],
-            },
-          },
-          // Sort the combined result by _id
-          { $sort: { _id: sort } },
-          // Limit the final result to N documents
-          { $limit: limit },
-        ])
-        .maxTimeMS(this.aggregateTimeoutMs)
-        .toArray()
-    })
-
-    // Convert from DB representation to Payloads
-    return foundPayloads.map(fromDbRepresentation)
-  }
-
-  protected override async startHandler() {
-    await super.startHandler()
-    await this.ensureIndexes()
-  }
-}

package/src/ArchivistV2.ts

@@ -1,163 +0,0 @@
-import type { Hash } from '@xylabs/sdk-js'
-import { exists } from '@xylabs/sdk-js'
-import { AbstractArchivist } from '@xyo-network/archivist-abstract'
-import type { ArchivistNextOptions } from '@xyo-network/archivist-model'
-import {
-  ArchivistDeleteQuerySchema, ArchivistGetQuerySchema, ArchivistInsertQuerySchema, ArchivistNextQuerySchema,
-} from '@xyo-network/archivist-model'
-import { MongoDBArchivistConfigSchema } from '@xyo-network/archivist-model-mongodb'
-import { DefaultModuleQueries } from '@xyo-network/module-abstract'
-import { MongoDBModuleMixinV2 } from '@xyo-network/module-abstract-mongodb'
-import {
-  type Payload, type Schema, type Sequence, SequenceConstants,
-  type WithStorageMeta,
-} from '@xyo-network/payload-model'
-import type { PayloadWithMongoMeta } from '@xyo-network/payload-mongodb'
-import { fromDbRepresentation, toDbRepresentation } from '@xyo-network/payload-mongodb'
-import type { MongoError } from 'mongodb'
-
-const MongoDBArchivistBaseV2 = MongoDBModuleMixinV2(AbstractArchivist)
-
-const MONGODB_DUPLICATE_KEY_ERROR = 11_000
-
-export class MongoDBArchivistV2 extends MongoDBArchivistBaseV2 {
-  static override readonly configSchemas: Schema[] = [...super.configSchemas, MongoDBArchivistConfigSchema]
-  static override readonly defaultConfigSchema: Schema = MongoDBArchivistConfigSchema
-
-  override readonly queries: Schema[] = [ArchivistInsertQuerySchema, ArchivistNextQuerySchema, ...super.queries]
-
-  /**
-   * The amount of time to allow the aggregate query to execute
-   */
-  protected readonly aggregateTimeoutMs = 10_000
-
-  protected override async deleteHandler(hashes: Hash[]): Promise<WithStorageMeta<Payload>[]> {
-    const payloads = await this.getHandler(hashes)
-    const foundHashes = payloads.map(p => p._hash)
-    await this.payloads.deleteMany({ _hash: { $in: foundHashes } })
-    return payloads
-  }
-
-  protected async findOneByHash(hash: Hash) {
-    const dataPayload = (await this.payloads.findOne({ _$hash: hash }))
-    if (dataPayload) {
-      return dataPayload
-    } else {
-      const payload = (await this.payloads.findOne({ _hash: hash }))
-      if (payload) {
-        return payload
-      }
-    }
-  }
-
-  protected async findOneBySequence(sequence: Sequence) {
-    const dataPayload = (await this.payloads.findOne({ _sequence: sequence }))
-    if (dataPayload) {
-      return dataPayload
-    }
-  }
-
-  protected override async getHandler(hashes: Hash[]): Promise<WithStorageMeta<Payload>[]> {
-    let remainingHashes = [...hashes]
-
-    const dataPayloads: WithStorageMeta<Payload>[] = (await Promise.all(remainingHashes.map(_dataHash => this.payloads.findOne({ _dataHash })))).filter(exists)
-    const dataPayloadsHashes = new Set(dataPayloads.map(payload => payload._dataHash))
-    remainingHashes = remainingHashes.filter(hash => !dataPayloadsHashes.has(hash))
-
-    const payloads: WithStorageMeta<Payload>[] = (await Promise.all(remainingHashes.map(_hash => this.payloads.findOne({ _hash })))).filter(exists)
-    const payloadsHashes = new Set(payloads.map(payload => payload._hash))
-    // eslint-disable-next-line sonarjs/no-dead-store
-    remainingHashes = remainingHashes.filter(hash => !payloadsHashes.has(hash))
-
-    const foundPayloads = [...dataPayloads, ...payloads] as PayloadWithMongoMeta<Payload>[]
-    const result = foundPayloads.map(fromDbRepresentation)
-    return result
-  }
-
-  protected override async insertHandler(payloads: WithStorageMeta<Payload>[]): Promise<WithStorageMeta<Payload>[]> {
-    const payloadsWithExternalMeta = payloads.map(value => toDbRepresentation(value))
-    if (payloadsWithExternalMeta.length > 0) {
-      try {
-        const payloadsResult = await this.payloads.insertMany(payloadsWithExternalMeta, { ordered: false })
-        if (!payloadsResult.acknowledged) throw new Error('MongoDBArchivist: Error inserting Payloads')
-      } catch (error) {
-        const mongoError = error as MongoError
-        // Intentional coercive equality since Mongo error codes are
-        // of type string | number
-        if (mongoError?.code != MONGODB_DUPLICATE_KEY_ERROR) throw error
-      }
-    }
-    return [...payloadsWithExternalMeta].map(fromDbRepresentation)
-  }
-
-  protected override async nextHandler(options?: ArchivistNextOptions): Promise<WithStorageMeta<Payload>[]> {
-    // Sanitize inputs and set defaults
-    let {
-      limit, cursor, order, open = true,
-    } = options ?? { limit: 10, order: 'desc' }
-
-    if (!limit) limit = 10
-    if (limit > 100) limit = 100
-
-    if (order != 'asc') order = 'desc'
-
-    let sequence: Sequence | undefined
-    if (cursor) {
-      const payload = await this.findOneBySequence(cursor)
-      // TODO: Should we throw an error if the requested payload is not found?
-      if (payload) sequence = payload._sequence
-    } else {
-      sequence = order === 'asc'
-      // If ascending, start from the beginning of time
-        ? SequenceConstants.minLocalSequence
-        // If descending, start from now (plus a bit more in the future to ensure
-        // them most recent ObjectIds are included)
-        : SequenceConstants.maxLocalSequence
-    }
-    if (!sequence) return []
-
-    // Create find criteria
-    const sort = order === 'asc' ? 1 : -1
-
-    const match = order === 'asc'
-      ? (open
-          ? { _sequence: { $gt: sequence } }
-          : { _sequence: { $gte: sequence } })
-      : (open
-          ? { _sequence: { $lt: sequence } }
-          : { _sequence: { $lte: sequence } })
-
-    // Run the aggregate query
-    const foundPayloads = await this.payloads.useCollection((collection) => {
-      return collection
-        .aggregate<PayloadWithMongoMeta>([
-          // Pre-filter payloads collection
-          { $match: match },
-          // Sort payloads by _sequence
-          { $sort: { _sequence: sort } },
-          // Limit payloads to the first N payloads
-          { $limit: limit },
-        ])
-        .maxTimeMS(this.aggregateTimeoutMs)
-        .toArray()
-    })
-
-    // Convert from DB representation to Payloads
-    return foundPayloads.map(fromDbRepresentation)
-  }
-
-  protected override async startHandler() {
-    await super.startHandler()
-    await this.ensureCollection()
-  }
-}
-
-export class MongoDBArchivistV2Deletable extends MongoDBArchivistV2 {
-  override readonly queries: Schema[] = [
-    ArchivistDeleteQuerySchema,
-    ArchivistGetQuerySchema,
-    ArchivistInsertQuerySchema,
-    ArchivistNextQuerySchema,
-    ...DefaultModuleQueries,
-  ]
-}

package/src/index.ts

@@ -1,3 +0,0 @@
-export * from './Archivist.js'
-export * from './ArchivistV2.ts'
-export * from '@xyo-network/archivist-model-mongodb'

package/src/lib/index.ts

@@ -1 +0,0 @@
-export * from './validByType.js'

package/src/lib/validByType.ts

@@ -1,29 +0,0 @@
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-import { isBoundWitness, isQueryBoundWitness } from '@xyo-network/boundwitness-model'
-import { BoundWitnessWrapper, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
-import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
-import { PayloadWrapper } from '@xyo-network/payload-wrapper'
-
-export const validByType = async (payloads: WithStorageMeta<Payload>[] = []) => {
-  const results: [WithStorageMeta<BoundWitness>[], WithStorageMeta<Payload>[]] = [[], []]
-  await Promise.all(
-    payloads.map(async (payload) => {
-      if (isBoundWitness(payload)) {
-        const wrapper = isQueryBoundWitness(payload) ? QueryBoundWitnessWrapper : BoundWitnessWrapper
-        const bw = wrapper.parse(payload)
-        if (await bw.getValid()) {
-          results[0].push(payload)
-        } else {
-          const errors = await bw.getErrors()
-          console.log(`validByType.Error: ${JSON.stringify(errors, null, 2)}`)
-        }
-      } else {
-        const payloadWrapper = PayloadWrapper.wrap(payload)
-        if (await payloadWrapper.getValid()) {
-          results[1].push(payload)
-        }
-      }
-    }),
-  )
-  return results
-}