@xyo-network/module-abstract 2.70.3 → 2.70.5

package/dist/esm/Resolver/SimpleModuleResolver.js

@@ -1,97 +0,0 @@
-import compact from 'lodash/compact';
-import flatten from 'lodash/flatten';
-//This class is now package private (not exported from index.ts)
-export class SimpleModuleResolver {
-    addressToName = {};
-    modules = {};
-    get isModuleResolver() {
-        return true;
-    }
-    add(module) {
-        if (Array.isArray(module)) {
-            module.forEach((module) => this.addSingleModule(module));
-        }
-        else {
-            this.addSingleModule(module);
-        }
-        return this;
-    }
-    addResolver(_resolver) {
-        throw 'Adding resolvers not supported';
-    }
-    remove(address) {
-        if (Array.isArray(address)) {
-            address.forEach((address) => this.removeSingleModule(address));
-        }
-        else {
-            this.removeSingleModule(address);
-        }
-        return this;
-    }
-    removeResolver(_resolver) {
-        throw 'Removing resolvers not supported';
-    }
-    resolve(nameOrAddressOrFilter) {
-        if (nameOrAddressOrFilter) {
-            if (typeof nameOrAddressOrFilter === 'string') {
-                const result = this.resolveByName(Object.values(this.modules), [nameOrAddressOrFilter]).pop() ??
-                    this.resolveByAddress(Object.values(this.modules), [nameOrAddressOrFilter]).pop();
-                return result;
-            }
-            else if (nameOrAddressOrFilter.address) {
-                const result = this.resolveByAddress(Object.values(this.modules), nameOrAddressOrFilter.address);
-                return result;
-            }
-            else if (nameOrAddressOrFilter.name) {
-                const result = this.resolveByName(Object.values(this.modules), nameOrAddressOrFilter.name);
-                return result;
-            }
-            else if (nameOrAddressOrFilter.query) {
-                return this.resolveByQuery(Object.values(this.modules), nameOrAddressOrFilter.query);
-            }
-        }
-        else {
-            return Object.values(this.modules);
-        }
-    }
-    addSingleModule(module) {
-        if (module) {
-            this.modules[module.address] = module;
-        }
-    }
-    removeSingleModule(address) {
-        if (address) {
-            if (this.modules[address]) {
-                delete this.modules[address];
-                const name = this.addressToName[address];
-                if (name) {
-                    delete this.addressToName[address];
-                }
-            }
-        }
-    }
-    resolveByAddress(modules, address) {
-        return address
-            ? compact(flatten(address?.map((address) => {
-                return modules.filter((module) => module.address === address);
-            })))
-            : modules;
-    }
-    resolveByName(modules, name) {
-        if (name) {
-            return compact(name.map((name) => modules.filter((module) => module.config?.name === name)).flat());
-        }
-        return modules;
-    }
-    resolveByQuery(modules, query) {
-        return query
-            ? compact(modules.filter((module) => query?.reduce((supported, queryList) => {
-                return (queryList.reduce((supported, query) => {
-                    const queryable = module.queries.includes(query);
-                    return supported && queryable;
-                }, true) || supported);
-            }, false)))
-            : modules;
-    }
-}
-//# sourceMappingURL=SimpleModuleResolver.js.map

package/dist/esm/Resolver/SimpleModuleResolver.js.map

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

package/dist/esm/Resolver/index.js

@@ -1,4 +0,0 @@
-export * from './CompositeModuleResolver';
-export * from './ResolverEventEmitter';
-export * from './SimpleModuleResolver';
-//# sourceMappingURL=index.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Resolver/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAA;AACzC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA"}

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

@@ -1,19 +0,0 @@
-import { Base, BaseParams } from '@xyo-network/core';
-import { ModuleFilter, ModuleFilterOptions, ModuleInstance, ModuleRepository, ModuleResolver } from '@xyo-network/module-model';
-export declare class CompositeModuleResolver extends Base implements ModuleRepository, ModuleResolver {
-    static defaultMaxDepth: number;
-    protected resolvers: ModuleResolver[];
-    private localResolver;
-    constructor(params?: BaseParams);
-    get isModuleResolver(): boolean;
-    add(module: ModuleInstance): this;
-    add(module: ModuleInstance[]): this;
-    addResolver(resolver: ModuleResolver): this;
-    remove(addressOrName: string | string[]): this;
-    removeResolver(resolver: ModuleResolver): this;
-    resolve<T extends ModuleInstance = ModuleInstance>(filter?: ModuleFilter<T>, options?: ModuleFilterOptions<T>): Promise<T[]>;
-    resolve<T extends ModuleInstance = ModuleInstance>(nameOrAddress: string, options?: ModuleFilterOptions<T>): Promise<T | undefined>;
-    private addSingleModule;
-    private removeSingleModule;
-}
-//# sourceMappingURL=CompositeModuleResolver.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"CompositeModuleResolver.d.ts","sourceRoot":"","sources":["../../../src/Resolver/CompositeModuleResolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAoB,YAAY,EAAE,mBAAmB,EAAE,cAAc,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAIjJ,qBAAa,uBAAwB,SAAQ,IAAK,YAAW,gBAAgB,EAAE,cAAc;IAC3F,MAAM,CAAC,eAAe,SAAI;IAC1B,SAAS,CAAC,SAAS,EAAE,cAAc,EAAE,CAAK;IAC1C,OAAO,CAAC,aAAa,CAAsB;gBAE/B,MAAM,GAAE,UAAe;IAOnC,IAAI,gBAAgB,YAEnB;IAED,GAAG,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI;IACjC,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI;IAUnC,WAAW,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAK3C,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IAS9C,cAAc,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAKxC,OAAO,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,EAAE,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,mBAAmB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAC5H,OAAO,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,mBAAmB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAiCzI,OAAO,CAAC,eAAe;IAKvB,OAAO,CAAC,kBAAkB;CAG3B"}

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

