@xyo-network/archivist-memory 5.3.15 → 5.3.17

package/dist/neutral/MemoryDriver.d.ts

@@ -13,10 +13,12 @@ export declare class MemoryDriver extends AbstractCreatable<MemoryDriverParams>
     private _cache?;
     private _config?;
     private _dataHashIndex?;
+    private _sortedValues?;
     protected get cache(): LRUCache<import("@xylabs/sdk-js").BrandedHash, WithStorageMeta<Payload>, unknown>;
     protected get config(): MemoryDriverConfig;
     protected get dataHashIndex(): LRUCache<import("@xylabs/sdk-js").BrandedHash, import("@xylabs/sdk-js").BrandedHash, unknown>;
     protected get max(): number;
+    protected get sortedValues(): WithStorageMeta<Payload>[];
     private static findIndexFromCursor;
     all(): Promisable<WithStorageMeta<Payload>[]>;
     clear(): void;

package/dist/neutral/MemoryDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryDriver.d.ts","sourceRoot":"","sources":["../../src/MemoryDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EAAO,UAAU,EACtB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EACL,iBAAiB,EACN,eAAe,EAE3B,MAAM,gBAAgB,CAAA;AACvB,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AAEzF,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEpC,MAAM,WAAW,kBAAkB;IACjC,GAAG,CAAC,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,kBAAmB,SAAQ,eAAe;IACzD,MAAM,EAAE,kBAAkB,CAAA;CAC3B;AAED,qBACa,YAAa,SAAQ,iBAAiB,CAAC,kBAAkB,CACpE,YAAW,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;IACnE,OAAO,CAAC,MAAM,CAAC,CAA0C;IACzD,OAAO,CAAC,OAAO,CAAC,CAAoB;IACpC,OAAO,CAAC,cAAc,CAAC,CAAsB;IAE7C,SAAS,KAAK,KAAK,sFAGlB;IAED,SAAS,KAAK,MAAM,uBAEnB;IAED,SAAS,KAAK,aAAa,kGAG1B;IAED,SAAS,KAAK,GAAG,WAEhB;IAED,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAQlC,GAAG,IAAI,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;IAI7C,KAAK;IAKL,KAAK;IAII,aAAa,IAAI,UAAU,CAAC,IAAI,CAAC;IAIpC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAexD,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;IAW3D,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,EAAE;IAOxE,IAAI,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;IAc5E,OAAO,CAAC,sBAAsB;IAM9B,OAAO,CAAC,oBAAoB;CAO7B"}
+{"version":3,"file":"MemoryDriver.d.ts","sourceRoot":"","sources":["../../src/MemoryDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EAAO,UAAU,EACtB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EACL,iBAAiB,EACN,eAAe,EAE3B,MAAM,gBAAgB,CAAA;AACvB,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AAEzF,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEpC,MAAM,WAAW,kBAAkB;IACjC,GAAG,CAAC,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,kBAAmB,SAAQ,eAAe;IACzD,MAAM,EAAE,kBAAkB,CAAA;CAC3B;AAED,qBACa,YAAa,SAAQ,iBAAiB,CAAC,kBAAkB,CACpE,YAAW,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;IACnE,OAAO,CAAC,MAAM,CAAC,CAA0C;IACzD,OAAO,CAAC,OAAO,CAAC,CAAoB;IACpC,OAAO,CAAC,cAAc,CAAC,CAAsB;IAC7C,OAAO,CAAC,aAAa,CAAC,CAA4B;IAElD,SAAS,KAAK,KAAK,sFAMlB;IAED,SAAS,KAAK,MAAM,uBAEnB;IAED,SAAS,KAAK,aAAa,kGAG1B;IAED,SAAS,KAAK,GAAG,WAEhB;IAED,SAAS,KAAK,YAAY,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE,CAKvD;IAED,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAQlC,GAAG,IAAI,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;IAI7C,KAAK;IAML,KAAK;IAII,aAAa,IAAI,UAAU,CAAC,IAAI,CAAC;IAIpC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAgBxD,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;IAW3D,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,EAAE;IAQxE,IAAI,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;IAW5E,OAAO,CAAC,sBAAsB;IAM9B,OAAO,CAAC,oBAAoB;CAO7B"}

package/dist/neutral/index.mjs

@@ -49,8 +49,14 @@ var MemoryDriver = class extends AbstractCreatable {
   _cache;
   _config;
   _dataHashIndex;
+  _sortedValues;
   get cache() {
-    this._cache = this._cache ?? new LRUCache({ max: this.max });
+    this._cache = this._cache ?? new LRUCache({
+      max: this.max,
+      dispose: () => {
+        this._sortedValues = void 0;
+      }
+    });
     return this._cache;
   }
   get config() {
@@ -63,6 +69,12 @@ var MemoryDriver = class extends AbstractCreatable {
   get max() {
     return this.config?.max ?? 1e4;
   }
+  get sortedValues() {
+    if (!this._sortedValues) {
+      this._sortedValues = [...this.cache.values()].filter(exists).toSorted(PayloadBuilder.compareStorageMeta);
+    }
+    return this._sortedValues;
+  }
   static findIndexFromCursor(payloads, cursor) {
     const index = payloads.findIndex(({ _sequence }) => _sequence === cursor);
     if (index === -1) {
@@ -71,11 +83,12 @@ var MemoryDriver = class extends AbstractCreatable {
     return index;
   }
   all() {
-    return [...this.cache.values()].filter(exists).toSorted(PayloadBuilder.compareStorageMeta);
+    return [...this.sortedValues];
   }
   clear() {
     this.cache.clear();
     this._dataHashIndex = new LRUCache({ max: this.max });
+    this._sortedValues = void 0;
   }
   count() {
     return this.cache.size;
@@ -84,6 +97,7 @@ var MemoryDriver = class extends AbstractCreatable {
     this._config = this.params.config ?? {};
   }
   async delete(hashes) {
+    this._sortedValues = void 0;
     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)) {
@@ -105,6 +119,7 @@ var MemoryDriver = class extends AbstractCreatable {
     }).filter(exists);
   }
   insert(payloads) {
+    this._sortedValues = void 0;
     const payloadsWithMeta = payloads.toSorted(PayloadBuilder.compareStorageMeta);
     return payloadsWithMeta.map((payload) => {
       return this.insertPayloadIntoCache(payload);
@@ -117,10 +132,7 @@ var MemoryDriver = class extends AbstractCreatable {
       order,
       open = true
     } = options ?? {};
-    let all = [...this.cache.values() ?? []].toSorted(PayloadBuilder.compareStorageMeta);
-    if (order === "desc") {
-      all = all.toReversed();
-    }
+    const all = order === "desc" ? this.sortedValues.toReversed() : this.sortedValues;
     const startIndex = isDefined(cursor) ? MemoryDriver.findIndexFromCursor(all, cursor) + (open ? 1 : 0) : 0;
     return all.slice(startIndex, startIndex + limit);
   }

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Archivist.ts","../../src/Config.ts","../../src/MemoryDriver.ts"],"sourcesContent":["import { StorageClassLabel } from '@xyo-network/archivist-abstract'\nimport { GenericArchivist, GenericArchivistParams } from '@xyo-network/archivist-generic'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistCommitQuerySchema,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuerySchema,\n  ArchivistModuleEventData,\n  ArchivistNextQuerySchema,\n  AttachableArchivistInstance,\n} from '@xyo-network/archivist-model'\nimport {\n  AnyConfigSchema, AttachableModuleInstance, creatableModule, ModuleInstance,\n} from '@xyo-network/module-model'\nimport { Schema } from '@xyo-network/payload-model'\n\nimport { MemoryArchivistConfig, MemoryArchivistConfigSchema } from './Config.ts'\nimport { MemoryDriver } from './MemoryDriver.ts'\n\nexport type MemoryArchivistParams<TConfig extends AnyConfigSchema<MemoryArchivistConfig> = AnyConfigSchema<MemoryArchivistConfig>>\n  = GenericArchivistParams<TConfig>\n@creatableModule()\nexport class MemoryArchivist<\n  TParams extends MemoryArchivistParams<AnyConfigSchema<MemoryArchivistConfig>> = MemoryArchivistParams,\n  TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n>\n  extends GenericArchivist<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  override get queries() {\n    return [\n      ArchivistAllQuerySchema,\n      ArchivistDeleteQuerySchema,\n      ArchivistClearQuerySchema,\n      ArchivistInsertQuerySchema,\n      ArchivistCommitQuerySchema,\n      ArchivistNextQuerySchema,\n      ...super.queries,\n    ]\n  }\n\n  static override async paramsHandler<T extends AttachableModuleInstance<MemoryArchivistParams, ArchivistModuleEventData>>(\n    inParams?: Partial<T['params']>,\n  ): Promise<T['params']> {\n    const superParams = await super.paramsHandler(inParams)\n    return { ...superParams, driver: superParams.driver ?? await MemoryDriver.create(superParams) }\n  }\n}\n","import type { EmptyObject, WithAdditional } from '@xylabs/sdk-js'\nimport type { ArchivistConfig } from '@xyo-network/archivist-model'\nimport {\n  asSchema, type Payload, type Schema,\n} from '@xyo-network/payload-model'\n\nexport const MemoryArchivistConfigSchema = asSchema('network.xyo.archivist.memory.config', true)\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","import type {\n  Hash, Hex, Promisable,\n} from '@xylabs/sdk-js'\nimport {\n  AbstractCreatable, assertEx,\n  creatable, CreatableParams, exists,\n  isDefined,\n} from '@xylabs/sdk-js'\nimport type { ArchivistDriver, ArchivistNextOptions } from '@xyo-network/archivist-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport type { Payload, WithStorageMeta } from '@xyo-network/payload-model'\nimport { LRUCache } from 'lru-cache'\n\nexport interface MemoryDriverConfig {\n  max?: number\n}\n\nexport interface MemoryDriverParams extends CreatableParams {\n  config: MemoryDriverConfig\n}\n\n@creatable()\nexport class MemoryDriver extends AbstractCreatable<MemoryDriverParams>\n  implements ArchivistDriver<Hash, Payload, WithStorageMeta<Payload>> {\n  private _cache?: LRUCache<Hash, WithStorageMeta<Payload>>\n  private _config?: MemoryDriverConfig\n  private _dataHashIndex?: LRUCache<Hash, Hash>\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 config() {\n    return assertEx(this._config, () => 'Driver config is not set')\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  all(): Promisable<WithStorageMeta<Payload>[]> {\n    return [...this.cache.values()].filter(exists).toSorted(PayloadBuilder.compareStorageMeta)\n  }\n\n  clear() {\n    this.cache.clear()\n    this._dataHashIndex = new LRUCache<Hash, Hash>({ max: this.max })\n  }\n\n  count() {\n    return this.cache.size\n  }\n\n  override createHandler(): Promisable<void> {\n    this._config = this.params.config ?? {}\n  }\n\n  async delete(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    return deletedPayloads\n  }\n\n  get(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  insert(payloads: WithStorageMeta<Payload>[]): WithStorageMeta<Payload>[] {\n    const payloadsWithMeta = payloads.toSorted(PayloadBuilder.compareStorageMeta)\n    return payloadsWithMeta.map((payload) => {\n      return this.insertPayloadIntoCache(payload)\n    })\n  }\n\n  next(options?: ArchivistNextOptions): Promisable<WithStorageMeta<Payload>[]> {\n    const {\n      limit = 100, cursor, order, open = true,\n    } = options ?? {}\n    let all = [...this.cache.values() ?? []].toSorted(PayloadBuilder.compareStorageMeta)\n    if (order === 'desc') {\n      all = all.toReversed()\n    }\n    const startIndex = isDefined(cursor)\n      ? MemoryDriver.findIndexFromCursor(all, cursor) + (open ? 1 : 0)\n      : 0\n    return all.slice(startIndex, startIndex + limit)\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"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../src/Archivist.ts","../../src/Config.ts","../../src/MemoryDriver.ts"],"sourcesContent":["import { StorageClassLabel } from '@xyo-network/archivist-abstract'\nimport { GenericArchivist, GenericArchivistParams } from '@xyo-network/archivist-generic'\nimport {\n  ArchivistAllQuerySchema,\n  ArchivistClearQuerySchema,\n  ArchivistCommitQuerySchema,\n  ArchivistDeleteQuerySchema,\n  ArchivistInsertQuerySchema,\n  ArchivistModuleEventData,\n  ArchivistNextQuerySchema,\n  AttachableArchivistInstance,\n} from '@xyo-network/archivist-model'\nimport {\n  AnyConfigSchema, AttachableModuleInstance, creatableModule, ModuleInstance,\n} from '@xyo-network/module-model'\nimport { Schema } from '@xyo-network/payload-model'\n\nimport { MemoryArchivistConfig, MemoryArchivistConfigSchema } from './Config.ts'\nimport { MemoryDriver } from './MemoryDriver.ts'\n\nexport type MemoryArchivistParams<TConfig extends AnyConfigSchema<MemoryArchivistConfig> = AnyConfigSchema<MemoryArchivistConfig>>\n  = GenericArchivistParams<TConfig>\n@creatableModule()\nexport class MemoryArchivist<\n  TParams extends MemoryArchivistParams<AnyConfigSchema<MemoryArchivistConfig>> = MemoryArchivistParams,\n  TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,\n>\n  extends GenericArchivist<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  override get queries() {\n    return [\n      ArchivistAllQuerySchema,\n      ArchivistDeleteQuerySchema,\n      ArchivistClearQuerySchema,\n      ArchivistInsertQuerySchema,\n      ArchivistCommitQuerySchema,\n      ArchivistNextQuerySchema,\n      ...super.queries,\n    ]\n  }\n\n  static override async paramsHandler<T extends AttachableModuleInstance<MemoryArchivistParams, ArchivistModuleEventData>>(\n    inParams?: Partial<T['params']>,\n  ): Promise<T['params']> {\n    const superParams = await super.paramsHandler(inParams)\n    return { ...superParams, driver: superParams.driver ?? await MemoryDriver.create(superParams) }\n  }\n}\n","import type { EmptyObject, WithAdditional } from '@xylabs/sdk-js'\nimport type { ArchivistConfig } from '@xyo-network/archivist-model'\nimport {\n  asSchema, type Payload, type Schema,\n} from '@xyo-network/payload-model'\n\nexport const MemoryArchivistConfigSchema = asSchema('network.xyo.archivist.memory.config', true)\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","import type {\n  Hash, Hex, Promisable,\n} from '@xylabs/sdk-js'\nimport {\n  AbstractCreatable, assertEx,\n  creatable, CreatableParams, exists,\n  isDefined,\n} from '@xylabs/sdk-js'\nimport type { ArchivistDriver, ArchivistNextOptions } from '@xyo-network/archivist-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport type { Payload, WithStorageMeta } from '@xyo-network/payload-model'\nimport { LRUCache } from 'lru-cache'\n\nexport interface MemoryDriverConfig {\n  max?: number\n}\n\nexport interface MemoryDriverParams extends CreatableParams {\n  config: MemoryDriverConfig\n}\n\n@creatable()\nexport class MemoryDriver extends AbstractCreatable<MemoryDriverParams>\n  implements ArchivistDriver<Hash, Payload, WithStorageMeta<Payload>> {\n  private _cache?: LRUCache<Hash, WithStorageMeta<Payload>>\n  private _config?: MemoryDriverConfig\n  private _dataHashIndex?: LRUCache<Hash, Hash>\n  private _sortedValues?: WithStorageMeta<Payload>[]\n\n  protected get cache() {\n    this._cache = this._cache ?? new LRUCache<Hash, WithStorageMeta<Payload>>({\n      max: this.max,\n      dispose: () => { this._sortedValues = undefined },\n    })\n    return this._cache\n  }\n\n  protected get config() {\n    return assertEx(this._config, () => 'Driver config is not set')\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  protected get sortedValues(): WithStorageMeta<Payload>[] {\n    if (!this._sortedValues) {\n      this._sortedValues = [...this.cache.values()].filter(exists).toSorted(PayloadBuilder.compareStorageMeta)\n    }\n    return this._sortedValues\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  all(): Promisable<WithStorageMeta<Payload>[]> {\n    return [...this.sortedValues]\n  }\n\n  clear() {\n    this.cache.clear()\n    this._dataHashIndex = new LRUCache<Hash, Hash>({ max: this.max })\n    this._sortedValues = undefined\n  }\n\n  count() {\n    return this.cache.size\n  }\n\n  override createHandler(): Promisable<void> {\n    this._config = this.params.config ?? {}\n  }\n\n  async delete(hashes: Hash[]): Promise<WithStorageMeta[]> {\n    this._sortedValues = undefined\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    return deletedPayloads\n  }\n\n  get(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  insert(payloads: WithStorageMeta<Payload>[]): WithStorageMeta<Payload>[] {\n    this._sortedValues = undefined\n    const payloadsWithMeta = payloads.toSorted(PayloadBuilder.compareStorageMeta)\n    return payloadsWithMeta.map((payload) => {\n      return this.insertPayloadIntoCache(payload)\n    })\n  }\n\n  next(options?: ArchivistNextOptions): Promisable<WithStorageMeta<Payload>[]> {\n    const {\n      limit = 100, cursor, order, open = true,\n    } = options ?? {}\n    const all = order === 'desc' ? this.sortedValues.toReversed() : this.sortedValues\n    const startIndex = isDefined(cursor)\n      ? MemoryDriver.findIndexFromCursor(all, cursor) + (open ? 1 : 0)\n      : 0\n    return all.slice(startIndex, startIndex + limit)\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"],"mappings":";;;;;;;;;;;;;;;;;AAAA,SAAS,yBAAyB;AAClC,SAAS,wBAAgD;AACzD;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,OAEK;AACP;AAAA,EAC6C;AAAA,OACtC;;;ACZP;AAAA,EACE;AAAA,OACK;AAEA,IAAM,8BAA8B,SAAS,uCAAuC,IAAI;;;ACH/F;AAAA,EACE;AAAA,EAAmB;AAAA,EACnB;AAAA,EAA4B;AAAA,EAC5B;AAAA,OACK;AAEP,SAAS,sBAAsB;AAE/B,SAAS,gBAAgB;AAWlB,IAAM,eAAN,cAA2B,kBACoC;AAAA,EAC5D;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAER,IAAc,QAAQ;AACpB,SAAK,SAAS,KAAK,UAAU,IAAI,SAAyC;AAAA,MACxE,KAAK,KAAK;AAAA,MACV,SAAS,MAAM;AAAE,aAAK,gBAAgB;AAAA,MAAU;AAAA,IAClD,CAAC;AACD,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,IAAc,SAAS;AACrB,WAAO,SAAS,KAAK,SAAS,MAAM,0BAA0B;AAAA,EAChE;AAAA,EAEA,IAAc,gBAAgB;AAC5B,SAAK,iBAAiB,KAAK,kBAAkB,IAAI,SAAqB,EAAE,KAAK,KAAK,IAAI,CAAC;AACvF,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,IAAc,MAAM;AAClB,WAAO,KAAK,QAAQ,OAAO;AAAA,EAC7B;AAAA,EAEA,IAAc,eAA2C;AACvD,QAAI,CAAC,KAAK,eAAe;AACvB,WAAK,gBAAgB,CAAC,GAAG,KAAK,MAAM,OAAO,CAAC,EAAE,OAAO,MAAM,EAAE,SAAS,eAAe,kBAAkB;AAAA,IACzG;AACA,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,OAAe,oBAAoB,UAA6B,QAAa;AAC3E,UAAM,QAAQ,SAAS,UAAU,CAAC,EAAE,UAAU,MAAM,cAAc,MAAM;AACxE,QAAI,UAAU,IAAI;AAChB,aAAO;AAAA,IACT;AACA,WAAO;AAAA,EACT;AAAA,EAEA,MAA8C;AAC5C,WAAO,CAAC,GAAG,KAAK,YAAY;AAAA,EAC9B;AAAA,EAEA,QAAQ;AACN,SAAK,MAAM,MAAM;AACjB,SAAK,iBAAiB,IAAI,SAAqB,EAAE,KAAK,KAAK,IAAI,CAAC;AAChE,SAAK,gBAAgB;AAAA,EACvB;AAAA,EAEA,QAAQ;AACN,WAAO,KAAK,MAAM;AAAA,EACpB;AAAA,EAES,gBAAkC;AACzC,SAAK,UAAU,KAAK,OAAO,UAAU,CAAC;AAAA,EACxC;AAAA,EAEA,MAAM,OAAO,QAA4C;AACvD,SAAK,gBAAgB;AACrB,UAAM,mBAA+C,MAAM,QAAQ,IAAI,KAAK,MACzE,KAAK,EACL,IAAI,OAAO,CAAC,KAAK,IAAI,MAAM;AAC1B,YAAM,oBAAoB,MAAM,eAAe,SAAS,KAAK,KAAK;AAClE,UAAI,OAAO,SAAS,GAAG,KAAK,OAAO,SAAS,iBAAiB,GAAG;AAC9D,aAAK,MAAM,OAAO,GAAG;AACrB,eAAO,KAAK;AAAA,MACd;AAAA,IACF,CAAC,CAAC,GACD,OAAO,MAAM;AAChB,SAAK,qBAAqB;AAC1B,WAAO;AAAA,EACT;AAAA,EAEA,IAAI,QAAwD;AAC1D,WAAO,OAAO,IAAI,CAAC,SAAS;AAC1B,YAAM,eAAe,KAAK,cAAc,IAAI,IAAI,KAAK;AACrD,YAAM,SAAS,KAAK,MAAM,IAAI,YAAY;AAC1C,UAAI,iBAAiB,QAAQ,CAAC,QAAQ;AACpC,cAAM,IAAI,MAAM,4BAA4B;AAAA,MAC9C;AACA,aAAO;AAAA,IACT,CAAC,EAAE,OAAO,MAAM;AAAA,EAClB;AAAA,EAEA,OAAO,UAAkE;AACvE,SAAK,gBAAgB;AACrB,UAAM,mBAAmB,SAAS,SAAS,eAAe,kBAAkB;AAC5E,WAAO,iBAAiB,IAAI,CAAC,YAAY;AACvC,aAAO,KAAK,uBAAuB,OAAO;AAAA,IAC5C,CAAC;AAAA,EACH;AAAA,EAEA,KAAK,SAAwE;AAC3E,UAAM;AAAA,MACJ,QAAQ;AAAA,MAAK;AAAA,MAAQ;AAAA,MAAO,OAAO;AAAA,IACrC,IAAI,WAAW,CAAC;AAChB,UAAM,MAAM,UAAU,SAAS,KAAK,aAAa,WAAW,IAAI,KAAK;AACrE,UAAM,aAAa,UAAU,MAAM,IAC/B,aAAa,oBAAoB,KAAK,MAAM,KAAK,OAAO,IAAI,KAC5D;AACJ,WAAO,IAAI,MAAM,YAAY,aAAa,KAAK;AAAA,EACjD;AAAA,EAEQ,uBAAuB,SAA6D;AAC1F,SAAK,MAAM,IAAI,QAAQ,OAAO,OAAO;AACrC,SAAK,cAAc,IAAI,QAAQ,WAAW,QAAQ,KAAK;AACvD,WAAO;AAAA,EACT;AAAA,EAEQ,uBAAuB;AAC7B,SAAK,iBAAiB,IAAI,SAAqB,EAAE,KAAK,KAAK,IAAI,CAAC;AAChE,UAAM,WAAW,KAAK,MAAM,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,MAAM,KAAK,KAAK;AAC/D,eAAW,WAAW,UAAU;AAC9B,WAAK,cAAc,IAAI,QAAQ,WAAW,QAAQ,KAAK;AAAA,IACzD;AAAA,EACF;AACF;AAxHa,eAAN;AAAA,EADN,UAAU;AAAA,GACE;;;AFCN,IAAM,kBAAN,cAIG,iBAC+C;AAAA,EAKvD,IAAa,UAAU;AACrB,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,GAAG,MAAM;AAAA,IACX;AAAA,EACF;AAAA,EAEA,aAAsB,cACpB,UACsB;AACtB,UAAM,cAAc,MAAM,MAAM,cAAc,QAAQ;AACtD,WAAO,EAAE,GAAG,aAAa,QAAQ,YAAY,UAAU,MAAM,aAAa,OAAO,WAAW,EAAE;AAAA,EAChG;AACF;AAtBE,cANW,iBAMc,iBAA0B,CAAC,GAAG,6CAAM,kBAAe,2BAA2B;AACvG,cAPW,iBAOc,uBAA8B;AACvD,cARW,iBAQc,UAAS,EAAE,GAAG,6CAAM,WAAQ,CAAC,iBAAiB,GAAG,SAAS;AARxE,kBAAN;AAAA,EADN,gBAAgB;AAAA,GACJ;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/archivist-memory",
-  "version": "5.3.15",
+  "version": "5.3.17",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -36,28 +36,27 @@
     "!**/*.test.*"
   ],
   "dependencies": {
-    "@xyo-network/archivist-abstract": "~5.3.15",
-    "@xyo-network/archivist-generic": "~5.3.15",
-    "@xyo-network/archivist-model": "~5.3.15",
-    "@xyo-network/module-model": "~5.3.15",
-    "@xyo-network/payload-builder": "~5.3.15",
-    "@xyo-network/payload-model": "~5.3.15",
-    "lru-cache": "^11.2.6"
+    "@xyo-network/archivist-abstract": "~5.3.17",
+    "@xyo-network/archivist-generic": "~5.3.17",
+    "@xyo-network/archivist-model": "~5.3.17",
+    "@xyo-network/module-model": "~5.3.17",
+    "@xyo-network/payload-builder": "~5.3.17",
+    "@xyo-network/payload-model": "~5.3.17",
+    "lru-cache": "^11.2.7"
   },
   "devDependencies": {
-    "@xylabs/sdk-js": "^5.0.80",
-    "@xylabs/ts-scripts-yarn3": "~7.3.2",
-    "@xylabs/tsconfig": "~7.3.2",
-    "@xylabs/vitest-extended": "~5.0.80",
-    "@xyo-network/account": "~5.3.15",
-    "@xyo-network/account-model": "~5.3.15",
-    "@xyo-network/archivist-acceptance-tests": "~5.3.15",
-    "@xyo-network/boundwitness-model": "~5.3.15",
-    "@xyo-network/id-payload-plugin": "~5.3.15",
-    "@xyo-network/payload-wrapper": "~5.3.15",
-    "@xyo-network/wallet": "~5.3.15",
+    "@xylabs/sdk-js": "^5.0.89",
+    "@xylabs/ts-scripts-yarn3": "~7.4.28",
+    "@xylabs/tsconfig": "~7.4.28",
+    "@xylabs/vitest-extended": "~5.0.89",
+    "@xyo-network/account": "~5.3.17",
+    "@xyo-network/account-model": "~5.3.17",
+    "@xyo-network/archivist-acceptance-tests": "~5.3.17",
+    "@xyo-network/id-payload-plugin": "~5.3.17",
+    "@xyo-network/payload-wrapper": "~5.3.17",
+    "@xyo-network/wallet": "~5.3.17",
     "typescript": "~5.9.3",
-    "vitest": "~4.0.18",
+    "vitest": "~4.1.2",
     "zod": "^4.3.6"
   },
   "peerDependencies": {

package/src/MemoryDriver.ts

@@ -25,9 +25,13 @@ export class MemoryDriver extends AbstractCreatable<MemoryDriverParams>
   private _cache?: LRUCache<Hash, WithStorageMeta<Payload>>
   private _config?: MemoryDriverConfig
   private _dataHashIndex?: LRUCache<Hash, Hash>
+  private _sortedValues?: WithStorageMeta<Payload>[]
 
   protected get cache() {
-    this._cache = this._cache ?? new LRUCache<Hash, WithStorageMeta<Payload>>({ max: this.max })
+    this._cache = this._cache ?? new LRUCache<Hash, WithStorageMeta<Payload>>({
+      max: this.max,
+      dispose: () => { this._sortedValues = undefined },
+    })
     return this._cache
   }
 
@@ -44,6 +48,13 @@ export class MemoryDriver extends AbstractCreatable<MemoryDriverParams>
     return this.config?.max ?? 10_000
   }
 
+  protected get sortedValues(): WithStorageMeta<Payload>[] {
+    if (!this._sortedValues) {
+      this._sortedValues = [...this.cache.values()].filter(exists).toSorted(PayloadBuilder.compareStorageMeta)
+    }
+    return this._sortedValues
+  }
+
   private static findIndexFromCursor(payloads: WithStorageMeta[], cursor: Hex) {
     const index = payloads.findIndex(({ _sequence }) => _sequence === cursor)
     if (index === -1) {
@@ -53,12 +64,13 @@ export class MemoryDriver extends AbstractCreatable<MemoryDriverParams>
   }
 
   all(): Promisable<WithStorageMeta<Payload>[]> {
-    return [...this.cache.values()].filter(exists).toSorted(PayloadBuilder.compareStorageMeta)
+    return [...this.sortedValues]
   }
 
   clear() {
     this.cache.clear()
     this._dataHashIndex = new LRUCache<Hash, Hash>({ max: this.max })
+    this._sortedValues = undefined
   }
 
   count() {
@@ -70,6 +82,7 @@ export class MemoryDriver extends AbstractCreatable<MemoryDriverParams>
   }
 
   async delete(hashes: Hash[]): Promise<WithStorageMeta[]> {
+    this._sortedValues = undefined
     const deletedPayloads: WithStorageMeta<Payload>[] = (await Promise.all(this.cache
       .dump()
       .map(async ([key, item]) => {
@@ -96,6 +109,7 @@ export class MemoryDriver extends AbstractCreatable<MemoryDriverParams>
   }
 
   insert(payloads: WithStorageMeta<Payload>[]): WithStorageMeta<Payload>[] {
+    this._sortedValues = undefined
     const payloadsWithMeta = payloads.toSorted(PayloadBuilder.compareStorageMeta)
     return payloadsWithMeta.map((payload) => {
       return this.insertPayloadIntoCache(payload)
@@ -106,10 +120,7 @@ export class MemoryDriver extends AbstractCreatable<MemoryDriverParams>
     const {
       limit = 100, cursor, order, open = true,
     } = options ?? {}
-    let all = [...this.cache.values() ?? []].toSorted(PayloadBuilder.compareStorageMeta)
-    if (order === 'desc') {
-      all = all.toReversed()
-    }
+    const all = order === 'desc' ? this.sortedValues.toReversed() : this.sortedValues
     const startIndex = isDefined(cursor)
       ? MemoryDriver.findIndexFromCursor(all, cursor) + (open ? 1 : 0)
       : 0