@xyo-network/module-abstract 2.57.4 → 2.57.6

package/src/ModuleFactory.ts

@@ -1,5 +1,6 @@
 import { Logger } from '@xyo-network/core'
 import { CreatableModule, CreatableModuleFactory, Module } from '@xyo-network/module-model'
+import merge from 'lodash/merge'
 
 export interface CreatableModuleDictionary {
   [key: string]: CreatableModuleFactory
@@ -26,7 +27,9 @@ export class ModuleFactory<TModule extends Module> implements CreatableModuleFac
 
   create<T extends Module>(this: CreatableModuleFactory<T>, params?: TModule['params'] | undefined): Promise<T> {
     const factory = this as ModuleFactory<T>
-    return factory.creatableModule.create<T>(factory.defaultParams ? { ...factory.defaultParams, ...params } : params)
+    const schema: CreatableModuleFactory<TModule>['configSchema'] = factory.creatableModule.configSchema
+    const mergedParams: TModule['params'] = merge(factory.defaultParams ?? {}, params, { config: { schema } })
+    return factory.creatableModule.create<T>(mergedParams)
   }
 
   factory<T extends Module>(this: CreatableModule<T>, _params?: T['params'] | undefined): CreatableModuleFactory<T> {

package/src/Resolver/CompositeModuleResolver.ts

@@ -61,6 +61,15 @@ export class CompositeModuleResolver extends Base implements ModuleRepository, M
     return result as T[]
   }
 
+  async resolveOne<T extends Module = Module>(filter: string): Promise<T | undefined> {
+    for (let i = 0; i < this.resolvers.length; i++) {
+      const resolver = this.resolvers[i]
+      const result = await resolver.resolveOne<T>(filter)
+      if (result) return result
+    }
+    return undefined
+  }
+
   private addSingleModule(module?: Module) {
     if (module) {
       this.localResolver.add(module)

package/src/Resolver/SimpleModuleResolver.ts

@@ -62,6 +62,15 @@ export class SimpleModuleResolver implements ModuleRepository {
     return filteredByQuery
   }
 
+  resolveOne<T extends Module = Module>(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]
+    }
+    return undefined
+  }
+
   private addSingleModule(module?: Module) {
     if (module) {
       this.modules[module.address] = module