@@ -1,10 +0,0 @@
-import { Module, ModuleFilter, ModuleResolver } from '@xyo-network/module-model';
-export interface ModuleResolvedEventArgs {
-    filter?: ModuleFilter;
-    module: Module;
-}
-export interface ResolverEventEmitter {
-    on(event: 'moduleResolved', listener: (args: ModuleResolvedEventArgs) => void): void;
-}
-export declare const mixinResolverEventEmitter: <T extends ModuleResolver = ModuleResolver>(resolver: T) => T & ResolverEventEmitter;
-//# sourceMappingURL=ResolverEventEmitter.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"ResolverEventEmitter.d.ts","sourceRoot":"","sources":["../../../src/Resolver/ResolverEventEmitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAEhF,MAAM,WAAW,uBAAuB;IACtC,MAAM,CAAC,EAAE,YAAY,CAAA;IACrB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,oBAAoB;IACnC,EAAE,CAAC,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,uBAAuB,KAAK,IAAI,GAAG,IAAI,CAAA;CACrF;AAgCD,eAAO,MAAM,yBAAyB,sFAIrC,CAAA"}

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

@@ -1,20 +0,0 @@
-import { ModuleFilter, ModuleInstance, ModuleRepository, ModuleResolver } from '@xyo-network/module-model';
-import { Promisable } from '@xyo-network/promise';
-export declare class SimpleModuleResolver implements ModuleRepository {
-    private addressToName;
-    private modules;
-    get isModuleResolver(): boolean;
-    add(module: ModuleInstance): this;
-    add(module: ModuleInstance[]): this;
-    addResolver(_resolver: ModuleResolver): this;
-    remove(address: string | string[]): this;
-    removeResolver(_resolver: ModuleResolver): this;
-    resolve(filter?: ModuleFilter): Promisable<ModuleInstance[]>;
-    resolve(nameOrAddress: string): Promisable<ModuleInstance | undefined>;
-    private addSingleModule;
-    private removeSingleModule;
-    private resolveByAddress;
-    private resolveByName;
-    private resolveByQuery;
-}
-//# sourceMappingURL=SimpleModuleResolver.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"SimpleModuleResolver.d.ts","sourceRoot":"","sources":["../../../src/Resolver/SimpleModuleResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,cAAc,EACd,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,MAAM,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC,cAAc,EAAE,CAAC;IAC5D,OAAO,CAAC,aAAa,EAAE,MAAM,GAAG,UAAU,CAAC,cAAc,GAAG,SAAS,CAAC;IAsBtE,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,gBAAgB;IAYxB,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,cAAc;CAiBvB"}

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

@@ -1,4 +0,0 @@
-export * from './CompositeModuleResolver';
-export * from './ResolverEventEmitter';
-export * from './SimpleModuleResolver';
-//# sourceMappingURL=index.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Resolver/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAA;AACzC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA"}

package/src/Resolver/CompositeModuleResolver.ts

