@etsoo/shared 1.2.80 → 1.2.82

package/.github/workflows/main.yml

@@ -11,6 +11,10 @@ on:
   # release:
   #  types: [created]
 
+permissions:
+  id-token: write # Required for OIDC
+  contents: read
+
 jobs:
   # Publish to NPM
   publish-npm:
@@ -44,6 +48,4 @@ jobs:
 
       # Publish to npm
       # For scoped package, make it public for free service
-      - run: npm publish --access public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.ETSOONpmToken }}
+      - run: npm publish

package/__tests__/Utils.ts

@@ -328,6 +328,16 @@ test("Tests for mergeClasses", () => {
   expect(Utils.mergeClasses("a", "", "b ", undefined, "c")).toBe("a b c");
 });
 
+test("Tests for formatName", () => {
+  expect(Utils.formatName("青岛亿速思维网络科技有限公司", 6)).toBe(
+    "青岛亿速思维"
+  );
+  expect(Utils.formatName("亿速思维（中国）网络科技有限公司", 6)).toBe(
+    "亿速思维（中国）"
+  );
+  expect(Utils.formatName("John Smith", 6)).toBe("John Smith");
+});
+
 test("Tests for getNestedValue", () => {
   const obj = { jsonData: { photoSize: [200, 100], supportResizing: true } };
   expect(Utils.getNestedValue(obj, "jsonData.supportResizing")).toBeTruthy();

package/lib/cjs/DateUtils.js

@@ -74,7 +74,7 @@ var DateUtils;
         if (parsed == null)
             return undefined;
         // Default options
-        options ?? (options = DateUtils.DayFormat);
+        options ??= DateUtils.DayFormat;
         // Default options
         // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat
         let opt;

package/lib/cjs/DomUtils.js

@@ -309,7 +309,7 @@ var DomUtils;
      * @returns Result
      */
     function isWechatClient(data) {
-        data ?? (data = parseUserAgent());
+        data ??= parseUserAgent();
         if (!data)
             return false;
         return data.brands.some((item) => item.brand.toLowerCase() === "micromessenger");
@@ -497,7 +497,7 @@ var DomUtils;
      * @returns User agent data
      */
     function parseUserAgent(ua) {
-        ua ?? (ua = globalThis.navigator.userAgent);
+        ua ??= globalThis.navigator.userAgent;
         if (!ua) {
             return null;
         }
@@ -583,7 +583,7 @@ var DomUtils;
      */
     function setFocus(name, container) {
         const elementName = typeof name === "string" ? name : Object.keys(name)[0];
-        container ?? (container = document.body);
+        container ??= document.body;
         const element = container.querySelector(`[name="${elementName}"]`);
         if (element != null)
             element.focus();
@@ -603,7 +603,7 @@ var DomUtils;
         const errorPD = Utils_1.Utils.getResult(preventDefault, errorType) ?? true;
         window.onerror = (message, source, lineNo, colNo, error) => {
             // Default source
-            source || (source = window.location.href);
+            source ||= window.location.href;
             let data;
             if (typeof message === "string") {
                 data = {

package/lib/cjs/NumberUtils.js

@@ -43,14 +43,14 @@ var NumberUtils;
             // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat
             options.style = "currency";
             options.currency = currency;
-            options.currencyDisplay ?? (options.currencyDisplay = "narrowSymbol");
+            options.currencyDisplay ??= "narrowSymbol";
         }
         if (isInteger) {
-            options.minimumFractionDigits ?? (options.minimumFractionDigits = 0);
-            options.maximumFractionDigits ?? (options.maximumFractionDigits = 0);
+            options.minimumFractionDigits ??= 0;
+            options.maximumFractionDigits ??= 0;
         }
         else
-            options.minimumFractionDigits ?? (options.minimumFractionDigits = 2);
+            options.minimumFractionDigits ??= 2;
         return format(input, locale, options);
     }
     NumberUtils.formatMoney = formatMoney;

package/lib/cjs/StorageUtils.js

@@ -4,8 +4,8 @@ exports.StorageUtils = void 0;
 const NodeStorage_1 = require("./node/NodeStorage");
 const Utils_1 = require("./Utils");
 // Mock node
-globalThis.localStorage ?? (globalThis.localStorage = new NodeStorage_1.NodeStorage());
-globalThis.sessionStorage ?? (globalThis.sessionStorage = new NodeStorage_1.NodeStorage());
+globalThis.localStorage ??= new NodeStorage_1.NodeStorage();
+globalThis.sessionStorage ??= new NodeStorage_1.NodeStorage();
 /**
  * Storage utilities
  * NodeStorage needs data persistance

package/lib/cjs/Utils.d.ts

@@ -132,6 +132,14 @@ export declare namespace Utils {
     export function excludeAsync<T extends {
         [P in D]: IdType;
     }, D extends string = "id">(items: Promise<T[] | undefined>, field: D, ...excludedValues: T[D][]): Promise<T[] | undefined>;
+    /**
+     * Format name
+     * @param name Input name
+     * @param maxChars Max chars
+     * @param maxParts Max parts (optional)
+     * @returns Formatted name
+     */
+    export function formatName(name: string, maxChars: number, maxParts?: number): string;
     /**
      * Format inital character to lower case or upper case
      * @param input Input string

package/lib/cjs/Utils.js

@@ -139,7 +139,7 @@ var Utils;
      */
     function addBlankItem(options, idField, labelField, blankLabel) {
         // Avoid duplicate blank items
-        idField ?? (idField = "id");
+        idField ??= "id";
         if (options.length === 0 || Reflect.get(options[0], idField) !== "") {
             const blankItem = {
                 [idField]: "",
@@ -207,6 +207,63 @@ var Utils;
         return exclude(result, field, ...excludedValues);
     }
     Utils.excludeAsync = excludeAsync;
+    /**
+     * Format name
+     * @param name Input name
+     * @param maxChars Max chars
+     * @param maxParts Max parts (optional)
+     * @returns Formatted name
+     */
+    function formatName(name, maxChars, maxParts) {
+        name = name.trim();
+        const parts = name.split(/\s+/);
+        const max = maxParts ?? Math.floor(maxChars / 3);
+        const effectiveMax = max < 2 ? 2 : max;
+        if (parts.length >= effectiveMax) {
+            return parts.slice(0, effectiveMax).join(" ");
+        }
+        else if (name.length > maxChars) {
+            let endIndex = maxChars;
+            const brackets = {
+                "(": ")",
+                "（": "）",
+                "[": "]"
+            };
+            // Count unmatched brackets for each type
+            for (const [start, end] of Object.entries(brackets)) {
+                let count = 0;
+                // Count opening and closing brackets in the substring
+                for (let i = 0; i < maxChars; i++) {
+                    if (name[i] === start)
+                        count++;
+                    else if (name[i] === end)
+                        count--;
+                }
+                if (count > 0) {
+                    // Find matching end brackets
+                    for (let i = maxChars; i < name.length && count > 0; i++) {
+                        if (name[i] === start) {
+                            count++;
+                        }
+                        else if (name[i] === end) {
+                            count--;
+                            if (count === 0) {
+                                endIndex = i + 1;
+                            }
+                        }
+                    }
+                    if (count === 0) {
+                        return name.substring(0, endIndex);
+                    }
+                }
+            }
+            return name.substring(0, endIndex);
+        }
+        else {
+            return name;
+        }
+    }
+    Utils.formatName = formatName;
     /**
      * Format inital character to lower case or upper case
      * @param input Input string
@@ -578,7 +635,7 @@ var Utils;
     Utils.setLabels = (source, labels, reference) => {
         Object.keys(source).forEach((key) => {
             // Reference key
-            const labelKey = reference == null ? key : reference[key] ?? key;
+            const labelKey = reference == null ? key : (reference[key] ?? key);
             // Label
             const label = labels[labelKey];
             if (label != null) {

package/lib/cjs/node/NodeStorage.js

@@ -6,15 +6,14 @@ exports.NodeStorage = void 0;
  * Please take care of the persistence with source property
  */
 class NodeStorage {
+    /**
+     * Storage source
+     */
+    source = [];
     /**
      * Constructor
      */
-    constructor() {
-        /**
-         * Storage source
-         */
-        this.source = [];
-    }
+    constructor() { }
     /**
      * Returns the number of key/value pairs currently present in the list
      */

package/lib/cjs/storage/IStorage.d.ts

@@ -63,5 +63,5 @@ export interface IStorage {
      * @param key Key name
      * @param data  Data, null for removal
      */
-    setPersistedData(key: string, data: unknown): void;
+    setPersistedData<T>(key: string, data: T): void;
 }

package/lib/cjs/storage/WindowStorage.d.ts

@@ -65,5 +65,5 @@ export declare class WindowStorage implements IStorage {
      * @param key Key name
      * @param data  Data, null for removal
      */
-    setPersistedData(key: string, data: unknown): void;
+    setPersistedData<T>(key: string, data: T): void;
 }

package/lib/cjs/test/MockDOMRect.js

@@ -5,6 +5,14 @@ exports.MockDOMRect = void 0;
  * A mock implementation of DOMRect for testing purposes
  */
 class MockDOMRect {
+    bottom;
+    height;
+    left;
+    right;
+    top;
+    width;
+    x;
+    y;
     toJSON() {
         return JSON.stringify({
             bottom: this.bottom,

package/lib/cjs/test/MockResizeObserver.js

@@ -5,9 +5,9 @@ exports.MockResizeObserver = void 0;
  * Mock implementation of ResizeObserver for testing purposes
  */
 class MockResizeObserver {
+    callbacks = [];
+    elements = [];
     constructor(callback) {
-        this.callbacks = [];
-        this.elements = [];
         this.callbacks.push(callback);
     }
     observe(element) {

package/lib/cjs/types/ContentDisposition.js

@@ -7,6 +7,9 @@ const Utils_1 = require("../Utils");
  * https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Disposition
  */
 class ContentDisposition {
+    type;
+    filename;
+    name;
     constructor(type, filename, name) {
         this.type = type;
         this.filename = filename;

package/lib/cjs/types/DataError.js

@@ -7,6 +7,10 @@ exports.DataError = void 0;
  *
  */
 class DataError extends Error {
+    /**
+     * Custom data
+     */
+    data;
     /**
      * Constructor
      * @param message Error message

package/lib/cjs/types/EColor.js

@@ -5,6 +5,10 @@ exports.EColor = void 0;
  * Etsoo implmented Color
  */
 class EColor {
+    r;
+    g;
+    b;
+    alpha;
     /**
      * Adjust value
      * @param value Current value

package/lib/cjs/types/EHistory.js

@@ -21,6 +21,13 @@ exports.EHistoryNavigateEvent = EHistoryNavigateEvent;
  * ETSOO Extended abstract history class
  */
 class EHistory extends EventClass_1.EventClass {
+    maxDepth;
+    // Index
+    _index = -1;
+    /**
+     * States
+     */
+    states = [];
     /**
      * States length
      */
@@ -48,12 +55,6 @@ class EHistory extends EventClass_1.EventClass {
     constructor(maxDepth = 20) {
         super();
         this.maxDepth = maxDepth;
-        // Index
-        this._index = -1;
-        /**
-         * States
-         */
-        this.states = [];
     }
     /**
      * Back to the previous state

package/lib/cjs/types/EventClass.js

@@ -7,12 +7,17 @@ exports.EventClass = exports.EventBase = void 0;
  * D for data
  */
 class EventBase {
+    target;
+    type;
+    data;
+    _propagationStopped = false;
     /**
      * stopImmediatePropagation called
      */
     get propagationStopped() {
         return this._propagationStopped;
     }
+    _timeStamp;
     /**
      * Time stamp
      */
@@ -27,7 +32,6 @@ class EventBase {
         this.target = target;
         this.type = type;
         this.data = data;
-        this._propagationStopped = false;
         this._timeStamp = Date.now();
     }
     /**
@@ -44,10 +48,8 @@ exports.EventBase = EventBase;
  * D for data
  */
 class EventClass {
-    constructor() {
-        // Listeners
-        this.listeners = new Map();
-    }
+    // Listeners
+    listeners = new Map();
     /**
      * Has specific type and callback events
      * @param type Type

package/lib/mjs/DateUtils.js

@@ -71,7 +71,7 @@ export var DateUtils;
         if (parsed == null)
             return undefined;
         // Default options
-        options ?? (options = DateUtils.DayFormat);
+        options ??= DateUtils.DayFormat;
         // Default options
         // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat
         let opt;

package/lib/mjs/DomUtils.js

@@ -306,7 +306,7 @@ export var DomUtils;
      * @returns Result
      */
     function isWechatClient(data) {
-        data ?? (data = parseUserAgent());
+        data ??= parseUserAgent();
         if (!data)
             return false;
         return data.brands.some((item) => item.brand.toLowerCase() === "micromessenger");
@@ -494,7 +494,7 @@ export var DomUtils;
      * @returns User agent data
      */
     function parseUserAgent(ua) {
-        ua ?? (ua = globalThis.navigator.userAgent);
+        ua ??= globalThis.navigator.userAgent;
         if (!ua) {
             return null;
         }
@@ -580,7 +580,7 @@ export var DomUtils;
      */
     function setFocus(name, container) {
         const elementName = typeof name === "string" ? name : Object.keys(name)[0];
-        container ?? (container = document.body);
+        container ??= document.body;
         const element = container.querySelector(`[name="${elementName}"]`);
         if (element != null)
             element.focus();
@@ -600,7 +600,7 @@ export var DomUtils;
         const errorPD = Utils.getResult(preventDefault, errorType) ?? true;
         window.onerror = (message, source, lineNo, colNo, error) => {
             // Default source
-            source || (source = window.location.href);
+            source ||= window.location.href;
             let data;
             if (typeof message === "string") {
                 data = {

package/lib/mjs/NumberUtils.js

@@ -40,14 +40,14 @@ export var NumberUtils;
             // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat
             options.style = "currency";
             options.currency = currency;
-            options.currencyDisplay ?? (options.currencyDisplay = "narrowSymbol");
+            options.currencyDisplay ??= "narrowSymbol";
         }
         if (isInteger) {
-            options.minimumFractionDigits ?? (options.minimumFractionDigits = 0);
-            options.maximumFractionDigits ?? (options.maximumFractionDigits = 0);
+            options.minimumFractionDigits ??= 0;
+            options.maximumFractionDigits ??= 0;
         }
         else
-            options.minimumFractionDigits ?? (options.minimumFractionDigits = 2);
+            options.minimumFractionDigits ??= 2;
         return format(input, locale, options);
     }
     NumberUtils.formatMoney = formatMoney;

package/lib/mjs/StorageUtils.js

@@ -1,8 +1,8 @@
 import { NodeStorage } from "./node/NodeStorage";
 import { Utils } from "./Utils";
 // Mock node
-globalThis.localStorage ?? (globalThis.localStorage = new NodeStorage());
-globalThis.sessionStorage ?? (globalThis.sessionStorage = new NodeStorage());
+globalThis.localStorage ??= new NodeStorage();
+globalThis.sessionStorage ??= new NodeStorage();
 /**
  * Storage utilities
  * NodeStorage needs data persistance

package/lib/mjs/Utils.d.ts

@@ -132,6 +132,14 @@ export declare namespace Utils {
     export function excludeAsync<T extends {
         [P in D]: IdType;
     }, D extends string = "id">(items: Promise<T[] | undefined>, field: D, ...excludedValues: T[D][]): Promise<T[] | undefined>;
+    /**
+     * Format name
+     * @param name Input name
+     * @param maxChars Max chars
+     * @param maxParts Max parts (optional)
+     * @returns Formatted name
+     */
+    export function formatName(name: string, maxChars: number, maxParts?: number): string;
     /**
      * Format inital character to lower case or upper case
      * @param input Input string

package/lib/mjs/Utils.js

@@ -136,7 +136,7 @@ export var Utils;
      */
     function addBlankItem(options, idField, labelField, blankLabel) {
         // Avoid duplicate blank items
-        idField ?? (idField = "id");
+        idField ??= "id";
         if (options.length === 0 || Reflect.get(options[0], idField) !== "") {
             const blankItem = {
                 [idField]: "",
@@ -204,6 +204,63 @@ export var Utils;
         return exclude(result, field, ...excludedValues);
     }
     Utils.excludeAsync = excludeAsync;
+    /**
+     * Format name
+     * @param name Input name
+     * @param maxChars Max chars
+     * @param maxParts Max parts (optional)
+     * @returns Formatted name
+     */
+    function formatName(name, maxChars, maxParts) {
+        name = name.trim();
+        const parts = name.split(/\s+/);
+        const max = maxParts ?? Math.floor(maxChars / 3);
+        const effectiveMax = max < 2 ? 2 : max;
+        if (parts.length >= effectiveMax) {
+            return parts.slice(0, effectiveMax).join(" ");
+        }
+        else if (name.length > maxChars) {
+            let endIndex = maxChars;
+            const brackets = {
+                "(": ")",
+                "（": "）",
+                "[": "]"
+            };
+            // Count unmatched brackets for each type
+            for (const [start, end] of Object.entries(brackets)) {
+                let count = 0;
+                // Count opening and closing brackets in the substring
+                for (let i = 0; i < maxChars; i++) {
+                    if (name[i] === start)
+                        count++;
+                    else if (name[i] === end)
+                        count--;
+                }
+                if (count > 0) {
+                    // Find matching end brackets
+                    for (let i = maxChars; i < name.length && count > 0; i++) {
+                        if (name[i] === start) {
+                            count++;
+                        }
+                        else if (name[i] === end) {
+                            count--;
+                            if (count === 0) {
+                                endIndex = i + 1;
+                            }
+                        }
+                    }
+                    if (count === 0) {
+                        return name.substring(0, endIndex);
+                    }
+                }
+            }
+            return name.substring(0, endIndex);
+        }
+        else {
+            return name;
+        }
+    }
+    Utils.formatName = formatName;
     /**
      * Format inital character to lower case or upper case
      * @param input Input string
@@ -575,7 +632,7 @@ export var Utils;
     Utils.setLabels = (source, labels, reference) => {
         Object.keys(source).forEach((key) => {
             // Reference key
-            const labelKey = reference == null ? key : reference[key] ?? key;
+            const labelKey = reference == null ? key : (reference[key] ?? key);
             // Label
             const label = labels[labelKey];
             if (label != null) {

package/lib/mjs/node/NodeStorage.js

@@ -3,15 +3,14 @@
  * Please take care of the persistence with source property
  */
 export class NodeStorage {
+    /**
+     * Storage source
+     */
+    source = [];
     /**
      * Constructor
      */
-    constructor() {
-        /**
-         * Storage source
-         */
-        this.source = [];
-    }
+    constructor() { }
     /**
      * Returns the number of key/value pairs currently present in the list
      */

package/lib/mjs/storage/IStorage.d.ts

@@ -63,5 +63,5 @@ export interface IStorage {
      * @param key Key name
      * @param data  Data, null for removal
      */
-    setPersistedData(key: string, data: unknown): void;
+    setPersistedData<T>(key: string, data: T): void;
 }

package/lib/mjs/storage/WindowStorage.d.ts

@@ -65,5 +65,5 @@ export declare class WindowStorage implements IStorage {
      * @param key Key name
      * @param data  Data, null for removal
      */
-    setPersistedData(key: string, data: unknown): void;
+    setPersistedData<T>(key: string, data: T): void;
 }

package/lib/mjs/test/MockDOMRect.js

@@ -2,6 +2,14 @@
  * A mock implementation of DOMRect for testing purposes
  */
 export class MockDOMRect {
+    bottom;
+    height;
+    left;
+    right;
+    top;
+    width;
+    x;
+    y;
     toJSON() {
         return JSON.stringify({
             bottom: this.bottom,

package/lib/mjs/test/MockResizeObserver.js

@@ -2,9 +2,9 @@
  * Mock implementation of ResizeObserver for testing purposes
  */
 export class MockResizeObserver {
+    callbacks = [];
+    elements = [];
     constructor(callback) {
-        this.callbacks = [];
-        this.elements = [];
         this.callbacks.push(callback);
     }
     observe(element) {

package/lib/mjs/types/ContentDisposition.js

@@ -4,6 +4,9 @@ import { Utils } from "../Utils";
  * https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Disposition
  */
 export class ContentDisposition {
+    type;
+    filename;
+    name;
     constructor(type, filename, name) {
         this.type = type;
         this.filename = filename;

package/lib/mjs/types/DataError.js

@@ -4,6 +4,10 @@
  *
  */
 export class DataError extends Error {
+    /**
+     * Custom data
+     */
+    data;
     /**
      * Constructor
      * @param message Error message

package/lib/mjs/types/EColor.js

@@ -2,6 +2,10 @@
  * Etsoo implmented Color
  */
 export class EColor {
+    r;
+    g;
+    b;
+    alpha;
     /**
      * Adjust value
      * @param value Current value

package/lib/mjs/types/EHistory.js

@@ -16,6 +16,13 @@ export class EHistoryNavigateEvent extends EventBase {
  * ETSOO Extended abstract history class
  */
 export class EHistory extends EventClass {
+    maxDepth;
+    // Index
+    _index = -1;
+    /**
+     * States
+     */
+    states = [];
     /**
      * States length
      */
@@ -43,12 +50,6 @@ export class EHistory extends EventClass {
     constructor(maxDepth = 20) {
         super();
         this.maxDepth = maxDepth;
-        // Index
-        this._index = -1;
-        /**
-         * States
-         */
-        this.states = [];
     }
     /**
      * Back to the previous state

package/lib/mjs/types/EventClass.js

@@ -4,12 +4,17 @@
  * D for data
  */
 export class EventBase {
+    target;
+    type;
+    data;
+    _propagationStopped = false;
     /**
      * stopImmediatePropagation called
      */
     get propagationStopped() {
         return this._propagationStopped;
     }
+    _timeStamp;
     /**
      * Time stamp
      */
@@ -24,7 +29,6 @@ export class EventBase {
         this.target = target;
         this.type = type;
         this.data = data;
-        this._propagationStopped = false;
         this._timeStamp = Date.now();
     }
     /**
@@ -40,10 +44,8 @@ export class EventBase {
  * D for data
  */
 export class EventClass {
-    constructor() {
-        // Listeners
-        this.listeners = new Map();
-    }
+    // Listeners
+    listeners = new Map();
     /**
      * Has specific type and callback events
      * @param type Type

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/shared",
-  "version": "1.2.80",
+  "version": "1.2.82",
   "description": "TypeScript shared utilities and functions",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -36,10 +36,10 @@
   },
   "homepage": "https://github.com/ETSOO/Shared#readme",
   "devDependencies": {
-    "@types/node": "^24.10.1",
-    "@vitejs/plugin-react": "^5.1.1",
-    "jsdom": "^27.2.0",
-    "typescript": "^5.9.3",
-    "vitest": "^4.0.10"
+    "@types/node": "^25.5.2",
+    "@vitejs/plugin-react": "^6.0.1",
+    "jsdom": "^29.0.1",
+    "typescript": "^6.0.2",
+    "vitest": "^4.1.2"
   }
 }

package/src/Utils.ts

@@ -355,6 +355,70 @@ export namespace Utils {
     return exclude(result, field, ...excludedValues);
   }
 
+  /**
+   * Format name
+   * @param name Input name
+   * @param maxChars Max chars
+   * @param maxParts Max parts (optional)
+   * @returns Formatted name
+   */
+  export function formatName(
+    name: string,
+    maxChars: number,
+    maxParts?: number
+  ): string {
+    name = name.trim();
+
+    const parts = name.split(/\s+/);
+
+    const max = maxParts ?? Math.floor(maxChars / 3);
+    const effectiveMax = max < 2 ? 2 : max;
+
+    if (parts.length >= effectiveMax) {
+      return parts.slice(0, effectiveMax).join(" ");
+    } else if (name.length > maxChars) {
+      let endIndex = maxChars;
+      const brackets: Record<string, string> = {
+        "(": ")",
+        "（": "）",
+        "[": "]"
+      };
+
+      // Count unmatched brackets for each type
+      for (const [start, end] of Object.entries(brackets)) {
+        let count = 0;
+
+        // Count opening and closing brackets in the substring
+        for (let i = 0; i < maxChars; i++) {
+          if (name[i] === start) count++;
+          else if (name[i] === end) count--;
+        }
+
+        if (count > 0) {
+          // Find matching end brackets
+          for (let i = maxChars; i < name.length && count > 0; i++) {
+            if (name[i] === start) {
+              count++;
+            } else if (name[i] === end) {
+              count--;
+              if (count === 0) {
+                endIndex = i + 1;
+              }
+            }
+          }
+
+          if (count === 0) {
+            return name.substring(0, endIndex);
+          }
+        }
+      }
+
+      return name.substring(0, endIndex);
+    } else {
+      return name;
+    }
+  }
+
   /**
    * Format inital character to lower case or upper case
    * @param input Input string
@@ -823,7 +887,7 @@ export namespace Utils {
   ) => {
     Object.keys(source).forEach((key) => {
       // Reference key
-      const labelKey = reference == null ? key : reference[key] ?? key;
+      const labelKey = reference == null ? key : (reference[key] ?? key);
 
       // Label
       const label = labels[labelKey];
@@ -963,8 +1027,8 @@ export namespace Utils {
         index1 === -1
           ? index2
           : index2 === -1
-          ? index1
-          : Math.min(index1, index2);
+            ? index1
+            : Math.min(index1, index2);
       root = path.substring(0, index + 1);
       dir = path.substring(0, lastIndex);
       if (dir === "") dir = root;

package/src/storage/IStorage.ts

@@ -73,5 +73,5 @@ export interface IStorage {
    * @param key Key name
    * @param data  Data, null for removal
    */
-  setPersistedData(key: string, data: unknown): void;
+  setPersistedData<T>(key: string, data: T): void;
 }

package/src/storage/WindowStorage.ts

@@ -141,7 +141,7 @@ export class WindowStorage implements IStorage {
    * @param key Key name
    * @param data  Data, null for removal
    */
-  setPersistedData(key: string, data: unknown) {
+  setPersistedData<T>(key: string, data: T) {
     StorageUtils.setLocalData(key, data);
   }
 }

package/tsconfig.cjs.json

@@ -1,15 +1,17 @@
 {
   "compilerOptions": {
     /* Visit https://aka.ms/tsconfig.json to read more about this file */
-    "target": "ES2020",
+    "target": "ES2025",
     "module": "NodeNext",
     "moduleResolution": "NodeNext",
     "isolatedModules": true,
+    "rootDir": "./src",
     "outDir": "./lib/cjs",
     "noEmit": false,
     "declaration": true,
     "strict": true,
     "esModuleInterop": true,
+    "types": ["node"],
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "lib": ["dom", "dom.iterable", "ESNext"]

package/tsconfig.json

@@ -1,15 +1,17 @@
 {
   "compilerOptions": {
     /* Visit https://aka.ms/tsconfig.json to read more about this file */
-    "target": "ES2020",
-    "module": "ES2020",
+    "target": "ES2025",
+    "module": "ESNext",
     "moduleResolution": "bundler",
     "isolatedModules": true,
+    "rootDir": "./src",
     "outDir": "./lib/mjs",
     "noEmit": false,
     "declaration": true,
     "strict": true,
     "esModuleInterop": true,
+    "types": ["node"],
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "lib": ["dom", "dom.iterable", "esnext"]