@xyo-network/node-model 2.66.9 → 2.67.0-rc.2

package/dist/cjs/typeChecks.js

@@ -2,21 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withNodeInstance = exports.withNodeModule = exports.asNodeInstance = exports.asNodeModule = exports.isNodeModule = exports.isNodeInstance = void 0;
 const module_model_1 = require("@xyo-network/module-model");
+const object_identity_1 = require("@xyo-network/object-identity");
 const Queries_1 = require("./Queries");
-exports.isNodeInstance = module_model_1.IsInstanceFactory.create({
+const instanceFactory = new module_model_1.IsInstanceFactory();
+exports.isNodeInstance = instanceFactory.create({
     attach: 'function',
     attached: 'function',
     detach: 'function',
     registered: 'function',
-}, module_model_1.isModuleInstance);
-exports.isNodeModule = module_model_1.IsModuleFactory.create([
-    Queries_1.NodeAttachedQuerySchema,
-    Queries_1.NodeAttachQuerySchema,
-    Queries_1.NodeDetachQuerySchema,
-    Queries_1.NodeRegisteredQuerySchema,
-]);
-exports.asNodeModule = module_model_1.AsFactory.create(exports.isNodeModule);
-exports.asNodeInstance = module_model_1.AsFactory.create(exports.isNodeInstance);
+}, [module_model_1.isModuleInstance]);
+const moduleFactory = new module_model_1.IsModuleFactory();
+exports.isNodeModule = moduleFactory.create([Queries_1.NodeAttachedQuerySchema, Queries_1.NodeAttachQuerySchema, Queries_1.NodeDetachQuerySchema, Queries_1.NodeRegisteredQuerySchema]);
+exports.asNodeModule = object_identity_1.AsObjectFactory.create(exports.isNodeModule);
+exports.asNodeInstance = object_identity_1.AsObjectFactory.create(exports.isNodeInstance);
 exports.withNodeModule = module_model_1.WithFactory.create(exports.isNodeModule);
 exports.withNodeInstance = module_model_1.WithFactory.create(exports.isNodeInstance);
 //# sourceMappingURL=typeChecks.js.map

package/dist/cjs/typeChecks.js.map

@@ -1 +1 @@
-{"version":3,"file":"typeChecks.js","sourceRoot":"","sources":["../../src/typeChecks.ts"],"names":[],"mappings":";;;AAAA,4DAAwH;AAGxH,uCAA4H;AAE/G,QAAA,cAAc,GAAG,gCAAiB,CAAC,MAAM,CACpD;IACE,MAAM,EAAE,UAAU;IAClB,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,UAAU;IAClB,UAAU,EAAE,UAAU;CACvB,EACD,+BAAgB,CACjB,CAAA;AACY,QAAA,YAAY,GAAG,8BAAe,CAAC,MAAM,CAAa;IAC7D,iCAAuB;IACvB,+BAAqB;IACrB,+BAAqB;IACrB,mCAAyB;CAC1B,CAAC,CAAA;AAEW,QAAA,YAAY,GAAG,wBAAS,CAAC,MAAM,CAAC,oBAAY,CAAC,CAAA;AAC7C,QAAA,cAAc,GAAG,wBAAS,CAAC,MAAM,CAAC,sBAAc,CAAC,CAAA;AACjD,QAAA,cAAc,GAAG,0BAAW,CAAC,MAAM,CAAC,oBAAY,CAAC,CAAA;AACjD,QAAA,gBAAgB,GAAG,0BAAW,CAAC,MAAM,CAAC,sBAAc,CAAC,CAAA"}
+{"version":3,"file":"typeChecks.js","sourceRoot":"","sources":["../../src/typeChecks.ts"],"names":[],"mappings":";;;AAAA,4DAA6G;AAC7G,kEAA8D;AAG9D,uCAA4H;AAE5H,MAAM,eAAe,GAAG,IAAI,gCAAiB,EAAgB,CAAA;AAEhD,QAAA,cAAc,GAAG,eAAe,CAAC,MAAM,CAClD;IACE,MAAM,EAAE,UAAU;IAClB,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,UAAU;IAClB,UAAU,EAAE,UAAU;CACvB,EACD,CAAC,+BAAgB,CAAC,CACnB,CAAA;AAED,MAAM,aAAa,GAAG,IAAI,8BAAe,EAAc,CAAA;AAE1C,QAAA,YAAY,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,iCAAuB,EAAE,+BAAqB,EAAE,+BAAqB,EAAE,mCAAyB,CAAC,CAAC,CAAA;AAEvI,QAAA,YAAY,GAAG,iCAAe,CAAC,MAAM,CAAC,oBAAY,CAAC,CAAA;AACnD,QAAA,cAAc,GAAG,iCAAe,CAAC,MAAM,CAAC,sBAAc,CAAC,CAAA;AACvD,QAAA,cAAc,GAAG,0BAAW,CAAC,MAAM,CAAC,oBAAY,CAAC,CAAA;AACjD,QAAA,gBAAgB,GAAG,0BAAW,CAAC,MAAM,CAAC,sBAAc,CAAC,CAAA"}

