@xyo-network/witness 2.35.0 → 2.36.0-rc.2

package/dist/cjs/XyoWitness.d.ts

@@ -1,7 +1,6 @@
 import { XyoAccount } from '@xyo-network/account';
-import { XyoBoundWitness } from '@xyo-network/boundwitness';
-import { XyoModule, XyoQuery } from '@xyo-network/module';
-import { XyoPayload } from '@xyo-network/payload';
+import { XyoModule, XyoQueryBoundWitness } from '@xyo-network/module';
+import { XyoPayload, XyoPayloads } from '@xyo-network/payload';
 import { Promisable } from '@xyo-network/promise';
 import { XyoWitnessConfig } from './Config';
 import { Witness } from './Witness';
@@ -10,7 +9,7 @@ export declare class XyoWitness<TTarget extends XyoPayload = XyoPayload, TConfig
     get targetSchema(): TTarget["schema"] | undefined;
     queries(): string[];
     observe(fields?: Partial<TTarget> | undefined): Promisable<TTarget>;
-    query<T extends XyoQuery = XyoQuery>(bw: XyoBoundWitness, query: T): Promise<import("@xyo-network/module").XyoModuleQueryResult<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
+    query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(query: T, payloads?: XyoPayloads): Promise<import("@xyo-network/module").ModuleQueryResult<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
         schema: string;
     }>>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"XyoWitness.d.ts","sourceRoot":"","sources":["../../src/XyoWitness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,qBAAa,UAAU,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,OAAO,SAAS,gBAAgB,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,OAAO,CAAC,CACpI,SAAQ,SAAS,CAAC,OAAO,CACzB,YAAW,OAAO,CAAC,OAAO,CAAC;gBAGf,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,SAAS;IAI7F,IAAW,YAAY,kCAEtB;IAEQ,OAAO;IAIT,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC;IAI3D,KAAK,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAAE,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC;;;CAgBlF"}
