@xyo-network/bridge 2.33.0-rc.13 → 2.33.0-rc.14

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

@@ -1,8 +1,10 @@
-import { XyoModuleQuery, XyoModuleQuerySchema } from '@xyo-network/module';
+import { XyoModuleQuery, XyoModuleQuerySchema, XyoQuery } from '@xyo-network/module';
 import { XyoBridgeConnectQuery, XyoBridgeConnectQuerySchema } from './Connect';
 import { XyoBridgeDisconnectQuery, XyoBridgeDisconnectQuerySchema } from './Disconnect';
 export * from './Connect';
 export * from './Disconnect';
-export declare type XyoBridgeQuery = XyoBridgeConnectQuery | XyoBridgeDisconnectQuery | XyoModuleQuery;
-export declare type XyoBridgeQuerySchema = XyoBridgeConnectQuerySchema | XyoBridgeDisconnectQuerySchema | XyoModuleQuerySchema;
+declare type XyoBridgeQueryBase = XyoBridgeConnectQuery | XyoBridgeDisconnectQuery | XyoModuleQuery;
+export declare type XyoBridgeQuery<T extends XyoQuery = XyoQuery> = T extends XyoQuery ? XyoBridgeQueryBase | T : XyoBridgeQueryBase;
+declare type XyoBridgeQuerySchemaBase = XyoBridgeConnectQuerySchema | XyoBridgeDisconnectQuerySchema | XyoModuleQuerySchema;
+export declare type XyoBridgeQuerySchema<T extends string = string> = T extends string ? XyoBridgeQuerySchemaBase | T : XyoBridgeQuerySchemaBase;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAE1E,OAAO,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,MAAM,WAAW,CAAA;AAC9E,OAAO,EAAE,wBAAwB,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAA;AAEvF,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAE5B,oBAAY,cAAc,GAAG,qBAAqB,GAAG,wBAAwB,GAAG,cAAc,CAAA;AAE9F,oBAAY,oBAAoB,GAAG,2BAA2B,GAAG,8BAA8B,GAAG,oBAAoB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAEpF,OAAO,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,MAAM,WAAW,CAAA;AAC9E,OAAO,EAAE,wBAAwB,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAA;AAEvF,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAE5B,aAAK,kBAAkB,GAAG,qBAAqB,GAAG,wBAAwB,GAAG,cAAc,CAAA;AAC3F,oBAAY,cAAc,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,IAAI,CAAC,SAAS,QAAQ,GAAG,kBAAkB,GAAG,CAAC,GAAG,kBAAkB,CAAA;AAE5H,aAAK,wBAAwB,GAAG,2BAA2B,GAAG,8BAA8B,GAAG,oBAAoB,CAAA;AACnH,oBAAY,oBAAoB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,MAAM,GAAG,wBAAwB,GAAG,CAAC,GAAG,wBAAwB,CAAA"}

package/dist/esm/XyoArchivistHttpBridge.d.ts

@@ -0,0 +1,6 @@
+import { XyoArchivistQuery } from '@xyo-network/archivist';
+import { XyoBridgeQuery } from './Queries';
+import { XyoHttpBridge } from './XyoHttpBridge';
+export declare class XyoArchivistHttpBridge<TQuery extends XyoBridgeQuery<XyoArchivistQuery> = XyoBridgeQuery<XyoArchivistQuery>> extends XyoHttpBridge<TQuery> {
+}
+//# sourceMappingURL=XyoArchivistHttpBridge.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"XyoArchivistHttpBridge.d.ts","sourceRoot":"","sources":["../../src/XyoArchivistHttpBridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,qBAAa,sBAAsB,CACjC,MAAM,SAAS,cAAc,CAAC,iBAAiB,CAAC,GAAG,cAAc,CAAC,iBAAiB,CAAC,CACpF,SAAQ,aAAa,CAAC,MAAM,CAAC;CAAG"}

package/dist/esm/XyoArchivistHttpBridge.js

@@ -0,0 +1,4 @@
+import { XyoHttpBridge } from './XyoHttpBridge';
+export class XyoArchivistHttpBridge extends XyoHttpBridge {
+}
+//# sourceMappingURL=XyoArchivistHttpBridge.js.map

