@xyo-network/api 2.21.22 → 2.22.1

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

@@ -20,7 +20,7 @@ export declare class XyoArchivistApi extends XyoApiBase {
     /** @deprecated use account instead */
     wallet(address: XyoDataLike): XyoAccountApi;
     account(address: XyoDataLike): XyoAccountApi;
-    huri(huri: Huri | string): XyoApiSimple<XyoPayload<object>, XyoPayload<object>, Record<string, never>, import("../models/Api/Config").XyoApiConfig>;
+    huri(huri: Huri | string): XyoApiSimple<import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, Record<string, never>, import("../models/Api/Config").XyoApiConfig>;
     /**
      * Issues commands/queries as XyoBoundWitness wrapped XyoPayloads against a Node in the network
      * @param archive Optional, the archive to issue the requests against

package/dist/cjs/Archivist/Node/Api.d.ts

@@ -17,7 +17,7 @@ export declare class XyoArchivistNodeApi<D extends XyoBoundWitnessWithMeta | Xyo
      * @param retryInterval The interval to poll for query results
      * @returns The results for the issued queries
      */
-    performTransaction(data: D, timeout?: number, retryInterval?: number): Promise<import("../../models").XyoApiEnvelope<XyoPayload<object> | undefined>[][]>;
+    performTransaction(data: D, timeout?: number, retryInterval?: number): Promise<import("../../models").XyoApiEnvelope<import("@xyo-network/payload").XyoPayloadBase | undefined>[][]>;
     /**
      * Issue the supplied query and wait (non-blocking) for the result
      * @param data The query to issue
@@ -25,5 +25,5 @@ export declare class XyoArchivistNodeApi<D extends XyoBoundWitnessWithMeta | Xyo
      * @param retryInterval The interval to poll for query results
      * @returns The result for the issued query
      */
-    perform<T>(data: T, schema: string, timeout?: number, retryInterval?: number): Promise<import("../../models").XyoApiEnvelope<XyoPayload<object> | undefined>>;
+    perform<T>(data: T, schema: string, timeout?: number, retryInterval?: number): Promise<import("../../models").XyoApiEnvelope<import("@xyo-network/payload").XyoPayloadBase | undefined>>;
 }

package/dist/cjs/Archivist/Payload/Api.d.ts

@@ -1,15 +1,9 @@
+import { XyoPayloadFindFilter } from '@xyo-network/archivist';
 import { XyoPayload, XyoPayloadWithPartialMeta } from '@xyo-network/payload';
 import { XyoApiConfig } from '../../models';
 import { XyoApiSimple } from '../../Simple';
 import { WithArchive } from '../../WithArchive';
 import { XyoArchivistArchivePayloadSchemaApi } from './Schema';
-export interface XyoPayloadFindFilter {
-    [key: string]: unknown;
-    order?: 'desc' | 'asc';
-    timestamp?: number;
-    limit?: number;
-    schema?: string;
-}
 export interface XyoPayloadStats {
     count: number;
 }

package/dist/cjs/Archivist/Payload/Api.js.map

