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

package/dist/cjs/XyoBridge.d.ts

@@ -1,5 +1,5 @@
 import { XyoBoundWitness } from '@xyo-network/boundwitness';
-import { XyoModule, XyoQuery } from '@xyo-network/module';
+import { XyoModule, XyoQuery, XyoQueryBoundWitness } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload';
 import { Promisable } from '@xyo-network/promise';
 import { BridgeModule } from './Bridge';
@@ -9,7 +9,7 @@ export declare abstract class XyoBridge<TConfig extends XyoBridgeConfig = XyoBri
     abstract connect(): Promisable<boolean>;
     abstract disconnect(): Promisable<boolean>;
     abstract forward(query: XyoQuery): Promise<[XyoBoundWitness, (XyoPayload | null)[]]>;
-    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): Promise<import("@xyo-network/module").ModuleQueryResult<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
         schema: string;
     }>>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"XyoBridge.d.ts","sourceRoot":"","sources":["../../src/XyoBridge.ts"],"names":[],"mappings":"AAEA,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,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAG1C,8BAAsB,SAAS,CAAC,OAAO,SAAS,eAAe,GAAG,eAAe,CAAE,SAAQ,SAAS,CAAC,OAAO,CAAE,YAAW,YAAY;IAC1H,OAAO;IAIhB,QAAQ,CAAC,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC;IACvC,QAAQ,CAAC,UAAU,IAAI,UAAU,CAAC,OAAO,CAAC;IAE1C,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,CAAC,eAAe,EAAE,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;IAErE,KAAK,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAAE,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC;;;CAwBlF"}
