@xyo-network/module-factory-locator 2.98.5 → 2.99.1

package/dist/node/ModuleFactoryLocator.d.ts

@@ -1,4 +1,4 @@
-import { AttachableModuleInstance, CreatableModuleFactory, CreatableModuleRegistry, LabeledCreatableModuleFactory, Labels } from '@xyo-network/module-model';
+import { CreatableModuleFactory, CreatableModuleRegistry, LabeledCreatableModuleFactory, Labels } from '@xyo-network/module-model';
 import { Schema } from '@xyo-network/payload-model';
 /**
  * A class which encapsulates the Service Locator Pattern for Module Factories
@@ -19,19 +19,15 @@ export declare class ModuleFactoryLocator {
     locate(schema: string, labels?: Labels): CreatableModuleFactory | LabeledCreatableModuleFactory;
     /**
      * Registers a single module factory (with optional tags) with the locator
-     * @param additional Additional module factories to register
+     * @param factory The factory to register
+     * @param labels The labels for the module factory
      */
-    register(mod: CreatableModuleFactory, labels?: Labels): this;
+    register(factory: CreatableModuleFactory, labels?: Labels, primary?: boolean | Schema | Schema[]): this;
     /**
      * Registers multiple module factories with the locator
-     * @param additional Additional module factories to register
-     */
-    registerMany(mods: CreatableModuleFactory[]): this;
-    /**
-     * Registers a single module factory (with optional tags) with the locator & a specific schema
-     * @param additional Additional module factories to register
+     * @param factories The factories to register
      */
-    registerOne<TModule extends AttachableModuleInstance>(mod: CreatableModuleFactory<TModule>, schema: Schema, labels?: Labels, primary?: boolean): this;
+    registerMany(factories: CreatableModuleFactory[]): this;
     /**
      * Tries to locate a module factory that matches the supplied schema and labels
      * @param schema The config schema for the module

package/dist/node/ModuleFactoryLocator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModuleFactoryLocator.d.ts","sourceRoot":"","sources":["../../src/ModuleFactoryLocator.ts"],"names":[],"mappings":"AACA,OAAO,EACL,wBAAwB,EACxB,sBAAsB,EACtB,uBAAuB,EAGvB,6BAA6B,EAC7B,MAAM,EACP,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAInD;;GAEG;AACH,qBAAa,oBAAoB;IACnB,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,uBAAuB;gBAAlC,SAAS,GAAE,uBAAsD;IAEhG;;OAEG;IACH,IAAI,QAAQ,IAAI,QAAQ,CAAC,uBAAuB,CAAC,CAEhD;IAED;;;;;OAKG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,sBAAsB,GAAG,6BAA6B;IAO/F;;;OAGG;IACH,QAAQ,CAAC,GAAG,EAAE,sBAAsB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;IAQ5D;;;OAGG;IACH,YAAY,CAAC,IAAI,EAAE,sBAAsB,EAAE,GAAG,IAAI;IAOlD;;;OAGG;IACH,WAAW,CAAC,OAAO,SAAS,wBAAwB,EAClD,GAAG,EAAE,sBAAsB,CAAC,OAAO,CAAC,EACpC,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,UAAQ,GACd,IAAI;IAcP;;;;;OAKG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,sBAAsB,GAAG,6BAA6B,GAAG,SAAS;CAQ/G"}
+{"version":3,"file":"ModuleFactoryLocator.d.ts","sourceRoot":"","sources":["../../src/ModuleFactoryLocator.ts"],"names":[],"mappings":"AACA,OAAO,EACL,sBAAsB,EACtB,uBAAuB,EAGvB,6BAA6B,EAC7B,MAAM,EAEP,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAInD;;GAEG;AACH,qBAAa,oBAAoB;IACnB,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,uBAAuB;gBAAlC,SAAS,GAAE,uBAAsD;IAEhG;;OAEG;IACH,IAAI,QAAQ,IAAI,QAAQ,CAAC,uBAAuB,CAAC,CAEhD;IAED;;;;;OAKG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,sBAAsB,GAAG,6BAA6B;IAO/F;;;;OAIG;IACH,QAAQ,CAAC,OAAO,EAAE,sBAAsB,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,GAAE,OAAO,GAAG,MAAM,GAAG,MAAM,EAAU,GAAG,IAAI;IAK9G;;;OAGG;IACH,YAAY,CAAC,SAAS,EAAE,sBAAsB,EAAE,GAAG,IAAI;IAOvD;;;;;OAKG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,sBAAsB,GAAG,6BAA6B,GAAG,SAAS;CAQ/G"}

package/dist/node/index.cjs

@@ -21,7 +21,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  ModuleFactoryLocator: () => ModuleFactoryLocator
+  ModuleFactoryLocator: () => ModuleFactoryLocator,
+  standardCreatableFactories: () => standardCreatableFactories,
+  standardCreatableFactoriesList: () => standardCreatableFactoriesList
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -31,39 +33,31 @@ var import_module_model2 = require("@xyo-network/module-model");
 
 // src/standardCreatableFactories.ts
 var import_archivist_memory = require("@xyo-network/archivist-memory");
-var import_archivist_model = require("@xyo-network/archivist-model");
 var import_archivist_view = require("@xyo-network/archivist-view");
-var import_bridge_model = require("@xyo-network/bridge-model");
+var import_diviner_boundwitness_memory = require("@xyo-network/diviner-boundwitness-memory");
 var import_diviner_identity = require("@xyo-network/diviner-identity");
-var import_diviner_model = require("@xyo-network/diviner-model");
+var import_diviner_payload_memory = require("@xyo-network/diviner-payload-memory");
 var import_http_bridge = require("@xyo-network/http-bridge");
 var import_module_model = require("@xyo-network/module-model");
 var import_node_memory = require("@xyo-network/node-memory");
-var import_node_model = require("@xyo-network/node-model");
 var import_node_view = require("@xyo-network/node-view");
 var import_sentinel_memory = require("@xyo-network/sentinel-memory");
-var import_sentinel_model = require("@xyo-network/sentinel-model");
 var import_witness_adhoc = require("@xyo-network/witness-adhoc");
-var import_witness_model = require("@xyo-network/witness-model");
 var standardCreatableFactoriesList = [
-  import_archivist_memory.MemoryArchivist,
   import_http_bridge.HttpBridge,
-  import_archivist_memory.MemoryArchivist,
-  import_node_memory.MemoryNode,
-  import_sentinel_memory.MemorySentinel,
   import_archivist_view.ViewArchivist,
   import_node_view.ViewNode,
-  import_witness_adhoc.AdhocWitness
+  import_witness_adhoc.AdhocWitness,
+  import_diviner_payload_memory.MemoryPayloadDiviner,
+  import_diviner_boundwitness_memory.MemoryBoundWitnessDiviner,
+  import_diviner_identity.IdentityDiviner,
+  import_archivist_memory.MemoryArchivist,
+  import_archivist_memory.MemoryArchivist,
+  import_node_memory.MemoryNode,
+  import_sentinel_memory.MemorySentinel
 ];
 var standardCreatableFactories = /* @__PURE__ */ __name(() => {
-  const registry = (0, import_module_model.registerCreatableModuleFactories)(standardCreatableFactoriesList);
-  (0, import_module_model.registerPrimaryCreatableModuleFactory)(registry, import_node_memory.MemoryNode, import_node_model.NodeConfigSchema);
-  (0, import_module_model.registerPrimaryCreatableModuleFactory)(registry, import_archivist_memory.MemoryArchivist, import_archivist_model.ArchivistConfigSchema);
-  (0, import_module_model.registerPrimaryCreatableModuleFactory)(registry, import_sentinel_memory.MemorySentinel, import_sentinel_model.SentinelConfigSchema);
-  (0, import_module_model.registerPrimaryCreatableModuleFactory)(registry, import_witness_adhoc.AdhocWitness, import_witness_model.WitnessConfigSchema);
-  (0, import_module_model.registerPrimaryCreatableModuleFactory)(registry, import_diviner_identity.IdentityDiviner, import_diviner_model.DivinerConfigSchema);
-  (0, import_module_model.registerPrimaryCreatableModuleFactory)(registry, import_http_bridge.HttpBridge, import_bridge_model.BridgeConfigSchema);
-  return registry;
+  return (0, import_module_model.registerCreatableModuleFactories)(standardCreatableFactoriesList, {}, true);
 }, "standardCreatableFactories");
 
 // src/ModuleFactoryLocator.ts
