@xyo-network/archivist 2.42.2 → 2.42.4

package/dist/esm/StorageArchivist.js

@@ -1,6 +1,6 @@
 import { assertEx } from '@xylabs/assert';
 import { Account } from '@xyo-network/account';
-import { XyoArchivistAllQuerySchema, XyoArchivistClearQuerySchema, XyoArchivistCommitQuerySchema, XyoArchivistDeleteQuerySchema, XyoArchivistFindQuerySchema, XyoArchivistInsertQuerySchema, } from '@xyo-network/archivist-interface';
+import { ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistCommitQuerySchema, ArchivistDeleteQuerySchema, ArchivistFindQuerySchema, ArchivistInsertQuerySchema, } from '@xyo-network/archivist-interface';
 import { PayloadWrapper } from '@xyo-network/payload';
 import compact from 'lodash/compact';
 import store from 'store2';
@@ -72,7 +72,7 @@ export class XyoStorageArchivist extends AbstractArchivist {
             const settled = await Promise.allSettled(compact(Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {
                 const queryPayload = PayloadWrapper.parse({
                     payloads: payloads.map((payload) => PayloadWrapper.hash(payload)),
-                    schema: XyoArchivistInsertQuerySchema,
+                    schema: ArchivistInsertQuerySchema,
                 });
                 const query = await this.bindQuery(queryPayload);
                 return (await parent?.query(query[0], query[1]))?.[0];
@@ -139,12 +139,12 @@ export class XyoStorageArchivist extends AbstractArchivist {
     }
     queries() {
         return [
-            XyoArchivistAllQuerySchema,
-            XyoArchivistDeleteQuerySchema,
-            XyoArchivistClearQuerySchema,
-            XyoArchivistFindQuerySchema,
-            XyoArchivistInsertQuerySchema,
-            XyoArchivistCommitQuerySchema,
+            ArchivistAllQuerySchema,
+            ArchivistDeleteQuerySchema,
+            ArchivistClearQuerySchema,
+            ArchivistFindQuerySchema,
+            ArchivistInsertQuerySchema,
+            ArchivistCommitQuerySchema,
             ...super.queries(),
         ];
     }

package/dist/esm/StorageArchivist.js.map

@@ -1 +1 @@
-{"version":3,"file":"StorageArchivist.js","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,6BAA6B,EAE7B,6BAA6B,EAC7B,2BAA2B,EAE3B,6BAA6B,GAC9B,MAAM,kCAAkC,CAAA;AAGzC,OAAO,EAAE,cAAc,EAAc,MAAM,sBAAsB,CAAA;AAEjE,OAAO,OAAO,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAoB,MAAM,QAAQ,CAAA;AAEzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAGvD,MAAM,CAAC,MAAM,4BAA4B,GAAiC,6CAA6C,CAAA;AAKvH,2DAA2D;AAC3D,MAAM,CAAC,MAAM,+BAA+B,GAAG,4BAA4B,CAAA;AAa3E,MAAM,OAAO,mBAAoB,SAAQ,iBAAyC;IAChF,MAAM,CAAU,YAAY,GAAG,4BAA4B,CAAA;IAEnD,eAAe,CAAuB;IACtC,QAAQ,CAAuB;IAEvC,YAAY,MAA+C;QACzD,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,IAAI,CAAC,WAAW,EAAE,CAAA;IACpB,CAAC;IAED,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,MAAM,EAAE,UAAU,IAAI,IAAI,CAAA;IACxC,CAAC;IAED,IAAW,YAAY;QACrB,OAAO,IAAI,CAAC,MAAM,EAAE,UAAU,IAAI,KAAK,CAAA;IACzC,CAAC;IAED,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,MAAM,EAAE,SAAS,IAAI,eAAe,CAAA;IAClD,CAAC;IAED,IAAW,cAAc;QACvB,OAAO,IAAI,CAAC,MAAM,EAAE,cAAc,IAAI,KAAK,CAAA;IAC7C,CAAC;IAED,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,OAAO,CAAA;IACrC,CAAC;IAED,0EAA0E;IAC1E,IAAY,cAAc;QACxB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,SAAS,UAAU,CAAC,CAAA;QAC/F,OAAO,IAAI,CAAC,eAAe,CAAA;IAC7B,CAAC;IAED,0EAA0E;IAC1E,IAAY,OAAO;QACjB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAC3E,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAAgD;QAC3E,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAwB,CAAA;IAC5D,CAAC;IAEe,GAAG;QACjB,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;QAC/D,IAAI;YACF,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;SACvE;QAAC,OAAO,EAAE,EAAE;YACX,OAAO,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;YACtD,MAAM,EAAE,CAAA;SACT;IACH,CAAC;IAEe,KAAK;QACnB,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;QAC/D,IAAI;YACF,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;SACrB;QAAC,OAAO,EAAE,EAAE;YACX,OAAO,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;YACtD,MAAM,EAAE,CAAA;SACT;IACH,CAAC;IAEe,KAAK,CAAC,MAAM;QAC1B,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;QAC/D,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,EAAE,CAAA;YACjC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,mBAAmB,CAAC,CAAA;YAClD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CACtC,OAAO,CACL,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBACvE,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAA0B;oBACjE,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACjE,MAAM,EAAE,6BAA6B;iBACtC,CAAC,CAAA;gBACF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;gBAChD,OAAO,CAAC,MAAM,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;YACvD,CAAC,CAAC,CACH,CACF,CAAA;YACD,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;YAClB,OAAO,OAAO,CACZ,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;gBACrB,OAAO,MAAM,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;YAC5D,CAAC,CAAC,CACH,CAAA;SACF;QAAC,OAAO,EAAE,EAAE;YACX,OAAO,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;YACtD,MAAM,EAAE,CAAA;SACT;IACH,CAAC;IAEe,MAAM,CAAC,MAAgB;QACrC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,kBAAkB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA;QACnD,IAAI;YACF,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACzB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;gBACzB,OAAO,IAAI,CAAA;YACb,CAAC,CAAC,CAAA;SACH;QAAC,OAAO,EAAE,EAAE;YACX,OAAO,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;YACtD,MAAM,EAAE,CAAA;SACT;IACH,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,MAAgB;QAC/B,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,kBAAkB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA;QACnD,IAAI;YACF,OAAO,MAAM,OAAO,CAAC,GAAG,CACtB,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;gBACxB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;gBACpC,OAAO,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAA;YAC3D,CAAC,CAAC,CACH,CAAA;SACF;QAAC,OAAO,EAAE,EAAE;YACX,OAAO,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;YACtD,MAAM,EAAE,CAAA;SACT;IACH,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,QAAsB;QACxC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,oBAAoB,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAA;QACvD,IAAI;YACF,MAAM,cAAc,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC9C,MAAM,OAAO,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,CAAA;gBAC3C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;gBACzB,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;gBAC7C,QAAQ,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,sBAAsB,OAAO,CAAC,IAAI,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC,CAAA;gBAClG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;gBACvC,OAAO,OAAO,CAAC,OAAO,CAAA;YACxB,CAAC,CAAC,CAAA;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAA;YACzD,MAAM,oBAAoB,GAAsB,EAAE,CAAA;YAClD,IAAI,IAAI,CAAC,YAAY,EAAE;gBACrB,4BAA4B;gBAC5B,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAA;aAC1F;YACD,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,oBAAoB,CAAC,CAAA;SAC5C;QAAC,OAAO,EAAE,EAAE;YACX,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,CAAC,CAAA;YAC7B,MAAM,EAAE,CAAA;SACT;IACH,CAAC;IAEe,OAAO;QACrB,OAAO;YACL,0BAA0B;YAC1B,6BAA6B;YAC7B,4BAA4B;YAC5B,2BAA2B;YAC3B,6BAA6B;YAC7B,6BAA6B;YAC7B,GAAG,KAAK,CAAC,OAAO,EAAE;SACnB,CAAA;IACH,CAAC;IAEQ,KAAK,CAAC,KAAK;QAClB,MAAM,KAAK,CAAC,KAAK,EAAE,CAAA;QACnB,IAAI,CAAC,WAAW,EAAE,CAAA;QAClB,OAAO,IAAI,CAAA;IACb,CAAC;IAEkB,WAAW;QAC5B,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;YACxD,IAAI,UAAU,EAAE;gBACd,IAAI;oBACF,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC,CAAA;oBAC3C,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;oBAC1C,OAAO,OAAO,CAAA;iBACf;gBAAC,OAAO,EAAE,EAAE;oBACX,OAAO,CAAC,KAAK,CAAC,uCAAuC,IAAI,CAAC,IAAI,KAAK,EAAE,wBAAwB,CAAC,CAAA;oBAC9F,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;iBACzC;aACF;SACF;QACD,OAAO,KAAK,CAAC,WAAW,EAAE,CAAA;IAC5B,CAAC;IAES,WAAW;QACnB,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;YAC/C,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;SAChE;IACH,CAAC"}
+{"version":3,"file":"StorageArchivist.js","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -9,14 +9,14 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/assert": "^2.6.9",
-    "@xyo-network/account": "^2.42.2",
-    "@xyo-network/archivist-interface": "^2.42.2",
-    "@xyo-network/boundwitness": "^2.42.2",
-    "@xyo-network/core": "^2.42.2",
-    "@xyo-network/module": "^2.42.2",
-    "@xyo-network/payload": "^2.42.2",
-    "@xyo-network/promise": "^2.42.2",
+    "@xylabs/assert": "^2.6.10",
+    "@xyo-network/account": "^2.42.4",
+    "@xyo-network/archivist-interface": "^2.42.4",
+    "@xyo-network/boundwitness": "^2.42.4",
+    "@xyo-network/core": "^2.42.4",
+    "@xyo-network/module": "^2.42.4",
+    "@xyo-network/payload": "^2.42.4",
+    "@xyo-network/promise": "^2.42.4",
     "js-cookie": "^3.0.1",
     "lodash": "^4.17.21",
     "lru-cache": "^7.14.1",
@@ -60,5 +60,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.42.2"
+  "version": "2.42.4"
 }

package/src/AbstractArchivist.ts

@@ -1,21 +1,21 @@
 import { assertEx } from '@xylabs/assert'
 import { Account } from '@xyo-network/account'
 import {
+  ArchivistAllQuerySchema,
+  ArchivistClearQuerySchema,
+  ArchivistCommitQuerySchema,
+  ArchivistConfig,
+  ArchivistDeleteQuerySchema,
+  ArchivistFindQuerySchema,
+  ArchivistGetQuery,
+  ArchivistGetQuerySchema,
+  ArchivistInsertQuerySchema,
+  ArchivistQuery,
   PayloadArchivist,
-  XyoArchivistAllQuerySchema,
-  XyoArchivistClearQuerySchema,
-  XyoArchivistCommitQuerySchema,
-  XyoArchivistConfig,
-  XyoArchivistDeleteQuerySchema,
-  XyoArchivistFindQuerySchema,
-  XyoArchivistGetQuery,
-  XyoArchivistGetQuerySchema,
-  XyoArchivistInsertQuerySchema,
-  XyoArchivistQuery,
 } from '@xyo-network/archivist-interface'
 import { XyoBoundWitness } from '@xyo-network/boundwitness'
-import { ModuleQueryResult, QueryBoundWitnessWrapper, XyoErrorBuilder, XyoModule, XyoQueryBoundWitness } from '@xyo-network/module'
-import { PayloadWrapper, XyoPayload, XyoPayloadFindFilter } from '@xyo-network/payload'
+import { AbstractModule, ModuleQueryResult, QueryBoundWitnessWrapper, XyoErrorBuilder, XyoQueryBoundWitness } from '@xyo-network/module'
+import { PayloadFindFilter, PayloadWrapper, XyoPayload } from '@xyo-network/payload'
 import { Promisable, PromisableArray } from '@xyo-network/promise'
 import compact from 'lodash/compact'
 
@@ -27,8 +27,8 @@ export interface XyoArchivistParentWrappers {
   write?: Record<string, ArchivistWrapper>
 }
 
-export abstract class AbstractArchivist<TConfig extends XyoArchivistConfig = XyoArchivistConfig>
-  extends XyoModule<TConfig>
+export abstract class AbstractArchivist<TConfig extends ArchivistConfig = ArchivistConfig>
+  extends AbstractModule<TConfig>
   implements PayloadArchivist
 {
   private _parents?: XyoArchivistParentWrappers
@@ -57,7 +57,7 @@ export abstract class AbstractArchivist<TConfig extends XyoArchivistConfig = Xyo
     throw Error('Not implemented')
   }
 
-  public async find(filter?: XyoPayloadFindFilter): Promise<XyoPayload[]> {
+  public async find(filter?: PayloadFindFilter): Promise<XyoPayload[]> {
     try {
       const filterSchemaList = filter?.schema ? (Array.isArray(filter.schema) ? filter.schema : [filter.schema]) : []
       return (await this.all()).filter((payload) => filterSchemaList.includes(payload.schema))
@@ -68,14 +68,14 @@ export abstract class AbstractArchivist<TConfig extends XyoArchivistConfig = Xyo
   }
 
   public override queries() {
-    return [XyoArchivistGetQuerySchema, ...super.queries()]
+    return [ArchivistGetQuerySchema, ...super.queries()]
   }
 
   override async query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(
     query: T,
     payloads?: XyoPayload[],
   ): Promise<ModuleQueryResult<XyoPayload>> {
-    const wrapper = QueryBoundWitnessWrapper.parseQuery<XyoArchivistQuery>(query, payloads)
+    const wrapper = QueryBoundWitnessWrapper.parseQuery<ArchivistQuery>(query, payloads)
     const typedQuery = wrapper.query.payload
     assertEx(this.queryable(typedQuery.schema, wrapper.addresses))
 
@@ -83,25 +83,25 @@ export abstract class AbstractArchivist<TConfig extends XyoArchivistConfig = Xyo
     const queryAccount = new Account()
     try {
       switch (typedQuery.schema) {
-        case XyoArchivistAllQuerySchema:
+        case ArchivistAllQuerySchema:
           resultPayloads.push(...(await this.all()))
           break
-        case XyoArchivistClearQuerySchema:
+        case ArchivistClearQuerySchema:
           await this.clear()
           break
-        case XyoArchivistCommitQuerySchema:
+        case ArchivistCommitQuerySchema:
           resultPayloads.push(...(await this.commit()))
           break
-        case XyoArchivistDeleteQuerySchema:
+        case ArchivistDeleteQuerySchema:
           await this.delete(typedQuery.hashes)
           break
-        case XyoArchivistFindQuerySchema:
+        case ArchivistFindQuerySchema:
           resultPayloads.push(...(await this.find(typedQuery.filter)))
           break
-        case XyoArchivistGetQuerySchema:
+        case ArchivistGetQuerySchema:
           resultPayloads.push(...(await this.get(typedQuery.hashes)))
           break
-        case XyoArchivistInsertQuerySchema: {
+        case ArchivistInsertQuerySchema: {
           const wrappers = payloads?.map((payload) => PayloadWrapper.parse(payload)) ?? []
           assertEx(typedQuery.payloads, `Missing payloads: ${JSON.stringify(typedQuery, null, 2)}`)
           const resolvedWrappers = wrappers.filter((wrapper) => typedQuery.payloads.includes(wrapper.hash))
@@ -125,7 +125,7 @@ export abstract class AbstractArchivist<TConfig extends XyoArchivistConfig = Xyo
     return compact(
       await Promise.all(
         Object.values(parents.read ?? {}).map(async (parent) => {
-          const queryPayload = PayloadWrapper.parse<XyoArchivistGetQuery>({ hashes: [hash], schema: XyoArchivistGetQuerySchema })
+          const queryPayload = PayloadWrapper.parse<ArchivistGetQuery>({ hashes: [hash], schema: ArchivistGetQuerySchema })
           const query = await this.bindQuery(queryPayload)
           const [, payloads] = (await parent?.query(query[0], query[1])) ?? []
           const wrapper = payloads?.[0] ? new PayloadWrapper(payloads?.[0]) : undefined
@@ -179,6 +179,3 @@ export abstract class AbstractArchivist<TConfig extends XyoArchivistConfig = Xyo
 
   abstract insert(item: XyoPayload[]): PromisableArray<XyoBoundWitness>
 }
-
-/** @deprecated use AbstractArchivist instead */
-export abstract class XyoArchivist<TConfig extends XyoArchivistConfig = XyoArchivistConfig> extends AbstractArchivist<TConfig> {}

package/src/ArchivingModule.ts

@@ -1,20 +1,20 @@
 import { Account } from '@xyo-network/account'
 import { XyoBoundWitness } from '@xyo-network/boundwitness'
 import { EmptyObject } from '@xyo-network/core'
-import { Module, ModuleQueryResult, XyoModule, XyoModuleConfig } from '@xyo-network/module'
+import { AbstractModule, AbstractModuleConfig, Module, ModuleQueryResult } from '@xyo-network/module'
 import { XyoPayload } from '@xyo-network/payload'
 import { PromiseEx } from '@xyo-network/promise'
 
 import { ArchivistWrapper } from './ArchivistWrapper'
 
-export type ArchivingModuleConfig<T extends EmptyObject = EmptyObject> = XyoModuleConfig<
+export type ArchivingModuleConfig<T extends EmptyObject = EmptyObject> = AbstractModuleConfig<
   {
     archivists?: string[]
     schema: string
   } & T
 >
 
-export class ArchivingModule<TConfig extends ArchivingModuleConfig = ArchivingModuleConfig> extends XyoModule<TConfig> implements Module {
+export class ArchivingModule<TConfig extends ArchivingModuleConfig = ArchivingModuleConfig> extends AbstractModule<TConfig> implements Module {
   protected bindResult(payloads: XyoPayload[], account?: Account): PromiseEx<ModuleQueryResult, Account> {
     const promise = new PromiseEx<ModuleQueryResult, Account>(async (resolve) => {
       const result = this.bindResultInternal(payloads, account)

package/src/ArchivistWrapper.ts

@@ -1,77 +1,67 @@
 import {
+  ArchivistAllQuery,
+  ArchivistAllQuerySchema,
+  ArchivistClearQuery,
+  ArchivistClearQuerySchema,
+  ArchivistCommitQuery,
+  ArchivistCommitQuerySchema,
+  ArchivistDeleteQuery,
+  ArchivistDeleteQuerySchema,
+  ArchivistFindQuery,
+  ArchivistFindQuerySchema,
+  ArchivistGetQuery,
+  ArchivistGetQuerySchema,
+  ArchivistInsertQuery,
+  ArchivistInsertQuerySchema,
   PayloadArchivist,
-  XyoArchivistAllQuery,
-  XyoArchivistAllQuerySchema,
-  XyoArchivistClearQuery,
-  XyoArchivistClearQuerySchema,
-  XyoArchivistCommitQuery,
-  XyoArchivistCommitQuerySchema,
-  XyoArchivistDeleteQuery,
-  XyoArchivistDeleteQuerySchema,
-  XyoArchivistFindQuery,
-  XyoArchivistFindQuerySchema,
-  XyoArchivistGetQuery,
-  XyoArchivistGetQuerySchema,
-  XyoArchivistInsertQuery,
-  XyoArchivistInsertQuerySchema,
 } from '@xyo-network/archivist-interface'
 import { isXyoBoundWitnessPayload, XyoBoundWitness, XyoBoundWitnessSchema } from '@xyo-network/boundwitness'
 import { ModuleWrapper } from '@xyo-network/module'
-import { PayloadWrapper, XyoPayload, XyoPayloadFindFilter } from '@xyo-network/payload'
+import { PayloadFindFilter, PayloadWrapper, XyoPayload } from '@xyo-network/payload'
 import compact from 'lodash/compact'
 
 export class ArchivistWrapper extends ModuleWrapper implements PayloadArchivist {
   public async all(): Promise<XyoPayload[]> {
-    const queryPayload = PayloadWrapper.parse<XyoArchivistAllQuery>({ schema: XyoArchivistAllQuerySchema })
-    const query = await this.bindQuery(queryPayload)
-    const result = await this.module.query(query[0], query[1])
-    this.throwErrors(query, result)
-    return compact(result[1])
+    const queryPayload = PayloadWrapper.parse<ArchivistAllQuery>({ schema: ArchivistAllQuerySchema })
+    const result = await this.sendQuery(queryPayload)
+    return compact(result)
   }
 
   public async clear(): Promise<void> {
-    const queryPayload = PayloadWrapper.parse<XyoArchivistClearQuery>({ schema: XyoArchivistClearQuerySchema })
-    const query = await this.bindQuery(queryPayload)
-    const result = await this.module.query(query[0], query[1])
-    this.throwErrors(query, result)
+    const queryPayload = PayloadWrapper.parse<ArchivistClearQuery>({ schema: ArchivistClearQuerySchema })
+    await this.sendQuery(queryPayload)
   }
 
   public async commit(): Promise<XyoBoundWitness[]> {
-    const queryPayload = PayloadWrapper.parse<XyoArchivistCommitQuery>({ schema: XyoArchivistCommitQuerySchema })
-    const query = await this.bindQuery(queryPayload)
-    const result = await this.module.query(query[0], query[1])
-    this.throwErrors(query, result)
-    return result[1].filter(isXyoBoundWitnessPayload)
+    const queryPayload = PayloadWrapper.parse<ArchivistCommitQuery>({ schema: ArchivistCommitQuerySchema })
+    const result = await this.sendQuery(queryPayload)
+    return result.filter(isXyoBoundWitnessPayload)
   }
 
   public async delete(hashes: string[]) {
-    const queryPayload = PayloadWrapper.parse<XyoArchivistDeleteQuery>({ hashes, schema: XyoArchivistDeleteQuerySchema })
+    const queryPayload = PayloadWrapper.parse<ArchivistDeleteQuery>({ hashes, schema: ArchivistDeleteQuerySchema })
     const query = await this.bindQuery(queryPayload)
     const result = await this.module.query(query[0], query[1])
     this.throwErrors(query, result)
     return result[0].payload_hashes.map(() => true)
   }
 
-  public async find(filter?: XyoPayloadFindFilter): Promise<XyoPayload[]> {
-    const queryPayload = PayloadWrapper.parse<XyoArchivistFindQuery>({ filter, schema: XyoArchivistFindQuerySchema })
-    const query = await this.bindQuery(queryPayload)
-    const result = await this.module.query(query[0], [queryPayload.payload])
-    this.throwErrors(query, result)
-    return compact(result[1])
+  public async find(filter?: PayloadFindFilter): Promise<XyoPayload[]> {
+    const queryPayload = PayloadWrapper.parse<ArchivistFindQuery>({ filter, schema: ArchivistFindQuerySchema })
+    const result = await this.sendQuery(queryPayload)
+    return compact(result)
   }
 
   public async get(hashes: string[]): Promise<XyoPayload[]> {
-    const queryPayload = PayloadWrapper.parse<XyoArchivistGetQuery>({ hashes, schema: XyoArchivistGetQuerySchema })
-    const query = await this.bindQuery(queryPayload)
-    const result = await this.module.query(query[0], query[1])
-    this.throwErrors(query, result)
-    return result[1]
+    const queryPayload = PayloadWrapper.parse<ArchivistGetQuery>({ hashes, schema: ArchivistGetQuerySchema })
+    const result = await this.sendQuery(queryPayload)
+    return result
   }
 
   public async insert(payloads: XyoPayload[]): Promise<XyoBoundWitness[]> {
-    const queryPayload = PayloadWrapper.parse<XyoArchivistInsertQuery>({
+    const queryPayload = PayloadWrapper.parse<ArchivistInsertQuery>({
       payloads: payloads.map((payload) => PayloadWrapper.hash(payload)),
-      schema: XyoArchivistInsertQuerySchema,
+      schema: ArchivistInsertQuerySchema,
     })
     const query = await this.bindQuery(queryPayload, payloads)
     const result = await this.module.query(query[0], [queryPayload.payload, ...payloads])

package/src/CookieArchivist.ts

@@ -1,16 +1,16 @@
 import { assertEx } from '@xylabs/assert'
 import {
-  XyoArchivistAllQuerySchema,
-  XyoArchivistClearQuerySchema,
-  XyoArchivistCommitQuerySchema,
-  XyoArchivistConfig,
-  XyoArchivistDeleteQuerySchema,
-  XyoArchivistFindQuerySchema,
-  XyoArchivistInsertQuery,
-  XyoArchivistInsertQuerySchema,
+  ArchivistAllQuerySchema,
+  ArchivistClearQuerySchema,
+  ArchivistCommitQuerySchema,
+  ArchivistConfig,
+  ArchivistDeleteQuerySchema,
+  ArchivistFindQuerySchema,
+  ArchivistInsertQuery,
+  ArchivistInsertQuerySchema,
 } from '@xyo-network/archivist-interface'
 import { XyoBoundWitness } from '@xyo-network/boundwitness'
-import { XyoModuleParams } from '@xyo-network/module'
+import { ModuleParams } from '@xyo-network/module'
 import { PayloadWrapper, XyoPayload } from '@xyo-network/payload'
 import { PromisableArray } from '@xyo-network/promise'
 import Cookies from 'js-cookie'
@@ -26,7 +26,7 @@ export type XyoCookieArchivistConfigSchema = CookieArchivistConfigSchema
 /** @deprecated use CookieArchivistConfigSchema instead */
 export const XyoCookieArchivistConfigSchema = CookieArchivistConfigSchema
 
-export type CookieArchivistConfig = XyoArchivistConfig<{
+export type CookieArchivistConfig = ArchivistConfig<{
   domain?: string
   maxEntries?: number
   maxEntrySize?: number
@@ -58,7 +58,7 @@ export class CookieArchivist extends AbstractArchivist<CookieArchivistConfig> {
     return this.config?.namespace ?? 'xyoarch'
   }
 
-  static override async create(params?: XyoModuleParams<CookieArchivistConfig>): Promise<CookieArchivist> {
+  static override async create(params?: ModuleParams<CookieArchivistConfig>): Promise<CookieArchivist> {
     return (await super.create(params)) as CookieArchivist
   }
 
@@ -93,9 +93,9 @@ export class CookieArchivist extends AbstractArchivist<CookieArchivistConfig> {
       const settled = await Promise.allSettled(
         compact(
           Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {
-            const queryPayload = PayloadWrapper.parse<XyoArchivistInsertQuery>({
+            const queryPayload = PayloadWrapper.parse<ArchivistInsertQuery>({
               payloads: payloads.map((payload) => PayloadWrapper.hash(payload)),
-              schema: XyoArchivistInsertQuerySchema,
+              schema: ArchivistInsertQuerySchema,
             })
             const query = await this.bindQuery(queryPayload)
             return (await parent?.query(query[0], query[1]))?.[0]
@@ -165,12 +165,12 @@ export class CookieArchivist extends AbstractArchivist<CookieArchivistConfig> {
 
   public override queries() {
     return [
-      XyoArchivistAllQuerySchema,
-      XyoArchivistDeleteQuerySchema,
-      XyoArchivistClearQuerySchema,
-      XyoArchivistFindQuerySchema,
-      XyoArchivistInsertQuerySchema,
-      XyoArchivistCommitQuerySchema,
+      ArchivistAllQuerySchema,
+      ArchivistDeleteQuerySchema,
+      ArchivistClearQuerySchema,
+      ArchivistFindQuerySchema,
+      ArchivistInsertQuerySchema,
+      ArchivistCommitQuerySchema,
       ...super.queries(),
     ]
   }

package/src/MemoryArchivist.ts

@@ -1,16 +1,16 @@
 import { assertEx } from '@xylabs/assert'
 import {
-  XyoArchivistAllQuerySchema,
-  XyoArchivistClearQuerySchema,
-  XyoArchivistCommitQuerySchema,
-  XyoArchivistConfig,
-  XyoArchivistDeleteQuerySchema,
-  XyoArchivistFindQuerySchema,
-  XyoArchivistInsertQuery,
-  XyoArchivistInsertQuerySchema,
+  ArchivistAllQuerySchema,
+  ArchivistClearQuerySchema,
+  ArchivistCommitQuerySchema,
+  ArchivistConfig,
+  ArchivistDeleteQuerySchema,
+  ArchivistFindQuerySchema,
+  ArchivistInsertQuery,
+  ArchivistInsertQuerySchema,
 } from '@xyo-network/archivist-interface'
 import { XyoBoundWitness } from '@xyo-network/boundwitness'
-import { XyoModuleParams } from '@xyo-network/module'
+import { ModuleParams } from '@xyo-network/module'
 import { PayloadWrapper, XyoPayload } from '@xyo-network/payload'
 import { PromisableArray } from '@xyo-network/promise'
 import compact from 'lodash/compact'
@@ -27,7 +27,7 @@ export type XyoMemoryArchivistConfigSchema = MemoryArchivistConfigSchema
 /** @deprecated use MemoryArchivistConfigSchema instead */
 export const XyoMemoryArchivistConfigSchema = MemoryArchivistConfigSchema
 
-export type MemoryArchivistConfig = XyoArchivistConfig<{
+export type MemoryArchivistConfig = ArchivistConfig<{
   max?: number
   schema: MemoryArchivistConfigSchema
 }>
@@ -40,7 +40,7 @@ export class MemoryArchivist<TConfig extends MemoryArchivistConfig = MemoryArchi
 
   private cache: LruCache<string, XyoPayload>
 
-  protected constructor(params: XyoModuleParams<TConfig>) {
+  protected constructor(params: ModuleParams<TConfig>) {
     super(params)
     this.cache = new LruCache<string, XyoPayload>({ max: this.max })
   }
@@ -49,7 +49,7 @@ export class MemoryArchivist<TConfig extends MemoryArchivistConfig = MemoryArchi
     return this.config?.max ?? 10000
   }
 
-  static override async create(params?: XyoModuleParams<MemoryArchivistConfig>): Promise<MemoryArchivist> {
+  static override async create(params?: ModuleParams<MemoryArchivistConfig>): Promise<MemoryArchivist> {
     return (await super.create(params)) as MemoryArchivist
   }
 
@@ -77,9 +77,9 @@ export class MemoryArchivist<TConfig extends MemoryArchivistConfig = MemoryArchi
       const settled = await Promise.allSettled(
         compact(
           Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {
-            const queryPayload = PayloadWrapper.parse<XyoArchivistInsertQuery>({
+            const queryPayload = PayloadWrapper.parse<ArchivistInsertQuery>({
               payloads: payloads.map((payload) => PayloadWrapper.hash(payload)),
-              schema: XyoArchivistInsertQuerySchema,
+              schema: ArchivistInsertQuerySchema,
             })
             const query = await this.bindQuery(queryPayload)
             return (await parent?.query(query[0], query[1]))?.[0]
@@ -150,12 +150,12 @@ export class MemoryArchivist<TConfig extends MemoryArchivistConfig = MemoryArchi
 
   public override queries() {
     return [
-      XyoArchivistAllQuerySchema,
-      XyoArchivistDeleteQuerySchema,
-      XyoArchivistClearQuerySchema,
-      XyoArchivistFindQuerySchema,
-      XyoArchivistInsertQuerySchema,
-      XyoArchivistCommitQuerySchema,
+      ArchivistAllQuerySchema,
+      ArchivistDeleteQuerySchema,
+      ArchivistClearQuerySchema,
+      ArchivistFindQuerySchema,
+      ArchivistInsertQuerySchema,
+      ArchivistCommitQuerySchema,
       ...super.queries(),
     ]
   }

package/src/StorageArchivist.spec.ts

@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 
-import { XyoModuleResolver } from '@xyo-network/module'
+import { AbstractModuleResolver } from '@xyo-network/module'
 import { PayloadWrapper } from '@xyo-network/payload'
 
 import { MemoryArchivist } from './MemoryArchivist'
@@ -64,7 +64,7 @@ test('XyoArchivist Parent Write Through', async () => {
       schema: StorageArchivistConfigSchema,
       type: 'local',
     },
-    resolver: new XyoModuleResolver().add(memory),
+    resolver: new AbstractModuleResolver().add(memory),
   })
   await storage.start()
 

package/src/StorageArchivist.ts

@@ -1,17 +1,17 @@
 import { assertEx } from '@xylabs/assert'
 import { Account } from '@xyo-network/account'
 import {
-  XyoArchivistAllQuerySchema,
-  XyoArchivistClearQuerySchema,
-  XyoArchivistCommitQuerySchema,
-  XyoArchivistConfig,
-  XyoArchivistDeleteQuerySchema,
-  XyoArchivistFindQuerySchema,
-  XyoArchivistInsertQuery,
-  XyoArchivistInsertQuerySchema,
+  ArchivistAllQuerySchema,
+  ArchivistClearQuerySchema,
+  ArchivistCommitQuerySchema,
+  ArchivistConfig,
+  ArchivistDeleteQuerySchema,
+  ArchivistFindQuerySchema,
+  ArchivistInsertQuery,
+  ArchivistInsertQuerySchema,
 } from '@xyo-network/archivist-interface'
 import { XyoBoundWitness } from '@xyo-network/boundwitness'
-import { XyoModuleParams } from '@xyo-network/module'
+import { ModuleParams } from '@xyo-network/module'
 import { PayloadWrapper, XyoPayload } from '@xyo-network/payload'
 import { PromisableArray } from '@xyo-network/promise'
 import compact from 'lodash/compact'
@@ -28,7 +28,7 @@ export type XyoStorageArchivistConfigSchema = StorageArchivistConfigSchema
 /** @deprecated use StorageArchivistConfigSchema instead */
 export const XyoStorageArchivistConfigSchema = StorageArchivistConfigSchema
 
-export type StorageArchivistConfig = XyoArchivistConfig<{
+export type StorageArchivistConfig = ArchivistConfig<{
   maxEntries?: number
   maxEntrySize?: number
   namespace?: string
@@ -45,7 +45,7 @@ export class XyoStorageArchivist extends AbstractArchivist<StorageArchivistConfi
   private _privateStorage: StoreBase | undefined
   private _storage: StoreBase | undefined
 
-  constructor(params: XyoModuleParams<StorageArchivistConfig>) {
+  constructor(params: ModuleParams<StorageArchivistConfig>) {
     super(params)
     this.loadAccount()
   }
@@ -82,7 +82,7 @@ export class XyoStorageArchivist extends AbstractArchivist<StorageArchivistConfi
     return this._storage
   }
 
-  static override async create(params?: XyoModuleParams<StorageArchivistConfig>): Promise<XyoStorageArchivist> {
+  static override async create(params?: ModuleParams<StorageArchivistConfig>): Promise<XyoStorageArchivist> {
     return (await super.create(params)) as XyoStorageArchivist
   }
 
@@ -114,9 +114,9 @@ export class XyoStorageArchivist extends AbstractArchivist<StorageArchivistConfi
       const settled = await Promise.allSettled(
         compact(
           Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {
-            const queryPayload = PayloadWrapper.parse<XyoArchivistInsertQuery>({
+            const queryPayload = PayloadWrapper.parse<ArchivistInsertQuery>({
               payloads: payloads.map((payload) => PayloadWrapper.hash(payload)),
-              schema: XyoArchivistInsertQuerySchema,
+              schema: ArchivistInsertQuerySchema,
             })
             const query = await this.bindQuery(queryPayload)
             return (await parent?.query(query[0], query[1]))?.[0]
@@ -189,12 +189,12 @@ export class XyoStorageArchivist extends AbstractArchivist<StorageArchivistConfi
 
   public override queries() {
     return [
-      XyoArchivistAllQuerySchema,
-      XyoArchivistDeleteQuerySchema,
-      XyoArchivistClearQuerySchema,
-      XyoArchivistFindQuerySchema,
-      XyoArchivistInsertQuerySchema,
-      XyoArchivistCommitQuerySchema,
+      ArchivistAllQuerySchema,
+      ArchivistDeleteQuerySchema,
+      ArchivistClearQuerySchema,
+      ArchivistFindQuerySchema,
+      ArchivistInsertQuerySchema,
+      ArchivistCommitQuerySchema,
       ...super.queries(),
     ]
   }