package/dist/esm/XyoArchivistHttpBridge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"XyoArchivistHttpBridge.js","sourceRoot":"","sources":["../../src/XyoArchivistHttpBridge.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,MAAM,OAAO,sBAEX,SAAQ,aAAqB;CAAG"}

package/dist/esm/XyoBridge.d.ts

@@ -12,9 +12,12 @@ export declare abstract class XyoBridge<TConfig extends XyoBridgeConfig = XyoBri
     abstract forward(query: TQuery): Promise<[XyoBoundWitness, (XyoPayload | null)[]]>;
     query(query: TQuery): Promise<import("@xyo-network/module").XyoModuleQueryResult<{
         schema: string;
+    } & {
         previousHash?: string | undefined;
         sources?: string[] | undefined;
         timestamp?: number | undefined;
+    } & {
+        schema: string;
     }>>;
 }
 //# sourceMappingURL=XyoBridge.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"XyoBridge.d.ts","sourceRoot":"","sources":["../../src/XyoBridge.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,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;AAC1C,OAAO,EAA+D,cAAc,EAAE,MAAM,WAAW,CAAA;AAEvG,8BAAsB,SAAS,CAAC,OAAO,SAAS,eAAe,GAAG,eAAe,EAAE,MAAM,SAAS,cAAc,GAAG,cAAc,CAC/H,SAAQ,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAC7C,YAAW,YAAY,CAAC,MAAM,CAAC;IAEtB,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,MAAM,GAAG,OAAO,CAAC,CAAC,eAAe,EAAE,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;IAEnE,KAAK,CAAC,KAAK,EAAE,MAAM;;;;;;CAqBnC"}
+{"version":3,"file":"XyoBridge.d.ts","sourceRoot":"","sources":["../../src/XyoBridge.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,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;AAC1C,OAAO,EAA+D,cAAc,EAAE,MAAM,WAAW,CAAA;AAEvG,8BAAsB,SAAS,CAAC,OAAO,SAAS,eAAe,GAAG,eAAe,EAAE,MAAM,SAAS,cAAc,GAAG,cAAc,CAC/H,SAAQ,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAC7C,YAAW,YAAY,CAAC,MAAM,CAAC;IAEtB,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,MAAM,GAAG,OAAO,CAAC,CAAC,eAAe,EAAE,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;IAEnE,KAAK,CAAC,KAAK,EAAE,MAAM;;;;;;;;;CAqBnC"}

package/dist/esm/XyoHttpBridge.d.ts

@@ -26,9 +26,12 @@ export declare class XyoHttpBridge<TQuery extends XyoBridgeQuery = XyoBridgeQuer
     protected forward(query: TQuery): Promise<[XyoBoundWitness, XyoPayloads]>;
     query(query: TQuery): Promise<import("@xyo-network/module").XyoModuleQueryResult<{
         schema: string;
+    } & {
         previousHash?: string | undefined;
         sources?: string[] | undefined;
         timestamp?: number | undefined;
+    } & {
+        schema: string;
     }>>;
 }
 //# sourceMappingURL=XyoHttpBridge.d.ts.map

package/dist/esm/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,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,UAAU,EAAE,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;AACrD,OAAO,EAA+D,cAAc,EAAE,MAAM,WAAW,CAAA;AAEvG,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,aAAa,CAAC,MAAM,SAAS,cAAc,GAAG,cAAc,CACvE,SAAQ,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,mBAAmB,CACzD,YAAW,YAAY,CAAC,MAAM,CAAC;IAE/B,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,MAAM,GAAG,OAAO,CAAC,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IAehE,KAAK,CAAC,KAAK,EAAE,MAAM;;;;;;CAqBnC"}
+{"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,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,UAAU,EAAE,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;AACrD,OAAO,EAA+D,cAAc,EAAE,MAAM,WAAW,CAAA;AAEvG,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,aAAa,CAAC,MAAM,SAAS,cAAc,GAAG,cAAc,CACvE,SAAQ,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,mBAAmB,CACzD,YAAW,YAAY,CAAC,MAAM,CAAC;IAE/B,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,MAAM,GAAG,OAAO,CAAC,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IAehE,KAAK,CAAC,KAAK,EAAE,MAAM;;;;;;;;;CAqBnC"}

package/package.json

