@xyo-network/module-abstract 2.94.19 → 2.94.21

package/dist/node/index.cjs

@@ -31,7 +31,6 @@ __export(src_exports, {
   BaseEmitter: () => BaseEmitter,
   ModuleConfigQueryValidator: () => ModuleConfigQueryValidator,
   ModuleErrorBuilder: () => ModuleErrorBuilder,
-  ResolveHelper: () => ResolveHelper,
   SupportedQueryValidator: () => SupportedQueryValidator,
   isQuerySupportedByModule: () => isQuerySupportedByModule
 });
@@ -53,7 +52,6 @@ var import_boundwitness_wrapper3 = require("@xyo-network/boundwitness-wrapper");
 var import_config_payload_plugin = require("@xyo-network/config-payload-plugin");
 var import_manifest_model = require("@xyo-network/manifest-model");
 var import_module_model = require("@xyo-network/module-model");
-var import_module_resolver = require("@xyo-network/module-resolver");
 var import_payload_builder2 = require("@xyo-network/payload-builder");
 var import_query_payload_plugin = require("@xyo-network/query-payload-plugin");
 
@@ -272,12 +270,9 @@ var _AbstractModule = class _AbstractModule extends BaseEmitter {
   _startPromise = void 0;
   _started = void 0;
   moduleConfigQueryValidator;
-  privateResolver = new import_module_resolver.CompositeModuleResolver({});
   supportedQueryValidator;
   _busyCount = 0;
-  _downResolver;
   _status = "stopped";
-  _upResolver;
   constructor(privateConstructorKey, params, account) {
     (0, import_assert2.assertEx)(_AbstractModule.privateConstructorKey === privateConstructorKey, () => "Use create function instead of constructor");
     const mutatedParams = {
@@ -310,12 +305,6 @@ var _AbstractModule = class _AbstractModule extends BaseEmitter {
   get dead() {
     return this.status === "dead";
   }
-  get downResolver() {
-    this._downResolver = this._downResolver ?? new import_module_resolver.CompositeModuleResolver({
-      moduleIdentifierTransformers: this.params.moduleIdentifierTransformers
-    });
-    return this._downResolver;
-  }
   get ephemeralQueryAccountEnabled() {
     return !!this.params.ephemeralQueryAccountEnabled;
   }
@@ -348,12 +337,6 @@ var _AbstractModule = class _AbstractModule extends BaseEmitter {
   get timestamp() {
     return this.config.timestamp ?? false;
   }
-  get upResolver() {
-    this._upResolver = this._upResolver ?? new import_module_resolver.CompositeModuleResolver({
-      moduleIdentifierTransformers: this.params.moduleIdentifierTransformers
-    });
-    return this._upResolver;
-  }
   get baseModuleQueryAccountPaths() {
     return this._baseModuleQueryAccountPaths;
   }
@@ -711,8 +694,7 @@ var _AbstractModule = class _AbstractModule extends BaseEmitter {
     const name = this.config.name ?? "Anonymous";
     const children = await this.downResolver.resolve("*", {
       direction: "down",
-      maxDepth,
-      visibility: "public"
+      maxDepth
     });
     const childAddressToName = {};
     for (const child of children) {
@@ -873,111 +855,14 @@ var AbstractModule = _AbstractModule;
 // src/AbstractModuleInstance.ts
 var import_assert3 = require("@xylabs/assert");
 var import_lodash2 = require("@xylabs/lodash");
-var import_object4 = require("@xylabs/object");
-var import_archivist_model2 = require("@xyo-network/archivist-model");
-var import_module_model3 = require("@xyo-network/module-model");
-
-// src/ResolveHelper.ts
-var import_logger2 = require("@xylabs/logger");
 var import_object3 = require("@xylabs/object");
+var import_archivist_model2 = require("@xyo-network/archivist-model");
 var import_module_model2 = require("@xyo-network/module-model");
-var _ResolveHelper = class _ResolveHelper {
-  static async resolve(config, idOrFilter = "*", { visibility, maxDepth = 3, required = "log", ...options } = {}) {
-    const { module: module2, logger = this.defaultLogger, dead = false, upResolver, downResolver } = config;
-    const log = logger ? new import_logger2.IdLogger(logger, () => `ResolveHelper [${module2.id}][${idOrFilter}][${visibility}]`) : void 0;
-    const downLocalOptions = {
-      ...options,
-      direction: "down",
-      maxDepth,
-      required: false,
-      visibility
-    };
-    const upLocalOptions = {
-      ...downLocalOptions,
-      direction: "up"
-    };
-    const childOptions = {
-      ...options,
-      maxDepth: maxDepth - 1,
-      required: false,
-      visibility
-    };
-    const direction = (options == null ? void 0 : options.direction) ?? "all";
-    const up = direction === "up" || direction === "all";
-    const down = direction === "down" || direction === "all";
-    let result;
-    log == null ? void 0 : log.debug("start", idOrFilter, maxDepth);
-    if (idOrFilter === "*") {
-      if (dead) {
-        log == null ? void 0 : log.warn("failed [dead]", idOrFilter);
-        return [];
-      }
-      const modules = [
-        ...down ? await downResolver.resolve("*", downLocalOptions) : [],
-        ...up ? await upResolver.resolve("*", upLocalOptions) : []
-      ].filter(import_module_model2.duplicateModules).filter((module3) => module3.address !== config.address);
-      if (modules.length > 0) {
-        log == null ? void 0 : log.log("modules [count]", modules.length);
-        log == null ? void 0 : log.debug("modules", (0, import_object3.toJsonString)(modules, 4));
-      }
-      if (maxDepth === 0) {
-        return modules;
-      }
-      const childModules = (await Promise.all(modules.map(async (module3) => await module3.resolve("*", childOptions)))).flat().filter(import_module_model2.duplicateModules);
-      return [
-        ...modules,
-        ...childModules
-      ].filter(import_module_model2.duplicateModules);
-    } else {
-      switch (typeof idOrFilter) {
-        case "string": {
-          if (dead) {
-            return void 0;
-          }
-          result = (down ? await downResolver.resolve(idOrFilter, downLocalOptions) : void 0) ?? (up ? await upResolver.resolve(idOrFilter, upLocalOptions) : void 0);
-          break;
-        }
-        default: {
-          if (dead) {
-            return [];
-          }
-          const filter = idOrFilter;
-          result = [
-            ...down ? await downResolver.resolve(filter, downLocalOptions) : [],
-            ...up ? await upResolver.resolve(filter, upLocalOptions) : []
-          ].filter(import_module_model2.duplicateModules);
-          break;
-        }
-      }
-    }
-    this.validateRequiredResolve(required, result, idOrFilter, logger);
-    return result;
-  }
-  static validateRequiredResolve(required, result, idOrFilter, logger = this.defaultLogger) {
-    const log = logger ? new import_logger2.IdLogger(logger, () => `validateRequiredResolve [${idOrFilter}][${result}]`) : void 0;
-    if (required && (result === void 0 || Array.isArray(result) && result.length > 0)) {
-      switch (required) {
-        case "warn": {
-          log == null ? void 0 : log.warn("resolve failed", idOrFilter);
-          break;
-        }
-        case "log": {
-          log == null ? void 0 : log.log("resolve failed", idOrFilter);
-          break;
-        }
-        default: {
-          throw new Error(`resolve failed [${idOrFilter}]`);
-        }
-      }
-    }
-  }
-};
-__name(_ResolveHelper, "ResolveHelper");
-__publicField(_ResolveHelper, "defaultLogger");
-var ResolveHelper = _ResolveHelper;
-
-// src/AbstractModuleInstance.ts
+var import_module_resolver = require("@xyo-network/module-resolver");
 var _AbstractModuleInstance = class _AbstractModuleInstance extends AbstractModule {
+  _downResolver;
+  _privateResolver;
+  _upResolver;
   constructor(privateConstructorKey, params, account) {
     (0, import_assert3.assertEx)(AbstractModule.privateConstructorKey === privateConstructorKey, () => "Use create function instead of constructor");
     const mutatedParams = {
@@ -990,6 +875,30 @@ var _AbstractModuleInstance = class _AbstractModuleInstance extends AbstractModu
       this.downResolver.add(this);
     }
   }
+  get downResolver() {
+    this._downResolver = this._downResolver ?? new import_module_resolver.CompositeModuleResolver({
+      moduleIdentifierTransformers: this.params.moduleIdentifierTransformers,
+      root: this
+    });
+    return this._downResolver;
+  }
+  get privateResolver() {
+    this._privateResolver = this._privateResolver ?? new import_module_resolver.CompositeModuleResolver({
+      moduleIdentifierTransformers: this.params.moduleIdentifierTransformers,
+      root: this
+    });
+    return this._privateResolver;
+  }
+  get root() {
+    return this;
+  }
+  get upResolver() {
+    this._upResolver = this._upResolver ?? new import_module_resolver.CompositeModuleResolver({
+      moduleIdentifierTransformers: this.params.moduleIdentifierTransformers,
+      root: this
+    });
+    return this._upResolver;
+  }
   manifest(maxDepth) {
     this._checkDead();
     return this.busy(async () => {
@@ -998,7 +907,7 @@ var _AbstractModuleInstance = class _AbstractModuleInstance extends AbstractModu
   }
   async manifestQuery(account, maxDepth) {
     const queryPayload = {
-      schema: import_module_model3.ModuleManifestQuerySchema,
+      schema: import_module_model2.ModuleManifestQuerySchema,
       ...maxDepth === void 0 ? {} : {
         maxDepth
       }
@@ -1021,17 +930,17 @@ var _AbstractModuleInstance = class _AbstractModuleInstance extends AbstractModu
       upResolver: this.upResolver
     };
     if (idOrFilter === "*") {
-      return (await ResolveHelper.resolve(config, idOrFilter, options)).filter((mod) => mod.address !== this.address);
+      return (await import_module_model2.ResolveHelper.resolve(config, idOrFilter, options)).filter((mod) => mod.address !== this.address);
     }
     switch (typeof idOrFilter) {
       case "string": {
-        return await ResolveHelper.resolve(config, idOrFilter, options);
+        return await import_module_model2.ResolveHelper.resolve(config, idOrFilter, options);
       }
       case "object": {
-        return (await ResolveHelper.resolve(config, idOrFilter, options)).filter((mod) => mod.address !== this.address);
+        return (await import_module_model2.ResolveHelper.resolve(config, idOrFilter, options)).filter((mod) => mod.address !== this.address);
       }
       default: {
-        return (await ResolveHelper.resolve(config, idOrFilter, options)).filter((mod) => mod.address !== this.address);
+        return (await import_module_model2.ResolveHelper.resolve(config, idOrFilter, options)).filter((mod) => mod.address !== this.address);
       }
     }
   }
@@ -1050,6 +959,9 @@ var _AbstractModuleInstance = class _AbstractModuleInstance extends AbstractModu
       }
     }
   }
+  async resolvePrivate(id = "*", options = {}) {
+    return await this.privateResolver.resolve(id, options) ?? await this.upResolver.resolve(id, options) ?? await this.downResolver.resolve(id, options);
+  }
   state() {
     this._checkDead();
     return this.busy(async () => {
@@ -1058,7 +970,7 @@ var _AbstractModuleInstance = class _AbstractModuleInstance extends AbstractModu
   }
   async stateQuery(account) {
     const queryPayload = {
-      schema: import_module_model3.ModuleStateQuerySchema
+      schema: import_module_model2.ModuleStateQuerySchema
     };
     return await this.sendQueryRaw(queryPayload, void 0, account);
   }
@@ -1095,7 +1007,7 @@ var _AbstractModuleInstance = class _AbstractModuleInstance extends AbstractModu
   }
 };
 __name(_AbstractModuleInstance, "AbstractModuleInstance");
-__publicField(_AbstractModuleInstance, "uniqueName", (0, import_object4.globallyUnique)("AbstractModuleInstance", _AbstractModuleInstance, "xyo"));
+__publicField(_AbstractModuleInstance, "uniqueName", (0, import_object3.globallyUnique)("AbstractModuleInstance", _AbstractModuleInstance, "xyo"));
 var AbstractModuleInstance = _AbstractModuleInstance;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -1104,7 +1016,6 @@ var AbstractModuleInstance = _AbstractModuleInstance;
   BaseEmitter,
   ModuleConfigQueryValidator,
   ModuleErrorBuilder,
-  ResolveHelper,
   SupportedQueryValidator,
   isQuerySupportedByModule
 });