@xyo-network/module-resolver 2.94.20 → 2.94.21

package/src/CompositeModuleResolver.ts

@@ -20,10 +20,10 @@ import {
 } from '@xyo-network/module-model'
 import { LRUCache } from 'lru-cache'
 
-import { AbstractModuleResolver } from './AbstractModuleResolver'
+import { AbstractModuleResolver, ModuleResolverParams } from './AbstractModuleResolver'
 import { SimpleModuleResolver } from './SimpleModuleResolver'
 
-export interface ModuleResolverParams extends BaseParams {
+export interface CompositeModuleResolverParams extends ModuleResolverParams {
   cache?: CacheConfig
   moduleIdentifierTransformers?: ModuleIdentifierTransformer[]
 }
@@ -32,7 +32,7 @@ const moduleIdentifierParts = (moduleIdentifier: ModuleIdentifier): ModuleIdenti
   return moduleIdentifier?.split(':') as ModuleIdentifierPart[]
 }
 
-export class CompositeModuleResolver<T extends ModuleResolverParams = ModuleResolverParams>
+export class CompositeModuleResolver<T extends CompositeModuleResolverParams = CompositeModuleResolverParams>
   extends AbstractModuleResolver<T>
   implements ModuleRepository, ModuleResolverInstance
 {
@@ -44,7 +44,7 @@ export class CompositeModuleResolver<T extends ModuleResolverParams = ModuleReso
 
   constructor(params: T) {
     super(params)
-    const localResolver = new SimpleModuleResolver()
+    const localResolver = new SimpleModuleResolver({ root: params.root })
     this.addResolver(localResolver)
     const { max = 100, ttl = 1000 * 5 /* five seconds */ } = params.cache ?? {}
     this._cache = new LRUCache<ModuleIdentifier, ModuleInstance>({ max, ttl, ...params.cache })
@@ -232,8 +232,8 @@ export class CompositeModuleResolver<T extends ModuleResolverParams = ModuleReso
     const idParts = moduleIdentifierParts(moduleIdentifier)
     assertEx(idParts.length >= 2, () => 'Not a valid multipart identifier')
     const id = assertEx(idParts.shift())
-    const module = await this.resolve<T>(id)
-    return await module?.resolve<T>(idParts.join(':'))
+    const module = (await this.resolve<T>(id)) ?? (await this.resolvePrivate<T>(id))
+    return (await module?.resolve<T>(idParts.join(':'))) ?? (await module?.resolvePrivate<T>(idParts.join(':')))
   }
 
   private async transformModuleIdentifier(identifier: ModuleIdentifier) {

package/src/SimpleModuleResolver.ts

@@ -17,15 +17,15 @@ import {
   ObjectFilterOptions,
 } from '@xyo-network/module-model'
 
-import { AbstractModuleResolver } from './AbstractModuleResolver'
+import { AbstractModuleResolver, ModuleResolverParams } from './AbstractModuleResolver'
 
 //This class is now package private (not exported from index.ts)
 export class SimpleModuleResolver extends AbstractModuleResolver implements ModuleRepository {
   private modules: Record<Address, ModuleInstance> = {}
   private nameToModule: Record<ModuleName, ModuleInstance> = {}
 
-  constructor() {
-    super({})
+  constructor(params: ModuleResolverParams) {
+    super(params)
   }
 
   add(module: ModuleInstance): this

package/src/index.ts

@@ -1,2 +1,3 @@
+export * from './AbstractModuleResolver'
 export * from './CompositeModuleResolver'
 export * from './ResolverEventEmitter'