+{"version":3,"file":"XyoWitness.d.ts","sourceRoot":"","sources":["../../src/XyoWitness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAA4B,SAAS,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC/F,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,qBAAa,UAAU,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,OAAO,SAAS,gBAAgB,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,OAAO,CAAC,CACpI,SAAQ,SAAS,CAAC,OAAO,CACzB,YAAW,OAAO,CAAC,OAAO,CAAC;gBAGf,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,SAAS;IAI7F,IAAW,YAAY,kCAEtB;IAEQ,OAAO;IAIT,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC;IAI3D,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,WAAW;;;CAiB7G"}

package/dist/cjs/XyoWitness.js

@@ -21,21 +21,22 @@ class XyoWitness extends module_1.XyoModule {
     observe(fields) {
         return Object.assign(Object.assign({}, fields), { schema: this.targetSchema });
     }
-    query(bw, query) {
+    query(query, payloads) {
         const _super = Object.create(null, {
             query: { get: () => super.query }
         });
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            (0, assert_1.assertEx)(this.queryable(query.schema, bw.addresses));
+            const wrapper = module_1.QueryBoundWitnessWrapper.parseQuery(query, payloads);
+            const typedQuery = wrapper.query.payload;
+            (0, assert_1.assertEx)(this.queryable(typedQuery.schema, wrapper.addresses));
             const queryAccount = new account_1.XyoAccount();
-            const typedQuery = query;
             switch (typedQuery.schema) {
                 case Queries_1.XyoWitnessObserveQuerySchema: {
                     const payloads = [yield this.observe(typedQuery === null || typedQuery === void 0 ? void 0 : typedQuery.payload)];
-                    return this.bindPayloads(payloads, queryAccount);
+                    return this.bindResult(payloads, queryAccount);
                 }
                 default: {
-                    return _super.query.call(this, bw, typedQuery);
+                    return _super.query.call(this, query, payloads);
                 }
             }
         });

package/dist/cjs/XyoWitness.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoWitness.js","sourceRoot":"","sources":["../../src/XyoWitness.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,kDAAiD;AAEjD,gDAAyD;AAKzD,uCAAyE;AAGzE,MAAa,UACX,SAAQ,kBAAkB;IAG1B,mCAAmC;IACnC,YAAY,MAAgB,EAAE,OAAoB,EAAE,QAAyC;QAC3F,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IAClC,CAAC;IAED,IAAW,YAAY;;QACrB,OAAO,MAAA,IAAI,CAAC,MAAM,0CAAE,YAAY,CAAA;IAClC,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,sCAA4B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC3D,CAAC;IAEM,OAAO,CAAC,MAAqC;QAClD,OAAO,gCAAK,MAAM,KAAE,MAAM,EAAE,IAAI,CAAC,YAAY,GAAa,CAAA;IAC5D,CAAC;IAEc,KAAK,CAAgC,EAAmB,EAAE,KAAQ;;;;;YAC/E,IAAA,iBAAQ,EAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAA;YAEpD,MAAM,YAAY,GAAG,IAAI,oBAAU,EAAE,CAAA;YACrC,MAAM,UAAU,GAAG,KAAiC,CAAA;YACpD,QAAQ,UAAU,CAAC,MAAM,EAAE;gBACzB,KAAK,sCAA4B,CAAC,CAAC;oBACjC,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,CAAC,CAAC,CAAA;oBAC1D,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;iBACjD;gBAED,OAAO,CAAC,CAAC;oBACP,OAAO,OAAM,KAAK,YAAC,EAAE,EAAE,UAAU,EAAC;iBACnC;aACF;QACH,CAAC;KAAA;CACF;AArCD,gCAqCC"}
+{"version":3,"file":"XyoWitness.js","sourceRoot":"","sources":["../../src/XyoWitness.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,kDAAiD;AACjD,gDAA+F;AAK/F,uCAAyE;AAGzE,MAAa,UACX,SAAQ,kBAAkB;IAG1B,mCAAmC;IACnC,YAAY,MAAgB,EAAE,OAAoB,EAAE,QAAyC;QAC3F,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IAClC,CAAC;IAED,IAAW,YAAY;;QACrB,OAAO,MAAA,IAAI,CAAC,MAAM,0CAAE,YAAY,CAAA;IAClC,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,sCAA4B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC3D,CAAC;IAEM,OAAO,CAAC,MAAqC;QAClD,OAAO,gCAAK,MAAM,KAAE,MAAM,EAAE,IAAI,CAAC,YAAY,GAAa,CAAA;IAC5D,CAAC;IAEc,KAAK,CAAwD,KAAQ,EAAE,QAAsB;;;;;YAC1G,MAAM,OAAO,GAAG,iCAAwB,CAAC,UAAU,CAA2B,KAAK,EAAE,QAAQ,CAAC,CAAA;YAC9F,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAA;YACxC,IAAA,iBAAQ,EAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAA;YAE9D,MAAM,YAAY,GAAG,IAAI,oBAAU,EAAE,CAAA;YACrC,QAAQ,UAAU,CAAC,MAAM,EAAE;gBACzB,KAAK,sCAA4B,CAAC,CAAC;oBACjC,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,CAAC,CAAC,CAAA;oBAC1D,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;iBAC/C;gBAED,OAAO,CAAC,CAAC;oBACP,OAAO,OAAM,KAAK,YAAC,KAAK,EAAE,QAAQ,EAAC;iBACpC;aACF;QACH,CAAC;KAAA;CACF;AAtCD,gCAsCC"}

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

@@ -1 +1 @@
-{"version":3,"file":"XyoWitnessWrapper.d.ts","sourceRoot":"","sources":["../../src/XyoWitnessWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,qBAAa,iBAAkB,SAAQ,gBAAiB,YAAW,OAAO;IAClE,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,SAAS,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAKrF"}
+{"version":3,"file":"XyoWitnessWrapper.d.ts","sourceRoot":"","sources":["../../src/XyoWitnessWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAwB,MAAM,qBAAqB,CAAA;AAC5E,OAAO,EAAkB,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,qBAAa,iBAAkB,SAAQ,gBAAiB,YAAW,OAAO;IAClE,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,SAAS,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CASrF"}

package/dist/cjs/XyoWitnessWrapper.js

@@ -3,13 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.XyoWitnessWrapper = void 0;
 const tslib_1 = require("tslib");
 const module_1 = require("@xyo-network/module");
+const payload_1 = require("@xyo-network/payload");
 const Queries_1 = require("./Queries");
 class XyoWitnessWrapper extends module_1.XyoModuleWrapper {
     observe(payload) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const query = { payload, schema: Queries_1.XyoWitnessObserveQuerySchema };
-            const bw = (yield this.bindPayloads([query]))[0];
-            return (yield this.module.query(bw, query))[1][0];
+            const queryPayload = payload_1.PayloadWrapper.parse({ payload, schema: Queries_1.XyoWitnessObserveQuerySchema });
+            const queryResult = yield this.bindQuery([queryPayload.payload], queryPayload.hash);
+            const queryBoundWitness = queryResult[0];
+            console.log(`queryBoundWitness: ${JSON.stringify(queryBoundWitness, null, 2)}`);
+            console.log(`queryPayload-hash: ${queryPayload.hash}`);
+            console.log(`queryResult: ${JSON.stringify(queryResult, null, 2)}`);
+            return (yield this.module.query(queryBoundWitness, [queryPayload.payload]))[1][0];
         });
     }
 }

package/dist/cjs/XyoWitnessWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoWitnessWrapper.js","sourceRoot":"","sources":["../../src/XyoWitnessWrapper.ts"],"names":[],"mappings":";;;;AAAA,gDAAsD;AAGtD,uCAAyE;AAGzE,MAAa,iBAAkB,SAAQ,yBAAgB;IAC/C,OAAO,CAAC,OAAyC;;YACrD,MAAM,KAAK,GAAoB,EAAE,OAAO,EAAE,MAAM,EAAE,sCAA4B,EAAE,CAAA;YAChF,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAChD,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACnD,CAAC;KAAA;CACF;AAND,8CAMC"}
+{"version":3,"file":"XyoWitnessWrapper.js","sourceRoot":"","sources":["../../src/XyoWitnessWrapper.ts"],"names":[],"mappings":";;;;AAAA,gDAA4E;AAC5E,kDAAiE;AAEjE,uCAAgF;AAGhF,MAAa,iBAAkB,SAAQ,yBAAgB;IAC/C,OAAO,CAAC,OAAyC;;YACrD,MAAM,YAAY,GAAG,wBAAc,CAAC,KAAK,CAAyB,EAAE,OAAO,EAAE,MAAM,EAAE,sCAA4B,EAAE,CAAC,CAAA;YACpH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC,CAAA;YACnF,MAAM,iBAAiB,GAAyB,WAAW,CAAC,CAAC,CAAC,CAAA;YAC9D,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;YAC/E,OAAO,CAAC,GAAG,CAAC,sBAAsB,YAAY,CAAC,IAAI,EAAE,CAAC,CAAA;YACtD,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;YACnE,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACnF,CAAC;KAAA;CACF;AAVD,8CAUC"}