@xyo-network/module-abstract 2.64.10 → 2.65.1

package/dist/types/Resolver/SimpleModuleResolver.d.ts

@@ -9,8 +9,8 @@ export declare class SimpleModuleResolver implements ModuleRepository {
     addResolver(_resolver: ModuleResolver): this;
     remove(address: string | string[]): this;
     removeResolver(_resolver: ModuleResolver): this;
-    resolve<T extends IndirectModule = IndirectModule>(filter?: ModuleFilter): Promisable<T[]>;
-    resolveOne<T extends IndirectModule = IndirectModule>(filter: string): Promisable<T | undefined>;
+    resolve<TModule extends IndirectModule = IndirectModule>(filter?: ModuleFilter): Promisable<TModule[]>;
+    resolve<TModule extends IndirectModule = IndirectModule>(nameOrAddress: string): Promisable<TModule | undefined>;
     private addSingleModule;
     private removeSingleModule;
     private resolveByAddress;

package/dist/types/Resolver/SimpleModuleResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleModuleResolver.d.ts","sourceRoot":"","sources":["../../../src/Resolver/SimpleModuleResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EACd,YAAY,EACZ,gBAAgB,EAChB,cAAc,EAGf,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAKjD,qBAAa,oBAAqB,YAAW,gBAAgB;IAC3D,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,OAAO,CAAqC;IAEpD,IAAI,gBAAgB,YAEnB;IAED,GAAG,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI;IACjC,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI;IAUnC,WAAW,CAAC,SAAS,EAAE,cAAc,GAAG,IAAI;IAI5C,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IASxC,cAAc,CAAC,SAAS,EAAE,cAAc,GAAG,IAAI;IAI/C,OAAO,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC,CAAC,EAAE,CAAC;IAc1F,UAAU,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,CAAC,GAAG,SAAS,CAAC;IAShG,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,gBAAgB;IAYxB,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,cAAc;CAgBvB"}
+{"version":3,"file":"SimpleModuleResolver.d.ts","sourceRoot":"","sources":["../../../src/Resolver/SimpleModuleResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EACd,YAAY,EACZ,gBAAgB,EAChB,cAAc,EAGf,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAKjD,qBAAa,oBAAqB,YAAW,gBAAgB;IAC3D,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,OAAO,CAAqC;IAEpD,IAAI,gBAAgB,YAEnB;IAED,GAAG,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI;IACjC,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI;IAUnC,WAAW,CAAC,SAAS,EAAE,cAAc,GAAG,IAAI;IAI5C,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IASxC,cAAc,CAAC,SAAS,EAAE,cAAc,GAAG,IAAI;IAI/C,OAAO,CAAC,OAAO,SAAS,cAAc,GAAG,cAAc,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;IACtG,OAAO,CAAC,OAAO,SAAS,cAAc,GAAG,cAAc,EAAE,aAAa,EAAE,MAAM,GAAG,UAAU,CAAC,OAAO,GAAG,SAAS,CAAC;IAsBhH,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,gBAAgB;IAYxB,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,cAAc;CAgBvB"}

package/dist/types/index.d.ts

@@ -1,9 +1,7 @@
+export * from './AbstractIndirectModule';
 export * from './AbstractModule';
 export * from './BaseEmitter';
 export * from './Error';
-export * from './lib';
-export * from './ModuleFactory';
-export * from './Query';
 export * from './QueryValidator';
 export * from './Resolver';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,SAAS,CAAA;AACvB,cAAc,OAAO,CAAA;AACrB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,SAAS,CAAA;AACvB,cAAc,kBAAkB,CAAA;AAChC,cAAc,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,SAAS,CAAA;AACvB,cAAc,kBAAkB,CAAA;AAChC,cAAc,YAAY,CAAA"}

package/package.json

@@ -12,32 +12,30 @@
   "dependencies": {
     "@xylabs/assert": "^2.9.3",
     "@xylabs/exists": "^2.9.3",
-    "@xylabs/promise": "^2.9.3",
-    "@xyo-network/account": "^2.64.10",
-    "@xyo-network/account-model": "^2.64.10",
-    "@xyo-network/address-payload-plugin": "^2.64.10",
-    "@xyo-network/archivist-model": "^2.64.10",
-    "@xyo-network/boundwitness-builder": "^2.64.10",
-    "@xyo-network/boundwitness-model": "^2.64.10",
-    "@xyo-network/boundwitness-validator": "^2.64.10",
-    "@xyo-network/boundwitness-wrapper": "^2.64.10",
-    "@xyo-network/config-payload-plugin": "^2.64.10",
-    "@xyo-network/core": "^2.64.10",
-    "@xyo-network/error": "^2.64.10",
-    "@xyo-network/manifest-model": "^2.64.10",
-    "@xyo-network/module-events": "^2.64.10",
-    "@xyo-network/module-model": "^2.64.10",
-    "@xyo-network/payload-builder": "^2.64.10",
-    "@xyo-network/payload-model": "^2.64.10",
-    "@xyo-network/payload-wrapper": "^2.64.10",
-    "@xyo-network/promise": "^2.64.10",
-    "@xyo-network/query-payload-plugin": "^2.64.10",
-    "@xyo-network/shared": "^2.64.10",
+    "@xyo-network/account": "^2.65.1",
+    "@xyo-network/account-model": "^2.65.1",
+    "@xyo-network/address-payload-plugin": "^2.65.1",
+    "@xyo-network/archivist-model": "^2.65.1",
+    "@xyo-network/archivist-wrapper": "^2.65.1",
+    "@xyo-network/boundwitness-builder": "^2.65.1",
+    "@xyo-network/boundwitness-model": "^2.65.1",
+    "@xyo-network/config-payload-plugin": "^2.65.1",
+    "@xyo-network/core": "^2.65.1",
+    "@xyo-network/error": "^2.65.1",
+    "@xyo-network/manifest-model": "^2.65.1",
+    "@xyo-network/module-events": "^2.65.1",
+    "@xyo-network/module-model": "^2.65.1",
+    "@xyo-network/payload-builder": "^2.65.1",
+    "@xyo-network/payload-model": "^2.65.1",
+    "@xyo-network/payload-wrapper": "^2.65.1",
+    "@xyo-network/promise": "^2.65.1",
+    "@xyo-network/query-payload-plugin": "^2.65.1",
+    "@xyo-network/shared": "^2.65.1",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^2.18.7",
-    "@xylabs/tsconfig": "^2.18.7",
+    "@xylabs/ts-scripts-yarn3": "^2.18.10",
+    "@xylabs/tsconfig": "^2.18.10",
     "jest": "^29.6.1",
     "jest-mock-extended": "^3.0.4",
     "typescript": "^5.1.6"
@@ -75,5 +73,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.64.10"
+  "version": "2.65.1"
 }

package/src/AbstractIndirectModule.ts

@@ -1,10 +1,11 @@
 import { assertEx } from '@xylabs/assert'
 import { exists } from '@xylabs/exists'
-import { Account, HDWallet } from '@xyo-network/account'
+import { HDWallet } from '@xyo-network/account'
 import { AccountInstance } from '@xyo-network/account-model'
 import { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'
-import { ArchivistModule } from '@xyo-network/archivist-model'
-import { BoundWitnessBuilder } from '@xyo-network/boundwitness-builder'
+import { ArchivistInstance } from '@xyo-network/archivist-model'
+import { IndirectArchivistWrapper } from '@xyo-network/archivist-wrapper'
+import { BoundWitnessBuilder, QueryBoundWitness, QueryBoundWitnessBuilder, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'
 import { BoundWitness } from '@xyo-network/boundwitness-model'
 import { ConfigPayload, ConfigSchema } from '@xyo-network/config-payload-plugin'
 import { handleErrorAsync } from '@xyo-network/error'
@@ -15,16 +16,18 @@ import {
   AddressPreviousHashSchema,
   CreatableModule,
   CreatableModuleFactory,
+  duplicateModules,
   IndirectModule,
   IndividualArchivistConfig,
   ModuleAddressQuerySchema,
+  ModuleBusyEventArgs,
   ModuleConfig,
   ModuleDescribeQuerySchema,
   ModuleDescriptionPayload,
   ModuleDescriptionSchema,
   ModuleDiscoverQuerySchema,
-  ModuleError,
   ModuleEventData,
+  ModuleFactory,
   ModuleFilter,
   ModuleParams,
   ModuleQueriedEventArgs,
@@ -32,13 +35,12 @@ import {
   ModuleQueryBase,
   ModuleQueryResult,
   ModuleSubscribeQuerySchema,
-  Query,
-  QueryBoundWitness,
   SchemaString,
+  serializableField,
   WalletModuleParams,
 } from '@xyo-network/module-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import { Payload } from '@xyo-network/payload-model'
+import { ModuleError, Payload, Query } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 import { Promisable, PromiseEx } from '@xyo-network/promise'
 import { QueryPayload, QuerySchema } from '@xyo-network/query-payload-plugin'
@@ -47,9 +49,6 @@ import compact from 'lodash/compact'
 
 import { BaseEmitter } from './BaseEmitter'
 import { ModuleErrorBuilder } from './Error'
-import { duplicateModules, serializableField } from './lib'
-import { ModuleFactory } from './ModuleFactory'
-import { QueryBoundWitnessBuilder, QueryBoundWitnessWrapper } from './Query'
 import { ModuleConfigQueryValidator, Queryable, SupportedQueryValidator } from './QueryValidator'
 import { CompositeModuleResolver } from './Resolver'
 
@@ -57,9 +56,10 @@ import { CompositeModuleResolver } from './Resolver'
 
 export abstract class AbstractIndirectModule<TParams extends ModuleParams = ModuleParams, TEventData extends ModuleEventData = ModuleEventData>
   extends BaseEmitter<TParams, TEventData>
-  implements IndirectModule<TParams, TEventData>
+  implements IndirectModule<TParams, TEventData>, IndirectModule
 {
   static configSchemas: string[]
+  static enableBusy = false
 
   protected static privateConstructorKey = Date.now().toString()
 
@@ -83,6 +83,8 @@ export abstract class AbstractIndirectModule<TParams extends ModuleParams = Modu
   protected readonly moduleConfigQueryValidator: Queryable
   protected readonly supportedQueryValidator: Queryable
 
+  private _busyCount = 0
+
   constructor(privateConstructorKey: string, params: TParams) {
     assertEx(AbstractIndirectModule.privateConstructorKey === privateConstructorKey, 'Use create function instead of constructor')
     // Clone params to prevent mutation of the incoming object
@@ -159,6 +161,29 @@ export abstract class AbstractIndirectModule<TParams extends ModuleParams = Modu
     return { address: this.address, previousHash: this._account?.previousHash, schema: AddressPreviousHashSchema }
   }
 
+  async busy<R>(closure: () => Promise<R>) {
+    if (AbstractIndirectModule.enableBusy) {
+      if (this._busyCount <= 0) {
+        this._busyCount = 0
+        const args: ModuleBusyEventArgs = { busy: true, module: this }
+        await this.emit('moduleBusy', args)
+      }
+      this._busyCount++
+      try {
+        return await closure()
+      } finally {
+        this._busyCount--
+        if (this._busyCount <= 0) {
+          this._busyCount = 0
+          const args: ModuleBusyEventArgs = { busy: false, module: this }
+          await this.emit('moduleBusy', args)
+        }
+      }
+    } else {
+      return closure()
+    }
+  }
+
   async loadAccount() {
     if (!this._account) {
       const activeLogger = this.params.logger ?? AbstractIndirectModule.defaultLogger
@@ -214,12 +239,14 @@ export abstract class AbstractIndirectModule<TParams extends ModuleParams = Modu
     queryConfig?: TConfig,
   ): Promise<ModuleQueryResult> {
     this.started('throw')
-    const result = await this.queryHandler(assertEx(QueryBoundWitnessWrapper.unwrap(query)), payloads, queryConfig)
+    return await this.busy(async () => {
+      const result = await this.queryHandler(assertEx(QueryBoundWitnessWrapper.unwrap(query)), payloads, queryConfig)
 
-    const args: ModuleQueriedEventArgs = { module: this as IndirectModule, payloads, query, result }
-    await this.emit('moduleQueried', args)
+      const args: ModuleQueriedEventArgs = { module: this, payloads, query, result }
+      await this.emit('moduleQueried', args)
 
-    return result
+      return result
+    })
   }
 
   queryable<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(
@@ -243,10 +270,7 @@ export abstract class AbstractIndirectModule<TParams extends ModuleParams = Modu
   ): Promise<TModule | TModule[] | undefined> {
     switch (typeof nameOrAddressOrFilter) {
       case 'string': {
-        const byAddress = Account.isAddress(nameOrAddressOrFilter)
-          ? (await this.resolve<TModule>({ address: [nameOrAddressOrFilter] })).pop()
-          : undefined
-        return byAddress ?? (await this.resolve<TModule>({ name: [nameOrAddressOrFilter] })).pop()
+        return (await this.downResolver.resolve<TModule>(nameOrAddressOrFilter)) ?? (await this.upResolver.resolve<TModule>(nameOrAddressOrFilter))
       }
       default: {
         const filter: ModuleFilter | undefined = nameOrAddressOrFilter
@@ -485,13 +509,13 @@ export abstract class AbstractIndirectModule<TParams extends ModuleParams = Modu
 
   protected writeArchivist = () => this.getArchivist('write')
 
-  private async getArchivist(kind: keyof IndividualArchivistConfig): Promise<ArchivistModule | undefined> {
+  private async getArchivist(kind: keyof IndividualArchivistConfig): Promise<ArchivistInstance | undefined> {
     if (!this.config.archivist) return undefined
     const filter =
       typeof this.config.archivist === 'string' || this.config.archivist instanceof String
         ? (this.config.archivist as string)
         : (this.config?.archivist?.[kind] as string)
-    const resolved = await this.upResolver.resolveOne(filter)
-    return resolved ? (resolved as ArchivistModule) : undefined
+    const resolved = await this.upResolver.resolve(filter)
+    return resolved ? IndirectArchivistWrapper.wrap(resolved, this.account) : undefined
   }
 }

package/src/AbstractModule.ts

@@ -19,22 +19,30 @@ export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams
 
   /* make it public */
   override async addressPreviousHash(): Promise<AddressPreviousHashPayload> {
-    return await super.addressPreviousHash()
+    return await this.busy(async () => {
+      return await super.addressPreviousHash()
+    })
   }
 
   /* make it public */
   override async describe(): Promise<ModuleDescriptionPayload> {
-    return await super.describe()
+    return await this.busy(async () => {
+      return await super.describe()
+    })
   }
 
   /* make it public */
   override async discover(): Promise<Payload[]> {
-    return await super.discover()
+    return await this.busy(async () => {
+      return await super.discover()
+    })
   }
 
   /* make it public */
   override async manifest(): Promise<ModuleManifestPayload> {
-    return await super.manifest()
+    return await this.busy(async () => {
+      return await super.manifest()
+    })
   }
 
   /* make it public */

package/src/Error.ts

@@ -1,5 +1,5 @@
-import { ModuleError, ModuleErrorSchema } from '@xyo-network/module-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { ModuleError, ModuleErrorSchema } from '@xyo-network/payload-model'
 
 export class ModuleErrorBuilder extends PayloadBuilder {
   _message?: string

package/src/QueryValidator/ModuleConfigQueryValidator.ts

@@ -1,6 +1,6 @@
+import { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'
 import { AddressString, AnyConfigSchema, CosigningAddressSet, ModuleConfig, ModuleQuery, SchemaString } from '@xyo-network/module-model'
 
-import { QueryBoundWitnessWrapper } from '../Query'
 import { Queryable, QueryValidator } from './QueryValidator'
 
 export type SortedPipedAddressesString = string

package/src/QueryValidator/QueryValidator.ts

@@ -1,4 +1,4 @@
-import { QueryBoundWitness } from '@xyo-network/module-model'
+import { QueryBoundWitness } from '@xyo-network/boundwitness-builder'
 import { Payload } from '@xyo-network/payload-model'
 import { Promisable } from '@xyo-network/promise'
 

package/src/QueryValidator/SupportedQueryValidator.ts

@@ -1,7 +1,7 @@
-import { IndirectModule, ModuleQuery, QueryBoundWitness } from '@xyo-network/module-model'
+import { QueryBoundWitness, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'
+import { IndirectModule, ModuleQuery } from '@xyo-network/module-model'
 import { Payload } from '@xyo-network/payload-model'
 
-import { QueryBoundWitnessWrapper } from '../Query'
 import { Queryable, QueryValidator } from './QueryValidator'
 
 export const isQuerySupportedByModule = async <T extends QueryBoundWitness = QueryBoundWitness>(

package/src/Resolver/CompositeModuleResolver.ts

@@ -1,8 +1,7 @@
-import { fulfilled } from '@xylabs/promise'
+import { exists } from '@xylabs/exists'
 import { Base, BaseParams } from '@xyo-network/core'
-import { IndirectModule, ModuleFilter, ModuleRepository, ModuleResolver } from '@xyo-network/module-model'
+import { duplicateModules, IndirectModule, ModuleFilter, ModuleRepository, ModuleResolver } from '@xyo-network/module-model'
 
-import { duplicateModules } from '../lib'
 import { SimpleModuleResolver } from './SimpleModuleResolver'
 
 export class CompositeModuleResolver extends Base implements ModuleRepository, ModuleResolver {
@@ -50,23 +49,27 @@ export class CompositeModuleResolver extends Base implements ModuleRepository, M
     return this
   }
 
-  async resolve<T extends IndirectModule = IndirectModule>(filter?: ModuleFilter): Promise<T[]> {
-    const modules = await Promise.allSettled(this.resolvers.map((resolver) => resolver.resolve(filter)))
-    const result = modules
-      .filter(fulfilled)
-      .map((r) => r.value)
-      .flat()
-      .filter(duplicateModules)
-    return result as T[]
-  }
-
-  async resolveOne<T extends IndirectModule = IndirectModule>(addressOrName: string): Promise<T | undefined> {
-    for (let i = 0; i < this.resolvers.length; i++) {
-      const resolver = this.resolvers[i]
-      const result = await resolver.resolveOne<T>(addressOrName)
-      if (result) return result
+  async resolve<TModule extends IndirectModule = IndirectModule>(filter?: ModuleFilter): Promise<TModule[]>
+  async resolve<TModule extends IndirectModule = IndirectModule>(nameOrAddress: string): Promise<TModule | undefined>
+  async resolve<TModule extends IndirectModule = IndirectModule>(
+    nameOrAddressOrFilter?: ModuleFilter | string,
+  ): Promise<TModule | TModule[] | undefined> {
+    if (typeof nameOrAddressOrFilter === 'string') {
+      const result = await Promise.all(
+        this.resolvers.map(async (resolver) => {
+          return await resolver.resolve<TModule>(nameOrAddressOrFilter)
+        }),
+      )
+      return result.filter(exists).filter(duplicateModules).pop()
+    } else {
+      const result = await Promise.all(
+        this.resolvers.map(async (resolver) => {
+          return await resolver.resolve<TModule>(nameOrAddressOrFilter)
+        }),
+      )
+      const flatResult = result.flat()
+      return flatResult.filter(duplicateModules)
     }
-    return undefined
   }
 
   private addSingleModule(module?: IndirectModule) {

package/src/Resolver/SimpleModuleResolver.ts

@@ -48,27 +48,27 @@ export class SimpleModuleResolver implements ModuleRepository {
     throw 'Removing resolvers not supported'
   }
 
-  resolve<T extends IndirectModule = IndirectModule>(filter?: ModuleFilter): Promisable<T[]> {
-    const filteredByName: T[] = this.resolveByName<T>(Object.values(this.modules) as T[], (filter as NameModuleFilter)?.name)
-
-    const filteredByAddress: T[] = (filter as AddressModuleFilter)?.address
-      ? this.resolveByAddress<T>(filteredByName, (filter as AddressModuleFilter)?.address)
-      : filteredByName
-
-    const filteredByQuery: T[] = (filter as QueryModuleFilter)?.query
-      ? this.resolveByQuery<T>(filteredByAddress, (filter as QueryModuleFilter)?.query)
-      : filteredByAddress
-
-    return filteredByQuery
-  }
-
-  resolveOne<T extends IndirectModule = IndirectModule>(filter: string): Promisable<T | undefined> {
-    const allModules = Object.values(this.modules) as T[]
-    for (const resolutionMethod of [this.resolveByAddress, this.resolveByName]) {
-      const filtered: T[] = resolutionMethod(allModules, [filter])
-      if (filtered.length === 1) return filtered[0]
+  resolve<TModule extends IndirectModule = IndirectModule>(filter?: ModuleFilter): Promisable<TModule[]>
+  resolve<TModule extends IndirectModule = IndirectModule>(nameOrAddress: string): Promisable<TModule | undefined>
+  resolve<TModule extends IndirectModule = IndirectModule>(
+    nameOrAddressOrFilter?: ModuleFilter | string,
+  ): Promisable<TModule | TModule[] | undefined> {
+    if (nameOrAddressOrFilter) {
+      if (typeof nameOrAddressOrFilter === 'string') {
+        return (
+          this.resolveByName(Object.values(this.modules) as TModule[], [nameOrAddressOrFilter]).pop() ??
+          this.resolveByAddress(Object.values(this.modules) as TModule[], [nameOrAddressOrFilter]).pop()
+        )
+      } else if ((nameOrAddressOrFilter as AddressModuleFilter).address) {
+        return this.resolveByAddress<TModule>(Object.values(this.modules) as TModule[], (nameOrAddressOrFilter as AddressModuleFilter).address)
+      } else if ((nameOrAddressOrFilter as NameModuleFilter).name) {
+        return this.resolveByName<TModule>(Object.values(this.modules) as TModule[], (nameOrAddressOrFilter as NameModuleFilter).name)
+      } else if ((nameOrAddressOrFilter as QueryModuleFilter).query) {
+        return this.resolveByQuery<TModule>(Object.values(this.modules) as TModule[], (nameOrAddressOrFilter as QueryModuleFilter).query)
+      }
+    } else {
+      return Object.values(this.modules) as TModule[]
     }
-    return undefined
   }
 
   private addSingleModule(module?: IndirectModule) {
@@ -94,7 +94,7 @@ export class SimpleModuleResolver implements ModuleRepository {
       ? compact(
           flatten(
             address?.map((address) => {
-              return modules.filter((modules) => modules.address === address)
+              return modules.filter((module) => module.address === address)
             }),
           ),
         )

package/src/index.ts

@@ -1,8 +1,6 @@
+export * from './AbstractIndirectModule'
 export * from './AbstractModule'
 export * from './BaseEmitter'
 export * from './Error'
-export * from './lib'
-export * from './ModuleFactory'
-export * from './Query'
 export * from './QueryValidator'
 export * from './Resolver'

package/dist/cjs/ModuleFactory.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModuleFactory = void 0;
-const tslib_1 = require("tslib");
-const merge_1 = tslib_1.__importDefault(require("lodash/merge"));
-class ModuleFactory {
-    constructor(creatableModule, params) {
-        this.creatableModule = creatableModule;
-        this.defaultParams = params;
-        this.configSchemas = creatableModule.configSchemas;
-    }
-    get configSchema() {
-        return this.configSchemas[0];
-    }
-    static withParams(creatableModule, params) {
-        return new ModuleFactory(creatableModule, params);
-    }
-    create(params) {
-        var _a;
-        const factory = this;
-        const schema = factory.creatableModule.configSchema;
-        const mergedParams = (0, merge_1.default)((_a = factory.defaultParams) !== null && _a !== void 0 ? _a : {}, params, { config: { schema } });
-        return factory.creatableModule.create(mergedParams);
-    }
-    factory(_params) {
-        throw new Error('Method not implemented.');
-    }
-}
-exports.ModuleFactory = ModuleFactory;
-//# sourceMappingURL=ModuleFactory.js.map

package/dist/cjs/ModuleFactory.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ModuleFactory.js","sourceRoot":"","sources":["../../src/ModuleFactory.ts"],"names":[],"mappings":";;;;AAEA,iEAAgC;AAMhC,MAAa,aAAa;IASxB,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,IAAA,eAAK,EAAC,MAAA,OAAO,CAAC,aAAa,mCAAI,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;AAjCD,sCAiCC"}

package/dist/cjs/Query/QueryBoundWitnessBuilder.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryBoundWitnessBuilder = void 0;
-const tslib_1 = require("tslib");
-const assert_1 = require("@xylabs/assert");
-const boundwitness_builder_1 = require("@xyo-network/boundwitness-builder");
-const module_model_1 = require("@xyo-network/module-model");
-const payload_wrapper_1 = require("@xyo-network/payload-wrapper");
-class QueryBoundWitnessBuilder extends boundwitness_builder_1.BoundWitnessBuilder {
-    hashableFields() {
-        const _super = Object.create(null, {
-            hashableFields: { get: () => super.hashableFields }
-        });
-        var _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return Object.assign(Object.assign({}, (yield _super.hashableFields.call(this))), { query: (0, assert_1.assertEx)(yield ((_a = this._query) === null || _a === void 0 ? void 0 : _a.hashAsync()), 'No Query Specified'), schema: module_model_1.QueryBoundWitnessSchema });
-        });
-    }
-    query(query) {
-        this._query = payload_wrapper_1.PayloadWrapper.wrap(query);
-        this.payload(this._query.payload());
-        return this;
-    }
-    resultSet(payloadSet) {
-        this._resultSet = payload_wrapper_1.PayloadWrapper.wrap(payloadSet);
-        this.payload(this._resultSet.payload());
-        return this;
-    }
-}
-exports.QueryBoundWitnessBuilder = QueryBoundWitnessBuilder;
-//# sourceMappingURL=QueryBoundWitnessBuilder.js.map

package/dist/cjs/Query/QueryBoundWitnessBuilder.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBoundWitnessBuilder.js","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,4EAAuE;AACvE,4DAA6F;AAE7F,kEAA6D;AAE7D,MAAa,wBAGX,SAAQ,0CAAkC;IAI3B,cAAc;;;;;;YAC3B,uCACK,CAAC,MAAM,OAAM,cAAc,WAAE,CAAC,KACjC,KAAK,EAAE,IAAA,iBAAQ,EAAC,MAAM,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,SAAS,EAAE,CAAA,EAAE,oBAAoB,CAAC,EACrE,MAAM,EAAE,sCAAuB,IAChC;;KACF;IAED,KAAK,CAA4C,KAAQ;QACvD,IAAI,CAAC,MAAM,GAAG,gCAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACxC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAA;QACnC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,SAAS,CAAkE,UAAa;QACtF,IAAI,CAAC,UAAU,GAAG,gCAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACjD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAA;QACvC,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AA1BD,4DA0BC"}

package/dist/cjs/Query/QueryBoundWitnessValidator.js

@@ -1,58 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryBoundWitnessValidator = void 0;
-const tslib_1 = require("tslib");
-const assert_1 = require("@xylabs/assert");
-const boundwitness_validator_1 = require("@xyo-network/boundwitness-validator");
-const boundwitness_wrapper_1 = require("@xyo-network/boundwitness-wrapper");
-const error_1 = require("@xyo-network/error");
-const module_model_1 = require("@xyo-network/module-model");
-const payload_wrapper_1 = require("@xyo-network/payload-wrapper");
-class QueryBoundWitnessValidator extends boundwitness_validator_1.BoundWitnessValidator {
-    get expectedSchema() {
-        return module_model_1.QueryBoundWitnessSchema;
-    }
-    static isQueryBoundWitnessValidator(obj) {
-        return (obj === null || obj === void 0 ? void 0 : obj.constructor) === QueryBoundWitnessValidator;
-    }
-    validate() {
-        const _super = Object.create(null, {
-            validate: { get: () => super.validate }
-        });
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return [
-                ...(yield _super.validate.call(this)),
-                // ...this.validateResultSet()
-            ];
-        });
-    }
-    validateResultSet() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const errors = [];
-            try {
-                const resultSetHash = (0, assert_1.assertEx)(this.obj.resultSet, 'Missing ResultSet');
-                const wrapper = boundwitness_wrapper_1.BoundWitnessWrapper.parse(this.obj);
-                const resultSet = payload_wrapper_1.PayloadWrapper.wrap((yield wrapper.payloadMap())[resultSetHash]);
-                const required = resultSet === null || resultSet === void 0 ? void 0 : resultSet.payload().required;
-                if (required) {
-                    Object.entries(required).forEach(([key, value]) => {
-                        const found = wrapper.payloadSchemas.reduce((count, schema) => {
-                            return count + (schema === key ? 1 : 0);
-                        }, 0);
-                        if (found !== value) {
-                            errors.push(Error(`validateResultSet: Missing Schema [${key}:${found}:${value}]`));
-                        }
-                    });
-                }
-            }
-            catch (ex) {
-                (0, error_1.handleError)(ex, (error) => {
-                    errors.push(error);
-                });
-            }
-            return errors;
-        });
-    }
-}
-exports.QueryBoundWitnessValidator = QueryBoundWitnessValidator;
-//# sourceMappingURL=QueryBoundWitnessValidator.js.map

package/dist/cjs/Query/QueryBoundWitnessValidator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBoundWitnessValidator.js","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessValidator.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,gFAA2E;AAC3E,4EAAuE;AACvE,8CAAgD;AAChD,4DAA6F;AAE7F,kEAA6D;AAC7D,MAAa,0BAAoD,SAAQ,8CAAwC;IAG/G,IAAuB,cAAc;QACnC,OAAO,sCAAuB,CAAA;IAChC,CAAC;IAED,MAAM,CAAC,4BAA4B,CAAC,GAAY;QAC9C,OAAO,CAAC,GAAkC,aAAlC,GAAG,uBAAH,GAAG,CAAiC,WAAW,MAAK,0BAA0B,CAAA;IACxF,CAAC;IAEc,QAAQ;;;;;YACrB,OAAO;gBACL,GAAG,CAAC,MAAM,OAAM,QAAQ,WAAE,CAAC;gBAC3B,8BAA8B;aAC/B,CAAA;QACH,CAAC;KAAA;IAEK,iBAAiB;;YACrB,MAAM,MAAM,GAAY,EAAE,CAAA;YAC1B,IAAI;gBACF,MAAM,aAAa,GAAG,IAAA,iBAAQ,EAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAA;gBACvE,MAAM,OAAO,GAAG,0CAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBACnD,MAAM,SAAS,GAAG,gCAAc,CAAC,IAAI,CAAoB,CAAC,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,aAAa,CAAsB,CAAC,CAAA;gBAC1H,MAAM,QAAQ,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,GAAG,QAAQ,CAAA;gBAC9C,IAAI,QAAQ,EAAE;oBACZ,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;wBAChD,MAAM,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;4BAC5D,OAAO,KAAK,GAAG,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;wBACzC,CAAC,EAAE,CAAC,CAAC,CAAA;wBACL,IAAI,KAAK,KAAK,KAAK,EAAE;4BACnB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,sCAAsC,GAAG,IAAI,KAAK,IAAI,KAAK,GAAG,CAAC,CAAC,CAAA;yBACnF;oBACH,CAAC,CAAC,CAAA;iBACH;aACF;YAAC,OAAO,EAAE,EAAE;gBACX,IAAA,mBAAW,EAAC,EAAE,EAAE,CAAC,KAAK,EAAE,EAAE;oBACxB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBACpB,CAAC,CAAC,CAAA;aACH;YACD,OAAO,MAAM,CAAA;QACf,CAAC;KAAA;CACF;AA1CD,gEA0CC"}