@xyo-network/archivist 2.22.3 → 2.22.6

package/dist/cjs/XyoArchivist.d.ts

@@ -1,15 +1,16 @@
 import { XyoAccount } from '@xyo-network/account';
 import { XyoPayload } from '@xyo-network/payload';
 import { Archivist } from './model';
-import { XyoPayloadFindFilter } from './XyoPayloadFindFilter';
-export declare abstract class XyoArchivist<TRead extends XyoPayload = XyoPayload, TWrite extends XyoPayload = XyoPayload> implements Archivist<string, TWrite, TRead | undefined, string, TRead, XyoPayloadFindFilter> {
-    protected parent?: XyoArchivist<TRead, TWrite>;
+import { XyoPayloadFindQuery } from './XyoPayloadFindFilter';
+export declare type XyoArchivist<T extends XyoPayload = XyoPayload> = Archivist<T, T, T, T, XyoPayloadFindQuery>;
+export declare abstract class XyoArchivistBase<T extends XyoPayload = XyoPayload> implements XyoArchivist<T> {
+    protected parent?: XyoArchivist<T>;
     protected account?: XyoAccount;
-    constructor(parent?: XyoArchivist<TRead, TWrite>, account?: XyoAccount);
-    abstract insert(item: TWrite): string[] | Promise<string[]>;
-    abstract find(query: XyoPayloadFindFilter): TRead[] | Promise<TRead[]>;
-    abstract get(hash: string): TRead[] | Promise<TRead[] | undefined> | undefined;
-    all(): TRead[] | Promise<TRead[] | undefined> | undefined;
+    constructor(parent?: XyoArchivist<T>, account?: XyoAccount);
+    abstract insert(payloads: T[]): T[] | Promise<T[]>;
+    abstract find(query: XyoPayloadFindQuery): T[] | Promise<T[]>;
+    abstract get(hash: string): T | Promise<T | undefined> | undefined;
+    all(): T[] | Promise<T[]>;
     delete(_hash: string): boolean | Promise<boolean>;
     clear(): void | Promise<void>;
     commit(): void;

package/dist/cjs/XyoArchivist.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.XyoArchivist = void 0;
-class XyoArchivist {
+exports.XyoArchivistBase = void 0;
+class XyoArchivistBase {
     constructor(parent, account) {
         this.parent = parent;
         this.account = account;
@@ -19,5 +19,5 @@ class XyoArchivist {
         throw Error('commit not supported');
     }
 }
-exports.XyoArchivist = XyoArchivist;
+exports.XyoArchivistBase = XyoArchivistBase;
 //# sourceMappingURL=XyoArchivist.js.map

package/dist/cjs/XyoArchivist.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoArchivist.js","sourceRoot":"","sources":["../../src/XyoArchivist.ts"],"names":[],"mappings":";;;AAMA,MAAsB,YAAY;IAKhC,YAAY,MAAoC,EAAE,OAAoB;QACpE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAIM,GAAG;QACR,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAA;IACrC,CAAC;IACM,MAAM,CAAC,KAAa;QACzB,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAA;IACrC,CAAC;IACM,KAAK;QACV,MAAM,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACpC,CAAC;IACM,MAAM;QACX,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAA;IACrC,CAAC;CACF;AAxBD,oCAwBC"}
+{"version":3,"file":"XyoArchivist.js","sourceRoot":"","sources":["../../src/XyoArchivist.ts"],"names":[],"mappings":";;;AAQA,MAAsB,gBAAgB;IAGpC,YAAY,MAAwB,EAAE,OAAoB;QACxD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAKM,GAAG;QACR,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAA;IACrC,CAAC;IACM,MAAM,CAAC,KAAa;QACzB,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAA;IACrC,CAAC;IACM,KAAK;QACV,MAAM,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACpC,CAAC;IACM,MAAM;QACX,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAA;IACrC,CAAC;CACF;AAvBD,4CAuBC"}

package/dist/cjs/XyoBoundWitnessMemoryArchivist.d.ts

@@ -1,5 +1,5 @@
 import { XyoBoundWitness, XyoBoundWitnessWithMeta } from '@xyo-network/boundwitness';
-import { XyoPayload, XyoPayloadWithMeta } from '@xyo-network/payload';
+import { XyoPayloadWithMeta } from '@xyo-network/payload';
 import { XyoBoundWitnessArchivist } from './XyoBoundWitnessArchivist';
 import { XyoPayloadFindFilter } from './XyoPayloadFindFilter';
 export declare class XyoBoundWitnessMemoryArchivist<TRead extends XyoPayloadWithMeta = XyoPayloadWithMeta, TWrite extends XyoBoundWitnessWithMeta<XyoBoundWitness, TRead> & TRead = XyoBoundWitnessWithMeta<XyoBoundWitness, TRead> & TRead> extends XyoBoundWitnessArchivist<TRead, TWrite> {
@@ -8,5 +8,5 @@ export declare class XyoBoundWitnessMemoryArchivist<TRead extends XyoPayloadWith
     clear(): void;
     get(hash: string): TRead[] | Promise<TRead[] | undefined> | undefined;
     insert(boundWitness: TWrite): string[];
-    find<T extends XyoPayload = XyoPayload>(filter: XyoPayloadFindFilter): T[];
+    find<T extends TRead = TRead>(filter: XyoPayloadFindFilter): T[];
 }

package/dist/cjs/XyoBoundWitnessMemoryArchivist.js

@@ -38,7 +38,13 @@ class XyoBoundWitnessMemoryArchivist extends XyoBoundWitnessArchivist_1.XyoBound
         return hashes;
     }
     find(filter) {
-        return [this.cache.find((value) => value.schema === filter.schema)];
+        const result = [];
+        this.cache.forEach((value) => {
+            if (value.schema === filter.schema) {
+                result.push(value);
+            }
+        });
+        return result;
     }
 }
 exports.XyoBoundWitnessMemoryArchivist = XyoBoundWitnessMemoryArchivist;

package/dist/cjs/XyoBoundWitnessMemoryArchivist.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoBoundWitnessMemoryArchivist.js","sourceRoot":"","sources":["../../src/XyoBoundWitnessMemoryArchivist.ts"],"names":[],"mappings":";;;;AAAA,4DAA4G;AAC5G,kDAAwF;AACxF,kEAAgC;AAEhC,yEAAqE;AAGrE,MAAa,8BAGX,SAAQ,mDAAuC;IAHjD;;QAIU,UAAK,GAAG,IAAI,mBAAQ,CAAgB,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAA;IAiC7D,CAAC;IA/BQ,MAAM,CAAC,IAAY;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;IACpB,CAAC;IAEM,GAAG,CAAC,IAAY;;QACrB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACxC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAA,IAAI,CAAC,MAAM,0CAAE,GAAG,CAAC,IAAI,CAAC,CAAA;IAC7D,CAAC;IAEM,MAAM,CAAC,YAAoB;;QAChC,MAAM,OAAO,GAAG,IAAI,qCAAsB,CAAC,YAAY,CAAC,CAAA;QACxD,MAAM,oBAAoB,mCAAQ,YAAY,KAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAE,CAAA;QAC7F,MAAM,MAAM,GAAa,EAAE,CAAA;QAC3B,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAA;QACvC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAA;QAChE,MAAA,YAAY,CAAC,SAAS,0CAAE,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC1C,MAAM,OAAO,GAAG,IAAI,2BAAiB,CAAC,OAAO,CAAC,CAAA;YAC9C,MAAM,eAAe,mCAAe,OAAO,KAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAE,CAAA;YAC1F,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;YAClC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;QACxD,CAAC,CAAC,CAAA;QACF,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,IAAI,CAAoC,MAA4B;QACzE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;IACrE,CAAC;CACF;AArCD,wEAqCC"}
+{"version":3,"file":"XyoBoundWitnessMemoryArchivist.js","sourceRoot":"","sources":["../../src/XyoBoundWitnessMemoryArchivist.ts"],"names":[],"mappings":";;;;AAAA,4DAA4G;AAC5G,kDAA4E;AAC5E,kEAAgC;AAEhC,yEAAqE;AAGrE,MAAa,8BAGX,SAAQ,mDAAuC;IAHjD;;QAIU,UAAK,GAAG,IAAI,mBAAQ,CAAgB,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAA;IAuC7D,CAAC;IArCQ,MAAM,CAAC,IAAY;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;IACpB,CAAC;IAEM,GAAG,CAAC,IAAY;;QACrB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACxC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAA,IAAI,CAAC,MAAM,0CAAE,GAAG,CAAC,IAAI,CAAC,CAAA;IAC7D,CAAC;IAEM,MAAM,CAAC,YAAoB;;QAChC,MAAM,OAAO,GAAG,IAAI,qCAAsB,CAAC,YAAY,CAAC,CAAA;QACxD,MAAM,oBAAoB,mCAAQ,YAAY,KAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAE,CAAA;QAC7F,MAAM,MAAM,GAAa,EAAE,CAAA;QAC3B,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAA;QACvC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAA;QAChE,MAAA,YAAY,CAAC,SAAS,0CAAE,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC1C,MAAM,OAAO,GAAG,IAAI,2BAAiB,CAAC,OAAO,CAAC,CAAA;YAC9C,MAAM,eAAe,mCAAe,OAAO,KAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAE,CAAA;YAC1F,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;YAClC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;QACxD,CAAC,CAAC,CAAA;QACF,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,IAAI,CAA0B,MAA4B;QAC/D,MAAM,MAAM,GAAQ,EAAE,CAAA;QACtB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC3B,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE;gBAClC,MAAM,CAAC,IAAI,CAAC,KAAU,CAAC,CAAA;aACxB;QACH,CAAC,CAAC,CAAA;QACF,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AA3CD,wEA2CC"}

package/dist/cjs/XyoMemoryArchivist.d.ts

@@ -1,11 +1,11 @@
 import { XyoPayload } from '@xyo-network/payload';
-import { XyoArchivist } from './XyoArchivist';
+import { XyoArchivistBase } from './XyoArchivist';
 import { XyoPayloadFindFilter } from './XyoPayloadFindFilter';
-export declare class XyoMemoryArchivist<TRead extends XyoPayload = XyoPayload, TWrite extends XyoPayload & TRead = XyoPayload & TRead> extends XyoArchivist<TRead, TWrite> {
+export declare class XyoMemoryArchivist<T extends XyoPayload = XyoPayload> extends XyoArchivistBase<T> {
     private cache;
-    delete(hash: string): boolean;
-    clear(): void;
-    get(hash: string): TRead[] | Promise<TRead[] | undefined> | undefined;
-    insert(payload: TWrite): string[];
-    find<T extends XyoPayload = XyoPayload>(filter: XyoPayloadFindFilter): T[];
+    delete(hash: string): boolean | Promise<boolean>;
+    clear(): void | Promise<void>;
+    get(hash: string): T | Promise<T | undefined> | undefined;
+    insert(payloads: T[]): T[] | Promise<T[]>;
+    find<R extends T = T>(filter: XyoPayloadFindFilter): T[] | Promise<T[]>;
 }

package/dist/cjs/XyoMemoryArchivist.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const payload_1 = require("@xyo-network/payload");
 const lru_cache_1 = tslib_1.__importDefault(require("lru-cache"));
 const XyoArchivist_1 = require("./XyoArchivist");
-class XyoMemoryArchivist extends XyoArchivist_1.XyoArchivist {
+class XyoMemoryArchivist extends XyoArchivist_1.XyoArchivistBase {
     constructor() {
         super(...arguments);
         this.cache = new lru_cache_1.default({ max: 10000 });
@@ -17,18 +17,25 @@ class XyoMemoryArchivist extends XyoArchivist_1.XyoArchivist {
         this.cache.clear();
     }
     get(hash) {
-        var _a;
-        const localResult = this.cache.get(hash);
-        return localResult ? [localResult] : (_a = this.parent) === null || _a === void 0 ? void 0 : _a.get(hash);
+        var _a, _b;
+        return (_a = this.cache.get(hash)) !== null && _a !== void 0 ? _a : (_b = this.parent) === null || _b === void 0 ? void 0 : _b.get(hash);
     }
-    insert(payload) {
-        const wrapper = new payload_1.XyoPayloadWrapper(payload);
-        const payloadWithmeta = Object.assign(Object.assign({}, payload), { _hash: wrapper.hash, _timestamp: Date.now() });
-        this.cache.set(payloadWithmeta._hash, payloadWithmeta);
-        return [payloadWithmeta._hash];
+    insert(payloads) {
+        return payloads.map((payload) => {
+            const wrapper = new payload_1.XyoPayloadWrapper(payload);
+            const payloadWithmeta = Object.assign(Object.assign({}, payload), { _hash: wrapper.hash, _timestamp: Date.now() });
+            this.cache.set(payloadWithmeta._hash, payloadWithmeta);
+            return payloadWithmeta;
+        });
     }
     find(filter) {
-        return [this.cache.find((value) => value.schema === filter.schema)];
+        const result = [];
+        this.cache.forEach((value) => {
+            if (value.schema === filter.schema) {
+                result.push(value);
+            }
+        });
+        return result;
     }
 }
 exports.XyoMemoryArchivist = XyoMemoryArchivist;

package/dist/cjs/XyoMemoryArchivist.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoMemoryArchivist.js","sourceRoot":"","sources":["../../src/XyoMemoryArchivist.ts"],"names":[],"mappings":";;;;AAAA,kDAAoE;AACpE,kEAAgC;AAEhC,iDAA6C;AAG7C,MAAa,kBAAkH,SAAQ,2BAA2B;IAAlK;;QACU,UAAK,GAA4B,IAAI,mBAAQ,CAAgB,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAA;IAyBtF,CAAC;IAvBQ,MAAM,CAAC,IAAY;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;IACpB,CAAC;IAEM,GAAG,CAAC,IAAY;;QACrB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACxC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAA,IAAI,CAAC,MAAM,0CAAE,GAAG,CAAC,IAAI,CAAC,CAAA;IAC7D,CAAC;IAEM,MAAM,CAAC,OAAe;QAC3B,MAAM,OAAO,GAAG,IAAI,2BAAiB,CAAC,OAAO,CAAC,CAAA;QAC9C,MAAM,eAAe,mCAAQ,OAAO,KAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAE,CAAA;QACnF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;QACtD,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;IAChC,CAAC;IAEM,IAAI,CAAoC,MAA4B;QACzE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;IACrE,CAAC;CACF;AA1BD,gDA0BC"}
+{"version":3,"file":"XyoMemoryArchivist.js","sourceRoot":"","sources":["../../src/XyoMemoryArchivist.ts"],"names":[],"mappings":";;;;AAAA,kDAAoE;AACpE,kEAAgC;AAEhC,iDAAiD;AAGjD,MAAa,kBAAsD,SAAQ,+BAAmB;IAA9F;;QACU,UAAK,GAAG,IAAI,mBAAQ,CAAY,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAA;IAgCzD,CAAC;IA9BQ,MAAM,CAAC,IAAY;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;IACpB,CAAC;IAEM,GAAG,CAAC,IAAY;;QACrB,OAAO,MAAA,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,mCAAI,MAAA,IAAI,CAAC,MAAM,0CAAE,GAAG,CAAC,IAAI,CAAC,CAAA;IACvD,CAAC;IAEM,MAAM,CAAC,QAAa;QACzB,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YAC9B,MAAM,OAAO,GAAG,IAAI,2BAAiB,CAAC,OAAO,CAAC,CAAA;YAC9C,MAAM,eAAe,mCAAQ,OAAO,KAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAE,CAAA;YACnF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;YACtD,OAAO,eAAe,CAAA;QACxB,CAAC,CAAC,CAAA;IACJ,CAAC;IAEM,IAAI,CAAkB,MAA4B;QACvD,MAAM,MAAM,GAAQ,EAAE,CAAA;QACtB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC3B,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE;gBAClC,MAAM,CAAC,IAAI,CAAC,KAAU,CAAC,CAAA;aACxB;QACH,CAAC,CAAC,CAAA;QACF,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AAjCD,gDAiCC"}

package/dist/cjs/XyoPayloadFindFilter.d.ts

@@ -1,7 +1,10 @@
+import { XyoQueryPayload } from '@xyo-network/payload';
 export interface XyoPayloadFindFilter {
-    [key: string]: unknown;
     order?: 'desc' | 'asc';
     timestamp?: number;
     limit?: number;
     schema?: string;
 }
+export declare type XyoPayloadFindQuery = XyoQueryPayload<{
+    filter: XyoPayloadFindFilter;
+}>;

package/dist/cjs/index.d.ts

@@ -1,6 +1,4 @@
 export * from './model';
 export * from './XyoArchivist';
-export * from './XyoBoundWitnessArchivist';
-export * from './XyoBoundWitnessMemoryArchivist';
 export * from './XyoMemoryArchivist';
 export * from './XyoPayloadFindFilter';

package/dist/cjs/index.js

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./model"), exports);
 tslib_1.__exportStar(require("./XyoArchivist"), exports);
-tslib_1.__exportStar(require("./XyoBoundWitnessArchivist"), exports);
-tslib_1.__exportStar(require("./XyoBoundWitnessMemoryArchivist"), exports);
 tslib_1.__exportStar(require("./XyoMemoryArchivist"), exports);
 tslib_1.__exportStar(require("./XyoPayloadFindFilter"), exports);
 //# sourceMappingURL=index.js.map

package/dist/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,kDAAuB;AACvB,yDAA8B;AAC9B,qEAA0C;AAC1C,2EAAgD;AAChD,+DAAoC;AACpC,iEAAsC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,kDAAuB;AACvB,yDAA8B;AAC9B,+DAAoC;AACpC,iEAAsC"}

package/dist/cjs/model/Archivist.d.ts

@@ -1,7 +1,7 @@
-export interface Archivist<TWriteResponse, TWrite, TReadResponse = TWriteResponse, TId = string, TQueryResponse = TReadResponse, TQuery = unknown> {
-    get(id: TId): Promise<TReadResponse[] | undefined> | TReadResponse[] | undefined;
+export interface Archivist<TReadResponse, TWriteResponse = TReadResponse, TWrite = TReadResponse, TQueryResponse = TReadResponse, TQuery = unknown, TId = string> {
+    get(id: TId): Promise<TReadResponse | undefined> | TReadResponse | undefined;
     find?(query: TQuery): Promise<TQueryResponse[]> | TQueryResponse[];
-    insert?(item: TWrite): Promise<TWriteResponse[]> | TWriteResponse[];
+    insert?(item: TWrite[]): Promise<TWriteResponse[]> | TWriteResponse[];
     delete?(id: TId): Promise<boolean> | boolean;
     clear?(): void;
 }

package/dist/esm/XyoArchivist.d.ts

@@ -1,15 +1,16 @@
 import { XyoAccount } from '@xyo-network/account';
 import { XyoPayload } from '@xyo-network/payload';
 import { Archivist } from './model';
-import { XyoPayloadFindFilter } from './XyoPayloadFindFilter';
-export declare abstract class XyoArchivist<TRead extends XyoPayload = XyoPayload, TWrite extends XyoPayload = XyoPayload> implements Archivist<string, TWrite, TRead | undefined, string, TRead, XyoPayloadFindFilter> {
-    protected parent?: XyoArchivist<TRead, TWrite>;
+import { XyoPayloadFindQuery } from './XyoPayloadFindFilter';
+export declare type XyoArchivist<T extends XyoPayload = XyoPayload> = Archivist<T, T, T, T, XyoPayloadFindQuery>;
+export declare abstract class XyoArchivistBase<T extends XyoPayload = XyoPayload> implements XyoArchivist<T> {
+    protected parent?: XyoArchivist<T>;
     protected account?: XyoAccount;
-    constructor(parent?: XyoArchivist<TRead, TWrite>, account?: XyoAccount);
-    abstract insert(item: TWrite): string[] | Promise<string[]>;
-    abstract find(query: XyoPayloadFindFilter): TRead[] | Promise<TRead[]>;
-    abstract get(hash: string): TRead[] | Promise<TRead[] | undefined> | undefined;
-    all(): TRead[] | Promise<TRead[] | undefined> | undefined;
+    constructor(parent?: XyoArchivist<T>, account?: XyoAccount);
+    abstract insert(payloads: T[]): T[] | Promise<T[]>;
+    abstract find(query: XyoPayloadFindQuery): T[] | Promise<T[]>;
+    abstract get(hash: string): T | Promise<T | undefined> | undefined;
+    all(): T[] | Promise<T[]>;
     delete(_hash: string): boolean | Promise<boolean>;
     clear(): void | Promise<void>;
     commit(): void;

package/dist/esm/XyoArchivist.js

@@ -1,4 +1,4 @@
-export class XyoArchivist {
+export class XyoArchivistBase {
     constructor(parent, account) {
         this.parent = parent;
         this.account = account;

package/dist/esm/XyoArchivist.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoArchivist.js","sourceRoot":"","sources":["../../src/XyoArchivist.ts"],"names":[],"mappings":"AAMA,MAAM,OAAgB,YAAY;IAKhC,YAAY,MAAoC,EAAE,OAAoB;QACpE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAIM,GAAG;QACR,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAA;IACrC,CAAC;IACM,MAAM,CAAC,KAAa;QACzB,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAA;IACrC,CAAC;IACM,KAAK;QACV,MAAM,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACpC,CAAC;IACM,MAAM;QACX,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAA;IACrC,CAAC;CACF"}
+{"version":3,"file":"XyoArchivist.js","sourceRoot":"","sources":["../../src/XyoArchivist.ts"],"names":[],"mappings":"AAQA,MAAM,OAAgB,gBAAgB;IAGpC,YAAY,MAAwB,EAAE,OAAoB;QACxD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAKM,GAAG;QACR,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAA;IACrC,CAAC;IACM,MAAM,CAAC,KAAa;QACzB,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAA;IACrC,CAAC;IACM,KAAK;QACV,MAAM,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACpC,CAAC;IACM,MAAM;QACX,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAA;IACrC,CAAC;CACF"}

package/dist/esm/XyoBoundWitnessArchivist.js

@@ -1,6 +1,5 @@
 import { assertEx } from '@xylabs/sdk-js';
 import { XyoBoundWitnessBuilder } from '@xyo-network/boundwitness';
-import { XyoArchivist } from './XyoArchivist';
 export class XyoBoundWitnessArchivist extends XyoArchivist {
     async commit() {
         const parent = assertEx(this.parent, 'Parent is required for commit');

package/dist/esm/XyoBoundWitnessArchivist.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoBoundWitnessArchivist.js","sourceRoot":"","sources":["../../src/XyoBoundWitnessArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,sBAAsB,EAA2B,MAAM,2BAA2B,CAAA;AAG3F,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,MAAM,OAAgB,wBAAkI,SAAQ,YAG/J;IACQ,KAAK,CAAC,MAAM;QACjB,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,+BAA+B,CAAC,CAAA;QACrE,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,gCAAgC,CAAC,CAAA;QACxE,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,MAAM,CAAC,GAAG,EAAE,EAAE,mBAAmB,CAAC,CAAA;QAClE,MAAM,OAAO,GAAG,IAAI,sBAAsB,EAAiB,CAAA;QAC3D,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAA;QACjE,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACzC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;QAClB,OAAO,IAAI,CAAA;IACb,CAAC;CACF"}
+{"version":3,"file":"XyoBoundWitnessArchivist.js","sourceRoot":"","sources":["../../src/XyoBoundWitnessArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,sBAAsB,EAA2B,MAAM,2BAA2B,CAAA;AAK3F,MAAM,OAAgB,wBAAkI,SAAQ,YAG/J;IACQ,KAAK,CAAC,MAAM;QACjB,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,+BAA+B,CAAC,CAAA;QACrE,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,gCAAgC,CAAC,CAAA;QACxE,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,MAAM,CAAC,GAAG,EAAE,EAAE,mBAAmB,CAAC,CAAA;QAClE,MAAM,OAAO,GAAG,IAAI,sBAAsB,EAAiB,CAAA;QAC3D,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAA;QACjE,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACzC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;QAClB,OAAO,IAAI,CAAA;IACb,CAAC;CACF"}

package/dist/esm/XyoBoundWitnessMemoryArchivist.d.ts

@@ -1,12 +1,12 @@
 import { XyoBoundWitness, XyoBoundWitnessWithMeta } from '@xyo-network/boundwitness';
-import { XyoPayload, XyoPayloadWithMeta } from '@xyo-network/payload';
+import { XyoPayloadWithMeta } from '@xyo-network/payload';
 import { XyoBoundWitnessArchivist } from './XyoBoundWitnessArchivist';
 import { XyoPayloadFindFilter } from './XyoPayloadFindFilter';
 export declare class XyoBoundWitnessMemoryArchivist<TRead extends XyoPayloadWithMeta = XyoPayloadWithMeta, TWrite extends XyoBoundWitnessWithMeta<XyoBoundWitness, TRead> & TRead = XyoBoundWitnessWithMeta<XyoBoundWitness, TRead> & TRead> extends XyoBoundWitnessArchivist<TRead, TWrite> {
     private cache;
     delete(hash: string): boolean;
     clear(): void;
-    get(hash: string): TRead[] | Promise<TRead[] | undefined> | undefined;
+    get(hash: string): any;
     insert(boundWitness: TWrite): string[];
-    find<T extends XyoPayload = XyoPayload>(filter: XyoPayloadFindFilter): T[];
+    find<T extends TRead = TRead>(filter: XyoPayloadFindFilter): T[];
 }

package/dist/esm/XyoBoundWitnessMemoryArchivist.js

@@ -32,7 +32,13 @@ export class XyoBoundWitnessMemoryArchivist extends XyoBoundWitnessArchivist {
         return hashes;
     }
     find(filter) {
-        return [this.cache.find((value) => value.schema === filter.schema)];
+        const result = [];
+        this.cache.forEach((value) => {
+            if (value.schema === filter.schema) {
+                result.push(value);
+            }
+        });
+        return result;
     }
 }
 //# sourceMappingURL=XyoBoundWitnessMemoryArchivist.js.map

package/dist/esm/XyoBoundWitnessMemoryArchivist.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoBoundWitnessMemoryArchivist.js","sourceRoot":"","sources":["../../src/XyoBoundWitnessMemoryArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4C,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAC5G,OAAO,EAAkC,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxF,OAAO,QAAQ,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AAGrE,MAAM,OAAO,8BAGX,SAAQ,wBAAuC;IAHjD;;QAIU,UAAK,GAAG,IAAI,QAAQ,CAAgB,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAA;IAiC7D,CAAC;IA/BQ,MAAM,CAAC,IAAY;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;IACpB,CAAC;IAEM,GAAG,CAAC,IAAY;QACrB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACxC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;IAC7D,CAAC;IAEM,MAAM,CAAC,YAAoB;QAChC,MAAM,OAAO,GAAG,IAAI,sBAAsB,CAAC,YAAY,CAAC,CAAA;QACxD,MAAM,oBAAoB,GAAG,EAAE,GAAG,YAAY,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAA;QAC7F,MAAM,MAAM,GAAa,EAAE,CAAA;QAC3B,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAA;QACvC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAA;QAChE,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC1C,MAAM,OAAO,GAAG,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAA;YAC9C,MAAM,eAAe,GAAU,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAA;YAC1F,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;YAClC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;QACxD,CAAC,CAAC,CAAA;QACF,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,IAAI,CAAoC,MAA4B;QACzE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;IACrE,CAAC;CACF"}
+{"version":3,"file":"XyoBoundWitnessMemoryArchivist.js","sourceRoot":"","sources":["../../src/XyoBoundWitnessMemoryArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4C,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAC5G,OAAO,EAAsB,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAC5E,OAAO,QAAQ,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AAGrE,MAAM,OAAO,8BAGX,SAAQ,wBAAuC;IAHjD;;QAIU,UAAK,GAAG,IAAI,QAAQ,CAAgB,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAA;IAuC7D,CAAC;IArCQ,MAAM,CAAC,IAAY;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;IACpB,CAAC;IAEM,GAAG,CAAC,IAAY;QACrB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACxC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;IAC7D,CAAC;IAEM,MAAM,CAAC,YAAoB;QAChC,MAAM,OAAO,GAAG,IAAI,sBAAsB,CAAC,YAAY,CAAC,CAAA;QACxD,MAAM,oBAAoB,GAAG,EAAE,GAAG,YAAY,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAA;QAC7F,MAAM,MAAM,GAAa,EAAE,CAAA;QAC3B,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAA;QACvC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAA;QAChE,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC1C,MAAM,OAAO,GAAG,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAA;YAC9C,MAAM,eAAe,GAAU,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAA;YAC1F,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;YAClC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;QACxD,CAAC,CAAC,CAAA;QACF,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,IAAI,CAA0B,MAA4B;QAC/D,MAAM,MAAM,GAAQ,EAAE,CAAA;QACtB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC3B,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE;gBAClC,MAAM,CAAC,IAAI,CAAC,KAAU,CAAC,CAAA;aACxB;QACH,CAAC,CAAC,CAAA;QACF,OAAO,MAAM,CAAA;IACf,CAAC;CACF"}

package/dist/esm/XyoMemoryArchivist.d.ts

@@ -1,11 +1,11 @@
 import { XyoPayload } from '@xyo-network/payload';
-import { XyoArchivist } from './XyoArchivist';
+import { XyoArchivistBase } from './XyoArchivist';
 import { XyoPayloadFindFilter } from './XyoPayloadFindFilter';
-export declare class XyoMemoryArchivist<TRead extends XyoPayload = XyoPayload, TWrite extends XyoPayload & TRead = XyoPayload & TRead> extends XyoArchivist<TRead, TWrite> {
+export declare class XyoMemoryArchivist<T extends XyoPayload = XyoPayload> extends XyoArchivistBase<T> {
     private cache;
-    delete(hash: string): boolean;
-    clear(): void;
-    get(hash: string): TRead[] | Promise<TRead[] | undefined> | undefined;
-    insert(payload: TWrite): string[];
-    find<T extends XyoPayload = XyoPayload>(filter: XyoPayloadFindFilter): T[];
+    delete(hash: string): boolean | Promise<boolean>;
+    clear(): void | Promise<void>;
+    get(hash: string): T | Promise<T | undefined> | undefined;
+    insert(payloads: T[]): T[] | Promise<T[]>;
+    find<R extends T = T>(filter: XyoPayloadFindFilter): T[] | Promise<T[]>;
 }

package/dist/esm/XyoMemoryArchivist.js

@@ -1,7 +1,7 @@
 import { XyoPayloadWrapper } from '@xyo-network/payload';
 import LruCache from 'lru-cache';
-import { XyoArchivist } from './XyoArchivist';
-export class XyoMemoryArchivist extends XyoArchivist {
+import { XyoArchivistBase } from './XyoArchivist';
+export class XyoMemoryArchivist extends XyoArchivistBase {
     constructor() {
         super(...arguments);
         this.cache = new LruCache({ max: 10000 });
@@ -13,17 +13,24 @@ export class XyoMemoryArchivist extends XyoArchivist {
         this.cache.clear();
     }
     get(hash) {
-        const localResult = this.cache.get(hash);
-        return localResult ? [localResult] : this.parent?.get(hash);
+        return this.cache.get(hash) ?? this.parent?.get(hash);
     }
-    insert(payload) {
-        const wrapper = new XyoPayloadWrapper(payload);
-        const payloadWithmeta = { ...payload, _hash: wrapper.hash, _timestamp: Date.now() };
-        this.cache.set(payloadWithmeta._hash, payloadWithmeta);
-        return [payloadWithmeta._hash];
+    insert(payloads) {
+        return payloads.map((payload) => {
+            const wrapper = new XyoPayloadWrapper(payload);
+            const payloadWithmeta = { ...payload, _hash: wrapper.hash, _timestamp: Date.now() };
+            this.cache.set(payloadWithmeta._hash, payloadWithmeta);
+            return payloadWithmeta;
+        });
     }
     find(filter) {
-        return [this.cache.find((value) => value.schema === filter.schema)];
+        const result = [];
+        this.cache.forEach((value) => {
+            if (value.schema === filter.schema) {
+                result.push(value);
+            }
+        });
+        return result;
     }
 }
 //# sourceMappingURL=XyoMemoryArchivist.js.map

package/dist/esm/XyoMemoryArchivist.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoMemoryArchivist.js","sourceRoot":"","sources":["../../src/XyoMemoryArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACpE,OAAO,QAAQ,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAG7C,MAAM,OAAO,kBAAkH,SAAQ,YAA2B;IAAlK;;QACU,UAAK,GAA4B,IAAI,QAAQ,CAAgB,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAA;IAyBtF,CAAC;IAvBQ,MAAM,CAAC,IAAY;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;IACpB,CAAC;IAEM,GAAG,CAAC,IAAY;QACrB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACxC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;IAC7D,CAAC;IAEM,MAAM,CAAC,OAAe;QAC3B,MAAM,OAAO,GAAG,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAA;QAC9C,MAAM,eAAe,GAAG,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAA;QACnF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;QACtD,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;IAChC,CAAC;IAEM,IAAI,CAAoC,MAA4B;QACzE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;IACrE,CAAC;CACF"}
+{"version":3,"file":"XyoMemoryArchivist.js","sourceRoot":"","sources":["../../src/XyoMemoryArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACpE,OAAO,QAAQ,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAGjD,MAAM,OAAO,kBAAsD,SAAQ,gBAAmB;IAA9F;;QACU,UAAK,GAAG,IAAI,QAAQ,CAAY,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAA;IAgCzD,CAAC;IA9BQ,MAAM,CAAC,IAAY;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;IACpB,CAAC;IAEM,GAAG,CAAC,IAAY;QACrB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;IACvD,CAAC;IAEM,MAAM,CAAC,QAAa;QACzB,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YAC9B,MAAM,OAAO,GAAG,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAA;YAC9C,MAAM,eAAe,GAAG,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAA;YACnF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;YACtD,OAAO,eAAe,CAAA;QACxB,CAAC,CAAC,CAAA;IACJ,CAAC;IAEM,IAAI,CAAkB,MAA4B;QACvD,MAAM,MAAM,GAAQ,EAAE,CAAA;QACtB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC3B,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE;gBAClC,MAAM,CAAC,IAAI,CAAC,KAAU,CAAC,CAAA;aACxB;QACH,CAAC,CAAC,CAAA;QACF,OAAO,MAAM,CAAA;IACf,CAAC;CACF"}

package/dist/esm/XyoPayloadFindFilter.d.ts

@@ -1,7 +1,10 @@
+import { XyoQueryPayload } from '@xyo-network/payload';
 export interface XyoPayloadFindFilter {
-    [key: string]: unknown;
     order?: 'desc' | 'asc';
     timestamp?: number;
     limit?: number;
     schema?: string;
 }
+export declare type XyoPayloadFindQuery = XyoQueryPayload<{
+    filter: XyoPayloadFindFilter;
+}>;

package/dist/esm/index.d.ts

@@ -1,6 +1,4 @@
 export * from './model';
 export * from './XyoArchivist';
-export * from './XyoBoundWitnessArchivist';
-export * from './XyoBoundWitnessMemoryArchivist';
 export * from './XyoMemoryArchivist';
 export * from './XyoPayloadFindFilter';

package/dist/esm/index.js

@@ -1,7 +1,5 @@
 export * from './model';
 export * from './XyoArchivist';
-export * from './XyoBoundWitnessArchivist';
-export * from './XyoBoundWitnessMemoryArchivist';
 export * from './XyoMemoryArchivist';
 export * from './XyoPayloadFindFilter';
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,4BAA4B,CAAA;AAC1C,cAAc,kCAAkC,CAAA;AAChD,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA"}

package/dist/esm/model/Archivist.d.ts

@@ -1,7 +1,7 @@
-export interface Archivist<TWriteResponse, TWrite, TReadResponse = TWriteResponse, TId = string, TQueryResponse = TReadResponse, TQuery = unknown> {
-    get(id: TId): Promise<TReadResponse[] | undefined> | TReadResponse[] | undefined;
+export interface Archivist<TReadResponse, TWriteResponse = TReadResponse, TWrite = TReadResponse, TQueryResponse = TReadResponse, TQuery = unknown, TId = string> {
+    get(id: TId): Promise<TReadResponse | undefined> | TReadResponse | undefined;
     find?(query: TQuery): Promise<TQueryResponse[]> | TQueryResponse[];
-    insert?(item: TWrite): Promise<TWriteResponse[]> | TWriteResponse[];
+    insert?(item: TWrite[]): Promise<TWriteResponse[]> | TWriteResponse[];
     delete?(id: TId): Promise<boolean> | boolean;
     clear?(): void;
 }

package/package.json

@@ -10,10 +10,10 @@
   },
   "dependencies": {
     "@xylabs/sdk-js": "^2.6.2",
-    "@xyo-network/account": "^2.22.3",
-    "@xyo-network/boundwitness": "^2.22.3",
-    "@xyo-network/core": "^2.22.3",
-    "@xyo-network/payload": "^2.22.3",
+    "@xyo-network/account": "^2.22.6",
+    "@xyo-network/boundwitness": "^2.22.6",
+    "@xyo-network/core": "^2.22.6",
+    "@xyo-network/payload": "^2.22.6",
     "axios": "^0.27.2",
     "lru-cache": "^7.13.1",
     "pako": "^2.0.4"
@@ -56,6 +56,6 @@
   },
   "sideEffects": true,
   "types": "dist/esm/index.d.ts",
-  "version": "2.22.3",
+  "version": "2.22.6",
   "packageManager": "yarn@3.1.1"
 }

package/src/XyoArchivist.ts

@@ -2,21 +2,22 @@ import { XyoAccount } from '@xyo-network/account'
 import { XyoPayload } from '@xyo-network/payload'
 
 import { Archivist } from './model'
-import { XyoPayloadFindFilter } from './XyoPayloadFindFilter'
+import { XyoPayloadFindQuery } from './XyoPayloadFindFilter'
 
-export abstract class XyoArchivist<TRead extends XyoPayload = XyoPayload, TWrite extends XyoPayload = XyoPayload>
-  implements Archivist<string, TWrite, TRead | undefined, string, TRead, XyoPayloadFindFilter>
-{
-  protected parent?: XyoArchivist<TRead, TWrite>
+export type XyoArchivist<T extends XyoPayload = XyoPayload> = Archivist<T, T, T, T, XyoPayloadFindQuery>
+
+export abstract class XyoArchivistBase<T extends XyoPayload = XyoPayload> implements XyoArchivist<T> {
+  protected parent?: XyoArchivist<T>
   protected account?: XyoAccount
-  constructor(parent?: XyoArchivist<TRead, TWrite>, account?: XyoAccount) {
+  constructor(parent?: XyoArchivist<T>, account?: XyoAccount) {
     this.parent = parent
     this.account = account
   }
-  abstract insert(item: TWrite): string[] | Promise<string[]>
-  abstract find(query: XyoPayloadFindFilter): TRead[] | Promise<TRead[]>
-  abstract get(hash: string): TRead[] | Promise<TRead[] | undefined> | undefined
-  public all(): TRead[] | Promise<TRead[] | undefined> | undefined {
+
+  abstract insert(payloads: T[]): T[] | Promise<T[]>
+  abstract find(query: XyoPayloadFindQuery): T[] | Promise<T[]>
+  abstract get(hash: string): T | Promise<T | undefined> | undefined
+  public all(): T[] | Promise<T[]> {
     throw Error('getAll not supported')
   }
   public delete(_hash: string): boolean | Promise<boolean> {

package/src/XyoMemoryArchivist.ts

@@ -1,33 +1,40 @@
 import { XyoPayload, XyoPayloadWrapper } from '@xyo-network/payload'
 import LruCache from 'lru-cache'
 
-import { XyoArchivist } from './XyoArchivist'
+import { XyoArchivistBase } from './XyoArchivist'
 import { XyoPayloadFindFilter } from './XyoPayloadFindFilter'
 
-export class XyoMemoryArchivist<TRead extends XyoPayload = XyoPayload, TWrite extends XyoPayload & TRead = XyoPayload & TRead> extends XyoArchivist<TRead, TWrite> {
-  private cache: LruCache<string, TRead> = new LruCache<string, TRead>({ max: 10000 })
+export class XyoMemoryArchivist<T extends XyoPayload = XyoPayload> extends XyoArchivistBase<T> {
+  private cache = new LruCache<string, T>({ max: 10000 })
 
-  public delete(hash: string) {
+  public delete(hash: string): boolean | Promise<boolean> {
     return this.cache.delete(hash)
   }
 
-  public clear() {
+  public clear(): void | Promise<void> {
     this.cache.clear()
   }
 
-  public get(hash: string) {
-    const localResult = this.cache.get(hash)
-    return localResult ? [localResult] : this.parent?.get(hash)
+  public get(hash: string): T | Promise<T | undefined> | undefined {
+    return this.cache.get(hash) ?? this.parent?.get(hash)
   }
 
-  public insert(payload: TWrite) {
-    const wrapper = new XyoPayloadWrapper(payload)
-    const payloadWithmeta = { ...payload, _hash: wrapper.hash, _timestamp: Date.now() }
-    this.cache.set(payloadWithmeta._hash, payloadWithmeta)
-    return [payloadWithmeta._hash]
+  public insert(payloads: T[]): T[] | Promise<T[]> {
+    return payloads.map((payload) => {
+      const wrapper = new XyoPayloadWrapper(payload)
+      const payloadWithmeta = { ...payload, _hash: wrapper.hash, _timestamp: Date.now() }
+      this.cache.set(payloadWithmeta._hash, payloadWithmeta)
+      return payloadWithmeta
+    })
   }
 
-  public find<T extends XyoPayload = XyoPayload>(filter: XyoPayloadFindFilter): T[] {
-    return [this.cache.find((value) => value.schema === filter.schema)]
+  public find<R extends T = T>(filter: XyoPayloadFindFilter): T[] | Promise<T[]> {
+    const result: R[] = []
+    this.cache.forEach((value) => {
+      if (value.schema === filter.schema) {
+        result.push(value as R)
+      }
+    })
+    return result
   }
 }

package/src/XyoPayloadFindFilter.ts

@@ -1,7 +1,12 @@
+import { XyoQueryPayload } from '@xyo-network/payload'
+
 export interface XyoPayloadFindFilter {
-  [key: string]: unknown
   order?: 'desc' | 'asc'
   timestamp?: number
   limit?: number
   schema?: string
 }
+
+export type XyoPayloadFindQuery = XyoQueryPayload<{
+  filter: XyoPayloadFindFilter
+}>

package/src/index.ts

@@ -1,6 +1,4 @@
 export * from './model'
 export * from './XyoArchivist'
-export * from './XyoBoundWitnessArchivist'
-export * from './XyoBoundWitnessMemoryArchivist'
 export * from './XyoMemoryArchivist'
 export * from './XyoPayloadFindFilter'

package/src/model/Archivist.ts

@@ -1,7 +1,7 @@
-export interface Archivist<TWriteResponse, TWrite, TReadResponse = TWriteResponse, TId = string, TQueryResponse = TReadResponse, TQuery = unknown> {
-  get(id: TId): Promise<TReadResponse[] | undefined> | TReadResponse[] | undefined
+export interface Archivist<TReadResponse, TWriteResponse = TReadResponse, TWrite = TReadResponse, TQueryResponse = TReadResponse, TQuery = unknown, TId = string> {
+  get(id: TId): Promise<TReadResponse | undefined> | TReadResponse | undefined
   find?(query: TQuery): Promise<TQueryResponse[]> | TQueryResponse[]
-  insert?(item: TWrite): Promise<TWriteResponse[]> | TWriteResponse[]
+  insert?(item: TWrite[]): Promise<TWriteResponse[]> | TWriteResponse[]
   delete?(id: TId): Promise<boolean> | boolean
   clear?(): void
 }

package/src/XyoBoundWitnessArchivist.ts

@@ -1,21 +0,0 @@
-import { assertEx } from '@xylabs/sdk-js'
-import { XyoBoundWitnessBuilder, XyoBoundWitnessWithMeta } from '@xyo-network/boundwitness'
-import { XyoPayload } from '@xyo-network/payload'
-
-import { XyoArchivist } from './XyoArchivist'
-
-export abstract class XyoBoundWitnessArchivist<TRead extends XyoPayload = XyoPayload, TWrite extends XyoBoundWitnessWithMeta = XyoBoundWitnessWithMeta> extends XyoArchivist<
-  TRead,
-  TWrite
-> {
-  public async commit() {
-    const parent = assertEx(this.parent, 'Parent is required for commit')
-    const account = assertEx(this.account, 'Account is required for commit')
-    const payloads = assertEx(await parent.all(), 'Nothing to commit')
-    const builder = new XyoBoundWitnessBuilder<TWrite, TRead>()
-    const block = builder.payloads(payloads).witness(account).build()
-    const [hash] = await parent.insert(block)
-    await this.clear()
-    return hash
-  }
-}

package/src/XyoBoundWitnessMemoryArchivist.ts

@@ -1,45 +0,0 @@
-import { XyoBoundWitness, XyoBoundWitnessWithMeta, XyoBoundWitnessWrapper } from '@xyo-network/boundwitness'
-import { XyoPayload, XyoPayloadWithMeta, XyoPayloadWrapper } from '@xyo-network/payload'
-import LruCache from 'lru-cache'
-
-import { XyoBoundWitnessArchivist } from './XyoBoundWitnessArchivist'
-import { XyoPayloadFindFilter } from './XyoPayloadFindFilter'
-
-export class XyoBoundWitnessMemoryArchivist<
-  TRead extends XyoPayloadWithMeta = XyoPayloadWithMeta,
-  TWrite extends XyoBoundWitnessWithMeta<XyoBoundWitness, TRead> & TRead = XyoBoundWitnessWithMeta<XyoBoundWitness, TRead> & TRead
-> extends XyoBoundWitnessArchivist<TRead, TWrite> {
-  private cache = new LruCache<string, TRead>({ max: 10000 })
-
-  public delete(hash: string) {
-    return this.cache.delete(hash)
-  }
-
-  public clear() {
-    this.cache.clear()
-  }
-
-  public get(hash: string) {
-    const localResult = this.cache.get(hash)
-    return localResult ? [localResult] : this.parent?.get(hash)
-  }
-
-  public insert(boundWitness: TWrite) {
-    const wrapper = new XyoBoundWitnessWrapper(boundWitness)
-    const boundWitnessWithMeta = { ...boundWitness, _hash: wrapper.hash, _timestamp: Date.now() }
-    const hashes: string[] = []
-    hashes.push(boundWitnessWithMeta._hash)
-    this.cache.set(boundWitnessWithMeta._hash, boundWitnessWithMeta)
-    boundWitness._payloads?.forEach((payload) => {
-      const wrapper = new XyoPayloadWrapper(payload)
-      const payloadWithMeta: TRead = { ...payload, _hash: wrapper.hash, _timestamp: Date.now() }
-      hashes.push(payloadWithMeta._hash)
-      this.cache.set(payloadWithMeta._hash, payloadWithMeta)
-    })
-    return hashes
-  }
-
-  public find<T extends XyoPayload = XyoPayload>(filter: XyoPayloadFindFilter): T[] {
-    return [this.cache.find((value) => value.schema === filter.schema)]
-  }
-}