@etsoo/shared 1.1.32 → 1.1.35

package/__tests__/EHistory.ts

@@ -1,4 +1,4 @@
-import { EHistory, EHistoryEvent } from '../src/types/EHistory';
+import { EHistory, EHistoryNavigateEvent } from '../src/types/EHistory';
 
 // Extended for tests
 class LHistory extends EHistory<number> {}
@@ -7,11 +7,14 @@ test('Tests for history', () => {
     const history = new LHistory();
     expect(history.index).toBe(-1);
     history.pushState(1);
+    expect(history.getStatus()).toStrictEqual([false, false]);
     history.pushState(2);
     history.pushState(3);
+    expect(history.getStatus()).toStrictEqual([true, false]);
     expect(history.states).toStrictEqual([1, 2, 3]);
     expect(history.index).toBe(2);
     history.back();
+    expect(history.getStatus()).toStrictEqual([true, true]);
     history.pushState(4);
     expect(history.index).toBe(2);
     expect(history.states).toStrictEqual([1, 2, 4]);
@@ -27,14 +30,14 @@ test('Tests for history', () => {
 
 test('Tests for events', () => {
     const navigatorFn = jest.fn();
-    const navigatorStopFn = jest.fn((event: EHistoryEvent) => {
+    const navigatorStopFn = jest.fn((event: EHistoryNavigateEvent) => {
         event.stopImmediatePropagation();
     });
     const clearFn = jest.fn();
     const pushFn = jest.fn();
     const replaceFn = jest.fn();
 
-    const history = new LHistory();
+    const history = new LHistory(3);
 
     history.on({
         clear: clearFn,
@@ -68,4 +71,9 @@ test('Tests for events', () => {
 
     // Previous handler stopped propagation
     expect(navigatorFn).toBeCalledTimes(5);
+
+    history.pushState(3);
+    history.pushState(4);
+    history.pushState(5);
+    expect(history.length).toBe(3);
 });

package/lib/cjs/DataTypes.js

@@ -52,10 +52,7 @@ var DataTypes;
     /**
      * Combined type enum
      */
-    DataTypes.CombinedEnum = {
-        ...SimpleEnum,
-        ...ExtendedEnum
-    };
+    DataTypes.CombinedEnum = Object.assign(Object.assign({}, SimpleEnum), ExtendedEnum);
     /**
      * Horizontal align enum
      */

package/lib/cjs/DateUtils.js

@@ -47,19 +47,11 @@ var DateUtils;
     /**
      * Minute format, YYYY-MM-DD hh:mm
      */
-    DateUtils.MinuteFormat = {
-        ...DateUtils.DayFormat,
-        hour: '2-digit',
-        hourCycle: 'h23',
-        minute: '2-digit'
-    };
+    DateUtils.MinuteFormat = Object.assign(Object.assign({}, DateUtils.DayFormat), { hour: '2-digit', hourCycle: 'h23', minute: '2-digit' });
     /**
      * Second format, YYYY-MM-DD hh:mm:ss
      */
-    DateUtils.SecondFormat = {
-        ...DateUtils.MinuteFormat,
-        second: '2-digit'
-    };
+    DateUtils.SecondFormat = Object.assign(Object.assign({}, DateUtils.MinuteFormat), { second: '2-digit' });
     /**
      * Format
      * @param input Input date time
@@ -92,7 +84,7 @@ var DateUtils;
                 opt = options;
         }
         // Clone as new options with time zone
-        const newOpt = { ...opt, ...(timeZone != null && { timeZone }) };
+        const newOpt = Object.assign(Object.assign({}, opt), (timeZone != null && { timeZone }));
         // Return format result
         return new Intl.DateTimeFormat(locale, newOpt)
             .format(parsed)

package/lib/cjs/DomUtils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DomUtils = void 0;
+const tslib_1 = require("tslib");
 const DataTypes_1 = require("./DataTypes");
 if (typeof navigator === 'undefined') {
     // Test mock only
@@ -163,7 +164,7 @@ var DomUtils;
             country =
                 (_b = (_a = new URL(location.href).searchParams.get(DomUtils.CountryField)) !== null && _a !== void 0 ? _a : sessionStorage.getItem(DomUtils.CountryField)) !== null && _b !== void 0 ? _b : localStorage.getItem(DomUtils.CountryField);
         }
-        catch {
+        catch (_c) {
             country = null;
         }
         // Return
@@ -180,7 +181,7 @@ var DomUtils;
             culture =
                 (_b = (_a = new URL(location.href).searchParams.get(DomUtils.CultureField)) !== null && _a !== void 0 ? _a : sessionStorage.getItem(DomUtils.CultureField)) !== null && _b !== void 0 ? _b : localStorage.getItem(DomUtils.CultureField);
         }
-        catch {
+        catch (_c) {
             culture = null;
         }
         // Browser detected
@@ -218,19 +219,21 @@ var DomUtils;
      * @param file File
      * @returns Data URL
      */
-    async function fileToDataURL(file) {
-        return new Promise((resolve, reject) => {
-            const reader = new FileReader();
-            reader.onerror = reject;
-            reader.onload = () => {
-                const data = reader.result;
-                if (data == null) {
-                    reject();
-                    return;
-                }
-                resolve(data);
-            };
-            reader.readAsDataURL(file);
+    function fileToDataURL(file) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                const reader = new FileReader();
+                reader.onerror = reject;
+                reader.onload = () => {
+                    const data = reader.result;
+                    if (data == null) {
+                        reject();
+                        return;
+                    }
+                    resolve(data);
+                };
+                reader.readAsDataURL(file);
+            });
         });
     }
     DomUtils.fileToDataURL = fileToDataURL;

package/lib/cjs/Utils.js

@@ -356,7 +356,7 @@ var Utils;
             // Return
             return json;
         }
-        catch {
+        catch (_a) {
             if (defaultValue == null)
                 return input;
             return defaultValue;

package/lib/cjs/index.js

@@ -1,32 +1,19 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./types/DelayedExecutorType"), exports);
-__exportStar(require("./types/EColor"), exports);
-__exportStar(require("./types/EHistory"), exports);
-__exportStar(require("./types/EventClass"), exports);
-__exportStar(require("./types/FormData"), exports);
-__exportStar(require("./storage/IStorage"), exports);
-__exportStar(require("./storage/WindowStorage"), exports);
-__exportStar(require("./DataTypes"), exports);
-__exportStar(require("./ColorUtils"), exports);
-__exportStar(require("./DateUtils"), exports);
-__exportStar(require("./DomUtils"), exports);
-__exportStar(require("./ExtendUtils"), exports);
-__exportStar(require("./Keyboard"), exports);
-__exportStar(require("./NumberUtils"), exports);
-__exportStar(require("./StorageUtils"), exports);
-__exportStar(require("./Utils"), exports);
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./types/DelayedExecutorType"), exports);
+tslib_1.__exportStar(require("./types/EColor"), exports);
+tslib_1.__exportStar(require("./types/EHistory"), exports);
+tslib_1.__exportStar(require("./types/EventClass"), exports);
+tslib_1.__exportStar(require("./types/FormData"), exports);
+tslib_1.__exportStar(require("./storage/IStorage"), exports);
+tslib_1.__exportStar(require("./storage/WindowStorage"), exports);
+tslib_1.__exportStar(require("./DataTypes"), exports);
+tslib_1.__exportStar(require("./ColorUtils"), exports);
+tslib_1.__exportStar(require("./DateUtils"), exports);
+tslib_1.__exportStar(require("./DomUtils"), exports);
+tslib_1.__exportStar(require("./ExtendUtils"), exports);
+tslib_1.__exportStar(require("./Keyboard"), exports);
+tslib_1.__exportStar(require("./NumberUtils"), exports);
+tslib_1.__exportStar(require("./StorageUtils"), exports);
+tslib_1.__exportStar(require("./Utils"), exports);

package/lib/cjs/types/EHistory.d.ts

@@ -1,26 +1,39 @@
 import { EventBase, EventClass } from './EventClass';
-/**
- * ETSOO Extended history event type
- */
-export declare type EHistoryEventType = 'navigate' | 'push' | 'replace' | 'clear';
-/**
- * ETSOO Extended history event data
- */
-export interface EHistoryEventData {
+interface EHistoryEventData {
     /**
      * Current index
      */
     index: number;
 }
+interface EHistoryNavigateEventData extends EHistoryEventData {
+    /**
+     * Delta
+     */
+    delta: number;
+}
+declare type EHistoryEventDef = {
+    clear: EHistoryEventData;
+    navigate: EHistoryNavigateEventData;
+    push: EHistoryEventData;
+    replace: EHistoryEventData;
+};
+declare type EHistoryEventType = Exclude<keyof EHistoryEventDef, 'navigate'>;
 /**
  * ETSOO Extended history event
  */
 export declare class EHistoryEvent extends EventBase<EHistoryEventType, EHistoryEventData> {
 }
+/**
+ * ETSOO Extended history navigate event
+ */
+export declare class EHistoryNavigateEvent extends EventBase<'navigate', EHistoryNavigateEventData> {
+    constructor(target: {}, data: EHistoryNavigateEventData);
+}
 /**
  * ETSOO Extended abstract history class
  */
-export declare abstract class EHistory<T> extends EventClass<EHistoryEventType, EHistoryEventData> {
+export declare abstract class EHistory<T> extends EventClass<EHistoryEventDef> {
+    readonly maxDepth: number;
     private _index;
     /**
      * States
@@ -38,6 +51,11 @@ export declare abstract class EHistory<T> extends EventClass<EHistoryEventType,
      * Get current state
      */
     get state(): T | undefined;
+    /**
+     * Constructor
+     * @param maxDepth Max depth of the history
+     */
+    constructor(maxDepth?: number);
     /**
      * Back to the previous state
      */
@@ -51,7 +69,8 @@ export declare abstract class EHistory<T> extends EventClass<EHistoryEventType,
      * @param type Type
      * @param index Current index
      */
-    protected createEvent(type: EHistoryEventType, index: number): EHistoryEvent;
+    protected createEvent<T extends EHistoryEventType>(type: T, index: number): EHistoryEvent;
+    protected createNavigateEvent(index: number, delta: number): EHistoryNavigateEvent;
     /**
      * Forward to the next state
      */
@@ -76,3 +95,4 @@ export declare abstract class EHistory<T> extends EventClass<EHistoryEventType,
      */
     replaceState(state: T): void;
 }
+export {};

package/lib/cjs/types/EHistory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EHistory = exports.EHistoryEvent = void 0;
+exports.EHistory = exports.EHistoryNavigateEvent = exports.EHistoryEvent = void 0;
 const EventClass_1 = require("./EventClass");
 /**
  * ETSOO Extended history event
@@ -8,12 +8,26 @@ const EventClass_1 = require("./EventClass");
 class EHistoryEvent extends EventClass_1.EventBase {
 }
 exports.EHistoryEvent = EHistoryEvent;
+/**
+ * ETSOO Extended history navigate event
+ */
+class EHistoryNavigateEvent extends EventClass_1.EventBase {
+    constructor(target, data) {
+        super(target, 'navigate', data);
+    }
+}
+exports.EHistoryNavigateEvent = EHistoryNavigateEvent;
 /**
  * ETSOO Extended abstract history class
  */
 class EHistory extends EventClass_1.EventClass {
-    constructor() {
-        super(...arguments);
+    /**
+     * Constructor
+     * @param maxDepth Max depth of the history
+     */
+    constructor(maxDepth = 20) {
+        super();
+        this.maxDepth = maxDepth;
         // Index
         this._index = -1;
         /**
@@ -64,6 +78,9 @@ class EHistory extends EventClass_1.EventClass {
     createEvent(type, index) {
         return new EHistoryEvent(this, type, { index });
     }
+    createNavigateEvent(index, delta) {
+        return new EHistoryNavigateEvent(this, { index, delta });
+    }
     /**
      * Forward to the next state
      */
@@ -98,7 +115,7 @@ class EHistory extends EventClass_1.EventClass {
         // Update the index
         this._index = newIndex;
         // Trigger event
-        this.trigger(this.createEvent('navigate', newIndex));
+        this.trigger(this.createNavigateEvent(newIndex, delta));
     }
     /**
      * Adds an entry to the history stack
@@ -111,6 +128,9 @@ class EHistory extends EventClass_1.EventClass {
         }
         this.states.push(state);
         this._index++;
+        if (this.length > this.maxDepth) {
+            this.states.shift();
+        }
         this.trigger(this.createEvent('push', this._index));
     }
     /**

package/lib/cjs/types/EventClass.d.ts

@@ -3,8 +3,8 @@
  * T for type
  * D for data
  */
-export declare abstract class EventBase<T extends string, D> {
-    readonly target: EventClass<T, D>;
+export declare abstract class EventBase<T, D> {
+    readonly target: {};
     readonly type: T;
     readonly data: D;
     private _propagationStopped;
@@ -21,7 +21,7 @@ export declare abstract class EventBase<T extends string, D> {
      * Constructor
      * @param type Type
      */
-    constructor(target: EventClass<T, D>, type: T, data: D);
+    constructor(target: {}, type: T, data: D);
     /**
      * Prevent all other listeners from being called
      */
@@ -40,65 +40,56 @@ interface EventOptions {
      */
     once?: boolean;
 }
-/**
- * Event class callback
- * T for type
- * D for data
- */
-export declare type EventClassCallback<T extends string, D> = (event: EventBase<T, D>) => void;
-/**
- * Event class collection definition
- * T for type
- * D for data
- */
-export declare type EventClassCollection<T extends string, D> = {
-    [key in T]?: EventClassCallback<T, D>;
+declare type EventClassDef = {
+    [key: string]: {};
 };
 /**
  * Event class
  * T for type
  * D for data
  */
-export declare abstract class EventClass<T extends string, D> {
+export declare abstract class EventClass<D extends EventClassDef> {
     private readonly listeners;
     /**
      * Has specific type events
      * @param type Type
      */
-    hasEvents(type: T): boolean;
+    hasEvents<T extends keyof D>(type: T): boolean;
     /**
      * Has specific type and callback events
      * @param type Type
      * @param callback Callback
      */
-    hasEvents(type: T, callback: EventClassCallback<T, D>): boolean;
+    hasEvents<T extends keyof D>(type: T, callback: (event: EventBase<T, D[T]>) => void): boolean;
     /**
      * Remove all specific type events
      * @param type Type
      */
-    off(type: T): void;
+    off<T extends keyof D>(type: T): void;
     /**
      * Remove specific type and callback event
      * @param type Type
      * @param callback Callback
      */
-    off(type: T, callback: EventClassCallback<T, D>): void;
+    off<T extends keyof D>(type: T, callback: (event: EventBase<T, D[T]>) => void): void;
     /**
      * Add event listeners
      * @param collection Collection of events
      */
-    on(collection: EventClassCollection<T, D>): void;
+    on(collection: {
+        [type in keyof D]: (event: EventBase<type, D[type]>) => void;
+    }): void;
     /**
      * Add event listener
      * @param type Type
      * @param callback Callback
      * @param options Options
      */
-    on(type: T, callback: EventClassCallback<T, D>, options?: EventOptions): void;
+    on<T extends keyof D>(type: T, callback: (event: EventBase<T, D[T]>) => void, options?: EventOptions): void;
     /**
      * Trigger event
      * @param event Event
      */
-    trigger(event: EventBase<T, D>): void;
+    trigger<T extends keyof D>(event: EventBase<T, D[T]>): void;
 }
 export {};

package/lib/cjs/types/EventClass.js

@@ -102,6 +102,8 @@ class EventClass {
         if (callback == null)
             return;
         this.listeners.has(type) || this.listeners.set(type, []);
+        // String to T conversion problem
+        // "keyofStringsOnly": true could solve part of it
         (_b = this.listeners.get(type)) === null || _b === void 0 ? void 0 : _b.push([callback, options]);
     }
     /**

package/lib/mjs/DataTypes.js

@@ -49,10 +49,7 @@ export var DataTypes;
     /**
      * Combined type enum
      */
-    DataTypes.CombinedEnum = {
-        ...SimpleEnum,
-        ...ExtendedEnum
-    };
+    DataTypes.CombinedEnum = Object.assign(Object.assign({}, SimpleEnum), ExtendedEnum);
     /**
      * Horizontal align enum
      */

package/lib/mjs/DateUtils.js

@@ -44,19 +44,11 @@ export var DateUtils;
     /**
      * Minute format, YYYY-MM-DD hh:mm
      */
-    DateUtils.MinuteFormat = {
-        ...DateUtils.DayFormat,
-        hour: '2-digit',
-        hourCycle: 'h23',
-        minute: '2-digit'
-    };
+    DateUtils.MinuteFormat = Object.assign(Object.assign({}, DateUtils.DayFormat), { hour: '2-digit', hourCycle: 'h23', minute: '2-digit' });
     /**
      * Second format, YYYY-MM-DD hh:mm:ss
      */
-    DateUtils.SecondFormat = {
-        ...DateUtils.MinuteFormat,
-        second: '2-digit'
-    };
+    DateUtils.SecondFormat = Object.assign(Object.assign({}, DateUtils.MinuteFormat), { second: '2-digit' });
     /**
      * Format
      * @param input Input date time
@@ -89,7 +81,7 @@ export var DateUtils;
                 opt = options;
         }
         // Clone as new options with time zone
-        const newOpt = { ...opt, ...(timeZone != null && { timeZone }) };
+        const newOpt = Object.assign(Object.assign({}, opt), (timeZone != null && { timeZone }));
         // Return format result
         return new Intl.DateTimeFormat(locale, newOpt)
             .format(parsed)

package/lib/mjs/DomUtils.js

@@ -1,3 +1,4 @@
+import { __awaiter } from "tslib";
 import { DataTypes } from './DataTypes';
 if (typeof navigator === 'undefined') {
     // Test mock only
@@ -160,7 +161,7 @@ export var DomUtils;
             country =
                 (_b = (_a = new URL(location.href).searchParams.get(DomUtils.CountryField)) !== null && _a !== void 0 ? _a : sessionStorage.getItem(DomUtils.CountryField)) !== null && _b !== void 0 ? _b : localStorage.getItem(DomUtils.CountryField);
         }
-        catch {
+        catch (_c) {
             country = null;
         }
         // Return
@@ -177,7 +178,7 @@ export var DomUtils;
             culture =
                 (_b = (_a = new URL(location.href).searchParams.get(DomUtils.CultureField)) !== null && _a !== void 0 ? _a : sessionStorage.getItem(DomUtils.CultureField)) !== null && _b !== void 0 ? _b : localStorage.getItem(DomUtils.CultureField);
         }
-        catch {
+        catch (_c) {
             culture = null;
         }
         // Browser detected
@@ -215,19 +216,21 @@ export var DomUtils;
      * @param file File
      * @returns Data URL
      */
-    async function fileToDataURL(file) {
-        return new Promise((resolve, reject) => {
-            const reader = new FileReader();
-            reader.onerror = reject;
-            reader.onload = () => {
-                const data = reader.result;
-                if (data == null) {
-                    reject();
-                    return;
-                }
-                resolve(data);
-            };
-            reader.readAsDataURL(file);
+    function fileToDataURL(file) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                const reader = new FileReader();
+                reader.onerror = reject;
+                reader.onload = () => {
+                    const data = reader.result;
+                    if (data == null) {
+                        reject();
+                        return;
+                    }
+                    resolve(data);
+                };
+                reader.readAsDataURL(file);
+            });
         });
     }
     DomUtils.fileToDataURL = fileToDataURL;

package/lib/mjs/Utils.js

@@ -353,7 +353,7 @@ export var Utils;
             // Return
             return json;
         }
-        catch {
+        catch (_a) {
             if (defaultValue == null)
                 return input;
             return defaultValue;

package/lib/mjs/types/EHistory.d.ts

@@ -1,26 +1,39 @@
 import { EventBase, EventClass } from './EventClass';
-/**
- * ETSOO Extended history event type
- */
-export declare type EHistoryEventType = 'navigate' | 'push' | 'replace' | 'clear';
-/**
- * ETSOO Extended history event data
- */
-export interface EHistoryEventData {
+interface EHistoryEventData {
     /**
      * Current index
      */
     index: number;
 }
+interface EHistoryNavigateEventData extends EHistoryEventData {
+    /**
+     * Delta
+     */
+    delta: number;
+}
+declare type EHistoryEventDef = {
+    clear: EHistoryEventData;
+    navigate: EHistoryNavigateEventData;
+    push: EHistoryEventData;
+    replace: EHistoryEventData;
+};
+declare type EHistoryEventType = Exclude<keyof EHistoryEventDef, 'navigate'>;
 /**
  * ETSOO Extended history event
  */
 export declare class EHistoryEvent extends EventBase<EHistoryEventType, EHistoryEventData> {
 }
+/**
+ * ETSOO Extended history navigate event
+ */
+export declare class EHistoryNavigateEvent extends EventBase<'navigate', EHistoryNavigateEventData> {
+    constructor(target: {}, data: EHistoryNavigateEventData);
+}
 /**
  * ETSOO Extended abstract history class
  */
-export declare abstract class EHistory<T> extends EventClass<EHistoryEventType, EHistoryEventData> {
+export declare abstract class EHistory<T> extends EventClass<EHistoryEventDef> {
+    readonly maxDepth: number;
     private _index;
     /**
      * States
@@ -38,6 +51,11 @@ export declare abstract class EHistory<T> extends EventClass<EHistoryEventType,
      * Get current state
      */
     get state(): T | undefined;
+    /**
+     * Constructor
+     * @param maxDepth Max depth of the history
+     */
+    constructor(maxDepth?: number);
     /**
      * Back to the previous state
      */
@@ -51,7 +69,8 @@ export declare abstract class EHistory<T> extends EventClass<EHistoryEventType,
      * @param type Type
      * @param index Current index
      */
-    protected createEvent(type: EHistoryEventType, index: number): EHistoryEvent;
+    protected createEvent<T extends EHistoryEventType>(type: T, index: number): EHistoryEvent;
+    protected createNavigateEvent(index: number, delta: number): EHistoryNavigateEvent;
     /**
      * Forward to the next state
      */
@@ -76,3 +95,4 @@ export declare abstract class EHistory<T> extends EventClass<EHistoryEventType,
      */
     replaceState(state: T): void;
 }
+export {};

package/lib/mjs/types/EHistory.js

@@ -4,12 +4,25 @@ import { EventBase, EventClass } from './EventClass';
  */
 export class EHistoryEvent extends EventBase {
 }
+/**
+ * ETSOO Extended history navigate event
+ */
+export class EHistoryNavigateEvent extends EventBase {
+    constructor(target, data) {
+        super(target, 'navigate', data);
+    }
+}
 /**
  * ETSOO Extended abstract history class
  */
 export class EHistory extends EventClass {
-    constructor() {
-        super(...arguments);
+    /**
+     * Constructor
+     * @param maxDepth Max depth of the history
+     */
+    constructor(maxDepth = 20) {
+        super();
+        this.maxDepth = maxDepth;
         // Index
         this._index = -1;
         /**
@@ -60,6 +73,9 @@ export class EHistory extends EventClass {
     createEvent(type, index) {
         return new EHistoryEvent(this, type, { index });
     }
+    createNavigateEvent(index, delta) {
+        return new EHistoryNavigateEvent(this, { index, delta });
+    }
     /**
      * Forward to the next state
      */
@@ -94,7 +110,7 @@ export class EHistory extends EventClass {
         // Update the index
         this._index = newIndex;
         // Trigger event
-        this.trigger(this.createEvent('navigate', newIndex));
+        this.trigger(this.createNavigateEvent(newIndex, delta));
     }
     /**
      * Adds an entry to the history stack
@@ -107,6 +123,9 @@ export class EHistory extends EventClass {
         }
         this.states.push(state);
         this._index++;
+        if (this.length > this.maxDepth) {
+            this.states.shift();
+        }
         this.trigger(this.createEvent('push', this._index));
     }
     /**

package/lib/mjs/types/EventClass.d.ts

@@ -3,8 +3,8 @@
  * T for type
  * D for data
  */
-export declare abstract class EventBase<T extends string, D> {
-    readonly target: EventClass<T, D>;
+export declare abstract class EventBase<T, D> {
+    readonly target: {};
     readonly type: T;
     readonly data: D;
     private _propagationStopped;
@@ -21,7 +21,7 @@ export declare abstract class EventBase<T extends string, D> {
      * Constructor
      * @param type Type
      */
-    constructor(target: EventClass<T, D>, type: T, data: D);
+    constructor(target: {}, type: T, data: D);
     /**
      * Prevent all other listeners from being called
      */
@@ -40,65 +40,56 @@ interface EventOptions {
      */
     once?: boolean;
 }
-/**
- * Event class callback
- * T for type
- * D for data
- */
-export declare type EventClassCallback<T extends string, D> = (event: EventBase<T, D>) => void;
-/**
- * Event class collection definition
- * T for type
- * D for data
- */
-export declare type EventClassCollection<T extends string, D> = {
-    [key in T]?: EventClassCallback<T, D>;
+declare type EventClassDef = {
+    [key: string]: {};
 };
 /**
  * Event class
  * T for type
  * D for data
  */
-export declare abstract class EventClass<T extends string, D> {
+export declare abstract class EventClass<D extends EventClassDef> {
     private readonly listeners;
     /**
      * Has specific type events
      * @param type Type
      */
-    hasEvents(type: T): boolean;
+    hasEvents<T extends keyof D>(type: T): boolean;
     /**
      * Has specific type and callback events
      * @param type Type
      * @param callback Callback
      */
-    hasEvents(type: T, callback: EventClassCallback<T, D>): boolean;
+    hasEvents<T extends keyof D>(type: T, callback: (event: EventBase<T, D[T]>) => void): boolean;
     /**
      * Remove all specific type events
      * @param type Type
      */
-    off(type: T): void;
+    off<T extends keyof D>(type: T): void;
     /**
      * Remove specific type and callback event
      * @param type Type
      * @param callback Callback
      */
-    off(type: T, callback: EventClassCallback<T, D>): void;
+    off<T extends keyof D>(type: T, callback: (event: EventBase<T, D[T]>) => void): void;
     /**
      * Add event listeners
      * @param collection Collection of events
      */
-    on(collection: EventClassCollection<T, D>): void;
+    on(collection: {
+        [type in keyof D]: (event: EventBase<type, D[type]>) => void;
+    }): void;
     /**
      * Add event listener
      * @param type Type
      * @param callback Callback
      * @param options Options
      */
-    on(type: T, callback: EventClassCallback<T, D>, options?: EventOptions): void;
+    on<T extends keyof D>(type: T, callback: (event: EventBase<T, D[T]>) => void, options?: EventOptions): void;
     /**
      * Trigger event
      * @param event Event
      */
-    trigger(event: EventBase<T, D>): void;
+    trigger<T extends keyof D>(event: EventBase<T, D[T]>): void;
 }
 export {};

package/lib/mjs/types/EventClass.js

@@ -98,6 +98,8 @@ export class EventClass {
         if (callback == null)
             return;
         this.listeners.has(type) || this.listeners.set(type, []);
+        // String to T conversion problem
+        // "keyofStringsOnly": true could solve part of it
         (_b = this.listeners.get(type)) === null || _b === void 0 ? void 0 : _b.push([callback, options]);
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.32",
+    "version": "1.1.35",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,14 +54,16 @@
     "homepage": "https://github.com/ETSOO/Shared#readme",
     "dependencies": {},
     "devDependencies": {
-        "@types/jest": "^27.4.1",
-        "@typescript-eslint/eslint-plugin": "^5.21.0",
-        "@typescript-eslint/parser": "^5.21.0",
-        "eslint": "^8.14.0",
+        "@types/jest": "^27.5.0",
+        "@typescript-eslint/eslint-plugin": "^5.23.0",
+        "@typescript-eslint/parser": "^5.23.0",
+        "eslint": "^8.15.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
-        "jest": "^27.5.1",
-        "ts-jest": "^27.1.4",
+        "jest": "^28.1.0",
+        "jest-environment-jsdom": "^28.1.0",
+        "ts-jest": "^28.0.2",
+        "tslib": "^2.4.0",
         "typescript": "^4.6.4"
     }
 }

package/src/types/EHistory.ts

@@ -1,20 +1,28 @@
 import { EventBase, EventClass } from './EventClass';
 
-/**
- * ETSOO Extended history event type
- */
-export type EHistoryEventType = 'navigate' | 'push' | 'replace' | 'clear';
-
-/**
- * ETSOO Extended history event data
- */
-export interface EHistoryEventData {
+interface EHistoryEventData {
     /**
      * Current index
      */
     index: number;
 }
 
+interface EHistoryNavigateEventData extends EHistoryEventData {
+    /**
+     * Delta
+     */
+    delta: number;
+}
+
+type EHistoryEventDef = {
+    clear: EHistoryEventData;
+    navigate: EHistoryNavigateEventData;
+    push: EHistoryEventData;
+    replace: EHistoryEventData;
+};
+
+type EHistoryEventType = Exclude<keyof EHistoryEventDef, 'navigate'>;
+
 /**
  * ETSOO Extended history event
  */
@@ -24,12 +32,21 @@ export class EHistoryEvent extends EventBase<
 > {}
 
 /**
- * ETSOO Extended abstract history class
+ * ETSOO Extended history navigate event
  */
-export abstract class EHistory<T> extends EventClass<
-    EHistoryEventType,
-    EHistoryEventData
+export class EHistoryNavigateEvent extends EventBase<
+    'navigate',
+    EHistoryNavigateEventData
 > {
+    constructor(target: {}, data: EHistoryNavigateEventData) {
+        super(target, 'navigate', data);
+    }
+}
+
+/**
+ * ETSOO Extended abstract history class
+ */
+export abstract class EHistory<T> extends EventClass<EHistoryEventDef> {
     // Index
     private _index: number = -1;
 
@@ -60,6 +77,14 @@ export abstract class EHistory<T> extends EventClass<
         return this.states[this._index];
     }
 
+    /**
+     * Constructor
+     * @param maxDepth Max depth of the history
+     */
+    constructor(public readonly maxDepth: number = 20) {
+        super();
+    }
+
     /**
      * Back to the previous state
      */
@@ -82,10 +107,14 @@ export abstract class EHistory<T> extends EventClass<
      * @param type Type
      * @param index Current index
      */
-    protected createEvent(type: EHistoryEventType, index: number) {
+    protected createEvent<T extends EHistoryEventType>(type: T, index: number) {
         return new EHistoryEvent(this, type, { index });
     }
 
+    protected createNavigateEvent(index: number, delta: number) {
+        return new EHistoryNavigateEvent(this, { index, delta });
+    }
+
     /**
      * Forward to the next state
      */
@@ -121,7 +150,7 @@ export abstract class EHistory<T> extends EventClass<
         this._index = newIndex;
 
         // Trigger event
-        this.trigger(this.createEvent('navigate', newIndex));
+        this.trigger(this.createNavigateEvent(newIndex, delta));
     }
 
     /**
@@ -136,6 +165,11 @@ export abstract class EHistory<T> extends EventClass<
 
         this.states.push(state);
         this._index++;
+
+        if (this.length > this.maxDepth) {
+            this.states.shift();
+        }
+
         this.trigger(this.createEvent('push', this._index));
     }
 

package/src/types/EventClass.ts

@@ -3,7 +3,7 @@
  * T for type
  * D for data
  */
-export abstract class EventBase<T extends string, D> {
+export abstract class EventBase<T, D> {
     private _propagationStopped: boolean = false;
     /**
      * stopImmediatePropagation called
@@ -25,7 +25,7 @@ export abstract class EventBase<T extends string, D> {
      * @param type Type
      */
     constructor(
-        public readonly target: EventClass<T, D>,
+        public readonly target: {},
         public readonly type: T,
         public readonly data: D
     ) {
@@ -55,48 +55,35 @@ interface EventOptions {
     once?: boolean;
 }
 
-/**
- * Event class callback
- * T for type
- * D for data
- */
-export type EventClassCallback<T extends string, D> = (
-    event: EventBase<T, D>
-) => void;
-
-/**
- * Event class collection definition
- * T for type
- * D for data
- */
-export type EventClassCollection<T extends string, D> = {
-    [key in T]?: EventClassCallback<T, D>;
-};
+type EventClassDef = { [key: string]: {} };
 
 /**
  * Event class
  * T for type
  * D for data
  */
-export abstract class EventClass<T extends string, D> {
+export abstract class EventClass<D extends EventClassDef> {
     // Listeners
     private readonly listeners = new Map<
-        T,
-        [EventClassCallback<T, D>, EventOptions?][]
+        keyof D,
+        [(event: EventBase<keyof D, D[keyof D]>) => void, EventOptions?][]
     >();
 
     /**
      * Has specific type events
      * @param type Type
      */
-    hasEvents(type: T): boolean;
+    hasEvents<T extends keyof D>(type: T): boolean;
 
     /**
      * Has specific type and callback events
      * @param type Type
      * @param callback Callback
      */
-    hasEvents(type: T, callback: EventClassCallback<T, D>): boolean;
+    hasEvents<T extends keyof D>(
+        type: T,
+        callback: (event: EventBase<T, D[T]>) => void
+    ): boolean;
 
     /**
      * Has specific type and callback events
@@ -104,7 +91,10 @@ export abstract class EventClass<T extends string, D> {
      * @param callback Callback
      * @returns Result
      */
-    hasEvents(type: T, callback?: EventClassCallback<T, D>) {
+    hasEvents<T extends keyof D>(
+        type: T,
+        callback?: (event: EventBase<T, D[T]>) => void
+    ) {
         const items = this.listeners.get(type);
         if (items == null || items.length === 0) return false;
 
@@ -119,21 +109,27 @@ export abstract class EventClass<T extends string, D> {
      * Remove all specific type events
      * @param type Type
      */
-    off(type: T): void;
+    off<T extends keyof D>(type: T): void;
 
     /**
      * Remove specific type and callback event
      * @param type Type
      * @param callback Callback
      */
-    off(type: T, callback: EventClassCallback<T, D>): void;
+    off<T extends keyof D>(
+        type: T,
+        callback: (event: EventBase<T, D[T]>) => void
+    ): void;
 
     /**
      * Remove specific type and callback event
      * @param type Type
      * @param callback Callback
      */
-    off(type: T, callback?: EventClassCallback<T, D>) {
+    off<T extends keyof D>(
+        type: T,
+        callback?: (event: EventBase<T, D[T]>) => void
+    ) {
         if (callback == null) {
             this.listeners.delete(type);
             return;
@@ -153,7 +149,9 @@ export abstract class EventClass<T extends string, D> {
      * Add event listeners
      * @param collection Collection of events
      */
-    on(collection: EventClassCollection<T, D>): void;
+    on(collection: {
+        [type in keyof D]: (event: EventBase<type, D[type]>) => void;
+    }): void;
 
     /**
      * Add event listener
@@ -161,9 +159,9 @@ export abstract class EventClass<T extends string, D> {
      * @param callback Callback
      * @param options Options
      */
-    on(
+    on<T extends keyof D>(
         type: T,
-        callback: EventClassCallback<T, D>,
+        callback: (event: EventBase<T, D[T]>) => void,
         options?: EventOptions
     ): void;
 
@@ -173,14 +171,18 @@ export abstract class EventClass<T extends string, D> {
      * @param callback Callback
      * @param options Options
      */
-    on(
-        type: EventClassCollection<T, D> | T,
-        callback?: EventClassCallback<T, D>,
+    on<T extends keyof D>(
+        type:
+            | {
+                  [type in keyof D]: (event: EventBase<type, D[type]>) => void;
+              }
+            | T,
+        callback?: (event: EventBase<T, D[T]>) => void,
         options?: EventOptions
     ) {
         if (typeof type === 'object') {
             for (const key in type) {
-                const item = key as T;
+                const item = key as keyof D;
                 const itemCallback = type[item] ?? callback;
                 if (itemCallback) this.on(item, itemCallback, options);
             }
@@ -189,14 +191,17 @@ export abstract class EventClass<T extends string, D> {
 
         if (callback == null) return;
         this.listeners.has(type) || this.listeners.set(type, []);
-        this.listeners.get(type)?.push([callback, options]);
+
+        // String to T conversion problem
+        // "keyofStringsOnly": true could solve part of it
+        this.listeners.get(type)?.push([callback as any, options]);
     }
 
     /**
      * Trigger event
      * @param event Event
      */
-    trigger(event: EventBase<T, D>) {
+    trigger<T extends keyof D>(event: EventBase<T, D[T]>) {
         const items = this.listeners.get(event.type);
         if (items == null) return;
 

package/tsconfig.cjs.json

@@ -1,7 +1,7 @@
 {
     "compilerOptions": {
         /* Visit https://aka.ms/tsconfig.json to read more about this file */
-        "target": "ES2019",
+        "target": "ES6",
         "module": "commonjs",
         "moduleResolution": "node",
         "isolatedModules": true,
@@ -11,6 +11,8 @@
         "strict": true,
         "esModuleInterop": true,
         "skipLibCheck": true,
+        "importHelpers": true,
+        "downlevelIteration": true,
         "forceConsistentCasingInFileNames": true,
         "lib": ["dom", "dom.iterable", "esnext"]
     },

package/tsconfig.json

@@ -1,7 +1,7 @@
 {
     "compilerOptions": {
         /* Visit https://aka.ms/tsconfig.json to read more about this file */
-        "target": "ES2019",
+        "target": "ES6",
         "module": "ESNext",
         "moduleResolution": "node",
         "isolatedModules": true,
@@ -11,6 +11,8 @@
         "strict": true,
         "esModuleInterop": true,
         "skipLibCheck": true,
+        "importHelpers": true,
+        "downlevelIteration": true,
         "forceConsistentCasingInFileNames": true,
         "lib": ["dom", "dom.iterable", "esnext"]
     },