@xyo-network/manifest 2.73.4 → 2.74.0

package/dist/index.mjs

@@ -1,5 +1,10 @@
 // src/ManifestWrapper.ts
 import { assertEx } from "@xylabs/assert";
+import {
+  assignCreatableModuleRegistry,
+  ModuleFactoryLocator,
+  toCreatableModuleRegistry
+} from "@xyo-network/module";
 import { MemoryNode as MemoryNode2 } from "@xyo-network/node-memory";
 import { PayloadWrapper } from "@xyo-network/payload-wrapper";
 
@@ -18,16 +23,21 @@ var standardCreatableModules = {
 
 // src/ManifestWrapper.ts
 var ManifestWrapper = class extends PayloadWrapper {
-  constructor(payload, wallet) {
+  constructor(payload, wallet, locator = new ModuleFactoryLocator({})) {
     super(payload);
     this.wallet = wallet;
+    this.locator = locator;
   }
   async loadModule(node, manifest, external = true, additionalCreatableModules) {
     const collision = async (node2, name, external2) => {
       const externalConflict = external2 ? (await node2.resolve({ name: [name] }, { direction: external2 ? "all" : "down" })).length !== 0 : false;
       return externalConflict || (await node2.resolve({ name: [name] }, { direction: "down" })).length !== 0;
     };
-    const creatableModules = { ...standardCreatableModules, ...additionalCreatableModules };
+    const creatableModules = assignCreatableModuleRegistry(
+      {},
+      toCreatableModuleRegistry(standardCreatableModules),
+      toCreatableModuleRegistry(additionalCreatableModules ?? {})
+    );
     if (!await collision(node, manifest.config.name, external)) {
       if (manifest.config.language && manifest.config.language === "javascript") {
         assertEx(
@@ -39,39 +49,38 @@ var ManifestWrapper = class extends PayloadWrapper {
   }
   async loadNodeFromIndex(index, additionalCreatableModules) {
     const manifest = assertEx(this.nodeManifest(index), "Failed to find Node Manifest");
-    return await this.loadNodeFromManifest(manifest, manifest.config.accountPath ?? `${index}'`, additionalCreatableModules);
+    const registry = toCreatableModuleRegistry(additionalCreatableModules ?? {});
+    return await this.loadNodeFromManifest(manifest, manifest.config.accountPath ?? `${index}'`, registry);
   }
   async loadNodeFromManifest(manifest, path, additionalCreatableModules) {
     const node = await MemoryNode2.create({ config: manifest.config, wallet: await this.wallet.derivePath(path) });
+    const registry = toCreatableModuleRegistry(additionalCreatableModules ?? {});
     const privateModules = manifest.modules?.private?.map(async (moduleManifest) => {
-      await this.loadModule(node, moduleManifest, false, additionalCreatableModules);
+      await this.loadModule(node, moduleManifest, false, registry);
     }) ?? [];
     const publicModules = manifest.modules?.public?.map(async (moduleManifest) => {
-      await this.loadModule(node, moduleManifest, true, additionalCreatableModules);
+      await this.loadModule(node, moduleManifest, true, registry);
     }) ?? [];
     await Promise.all([...privateModules, ...publicModules]);
     return node;
   }
   async loadNodes(node, additionalCreatableModules) {
-    const start = Date.now();
+    const registry = toCreatableModuleRegistry(additionalCreatableModules ?? {});
     const result = await Promise.all(
       this.payload().nodes?.map(async (nodeManifest, index) => {
-        const subNode = await this.loadNodeFromManifest(nodeManifest, nodeManifest.config.accountPath ?? `${index}'`, additionalCreatableModules);
+        const subNode = await this.loadNodeFromManifest(nodeManifest, nodeManifest.config.accountPath ?? `${index}'`, registry);
         await node?.register(subNode);
         return subNode;
       })
     );
-    console.log(`Loaded nodes from manifest in ${Date.now() - start}ms`);
     return result;
   }
   nodeManifest(index) {
     return this.payload().nodes?.[index];
   }
   async registerModule(node, manifest, creatableModules) {
-    const creatableModule = assertEx(
-      creatableModules?.[manifest.config.schema],
-      `No module with [${manifest.config.schema}] config schema available for registration`
-    );
+    const registry = toCreatableModuleRegistry(creatableModules ?? {});
+    const creatableModule = new ModuleFactoryLocator(this.locator.registry).registerMany(registry).locate(manifest.config.schema, manifest.config.labels);
     const module = await creatableModule.create({
       account: manifest.config.accountPath ? await this.wallet.derivePath(manifest.config.accountPath) : this.wallet,
       config: assertEx(manifest.config, "Missing config")

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/ManifestWrapper.ts","../src/standardCreatableModules.ts","../src/index.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { ManifestPayload, ModuleManifest, NodeManifest } from '@xyo-network/manifest-model'\nimport { CreatableModuleDictionary } from '@xyo-network/module'\nimport { MemoryNode } from '@xyo-network/node-memory'\nimport { NodeInstance } from '@xyo-network/node-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\nimport { WalletInstance } from '@xyo-network/wallet-model'\n\nimport { standardCreatableModules } from './standardCreatableModules'\n\nexport class ManifestWrapper extends PayloadWrapper<ManifestPayload> {\n  constructor(\n    payload: ManifestPayload,\n    protected wallet: WalletInstance,\n  ) {\n    super(payload)\n  }\n\n  async loadModule(node: MemoryNode, manifest: ModuleManifest, external = true, additionalCreatableModules?: CreatableModuleDictionary) {\n    const collision = async (node: NodeInstance, name: string, external: boolean) => {\n      const externalConflict = external ? (await node.resolve({ name: [name] }, { direction: external ? 'all' : 'down' })).length !== 0 : false\n      return externalConflict || (await node.resolve({ name: [name] }, { direction: 'down' })).length !== 0\n    }\n\n    const creatableModules = { ...standardCreatableModules, ...additionalCreatableModules }\n    if (!(await collision(node, manifest.config.name, external))) {\n      if (manifest.config.language && manifest.config.language === 'javascript') {\n        assertEx(\n          (manifest.config.name && (await node.attach(manifest.config.name, external))) ??\n            (await node.attach((await this.registerModule(node, manifest, creatableModules)).address, external)),\n          `No module with config schema [${manifest.config.name}] registered`,\n        )\n      }\n    }\n  }\n\n  async loadNodeFromIndex(index: number, additionalCreatableModules?: CreatableModuleDictionary) {\n    const manifest = assertEx(this.nodeManifest(index), 'Failed to find Node Manifest')\n    return await this.loadNodeFromManifest(manifest, manifest.config.accountPath ?? `${index}'`, additionalCreatableModules)\n  }\n\n  async loadNodeFromManifest(manifest: NodeManifest, path: string, additionalCreatableModules?: CreatableModuleDictionary) {\n    const node = await MemoryNode.create({ config: manifest.config, wallet: await this.wallet.derivePath(path) })\n    // Load Private Modules\n    const privateModules =\n      manifest.modules?.private?.map(async (moduleManifest) => {\n        await this.loadModule(node, moduleManifest, false, additionalCreatableModules)\n      }) ?? []\n    // Load Public Modules\n    const publicModules =\n      manifest.modules?.public?.map(async (moduleManifest) => {\n        await this.loadModule(node, moduleManifest, true, additionalCreatableModules)\n      }) ?? []\n    await Promise.all([...privateModules, ...publicModules])\n    return node\n  }\n\n  async loadNodes(node?: MemoryNode, additionalCreatableModules?: CreatableModuleDictionary) {\n    const start = Date.now()\n    const result = await Promise.all(\n      this.payload().nodes?.map(async (nodeManifest, index) => {\n        const subNode = await this.loadNodeFromManifest(nodeManifest, nodeManifest.config.accountPath ?? `${index}'`, additionalCreatableModules)\n        await node?.register(subNode)\n        return subNode\n      }),\n    )\n    console.log(`Loaded nodes from manifest in ${Date.now() - start}ms`)\n    return result\n  }\n\n  nodeManifest(index: number) {\n    return this.payload().nodes?.[index]\n  }\n\n  async registerModule(node: MemoryNode, manifest: ModuleManifest, creatableModules?: CreatableModuleDictionary) {\n    const creatableModule = assertEx(\n      creatableModules?.[manifest.config.schema],\n      `No module with [${manifest.config.schema}] config schema available for registration`,\n    )\n\n    const module = await creatableModule.create({\n      account: manifest.config.accountPath ? await this.wallet.derivePath(manifest.config.accountPath) : this.wallet,\n      config: assertEx(manifest.config, 'Missing config'),\n    })\n    await node.register(module)\n    return module\n  }\n}\n","import { HttpBridge } from '@xyo-network/http-bridge'\nimport { MemoryArchivist } from '@xyo-network/memory-archivist'\nimport { CreatableModuleDictionary, ModuleFactory } from '@xyo-network/module'\nimport { MemoryNode } from '@xyo-network/node-memory'\nimport { MemorySentinel } from '@xyo-network/sentinel'\n\nexport const standardCreatableModules: CreatableModuleDictionary = {\n  'network.xyo.archivist.config': MemoryArchivist,\n  'network.xyo.bridge.http.config': ModuleFactory.withParams(HttpBridge, { config: { schema: HttpBridge.configSchema } }),\n  'network.xyo.node.config': MemoryNode,\n  'network.xyo.sentinel.config': MemorySentinel,\n}\n","export * from './ManifestWrapper'\nexport * from './standardCreatableModules'\nexport * from '@xyo-network/manifest-model'\n"],"mappings":"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","names":["MemoryNode","node","external","MemoryNode"]}
+{"version":3,"sources":["../src/ManifestWrapper.ts","../src/standardCreatableModules.ts","../src/index.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { ManifestPayload, ModuleManifest, NodeManifest } from '@xyo-network/manifest-model'\nimport {\n  assignCreatableModuleRegistry,\n  CreatableModuleDictionary,\n  CreatableModuleRegistry,\n  ModuleFactoryLocator,\n  ModuleInstance,\n  toCreatableModuleRegistry,\n} from '@xyo-network/module'\nimport { MemoryNode } from '@xyo-network/node-memory'\nimport { NodeInstance } from '@xyo-network/node-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\nimport { WalletInstance } from '@xyo-network/wallet-model'\n\nimport { standardCreatableModules } from './standardCreatableModules'\n\nexport class ManifestWrapper extends PayloadWrapper<ManifestPayload> {\n  constructor(\n    payload: ManifestPayload,\n    protected readonly wallet: WalletInstance,\n    protected readonly locator: ModuleFactoryLocator = new ModuleFactoryLocator({}),\n  ) {\n    super(payload)\n  }\n\n  async loadModule(node: MemoryNode, manifest: ModuleManifest, external: boolean, additionalCreatableModules?: CreatableModuleRegistry): Promise<void>\n  async loadModule(\n    node: MemoryNode,\n    manifest: ModuleManifest,\n    external: boolean,\n    additionalCreatableModules?: CreatableModuleDictionary,\n  ): Promise<void>\n  async loadModule(\n    node: MemoryNode,\n    manifest: ModuleManifest,\n    external = true,\n    additionalCreatableModules?: CreatableModuleDictionary | CreatableModuleRegistry,\n  ): Promise<void> {\n    const collision = async (node: NodeInstance, name: string, external: boolean) => {\n      const externalConflict = external ? (await node.resolve({ name: [name] }, { direction: external ? 'all' : 'down' })).length !== 0 : false\n      return externalConflict || (await node.resolve({ name: [name] }, { direction: 'down' })).length !== 0\n    }\n\n    const creatableModules = assignCreatableModuleRegistry(\n      {},\n      toCreatableModuleRegistry(standardCreatableModules),\n      toCreatableModuleRegistry(additionalCreatableModules ?? {}),\n    )\n    if (!(await collision(node, manifest.config.name, external))) {\n      if (manifest.config.language && manifest.config.language === 'javascript') {\n        assertEx(\n          (manifest.config.name && (await node.attach(manifest.config.name, external))) ??\n            (await node.attach((await this.registerModule(node, manifest, creatableModules)).address, external)),\n          `No module with config schema [${manifest.config.name}] registered`,\n        )\n      }\n    }\n  }\n\n  async loadNodeFromIndex(index: number, additionalCreatableModules?: CreatableModuleRegistry): Promise<MemoryNode>\n  async loadNodeFromIndex(index: number, additionalCreatableModules?: CreatableModuleDictionary): Promise<MemoryNode>\n  async loadNodeFromIndex(index: number, additionalCreatableModules?: CreatableModuleDictionary | CreatableModuleRegistry): Promise<MemoryNode> {\n    const manifest = assertEx(this.nodeManifest(index), 'Failed to find Node Manifest')\n    const registry = toCreatableModuleRegistry(additionalCreatableModules ?? {})\n    return await this.loadNodeFromManifest(manifest, manifest.config.accountPath ?? `${index}'`, registry)\n  }\n\n  async loadNodeFromManifest(manifest: NodeManifest, path: string, additionalCreatableModules?: CreatableModuleRegistry): Promise<MemoryNode>\n  async loadNodeFromManifest(manifest: NodeManifest, path: string, additionalCreatableModules?: CreatableModuleDictionary): Promise<MemoryNode>\n  async loadNodeFromManifest(\n    manifest: NodeManifest,\n    path: string,\n    additionalCreatableModules?: CreatableModuleDictionary | CreatableModuleRegistry,\n  ): Promise<MemoryNode> {\n    const node = await MemoryNode.create({ config: manifest.config, wallet: await this.wallet.derivePath(path) })\n    const registry = toCreatableModuleRegistry(additionalCreatableModules ?? {})\n    // Load Private Modules\n    const privateModules =\n      manifest.modules?.private?.map(async (moduleManifest) => {\n        await this.loadModule(node, moduleManifest, false, registry)\n      }) ?? []\n    // Load Public Modules\n    const publicModules =\n      manifest.modules?.public?.map(async (moduleManifest) => {\n        await this.loadModule(node, moduleManifest, true, registry)\n      }) ?? []\n    await Promise.all([...privateModules, ...publicModules])\n    return node\n  }\n\n  async loadNodes(node?: MemoryNode, additionalCreatableModules?: CreatableModuleRegistry): Promise<MemoryNode[]>\n  async loadNodes(node?: MemoryNode, additionalCreatableModules?: CreatableModuleDictionary): Promise<MemoryNode[]>\n  async loadNodes(node?: MemoryNode, additionalCreatableModules?: CreatableModuleDictionary | CreatableModuleRegistry): Promise<MemoryNode[]> {\n    const registry = toCreatableModuleRegistry(additionalCreatableModules ?? {})\n    const result = await Promise.all(\n      this.payload().nodes?.map(async (nodeManifest, index) => {\n        const subNode = await this.loadNodeFromManifest(nodeManifest, nodeManifest.config.accountPath ?? `${index}'`, registry)\n        await node?.register(subNode)\n        return subNode\n      }),\n    )\n    return result\n  }\n\n  nodeManifest(index: number) {\n    return this.payload().nodes?.[index]\n  }\n\n  async registerModule(node: MemoryNode, manifest: ModuleManifest, creatableModules?: CreatableModuleRegistry): Promise<ModuleInstance>\n  async registerModule(node: MemoryNode, manifest: ModuleManifest, creatableModules?: CreatableModuleDictionary): Promise<ModuleInstance>\n  async registerModule(\n    node: MemoryNode,\n    manifest: ModuleManifest,\n    creatableModules?: CreatableModuleDictionary | CreatableModuleRegistry,\n  ): Promise<ModuleInstance> {\n    const registry = toCreatableModuleRegistry(creatableModules ?? {})\n    const creatableModule = new ModuleFactoryLocator(this.locator.registry)\n      .registerMany(registry)\n      .locate(manifest.config.schema, manifest.config.labels)\n    const module = await creatableModule.create({\n      account: manifest.config.accountPath ? await this.wallet.derivePath(manifest.config.accountPath) : this.wallet,\n      config: assertEx(manifest.config, 'Missing config'),\n    })\n    await node.register(module)\n    return module\n  }\n}\n","import { HttpBridge } from '@xyo-network/http-bridge'\nimport { MemoryArchivist } from '@xyo-network/memory-archivist'\nimport { CreatableModuleDictionary, ModuleFactory } from '@xyo-network/module'\nimport { MemoryNode } from '@xyo-network/node-memory'\nimport { MemorySentinel } from '@xyo-network/sentinel'\n\nexport const standardCreatableModules: CreatableModuleDictionary = {\n  'network.xyo.archivist.config': MemoryArchivist,\n  'network.xyo.bridge.http.config': ModuleFactory.withParams(HttpBridge, { config: { schema: HttpBridge.configSchema } }),\n  'network.xyo.node.config': MemoryNode,\n  'network.xyo.sentinel.config': MemorySentinel,\n}\n","export * from './ManifestWrapper'\nexport * from './standardCreatableModules'\nexport * from '@xyo-network/manifest-model'\n"],"mappings":";AAAA,SAAS,gBAAgB;AAEzB;AAAA,EACE;AAAA,EAGA;AAAA,EAEA;AAAA,OACK;AACP,SAAS,cAAAA,mBAAkB;AAE3B,SAAS,sBAAsB;;;ACZ/B,SAAS,kBAAkB;AAC3B,SAAS,uBAAuB;AAChC,SAAoC,qBAAqB;AACzD,SAAS,kBAAkB;AAC3B,SAAS,sBAAsB;AAExB,IAAM,2BAAsD;AAAA,EACjE,gCAAgC;AAAA,EAChC,kCAAkC,cAAc,WAAW,YAAY,EAAE,QAAQ,EAAE,QAAQ,WAAW,aAAa,EAAE,CAAC;AAAA,EACtH,2BAA2B;AAAA,EAC3B,+BAA+B;AACjC;;;ADMO,IAAM,kBAAN,cAA8B,eAAgC;AAAA,EACnE,YACE,SACmB,QACA,UAAgC,IAAI,qBAAqB,CAAC,CAAC,GAC9E;AACA,UAAM,OAAO;AAHM;AACA;AAAA,EAGrB;AAAA,EASA,MAAM,WACJ,MACA,UACA,WAAW,MACX,4BACe;AACf,UAAM,YAAY,OAAOC,OAAoB,MAAcC,cAAsB;AAC/E,YAAM,mBAAmBA,aAAY,MAAMD,MAAK,QAAQ,EAAE,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,WAAWC,YAAW,QAAQ,OAAO,CAAC,GAAG,WAAW,IAAI;AACpI,aAAO,qBAAqB,MAAMD,MAAK,QAAQ,EAAE,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,WAAW,OAAO,CAAC,GAAG,WAAW;AAAA,IACtG;AAEA,UAAM,mBAAmB;AAAA,MACvB,CAAC;AAAA,MACD,0BAA0B,wBAAwB;AAAA,MAClD,0BAA0B,8BAA8B,CAAC,CAAC;AAAA,IAC5D;AACA,QAAI,CAAE,MAAM,UAAU,MAAM,SAAS,OAAO,MAAM,QAAQ,GAAI;AAC5D,UAAI,SAAS,OAAO,YAAY,SAAS,OAAO,aAAa,cAAc;AACzE;AAAA,WACG,SAAS,OAAO,QAAS,MAAM,KAAK,OAAO,SAAS,OAAO,MAAM,QAAQ,MACvE,MAAM,KAAK,QAAQ,MAAM,KAAK,eAAe,MAAM,UAAU,gBAAgB,GAAG,SAAS,QAAQ;AAAA,UACpG,iCAAiC,SAAS,OAAO,IAAI;AAAA,QACvD;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAIA,MAAM,kBAAkB,OAAe,4BAAuG;AAC5I,UAAM,WAAW,SAAS,KAAK,aAAa,KAAK,GAAG,8BAA8B;AAClF,UAAM,WAAW,0BAA0B,8BAA8B,CAAC,CAAC;AAC3E,WAAO,MAAM,KAAK,qBAAqB,UAAU,SAAS,OAAO,eAAe,GAAG,KAAK,KAAK,QAAQ;AAAA,EACvG;AAAA,EAIA,MAAM,qBACJ,UACA,MACA,4BACqB;AACrB,UAAM,OAAO,MAAME,YAAW,OAAO,EAAE,QAAQ,SAAS,QAAQ,QAAQ,MAAM,KAAK,OAAO,WAAW,IAAI,EAAE,CAAC;AAC5G,UAAM,WAAW,0BAA0B,8BAA8B,CAAC,CAAC;AAE3E,UAAM,iBACJ,SAAS,SAAS,SAAS,IAAI,OAAO,mBAAmB;AACvD,YAAM,KAAK,WAAW,MAAM,gBAAgB,OAAO,QAAQ;AAAA,IAC7D,CAAC,KAAK,CAAC;AAET,UAAM,gBACJ,SAAS,SAAS,QAAQ,IAAI,OAAO,mBAAmB;AACtD,YAAM,KAAK,WAAW,MAAM,gBAAgB,MAAM,QAAQ;AAAA,IAC5D,CAAC,KAAK,CAAC;AACT,UAAM,QAAQ,IAAI,CAAC,GAAG,gBAAgB,GAAG,aAAa,CAAC;AACvD,WAAO;AAAA,EACT;AAAA,EAIA,MAAM,UAAU,MAAmB,4BAAyG;AAC1I,UAAM,WAAW,0BAA0B,8BAA8B,CAAC,CAAC;AAC3E,UAAM,SAAS,MAAM,QAAQ;AAAA,MAC3B,KAAK,QAAQ,EAAE,OAAO,IAAI,OAAO,cAAc,UAAU;AACvD,cAAM,UAAU,MAAM,KAAK,qBAAqB,cAAc,aAAa,OAAO,eAAe,GAAG,KAAK,KAAK,QAAQ;AACtH,cAAM,MAAM,SAAS,OAAO;AAC5B,eAAO;AAAA,MACT,CAAC;AAAA,IACH;AACA,WAAO;AAAA,EACT;AAAA,EAEA,aAAa,OAAe;AAC1B,WAAO,KAAK,QAAQ,EAAE,QAAQ,KAAK;AAAA,EACrC;AAAA,EAIA,MAAM,eACJ,MACA,UACA,kBACyB;AACzB,UAAM,WAAW,0BAA0B,oBAAoB,CAAC,CAAC;AACjE,UAAM,kBAAkB,IAAI,qBAAqB,KAAK,QAAQ,QAAQ,EACnE,aAAa,QAAQ,EACrB,OAAO,SAAS,OAAO,QAAQ,SAAS,OAAO,MAAM;AACxD,UAAM,SAAS,MAAM,gBAAgB,OAAO;AAAA,MAC1C,SAAS,SAAS,OAAO,cAAc,MAAM,KAAK,OAAO,WAAW,SAAS,OAAO,WAAW,IAAI,KAAK;AAAA,MACxG,QAAQ,SAAS,SAAS,QAAQ,gBAAgB;AAAA,IACpD,CAAC;AACD,UAAM,KAAK,SAAS,MAAM;AAC1B,WAAO;AAAA,EACT;AACF;;;AE7HA,cAAc;","names":["MemoryNode","node","external","MemoryNode"]}

package/dist/standardCreatableModules.d.mts

@@ -0,0 +1,3 @@
+import { CreatableModuleDictionary } from '@xyo-network/module';
+export declare const standardCreatableModules: CreatableModuleDictionary;
+//# sourceMappingURL=standardCreatableModules.d.ts.map

package/dist/standardCreatableModules.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"standardCreatableModules.d.ts","sourceRoot":"","sources":["../src/standardCreatableModules.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAAiB,MAAM,qBAAqB,CAAA;AAI9E,eAAO,MAAM,wBAAwB,EAAE,yBAKtC,CAAA"}

package/dist/standardCreatableModules.d.ts

@@ -0,0 +1,3 @@
+import { CreatableModuleDictionary } from '@xyo-network/module';
+export declare const standardCreatableModules: CreatableModuleDictionary;
+//# sourceMappingURL=standardCreatableModules.d.ts.map

package/dist/standardCreatableModules.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"standardCreatableModules.d.ts","sourceRoot":"","sources":["../src/standardCreatableModules.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAAiB,MAAM,qBAAqB,CAAA;AAI9E,eAAO,MAAM,wBAAwB,EAAE,yBAKtC,CAAA"}

package/package.json

@@ -8,28 +8,22 @@
     "email": "support@xyo.network",
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
-  "scripts": {
-    "package-compile": "tsup && publint",
-    "package-recompile": "tsup && publint"
-  },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "dependencies": {
-    "@xylabs/assert": "^2.10.16",
-    "@xyo-network/http-bridge": "~2.73.4",
-    "@xyo-network/manifest-model": "~2.73.4",
-    "@xyo-network/memory-archivist": "~2.73.4",
-    "@xyo-network/module": "~2.73.4",
-    "@xyo-network/node-memory": "~2.73.4",
-    "@xyo-network/node-model": "~2.73.4",
-    "@xyo-network/payload-wrapper": "~2.73.4",
-    "@xyo-network/sentinel": "~2.73.4",
-    "@xyo-network/wallet-model": "~2.73.4"
+    "@xylabs/assert": "^2.11.5",
+    "@xyo-network/http-bridge": "~2.74.0",
+    "@xyo-network/manifest-model": "~2.74.0",
+    "@xyo-network/memory-archivist": "~2.74.0",
+    "@xyo-network/module": "~2.74.0",
+    "@xyo-network/node-memory": "~2.74.0",
+    "@xyo-network/node-model": "~2.74.0",
+    "@xyo-network/payload-wrapper": "~2.74.0",
+    "@xyo-network/sentinel": "~2.74.0",
+    "@xyo-network/wallet-model": "~2.74.0"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^2.19.12",
-    "@xylabs/tsconfig": "^2.19.12",
-    "publint": "^0.2.2",
-    "tsup": "^7.2.0",
+    "@xylabs/ts-scripts-yarn3": "^3.0.27",
+    "@xylabs/tsconfig": "^3.0.27",
     "typescript": "^5.2.2"
   },
   "docs": "dist/docs.json",
@@ -45,18 +39,9 @@
         "default": "./dist/index.mjs"
       }
     },
-    "./dist/docs.json": {
-      "default": "./dist/docs.json"
-    },
-    "./cjs": {
-      "default": "./dist/index.js"
-    },
     "./docs": {
       "default": "./dist/docs.json"
     },
-    "./esm": {
-      "default": "./dist/index.mjs"
-    },
     "./package.json": "./package.json"
   },
   "main": "dist/index.js",
@@ -72,5 +57,5 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.73.4"
+  "version": "2.74.0"
 }

package/src/ManifestWrapper.ts

@@ -1,6 +1,13 @@
 import { assertEx } from '@xylabs/assert'
 import { ManifestPayload, ModuleManifest, NodeManifest } from '@xyo-network/manifest-model'
-import { CreatableModuleDictionary } from '@xyo-network/module'
+import {
+  assignCreatableModuleRegistry,
+  CreatableModuleDictionary,
+  CreatableModuleRegistry,
+  ModuleFactoryLocator,
+  ModuleInstance,
+  toCreatableModuleRegistry,
+} from '@xyo-network/module'
 import { MemoryNode } from '@xyo-network/node-memory'
 import { NodeInstance } from '@xyo-network/node-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
@@ -11,18 +18,35 @@ import { standardCreatableModules } from './standardCreatableModules'
 export class ManifestWrapper extends PayloadWrapper<ManifestPayload> {
   constructor(
     payload: ManifestPayload,
-    protected wallet: WalletInstance,
+    protected readonly wallet: WalletInstance,
+    protected readonly locator: ModuleFactoryLocator = new ModuleFactoryLocator({}),
   ) {
     super(payload)
   }
 
-  async loadModule(node: MemoryNode, manifest: ModuleManifest, external = true, additionalCreatableModules?: CreatableModuleDictionary) {
+  async loadModule(node: MemoryNode, manifest: ModuleManifest, external: boolean, additionalCreatableModules?: CreatableModuleRegistry): Promise<void>
+  async loadModule(
+    node: MemoryNode,
+    manifest: ModuleManifest,
+    external: boolean,
+    additionalCreatableModules?: CreatableModuleDictionary,
+  ): Promise<void>
+  async loadModule(
+    node: MemoryNode,
+    manifest: ModuleManifest,
+    external = true,
+    additionalCreatableModules?: CreatableModuleDictionary | CreatableModuleRegistry,
+  ): Promise<void> {
     const collision = async (node: NodeInstance, name: string, external: boolean) => {
       const externalConflict = external ? (await node.resolve({ name: [name] }, { direction: external ? 'all' : 'down' })).length !== 0 : false
       return externalConflict || (await node.resolve({ name: [name] }, { direction: 'down' })).length !== 0
     }
 
-    const creatableModules = { ...standardCreatableModules, ...additionalCreatableModules }
+    const creatableModules = assignCreatableModuleRegistry(
+      {},
+      toCreatableModuleRegistry(standardCreatableModules),
+      toCreatableModuleRegistry(additionalCreatableModules ?? {}),
+    )
     if (!(await collision(node, manifest.config.name, external))) {
       if (manifest.config.language && manifest.config.language === 'javascript') {
         assertEx(
@@ -34,37 +58,48 @@ export class ManifestWrapper extends PayloadWrapper<ManifestPayload> {
     }
   }
 
-  async loadNodeFromIndex(index: number, additionalCreatableModules?: CreatableModuleDictionary) {
+  async loadNodeFromIndex(index: number, additionalCreatableModules?: CreatableModuleRegistry): Promise<MemoryNode>
+  async loadNodeFromIndex(index: number, additionalCreatableModules?: CreatableModuleDictionary): Promise<MemoryNode>
+  async loadNodeFromIndex(index: number, additionalCreatableModules?: CreatableModuleDictionary | CreatableModuleRegistry): Promise<MemoryNode> {
     const manifest = assertEx(this.nodeManifest(index), 'Failed to find Node Manifest')
-    return await this.loadNodeFromManifest(manifest, manifest.config.accountPath ?? `${index}'`, additionalCreatableModules)
+    const registry = toCreatableModuleRegistry(additionalCreatableModules ?? {})
+    return await this.loadNodeFromManifest(manifest, manifest.config.accountPath ?? `${index}'`, registry)
   }
 
-  async loadNodeFromManifest(manifest: NodeManifest, path: string, additionalCreatableModules?: CreatableModuleDictionary) {
+  async loadNodeFromManifest(manifest: NodeManifest, path: string, additionalCreatableModules?: CreatableModuleRegistry): Promise<MemoryNode>
+  async loadNodeFromManifest(manifest: NodeManifest, path: string, additionalCreatableModules?: CreatableModuleDictionary): Promise<MemoryNode>
+  async loadNodeFromManifest(
+    manifest: NodeManifest,
+    path: string,
+    additionalCreatableModules?: CreatableModuleDictionary | CreatableModuleRegistry,
+  ): Promise<MemoryNode> {
     const node = await MemoryNode.create({ config: manifest.config, wallet: await this.wallet.derivePath(path) })
+    const registry = toCreatableModuleRegistry(additionalCreatableModules ?? {})
     // Load Private Modules
     const privateModules =
       manifest.modules?.private?.map(async (moduleManifest) => {
-        await this.loadModule(node, moduleManifest, false, additionalCreatableModules)
+        await this.loadModule(node, moduleManifest, false, registry)
       }) ?? []
     // Load Public Modules
     const publicModules =
       manifest.modules?.public?.map(async (moduleManifest) => {
-        await this.loadModule(node, moduleManifest, true, additionalCreatableModules)
+        await this.loadModule(node, moduleManifest, true, registry)
       }) ?? []
     await Promise.all([...privateModules, ...publicModules])
     return node
   }
 
-  async loadNodes(node?: MemoryNode, additionalCreatableModules?: CreatableModuleDictionary) {
-    const start = Date.now()
+  async loadNodes(node?: MemoryNode, additionalCreatableModules?: CreatableModuleRegistry): Promise<MemoryNode[]>
+  async loadNodes(node?: MemoryNode, additionalCreatableModules?: CreatableModuleDictionary): Promise<MemoryNode[]>
+  async loadNodes(node?: MemoryNode, additionalCreatableModules?: CreatableModuleDictionary | CreatableModuleRegistry): Promise<MemoryNode[]> {
+    const registry = toCreatableModuleRegistry(additionalCreatableModules ?? {})
     const result = await Promise.all(
       this.payload().nodes?.map(async (nodeManifest, index) => {
-        const subNode = await this.loadNodeFromManifest(nodeManifest, nodeManifest.config.accountPath ?? `${index}'`, additionalCreatableModules)
+        const subNode = await this.loadNodeFromManifest(nodeManifest, nodeManifest.config.accountPath ?? `${index}'`, registry)
         await node?.register(subNode)
         return subNode
       }),
     )
-    console.log(`Loaded nodes from manifest in ${Date.now() - start}ms`)
     return result
   }
 
@@ -72,12 +107,17 @@ export class ManifestWrapper extends PayloadWrapper<ManifestPayload> {
     return this.payload().nodes?.[index]
   }
 
-  async registerModule(node: MemoryNode, manifest: ModuleManifest, creatableModules?: CreatableModuleDictionary) {
-    const creatableModule = assertEx(
-      creatableModules?.[manifest.config.schema],
-      `No module with [${manifest.config.schema}] config schema available for registration`,
-    )
-
+  async registerModule(node: MemoryNode, manifest: ModuleManifest, creatableModules?: CreatableModuleRegistry): Promise<ModuleInstance>
+  async registerModule(node: MemoryNode, manifest: ModuleManifest, creatableModules?: CreatableModuleDictionary): Promise<ModuleInstance>
+  async registerModule(
+    node: MemoryNode,
+    manifest: ModuleManifest,
+    creatableModules?: CreatableModuleDictionary | CreatableModuleRegistry,
+  ): Promise<ModuleInstance> {
+    const registry = toCreatableModuleRegistry(creatableModules ?? {})
+    const creatableModule = new ModuleFactoryLocator(this.locator.registry)
+      .registerMany(registry)
+      .locate(manifest.config.schema, manifest.config.labels)
     const module = await creatableModule.create({
       account: manifest.config.accountPath ? await this.wallet.derivePath(manifest.config.accountPath) : this.wallet,
       config: assertEx(manifest.config, 'Missing config'),

package/types.d.ts

@@ -0,0 +1,3 @@
+declare module 'rollup-plugin-exclude-dependencies-from-bundle'
+declare module '@haensl/rollup-plugin-local-resolve'
+declare module 'rollup-plugin-progress'