fix(types): make ILogger to be compatible with standard console

qiwi · Apr 4, 2019 · 888a85f · 888a85f
1 parent 8cb08c1
commit 888a85f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/packages/facade/package.json b/packages/facade/package.json
@@ -38,6 +38,7 @@
   },
   "devDependencies": {
     "@types/jest": "^24.0.9",
+    "@types/node": "^11.11.3",
     "dts-generator": "^3.0.0",
     "flowgen": "^1.7.0",
     "replace-in-file": "^3.4.4",

diff --git a/packages/facade/src/test/tsconfig.json b/packages/facade/src/test/tsconfig.json
@@ -14,7 +14,7 @@
     "noUnusedParameters": true,
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
-    "lib": ["es6"],
+    "lib": ["es6", "dom"],
     "skipLibCheck": true,
     "baseUrl": ".",
     "paths": {
@@ -31,4 +31,4 @@
   "exclude": [
     "node_modules"
   ]
-}
+}
diff --git a/packages/types/src/main/ILogger.ts b/packages/types/src/main/ILogger.ts
@@ -1,14 +1,14 @@
 // Inherits log4j logging levels contract and Logback values
 
-export type ILoggerMethod = (...args: any[]) => undefined | null
+export type ILoggerMethod = (...args: any[]) => void
 
 export type TLogLevel = number
 
 export interface ILogger {
   trace: ILoggerMethod,
   debug: ILoggerMethod,
   info: ILoggerMethod,
-  log: ILoggerMethod,
+  log: ILoggerMethod, // Legacy, use .info() instead
   warn: ILoggerMethod,
   error: ILoggerMethod,
   fatal?: ILoggerMethod,

diff --git a/packages/types/src/test/index.ts b/packages/types/src/test/index.ts
@@ -62,7 +62,7 @@ const emitter: IEventEmitter = {
 const brokenLogLevel: TLogLevel = 'info'; // $ExpectError
 const traceLogLevel: TLogLevel = 5e3;
 
-const brokenLogMethod: ILoggerMethod = () => 'foo'; // $ExpectError
+const brokenLogMethod: ILoggerMethod = null; // $ExpectError
 const logMethod: ILoggerMethod = () => undefined;
 
 const brokenLogger: ILogger = {
@@ -71,7 +71,7 @@ const brokenLogger: ILogger = {
   info: logMethod,
   log: logMethod,
   warn: logMethod,
-  error: () => 'foo' // $ExpectError
+  error: null // $ExpectError
 };
 
 const logger: ILogger = {
@@ -84,6 +84,8 @@ const logger: ILogger = {
   custom: () => 'foo'
 };
 
+const legacyLogger: ILogger = console;
+
 // TUtilGet
 
 const brokenUtilGet: TUtilGet = (obj: object, path: any[], defaultValue?: any) => { obj || path || defaultValue; }; // $ExpectError

diff --git a/packages/types/src/test/tsconfig.json b/packages/types/src/test/tsconfig.json
@@ -14,7 +14,7 @@
     "noUnusedParameters": true,
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
-    "lib": ["es6"],
+    "lib": ["es6", "dom"],
     "skipLibCheck": true,
     "baseUrl": ".",
     "paths": {
@@ -31,4 +31,4 @@
   "exclude": [
     "node_modules"
   ]
-}
+}
diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -17,6 +17,7 @@
     "skipLibCheck": true,
     "resolveJsonModule": true,
     "esModuleInterop": true,
-    "composite": true
+    "composite": true,
+    "strictNullChecks": true
   }
 }