@@ -1 +1 @@
-{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../../../src/Archivist/Payload/Api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../../../src/Archivist/Payload/Api.ts"],"names":[],"mappings":"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"}

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

@@ -1,13 +1,12 @@
 import { XyoAccount } from '@xyo-network/account';
+import { XyoArchivist, XyoBoundWitnessArchivist, XyoPayloadFindFilter } from '@xyo-network/archivist';
 import { XyoBoundWitnessWithPartialMeta } from '@xyo-network/boundwitness';
 import { XyoArchivistApi } from './Api';
-import { XyoPayloadFindFilter } from './Payload';
-import { XyoArchivist } from './XyoArchivist';
-export declare class XyoApiArchivist extends XyoArchivist {
+export declare class XyoApiArchivist extends XyoBoundWitnessArchivist {
     protected api: XyoArchivistApi;
     protected archive: string;
     constructor(api: XyoArchivistApi, archive: string, parent?: XyoArchivist, account?: XyoAccount);
-    get(hash: string): Promise<import("@xyo-network/payload").XyoPayload<object> | undefined>;
+    get(hash: string): Promise<import("@xyo-network/payload").XyoPayloadBase[] | undefined>;
     insert(payload: XyoBoundWitnessWithPartialMeta): Promise<string[]>;
-    find(filter: XyoPayloadFindFilter): Promise<import("@xyo-network/payload").XyoPayloadWithPartialMeta<unknown>[]>;
+    find(filter: XyoPayloadFindFilter): Promise<import("@xyo-network/payload").XyoPayloadWithPartialMeta<import("@xyo-network/core").EmptyObject>[]>;
 }

package/dist/cjs/Archivist/XyoApiArchivist.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.XyoApiArchivist = void 0;
 const tslib_1 = require("tslib");
 const sdk_js_1 = require("@xylabs/sdk-js");
-const XyoArchivist_1 = require("./XyoArchivist");
-class XyoApiArchivist extends XyoArchivist_1.XyoArchivist {
+const archivist_1 = require("@xyo-network/archivist");
+class XyoApiArchivist extends archivist_1.XyoBoundWitnessArchivist {
     constructor(api, archive, parent, account) {
         super(parent, account);
         this.api = api;
@@ -13,7 +13,7 @@ class XyoApiArchivist extends XyoArchivist_1.XyoArchivist {
     get(hash) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const [payloads] = yield this.api.archive(this.archive).payload.hash(hash).get('tuple');
-            return payloads === null || payloads === void 0 ? void 0 : payloads.pop();
+            return payloads;
         });
     }
     insert(payload) {

package/dist/cjs/Archivist/XyoApiArchivist.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoApiArchivist.js","sourceRoot":"","sources":["../../../src/Archivist/XyoApiArchivist.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AAMzC,iDAA6C;AAE7C,MAAa,eAAgB,SAAQ,2BAAY;IAG/C,YAAY,GAAoB,EAAE,OAAe,EAAE,MAAqB,EAAE,OAAoB;QAC5F,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACtB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEY,GAAG,CAAC,IAAY;;YAC3B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YACvF,OAAO,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,EAAE,CAAA;QACxB,CAAC;KAAA;IAEY,MAAM,CAAC,OAAuC;;;YACzD,OAAO,MAAA,MAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,0CAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,iBAAQ,EAAC,KAAK,CAAC,KAAK,CAAC,CAAC,mCAAI,EAAE,CAAA;;KACjH;IAEY,IAAI,CAAC,MAA4B;;;YAC5C,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC,GAAG,MAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,mCAAI,EAAE,CAAA;YAClG,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,MAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,mCAAI,EAAE,CAAA;YAC9F,OAAO,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;;KAC/B;CACF;AAvBD,0CAuBC"}
+{"version":3,"file":"XyoApiArchivist.js","sourceRoot":"","sources":["../../../src/Archivist/XyoApiArchivist.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AAEzC,sDAAqG;AAKrG,MAAa,eAAgB,SAAQ,oCAAwB;IAG3D,YAAY,GAAoB,EAAE,OAAe,EAAE,MAAqB,EAAE,OAAoB;QAC5F,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACtB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEY,GAAG,CAAC,IAAY;;YAC3B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YACvF,OAAO,QAAQ,CAAA;QACjB,CAAC;KAAA;IAEY,MAAM,CAAC,OAAuC;;;YACzD,OAAO,MAAA,MAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,0CAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,iBAAQ,EAAC,KAAK,CAAC,KAAK,CAAC,CAAC,mCAAI,EAAE,CAAA;;KACjH;IAEY,IAAI,CAAC,MAA4B;;;YAC5C,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC,GAAG,MAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,mCAAI,EAAE,CAAA;YAClG,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,MAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,mCAAI,EAAE,CAAA;YAC9F,OAAO,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;;KAC/B;CACF;AAvBD,0CAuBC"}

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

@@ -3,8 +3,5 @@ export * from './Api';
 export * from './Archive';
 export * from './Archives';
 export * from './Block';
-export * from './Model';
 export * from './Payload';
 export * from './XyoApiArchivist';
-export * from './XyoArchivist';
-export * from './XyoMemoryArchivist';

package/dist/cjs/Archivist/index.js

@@ -6,9 +6,6 @@ tslib_1.__exportStar(require("./Api"), exports);
 tslib_1.__exportStar(require("./Archive"), exports);
 tslib_1.__exportStar(require("./Archives"), exports);
 tslib_1.__exportStar(require("./Block"), exports);
-tslib_1.__exportStar(require("./Model"), exports);
 tslib_1.__exportStar(require("./Payload"), exports);
 tslib_1.__exportStar(require("./XyoApiArchivist"), exports);
-tslib_1.__exportStar(require("./XyoArchivist"), exports);
-tslib_1.__exportStar(require("./XyoMemoryArchivist"), exports);
 //# sourceMappingURL=index.js.map

package/dist/cjs/Archivist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Archivist/index.ts"],"names":[],"mappings":";;;AAAA,oDAAyB;AACzB,gDAAqB;AACrB,oDAAyB;AACzB,qDAA0B;AAC1B,kDAAuB;AACvB,kDAAuB;AACvB,oDAAyB;AACzB,4DAAiC;AACjC,yDAA8B;AAC9B,+DAAoC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Archivist/index.ts"],"names":[],"mappings":";;;AAAA,oDAAyB;AACzB,gDAAqB;AACrB,oDAAyB;AACzB,qDAA0B;AAC1B,kDAAuB;AACvB,oDAAyB;AACzB,4DAAiC"}

package/dist/cjs/User/Api.d.ts

@@ -12,7 +12,7 @@ export declare class XyoUserApi extends XyoApiBase {
     get authenticated(): boolean;
     get headers(): Record<string, string>;
     get login(): XyoApiSimple<XyoUserLogin, XyoUserLogin, Record<string, never>, import("../models/Api/Config").XyoApiConfig>;
-    get profile(): XyoApiSimple<import("@xyo-network/payload").XyoPayload<object>, import("@xyo-network/payload").XyoPayload<object>, Record<string, never>, {
+    get profile(): XyoApiSimple<import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, Record<string, never>, {
         root: string;
         apiDomain: string; /** @field Password of the user [in] */
         userid?: string | undefined;

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

@@ -20,7 +20,7 @@ export declare class XyoArchivistApi extends XyoApiBase {
     /** @deprecated use account instead */
     wallet(address: XyoDataLike): XyoAccountApi;
     account(address: XyoDataLike): XyoAccountApi;
-    huri(huri: Huri | string): XyoApiSimple<XyoPayload<object>, XyoPayload<object>, Record<string, never>, import("../models/Api/Config").XyoApiConfig>;
+    huri(huri: Huri | string): XyoApiSimple<import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, Record<string, never>, import("../models/Api/Config").XyoApiConfig>;
     /**
      * Issues commands/queries as XyoBoundWitness wrapped XyoPayloads against a Node in the network
      * @param archive Optional, the archive to issue the requests against

package/dist/esm/Archivist/Node/Api.d.ts

@@ -17,7 +17,7 @@ export declare class XyoArchivistNodeApi<D extends XyoBoundWitnessWithMeta | Xyo
      * @param retryInterval The interval to poll for query results
      * @returns The results for the issued queries
      */
-    performTransaction(data: D, timeout?: number, retryInterval?: number): Promise<import("../../models").XyoApiEnvelope<XyoPayload<object> | undefined>[][]>;
+    performTransaction(data: D, timeout?: number, retryInterval?: number): Promise<import("../../models").XyoApiEnvelope<import("@xyo-network/payload").XyoPayloadBase | undefined>[][]>;
     /**
      * Issue the supplied query and wait (non-blocking) for the result
      * @param data The query to issue
@@ -25,5 +25,5 @@ export declare class XyoArchivistNodeApi<D extends XyoBoundWitnessWithMeta | Xyo
      * @param retryInterval The interval to poll for query results
      * @returns The result for the issued query
      */
-    perform<T>(data: T, schema: string, timeout?: number, retryInterval?: number): Promise<import("../../models").XyoApiEnvelope<XyoPayload<object> | undefined>>;
+    perform<T>(data: T, schema: string, timeout?: number, retryInterval?: number): Promise<import("../../models").XyoApiEnvelope<import("@xyo-network/payload").XyoPayloadBase | undefined>>;
 }

package/dist/esm/Archivist/Payload/Api.d.ts

@@ -1,15 +1,9 @@
+import { XyoPayloadFindFilter } from '@xyo-network/archivist';
 import { XyoPayload, XyoPayloadWithPartialMeta } from '@xyo-network/payload';
 import { XyoApiConfig } from '../../models';
 import { XyoApiSimple } from '../../Simple';
 import { WithArchive } from '../../WithArchive';
 import { XyoArchivistArchivePayloadSchemaApi } from './Schema';
-export interface XyoPayloadFindFilter {
-    [key: string]: unknown;
-    order?: 'desc' | 'asc';
-    timestamp?: number;
-    limit?: number;
-    schema?: string;
-}
 export interface XyoPayloadStats {
     count: number;
 }

package/dist/esm/Archivist/Payload/Api.js.map

@@ -1 +1 @@
-{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../../../src/Archivist/Payload/Api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../../../src/Archivist/Payload/Api.ts"],"names":[],"mappings":"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"}

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

@@ -1,13 +1,12 @@
 import { XyoAccount } from '@xyo-network/account';
+import { XyoArchivist, XyoBoundWitnessArchivist, XyoPayloadFindFilter } from '@xyo-network/archivist';
 import { XyoBoundWitnessWithPartialMeta } from '@xyo-network/boundwitness';
 import { XyoArchivistApi } from './Api';
-import { XyoPayloadFindFilter } from './Payload';
-import { XyoArchivist } from './XyoArchivist';
-export declare class XyoApiArchivist extends XyoArchivist {
+export declare class XyoApiArchivist extends XyoBoundWitnessArchivist {
     protected api: XyoArchivistApi;
     protected archive: string;
     constructor(api: XyoArchivistApi, archive: string, parent?: XyoArchivist, account?: XyoAccount);
-    get(hash: string): Promise<import("@xyo-network/payload").XyoPayload<object> | undefined>;
+    get(hash: string): Promise<import("@xyo-network/payload").XyoPayloadBase[] | undefined>;
     insert(payload: XyoBoundWitnessWithPartialMeta): Promise<string[]>;
-    find(filter: XyoPayloadFindFilter): Promise<import("@xyo-network/payload").XyoPayloadWithPartialMeta<unknown>[]>;
+    find(filter: XyoPayloadFindFilter): Promise<import("@xyo-network/payload").XyoPayloadWithPartialMeta<import("@xyo-network/core").EmptyObject>[]>;
 }

package/dist/esm/Archivist/XyoApiArchivist.js

@@ -1,6 +1,6 @@
 import { assertEx } from '@xylabs/sdk-js';
-import { XyoArchivist } from './XyoArchivist';
-export class XyoApiArchivist extends XyoArchivist {
+import { XyoBoundWitnessArchivist } from '@xyo-network/archivist';
+export class XyoApiArchivist extends XyoBoundWitnessArchivist {
     constructor(api, archive, parent, account) {
         super(parent, account);
         this.api = api;
@@ -8,7 +8,7 @@ export class XyoApiArchivist extends XyoArchivist {
     }
     async get(hash) {
         const [payloads] = await this.api.archive(this.archive).payload.hash(hash).get('tuple');
-        return payloads?.pop();
+        return payloads;
     }
     async insert(payload) {
         return (await this.api.archive(this.archive).block.post([payload]))?.map((value) => assertEx(value._hash)) ?? [];

package/dist/esm/Archivist/XyoApiArchivist.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoApiArchivist.js","sourceRoot":"","sources":["../../../src/Archivist/XyoApiArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAMzC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,MAAM,OAAO,eAAgB,SAAQ,YAAY;IAG/C,YAAY,GAAoB,EAAE,OAAe,EAAE,MAAqB,EAAE,OAAoB;QAC5F,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACtB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,IAAY;QAC3B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACvF,OAAO,QAAQ,EAAE,GAAG,EAAE,CAAA;IACxB,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,OAAuC;QACzD,OAAO,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAA;IAClH,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,MAA4B;QAC5C,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;QAClG,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;QAC9F,OAAO,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAChC,CAAC;CACF"}
+{"version":3,"file":"XyoApiArchivist.js","sourceRoot":"","sources":["../../../src/Archivist/XyoApiArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAgB,wBAAwB,EAAwB,MAAM,wBAAwB,CAAA;AAKrG,MAAM,OAAO,eAAgB,SAAQ,wBAAwB;IAG3D,YAAY,GAAoB,EAAE,OAAe,EAAE,MAAqB,EAAE,OAAoB;QAC5F,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACtB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,IAAY;QAC3B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACvF,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,OAAuC;QACzD,OAAO,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAA;IAClH,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,MAA4B;QAC5C,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;QAClG,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;QAC9F,OAAO,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAChC,CAAC;CACF"}

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

@@ -3,8 +3,5 @@ export * from './Api';
 export * from './Archive';
 export * from './Archives';
 export * from './Block';
-export * from './Model';
 export * from './Payload';
 export * from './XyoApiArchivist';
-export * from './XyoArchivist';
-export * from './XyoMemoryArchivist';

package/dist/esm/Archivist/index.js

@@ -3,9 +3,6 @@ export * from './Api';
 export * from './Archive';
 export * from './Archives';
 export * from './Block';
-export * from './Model';
 export * from './Payload';
 export * from './XyoApiArchivist';
-export * from './XyoArchivist';
-export * from './XyoMemoryArchivist';
 //# sourceMappingURL=index.js.map

package/dist/esm/Archivist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Archivist/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,OAAO,CAAA;AACrB,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,SAAS,CAAA;AACvB,cAAc,SAAS,CAAA;AACvB,cAAc,WAAW,CAAA;AACzB,cAAc,mBAAmB,CAAA;AACjC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,sBAAsB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Archivist/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,OAAO,CAAA;AACrB,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,SAAS,CAAA;AACvB,cAAc,WAAW,CAAA;AACzB,cAAc,mBAAmB,CAAA"}

package/dist/esm/User/Api.d.ts

@@ -12,7 +12,7 @@ export declare class XyoUserApi extends XyoApiBase {
     get authenticated(): boolean;
     get headers(): Record<string, string>;
     get login(): XyoApiSimple<XyoUserLogin, XyoUserLogin, Record<string, never>, import("../models/Api/Config").XyoApiConfig>;
-    get profile(): XyoApiSimple<import("@xyo-network/payload").XyoPayload<object>, import("@xyo-network/payload").XyoPayload<object>, Record<string, never>, {
+    get profile(): XyoApiSimple<import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, Record<string, never>, {
         root: string;
         apiDomain: string; /** @field Password of the user [in] */
         userid?: string | undefined;

package/package.json

@@ -10,11 +10,12 @@
   },
   "dependencies": {
     "@xylabs/sdk-js": "^2.6.2",
-    "@xyo-network/account": "^2.21.22",
-    "@xyo-network/boundwitness": "^2.21.22",
-    "@xyo-network/core": "^2.21.22",
-    "@xyo-network/payload": "^2.21.22",
-    "@xyo-network/typeof": "^2.21.22",
+    "@xyo-network/account": "^2.22.1",
+    "@xyo-network/archivist": "^2.22.1",
+    "@xyo-network/boundwitness": "^2.22.1",
+    "@xyo-network/core": "^2.22.1",
+    "@xyo-network/payload": "^2.22.1",
+    "@xyo-network/typeof": "^2.22.1",
     "axios": "^0.27.2",
     "lru-cache": "^7.13.1",
     "pako": "^2.0.4",
@@ -61,6 +62,6 @@
   },
   "sideEffects": true,
   "types": "dist/esm/index.d.ts",
-  "version": "2.21.22",
+  "version": "2.22.1",
   "packageManager": "yarn@3.1.1"
 }

package/src/Archivist/Payload/Api.ts

@@ -1,4 +1,5 @@
 import { assertEx } from '@xylabs/sdk-js'
+import { XyoPayloadFindFilter } from '@xyo-network/archivist'
 import { XyoPayload, XyoPayloadWithPartialMeta } from '@xyo-network/payload'
 
 import { XyoApiConfig } from '../../models'
@@ -6,14 +7,6 @@ import { XyoApiSimple } from '../../Simple'
 import { WithArchive } from '../../WithArchive'
 import { XyoArchivistArchivePayloadSchemaApi } from './Schema'
 
-export interface XyoPayloadFindFilter {
-  [key: string]: unknown
-  order?: 'desc' | 'asc'
-  timestamp?: number
-  limit?: number
-  schema?: string
-}
-
 export interface XyoPayloadStats {
   count: number
 }

package/src/Archivist/XyoApiArchivist.ts

@@ -1,12 +1,11 @@
 import { assertEx } from '@xylabs/sdk-js'
 import { XyoAccount } from '@xyo-network/account'
+import { XyoArchivist, XyoBoundWitnessArchivist, XyoPayloadFindFilter } from '@xyo-network/archivist'
 import { XyoBoundWitnessWithPartialMeta } from '@xyo-network/boundwitness'
 
 import { XyoArchivistApi } from './Api'
-import { XyoPayloadFindFilter } from './Payload'
-import { XyoArchivist } from './XyoArchivist'
 
-export class XyoApiArchivist extends XyoArchivist {
+export class XyoApiArchivist extends XyoBoundWitnessArchivist {
   protected api: XyoArchivistApi
   protected archive: string
   constructor(api: XyoArchivistApi, archive: string, parent?: XyoArchivist, account?: XyoAccount) {
@@ -17,7 +16,7 @@ export class XyoApiArchivist extends XyoArchivist {
 
   public async get(hash: string) {
     const [payloads] = await this.api.archive(this.archive).payload.hash(hash).get('tuple')
-    return payloads?.pop()
+    return payloads
   }
 
   public async insert(payload: XyoBoundWitnessWithPartialMeta) {

package/src/Archivist/index.ts

@@ -3,8 +3,5 @@ export * from './Api'
 export * from './Archive'
 export * from './Archives'
 export * from './Block'
-export * from './Model'
 export * from './Payload'
 export * from './XyoApiArchivist'
-export * from './XyoArchivist'
-export * from './XyoMemoryArchivist'

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

@@ -1,13 +0,0 @@
-export interface QueryableArchivist<TQueryResponse, TQuery> {
-    find(query: TQuery): Promise<TQueryResponse> | TQueryResponse;
-}
-export interface ReadArchivist<TReadResponse, TId = string> {
-    get(id: TId): Promise<TReadResponse | undefined> | TReadResponse | undefined;
-}
-export interface WriteArchivist<TWriteResponse, TWrite, TId = string> {
-    insert(item: TWrite): Promise<TWriteResponse> | TWriteResponse;
-    delete?(id: TId): Promise<boolean> | boolean;
-    clear?(): void;
-}
-export declare type ReadWriteArchivist<TWriteResponse, TWrite, TReadResponse = TWriteResponse, TId = string> = ReadArchivist<TReadResponse, TId> & WriteArchivist<TWriteResponse, TWrite>;
-export declare type Archivist<TWriteResponse, TWrite, TReadResponse = TWriteResponse, TId = string, TQueryResponse = unknown, TQuery = unknown> = ReadWriteArchivist<TWriteResponse, TWrite, TReadResponse, TId> & QueryableArchivist<TQueryResponse, TQuery>;

package/dist/cjs/Archivist/Model/Archivist.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=Archivist.js.map

package/dist/cjs/Archivist/Model/Archivist.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Archivist.js","sourceRoot":"","sources":["../../../../src/Archivist/Model/Archivist.ts"],"names":[],"mappings":""}

package/dist/cjs/Archivist/Model/index.d.ts

@@ -1 +0,0 @@
-export * from './Archivist';

package/dist/cjs/Archivist/Model/index.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./Archivist"), exports);
-//# sourceMappingURL=index.js.map

package/dist/cjs/Archivist/Model/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/Archivist/Model/index.ts"],"names":[],"mappings":";;;AAAA,sDAA2B"}

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

@@ -1,17 +0,0 @@
-import { XyoAccount } from '@xyo-network/account';
-import { XyoBoundWitness, XyoBoundWitnessWithPartialMeta } from '@xyo-network/boundwitness';
-import { XyoPayload, XyoPayloadWithPartialMeta } from '@xyo-network/payload';
-import { Archivist } from './Model';
-import { XyoPayloadFindFilter } from './Payload';
-export declare abstract class XyoArchivist<TWrite extends XyoBoundWitness = XyoBoundWitnessWithPartialMeta, TRead extends XyoPayload = XyoPayloadWithPartialMeta> implements Archivist<string[], TWrite, TRead | undefined, string, TRead[], XyoPayloadFindFilter> {
-    protected parent?: XyoArchivist;
-    protected account?: XyoAccount;
-    constructor(parent?: XyoArchivist, 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;
-    delete(_hash: string): boolean | Promise<boolean>;
-    clear(): void | Promise<void>;
-    commit(): Promise<string>;
-}

package/dist/cjs/Archivist/XyoArchivist.js

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.XyoArchivist = void 0;
-const tslib_1 = require("tslib");
-const sdk_js_1 = require("@xylabs/sdk-js");
-const boundwitness_1 = require("@xyo-network/boundwitness");
-class XyoArchivist {
-    constructor(parent, account) {
-        this.parent = parent;
-        this.account = account;
-    }
-    all() {
-        throw Error('getAll not supported');
-    }
-    delete(_hash) {
-        throw Error('delete not supported');
-    }
-    clear() {
-        throw Error('clear not supported');
-    }
-    commit() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const parent = (0, sdk_js_1.assertEx)(this.parent, 'Parent is required for commit');
-            const account = (0, sdk_js_1.assertEx)(this.account, 'Account is required for commit');
-            const payloads = (0, sdk_js_1.assertEx)(yield parent.all(), 'Nothing to commit');
-            const builder = new boundwitness_1.XyoBoundWitnessBuilder();
-            const block = builder.payloads(payloads).witness(account).build();
-            const [hash] = yield parent.insert(block);
-            yield this.clear();
-            return hash;
-        });
-    }
-}
-exports.XyoArchivist = XyoArchivist;
-//# sourceMappingURL=XyoArchivist.js.map

package/dist/cjs/Archivist/XyoArchivist.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"XyoArchivist.js","sourceRoot":"","sources":["../../../src/Archivist/XyoArchivist.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AAEzC,4DAAmH;AAMnH,MAAsB,YAAY;IAKhC,YAAY,MAAqB,EAAE,OAAoB;QACrD,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;IACY,MAAM;;YACjB,MAAM,MAAM,GAAG,IAAA,iBAAQ,EAAC,IAAI,CAAC,MAAM,EAAE,+BAA+B,CAAC,CAAA;YACrE,MAAM,OAAO,GAAG,IAAA,iBAAQ,EAAC,IAAI,CAAC,OAAO,EAAE,gCAAgC,CAAC,CAAA;YACxE,MAAM,QAAQ,GAAG,IAAA,iBAAQ,EAAC,MAAM,MAAM,CAAC,GAAG,EAAE,EAAE,mBAAmB,CAAC,CAAA;YAClE,MAAM,OAAO,GAAG,IAAI,qCAAsB,EAAE,CAAA;YAC5C,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAA;YACjE,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACzC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;YAClB,OAAO,IAAI,CAAA;QACb,CAAC;KAAA;CACF;AA/BD,oCA+BC"}

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

@@ -1,12 +0,0 @@
-import { XyoBoundWitnessWithMeta } from '@xyo-network/boundwitness';
-import { XyoPayload, XyoPayloadWithPartialMeta } from '@xyo-network/payload';
-import { XyoPayloadFindFilter } from './Payload';
-import { XyoArchivist } from './XyoArchivist';
-export declare class XyoMemoryArchivist extends XyoArchivist {
-    private cache;
-    delete(hash: string): boolean;
-    clear(): void;
-    get(hash: string): XyoPayloadWithPartialMeta<unknown> | Promise<XyoPayloadWithPartialMeta<unknown> | undefined> | undefined;
-    insert(payload: XyoBoundWitnessWithMeta): string[];
-    find<T extends XyoPayload = XyoPayload>(filter: XyoPayloadFindFilter): T[];
-}

package/dist/cjs/Archivist/XyoMemoryArchivist.js

@@ -1,65 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.XyoMemoryArchivist = void 0;
-const tslib_1 = require("tslib");
-const boundwitness_1 = require("@xyo-network/boundwitness");
-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 {
-    constructor() {
-        super(...arguments);
-        this.cache = new lru_cache_1.default({ max: 10000 });
-    }
-    delete(hash) {
-        return this.cache.delete(hash);
-    }
-    clear() {
-        this.cache.clear();
-    }
-    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) {
-        var _a;
-        const wrapper = new boundwitness_1.XyoBoundWitnessWrapper(payload);
-        const payloadWithmeta = Object.assign(Object.assign({}, payload), { _hash: wrapper.hash, _timestamp: Date.now() });
-        const hashes = [];
-        hashes.push(payloadWithmeta._hash);
-        this.cache.set(payloadWithmeta._hash, payloadWithmeta);
-        (_a = payload._payloads) === null || _a === void 0 ? void 0 : _a.forEach((payload) => {
-            const wrapper = new payload_1.XyoPayloadWrapper(payload);
-            const payloadWithmeta = Object.assign(Object.assign({}, payload), { _hash: wrapper.hash, _timestamp: Date.now() });
-            hashes.push(payloadWithmeta._hash);
-            this.cache.set(payloadWithmeta._hash, payloadWithmeta);
-        });
-        return hashes;
-    }
-    find(filter) {
-        const result = [];
-        if (filter.type === 'schema') {
-            const filterSchema = filter.schema !== undefined ? (Array.isArray(filter.schema) ? filter.schema : [filter.schema]) : undefined;
-            this.cache.forEach((value) => {
-                let match = value;
-                match = filterSchema === undefined || filterSchema.includes(value.schema) ? value : undefined;
-                if (match) {
-                    result.push(match);
-                }
-            });
-        }
-        if (filter.type === 'hash') {
-            const filterHash = filter.hash !== undefined ? (Array.isArray(filter.hash) ? filter.hash : [filter.hash]) : undefined;
-            this.cache.forEach((value) => {
-                let match = value;
-                match = filterHash === undefined || filterHash.includes(new payload_1.XyoPayloadWrapper(value).hash) ? value : undefined;
-                if (match) {
-                    result.push(match);
-                }
-            });
-        }
-        return result;
-    }
-}
-exports.XyoMemoryArchivist = XyoMemoryArchivist;
-//# sourceMappingURL=XyoMemoryArchivist.js.map

package/dist/cjs/Archivist/XyoMemoryArchivist.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"XyoMemoryArchivist.js","sourceRoot":"","sources":["../../../src/Archivist/XyoMemoryArchivist.ts"],"names":[],"mappings":"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"}

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

@@ -1,13 +0,0 @@
-export interface QueryableArchivist<TQueryResponse, TQuery> {
-    find(query: TQuery): Promise<TQueryResponse> | TQueryResponse;
-}
-export interface ReadArchivist<TReadResponse, TId = string> {
-    get(id: TId): Promise<TReadResponse | undefined> | TReadResponse | undefined;
-}
-export interface WriteArchivist<TWriteResponse, TWrite, TId = string> {
-    insert(item: TWrite): Promise<TWriteResponse> | TWriteResponse;
-    delete?(id: TId): Promise<boolean> | boolean;
-    clear?(): void;
-}
-export declare type ReadWriteArchivist<TWriteResponse, TWrite, TReadResponse = TWriteResponse, TId = string> = ReadArchivist<TReadResponse, TId> & WriteArchivist<TWriteResponse, TWrite>;
-export declare type Archivist<TWriteResponse, TWrite, TReadResponse = TWriteResponse, TId = string, TQueryResponse = unknown, TQuery = unknown> = ReadWriteArchivist<TWriteResponse, TWrite, TReadResponse, TId> & QueryableArchivist<TQueryResponse, TQuery>;

package/dist/esm/Archivist/Model/Archivist.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=Archivist.js.map

package/dist/esm/Archivist/Model/Archivist.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Archivist.js","sourceRoot":"","sources":["../../../../src/Archivist/Model/Archivist.ts"],"names":[],"mappings":""}

package/dist/esm/Archivist/Model/index.d.ts

@@ -1 +0,0 @@
-export * from './Archivist';

package/dist/esm/Archivist/Model/index.js

@@ -1,2 +0,0 @@
-export * from './Archivist';
-//# sourceMappingURL=index.js.map

package/dist/esm/Archivist/Model/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/Archivist/Model/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA"}

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

@@ -1,17 +0,0 @@
-import { XyoAccount } from '@xyo-network/account';
-import { XyoBoundWitness, XyoBoundWitnessWithPartialMeta } from '@xyo-network/boundwitness';
-import { XyoPayload, XyoPayloadWithPartialMeta } from '@xyo-network/payload';
-import { Archivist } from './Model';
-import { XyoPayloadFindFilter } from './Payload';
-export declare abstract class XyoArchivist<TWrite extends XyoBoundWitness = XyoBoundWitnessWithPartialMeta, TRead extends XyoPayload = XyoPayloadWithPartialMeta> implements Archivist<string[], TWrite, TRead | undefined, string, TRead[], XyoPayloadFindFilter> {
-    protected parent?: XyoArchivist;
-    protected account?: XyoAccount;
-    constructor(parent?: XyoArchivist, 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;
-    delete(_hash: string): boolean | Promise<boolean>;
-    clear(): void | Promise<void>;
-    commit(): Promise<string>;
-}

package/dist/esm/Archivist/XyoArchivist.js

@@ -1,28 +0,0 @@
-import { assertEx } from '@xylabs/sdk-js';
-import { XyoBoundWitnessBuilder } from '@xyo-network/boundwitness';
-export class XyoArchivist {
-    constructor(parent, account) {
-        this.parent = parent;
-        this.account = account;
-    }
-    all() {
-        throw Error('getAll not supported');
-    }
-    delete(_hash) {
-        throw Error('delete not supported');
-    }
-    clear() {
-        throw Error('clear not supported');
-    }
-    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();
-        const block = builder.payloads(payloads).witness(account).build();
-        const [hash] = await parent.insert(block);
-        await this.clear();
-        return hash;
-    }
-}
-//# sourceMappingURL=XyoArchivist.js.map

package/dist/esm/Archivist/XyoArchivist.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"XyoArchivist.js","sourceRoot":"","sources":["../../../src/Archivist/XyoArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAmB,sBAAsB,EAAkC,MAAM,2BAA2B,CAAA;AAMnH,MAAM,OAAgB,YAAY;IAKhC,YAAY,MAAqB,EAAE,OAAoB;QACrD,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,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,EAAE,CAAA;QAC5C,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/Archivist/XyoMemoryArchivist.d.ts

@@ -1,12 +0,0 @@
-import { XyoBoundWitnessWithMeta } from '@xyo-network/boundwitness';
-import { XyoPayload, XyoPayloadWithPartialMeta } from '@xyo-network/payload';
-import { XyoPayloadFindFilter } from './Payload';
-import { XyoArchivist } from './XyoArchivist';
-export declare class XyoMemoryArchivist extends XyoArchivist {
-    private cache;
-    delete(hash: string): boolean;
-    clear(): void;
-    get(hash: string): XyoPayloadWithPartialMeta<unknown> | Promise<XyoPayloadWithPartialMeta<unknown> | undefined> | undefined;
-    insert(payload: XyoBoundWitnessWithMeta): string[];
-    find<T extends XyoPayload = XyoPayload>(filter: XyoPayloadFindFilter): T[];
-}

package/dist/esm/Archivist/XyoMemoryArchivist.js

@@ -1,58 +0,0 @@
-import { XyoBoundWitnessWrapper } from '@xyo-network/boundwitness';
-import { XyoPayloadWrapper } from '@xyo-network/payload';
-import LruCache from 'lru-cache';
-import { XyoArchivist } from './XyoArchivist';
-export class XyoMemoryArchivist extends XyoArchivist {
-    constructor() {
-        super(...arguments);
-        this.cache = new LruCache({ max: 10000 });
-    }
-    delete(hash) {
-        return this.cache.delete(hash);
-    }
-    clear() {
-        this.cache.clear();
-    }
-    get(hash) {
-        return this.cache.get(hash) ?? this.parent?.get(hash);
-    }
-    insert(payload) {
-        const wrapper = new XyoBoundWitnessWrapper(payload);
-        const payloadWithmeta = { ...payload, _hash: wrapper.hash, _timestamp: Date.now() };
-        const hashes = [];
-        hashes.push(payloadWithmeta._hash);
-        this.cache.set(payloadWithmeta._hash, payloadWithmeta);
-        payload._payloads?.forEach((payload) => {
-            const wrapper = new XyoPayloadWrapper(payload);
-            const payloadWithmeta = { ...payload, _hash: wrapper.hash, _timestamp: Date.now() };
-            hashes.push(payloadWithmeta._hash);
-            this.cache.set(payloadWithmeta._hash, payloadWithmeta);
-        });
-        return hashes;
-    }
-    find(filter) {
-        const result = [];
-        if (filter.type === 'schema') {
-            const filterSchema = filter.schema !== undefined ? (Array.isArray(filter.schema) ? filter.schema : [filter.schema]) : undefined;
-            this.cache.forEach((value) => {
-                let match = value;
-                match = filterSchema === undefined || filterSchema.includes(value.schema) ? value : undefined;
-                if (match) {
-                    result.push(match);
-                }
-            });
-        }
-        if (filter.type === 'hash') {
-            const filterHash = filter.hash !== undefined ? (Array.isArray(filter.hash) ? filter.hash : [filter.hash]) : undefined;
-            this.cache.forEach((value) => {
-                let match = value;
-                match = filterHash === undefined || filterHash.includes(new XyoPayloadWrapper(value).hash) ? value : undefined;
-                if (match) {
-                    result.push(match);
-                }
-            });
-        }
-        return result;
-    }
-}
-//# sourceMappingURL=XyoMemoryArchivist.js.map

package/dist/esm/Archivist/XyoMemoryArchivist.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"XyoMemoryArchivist.js","sourceRoot":"","sources":["../../../src/Archivist/XyoMemoryArchivist.ts"],"names":[],"mappings":"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"}

package/src/Archivist/Model/Archivist.ts

@@ -1,22 +0,0 @@
-export interface QueryableArchivist<TQueryResponse, TQuery> {
-  find(query: TQuery): Promise<TQueryResponse> | TQueryResponse
-}
-export interface ReadArchivist<TReadResponse, TId = string> {
-  get(id: TId): Promise<TReadResponse | undefined> | TReadResponse | undefined
-}
-
-export interface WriteArchivist<TWriteResponse, TWrite, TId = string> {
-  insert(item: TWrite): Promise<TWriteResponse> | TWriteResponse
-  delete?(id: TId): Promise<boolean> | boolean
-  clear?(): void
-}
-
-export type ReadWriteArchivist<TWriteResponse, TWrite, TReadResponse = TWriteResponse, TId = string> = ReadArchivist<TReadResponse, TId> & WriteArchivist<TWriteResponse, TWrite>
-
-export type Archivist<TWriteResponse, TWrite, TReadResponse = TWriteResponse, TId = string, TQueryResponse = unknown, TQuery = unknown> = ReadWriteArchivist<
-  TWriteResponse,
-  TWrite,
-  TReadResponse,
-  TId
-> &
-  QueryableArchivist<TQueryResponse, TQuery>

package/src/Archivist/Model/index.ts

@@ -1 +0,0 @@
-export * from './Archivist'

package/src/Archivist/XyoArchivist.ts

@@ -1,40 +0,0 @@
-import { assertEx } from '@xylabs/sdk-js'
-import { XyoAccount } from '@xyo-network/account'
-import { XyoBoundWitness, XyoBoundWitnessBuilder, XyoBoundWitnessWithPartialMeta } from '@xyo-network/boundwitness'
-import { XyoPayload, XyoPayloadWithPartialMeta } from '@xyo-network/payload'
-
-import { Archivist } from './Model'
-import { XyoPayloadFindFilter } from './Payload'
-
-export abstract class XyoArchivist<TWrite extends XyoBoundWitness = XyoBoundWitnessWithPartialMeta, TRead extends XyoPayload = XyoPayloadWithPartialMeta>
-  implements Archivist<string[], TWrite, TRead | undefined, string, TRead[], XyoPayloadFindFilter>
-{
-  protected parent?: XyoArchivist
-  protected account?: XyoAccount
-  constructor(parent?: XyoArchivist, 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 {
-    throw Error('getAll not supported')
-  }
-  public delete(_hash: string): boolean | Promise<boolean> {
-    throw Error('delete not supported')
-  }
-  public clear(): void | Promise<void> {
-    throw Error('clear not supported')
-  }
-  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()
-    const block = builder.payloads(payloads).witness(account).build()
-    const [hash] = await parent.insert(block)
-    await this.clear()
-    return hash
-  }
-}

package/src/Archivist/XyoMemoryArchivist.ts

@@ -1,62 +0,0 @@
-import { XyoBoundWitnessWithMeta, XyoBoundWitnessWrapper } from '@xyo-network/boundwitness'
-import { XyoPayload, XyoPayloadWithPartialMeta, XyoPayloadWrapper } from '@xyo-network/payload'
-import LruCache from 'lru-cache'
-
-import { XyoPayloadFindFilter } from './Payload'
-import { XyoArchivist } from './XyoArchivist'
-
-export class XyoMemoryArchivist extends XyoArchivist {
-  private cache: LruCache<string, XyoPayloadWithPartialMeta> = new LruCache<string, XyoPayloadWithPartialMeta>({ max: 10000 })
-
-  public delete(hash: string) {
-    return this.cache.delete(hash)
-  }
-
-  public clear() {
-    this.cache.clear()
-  }
-
-  public get(hash: string) {
-    return this.cache.get(hash) ?? this.parent?.get(hash)
-  }
-
-  public insert(payload: XyoBoundWitnessWithMeta) {
-    const wrapper = new XyoBoundWitnessWrapper(payload)
-    const payloadWithmeta = { ...payload, _hash: wrapper.hash, _timestamp: Date.now() }
-    const hashes: string[] = []
-    hashes.push(payloadWithmeta._hash)
-    this.cache.set(payloadWithmeta._hash, payloadWithmeta)
-    payload._payloads?.forEach((payload) => {
-      const wrapper = new XyoPayloadWrapper(payload)
-      const payloadWithmeta = { ...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[] {
-    const result: T[] = []
-    if (filter.type === 'schema') {
-      const filterSchema = filter.schema !== undefined ? (Array.isArray(filter.schema) ? filter.schema : [filter.schema]) : undefined
-      this.cache.forEach((value) => {
-        let match: XyoPayload | undefined = value
-        match = filterSchema === undefined || filterSchema.includes(value.schema) ? value : undefined
-        if (match) {
-          result.push(match as T)
-        }
-      })
-    }
-    if (filter.type === 'hash') {
-      const filterHash = filter.hash !== undefined ? (Array.isArray(filter.hash) ? filter.hash : [filter.hash]) : undefined
-      this.cache.forEach((value) => {
-        let match: XyoPayload | undefined = value
-        match = filterHash === undefined || filterHash.includes(new XyoPayloadWrapper(value).hash) ? value : undefined
-        if (match) {
-          result.push(match as T)
-        }
-      })
-    }
-    return result
-  }
-}