+{"version":3,"file":"XyoBridge.d.ts","sourceRoot":"","sources":["../../src/XyoBridge.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAA4B,SAAS,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AACzG,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAG1C,8BAAsB,SAAS,CAAC,OAAO,SAAS,eAAe,GAAG,eAAe,CAAE,SAAQ,SAAS,CAAC,OAAO,CAAE,YAAW,YAAY;IAC1H,OAAO;IAIhB,QAAQ,CAAC,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC;IACvC,QAAQ,CAAC,UAAU,IAAI,UAAU,CAAC,OAAO,CAAC;IAE1C,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,CAAC,eAAe,EAAE,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;IAErE,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,KAAK,EAAE,CAAC;;;CA0BrF"}

package/dist/cjs/XyoBridge.js

@@ -10,16 +10,17 @@ class XyoBridge extends module_1.XyoModule {
     queries() {
         return [Queries_1.XyoBridgeConnectQuerySchema, Queries_1.XyoBridgeDisconnectQuerySchema, ...super.queries()];
     }
-    query(bw, query) {
+    query(query) {
         const _super = Object.create(null, {
             queries: { get: () => super.queries },
             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);
+            const typedQuery = wrapper.query.payload;
+            (0, assert_1.assertEx)(this.queryable(typedQuery.schema, wrapper.addresses));
             const payloads = [];
             const queryAccount = new account_1.XyoAccount();
-            const typedQuery = query;
             switch (typedQuery.schema) {
                 case Queries_1.XyoBridgeConnectQuerySchema: {
                     yield this.connect();
@@ -30,14 +31,14 @@ class XyoBridge extends module_1.XyoModule {
                     break;
                 }
                 default:
-                    if (_super.queries.call(this).includes(query.schema)) {
-                        return _super.query.call(this, bw, query);
+                    if (_super.queries.call(this).includes(typedQuery.schema)) {
+                        return _super.query.call(this, query, payloads);
                     }
                     else {
                         return this.forward(typedQuery);
                     }
             }
-            return this.bindPayloads(payloads, queryAccount);
+            return this.bindResult(payloads, queryAccount);
         });
     }
 }

package/dist/cjs/XyoBridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoBridge.js","sourceRoot":"","sources":["../../src/XyoBridge.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,kDAAiD;AAEjD,gDAAyD;AAMzD,uCAAuG;AAEvG,MAAsB,SAA6D,SAAQ,kBAAkB;IAClG,OAAO;QACd,OAAO,CAAC,qCAA2B,EAAE,wCAA8B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1F,CAAC;IAOc,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,QAAQ,GAA0B,EAAE,CAAA;YAC1C,MAAM,YAAY,GAAG,IAAI,oBAAU,EAAE,CAAA;YACrC,MAAM,UAAU,GAAG,KAAuB,CAAA;YAC1C,QAAQ,UAAU,CAAC,MAAM,EAAE;gBACzB,KAAK,qCAA2B,CAAC,CAAC;oBAChC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;oBACpB,MAAK;iBACN;gBACD,KAAK,wCAA8B,CAAC,CAAC;oBACnC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;oBACvB,MAAK;iBACN;gBACD;oBACE,IAAI,OAAM,OAAO,YAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;wBAC1C,OAAO,OAAM,KAAK,YAAC,EAAE,EAAE,KAAK,EAAC;qBAC9B;yBAAM;wBACL,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;qBAChC;aACJ;YACD,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;QAClD,CAAC;KAAA;CACF;AAlCD,8BAkCC"}
+{"version":3,"file":"XyoBridge.js","sourceRoot":"","sources":["../../src/XyoBridge.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,kDAAiD;AAEjD,gDAAyG;AAMzG,uCAAuG;AAEvG,MAAsB,SAA6D,SAAQ,kBAAkB;IAClG,OAAO;QACd,OAAO,CAAC,qCAA2B,EAAE,wCAA8B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1F,CAAC;IAOc,KAAK,CAAwD,KAAQ;;;;;;YAClF,MAAM,OAAO,GAAG,iCAAwB,CAAC,UAAU,CAAiB,KAAK,CAAC,CAAA;YAC1E,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,QAAQ,GAA0B,EAAE,CAAA;YAC1C,MAAM,YAAY,GAAG,IAAI,oBAAU,EAAE,CAAA;YAErC,QAAQ,UAAU,CAAC,MAAM,EAAE;gBACzB,KAAK,qCAA2B,CAAC,CAAC;oBAChC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;oBACpB,MAAK;iBACN;gBACD,KAAK,wCAA8B,CAAC,CAAC;oBACnC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;oBACvB,MAAK;iBACN;gBACD;oBACE,IAAI,OAAM,OAAO,YAAG,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;wBAC/C,OAAO,OAAM,KAAK,YAAC,KAAK,EAAE,QAAQ,EAAC;qBACpC;yBAAM;wBACL,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;qBAChC;aACJ;YACD,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;QAChD,CAAC;KAAA;CACF;AApCD,8BAoCC"}

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

@@ -1 +1 @@
-{"version":3,"file":"XyoBridgeWrapper.d.ts","sourceRoot":"","sources":["../../src/XyoBridgeWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAEtD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAGjC,qBAAa,gBAAiB,SAAQ,gBAAiB,YAAW,MAAM;IAChE,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOvC,UAAU,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAMjD"}
+{"version":3,"file":"XyoBridgeWrapper.d.ts","sourceRoot":"","sources":["../../src/XyoBridgeWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAGtD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAGjC,qBAAa,gBAAiB,SAAQ,gBAAiB,YAAW,MAAM;IAChE,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOvC,UAAU,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAMjD"}

package/dist/cjs/XyoBridgeWrapper.js

@@ -3,21 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.XyoBridgeWrapper = 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 XyoBridgeWrapper extends module_1.XyoModuleWrapper {
     connect(uri) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const query = { schema: Queries_1.XyoBridgeConnectQuerySchema, uri };
-            const bw = (yield this.bindPayloads([query]))[0];
-            yield this.module.query(bw, query);
+            const queryPayload = payload_1.PayloadWrapper.parse({ schema: Queries_1.XyoBridgeConnectQuerySchema, uri });
+            const query = yield this.bindQuery([queryPayload.body], queryPayload.hash);
+            yield this.module.query(query[0], query[1]);
             return true;
         });
     }
     disconnect(uri) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const query = { schema: Queries_1.XyoBridgeDisconnectQuerySchema, uri };
-            const bw = (yield this.bindPayloads([query]))[0];
-            yield this.module.query(bw, query);
+            const queryPayload = payload_1.PayloadWrapper.parse({ schema: Queries_1.XyoBridgeDisconnectQuerySchema, uri });
+            const query = yield this.bindQuery([queryPayload.body], queryPayload.hash);
+            yield this.module.query(query[0], query[1]);
             return true;
         });
     }

package/dist/cjs/XyoBridgeWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoBridgeWrapper.js","sourceRoot":"","sources":["../../src/XyoBridgeWrapper.ts"],"names":[],"mappings":";;;;AAAA,gDAAsD;AAGtD,uCAAuG;AAEvG,MAAa,gBAAiB,SAAQ,yBAAgB;IAC9C,OAAO,CAAC,GAAY;;YACxB,MAAM,KAAK,GAAmB,EAAE,MAAM,EAAE,qCAA2B,EAAE,GAAG,EAAE,CAAA;YAC1E,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAChD,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;YAClC,OAAO,IAAI,CAAA;QACb,CAAC;KAAA;IAEK,UAAU,CAAC,GAAY;;YAC3B,MAAM,KAAK,GAAmB,EAAE,MAAM,EAAE,wCAA8B,EAAE,GAAG,EAAE,CAAA;YAC7E,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAChD,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;YAClC,OAAO,IAAI,CAAA;QACb,CAAC;KAAA;CACF;AAdD,4CAcC"}
+{"version":3,"file":"XyoBridgeWrapper.js","sourceRoot":"","sources":["../../src/XyoBridgeWrapper.ts"],"names":[],"mappings":";;;;AAAA,gDAAsD;AACtD,kDAAqD;AAGrD,uCAAuG;AAEvG,MAAa,gBAAiB,SAAQ,yBAAgB;IAC9C,OAAO,CAAC,GAAY;;YACxB,MAAM,YAAY,GAAG,wBAAc,CAAC,KAAK,CAAiB,EAAE,MAAM,EAAE,qCAA2B,EAAE,GAAG,EAAE,CAAC,CAAA;YACvG,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC,CAAA;YAC1E,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;YAC3C,OAAO,IAAI,CAAA;QACb,CAAC;KAAA;IAEK,UAAU,CAAC,GAAY;;YAC3B,MAAM,YAAY,GAAG,wBAAc,CAAC,KAAK,CAAiB,EAAE,MAAM,EAAE,wCAA8B,EAAE,GAAG,EAAE,CAAC,CAAA;YAC1G,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC,CAAA;YAC1E,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;YAC3C,OAAO,IAAI,CAAA;QACb,CAAC;KAAA;CACF;AAdD,4CAcC"}

package/dist/cjs/XyoHttpBridge.d.ts

@@ -1,5 +1,5 @@
 import { XyoBoundWitness } from '@xyo-network/boundwitness';
-import { XyoModule, XyoModuleQueryResult, XyoQuery } from '@xyo-network/module';
+import { ModuleQueryResult, XyoModule, XyoQuery, XyoQueryBoundWitness } from '@xyo-network/module';
 import { XyoPayloads } from '@xyo-network/payload';
 import { Promisable } from '@xyo-network/promise';
 import { AxiosRequestHeaders } from 'axios';
@@ -22,7 +22,7 @@ export declare class XyoHttpBridge extends XyoModule<XyoHttpBridgeConfig> implem
     get targetAddressString(): string;
     connect(): Promisable<boolean>;
     disconnect(): Promisable<boolean>;
-    protected forward(query: XyoQuery): Promise<[XyoBoundWitness, XyoPayloads]>;
-    query<T extends XyoQuery = XyoQuery>(bw: XyoBoundWitness, query: T): Promise<XyoModuleQueryResult>;
+    protected forward(query: XyoQuery, _payloads?: XyoPayloads): Promise<[XyoBoundWitness, XyoPayloads]>;
+    query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(query: T, payloads?: XyoPayloads): Promise<ModuleQueryResult>;
 }
 //# sourceMappingURL=XyoHttpBridge.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"XyoHttpBridge.d.ts","sourceRoot":"","sources":["../../src/XyoHttpBridge.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC/E,OAAO,EAAc,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAc,mBAAmB,EAAE,MAAM,OAAO,CAAA;AAEvD,OAAO,EAAa,sBAAsB,EAAE,MAAM,aAAa,CAAA;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAGrD,oBAAY,yBAAyB,GAAG,gCAAgC,CAAA;AACxE,eAAO,MAAM,yBAAyB,EAAE,yBAA4D,CAAA;AAEpG,oBAAY,mBAAmB,GAAG,eAAe,CAAC;IAChD,MAAM,EAAE,yBAAyB,CAAA;IACjC,OAAO,CAAC,EAAE,mBAAmB,CAAA;IAC7B,KAAK,CAAC,EAAE,sBAAsB,CAAA;CAC/B,CAAC,CAAA;AAEF,qBAAa,aAAc,SAAQ,SAAS,CAAC,mBAAmB,CAAE,YAAW,YAAY;IACvF,OAAO,CAAC,KAAK,CAAW;gBAEZ,MAAM,EAAE,mBAAmB,CAAC,mBAAmB,CAAC;IAK5D,IAAW,OAAO,WAEjB;IAED,IAAW,aAAa,uBAEvB;IAED,IAAW,mBAAmB,WAE7B;IAED,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC;IAI9B,UAAU,IAAI,UAAU,CAAC,OAAO,CAAC;cAIjB,OAAO,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IAalE,KAAK,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAAE,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAsBlH"}
