@xyo-network/witness 2.25.5 → 2.26.0

package/dist/cjs/Witness/Witness.d.ts

@@ -1,18 +1,13 @@
-import { EmptyObject } from '@xyo-network/core';
-import { WithTimestamp, XyoPayload } from '@xyo-network/payload';
-export interface XyoWitness<T extends XyoPayload = XyoPayload> {
-    targetSchema: string;
-    observe(fields?: Partial<T>): Promise<T>;
-}
-export declare abstract class XyoAbstractWitness<T extends XyoPayload = XyoPayload, C extends EmptyObject = EmptyObject> implements XyoWitness<T> {
-    readonly config?: C;
-    constructor(config?: C);
-    abstract observe(fields?: Partial<T>): Promise<T>;
-    abstract get targetSchema(): string;
-}
-export declare abstract class XyoAbstractTimestampWitness<TTargetPayload extends WithTimestamp<XyoPayload> = WithTimestamp<XyoPayload>, TConfig extends EmptyObject = EmptyObject> extends XyoAbstractWitness<TTargetPayload, TConfig> {
-}
-/** @deprecated use XyoAbstractWitness instead */
-export declare abstract class XyoWitnessBase<T extends XyoPayload = XyoPayload, C extends EmptyObject = EmptyObject> extends XyoAbstractWitness<T, C> {
+import { XyoBoundWitness } from '@xyo-network/boundwitness';
+import { XyoAbstractModule } from '@xyo-network/module';
+import { XyoPayload } from '@xyo-network/payload';
+import { Promisable } from '@xyo-network/promisable';
+import { XyoWitnessConfig } from './XyoWitnessConfig';
+import { XyoWitnessQueryPayload } from './XyoWitnessQueryPayload';
+export declare abstract class XyoWitness<T extends XyoPayload = XyoPayload, Q extends XyoWitnessQueryPayload = XyoWitnessQueryPayload, C extends XyoWitnessConfig<Q> = XyoWitnessConfig<Q>> extends XyoAbstractModule<Q, C> {
+    observe(fields?: Partial<T> | undefined, _query?: Q | undefined): Promisable<T>;
+    query(query?: Q): Promise<[XyoBoundWitness, XyoPayload<{
+        schema: string;
+    }>[]]>;
 }
 //# sourceMappingURL=Witness.d.ts.map

package/dist/cjs/Witness/Witness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEhE,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU;IAC3D,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;CACzC;AAED,8BAAsB,kBAAkB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,CAAC,SAAS,WAAW,GAAG,WAAW,CAAE,YAAW,UAAU,CAAC,CAAC,CAAC;IACvI,SAAgB,MAAM,CAAC,EAAE,CAAC,CAAA;gBACd,MAAM,CAAC,EAAE,CAAC;IAGtB,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IACjD,QAAQ,KAAK,YAAY,IAAI,MAAM,CAAA;CACpC;AAED,8BAAsB,2BAA2B,CAC/C,cAAc,SAAS,aAAa,CAAC,UAAU,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,EAC5E,OAAO,SAAS,WAAW,GAAG,WAAW,CACzC,SAAQ,kBAAkB,CAAC,cAAc,EAAE,OAAO,CAAC;CAAG;AAExD,iDAAiD;AACjD,8BAAsB,cAAc,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,CAAC,SAAS,WAAW,GAAG,WAAW,CAAE,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC;CAAG"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,8BAAsB,UAAU,CAC9B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,sBAAsB,GAAG,sBAAsB,EACzD,CAAC,SAAS,gBAAgB,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CACnD,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC;IACxB,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,GAAG,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC;IAIhF,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,eAAe,EAAE,UAAU,CAAC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAC,CAAC;CAIrF"}

package/dist/cjs/Witness/Witness.js

