@xyo-network/module-model 2.66.2 → 2.66.4

package/dist/esm/Events/ModuleError.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ModuleError.js.map

package/dist/esm/Events/ModuleError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModuleError.js","sourceRoot":"","sources":["../../../src/Events/ModuleError.ts"],"names":[],"mappings":""}

package/dist/esm/Events/index.js

@@ -1,3 +1,4 @@
 export * from './ModuleBusy';
+export * from './ModuleError';
 export * from './ModuleQueried';
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Events/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Events/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA"}

package/dist/esm/ModuleFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModuleFactory.js","sourceRoot":"","sources":["../../src/ModuleFactory.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,cAAc,CAAA;AAKhC,MAAM,OAAO,aAAa;IACxB,aAAa,CAAkD;IAE/D,eAAe,CAA0B;IAEzC,aAAa,CAAqB;IAElC,aAAa,CAAoB;IAEjC,YAAY,eAAyC,EAAE,MAA0B;QAC/E,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACtC,IAAI,CAAC,aAAa,GAAG,MAAM,CAAA;QAC3B,IAAI,CAAC,aAAa,GAAG,eAAe,CAAC,aAAa,CAAA;IACpD,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;IAC9B,CAAC;IAED,MAAM,CAAC,UAAU,CAA2B,eAAmC,EAAE,MAAoB;QACnG,OAAO,IAAI,aAAa,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;IACnD,CAAC;IAED,MAAM,CAA4D,MAAsC;QACtG,MAAM,OAAO,GAAG,IAAwB,CAAA;QACxC,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,YAAY,CAAA;QACnD,MAAM,YAAY,GAAsB,KAAK,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;QAC1G,OAAO,OAAO,CAAC,eAAe,CAAC,MAAM,CAAI,YAAY,CAAC,CAAA;IACxD,CAAC;IAED,OAAO,CAAqD,OAAiC;QAC3F,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;CACF"}
+{"version":3,"file":"ModuleFactory.js","sourceRoot":"","sources":["../../src/ModuleFactory.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,cAAc,CAAA;AAKhC,MAAM,OAAO,aAAa;IACxB,aAAa,CAAkD;IAE/D,eAAe,CAA0B;IAEzC,aAAa,CAAqB;IAElC,aAAa,CAAoB;IAEjC,YAAY,eAAyC,EAAE,MAA0B;QAC/E,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACtC,IAAI,CAAC,aAAa,GAAG,MAAM,CAAA;QAC3B,IAAI,CAAC,aAAa,GAAG,eAAe,CAAC,aAAa,CAAA;IACpD,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;IAC9B,CAAC;IAED,MAAM,CAAC,UAAU,CAAmB,eAAmC,EAAE,MAAoB;QAC3F,OAAO,IAAI,aAAa,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;IACnD,CAAC;IAED,MAAM,CAAoD,MAAsC;QAC9F,MAAM,OAAO,GAAG,IAAwB,CAAA;QACxC,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,YAAY,CAAA;QACnD,MAAM,YAAY,GAAsB,KAAK,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;QAC1G,OAAO,OAAO,CAAC,eAAe,CAAC,MAAM,CAAI,YAAY,CAAC,CAAA;IACxD,CAAC;IAED,OAAO,CAA6C,OAAiC;QACnF,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;CACF"}

package/dist/esm/isModule.js

@@ -13,28 +13,26 @@ export const IsInstanceFactory = {
     create: (shape, additionalCheck) => {
         return (module = {}, log = false) => {
             return ((additionalCheck?.(module) ?? true) &&
-                (Object.entries(shape ?? {}).reduce((prev, [key, type]) => {
+                Object.entries(shape ?? {}).reduce((prev, [key, type]) => {
                     const result = isType(module[key], type);
                     if (!result && log) {
                         console.warn(`isType Failed: ${key}: ${type}`);
                     }
-                    return result;
-                }, true) ??
-                    true));
+                    return prev && result;
+                }, true));
         };
     },
 };
