@xyo-network/bridge-model 2.64.6 → 2.64.7

package/dist/esm/index.js

@@ -1,5 +1,6 @@
 export * from './Bridge';
 export * from './Config';
+export * from './isBridgeInstance';
 export * from './isBridgeModule';
 export * from './Queries';
 export * from './withBridgeModule';

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,kBAAkB,CAAA;AAChC,cAAc,WAAW,CAAA;AACzB,cAAc,oBAAoB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA;AAChC,cAAc,WAAW,CAAA;AACzB,cAAc,oBAAoB,CAAA"}

package/dist/esm/isBridgeInstance.js

@@ -0,0 +1,6 @@
+import { IsInstanceFactory, isModuleInstance } from '@xyo-network/module-model';
+export const isBridgeInstance = IsInstanceFactory.create({
+    connect: 'function',
+    disconnect: 'function',
+}, isModuleInstance);
+//# sourceMappingURL=isBridgeInstance.js.map

package/dist/esm/isBridgeInstance.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isBridgeInstance.js","sourceRoot":"","sources":["../../src/isBridgeInstance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAI/E,MAAM,CAAC,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,MAAM,CACtD;IACE,OAAO,EAAE,UAAU;IACnB,UAAU,EAAE,UAAU;CACvB,EACD,gBAAgB,CACjB,CAAA"}

package/dist/esm/isBridgeModule.js

@@ -1,11 +1,4 @@
-import { isModule, IsModuleFactory } from '@xyo-network/module-model';
-export const isBridgeModule = IsModuleFactory.create(isModule, [
-    'targetConfig',
-    'targetDiscover',
-    'targetDownResolver',
-    'targetQueries',
-    'targetQuery',
-    'targetQueryable',
-    'targetResolve',
-]);
+import { IsModuleFactory } from '@xyo-network/module-model';
+import { BridgeConnectQuerySchema, BridgeDisconnectQuerySchema } from './Queries';
+export const isBridgeModule = IsModuleFactory.create([BridgeConnectQuerySchema, BridgeDisconnectQuerySchema]);
 //# sourceMappingURL=isBridgeModule.js.map