@@ -1,17 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.XyoWitnessBase = exports.XyoAbstractTimestampWitness = exports.XyoAbstractWitness = void 0;
-class XyoAbstractWitness {
-    constructor(config) {
-        this.config = config;
+exports.XyoWitness = void 0;
+const tslib_1 = require("tslib");
+const module_1 = require("@xyo-network/module");
+class XyoWitness extends module_1.XyoAbstractModule {
+    observe(fields, _query) {
+        return Object.assign(Object.assign({}, fields), { schema: this.config.targetSchema });
+    }
+    query(query) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const payloads = [yield this.observe({}, query)];
+            return [this.bindPayloads(payloads), payloads];
+        });
     }
 }
-exports.XyoAbstractWitness = XyoAbstractWitness;
-class XyoAbstractTimestampWitness extends XyoAbstractWitness {
-}
-exports.XyoAbstractTimestampWitness = XyoAbstractTimestampWitness;
-/** @deprecated use XyoAbstractWitness instead */
-class XyoWitnessBase extends XyoAbstractWitness {
-}
-exports.XyoWitnessBase = XyoWitnessBase;
+exports.XyoWitness = XyoWitness;
 //# sourceMappingURL=Witness.js.map

package/dist/cjs/Witness/Witness.js.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":";;;AAQA,MAAsB,kBAAkB;IAEtC,YAAY,MAAU;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;CAGF;AAPD,gDAOC;AAED,MAAsB,2BAGpB,SAAQ,kBAA2C;CAAG;AAHxD,kEAGwD;AAExD,iDAAiD;AACjD,MAAsB,cAAuF,SAAQ,kBAAwB;CAAG;AAAhJ,wCAAgJ"}
+{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":";;;;AACA,gDAAuD;AAOvD,MAAsB,UAIpB,SAAQ,0BAAuB;IACxB,OAAO,CAAC,MAA+B,EAAE,MAAsB;QACpE,OAAO,gCAAK,MAAM,KAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,GAAO,CAAA;IAC7D,CAAC;IAEK,KAAK,CAAC,KAAS;;YACnB,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAA;YAChD,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAA;QAChD,CAAC;KAAA;CACF;AAbD,gCAaC"}

package/dist/cjs/Witness/XyoWitnessConfig.d.ts

@@ -0,0 +1,7 @@
+import { XyoModuleConfig } from '@xyo-network/module';
+import { XyoWitnessQueryPayload } from './XyoWitnessQueryPayload';
+export interface XyoWitnessConfig<Q extends XyoWitnessQueryPayload = XyoWitnessQueryPayload> extends XyoModuleConfig {
+    targetSchema: string;
+    query?: Q;
+}
+//# sourceMappingURL=XyoWitnessConfig.d.ts.map

package/dist/cjs/Witness/XyoWitnessConfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"XyoWitnessConfig.d.ts","sourceRoot":"","sources":["../../../src/Witness/XyoWitnessConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAErD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,sBAAsB,GAAG,sBAAsB,CAAE,SAAQ,eAAe;IAClH,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,CAAC,CAAA;CACV"}

package/dist/cjs/Witness/XyoWitnessConfig.js

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

package/dist/cjs/Witness/XyoWitnessConfig.js.map

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

package/dist/cjs/Witness/XyoWitnessQueryPayload.d.ts

@@ -0,0 +1,3 @@
+import { XyoPayload, XyoQueryPayload } from '@xyo-network/payload';
+export declare type XyoWitnessQueryPayload<T extends XyoPayload = XyoPayload> = XyoQueryPayload<T>;
+//# sourceMappingURL=XyoWitnessQueryPayload.d.ts.map

package/dist/cjs/Witness/XyoWitnessQueryPayload.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"XyoWitnessQueryPayload.d.ts","sourceRoot":"","sources":["../../../src/Witness/XyoWitnessQueryPayload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAElE,oBAAY,sBAAsB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,eAAe,CAAC,CAAC,CAAC,CAAA"}

package/dist/cjs/Witness/XyoWitnessQueryPayload.js

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

package/dist/cjs/Witness/XyoWitnessQueryPayload.js.map

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

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

@@ -1,4 +1,4 @@
-export * from './QueryWitness';
-export * from './SimpleWitness';
 export * from './Witness';
+export * from './XyoWitnessConfig';
+export * from './XyoWitnessQueryPayload';
 //# sourceMappingURL=index.d.ts.map

package/dist/cjs/Witness/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Witness/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Witness/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,oBAAoB,CAAA;AAClC,cAAc,0BAA0B,CAAA"}

package/dist/cjs/Witness/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./QueryWitness"), exports);
-tslib_1.__exportStar(require("./SimpleWitness"), exports);
 tslib_1.__exportStar(require("./Witness"), exports);
+tslib_1.__exportStar(require("./XyoWitnessConfig"), exports);
+tslib_1.__exportStar(require("./XyoWitnessQueryPayload"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Witness/index.ts"],"names":[],"mappings":";;;AAAA,yDAA8B;AAC9B,0DAA+B;AAC/B,oDAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Witness/index.ts"],"names":[],"mappings":";;;AAAA,oDAAyB;AACzB,6DAAkC;AAClC,mEAAwC"}

package/dist/esm/Witness/Witness.d.ts

@@ -1,18 +1,13 @@
-import { EmptyObject } from '@xyo-network/core';
-import { WithTimestamp, XyoPayload } from '@xyo-network/payload';
-export interface XyoWitness<T extends XyoPayload = XyoPayload> {
-    targetSchema: string;
-    observe(fields?: Partial<T>): Promise<T>;
-}
-export declare abstract class XyoAbstractWitness<T extends XyoPayload = XyoPayload, C extends EmptyObject = EmptyObject> implements XyoWitness<T> {
-    readonly config?: C;
-    constructor(config?: C);
-    abstract observe(fields?: Partial<T>): Promise<T>;
-    abstract get targetSchema(): string;
-}
-export declare abstract class XyoAbstractTimestampWitness<TTargetPayload extends WithTimestamp<XyoPayload> = WithTimestamp<XyoPayload>, TConfig extends EmptyObject = EmptyObject> extends XyoAbstractWitness<TTargetPayload, TConfig> {
-}
-/** @deprecated use XyoAbstractWitness instead */
-export declare abstract class XyoWitnessBase<T extends XyoPayload = XyoPayload, C extends EmptyObject = EmptyObject> extends XyoAbstractWitness<T, C> {
+import { XyoBoundWitness } from '@xyo-network/boundwitness';
+import { XyoAbstractModule } from '@xyo-network/module';
+import { XyoPayload } from '@xyo-network/payload';
+import { Promisable } from '@xyo-network/promisable';
+import { XyoWitnessConfig } from './XyoWitnessConfig';
+import { XyoWitnessQueryPayload } from './XyoWitnessQueryPayload';
+export declare abstract class XyoWitness<T extends XyoPayload = XyoPayload, Q extends XyoWitnessQueryPayload = XyoWitnessQueryPayload, C extends XyoWitnessConfig<Q> = XyoWitnessConfig<Q>> extends XyoAbstractModule<Q, C> {
+    observe(fields?: Partial<T> | undefined, _query?: Q | undefined): Promisable<T>;
+    query(query?: Q): Promise<[XyoBoundWitness, XyoPayload<{
+        schema: string;
+    }>[]]>;
 }
 //# sourceMappingURL=Witness.d.ts.map

package/dist/esm/Witness/Witness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEhE,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU;IAC3D,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;CACzC;AAED,8BAAsB,kBAAkB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,CAAC,SAAS,WAAW,GAAG,WAAW,CAAE,YAAW,UAAU,CAAC,CAAC,CAAC;IACvI,SAAgB,MAAM,CAAC,EAAE,CAAC,CAAA;gBACd,MAAM,CAAC,EAAE,CAAC;IAGtB,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IACjD,QAAQ,KAAK,YAAY,IAAI,MAAM,CAAA;CACpC;AAED,8BAAsB,2BAA2B,CAC/C,cAAc,SAAS,aAAa,CAAC,UAAU,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,EAC5E,OAAO,SAAS,WAAW,GAAG,WAAW,CACzC,SAAQ,kBAAkB,CAAC,cAAc,EAAE,OAAO,CAAC;CAAG;AAExD,iDAAiD;AACjD,8BAAsB,cAAc,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,CAAC,SAAS,WAAW,GAAG,WAAW,CAAE,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC;CAAG"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,8BAAsB,UAAU,CAC9B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,sBAAsB,GAAG,sBAAsB,EACzD,CAAC,SAAS,gBAAgB,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CACnD,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC;IACxB,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,GAAG,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC;IAIhF,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,eAAe,EAAE,UAAU,CAAC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAC,CAAC;CAIrF"}

package/dist/esm/Witness/Witness.js

@@ -1,12 +1,11 @@
-export class XyoAbstractWitness {
-    config;
-    constructor(config) {
-        this.config = config;
+import { XyoAbstractModule } from '@xyo-network/module';
+export class XyoWitness extends XyoAbstractModule {
+    observe(fields, _query) {
+        return { ...fields, schema: this.config.targetSchema };
+    }
+    async query(query) {
+        const payloads = [await this.observe({}, query)];
+        return [this.bindPayloads(payloads), payloads];
     }
-}
-export class XyoAbstractTimestampWitness extends XyoAbstractWitness {
-}
-/** @deprecated use XyoAbstractWitness instead */
-export class XyoWitnessBase extends XyoAbstractWitness {
 }
 //# sourceMappingURL=Witness.js.map

package/dist/esm/Witness/Witness.js.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"AAQA,MAAM,OAAgB,kBAAkB;IACtB,MAAM,CAAI;IAC1B,YAAY,MAAU;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;CAGF;AAED,MAAM,OAAgB,2BAGpB,SAAQ,kBAA2C;CAAG;AAExD,iDAAiD;AACjD,MAAM,OAAgB,cAAuF,SAAQ,kBAAwB;CAAG"}
+{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../../src/Witness/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAOvD,MAAM,OAAgB,UAIpB,SAAQ,iBAAuB;IACxB,OAAO,CAAC,MAA+B,EAAE,MAAsB;QACpE,OAAO,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,EAAO,CAAA;IAC7D,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAAS;QACnB,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAA;QAChD,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;CACF"}

package/dist/esm/Witness/XyoWitnessConfig.d.ts

@@ -0,0 +1,7 @@
+import { XyoModuleConfig } from '@xyo-network/module';
+import { XyoWitnessQueryPayload } from './XyoWitnessQueryPayload';
+export interface XyoWitnessConfig<Q extends XyoWitnessQueryPayload = XyoWitnessQueryPayload> extends XyoModuleConfig {
+    targetSchema: string;
+    query?: Q;
+}
+//# sourceMappingURL=XyoWitnessConfig.d.ts.map

package/dist/esm/Witness/XyoWitnessConfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"XyoWitnessConfig.d.ts","sourceRoot":"","sources":["../../../src/Witness/XyoWitnessConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAErD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,sBAAsB,GAAG,sBAAsB,CAAE,SAAQ,eAAe;IAClH,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,CAAC,CAAA;CACV"}

package/dist/esm/Witness/XyoWitnessConfig.js

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

package/dist/esm/Witness/XyoWitnessConfig.js.map

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

package/dist/esm/Witness/XyoWitnessQueryPayload.d.ts

@@ -0,0 +1,3 @@
+import { XyoPayload, XyoQueryPayload } from '@xyo-network/payload';
+export declare type XyoWitnessQueryPayload<T extends XyoPayload = XyoPayload> = XyoQueryPayload<T>;
+//# sourceMappingURL=XyoWitnessQueryPayload.d.ts.map

package/dist/esm/Witness/XyoWitnessQueryPayload.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"XyoWitnessQueryPayload.d.ts","sourceRoot":"","sources":["../../../src/Witness/XyoWitnessQueryPayload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAElE,oBAAY,sBAAsB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,eAAe,CAAC,CAAC,CAAC,CAAA"}

package/dist/esm/Witness/XyoWitnessQueryPayload.js

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

package/dist/esm/Witness/XyoWitnessQueryPayload.js.map

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

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

@@ -1,4 +1,4 @@
-export * from './QueryWitness';
-export * from './SimpleWitness';
 export * from './Witness';
+export * from './XyoWitnessConfig';
+export * from './XyoWitnessQueryPayload';
 //# sourceMappingURL=index.d.ts.map

package/dist/esm/Witness/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Witness/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Witness/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,oBAAoB,CAAA;AAClC,cAAc,0BAA0B,CAAA"}

package/dist/esm/Witness/index.js

@@ -1,4 +1,4 @@
-export * from './QueryWitness';
-export * from './SimpleWitness';
 export * from './Witness';
+export * from './XyoWitnessConfig';
+export * from './XyoWitnessQueryPayload';
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Witness/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Witness/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,oBAAoB,CAAA;AAClC,cAAc,0BAA0B,CAAA"}

package/package.json

@@ -10,13 +10,15 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/core": "^2.25.5",
-    "@xyo-network/payload": "^2.25.5",
+    "@xyo-network/boundwitness": "^2.26.0",
+    "@xyo-network/module": "^2.26.0",
+    "@xyo-network/payload": "^2.26.0",
+    "@xyo-network/promisable": "^2.26.0",
     "tslib": "^2.4.0"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "devDependencies": {
-    "@xylabs/tsconfig": "^2.5.99"
+    "@xylabs/tsconfig": "^2.5.117"
   },
   "browser": "dist/esm/index.js",
   "docs": "dist/docs.json",
@@ -50,5 +52,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.25.5"
+  "version": "2.26.0"
 }

package/src/Witness/Witness.ts

@@ -1,24 +1,22 @@
-import { EmptyObject } from '@xyo-network/core'
-import { WithTimestamp, XyoPayload } from '@xyo-network/payload'
+import { XyoBoundWitness } from '@xyo-network/boundwitness'
+import { XyoAbstractModule } from '@xyo-network/module'
+import { XyoPayload } from '@xyo-network/payload'
+import { Promisable } from '@xyo-network/promisable'
 
-export interface XyoWitness<T extends XyoPayload = XyoPayload> {
-  targetSchema: string
-  observe(fields?: Partial<T>): Promise<T>
-}
+import { XyoWitnessConfig } from './XyoWitnessConfig'
+import { XyoWitnessQueryPayload } from './XyoWitnessQueryPayload'
 
-export abstract class XyoAbstractWitness<T extends XyoPayload = XyoPayload, C extends EmptyObject = EmptyObject> implements XyoWitness<T> {
-  public readonly config?: C
-  constructor(config?: C) {
-    this.config = config
+export abstract class XyoWitness<
+  T extends XyoPayload = XyoPayload,
+  Q extends XyoWitnessQueryPayload = XyoWitnessQueryPayload,
+  C extends XyoWitnessConfig<Q> = XyoWitnessConfig<Q>,
+> extends XyoAbstractModule<Q, C> {
+  public observe(fields?: Partial<T> | undefined, _query?: Q | undefined): Promisable<T> {
+    return { ...fields, schema: this.config.targetSchema } as T
   }
-  abstract observe(fields?: Partial<T>): Promise<T>
-  abstract get targetSchema(): string
-}
-
-export abstract class XyoAbstractTimestampWitness<
-  TTargetPayload extends WithTimestamp<XyoPayload> = WithTimestamp<XyoPayload>,
-  TConfig extends EmptyObject = EmptyObject,
-> extends XyoAbstractWitness<TTargetPayload, TConfig> {}
 
-/** @deprecated use XyoAbstractWitness instead */
-export abstract class XyoWitnessBase<T extends XyoPayload = XyoPayload, C extends EmptyObject = EmptyObject> extends XyoAbstractWitness<T, C> {}
+  async query(query?: Q): Promise<[XyoBoundWitness, XyoPayload<{ schema: string }>[]]> {
+    const payloads = [await this.observe({}, query)]
+    return [this.bindPayloads(payloads), payloads]
+  }
+}

package/src/Witness/XyoWitnessConfig.ts

@@ -0,0 +1,8 @@
+import { XyoModuleConfig } from '@xyo-network/module'
+
+import { XyoWitnessQueryPayload } from './XyoWitnessQueryPayload'
+
+export interface XyoWitnessConfig<Q extends XyoWitnessQueryPayload = XyoWitnessQueryPayload> extends XyoModuleConfig {
+  targetSchema: string
+  query?: Q
+}

package/src/Witness/XyoWitnessQueryPayload.ts

@@ -0,0 +1,3 @@
+import { XyoPayload, XyoQueryPayload } from '@xyo-network/payload'
+
+export type XyoWitnessQueryPayload<T extends XyoPayload = XyoPayload> = XyoQueryPayload<T>

package/src/Witness/index.ts

@@ -1,3 +1,3 @@
-export * from './QueryWitness'
-export * from './SimpleWitness'
 export * from './Witness'
+export * from './XyoWitnessConfig'
+export * from './XyoWitnessQueryPayload'

package/src/Witness/QueryWitness.ts

@@ -1,21 +0,0 @@
-import { XyoPayload, XyoPayloadBuilder, XyoQueryPayload } from '@xyo-network/payload'
-
-import { XyoAbstractWitness } from './Witness'
-
-export interface XyoQueryWitnessConfig<Q extends XyoQueryPayload = XyoQueryPayload> {
-  query: Q
-}
-
-export class XyoQueryWitness<
-  T extends XyoPayload,
-  Q extends XyoQueryPayload = XyoQueryPayload,
-  C extends XyoQueryWitnessConfig<Q> = XyoQueryWitnessConfig<Q>,
-> extends XyoAbstractWitness<T, C> {
-  override get targetSchema() {
-    return this.config?.query.targetSchema ?? 'network.xyo.payload'
-  }
-
-  public observe(fields?: Partial<T>): Promise<T> {
-    return Promise.resolve(new XyoPayloadBuilder<T>({ schema: this.targetSchema }).fields(fields).build())
-  }
-}

package/src/Witness/SimpleWitness.ts

@@ -1,37 +0,0 @@
-import { XyoPayload, XyoPayloadBuilder } from '@xyo-network/payload'
-
-import { XyoAbstractWitness, XyoWitness } from './Witness'
-
-export interface XyoSimpleWitnessConfig<T extends XyoPayload = XyoPayload> {
-  schema: string
-  template?: XyoPayload
-  observer?: () => Promise<T> | T
-}
-
-export class XyoSimpleWitness<T extends XyoPayload = XyoPayload, C extends XyoSimpleWitnessConfig<T> = XyoSimpleWitnessConfig<T>>
-  extends XyoAbstractWitness<T, C>
-  implements XyoWitness<T>
-{
-  public previousHash?: string
-
-  override get targetSchema() {
-    return this.config?.schema ?? 'network.xyo.payload'
-  }
-
-  public async observe(fields?: Partial<T>) {
-    return new XyoPayloadBuilder<T>({ schema: this.targetSchema })
-      .previousHash(this.previousHash)
-      .fields(await this.config?.observer?.())
-      .fields(fields)
-      .build()
-  }
-}
-
-/** @deprecated Use XyoSimpleWitness */
-export class XyoLegacyWitness<
-  T extends XyoPayload = XyoPayload,
-  C extends XyoSimpleWitnessConfig<T> = XyoSimpleWitnessConfig<T>,
-> extends XyoSimpleWitness<T, C> {}
-
-/** @deprecated Use XyoSimpleWitnessConfig */
-export type XyoWitnessConfig<T extends XyoPayload = XyoPayload> = XyoSimpleWitnessConfig<T>

package/src/Witness/Witness.spec.ts

@@ -1,13 +0,0 @@
-import { XyoSimpleWitness } from './SimpleWitness'
-
-describe('XyoWitness', () => {
-  test('valid-instantiation', () => {
-    const template = {
-      schema: 'network.xyo.foo',
-    }
-    const witness = new XyoSimpleWitness({ schema: 'network.xyo.payload', template })
-    expect(witness).toBeTruthy()
-    expect(witness.config?.schema).toBe('network.xyo.payload')
-    expect(witness.config?.template).toBe(template)
-  })
-})