@hkdigital/lib-core 0.4.43 → 0.4.45

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

@@ -10,7 +10,8 @@ import {
   LOAD,
   LOADED,
   ABORT,
-  ABORTED
+  ABORTED,
+  ERROR
 } from '../../../state/machines.js';
 
 import { waitForState } from '../../../util/svelte.js';
@@ -89,25 +90,39 @@ 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);
         }
       }
     });
 
+    $effect(() => {
+      if (this.#state.current === STATE_LOADING) {
+        // Check if any source failed during loading
+        const sources = this.sources;
+        for (const source of sources) {
+          const loader = this.getLoaderFromSource(source);
+          if (loader.state === STATE_ERROR) {
+            this.#state.send(ERROR, loader.error || new Error('Source loading failed'));
+            break;
+          }
+        }
+      }
+    });
+
     state.onenter = (currentState) => {
       if (currentState === STATE_LOADING) {
         this.#startLoading();
@@ -253,7 +268,7 @@ export default class SceneBase {
           if (isAborted || this.state === STATE_ABORTED) {
             reject(new Error('Preload was aborted'));
           } else if (this.state === STATE_ERROR) {
-            reject(new Error('Preload failed due to error'));
+            reject(this.#state.error);
           } else if (this.loaded) {
             resolve(this);
           } else {

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

@@ -28,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
      *
@@ -164,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 {LogLevel} [level] - Log level (required when nameOrConfig is service name)
      */
-    setServiceLogLevel(nameOrConfig: string | {
-        [x: string]: string;
-    }, level?: LogLevel): void;
+    setServiceLogLevel(nameOrConfig: string | Record<string, LogLevel>, level?: LogLevel): void;
     /**
      * Get all services with a specific tag
      *

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

@@ -130,14 +130,24 @@ 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);
@@ -145,7 +155,8 @@ export class ServiceManager extends EventEmitter {
     if (serviceLogLevels) {
       // Parse and store service log levels, but don't apply them yet
       // They will be applied when services are created in get()
-      /** @type {{[name:string]: LogLevel}} */
+
+      /** @type {Record<string,LogLevel>} */
       let parsedServiceLevels = {};
 
       if (typeof serviceLogLevels === 'string') {
@@ -591,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;
@@ -601,7 +612,7 @@ 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'
@@ -609,7 +620,7 @@ export class ServiceManager extends EventEmitter {
    * @param {LogLevel} [level] - Log level (required when nameOrConfig is service name)
    */
   setServiceLogLevel(nameOrConfig, level) {
-    /** @type {{[name:string]: LogLevel}} */
+    /** @type {Record<string,LogLevel>} */
     let serviceLevels = {};
 
     if (typeof nameOrConfig === 'string') {
@@ -630,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 = {};
     }
 

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.js

@@ -23,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(',');
@@ -39,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/dist/state/machines/loading-state-machine/LoadingStateMachine.svelte.js

@@ -65,6 +65,7 @@ export default class LoadingStateMachine extends FiniteStateMachine {
       },
       [STATE_ABORTED]: {
         [LOAD]: STATE_LOADING,
+        [LOADED]: STATE_LOADED,
         [UNLOAD]: STATE_UNLOADING
       },
       [STATE_TIMEOUT]: {

package/package.json

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