+{"version":3,"file":"XyoHttpBridge.d.ts","sourceRoot":"","sources":["../../src/XyoHttpBridge.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,iBAAiB,EAA4B,SAAS,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC5H,OAAO,EAAc,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAc,mBAAmB,EAAE,MAAM,OAAO,CAAA;AAEvD,OAAO,EAAa,sBAAsB,EAAE,MAAM,aAAa,CAAA;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAGrD,oBAAY,yBAAyB,GAAG,gCAAgC,CAAA;AACxE,eAAO,MAAM,yBAAyB,EAAE,yBAA4D,CAAA;AAEpG,oBAAY,mBAAmB,GAAG,eAAe,CAAC;IAChD,MAAM,EAAE,yBAAyB,CAAA;IACjC,OAAO,CAAC,EAAE,mBAAmB,CAAA;IAC7B,KAAK,CAAC,EAAE,sBAAsB,CAAA;CAC/B,CAAC,CAAA;AAEF,qBAAa,aAAc,SAAQ,SAAS,CAAC,mBAAmB,CAAE,YAAW,YAAY;IACvF,OAAO,CAAC,KAAK,CAAW;gBAEZ,MAAM,EAAE,mBAAmB,CAAC,mBAAmB,CAAC;IAK5D,IAAW,OAAO,WAEjB;IAED,IAAW,aAAa,uBAEvB;IAED,IAAW,mBAAmB,WAE7B;IAED,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC;IAI9B,UAAU,IAAI,UAAU,CAAC,OAAO,CAAC;cAIjB,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IAa3F,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAwB1I"}

package/dist/cjs/XyoHttpBridge.js

@@ -32,10 +32,10 @@ class XyoHttpBridge extends module_1.XyoModule {
     disconnect() {
         return true;
     }
-    forward(query) {
+    forward(query, _payloads) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
-                const boundQuery = this.bindPayloads([query]);
+                const boundQuery = this.bindQuery([query]);
                 const result = yield this.axios.post(`${this.nodeUri}/${this.address}`, [boundQuery, ...[query]]);
                 return result.data;
             }
@@ -47,16 +47,18 @@ class XyoHttpBridge extends module_1.XyoModule {
             }
         });
     }
