IntfLogger.expectInstance()

CHANGELOG.md

@@ -15,7 +15,9 @@ Breaking changes:
   * `BaseComponent`: Renamed `CONFIG_CLASS` to `configClass`.
 
 Other notable changes:
-* None.
+* `loggy-intf`:
+  * `LoggyIntf`: New static methods `expectInstance()` and
+    `expectInstanceOrNull()`, to avoid more ad-hoc checks.
 
 ### v0.8.5 -- 2024-12-06
 

src/loggy-intf/export/IntfLogger.js

@@ -1,7 +1,7 @@
 // Copyright 2022-2024 the Lactoserv Authors (Dan Bornstein et alia).
 // SPDX-License-Identifier: Apache-2.0
 
-import { Methods } from '@this/typey';
+import { AskIf, Methods } from '@this/typey';
 
 import { IntfLoggingEnvironment } from '#x/IntfLoggingEnvironment';
 import { LogPayload } from '#x/LogPayload';
@@ -79,6 +79,47 @@ export class IntfLogger {
     return Methods.abstract();
   }
 
+
+  //
+  // Static members
+  //
+
+  /**
+   * Returns the given value if it is an instance of this interface. Throws an
+   * error if not.
+   *
+   * **Note:** Because of JavaScript's loosey-goosey nature, this method is, as
+   * a practical matter, overly accepting of values as instances.
+   *
+   * @param {*} logger (Alleged) logger instance.
+   * @returns {IntfLogger} `logger` if it is a logger.
+   * @throws {Error} Thrown if `logger` is not actually a logger.
+   */
+  static expectInstance(logger) {
+    if (logger instanceof IntfLogger) {
+      return logger;
+    } else if (AskIf.callableFunction(logger) && logger.$env) {
+      return logger;
+    }
+
+    throw new Error(`Not a logger: ${logger}`);
+  }
+
+  /**
+   * Returns the given value if it is an instance of this interface or is
+   * `null`. Throws an error if not either.
+   *
+   * **Note:** Because of JavaScript's loosey-goosey nature, this method is, as
+   * a practical matter, overly accepting of values as instances.
+   *
+   * @param {*} logger (Alleged) logger instance.
+   * @returns {?IntfLogger} `logger` if it is a logger or `null`.
+   * @throws {Error} Thrown if `logger` is not actually a logger or `null`.
+   */
+  static expectInstanceOrNull(logger) {
+    return (logger === null) ? null : this.expectInstance(logger);
+  }
+
   /**
    * Metainformation about a logger. Instances of this interface are returned
    * when accessing the property `$meta` on logger instances.

src/metacomp/export/LimitedLoader.js

@@ -71,7 +71,7 @@ export class LimitedLoader {
    */
   constructor(context = null, logger = null) {
     this.#context = context;
-    this.#logger  = logger;
+    this.#logger  = IntfLogger.expectInstanceOrNull(logger);
 
     if (context && !vm.isContext(context)) {
       vm.createContext(context);

src/net-protocol/export/ProtocolWrangler.js

@@ -181,7 +181,7 @@ export class ProtocolWrangler {
    *   logging.
    */
   async init(logger) {
-    this.#logger = logger;
+    this.#logger = IntfLogger.expectInstanceOrNull(logger);
 
     // Confusion alert!: This is not the same as the `requestLogger` (a "request
     // logger") per se) passed in as an option. This is the sub-logger of the

src/net-protocol/private/AsyncServerSocket.js

@@ -76,7 +76,7 @@ export class AsyncServerSocket {
     // Note: `interface` is a reserved word.
     this.#interface = MustBe.instanceOf(iface, InterfaceAddress);
     this.#protocol  = MustBe.string(protocol);
-    this.#logger    = logger;
+    this.#logger    = IntfLogger.expectInstanceOrNull(logger);
   }
 
   /**

src/net-protocol/private/WranglerContext.js

@@ -267,8 +267,8 @@ export class WranglerContext {
     ctx.#socket   = socket;
 
     if (logger) {
-      ctx.#connectionLogger = logger;
-      ctx.#connectionId     = logger.$meta.lastContext;
+      ctx.#connectionLogger = IntfLogger.expectInstanceOrNull(logger);
+      ctx.#connectionId     = logger?.$meta.lastContext ?? null;
     }
 
     ctx.bind(socket);

src/net-util/export/DispatchInfo.js

@@ -57,7 +57,7 @@ export class DispatchInfo extends IntfDeconstructable {
 
     this.#base   = MustBe.instanceOf(base, PathKey);
     this.#extra  = MustBe.instanceOf(extra, PathKey);
-    this.#logger = (logger === null) ? null : MustBe.callableFunction(logger);
+    this.#logger = IntfLogger.expectInstanceOrNull(logger);
   }
 
   /** @override */

src/webapp-core/export/HostManager.js

@@ -130,7 +130,7 @@ export class HostManager extends TemplAggregateComponent('HostAggregate', BaseCo
      * @param {?IntfLogger} logger Logger to use, if any.
      */
     constructor(logger) {
-      this.#logger = logger;
+      this.#logger = IntfLogger.expectInstanceOrNull(logger);
     }
 
     /**