@xyo-network/archivist 2.64.10 → 2.65.0

package/dist/types/StorageArchivist.d.ts

@@ -1,6 +1,6 @@
-import { AbstractArchivist } from '@xyo-network/abstract-archivist';
+import { AbstractDirectArchivist } from '@xyo-network/abstract-archivist';
 import { AccountInstance } from '@xyo-network/account-model';
-import { ArchivistConfig, ArchivistModule, ArchivistModuleEventData, ArchivistParams } from '@xyo-network/archivist-model';
+import { ArchivistConfig, ArchivistModuleEventData, ArchivistParams, DirectArchivistModule } from '@xyo-network/archivist-model';
 import { BoundWitness } from '@xyo-network/boundwitness-model';
 import { Logger } from '@xyo-network/core';
 import { AnyConfigSchema } from '@xyo-network/module';
@@ -18,7 +18,7 @@ export type StorageArchivistConfig = ArchivistConfig<{
     type?: 'local' | 'session' | 'page';
 }>;
 export type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>;
-export declare class StorageArchivist<TParams extends StorageArchivistParams = StorageArchivistParams, TEventData extends ArchivistModuleEventData = ArchivistModuleEventData> extends AbstractArchivist<TParams, TEventData> implements ArchivistModule {
+export declare class StorageArchivist<TParams extends StorageArchivistParams = StorageArchivistParams, TEventData extends ArchivistModuleEventData = ArchivistModuleEventData> extends AbstractDirectArchivist<TParams, TEventData> implements DirectArchivistModule {
     static configSchemas: "network.xyo.archivist.storage.config"[];
     private _privateStorage;
     private _storage;
@@ -30,14 +30,14 @@ export declare class StorageArchivist<TParams extends StorageArchivistParams = S
     get type(): "local" | "session" | "page";
     private get privateStorage();
     private get storage();
-    all(): PromisableArray<Payload>;
-    clear(): void | Promise<void>;
-    commit(): Promise<BoundWitness[]>;
-    delete(hashes: string[]): Promise<boolean[]>;
-    get(hashes: string[]): Promise<Payload[]>;
-    insert(payloads: Payload[]): Promise<BoundWitness[]>;
     loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger): Promise<AccountInstance>;
     start(): Promise<void>;
+    protected allHandler(): PromisableArray<Payload>;
+    protected clearHandler(): void | Promise<void>;
+    protected commitHandler(): Promise<BoundWitness[]>;
+    protected deleteHandler(hashes: string[]): Promise<boolean[]>;
+    protected getHandler(hashes: string[]): Promise<Payload[]>;
+    protected insertHandler(payloads: Payload[]): Promise<BoundWitness[]>;
     protected saveAccount(): void;
 }
 //# sourceMappingURL=StorageArchivist.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAIL,eAAe,EAIf,eAAe,EACf,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,MAAM,EAAiB,MAAM,mBAAmB,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,OAAc,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAEzC,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,eAAe;IAE1B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;IAEQ,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC;IAK/B,KAAK,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAMvB,MAAM,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAqBjC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAU5C,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAclD,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAwB3C,WAAW,CAAC,OAAO,CAAC,EAAE,eAAe,EAAE,cAAc,CAAC,EAAE,OAAO,EAAE,cAAc,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM;IAkB7G,KAAK;IAKpB,SAAS,CAAC,WAAW;CAOtB"}
