@xyo-network/sdk 7.4.1 → 8.0.0

package/dist/neutral/module-abstract.mjs

@@ -84,36 +84,36 @@ async function determineAccount(params, allowRandomAccount = true) {
 // src/modules/module-abstract/Error.ts
 import { ModuleErrorSchema, PayloadBuilder } from "@xyo-network/sdk-protocol";
 var ModuleErrorBuilder = class extends PayloadBuilder {
-  _details;
-  _message;
-  _name;
-  _query;
+  #details;
+  #message;
+  #name;
+  #query;
   constructor() {
     super({ schema: ModuleErrorSchema });
   }
   build() {
     this.fields({
-      details: this._details,
-      message: this._message,
-      name: this._name,
-      query: this._query
+      details: this.#details,
+      message: this.#message,
+      name: this.#name,
+      query: this.#query
     });
     return super.build();
   }
   details(details) {
-    this._details = details;
+    this.#details = details;
     return this;
   }
   message(message) {
-    this._message = message;
+    this.#message = message;
     return this;
   }
   name(name) {
-    this._name = name;
+    this.#name = name;
     return this;
   }
   query(query) {
-    this._query = query;
+    this.#query = query;
     return this;
   }
 };
@@ -132,13 +132,15 @@ var ModuleConfigQueryValidator = class {
   hasRules;
   constructor(config) {
     if (config?.security?.allowed) {
-      for (const [schema, addresses] of Object.entries(config.security?.allowed)) {
+      const allowedEntries = Object.entries(config.security?.allowed);
+      for (const [schema, addresses] of allowedEntries) {
         const typedSchema = asSchema(schema, true);
         this.allowed[typedSchema] = addresses.map(toAddressesString);
       }
     }
     if (config?.security?.disallowed) {
-      for (const [schema, addresses] of Object.entries(config.security?.disallowed)) {
+      const disallowedEntries = Object.entries(config.security?.disallowed);
+      for (const [schema, addresses] of disallowedEntries) {
         const typedSchema = asSchema(schema, true);
         this.disallowed[typedSchema] = addresses.map(toAddressesString);
       }
@@ -152,7 +154,7 @@ var ModuleConfigQueryValidator = class {
     const addresses = query.addresses;
     if (addresses.length === 0) return false;
     const wrapper = QueryBoundWitnessWrapper.parseQuery(query, payloads);
-    const schema = (await wrapper.getQuery()).schema;
+    const { schema } = await wrapper.getQuery();
     return this.queryAllowed(schema, addresses) && !this.queryDisallowed(schema, addresses);
   };
   queryAllowed = (schema, addresses) => {
@@ -162,7 +164,7 @@ var ModuleConfigQueryValidator = class {
       const validCosigners = this.allowed?.[schema]?.includes(signatories);
       if (validCosigners) return true;
     }
-    return addresses.every((address) => this.allowed?.[schema]?.includes(address) || false);
+    return addresses.every((address) => this.allowed?.[schema]?.includes(address));
   };
   queryDisallowed = (schema, addresses) => {
     if (!this.hasDisallowedRules) return false;
@@ -177,7 +179,7 @@ var toAddressesString = (addresses) => {
 import { QueryBoundWitnessWrapper as QueryBoundWitnessWrapper2 } from "@xyo-network/sdk-protocol";
 var isQuerySupportedByModule = async (mod, query, payloads) => {
   const wrapper = QueryBoundWitnessWrapper2.parseQuery(query, payloads);
-  const schema = (await wrapper.getQuery()).schema;
+  const { schema } = await wrapper.getQuery();
   return mod.queries.includes(schema);
 };
 var SupportedQueryValidator = class {
@@ -192,6 +194,15 @@ var SupportedQueryValidator = class {
 
 // src/modules/module-abstract/AbstractModule.ts
 var DefaultModuleQueries = [ModuleAddressQuerySchema, ModuleSubscribeQuerySchema, ModuleManifestQuerySchema, ModuleStateQuerySchema];
+function rootFunction(obj, funcName) {
+  let current = obj;
+  let prototype = Object.getPrototypeOf(current);
+  while (prototype !== null && prototype[funcName] !== void 0) {
+    current = prototype;
+    prototype = Object.getPrototypeOf(current);
+  }
+  return current[funcName];
+}
 var AbstractModule = class _AbstractModule extends AbstractCreatable {
   static allowRandomAccount = true;
   static configSchemas = [ModuleConfigSchema];
@@ -219,7 +230,7 @@ var AbstractModule = class _AbstractModule extends AbstractCreatable {
     return this.account.address;
   }
   get allowAnonymous() {
-    return !!this.config.security?.allowAnonymous;
+    return this.config.security?.allowAnonymous ?? false;
   }
   get allowNameResolution() {
     return this.params.allowNameResolution ?? true;
@@ -237,10 +248,10 @@ var AbstractModule = class _AbstractModule extends AbstractCreatable {
     return this.status === "error";
   }
   get ephemeralQueryAccountEnabled() {
-    return !!this.params.ephemeralQueryAccountEnabled;
+    return this.params.ephemeralQueryAccountEnabled ?? false;
   }
   get globalReentrancyMutex() {
-    this._globalReentrancyMutex = this._globalReentrancyMutex ?? (this.reentrancy?.scope === "global" ? new Mutex() : void 0);
+    this._globalReentrancyMutex ??= this.reentrancy?.scope === "global" ? new Mutex() : void 0;
     return this._globalReentrancyMutex;
   }
   get id() {
@@ -278,23 +289,9 @@ var AbstractModule = class _AbstractModule extends AbstractCreatable {
   get supportedQueryValidator() {
     return assertEx2(this._supportedQueryValidator, () => "SupportedQueryValidator not initialized");
   }
-  /* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return */
-  static _getRootFunction(funcName) {
-    let anyThis = this;
-    while (anyThis.__proto__[funcName]) {
-      anyThis = anyThis.__proto__;
-    }
-    return anyThis[funcName];
-  }
-  static _noOverride(functionName) {
-    const thisFunc = this[functionName];
-    const rootFunc = this._getRootFunction(functionName);
-    assertEx2(thisFunc === rootFunc, () => `Override not allowed for [${functionName}] - override ${functionName}Handler instead`);
-  }
-  /* eslint-enable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return */
   static async createHandler(inInstance) {
     const instance = await super.createHandler(inInstance);
-    if (instance instanceof _AbstractModule) {
+    if (instance instanceof this) {
       if (this.configSchemas.length === 0) {
         throw new Error(`No allowed config schemas for [${this.name}]`);
       }
@@ -325,15 +322,11 @@ var AbstractModule = class _AbstractModule extends AbstractCreatable {
     };
     return params;
   }
-  /* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return */
+  // Public API for walking to the root implementation of a named function.
+  // eslint-disable-next-line unicorn/prefer-private-class-fields
   _getRootFunction(funcName) {
-    let anyThis = this;
-    while (anyThis.__proto__[funcName]) {
-      anyThis = anyThis.__proto__;
-    }
-    return anyThis[funcName];
+    return rootFunction(this, funcName);
   }
-  /* eslint-enable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return */
   async busy(closure) {
     if (this._busyCount <= 0) {
       this._busyCount = 0;
@@ -361,15 +354,14 @@ var AbstractModule = class _AbstractModule extends AbstractCreatable {
       this._account = this.params.account;
     }
     assertEx2(isAccountInstance(this._account), () => `Invalid account instance: ${JSON.stringify(this._account)}`);
-    this._supportedQueryValidator = new SupportedQueryValidator(this).queryable;
-    this._moduleConfigQueryValidator = new ModuleConfigQueryValidator(this.config).queryable;
+    const supportedQueryValidator = new SupportedQueryValidator(this);
+    this._supportedQueryValidator = supportedQueryValidator.queryable;
+    const moduleConfigQueryValidator = new ModuleConfigQueryValidator(this.config);
+    this._moduleConfigQueryValidator = moduleConfigQueryValidator.queryable;
     if (!_AbstractModule.enableLazyLoad) {
       setTimeout(() => forget(this.start()), 200);
     }
   }
-  emit(eventName, eventArgs) {
-    return super.emit(eventName, eventArgs);
-  }
   isSupportedQuery(query, assert = false) {
     if (!this.queries.includes(query)) {
       if (assert !== false) {
@@ -409,8 +401,9 @@ var AbstractModule = class _AbstractModule extends AbstractCreatable {
           await handleErrorAsync(ex, async (err) => {
             const error = err;
             this._lastError = error;
+            const moduleErrorBuilder = new ModuleErrorBuilder();
             errorPayloads.push(
-              new ModuleErrorBuilder().meta({ $sources: [await PayloadBuilder2.dataHash(sourceQuery)] }).name(this.modName ?? "<Unknown>").query(sourceQuery.schema).details(error.details).message(error.message).build()
+              moduleErrorBuilder.meta({ $sources: [await PayloadBuilder2.dataHash(sourceQuery)] }).name(this.modName ?? "<Unknown>").query(sourceQuery.schema).details(error.details).message(error.message).build()
             );
           });
         }
@@ -435,7 +428,8 @@ var AbstractModule = class _AbstractModule extends AbstractCreatable {
       return false;
     }
     if (!this.started("warn")) return false;
-    const configValidator = queryConfig ? new ModuleConfigQueryValidator(Object.assign({}, this.config, queryConfig)).queryable : this.moduleConfigQueryValidator;
+    const queryConfigValidator = queryConfig ? new ModuleConfigQueryValidator(Object.assign({}, this.config, queryConfig)) : void 0;
+    const configValidator = queryConfigValidator?.queryable ?? this.moduleConfigQueryValidator;
     const validators = [this.supportedQueryValidator, configValidator];
     const results = await Promise.all(validators.map((validator) => validator(query, payloads)));
     for (const result of results) {
@@ -493,8 +487,10 @@ var AbstractModule = class _AbstractModule extends AbstractCreatable {
     }, account);
   }
   async bindHashesInternal(hashes, schema, account = this.account) {
-    const builder = new BoundWitnessBuilder().hashes(hashes, schema).signer(account);
-    const result = (await builder.build())[0];
+    const boundWitnessBuilder = new BoundWitnessBuilder();
+    const builder = boundWitnessBuilder.hashes(hashes, schema).signer(account);
+    const built = await builder.build();
+    const result = built[0];
     this.logger?.debug(`result: ${JSON.stringify(result, null, 2)}`);
     return result;
   }
@@ -507,17 +503,20 @@ var AbstractModule = class _AbstractModule extends AbstractCreatable {
   }
   async bindQueryInternal(query, payloads, account = this.account, additionalSigners = []) {
     const accounts = [account, ...additionalSigners].filter(exists);
-    const builder = new QueryBoundWitnessBuilder().payloads(payloads).signers(accounts).query(query);
+    const queryBoundWitnessBuilder = new QueryBoundWitnessBuilder();
+    const builder = queryBoundWitnessBuilder.payloads(payloads).signers(accounts).query(query);
     const [bw, payloadsOut, errors] = await builder.build();
     return [bw, [...payloadsOut], errors];
   }
   async bindQueryResult(query, payloads, additionalWitnesses = [], errors) {
     const queryDataHash = await PayloadBuilder2.dataHash(query);
-    const builder = new BoundWitnessBuilder().payloads(payloads).errors(errors).sourceQuery(queryDataHash);
+    const boundWitnessBuilder = new BoundWitnessBuilder();
+    const builder = boundWitnessBuilder.payloads(payloads).errors(errors).sourceQuery(queryDataHash);
     const witnesses = [this.account, ...additionalWitnesses].filter(exists);
     builder.signers(witnesses);
+    const built = await builder.build();
     const result = [
-      PayloadBuilder2.omitPrivateStorageMeta((await builder.build())[0]),
+      PayloadBuilder2.omitPrivateStorageMeta(built[0]),
       PayloadBuilder2.omitPrivateStorageMeta(payloads),
       PayloadBuilder2.omitPrivateStorageMeta(errors ?? [])
     ];
@@ -627,33 +626,26 @@ var AbstractModule = class _AbstractModule extends AbstractCreatable {
     return;
   }
   validateConfig(config, parents = []) {
-    return Object.entries(config ?? this.config ?? {}).reduce((valid, [key, value]) => {
-      switch (typeof value) {
-        case "function": {
-          this.logger?.warn(`Fields of type function not allowed in config [${parents?.join(".")}.${key}]`);
-          return false;
-        }
-        case "object": {
-          if (Array.isArray(value)) {
-            return value.reduce(
-              (valid2, value2) => (
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-                this.validateConfig(value2, [...parents, key]) && valid2
-              ),
-              true
-            ) && valid;
-          }
-          if (!isSerializable(value)) {
-            this.logger?.warn(`Fields that are not serializable to JSON are not allowed in config [${parents?.join(".")}.${key}]`);
-            return false;
+    let valid = true;
+    const entries = Object.entries(config ?? this.config ?? {});
+    for (const [key, value] of entries) {
+      if (typeof value === "function") {
+        this.logger?.warn(`Fields of type function not allowed in config [${parents?.join(".")}.${key}]`);
+        valid = false;
+      } else if (typeof value === "object") {
+        if (Array.isArray(value)) {
+          for (const item of value) {
+            valid = this.validateConfig(item, [...parents, key]) && valid;
           }
-          return value ? this.validateConfig(value, [...parents, key]) && valid : true;
-        }
-        default: {
-          return valid;
+        } else if (isSerializable(value)) {
+          valid = value === null ? true : this.validateConfig(value, [...parents, key]) && valid;
+        } else {
+          this.logger?.warn(`Fields that are not serializable to JSON are not allowed in config [${parents?.join(".")}.${key}]`);
+          valid = false;
         }
       }
-    }, true);
+    }
+    return valid;
   }
 };
 
@@ -692,7 +684,7 @@ var AbstractModuleInstance = class _AbstractModuleInstance extends AbstractModul
   _privateResolver;
   _upResolver;
   get downResolver() {
-    this._downResolver = this._downResolver ?? new CompositeModuleResolver({
+    this._downResolver ??= new CompositeModuleResolver({
       allowNameResolution: this.allowNameResolution,
       moduleIdentifierTransformers: this.params.moduleIdentifierTransformers,
       root: this
@@ -706,7 +698,7 @@ var AbstractModuleInstance = class _AbstractModuleInstance extends AbstractModul
     return this.params.moduleIdentifierTransformers ?? ResolveHelper.transformers;
   }
   get privateResolver() {
-    this._privateResolver = this._privateResolver ?? new CompositeModuleResolver({
+    this._privateResolver ??= new CompositeModuleResolver({
       allowNameResolution: this.allowNameResolution,
       moduleIdentifierTransformers: this.params.moduleIdentifierTransformers,
       root: this
@@ -720,7 +712,7 @@ var AbstractModuleInstance = class _AbstractModuleInstance extends AbstractModul
     return this.config.timeBudget;
   }
   get upResolver() {
-    this._upResolver = this._upResolver ?? new CompositeModuleResolver({
+    this._upResolver ??= new CompositeModuleResolver({
       allowNameResolution: this.allowNameResolution,
       moduleIdentifierTransformers: this.params.moduleIdentifierTransformers,
       root: this
@@ -735,17 +727,18 @@ var AbstractModuleInstance = class _AbstractModuleInstance extends AbstractModul
   }
   async certifyParents() {
     const parents = await this.parents();
-    return (await Promise.all(
+    const certified = await Promise.all(
       parents.map(async (parent) => {
         const [bw, payloads, errors] = await parent.certifyQuery(this.address);
         return errors.length === 0 ? [bw, ...payloads] : [];
       })
-    )).flat();
+    );
+    return certified.flat();
   }
   async createHandler() {
     await super.createHandler();
-    const addToResolvers = this.params.addToResolvers ?? true;
-    if (addToResolvers) {
+    const shouldAddToResolvers = this.params.addToResolvers ?? true;
+    if (shouldAddToResolvers) {
       this.upResolver.add(this);
       this.downResolver.add(this);
     }
@@ -757,7 +750,7 @@ var AbstractModuleInstance = class _AbstractModuleInstance extends AbstractModul
     });
   }
   async manifestQuery(account, maxDepth) {
-    const queryPayload = { schema: ModuleManifestQuerySchema2, ...maxDepth === void 0 ? {} : { maxDepth } };
+    const queryPayload = { schema: ModuleManifestQuerySchema2, ...maxDepth !== void 0 && { maxDepth } };
     return await this.sendQueryRaw(queryPayload, void 0, account);
   }
   moduleAddress() {
@@ -789,26 +782,25 @@ var AbstractModuleInstance = class _AbstractModuleInstance extends AbstractModul
           return filterIdentity(await resolveAllUp(this, maxDepth) ?? [], options.identity);
         }
         return filterIdentity(await resolveAll(this, maxDepth) ?? [], options.identity);
-      } else if (typeof id === "string") {
-        return filterIdentity(await resolvePathToInstance(this, id, true), options.identity);
-      } else {
-        throw new TypeError("Invalid id type");
       }
-    } else {
-      const config = {
-        address: this.address,
-        dead: this.dead,
-        downResolver: this.downResolver,
-        logger: this.logger,
-        mod: this,
-        transformers: this.moduleIdentifierTransformers,
-        upResolver: this.upResolver
-      };
-      if (id === "*") {
-        return filterIdentity(await ResolveHelper.resolve(config, "*", options) ?? [], options.identity);
+      if (typeof id === "string") {
+        return filterIdentity(await resolvePathToInstance(this, id, true), options.identity);
       }
-      return filterIdentity(await ResolveHelper.resolve(config, id, options), options.identity);
+      throw new TypeError("Invalid id type");
     }
+    const config = {
+      address: this.address,
+      dead: this.dead,
+      downResolver: this.downResolver,
+      logger: this.logger,
+      mod: this,
+      transformers: this.moduleIdentifierTransformers,
+      upResolver: this.upResolver
+    };
+    if (id === "*") {
+      return filterIdentity(await ResolveHelper.resolve(config, "*", options) ?? [], options.identity);
+    }
+    return filterIdentity(await ResolveHelper.resolve(config, id, options), options.identity);
   }
   resolveIdentifier(id, options) {
     const { direction = "all" } = options ?? {};
@@ -826,7 +818,9 @@ var AbstractModuleInstance = class _AbstractModuleInstance extends AbstractModul
     return await this.privateResolver.resolve(id, options) ?? await this.upResolver.resolve(id, options) ?? await this.downResolver.resolve(id, options);
   }
   async siblings() {
-    return (await Promise.all((await this.parents()).map((parent) => parent.publicChildren()))).flat().filter(duplicateModules);
+    const parents = await this.parents();
+    const children = await Promise.all(parents.map((parent) => parent.publicChildren()));
+    return children.flat().filter(duplicateModules);
   }
   state() {
     this._checkDead();
@@ -918,8 +912,8 @@ var LoggerModuleStatusReporter = class {
   }
   report(name, status, progress) {
     this.statusMap[name] = status;
-    const starting = Object.entries(this.statusMap).map(([, value]) => value === "starting" ? 1 : 0).reduce((a, b) => a + b, 0);
-    const started = Object.entries(this.statusMap).map(([, value]) => value === "started" ? 1 : 0).reduce((a, b) => a + b, 0);
+    const starting = Object.values(this.statusMap).map((value) => value === "starting" ? 1 : 0).reduce((a, b) => a + b, 0);
+    const started = Object.values(this.statusMap).map((value) => value === "started" ? 1 : 0).reduce((a, b) => a + b, 0);
     this.logger.log(`${started}/${starting + started} ${name} status: ${status}`, { progress });
   }
 };