@develia/commons 0.4.16 → 0.4.18

package/src/stopwatch.ts

@@ -1,43 +1,43 @@
-import TimeSpan from "./timespan.js";
-
-export default class Stopwatch {
-    private startTime: number | null = null;
-    private elapsedTime: number | null = null;
-
-    /*static measure<T>(callback: () => T, measure: { value: TimeSpan | null }): T {
-        const stopwatch = new Stopwatch();
-        stopwatch.start();
-        try {
-            return callback();
-        } finally {
-            stopwatch.stop();
-            measure.value = stopwatch.getElapsedTime();
-        }
-    }*/
-
-    start(): void {
-        this.startTime = performance.now();
-        this.elapsedTime = null;
-    }
-
-    stop(): void {
-        if (this.startTime !== null) {
-            this.elapsedTime = performance.now() - this.startTime;
-            this.startTime = null;
-        }
-    }
-
-    resume(): void {
-        if (this.elapsedTime !== null) {
-            this.startTime = performance.now() - this.elapsedTime;
-            this.elapsedTime = null;
-        }
-    }
-
-    getElapsedTime(): TimeSpan {
-        if (this.startTime !== null) {
-            return TimeSpan.fromMilliseconds(performance.now() - this.startTime);
-        }
-        return TimeSpan.fromMilliseconds(this.elapsedTime ?? 0.0);
-    }
-}
+import TimeSpan from "./timespan.js";
+
+export default class Stopwatch {
+    private startTime: number | null = null;
+    private elapsedTime: number | null = null;
+
+    /*static measure<T>(callback: () => T, measure: { value: TimeSpan | null }): T {
+        const stopwatch = new Stopwatch();
+        stopwatch.start();
+        try {
+            return callback();
+        } finally {
+            stopwatch.stop();
+            measure.value = stopwatch.getElapsedTime();
+        }
+    }*/
+
+    start(): void {
+        this.startTime = performance.now();
+        this.elapsedTime = null;
+    }
+
+    stop(): void {
+        if (this.startTime !== null) {
+            this.elapsedTime = performance.now() - this.startTime;
+            this.startTime = null;
+        }
+    }
+
+    resume(): void {
+        if (this.elapsedTime !== null) {
+            this.startTime = performance.now() - this.elapsedTime;
+            this.elapsedTime = null;
+        }
+    }
+
+    getElapsedTime(): TimeSpan {
+        if (this.startTime !== null) {
+            return TimeSpan.fromMilliseconds(performance.now() - this.startTime);
+        }
+        return TimeSpan.fromMilliseconds(this.elapsedTime ?? 0.0);
+    }
+}

package/src/string.ts

@@ -36,7 +36,8 @@ export function ensureSuffix(str: string, suffix: string): string {
 export function format(template: string, ...args: any[]): string {
 
     let regex: RegExp;
-    if (args.length === 1 && typeof args[0] === 'object') {
+    const hasNamedPlaceholders = /{(?!\d+})[^{}]+}/.test(template);
+    if (args.length === 1 && args[0] !== null && typeof args[0] === 'object' && hasNamedPlaceholders) {
         args = args[0];
         regex = /{(.+?)}/g;
     } else {
@@ -44,7 +45,9 @@ export function format(template: string, ...args: any[]): string {
     }
 
     return template.replace(regex, (match, key) => {
-        return typeof args[key] !== 'undefined' ? args[key] : "";
+        return Object.prototype.hasOwnProperty.call(args, key) && typeof args[key] !== 'undefined'
+            ? args[key]
+            : "";
     });
 }
 
@@ -61,11 +64,11 @@ function toWords(str: string): string[] {
 
     return str
         // Insert a space between a lowercase/digit and an uppercase letter (camelCase -> camel Case)
-        .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
+        .replace(/([\p{Ll}\p{N}])(\p{Lu})/gu, '$1 $2')
         // Insert a space between consecutive uppercase letters followed by a lowercase letter (XMLParser -> XML Parser)
-        .replace(/([A-Z]+)([A-Z][a-z])/g, '$1 $2')
+        .replace(/(\p{Lu}+)(\p{Lu}\p{Ll})/gu, '$1 $2')
         // Replace any non-alphanumeric character with a space
-        .replace(/[^a-zA-Z0-9]+/g, ' ')
+        .replace(/[^\p{L}\p{N}]+/gu, ' ')
         .trim()
         .toLowerCase()
         .split(/\s+/)

package/src/timer.ts

@@ -1,68 +1,68 @@
-/**
- * A class representing a timer that executes a callback function at a specified interval.
- */
-export default class Timer {
-
-    private _callback: () => void;
-    private _interval: number;
-    private _intervalId: any | null;
-
-    /**
-     * @param callback Callback
-     * @param interval Seconds between calls
-     */
-    constructor(callback: () => void, interval: number) {
-        this._callback = callback;
-        this._interval = interval;
-        this._intervalId = null;
-    }
-
-    
-    get running(): boolean {
-        return this._intervalId !== null && this._intervalId !== undefined;
-    }
-
-    get interval(): number {
-        return this._interval;
-    }
-
-    set interval(value: number) {
-        if (value != this._interval) {
-            this._interval = value;
-            if (this.running)
-                this.restart();
-        }
-    }
-
-    get callback(): () => void {
-        return this._callback;
-    }
-
-    set callback(value: () => void) {
-        if (value != this._callback) {
-            this._callback = value;
-        }
-    }
-
-
-    start(): void {
-        if (this._intervalId === null) {
-            this._intervalId = setInterval(() => {
-                if (this._callback != null)
-                    this._callback();
-            }, this._interval);
-        }
-    }
-
-    stop(): void {
-        if (this._intervalId !== null) {
-            clearInterval(this._intervalId);
-            this._intervalId = null;
-        }
-    }
-
-    restart(): void {
-        this.stop();
-        this.start();
-    }
+/**
+ * A class representing a timer that executes a callback function at a specified interval.
+ */
+export default class Timer {
+
+    private _callback: () => void;
+    private _interval: number;
+    private _intervalId: any | null;
+
+    /**
+     * @param callback Callback
+     * @param interval Milliseconds between calls
+     */
+    constructor(callback: () => void, interval: number) {
+        this._callback = callback;
+        this._interval = interval;
+        this._intervalId = null;
+    }
+
+    
+    get running(): boolean {
+        return this._intervalId !== null && this._intervalId !== undefined;
+    }
+
+    get interval(): number {
+        return this._interval;
+    }
+
+    set interval(value: number) {
+        if (value != this._interval) {
+            this._interval = value;
+            if (this.running)
+                this.restart();
+        }
+    }
+
+    get callback(): () => void {
+        return this._callback;
+    }
+
+    set callback(value: () => void) {
+        if (value != this._callback) {
+            this._callback = value;
+        }
+    }
+
+
+    start(): void {
+        if (this._intervalId === null) {
+            this._intervalId = setInterval(() => {
+                if (this._callback != null)
+                    this._callback();
+            }, this._interval);
+        }
+    }
+
+    stop(): void {
+        if (this._intervalId !== null) {
+            clearInterval(this._intervalId);
+            this._intervalId = null;
+        }
+    }
+
+    restart(): void {
+        this.stop();
+        this.start();
+    }
 }