package/dist/esm/typeChecks.js

@@ -1,19 +1,17 @@
-import { AsFactory, IsInstanceFactory, IsModuleFactory, isModuleInstance, WithFactory } from '@xyo-network/module-model';
+import { IsInstanceFactory, IsModuleFactory, isModuleInstance, WithFactory } from '@xyo-network/module-model';
+import { AsObjectFactory } from '@xyo-network/object-identity';
 import { NodeAttachedQuerySchema, NodeAttachQuerySchema, NodeDetachQuerySchema, NodeRegisteredQuerySchema } from './Queries';
-export const isNodeInstance = IsInstanceFactory.create({
+const instanceFactory = new IsInstanceFactory();
+export const isNodeInstance = instanceFactory.create({
     attach: 'function',
     attached: 'function',
     detach: 'function',
     registered: 'function',
-}, isModuleInstance);
-export const isNodeModule = IsModuleFactory.create([
-    NodeAttachedQuerySchema,
-    NodeAttachQuerySchema,
-    NodeDetachQuerySchema,
-    NodeRegisteredQuerySchema,
-]);
-export const asNodeModule = AsFactory.create(isNodeModule);
-export const asNodeInstance = AsFactory.create(isNodeInstance);
+}, [isModuleInstance]);
+const moduleFactory = new IsModuleFactory();
+export const isNodeModule = moduleFactory.create([NodeAttachedQuerySchema, NodeAttachQuerySchema, NodeDetachQuerySchema, NodeRegisteredQuerySchema]);
+export const asNodeModule = AsObjectFactory.create(isNodeModule);
+export const asNodeInstance = AsObjectFactory.create(isNodeInstance);
 export const withNodeModule = WithFactory.create(isNodeModule);
 export const withNodeInstance = WithFactory.create(isNodeInstance);
 //# sourceMappingURL=typeChecks.js.map

package/dist/esm/typeChecks.js.map

