Use console logger

Author: mackdk

src/main/typescript/index.d.ts

@@ -11,7 +11,4 @@ declare global {
         };
     };
     /* eslint-enable no-var */
-
-    export function log(message: string): void;
-    export function logError(e: unknown, message: string): void;
 }

src/main/typescript/utils/Logger.ts

@@ -60,7 +60,7 @@ export class Logger {
                     }
                 });
         } catch (error) {
-            logError(error, `[${Logger.domainName}] Logger initialization error while loading configuration file`);
+            globalThis.console.log(`[${Logger.domainName}] Error while loading configuration file`, error);
         }
     }
 
@@ -177,13 +177,13 @@ export class Logger {
         const logMessage = `[${Logger.domainName}] ${this.loggerName} ${LogLevel[level]} ${message}`;
 
         if (err instanceof Error) {
-            logError(err, logMessage);
+            globalThis.console.log(logMessage, err);
         } else if (typeof err === 'string') {
-            log(`${logMessage} - ${err}`);
+            globalThis.console.log(`${logMessage} - ${err}`);
         } else if (err !== undefined) {
-            log(`${logMessage} - Additional object of type ${typeof err}: ${err?.toString() ?? '(n/a)'}`);
+            globalThis.console.log(`${logMessage} - Error of type ${typeof err}: ${err?.toString() ?? '(n/a)'}`);
         } else {
-            log(logMessage);
+            globalThis.console.log(logMessage);
         }
     }
 

src/test/typescript/utils/Logger.test.ts

@@ -8,32 +8,27 @@ import { LogLevel, Logger } from '@github-manager/utils/Logger';
 import '@test-suite/globals';
 
 describe('Logger', () => {
-    let logSpy: SinonSpy<[message: string], void>;
-    let logErrorSpy: SinonSpy<[e: unknown, message: string], void>;
+    let logSpy: SinonSpy<[message?: unknown, ...addtionalPamaraters: unknown[]], void>;
 
     const getUserDataDirStub: SinonStub<[], string> = stub(GLib, 'get_user_data_dir');
     const newForPathStub: SinonStub<[path: string], Gio.File> = stub(Gio.File, 'new_for_path');
 
     before(() => {
-        logSpy = spy(globalThis, 'log');
-        logErrorSpy = spy(globalThis, 'logError');
+        logSpy = spy(globalThis.console, 'log');
         Logger.domain = 'TestSuite';
     });
 
     beforeEach(() => {
         Logger.resetConfiguration();
 
         logSpy.resetHistory();
-        logErrorSpy.resetHistory();
 
         newForPathStub.reset();
         getUserDataDirStub.reset();
     });
 
     after(() => {
         logSpy.restore();
-        logErrorSpy.restore();
-
         newForPathStub.restore();
         getUserDataDirStub.restore();
     });
@@ -104,25 +99,22 @@ describe('Logger', () => {
 
         // Single error argument
         logger.warn('Log entry with an error', error);
-        assert.isTrue(logSpy.notCalled);
-        assert.isTrue(logErrorSpy.calledOnce);
-        assert.isTrue(logErrorSpy.calledWithExactly(error, '[TestSuite] Logger.test WARN Log entry with an error'));
+        assert.isTrue(logSpy.calledOnce);
+        assert.isTrue(logSpy.calledWithExactly('[TestSuite] Logger.test WARN Log entry with an error', error));
 
         // Error argument with other format arguments
         logger.error('Unable to get item #{0} due to {1}', 65, 'E_DUPLICATE_KEY', error);
-        assert.isTrue(logSpy.notCalled);
-        assert.isTrue(logErrorSpy.calledTwice);
+        assert.isTrue(logSpy.calledTwice);
         assert.isTrue(
-            logErrorSpy.calledWithExactly(
-                error,
-                '[TestSuite] Logger.test ERROR Unable to get item #65 due to E_DUPLICATE_KEY'
+            logSpy.calledWithExactly(
+                '[TestSuite] Logger.test ERROR Unable to get item #65 due to E_DUPLICATE_KEY',
+                error
             )
         );
 
         // Error argument as string
         logger.error('Unable to get item #{0} due to {1}', 65, 'E_DUPLICATE_KEY', 'Error text');
-        assert.isTrue(logSpy.calledOnce);
-        assert.isTrue(logErrorSpy.calledTwice);
+        assert.isTrue(logSpy.callCount === 3);
         assert.isTrue(
             logSpy.calledWithExactly(
                 '[TestSuite] Logger.test ERROR Unable to get item #65 due to E_DUPLICATE_KEY - Error text'
@@ -132,11 +124,10 @@ describe('Logger', () => {
         // Error argument as object
         const errorObject = { toString: () => 'Error in object' };
         logger.error('Unable to get item #{0} due to {1}', 65, 'E_DUPLICATE_KEY', errorObject);
-        assert.isTrue(logSpy.calledTwice);
-        assert.isTrue(logErrorSpy.calledTwice);
+        assert.isTrue(logSpy.callCount === 4);
         assert.isTrue(
             logSpy.calledWithExactly(
-                '[TestSuite] Logger.test ERROR Unable to get item #65 due to E_DUPLICATE_KEY - Additional object of type object: Error in object'
+                '[TestSuite] Logger.test ERROR Unable to get item #65 due to E_DUPLICATE_KEY - Error of type object: Error in object'
             )
         );
     });