@etsoo/shared 1.1.34 → 1.1.35

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/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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.34",
+    "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/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"]
     },