@@ -89,49 +83,24 @@ var _ModuleFactoryLocator = class _ModuleFactoryLocator {
   }
   /**
   * Registers a single module factory (with optional tags) with the locator
-  * @param additional Additional module factories to register
+  * @param factory The factory to register
+  * @param labels The labels for the module factory
   */
-  register(mod, labels) {
-    this.registerOne(mod, mod.defaultConfigSchema, labels, true);
-    mod.configSchemas.map((schema) => {
-      this.registerOne(mod, schema, labels, false);
-    });
+  register(factory, labels, primary = false) {
+    (0, import_module_model2.registerCreatableModuleFactory)(this._registry, factory, labels, primary);
     return this;
   }
   /**
   * Registers multiple module factories with the locator
-  * @param additional Additional module factories to register
+  * @param factories The factories to register
   */
-  registerMany(mods) {
-    for (const mod of mods) {
-      this.register(mod);
+  registerMany(factories) {
+    for (const factory of factories) {
+      this.register(factory);
     }
     return this;
   }
   /**
-  * Registers a single module factory (with optional tags) with the locator & a specific schema
-  * @param additional Additional module factories to register
-  */
-  registerOne(mod, schema, labels, primary = false) {
-    const existingFactories = this._registry[schema];
-    const factory = {
-      // Destructure instance properties
-      ...mod,
-      // Copy static methods
-      create: mod.create.bind(mod),
-      // Merge module & supplied labels
-      labels: Object.assign({}, mod.labels ?? {}, labels ?? {})
-    };
-    this._registry[schema] = primary ? [
-      factory,
-      ...existingFactories ?? []
-    ] : [
-      ...existingFactories ?? [],
-      factory
-    ];
-    return this;
-  }
-  /**
   * Tries to locate a module factory that matches the supplied schema and labels
   * @param schema The config schema for the module
   * @param labels The labels for the module factory
@@ -149,6 +118,8 @@ __name(_ModuleFactoryLocator, "ModuleFactoryLocator");
 var ModuleFactoryLocator = _ModuleFactoryLocator;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ModuleFactoryLocator
+  ModuleFactoryLocator,
+  standardCreatableFactories,
+  standardCreatableFactoriesList
 });
 //# sourceMappingURL=index.cjs.map

package/dist/node/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/ModuleFactoryLocator.ts","../../src/standardCreatableFactories.ts"],"sourcesContent":["export * from './ModuleFactoryLocator'\n","import { assertEx } from '@xylabs/assert'\nimport {\n  AttachableModuleInstance,\n  CreatableModuleFactory,\n  CreatableModuleRegistry,\n  hasAllLabels,\n  hasLabels,\n  LabeledCreatableModuleFactory,\n  Labels,\n} from '@xyo-network/module-model'\nimport { Schema } from '@xyo-network/payload-model'\n\nimport { standardCreatableFactories } from './standardCreatableFactories'\n\n/**\n * A class which encapsulates the Service Locator Pattern for Module Factories\n */\nexport class ModuleFactoryLocator {\n  constructor(protected readonly _registry: CreatableModuleRegistry = standardCreatableFactories()) {}\n\n  /**\n   * The current registry for the module factory\n   */\n  get registry(): Readonly<CreatableModuleRegistry> {\n    return this._registry\n  }\n\n  /**\n   * Locates a module factory that matches the supplied schema and labels\n   * @param schema The config schema for the module\n   * @param labels The labels for the module factory\n   * @returns A module factory that matches the supplied schema and labels or throws if one is not found\n   */\n  locate(schema: string, labels?: Labels): CreatableModuleFactory | LabeledCreatableModuleFactory {\n    return assertEx(\n      this.tryLocate(schema, labels),\n      () => `No module factory for the supplied ${`config schema [${schema}]`}${labels ? ` & labels [${JSON.stringify(labels)}]` : ''} registered`,\n    )\n  }\n\n  /**\n   * Registers a single module factory (with optional tags) with the locator\n   * @param additional Additional module factories to register\n   */\n  register(mod: CreatableModuleFactory, labels?: Labels): this {\n    this.registerOne(mod, mod.defaultConfigSchema, labels, true)\n    mod.configSchemas.map((schema) => {\n      this.registerOne(mod, schema, labels, false)\n    })\n    return this\n  }\n\n  /**\n   * Registers multiple module factories with the locator\n   * @param additional Additional module factories to register\n   */\n  registerMany(mods: CreatableModuleFactory[]): this {\n    for (const mod of mods) {\n      this.register(mod)\n    }\n    return this\n  }\n\n  /**\n   * Registers a single module factory (with optional tags) with the locator & a specific schema\n   * @param additional Additional module factories to register\n   */\n  registerOne<TModule extends AttachableModuleInstance>(\n    mod: CreatableModuleFactory<TModule>,\n    schema: Schema,\n    labels?: Labels,\n    primary = false,\n  ): this {\n    const existingFactories = this._registry[schema]\n    const factory: LabeledCreatableModuleFactory<TModule> = {\n      // Destructure instance properties\n      ...mod,\n      // Copy static methods\n      create: mod.create.bind(mod) as LabeledCreatableModuleFactory<TModule>['create'],\n      // Merge module & supplied labels\n      labels: Object.assign({}, (mod as LabeledCreatableModuleFactory).labels ?? {}, labels ?? {}),\n    }\n    this._registry[schema] = primary ? [factory, ...(existingFactories ?? [])] : [...(existingFactories ?? []), factory]\n    return this\n  }\n\n  /**\n   * Tries to locate a module factory that matches the supplied schema and labels\n   * @param schema The config schema for the module\n   * @param labels The labels for the module factory\n   * @returns A module factory that matches the supplied schema and labels or undefined\n   */\n  tryLocate(schema: string, labels?: Labels): CreatableModuleFactory | LabeledCreatableModuleFactory | undefined {\n    // If labels were provided\n    return labels ?\n        // Find the first factory that has labels and has all the labels provided\n        this._registry[schema]?.filter(hasLabels).find((factory) => hasAllLabels(factory?.labels, labels))\n      : // Otherwise, return the first factory\n        this._registry[schema]?.[0]\n  }\n}\n","import { MemoryArchivist } from '@xyo-network/archivist-memory'\nimport { ArchivistConfigSchema } from '@xyo-network/archivist-model'\nimport { ViewArchivist } from '@xyo-network/archivist-view'\nimport { BridgeConfigSchema } from '@xyo-network/bridge-model'\nimport { IdentityDiviner } from '@xyo-network/diviner-identity'\nimport { DivinerConfigSchema } from '@xyo-network/diviner-model'\nimport { HttpBridge } from '@xyo-network/http-bridge'\nimport {\n  CreatableModuleFactory,\n  LabeledCreatableModuleFactory,\n  registerCreatableModuleFactories,\n  registerPrimaryCreatableModuleFactory,\n} from '@xyo-network/module-model'\nimport { MemoryNode } from '@xyo-network/node-memory'\nimport { NodeConfigSchema } from '@xyo-network/node-model'\nimport { ViewNode } from '@xyo-network/node-view'\nimport { MemorySentinel } from '@xyo-network/sentinel-memory'\nimport { SentinelConfigSchema } from '@xyo-network/sentinel-model'\nimport { AdhocWitness } from '@xyo-network/witness-adhoc'\nimport { WitnessConfigSchema } from '@xyo-network/witness-model'\n\nexport const standardCreatableFactoriesList: (CreatableModuleFactory | LabeledCreatableModuleFactory)[] = [\n  MemoryArchivist,\n  HttpBridge,\n  MemoryArchivist,\n  MemoryNode,\n  MemorySentinel,\n  ViewArchivist,\n  ViewNode,\n  AdhocWitness,\n]\n\nexport const standardCreatableFactories = () => {\n  const registry = registerCreatableModuleFactories(standardCreatableFactoriesList)\n  registerPrimaryCreatableModuleFactory(registry, MemoryNode, NodeConfigSchema)\n  registerPrimaryCreatableModuleFactory(registry, MemoryArchivist, ArchivistConfigSchema)\n  registerPrimaryCreatableModuleFactory(registry, MemorySentinel, SentinelConfigSchema)\n  registerPrimaryCreatableModuleFactory(registry, AdhocWitness, WitnessConfigSchema)\n  registerPrimaryCreatableModuleFactory(registry, IdentityDiviner, DivinerConfigSchema)\n  registerPrimaryCreatableModuleFactory(registry, HttpBridge, BridgeConfigSchema)\n  return registry\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;ACAA,oBAAyB;AACzB,IAAAA,uBAQO;;;ACTP,8BAAgC;AAChC,6BAAsC;AACtC,4BAA8B;AAC9B,0BAAmC;AACnC,8BAAgC;AAChC,2BAAoC;AACpC,yBAA2B;AAC3B,0BAKO;AACP,yBAA2B;AAC3B,wBAAiC;AACjC,uBAAyB;AACzB,6BAA+B;AAC/B,4BAAqC;AACrC,2BAA6B;AAC7B,2BAAoC;AAE7B,IAAMC,iCAA6F;EACxGC;EACAC;EACAD;EACAE;EACAC;EACAC;EACAC;EACAC;;AAGK,IAAMC,6BAA6B,6BAAA;AACxC,QAAMC,eAAWC,sDAAiCV,8BAAAA;AAClDW,iEAAsCF,UAAUN,+BAAYS,kCAAAA;AAC5DD,iEAAsCF,UAAUR,yCAAiBY,4CAAAA;AACjEF,iEAAsCF,UAAUL,uCAAgBU,0CAAAA;AAChEH,iEAAsCF,UAAUF,mCAAcQ,wCAAAA;AAC9DJ,iEAAsCF,UAAUO,yCAAiBC,wCAAAA;AACjEN,iEAAsCF,UAAUP,+BAAYgB,sCAAAA;AAC5D,SAAOT;AACT,GAT0C;;;ADfnC,IAAMU,wBAAN,MAAMA,sBAAAA;;EACXC,YAA+BC,YAAqCC,2BAAAA,GAA8B;SAAnED,YAAAA;EAAoE;;;;EAKnG,IAAIE,WAA8C;AAChD,WAAO,KAAKF;EACd;;;;;;;EAQAG,OAAOC,QAAgBC,QAAyE;AAC9F,eAAOC,wBACL,KAAKC,UAAUH,QAAQC,MAAAA,GACvB,MAAM,sCAAsC,kBAAkBD,MAAAA,GAAS,GAAGC,SAAS,cAAcG,KAAKC,UAAUJ,MAAAA,CAAAA,MAAa,EAAA,aAAe;EAEhJ;;;;;EAMAK,SAASC,KAA6BN,QAAuB;AAC3D,SAAKO,YAAYD,KAAKA,IAAIE,qBAAqBR,QAAQ,IAAA;AACvDM,QAAIG,cAAcC,IAAI,CAACX,WAAAA;AACrB,WAAKQ,YAAYD,KAAKP,QAAQC,QAAQ,KAAA;IACxC,CAAA;AACA,WAAO;EACT;;;;;EAMAW,aAAaC,MAAsC;AACjD,eAAWN,OAAOM,MAAM;AACtB,WAAKP,SAASC,GAAAA;IAChB;AACA,WAAO;EACT;;;;;EAMAC,YACED,KACAP,QACAC,QACAa,UAAU,OACJ;AACN,UAAMC,oBAAoB,KAAKnB,UAAUI,MAAAA;AACzC,UAAMgB,UAAkD;;MAEtD,GAAGT;;MAEHU,QAAQV,IAAIU,OAAOC,KAAKX,GAAAA;;MAExBN,QAAQkB,OAAOC,OAAO,CAAC,GAAIb,IAAsCN,UAAU,CAAC,GAAGA,UAAU,CAAC,CAAA;IAC5F;AACA,SAAKL,UAAUI,MAAAA,IAAUc,UAAU;MAACE;SAAaD,qBAAqB,CAAA;QAAO;SAAKA,qBAAqB,CAAA;MAAKC;;AAC5G,WAAO;EACT;;;;;;;EAQAb,UAAUH,QAAgBC,QAAqF;AA5FjH;AA8FI,WAAOA;;OAEH,UAAKL,UAAUI,MAAAA,MAAf,mBAAwBqB,OAAOC,gCAAWC,KAAK,CAACP,gBAAYQ,mCAAaR,mCAASf,QAAQA,MAAAA;SAE1F,UAAKL,UAAUI,MAAAA,MAAf,mBAAyB;EAC/B;AACF;AAnFaN;AAAN,IAAMA,uBAAN;","names":["import_module_model","standardCreatableFactoriesList","MemoryArchivist","HttpBridge","MemoryNode","MemorySentinel","ViewArchivist","ViewNode","AdhocWitness","standardCreatableFactories","registry","registerCreatableModuleFactories","registerPrimaryCreatableModuleFactory","NodeConfigSchema","ArchivistConfigSchema","SentinelConfigSchema","WitnessConfigSchema","IdentityDiviner","DivinerConfigSchema","BridgeConfigSchema","ModuleFactoryLocator","constructor","_registry","standardCreatableFactories","registry","locate","schema","labels","assertEx","tryLocate","JSON","stringify","register","mod","registerOne","defaultConfigSchema","configSchemas","map","registerMany","mods","primary","existingFactories","factory","create","bind","Object","assign","filter","hasLabels","find","hasAllLabels"]}
+{"version":3,"sources":["../../src/index.ts","../../src/ModuleFactoryLocator.ts","../../src/standardCreatableFactories.ts"],"sourcesContent":["export * from './ModuleFactoryLocator'\nexport * from './standardCreatableFactories'\n","import { assertEx } from '@xylabs/assert'\nimport {\n  CreatableModuleFactory,\n  CreatableModuleRegistry,\n  hasAllLabels,\n  hasLabels,\n  LabeledCreatableModuleFactory,\n  Labels,\n  registerCreatableModuleFactory,\n} from '@xyo-network/module-model'\nimport { Schema } from '@xyo-network/payload-model'\n\nimport { standardCreatableFactories } from './standardCreatableFactories'\n\n/**\n * A class which encapsulates the Service Locator Pattern for Module Factories\n */\nexport class ModuleFactoryLocator {\n  constructor(protected readonly _registry: CreatableModuleRegistry = standardCreatableFactories()) {}\n\n  /**\n   * The current registry for the module factory\n   */\n  get registry(): Readonly<CreatableModuleRegistry> {\n    return this._registry\n  }\n\n  /**\n   * Locates a module factory that matches the supplied schema and labels\n   * @param schema The config schema for the module\n   * @param labels The labels for the module factory\n   * @returns A module factory that matches the supplied schema and labels or throws if one is not found\n   */\n  locate(schema: string, labels?: Labels): CreatableModuleFactory | LabeledCreatableModuleFactory {\n    return assertEx(\n      this.tryLocate(schema, labels),\n      () => `No module factory for the supplied ${`config schema [${schema}]`}${labels ? ` & labels [${JSON.stringify(labels)}]` : ''} registered`,\n    )\n  }\n\n  /**\n   * Registers a single module factory (with optional tags) with the locator\n   * @param factory The factory to register\n   * @param labels The labels for the module factory\n   */\n  register(factory: CreatableModuleFactory, labels?: Labels, primary: boolean | Schema | Schema[] = false): this {\n    registerCreatableModuleFactory(this._registry, factory, labels, primary)\n    return this\n  }\n\n  /**\n   * Registers multiple module factories with the locator\n   * @param factories The factories to register\n   */\n  registerMany(factories: CreatableModuleFactory[]): this {\n    for (const factory of factories) {\n      this.register(factory)\n    }\n    return this\n  }\n\n  /**\n   * Tries to locate a module factory that matches the supplied schema and labels\n   * @param schema The config schema for the module\n   * @param labels The labels for the module factory\n   * @returns A module factory that matches the supplied schema and labels or undefined\n   */\n  tryLocate(schema: string, labels?: Labels): CreatableModuleFactory | LabeledCreatableModuleFactory | undefined {\n    // If labels were provided\n    return labels ?\n        // Find the first factory that has labels and has all the labels provided\n        this._registry[schema]?.filter(hasLabels).find((factory) => hasAllLabels(factory?.labels, labels))\n      : // Otherwise, return the first factory\n        this._registry[schema]?.[0]\n  }\n}\n","import { MemoryArchivist } from '@xyo-network/archivist-memory'\nimport { ViewArchivist } from '@xyo-network/archivist-view'\nimport { MemoryBoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-memory'\nimport { IdentityDiviner } from '@xyo-network/diviner-identity'\nimport { MemoryPayloadDiviner } from '@xyo-network/diviner-payload-memory'\nimport { HttpBridge } from '@xyo-network/http-bridge'\nimport { CreatableModuleFactory, LabeledCreatableModuleFactory, registerCreatableModuleFactories } from '@xyo-network/module-model'\nimport { MemoryNode } from '@xyo-network/node-memory'\nimport { ViewNode } from '@xyo-network/node-view'\nimport { MemorySentinel } from '@xyo-network/sentinel-memory'\nimport { AdhocWitness } from '@xyo-network/witness-adhoc'\n\n//order matters in this array.  later items will register themselves as primary for schemas shared with earlier items\nexport const standardCreatableFactoriesList: (CreatableModuleFactory | LabeledCreatableModuleFactory)[] = [\n  HttpBridge,\n  ViewArchivist,\n  ViewNode,\n  AdhocWitness,\n  MemoryPayloadDiviner,\n  MemoryBoundWitnessDiviner,\n  IdentityDiviner,\n  MemoryArchivist,\n  MemoryArchivist,\n  MemoryNode,\n  MemorySentinel,\n]\n\nexport const standardCreatableFactories = () => {\n  return registerCreatableModuleFactories(standardCreatableFactoriesList, {}, true)\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;ACAA,oBAAyB;AACzB,IAAAA,uBAQO;;;ACTP,8BAAgC;AAChC,4BAA8B;AAC9B,yCAA0C;AAC1C,8BAAgC;AAChC,oCAAqC;AACrC,yBAA2B;AAC3B,0BAAwG;AACxG,yBAA2B;AAC3B,uBAAyB;AACzB,6BAA+B;AAC/B,2BAA6B;AAGtB,IAAMC,iCAA6F;EACxGC;EACAC;EACAC;EACAC;EACAC;EACAC;EACAC;EACAC;EACAA;EACAC;EACAC;;AAGK,IAAMC,6BAA6B,6BAAA;AACxC,aAAOC,sDAAiCZ,gCAAgC,CAAC,GAAG,IAAA;AAC9E,GAF0C;;;ADVnC,IAAMa,wBAAN,MAAMA,sBAAAA;;EACXC,YAA+BC,YAAqCC,2BAAAA,GAA8B;SAAnED,YAAAA;EAAoE;;;;EAKnG,IAAIE,WAA8C;AAChD,WAAO,KAAKF;EACd;;;;;;;EAQAG,OAAOC,QAAgBC,QAAyE;AAC9F,eAAOC,wBACL,KAAKC,UAAUH,QAAQC,MAAAA,GACvB,MAAM,sCAAsC,kBAAkBD,MAAAA,GAAS,GAAGC,SAAS,cAAcG,KAAKC,UAAUJ,MAAAA,CAAAA,MAAa,EAAA,aAAe;EAEhJ;;;;;;EAOAK,SAASC,SAAiCN,QAAiBO,UAAuC,OAAa;AAC7GC,6DAA+B,KAAKb,WAAWW,SAASN,QAAQO,OAAAA;AAChE,WAAO;EACT;;;;;EAMAE,aAAaC,WAA2C;AACtD,eAAWJ,WAAWI,WAAW;AAC/B,WAAKL,SAASC,OAAAA;IAChB;AACA,WAAO;EACT;;;;;;;EAQAJ,UAAUH,QAAgBC,QAAqF;AAnEjH;AAqEI,WAAOA;;OAEH,UAAKL,UAAUI,MAAAA,MAAf,mBAAwBY,OAAOC,gCAAWC,KAAK,CAACP,gBAAYQ,mCAAaR,mCAASN,QAAQA,MAAAA;SAE1F,UAAKL,UAAUI,MAAAA,MAAf,mBAAyB;EAC/B;AACF;AA1DaN;AAAN,IAAMA,uBAAN;","names":["import_module_model","standardCreatableFactoriesList","HttpBridge","ViewArchivist","ViewNode","AdhocWitness","MemoryPayloadDiviner","MemoryBoundWitnessDiviner","IdentityDiviner","MemoryArchivist","MemoryNode","MemorySentinel","standardCreatableFactories","registerCreatableModuleFactories","ModuleFactoryLocator","constructor","_registry","standardCreatableFactories","registry","locate","schema","labels","assertEx","tryLocate","JSON","stringify","register","factory","primary","registerCreatableModuleFactory","registerMany","factories","filter","hasLabels","find","hasAllLabels"]}

package/dist/node/index.d.cts

@@ -1,2 +1,3 @@
 export * from './ModuleFactoryLocator';
+export * from './standardCreatableFactories';
 //# sourceMappingURL=index.d.ts.map

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

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

package/dist/node/index.d.mts

@@ -1,2 +1,3 @@
 export * from './ModuleFactoryLocator';
+export * from './standardCreatableFactories';
 //# sourceMappingURL=index.d.ts.map

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

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

package/dist/node/index.d.ts

@@ -1,2 +1,3 @@
 export * from './ModuleFactoryLocator';
+export * from './standardCreatableFactories';
 //# sourceMappingURL=index.d.ts.map

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

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

package/dist/node/index.js

@@ -3,43 +3,35 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 
 // src/ModuleFactoryLocator.ts
 import { assertEx } from "@xylabs/assert";
-import { hasAllLabels, hasLabels } from "@xyo-network/module-model";
+import { hasAllLabels, hasLabels, registerCreatableModuleFactory } from "@xyo-network/module-model";
 
 // src/standardCreatableFactories.ts
 import { MemoryArchivist } from "@xyo-network/archivist-memory";
-import { ArchivistConfigSchema } from "@xyo-network/archivist-model";
 import { ViewArchivist } from "@xyo-network/archivist-view";
-import { BridgeConfigSchema } from "@xyo-network/bridge-model";
+import { MemoryBoundWitnessDiviner } from "@xyo-network/diviner-boundwitness-memory";
 import { IdentityDiviner } from "@xyo-network/diviner-identity";
-import { DivinerConfigSchema } from "@xyo-network/diviner-model";
+import { MemoryPayloadDiviner } from "@xyo-network/diviner-payload-memory";
 import { HttpBridge } from "@xyo-network/http-bridge";
-import { registerCreatableModuleFactories, registerPrimaryCreatableModuleFactory } from "@xyo-network/module-model";
+import { registerCreatableModuleFactories } from "@xyo-network/module-model";
 import { MemoryNode } from "@xyo-network/node-memory";
-import { NodeConfigSchema } from "@xyo-network/node-model";
 import { ViewNode } from "@xyo-network/node-view";
 import { MemorySentinel } from "@xyo-network/sentinel-memory";
-import { SentinelConfigSchema } from "@xyo-network/sentinel-model";
 import { AdhocWitness } from "@xyo-network/witness-adhoc";
-import { WitnessConfigSchema } from "@xyo-network/witness-model";
 var standardCreatableFactoriesList = [
-  MemoryArchivist,
   HttpBridge,
-  MemoryArchivist,
-  MemoryNode,
-  MemorySentinel,
   ViewArchivist,
   ViewNode,
-  AdhocWitness
+  AdhocWitness,
+  MemoryPayloadDiviner,
+  MemoryBoundWitnessDiviner,
+  IdentityDiviner,
+  MemoryArchivist,
+  MemoryArchivist,
+  MemoryNode,
+  MemorySentinel
 ];
 var standardCreatableFactories = /* @__PURE__ */ __name(() => {
-  const registry = registerCreatableModuleFactories(standardCreatableFactoriesList);
-  registerPrimaryCreatableModuleFactory(registry, MemoryNode, NodeConfigSchema);
-  registerPrimaryCreatableModuleFactory(registry, MemoryArchivist, ArchivistConfigSchema);
-  registerPrimaryCreatableModuleFactory(registry, MemorySentinel, SentinelConfigSchema);
-  registerPrimaryCreatableModuleFactory(registry, AdhocWitness, WitnessConfigSchema);
-  registerPrimaryCreatableModuleFactory(registry, IdentityDiviner, DivinerConfigSchema);
-  registerPrimaryCreatableModuleFactory(registry, HttpBridge, BridgeConfigSchema);
-  return registry;
+  return registerCreatableModuleFactories(standardCreatableFactoriesList, {}, true);
 }, "standardCreatableFactories");
 
 // src/ModuleFactoryLocator.ts
@@ -65,49 +57,24 @@ var _ModuleFactoryLocator = class _ModuleFactoryLocator {
   }
   /**
   * Registers a single module factory (with optional tags) with the locator
-  * @param additional Additional module factories to register
+  * @param factory The factory to register
+  * @param labels The labels for the module factory
   */
-  register(mod, labels) {
-    this.registerOne(mod, mod.defaultConfigSchema, labels, true);
-    mod.configSchemas.map((schema) => {
-      this.registerOne(mod, schema, labels, false);
-    });
+  register(factory, labels, primary = false) {
+    registerCreatableModuleFactory(this._registry, factory, labels, primary);
     return this;
   }
   /**
   * Registers multiple module factories with the locator
-  * @param additional Additional module factories to register
+  * @param factories The factories to register
   */
-  registerMany(mods) {
-    for (const mod of mods) {
-      this.register(mod);
+  registerMany(factories) {
+    for (const factory of factories) {
+      this.register(factory);
     }
     return this;
   }
   /**
-  * Registers a single module factory (with optional tags) with the locator & a specific schema
-  * @param additional Additional module factories to register
-  */
-  registerOne(mod, schema, labels, primary = false) {
-    const existingFactories = this._registry[schema];
-    const factory = {
-      // Destructure instance properties
-      ...mod,
-      // Copy static methods
-      create: mod.create.bind(mod),
-      // Merge module & supplied labels
-      labels: Object.assign({}, mod.labels ?? {}, labels ?? {})
-    };
-    this._registry[schema] = primary ? [
-      factory,
-      ...existingFactories ?? []
-    ] : [
-      ...existingFactories ?? [],
-      factory
-    ];
-    return this;
-  }
-  /**
   * Tries to locate a module factory that matches the supplied schema and labels
   * @param schema The config schema for the module
   * @param labels The labels for the module factory
@@ -124,6 +91,8 @@ var _ModuleFactoryLocator = class _ModuleFactoryLocator {
 __name(_ModuleFactoryLocator, "ModuleFactoryLocator");
 var ModuleFactoryLocator = _ModuleFactoryLocator;
 export {
-  ModuleFactoryLocator
+  ModuleFactoryLocator,
+  standardCreatableFactories,
+  standardCreatableFactoriesList
 };
 //# sourceMappingURL=index.js.map

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/ModuleFactoryLocator.ts","../../src/standardCreatableFactories.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport {\n  AttachableModuleInstance,\n  CreatableModuleFactory,\n  CreatableModuleRegistry,\n  hasAllLabels,\n  hasLabels,\n  LabeledCreatableModuleFactory,\n  Labels,\n} from '@xyo-network/module-model'\nimport { Schema } from '@xyo-network/payload-model'\n\nimport { standardCreatableFactories } from './standardCreatableFactories'\n\n/**\n * A class which encapsulates the Service Locator Pattern for Module Factories\n */\nexport class ModuleFactoryLocator {\n  constructor(protected readonly _registry: CreatableModuleRegistry = standardCreatableFactories()) {}\n\n  /**\n   * The current registry for the module factory\n   */\n  get registry(): Readonly<CreatableModuleRegistry> {\n    return this._registry\n  }\n\n  /**\n   * Locates a module factory that matches the supplied schema and labels\n   * @param schema The config schema for the module\n   * @param labels The labels for the module factory\n   * @returns A module factory that matches the supplied schema and labels or throws if one is not found\n   */\n  locate(schema: string, labels?: Labels): CreatableModuleFactory | LabeledCreatableModuleFactory {\n    return assertEx(\n      this.tryLocate(schema, labels),\n      () => `No module factory for the supplied ${`config schema [${schema}]`}${labels ? ` & labels [${JSON.stringify(labels)}]` : ''} registered`,\n    )\n  }\n\n  /**\n   * Registers a single module factory (with optional tags) with the locator\n   * @param additional Additional module factories to register\n   */\n  register(mod: CreatableModuleFactory, labels?: Labels): this {\n    this.registerOne(mod, mod.defaultConfigSchema, labels, true)\n    mod.configSchemas.map((schema) => {\n      this.registerOne(mod, schema, labels, false)\n    })\n    return this\n  }\n\n  /**\n   * Registers multiple module factories with the locator\n   * @param additional Additional module factories to register\n   */\n  registerMany(mods: CreatableModuleFactory[]): this {\n    for (const mod of mods) {\n      this.register(mod)\n    }\n    return this\n  }\n\n  /**\n   * Registers a single module factory (with optional tags) with the locator & a specific schema\n   * @param additional Additional module factories to register\n   */\n  registerOne<TModule extends AttachableModuleInstance>(\n    mod: CreatableModuleFactory<TModule>,\n    schema: Schema,\n    labels?: Labels,\n    primary = false,\n  ): this {\n    const existingFactories = this._registry[schema]\n    const factory: LabeledCreatableModuleFactory<TModule> = {\n      // Destructure instance properties\n      ...mod,\n      // Copy static methods\n      create: mod.create.bind(mod) as LabeledCreatableModuleFactory<TModule>['create'],\n      // Merge module & supplied labels\n      labels: Object.assign({}, (mod as LabeledCreatableModuleFactory).labels ?? {}, labels ?? {}),\n    }\n    this._registry[schema] = primary ? [factory, ...(existingFactories ?? [])] : [...(existingFactories ?? []), factory]\n    return this\n  }\n\n  /**\n   * Tries to locate a module factory that matches the supplied schema and labels\n   * @param schema The config schema for the module\n   * @param labels The labels for the module factory\n   * @returns A module factory that matches the supplied schema and labels or undefined\n   */\n  tryLocate(schema: string, labels?: Labels): CreatableModuleFactory | LabeledCreatableModuleFactory | undefined {\n    // If labels were provided\n    return labels ?\n        // Find the first factory that has labels and has all the labels provided\n        this._registry[schema]?.filter(hasLabels).find((factory) => hasAllLabels(factory?.labels, labels))\n      : // Otherwise, return the first factory\n        this._registry[schema]?.[0]\n  }\n}\n","import { MemoryArchivist } from '@xyo-network/archivist-memory'\nimport { ArchivistConfigSchema } from '@xyo-network/archivist-model'\nimport { ViewArchivist } from '@xyo-network/archivist-view'\nimport { BridgeConfigSchema } from '@xyo-network/bridge-model'\nimport { IdentityDiviner } from '@xyo-network/diviner-identity'\nimport { DivinerConfigSchema } from '@xyo-network/diviner-model'\nimport { HttpBridge } from '@xyo-network/http-bridge'\nimport {\n  CreatableModuleFactory,\n  LabeledCreatableModuleFactory,\n  registerCreatableModuleFactories,\n  registerPrimaryCreatableModuleFactory,\n} from '@xyo-network/module-model'\nimport { MemoryNode } from '@xyo-network/node-memory'\nimport { NodeConfigSchema } from '@xyo-network/node-model'\nimport { ViewNode } from '@xyo-network/node-view'\nimport { MemorySentinel } from '@xyo-network/sentinel-memory'\nimport { SentinelConfigSchema } from '@xyo-network/sentinel-model'\nimport { AdhocWitness } from '@xyo-network/witness-adhoc'\nimport { WitnessConfigSchema } from '@xyo-network/witness-model'\n\nexport const standardCreatableFactoriesList: (CreatableModuleFactory | LabeledCreatableModuleFactory)[] = [\n  MemoryArchivist,\n  HttpBridge,\n  MemoryArchivist,\n  MemoryNode,\n  MemorySentinel,\n  ViewArchivist,\n  ViewNode,\n  AdhocWitness,\n]\n\nexport const standardCreatableFactories = () => {\n  const registry = registerCreatableModuleFactories(standardCreatableFactoriesList)\n  registerPrimaryCreatableModuleFactory(registry, MemoryNode, NodeConfigSchema)\n  registerPrimaryCreatableModuleFactory(registry, MemoryArchivist, ArchivistConfigSchema)\n  registerPrimaryCreatableModuleFactory(registry, MemorySentinel, SentinelConfigSchema)\n  registerPrimaryCreatableModuleFactory(registry, AdhocWitness, WitnessConfigSchema)\n  registerPrimaryCreatableModuleFactory(registry, IdentityDiviner, DivinerConfigSchema)\n  registerPrimaryCreatableModuleFactory(registry, HttpBridge, BridgeConfigSchema)\n  return registry\n}\n"],"mappings":";;;;AAAA,SAASA,gBAAgB;AACzB,SAIEC,cACAC,iBAGK;;;ACTP,SAASC,uBAAuB;AAChC,SAASC,6BAA6B;AACtC,SAASC,qBAAqB;AAC9B,SAASC,0BAA0B;AACnC,SAASC,uBAAuB;AAChC,SAASC,2BAA2B;AACpC,SAASC,kBAAkB;AAC3B,SAGEC,kCACAC,6CACK;AACP,SAASC,kBAAkB;AAC3B,SAASC,wBAAwB;AACjC,SAASC,gBAAgB;AACzB,SAASC,sBAAsB;AAC/B,SAASC,4BAA4B;AACrC,SAASC,oBAAoB;AAC7B,SAASC,2BAA2B;AAE7B,IAAMC,iCAA6F;EACxGC;EACAC;EACAD;EACAE;EACAC;EACAC;EACAC;EACAC;;AAGK,IAAMC,6BAA6B,6BAAA;AACxC,QAAMC,WAAWC,iCAAiCV,8BAAAA;AAClDW,wCAAsCF,UAAUN,YAAYS,gBAAAA;AAC5DD,wCAAsCF,UAAUR,iBAAiBY,qBAAAA;AACjEF,wCAAsCF,UAAUL,gBAAgBU,oBAAAA;AAChEH,wCAAsCF,UAAUF,cAAcQ,mBAAAA;AAC9DJ,wCAAsCF,UAAUO,iBAAiBC,mBAAAA;AACjEN,wCAAsCF,UAAUP,YAAYgB,kBAAAA;AAC5D,SAAOT;AACT,GAT0C;;;ADfnC,IAAMU,wBAAN,MAAMA,sBAAAA;;EACXC,YAA+BC,YAAqCC,2BAAAA,GAA8B;SAAnED,YAAAA;EAAoE;;;;EAKnG,IAAIE,WAA8C;AAChD,WAAO,KAAKF;EACd;;;;;;;EAQAG,OAAOC,QAAgBC,QAAyE;AAC9F,WAAOC,SACL,KAAKC,UAAUH,QAAQC,MAAAA,GACvB,MAAM,sCAAsC,kBAAkBD,MAAAA,GAAS,GAAGC,SAAS,cAAcG,KAAKC,UAAUJ,MAAAA,CAAAA,MAAa,EAAA,aAAe;EAEhJ;;;;;EAMAK,SAASC,KAA6BN,QAAuB;AAC3D,SAAKO,YAAYD,KAAKA,IAAIE,qBAAqBR,QAAQ,IAAA;AACvDM,QAAIG,cAAcC,IAAI,CAACX,WAAAA;AACrB,WAAKQ,YAAYD,KAAKP,QAAQC,QAAQ,KAAA;IACxC,CAAA;AACA,WAAO;EACT;;;;;EAMAW,aAAaC,MAAsC;AACjD,eAAWN,OAAOM,MAAM;AACtB,WAAKP,SAASC,GAAAA;IAChB;AACA,WAAO;EACT;;;;;EAMAC,YACED,KACAP,QACAC,QACAa,UAAU,OACJ;AACN,UAAMC,oBAAoB,KAAKnB,UAAUI,MAAAA;AACzC,UAAMgB,UAAkD;;MAEtD,GAAGT;;MAEHU,QAAQV,IAAIU,OAAOC,KAAKX,GAAAA;;MAExBN,QAAQkB,OAAOC,OAAO,CAAC,GAAIb,IAAsCN,UAAU,CAAC,GAAGA,UAAU,CAAC,CAAA;IAC5F;AACA,SAAKL,UAAUI,MAAAA,IAAUc,UAAU;MAACE;SAAaD,qBAAqB,CAAA;QAAO;SAAKA,qBAAqB,CAAA;MAAKC;;AAC5G,WAAO;EACT;;;;;;;EAQAb,UAAUH,QAAgBC,QAAqF;AA5FjH;AA8FI,WAAOA;;OAEH,UAAKL,UAAUI,MAAAA,MAAf,mBAAwBqB,OAAOC,WAAWC,KAAK,CAACP,YAAYQ,aAAaR,mCAASf,QAAQA,MAAAA;SAE1F,UAAKL,UAAUI,MAAAA,MAAf,mBAAyB;EAC/B;AACF;AAnFaN;AAAN,IAAMA,uBAAN;","names":["assertEx","hasAllLabels","hasLabels","MemoryArchivist","ArchivistConfigSchema","ViewArchivist","BridgeConfigSchema","IdentityDiviner","DivinerConfigSchema","HttpBridge","registerCreatableModuleFactories","registerPrimaryCreatableModuleFactory","MemoryNode","NodeConfigSchema","ViewNode","MemorySentinel","SentinelConfigSchema","AdhocWitness","WitnessConfigSchema","standardCreatableFactoriesList","MemoryArchivist","HttpBridge","MemoryNode","MemorySentinel","ViewArchivist","ViewNode","AdhocWitness","standardCreatableFactories","registry","registerCreatableModuleFactories","registerPrimaryCreatableModuleFactory","NodeConfigSchema","ArchivistConfigSchema","SentinelConfigSchema","WitnessConfigSchema","IdentityDiviner","DivinerConfigSchema","BridgeConfigSchema","ModuleFactoryLocator","constructor","_registry","standardCreatableFactories","registry","locate","schema","labels","assertEx","tryLocate","JSON","stringify","register","mod","registerOne","defaultConfigSchema","configSchemas","map","registerMany","mods","primary","existingFactories","factory","create","bind","Object","assign","filter","hasLabels","find","hasAllLabels"]}
+{"version":3,"sources":["../../src/ModuleFactoryLocator.ts","../../src/standardCreatableFactories.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport {\n  CreatableModuleFactory,\n  CreatableModuleRegistry,\n  hasAllLabels,\n  hasLabels,\n  LabeledCreatableModuleFactory,\n  Labels,\n  registerCreatableModuleFactory,\n} from '@xyo-network/module-model'\nimport { Schema } from '@xyo-network/payload-model'\n\nimport { standardCreatableFactories } from './standardCreatableFactories'\n\n/**\n * A class which encapsulates the Service Locator Pattern for Module Factories\n */\nexport class ModuleFactoryLocator {\n  constructor(protected readonly _registry: CreatableModuleRegistry = standardCreatableFactories()) {}\n\n  /**\n   * The current registry for the module factory\n   */\n  get registry(): Readonly<CreatableModuleRegistry> {\n    return this._registry\n  }\n\n  /**\n   * Locates a module factory that matches the supplied schema and labels\n   * @param schema The config schema for the module\n   * @param labels The labels for the module factory\n   * @returns A module factory that matches the supplied schema and labels or throws if one is not found\n   */\n  locate(schema: string, labels?: Labels): CreatableModuleFactory | LabeledCreatableModuleFactory {\n    return assertEx(\n      this.tryLocate(schema, labels),\n      () => `No module factory for the supplied ${`config schema [${schema}]`}${labels ? ` & labels [${JSON.stringify(labels)}]` : ''} registered`,\n    )\n  }\n\n  /**\n   * Registers a single module factory (with optional tags) with the locator\n   * @param factory The factory to register\n   * @param labels The labels for the module factory\n   */\n  register(factory: CreatableModuleFactory, labels?: Labels, primary: boolean | Schema | Schema[] = false): this {\n    registerCreatableModuleFactory(this._registry, factory, labels, primary)\n    return this\n  }\n\n  /**\n   * Registers multiple module factories with the locator\n   * @param factories The factories to register\n   */\n  registerMany(factories: CreatableModuleFactory[]): this {\n    for (const factory of factories) {\n      this.register(factory)\n    }\n    return this\n  }\n\n  /**\n   * Tries to locate a module factory that matches the supplied schema and labels\n   * @param schema The config schema for the module\n   * @param labels The labels for the module factory\n   * @returns A module factory that matches the supplied schema and labels or undefined\n   */\n  tryLocate(schema: string, labels?: Labels): CreatableModuleFactory | LabeledCreatableModuleFactory | undefined {\n    // If labels were provided\n    return labels ?\n        // Find the first factory that has labels and has all the labels provided\n        this._registry[schema]?.filter(hasLabels).find((factory) => hasAllLabels(factory?.labels, labels))\n      : // Otherwise, return the first factory\n        this._registry[schema]?.[0]\n  }\n}\n","import { MemoryArchivist } from '@xyo-network/archivist-memory'\nimport { ViewArchivist } from '@xyo-network/archivist-view'\nimport { MemoryBoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-memory'\nimport { IdentityDiviner } from '@xyo-network/diviner-identity'\nimport { MemoryPayloadDiviner } from '@xyo-network/diviner-payload-memory'\nimport { HttpBridge } from '@xyo-network/http-bridge'\nimport { CreatableModuleFactory, LabeledCreatableModuleFactory, registerCreatableModuleFactories } from '@xyo-network/module-model'\nimport { MemoryNode } from '@xyo-network/node-memory'\nimport { ViewNode } from '@xyo-network/node-view'\nimport { MemorySentinel } from '@xyo-network/sentinel-memory'\nimport { AdhocWitness } from '@xyo-network/witness-adhoc'\n\n//order matters in this array.  later items will register themselves as primary for schemas shared with earlier items\nexport const standardCreatableFactoriesList: (CreatableModuleFactory | LabeledCreatableModuleFactory)[] = [\n  HttpBridge,\n  ViewArchivist,\n  ViewNode,\n  AdhocWitness,\n  MemoryPayloadDiviner,\n  MemoryBoundWitnessDiviner,\n  IdentityDiviner,\n  MemoryArchivist,\n  MemoryArchivist,\n  MemoryNode,\n  MemorySentinel,\n]\n\nexport const standardCreatableFactories = () => {\n  return registerCreatableModuleFactories(standardCreatableFactoriesList, {}, true)\n}\n"],"mappings":";;;;AAAA,SAASA,gBAAgB;AACzB,SAGEC,cACAC,WAGAC,sCACK;;;ACTP,SAASC,uBAAuB;AAChC,SAASC,qBAAqB;AAC9B,SAASC,iCAAiC;AAC1C,SAASC,uBAAuB;AAChC,SAASC,4BAA4B;AACrC,SAASC,kBAAkB;AAC3B,SAAgEC,wCAAwC;AACxG,SAASC,kBAAkB;AAC3B,SAASC,gBAAgB;AACzB,SAASC,sBAAsB;AAC/B,SAASC,oBAAoB;AAGtB,IAAMC,iCAA6F;EACxGC;EACAC;EACAC;EACAC;EACAC;EACAC;EACAC;EACAC;EACAA;EACAC;EACAC;;AAGK,IAAMC,6BAA6B,6BAAA;AACxC,SAAOC,iCAAiCZ,gCAAgC,CAAC,GAAG,IAAA;AAC9E,GAF0C;;;ADVnC,IAAMa,wBAAN,MAAMA,sBAAAA;;EACXC,YAA+BC,YAAqCC,2BAAAA,GAA8B;SAAnED,YAAAA;EAAoE;;;;EAKnG,IAAIE,WAA8C;AAChD,WAAO,KAAKF;EACd;;;;;;;EAQAG,OAAOC,QAAgBC,QAAyE;AAC9F,WAAOC,SACL,KAAKC,UAAUH,QAAQC,MAAAA,GACvB,MAAM,sCAAsC,kBAAkBD,MAAAA,GAAS,GAAGC,SAAS,cAAcG,KAAKC,UAAUJ,MAAAA,CAAAA,MAAa,EAAA,aAAe;EAEhJ;;;;;;EAOAK,SAASC,SAAiCN,QAAiBO,UAAuC,OAAa;AAC7GC,mCAA+B,KAAKb,WAAWW,SAASN,QAAQO,OAAAA;AAChE,WAAO;EACT;;;;;EAMAE,aAAaC,WAA2C;AACtD,eAAWJ,WAAWI,WAAW;AAC/B,WAAKL,SAASC,OAAAA;IAChB;AACA,WAAO;EACT;;;;;;;EAQAJ,UAAUH,QAAgBC,QAAqF;AAnEjH;AAqEI,WAAOA;;OAEH,UAAKL,UAAUI,MAAAA,MAAf,mBAAwBY,OAAOC,WAAWC,KAAK,CAACP,YAAYQ,aAAaR,mCAASN,QAAQA,MAAAA;SAE1F,UAAKL,UAAUI,MAAAA,MAAf,mBAAyB;EAC/B;AACF;AA1DaN;AAAN,IAAMA,uBAAN;","names":["assertEx","hasAllLabels","hasLabels","registerCreatableModuleFactory","MemoryArchivist","ViewArchivist","MemoryBoundWitnessDiviner","IdentityDiviner","MemoryPayloadDiviner","HttpBridge","registerCreatableModuleFactories","MemoryNode","ViewNode","MemorySentinel","AdhocWitness","standardCreatableFactoriesList","HttpBridge","ViewArchivist","ViewNode","AdhocWitness","MemoryPayloadDiviner","MemoryBoundWitnessDiviner","IdentityDiviner","MemoryArchivist","MemoryNode","MemorySentinel","standardCreatableFactories","registerCreatableModuleFactories","ModuleFactoryLocator","constructor","_registry","standardCreatableFactories","registry","locate","schema","labels","assertEx","tryLocate","JSON","stringify","register","factory","primary","registerCreatableModuleFactory","registerMany","factories","filter","hasLabels","find","hasAllLabels"]}

package/dist/node/standardCreatableFactories.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"standardCreatableFactories.d.ts","sourceRoot":"","sources":["../../src/standardCreatableFactories.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,sBAAsB,EACtB,6BAA6B,EAG9B,MAAM,2BAA2B,CAAA;AASlC,eAAO,MAAM,8BAA8B,EAAE,CAAC,sBAAsB,GAAG,6BAA6B,CAAC,EASpG,CAAA;AAED,eAAO,MAAM,0BAA0B,mEAStC,CAAA"}
+{"version":3,"file":"standardCreatableFactories.d.ts","sourceRoot":"","sources":["../../src/standardCreatableFactories.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAoC,MAAM,2BAA2B,CAAA;AAOnI,eAAO,MAAM,8BAA8B,EAAE,CAAC,sBAAsB,GAAG,6BAA6B,CAAC,EAYpG,CAAA;AAED,eAAO,MAAM,0BAA0B,mEAEtC,CAAA"}

package/dist/node/standardCreatableFactories.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"standardCreatableFactories.d.ts","sourceRoot":"","sources":["../../src/standardCreatableFactories.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,sBAAsB,EACtB,6BAA6B,EAG9B,MAAM,2BAA2B,CAAA;AASlC,eAAO,MAAM,8BAA8B,EAAE,CAAC,sBAAsB,GAAG,6BAA6B,CAAC,EASpG,CAAA;AAED,eAAO,MAAM,0BAA0B,mEAStC,CAAA"}
+{"version":3,"file":"standardCreatableFactories.d.ts","sourceRoot":"","sources":["../../src/standardCreatableFactories.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAoC,MAAM,2BAA2B,CAAA;AAOnI,eAAO,MAAM,8BAA8B,EAAE,CAAC,sBAAsB,GAAG,6BAA6B,CAAC,EAYpG,CAAA;AAED,eAAO,MAAM,0BAA0B,mEAEtC,CAAA"}

package/dist/node/standardCreatableFactories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"standardCreatableFactories.d.ts","sourceRoot":"","sources":["../../src/standardCreatableFactories.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,sBAAsB,EACtB,6BAA6B,EAG9B,MAAM,2BAA2B,CAAA;AASlC,eAAO,MAAM,8BAA8B,EAAE,CAAC,sBAAsB,GAAG,6BAA6B,CAAC,EASpG,CAAA;AAED,eAAO,MAAM,0BAA0B,mEAStC,CAAA"}
+{"version":3,"file":"standardCreatableFactories.d.ts","sourceRoot":"","sources":["../../src/standardCreatableFactories.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAoC,MAAM,2BAA2B,CAAA;AAOnI,eAAO,MAAM,8BAA8B,EAAE,CAAC,sBAAsB,GAAG,6BAA6B,CAAC,EAYpG,CAAA;AAED,eAAO,MAAM,0BAA0B,mEAEtC,CAAA"}

package/package.json

@@ -10,23 +10,20 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/assert": "^3.1.10",
-    "@xyo-network/archivist-memory": "~2.98.5",
-    "@xyo-network/archivist-model": "~2.98.5",
-    "@xyo-network/archivist-view": "~2.98.5",
-    "@xyo-network/bridge-model": "~2.98.5",
-    "@xyo-network/diviner-identity": "~2.98.5",
-    "@xyo-network/diviner-model": "~2.98.5",
-    "@xyo-network/http-bridge": "~2.98.5",
-    "@xyo-network/module-model": "~2.98.5",
-    "@xyo-network/node-memory": "~2.98.5",
-    "@xyo-network/node-model": "~2.98.5",
-    "@xyo-network/node-view": "~2.98.5",
-    "@xyo-network/payload-model": "~2.98.5",
-    "@xyo-network/sentinel-memory": "~2.98.5",
-    "@xyo-network/sentinel-model": "~2.98.5",
-    "@xyo-network/witness-adhoc": "~2.98.5",
-    "@xyo-network/witness-model": "~2.98.5"
+    "@xylabs/assert": "^3.1.11",
+    "@xyo-network/archivist-memory": "~2.99.1",
+    "@xyo-network/archivist-view": "~2.99.1",
+    "@xyo-network/bridge-model": "~2.99.1",
+    "@xyo-network/diviner-boundwitness-memory": "~2.99.1",
+    "@xyo-network/diviner-identity": "~2.99.1",
+    "@xyo-network/diviner-payload-memory": "~2.99.1",
+    "@xyo-network/http-bridge": "~2.99.1",
+    "@xyo-network/module-model": "~2.99.1",
+    "@xyo-network/node-memory": "~2.99.1",
+    "@xyo-network/node-view": "~2.99.1",
+    "@xyo-network/payload-model": "~2.99.1",
+    "@xyo-network/sentinel-memory": "~2.99.1",
+    "@xyo-network/witness-adhoc": "~2.99.1"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^3.9.1",
@@ -72,6 +69,6 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.98.5",
+  "version": "2.99.1",
   "type": "module"
 }

package/src/ModuleFactoryLocator.ts

@@ -1,12 +1,12 @@
 import { assertEx } from '@xylabs/assert'
 import {
-  AttachableModuleInstance,
   CreatableModuleFactory,
   CreatableModuleRegistry,
   hasAllLabels,
   hasLabels,
   LabeledCreatableModuleFactory,
   Labels,
+  registerCreatableModuleFactory,
 } from '@xyo-network/module-model'
 import { Schema } from '@xyo-network/payload-model'
 
@@ -40,47 +40,22 @@ export class ModuleFactoryLocator {
 
   /**
    * Registers a single module factory (with optional tags) with the locator
-   * @param additional Additional module factories to register
+   * @param factory The factory to register
+   * @param labels The labels for the module factory
    */
-  register(mod: CreatableModuleFactory, labels?: Labels): this {
-    this.registerOne(mod, mod.defaultConfigSchema, labels, true)
-    mod.configSchemas.map((schema) => {
-      this.registerOne(mod, schema, labels, false)
-    })
+  register(factory: CreatableModuleFactory, labels?: Labels, primary: boolean | Schema | Schema[] = false): this {
+    registerCreatableModuleFactory(this._registry, factory, labels, primary)
     return this
   }
 
   /**
    * Registers multiple module factories with the locator
-   * @param additional Additional module factories to register
-   */
-  registerMany(mods: CreatableModuleFactory[]): this {
-    for (const mod of mods) {
-      this.register(mod)
-    }
-    return this
-  }
-
-  /**
-   * Registers a single module factory (with optional tags) with the locator & a specific schema
-   * @param additional Additional module factories to register
+   * @param factories The factories to register
    */
-  registerOne<TModule extends AttachableModuleInstance>(
-    mod: CreatableModuleFactory<TModule>,
-    schema: Schema,
-    labels?: Labels,
-    primary = false,
-  ): this {
-    const existingFactories = this._registry[schema]
-    const factory: LabeledCreatableModuleFactory<TModule> = {
-      // Destructure instance properties
-      ...mod,
-      // Copy static methods
-      create: mod.create.bind(mod) as LabeledCreatableModuleFactory<TModule>['create'],
-      // Merge module & supplied labels
-      labels: Object.assign({}, (mod as LabeledCreatableModuleFactory).labels ?? {}, labels ?? {}),
+  registerMany(factories: CreatableModuleFactory[]): this {
+    for (const factory of factories) {
+      this.register(factory)
     }
-    this._registry[schema] = primary ? [factory, ...(existingFactories ?? [])] : [...(existingFactories ?? []), factory]
     return this
   }
 

package/src/index.ts

@@ -1 +1,2 @@
 export * from './ModuleFactoryLocator'
+export * from './standardCreatableFactories'

package/src/standardCreatableFactories.ts

@@ -1,42 +1,30 @@
 import { MemoryArchivist } from '@xyo-network/archivist-memory'
-import { ArchivistConfigSchema } from '@xyo-network/archivist-model'
 import { ViewArchivist } from '@xyo-network/archivist-view'
-import { BridgeConfigSchema } from '@xyo-network/bridge-model'
+import { MemoryBoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-memory'
 import { IdentityDiviner } from '@xyo-network/diviner-identity'
-import { DivinerConfigSchema } from '@xyo-network/diviner-model'
+import { MemoryPayloadDiviner } from '@xyo-network/diviner-payload-memory'
 import { HttpBridge } from '@xyo-network/http-bridge'
-import {
-  CreatableModuleFactory,
-  LabeledCreatableModuleFactory,
-  registerCreatableModuleFactories,
-  registerPrimaryCreatableModuleFactory,
-} from '@xyo-network/module-model'
+import { CreatableModuleFactory, LabeledCreatableModuleFactory, registerCreatableModuleFactories } from '@xyo-network/module-model'
 import { MemoryNode } from '@xyo-network/node-memory'
-import { NodeConfigSchema } from '@xyo-network/node-model'
 import { ViewNode } from '@xyo-network/node-view'
 import { MemorySentinel } from '@xyo-network/sentinel-memory'
-import { SentinelConfigSchema } from '@xyo-network/sentinel-model'
 import { AdhocWitness } from '@xyo-network/witness-adhoc'
-import { WitnessConfigSchema } from '@xyo-network/witness-model'
 
+//order matters in this array.  later items will register themselves as primary for schemas shared with earlier items
 export const standardCreatableFactoriesList: (CreatableModuleFactory | LabeledCreatableModuleFactory)[] = [
-  MemoryArchivist,
   HttpBridge,
-  MemoryArchivist,
-  MemoryNode,
-  MemorySentinel,
   ViewArchivist,
   ViewNode,
   AdhocWitness,
+  MemoryPayloadDiviner,
+  MemoryBoundWitnessDiviner,
+  IdentityDiviner,
+  MemoryArchivist,
+  MemoryArchivist,
+  MemoryNode,
+  MemorySentinel,
 ]
 
 export const standardCreatableFactories = () => {
-  const registry = registerCreatableModuleFactories(standardCreatableFactoriesList)
-  registerPrimaryCreatableModuleFactory(registry, MemoryNode, NodeConfigSchema)
-  registerPrimaryCreatableModuleFactory(registry, MemoryArchivist, ArchivistConfigSchema)
-  registerPrimaryCreatableModuleFactory(registry, MemorySentinel, SentinelConfigSchema)
-  registerPrimaryCreatableModuleFactory(registry, AdhocWitness, WitnessConfigSchema)
-  registerPrimaryCreatableModuleFactory(registry, IdentityDiviner, DivinerConfigSchema)
-  registerPrimaryCreatableModuleFactory(registry, HttpBridge, BridgeConfigSchema)
-  return registry
+  return registerCreatableModuleFactories(standardCreatableFactoriesList, {}, true)
 }