-    query(bw, query) {
+    query(query, payloads) {
         const _super = Object.create(null, {
             queries: { get: () => super.queries },
             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 payloads = [];
-            switch (query.schema) {
+            const resultPayloads = [];
+            switch (typedQuery.schema) {
                 case Queries_1.XyoBridgeConnectQuerySchema: {
                     yield this.connect();
                     break;
@@ -66,14 +68,14 @@ class XyoHttpBridge extends module_1.XyoModule {
                     break;
                 }
                 default:
-                    if (_super.queries.call(this).find((schema) => schema === query.schema)) {
-                        return _super.query.call(this, bw, query);
+                    if (_super.queries.call(this).find((schema) => schema === typedQuery.schema)) {
+                        return _super.query.call(this, query, payloads);
                     }
                     else {
-                        return this.forward(query);
+                        return this.forward(query, payloads);
                     }
             }
-            return this.bindPayloads(payloads, queryAccount);
+            return this.bindResult(resultPayloads, queryAccount);
         });
     }
 }

package/dist/cjs/XyoHttpBridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoHttpBridge.js","sourceRoot":"","sources":["../../src/XyoHttpBridge.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,kDAAiD;AAEjD,gDAA+E;AAK/E,2CAA+D;AAI/D,uCAAuF;AAG1E,QAAA,yBAAyB,GAA8B,gCAAgC,CAAA;AAQpG,MAAa,aAAc,SAAQ,kBAA8B;IAG/D,YAAY,MAAgD;;QAC1D,KAAK,iBAAG,MAAM,EAAE,iCAAyB,IAAK,MAAM,EAAG,CAAA;QACvD,IAAI,CAAC,KAAK,GAAG,IAAI,qBAAS,CAAC,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,CAAA;IAChD,CAAC;IAED,IAAW,OAAO;;QAChB,OAAO,IAAA,iBAAQ,EAAC,MAAA,IAAI,CAAC,MAAM,0CAAE,OAAO,EAAE,iBAAiB,CAAC,CAAA;IAC1D,CAAC;IAED,IAAW,aAAa;;QACtB,OAAO,MAAA,IAAI,CAAC,MAAM,0CAAE,aAAa,CAAA;IACnC,CAAC;IAED,IAAW,mBAAmB;;QAC5B,OAAO,MAAA,IAAI,CAAC,aAAa,mCAAI,EAAE,CAAA;IACjC,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAA;IACb,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAA;IACb,CAAC;IAEe,OAAO,CAAC,KAAe;;YACrC,IAAI;gBACF,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA;gBAC7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAiC,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBACjI,OAAO,MAAM,CAAC,IAAI,CAAA;aACnB;YAAC,OAAO,EAAE,EAAE;gBACX,MAAM,KAAK,GAAG,EAAgB,CAAA;gBAC9B,OAAO,CAAC,GAAG,CAAC,iBAAiB,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;gBAC5C,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;gBACnE,MAAM,KAAK,CAAA;aACZ;QACH,CAAC;KAAA;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;YACpD,MAAM,YAAY,GAAG,IAAI,oBAAU,EAAE,CAAA;YACrC,MAAM,QAAQ,GAA0B,EAAE,CAAA;YAC1C,QAAQ,KAAK,CAAC,MAAM,EAAE;gBACpB,KAAK,qCAA2B,CAAC,CAAC;oBAChC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;oBACpB,MAAK;iBACN;gBACD,KAAK,wCAA8B,CAAC,CAAC;oBACnC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;oBACvB,MAAK;iBACN;gBACD;oBACE,IAAI,OAAM,OAAO,YAAG,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,CAAC,EAAE;wBAC7D,OAAO,OAAM,KAAK,YAAC,EAAE,EAAE,KAAK,EAAC;qBAC9B;yBAAM;wBACL,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;qBAC3B;aACJ;YACD,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;QAClD,CAAC;KAAA;CACF;AA/DD,sCA+DC"}
+{"version":3,"file":"XyoHttpBridge.js","sourceRoot":"","sources":["../../src/XyoHttpBridge.ts"],"names":[],"mappings":"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"}