@etsoo/shared 1.1.76 → 1.1.78

package/__tests__/NumberUtils.ts

@@ -1,7 +1,6 @@
 import { NumberUtils } from '../src/NumberUtils';
 
 test('Tests for format', () => {
-    expect(NumberUtils.format(undefined)).toBeUndefined();
     expect(NumberUtils.format(12.4, 'zh-CN', { style: 'percent' })).toBe(
         '1,240%'
     );

package/lib/cjs/DataTypes.d.ts

@@ -371,20 +371,20 @@ export declare namespace DataTypes {
 /**
  * List item with number id type
  */
-export declare type ListType = DataTypes.IdLabelItem<number>;
+export type ListType = DataTypes.IdLabelItem<number>;
 /**
  * List item with string id type
  */
-export declare type ListType1 = DataTypes.IdLabelItem<string>;
+export type ListType1 = DataTypes.IdLabelItem<string>;
 /**
  * Id default type
  */
-export declare type IdDefaultType<T extends object> = T extends {
+export type IdDefaultType<T extends object> = T extends {
     id: number | string;
 } ? DataTypes.Keys<T> & 'id' : DataTypes.Keys<T>;
 /**
  * Label default type
  */
-export declare type LabelDefaultType<T extends object> = T extends {
+export type LabelDefaultType<T extends object> = T extends {
     label: string;
 } ? DataTypes.Keys<T, string> & 'label' : DataTypes.Keys<T, string>;

package/lib/cjs/NumberUtils.d.ts

@@ -8,9 +8,23 @@ declare global {
     }
 }
 export declare namespace NumberUtils {
-    function format(input: undefined | null, locale?: string | string[], options?: Intl.NumberFormatOptions): undefined;
+    /**
+     * Format number
+     * @param input Input
+     * @param locale Locale
+     * @param options Options
+     * @returns Result
+     */
     function format(input: number | bigint, locale?: string | string[], options?: Intl.NumberFormatOptions): string;
-    function formatMoney(input: undefined | null, currency?: string, locale?: string | string[], isInteger?: boolean, options?: Intl.NumberFormatOptions): undefined;
+    /**
+     * Format money
+     * @param input Input
+     * @param currency Currency, like USD for US dollar
+     * @param locale Locale
+     * @param isInteger Is integer value
+     * @param options Options
+     * @returns Result
+     */
     function formatMoney(input: number | bigint, currency?: string, locale?: string | string[], isInteger?: boolean, options?: Intl.NumberFormatOptions): string;
     /**
      * Parse float value

package/lib/cjs/NumberUtils.js

@@ -19,8 +19,6 @@ var NumberUtils;
      * @returns Result
      */
     function format(input, locale, options) {
-        if (input == null)
-            return undefined;
         // Formatter
         const intl = new Intl.NumberFormat(locale, options);
         return intl.format(input);
@@ -37,8 +35,6 @@ var NumberUtils;
      */
     function formatMoney(input, currency, locale, isInteger = false, options = {}) {
         var _a, _b, _c, _d;
-        if (input == null)
-            return format(input, locale, options);
         if (currency) {
             // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat
             options.style = 'currency';

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

@@ -1,4 +1,4 @@
-export declare type DelayedExecutorType<P extends any[] = []> = {
+export type DelayedExecutorType<P extends any[] = []> = {
     /**
      * Call the function
      * @param miliseconds Delayed miliseconds for this call

package/lib/cjs/types/EColor.js

@@ -5,19 +5,6 @@ exports.EColor = void 0;
  * Etsoo implmented Color
  */
 class EColor {
-    /**
-     * Constructor
-     * @param r Reg
-     * @param g Green
-     * @param b Blue
-     * @param alpha Alpha
-     */
-    constructor(r, g, b, alpha) {
-        this.r = r;
-        this.g = g;
-        this.b = b;
-        this.alpha = alpha;
-    }
     /**
      * Adjust value
      * @param value Current value
@@ -100,6 +87,19 @@ class EColor {
         }
         return undefined;
     }
+    /**
+     * Constructor
+     * @param r Reg
+     * @param g Green
+     * @param b Blue
+     * @param alpha Alpha
+     */
+    constructor(r, g, b, alpha) {
+        this.r = r;
+        this.g = g;
+        this.b = b;
+        this.alpha = alpha;
+    }
     /**
      * Clone color with adjustments
      * @param adjustR Adjust R value

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

@@ -11,13 +11,13 @@ interface EHistoryNavigateEventData extends EHistoryEventData {
      */
     delta: number;
 }
-declare type EHistoryEventDef = {
+type EHistoryEventDef = {
     clear: EHistoryEventData;
     navigate: EHistoryNavigateEventData;
     push: EHistoryEventData;
     replace: EHistoryEventData;
 };
-declare type EHistoryEventType = Exclude<keyof EHistoryEventDef, 'navigate'>;
+type EHistoryEventType = Exclude<keyof EHistoryEventDef, 'navigate'>;
 /**
  * ETSOO Extended history event
  */

package/lib/cjs/types/EHistory.js

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

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

@@ -40,7 +40,7 @@ interface EventOptions {
      */
     once?: boolean;
 }
-declare type EventClassDef = {
+type EventClassDef = {
     [key: string]: object;
 };
 /**

package/lib/cjs/types/EventClass.js

@@ -7,17 +7,6 @@ exports.EventClass = exports.EventBase = void 0;
  * D for data
  */
 class EventBase {
-    /**
-     * Constructor
-     * @param type Type
-     */
-    constructor(target, type, data) {
-        this.target = target;
-        this.type = type;
-        this.data = data;
-        this._propagationStopped = false;
-        this._timeStamp = Date.now();
-    }
     /**
      * stopImmediatePropagation called
      */
@@ -30,6 +19,17 @@ class EventBase {
     get timeStamp() {
         return this._timeStamp;
     }
+    /**
+     * Constructor
+     * @param type Type
+     */
+    constructor(target, type, data) {
+        this.target = target;
+        this.type = type;
+        this.data = data;
+        this._propagationStopped = false;
+        this._timeStamp = Date.now();
+    }
     /**
      * Prevent all other listeners from being called
      */

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

@@ -22,7 +22,7 @@ export interface IFile {
 /**
  * FormDataFieldValue like type
  */
-export declare type FormDataFieldValue = string | IFile;
+export type FormDataFieldValue = string | IFile;
 /**
  * FormData like interface
  * https://developer.mozilla.org/en-US/docs/Web/API/FormData

package/lib/mjs/DataTypes.d.ts

@@ -371,20 +371,20 @@ export declare namespace DataTypes {
 /**
  * List item with number id type
  */
-export declare type ListType = DataTypes.IdLabelItem<number>;
+export type ListType = DataTypes.IdLabelItem<number>;
 /**
  * List item with string id type
  */
-export declare type ListType1 = DataTypes.IdLabelItem<string>;
+export type ListType1 = DataTypes.IdLabelItem<string>;
 /**
  * Id default type
  */
-export declare type IdDefaultType<T extends object> = T extends {
+export type IdDefaultType<T extends object> = T extends {
     id: number | string;
 } ? DataTypes.Keys<T> & 'id' : DataTypes.Keys<T>;
 /**
  * Label default type
  */
-export declare type LabelDefaultType<T extends object> = T extends {
+export type LabelDefaultType<T extends object> = T extends {
     label: string;
 } ? DataTypes.Keys<T, string> & 'label' : DataTypes.Keys<T, string>;

package/lib/mjs/NumberUtils.d.ts

@@ -8,9 +8,23 @@ declare global {
     }
 }
 export declare namespace NumberUtils {
-    function format(input: undefined | null, locale?: string | string[], options?: Intl.NumberFormatOptions): undefined;
+    /**
+     * Format number
+     * @param input Input
+     * @param locale Locale
+     * @param options Options
+     * @returns Result
+     */
     function format(input: number | bigint, locale?: string | string[], options?: Intl.NumberFormatOptions): string;
-    function formatMoney(input: undefined | null, currency?: string, locale?: string | string[], isInteger?: boolean, options?: Intl.NumberFormatOptions): undefined;
+    /**
+     * Format money
+     * @param input Input
+     * @param currency Currency, like USD for US dollar
+     * @param locale Locale
+     * @param isInteger Is integer value
+     * @param options Options
+     * @returns Result
+     */
     function formatMoney(input: number | bigint, currency?: string, locale?: string | string[], isInteger?: boolean, options?: Intl.NumberFormatOptions): string;
     /**
      * Parse float value

package/lib/mjs/NumberUtils.js

@@ -16,8 +16,6 @@ export var NumberUtils;
      * @returns Result
      */
     function format(input, locale, options) {
-        if (input == null)
-            return undefined;
         // Formatter
         const intl = new Intl.NumberFormat(locale, options);
         return intl.format(input);
@@ -34,8 +32,6 @@ export var NumberUtils;
      */
     function formatMoney(input, currency, locale, isInteger = false, options = {}) {
         var _a, _b, _c, _d;
-        if (input == null)
-            return format(input, locale, options);
         if (currency) {
             // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat
             options.style = 'currency';

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

@@ -1,4 +1,4 @@
-export declare type DelayedExecutorType<P extends any[] = []> = {
+export type DelayedExecutorType<P extends any[] = []> = {
     /**
      * Call the function
      * @param miliseconds Delayed miliseconds for this call

package/lib/mjs/types/EColor.js

@@ -2,19 +2,6 @@
  * Etsoo implmented Color
  */
 export class EColor {
-    /**
-     * Constructor
-     * @param r Reg
-     * @param g Green
-     * @param b Blue
-     * @param alpha Alpha
-     */
-    constructor(r, g, b, alpha) {
-        this.r = r;
-        this.g = g;
-        this.b = b;
-        this.alpha = alpha;
-    }
     /**
      * Adjust value
      * @param value Current value
@@ -97,6 +84,19 @@ export class EColor {
         }
         return undefined;
     }
+    /**
+     * Constructor
+     * @param r Reg
+     * @param g Green
+     * @param b Blue
+     * @param alpha Alpha
+     */
+    constructor(r, g, b, alpha) {
+        this.r = r;
+        this.g = g;
+        this.b = b;
+        this.alpha = alpha;
+    }
     /**
      * Clone color with adjustments
      * @param adjustR Adjust R value

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

@@ -11,13 +11,13 @@ interface EHistoryNavigateEventData extends EHistoryEventData {
      */
     delta: number;
 }
-declare type EHistoryEventDef = {
+type EHistoryEventDef = {
     clear: EHistoryEventData;
     navigate: EHistoryNavigateEventData;
     push: EHistoryEventData;
     replace: EHistoryEventData;
 };
-declare type EHistoryEventType = Exclude<keyof EHistoryEventDef, 'navigate'>;
+type EHistoryEventType = Exclude<keyof EHistoryEventDef, 'navigate'>;
 /**
  * ETSOO Extended history event
  */

package/lib/mjs/types/EHistory.js

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

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

@@ -40,7 +40,7 @@ interface EventOptions {
      */
     once?: boolean;
 }
-declare type EventClassDef = {
+type EventClassDef = {
     [key: string]: object;
 };
 /**

package/lib/mjs/types/EventClass.js

@@ -4,17 +4,6 @@
  * D for data
  */
 export class EventBase {
-    /**
-     * Constructor
-     * @param type Type
-     */
-    constructor(target, type, data) {
-        this.target = target;
-        this.type = type;
-        this.data = data;
-        this._propagationStopped = false;
-        this._timeStamp = Date.now();
-    }
     /**
      * stopImmediatePropagation called
      */
@@ -27,6 +16,17 @@ export class EventBase {
     get timeStamp() {
         return this._timeStamp;
     }
+    /**
+     * Constructor
+     * @param type Type
+     */
+    constructor(target, type, data) {
+        this.target = target;
+        this.type = type;
+        this.data = data;
+        this._propagationStopped = false;
+        this._timeStamp = Date.now();
+    }
     /**
      * Prevent all other listeners from being called
      */

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

@@ -22,7 +22,7 @@ export interface IFile {
 /**
  * FormDataFieldValue like type
  */
-export declare type FormDataFieldValue = string | IFile;
+export type FormDataFieldValue = string | IFile;
 /**
  * FormData like interface
  * https://developer.mozilla.org/en-US/docs/Web/API/FormData

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.76",
+    "version": "1.1.78",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,17 +54,17 @@
     },
     "homepage": "https://github.com/ETSOO/Shared#readme",
     "devDependencies": {
-        "@types/jest": "^29.2.2",
+        "@types/jest": "^29.2.3",
         "@types/lodash.isequal": "^4.5.6",
-        "@typescript-eslint/eslint-plugin": "^5.42.1",
-        "@typescript-eslint/parser": "^5.42.1",
+        "@typescript-eslint/eslint-plugin": "^5.43.0",
+        "@typescript-eslint/parser": "^5.43.0",
         "eslint": "^8.27.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "jest": "^29.3.1",
         "jest-environment-jsdom": "^29.3.1",
         "ts-jest": "^29.0.3",
-        "typescript": "^4.8.4"
+        "typescript": "^4.9.3"
     },
     "dependencies": {
         "lodash.isequal": "^4.5.0"

package/src/NumberUtils.ts

@@ -18,16 +18,6 @@ Number.prototype.toExact = function (this: number, precision?: number) {
 };
 
 export namespace NumberUtils {
-    export function format(
-        input: undefined | null,
-        locale?: string | string[],
-        options?: Intl.NumberFormatOptions
-    ): undefined;
-    export function format(
-        input: number | bigint,
-        locale?: string | string[],
-        options?: Intl.NumberFormatOptions
-    ): string;
     /**
      * Format number
      * @param input Input
@@ -36,32 +26,15 @@ export namespace NumberUtils {
      * @returns Result
      */
     export function format(
-        input: number | bigint | undefined | null,
+        input: number | bigint,
         locale?: string | string[],
         options?: Intl.NumberFormatOptions
     ) {
-        if (input == null) return undefined;
-
         // Formatter
         const intl = new Intl.NumberFormat(locale, options);
-
         return intl.format(input);
     }
 
-    export function formatMoney(
-        input: undefined | null,
-        currency?: string,
-        locale?: string | string[],
-        isInteger?: boolean,
-        options?: Intl.NumberFormatOptions
-    ): undefined;
-    export function formatMoney(
-        input: number | bigint,
-        currency?: string,
-        locale?: string | string[],
-        isInteger?: boolean,
-        options?: Intl.NumberFormatOptions
-    ): string;
     /**
      * Format money
      * @param input Input
@@ -72,14 +45,12 @@ export namespace NumberUtils {
      * @returns Result
      */
     export function formatMoney(
-        input: number | bigint | undefined | null,
+        input: number | bigint,
         currency?: string,
         locale?: string | string[],
         isInteger: boolean = false,
         options: Intl.NumberFormatOptions = {}
     ) {
-        if (input == null) return format(input, locale, options);
-
         if (currency) {
             // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat
             options.style = 'currency';