@xyo-network/archivist-memory 3.15.10 → 3.16.0

package/dist/neutral/index.mjs

@@ -104,16 +104,16 @@ var MemoryArchivist = class extends AbstractArchivist {
     return settled.filter(fulfilled).map((result) => result.value).filter(exists);
   }
   async deleteHandler(hashes) {
-    const deletedHashes = (await Promise.all(this.cache.dump().map(async ([key, item]) => {
+    const deletedPayloads = (await Promise.all(this.cache.dump().map(async ([key, item]) => {
       const itemValueDataHash = await PayloadBuilder.dataHash(item.value);
       if (hashes.includes(key) || hashes.includes(itemValueDataHash)) {
         this.cache.delete(key);
-        return key;
+        return item.value;
       }
     }))).filter(exists);
     this.rebuildDataHashIndex();
     await this.rebuildSequenceIndex();
-    return deletedHashes;
+    return deletedPayloads;
   }
   getHandler(hashes) {
     return hashes.map((hash) => {

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Archivist.ts","../../src/Config.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport {\n  Hash, Hex, hexToBigInt,\n} from '@xylabs/hex'\nimport {\n  fulfilled, Promisable, PromisableArray,\n} from '@xylabs/promise'\nimport { Account } from '@xyo-network/account'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { AbstractArchivist, StorageClassLabel } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistCommitQuerySchema,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuery,\n  ArchivistInsertQuerySchema,\n  ArchivistModuleEventData,\n  ArchivistNextOptions,\n  ArchivistNextQuerySchema,\n  ArchivistParams,\n  ArchivistSnapshotPayload,\n  ArchivistSnapshotPayloadSchema,\n  AttachableArchivistInstance,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport {\n  AnyConfigSchema, creatableModule, ModuleInstance,\n} from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport {\n  Payload, Schema, WithStorageMeta,\n} from '@xyo-network/payload-model'\nimport { LRUCache } from 'lru-cache'\n\nimport { MemoryArchivistConfig, MemoryArchivistConfigSchema } from './Config.ts'\n\nexport type MemoryArchivistParams<TConfig extends AnyConfigSchema<MemoryArchivistConfig> = AnyConfigSchema<MemoryArchivistConfig>> =\n  ArchivistParams<TConfig>\n@creatableModule()\nexport class MemoryArchivist<\n  TParams extends MemoryArchivistParams<AnyConfigSchema<MemoryArchivistConfig>> = MemoryArchivistParams,\n  TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n>\n  extends AbstractArchivist<TParams, TEventData>\n  implements AttachableArchivistInstance, ModuleInstance {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, MemoryArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = MemoryArchivistConfigSchema\n  static override readonly labels = { ...super.labels, [StorageClassLabel]: 'memory' }\n\n  private _cache?: LRUCache<Hash, WithStorageMeta<Payload>>\n  private _dataHashIndex?: LRUCache<Hash, Hash>\n  private _sequenceIndex: WithStorageMeta<Payload>[] = []\n\n  override get queries() {\n    return [\n      ArchivistAllQuerySchema,\n      ArchivistDeleteQuerySchema,\n      ArchivistClearQuerySchema,\n      ArchivistInsertQuerySchema,\n      ArchivistCommitQuerySchema,\n      ArchivistNextQuerySchema,\n      ...super.queries,\n    ]\n  }\n\n  protected get cache() {\n    this._cache = this._cache ?? new LRUCache<Hash, WithStorageMeta<Payload>>({ max: this.max })\n    return this._cache\n  }\n\n  protected get dataHashIndex() {\n    this._dataHashIndex = this._dataHashIndex ?? new LRUCache<Hash, Hash>({ max: this.max })\n    return this._dataHashIndex\n  }\n\n  protected get max() {\n    return this.config?.max ?? 10_000\n  }\n\n  private static findIndexFromCursor(payloads: WithStorageMeta[], cursor: Hex) {\n    const index = payloads.findIndex(({ _sequence }) => _sequence === cursor)\n    if (index === -1) {\n      return Infinity // move to the end\n    }\n    return index\n  }\n\n  async from(payloads: Payload[], account?: AccountInstance): Promise<MemoryArchivist> {\n    const archivist = await MemoryArchivist.create({ account: account ?? await Account.random() })\n    await archivist.insert(payloads)\n    return archivist\n  }\n\n  protected override allHandler(): Promisable<WithStorageMeta<Payload>[]> {\n    return [...this.cache.values()].filter(exists).toSorted(PayloadBuilder.compareStorageMeta)\n  }\n\n  protected override clearHandler(): void | Promise<void> {\n    this.cache.clear()\n    this.rebuildDataHashIndex()\n    this.rebuildDataHashIndex()\n    return this.emit('cleared', { mod: this })\n  }\n\n  protected override async commitHandler(): Promise<BoundWitness[]> {\n    const payloads = assertEx(await this.allHandler(), () => 'Nothing to commit')\n    const settled = await Promise.allSettled(\n      Object.values((await this.parentArchivists()).commit ?? [])?.map(async (parent) => {\n        const queryPayload: ArchivistInsertQuery = { schema: ArchivistInsertQuerySchema }\n        const query = await this.bindQuery(queryPayload, payloads)\n        return (await parent?.query(query[0], query[1]))?.[0]\n      }).filter(exists),\n    )\n    await this.clearHandler()\n    return settled.filter(fulfilled).map(result => result.value).filter(exists)\n  }\n\n  protected override async deleteHandler(hashes: Hash[]): Promise<Hash[]> {\n    const deletedHashes: Hash[] = (await Promise.all(this.cache\n      .dump()\n      .map(async ([key, item]) => {\n        const itemValueDataHash = await PayloadBuilder.dataHash(item.value)\n        if (hashes.includes(key) || hashes.includes(itemValueDataHash)) {\n          this.cache.delete(key)\n          return key\n        }\n      })))\n      .filter(exists)\n    this.rebuildDataHashIndex()\n    await this.rebuildSequenceIndex()\n    return deletedHashes\n  }\n\n  protected override getHandler(hashes: Hash[]): Promisable<WithStorageMeta<Payload>[]> {\n    return hashes.map((hash) => {\n      const resolvedHash = this.dataHashIndex.get(hash) ?? hash\n      const result = this.cache.get(resolvedHash)\n      if (resolvedHash !== hash && !result) {\n        throw new Error('Missing referenced payload')\n      }\n      return result\n    }).filter(exists)\n  }\n\n  protected override insertHandler(payloads: WithStorageMeta<Payload>[]): WithStorageMeta<Payload>[] {\n    const payloadsWithMeta = payloads.toSorted(PayloadBuilder.compareStorageMeta)\n    this._sequenceIndex.push(...payloadsWithMeta)\n    return payloadsWithMeta.map((payload) => {\n      return this.insertPayloadIntoCache(payload)\n    })\n  }\n\n  protected override nextHandler(options?: ArchivistNextOptions): Promisable<WithStorageMeta<Payload>[]> {\n    const {\n      limit = 100, cursor, order, open = true,\n    } = options ?? {}\n    let all = this._sequenceIndex.toSorted(PayloadBuilder.compareStorageMeta)\n    if (order === 'desc') {\n      all = all.toReversed()\n    }\n    const startIndex = cursor\n      ? MemoryArchivist.findIndexFromCursor(all, cursor) + (open ? 1 : 0)\n      : 0\n    return all.slice(startIndex, startIndex + limit)\n  }\n\n  protected override payloadCountHandler() {\n    return this.cache.size\n  }\n\n  protected override snapshotHandler(): PromisableArray<ArchivistSnapshotPayload<WithStorageMeta<Payload>, Hash>> {\n    return [{\n      hash: Object.fromEntries(\n        [...this.cache.entries()].toSorted(([, payloadA], [, payloadB]) => {\n          const diff = hexToBigInt(payloadA._sequence) - hexToBigInt(payloadB._sequence)\n          return diff > 0n ? 1 : diff < 0n ? -1 : 0\n        }),\n      ),\n      dataHash: Object.fromEntries(this.dataHashIndex.entries()),\n      schema: ArchivistSnapshotPayloadSchema,\n    }]\n  }\n\n  private insertPayloadIntoCache(payload: WithStorageMeta<Payload>): WithStorageMeta<Payload> {\n    this.cache.set(payload._hash, payload)\n    this.dataHashIndex.set(payload._dataHash, payload._hash)\n    return payload\n  }\n\n  private rebuildDataHashIndex() {\n    this._dataHashIndex = new LRUCache<Hash, Hash>({ max: this.max })\n    const payloads = this.cache.dump().map(([, item]) => item.value)\n    for (const payload of payloads) {\n      this.dataHashIndex.set(payload._dataHash, payload._hash)\n    }\n  }\n\n  private async rebuildSequenceIndex() {\n    this._sequenceIndex = (await this.allHandler()).toSorted(PayloadBuilder.compareStorageMeta)\n  }\n}\n","import type { EmptyObject, WithAdditional } from '@xylabs/object'\nimport type { ArchivistConfig } from '@xyo-network/archivist-model'\nimport type { Payload, Schema } from '@xyo-network/payload-model'\n\nexport const MemoryArchivistConfigSchema = 'network.xyo.archivist.memory.config' as const\nexport type MemoryArchivistConfigSchema = typeof MemoryArchivistConfigSchema\n\nexport type MemoryArchivistConfig<TConfig extends Payload | EmptyObject | void = void, TSchema extends Schema | void = void> = ArchivistConfig<\n  WithAdditional<\n    {\n      max?: number\n    },\n    TConfig\n  >,\n  TSchema extends Schema ? TSchema : MemoryArchivistConfigSchema | ArchivistConfig['schema']\n>\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../src/Archivist.ts","../../src/Config.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport {\n  Hash, Hex, hexToBigInt,\n} from '@xylabs/hex'\nimport {\n  fulfilled, Promisable, PromisableArray,\n} from '@xylabs/promise'\nimport { Account } from '@xyo-network/account'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { AbstractArchivist, StorageClassLabel } from '@xyo-network/archivist-abstract'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistCommitQuerySchema,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuery,\n  ArchivistInsertQuerySchema,\n  ArchivistModuleEventData,\n  ArchivistNextOptions,\n  ArchivistNextQuerySchema,\n  ArchivistParams,\n  ArchivistSnapshotPayload,\n  ArchivistSnapshotPayloadSchema,\n  AttachableArchivistInstance,\n} from '@xyo-network/archivist-model'\nimport { BoundWitness } from '@xyo-network/boundwitness-model'\nimport {\n  AnyConfigSchema, creatableModule, ModuleInstance,\n} from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport {\n  Payload, Schema, WithStorageMeta,\n} from '@xyo-network/payload-model'\nimport { LRUCache } from 'lru-cache'\n\nimport { MemoryArchivistConfig, MemoryArchivistConfigSchema } from './Config.ts'\n\nexport type MemoryArchivistParams<TConfig extends AnyConfigSchema<MemoryArchivistConfig> = AnyConfigSchema<MemoryArchivistConfig>> =\n  ArchivistParams<TConfig>\n@creatableModule()\nexport class MemoryArchivist<\n  TParams extends MemoryArchivistParams<AnyConfigSchema<MemoryArchivistConfig>> = MemoryArchivistParams,\n  TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n>\n  extends AbstractArchivist<TParams, TEventData>\n  implements AttachableArchivistInstance, ModuleInstance {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, MemoryArchivistConfigSchema]\n  static override readonly defaultConfigSchema: Schema = MemoryArchivistConfigSchema\n  static override readonly labels = { ...super.labels, [StorageClassLabel]: 'memory' }\n\n  private _cache?: LRUCache<Hash, WithStorageMeta<Payload>>\n  private _dataHashIndex?: LRUCache<Hash, Hash>\n  private _sequenceIndex: WithStorageMeta<Payload>[] = []\n\n  override get queries() {\n    return [\n      ArchivistAllQuerySchema,\n      ArchivistDeleteQuerySchema,\n      ArchivistClearQuerySchema,\n      ArchivistInsertQuerySchema,\n      ArchivistCommitQuerySchema,\n      ArchivistNextQuerySchema,\n      ...super.queries,\n    ]\n  }\n\n  protected get cache() {\n    this._cache = this._cache ?? new LRUCache<Hash, WithStorageMeta<Payload>>({ max: this.max })\n    return this._cache\n  }\n\n  protected get dataHashIndex() {\n    this._dataHashIndex = this._dataHashIndex ?? new LRUCache<Hash, Hash>({ max: this.max })\n    return this._dataHashIndex\n  }\n\n  protected get max() {\n    return this.config?.max ?? 10_000\n  }\n\n  private static findIndexFromCursor(payloads: WithStorageMeta[], cursor: Hex) {\n    const index = payloads.findIndex(({ _sequence }) => _sequence === cursor)\n    if (index === -1) {\n      return Infinity // move to the end\n    }\n    return index\n  }\n\n  async from(payloads: Payload[], account?: AccountInstance): Promise<MemoryArchivist> {\n    const archivist = await MemoryArchivist.create({ account: account ?? await Account.random() })\n    await archivist.insert(payloads)\n    return archivist\n  }\n\n  protected override allHandler(): Promisable<WithStorageMeta<Payload>[]> {\n    return [...this.cache.values()].filter(exists).toSorted(PayloadBuilder.compareStorageMeta)\n  }\n\n  protected override clearHandler(): void | Promise<void> {\n    this.cache.clear()\n    this.rebuildDataHashIndex()\n    this.rebuildDataHashIndex()\n    return this.emit('cleared', { mod: this })\n  }\n\n  protected override async commitHandler(): Promise<BoundWitness[]> {\n    const payloads = assertEx(await this.allHandler(), () => 'Nothing to commit')\n    const settled = await Promise.allSettled(\n      Object.values((await this.parentArchivists()).commit ?? [])?.map(async (parent) => {\n        const queryPayload: ArchivistInsertQuery = { schema: ArchivistInsertQuerySchema }\n        const query = await this.bindQuery(queryPayload, payloads)\n        return (await parent?.query(query[0], query[1]))?.[0]\n      }).filter(exists),\n    )\n    await this.clearHandler()\n    return settled.filter(fulfilled).map(result => result.value).filter(exists)\n  }\n\n  protected override async deleteHandler(hashes: Hash[]): Promise<WithStorageMeta[]> {\n    const deletedPayloads: WithStorageMeta<Payload>[] = (await Promise.all(this.cache\n      .dump()\n      .map(async ([key, item]) => {\n        const itemValueDataHash = await PayloadBuilder.dataHash(item.value)\n        if (hashes.includes(key) || hashes.includes(itemValueDataHash)) {\n          this.cache.delete(key)\n          return item.value\n        }\n      })))\n      .filter(exists)\n    this.rebuildDataHashIndex()\n    await this.rebuildSequenceIndex()\n    return deletedPayloads\n  }\n\n  protected override getHandler(hashes: Hash[]): Promisable<WithStorageMeta<Payload>[]> {\n    return hashes.map((hash) => {\n      const resolvedHash = this.dataHashIndex.get(hash) ?? hash\n      const result = this.cache.get(resolvedHash)\n      if (resolvedHash !== hash && !result) {\n        throw new Error('Missing referenced payload')\n      }\n      return result\n    }).filter(exists)\n  }\n\n  protected override insertHandler(payloads: WithStorageMeta<Payload>[]): WithStorageMeta<Payload>[] {\n    const payloadsWithMeta = payloads.toSorted(PayloadBuilder.compareStorageMeta)\n    this._sequenceIndex.push(...payloadsWithMeta)\n    return payloadsWithMeta.map((payload) => {\n      return this.insertPayloadIntoCache(payload)\n    })\n  }\n\n  protected override nextHandler(options?: ArchivistNextOptions): Promisable<WithStorageMeta<Payload>[]> {\n    const {\n      limit = 100, cursor, order, open = true,\n    } = options ?? {}\n    let all = this._sequenceIndex.toSorted(PayloadBuilder.compareStorageMeta)\n    if (order === 'desc') {\n      all = all.toReversed()\n    }\n    const startIndex = cursor\n      ? MemoryArchivist.findIndexFromCursor(all, cursor) + (open ? 1 : 0)\n      : 0\n    return all.slice(startIndex, startIndex + limit)\n  }\n\n  protected override payloadCountHandler() {\n    return this.cache.size\n  }\n\n  protected override snapshotHandler(): PromisableArray<ArchivistSnapshotPayload<WithStorageMeta<Payload>, Hash>> {\n    return [{\n      hash: Object.fromEntries(\n        [...this.cache.entries()].toSorted(([, payloadA], [, payloadB]) => {\n          const diff = hexToBigInt(payloadA._sequence) - hexToBigInt(payloadB._sequence)\n          return diff > 0n ? 1 : diff < 0n ? -1 : 0\n        }),\n      ),\n      dataHash: Object.fromEntries(this.dataHashIndex.entries()),\n      schema: ArchivistSnapshotPayloadSchema,\n    }]\n  }\n\n  private insertPayloadIntoCache(payload: WithStorageMeta<Payload>): WithStorageMeta<Payload> {\n    this.cache.set(payload._hash, payload)\n    this.dataHashIndex.set(payload._dataHash, payload._hash)\n    return payload\n  }\n\n  private rebuildDataHashIndex() {\n    this._dataHashIndex = new LRUCache<Hash, Hash>({ max: this.max })\n    const payloads = this.cache.dump().map(([, item]) => item.value)\n    for (const payload of payloads) {\n      this.dataHashIndex.set(payload._dataHash, payload._hash)\n    }\n  }\n\n  private async rebuildSequenceIndex() {\n    this._sequenceIndex = (await this.allHandler()).toSorted(PayloadBuilder.compareStorageMeta)\n  }\n}\n","import type { EmptyObject, WithAdditional } from '@xylabs/object'\nimport type { ArchivistConfig } from '@xyo-network/archivist-model'\nimport type { Payload, Schema } from '@xyo-network/payload-model'\n\nexport const MemoryArchivistConfigSchema = 'network.xyo.archivist.memory.config' as const\nexport type MemoryArchivistConfigSchema = typeof MemoryArchivistConfigSchema\n\nexport type MemoryArchivistConfig<TConfig extends Payload | EmptyObject | void = void, TSchema extends Schema | void = void> = ArchivistConfig<\n  WithAdditional<\n    {\n      max?: number\n    },\n    TConfig\n  >,\n  TSchema extends Schema ? TSchema : MemoryArchivistConfigSchema | ArchivistConfig['schema']\n>\n"],"mappings":"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","names":[]}

package/dist/types/Archivist.d.ts

@@ -27,7 +27,7 @@ export declare class MemoryArchivist<TParams extends MemoryArchivistParams<AnyCo
     protected allHandler(): Promisable<WithStorageMeta<Payload>[]>;
     protected clearHandler(): void | Promise<void>;
     protected commitHandler(): Promise<BoundWitness[]>;
-    protected deleteHandler(hashes: Hash[]): Promise<Hash[]>;
+    protected deleteHandler(hashes: Hash[]): Promise<WithStorageMeta[]>;
     protected getHandler(hashes: Hash[]): Promisable<WithStorageMeta<Payload>[]>;
     protected insertHandler(payloads: WithStorageMeta<Payload>[]): WithStorageMeta<Payload>[];
     protected nextHandler(options?: ArchivistNextOptions): Promisable<WithStorageMeta<Payload>[]>;

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

@@ -1 +1 @@
-{"version":3,"file":"Archivist.d.ts","sourceRoot":"","sources":["../../src/Archivist.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,IAAI,EACL,MAAM,aAAa,CAAA;AACpB,OAAO,EACM,UAAU,EAAE,eAAe,EACvC,MAAM,iBAAiB,CAAA;AAExB,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAqB,MAAM,iCAAiC,CAAA;AACtF,OAAO,EAOL,wBAAwB,EACxB,oBAAoB,EAEpB,eAAe,EACf,wBAAwB,EAExB,2BAA2B,EAC5B,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EACL,eAAe,EAAmB,cAAc,EACjD,MAAM,2BAA2B,CAAA;AAElC,OAAO,EACL,OAAO,EAAE,MAAM,EAAE,eAAe,EACjC,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEpC,OAAO,EAAE,qBAAqB,EAA+B,MAAM,aAAa,CAAA;AAEhF,MAAM,MAAM,qBAAqB,CAAC,OAAO,SAAS,eAAe,CAAC,qBAAqB,CAAC,GAAG,eAAe,CAAC,qBAAqB,CAAC,IAC/H,eAAe,CAAC,OAAO,CAAC,CAAA;AAC1B,qBACa,eAAe,CAC1B,OAAO,SAAS,qBAAqB,CAAC,eAAe,CAAC,qBAAqB,CAAC,CAAC,GAAG,qBAAqB,EACrG,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAEtE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,2BAA2B,EAAE,cAAc;IACtD,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwD;IACxG,gBAAyB,mBAAmB,EAAE,MAAM,CAA8B;IAClF,gBAAyB,MAAM;;MAAqD;IAEpF,OAAO,CAAC,MAAM,CAAC,CAA0C;IACzD,OAAO,CAAC,cAAc,CAAC,CAAsB;IAC7C,OAAO,CAAC,cAAc,CAAiC;IAEvD,IAAa,OAAO,aAUnB;IAED,SAAS,KAAK,KAAK,mEAGlB;IAED,SAAS,KAAK,aAAa,4DAG1B;IAED,SAAS,KAAK,GAAG,WAEhB;IAED,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAQ5B,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;cAMjE,UAAU,IAAI,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cAIpD,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAO9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAaxC,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;cAgBpD,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cAWlE,aAAa,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,EAAE;cAQ/E,WAAW,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cAcnF,mBAAmB;cAInB,eAAe,IAAI,eAAe,CAAC,wBAAwB,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;IAa/G,OAAO,CAAC,sBAAsB;IAM9B,OAAO,CAAC,oBAAoB;YAQd,oBAAoB;CAGnC"}
+{"version":3,"file":"Archivist.d.ts","sourceRoot":"","sources":["../../src/Archivist.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,IAAI,EACL,MAAM,aAAa,CAAA;AACpB,OAAO,EACM,UAAU,EAAE,eAAe,EACvC,MAAM,iBAAiB,CAAA;AAExB,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAqB,MAAM,iCAAiC,CAAA;AACtF,OAAO,EAOL,wBAAwB,EACxB,oBAAoB,EAEpB,eAAe,EACf,wBAAwB,EAExB,2BAA2B,EAC5B,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EACL,eAAe,EAAmB,cAAc,EACjD,MAAM,2BAA2B,CAAA;AAElC,OAAO,EACL,OAAO,EAAE,MAAM,EAAE,eAAe,EACjC,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEpC,OAAO,EAAE,qBAAqB,EAA+B,MAAM,aAAa,CAAA;AAEhF,MAAM,MAAM,qBAAqB,CAAC,OAAO,SAAS,eAAe,CAAC,qBAAqB,CAAC,GAAG,eAAe,CAAC,qBAAqB,CAAC,IAC/H,eAAe,CAAC,OAAO,CAAC,CAAA;AAC1B,qBACa,eAAe,CAC1B,OAAO,SAAS,qBAAqB,CAAC,eAAe,CAAC,qBAAqB,CAAC,CAAC,GAAG,qBAAqB,EACrG,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAEtE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,2BAA2B,EAAE,cAAc;IACtD,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwD;IACxG,gBAAyB,mBAAmB,EAAE,MAAM,CAA8B;IAClF,gBAAyB,MAAM;;MAAqD;IAEpF,OAAO,CAAC,MAAM,CAAC,CAA0C;IACzD,OAAO,CAAC,cAAc,CAAC,CAAsB;IAC7C,OAAO,CAAC,cAAc,CAAiC;IAEvD,IAAa,OAAO,aAUnB;IAED,SAAS,KAAK,KAAK,mEAGlB;IAED,SAAS,KAAK,aAAa,4DAG1B;IAED,SAAS,KAAK,GAAG,WAEhB;IAED,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAQ5B,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;cAMjE,UAAU,IAAI,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cAIpD,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAO9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAaxC,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;cAgB/D,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cAWlE,aAAa,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,EAAE;cAQ/E,WAAW,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;cAcnF,mBAAmB;cAInB,eAAe,IAAI,eAAe,CAAC,wBAAwB,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;IAa/G,OAAO,CAAC,sBAAsB;IAM9B,OAAO,CAAC,oBAAoB;YAQd,oBAAoB;CAGnC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/archivist-memory",
-  "version": "3.15.10",
+  "version": "3.16.0",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -34,14 +34,14 @@
     "@xylabs/hex": "^4.9.18",
     "@xylabs/object": "^4.9.18",
     "@xylabs/promise": "^4.9.18",
-    "@xyo-network/account": "^3.15.10",
-    "@xyo-network/account-model": "^3.15.10",
-    "@xyo-network/archivist-abstract": "^3.15.10",
-    "@xyo-network/archivist-model": "^3.15.10",
-    "@xyo-network/boundwitness-model": "^3.15.10",
-    "@xyo-network/module-model": "^3.15.10",
-    "@xyo-network/payload-builder": "^3.15.10",
-    "@xyo-network/payload-model": "^3.15.10",
+    "@xyo-network/account": "^3.16.0",
+    "@xyo-network/account-model": "^3.16.0",
+    "@xyo-network/archivist-abstract": "^3.16.0",
+    "@xyo-network/archivist-model": "^3.16.0",
+    "@xyo-network/boundwitness-model": "^3.16.0",
+    "@xyo-network/module-model": "^3.16.0",
+    "@xyo-network/payload-builder": "^3.16.0",
+    "@xyo-network/payload-model": "^3.16.0",
     "lru-cache": "^11.1.0"
   },
   "devDependencies": {
@@ -49,10 +49,10 @@
     "@xylabs/ts-scripts-yarn3": "^6.5.6",
     "@xylabs/tsconfig": "^6.5.6",
     "@xylabs/vitest-extended": "^4.9.18",
-    "@xyo-network/archivist-acceptance-tests": "^3.15.10",
-    "@xyo-network/id-payload-plugin": "^3.15.10",
-    "@xyo-network/payload-wrapper": "^3.15.10",
-    "@xyo-network/wallet": "^3.15.10",
+    "@xyo-network/archivist-acceptance-tests": "^3.16.0",
+    "@xyo-network/id-payload-plugin": "^3.16.0",
+    "@xyo-network/payload-wrapper": "^3.16.0",
+    "@xyo-network/wallet": "^3.16.0",
     "typescript": "^5.8.3",
     "vitest": "^3.1.3"
   },

package/src/Archivist.ts

@@ -117,20 +117,20 @@ export class MemoryArchivist<
     return settled.filter(fulfilled).map(result => result.value).filter(exists)
   }
 
-  protected override async deleteHandler(hashes: Hash[]): Promise<Hash[]> {
-    const deletedHashes: Hash[] = (await Promise.all(this.cache
+  protected override async deleteHandler(hashes: Hash[]): Promise<WithStorageMeta[]> {
+    const deletedPayloads: WithStorageMeta<Payload>[] = (await Promise.all(this.cache
       .dump()
       .map(async ([key, item]) => {
         const itemValueDataHash = await PayloadBuilder.dataHash(item.value)
         if (hashes.includes(key) || hashes.includes(itemValueDataHash)) {
           this.cache.delete(key)
-          return key
+          return item.value
         }
       })))
       .filter(exists)
     this.rebuildDataHashIndex()
     await this.rebuildSequenceIndex()
-    return deletedHashes
+    return deletedPayloads
   }
 
   protected override getHandler(hashes: Hash[]): Promisable<WithStorageMeta<Payload>[]> {