@etsoo/shared 1.2.26 → 1.2.27

package/__tests__/DateUtils.ts

@@ -98,6 +98,11 @@ test('Tests for substract', () => {
 test('Tests for parse', () => {
     const d1 = DateUtils.parse('2014-01-01T13:13:34.441Z')?.toJSON();
     expect(d1).toBe('2014-01-01T13:13:34.441Z');
+
+    const d2 = DateUtils.parse('2024-03-01T11:41');
+    expect(d2?.getDate()).toBe(1);
+    expect(d2?.getHours()).toBe(11);
+    expect(d2?.getSeconds()).toBe(0);
 });
 
 test('Tests for sameDay', () => {

package/lib/cjs/ColorUtils.js

@@ -27,9 +27,8 @@ var ColorUtils;
      * @returns Result
      */
     function getEColors(init = '#000', factor = 51, adjustOrder = true) {
-        var _a;
         // Init color
-        const initColor = (_a = EColor_1.EColor.parse(init)) !== null && _a !== void 0 ? _a : new EColor_1.EColor(0, 0, 0);
+        const initColor = EColor_1.EColor.parse(init) ?? new EColor_1.EColor(0, 0, 0);
         // Factors elements
         // 51 = '00', '33', '66', '99', 'cc', 'ff'
         const factors = [];

package/lib/cjs/DateUtils.js

@@ -74,7 +74,7 @@ var DateUtils;
         if (parsed == null)
             return undefined;
         // Default options
-        options !== null && options !== void 0 ? options : (options = DateUtils.DayFormat);
+        options ?? (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

@@ -7,8 +7,8 @@ const DateUtils_1 = require("./DateUtils");
 const Utils_1 = require("./Utils");
 if (typeof navigator === 'undefined') {
     // Test mock only
-    global.navigator = { language: 'en-US' };
-    global.location = { href: 'http://localhost/' };
+    globalThis.navigator = { language: 'en-US' };
+    globalThis.location = { href: 'http://localhost/' };
 }
 /**
  * Dom Utilities
@@ -93,15 +93,14 @@ var DomUtils;
     }
     DomUtils.clearFormData = clearFormData;
     function dataAsTraveller(source, data, template, keepSource, isValue) {
-        var _a;
         // Properties
         const properties = Object.keys(template);
         // Entries
         const entries = Object.entries(isFormData(source) ? formDataToObject(source) : source);
         for (const [key, value] of entries) {
             // Is included or keepSource
-            const property = (_a = properties.find((p) => p.localeCompare(key, 'en', { sensitivity: 'base' }) ===
-                0)) !== null && _a !== void 0 ? _a : (keepSource ? key : undefined);
+            const property = properties.find((p) => p.localeCompare(key, 'en', { sensitivity: 'base' }) ===
+                0) ?? (keepSource ? key : undefined);
             if (property == null)
                 continue;
             // Template value
@@ -168,12 +167,13 @@ var DomUtils;
      * Current detected country
      */
     DomUtils.detectedCountry = (() => {
-        var _a, _b;
         // URL first, then local storage
         let country;
         try {
             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);
+                new URL(location.href).searchParams.get(DomUtils.CountryField) ??
+                    sessionStorage.getItem(DomUtils.CountryField) ??
+                    localStorage.getItem(DomUtils.CountryField);
         }
         catch {
             country = null;
@@ -185,12 +185,13 @@ var DomUtils;
      * Current detected culture
      */
     DomUtils.detectedCulture = (() => {
-        var _a, _b;
         // URL first, then local storage
         let culture;
         try {
             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);
+                new URL(location.href).searchParams.get(DomUtils.CultureField) ??
+                    sessionStorage.getItem(DomUtils.CultureField) ??
+                    localStorage.getItem(DomUtils.CultureField);
         }
         catch {
             culture = null;
@@ -362,11 +363,8 @@ var DomUtils;
         if (exactMatch)
             return [exactMatch, CultureMatch.Exact];
         // Compatible match
-        const compatibleMatch = items.find((item) => {
-            var _a;
-            return ((_a = item.compatibleNames) === null || _a === void 0 ? void 0 : _a.includes(culture)) ||
-                culture.startsWith(item + '-');
-        });
+        const compatibleMatch = items.find((item) => item.compatibleNames?.includes(culture) ||
+            culture.startsWith(item + '-'));
         if (compatibleMatch)
             return [compatibleMatch, CultureMatch.Compatible];
         // Same part, like zh-CN and zh-HK
@@ -383,7 +381,6 @@ var DomUtils;
      * @returns Result
      */
     function getInputValue(input) {
-        var _a;
         const type = input.type;
         if (type === 'number' || type === 'range') {
             const num = input.valueAsNumber;
@@ -392,7 +389,7 @@ var DomUtils;
             return num;
         }
         else if (type === 'date' || type === 'datetime-local')
-            return (_a = input.valueAsDate) !== null && _a !== void 0 ? _a : DateUtils_1.DateUtils.parse(input.value);
+            return input.valueAsDate ?? DateUtils_1.DateUtils.parse(input.value);
         return input.value;
     }
     DomUtils.getInputValue = getInputValue;
@@ -493,7 +490,7 @@ var DomUtils;
      */
     function setFocus(name, container) {
         const elementName = typeof name === 'string' ? name : Object.keys(name)[0];
-        container !== null && container !== void 0 ? container : (container = document.body);
+        container ?? (container = document.body);
         const element = container.querySelector(`[name="${elementName}"]`);
         if (element != null)
             element.focus();
@@ -505,13 +502,11 @@ var DomUtils;
      * @param preventDefault Is prevent default action
      */
     function setupLogging(action, preventDefault) {
-        var _a, _b;
         // Avoid multiple setup, if there is already a handler, please set "globalThis.onunhandledrejection = null" first
         if (globalThis.onunhandledrejection)
             return;
-        const errorPD = (_a = Utils_1.Utils.getResult(preventDefault, 'error')) !== null && _a !== void 0 ? _a : true;
+        const errorPD = Utils_1.Utils.getResult(preventDefault, 'error') ?? true;
         globalThis.onerror = (message, source, lineNo, colNo, error) => {
-            var _a;
             // Default source
             source || (source = globalThis.location.href);
             let data;
@@ -522,25 +517,26 @@ var DomUtils;
                     source,
                     lineNo,
                     colNo,
-                    stack: error === null || error === void 0 ? void 0 : error.stack
+                    stack: error?.stack
                 };
             }
             else {
                 data = {
                     type: 'error',
                     eventType: message.type,
-                    message: (_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : `${message.currentTarget} event error`,
+                    message: error?.message ??
+                        `${message.currentTarget} event error`,
                     source,
                     lineNo,
                     colNo,
-                    stack: error === null || error === void 0 ? void 0 : error.stack
+                    stack: error?.stack
                 };
             }
             action(data);
             // Return true to suppress error alert
             return errorPD;
         };
-        const rejectionPD = (_b = Utils_1.Utils.getResult(preventDefault, 'error')) !== null && _b !== void 0 ? _b : true;
+        const rejectionPD = Utils_1.Utils.getResult(preventDefault, 'error') ?? true;
         globalThis.onunhandledrejection = (event) => {
             if (rejectionPD)
                 event.preventDefault();
@@ -556,8 +552,7 @@ var DomUtils;
             action(data);
         };
         const localConsole = (type, orgin) => {
-            var _a;
-            const consolePD = (_a = Utils_1.Utils.getResult(preventDefault, type)) !== null && _a !== void 0 ? _a : false;
+            const consolePD = Utils_1.Utils.getResult(preventDefault, type) ?? false;
             return (...args) => {
                 // Keep original action
                 if (!consolePD)

package/lib/cjs/ExtendUtils.js

@@ -42,7 +42,7 @@ var ExtendUtils;
                 cancel = waitFor(() => {
                     func(...args);
                     cancel = undefined;
-                }, miliseconds !== null && miliseconds !== void 0 ? miliseconds : delayMiliseconds);
+                }, miliseconds ?? delayMiliseconds);
             },
             /**
              * Clear

package/lib/cjs/NumberUtils.js

@@ -34,19 +34,18 @@ var NumberUtils;
      * @returns Result
      */
     function formatMoney(input, currency, locale, isInteger = false, options = {}) {
-        var _a, _b, _c, _d;
         if (currency) {
             // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat
             options.style = 'currency';
             options.currency = currency;
-            (_a = options.currencyDisplay) !== null && _a !== void 0 ? _a : (options.currencyDisplay = 'narrowSymbol');
+            options.currencyDisplay ?? (options.currencyDisplay = 'narrowSymbol');
         }
         if (isInteger) {
-            (_b = options.minimumFractionDigits) !== null && _b !== void 0 ? _b : (options.minimumFractionDigits = 0);
-            (_c = options.maximumFractionDigits) !== null && _c !== void 0 ? _c : (options.maximumFractionDigits = 0);
+            options.minimumFractionDigits ?? (options.minimumFractionDigits = 0);
+            options.maximumFractionDigits ?? (options.maximumFractionDigits = 0);
         }
         else
-            (_d = options.minimumFractionDigits) !== null && _d !== void 0 ? _d : (options.minimumFractionDigits = 2);
+            options.minimumFractionDigits ?? (options.minimumFractionDigits = 2);
         return format(input, locale, options);
     }
     NumberUtils.formatMoney = formatMoney;
@@ -71,14 +70,13 @@ var NumberUtils;
      * @returns Result
      */
     function getCurrencySymbol(code, display = 'narrowSymbol', locale) {
-        var _a;
         const formatter = new Intl.NumberFormat(locale, {
             style: 'currency',
             currency: code,
             currencyDisplay: display
         });
         const parts = formatter.formatToParts();
-        const symbol = (_a = parts.find((part) => part.type === 'currency')) === null || _a === void 0 ? void 0 : _a.value;
+        const symbol = parts.find((part) => part.type === 'currency')?.value;
         return symbol;
     }
     NumberUtils.getCurrencySymbol = getCurrencySymbol;

package/lib/cjs/StorageUtils.js

@@ -1,12 +1,11 @@
 "use strict";
-var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StorageUtils = void 0;
 const Storage_1 = require("./node/Storage");
 const Utils_1 = require("./Utils");
 // Mock node
-(_a = globalThis.localStorage) !== null && _a !== void 0 ? _a : (globalThis.localStorage = new Storage_1.NodeStorage());
-(_b = globalThis.sessionStorage) !== null && _b !== void 0 ? _b : (globalThis.sessionStorage = new Storage_1.NodeStorage());
+globalThis.localStorage ?? (globalThis.localStorage = new Storage_1.NodeStorage());
+globalThis.sessionStorage ?? (globalThis.sessionStorage = new Storage_1.NodeStorage());
 /**
  * Storage utilities
  * NodeStorage needs data persistance

package/lib/cjs/Utils.js

@@ -55,7 +55,7 @@ String.prototype.hideEmail = function () {
     return this.hideData('@');
 };
 String.prototype.isDigits = function (minLength) {
-    return this.length >= (minLength !== null && minLength !== void 0 ? minLength : 0) && /^\d+$/.test(this);
+    return this.length >= (minLength ?? 0) && /^\d+$/.test(this);
 };
 String.prototype.isEmail = function () {
     const re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
@@ -78,11 +78,11 @@ var Utils;
      */
     function addBlankItem(options, idField, labelField, blankLabel) {
         // Avoid duplicate blank items
-        idField !== null && idField !== void 0 ? idField : (idField = 'id');
+        idField ?? (idField = 'id');
         if (options.length === 0 || Reflect.get(options[0], idField) !== '') {
             const blankItem = {
                 [idField]: '',
-                [typeof labelField === 'string' ? labelField : 'label']: blankLabel !== null && blankLabel !== void 0 ? blankLabel : '---'
+                [typeof labelField === 'string' ? labelField : 'label']: blankLabel ?? '---'
             };
             options.unshift(blankItem);
         }
@@ -199,7 +199,6 @@ var Utils;
         // Changed fields
         const changes = [];
         Object.entries(input).forEach(([key, value]) => {
-            var _a;
             // Ignore fields, no process
             if (ignoreFields.includes(key))
                 return;
@@ -214,7 +213,7 @@ var Utils;
                 // Date when meets string
                 if (value instanceof Date) {
                     if (value.valueOf() ===
-                        ((_a = DateUtils_1.DateUtils.parse(initValue)) === null || _a === void 0 ? void 0 : _a.valueOf())) {
+                        DateUtils_1.DateUtils.parse(initValue)?.valueOf()) {
                         Reflect.deleteProperty(input, key);
                         return;
                     }
@@ -484,7 +483,7 @@ var Utils;
      * @returns Result
      */
     Utils.removeNonLetters = (input) => {
-        return input === null || input === void 0 ? void 0 : input.removeNonLetters();
+        return input?.removeNonLetters();
     };
     /**
      * Replace null or empty with default value
@@ -505,9 +504,8 @@ var Utils;
      */
     Utils.setLabels = (source, labels, reference) => {
         Object.keys(source).forEach((key) => {
-            var _a;
             // Reference key
-            const labelKey = reference == null ? key : (_a = reference[key]) !== null && _a !== void 0 ? _a : key;
+            const labelKey = reference == null ? key : reference[key] ?? key;
             // Label
             const label = labels[labelKey];
             if (label != null) {

package/lib/cjs/types/ContentDisposition.js

@@ -64,7 +64,7 @@ class ContentDisposition {
             }
         }
         if (type === 'form-data') {
-            return new ContentDisposition(type, filename, name !== null && name !== void 0 ? name : 'file');
+            return new ContentDisposition(type, filename, name ?? 'file');
         }
         if (type === 'inline' || type === 'attachment') {
             return new ContentDisposition(type, filename);

package/lib/cjs/types/EColor.js

@@ -217,7 +217,7 @@ class EColor {
             includeAlpha = alpha;
         }
         if (includeAlpha)
-            return `RGBA(${this.r}, ${this.g}, ${this.b}, ${alphaValue !== null && alphaValue !== void 0 ? alphaValue : 1})`;
+            return `RGBA(${this.r}, ${this.g}, ${this.b}, ${alphaValue ?? 1})`;
         return `RGB(${this.r}, ${this.g}, ${this.b})`;
     }
 }

package/lib/cjs/types/EventClass.js

@@ -89,11 +89,10 @@ class EventClass {
      * @param options Options
      */
     on(type, callback, options) {
-        var _a, _b;
         if (typeof type === 'object') {
             for (const key in type) {
                 const item = key;
-                const itemCallback = (_a = type[item]) !== null && _a !== void 0 ? _a : callback;
+                const itemCallback = type[item] ?? callback;
                 if (itemCallback)
                     this.on(item, itemCallback, options);
             }
@@ -104,7 +103,7 @@ class EventClass {
         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]);
+        this.listeners.get(type)?.push([callback, options]);
     }
     /**
      * Trigger event
@@ -140,10 +139,10 @@ class EventClass {
             for (let c = 0; c < len; c++) {
                 const item = items[c];
                 const [callback, options] = item;
-                if (options === null || options === void 0 ? void 0 : options.capture)
+                if (options?.capture)
                     continue;
                 callback(event);
-                if (options === null || options === void 0 ? void 0 : options.once) {
+                if (options?.once) {
                     indicies.push(c);
                 }
                 if (event.propagationStopped) {

package/lib/mjs/ColorUtils.js

@@ -24,9 +24,8 @@ export var ColorUtils;
      * @returns Result
      */
     function getEColors(init = '#000', factor = 51, adjustOrder = true) {
-        var _a;
         // Init color
-        const initColor = (_a = EColor.parse(init)) !== null && _a !== void 0 ? _a : new EColor(0, 0, 0);
+        const initColor = EColor.parse(init) ?? new EColor(0, 0, 0);
         // Factors elements
         // 51 = '00', '33', '66', '99', 'cc', 'ff'
         const factors = [];

package/lib/mjs/DateUtils.js

@@ -71,7 +71,7 @@ export var DateUtils;
         if (parsed == null)
             return undefined;
         // Default options
-        options !== null && options !== void 0 ? options : (options = DateUtils.DayFormat);
+        options ?? (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

@@ -4,8 +4,8 @@ import { DateUtils } from './DateUtils';
 import { Utils } from './Utils';
 if (typeof navigator === 'undefined') {
     // Test mock only
-    global.navigator = { language: 'en-US' };
-    global.location = { href: 'http://localhost/' };
+    globalThis.navigator = { language: 'en-US' };
+    globalThis.location = { href: 'http://localhost/' };
 }
 /**
  * Dom Utilities
@@ -90,15 +90,14 @@ export var DomUtils;
     }
     DomUtils.clearFormData = clearFormData;
     function dataAsTraveller(source, data, template, keepSource, isValue) {
-        var _a;
         // Properties
         const properties = Object.keys(template);
         // Entries
         const entries = Object.entries(isFormData(source) ? formDataToObject(source) : source);
         for (const [key, value] of entries) {
             // Is included or keepSource
-            const property = (_a = properties.find((p) => p.localeCompare(key, 'en', { sensitivity: 'base' }) ===
-                0)) !== null && _a !== void 0 ? _a : (keepSource ? key : undefined);
+            const property = properties.find((p) => p.localeCompare(key, 'en', { sensitivity: 'base' }) ===
+                0) ?? (keepSource ? key : undefined);
             if (property == null)
                 continue;
             // Template value
@@ -165,12 +164,13 @@ export var DomUtils;
      * Current detected country
      */
     DomUtils.detectedCountry = (() => {
-        var _a, _b;
         // URL first, then local storage
         let country;
         try {
             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);
+                new URL(location.href).searchParams.get(DomUtils.CountryField) ??
+                    sessionStorage.getItem(DomUtils.CountryField) ??
+                    localStorage.getItem(DomUtils.CountryField);
         }
         catch {
             country = null;
@@ -182,12 +182,13 @@ export var DomUtils;
      * Current detected culture
      */
     DomUtils.detectedCulture = (() => {
-        var _a, _b;
         // URL first, then local storage
         let culture;
         try {
             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);
+                new URL(location.href).searchParams.get(DomUtils.CultureField) ??
+                    sessionStorage.getItem(DomUtils.CultureField) ??
+                    localStorage.getItem(DomUtils.CultureField);
         }
         catch {
             culture = null;
@@ -359,11 +360,8 @@ export var DomUtils;
         if (exactMatch)
             return [exactMatch, CultureMatch.Exact];
         // Compatible match
-        const compatibleMatch = items.find((item) => {
-            var _a;
-            return ((_a = item.compatibleNames) === null || _a === void 0 ? void 0 : _a.includes(culture)) ||
-                culture.startsWith(item + '-');
-        });
+        const compatibleMatch = items.find((item) => item.compatibleNames?.includes(culture) ||
+            culture.startsWith(item + '-'));
         if (compatibleMatch)
             return [compatibleMatch, CultureMatch.Compatible];
         // Same part, like zh-CN and zh-HK
@@ -380,7 +378,6 @@ export var DomUtils;
      * @returns Result
      */
     function getInputValue(input) {
-        var _a;
         const type = input.type;
         if (type === 'number' || type === 'range') {
             const num = input.valueAsNumber;
@@ -389,7 +386,7 @@ export var DomUtils;
             return num;
         }
         else if (type === 'date' || type === 'datetime-local')
-            return (_a = input.valueAsDate) !== null && _a !== void 0 ? _a : DateUtils.parse(input.value);
+            return input.valueAsDate ?? DateUtils.parse(input.value);
         return input.value;
     }
     DomUtils.getInputValue = getInputValue;
@@ -490,7 +487,7 @@ export var DomUtils;
      */
     function setFocus(name, container) {
         const elementName = typeof name === 'string' ? name : Object.keys(name)[0];
-        container !== null && container !== void 0 ? container : (container = document.body);
+        container ?? (container = document.body);
         const element = container.querySelector(`[name="${elementName}"]`);
         if (element != null)
             element.focus();
@@ -502,13 +499,11 @@ export var DomUtils;
      * @param preventDefault Is prevent default action
      */
     function setupLogging(action, preventDefault) {
-        var _a, _b;
         // Avoid multiple setup, if there is already a handler, please set "globalThis.onunhandledrejection = null" first
         if (globalThis.onunhandledrejection)
             return;
-        const errorPD = (_a = Utils.getResult(preventDefault, 'error')) !== null && _a !== void 0 ? _a : true;
+        const errorPD = Utils.getResult(preventDefault, 'error') ?? true;
         globalThis.onerror = (message, source, lineNo, colNo, error) => {
-            var _a;
             // Default source
             source || (source = globalThis.location.href);
             let data;
@@ -519,25 +514,26 @@ export var DomUtils;
                     source,
                     lineNo,
                     colNo,
-                    stack: error === null || error === void 0 ? void 0 : error.stack
+                    stack: error?.stack
                 };
             }
             else {
                 data = {
                     type: 'error',
                     eventType: message.type,
-                    message: (_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : `${message.currentTarget} event error`,
+                    message: error?.message ??
+                        `${message.currentTarget} event error`,
                     source,
                     lineNo,
                     colNo,
-                    stack: error === null || error === void 0 ? void 0 : error.stack
+                    stack: error?.stack
                 };
             }
             action(data);
             // Return true to suppress error alert
             return errorPD;
         };
-        const rejectionPD = (_b = Utils.getResult(preventDefault, 'error')) !== null && _b !== void 0 ? _b : true;
+        const rejectionPD = Utils.getResult(preventDefault, 'error') ?? true;
         globalThis.onunhandledrejection = (event) => {
             if (rejectionPD)
                 event.preventDefault();
@@ -553,8 +549,7 @@ export var DomUtils;
             action(data);
         };
         const localConsole = (type, orgin) => {
-            var _a;
-            const consolePD = (_a = Utils.getResult(preventDefault, type)) !== null && _a !== void 0 ? _a : false;
+            const consolePD = Utils.getResult(preventDefault, type) ?? false;
             return (...args) => {
                 // Keep original action
                 if (!consolePD)

package/lib/mjs/ExtendUtils.js

@@ -39,7 +39,7 @@ export var ExtendUtils;
                 cancel = waitFor(() => {
                     func(...args);
                     cancel = undefined;
-                }, miliseconds !== null && miliseconds !== void 0 ? miliseconds : delayMiliseconds);
+                }, miliseconds ?? delayMiliseconds);
             },
             /**
              * Clear

package/lib/mjs/NumberUtils.js

@@ -31,19 +31,18 @@ export var NumberUtils;
      * @returns Result
      */
     function formatMoney(input, currency, locale, isInteger = false, options = {}) {
-        var _a, _b, _c, _d;
         if (currency) {
             // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat
             options.style = 'currency';
             options.currency = currency;
-            (_a = options.currencyDisplay) !== null && _a !== void 0 ? _a : (options.currencyDisplay = 'narrowSymbol');
+            options.currencyDisplay ?? (options.currencyDisplay = 'narrowSymbol');
         }
         if (isInteger) {
-            (_b = options.minimumFractionDigits) !== null && _b !== void 0 ? _b : (options.minimumFractionDigits = 0);
-            (_c = options.maximumFractionDigits) !== null && _c !== void 0 ? _c : (options.maximumFractionDigits = 0);
+            options.minimumFractionDigits ?? (options.minimumFractionDigits = 0);
+            options.maximumFractionDigits ?? (options.maximumFractionDigits = 0);
         }
         else
-            (_d = options.minimumFractionDigits) !== null && _d !== void 0 ? _d : (options.minimumFractionDigits = 2);
+            options.minimumFractionDigits ?? (options.minimumFractionDigits = 2);
         return format(input, locale, options);
     }
     NumberUtils.formatMoney = formatMoney;
@@ -68,14 +67,13 @@ export var NumberUtils;
      * @returns Result
      */
     function getCurrencySymbol(code, display = 'narrowSymbol', locale) {
-        var _a;
         const formatter = new Intl.NumberFormat(locale, {
             style: 'currency',
             currency: code,
             currencyDisplay: display
         });
         const parts = formatter.formatToParts();
-        const symbol = (_a = parts.find((part) => part.type === 'currency')) === null || _a === void 0 ? void 0 : _a.value;
+        const symbol = parts.find((part) => part.type === 'currency')?.value;
         return symbol;
     }
     NumberUtils.getCurrencySymbol = getCurrencySymbol;

package/lib/mjs/StorageUtils.js

@@ -1,9 +1,8 @@
-var _a, _b;
 import { NodeStorage } from './node/Storage';
 import { Utils } from './Utils';
 // Mock node
-(_a = globalThis.localStorage) !== null && _a !== void 0 ? _a : (globalThis.localStorage = new NodeStorage());
-(_b = globalThis.sessionStorage) !== null && _b !== void 0 ? _b : (globalThis.sessionStorage = new NodeStorage());
+globalThis.localStorage ?? (globalThis.localStorage = new NodeStorage());
+globalThis.sessionStorage ?? (globalThis.sessionStorage = new NodeStorage());
 /**
  * Storage utilities
  * NodeStorage needs data persistance

package/lib/mjs/Utils.js

@@ -49,7 +49,7 @@ String.prototype.hideEmail = function () {
     return this.hideData('@');
 };
 String.prototype.isDigits = function (minLength) {
-    return this.length >= (minLength !== null && minLength !== void 0 ? minLength : 0) && /^\d+$/.test(this);
+    return this.length >= (minLength ?? 0) && /^\d+$/.test(this);
 };
 String.prototype.isEmail = function () {
     const re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
@@ -72,11 +72,11 @@ export var Utils;
      */
     function addBlankItem(options, idField, labelField, blankLabel) {
         // Avoid duplicate blank items
-        idField !== null && idField !== void 0 ? idField : (idField = 'id');
+        idField ?? (idField = 'id');
         if (options.length === 0 || Reflect.get(options[0], idField) !== '') {
             const blankItem = {
                 [idField]: '',
-                [typeof labelField === 'string' ? labelField : 'label']: blankLabel !== null && blankLabel !== void 0 ? blankLabel : '---'
+                [typeof labelField === 'string' ? labelField : 'label']: blankLabel ?? '---'
             };
             options.unshift(blankItem);
         }
@@ -193,7 +193,6 @@ export var Utils;
         // Changed fields
         const changes = [];
         Object.entries(input).forEach(([key, value]) => {
-            var _a;
             // Ignore fields, no process
             if (ignoreFields.includes(key))
                 return;
@@ -208,7 +207,7 @@ export var Utils;
                 // Date when meets string
                 if (value instanceof Date) {
                     if (value.valueOf() ===
-                        ((_a = DateUtils.parse(initValue)) === null || _a === void 0 ? void 0 : _a.valueOf())) {
+                        DateUtils.parse(initValue)?.valueOf()) {
                         Reflect.deleteProperty(input, key);
                         return;
                     }
@@ -478,7 +477,7 @@ export var Utils;
      * @returns Result
      */
     Utils.removeNonLetters = (input) => {
-        return input === null || input === void 0 ? void 0 : input.removeNonLetters();
+        return input?.removeNonLetters();
     };
     /**
      * Replace null or empty with default value
@@ -499,9 +498,8 @@ export var Utils;
      */
     Utils.setLabels = (source, labels, reference) => {
         Object.keys(source).forEach((key) => {
-            var _a;
             // Reference key
-            const labelKey = reference == null ? key : (_a = reference[key]) !== null && _a !== void 0 ? _a : key;
+            const labelKey = reference == null ? key : reference[key] ?? key;
             // Label
             const label = labels[labelKey];
             if (label != null) {

package/lib/mjs/types/ContentDisposition.js

@@ -61,7 +61,7 @@ export class ContentDisposition {
             }
         }
         if (type === 'form-data') {
-            return new ContentDisposition(type, filename, name !== null && name !== void 0 ? name : 'file');
+            return new ContentDisposition(type, filename, name ?? 'file');
         }
         if (type === 'inline' || type === 'attachment') {
             return new ContentDisposition(type, filename);

package/lib/mjs/types/EColor.js

@@ -214,7 +214,7 @@ export class EColor {
             includeAlpha = alpha;
         }
         if (includeAlpha)
-            return `RGBA(${this.r}, ${this.g}, ${this.b}, ${alphaValue !== null && alphaValue !== void 0 ? alphaValue : 1})`;
+            return `RGBA(${this.r}, ${this.g}, ${this.b}, ${alphaValue ?? 1})`;
         return `RGB(${this.r}, ${this.g}, ${this.b})`;
     }
 }

package/lib/mjs/types/EventClass.js

@@ -85,11 +85,10 @@ export class EventClass {
      * @param options Options
      */
     on(type, callback, options) {
-        var _a, _b;
         if (typeof type === 'object') {
             for (const key in type) {
                 const item = key;
-                const itemCallback = (_a = type[item]) !== null && _a !== void 0 ? _a : callback;
+                const itemCallback = type[item] ?? callback;
                 if (itemCallback)
                     this.on(item, itemCallback, options);
             }
@@ -100,7 +99,7 @@ export class EventClass {
         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]);
+        this.listeners.get(type)?.push([callback, options]);
     }
     /**
      * Trigger event
@@ -136,10 +135,10 @@ export class EventClass {
             for (let c = 0; c < len; c++) {
                 const item = items[c];
                 const [callback, options] = item;
-                if (options === null || options === void 0 ? void 0 : options.capture)
+                if (options?.capture)
                     continue;
                 callback(event);
-                if (options === null || options === void 0 ? void 0 : options.once) {
+                if (options?.once) {
                     indicies.push(c);
                 }
                 if (event.propagationStopped) {

package/package.json

@@ -1,9 +1,10 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.2.26",
+    "version": "1.2.27",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
+    "type": "module",
     "types": "lib/mjs/index.d.ts",
     "exports": {
         ".": {

package/src/DomUtils.ts

@@ -7,8 +7,8 @@ import { FormDataFieldValue, IFormData } from './types/FormData';
 
 if (typeof navigator === 'undefined') {
     // Test mock only
-    global.navigator = { language: 'en-US' } as any;
-    global.location = { href: 'http://localhost/' } as any;
+    globalThis.navigator = { language: 'en-US' } as any;
+    globalThis.location = { href: 'http://localhost/' } as any;
 }
 
 /**

package/tsconfig.cjs.json

@@ -1,9 +1,9 @@
 {
     "compilerOptions": {
         /* Visit https://aka.ms/tsconfig.json to read more about this file */
-        "target": "ES2019",
-        "module": "commonjs",
-        "moduleResolution": "node",
+        "target": "ES2020",
+        "module": "CommonJS",
+        "moduleResolution": "Node",
         "isolatedModules": true,
         "outDir": "./lib/cjs",
         "noEmit": false,

package/tsconfig.json

@@ -1,9 +1,9 @@
 {
     "compilerOptions": {
         /* Visit https://aka.ms/tsconfig.json to read more about this file */
-        "target": "ES2019",
+        "target": "ES2020",
         "module": "ESNext",
-        "moduleResolution": "node",
+        "moduleResolution": "bundler",
         "isolatedModules": true,
         "outDir": "./lib/mjs",
         "noEmit": false,