@xyo-network/module-resolver 2.93.4 → 2.93.6

package/src/SimpleModuleResolver.ts

@@ -14,14 +14,15 @@ import {
   ModuleName,
   ModuleRepository,
   ModuleResolverInstance,
+  ObjectFilterOptions,
 } from '@xyo-network/module-model'
 
 import { AbstractModuleResolver } from './AbstractModuleResolver'
 
 //This class is now package private (not exported from index.ts)
 export class SimpleModuleResolver extends AbstractModuleResolver implements ModuleRepository {
-  private addressToName: Record<Address, ModuleName> = {}
   private modules: Record<Address, ModuleInstance> = {}
+  private nameToModule: Record<ModuleName, ModuleInstance> = {}
 
   constructor() {
     super({})
@@ -99,20 +100,40 @@ export class SimpleModuleResolver extends AbstractModuleResolver implements Modu
     }
   }
 
+  resolveIdentifier(id: ModuleIdentifier, _options?: ObjectFilterOptions): Promisable<Address | undefined> {
+    //check if id is a name of one of modules in the resolver
+    const moduleFromName = this.nameToModule[id]
+    if (moduleFromName) {
+      return moduleFromName.address
+    }
+
+    //check if any of the modules have the id as an address
+    for (const module of Object.values(this.modules)) {
+      if (module.address === id) {
+        return module.address
+      }
+    }
+  }
+
   private addSingleModule(module?: ModuleInstance) {
     if (module) {
+      const name = module.config.name
+      if (name) {
+        //check for collision
+        assertEx(this.nameToModule[name] === undefined, () => `Module with name ${name} already added`)
+        this.nameToModule[name] = module
+      }
       this.modules[module.address] = module
     }
   }
 
   private removeSingleModule(address: Address) {
     assertEx(isAddress(address), () => 'Invalid address')
-    if (address && this.modules[address]) {
-      delete this.modules[address]
-      const name = this.addressToName[address]
-      if (name) {
-        delete this.addressToName[address]
-      }
+    const module = assertEx(this.modules[address], () => 'Address not found in modules')
+    delete this.modules[address]
+    const name = module.config.name
+    if (name) {
+      delete this.nameToModule[name]
     }
   }
 

package/dist/browser/transformers/Xns.d.cts

@@ -1,3 +0,0 @@
-import { ModuleIdentifier } from '@xyo-network/module-model';
-export declare const XnsModuleIdentifierTransformer: (id: ModuleIdentifier) => string;
-//# sourceMappingURL=Xns.d.ts.map

package/dist/browser/transformers/Xns.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Xns.d.ts","sourceRoot":"","sources":["../../../src/transformers/Xns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAE5D,eAAO,MAAM,8BAA8B,OAAQ,gBAAgB,WAElE,CAAA"}

package/dist/browser/transformers/Xns.d.mts

@@ -1,3 +0,0 @@
-import { ModuleIdentifier } from '@xyo-network/module-model';
-export declare const XnsModuleIdentifierTransformer: (id: ModuleIdentifier) => string;
-//# sourceMappingURL=Xns.d.ts.map

package/dist/browser/transformers/Xns.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Xns.d.ts","sourceRoot":"","sources":["../../../src/transformers/Xns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAE5D,eAAO,MAAM,8BAA8B,OAAQ,gBAAgB,WAElE,CAAA"}

package/dist/browser/transformers/Xns.d.ts

@@ -1,3 +0,0 @@
-import { ModuleIdentifier } from '@xyo-network/module-model';
-export declare const XnsModuleIdentifierTransformer: (id: ModuleIdentifier) => string;
-//# sourceMappingURL=Xns.d.ts.map

package/dist/browser/transformers/Xns.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Xns.d.ts","sourceRoot":"","sources":["../../../src/transformers/Xns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAE5D,eAAO,MAAM,8BAA8B,OAAQ,gBAAgB,WAElE,CAAA"}

package/dist/browser/transformers/index.d.cts

@@ -1,3 +0,0 @@
-export * from './model';
-export * from './Xns';
-//# sourceMappingURL=index.d.ts.map

package/dist/browser/transformers/index.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/transformers/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,OAAO,CAAA"}

package/dist/browser/transformers/index.d.mts

@@ -1,3 +0,0 @@
-export * from './model';
-export * from './Xns';
-//# sourceMappingURL=index.d.ts.map

package/dist/browser/transformers/index.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/transformers/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,OAAO,CAAA"}

package/dist/browser/transformers/index.d.ts

@@ -1,3 +0,0 @@
-export * from './model';
-export * from './Xns';
-//# sourceMappingURL=index.d.ts.map

package/dist/browser/transformers/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/transformers/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,OAAO,CAAA"}

package/dist/browser/transformers/model.d.cts

@@ -1,7 +0,0 @@
-import { Promisable } from '@xylabs/promise';
-import { ModuleIdentifier } from '@xyo-network/module-model';
-export type ModuleIdentifierTransformerFunc = (id: ModuleIdentifier) => Promisable<ModuleIdentifier>;
-export interface ModuleIdentifierTransformer {
-    transform: ModuleIdentifierTransformerFunc;
-}
-//# sourceMappingURL=model.d.ts.map

package/dist/browser/transformers/model.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/transformers/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAE5D,MAAM,MAAM,+BAA+B,GAAG,CAAC,EAAE,EAAE,gBAAgB,KAAK,UAAU,CAAC,gBAAgB,CAAC,CAAA;AAEpG,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,+BAA+B,CAAA;CAC3C"}

package/dist/browser/transformers/model.d.mts

@@ -1,7 +0,0 @@
-import { Promisable } from '@xylabs/promise';
-import { ModuleIdentifier } from '@xyo-network/module-model';
-export type ModuleIdentifierTransformerFunc = (id: ModuleIdentifier) => Promisable<ModuleIdentifier>;
-export interface ModuleIdentifierTransformer {
-    transform: ModuleIdentifierTransformerFunc;
-}
-//# sourceMappingURL=model.d.ts.map

package/dist/browser/transformers/model.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/transformers/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAE5D,MAAM,MAAM,+BAA+B,GAAG,CAAC,EAAE,EAAE,gBAAgB,KAAK,UAAU,CAAC,gBAAgB,CAAC,CAAA;AAEpG,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,+BAA+B,CAAA;CAC3C"}

package/dist/browser/transformers/model.d.ts

@@ -1,7 +0,0 @@
-import { Promisable } from '@xylabs/promise';
-import { ModuleIdentifier } from '@xyo-network/module-model';
-export type ModuleIdentifierTransformerFunc = (id: ModuleIdentifier) => Promisable<ModuleIdentifier>;
-export interface ModuleIdentifierTransformer {
-    transform: ModuleIdentifierTransformerFunc;
-}
-//# sourceMappingURL=model.d.ts.map

package/dist/browser/transformers/model.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/transformers/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAE5D,MAAM,MAAM,+BAA+B,GAAG,CAAC,EAAE,EAAE,gBAAgB,KAAK,UAAU,CAAC,gBAAgB,CAAC,CAAA;AAEpG,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,+BAA+B,CAAA;CAC3C"}

package/dist/node/transformers/Xns.d.cts

@@ -1,3 +0,0 @@
-import { ModuleIdentifier } from '@xyo-network/module-model';
-export declare const XnsModuleIdentifierTransformer: (id: ModuleIdentifier) => string;
-//# sourceMappingURL=Xns.d.ts.map

package/dist/node/transformers/Xns.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Xns.d.ts","sourceRoot":"","sources":["../../../src/transformers/Xns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAE5D,eAAO,MAAM,8BAA8B,OAAQ,gBAAgB,WAElE,CAAA"}

package/dist/node/transformers/Xns.d.mts

@@ -1,3 +0,0 @@
-import { ModuleIdentifier } from '@xyo-network/module-model';
-export declare const XnsModuleIdentifierTransformer: (id: ModuleIdentifier) => string;
-//# sourceMappingURL=Xns.d.ts.map

package/dist/node/transformers/Xns.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Xns.d.ts","sourceRoot":"","sources":["../../../src/transformers/Xns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAE5D,eAAO,MAAM,8BAA8B,OAAQ,gBAAgB,WAElE,CAAA"}

package/dist/node/transformers/Xns.d.ts

@@ -1,3 +0,0 @@
-import { ModuleIdentifier } from '@xyo-network/module-model';
-export declare const XnsModuleIdentifierTransformer: (id: ModuleIdentifier) => string;
-//# sourceMappingURL=Xns.d.ts.map

package/dist/node/transformers/Xns.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Xns.d.ts","sourceRoot":"","sources":["../../../src/transformers/Xns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAE5D,eAAO,MAAM,8BAA8B,OAAQ,gBAAgB,WAElE,CAAA"}

package/dist/node/transformers/index.d.cts

@@ -1,3 +0,0 @@
-export * from './model';
-export * from './Xns';
-//# sourceMappingURL=index.d.ts.map

package/dist/node/transformers/index.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/transformers/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,OAAO,CAAA"}

package/dist/node/transformers/index.d.mts

@@ -1,3 +0,0 @@
-export * from './model';
-export * from './Xns';
-//# sourceMappingURL=index.d.ts.map

package/dist/node/transformers/index.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/transformers/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,OAAO,CAAA"}

package/dist/node/transformers/index.d.ts

@@ -1,3 +0,0 @@
-export * from './model';
-export * from './Xns';
-//# sourceMappingURL=index.d.ts.map

package/dist/node/transformers/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/transformers/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,OAAO,CAAA"}

package/dist/node/transformers/model.d.cts

@@ -1,7 +0,0 @@
-import { Promisable } from '@xylabs/promise';
-import { ModuleIdentifier } from '@xyo-network/module-model';
-export type ModuleIdentifierTransformerFunc = (id: ModuleIdentifier) => Promisable<ModuleIdentifier>;
-export interface ModuleIdentifierTransformer {
-    transform: ModuleIdentifierTransformerFunc;
-}
-//# sourceMappingURL=model.d.ts.map

package/dist/node/transformers/model.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/transformers/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAE5D,MAAM,MAAM,+BAA+B,GAAG,CAAC,EAAE,EAAE,gBAAgB,KAAK,UAAU,CAAC,gBAAgB,CAAC,CAAA;AAEpG,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,+BAA+B,CAAA;CAC3C"}

package/dist/node/transformers/model.d.mts

@@ -1,7 +0,0 @@
-import { Promisable } from '@xylabs/promise';
-import { ModuleIdentifier } from '@xyo-network/module-model';
-export type ModuleIdentifierTransformerFunc = (id: ModuleIdentifier) => Promisable<ModuleIdentifier>;
-export interface ModuleIdentifierTransformer {
-    transform: ModuleIdentifierTransformerFunc;
-}
-//# sourceMappingURL=model.d.ts.map

package/dist/node/transformers/model.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/transformers/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAE5D,MAAM,MAAM,+BAA+B,GAAG,CAAC,EAAE,EAAE,gBAAgB,KAAK,UAAU,CAAC,gBAAgB,CAAC,CAAA;AAEpG,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,+BAA+B,CAAA;CAC3C"}

package/dist/node/transformers/model.d.ts

@@ -1,7 +0,0 @@
-import { Promisable } from '@xylabs/promise';
-import { ModuleIdentifier } from '@xyo-network/module-model';
-export type ModuleIdentifierTransformerFunc = (id: ModuleIdentifier) => Promisable<ModuleIdentifier>;
-export interface ModuleIdentifierTransformer {
-    transform: ModuleIdentifierTransformerFunc;
-}
-//# sourceMappingURL=model.d.ts.map

package/dist/node/transformers/model.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/transformers/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAE5D,MAAM,MAAM,+BAA+B,GAAG,CAAC,EAAE,EAAE,gBAAgB,KAAK,UAAU,CAAC,gBAAgB,CAAC,CAAA;AAEpG,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,+BAA+B,CAAA;CAC3C"}

package/src/transformers/Xns.ts

@@ -1,5 +0,0 @@
-import { ModuleIdentifier } from '@xyo-network/module-model'
-
-export const XnsModuleIdentifierTransformer = (id: ModuleIdentifier) => {
-  return id
-}

package/src/transformers/index.ts

@@ -1,2 +0,0 @@
-export * from './model'
-export * from './Xns'

package/src/transformers/model.ts

@@ -1,8 +0,0 @@
-import { Promisable } from '@xylabs/promise'
-import { ModuleIdentifier } from '@xyo-network/module-model'
-
-export type ModuleIdentifierTransformerFunc = (id: ModuleIdentifier) => Promisable<ModuleIdentifier>
-
-export interface ModuleIdentifierTransformer {
-  transform: ModuleIdentifierTransformerFunc
-}