@hkdigital/lib-core 0.4.42 → 0.4.44

package/dist/logging/internal/logger/Logger.js

@@ -34,6 +34,8 @@
 
 /** @typedef {import('../../../generic/typedef.js').ErrorDetails} ErrorDetails */
 
+import * as expect from '../../../util/expect.js';
+
 import { EventEmitter } from '../../../generic/events.js';
 
 import {
@@ -248,6 +250,8 @@ export default class Logger extends EventEmitter {
    * @param {import('../../typedef.js').LogEventData} eventData
    */
   logFromEvent(eventData) {
+    expect.object(eventData);
+
     const level = eventData.level;
 
     // Check if this log level should be filtered

package/dist/network/loaders/base/SceneBase.svelte.js

@@ -89,20 +89,20 @@ export default class SceneBase {
     const state = this.#state;
 
     $effect(() => {
-      if (state.current === STATE_LOADING) {
+      if (this.#state.current === STATE_LOADING) {
         const { sourcesLoaded, numberOfSources } = this.#progress;
 
-        if (sourcesLoaded === numberOfSources) {
+        if (sourcesLoaded === numberOfSources && numberOfSources > 0) {
           this.#state.send(LOADED);
         }
       }
     });
 
     $effect(() => {
-      if (state.current === STATE_ABORTING) {
+      if (this.#state.current === STATE_ABORTING) {
         const { sourcesAborted, numberOfSources } = this.#abortProgress;
 
-        if (sourcesAborted === numberOfSources) {
+        if (sourcesAborted === numberOfSources && numberOfSources > 0) {
           this.#state.send(ABORTED);
         }
       }

package/dist/services/service-manager/ServiceManager.d.ts

@@ -1,3 +1,4 @@
+/** @typedef {import('../../logging/typedef.js').LogLevel} LogLevel */
 /**
  * @typedef {import('./typedef.js').ServiceConstructor} ServiceConstructor
  * @typedef {import('./typedef.js').ServiceRegistrationOptions} ServiceRegistrationOptions
@@ -27,8 +28,24 @@ export class ServiceManager extends EventEmitter {
     services: Map<string, ServiceEntry>;
     /** @type {Logger} */
     logger: Logger;
-    /** @type {ServiceManagerConfig} */
-    config: ServiceManagerConfig;
+    /**
+     * @type {{
+     *   debug: boolean,
+     *   autoStart: boolean,
+     *   stopTimeout: number,
+     *   defaultLogLevel: LogLevel,
+     *   managerLogLevel: LogLevel,
+     *   serviceLogLevels?: Record<string,LogLevel>
+     * }}
+     **/
+    config: {
+        debug: boolean;
+        autoStart: boolean;
+        stopTimeout: number;
+        defaultLogLevel: LogLevel;
+        managerLogLevel: LogLevel;
+        serviceLogLevels?: Record<string, LogLevel>;
+    };
     /**
      * Attach a plugin to the ServiceManager
      *
@@ -163,22 +180,20 @@ export class ServiceManager extends EventEmitter {
     /**
      * Set log level for the ServiceManager itself
      *
-     * @param {string} level - Log level to set for the ServiceManager
+     * @param {LogLevel} level - Log level to set for the ServiceManager
      */
-    setManagerLogLevel(level: string): void;
+    setManagerLogLevel(level: LogLevel): void;
     /**
      * Set log level for individual services
      *
-     * @param {string|Object<string,string>} nameOrConfig
+     * @param {string|Record<string,LogLevel>} nameOrConfig
      *   Service configuration:
      *   - String with service name: 'auth' (requires level parameter)
      *   - String with config: 'auth:debug,database:info'
      *   - Object: { auth: 'debug', database: 'info' }
-     * @param {string} [level] - Log level (required when nameOrConfig is service name)
+     * @param {LogLevel} [level] - Log level (required when nameOrConfig is service name)
      */
-    setServiceLogLevel(nameOrConfig: string | {
-        [x: string]: string;
-    }, level?: string): void;
+    setServiceLogLevel(nameOrConfig: string | Record<string, LogLevel>, level?: LogLevel): void;
     /**
      * Get all services with a specific tag
      *
@@ -198,6 +213,7 @@ export class ServiceManager extends EventEmitter {
     #private;
 }
 export default ServiceManager;
+export type LogLevel = import("../../logging/typedef.js").LogLevel;
 export type ServiceConstructor = import("./typedef.js").ServiceConstructor;
 export type ServiceRegistrationOptions = import("./typedef.js").ServiceRegistrationOptions;
 export type ServiceManagerConfig = import("./typedef.js").ServiceManagerConfig;

package/dist/services/service-manager/ServiceManager.js

@@ -86,6 +86,8 @@ import {
   STATE_DESTROYED
 } from '../service-base/constants.js';
 
+/** @typedef {import('../../logging/typedef.js').LogLevel} LogLevel */
+
 /**
  * @typedef {import('./typedef.js').ServiceConstructor} ServiceConstructor
  * @typedef {import('./typedef.js').ServiceRegistrationOptions} ServiceRegistrationOptions
@@ -128,20 +130,50 @@ export class ServiceManager extends EventEmitter {
     /** @type {Logger} */
     this.logger = new Logger('ServiceManager', managerLogLevel);
 
-    /** @type {ServiceManagerConfig} */
+    /**
+     * @type {{
+     *   debug: boolean,
+     *   autoStart: boolean,
+     *   stopTimeout: number,
+     *   defaultLogLevel: LogLevel,
+     *   managerLogLevel: LogLevel,
+     *   serviceLogLevels?: Record<string,LogLevel>
+     * }}
+     **/
+    // @ts-ignore (managerLogLevel set later)
     this.config = {
       debug: config.debug ?? false,
       autoStart: config.autoStart ?? false,
       stopTimeout: config.stopTimeout || 10000,
       defaultLogLevel
       // managerLogLevel will be set bysetManagerLogLevel()
-      // serviceLogLevels will be set by setServiceLogLevel()
+      // serviceLogLevels will be optionally set by setServiceLogLevel()
     };
 
     this.setManagerLogLevel(managerLogLevel);
 
     if (serviceLogLevels) {
-      this.setServiceLogLevel(serviceLogLevels);
+      // Parse and store service log levels, but don't apply them yet
+      // They will be applied when services are created in get()
+
+      /** @type {Record<string,LogLevel>} */
+      let parsedServiceLevels = {};
+
+      if (typeof serviceLogLevels === 'string') {
+        if (serviceLogLevels.includes(':')) {
+          // Parse string config: 'auth:debug,database:info'
+          parsedServiceLevels = parseServiceLogLevels(serviceLogLevels);
+        } else {
+          throw new Error(
+            'Service log levels string must include service:level pairs'
+          );
+        }
+      } else {
+        // Object config: { auth: 'debug', database: 'info' }
+        parsedServiceLevels = serviceLogLevels;
+      }
+
+      this.config.serviceLogLevels = parsedServiceLevels;
     }
   }
 
@@ -570,7 +602,7 @@ export class ServiceManager extends EventEmitter {
   /**
    * Set log level for the ServiceManager itself
    *
-   * @param {string} level - Log level to set for the ServiceManager
+   * @param {LogLevel} level - Log level to set for the ServiceManager
    */
   setManagerLogLevel(level) {
     this.config.managerLogLevel = level;
@@ -580,15 +612,15 @@ export class ServiceManager extends EventEmitter {
   /**
    * Set log level for individual services
    *
-   * @param {string|Object<string,string>} nameOrConfig
+   * @param {string|Record<string,LogLevel>} nameOrConfig
    *   Service configuration:
    *   - String with service name: 'auth' (requires level parameter)
    *   - String with config: 'auth:debug,database:info'
    *   - Object: { auth: 'debug', database: 'info' }
-   * @param {string} [level] - Log level (required when nameOrConfig is service name)
+   * @param {LogLevel} [level] - Log level (required when nameOrConfig is service name)
    */
   setServiceLogLevel(nameOrConfig, level) {
-    /** @type {{[name:string]: string}} */
+    /** @type {Record<string,LogLevel>} */
     let serviceLevels = {};
 
     if (typeof nameOrConfig === 'string') {
@@ -609,7 +641,9 @@ export class ServiceManager extends EventEmitter {
       serviceLevels = nameOrConfig;
     }
 
+    // Ensure serviceLogLevels is initialized as an object
     if (!this.config.serviceLogLevels) {
+      /** @type {Record<string,LogLevel>} */
       this.config.serviceLogLevels = {};
     }
 
@@ -617,10 +651,10 @@ export class ServiceManager extends EventEmitter {
     for (const [name, logLevel] of Object.entries(serviceLevels)) {
       this.config.serviceLogLevels[name] = logLevel;
 
-      // Apply to existing instance
-      const instance = this.get(name);
-      if (instance) {
-        instance.setLogLevel(logLevel);
+      // Apply to existing instance if it exists and is registered
+      const entry = this.services.get(name);
+      if (entry?.instance) {
+        entry.instance.setLogLevel(logLevel);
       }
     }
   }

package/dist/services/service-manager/typedef.d.ts

@@ -51,9 +51,7 @@ export type ServiceManagerConfig = {
      * - String: "auth:debug,database:info"
      * - Object: { auth: "debug", database: "info" }
      */
-    serviceLogLevels?: string | {
-        [x: string]: import("../../logging/typedef.js").LogLevel;
-    } | undefined;
+    serviceLogLevels?: string | Record<string, import("../../logging/typedef.js").LogLevel> | undefined;
 };
 /**
  * Result of health check for all services

package/dist/services/service-manager/typedef.js

@@ -56,7 +56,7 @@
  * @property {number} [stopTimeout=10000] - Default timeout for stopping services
  * @property {LogLevel} [defaultLogLevel] - Default log level for new services
  * @property {LogLevel} [managerLogLevel] - Initial log level for ServiceManager
- * @property {string|Object<string,LogLevel>} [serviceLogLevels]
+ * @property {string|Record<string,LogLevel>} [serviceLogLevels]
  *   Per-service log levels:
  *   - String: "auth:debug,database:info"
  *   - Object: { auth: "debug", database: "info" }

package/dist/services/service-manager/util.d.ts

@@ -1,18 +1,17 @@
+/** @typedef {import('../../logging/typedef.js').LogLevel} LogLevel */
 /**
  * Parse comma-separated service:level configuration string
  *
  * @param {string} configString
  *   Comma-separated string like "auth:debug,database:info,cache:warn"
  *
- * @returns {Object<string, string>} Service name to log level mapping
+ * @returns {Record<string, LogLevel>} Service name to log level mapping
  *
  * @example
  * const config = parseServiceLogLevels("auth:debug,database:info");
  * // Returns: { auth: "debug", database: "info" }
  */
-export function parseServiceLogLevels(configString: string): {
-    [x: string]: string;
-};
+export function parseServiceLogLevels(configString: string): Record<string, LogLevel>;
 /**
  * Expand log levels to include higher severity levels
  *
@@ -33,3 +32,4 @@ export function expandLogLevels(serviceLevels: {
 }): {
     [x: string]: string[];
 };
+export type LogLevel = import("../../logging/typedef.js").LogLevel;

package/dist/services/service-manager/util.js

@@ -7,13 +7,15 @@
 
 import { DEBUG, INFO, WARN, ERROR } from '../../logging/index.js';
 
+/** @typedef {import('../../logging/typedef.js').LogLevel} LogLevel */
+
 /**
  * Parse comma-separated service:level configuration string
  *
  * @param {string} configString
  *   Comma-separated string like "auth:debug,database:info,cache:warn"
  *
- * @returns {Object<string, string>} Service name to log level mapping
+ * @returns {Record<string, LogLevel>} Service name to log level mapping
  *
  * @example
  * const config = parseServiceLogLevels("auth:debug,database:info");
@@ -21,11 +23,11 @@ import { DEBUG, INFO, WARN, ERROR } from '../../logging/index.js';
  */
 export function parseServiceLogLevels(configString) {
   if (!configString || typeof configString !== 'string') {
-    /** @type {Object<string, string>} */
+    /** @type {Record<string, LogLevel>} */
     return {};
   }
 
-  /** @type {Object<string, string>} */
+  /** @type {Record<string, LogLevel>} */
   const result = {};
 
   const services = configString.split(',');
@@ -37,7 +39,7 @@ export function parseServiceLogLevels(configString) {
     const parts = trimmed.split(':');
     if (parts.length === 2) {
       const [serviceName, logLevel] = parts;
-      result[serviceName.trim()] = logLevel.trim();
+      result[serviceName.trim()] = /** @type {LogLevel} */ (logLevel.trim());
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@hkdigital/lib-core",
-	"version": "0.4.42",
+	"version": "0.4.44",
 	"author": {
 		"name": "HKdigital",
 		"url": "https://hkdigital.nl"