-export const IsIndirectModuleFactory = {
+export const IsModuleFactory = {
     create: (expectedQueries, additionalCheck) => {
         return (module = {}) => {
-            return (isIndirectModuleInstance(module) &&
+            return (isModule(module) &&
                 (additionalCheck?.(module) ?? true) &&
                 (expectedQueries?.reduce((prev, query) => prev && module.queries.includes(query), true) ?? true));
         };
     },
 };
-export const IsModuleFactory = IsIndirectModuleFactory;
-export const isIndirectModuleInstance = IsInstanceFactory.create({
+export const isModule = IsInstanceFactory.create({
     address: 'string',
     config: 'object',
     downResolver: 'object',
@@ -43,21 +41,9 @@ export const isIndirectModuleInstance = IsInstanceFactory.create({
     query: 'function',
     queryable: 'function',
 });
-export const isDirectModuleInstance = IsInstanceFactory.create({
+export const isModuleInstance = IsInstanceFactory.create({
     describe: 'function',
     discover: 'function',
     manifest: 'function',
-}, isIndirectModuleInstance);
-export const isModuleInstance = isDirectModuleInstance;
-export const isDirectModule = (module = {}, expectedQueries, additionalCheck) => {
-    return (isDirectModuleInstance(module) &&
-        (additionalCheck?.(module) ?? true) &&
-        (expectedQueries?.reduce((prev, query) => prev && module.queries.includes(query), true) ?? true));
-};
-export const isIndirectModule = (module = {}, expectedQueries, additionalCheck) => {
-    return (isIndirectModuleInstance(module) &&
-        (additionalCheck?.(module) ?? true) &&
-        (expectedQueries?.reduce((prev, query) => prev && module.queries.includes(query), true) ?? true));
-};
-export const isModule = isIndirectModule;
+}, isModule);
 //# sourceMappingURL=isModule.js.map

package/dist/esm/isModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"isModule.js","sourceRoot":"","sources":["../../src/isModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"isModule.js","sourceRoot":"","sources":["../../src/isModule.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,KAAU,EAAE,YAAuB,EAAE,EAAE;IAC5D,IAAI,YAAY,KAAK,OAAO,EAAE;QAC5B,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;KAC5B;SAAM,IAAI,YAAY,KAAK,SAAS,EAAE;QACrC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAA;KACrE;SAAM;QACL,OAAO,OAAO,KAAK,KAAK,YAAY,CAAA;KACrC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,MAAM,EAAE,CAA4B,KAAyB,EAAE,eAA0C,EAAwB,EAAE;QACjI,OAAO,CAAC,SAAc,EAAE,EAAE,GAAG,GAAG,KAAK,EAAe,EAAE;YACpD,OAAO,CACL,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;gBACnC,MAAM,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;oBACvD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAA;oBACxC,IAAI,CAAC,MAAM,IAAI,GAAG,EAAE;wBAClB,OAAO,CAAC,IAAI,CAAC,kBAAkB,GAAG,KAAK,IAAI,EAAE,CAAC,CAAA;qBAC/C;oBACD,OAAO,IAAI,IAAI,MAAM,CAAA;gBACvB,CAAC,EAAE,IAAI,CAAC,CACT,CAAA;QACH,CAAC,CAAA;IACH,CAAC;CACF,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,MAAM,EAAE,CAA4B,eAA0B,EAAE,eAA0C,EAAsB,EAAE;QAChI,OAAO,CAAC,SAAc,EAAE,EAAe,EAAE;YACvC,OAAO,CACL,QAAQ,CAAC,MAAM,CAAC;gBAChB,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;gBACnC,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,CACjG,CAAA;QACH,CAAC,CAAA;IACH,CAAC;CACF,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAsC,iBAAiB,CAAC,MAAM,CAAiB;IAClG,OAAO,EAAE,QAAQ;IACjB,MAAM,EAAE,QAAQ;IAChB,YAAY,EAAE,QAAQ;IACtB,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,UAAU;IACjB,SAAS,EAAE,UAAU;CACtB,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAsC,iBAAiB,CAAC,MAAM,CACzF;IACE,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;CACrB,EACD,QAAQ,CACT,CAAA"}

package/dist/esm/lib/duplicateModules.js.map

@@ -1 +1 @@
-{"version":3,"file":"duplicateModules.js","sourceRoot":"","sources":["../../../src/lib/duplicateModules.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAAqB,EAAE,KAAa,EAAE,KAAuB,EAA2B,EAAE;IACzH,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,CAAC,OAAO,CAAC,KAAK,KAAK,CAAA;AACtE,CAAC,CAAA"}
+{"version":3,"file":"duplicateModules.js","sourceRoot":"","sources":["../../../src/lib/duplicateModules.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAE,KAAa,EAAE,KAAe,EAAmB,EAAE;IACjG,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,CAAC,OAAO,CAAC,KAAK,KAAK,CAAA;AACtE,CAAC,CAAA"}

package/dist/types/CreatableModule.d.ts

@@ -1,15 +1,15 @@
 import { Logger } from '@xyo-network/core';
-import { IndirectModule } from './Module';
-export interface CreatableModule<T extends IndirectModule = IndirectModule> {
+import { Module } from './Module';
+export interface CreatableModule<T extends Module = Module> {
     configSchema: string;
     configSchemas: string[];
     defaultLogger?: Logger;
     new (privateConstructorKey: string, params: T['params']): T;
-    create<T extends IndirectModule>(this: CreatableModule<T>, params?: T['params']): Promise<T>;
-    factory<T extends IndirectModule>(this: CreatableModule<T>, params?: T['params']): CreatableModuleFactory<T>;
+    create<T extends Module>(this: CreatableModule<T>, params?: T['params']): Promise<T>;
+    factory<T extends Module>(this: CreatableModule<T>, params?: T['params']): CreatableModuleFactory<T>;
 }
-export type CreatableModuleFactory<T extends IndirectModule = IndirectModule> = Omit<Omit<CreatableModule<T>, 'new'>, 'create'> & {
-    create<T extends IndirectModule>(this: CreatableModuleFactory<T>, params?: T['params']): Promise<T>;
+export type CreatableModuleFactory<T extends Module = Module> = Omit<Omit<CreatableModule<T>, 'new'>, 'create'> & {
+    create<T extends Module>(this: CreatableModuleFactory<T>, params?: T['params']): Promise<T>;
 };
 /**
  * Class annotation to be used to decorate Modules which support
@@ -17,5 +17,5 @@ export type CreatableModuleFactory<T extends IndirectModule = IndirectModule> =
  * @returns The decorated Module requiring it implement the members
  * of the CreatableModule as statics properties/methods
  */
-export declare function creatableModule<TModule extends IndirectModule = IndirectModule>(): <U extends CreatableModule<TModule>>(constructor: U) => void;
+export declare function creatableModule<TModule extends Module = Module>(): <U extends CreatableModule<TModule>>(constructor: U) => void;
 //# sourceMappingURL=CreatableModule.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"CreatableModule.d.ts","sourceRoot":"","sources":["../../src/CreatableModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAEzC,MAAM,WAAW,eAAe,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc;IACxE,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,qBAAqB,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;IAC3D,MAAM,CAAC,CAAC,SAAS,cAAc,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;IAC5F,OAAO,CAAC,CAAC,SAAS,cAAc,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAA;CAC7G;AAED,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,QAAQ,CAAC,GAAG;IAChI,MAAM,CAAC,CAAC,SAAS,cAAc,EAAE,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;CACpG,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,OAAO,SAAS,cAAc,GAAG,cAAc,kEAI9E"}
+{"version":3,"file":"CreatableModule.d.ts","sourceRoot":"","sources":["../../src/CreatableModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAEjC,MAAM,WAAW,eAAe,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM;IACxD,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,qBAAqB,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;IAC3D,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;IACpF,OAAO,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAA;CACrG;AAED,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,QAAQ,CAAC,GAAG;IAChH,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;CAC5F,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,kEAI9D"}

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

@@ -1,6 +1,6 @@
 import { EventData } from '@xyo-network/module-events';
-import { IndirectModule, ModuleEventArgs } from '../Module';
-export type ModuleBusyEventArgs<TModule extends IndirectModule = IndirectModule> = ModuleEventArgs<TModule, {
+import { Module, ModuleEventArgs } from '../Module';
+export type ModuleBusyEventArgs<TModule extends Module = Module> = ModuleEventArgs<TModule, {
     busy: boolean;
 }>;
 export interface ModuleBusyEventData extends EventData {

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

@@ -1 +1 @@
-{"version":3,"file":"ModuleBusy.d.ts","sourceRoot":"","sources":["../../../src/Events/ModuleBusy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AAEtD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3D,MAAM,MAAM,mBAAmB,CAAC,OAAO,SAAS,cAAc,GAAG,cAAc,IAAI,eAAe,CAAC,OAAO,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,CAAA;AAE9H,MAAM,WAAW,mBAAoB,SAAQ,SAAS;IACpD,UAAU,EAAE,mBAAmB,CAAA;CAChC"}
+{"version":3,"file":"ModuleBusy.d.ts","sourceRoot":"","sources":["../../../src/Events/ModuleBusy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AAEtD,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAEnD,MAAM,MAAM,mBAAmB,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,IAAI,eAAe,CAAC,OAAO,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,CAAA;AAE9G,MAAM,WAAW,mBAAoB,SAAQ,SAAS;IACpD,UAAU,EAAE,mBAAmB,CAAA;CAChC"}

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

@@ -0,0 +1,9 @@
+import { EventData } from '@xyo-network/module-events';
+import { Module, ModuleEventArgs } from '../Module';
+export type ModuleErrorEventArgs<TModule extends Module = Module> = ModuleEventArgs<TModule, {
+    error: Error;
+}>;
+export interface ModuleErrorEventData extends EventData {
+    moduleError: ModuleErrorEventArgs;
+}
+//# sourceMappingURL=ModuleError.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ModuleError.d.ts","sourceRoot":"","sources":["../../../src/Events/ModuleError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AAEtD,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAEnD,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,IAAI,eAAe,CAAC,OAAO,EAAE;IAAE,KAAK,EAAE,KAAK,CAAA;CAAE,CAAC,CAAA;AAE9G,MAAM,WAAW,oBAAqB,SAAQ,SAAS;IACrD,WAAW,EAAE,oBAAoB,CAAA;CAClC"}

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

@@ -1,9 +1,9 @@
 import { QueryBoundWitness } from '@xyo-network/boundwitness-builder';
 import { EventData } from '@xyo-network/module-events';
 import { Payload } from '@xyo-network/payload-model';
-import { IndirectModule, ModuleEventArgs } from '../Module';
+import { Module, ModuleEventArgs } from '../Module';
 import { ModuleQueryResult } from '../ModuleQueryResult';
-export type ModuleQueriedEventArgs = ModuleEventArgs<IndirectModule, {
+export type ModuleQueriedEventArgs = ModuleEventArgs<Module, {
     payloads?: Payload[];
     query: QueryBoundWitness;
     result: ModuleQueryResult;

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

@@ -1 +1 @@
-{"version":3,"file":"ModuleQueried.d.ts","sourceRoot":"","sources":["../../../src/Events/ModuleQueried.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAA;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAExD,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAClD,cAAc,EACd;IACE,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAA;IACpB,KAAK,EAAE,iBAAiB,CAAA;IACxB,MAAM,EAAE,iBAAiB,CAAA;CAC1B,CACF,CAAA;AAED,MAAM,WAAW,sBAAuB,SAAQ,SAAS;IACvD,aAAa,EAAE,sBAAsB,CAAA;CACtC"}
+{"version":3,"file":"ModuleQueried.d.ts","sourceRoot":"","sources":["../../../src/Events/ModuleQueried.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAA;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAExD,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAClD,MAAM,EACN;IACE,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAA;IACpB,KAAK,EAAE,iBAAiB,CAAA;IACxB,MAAM,EAAE,iBAAiB,CAAA;CAC1B,CACF,CAAA;AAED,MAAM,WAAW,sBAAuB,SAAQ,SAAS;IACvD,aAAa,EAAE,sBAAsB,CAAA;CACtC"}

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

@@ -1,3 +1,4 @@
 export * from './ModuleBusy';
+export * from './ModuleError';
 export * from './ModuleQueried';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Events/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Events/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA"}

package/dist/types/Module.d.ts

@@ -5,28 +5,28 @@ import { EventArgs, EventFunctions } from '@xyo-network/module-events';
 import { Payload } from '@xyo-network/payload-model';
 import { Promisable } from '@xyo-network/promise';
 import { AnyConfigSchema, ModuleConfig } from './Config';
-import { ModuleBusyEventData, ModuleQueriedEventData } from './Events';
+import { ModuleBusyEventData, ModuleErrorEventData, ModuleQueriedEventData } from './Events';
 import { ModuleDescription } from './ModuleDescription';
 import { ModuleFilter, ModuleFilterOptions } from './ModuleFilter';
 import { ModuleParams } from './ModuleParams';
 import { ModuleQueryResult } from './ModuleQueryResult';
 import { AddressPreviousHashPayload } from './Queries';
 export interface ResolveFunctions {
-    resolve<TModule extends Module = Module>(filter?: ModuleFilter, options?: ModuleFilterOptions): Promisable<TModule[]>;
-    resolve<TModule extends Module = Module>(nameOrAddress: string, options?: ModuleFilterOptions): Promisable<TModule | undefined>;
-    resolve<TModule extends Module = Module>(nameOrAddressOrFilter?: ModuleFilter | string, options?: ModuleFilterOptions): Promisable<TModule | TModule[] | undefined>;
+    resolve<TModuleInstance extends ModuleInstance>(filter?: ModuleFilter, options?: ModuleFilterOptions<TModuleInstance>): Promisable<TModuleInstance[]>;
+    resolve<TModuleInstance extends ModuleInstance>(nameOrAddress: string, options?: ModuleFilterOptions<TModuleInstance>): Promisable<TModuleInstance | undefined>;
+    resolve<TModuleInstance extends ModuleInstance>(nameOrAddressOrFilter?: ModuleFilter | string, options?: ModuleFilterOptions<TModuleInstance>): Promisable<TModuleInstance | TModuleInstance[] | undefined>;
 }
 export interface ModuleResolver extends ResolveFunctions {
     addResolver: (resolver: ModuleResolver) => this;
     isModuleResolver: boolean;
     removeResolver: (resolver: ModuleResolver) => this;
 }
-export type ModuleEventArgs<TModule extends IndirectModule = IndirectModule, TArgs extends EventArgs | undefined = undefined> = TArgs extends EventArgs ? {
+export type ModuleEventArgs<TModule extends Module = Module, TArgs extends EventArgs | undefined = undefined> = TArgs extends EventArgs ? {
     module: TModule;
 } & TArgs : {
     module: TModule;
 };
-export interface ModuleEventData extends ModuleQueriedEventData, ModuleBusyEventData {
+export interface ModuleEventData extends ModuleQueriedEventData, ModuleBusyEventData, ModuleErrorEventData {
 }
 export type ModuleQueryFunctions = {
     describe: () => Promise<ModuleDescription>;
@@ -37,7 +37,7 @@ export type ModuleQueryFunctions = {
 export type ModuleFields<TParams extends ModuleParams<AnyConfigSchema<ModuleConfig>> = ModuleParams<AnyConfigSchema<ModuleConfig>>> = {
     address: string;
     config: TParams['config'];
-    readonly downResolver: ModuleResolver;
+    readonly downResolver: Omit<ModuleResolver, 'resolve'>;
     loadAccount?: () => Promisable<AccountInstance>;
     params: TParams;
     previousHash: () => Promisable<string | undefined>;
@@ -46,10 +46,8 @@ export type ModuleFields<TParams extends ModuleParams<AnyConfigSchema<ModuleConf
     queryable: <T extends QueryBoundWitness = QueryBoundWitness, TConf extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConf) => Promisable<boolean>;
     start?: () => Promisable<boolean>;
     stop?: () => Promisable<boolean>;
-    readonly upResolver: ModuleResolver;
+    readonly upResolver: Omit<ModuleResolver, 'resolve'>;
 };
-export type IndirectModule<TParams extends ModuleParams<AnyConfigSchema<ModuleConfig>> = ModuleParams<AnyConfigSchema<ModuleConfig>>, TEventData extends ModuleEventData = ModuleEventData> = ModuleFields<TParams> & EventFunctions<TEventData> & ResolveFunctions;
-export type DirectModule<TParams extends ModuleParams<AnyConfigSchema<ModuleConfig>> = ModuleParams<AnyConfigSchema<ModuleConfig>>, TEventData extends ModuleEventData = ModuleEventData> = IndirectModule<TParams, TEventData> & ModuleQueryFunctions;
-export type ModuleInstance<TParams extends ModuleParams<AnyConfigSchema<ModuleConfig>> = ModuleParams<AnyConfigSchema<ModuleConfig>>, TEventData extends ModuleEventData = ModuleEventData> = DirectModule<TParams, TEventData>;
-export type Module<TParams extends ModuleParams<AnyConfigSchema<ModuleConfig>> = ModuleParams<AnyConfigSchema<ModuleConfig>>, TEventData extends ModuleEventData = ModuleEventData> = IndirectModule<TParams, TEventData>;
+export type Module<TParams extends ModuleParams<AnyConfigSchema<ModuleConfig>> = ModuleParams<AnyConfigSchema<ModuleConfig>>, TEventData extends ModuleEventData = ModuleEventData> = ModuleFields<TParams> & EventFunctions<TEventData> & ResolveFunctions;
+export type ModuleInstance<TParams extends ModuleParams<AnyConfigSchema<ModuleConfig>> = ModuleParams<AnyConfigSchema<ModuleConfig>>, TEventData extends ModuleEventData = ModuleEventData> = Module<TParams, TEventData> & ModuleQueryFunctions;
 //# sourceMappingURL=Module.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Module.d.ts","sourceRoot":"","sources":["../../src/Module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Module.d.ts","sourceRoot":"","sources":["../../src/Module.ts"],"names":[],"mappings":"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"}

package/dist/types/ModuleFactory.d.ts

@@ -1,15 +1,15 @@
 import { Logger } from '@xyo-network/core';
 import { CreatableModule, CreatableModuleFactory } from './CreatableModule';
-import { IndirectModule } from './Module';
-export declare class ModuleFactory<TModule extends IndirectModule> implements CreatableModuleFactory<TModule> {
+import { Module } from './Module';
+export declare class ModuleFactory<TModule extends Module> implements CreatableModuleFactory<TModule> {
     configSchemas: CreatableModuleFactory<TModule>['configSchemas'];
     creatableModule: CreatableModule<TModule>;
     defaultLogger?: Logger | undefined;
     defaultParams?: TModule['params'];
     constructor(creatableModule: CreatableModule<TModule>, params?: TModule['params']);
     get configSchema(): string;
-    static withParams<T extends IndirectModule>(creatableModule: CreatableModule<T>, params?: T['params']): ModuleFactory<T>;
-    create<T extends IndirectModule>(this: CreatableModuleFactory<T>, params?: TModule['params'] | undefined): Promise<T>;
-    factory<T extends IndirectModule>(this: CreatableModule<T>, _params?: T['params'] | undefined): CreatableModuleFactory<T>;
+    static withParams<T extends Module>(creatableModule: CreatableModule<T>, params?: T['params']): ModuleFactory<T>;
+    create<T extends Module>(this: CreatableModuleFactory<T>, params?: TModule['params'] | undefined): Promise<T>;
+    factory<T extends Module>(this: CreatableModule<T>, _params?: T['params'] | undefined): CreatableModuleFactory<T>;
 }
 //# sourceMappingURL=ModuleFactory.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ModuleFactory.d.ts","sourceRoot":"","sources":["../../src/ModuleFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAG1C,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAEzC,qBAAa,aAAa,CAAC,OAAO,SAAS,cAAc,CAAE,YAAW,sBAAsB,CAAC,OAAO,CAAC;IACnG,aAAa,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,CAAA;IAE/D,eAAe,EAAE,eAAe,CAAC,OAAO,CAAC,CAAA;IAEzC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAElC,aAAa,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;gBAErB,eAAe,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC;IAMjF,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,cAAc,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC;IAIrG,MAAM,CAAC,CAAC,SAAS,cAAc,EAAE,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC;IAOrH,OAAO,CAAC,CAAC,SAAS,cAAc,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,SAAS,GAAG,sBAAsB,CAAC,CAAC,CAAC;CAG1H"}
+{"version":3,"file":"ModuleFactory.d.ts","sourceRoot":"","sources":["../../src/ModuleFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAG1C,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAC3E,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAEjC,qBAAa,aAAa,CAAC,OAAO,SAAS,MAAM,CAAE,YAAW,sBAAsB,CAAC,OAAO,CAAC;IAC3F,aAAa,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,CAAA;IAE/D,eAAe,EAAE,eAAe,CAAC,OAAO,CAAC,CAAA;IAEzC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAElC,aAAa,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;gBAErB,eAAe,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC;IAMjF,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC;IAI7F,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC;IAO7G,OAAO,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,SAAS,GAAG,sBAAsB,CAAC,CAAC,CAAC;CAGlH"}

package/dist/types/ModuleFilter.d.ts

@@ -1,16 +1,19 @@
-export interface ModuleFilterOptions {
+import { InstanceTypeCheck } from './isModule';
+import { ModuleInstance } from './Module';
+export interface ModuleFilterOptions<TInstance extends ModuleInstance = ModuleInstance> {
     direction?: 'up' | 'down' | 'all';
+    identity?: InstanceTypeCheck<TInstance>;
     visibility?: 'public' | 'private' | 'all';
 }
-export interface AddressModuleFilter extends ModuleFilterOptions {
+export interface AddressModuleFilter<TInstance extends ModuleInstance = ModuleInstance> extends ModuleFilterOptions<TInstance> {
     address: string[];
 }
-export interface NameModuleFilter extends ModuleFilterOptions {
+export interface NameModuleFilter<TInstance extends ModuleInstance = ModuleInstance> extends ModuleFilterOptions<TInstance> {
     name: string[];
 }
-export interface QueryModuleFilter extends ModuleFilterOptions {
+export interface QueryModuleFilter<TInstance extends ModuleInstance = ModuleInstance> extends ModuleFilterOptions<TInstance> {
     query: string[][];
 }
-export type AnyModuleFilter = Partial<AddressModuleFilter> & Partial<NameModuleFilter> & Partial<QueryModuleFilter>;
-export type ModuleFilter = ModuleFilterOptions | AddressModuleFilter | NameModuleFilter | QueryModuleFilter;
+export type AnyModuleFilter = Partial<AddressModuleFilter<ModuleInstance>> & Partial<NameModuleFilter<ModuleInstance>> & Partial<QueryModuleFilter<ModuleInstance>>;
+export type ModuleFilter<TInstance extends ModuleInstance = ModuleInstance> = ModuleFilterOptions<TInstance> | AddressModuleFilter<TInstance> | NameModuleFilter<TInstance> | QueryModuleFilter<TInstance>;
 //# sourceMappingURL=ModuleFilter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ModuleFilter.d.ts","sourceRoot":"","sources":["../../src/ModuleFilter.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IAClC,SAAS,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,KAAK,CAAA;IACjC,UAAU,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,KAAK,CAAA;CAC1C;AAED,MAAM,WAAW,mBAAoB,SAAQ,mBAAmB;IAC9D,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB;AAED,MAAM,WAAW,gBAAiB,SAAQ,mBAAmB;IAC3D,IAAI,EAAE,MAAM,EAAE,CAAA;CACf;AAED,MAAM,WAAW,iBAAkB,SAAQ,mBAAmB;IAC5D,KAAK,EAAE,MAAM,EAAE,EAAE,CAAA;CAClB;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AACnH,MAAM,MAAM,YAAY,GAAG,mBAAmB,GAAG,mBAAmB,GAAG,gBAAgB,GAAG,iBAAiB,CAAA"}
+{"version":3,"file":"ModuleFilter.d.ts","sourceRoot":"","sources":["../../src/ModuleFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAEzC,MAAM,WAAW,mBAAmB,CAAC,SAAS,SAAS,cAAc,GAAG,cAAc;IACpF,SAAS,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,KAAK,CAAA;IACjC,QAAQ,CAAC,EAAE,iBAAiB,CAAC,SAAS,CAAC,CAAA;IACvC,UAAU,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,KAAK,CAAA;CAC1C;AAED,MAAM,WAAW,mBAAmB,CAAC,SAAS,SAAS,cAAc,GAAG,cAAc,CAAE,SAAQ,mBAAmB,CAAC,SAAS,CAAC;IAC5H,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB;AAED,MAAM,WAAW,gBAAgB,CAAC,SAAS,SAAS,cAAc,GAAG,cAAc,CAAE,SAAQ,mBAAmB,CAAC,SAAS,CAAC;IACzH,IAAI,EAAE,MAAM,EAAE,CAAA;CACf;AAED,MAAM,WAAW,iBAAiB,CAAC,SAAS,SAAS,cAAc,GAAG,cAAc,CAAE,SAAQ,mBAAmB,CAAC,SAAS,CAAC;IAC1H,KAAK,EAAE,MAAM,EAAE,EAAE,CAAA;CAClB;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC,GACxE,OAAO,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,GACzC,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC,CAAA;AAC5C,MAAM,MAAM,YAAY,CAAC,SAAS,SAAS,cAAc,GAAG,cAAc,IACtE,mBAAmB,CAAC,SAAS,CAAC,GAC9B,mBAAmB,CAAC,SAAS,CAAC,GAC9B,gBAAgB,CAAC,SAAS,CAAC,GAC3B,iBAAiB,CAAC,SAAS,CAAC,CAAA"}

package/dist/types/ModuleRepository.d.ts

@@ -1,8 +1,8 @@
-import { IndirectModule, ModuleResolver } from './Module';
+import { Module, ModuleResolver } from './Module';
 export interface ModuleRepository extends ModuleResolver {
-    add(module: IndirectModule): this;
-    add(module: IndirectModule[]): this;
-    add(module: IndirectModule | IndirectModule[]): this;
+    add(module: Module): this;
+    add(module: Module[]): this;
+    add(module: Module | Module[]): this;
     remove(address: string | string[]): this;
 }
 //# sourceMappingURL=ModuleRepository.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ModuleRepository.d.ts","sourceRoot":"","sources":["../../src/ModuleRepository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAEzD,MAAM,WAAW,gBAAiB,SAAQ,cAAc;IACtD,GAAG,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAA;IACjC,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAA;IACnC,GAAG,CAAC,MAAM,EAAE,cAAc,GAAG,cAAc,EAAE,GAAG,IAAI,CAAA;IAEpD,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;CACzC"}
+{"version":3,"file":"ModuleRepository.d.ts","sourceRoot":"","sources":["../../src/ModuleRepository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAEjD,MAAM,WAAW,gBAAiB,SAAQ,cAAc;IACtD,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;IAC3B,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;IAEpC,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;CACzC"}

package/dist/types/asModule.d.ts

@@ -6,8 +6,8 @@ export declare const AsFactory: {
     };
 };
 export declare const asModule: {
-    (module: any): import("./Module").IndirectModule | undefined;
-    (module: any, assert: string | (() => string)): import("./Module").IndirectModule;
+    (module: any): import("./Module").ModuleInstance | undefined;
+    (module: any, assert: string | (() => string)): import("./Module").ModuleInstance;
 };
 export declare const asModuleInstance: {
     (module: any): import("./Module").ModuleInstance | undefined;

package/dist/types/isModule.d.ts

@@ -1,4 +1,4 @@
-import { DirectModule, IndirectModule, Module, ModuleInstance } from './Module';
+import { Module, ModuleInstance } from './Module';
 export type InstanceTypeCheck<T extends object = object> = (module: object) => module is T;
 export type ModuleTypeCheck<T extends Module = Module> = InstanceTypeCheck<T>;
 export type FieldType = 'string' | 'number' | 'object' | 'symbol' | 'symbol' | 'undefined' | 'null' | 'array' | 'function' | 'payload';
@@ -7,16 +7,9 @@ export declare const isType: (value: any, expectedType: FieldType) => boolean;
 export declare const IsInstanceFactory: {
     create: <T extends object = object>(shape?: InstanceTypeShape, additionalCheck?: ((module: any) => boolean) | undefined) => InstanceTypeCheck<T>;
 };
-export declare const IsIndirectModuleFactory: {
-    create: <T extends IndirectModule = IndirectModule>(expectedQueries?: string[], additionalCheck?: ((module: any) => boolean) | undefined) => ModuleTypeCheck<T>;
-};
 export declare const IsModuleFactory: {
-    create: <T extends IndirectModule = IndirectModule>(expectedQueries?: string[], additionalCheck?: ((module: any) => boolean) | undefined) => ModuleTypeCheck<T>;
+    create: <T extends Module = Module>(expectedQueries?: string[], additionalCheck?: ((module: any) => boolean) | undefined) => ModuleTypeCheck<T>;
 };
-export declare const isIndirectModuleInstance: InstanceTypeCheck<ModuleInstance>;
-export declare const isDirectModuleInstance: InstanceTypeCheck<ModuleInstance>;
+export declare const isModule: InstanceTypeCheck<ModuleInstance>;
 export declare const isModuleInstance: InstanceTypeCheck<ModuleInstance>;
-export declare const isDirectModule: <T extends DirectModule = DirectModule>(module?: any, expectedQueries?: string[], additionalCheck?: ((module: any) => boolean) | undefined) => module is T;
-export declare const isIndirectModule: <T extends IndirectModule = IndirectModule>(module?: any, expectedQueries?: string[], additionalCheck?: ((module: any) => boolean) | undefined) => module is T;
-export declare const isModule: <T extends IndirectModule = IndirectModule>(module?: any, expectedQueries?: string[], additionalCheck?: ((module: any) => boolean) | undefined) => module is T;
 //# sourceMappingURL=isModule.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"isModule.d.ts","sourceRoot":"","sources":["../../src/isModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAE/E,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,IAAI,CAAC,CAAA;AAE1F,MAAM,MAAM,eAAe,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAAA;AAE7E,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,WAAW,GAAG,MAAM,GAAG,OAAO,GAAG,UAAU,GAAG,SAAS,CAAA;AAEtI,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,SAAS,CAAC,CAAA;AAE3E,eAAO,MAAM,MAAM,UAAW,GAAG,gBAAgB,SAAS,YAQzD,CAAA;AAED,eAAO,MAAM,iBAAiB;gDACgB,iBAAiB,8BAA6B,GAAG,KAAK,OAAO;CAe1G,CAAA;AAED,eAAO,MAAM,uBAAuB;0EACoC,MAAM,EAAE,8BAA6B,GAAG,KAAK,OAAO;CAS3H,CAAA;AAED,eAAO,MAAM,eAAe;0EAX4C,MAAM,EAAE,8BAA6B,GAAG,KAAK,OAAO;CAWtE,CAAA;AAEtD,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,cAAc,CAQrE,CAAA;AAEF,eAAO,MAAM,sBAAsB,EAAE,iBAAiB,CAAC,cAAc,CAOpE,CAAA;AAED,eAAO,MAAM,gBAAgB,mCAAyB,CAAA;AAEtD,eAAO,MAAM,cAAc,mDACjB,GAAG,oBACO,MAAM,EAAE,8BACC,GAAG,KAAK,OAAO,6BAO3C,CAAA;AAED,eAAO,MAAM,gBAAgB,uDACnB,GAAG,oBACO,MAAM,EAAE,8BACC,GAAG,KAAK,OAAO,6BAO3C,CAAA;AAED,eAAO,MAAM,QAAQ,uDAXX,GAAG,oBACO,MAAM,EAAE,8BACC,GAAG,KAAK,OAAO,6BASJ,CAAA"}
+{"version":3,"file":"isModule.d.ts","sourceRoot":"","sources":["../../src/isModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAEjD,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,IAAI,CAAC,CAAA;AAE1F,MAAM,MAAM,eAAe,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAAA;AAE7E,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,WAAW,GAAG,MAAM,GAAG,OAAO,GAAG,UAAU,GAAG,SAAS,CAAA;AAEtI,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,SAAS,CAAC,CAAA;AAE3E,eAAO,MAAM,MAAM,UAAW,GAAG,gBAAgB,SAAS,YAQzD,CAAA;AAED,eAAO,MAAM,iBAAiB;gDACgB,iBAAiB,8BAA6B,GAAG,KAAK,OAAO;CAc1G,CAAA;AAED,eAAO,MAAM,eAAe;0DAC4B,MAAM,EAAE,8BAA6B,GAAG,KAAK,OAAO;CAS3G,CAAA;AAED,eAAO,MAAM,QAAQ,EAAE,iBAAiB,CAAC,cAAc,CAQrD,CAAA;AAEF,eAAO,MAAM,gBAAgB,EAAE,iBAAiB,CAAC,cAAc,CAO9D,CAAA"}

package/dist/types/lib/duplicateModules.d.ts

@@ -1,4 +1,4 @@
-import { IndirectModule } from '../Module';
+import { Module } from '../Module';
 /**
  * Used to filter duplicates from an array of modules
  * @example: modulesArray.filter(duplicateModules)
@@ -8,5 +8,5 @@ import { IndirectModule } from '../Module';
  * @returns True if the Module's address is the first occurrence of
  * that address in the array, false otherwise
  */
-export declare const duplicateModules: (value: IndirectModule, index: number, array: IndirectModule[]) => value is IndirectModule;
+export declare const duplicateModules: (value: Module, index: number, array: Module[]) => value is Module;
 //# sourceMappingURL=duplicateModules.d.ts.map

package/dist/types/lib/duplicateModules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"duplicateModules.d.ts","sourceRoot":"","sources":["../../../src/lib/duplicateModules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAE1C;;;;;;;;GAQG;AACH,eAAO,MAAM,gBAAgB,UAAW,cAAc,SAAS,MAAM,SAAS,cAAc,EAAE,4BAE7F,CAAA"}
+{"version":3,"file":"duplicateModules.d.ts","sourceRoot":"","sources":["../../../src/lib/duplicateModules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAElC;;;;;;;;GAQG;AACH,eAAO,MAAM,gBAAgB,UAAW,MAAM,SAAS,MAAM,SAAS,MAAM,EAAE,oBAE7E,CAAA"}

package/dist/types/withModule.d.ts

@@ -2,6 +2,6 @@ import { InstanceTypeCheck } from './isModule';
 export declare const WithFactory: {
     create: <T extends object>(typeCheck: InstanceTypeCheck<T>) => <R>(module: any, closure: (module: T) => R) => R | undefined;
 };
-export declare const withModule: <R>(module: any, closure: (module: import("./Module").IndirectModule) => R) => R | undefined;
+export declare const withModule: <R>(module: any, closure: (module: import("./Module").ModuleInstance) => R) => R | undefined;
 export declare const withModuleInstance: <R>(module: any, closure: (module: import("./Module").ModuleInstance) => R) => R | undefined;
 //# sourceMappingURL=withModule.d.ts.map

package/package.json

@@ -11,16 +11,16 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.9.3",
-    "@xyo-network/account-model": "^2.66.2",
-    "@xyo-network/address-payload-plugin": "^2.66.2",
-    "@xyo-network/boundwitness-builder": "^2.66.2",
-    "@xyo-network/boundwitness-model": "^2.66.2",
-    "@xyo-network/core": "^2.66.2",
-    "@xyo-network/manifest-model": "^2.66.2",
-    "@xyo-network/module-events": "^2.66.2",
-    "@xyo-network/payload-model": "^2.66.2",
-    "@xyo-network/promise": "^2.66.2",
-    "@xyo-network/wallet-model": "^2.66.2",
+    "@xyo-network/account-model": "~2.66.4",
+    "@xyo-network/address-payload-plugin": "~2.66.4",
+    "@xyo-network/boundwitness-builder": "~2.66.4",
+    "@xyo-network/boundwitness-model": "~2.66.4",
+    "@xyo-network/core": "~2.66.4",
+    "@xyo-network/manifest-model": "~2.66.4",
+    "@xyo-network/module-events": "~2.66.4",
+    "@xyo-network/payload-model": "~2.66.4",
+    "@xyo-network/promise": "~2.66.4",
+    "@xyo-network/wallet-model": "~2.66.4",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
@@ -61,5 +61,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.66.2"
+  "version": "2.66.4"
 }

package/src/CreatableModule.ts

@@ -1,18 +1,18 @@
 import { Logger } from '@xyo-network/core'
 
-import { IndirectModule } from './Module'
+import { Module } from './Module'
 
-export interface CreatableModule<T extends IndirectModule = IndirectModule> {
+export interface CreatableModule<T extends Module = Module> {
   configSchema: string
   configSchemas: string[]
   defaultLogger?: Logger
   new (privateConstructorKey: string, params: T['params']): T
-  create<T extends IndirectModule>(this: CreatableModule<T>, params?: T['params']): Promise<T>
-  factory<T extends IndirectModule>(this: CreatableModule<T>, params?: T['params']): CreatableModuleFactory<T>
+  create<T extends Module>(this: CreatableModule<T>, params?: T['params']): Promise<T>
+  factory<T extends Module>(this: CreatableModule<T>, params?: T['params']): CreatableModuleFactory<T>
 }
 
-export type CreatableModuleFactory<T extends IndirectModule = IndirectModule> = Omit<Omit<CreatableModule<T>, 'new'>, 'create'> & {
-  create<T extends IndirectModule>(this: CreatableModuleFactory<T>, params?: T['params']): Promise<T>
+export type CreatableModuleFactory<T extends Module = Module> = Omit<Omit<CreatableModule<T>, 'new'>, 'create'> & {
+  create<T extends Module>(this: CreatableModuleFactory<T>, params?: T['params']): Promise<T>
 }
 
 /**
@@ -21,7 +21,7 @@ export type CreatableModuleFactory<T extends IndirectModule = IndirectModule> =
  * @returns The decorated Module requiring it implement the members
  * of the CreatableModule as statics properties/methods
  */
-export function creatableModule<TModule extends IndirectModule = IndirectModule>() {
+export function creatableModule<TModule extends Module = Module>() {
   return <U extends CreatableModule<TModule>>(constructor: U) => {
     constructor
   }

package/src/Events/ModuleBusy.ts

@@ -1,8 +1,8 @@
 import { EventData } from '@xyo-network/module-events'
 
-import { IndirectModule, ModuleEventArgs } from '../Module'
+import { Module, ModuleEventArgs } from '../Module'
 
-export type ModuleBusyEventArgs<TModule extends IndirectModule = IndirectModule> = ModuleEventArgs<TModule, { busy: boolean }>
+export type ModuleBusyEventArgs<TModule extends Module = Module> = ModuleEventArgs<TModule, { busy: boolean }>
 
 export interface ModuleBusyEventData extends EventData {
   moduleBusy: ModuleBusyEventArgs

package/src/Events/ModuleError.ts

@@ -0,0 +1,9 @@
+import { EventData } from '@xyo-network/module-events'
+
+import { Module, ModuleEventArgs } from '../Module'
+
+export type ModuleErrorEventArgs<TModule extends Module = Module> = ModuleEventArgs<TModule, { error: Error }>
+
+export interface ModuleErrorEventData extends EventData {
+  moduleError: ModuleErrorEventArgs
+}

package/src/Events/ModuleQueried.ts

@@ -2,11 +2,11 @@ import { QueryBoundWitness } from '@xyo-network/boundwitness-builder'
 import { EventData } from '@xyo-network/module-events'
 import { Payload } from '@xyo-network/payload-model'
 
-import { IndirectModule, ModuleEventArgs } from '../Module'
+import { Module, ModuleEventArgs } from '../Module'
 import { ModuleQueryResult } from '../ModuleQueryResult'
 
 export type ModuleQueriedEventArgs = ModuleEventArgs<
-  IndirectModule,
+  Module,
   {
     payloads?: Payload[]
     query: QueryBoundWitness

package/src/Events/index.ts

@@ -1,2 +1,3 @@
 export * from './ModuleBusy'
+export * from './ModuleError'
 export * from './ModuleQueried'