@@ -1,95 +0,0 @@
-import { exists } from '@xylabs/exists'
-import { Base, BaseParams } from '@xyo-network/core'
-import { duplicateModules, ModuleFilter, ModuleFilterOptions, ModuleInstance, ModuleRepository, ModuleResolver } from '@xyo-network/module-model'
-
-import { SimpleModuleResolver } from './SimpleModuleResolver'
-
-export class CompositeModuleResolver extends Base implements ModuleRepository, ModuleResolver {
-  static defaultMaxDepth = 4
-  protected resolvers: ModuleResolver[] = []
-  private localResolver: SimpleModuleResolver
-
-  constructor(params: BaseParams = {}) {
-    super(params)
-    const localResolver = new SimpleModuleResolver()
-    this.addResolver(localResolver)
-    this.localResolver = localResolver
-  }
-
-  get isModuleResolver() {
-    return true
-  }
-
-  add(module: ModuleInstance): this
-  add(module: ModuleInstance[]): this
-  add(module: ModuleInstance | ModuleInstance[]): this {
-    if (Array.isArray(module)) {
-      module.forEach((module) => this.addSingleModule(module))
-    } else {
-      this.addSingleModule(module)
-    }
-    return this
-  }
-
-  addResolver(resolver: ModuleResolver): this {
-    this.resolvers.push(resolver)
-    return this
-  }
-
-  remove(addressOrName: string | string[]): this {
-    if (Array.isArray(addressOrName)) {
-      addressOrName.forEach((address) => this.removeSingleModule(address))
-    } else {
-      this.removeSingleModule(addressOrName)
-    }
-    return this
-  }
-
-  removeResolver(resolver: ModuleResolver): this {
-    this.resolvers = this.resolvers.filter((item) => item !== resolver)
-    return this
-  }
-
-  async resolve<T extends ModuleInstance = ModuleInstance>(filter?: ModuleFilter<T>, options?: ModuleFilterOptions<T>): Promise<T[]>
-  async resolve<T extends ModuleInstance = ModuleInstance>(nameOrAddress: string, options?: ModuleFilterOptions<T>): Promise<T | undefined>
-  async resolve<T extends ModuleInstance = ModuleInstance>(
-    nameOrAddressOrFilter?: ModuleFilter<T> | string,
-    options?: ModuleFilterOptions<T>,
-  ): Promise<T | T[] | undefined> {
-    const mutatedOptions = { ...options, maxDepth: (options?.maxDepth ?? CompositeModuleResolver.defaultMaxDepth) - 1 }
-    if (typeof nameOrAddressOrFilter === 'string') {
-      if (mutatedOptions.maxDepth < 0) {
-        return undefined
-      }
-      const results = await Promise.all(
-        this.resolvers.map(async (resolver) => {
-          const result: T | undefined = await resolver.resolve<T>(nameOrAddressOrFilter, mutatedOptions)
-          return result
-        }),
-      )
-      const result: T | undefined = results.filter(exists).filter(duplicateModules).pop()
-      return result
-    } else {
-      if (mutatedOptions.maxDepth < 0) {
-        return []
-      }
-      const result = await Promise.all(
-        this.resolvers.map(async (resolver) => {
-          const result: T[] = await resolver.resolve<T>(nameOrAddressOrFilter, mutatedOptions)
-          return result
-        }),
-      )
-      const flatResult: T[] = result.flat()
-      return flatResult.filter(duplicateModules)
-    }
-  }
-
-  private addSingleModule(module?: ModuleInstance) {
-    if (module) {
-      this.localResolver.add(module)
-    }
-  }
-  private removeSingleModule(addressOrName: string) {
-    this.localResolver.remove(addressOrName)
-  }
-}

package/src/Resolver/ResolverEventEmitter.ts

@@ -1,46 +0,0 @@
-import { Module, ModuleFilter, ModuleResolver } from '@xyo-network/module-model'
-
-export interface ModuleResolvedEventArgs {
-  filter?: ModuleFilter
-  module: Module
-}
-
-export interface ResolverEventEmitter {
-  on(event: 'moduleResolved', listener: (args: ModuleResolvedEventArgs) => void): void
-}
-
-type ListenerFunction = (args: ModuleResolvedEventArgs) => void
-
-const getMixin = <T extends ModuleResolver = ModuleResolver>(resolver: T) => {
-  const listeners: ListenerFunction[] = []
-  const emit = (event: 'moduleResolved', args: ModuleResolvedEventArgs): boolean => {
-    if (listeners.length < 1) return false
-    listeners.map((listener) => listener(args))
-    return true
-  }
-  const onModuleResolved = (module: Module, filter?: ModuleFilter) => {
-    const args = { filter, module }
-    emit('moduleResolved', args)
-  }
-  const { resolve } = resolver
-  function originalResolve(filter?: ModuleFilter) {
-    return resolve.bind(resolver)(filter)
-  }
-
-  return {
-    on: (event: 'moduleResolved', listener: (args: ModuleResolvedEventArgs) => void) => {
-      listeners.push(listener)
-    },
-    resolve: async (filter?: ModuleFilter): Promise<Module[]> => {
-      const modules: Module[] = await originalResolve(filter)
-      await Promise.allSettled(modules.map((mod) => onModuleResolved(mod, filter)))
-      return modules
-    },
-  }
-}
-
-export const mixinResolverEventEmitter = <T extends ModuleResolver = ModuleResolver>(resolver: T): T & ResolverEventEmitter => {
-  const mixin = getMixin(resolver)
-  const ret = Object.assign(resolver, mixin)
-  return ret
-}

