@xyo-network/module-model 2.66.4 → 2.66.6

package/dist/esm/isModule.js

@@ -12,7 +12,8 @@ export const isType = (value, expectedType) => {
 export const IsInstanceFactory = {
     create: (shape, additionalCheck) => {
         return (module = {}, log = false) => {
-            return ((additionalCheck?.(module) ?? true) &&
+            return (module &&
+                (additionalCheck?.(module) ?? true) &&
                 Object.entries(shape ?? {}).reduce((prev, [key, type]) => {
                     const result = isType(module[key], type);
                     if (!result && log) {
@@ -35,7 +36,6 @@ export const IsModuleFactory = {
 export const isModule = IsInstanceFactory.create({
     address: 'string',
     config: 'object',
-    downResolver: 'object',
     params: 'object',
     queries: 'array',
     query: 'function',

package/dist/esm/isModule.js.map

@@ -1 +1 @@
-{"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"}
+{"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,MAAM;gBACN,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,GAA4B,iBAAiB,CAAC,MAAM,CAAS;IAChF,OAAO,EAAE,QAAQ;IACjB,MAAM,EAAE,QAAQ;IAChB,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/types/Events/ModuleQueried.d.ts

@@ -3,7 +3,7 @@ import { EventData } from '@xyo-network/module-events';
 import { Payload } from '@xyo-network/payload-model';
 import { Module, ModuleEventArgs } from '../Module';
 import { ModuleQueryResult } from '../ModuleQueryResult';
-export type ModuleQueriedEventArgs = ModuleEventArgs<Module, {
+export type ModuleQueriedEventArgs<TModule extends Module = Module> = ModuleEventArgs<TModule, {
     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,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"}
+{"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,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,IAAI,eAAe,CACnF,OAAO,EACP;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/asModule.d.ts

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

package/dist/types/isModule.d.ts

@@ -10,6 +10,6 @@ export declare const IsInstanceFactory: {
 export declare const IsModuleFactory: {
     create: <T extends Module = Module>(expectedQueries?: string[], additionalCheck?: ((module: any) => boolean) | undefined) => ModuleTypeCheck<T>;
 };
-export declare const isModule: InstanceTypeCheck<ModuleInstance>;
+export declare const isModule: ModuleTypeCheck<Module>;
 export declare const isModuleInstance: InstanceTypeCheck<ModuleInstance>;
 //# 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,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"}
+{"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;CAe1G,CAAA;AAED,eAAO,MAAM,eAAe;0DAC4B,MAAM,EAAE,8BAA6B,GAAG,KAAK,OAAO;CAS3G,CAAA;AAED,eAAO,MAAM,QAAQ,EAAE,eAAe,CAAC,MAAM,CAO3C,CAAA;AAEF,eAAO,MAAM,gBAAgB,EAAE,iBAAiB,CAAC,cAAc,CAO9D,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").ModuleInstance) => R) => R | undefined;
+export declare const withModule: <R>(module: any, closure: (module: import("./Module").Module) => R) => R | undefined;
 export declare const withModuleInstance: <R>(module: any, closure: (module: import("./Module").ModuleInstance) => R) => R | undefined;
 //# sourceMappingURL=withModule.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"withModule.d.ts","sourceRoot":"","sources":["../../src/withModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAA8B,MAAM,YAAY,CAAA;AAE1E,eAAO,MAAM,WAAW;+EAIV,GAAG;CAOhB,CAAA;AAED,eAAO,MAAM,UAAU,cATT,GAAG,6EASqC,CAAA;AACtD,eAAO,MAAM,kBAAkB,cAVjB,GAAG,6EAUqD,CAAA"}
+{"version":3,"file":"withModule.d.ts","sourceRoot":"","sources":["../../src/withModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAA8B,MAAM,YAAY,CAAA;AAE1E,eAAO,MAAM,WAAW;+EAIV,GAAG;CAOhB,CAAA;AAED,eAAO,MAAM,UAAU,cATT,GAAG,qEASqC,CAAA;AACtD,eAAO,MAAM,kBAAkB,cAVjB,GAAG,6EAUqD,CAAA"}

package/package.json

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

package/src/Events/ModuleQueried.ts

@@ -5,8 +5,8 @@ import { Payload } from '@xyo-network/payload-model'
 import { Module, ModuleEventArgs } from '../Module'
 import { ModuleQueryResult } from '../ModuleQueryResult'
 
-export type ModuleQueriedEventArgs = ModuleEventArgs<
-  Module,
+export type ModuleQueriedEventArgs<TModule extends Module = Module> = ModuleEventArgs<
+  TModule,
   {
     payloads?: Payload[]
     query: QueryBoundWitness

package/src/isModule.ts

@@ -23,6 +23,7 @@ export const IsInstanceFactory = {
   create: <T extends object = object>(shape?: InstanceTypeShape, additionalCheck?: (module: any) => boolean): InstanceTypeCheck<T> => {
     return (module: any = {}, log = false): module is T => {
       return (
+        module &&
         (additionalCheck?.(module) ?? true) &&
         Object.entries(shape ?? {}).reduce((prev, [key, type]) => {
           const result = isType(module[key], type)
@@ -48,10 +49,9 @@ export const IsModuleFactory = {
   },
 }
 
-export const isModule: InstanceTypeCheck<ModuleInstance> = IsInstanceFactory.create<ModuleInstance>({
+export const isModule: ModuleTypeCheck<Module> = IsInstanceFactory.create<Module>({
   address: 'string',
   config: 'object',
-  downResolver: 'object',
   params: 'object',
   queries: 'array',
   query: 'function',