@hkdigital/lib-core 0.5.48 → 0.5.50

package/dist/state/machines/page-machine/PageMachine.svelte.d.ts

@@ -69,10 +69,8 @@ export default class PageMachine {
      *   Initial data properties (from server)
      * @param {Record<string, Function>} [config.onEnterHooks={}]
      *   Map of states to onEnter hook functions
-     * @param {string} [config.name='PageMachine']
-     *   Name for logger identification
-     * @param {import('../../../logging/typedef.js').LogLevel} [config.logLevel]
-     *   Log level (defaults to INFO for state transitions)
+     * @param {import('../../../logging/client.js').Logger} [config.logger]
+     *   Logger instance (optional, if not provided no logging occurs)
      *
      * @example
      * ```javascript
@@ -97,19 +95,18 @@ export default class PageMachine {
      * });
      * ```
      */
-    constructor({ startPath, routeMap, initialData, onEnterHooks, name, logLevel }: {
+    constructor({ startPath, routeMap, initialData, onEnterHooks, logger }: {
         startPath: string;
         routeMap?: Record<string, string> | undefined;
         initialData?: Record<string, any> | undefined;
         onEnterHooks?: Record<string, Function> | undefined;
-        name?: string | undefined;
-        logLevel?: import("../../../logging/typedef.js").LogLevel | undefined;
+        logger?: import("../../../logging/client.js").Logger | undefined;
     });
     /**
      * Logger instance for state machine
-     * @type {Logger}
+     * @type {import('../../../logging/client.js').Logger}
      */
-    logger: Logger;
+    logger: import("../../../logging/client.js").Logger;
     /**
      * Synchronize machine state with URL path
      *
@@ -334,4 +331,3 @@ export default class PageMachine {
     get canAbortTransitions(): boolean;
     #private;
 }
-import { Logger } from '../../../logging/common.js';

package/dist/state/machines/page-machine/PageMachine.svelte.js

@@ -1,5 +1,3 @@
-import { Logger, INFO } from '../../../logging/common.js';
-
 /**
  * Base class for page state machines with URL route mapping
  *
@@ -61,7 +59,7 @@ import { Logger, INFO } from '../../../logging/common.js';
 export default class PageMachine {
 	/**
 	 * Logger instance for state machine
-	 * @type {Logger}
+	 * @type {import('../../../logging/client.js').Logger}
 	 */
 	logger;
 	/**
@@ -152,10 +150,8 @@ export default class PageMachine {
 	 *   Initial data properties (from server)
 	 * @param {Record<string, Function>} [config.onEnterHooks={}]
 	 *   Map of states to onEnter hook functions
-	 * @param {string} [config.name='PageMachine']
-	 *   Name for logger identification
-	 * @param {import('../../../logging/typedef.js').LogLevel} [config.logLevel]
-	 *   Log level (defaults to INFO for state transitions)
+	 * @param {import('../../../logging/client.js').Logger} [config.logger]
+	 *   Logger instance (optional, if not provided no logging occurs)
 	 *
 	 * @example
 	 * ```javascript
@@ -185,14 +181,13 @@ export default class PageMachine {
 		routeMap = {},
 		initialData = {},
 		onEnterHooks = {},
-		name = 'PageMachine',
-		logLevel = INFO
+		logger = null
 	}) {
 		if (!startPath) {
 			throw new Error('PageMachine requires startPath parameter');
 		}
 
-		this.logger = new Logger(name, logLevel);
+		this.logger = logger;
 		this.#startPath = startPath;
 		this.#routeMap = routeMap;
 		this.#data = initialData;
@@ -222,17 +217,18 @@ export default class PageMachine {
 	 * Normalize onEnterHooks to ensure consistent format
 	 * Converts function to {onEnter: function} object
 	 *
-	 * @param {Record<string, Function|Object>} hooks - Raw hooks configuration
+	 * @param {Record<string, Function|{onEnter: Function}>} hooks - Raw hooks configuration
 	 * @returns {Record<string, {onEnter: Function}>} Normalized hooks
 	 */
 	#normalizeOnEnterHooks(hooks) {
+		/** @type {Record<string, {onEnter: Function} */
 		const normalized = {};
 
 		for (const [state, hook] of Object.entries(hooks)) {
 			if (typeof hook === 'function') {
 				// Simple function -> wrap in object
 				normalized[state] = { onEnter: hook };
-			} else if (hook && typeof hook === 'object' && hook.onEnter) {
+			} else if (hook?.onEnter) {
 				// Already an object with onEnter
 				normalized[state] = hook;
 			}
@@ -255,9 +251,14 @@ export default class PageMachine {
 		const targetState = this.#getStateFromPath(currentPath);
 
 		if (targetState && targetState !== this.#current) {
+			const oldState = this.#current;
 			this.#current = targetState;
 			this.#visitedStates.add(targetState);
 			this.#revision++;
+
+			// Log state transition from URL sync
+			this.logger?.debug(`syncFromPath (url): ${oldState} → ${targetState}`);
+
 			return true;
 		}
 
@@ -288,14 +289,15 @@ export default class PageMachine {
 		this.#visitedStates.add(newState);
 
 		// Log state transition
-		this.logger.debug(`${oldState} → ${newState}`);
+		this.logger?.debug(`setState: ${oldState} → ${newState}`);
 
 		// Check if this state has an onEnter hook
 		const hookConfig = this.#onEnterHooks[newState];
 		if (hookConfig?.onEnter) {
 			// Create done callback for auto-transition
 			let doneCalled = false;
-			const done = (nextState) => {
+
+			const done = ( /** @type {string} */ nextState) => {
 				if (!doneCalled && nextState && nextState !== newState) {
 					doneCalled = true;
 					this.#isTransitioning = false;
@@ -324,7 +326,8 @@ export default class PageMachine {
 					await handler;
 				}
 			} catch (error) {
-				console.error(`Error in onEnter hook for state ${newState}:`, error);
+				const logger = this.logger ?? console;
+				logger.error(`Error in onEnter hook for state ${newState}:`, error);
 			}
 		}
 

package/package.json

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