@@ -11,11 +11,12 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.6.7",
-    "@xyo-network/account": "^2.33.0-rc.13",
-    "@xyo-network/boundwitness": "^2.33.0-rc.13",
-    "@xyo-network/module": "^2.33.0-rc.13",
-    "@xyo-network/payload": "^2.33.0-rc.13",
-    "@xyo-network/promise": "^2.33.0-rc.13",
+    "@xyo-network/account": "^2.33.0-rc.14",
+    "@xyo-network/archivist": "^2.33.0-rc.14",
+    "@xyo-network/boundwitness": "^2.33.0-rc.14",
+    "@xyo-network/module": "^2.33.0-rc.14",
+    "@xyo-network/payload": "^2.33.0-rc.14",
+    "@xyo-network/promise": "^2.33.0-rc.14",
     "pako": "^2.0.4",
     "tslib": "^2.4.0"
   },
@@ -55,6 +56,6 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.33.0-rc.13",
+  "version": "2.33.0-rc.14",
   "stableVersion": "2.32.1"
 }

package/src/Queries/index.ts

@@ -1,4 +1,4 @@
-import { XyoModuleQuery, XyoModuleQuerySchema } from '@xyo-network/module'
+import { XyoModuleQuery, XyoModuleQuerySchema, XyoQuery } from '@xyo-network/module'
 
 import { XyoBridgeConnectQuery, XyoBridgeConnectQuerySchema } from './Connect'
 import { XyoBridgeDisconnectQuery, XyoBridgeDisconnectQuerySchema } from './Disconnect'
@@ -6,6 +6,8 @@ import { XyoBridgeDisconnectQuery, XyoBridgeDisconnectQuerySchema } from './Disc
 export * from './Connect'
 export * from './Disconnect'
 
-export type XyoBridgeQuery = XyoBridgeConnectQuery | XyoBridgeDisconnectQuery | XyoModuleQuery
+type XyoBridgeQueryBase = XyoBridgeConnectQuery | XyoBridgeDisconnectQuery | XyoModuleQuery
+export type XyoBridgeQuery<T extends XyoQuery = XyoQuery> = T extends XyoQuery ? XyoBridgeQueryBase | T : XyoBridgeQueryBase
 
-export type XyoBridgeQuerySchema = XyoBridgeConnectQuerySchema | XyoBridgeDisconnectQuerySchema | XyoModuleQuerySchema
+type XyoBridgeQuerySchemaBase = XyoBridgeConnectQuerySchema | XyoBridgeDisconnectQuerySchema | XyoModuleQuerySchema
+export type XyoBridgeQuerySchema<T extends string = string> = T extends string ? XyoBridgeQuerySchemaBase | T : XyoBridgeQuerySchemaBase

package/src/XyoArchivistHttpBridge.ts

@@ -0,0 +1,8 @@
+import { XyoArchivistQuery } from '@xyo-network/archivist'
+
+import { XyoBridgeQuery } from './Queries'
+import { XyoHttpBridge } from './XyoHttpBridge'
+
+export class XyoArchivistHttpBridge<
+  TQuery extends XyoBridgeQuery<XyoArchivistQuery> = XyoBridgeQuery<XyoArchivistQuery>,
+> extends XyoHttpBridge<TQuery> {}

package/src/XyoHttpBridge.spec.ts

@@ -1,13 +1,14 @@
-import { XyoArchivistWrapper } from '@xyo-network/archivist'
+import { XyoArchivistQuery, XyoArchivistWrapper } from '@xyo-network/archivist'
 import { uuid } from '@xyo-network/core'
 import { XyoPayloadWrapper } from '@xyo-network/payload'
 
+import { XyoBridgeQuery } from './Queries'
 import { XyoHttpBridge } from './XyoHttpBridge'
 
 test('XyoHttpBridge', async () => {
   const nodeUri = `${process.env.API_DOMAIN}` ?? 'https://beta.api.archivist.xyo.network'
   const targetAddress = 'temp'
-  const bridge = new XyoHttpBridge({ nodeUri, targetAddress })
+  const bridge = new XyoHttpBridge<XyoBridgeQuery<XyoArchivistQuery>>({ nodeUri, targetAddress })
   const wrapper = new XyoArchivistWrapper(bridge)
   const debugPayload = {
     nonce: uuid(),