+{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAA;AAEzE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAIL,eAAe,EAIf,wBAAwB,EACxB,eAAe,EACf,qBAAqB,EACtB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,MAAM,EAAiB,MAAM,mBAAmB,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,OAAc,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAEzC,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,uBAAuB,CAAC,OAAO,EAAE,UAAU,CACnD,YAAW,qBAAqB;IAEhC,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;IAEc,WAAW,CAAC,OAAO,CAAC,EAAE,eAAe,EAAE,cAAc,CAAC,EAAE,OAAO,EAAE,cAAc,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM;IAkB7G,KAAK;cAKD,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAKtC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAqBxC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAUnD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAczD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAwB3E,SAAS,CAAC,WAAW;CAOtB"}

package/package.json

@@ -11,18 +11,18 @@
   "dependencies": {
     "@xylabs/assert": "^2.9.3",
     "@xylabs/promise": "^2.9.3",
-    "@xyo-network/abstract-archivist": "^2.64.10",
-    "@xyo-network/account": "^2.64.10",
-    "@xyo-network/account-model": "^2.64.10",
-    "@xyo-network/archivist-model": "^2.64.10",
-    "@xyo-network/archivist-wrapper": "^2.64.10",
-    "@xyo-network/boundwitness-model": "^2.64.10",
-    "@xyo-network/core": "^2.64.10",
-    "@xyo-network/memory-archivist": "^2.64.10",
-    "@xyo-network/module": "^2.64.10",
-    "@xyo-network/payload-model": "^2.64.10",
-    "@xyo-network/payload-wrapper": "^2.64.10",
-    "@xyo-network/promise": "^2.64.10",
+    "@xyo-network/abstract-archivist": "^2.65.0",
+    "@xyo-network/account": "^2.65.0",
+    "@xyo-network/account-model": "^2.65.0",
+    "@xyo-network/archivist-model": "^2.65.0",
+    "@xyo-network/archivist-wrapper": "^2.65.0",
+    "@xyo-network/boundwitness-model": "^2.65.0",
+    "@xyo-network/core": "^2.65.0",
+    "@xyo-network/memory-archivist": "^2.65.0",
+    "@xyo-network/module": "^2.65.0",
+    "@xyo-network/payload-model": "^2.65.0",
+    "@xyo-network/payload-wrapper": "^2.65.0",
+    "@xyo-network/promise": "^2.65.0",
     "js-cookie": "^3.0.5",
     "lodash": "^4.17.21",
     "store2": "^2.14.2"
@@ -31,10 +31,10 @@
     "@types/js-cookie": "^3.0.3",
     "@types/lodash": "^4.14.195",
     "@xylabs/delay": "^2.9.3",
-    "@xylabs/ts-scripts-yarn3": "^2.18.7",
-    "@xylabs/tsconfig": "^2.18.7",
-    "@xyo-network/boundwitness-wrapper": "^2.64.10",
-    "@xyo-network/plugins": "^2.64.10",
+    "@xylabs/ts-scripts-yarn3": "^2.18.10",
+    "@xylabs/tsconfig": "^2.18.10",
+    "@xyo-network/boundwitness-wrapper": "^2.65.0",
+    "@xyo-network/plugins": "^2.65.0",
     "typescript": "^5.1.6"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -71,5 +71,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.64.10"
+  "version": "2.65.0"
 }

package/src/ArchivingModule.ts

@@ -1,10 +1,10 @@
 import { AccountInstance } from '@xyo-network/account-model'
 import { ArchivistModule, asArchivistModule, isArchivistInstance } from '@xyo-network/archivist-model'
-import { ArchivistWrapper } from '@xyo-network/archivist-wrapper'
+import { IndirectArchivistWrapper } from '@xyo-network/archivist-wrapper'
 import { BoundWitness } from '@xyo-network/boundwitness-model'
 import { AnyObject } from '@xyo-network/core'
-import { AbstractModule, Module, ModuleConfig, ModuleError, ModuleEventData, ModuleParams, ModuleQueryResult, Query } from '@xyo-network/module'
-import { Payload } from '@xyo-network/payload-model'
+import { AbstractModule, Module, ModuleConfig, ModuleEventData, ModuleParams, ModuleQueryResult } from '@xyo-network/module'
+import { ModuleError, Payload, Query } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 import compact from 'lodash/compact'
 
@@ -44,7 +44,7 @@ export abstract class ArchivingModule<
     return (
       await Promise.all(
         archivists.map((archivist) => {
-          return isArchivistInstance(archivist) ? archivist.insert(payloads) : ArchivistWrapper.wrap(archivist, this.account).insert(payloads)
+          return isArchivistInstance(archivist) ? archivist.insert(payloads) : IndirectArchivistWrapper.wrap(archivist, this.account).insert(payloads)
         }),
       )
     ).map(([bw]) => bw)

package/src/CookieArchivist.ts

@@ -1,6 +1,6 @@
 import { assertEx } from '@xylabs/assert'
 import { fulfilled } from '@xylabs/promise'
-import { AbstractArchivist } from '@xyo-network/abstract-archivist'
+import { AbstractDirectArchivist } from '@xyo-network/abstract-archivist'
 import {
   ArchivistAllQuerySchema,
   ArchivistClearQuerySchema,
@@ -37,7 +37,7 @@ export type CookieArchivistParams = ArchivistParams<AnyConfigSchema<CookieArchiv
 export class CookieArchivist<
   TParams extends CookieArchivistParams,
   TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,
-> extends AbstractArchivist<TParams, TEventData> {
+> extends AbstractDirectArchivist<TParams, TEventData> {
   static override configSchemas = [CookieArchivistConfigSchema]
 
   get domain() {
@@ -69,7 +69,7 @@ export class CookieArchivist<
     ]
   }
 
-  override all(): PromisableArray<Payload> {
+  protected override allHandler(): PromisableArray<Payload> {
     try {
       return Object.entries(Cookies.get())
         .filter(([key]) => key.startsWith(`${this.namespace}-`))
@@ -80,7 +80,7 @@ export class CookieArchivist<
     }
   }
 
-  override clear(): void | Promise<void> {
+  protected override clearHandler(): void | Promise<void> {
     try {
       Object.entries(Cookies.get()).map(([key]) => {
         if (key.startsWith(`${this.namespace}-`)) {
@@ -93,7 +93,7 @@ export class CookieArchivist<
     }
   }
 
-  override async commit(): Promise<BoundWitness[]> {
+  protected override async commitHandler(): Promise<BoundWitness[]> {
     try {
       const payloads = await this.all()
       assertEx(payloads.length > 0, 'Nothing to commit')
@@ -117,7 +117,7 @@ export class CookieArchivist<
     }
   }
 
-  override async delete(hashes: string[]): Promise<boolean[]> {
+  protected override async deleteHandler(hashes: string[]): Promise<boolean[]> {
     try {
       const found = hashes.map((hash) => {
         Cookies.remove(this.keyFromHash(hash))
@@ -131,7 +131,7 @@ export class CookieArchivist<
     }
   }
 
-  override async get(hashes: string[]): Promise<Payload[]> {
+  protected override async getHandler(hashes: string[]): Promise<Payload[]> {
     try {
       return await Promise.all(
         hashes.map(async (hash) => {
@@ -145,7 +145,7 @@ export class CookieArchivist<
     }
   }
 
-  async insert(payloads: Payload[]): Promise<BoundWitness[]> {
+  protected async insertHandler(payloads: Payload[]): Promise<BoundWitness[]> {
     try {
       const resultPayloads: Payload[] = await Promise.all(
         payloads.map(async (payload) => {

package/src/StorageArchivist.ts

@@ -1,6 +1,6 @@
 import { assertEx } from '@xylabs/assert'
 import { fulfilled } from '@xylabs/promise'
-import { AbstractArchivist } from '@xyo-network/abstract-archivist'
+import { AbstractDirectArchivist } from '@xyo-network/abstract-archivist'
 import { Account } from '@xyo-network/account'
 import { AccountInstance } from '@xyo-network/account-model'
 import {
@@ -11,9 +11,9 @@ import {
   ArchivistDeleteQuerySchema,
   ArchivistInsertQuery,
   ArchivistInsertQuerySchema,
-  ArchivistModule,
   ArchivistModuleEventData,
   ArchivistParams,
+  DirectArchivistModule,
 } from '@xyo-network/archivist-model'
 import { BoundWitness } from '@xyo-network/boundwitness-model'
 import { Logger, PayloadHasher } from '@xyo-network/core'
@@ -41,8 +41,8 @@ export class StorageArchivist<
     TParams extends StorageArchivistParams = StorageArchivistParams,
     TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,
   >
-  extends AbstractArchivist<TParams, TEventData>
-  implements ArchivistModule
+  extends AbstractDirectArchivist<TParams, TEventData>
+  implements DirectArchivistModule
 {
   static override configSchemas = [StorageArchivistConfigSchema]
 
@@ -92,18 +92,41 @@ export class StorageArchivist<
     return this._storage
   }
 
-  override all(): PromisableArray<Payload> {
+  override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {
+    if (!this._account) {
+      if (persistAccount) {
+        const privateKey = privateStorage?.get('privateKey')
+        if (privateKey) {
+          try {
+            this._account = await Account.create({ privateKey })
+            return this._account
+          } catch (ex) {
+            console.error(`Error reading Account from storage [${ex}] - Recreating Account`)
+            privateStorage?.remove('privateKey')
+          }
+        }
+      }
+    }
+    return await super.loadAccount()
+  }
+
+  override async start() {
+    await super.start()
+    this.saveAccount()
+  }
+
+  protected override allHandler(): PromisableArray<Payload> {
     this.logger?.log(`this.storage.length: ${this.storage.length}`)
     return Object.entries(this.storage.getAll()).map(([, value]) => value)
   }
 
-  override clear(): void | Promise<void> {
+  protected override clearHandler(): void | Promise<void> {
     this.logger?.log(`this.storage.length: ${this.storage.length}`)
     this.storage.clear()
     return this.emit('cleared', { module: this })
   }
 
-  override async commit(): Promise<BoundWitness[]> {
+  protected override async commitHandler(): Promise<BoundWitness[]> {
     this.logger?.log(`this.storage.length: ${this.storage.length}`)
     const payloads = await this.all()
     assertEx(payloads.length > 0, 'Nothing to commit')
@@ -124,7 +147,7 @@ export class StorageArchivist<
     return compact(settled.filter(fulfilled).map((result) => result.value))
   }
 
-  override async delete(hashes: string[]): Promise<boolean[]> {
+  protected override async deleteHandler(hashes: string[]): Promise<boolean[]> {
     this.logger?.log(`delete: hashes.length: ${hashes.length}`)
     const found = hashes.map((hash) => {
       this.storage.remove(hash)
@@ -134,12 +157,12 @@ export class StorageArchivist<
     return found
   }
 
-  override async get(hashes: string[]): Promise<Payload[]> {
+  protected override async getHandler(hashes: string[]): Promise<Payload[]> {
     this.logger?.log(`get: hashes.length: ${hashes.length}`)
 
     return await Promise.all(
       hashes.map(async (hash) => {
-        const payload = this.storage.get(hash) ?? (await super.get([hash]))[0] ?? null
+        const payload = this.storage.get(hash) ?? (await super.getHandler([hash]))[0] ?? null
         if (this.storeParentReads) {
           this.storage.set(hash, payload)
         }
@@ -148,7 +171,7 @@ export class StorageArchivist<
     )
   }
 
-  async insert(payloads: Payload[]): Promise<BoundWitness[]> {
+  protected async insertHandler(payloads: Payload[]): Promise<BoundWitness[]> {
     const resultPayloads = await Promise.all(
       payloads.map(async (payload) => {
         const wrapper = PayloadWrapper.wrap(payload)
@@ -172,29 +195,6 @@ export class StorageArchivist<
     return boundWitnesses
   }
 
-  override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {
-    if (!this._account) {
-      if (persistAccount) {
-        const privateKey = privateStorage?.get('privateKey')
-        if (privateKey) {
-          try {
-            this._account = await Account.create({ privateKey })
-            return this._account
-          } catch (ex) {
-            console.error(`Error reading Account from storage [${ex}] - Recreating Account`)
-            privateStorage?.remove('privateKey')
-          }
-        }
-      }
-    }
-    return await super.loadAccount()
-  }
-
-  override async start() {
-    await super.start()
-    this.saveAccount()
-  }
-
   protected saveAccount() {
     if (this.persistAccount) {
       const account = this.account

package/src/spec/testArchivist.ts

@@ -3,7 +3,7 @@
  */
 
 import { delay } from '@xylabs/delay'
-import { ArchivistModule } from '@xyo-network/archivist-model'
+import { ArchivistInstance } from '@xyo-network/archivist-model'
 import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
 import { PayloadHasher } from '@xyo-network/core'
 import { Payload } from '@xyo-network/payload-model'
@@ -11,7 +11,7 @@ import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 import { IdSchema } from '@xyo-network/plugins'
 import { Promisable } from '@xyo-network/promise'
 
-export const testArchivistRoundTrip = (archivistPromise: Promisable<ArchivistModule>, name: string) => {
+export const testArchivistRoundTrip = (archivistPromise: Promisable<ArchivistInstance>, name: string) => {
   test(`Archivist RoundTrip [${name}]`, async () => {
     const idPayload: Payload<{ salt: string }> = {
       salt: Date.now().toString(),
@@ -37,7 +37,7 @@ export const testArchivistRoundTrip = (archivistPromise: Promisable<ArchivistMod
   })
 }
 
-export const testArchivistAll = (archivist: Promisable<ArchivistModule>, name: string) => {
+export const testArchivistAll = (archivist: Promisable<ArchivistInstance>, name: string) => {
   test(`Archivist All [${name}]`, async () => {
     const idPayload = {
       salt: Date.now().toString(),