@@ -1 +1 @@
-{"version":3,"file":"typeChecks.js","sourceRoot":"","sources":["../../src/typeChecks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,eAAe,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAGxH,OAAO,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAA;AAE5H,MAAM,CAAC,MAAM,cAAc,GAAG,iBAAiB,CAAC,MAAM,CACpD;IACE,MAAM,EAAE,UAAU;IAClB,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,UAAU;IAClB,UAAU,EAAE,UAAU;CACvB,EACD,gBAAgB,CACjB,CAAA;AACD,MAAM,CAAC,MAAM,YAAY,GAAG,eAAe,CAAC,MAAM,CAAa;IAC7D,uBAAuB;IACvB,qBAAqB;IACrB,qBAAqB;IACrB,yBAAyB;CAC1B,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;AAC1D,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;AAC9D,MAAM,CAAC,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;AAC9D,MAAM,CAAC,MAAM,gBAAgB,GAAG,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA"}
+{"version":3,"file":"typeChecks.js","sourceRoot":"","sources":["../../src/typeChecks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC7G,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAG9D,OAAO,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAA;AAE5H,MAAM,eAAe,GAAG,IAAI,iBAAiB,EAAgB,CAAA;AAE7D,MAAM,CAAC,MAAM,cAAc,GAAG,eAAe,CAAC,MAAM,CAClD;IACE,MAAM,EAAE,UAAU;IAClB,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,UAAU;IAClB,UAAU,EAAE,UAAU;CACvB,EACD,CAAC,gBAAgB,CAAC,CACnB,CAAA;AAED,MAAM,aAAa,GAAG,IAAI,eAAe,EAAc,CAAA;AAEvD,MAAM,CAAC,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,uBAAuB,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,yBAAyB,CAAC,CAAC,CAAA;AAEpJ,MAAM,CAAC,MAAM,YAAY,GAAG,eAAe,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;AAChE,MAAM,CAAC,MAAM,cAAc,GAAG,eAAe,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;AACpE,MAAM,CAAC,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;AAC9D,MAAM,CAAC,MAAM,gBAAgB,GAAG,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA"}

package/dist/types/Node.d.ts

@@ -1,4 +1,5 @@
 import { AnyObject } from '@xyo-network/core';
+import { NodeManifestPayload } from '@xyo-network/manifest-model';
 import { AnyConfigSchema, Module, ModuleEventData, ModuleInstance, ModuleParams } from '@xyo-network/module-model';
 import { Promisable } from '@xyo-network/promise';
 import { NodeConfig } from './Config';
@@ -7,6 +8,7 @@ export interface NodeQueryFunctions {
     attach(nameOrAddress: string, external?: boolean): Promisable<string | undefined>;
     attached(): Promisable<string[]>;
     detach(nameOrAddress: string): Promisable<string | undefined>;
+    manifest(): Promise<NodeManifestPayload>;
     registered(): Promisable<string[]>;
 }
 export interface NodeModuleEventData extends ModuleAttachedEventData, ModuleDetachedEventData, ModuleRegisteredEventData, ModuleUnregisteredEventData, ModuleEventData {
@@ -14,6 +16,6 @@ export interface NodeModuleEventData extends ModuleAttachedEventData, ModuleDeta
 export type NodeModuleParams<TConfig extends AnyConfigSchema<NodeConfig> = AnyConfigSchema<NodeConfig>, TAdditionalParams extends AnyObject | undefined = undefined> = ModuleParams<TConfig, TAdditionalParams>;
 export type NodeModule<TParams extends ModuleParams<AnyConfigSchema<NodeConfig>> = ModuleParams<AnyConfigSchema<NodeConfig>>, TEventData extends NodeModuleEventData = NodeModuleEventData> = Module<TParams, TEventData>;
 export type NodeInstance<TParams extends ModuleParams<AnyConfigSchema<NodeConfig>> = ModuleParams<AnyConfigSchema<NodeConfig>>, TEventData extends NodeModuleEventData = NodeModuleEventData> = NodeModule<TParams, TEventData> & NodeQueryFunctions & ModuleInstance & {
-    register: (module: Module) => void;
+    register: (module: ModuleInstance) => void;
 };
 //# 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,cAAc,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAClH,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,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,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;AAE/B,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,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,kBAAkB,GAAG,cAAc,GAAG;IAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;CAAE,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,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAClH,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,QAAQ,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAAA;IACxC,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,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,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;AAE/B,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,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,GACjC,kBAAkB,GAClB,cAAc,GAAG;IACf,QAAQ,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAA;CAC3C,CAAA"}

package/dist/types/typeChecks.d.ts

@@ -1,13 +1,13 @@
 import { NodeInstance, NodeModule } from './Node';
-export declare const isNodeInstance: import("@xyo-network/module-model").InstanceTypeCheck<NodeInstance>;
+export declare const isNodeInstance: import("@xyo-network/object-identity").ObjectTypeCheck<NodeInstance>;
 export declare const isNodeModule: import("@xyo-network/module-model").ModuleTypeCheck<NodeModule>;
 export declare const asNodeModule: {
-    (module: any): NodeModule | undefined;
-    (module: any, assert: string | (() => string)): NodeModule;
+    (obj: any, config?: import("@xyo-network/object-identity").ObjectTypeConfig | undefined): NodeModule | undefined;
+    (obj: any, assert: string | (() => string), config?: import("@xyo-network/object-identity").ObjectTypeConfig | undefined): NodeModule;
 };
 export declare const asNodeInstance: {
-    (module: any): NodeInstance | undefined;
-    (module: any, assert: string | (() => string)): NodeInstance;
+    (obj: any, config?: import("@xyo-network/object-identity").ObjectTypeConfig | undefined): NodeInstance | undefined;
+    (obj: any, assert: string | (() => string), config?: import("@xyo-network/object-identity").ObjectTypeConfig | undefined): NodeInstance;
 };
 export declare const withNodeModule: <R>(module: any, closure: (module: NodeModule) => R) => R | undefined;
 export declare const withNodeInstance: <R>(module: any, closure: (module: NodeInstance) => R) => R | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"typeChecks.d.ts","sourceRoot":"","sources":["../../src/typeChecks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAGjD,eAAO,MAAM,cAAc,qEAQ1B,CAAA;AACD,eAAO,MAAM,YAAY,iEAKvB,CAAA;AAEF,eAAO,MAAM,YAAY;;;CAAiC,CAAA;AAC1D,eAAO,MAAM,cAAc;;;CAAmC,CAAA;AAC9D,eAAO,MAAM,cAAc,uEAAmC,CAAA;AAC9D,eAAO,MAAM,gBAAgB,yEAAqC,CAAA"}
+{"version":3,"file":"typeChecks.d.ts","sourceRoot":"","sources":["../../src/typeChecks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAKjD,eAAO,MAAM,cAAc,sEAQ1B,CAAA;AAID,eAAO,MAAM,YAAY,iEAA2H,CAAA;AAEpJ,eAAO,MAAM,YAAY;;;CAAuC,CAAA;AAChE,eAAO,MAAM,cAAc;;;CAAyC,CAAA;AACpE,eAAO,MAAM,cAAc,uEAAmC,CAAA;AAC9D,eAAO,MAAM,gBAAgB,yEAAqC,CAAA"}

package/package.json

@@ -10,15 +10,17 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/core": "~2.66.9",
-    "@xyo-network/module-events": "~2.66.9",
-    "@xyo-network/module-model": "~2.66.9",
-    "@xyo-network/payload-model": "~2.66.9",
-    "@xyo-network/promise": "~2.66.9"
+    "@xyo-network/core": "~2.67.0-rc.2",
+    "@xyo-network/manifest-model": "~2.67.0-rc.2",
+    "@xyo-network/module-events": "~2.67.0-rc.2",
+    "@xyo-network/module-model": "~2.67.0-rc.2",
+    "@xyo-network/object-identity": "~2.67.0-rc.2",
+    "@xyo-network/payload-model": "~2.67.0-rc.2",
+    "@xyo-network/promise": "~2.67.0-rc.2"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^2.18.11",
-    "@xylabs/tsconfig": "^2.18.11",
+    "@xylabs/ts-scripts-yarn3": "^2.19.0",
+    "@xylabs/tsconfig": "^2.19.0",
     "typescript": "^5.1.6"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -54,5 +56,6 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.66.9"
+  "version": "2.67.0-rc.2",
+  "stableVersion": "2.66.9"
 }

package/src/Node.ts

@@ -1,4 +1,5 @@
 import { AnyObject } from '@xyo-network/core'
+import { NodeManifestPayload } from '@xyo-network/manifest-model'
 import { AnyConfigSchema, Module, ModuleEventData, ModuleInstance, ModuleParams } from '@xyo-network/module-model'
 import { Promisable } from '@xyo-network/promise'
 
@@ -9,6 +10,7 @@ export interface NodeQueryFunctions {
   attach(nameOrAddress: string, external?: boolean): Promisable<string | undefined>
   attached(): Promisable<string[]>
   detach(nameOrAddress: string): Promisable<string | undefined>
+  manifest(): Promise<NodeManifestPayload>
   registered(): Promisable<string[]>
 }
 
@@ -32,4 +34,8 @@ export type NodeModule<
 export type NodeInstance<
   TParams extends ModuleParams<AnyConfigSchema<NodeConfig>> = ModuleParams<AnyConfigSchema<NodeConfig>>,
   TEventData extends NodeModuleEventData = NodeModuleEventData,
-> = NodeModule<TParams, TEventData> & NodeQueryFunctions & ModuleInstance & { register: (module: Module) => void }
+> = NodeModule<TParams, TEventData> &
+  NodeQueryFunctions &
+  ModuleInstance & {
+    register: (module: ModuleInstance) => void
+  }

package/src/typeChecks.ts

@@ -1,25 +1,26 @@
-import { AsFactory, IsInstanceFactory, IsModuleFactory, isModuleInstance, WithFactory } from '@xyo-network/module-model'
+import { IsInstanceFactory, IsModuleFactory, isModuleInstance, WithFactory } from '@xyo-network/module-model'
+import { AsObjectFactory } from '@xyo-network/object-identity'
 
 import { NodeInstance, NodeModule } from './Node'
 import { NodeAttachedQuerySchema, NodeAttachQuerySchema, NodeDetachQuerySchema, NodeRegisteredQuerySchema } from './Queries'
 
-export const isNodeInstance = IsInstanceFactory.create<NodeInstance>(
+const instanceFactory = new IsInstanceFactory<NodeInstance>()
+
+export const isNodeInstance = instanceFactory.create(
   {
     attach: 'function',
     attached: 'function',
     detach: 'function',
     registered: 'function',
   },
-  isModuleInstance,
+  [isModuleInstance],
 )
-export const isNodeModule = IsModuleFactory.create<NodeModule>([
-  NodeAttachedQuerySchema,
-  NodeAttachQuerySchema,
-  NodeDetachQuerySchema,
-  NodeRegisteredQuerySchema,
-])
 
-export const asNodeModule = AsFactory.create(isNodeModule)
-export const asNodeInstance = AsFactory.create(isNodeInstance)
+const moduleFactory = new IsModuleFactory<NodeModule>()
+
+export const isNodeModule = moduleFactory.create([NodeAttachedQuerySchema, NodeAttachQuerySchema, NodeDetachQuerySchema, NodeRegisteredQuerySchema])
+
+export const asNodeModule = AsObjectFactory.create(isNodeModule)
+export const asNodeInstance = AsObjectFactory.create(isNodeInstance)
 export const withNodeModule = WithFactory.create(isNodeModule)
 export const withNodeInstance = WithFactory.create(isNodeInstance)