package/dist/esm/isBridgeModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"isBridgeModule.js","sourceRoot":"","sources":["../../src/isBridgeModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAIrE,MAAM,CAAC,MAAM,cAAc,GAAG,eAAe,CAAC,MAAM,CAAe,QAAQ,EAAE;IAC3E,cAAc;IACd,gBAAgB;IAChB,oBAAoB;IACpB,eAAe;IACf,aAAa;IACb,iBAAiB;IACjB,eAAe;CAChB,CAAC,CAAA"}
+{"version":3,"file":"isBridgeModule.js","sourceRoot":"","sources":["../../src/isBridgeModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAG3D,OAAO,EAAE,wBAAwB,EAAE,2BAA2B,EAAE,MAAM,WAAW,CAAA;AAEjF,MAAM,CAAC,MAAM,cAAc,GAAG,eAAe,CAAC,MAAM,CAAe,CAAC,wBAAwB,EAAE,2BAA2B,CAAC,CAAC,CAAA"}

package/dist/esm/withBridgeModule.js

@@ -1,4 +1,6 @@
-import { WithModuleFactory } from '@xyo-network/module-model';
+import { WithFactory } from '@xyo-network/module-model';
+import { isBridgeInstance } from './isBridgeInstance';
 import { isBridgeModule } from './isBridgeModule';
-export const withBridgeModule = WithModuleFactory.create(isBridgeModule);
+export const withBridgeModule = WithFactory.create(isBridgeModule);
+export const withBridgeInstance = WithFactory.create(isBridgeInstance);
 //# sourceMappingURL=withBridgeModule.js.map

package/dist/esm/withBridgeModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"withBridgeModule.js","sourceRoot":"","sources":["../../src/withBridgeModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAE7D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,MAAM,CAAC,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA"}
+{"version":3,"file":"withBridgeModule.js","sourceRoot":"","sources":["../../src/withBridgeModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAEvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,MAAM,CAAC,MAAM,gBAAgB,GAAG,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;AAClE,MAAM,CAAC,MAAM,kBAAkB,GAAG,WAAW,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA"}

package/dist/types/Bridge.d.ts

@@ -1,13 +1,15 @@
-import { AnyConfigSchema, Module, ModuleConfig, ModuleEventData, ModuleFilter, ModuleParams, ModuleQueryResult, Query, QueryBoundWitness } from '@xyo-network/module-model';
+import { AnyConfigSchema, Module, ModuleConfig, ModuleEventData, ModuleFilter, ModuleInstance, ModuleParams, ModuleQueryResult, Query, QueryBoundWitness } from '@xyo-network/module-model';
 import { Payload } from '@xyo-network/payload-model';
 import { Promisable } from '@xyo-network/promise';
 import { BridgeConfig } from './Config';
-export interface Bridge {
+export interface BridgeInstance {
     connect: () => Promisable<boolean>;
     disconnect: () => Promisable<boolean>;
 }
+/** @deprecated use BridgeInstance instead */
+export type Bridge = BridgeInstance;
 export type BridgeParams<TConfig extends AnyConfigSchema<BridgeConfig> = AnyConfigSchema<BridgeConfig>> = ModuleParams<TConfig>;
-export interface BridgeModule<TParams extends BridgeParams = BridgeParams, TEventData extends ModuleEventData = ModuleEventData, TModule extends Module<ModuleParams, TEventData> = Module<ModuleParams, TEventData>> extends Bridge, Module<TParams, TEventData> {
+export interface BridgeModule<TParams extends BridgeParams = BridgeParams, TEventData extends ModuleEventData = ModuleEventData, TModule extends ModuleInstance<ModuleParams, TEventData> = Module<ModuleParams, TEventData>> extends BridgeInstance, ModuleInstance<TParams, TEventData> {
     targetConfig(address: string): ModuleConfig;
     targetDiscover(address?: string): Promisable<Payload[] | undefined>;
     targetDownResolver(address?: string): TModule['downResolver'];

package/dist/types/Bridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Bridge.d.ts","sourceRoot":"","sources":["../../src/Bridge.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,MAAM,EACN,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,iBAAiB,EACjB,KAAK,EACL,iBAAiB,EAClB,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAEvC,MAAM,WAAW,MAAM;IACrB,OAAO,EAAE,MAAM,UAAU,CAAC,OAAO,CAAC,CAAA;IAClC,UAAU,EAAE,MAAM,UAAU,CAAC,OAAO,CAAC,CAAA;CACtC;AAED,MAAM,MAAM,YAAY,CAAC,OAAO,SAAS,eAAe,CAAC,YAAY,CAAC,GAAG,eAAe,CAAC,YAAY,CAAC,IAAI,YAAY,CAAC,OAAO,CAAC,CAAA;AAE/H,MAAM,WAAW,YAAY,CAC3B,OAAO,SAAS,YAAY,GAAG,YAAY,EAC3C,UAAU,SAAS,eAAe,GAAG,eAAe,EACpD,OAAO,SAAS,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,GAAG,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,CACnF,SAAQ,MAAM,EACZ,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC;IAC7B,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAAA;IAC3C,cAAc,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,CAAA;IACnE,kBAAkB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7D,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACxC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAAA;IAC3G,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,WAAW,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC,OAAO,CAAC,CAAA;IACjI,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC,CAAA;CAC7E"}
+{"version":3,"file":"Bridge.d.ts","sourceRoot":"","sources":["../../src/Bridge.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,MAAM,EACN,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,iBAAiB,EACjB,KAAK,EACL,iBAAiB,EAClB,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAEvC,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,UAAU,CAAC,OAAO,CAAC,CAAA;IAClC,UAAU,EAAE,MAAM,UAAU,CAAC,OAAO,CAAC,CAAA;CACtC;AAED,6CAA6C;AAC7C,MAAM,MAAM,MAAM,GAAG,cAAc,CAAA;AAEnC,MAAM,MAAM,YAAY,CAAC,OAAO,SAAS,eAAe,CAAC,YAAY,CAAC,GAAG,eAAe,CAAC,YAAY,CAAC,IAAI,YAAY,CAAC,OAAO,CAAC,CAAA;AAE/H,MAAM,WAAW,YAAY,CAC3B,OAAO,SAAS,YAAY,GAAG,YAAY,EAC3C,UAAU,SAAS,eAAe,GAAG,eAAe,EACpD,OAAO,SAAS,cAAc,CAAC,YAAY,EAAE,UAAU,CAAC,GAAG,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,CAC3F,SAAQ,cAAc,EACpB,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC;IACrC,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAAA;IAC3C,cAAc,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,CAAA;IACnE,kBAAkB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7D,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACxC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAAA;IAC3G,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,WAAW,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC,OAAO,CAAC,CAAA;IACjI,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC,CAAA;CAC7E"}

package/dist/types/index.d.ts

@@ -1,5 +1,6 @@
 export * from './Bridge';
 export * from './Config';
+export * from './isBridgeInstance';
 export * from './isBridgeModule';
 export * from './Queries';
 export * from './withBridgeModule';

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,kBAAkB,CAAA;AAChC,cAAc,WAAW,CAAA;AACzB,cAAc,oBAAoB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA;AAChC,cAAc,WAAW,CAAA;AACzB,cAAc,oBAAoB,CAAA"}

package/dist/types/isBridgeInstance.d.ts

@@ -0,0 +1,3 @@
+import { BridgeInstance } from './Bridge';
+export declare const isBridgeInstance: import("@xyo-network/module-model").InstanceTypeCheck<BridgeInstance>;
+//# sourceMappingURL=isBridgeInstance.d.ts.map

package/dist/types/isBridgeInstance.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isBridgeInstance.d.ts","sourceRoot":"","sources":["../../src/isBridgeInstance.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAEzC,eAAO,MAAM,gBAAgB,uEAM5B,CAAA"}

package/dist/types/isBridgeModule.d.ts

@@ -28,7 +28,11 @@ export declare const isBridgeModule: import("@xyo-network/module-model").ModuleT
 } & Omit<{
     discoverCache?: true | import("./Config").CacheConfig | undefined;
     schema: "network.xyo.bridge.config";
-}, "schema">, "schema"> & {
+}, "schema"> & {
+    schema: "network.xyo.bridge.config";
+}, "schema"> & {
+    schema: string;
+}, "schema"> & {
     schema: string;
-}, "schema">>, import("@xyo-network/module-model").ModuleEventData, import("@xyo-network/module-model").Module<import("@xyo-network/module-model").ModuleParams, import("@xyo-network/module-model").ModuleEventData>>>;
+}>, import("@xyo-network/module-model").ModuleEventData, import("@xyo-network/module-model").Module<import("@xyo-network/module-model").ModuleParams, import("@xyo-network/module-model").ModuleEventData>>>;
 //# sourceMappingURL=isBridgeModule.d.ts.map

package/dist/types/isBridgeModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isBridgeModule.d.ts","sourceRoot":"","sources":["../../src/isBridgeModule.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAEvC,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uNAQzB,CAAA"}
+{"version":3,"file":"isBridgeModule.d.ts","sourceRoot":"","sources":["../../src/isBridgeModule.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAGvC,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4MAAgG,CAAA"}

package/dist/types/withBridgeModule.d.ts

@@ -1,2 +1,38 @@
-export declare const withBridgeModule: <R extends void = void>(module: any, closure: (module: any) => R) => R | undefined;
+export declare const withBridgeModule: <R extends void = void>(module: any, closure: (module: import("./Bridge").BridgeModule<import("./Bridge").BridgeParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+    readonly archivist?: import("@xyo-network/module-model").ArchivistModuleConfig | undefined;
+    readonly name?: string | undefined;
+    readonly paging?: Record<string, {
+        size?: number | undefined;
+    }> | undefined;
+    readonly schema: string;
+    readonly security?: {
+        readonly allowAnonymous?: boolean | undefined;
+        readonly allowed?: Record<string, (string | import("@xyo-network/module-model").CosigningAddressSet)[]> | undefined;
+        readonly disallowed?: Record<string, string[]> | undefined;
+    } | undefined;
+    readonly storeQueries?: boolean | undefined;
+} & Omit<Omit<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+    readonly archivist?: import("@xyo-network/module-model").ArchivistModuleConfig | undefined;
+    readonly name?: string | undefined;
+    readonly paging?: Record<string, {
+        size?: number | undefined;
+    }> | undefined;
+    readonly schema: "network.xyo.bridge.config";
+    readonly security?: {
+        readonly allowAnonymous?: boolean | undefined;
+        readonly allowed?: Record<string, (string | import("@xyo-network/module-model").CosigningAddressSet)[]> | undefined;
+        readonly disallowed?: Record<string, string[]> | undefined;
+    } | undefined;
+    readonly storeQueries?: boolean | undefined;
+} & Omit<{
+    discoverCache?: true | import("./Config").CacheConfig | undefined;
+    schema: "network.xyo.bridge.config";
+}, "schema"> & {
+    schema: "network.xyo.bridge.config";
+}, "schema"> & {
+    schema: string;
+}, "schema"> & {
+    schema: string;
+}>, import("@xyo-network/module-model").ModuleEventData, import("@xyo-network/module-model").Module<import("@xyo-network/module-model").ModuleParams, import("@xyo-network/module-model").ModuleEventData>>) => R) => R | undefined;
+export declare const withBridgeInstance: <R extends void = void>(module: any, closure: (module: import("./Bridge").BridgeInstance) => R) => R | undefined;
 //# sourceMappingURL=withBridgeModule.d.ts.map

package/dist/types/withBridgeModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withBridgeModule.d.ts","sourceRoot":"","sources":["../../src/withBridgeModule.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,gBAAgB,oFAA2C,CAAA"}
+{"version":3,"file":"withBridgeModule.d.ts","sourceRoot":"","sources":["../../src/withBridgeModule.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mOAAqC,CAAA;AAClE,eAAO,MAAM,kBAAkB,kHAAuC,CAAA"}

package/package.json

@@ -10,11 +10,11 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/core": "^2.64.6",
-    "@xyo-network/module": "^2.64.6",
-    "@xyo-network/module-model": "^2.64.6",
-    "@xyo-network/payload-model": "^2.64.6",
-    "@xyo-network/promise": "^2.64.6"
+    "@xyo-network/core": "^2.64.7",
+    "@xyo-network/module": "^2.64.7",
+    "@xyo-network/module-model": "^2.64.7",
+    "@xyo-network/payload-model": "^2.64.7",
+    "@xyo-network/promise": "^2.64.7"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^2.18.5",
@@ -54,5 +54,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.64.6"
+  "version": "2.64.7"
 }

package/src/Bridge.ts

@@ -4,6 +4,7 @@ import {
   ModuleConfig,
   ModuleEventData,
   ModuleFilter,
+  ModuleInstance,
   ModuleParams,
   ModuleQueryResult,
   Query,
@@ -14,19 +15,22 @@ import { Promisable } from '@xyo-network/promise'
 
 import { BridgeConfig } from './Config'
 
-export interface Bridge {
+export interface BridgeInstance {
   connect: () => Promisable<boolean>
   disconnect: () => Promisable<boolean>
 }
 
+/** @deprecated use BridgeInstance instead */
+export type Bridge = BridgeInstance
+
 export type BridgeParams<TConfig extends AnyConfigSchema<BridgeConfig> = AnyConfigSchema<BridgeConfig>> = ModuleParams<TConfig>
 
 export interface BridgeModule<
   TParams extends BridgeParams = BridgeParams,
   TEventData extends ModuleEventData = ModuleEventData,
-  TModule extends Module<ModuleParams, TEventData> = Module<ModuleParams, TEventData>,
-> extends Bridge,
-    Module<TParams, TEventData> {
+  TModule extends ModuleInstance<ModuleParams, TEventData> = Module<ModuleParams, TEventData>,
+> extends BridgeInstance,
+    ModuleInstance<TParams, TEventData> {
   targetConfig(address: string): ModuleConfig
   targetDiscover(address?: string): Promisable<Payload[] | undefined>
   targetDownResolver(address?: string): TModule['downResolver']

package/src/index.ts

@@ -1,5 +1,6 @@
 export * from './Bridge'
 export * from './Config'
+export * from './isBridgeInstance'
 export * from './isBridgeModule'
 export * from './Queries'
 export * from './withBridgeModule'

package/src/isBridgeInstance.ts

@@ -0,0 +1,11 @@
+import { IsInstanceFactory, isModuleInstance } from '@xyo-network/module-model'
+
+import { BridgeInstance } from './Bridge'
+
+export const isBridgeInstance = IsInstanceFactory.create<BridgeInstance>(
+  {
+    connect: 'function',
+    disconnect: 'function',
+  },
+  isModuleInstance,
+)

package/src/isBridgeModule.ts

@@ -1,13 +1,6 @@
-import { isModule, IsModuleFactory } from '@xyo-network/module-model'
+import { IsModuleFactory } from '@xyo-network/module-model'
 
 import { BridgeModule } from './Bridge'
+import { BridgeConnectQuerySchema, BridgeDisconnectQuerySchema } from './Queries'
 
-export const isBridgeModule = IsModuleFactory.create<BridgeModule>(isModule, [
-  'targetConfig',
-  'targetDiscover',
-  'targetDownResolver',
-  'targetQueries',
-  'targetQuery',
-  'targetQueryable',
-  'targetResolve',
-])
+export const isBridgeModule = IsModuleFactory.create<BridgeModule>([BridgeConnectQuerySchema, BridgeDisconnectQuerySchema])

package/src/withBridgeModule.ts

@@ -1,5 +1,7 @@
-import { WithModuleFactory } from '@xyo-network/module-model'
+import { WithFactory } from '@xyo-network/module-model'
 
+import { isBridgeInstance } from './isBridgeInstance'
 import { isBridgeModule } from './isBridgeModule'
 
-export const withBridgeModule = WithModuleFactory.create(isBridgeModule)
+export const withBridgeModule = WithFactory.create(isBridgeModule)
+export const withBridgeInstance = WithFactory.create(isBridgeInstance)