@xyo-network/node-model 2.64.9 → 2.65.0

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":";;;AAOA,mDAAwB;AACxB,qDAA0B;AAC1B,mDAAwB;AACxB,uDAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":";;;AAQA,mDAAwB;AACxB,qDAA0B;AAC1B,mDAAwB;AACxB,uDAA4B"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAOA,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAQA,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA"}

package/dist/types/Config.d.ts

@@ -1,4 +1,4 @@
-import { ModuleConfig } from '@xyo-network/module';
+import { ModuleConfig } from '@xyo-network/module-model';
 import { Payload } from '@xyo-network/payload-model';
 export type NodeConfigSchema = 'network.xyo.node.config';
 export declare const NodeConfigSchema: NodeConfigSchema;

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

@@ -1 +1 @@
-{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,MAAM,gBAAgB,GAAG,yBAAyB,CAAA;AACxD,eAAO,MAAM,gBAAgB,EAAE,gBAA4C,CAAA;AAE3E,MAAM,MAAM,UAAU,CAAC,OAAO,SAAS,OAAO,GAAG,SAAS,GAAG,SAAS,IAAI,YAAY,CACpF;IACE,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,OAAO,SAAS,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,gBAAgB,CAAA;CACvE,GAAG,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAC5B,CAAA"}
+{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,MAAM,gBAAgB,GAAG,yBAAyB,CAAA;AACxD,eAAO,MAAM,gBAAgB,EAAE,gBAA4C,CAAA;AAE3E,MAAM,MAAM,UAAU,CAAC,OAAO,SAAS,OAAO,GAAG,SAAS,GAAG,SAAS,IAAI,YAAY,CACpF;IACE,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,OAAO,SAAS,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,gBAAgB,CAAA;CACvE,GAAG,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAC5B,CAAA"}

package/dist/types/Events/ModuleAttached.d.ts

@@ -1,4 +1,5 @@
-import { EventData, Module, ModuleEventArgs } from '@xyo-network/module';
+import { EventData } from '@xyo-network/module-events';
+import { Module, ModuleEventArgs } from '@xyo-network/module-model';
 export type ModuleAttachedEventArgs<TModule extends Module = Module> = ModuleEventArgs<TModule>;
 export interface ModuleAttachedEventData extends EventData {
     moduleAttached: ModuleAttachedEventArgs;

package/dist/types/Events/ModuleAttached.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModuleAttached.d.ts","sourceRoot":"","sources":["../../../src/Events/ModuleAttached.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAExE,MAAM,MAAM,uBAAuB,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,IAAI,eAAe,CAAC,OAAO,CAAC,CAAA;AAE/F,MAAM,WAAW,uBAAwB,SAAQ,SAAS;IACxD,cAAc,EAAE,uBAAuB,CAAA;CACxC"}
+{"version":3,"file":"ModuleAttached.d.ts","sourceRoot":"","sources":["../../../src/Events/ModuleAttached.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AACtD,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAEnE,MAAM,MAAM,uBAAuB,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,IAAI,eAAe,CAAC,OAAO,CAAC,CAAA;AAE/F,MAAM,WAAW,uBAAwB,SAAQ,SAAS;IACxD,cAAc,EAAE,uBAAuB,CAAA;CACxC"}

package/dist/types/Events/ModuleDetached.d.ts

@@ -1,4 +1,5 @@
-import { EventData, Module, ModuleEventArgs } from '@xyo-network/module';
+import { EventData } from '@xyo-network/module-events';
+import { Module, ModuleEventArgs } from '@xyo-network/module-model';
 export type ModuleDetachedEventArgs<TModule extends Module = Module> = ModuleEventArgs<TModule>;
 export interface ModuleDetachedEventData extends EventData {
     moduleDetached: ModuleDetachedEventArgs;

package/dist/types/Events/ModuleDetached.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModuleDetached.d.ts","sourceRoot":"","sources":["../../../src/Events/ModuleDetached.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAExE,MAAM,MAAM,uBAAuB,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,IAAI,eAAe,CAAC,OAAO,CAAC,CAAA;AAE/F,MAAM,WAAW,uBAAwB,SAAQ,SAAS;IACxD,cAAc,EAAE,uBAAuB,CAAA;CACxC"}
+{"version":3,"file":"ModuleDetached.d.ts","sourceRoot":"","sources":["../../../src/Events/ModuleDetached.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AACtD,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAEnE,MAAM,MAAM,uBAAuB,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,IAAI,eAAe,CAAC,OAAO,CAAC,CAAA;AAE/F,MAAM,WAAW,uBAAwB,SAAQ,SAAS;IACxD,cAAc,EAAE,uBAAuB,CAAA;CACxC"}

package/dist/types/Events/ModuleRegistered.d.ts

@@ -1,4 +1,5 @@
-import { EventData, Module, ModuleEventArgs } from '@xyo-network/module';
+import { EventData } from '@xyo-network/module-events';
+import { Module, ModuleEventArgs } from '@xyo-network/module-model';
 export type ModuleRegisteredEventArgs<TModule extends Module = Module> = ModuleEventArgs<TModule>;
 export interface ModuleRegisteredEventData extends EventData {
     moduleRegistered: ModuleRegisteredEventArgs;

package/dist/types/Events/ModuleRegistered.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModuleRegistered.d.ts","sourceRoot":"","sources":["../../../src/Events/ModuleRegistered.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAExE,MAAM,MAAM,yBAAyB,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,IAAI,eAAe,CAAC,OAAO,CAAC,CAAA;AAEjG,MAAM,WAAW,yBAA0B,SAAQ,SAAS;IAC1D,gBAAgB,EAAE,yBAAyB,CAAA;CAC5C"}
+{"version":3,"file":"ModuleRegistered.d.ts","sourceRoot":"","sources":["../../../src/Events/ModuleRegistered.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AACtD,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAEnE,MAAM,MAAM,yBAAyB,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,IAAI,eAAe,CAAC,OAAO,CAAC,CAAA;AAEjG,MAAM,WAAW,yBAA0B,SAAQ,SAAS;IAC1D,gBAAgB,EAAE,yBAAyB,CAAA;CAC5C"}

package/dist/types/Events/ModuleUnregistered.d.ts

@@ -1,4 +1,5 @@
-import { EventData, Module, ModuleEventArgs } from '@xyo-network/module';
+import { EventData } from '@xyo-network/module-events';
+import { Module, ModuleEventArgs } from '@xyo-network/module-model';
 export type ModuleUnregisteredEventArgs<TModule extends Module = Module> = ModuleEventArgs<TModule>;
 export interface ModuleUnregisteredEventData extends EventData {
     moduleUnregistered: ModuleUnregisteredEventArgs;

package/dist/types/Events/ModuleUnregistered.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModuleUnregistered.d.ts","sourceRoot":"","sources":["../../../src/Events/ModuleUnregistered.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAExE,MAAM,MAAM,2BAA2B,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,IAAI,eAAe,CAAC,OAAO,CAAC,CAAA;AAEnG,MAAM,WAAW,2BAA4B,SAAQ,SAAS;IAC5D,kBAAkB,EAAE,2BAA2B,CAAA;CAChD"}
+{"version":3,"file":"ModuleUnregistered.d.ts","sourceRoot":"","sources":["../../../src/Events/ModuleUnregistered.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AACtD,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAEnE,MAAM,MAAM,2BAA2B,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,IAAI,eAAe,CAAC,OAAO,CAAC,CAAA;AAEnG,MAAM,WAAW,2BAA4B,SAAQ,SAAS;IAC5D,kBAAkB,EAAE,2BAA2B,CAAA;CAChD"}

package/dist/types/Node.d.ts

@@ -1,21 +1,21 @@
 import { AnyObject } from '@xyo-network/core';
-import { AnyConfigSchema, Module, ModuleEventData, ModuleFilter, ModuleInstance, ModuleParams } from '@xyo-network/module-model';
+import { AnyConfigSchema, DirectModule, IndirectModule, Module, ModuleEventData, ModuleParams } from '@xyo-network/module-model';
 import { Promisable } from '@xyo-network/promise';
 import { NodeConfig } from './Config';
 import { ModuleAttachedEventData, ModuleDetachedEventData, ModuleRegisteredEventData, ModuleUnregisteredEventData } from './Events';
-export interface NodeInstance {
+export interface NodeQueryFunctions {
     attach(nameOrAddress: string, external?: boolean): Promisable<string | undefined>;
     attached(): Promisable<string[]>;
     detach(nameOrAddress: string): Promisable<string | undefined>;
     registered(): Promisable<string[]>;
-    resolve<TModule extends Module = Module>(filter?: ModuleFilter): Promise<TModule[]>;
-    resolve<TModule extends Module = Module>(nameOrAddress: string): Promise<TModule | undefined>;
-    resolve<TModule extends Module = Module>(nameOrAddressOrFilter?: ModuleFilter | string): Promise<TModule | TModule[] | undefined>;
 }
-/** @deprecated use NodeInstance instead */
-export type Node = NodeInstance;
 export interface NodeModuleEventData extends ModuleAttachedEventData, ModuleDetachedEventData, ModuleRegisteredEventData, ModuleUnregisteredEventData, ModuleEventData {
 }
 export type NodeModuleParams<TConfig extends AnyConfigSchema<NodeConfig> = AnyConfigSchema<NodeConfig>, TAdditionalParams extends AnyObject | undefined = undefined> = ModuleParams<TConfig, TAdditionalParams>;
-export type NodeModule<TParams extends NodeModuleParams = NodeModuleParams, TEventData extends NodeModuleEventData = NodeModuleEventData> = NodeInstance & ModuleInstance<TParams, TEventData>;
+export type IndirectNodeModule<TParams extends ModuleParams<AnyConfigSchema<NodeConfig>> = ModuleParams<AnyConfigSchema<NodeConfig>>, TEventData extends ModuleEventData = ModuleEventData> = IndirectModule<TParams, TEventData>;
+export type DirectNodeModule<TParams extends ModuleParams<AnyConfigSchema<NodeConfig>> = ModuleParams<AnyConfigSchema<NodeConfig>>, TEventData extends ModuleEventData = ModuleEventData> = IndirectNodeModule<TParams, TEventData> & NodeQueryFunctions & DirectModule & {
+    register: (module: Module) => void;
+};
+export type NodeModule<TParams extends ModuleParams<AnyConfigSchema<NodeConfig>> = ModuleParams<AnyConfigSchema<NodeConfig>>, TEventData extends NodeModuleEventData = NodeModuleEventData> = IndirectNodeModule<TParams, TEventData> | DirectNodeModule<TParams, TEventData>;
+export type NodeInstance<TParams extends ModuleParams<AnyConfigSchema<NodeConfig>> = ModuleParams<AnyConfigSchema<NodeConfig>>, TEventData extends NodeModuleEventData = NodeModuleEventData> = DirectNodeModule<TParams, TEventData>;
 //# sourceMappingURL=Node.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Node.d.ts","sourceRoot":"","sources":["../../src/Node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAChI,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,yBAAyB,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AAEnI,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IACjF,QAAQ,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC,CAAA;IAChC,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAC7D,UAAU,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC,CAAA;IAElC,OAAO,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IACnF,OAAO,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAA;IAC7F,OAAO,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,EAAE,qBAAqB,CAAC,EAAE,YAAY,GAAG,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,OAAO,EAAE,GAAG,SAAS,CAAC,CAAA;CAClI;AAED,2CAA2C;AAC3C,MAAM,MAAM,IAAI,GAAG,YAAY,CAAA;AAE/B,MAAM,WAAW,mBACf,SAAQ,uBAAuB,EAC7B,uBAAuB,EACvB,yBAAyB,EACzB,2BAA2B,EAC3B,eAAe;CAAG;AAEtB,MAAM,MAAM,gBAAgB,CAC1B,OAAO,SAAS,eAAe,CAAC,UAAU,CAAC,GAAG,eAAe,CAAC,UAAU,CAAC,EACzE,iBAAiB,SAAS,SAAS,GAAG,SAAS,GAAG,SAAS,IACzD,YAAY,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;AAE5C,MAAM,MAAM,UAAU,CACpB,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EACnD,UAAU,SAAS,mBAAmB,GAAG,mBAAmB,IAC1D,YAAY,GAAG,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA"}
+{"version":3,"file":"Node.d.ts","sourceRoot":"","sources":["../../src/Node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAChI,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,yBAAyB,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AAEnI,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IACjF,QAAQ,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC,CAAA;IAChC,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAC7D,UAAU,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC,CAAA;CACnC;AAED,MAAM,WAAW,mBACf,SAAQ,uBAAuB,EAC7B,uBAAuB,EACvB,yBAAyB,EACzB,2BAA2B,EAC3B,eAAe;CAAG;AAEtB,MAAM,MAAM,gBAAgB,CAC1B,OAAO,SAAS,eAAe,CAAC,UAAU,CAAC,GAAG,eAAe,CAAC,UAAU,CAAC,EACzE,iBAAiB,SAAS,SAAS,GAAG,SAAS,GAAG,SAAS,IACzD,YAAY,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;AAE5C,MAAM,MAAM,kBAAkB,CAC5B,OAAO,SAAS,YAAY,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,GAAG,YAAY,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,EACrG,UAAU,SAAS,eAAe,GAAG,eAAe,IAClD,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;AAEvC,MAAM,MAAM,gBAAgB,CAC1B,OAAO,SAAS,YAAY,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,GAAG,YAAY,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,EACrG,UAAU,SAAS,eAAe,GAAG,eAAe,IAClD,kBAAkB,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,kBAAkB,GAAG,YAAY,GAAG;IAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;CAAE,CAAA;AAExH,MAAM,MAAM,UAAU,CACpB,OAAO,SAAS,YAAY,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,GAAG,YAAY,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,EACrG,UAAU,SAAS,mBAAmB,GAAG,mBAAmB,IAC1D,kBAAkB,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;AAEnF,MAAM,MAAM,YAAY,CACtB,OAAO,SAAS,YAAY,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,GAAG,YAAY,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,EACrG,UAAU,SAAS,mBAAmB,GAAG,mBAAmB,IAC1D,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA"}

package/dist/types/Queries/Attach.d.ts

@@ -1,4 +1,4 @@
-import { Query } from '@xyo-network/module-model';
+import { Query } from '@xyo-network/payload-model';
 export type NodeAttachQuerySchema = 'network.xyo.query.node.attach';
 export declare const NodeAttachQuerySchema: NodeAttachQuerySchema;
 export type NodeAttachQuery = Query<{

package/dist/types/Queries/Attach.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Attach.d.ts","sourceRoot":"","sources":["../../../src/Queries/Attach.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAA;AAEjD,MAAM,MAAM,qBAAqB,GAAG,+BAA+B,CAAA;AACnE,eAAO,MAAM,qBAAqB,EAAE,qBAAuD,CAAA;AAE3F,MAAM,MAAM,eAAe,GAAG,KAAK,CAAC;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,aAAa,EAAE,MAAM,CAAA;IACrB,MAAM,EAAE,qBAAqB,CAAA;CAC9B,CAAC,CAAA"}
+{"version":3,"file":"Attach.d.ts","sourceRoot":"","sources":["../../../src/Queries/Attach.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAElD,MAAM,MAAM,qBAAqB,GAAG,+BAA+B,CAAA;AACnE,eAAO,MAAM,qBAAqB,EAAE,qBAAuD,CAAA;AAE3F,MAAM,MAAM,eAAe,GAAG,KAAK,CAAC;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,aAAa,EAAE,MAAM,CAAA;IACrB,MAAM,EAAE,qBAAqB,CAAA;CAC9B,CAAC,CAAA"}

package/dist/types/Queries/Attached.d.ts

@@ -1,4 +1,4 @@
-import { Query } from '@xyo-network/module-model';
+import { Query } from '@xyo-network/payload-model';
 export type NodeAttachedQuerySchema = 'network.xyo.query.node.attached';
 export declare const NodeAttachedQuerySchema: NodeAttachedQuerySchema;
 export type NodeAttachedQuery = Query<{

package/dist/types/Queries/Attached.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Attached.d.ts","sourceRoot":"","sources":["../../../src/Queries/Attached.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAA;AAEjD,MAAM,MAAM,uBAAuB,GAAG,iCAAiC,CAAA;AACvE,eAAO,MAAM,uBAAuB,EAAE,uBAA2D,CAAA;AAEjG,MAAM,MAAM,iBAAiB,GAAG,KAAK,CAAC;IACpC,MAAM,EAAE,uBAAuB,CAAA;CAChC,CAAC,CAAA"}
+{"version":3,"file":"Attached.d.ts","sourceRoot":"","sources":["../../../src/Queries/Attached.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAElD,MAAM,MAAM,uBAAuB,GAAG,iCAAiC,CAAA;AACvE,eAAO,MAAM,uBAAuB,EAAE,uBAA2D,CAAA;AAEjG,MAAM,MAAM,iBAAiB,GAAG,KAAK,CAAC;IACpC,MAAM,EAAE,uBAAuB,CAAA;CAChC,CAAC,CAAA"}

package/dist/types/Queries/Detach.d.ts

@@ -1,4 +1,4 @@
-import { Query } from '@xyo-network/module-model';
+import { Query } from '@xyo-network/payload-model';
 export type NodeDetachQuerySchema = 'network.xyo.query.node.detach';
 export declare const NodeDetachQuerySchema: NodeDetachQuerySchema;
 export type NodeDetachQuery = Query<{

package/dist/types/Queries/Detach.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Detach.d.ts","sourceRoot":"","sources":["../../../src/Queries/Detach.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAA;AAEjD,MAAM,MAAM,qBAAqB,GAAG,+BAA+B,CAAA;AACnE,eAAO,MAAM,qBAAqB,EAAE,qBAAuD,CAAA;AAE3F,MAAM,MAAM,eAAe,GAAG,KAAK,CAAC;IAClC,aAAa,EAAE,MAAM,CAAA;IACrB,MAAM,EAAE,qBAAqB,CAAA;CAC9B,CAAC,CAAA"}
+{"version":3,"file":"Detach.d.ts","sourceRoot":"","sources":["../../../src/Queries/Detach.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAElD,MAAM,MAAM,qBAAqB,GAAG,+BAA+B,CAAA;AACnE,eAAO,MAAM,qBAAqB,EAAE,qBAAuD,CAAA;AAE3F,MAAM,MAAM,eAAe,GAAG,KAAK,CAAC;IAClC,aAAa,EAAE,MAAM,CAAA;IACrB,MAAM,EAAE,qBAAqB,CAAA;CAC9B,CAAC,CAAA"}

package/dist/types/Queries/Registered.d.ts

@@ -1,4 +1,4 @@
-import { Query } from '@xyo-network/module-model';
+import { Query } from '@xyo-network/payload-model';
 export type NodeRegisteredQuerySchema = 'network.xyo.query.node.registered';
 export declare const NodeRegisteredQuerySchema: NodeRegisteredQuerySchema;
 export type NodeRegisteredQuery = Query<{

package/dist/types/Queries/Registered.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Registered.d.ts","sourceRoot":"","sources":["../../../src/Queries/Registered.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAA;AAEjD,MAAM,MAAM,yBAAyB,GAAG,mCAAmC,CAAA;AAC3E,eAAO,MAAM,yBAAyB,EAAE,yBAA+D,CAAA;AAEvG,MAAM,MAAM,mBAAmB,GAAG,KAAK,CAAC;IACtC,MAAM,EAAE,yBAAyB,CAAA;CAClC,CAAC,CAAA"}
+{"version":3,"file":"Registered.d.ts","sourceRoot":"","sources":["../../../src/Queries/Registered.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAElD,MAAM,MAAM,yBAAyB,GAAG,mCAAmC,CAAA;AAC3E,eAAO,MAAM,yBAAyB,EAAE,yBAA+D,CAAA;AAEvG,MAAM,MAAM,mBAAmB,GAAG,KAAK,CAAC;IACtC,MAAM,EAAE,yBAAyB,CAAA;CAClC,CAAC,CAAA"}

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

@@ -1,4 +1,5 @@
-import { ModuleQuery, ModuleQueryBase, Query } from '@xyo-network/module-model';
+import { ModuleQuery, ModuleQueryBase } from '@xyo-network/module-model';
+import { Query } from '@xyo-network/payload-model';
 import { NodeAttachQuery } from './Attach';
 import { NodeAttachedQuery } from './Attached';
 import { NodeDetachQuery } from './Detach';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAA;AAE/E,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAElD,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA;AAE5B,MAAM,MAAM,aAAa,GAAG,eAAe,GAAG,eAAe,GAAG,iBAAiB,GAAG,mBAAmB,CAAA;AACvG,MAAM,MAAM,iBAAiB,GAAG,eAAe,GAAG,aAAa,CAAA;AAC/D,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,GAAG,IAAI,IAAI,WAAW,CAAC,CAAC,SAAS,KAAK,GAAG,aAAa,GAAG,CAAC,GAAG,aAAa,CAAC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AACxE,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAElD,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA;AAE5B,MAAM,MAAM,aAAa,GAAG,eAAe,GAAG,eAAe,GAAG,iBAAiB,GAAG,mBAAmB,CAAA;AACvG,MAAM,MAAM,iBAAiB,GAAG,eAAe,GAAG,aAAa,CAAA;AAC/D,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,GAAG,IAAI,IAAI,WAAW,CAAC,CAAC,SAAS,KAAK,GAAG,aAAa,GAAG,CAAC,GAAG,aAAa,CAAC,CAAA"}

package/package.json

@@ -10,15 +10,15 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/core": "^2.64.9",
-    "@xyo-network/module": "^2.64.9",
-    "@xyo-network/module-model": "^2.64.9",
-    "@xyo-network/payload-model": "^2.64.9",
-    "@xyo-network/promise": "^2.64.9"
+    "@xyo-network/core": "^2.65.0",
+    "@xyo-network/module-events": "^2.65.0",
+    "@xyo-network/module-model": "^2.65.0",
+    "@xyo-network/payload-model": "^2.65.0",
+    "@xyo-network/promise": "^2.65.0"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^2.18.7",
-    "@xylabs/tsconfig": "^2.18.7",
+    "@xylabs/ts-scripts-yarn3": "^2.18.10",
+    "@xylabs/tsconfig": "^2.18.10",
     "typescript": "^5.1.6"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -54,5 +54,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.64.9"
+  "version": "2.65.0"
 }

package/src/Config.ts

@@ -1,4 +1,4 @@
-import { ModuleConfig } from '@xyo-network/module'
+import { ModuleConfig } from '@xyo-network/module-model'
 import { Payload } from '@xyo-network/payload-model'
 
 export type NodeConfigSchema = 'network.xyo.node.config'

package/src/Events/ModuleAttached.ts

@@ -1,4 +1,5 @@
-import { EventData, Module, ModuleEventArgs } from '@xyo-network/module'
+import { EventData } from '@xyo-network/module-events'
+import { Module, ModuleEventArgs } from '@xyo-network/module-model'
 
 export type ModuleAttachedEventArgs<TModule extends Module = Module> = ModuleEventArgs<TModule>
 

package/src/Events/ModuleDetached.ts

@@ -1,4 +1,5 @@
-import { EventData, Module, ModuleEventArgs } from '@xyo-network/module'
+import { EventData } from '@xyo-network/module-events'
+import { Module, ModuleEventArgs } from '@xyo-network/module-model'
 
 export type ModuleDetachedEventArgs<TModule extends Module = Module> = ModuleEventArgs<TModule>
 

package/src/Events/ModuleRegistered.ts

@@ -1,4 +1,5 @@
-import { EventData, Module, ModuleEventArgs } from '@xyo-network/module'
+import { EventData } from '@xyo-network/module-events'
+import { Module, ModuleEventArgs } from '@xyo-network/module-model'
 
 export type ModuleRegisteredEventArgs<TModule extends Module = Module> = ModuleEventArgs<TModule>
 

package/src/Events/ModuleUnregistered.ts

@@ -1,4 +1,5 @@
-import { EventData, Module, ModuleEventArgs } from '@xyo-network/module'
+import { EventData } from '@xyo-network/module-events'
+import { Module, ModuleEventArgs } from '@xyo-network/module-model'
 
 export type ModuleUnregisteredEventArgs<TModule extends Module = Module> = ModuleEventArgs<TModule>
 

package/src/Node.ts

@@ -1,24 +1,17 @@
 import { AnyObject } from '@xyo-network/core'
-import { AnyConfigSchema, Module, ModuleEventData, ModuleFilter, ModuleInstance, ModuleParams } from '@xyo-network/module-model'
+import { AnyConfigSchema, DirectModule, IndirectModule, Module, ModuleEventData, ModuleParams } from '@xyo-network/module-model'
 import { Promisable } from '@xyo-network/promise'
 
 import { NodeConfig } from './Config'
 import { ModuleAttachedEventData, ModuleDetachedEventData, ModuleRegisteredEventData, ModuleUnregisteredEventData } from './Events'
 
-export interface NodeInstance {
+export interface NodeQueryFunctions {
   attach(nameOrAddress: string, external?: boolean): Promisable<string | undefined>
   attached(): Promisable<string[]>
   detach(nameOrAddress: string): Promisable<string | undefined>
   registered(): Promisable<string[]>
-
-  resolve<TModule extends Module = Module>(filter?: ModuleFilter): Promise<TModule[]>
-  resolve<TModule extends Module = Module>(nameOrAddress: string): Promise<TModule | undefined>
-  resolve<TModule extends Module = Module>(nameOrAddressOrFilter?: ModuleFilter | string): Promise<TModule | TModule[] | undefined>
 }
 
-/** @deprecated use NodeInstance instead */
-export type Node = NodeInstance
-
 export interface NodeModuleEventData
   extends ModuleAttachedEventData,
     ModuleDetachedEventData,
@@ -31,7 +24,22 @@ export type NodeModuleParams<
   TAdditionalParams extends AnyObject | undefined = undefined,
 > = ModuleParams<TConfig, TAdditionalParams>
 
+export type IndirectNodeModule<
+  TParams extends ModuleParams<AnyConfigSchema<NodeConfig>> = ModuleParams<AnyConfigSchema<NodeConfig>>,
+  TEventData extends ModuleEventData = ModuleEventData,
+> = IndirectModule<TParams, TEventData>
+
+export type DirectNodeModule<
+  TParams extends ModuleParams<AnyConfigSchema<NodeConfig>> = ModuleParams<AnyConfigSchema<NodeConfig>>,
+  TEventData extends ModuleEventData = ModuleEventData,
+> = IndirectNodeModule<TParams, TEventData> & NodeQueryFunctions & DirectModule & { register: (module: Module) => void }
+
 export type NodeModule<
-  TParams extends NodeModuleParams = NodeModuleParams,
+  TParams extends ModuleParams<AnyConfigSchema<NodeConfig>> = ModuleParams<AnyConfigSchema<NodeConfig>>,
+  TEventData extends NodeModuleEventData = NodeModuleEventData,
+> = IndirectNodeModule<TParams, TEventData> | DirectNodeModule<TParams, TEventData>
+
+export type NodeInstance<
+  TParams extends ModuleParams<AnyConfigSchema<NodeConfig>> = ModuleParams<AnyConfigSchema<NodeConfig>>,
   TEventData extends NodeModuleEventData = NodeModuleEventData,
-> = NodeInstance & ModuleInstance<TParams, TEventData>
+> = DirectNodeModule<TParams, TEventData>

package/src/Queries/Attach.ts

@@ -1,4 +1,4 @@
-import { Query } from '@xyo-network/module-model'
+import { Query } from '@xyo-network/payload-model'
 
 export type NodeAttachQuerySchema = 'network.xyo.query.node.attach'
 export const NodeAttachQuerySchema: NodeAttachQuerySchema = 'network.xyo.query.node.attach'

package/src/Queries/Attached.ts

@@ -1,4 +1,4 @@
-import { Query } from '@xyo-network/module-model'
+import { Query } from '@xyo-network/payload-model'
 
 export type NodeAttachedQuerySchema = 'network.xyo.query.node.attached'
 export const NodeAttachedQuerySchema: NodeAttachedQuerySchema = 'network.xyo.query.node.attached'

package/src/Queries/Detach.ts

@@ -1,4 +1,4 @@
-import { Query } from '@xyo-network/module-model'
+import { Query } from '@xyo-network/payload-model'
 
 export type NodeDetachQuerySchema = 'network.xyo.query.node.detach'
 export const NodeDetachQuerySchema: NodeDetachQuerySchema = 'network.xyo.query.node.detach'

package/src/Queries/Registered.ts

@@ -1,4 +1,4 @@
-import { Query } from '@xyo-network/module-model'
+import { Query } from '@xyo-network/payload-model'
 
 export type NodeRegisteredQuerySchema = 'network.xyo.query.node.registered'
 export const NodeRegisteredQuerySchema: NodeRegisteredQuerySchema = 'network.xyo.query.node.registered'

package/src/Queries/index.ts

@@ -1,4 +1,5 @@
-import { ModuleQuery, ModuleQueryBase, Query } from '@xyo-network/module-model'
+import { ModuleQuery, ModuleQueryBase } from '@xyo-network/module-model'
+import { Query } from '@xyo-network/payload-model'
 
 import { NodeAttachQuery } from './Attach'
 import { NodeAttachedQuery } from './Attached'