@xyo-network/module-resolver 2.92.11 → 2.93.0-rc.2

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/CompositeModuleResolver.ts","../../src/SimpleModuleResolver.ts","../../src/ResolverEventEmitter.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport { Address } from '@xylabs/hex'\nimport { Base, BaseParams } from '@xylabs/object'\nimport { Promisable } from '@xylabs/promise'\nimport {\n  CacheConfig,\n  duplicateModules,\n  ModuleFilter,\n  ModuleFilterOptions,\n  ModuleIdentifier,\n  ModuleIdentifierPart,\n  ModuleInstance,\n  ModuleRepository,\n  ModuleResolverInstance,\n} from '@xyo-network/module-model'\nimport { LRUCache } from 'lru-cache'\n\nimport { SimpleModuleResolver } from './SimpleModuleResolver'\nimport { ModuleIdentifierTransformer } from './transformers'\n\nexport type ModuleIdentifierTransformerFunc = (id: ModuleIdentifier) => Promisable<ModuleIdentifier>\n\nexport interface ModuleResolverParams extends BaseParams {\n  cache?: CacheConfig\n  moduleIdentifierTransformers?: ModuleIdentifierTransformer[]\n}\n\nconst moduleIdentifierParts = (moduleIdentifier: ModuleIdentifier): ModuleIdentifierPart[] => {\n  return moduleIdentifier?.split(':') as ModuleIdentifierPart[]\n}\n\nexport class CompositeModuleResolver extends Base<ModuleResolverParams> implements ModuleRepository, ModuleResolverInstance {\n  static defaultMaxDepth = 5\n  protected resolvers: ModuleResolverInstance[] = []\n  private _cache: LRUCache<ModuleIdentifier, ModuleInstance>\n  private _localResolver: SimpleModuleResolver\n\n  constructor({ cache, ...params }: ModuleResolverParams = {}) {\n    super(params)\n    const localResolver = new SimpleModuleResolver()\n    this.addResolver(localResolver)\n    const { max = 100, ttl = 1000 * 5 /* five seconds */ } = cache ?? {}\n    this._cache = new LRUCache<ModuleIdentifier, ModuleInstance>({ max, ttl, ...cache })\n    this._localResolver = localResolver\n  }\n\n  private get moduleIdentifierTransformers() {\n    return this.params.moduleIdentifierTransformers\n  }\n\n  add(module: ModuleInstance): this\n  add(module: ModuleInstance[]): this\n  add(module: ModuleInstance | ModuleInstance[]): this {\n    if (Array.isArray(module)) {\n      for (const mod of module) this.addSingleModule(mod)\n    } else {\n      this.addSingleModule(module)\n    }\n    return this\n  }\n\n  addResolver(resolver: ModuleResolverInstance): this {\n    this.resolvers.push(resolver)\n    return this\n  }\n\n  remove(addresses: Address[] | Address): this {\n    if (Array.isArray(addresses)) {\n      for (const address of addresses) this.removeSingleModule(address)\n    } else {\n      this.removeSingleModule(addresses)\n    }\n    return this\n  }\n\n  removeResolver(resolver: ModuleResolverInstance): this {\n    this.resolvers = this.resolvers.filter((item) => item !== resolver)\n    return this\n  }\n  /** @deprecated do not pass undefined.  If trying to get all, pass '*' */\n  async resolve(): Promise<ModuleInstance[]>\n  async resolve<T extends ModuleInstance = ModuleInstance>(all: '*', options?: ModuleFilterOptions<T>): Promise<T[]>\n  async resolve<T extends ModuleInstance = ModuleInstance>(filter: ModuleFilter<T>, options?: ModuleFilterOptions<T>): Promise<T[]>\n  async resolve<T extends ModuleInstance = ModuleInstance>(id: ModuleIdentifier, options?: ModuleFilterOptions<T>): Promise<T | undefined>\n  /** @deprecated use '*' if trying to resolve all */\n  async resolve<T extends ModuleInstance = ModuleInstance>(filter?: ModuleFilter<T>, options?: ModuleFilterOptions<T>): Promise<T[]>\n  async resolve<T extends ModuleInstance = ModuleInstance>(\n    idOrFilter: ModuleFilter<T> | ModuleIdentifier = '*',\n    options?: ModuleFilterOptions<T>,\n  ): Promise<T | T[] | undefined> {\n    const mutatedOptions = { ...options, maxDepth: (options?.maxDepth ?? CompositeModuleResolver.defaultMaxDepth) - 1 }\n\n    //resolve all\n    if (idOrFilter === '*') {\n      const all = idOrFilter\n      if (mutatedOptions.maxDepth < 0) {\n        return []\n      }\n      const result = await Promise.all(\n        this.resolvers.map(async (resolver) => {\n          const result: T[] = await resolver.resolve<T>(all, mutatedOptions)\n          return result\n        }),\n      )\n      const flatResult: T[] = result.flat().filter(exists)\n      return flatResult.filter(duplicateModules)\n    }\n\n    if (typeof idOrFilter === 'string') {\n      //resolve ModuleIdentifier\n      const idParts = moduleIdentifierParts(idOrFilter)\n      if (idParts.length > 1) {\n        return await this.resolveMultipartIdentifier<T>(idOrFilter)\n      }\n      const id = await this.transformModuleIdentifier(idOrFilter)\n      if (mutatedOptions.maxDepth < 0) {\n        return undefined\n      }\n      const cachedResult = this._cache.get(id)\n      if (cachedResult) {\n        if (cachedResult.status === 'dead') {\n          this._cache.delete(id)\n        } else {\n          return cachedResult as T\n        }\n      }\n      const results = await Promise.all(\n        this.resolvers.map(async (resolver) => {\n          const result: T | undefined = await resolver.resolve<T>(id, mutatedOptions)\n          return result\n        }),\n      )\n      const result: T | undefined = results.filter(exists).filter(duplicateModules).pop()\n      if (result) {\n        this._cache.set(id, result)\n      }\n      return result\n    } else {\n      //resolve filter\n      const filter = idOrFilter\n      if (mutatedOptions.maxDepth < 0) {\n        return []\n      }\n      const result = await Promise.all(\n        this.resolvers.map(async (resolver) => {\n          const result: T[] = await resolver.resolve<T>(filter, mutatedOptions)\n          return result\n        }),\n      )\n      const flatResult: T[] = result.flat().filter(exists)\n      return flatResult.filter(duplicateModules)\n    }\n  }\n\n  private addSingleModule(module?: ModuleInstance) {\n    if (module) {\n      this._localResolver.add(module)\n    }\n  }\n  private removeSingleModule(address: Address) {\n    this._localResolver.remove(address)\n  }\n\n  private async resolveMultipartIdentifier<T extends ModuleInstance = ModuleInstance>(moduleIdentifier: ModuleIdentifier): Promise<T | undefined> {\n    const idParts = moduleIdentifierParts(moduleIdentifier)\n    assertEx(idParts.length >= 2, () => 'Not a valid multipart identifier')\n    const id = assertEx(idParts.shift())\n    const module = await this.resolve(id)\n    return await module?.resolve<T>(idParts.join(':'))\n  }\n\n  private async transformModuleIdentifier(identifier: ModuleIdentifier) {\n    let id = identifier\n    for (const transformer of this.moduleIdentifierTransformers ?? []) {\n      id = await transformer.transform(id)\n    }\n    return id\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { Address, isAddress } from '@xylabs/hex'\nimport { compact } from '@xylabs/lodash'\nimport { Promisable } from '@xylabs/promise'\nimport {\n  isAddressModuleFilter,\n  isModuleName,\n  isNameModuleFilter,\n  isQueryModuleFilter,\n  ModuleFilter,\n  ModuleFilterOptions,\n  ModuleIdentifier,\n  ModuleInstance,\n  ModuleName,\n  ModuleRepository,\n  ModuleResolver,\n  ModuleResolverInstance,\n} from '@xyo-network/module-model'\n\n//This class is now package private (not exported from index.ts)\nexport class SimpleModuleResolver implements ModuleRepository, ModuleResolver {\n  private addressToName: Record<Address, ModuleName> = {}\n  private modules: Record<Address, ModuleInstance> = {}\n\n  add(module: ModuleInstance): this\n  add(module: ModuleInstance[]): this\n  add(module: ModuleInstance | ModuleInstance[]): this {\n    if (Array.isArray(module)) {\n      for (const mod of module) this.addSingleModule(mod)\n    } else {\n      this.addSingleModule(module)\n    }\n    return this\n  }\n\n  addResolver(_resolver: ModuleResolverInstance): this {\n    throw 'Adding resolvers not supported'\n  }\n\n  remove(address: Address | Address[]): this {\n    if (Array.isArray(address)) {\n      for (const addr of address) this.removeSingleModule(addr)\n    } else {\n      this.removeSingleModule(address)\n    }\n    return this\n  }\n\n  removeResolver(_resolver: ModuleResolverInstance): this {\n    throw 'Removing resolvers not supported'\n  }\n\n  resolve<T extends ModuleInstance = ModuleInstance>(all: '*', options?: ModuleFilterOptions<T>): Promisable<T[]>\n  resolve<T extends ModuleInstance = ModuleInstance>(filter: ModuleFilter<T>, options?: ModuleFilterOptions<T>): Promisable<T[]>\n  resolve<T extends ModuleInstance = ModuleInstance>(id: ModuleIdentifier, options?: ModuleFilterOptions<T>): Promisable<T | undefined>\n  /** @deprecated use '*' if trying to resolve all */\n  resolve<T extends ModuleInstance = ModuleInstance>(filter?: ModuleFilter<T>, options?: ModuleFilterOptions<T>): Promisable<T[]>\n  resolve<T extends ModuleInstance = ModuleInstance>(\n    idOrFilter: ModuleFilter<T> | string = '*',\n    options?: ModuleFilterOptions<T>,\n  ): Promisable<T[] | T | undefined> {\n    const unfiltered = (() => {\n      if (idOrFilter) {\n        if (typeof idOrFilter === 'string') {\n          if (idOrFilter === '*') {\n            return Object.values(this.modules) as T[]\n          }\n          const id = idOrFilter as ModuleIdentifier\n          const name = isModuleName(id) ? id : undefined\n          const address = isAddress(id) ? id : undefined\n          assertEx(name || address, () => 'module identifier must be a ModuleName or Address')\n          return (\n            (name ? this.resolveByName<T>(Object.values(this.modules), [name]).pop() : undefined) ??\n            (address ? this.resolveByAddress<T>(this.modules, [address]).pop() : undefined)\n          )\n        } else {\n          const filter = idOrFilter\n          if (isAddressModuleFilter(filter)) {\n            return this.resolveByAddress<T>(this.modules, filter.address)\n          } else if (isNameModuleFilter(filter)) {\n            return this.resolveByName<T>(Object.values(this.modules), filter.name)\n          } else if (isQueryModuleFilter(filter)) {\n            return this.resolveByQuery<T>(Object.values(this.modules), filter.query)\n          }\n        }\n      } else {\n        return Object.values(this.modules) as T[]\n      }\n    })()\n    const identity = options?.identity\n    if (identity) {\n      return (\n        Array.isArray(unfiltered) ? unfiltered?.filter((module) => identity(module))\n        : identity(unfiltered) ? unfiltered\n        : undefined\n      )\n    } else {\n      return unfiltered\n    }\n  }\n\n  private addSingleModule(module?: ModuleInstance) {\n    if (module) {\n      this.modules[module.address] = module\n    }\n  }\n\n  private removeSingleModule(address: Address) {\n    assertEx(isAddress(address), () => 'Invalid address')\n    if (address && this.modules[address]) {\n      delete this.modules[address]\n      const name = this.addressToName[address]\n      if (name) {\n        delete this.addressToName[address]\n      }\n    }\n  }\n\n  private resolveByAddress<T extends ModuleInstance = ModuleInstance>(modules: Record<Address, ModuleInstance>, address: Address[]): T[] {\n    return compact(\n      address.map((address) => {\n        return modules[address]\n      }),\n    ) as T[]\n  }\n\n  private resolveByName<T extends ModuleInstance = ModuleInstance>(modules: ModuleInstance[], name: ModuleName[]): T[] {\n    return compact(\n      name.map((name) => {\n        return modules.find((module) => module.config.name === name)\n      }),\n    ) as T[]\n  }\n\n  private resolveByQuery<T extends ModuleInstance = ModuleInstance>(modules: ModuleInstance[], query: string[][]): T[] {\n    return compact(\n      modules.filter((module) =>\n        query?.reduce((supported, queryList) => {\n          return (\n            // eslint-disable-next-line unicorn/no-array-reduce\n            queryList.reduce((supported, query) => {\n              const queryable = module.queries.includes(query)\n              return supported && queryable\n            }, true) || supported\n          )\n        }, false),\n      ),\n    ) as T[]\n  }\n}\n","import { Module, ModuleFilter, ModuleResolver } from '@xyo-network/module-model'\n\nexport interface ModuleResolvedEventArgs {\n  filter?: ModuleFilter\n  module: Module\n}\n\nexport interface ResolverEventEmitter {\n  on(event: 'moduleResolved', listener: (args: ModuleResolvedEventArgs) => void): void\n}\n\ntype ListenerFunction = (args: ModuleResolvedEventArgs) => void\n\nconst getMixin = <T extends ModuleResolver = ModuleResolver>(resolver: T) => {\n  const listeners: ListenerFunction[] = []\n  const emit = (event: 'moduleResolved', args: ModuleResolvedEventArgs): boolean => {\n    if (listeners.length === 0) return false\n    listeners.map((listener) => listener(args))\n    return true\n  }\n  const onModuleResolved = (module: Module, filter?: ModuleFilter) => {\n    const args = { filter, module }\n    emit('moduleResolved', args)\n  }\n  // eslint-disable-next-line deprecation/deprecation\n  const { resolve } = resolver\n  function originalResolve(filter?: ModuleFilter) {\n    return resolve.bind(resolver)(filter)\n  }\n\n  return {\n    on: (event: 'moduleResolved', listener: (args: ModuleResolvedEventArgs) => void) => {\n      listeners.push(listener)\n    },\n    resolve: async (filter?: ModuleFilter): Promise<Module[]> => {\n      const modules: Module[] = await originalResolve(filter)\n      await Promise.allSettled(modules.map((mod) => onModuleResolved(mod, filter)))\n      return modules\n    },\n  }\n}\n\nexport const mixinResolverEventEmitter = <T extends ModuleResolver = ModuleResolver>(resolver: T): T & ResolverEventEmitter => {\n  const mixin = getMixin(resolver)\n  const ret = Object.assign(resolver, mixin)\n  return ret\n}\n"],"mappings":"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","names":["assertEx","exists","Base","duplicateModules","LRUCache","assertEx","isAddress","compact","isAddressModuleFilter","isModuleName","isNameModuleFilter","isQueryModuleFilter","SimpleModuleResolver","addressToName","modules","add","module","Array","isArray","mod","addSingleModule","addResolver","_resolver","remove","address","addr","removeSingleModule","removeResolver","resolve","idOrFilter","options","unfiltered","Object","values","id","name","isModuleName","undefined","isAddress","assertEx","resolveByName","pop","resolveByAddress","filter","isAddressModuleFilter","isNameModuleFilter","isQueryModuleFilter","resolveByQuery","query","identity","compact","map","find","config","reduce","supported","queryList","queryable","queries","includes","moduleIdentifierParts","moduleIdentifier","split","CompositeModuleResolver","Base","resolvers","_cache","_localResolver","constructor","cache","params","localResolver","SimpleModuleResolver","addResolver","max","ttl","LRUCache","moduleIdentifierTransformers","add","module","Array","isArray","mod","addSingleModule","resolver","push","remove","addresses","address","removeSingleModule","removeResolver","filter","item","resolve","idOrFilter","options","mutatedOptions","maxDepth","defaultMaxDepth","all","result","Promise","map","flatResult","flat","exists","duplicateModules","idParts","length","resolveMultipartIdentifier","id","transformModuleIdentifier","undefined","cachedResult","get","status","delete","results","pop","set","assertEx","shift","join","identifier","transformer","transform","getMixin","resolver","listeners","emit","event","args","length","map","listener","onModuleResolved","module","filter","resolve","originalResolve","bind","on","push","modules","Promise","allSettled","mod","mixinResolverEventEmitter","mixin","ret","Object","assign"]}
+{"version":3,"sources":["../../src/CompositeModuleResolver.ts","../../src/AbstractModuleResolver.ts","../../src/SimpleModuleResolver.ts","../../src/ResolverEventEmitter.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport { Address } from '@xylabs/hex'\nimport { BaseParams } from '@xylabs/object'\nimport { Promisable } from '@xylabs/promise'\nimport {\n  CacheConfig,\n  duplicateModules,\n  ModuleFilter,\n  ModuleFilterOptions,\n  ModuleIdentifier,\n  ModuleIdentifierPart,\n  ModuleInstance,\n  ModuleRepository,\n  ModuleResolverInstance,\n} from '@xyo-network/module-model'\nimport { LRUCache } from 'lru-cache'\n\nimport { AbstractModuleResolver } from './AbstractModuleResolver'\nimport { SimpleModuleResolver } from './SimpleModuleResolver'\nimport { ModuleIdentifierTransformer } from './transformers'\n\nexport type ModuleIdentifierTransformerFunc = (id: ModuleIdentifier) => Promisable<ModuleIdentifier>\n\nexport interface ModuleResolverParams extends BaseParams {\n  cache?: CacheConfig\n  moduleIdentifierTransformers?: ModuleIdentifierTransformer[]\n}\n\nconst moduleIdentifierParts = (moduleIdentifier: ModuleIdentifier): ModuleIdentifierPart[] => {\n  return moduleIdentifier?.split(':') as ModuleIdentifierPart[]\n}\n\nexport class CompositeModuleResolver extends AbstractModuleResolver<ModuleResolverParams> implements ModuleRepository, ModuleResolverInstance {\n  static defaultMaxDepth = 5\n  protected _cache: LRUCache<ModuleIdentifier, ModuleInstance>\n  protected resolvers: ModuleResolverInstance[] = []\n  private _localResolver: SimpleModuleResolver\n\n  constructor({ cache, ...params }: ModuleResolverParams = {}) {\n    super(params)\n    const localResolver = new SimpleModuleResolver()\n    this.addResolver(localResolver)\n    const { max = 100, ttl = 1000 * 5 /* five seconds */ } = cache ?? {}\n    this._cache = new LRUCache<ModuleIdentifier, ModuleInstance>({ max, ttl, ...cache })\n    this._localResolver = localResolver\n  }\n\n  private get moduleIdentifierTransformers() {\n    return this.params.moduleIdentifierTransformers\n  }\n\n  add(module: ModuleInstance): this\n  add(module: ModuleInstance[]): this\n  add(module: ModuleInstance | ModuleInstance[]): this {\n    if (Array.isArray(module)) {\n      for (const mod of module) this.addSingleModule(mod)\n    } else {\n      this.addSingleModule(module)\n    }\n    return this\n  }\n\n  addResolver(resolver: ModuleResolverInstance): this {\n    this.resolvers.push(resolver)\n    return this\n  }\n\n  remove(addresses: Address[] | Address): this {\n    if (Array.isArray(addresses)) {\n      for (const address of addresses) this.removeSingleModule(address)\n    } else {\n      this.removeSingleModule(addresses)\n    }\n    return this\n  }\n\n  removeResolver(resolver: ModuleResolverInstance): this {\n    this.resolvers = this.resolvers.filter((item) => item !== resolver)\n    return this\n  }\n\n  async resolveHandler<T extends ModuleInstance = ModuleInstance>(\n    idOrFilter: ModuleFilter<T> | ModuleIdentifier = '*',\n    options?: ModuleFilterOptions<T>,\n  ): Promise<T | T[] | undefined> {\n    const mutatedOptions = { ...options, maxDepth: (options?.maxDepth ?? CompositeModuleResolver.defaultMaxDepth) - 1 }\n\n    //resolve all\n    if (idOrFilter === '*') {\n      const all = idOrFilter\n      if (mutatedOptions.maxDepth < 0) {\n        return []\n      }\n      const result = await Promise.all(\n        this.resolvers.map(async (resolver) => {\n          const result: T[] = await resolver.resolve<T>(all, mutatedOptions)\n          return result\n        }),\n      )\n      const flatResult: T[] = result.flat().filter(exists)\n      return flatResult.filter(duplicateModules)\n    }\n\n    if (typeof idOrFilter === 'string') {\n      //resolve ModuleIdentifier\n      const idParts = moduleIdentifierParts(idOrFilter)\n      if (idParts.length > 1) {\n        return await this.resolveMultipartIdentifier<T>(idOrFilter)\n      }\n      const id = await this.transformModuleIdentifier(idOrFilter)\n      if (mutatedOptions.maxDepth < 0) {\n        return undefined\n      }\n      const cachedResult = this._cache.get(id)\n      if (cachedResult) {\n        if (cachedResult.status === 'dead') {\n          this._cache.delete(id)\n        } else {\n          return cachedResult as T\n        }\n      }\n      const results = await Promise.all(\n        this.resolvers.map(async (resolver) => {\n          const result: T | undefined = await resolver.resolve<T>(id, mutatedOptions)\n          return result\n        }),\n      )\n      const result: T | undefined = results.filter(exists).filter(duplicateModules).pop()\n      if (result) {\n        this._cache.set(id, result)\n      }\n      return result\n    } else {\n      //resolve filter\n      const filter = idOrFilter\n      if (mutatedOptions.maxDepth < 0) {\n        return []\n      }\n      const result = await Promise.all(\n        this.resolvers.map(async (resolver) => {\n          const result: T[] = await resolver.resolve<T>(filter, mutatedOptions)\n          return result\n        }),\n      )\n      const flatResult: T[] = result.flat().filter(exists)\n      return flatResult.filter(duplicateModules)\n    }\n  }\n\n  private addSingleModule(module?: ModuleInstance) {\n    if (module) {\n      this._localResolver.add(module)\n    }\n  }\n  private removeSingleModule(address: Address) {\n    this._localResolver.remove(address)\n  }\n\n  private async resolveMultipartIdentifier<T extends ModuleInstance = ModuleInstance>(moduleIdentifier: ModuleIdentifier): Promise<T | undefined> {\n    const idParts = moduleIdentifierParts(moduleIdentifier)\n    assertEx(idParts.length >= 2, () => 'Not a valid multipart identifier')\n    const id = assertEx(idParts.shift())\n    const module = await this.resolve<T>(id)\n    return await module?.resolve<T>(idParts.join(':'))\n  }\n\n  private async transformModuleIdentifier(identifier: ModuleIdentifier) {\n    let id = identifier\n    for (const transformer of this.moduleIdentifierTransformers ?? []) {\n      id = await transformer.transform(id)\n    }\n    return id\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { Base, BaseParams, toJsonString } from '@xylabs/object'\nimport { Promisable } from '@xylabs/promise'\nimport { asModuleInstance, ModuleFilter, ModuleFilterOptions, ModuleIdentifier, ModuleInstance, ModuleResolver } from '@xyo-network/module-model'\n\nexport abstract class AbstractModuleResolver<T extends BaseParams = BaseParams> extends Base<T> implements ModuleResolver {\n  async resolve<T extends ModuleInstance = ModuleInstance>(all: '*', options?: ModuleFilterOptions<T>): Promise<T[]>\n  async resolve<T extends ModuleInstance = ModuleInstance>(filter: ModuleFilter<T>, options?: ModuleFilterOptions<T>): Promise<T[]>\n  async resolve<T extends ModuleInstance = ModuleInstance>(id: ModuleIdentifier, options?: ModuleFilterOptions<T>): Promise<T | undefined>\n  /** @deprecated use '*' if trying to resolve all */\n  async resolve<T extends ModuleInstance = ModuleInstance>(filter?: ModuleFilter<T>, options?: ModuleFilterOptions<T>): Promise<T[]>\n  async resolve<T extends ModuleInstance = ModuleInstance>(\n    idOrFilter: ModuleFilter<T> | string = '*',\n    options?: ModuleFilterOptions<T>,\n  ): Promise<T[] | T | undefined> {\n    if (idOrFilter === '*') {\n      const values = (await this.resolveHandler(idOrFilter, options)) as []\n      assertEx(Array.isArray(values), () => 'resolveHandler returned a non-array')\n      return values.map((value) =>\n        asModuleInstance<T>(value, () => {\n          // eslint-disable-next-line @typescript-eslint/no-explicit-any\n          return `resolveHandler returned invalid result (*) [${(value as any)?.constructor?.name}][${toJsonString(value)}]`\n        }),\n      )\n    }\n    switch (typeof idOrFilter) {\n      case 'string': {\n        const value = await this.resolveHandler(idOrFilter, options)\n        return asModuleInstance<T>(\n          value,\n          () =>\n            // eslint-disable-next-line @typescript-eslint/no-explicit-any\n            `resolveHandler returned invalid result (string) [${(value as any)?.constructor?.name}][${toJsonString(value)}]`,\n        )\n      }\n      default: {\n        const values = (await this.resolveHandler(idOrFilter, options)) as []\n        assertEx(Array.isArray(values), () => 'resolveHandler returned a non-array')\n        return values.map((value) =>\n          asModuleInstance<T>(value, () => {\n            // eslint-disable-next-line @typescript-eslint/no-explicit-any\n            return `resolveHandler returned invalid result (filter) [${(value as any)?.constructor?.name}][${toJsonString(value)}]`\n          }),\n        )\n      }\n    }\n  }\n\n  abstract resolveHandler<T extends ModuleInstance = ModuleInstance>(\n    idOrFilter: ModuleFilter<T> | ModuleIdentifier,\n    options?: ModuleFilterOptions<T>,\n  ): Promisable<T | T[] | undefined>\n}\n","import { assertEx } from '@xylabs/assert'\nimport { Address, isAddress } from '@xylabs/hex'\nimport { compact } from '@xylabs/lodash'\nimport { Promisable } from '@xylabs/promise'\nimport {\n  isAddressModuleFilter,\n  isModuleName,\n  isNameModuleFilter,\n  isQueryModuleFilter,\n  ModuleFilter,\n  ModuleFilterOptions,\n  ModuleIdentifier,\n  ModuleInstance,\n  ModuleName,\n  ModuleRepository,\n  ModuleResolverInstance,\n} from '@xyo-network/module-model'\n\nimport { AbstractModuleResolver } from './AbstractModuleResolver'\n\n//This class is now package private (not exported from index.ts)\nexport class SimpleModuleResolver extends AbstractModuleResolver implements ModuleRepository {\n  private addressToName: Record<Address, ModuleName> = {}\n  private modules: Record<Address, ModuleInstance> = {}\n\n  constructor() {\n    super({})\n  }\n\n  add(module: ModuleInstance): this\n  add(module: ModuleInstance[]): this\n  add(module: ModuleInstance | ModuleInstance[]): this {\n    if (Array.isArray(module)) {\n      for (const mod of module) this.addSingleModule(mod)\n    } else {\n      this.addSingleModule(module)\n    }\n    return this\n  }\n\n  addResolver(_resolver: ModuleResolverInstance): this {\n    throw 'Adding resolvers not supported'\n  }\n\n  remove(address: Address | Address[]): this {\n    if (Array.isArray(address)) {\n      for (const addr of address) this.removeSingleModule(addr)\n    } else {\n      this.removeSingleModule(address)\n    }\n    return this\n  }\n\n  removeResolver(_resolver: ModuleResolverInstance): this {\n    throw 'Removing resolvers not supported'\n  }\n\n  resolveHandler<T extends ModuleInstance = ModuleInstance>(\n    idOrFilter: ModuleFilter<T> | string = '*',\n    options?: ModuleFilterOptions<T>,\n  ): Promisable<T[] | T | undefined> {\n    const unfiltered = (() => {\n      if (idOrFilter) {\n        if (typeof idOrFilter === 'string') {\n          if (idOrFilter === '*') {\n            return Object.values(this.modules) as T[]\n          }\n          const id = idOrFilter as ModuleIdentifier\n          const name = isModuleName(id) ? id : undefined\n          const address = isAddress(id) ? id : undefined\n          assertEx(name || address, () => 'module identifier must be a ModuleName or Address')\n          return (\n            (name ? this.resolveByName<T>(Object.values(this.modules), [name]).pop() : undefined) ??\n            (address ? this.resolveByAddress<T>(this.modules, [address]).pop() : undefined)\n          )\n        } else {\n          const filter = idOrFilter\n          if (isAddressModuleFilter(filter)) {\n            return this.resolveByAddress<T>(this.modules, filter.address)\n          } else if (isNameModuleFilter(filter)) {\n            return this.resolveByName<T>(Object.values(this.modules), filter.name)\n          } else if (isQueryModuleFilter(filter)) {\n            return this.resolveByQuery<T>(Object.values(this.modules), filter.query)\n          }\n        }\n      } else {\n        return Object.values(this.modules) as T[]\n      }\n    })()\n    const identity = options?.identity\n    if (identity) {\n      return (\n        Array.isArray(unfiltered) ? unfiltered?.filter((module) => identity(module))\n        : identity(unfiltered) ? unfiltered\n        : undefined\n      )\n    } else {\n      return unfiltered\n    }\n  }\n\n  private addSingleModule(module?: ModuleInstance) {\n    if (module) {\n      this.modules[module.address] = module\n    }\n  }\n\n  private removeSingleModule(address: Address) {\n    assertEx(isAddress(address), () => 'Invalid address')\n    if (address && this.modules[address]) {\n      delete this.modules[address]\n      const name = this.addressToName[address]\n      if (name) {\n        delete this.addressToName[address]\n      }\n    }\n  }\n\n  private resolveByAddress<T extends ModuleInstance = ModuleInstance>(modules: Record<Address, ModuleInstance>, address: Address[]): T[] {\n    return compact(\n      address.map((address) => {\n        return modules[address]\n      }),\n    ) as T[]\n  }\n\n  private resolveByName<T extends ModuleInstance = ModuleInstance>(modules: ModuleInstance[], name: ModuleName[]): T[] {\n    return compact(\n      name.map((name) => {\n        return modules.find((module) => module.config.name === name)\n      }),\n    ) as T[]\n  }\n\n  private resolveByQuery<T extends ModuleInstance = ModuleInstance>(modules: ModuleInstance[], query: string[][]): T[] {\n    return compact(\n      modules.filter((module) =>\n        query?.reduce((supported, queryList) => {\n          return (\n            // eslint-disable-next-line unicorn/no-array-reduce\n            queryList.reduce((supported, query) => {\n              const queryable = module.queries.includes(query)\n              return supported && queryable\n            }, true) || supported\n          )\n        }, false),\n      ),\n    ) as T[]\n  }\n}\n","import { Module, ModuleFilter, ModuleResolver } from '@xyo-network/module-model'\n\nexport interface ModuleResolvedEventArgs {\n  filter?: ModuleFilter\n  module: Module\n}\n\nexport interface ResolverEventEmitter {\n  on(event: 'moduleResolved', listener: (args: ModuleResolvedEventArgs) => void): void\n}\n\ntype ListenerFunction = (args: ModuleResolvedEventArgs) => void\n\nconst getMixin = <T extends ModuleResolver = ModuleResolver>(resolver: T) => {\n  const listeners: ListenerFunction[] = []\n  const emit = (event: 'moduleResolved', args: ModuleResolvedEventArgs): boolean => {\n    if (listeners.length === 0) return false\n    listeners.map((listener) => listener(args))\n    return true\n  }\n  const onModuleResolved = (module: Module, filter?: ModuleFilter) => {\n    const args = { filter, module }\n    emit('moduleResolved', args)\n  }\n  // eslint-disable-next-line deprecation/deprecation\n  const { resolve } = resolver\n  function originalResolve(filter?: ModuleFilter) {\n    return resolve.bind(resolver)(filter)\n  }\n\n  return {\n    on: (event: 'moduleResolved', listener: (args: ModuleResolvedEventArgs) => void) => {\n      listeners.push(listener)\n    },\n    resolve: async (filter?: ModuleFilter): Promise<Module[]> => {\n      const modules: Module[] = await originalResolve(filter)\n      await Promise.allSettled(modules.map((mod) => onModuleResolved(mod, filter)))\n      return modules\n    },\n  }\n}\n\nexport const mixinResolverEventEmitter = <T extends ModuleResolver = ModuleResolver>(resolver: T): T & ResolverEventEmitter => {\n  const mixin = getMixin(resolver)\n  const ret = Object.assign(resolver, mixin)\n  return ret\n}\n"],"mappings":"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","names":["assertEx","exists","duplicateModules","LRUCache","assertEx","Base","toJsonString","asModuleInstance","AbstractModuleResolver","Base","resolve","idOrFilter","options","values","resolveHandler","assertEx","Array","isArray","map","value","asModuleInstance","constructor","name","toJsonString","assertEx","isAddress","compact","isAddressModuleFilter","isModuleName","isNameModuleFilter","isQueryModuleFilter","SimpleModuleResolver","AbstractModuleResolver","addressToName","modules","constructor","add","module","Array","isArray","mod","addSingleModule","addResolver","_resolver","remove","address","addr","removeSingleModule","removeResolver","resolveHandler","idOrFilter","options","unfiltered","Object","values","id","name","isModuleName","undefined","isAddress","assertEx","resolveByName","pop","resolveByAddress","filter","isAddressModuleFilter","isNameModuleFilter","isQueryModuleFilter","resolveByQuery","query","identity","compact","map","find","config","reduce","supported","queryList","queryable","queries","includes","moduleIdentifierParts","moduleIdentifier","split","CompositeModuleResolver","AbstractModuleResolver","_cache","resolvers","_localResolver","constructor","cache","params","localResolver","SimpleModuleResolver","addResolver","max","ttl","LRUCache","moduleIdentifierTransformers","add","module","Array","isArray","mod","addSingleModule","resolver","push","remove","addresses","address","removeSingleModule","removeResolver","filter","item","resolveHandler","idOrFilter","options","mutatedOptions","maxDepth","defaultMaxDepth","all","result","Promise","map","resolve","flatResult","flat","exists","duplicateModules","idParts","length","resolveMultipartIdentifier","id","transformModuleIdentifier","undefined","cachedResult","get","status","delete","results","pop","set","assertEx","shift","join","identifier","transformer","transform","getMixin","resolver","listeners","emit","event","args","length","map","listener","onModuleResolved","module","filter","resolve","originalResolve","bind","on","push","modules","Promise","allSettled","mod","mixinResolverEventEmitter","mixin","ret","Object","assign"]}

package/dist/node/toJson.d.cts

@@ -0,0 +1,3 @@
+import { JsonValue } from '@xylabs/object';
+export declare const toJson: (value: unknown, maxDepth?: number) => JsonValue;
+//# sourceMappingURL=toJson.d.ts.map

package/dist/node/toJson.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"toJson.d.ts","sourceRoot":"","sources":["../../src/toJson.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,SAAS,EAAE,MAAM,gBAAgB,CAAA;AA0CjE,eAAO,MAAM,MAAM,UAAW,OAAO,wBAAiB,SAErD,CAAA"}

package/dist/node/toJson.d.mts

@@ -0,0 +1,3 @@
+import { JsonValue } from '@xylabs/object';
+export declare const toJson: (value: unknown, maxDepth?: number) => JsonValue;
+//# sourceMappingURL=toJson.d.ts.map

package/dist/node/toJson.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"toJson.d.ts","sourceRoot":"","sources":["../../src/toJson.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,SAAS,EAAE,MAAM,gBAAgB,CAAA;AA0CjE,eAAO,MAAM,MAAM,UAAW,OAAO,wBAAiB,SAErD,CAAA"}

package/dist/node/toJson.d.ts

@@ -0,0 +1,3 @@
+import { JsonValue } from '@xylabs/object';
+export declare const toJson: (value: unknown, maxDepth?: number) => JsonValue;
+//# sourceMappingURL=toJson.d.ts.map

package/dist/node/toJson.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"toJson.d.ts","sourceRoot":"","sources":["../../src/toJson.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,SAAS,EAAE,MAAM,gBAAgB,CAAA;AA0CjE,eAAO,MAAM,MAAM,UAAW,OAAO,wBAAiB,SAErD,CAAA"}

package/package.json

@@ -10,13 +10,13 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/assert": "^3.0.15",
-    "@xylabs/exists": "^3.0.15",
-    "@xylabs/hex": "^3.0.15",
-    "@xylabs/lodash": "^3.0.15",
-    "@xylabs/object": "^3.0.15",
-    "@xylabs/promise": "^3.0.15",
-    "@xyo-network/module-model": "~2.92.11",
+    "@xylabs/assert": "^3.0.24",
+    "@xylabs/exists": "^3.0.24",
+    "@xylabs/hex": "^3.0.24",
+    "@xylabs/lodash": "^3.0.24",
+    "@xylabs/object": "^3.0.24",
+    "@xylabs/promise": "^3.0.24",
+    "@xyo-network/module-model": "~2.93.0-rc.2",
     "lru-cache": "^10.2.0"
   },
   "devDependencies": {
@@ -24,7 +24,7 @@
     "@xylabs/tsconfig": "^3.5.2",
     "jest": "^29.7.0",
     "jest-mock-extended": "^3.0.5",
-    "typescript": "^5.4.2"
+    "typescript": "^5.4.3"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "types": "dist/node/index.d.ts",
@@ -65,6 +65,7 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.92.11",
-  "type": "module"
+  "version": "2.93.0-rc.2",
+  "type": "module",
+  "stableVersion": "2.92.11"
 }

package/src/AbstractModuleResolver.ts

@@ -0,0 +1,53 @@
+import { assertEx } from '@xylabs/assert'
+import { Base, BaseParams, toJsonString } from '@xylabs/object'
+import { Promisable } from '@xylabs/promise'
+import { asModuleInstance, ModuleFilter, ModuleFilterOptions, ModuleIdentifier, ModuleInstance, ModuleResolver } from '@xyo-network/module-model'
+
+export abstract class AbstractModuleResolver<T extends BaseParams = BaseParams> extends Base<T> implements ModuleResolver {
+  async resolve<T extends ModuleInstance = ModuleInstance>(all: '*', options?: ModuleFilterOptions<T>): Promise<T[]>
+  async resolve<T extends ModuleInstance = ModuleInstance>(filter: ModuleFilter<T>, options?: ModuleFilterOptions<T>): Promise<T[]>
+  async resolve<T extends ModuleInstance = ModuleInstance>(id: ModuleIdentifier, options?: ModuleFilterOptions<T>): Promise<T | undefined>
+  /** @deprecated use '*' if trying to resolve all */
+  async resolve<T extends ModuleInstance = ModuleInstance>(filter?: ModuleFilter<T>, options?: ModuleFilterOptions<T>): Promise<T[]>
+  async resolve<T extends ModuleInstance = ModuleInstance>(
+    idOrFilter: ModuleFilter<T> | string = '*',
+    options?: ModuleFilterOptions<T>,
+  ): Promise<T[] | T | undefined> {
+    if (idOrFilter === '*') {
+      const values = (await this.resolveHandler(idOrFilter, options)) as []
+      assertEx(Array.isArray(values), () => 'resolveHandler returned a non-array')
+      return values.map((value) =>
+        asModuleInstance<T>(value, () => {
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          return `resolveHandler returned invalid result (*) [${(value as any)?.constructor?.name}][${toJsonString(value)}]`
+        }),
+      )
+    }
+    switch (typeof idOrFilter) {
+      case 'string': {
+        const value = await this.resolveHandler(idOrFilter, options)
+        return asModuleInstance<T>(
+          value,
+          () =>
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            `resolveHandler returned invalid result (string) [${(value as any)?.constructor?.name}][${toJsonString(value)}]`,
+        )
+      }
+      default: {
+        const values = (await this.resolveHandler(idOrFilter, options)) as []
+        assertEx(Array.isArray(values), () => 'resolveHandler returned a non-array')
+        return values.map((value) =>
+          asModuleInstance<T>(value, () => {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            return `resolveHandler returned invalid result (filter) [${(value as any)?.constructor?.name}][${toJsonString(value)}]`
+          }),
+        )
+      }
+    }
+  }
+
+  abstract resolveHandler<T extends ModuleInstance = ModuleInstance>(
+    idOrFilter: ModuleFilter<T> | ModuleIdentifier,
+    options?: ModuleFilterOptions<T>,
+  ): Promisable<T | T[] | undefined>
+}

package/src/CompositeModuleResolver.ts

@@ -1,7 +1,7 @@
 import { assertEx } from '@xylabs/assert'
 import { exists } from '@xylabs/exists'
 import { Address } from '@xylabs/hex'
-import { Base, BaseParams } from '@xylabs/object'
+import { BaseParams } from '@xylabs/object'
 import { Promisable } from '@xylabs/promise'
 import {
   CacheConfig,
@@ -16,6 +16,7 @@ import {
 } from '@xyo-network/module-model'
 import { LRUCache } from 'lru-cache'
 
+import { AbstractModuleResolver } from './AbstractModuleResolver'
 import { SimpleModuleResolver } from './SimpleModuleResolver'
 import { ModuleIdentifierTransformer } from './transformers'
 
@@ -30,10 +31,10 @@ const moduleIdentifierParts = (moduleIdentifier: ModuleIdentifier): ModuleIdenti
   return moduleIdentifier?.split(':') as ModuleIdentifierPart[]
 }
 
-export class CompositeModuleResolver extends Base<ModuleResolverParams> implements ModuleRepository, ModuleResolverInstance {
+export class CompositeModuleResolver extends AbstractModuleResolver<ModuleResolverParams> implements ModuleRepository, ModuleResolverInstance {
   static defaultMaxDepth = 5
+  protected _cache: LRUCache<ModuleIdentifier, ModuleInstance>
   protected resolvers: ModuleResolverInstance[] = []
-  private _cache: LRUCache<ModuleIdentifier, ModuleInstance>
   private _localResolver: SimpleModuleResolver
 
   constructor({ cache, ...params }: ModuleResolverParams = {}) {
@@ -78,14 +79,8 @@ export class CompositeModuleResolver extends Base<ModuleResolverParams> implemen
     this.resolvers = this.resolvers.filter((item) => item !== resolver)
     return this
   }
-  /** @deprecated do not pass undefined.  If trying to get all, pass '*' */
-  async resolve(): Promise<ModuleInstance[]>
-  async resolve<T extends ModuleInstance = ModuleInstance>(all: '*', options?: ModuleFilterOptions<T>): Promise<T[]>
-  async resolve<T extends ModuleInstance = ModuleInstance>(filter: ModuleFilter<T>, options?: ModuleFilterOptions<T>): Promise<T[]>
-  async resolve<T extends ModuleInstance = ModuleInstance>(id: ModuleIdentifier, options?: ModuleFilterOptions<T>): Promise<T | undefined>
-  /** @deprecated use '*' if trying to resolve all */
-  async resolve<T extends ModuleInstance = ModuleInstance>(filter?: ModuleFilter<T>, options?: ModuleFilterOptions<T>): Promise<T[]>
-  async resolve<T extends ModuleInstance = ModuleInstance>(
+
+  async resolveHandler<T extends ModuleInstance = ModuleInstance>(
     idOrFilter: ModuleFilter<T> | ModuleIdentifier = '*',
     options?: ModuleFilterOptions<T>,
   ): Promise<T | T[] | undefined> {
@@ -166,7 +161,7 @@ export class CompositeModuleResolver extends Base<ModuleResolverParams> implemen
     const idParts = moduleIdentifierParts(moduleIdentifier)
     assertEx(idParts.length >= 2, () => 'Not a valid multipart identifier')
     const id = assertEx(idParts.shift())
-    const module = await this.resolve(id)
+    const module = await this.resolve<T>(id)
     return await module?.resolve<T>(idParts.join(':'))
   }
 

package/src/SimpleModuleResolver.ts

@@ -13,15 +13,20 @@ import {
   ModuleInstance,
   ModuleName,
   ModuleRepository,
-  ModuleResolver,
   ModuleResolverInstance,
 } from '@xyo-network/module-model'
 
+import { AbstractModuleResolver } from './AbstractModuleResolver'
+
 //This class is now package private (not exported from index.ts)
-export class SimpleModuleResolver implements ModuleRepository, ModuleResolver {
+export class SimpleModuleResolver extends AbstractModuleResolver implements ModuleRepository {
   private addressToName: Record<Address, ModuleName> = {}
   private modules: Record<Address, ModuleInstance> = {}
 
+  constructor() {
+    super({})
+  }
+
   add(module: ModuleInstance): this
   add(module: ModuleInstance[]): this
   add(module: ModuleInstance | ModuleInstance[]): this {
@@ -50,12 +55,7 @@ export class SimpleModuleResolver implements ModuleRepository, ModuleResolver {
     throw 'Removing resolvers not supported'
   }
 
-  resolve<T extends ModuleInstance = ModuleInstance>(all: '*', options?: ModuleFilterOptions<T>): Promisable<T[]>
-  resolve<T extends ModuleInstance = ModuleInstance>(filter: ModuleFilter<T>, options?: ModuleFilterOptions<T>): Promisable<T[]>
-  resolve<T extends ModuleInstance = ModuleInstance>(id: ModuleIdentifier, options?: ModuleFilterOptions<T>): Promisable<T | undefined>
-  /** @deprecated use '*' if trying to resolve all */
-  resolve<T extends ModuleInstance = ModuleInstance>(filter?: ModuleFilter<T>, options?: ModuleFilterOptions<T>): Promisable<T[]>
-  resolve<T extends ModuleInstance = ModuleInstance>(
+  resolveHandler<T extends ModuleInstance = ModuleInstance>(
     idOrFilter: ModuleFilter<T> | string = '*',
     options?: ModuleFilterOptions<T>,
   ): Promisable<T[] | T | undefined> {

package/src/toJson.ts

@@ -0,0 +1,45 @@
+import { JsonArray, JsonObject, JsonValue } from '@xylabs/object'
+
+const toJsonArray = (value: unknown[], cycleList?: unknown[], maxDepth = 3): JsonArray => {
+  return value.map((item) => toJsonValue(item, cycleList, maxDepth))
+}
+
+const toJsonObject = (value: object, cycleList?: unknown[], maxDepth = 3): JsonObject => {
+  const result: JsonObject = {}
+  for (const [key, entry] of Object.entries(value)) {
+    result[key] = value === undefined ? '[Undefined]' : toJsonValue(entry, cycleList, maxDepth)
+  }
+  return result
+}
+
+const toJsonValue = (value: unknown, cycleList?: unknown[], maxDepth = 3): JsonValue => {
+  console.log(`toJsonValue: ${maxDepth}`)
+  if (maxDepth <= 0 && typeof value === 'object') {
+    return '[MaxDepth]'
+  }
+  if (cycleList?.includes(value)) {
+    return '[Circular]'
+  }
+  switch (typeof value) {
+    case 'string':
+    case 'boolean':
+    case 'number': {
+      return value
+    }
+    case 'object': {
+      if (value === null) {
+        return null
+      }
+      const newCycleList = cycleList ?? []
+      newCycleList.push(value)
+      return Array.isArray(value) ? toJsonArray(value, newCycleList, maxDepth - 1) : toJsonObject(value, newCycleList, maxDepth - 1)
+    }
+    default: {
+      return `[${typeof value}]`
+    }
+  }
+}
+
+export const toJson = (value: unknown, maxDepth = 3): JsonValue => {
+  return toJsonValue(value, undefined, maxDepth)
+}