package/src/Resolver/SimpleModuleResolver.ts

@@ -1,128 +0,0 @@
-import {
-  AddressModuleFilter,
-  ModuleFilter,
-  ModuleInstance,
-  ModuleRepository,
-  ModuleResolver,
-  NameModuleFilter,
-  QueryModuleFilter,
-} from '@xyo-network/module-model'
-import { Promisable } from '@xyo-network/promise'
-import compact from 'lodash/compact'
-import flatten from 'lodash/flatten'
-
-//This class is now package private (not exported from index.ts)
-export class SimpleModuleResolver implements ModuleRepository {
-  private addressToName: Record<string, string> = {}
-  private modules: Record<string, ModuleInstance> = {}
-
-  get isModuleResolver() {
-    return true
-  }
-
-  add(module: ModuleInstance): this
-  add(module: ModuleInstance[]): this
-  add(module: ModuleInstance | ModuleInstance[]): this {
-    if (Array.isArray(module)) {
-      module.forEach((module) => this.addSingleModule(module))
-    } else {
-      this.addSingleModule(module)
-    }
-    return this
-  }
-
-  addResolver(_resolver: ModuleResolver): this {
-    throw 'Adding resolvers not supported'
-  }
-
-  remove(address: string | string[]): this {
-    if (Array.isArray(address)) {
-      address.forEach((address) => this.removeSingleModule(address))
-    } else {
-      this.removeSingleModule(address)
-    }
-    return this
-  }
-
-  removeResolver(_resolver: ModuleResolver): this {
-    throw 'Removing resolvers not supported'
-  }
-
-  resolve(filter?: ModuleFilter): Promisable<ModuleInstance[]>
-  resolve(nameOrAddress: string): Promisable<ModuleInstance | undefined>
-  resolve(nameOrAddressOrFilter?: ModuleFilter | string): Promisable<ModuleInstance[] | ModuleInstance | undefined> {
-    if (nameOrAddressOrFilter) {
-      if (typeof nameOrAddressOrFilter === 'string') {
-        const result: ModuleInstance | undefined =
-          this.resolveByName(Object.values(this.modules), [nameOrAddressOrFilter]).pop() ??
-          this.resolveByAddress(Object.values(this.modules), [nameOrAddressOrFilter]).pop()
-        return result
-      } else if ((nameOrAddressOrFilter as AddressModuleFilter).address) {
-        const result: ModuleInstance[] = this.resolveByAddress(Object.values(this.modules), (nameOrAddressOrFilter as AddressModuleFilter).address)
-        return result
-      } else if ((nameOrAddressOrFilter as NameModuleFilter).name) {
-        const result: ModuleInstance[] = this.resolveByName(Object.values(this.modules), (nameOrAddressOrFilter as NameModuleFilter).name)
-        return result
-      } else if ((nameOrAddressOrFilter as QueryModuleFilter).query) {
-        return this.resolveByQuery(Object.values(this.modules), (nameOrAddressOrFilter as QueryModuleFilter).query)
-      }
-    } else {
-      return Object.values(this.modules)
-    }
-  }
-
-  private addSingleModule(module?: ModuleInstance) {
-    if (module) {
-      this.modules[module.address] = module
-    }
-  }
-
-  private removeSingleModule(address: string) {
-    if (address) {
-      if (this.modules[address]) {
-        delete this.modules[address]
-        const name = this.addressToName[address]
-        if (name) {
-          delete this.addressToName[address]
-        }
-      }
-    }
-  }
-
-  private resolveByAddress<T extends ModuleInstance = ModuleInstance>(modules: T[], address?: string[]): T[] {
-    return address
-      ? compact(
-          flatten(
-            address?.map((address) => {
-              return modules.filter((module) => module.address === address)
-            }),
-          ),
-        )
-      : modules
-  }
-
-  private resolveByName<T extends ModuleInstance = ModuleInstance>(modules: T[], name?: string[]): T[] {
-    if (name) {
-      return compact(name.map((name) => modules.filter((module) => module.config?.name === name)).flat())
-    }
-    return modules
-  }
-
-  private resolveByQuery<T extends ModuleInstance = ModuleInstance>(modules: T[], query?: string[][]): T[] {
-    return query
-      ? compact(
-          modules.filter(
-            (module) =>
-              query?.reduce((supported, queryList) => {
-                return (
-                  queryList.reduce((supported, query) => {
-                    const queryable = module.queries.includes(query)
-                    return supported && queryable
-                  }, true) || supported
-                )
-              }, false),
-          ),
-        )
-      : modules
-  }
-}

package/src/Resolver/index.ts

@@ -1,3 +0,0 @@
-export * from './CompositeModuleResolver'
-export * from './ResolverEventEmitter'
-export * from './SimpleModuleResolver'