@xyo-network/module-model 2.64.6 → 2.64.7

package/dist/esm/Queries/{ModuleAccount → ModuleAddress}/Payload.js.map

@@ -1 +1 @@
-{"version":3,"file":"Payload.js","sourceRoot":"","sources":["../../../../src/Queries/ModuleAccount/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAA;AAGnE,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAAG,aAAa,gBAAgB,CAAA"}
+{"version":3,"file":"Payload.js","sourceRoot":"","sources":["../../../../src/Queries/ModuleAddress/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAA;AAGnE,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAAG,aAAa,gBAAgB,CAAA"}

package/dist/esm/Queries/ModuleAddress/Query.js

@@ -0,0 +1,2 @@
+export const ModuleAddressQuerySchema = 'network.xyo.query.module.address';
+//# sourceMappingURL=Query.js.map

package/dist/esm/Queries/ModuleAddress/Query.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Query.js","sourceRoot":"","sources":["../../../../src/Queries/ModuleAddress/Query.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,wBAAwB,GAA6B,kCAAkC,CAAA"}

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/Queries/ModuleAddress/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA"}

package/dist/esm/Queries/index.js

@@ -1,4 +1,4 @@
 export * from './Discover';
-export * from './ModuleAccount';
+export * from './ModuleAddress';
 export * from './Subscribe';
 //# sourceMappingURL=index.js.map

package/dist/esm/isModule.js

@@ -1,14 +1,44 @@
+import { ModuleAddressQuerySchema, ModuleDiscoverQuerySchema } from './Queries';
+export const isType = (value, expectedType) => {
+    if (expectedType === 'array') {
+        return Array.isArray(value);
+    }
+    else if (expectedType === 'payload') {
+        return typeof value === 'object' && typeof value.schema === 'string';
+    }
+    else {
+        return typeof value === expectedType;
+    }
+};
+export const IsInstanceFactory = {
+    create: (shape, additionalCheck) => {
+        return (module) => {
+            return ((additionalCheck?.(module) ?? true) &&
+                (Object.entries(shape ?? {}).reduce((prev, [key, type]) => prev && isType(module[key], type), true) ?? true));
+        };
+    },
+};
 export const IsModuleFactory = {
-    create: (baseCheck, expectedFunctions, 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    additionalCheck) => {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    create: (expectedQueries, additionalCheck) => {
         return (module) => {
-            return ((baseCheck?.(module) || true) &&
+            return (isModuleInstance(module) &&
                 (additionalCheck?.(module) ?? true) &&
-                (expectedFunctions?.reduce((prev, value) => prev && typeof module[value] === 'function', true) ?? true));
+                (expectedQueries?.reduce((prev, query) => prev && module.queries.includes(query), true) ?? true));
         };
     },
 };
-export const isModule = IsModuleFactory.create(undefined, ['query'], (module) => typeof module.config === 'object');
+export const isModuleInstance = IsInstanceFactory.create({
+    account: 'object',
+    address: 'string',
+    config: 'object',
+    discover: 'function',
+    downResolver: 'object',
+    manifest: 'function',
+    params: 'object',
+    queries: 'array',
+    query: 'function',
+    queryable: 'function',
+    upResolver: 'object',
+});
+export const isModule = IsModuleFactory.create([ModuleAddressQuerySchema, ModuleDiscoverQuerySchema]);
 //# sourceMappingURL=isModule.js.map

package/dist/esm/isModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"isModule.js","sourceRoot":"","sources":["../../src/isModule.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,MAAM,EAAE,CACN,SAA2B,EAC3B,iBAA4B;IAC5B,8DAA8D;IAC9D,eAA0C,EACtB,EAAE;QACtB,8DAA8D;QAC9D,OAAO,CAAC,MAAW,EAAe,EAAE;YAClC,OAAO,CACL,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;gBAC7B,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;gBACnC,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,IAAI,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,UAAU,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,CACxG,CAAA;QACH,CAAC,CAAA;IACH,CAAC;CACF,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAA4B,eAAe,CAAC,MAAM,CAAS,SAAS,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAA"}
+{"version":3,"file":"isModule.js","sourceRoot":"","sources":["../../src/isModule.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAA;AAU/E,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,MAAW,EAAe,EAAE;YAClC,OAAO,CACL,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;gBACnC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,CAC7G,CAAA;QACH,CAAC,CAAA;IACH,CAAC;CACF,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,MAAM,EAAE,CAA4C,eAA0B,EAAE,eAA0C,EAAsB,EAAE;QAChJ,OAAO,CAAC,MAAW,EAAe,EAAE;YAClC,OAAO,CACL,gBAAgB,CAAC,MAAM,CAAC;gBACxB,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,gBAAgB,GAAsC,iBAAiB,CAAC,MAAM,CAAiB;IAC1G,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,QAAQ;IACjB,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;IACpB,YAAY,EAAE,QAAQ;IACtB,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,UAAU;IACjB,SAAS,EAAE,UAAU;IACrB,UAAU,EAAE,QAAQ;CACrB,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAoC,eAAe,CAAC,MAAM,CAAiB,CAAC,wBAAwB,EAAE,yBAAyB,CAAC,CAAC,CAAA"}

package/dist/esm/withModule.js

@@ -1,5 +1,5 @@
-import { isModule } from './isModule';
-export const WithModuleFactory = {
+import { isModule, isModuleInstance } from './isModule';
+export const WithFactory = {
     create: (typeCheck) => {
         return (
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -10,5 +10,6 @@ export const WithModuleFactory = {
         };
     },
 };
-export const withModule = WithModuleFactory.create(isModule);
+export const withModule = WithFactory.create(isModule);
+export const withModuleInstance = WithFactory.create(isModuleInstance);
 //# sourceMappingURL=withModule.js.map

package/dist/esm/withModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"withModule.js","sourceRoot":"","sources":["../../src/withModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAmB,MAAM,YAAY,CAAA;AAGtD,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,MAAM,EAAE,CAA4B,SAA6B,EAAE,EAAE;QACnE,OAAO;QACL,8DAA8D;QAC9D,MAAW;QACX,8DAA8D;QAC9D,OAA2B,EACZ,EAAE;YACjB,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QACxD,CAAC,CAAA;IACH,CAAC;CACF,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA"}
+{"version":3,"file":"withModule.js","sourceRoot":"","sources":["../../src/withModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,QAAQ,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAE1E,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,MAAM,EAAE,CAAmB,SAA+B,EAAE,EAAE;QAC5D,OAAO;QACL,8DAA8D;QAC9D,MAAW;QACX,8DAA8D;QAC9D,OAAyB,EACV,EAAE;YACjB,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QACxD,CAAC,CAAA;IACH,CAAC;CACF,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;AACtD,MAAM,CAAC,MAAM,kBAAkB,GAAG,WAAW,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA"}

package/dist/types/Module.d.ts

@@ -7,6 +7,7 @@ import { AnyConfigSchema, ModuleConfig } from './Config';
 import { ModuleFilter } from './ModuleFilter';
 import { ModuleParams } from './ModuleParams';
 import { ModuleQueryResult } from './ModuleQueryResult';
+import { AddressPreviousHashPayload } from './Queries';
 import { QueryBoundWitness } from './Query';
 export interface ModuleResolver {
     addResolver: (resolver: ModuleResolver) => this;
@@ -17,19 +18,19 @@ export interface ModuleResolver {
      * is supplied, all modules are returned
      * @param filter Filter criteria for the desired modules
      */
-    resolve<T extends Module = Module>(filter?: ModuleFilter): Promisable<T[]>;
+    resolve<T extends ModuleInstance = ModuleInstance>(filter?: ModuleFilter): Promisable<T[]>;
     /**
      * Resolves a single module, or undefined if no modules matched the filter.
      * @param filter The desired Module's Address or Name
      */
-    resolveOne<T extends Module = Module>(filter: string): Promisable<T | undefined>;
+    resolveOne<T extends ModuleInstance = ModuleInstance>(filter: string): Promisable<T | undefined>;
 }
-export type ModuleEventArgs<TModule extends Module = Module, TArgs extends EventArgs | undefined = undefined> = TArgs extends EventArgs ? {
+export type ModuleEventArgs<TModule extends ModuleInstance = ModuleInstance, TArgs extends EventArgs | undefined = undefined> = TArgs extends EventArgs ? {
     module: TModule;
 } & TArgs : {
     module: TModule;
 };
-export type ModuleQueriedEventArgs = ModuleEventArgs<Module, {
+export type ModuleQueriedEventArgs = ModuleEventArgs<ModuleInstance, {
     payloads?: Payload[];
     query: QueryBoundWitness;
     result: ModuleQueryResult;
@@ -37,13 +38,16 @@ export type ModuleQueriedEventArgs = ModuleEventArgs<Module, {
 export interface ModuleEventData extends EventData {
     moduleQueried: ModuleQueriedEventArgs;
 }
+export type ModuleQueryFunctions = {
+    addressPreviousHash: () => Promisable<AddressPreviousHashPayload>;
+    discover: () => Promisable<Payload[]>;
+    manifest: () => Promisable<ModuleManifest>;
+};
 export type ModuleFields<TParams extends ModuleParams<AnyConfigSchema<ModuleConfig>> = ModuleParams<AnyConfigSchema<ModuleConfig>>> = {
-    account?: AccountInstance;
     address: string;
     config: TParams['config'];
     readonly downResolver: ModuleResolver;
     loadAccount?: () => Promisable<AccountInstance>;
-    manifest: () => Promisable<ModuleManifest>;
     params: TParams;
     queries: string[];
     query: <T extends QueryBoundWitness = QueryBoundWitness, TConf extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConf) => Promisable<ModuleQueryResult>;
@@ -51,5 +55,6 @@ export type ModuleFields<TParams extends ModuleParams<AnyConfigSchema<ModuleConf
     start?: () => Promisable<void>;
     readonly upResolver: ModuleResolver;
 };
-export type Module<TParams extends ModuleParams<AnyConfigSchema<ModuleConfig>> = ModuleParams<AnyConfigSchema<ModuleConfig>>, TEventData extends ModuleEventData = ModuleEventData> = ModuleFields<TParams> & EventFunctions<TEventData>;
+export type Module<TParams extends ModuleParams<AnyConfigSchema<ModuleConfig>> = ModuleParams<AnyConfigSchema<ModuleConfig>>, TEventData extends ModuleEventData = ModuleEventData> = ModuleFields<TParams> & EventFunctions<TEventData> & ModuleQueryFunctions;
+export type ModuleInstance<TParams extends ModuleParams<AnyConfigSchema<ModuleConfig>> = ModuleParams<AnyConfigSchema<ModuleConfig>>, TEventData extends ModuleEventData = ModuleEventData> = Module<TParams, TEventData>;
 //# 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/Queries/{ModuleAccount → ModuleAddress}/Payload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../../../src/Queries/ModuleAccount/Payload.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,eAAO,MAAM,yBAAyB,QAAmC,CAAA;AACzE,MAAM,MAAM,yBAAyB,GAAG,OAAO,yBAAyB,CAAA;AAExE,MAAM,MAAM,0BAA0B,GAAG,OAAO,CAAC;IAC/C,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,MAAM,EAAE,yBAAyB,CAAA;CAClC,CAAC,CAAA"}
+{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../../../src/Queries/ModuleAddress/Payload.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,eAAO,MAAM,yBAAyB,QAAmC,CAAA;AACzE,MAAM,MAAM,yBAAyB,GAAG,OAAO,yBAAyB,CAAA;AAExE,MAAM,MAAM,0BAA0B,GAAG,OAAO,CAAC;IAC/C,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,MAAM,EAAE,yBAAyB,CAAA;CAClC,CAAC,CAAA"}

package/dist/types/Queries/ModuleAddress/Query.d.ts

@@ -0,0 +1,7 @@
+import { Query } from '../../Query';
+export type ModuleAddressQuerySchema = 'network.xyo.query.module.address';
+export declare const ModuleAddressQuerySchema: ModuleAddressQuerySchema;
+export type ModuleAddressQuery = Query<{
+    schema: ModuleAddressQuerySchema;
+}>;
+//# sourceMappingURL=Query.d.ts.map

package/dist/types/Queries/{ModuleAccount → ModuleAddress}/Query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Query.d.ts","sourceRoot":"","sources":["../../../../src/Queries/ModuleAccount/Query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAEnC,MAAM,MAAM,wBAAwB,GAAG,kCAAkC,CAAA;AACzE,eAAO,MAAM,wBAAwB,EAAE,wBAA6D,CAAA;AAEpG,MAAM,MAAM,kBAAkB,GAAG,KAAK,CAAC;IACrC,MAAM,EAAE,wBAAwB,CAAA;CACjC,CAAC,CAAA"}
+{"version":3,"file":"Query.d.ts","sourceRoot":"","sources":["../../../../src/Queries/ModuleAddress/Query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAEnC,MAAM,MAAM,wBAAwB,GAAG,kCAAkC,CAAA;AACzE,eAAO,MAAM,wBAAwB,EAAE,wBAA6D,CAAA;AAEpG,MAAM,MAAM,kBAAkB,GAAG,KAAK,CAAC;IACrC,MAAM,EAAE,wBAAwB,CAAA;CACjC,CAAC,CAAA"}

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/Queries/ModuleAddress/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA"}

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

@@ -1,10 +1,10 @@
 import { Query } from '../Query';
 import { ModuleDiscoverQuery } from './Discover';
-import { ModuleAccountQuery } from './ModuleAccount';
+import { ModuleAddressQuery } from './ModuleAddress';
 import { ModuleSubscribeQuery } from './Subscribe';
 export * from './Discover';
-export * from './ModuleAccount';
+export * from './ModuleAddress';
 export * from './Subscribe';
-export type ModuleQueryBase = ModuleDiscoverQuery | ModuleAccountQuery | ModuleSubscribeQuery;
+export type ModuleQueryBase = ModuleDiscoverQuery | ModuleAddressQuery | ModuleSubscribeQuery;
 export type ModuleQuery<T extends Query | void = void> = T extends Query ? ModuleQueryBase | T : ModuleQueryBase;
 //# sourceMappingURL=index.d.ts.map

package/dist/types/Query/QueryBoundWitness.d.ts

@@ -11,5 +11,7 @@ export declare const isQueryBoundWitness: (x?: Payload | null) => x is import("@
     query: string;
     resultSet?: string | undefined;
     schema: BoundWitnessSchema;
+} & {
+    schema: "network.xyo.boundwitness";
 };
 //# sourceMappingURL=QueryBoundWitness.d.ts.map

package/dist/types/Query/QueryBoundWitness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBoundWitness.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAkB,MAAM,iCAAiC,CAAA;AAClG,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,MAAM,uBAAuB,GAAG,kBAAkB,CAAA;AACxD,eAAO,MAAM,uBAAuB,EAAE,uBAA4C,CAAA;AAElF,MAAM,MAAM,iBAAiB,GAAG,YAAY,CAAC;IAC3C,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,kBAAkB,CAAA;CAC3B,CAAC,CAAA;AAEF,eAAO,MAAM,mBAAmB,OAAQ,OAAO,GAAG,IAAI;WAL7C,MAAM;;YAEL,kBAAkB;CAGyH,CAAA"}
+{"version":3,"file":"QueryBoundWitness.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAkB,MAAM,iCAAiC,CAAA;AAClG,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,MAAM,uBAAuB,GAAG,kBAAkB,CAAA;AACxD,eAAO,MAAM,uBAAuB,EAAE,uBAA4C,CAAA;AAElF,MAAM,MAAM,iBAAiB,GAAG,YAAY,CAAC;IAC3C,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,kBAAkB,CAAA;CAC3B,CAAC,CAAA;AAEF,eAAO,MAAM,mBAAmB,OAAQ,OAAO,GAAG,IAAI;WAL7C,MAAM;;YAEL,kBAAkB;;;CAGyH,CAAA"}

package/dist/types/isModule.d.ts

@@ -1,7 +1,15 @@
-import { Module } from './Module';
-export type ModuleTypeCheck<T extends Module = Module> = (module: any) => module is T;
+import { ModuleInstance } from './Module';
+export type InstanceTypeCheck<T extends object = object> = (module: object) => module is T;
+export type ModuleTypeCheck<T extends ModuleInstance = ModuleInstance> = InstanceTypeCheck<T>;
+export type FieldType = 'string' | 'number' | 'object' | 'symbol' | 'symbol' | 'undefined' | 'null' | 'array' | 'function' | 'payload';
+export type InstanceTypeShape = Record<string | number | symbol, FieldType>;
+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 IsModuleFactory: {
-    create: <T extends Module = Module>(baseCheck?: ModuleTypeCheck, expectedFunctions?: string[], additionalCheck?: ((module: any) => boolean) | undefined) => ModuleTypeCheck<T>;
+    create: <T extends ModuleInstance = ModuleInstance>(expectedQueries?: string[], additionalCheck?: ((module: any) => boolean) | undefined) => ModuleTypeCheck<T>;
 };
-export declare const isModule: ModuleTypeCheck<Module>;
+export declare const isModuleInstance: InstanceTypeCheck<ModuleInstance>;
+export declare const isModule: ModuleTypeCheck<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":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAGjC,MAAM,MAAM,eAAe,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,MAAM,IAAI,CAAC,CAAA;AAErF,eAAO,MAAM,eAAe;oDAEZ,eAAe,sBACP,MAAM,EAAE,8BAED,GAAG,KAAK,OAAO;CAW7C,CAAA;AAED,eAAO,MAAM,QAAQ,EAAE,eAAe,CAAC,MAAM,CAAuG,CAAA"}
+{"version":3,"file":"isModule.d.ts","sourceRoot":"","sources":["../../src/isModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAGzC,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,cAAc,GAAG,cAAc,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAAA;AAE7F,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;CAQ1G,CAAA;AAED,eAAO,MAAM,eAAe;0EAC4C,MAAM,EAAE,8BAA6B,GAAG,KAAK,OAAO;CAS3H,CAAA;AAED,eAAO,MAAM,gBAAgB,EAAE,iBAAiB,CAAC,cAAc,CAY7D,CAAA;AAEF,eAAO,MAAM,QAAQ,EAAE,eAAe,CAAC,cAAc,CAAiG,CAAA"}

package/dist/types/withModule.d.ts

@@ -1,7 +1,7 @@
-import { ModuleTypeCheck } from './isModule';
-import { Module } from './Module';
-export declare const WithModuleFactory: {
-    create: <T extends Module = Module>(typeCheck: ModuleTypeCheck<T>) => <R extends void = void>(module: any, closure: (module: any) => R) => R | undefined;
+import { InstanceTypeCheck } from './isModule';
+export declare const WithFactory: {
+    create: <T extends object>(typeCheck: InstanceTypeCheck<T>) => <R extends void = void>(module: any, closure: (module: T) => R) => R | undefined;
 };
-export declare const withModule: <R extends void = void>(module: any, closure: (module: any) => R) => R | undefined;
+export declare const withModule: <R extends void = void>(module: any, closure: (module: import("./Module").ModuleInstance) => R) => R | undefined;
+export declare const withModuleInstance: <R extends void = void>(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,EAAY,eAAe,EAAE,MAAM,YAAY,CAAA;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAEjC,eAAO,MAAM,iBAAiB;0GAIhB,GAAG,oBAEO,GAAG;CAK1B,CAAA;AAED,eAAO,MAAM,UAAU,kCATT,GAAG,oBAEO,GAAG,wBAOiC,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;mGAIV,GAAG;CAOhB,CAAA;AAED,eAAO,MAAM,UAAU,kCATT,GAAG,6EASqC,CAAA;AACtD,eAAO,MAAM,kBAAkB,kCAVjB,GAAG,6EAUqD,CAAA"}

package/package.json

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

package/src/Module.ts

@@ -8,6 +8,7 @@ import { AnyConfigSchema, ModuleConfig } from './Config'
 import { ModuleFilter } from './ModuleFilter'
 import { ModuleParams } from './ModuleParams'
 import { ModuleQueryResult } from './ModuleQueryResult'
+import { AddressPreviousHashPayload } from './Queries'
 import { QueryBoundWitness } from './Query'
 
 export interface ModuleResolver {
@@ -19,15 +20,18 @@ export interface ModuleResolver {
    * is supplied, all modules are returned
    * @param filter Filter criteria for the desired modules
    */
-  resolve<T extends Module = Module>(filter?: ModuleFilter): Promisable<T[]>
+  resolve<T extends ModuleInstance = ModuleInstance>(filter?: ModuleFilter): Promisable<T[]>
   /**
    * Resolves a single module, or undefined if no modules matched the filter.
    * @param filter The desired Module's Address or Name
    */
-  resolveOne<T extends Module = Module>(filter: string): Promisable<T | undefined>
+  resolveOne<T extends ModuleInstance = ModuleInstance>(filter: string): Promisable<T | undefined>
 }
 
-export type ModuleEventArgs<TModule extends Module = Module, TArgs extends EventArgs | undefined = undefined> = TArgs extends EventArgs
+export type ModuleEventArgs<
+  TModule extends ModuleInstance = ModuleInstance,
+  TArgs extends EventArgs | undefined = undefined,
+> = TArgs extends EventArgs
   ? {
       module: TModule
     } & TArgs
@@ -36,7 +40,7 @@ export type ModuleEventArgs<TModule extends Module = Module, TArgs extends Event
     }
 
 export type ModuleQueriedEventArgs = ModuleEventArgs<
-  Module,
+  ModuleInstance,
   {
     payloads?: Payload[]
     query: QueryBoundWitness
@@ -48,8 +52,13 @@ export interface ModuleEventData extends EventData {
   moduleQueried: ModuleQueriedEventArgs
 }
 
+export type ModuleQueryFunctions = {
+  addressPreviousHash: () => Promisable<AddressPreviousHashPayload>
+  discover: () => Promisable<Payload[]>
+  manifest: () => Promisable<ModuleManifest>
+}
+
 export type ModuleFields<TParams extends ModuleParams<AnyConfigSchema<ModuleConfig>> = ModuleParams<AnyConfigSchema<ModuleConfig>>> = {
-  account?: AccountInstance
   address: string
   config: TParams['config']
 
@@ -58,8 +67,6 @@ export type ModuleFields<TParams extends ModuleParams<AnyConfigSchema<ModuleConf
 
   loadAccount?: () => Promisable<AccountInstance>
 
-  manifest: () => Promisable<ModuleManifest>
-
   params: TParams
 
   queries: string[]
@@ -84,4 +91,9 @@ export type ModuleFields<TParams extends ModuleParams<AnyConfigSchema<ModuleConf
 export type Module<
   TParams extends ModuleParams<AnyConfigSchema<ModuleConfig>> = ModuleParams<AnyConfigSchema<ModuleConfig>>,
   TEventData extends ModuleEventData = ModuleEventData,
-> = ModuleFields<TParams> & EventFunctions<TEventData>
+> = ModuleFields<TParams> & EventFunctions<TEventData> & ModuleQueryFunctions
+
+export type ModuleInstance<
+  TParams extends ModuleParams<AnyConfigSchema<ModuleConfig>> = ModuleParams<AnyConfigSchema<ModuleConfig>>,
+  TEventData extends ModuleEventData = ModuleEventData,
+> = Module<TParams, TEventData>

package/src/Queries/ModuleAddress/Query.ts

@@ -0,0 +1,8 @@
+import { Query } from '../../Query'
+
+export type ModuleAddressQuerySchema = 'network.xyo.query.module.address'
+export const ModuleAddressQuerySchema: ModuleAddressQuerySchema = 'network.xyo.query.module.address'
+
+export type ModuleAddressQuery = Query<{
+  schema: ModuleAddressQuerySchema
+}>

package/src/Queries/index.ts

@@ -1,12 +1,12 @@
 import { Query } from '../Query'
 import { ModuleDiscoverQuery } from './Discover'
-import { ModuleAccountQuery } from './ModuleAccount'
+import { ModuleAddressQuery } from './ModuleAddress'
 import { ModuleSubscribeQuery } from './Subscribe'
 
 export * from './Discover'
-export * from './ModuleAccount'
+export * from './ModuleAddress'
 export * from './Subscribe'
 
-export type ModuleQueryBase = ModuleDiscoverQuery | ModuleAccountQuery | ModuleSubscribeQuery
+export type ModuleQueryBase = ModuleDiscoverQuery | ModuleAddressQuery | ModuleSubscribeQuery
 
 export type ModuleQuery<T extends Query | void = void> = T extends Query ? ModuleQueryBase | T : ModuleQueryBase

package/src/isModule.ts

@@ -1,24 +1,60 @@
-import { Module } from './Module'
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { ModuleInstance } from './Module'
+import { ModuleAddressQuerySchema, ModuleDiscoverQuerySchema } from './Queries'
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type ModuleTypeCheck<T extends Module = Module> = (module: any) => module is T
+export type InstanceTypeCheck<T extends object = object> = (module: object) => module is T
+
+export type ModuleTypeCheck<T extends ModuleInstance = ModuleInstance> = InstanceTypeCheck<T>
+
+export type FieldType = 'string' | 'number' | 'object' | 'symbol' | 'symbol' | 'undefined' | 'null' | 'array' | 'function' | 'payload'
+
+export type InstanceTypeShape = Record<string | number | symbol, FieldType>
+
+export const isType = (value: any, expectedType: FieldType) => {
+  if (expectedType === 'array') {
+    return Array.isArray(value)
+  } else if (expectedType === 'payload') {
+    return typeof value === 'object' && typeof value.schema === 'string'
+  } else {
+    return typeof value === expectedType
+  }
+}
+
+export const IsInstanceFactory = {
+  create: <T extends object = object>(shape?: InstanceTypeShape, additionalCheck?: (module: any) => boolean): InstanceTypeCheck<T> => {
+    return (module: any): module is T => {
+      return (
+        (additionalCheck?.(module) ?? true) &&
+        (Object.entries(shape ?? {}).reduce((prev, [key, type]) => prev && isType(module[key], type), true) ?? true)
+      )
+    }
+  },
+}
 
 export const IsModuleFactory = {
-  create: <T extends Module = Module>(
-    baseCheck?: ModuleTypeCheck,
-    expectedFunctions?: string[],
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    additionalCheck?: (module: any) => boolean,
-  ): ModuleTypeCheck<T> => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  create: <T extends ModuleInstance = ModuleInstance>(expectedQueries?: string[], additionalCheck?: (module: any) => boolean): ModuleTypeCheck<T> => {
     return (module: any): module is T => {
       return (
-        (baseCheck?.(module) || true) &&
+        isModuleInstance(module) &&
         (additionalCheck?.(module) ?? true) &&
-        (expectedFunctions?.reduce((prev, value) => prev && typeof module[value] === 'function', true) ?? true)
+        (expectedQueries?.reduce((prev, query) => prev && module.queries.includes(query), true) ?? true)
       )
     }
   },
 }
 
-export const isModule: ModuleTypeCheck<Module> = IsModuleFactory.create<Module>(undefined, ['query'], (module) => typeof module.config === 'object')
+export const isModuleInstance: InstanceTypeCheck<ModuleInstance> = IsInstanceFactory.create<ModuleInstance>({
+  account: 'object',
+  address: 'string',
+  config: 'object',
+  discover: 'function',
+  downResolver: 'object',
+  manifest: 'function',
+  params: 'object',
+  queries: 'array',
+  query: 'function',
+  queryable: 'function',
+  upResolver: 'object',
+})
+
+export const isModule: ModuleTypeCheck<ModuleInstance> = IsModuleFactory.create<ModuleInstance>([ModuleAddressQuerySchema, ModuleDiscoverQuerySchema])

package/src/withModule.ts

@@ -1,17 +1,17 @@
-import { isModule, ModuleTypeCheck } from './isModule'
-import { Module } from './Module'
+import { InstanceTypeCheck, isModule, isModuleInstance } from './isModule'
 
-export const WithModuleFactory = {
-  create: <T extends Module = Module>(typeCheck: ModuleTypeCheck<T>) => {
+export const WithFactory = {
+  create: <T extends object>(typeCheck: InstanceTypeCheck<T>) => {
     return <R extends void = void>(
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       module: any,
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      closure: (module: any) => R,
+      closure: (module: T) => R,
     ): R | undefined => {
       return typeCheck(module) ? closure(module) : undefined
     }
   },
 }
 
-export const withModule = WithModuleFactory.create(isModule)
+export const withModule = WithFactory.create(isModule)
+export const withModuleInstance = WithFactory.create(isModuleInstance)

package/dist/cjs/Queries/ModuleAccount/Query.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModuleAccountQuerySchema = void 0;
-exports.ModuleAccountQuerySchema = 'network.xyo.query.module.account';
-//# sourceMappingURL=Query.js.map

package/dist/cjs/Queries/ModuleAccount/Query.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Query.js","sourceRoot":"","sources":["../../../../src/Queries/ModuleAccount/Query.ts"],"names":[],"mappings":";;;AAGa,QAAA,wBAAwB,GAA6B,kCAAkC,CAAA"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/Queries/ModuleAccount/index.ts"],"names":[],"mappings":";;;AAAA,oDAAyB;AACzB,kDAAuB"}

package/dist/esm/Queries/ModuleAccount/Query.js

@@ -1,2 +0,0 @@
-export const ModuleAccountQuerySchema = 'network.xyo.query.module.account';
-//# sourceMappingURL=Query.js.map

package/dist/esm/Queries/ModuleAccount/Query.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Query.js","sourceRoot":"","sources":["../../../../src/Queries/ModuleAccount/Query.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,wBAAwB,GAA6B,kCAAkC,CAAA"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/Queries/ModuleAccount/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA"}

package/dist/types/Queries/ModuleAccount/Query.d.ts

@@ -1,7 +0,0 @@
-import { Query } from '../../Query';
-export type ModuleAccountQuerySchema = 'network.xyo.query.module.account';
-export declare const ModuleAccountQuerySchema: ModuleAccountQuerySchema;
-export type ModuleAccountQuery = Query<{
-    schema: ModuleAccountQuerySchema;
-}>;
-//# sourceMappingURL=Query.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/Queries/ModuleAccount/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA"}

package/src/Queries/ModuleAccount/Query.ts

@@ -1,8 +0,0 @@
-import { Query } from '../../Query'
-
-export type ModuleAccountQuerySchema = 'network.xyo.query.module.account'
-export const ModuleAccountQuerySchema: ModuleAccountQuerySchema = 'network.xyo.query.module.account'
-
-export type ModuleAccountQuery = Query<{
-  schema: ModuleAccountQuerySchema
-}>