@etsoo/shared 1.2.33 → 1.2.34

package/__tests__/DomUtils.ts

@@ -1,6 +1,7 @@
 import { DomUtils } from '../src/DomUtils';
 import { DataTypes } from '../src/DataTypes';
 import { DateUtils } from '../src/DateUtils';
+import { ErrorData } from '../src/types/ErrorData';
 
 // Implement for tests
 class Rect implements DOMRect {
@@ -302,12 +303,12 @@ test('Tests for setFocus', () => {
     container.append(input);
 
     DomUtils.setFocus('test');
-    expect(focus).toBeCalledTimes(1);
+    expect(focus).toHaveBeenCalledTimes(1);
 
     input.blur();
 
     DomUtils.setFocus({ test: 'No content' }, container);
-    expect(focus).toBeCalledTimes(2);
+    expect(focus).toHaveBeenCalledTimes(2);
 });
 
 test('Tests for getInputValue', () => {
@@ -327,9 +328,11 @@ test('Tests for getInputValue', () => {
     }
 });
 
-test('Tests for setupLogging', () => {
+test('Tests for setupLogging', async () => {
     // Arrange
-    const action = jest.fn();
+    const action = jest.fn((data: ErrorData) => {
+        expect(data.message).toBe('Test');
+    });
     DomUtils.setupLogging(action, true);
 
     // Act

package/__tests__/EHistory.ts

@@ -49,28 +49,28 @@ test('Tests for events', () => {
     history.on('navigate', navigatorFn, { capture: true, once: true });
 
     history.clear();
-    expect(clearFn).toBeCalled();
+    expect(clearFn).toHaveBeenCalled();
 
     history.pushState(1);
-    expect(pushFn).toBeCalled();
+    expect(pushFn).toHaveBeenCalled();
 
     history.replaceState(11);
-    expect(replaceFn).toBeCalled();
+    expect(replaceFn).toHaveBeenCalled();
 
     history.pushState(2);
     history.back();
-    expect(navigatorFn).toBeCalledTimes(3);
+    expect(navigatorFn).toHaveBeenCalledTimes(3);
 
     history.forward();
     // Once handler was removed
-    expect(navigatorFn).toBeCalledTimes(5);
+    expect(navigatorFn).toHaveBeenCalledTimes(5);
 
     history.on('navigate', navigatorStopFn, { capture: true });
     history.go(-1);
-    expect(navigatorStopFn).toBeCalled();
+    expect(navigatorStopFn).toHaveBeenCalled();
 
     // Previous handler stopped propagation
-    expect(navigatorFn).toBeCalledTimes(5);
+    expect(navigatorFn).toHaveBeenCalledTimes(5);
 
     history.pushState(3);
     history.pushState(4);

package/__tests__/ExtendUtils.ts

@@ -34,7 +34,7 @@ test('Tests for delayedExecutor', () => {
 
     e.call(2, true, 'b');
 
-    expect(f).toBeCalledTimes(0);
+    expect(f).toHaveBeenCalledTimes(0);
     e.clear();
     expect(e.isRunning()).toBeFalsy();
 });

package/__tests__/tsconfig.json

@@ -2,6 +2,7 @@
     "compilerOptions": {
         "target": "ES2020",
         "module": "ESNext",
+        "moduleResolution": "Node10",
         "allowJs": false,
         "skipLibCheck": true,
         "esModuleInterop": true,

package/lib/cjs/DomUtils.js

@@ -523,7 +523,7 @@ var DomUtils;
             else {
                 data = {
                     type: 'error',
-                    eventType: message.type,
+                    subType: message.type,
                     message: error?.message ??
                         `${message.currentTarget} event error`,
                     source,
@@ -541,14 +541,25 @@ var DomUtils;
             if (rejectionPD)
                 event.preventDefault();
             const reason = event.reason;
-            const data = {
-                type: 'unhandledrejection',
-                eventType: event.type,
-                message: typeof reason === 'string'
-                    ? reason
-                    : JSON.stringify(reason),
-                source: globalThis.location.href
-            };
+            let data;
+            if (reason instanceof Error) {
+                data = {
+                    type: 'unhandledrejection',
+                    subType: reason.name,
+                    message: reason.message,
+                    stack: reason.stack,
+                    source: globalThis.location.href
+                };
+            }
+            else {
+                data = {
+                    type: 'unhandledrejection',
+                    message: typeof reason === 'string'
+                        ? reason
+                        : JSON.stringify(reason),
+                    source: globalThis.location.href
+                };
+            }
             action(data);
         };
         const localConsole = (type, orgin) => {

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

@@ -1,7 +1,7 @@
 export type ErrorType = 'error' | 'unhandledrejection' | 'consoleWarn' | 'consoleError';
 export type ErrorData = {
     type: ErrorType;
-    eventType?: string;
+    subType?: string;
     message: string;
     source?: string;
     lineNo?: number;

package/lib/mjs/DomUtils.js

@@ -520,7 +520,7 @@ export var DomUtils;
             else {
                 data = {
                     type: 'error',
-                    eventType: message.type,
+                    subType: message.type,
                     message: error?.message ??
                         `${message.currentTarget} event error`,
                     source,
@@ -538,14 +538,25 @@ export var DomUtils;
             if (rejectionPD)
                 event.preventDefault();
             const reason = event.reason;
-            const data = {
-                type: 'unhandledrejection',
-                eventType: event.type,
-                message: typeof reason === 'string'
-                    ? reason
-                    : JSON.stringify(reason),
-                source: globalThis.location.href
-            };
+            let data;
+            if (reason instanceof Error) {
+                data = {
+                    type: 'unhandledrejection',
+                    subType: reason.name,
+                    message: reason.message,
+                    stack: reason.stack,
+                    source: globalThis.location.href
+                };
+            }
+            else {
+                data = {
+                    type: 'unhandledrejection',
+                    message: typeof reason === 'string'
+                        ? reason
+                        : JSON.stringify(reason),
+                    source: globalThis.location.href
+                };
+            }
             action(data);
         };
         const localConsole = (type, orgin) => {

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

@@ -1,7 +1,7 @@
 export type ErrorType = 'error' | 'unhandledrejection' | 'consoleWarn' | 'consoleError';
 export type ErrorData = {
     type: ErrorType;
-    eventType?: string;
+    subType?: string;
     message: string;
     source?: string;
     lineNo?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.2.33",
+    "version": "1.2.34",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/DomUtils.ts

@@ -630,7 +630,7 @@ export namespace DomUtils {
             } else {
                 data = {
                     type: 'error',
-                    eventType: message.type,
+                    subType: message.type,
                     message:
                         error?.message ??
                         `${message.currentTarget} event error`,
@@ -652,15 +652,26 @@ export namespace DomUtils {
             if (rejectionPD) event.preventDefault();
 
             const reason = event.reason;
-            const data: ErrorData = {
-                type: 'unhandledrejection',
-                eventType: event.type,
-                message:
-                    typeof reason === 'string'
-                        ? reason
-                        : JSON.stringify(reason),
-                source: globalThis.location.href
-            };
+            let data: ErrorData;
+
+            if (reason instanceof Error) {
+                data = {
+                    type: 'unhandledrejection',
+                    subType: reason.name,
+                    message: reason.message,
+                    stack: reason.stack,
+                    source: globalThis.location.href
+                };
+            } else {
+                data = {
+                    type: 'unhandledrejection',
+                    message:
+                        typeof reason === 'string'
+                            ? reason
+                            : JSON.stringify(reason),
+                    source: globalThis.location.href
+                };
+            }
 
             action(data);
         };

package/src/types/ErrorData.ts

@@ -6,7 +6,7 @@ export type ErrorType =
 
 export type ErrorData = {
     type: ErrorType;
-    eventType?: string;
+    subType?: string;
     message: string;
     source?: string;
     lineNo?: number;