chore: expose the ILogger interface from the main logger module #74 (#75)

regevbr · web-flow · commit 75e33c93423d · 2020-05-10T00:01:26.000+03:00
diff --git a/src/db/impl/connectionProvider.ts b/src/db/impl/connectionProvider.ts
@@ -3,8 +3,7 @@ import { Connection } from 'typeorm/connection/Connection';
 import { memoize } from '../../utils/memoize/memoize';
 import { IConnectionProvider } from '../interfaces/IConnectionProvider';
 import { TypeOrm, TYPES } from '../../container/nodeModulesContainer';
-import { ILoggerFactory } from '../../utils/logger';
-import { ILogger } from '../../utils/logger/interfaces/ILogger';
+import { ILogger, ILoggerFactory } from '../../utils/logger';
 import { IConnectionOptionsProvider } from '../interfaces/IConnectionOptionsProvider';
 
 @injectable()
diff --git a/src/dependencyChecker/impl/dependencyChecker.ts b/src/dependencyChecker/impl/dependencyChecker.ts
@@ -9,8 +9,7 @@ import { ICacheResolver } from '../../resolvers/cacheResolver';
 import { ICIResolver } from '../../resolvers/ciResolver';
 import { ITestResolver } from '../../resolvers/testResolver';
 import { IEnginesResolver } from '../../resolvers/enginesResolver';
-import { ILoggerFactory } from '../../utils/logger';
-import { ILogger } from '../../utils/logger/interfaces/ILogger';
+import { ILogger, ILoggerFactory } from '../../utils/logger';
 import { IPackageInfoCache } from '..';
 
 @injectable()
diff --git a/src/dependencyChecker/impl/packageInfoCache.ts b/src/dependencyChecker/impl/packageInfoCache.ts
@@ -1,7 +1,6 @@
 import { injectable } from 'inversify';
 import { IPackageInfo } from '../../utils/packageInfo';
-import { ILoggerFactory } from '../../utils/logger';
-import { ILogger } from '../../utils/logger/interfaces/ILogger';
+import { ILogger, ILoggerFactory } from '../../utils/logger';
 import { DependencyVersion, IDependencyVersionRepositoryProvider } from '../../db';
 import {
   IPackageInfoCache,
diff --git a/src/resolvers/cacheResolver/impl/cacheResolver.ts b/src/resolvers/cacheResolver/impl/cacheResolver.ts
@@ -1,8 +1,7 @@
 import { injectable } from 'inversify';
 import { ICacheResolver, ICacheResolverOptions, ICacheResolverResult } from '../interfaces/ICacheResolver';
 import { IDependencyRepositoryProvider } from '../../../db';
-import { ILoggerFactory } from '../../../utils/logger';
-import { ILogger } from '../../../utils/logger/interfaces/ILogger';
+import { ILoggerFactory, ILogger } from '../../../utils/logger';
 
 @injectable()
 export class CacheResolver extends ICacheResolver {
diff --git a/src/resolvers/ciResolver/impl/ciResolver.ts b/src/resolvers/ciResolver/impl/ciResolver.ts
@@ -2,8 +2,7 @@ import { ICIResolveOptions, ICIResolver } from '../interfaces/ICIResolver';
 import { injectable, multiInject } from 'inversify';
 import { ISpecificCIResolver } from '../interfaces/ISpecificCIResolver';
 import { IResolverResult } from '../../types';
-import { ILoggerFactory } from '../../../utils/logger';
-import { ILogger } from '../../../utils/logger/interfaces/ILogger';
+import { ILoggerFactory, ILogger } from '../../../utils/logger';
 import { asyncFilter } from '../../../utils/asyncFilter/asyncFilter';
 import { ISpecificCIResolverRunner } from '../interfaces/ISpecificCIResolverRunner';
 
diff --git a/src/resolvers/ciResolver/impl/resolvers/appveyor/appVeyorConfigParser.ts b/src/resolvers/ciResolver/impl/resolvers/appveyor/appVeyorConfigParser.ts
@@ -1,7 +1,6 @@
 import { ISpecificCIResolverResponse } from '../../../interfaces/ISpecificCIResolver';
 import { injectable } from 'inversify';
-import { ILoggerFactory } from '../../../../../utils/logger';
-import { ILogger } from '../../../../../utils/logger/interfaces/ILogger';
+import { ILoggerFactory, ILogger } from '../../../../../utils/logger';
 import { INode, keySorter, NodeSorter, objectIterator } from '../../../../../utils/objectIterator/objectIterator';
 import { isString } from 'ts-type-guards';
 import { INvmHandler } from '../../../interfaces/INvmHandler';
diff --git a/src/resolvers/ciResolver/impl/resolvers/appveyor/appVeyorResolver.ts b/src/resolvers/ciResolver/impl/resolvers/appveyor/appVeyorResolver.ts
@@ -7,8 +7,7 @@ import {
 import { inject, injectable } from 'inversify';
 import { FS, TYPES } from '../../../../../container/nodeModulesContainer';
 import { parse } from 'yaml';
-import { ILoggerFactory } from '../../../../../utils/logger';
-import { ILogger } from '../../../../../utils/logger/interfaces/ILogger';
+import { ILoggerFactory, ILogger } from '../../../../../utils/logger';
 import { AppVeyorConfigParser } from './appVeyorConfigParser';
 
 const ciFileName = `.appveyor.yml`;
diff --git a/src/resolvers/ciResolver/impl/resolvers/circleci/circleCiConfigParser.ts b/src/resolvers/ciResolver/impl/resolvers/circleci/circleCiConfigParser.ts
@@ -1,7 +1,6 @@
 import { ISpecificCIResolverResponse } from '../../../interfaces/ISpecificCIResolver';
 import { injectable } from 'inversify';
-import { ILoggerFactory } from '../../../../../utils/logger';
-import { ILogger } from '../../../../../utils/logger/interfaces/ILogger';
+import { ILoggerFactory, ILogger } from '../../../../../utils/logger';
 import { INode, objectIterator } from '../../../../../utils/objectIterator/objectIterator';
 import { isString } from 'ts-type-guards';
 import { ITargetMatcher } from '../../../interfaces/ITargetMatcher';
diff --git a/src/resolvers/ciResolver/impl/resolvers/circleci/circleCiResolver.ts b/src/resolvers/ciResolver/impl/resolvers/circleci/circleCiResolver.ts
@@ -6,8 +6,7 @@ import {
 } from '../../../interfaces/ISpecificCIResolver';
 import { inject, injectable } from 'inversify';
 import { FS, TYPES } from '../../../../../container/nodeModulesContainer';
-import { ILoggerFactory } from '../../../../../utils/logger';
-import { ILogger } from '../../../../../utils/logger/interfaces/ILogger';
+import { ILoggerFactory, ILogger } from '../../../../../utils/logger';
 import { CircleCiConfigParser } from './circleCiConfigParser';
 import { parse } from 'yaml';
 
diff --git a/src/resolvers/ciResolver/impl/resolvers/githubActions/githubActionsConfigParser.ts b/src/resolvers/ciResolver/impl/resolvers/githubActions/githubActionsConfigParser.ts
@@ -1,7 +1,6 @@
 import { ISpecificCIResolverResponse } from '../../../interfaces/ISpecificCIResolver';
 import { injectable } from 'inversify';
-import { ILoggerFactory } from '../../../../../utils/logger';
-import { ILogger } from '../../../../../utils/logger/interfaces/ILogger';
+import { ILoggerFactory, ILogger } from '../../../../../utils/logger';
 import { INode, keySorter, NodeSorter, objectIterator } from '../../../../../utils/objectIterator/objectIterator';
 import { is, isArrayOfObjects, isString } from 'ts-type-guards';
 import { INvmHandler } from '../../../interfaces/INvmHandler';
diff --git a/src/resolvers/ciResolver/impl/resolvers/githubActions/githubActionsResolver.ts b/src/resolvers/ciResolver/impl/resolvers/githubActions/githubActionsResolver.ts
@@ -6,8 +6,7 @@ import {
 } from '../../../interfaces/ISpecificCIResolver';
 import { inject, injectable } from 'inversify';
 import { FS, TYPES } from '../../../../../container/nodeModulesContainer';
-import { ILoggerFactory } from '../../../../../utils/logger';
-import { ILogger } from '../../../../../utils/logger/interfaces/ILogger';
+import { ILoggerFactory, ILogger } from '../../../../../utils/logger';
 import { GithubActionsConfigParser } from './githubActionsConfigParser';
 import { parse } from 'yaml';
 
diff --git a/src/resolvers/ciResolver/impl/resolvers/travisci/travisCiConfigParser.ts b/src/resolvers/ciResolver/impl/resolvers/travisci/travisCiConfigParser.ts
@@ -1,7 +1,6 @@
 import { ISpecificCIResolverResponse } from '../../../interfaces/ISpecificCIResolver';
 import { injectable } from 'inversify';
-import { ILoggerFactory } from '../../../../../utils/logger';
-import { ILogger } from '../../../../../utils/logger/interfaces/ILogger';
+import { ILoggerFactory, ILogger } from '../../../../../utils/logger';
 import { INode, objectIterator } from '../../../../../utils/objectIterator/objectIterator';
 import { isString } from 'ts-type-guards';
 import { ITargetMatcher } from '../../../interfaces/ITargetMatcher';
diff --git a/src/resolvers/ciResolver/impl/resolvers/travisci/travisCiResolver.ts b/src/resolvers/ciResolver/impl/resolvers/travisci/travisCiResolver.ts
@@ -7,8 +7,7 @@ import {
 import { inject, injectable } from 'inversify';
 import { FS, TYPES } from '../../../../../container/nodeModulesContainer';
 import { parse } from 'yaml';
-import { ILoggerFactory } from '../../../../../utils/logger';
-import { ILogger } from '../../../../../utils/logger/interfaces/ILogger';
+import { ILoggerFactory, ILogger } from '../../../../../utils/logger';
 import { TravisCiConfigParser } from './travisCiConfigParser';
 
 const ciFileName = `.travis.yml`;
diff --git a/src/resolvers/ciResolver/impl/specificCIResolverRunner.ts b/src/resolvers/ciResolver/impl/specificCIResolverRunner.ts
@@ -1,8 +1,7 @@
 import { injectable } from 'inversify';
 import { ITargetMatcher } from '../interfaces/ITargetMatcher';
 import { IResolverResult } from '../../types';
-import { ILoggerFactory } from '../../../utils/logger';
-import { ILogger } from '../../../utils/logger/interfaces/ILogger';
+import { ILoggerFactory, ILogger } from '../../../utils/logger';
 import { ISpecificCIResolverRunner, ISpecificCIResolverRunnerOptions } from '../interfaces/ISpecificCIResolverRunner';
 
 @injectable()
diff --git a/src/resolvers/ciResolver/impl/targetMatcher.ts b/src/resolvers/ciResolver/impl/targetMatcher.ts
@@ -2,8 +2,7 @@ import { IGetLtsVersionPlaceholderOptions, ITargetMatcher, ITargetMatcherOptions
 import { injectable } from 'inversify';
 import { INodeVersions } from '../../../utils/nodeVersions';
 import semver = require('semver');
-import { ILoggerFactory } from '../../../utils/logger';
-import { ILogger } from '../../../utils/logger/interfaces/ILogger';
+import { ILoggerFactory, ILogger } from '../../../utils/logger';
 
 const coerce = (version: string): string | undefined => {
   const coercedAll = semver.coerce(version);
diff --git a/src/resolvers/testResolver/impl/testResolver.ts b/src/resolvers/testResolver/impl/testResolver.ts
@@ -2,8 +2,7 @@ import { injectable } from 'inversify';
 import { IResolverResult } from '../../types';
 import { ITestResolver, ITestResolverOptions } from '../interfaces/ITestResolver';
 import { IYarn, IYarnOptions } from '../../../utils/yarn';
-import { ILoggerFactory } from '../../../utils/logger';
-import { ILogger } from '../../../utils/logger/interfaces/ILogger';
+import { ILoggerFactory, ILogger } from '../../../utils/logger';
 
 const resolverName = `yarn run test`;
 
diff --git a/src/utils/commandRunner/impl/commandRunner.ts b/src/utils/commandRunner/impl/commandRunner.ts
@@ -2,8 +2,7 @@ import { SpawnOptionsWithoutStdio } from 'child_process';
 import { inject, injectable } from 'inversify';
 import { IExecuteCommandOptions, ICommandRunner } from '../interfaces/ICommandRunner';
 import { Spawn, TYPES } from '../../../container/nodeModulesContainer';
-import { ILoggerFactory } from '../../logger';
-import { ILogger } from '../../logger/interfaces/ILogger';
+import { ILoggerFactory, ILogger } from '../../logger';
 
 interface IPromisifiedSpawnOptions {
   command: string;
diff --git a/src/utils/git/impl/git.ts b/src/utils/git/impl/git.ts
@@ -1,7 +1,6 @@
 import { inject, injectable } from 'inversify';
 import { SimpleGitFn, TYPES } from '../../../container/nodeModulesContainer';
-import { ILoggerFactory } from '../../logger';
-import { ILogger } from '../../logger/interfaces/ILogger';
+import { ILoggerFactory, ILogger } from '../../logger';
 import { SimpleGit } from 'simple-git/promise';
 
 export interface ICheckoutCommitOptions {
diff --git a/src/utils/git/impl/gitCheckout.ts b/src/utils/git/impl/gitCheckout.ts
@@ -4,8 +4,7 @@ import { ICheckoutOptions, ICheckoutResult, IGitCheckout } from '../interfaces/I
 import { getRepoDirName } from './getRepoDirName';
 import { Git } from './git';
 import { FS, TYPES } from '../../../container/nodeModulesContainer';
-import { ILoggerFactory } from '../../logger';
-import { ILogger } from '../../logger/interfaces/ILogger';
+import { ILoggerFactory, ILogger } from '../../logger';
 
 @injectable()
 export class GitCheckout extends IGitCheckout {
diff --git a/src/utils/logger/impl/logLevel.ts b/src/utils/logger/impl/logLevel.ts
@@ -1,5 +1,5 @@
 import { LogLevel as ConsolaLogLevel } from 'consola';
-import { LogLevel } from '../interfaces/ILogger';
+import { LogLevel } from '../interfaces/ILoggerSettings';
 
 const logLevelMap = {
   [LogLevel.ERROR]: ConsolaLogLevel.Error,
@@ -8,8 +8,8 @@ const logLevelMap = {
   [LogLevel.INFO]: ConsolaLogLevel.Info,
   [LogLevel.DEBUG]: ConsolaLogLevel.Debug,
   [LogLevel.TRACE]: ConsolaLogLevel.Trace,
-  [LogLevel.SILENT]: -ConsolaLogLevel.Silent, // Hack until the issue in conosla is fixed
-  [LogLevel.VERBOSE]: ConsolaLogLevel.Silent, // Hack until the issue in conosla is fixed
+  [LogLevel.SILENT]: -ConsolaLogLevel.Silent, // Hack until the issue in conosla is fixed. Need to also give restrictive type to object
+  [LogLevel.VERBOSE]: ConsolaLogLevel.Silent, // Hack until the issue in conosla is fixed. Need to also give restrictive type to object
 };
 
 export const getConoslaLogLevel = (level: LogLevel): ConsolaLogLevel => logLevelMap[level];
diff --git a/src/utils/logger/impl/logger.ts b/src/utils/logger/impl/logger.ts
diff --git a/src/utils/logger/impl/loggerFactory.ts b/src/utils/logger/impl/loggerFactory.ts
@@ -2,9 +2,9 @@ import { inject, injectable } from 'inversify';
 import { ILoggerFactory } from '../interfaces/ILoggerFactory';
 import { Consola, ConsolaOptions, ConsolaReporter } from 'consola';
 import { memoize } from '../../memoize/memoize';
-import { ILoggerSettings } from '../interfaces/ILoggerSettings';
+import { ILoggerSettings, LogLevel } from '../interfaces/ILoggerSettings';
+import { ILogger } from '../interfaces/ILogger';
 import * as chalk from 'chalk';
-import { ILogger, LogLevel } from '../interfaces/ILogger';
 import { LogReporter } from './logReporter';
 import { getConoslaLogLevel } from './logLevel';
 import { JsonLogReporter } from './jsonLogReporter';
diff --git a/src/utils/logger/index.ts b/src/utils/logger/index.ts
@@ -9,3 +9,4 @@ export const loggerModuleBinder = (bind: Bind): void => {
 
 export * from './interfaces/ILoggerFactory';
 export * from './interfaces/ILoggerSettings';
+export * from './interfaces/ILogger';
diff --git a/src/utils/logger/interfaces/ILogger.ts b/src/utils/logger/interfaces/ILogger.ts
@@ -1,14 +1,3 @@
-export enum LogLevel {
-  ERROR,
-  WARN,
-  LOG,
-  INFO,
-  DEBUG,
-  TRACE,
-  SILENT,
-  VERBOSE,
-}
-
 export interface ILogger {
   fatal(...args: unknown[]): void;
 
diff --git a/src/utils/logger/interfaces/ILoggerSettings.ts b/src/utils/logger/interfaces/ILoggerSettings.ts
@@ -1,4 +1,13 @@
-import { LogLevel } from './ILogger';
+export enum LogLevel {
+  ERROR,
+  WARN,
+  LOG,
+  INFO,
+  DEBUG,
+  TRACE,
+  SILENT,
+  VERBOSE,
+}
 
 export abstract class ILoggerSettings {
   public abstract readonly logLevel: LogLevel | undefined;
diff --git a/src/utils/nodeVersions/impl/nodeVersions.ts b/src/utils/nodeVersions/impl/nodeVersions.ts
@@ -4,8 +4,7 @@ import { Moment } from 'moment';
 import moment = require('moment');
 import { memoize } from '../../memoize/memoize';
 import { Axios, TYPES } from '../../../container/nodeModulesContainer';
-import { ILoggerFactory } from '../../logger';
-import { ILogger } from '../../logger/interfaces/ILogger';
+import { ILoggerFactory, ILogger } from '../../logger';
 import { O } from 'ts-toolbelt';
 
 const NODE_RELEASE_FILE = `https://raw.githubusercontent.com/nodejs/Release/master/schedule.json`;
diff --git a/src/utils/packageInfo/impl/packageInfo.ts b/src/utils/packageInfo/impl/packageInfo.ts
@@ -6,8 +6,7 @@ import {
   IPackageVersionOptions,
 } from '../interfaces/IPackageInfo';
 import { Pacote, TYPES } from '../../../container/nodeModulesContainer';
-import { ILoggerFactory } from '../../logger';
-import { ILogger } from '../../logger/interfaces/ILogger';
+import { ILoggerFactory, ILogger } from '../../logger';
 import moment = require('moment');
 import { memoize } from '../../memoize/memoize';
 
diff --git a/src/utils/yarn/impl/yarn.ts b/src/utils/yarn/impl/yarn.ts
@@ -1,8 +1,7 @@
 import { ICommandRunner } from '../../commandRunner';
 import { IYarn, IYarnOptions } from '../interfaces/IYarn';
 import { injectable } from 'inversify';
-import { ILoggerFactory } from '../../logger';
-import { ILogger } from '../../logger/interfaces/ILogger';
+import { ILoggerFactory, ILogger } from '../../logger';
 
 @injectable()
 export class Yarn extends IYarn {
diff --git a/test/common/logger.ts b/test/common/logger.ts
@@ -1,6 +1,5 @@
 import { LoggerFactory } from '../../src/utils/logger/impl/loggerFactory';
-import { ILoggerFactory, ILoggerSettings } from '../../src/utils/logger';
-import { LogLevel } from '../../src/utils/logger/interfaces/ILogger';
+import { ILoggerFactory, ILoggerSettings, LogLevel } from '../../src/utils/logger';
 import * as fs from 'fs';
 
 export const loggerSettings: ILoggerSettings = {
diff --git a/test/src/utils/commandRunner/impl/commandRunner.spec.ts b/test/src/utils/commandRunner/impl/commandRunner.spec.ts
@@ -1,8 +1,7 @@
 import { CommandRunner } from '../../../../../src/utils/commandRunner/impl/commandRunner';
 // @ts-ignore
 import mockSpawn = require('mock-spawn');
-import { ILoggerFactory } from '../../../../../src/utils/logger';
-import { ILogger } from '../../../../../src/utils/logger/interfaces/ILogger';
+import { ILoggerFactory, ILogger } from '../../../../../src/utils/logger';
 import { mock, mockReset } from 'jest-mock-extended';
 import { Spawn } from '../../../../../src/container/nodeModulesContainer';
 
diff --git a/test/src/utils/logger/impl/logLevel.spec.ts b/test/src/utils/logger/impl/logLevel.spec.ts
@@ -1,6 +1,6 @@
-import { LogLevel } from '../../../../../src/utils/logger/interfaces/ILogger';
 import { LogLevel as ConsolaLogLevel } from 'consola';
 import { getConoslaLogLevel } from '../../../../../src/utils/logger/impl/logLevel';
+import { LogLevel } from '../../../../../src/utils/logger';
 
 describe(`log level`, () => {
   describe(`get conosla log level`, () => {
diff --git a/test/src/utils/logger/impl/loggerFactory.spec.ts b/test/src/utils/logger/impl/loggerFactory.spec.ts
@@ -1,6 +1,5 @@
-import { ILoggerSettings } from '../../../../../src/utils/logger';
+import { ILoggerSettings, LogLevel } from '../../../../../src/utils/logger';
 import { LoggerFactory } from '../../../../../src/utils/logger/impl/loggerFactory';
-import { LogLevel } from '../../../../../src/utils/logger/interfaces/ILogger';
 import * as tmp from 'tmp';
 import { FS } from '../../../../../src/container/nodeModulesContainer';
 import { mock, mockReset } from 'jest-mock-extended';
diff --git a/test/src/utils/nodeVersions/impl/nodeVersions.spec.ts b/test/src/utils/nodeVersions/impl/nodeVersions.spec.ts
@@ -2,8 +2,7 @@ import moment = require('moment');
 import { NodeVersions } from '../../../../../src/utils/nodeVersions/impl/nodeVersions';
 import { Axios } from '../../../../../src/container/nodeModulesContainer';
 import { mock, mockReset } from 'jest-mock-extended';
-import { ILogger } from '../../../../../src/utils/logger/interfaces/ILogger';
-import { ILoggerFactory } from '../../../../../src/utils/logger';
+import { ILoggerFactory, ILogger } from '../../../../../src/utils/logger';
 
 const dateFormat = `YYYY-MM-DD`;
 
diff --git a/tools/utils/logger.ts b/tools/utils/logger.ts
@@ -1,6 +1,5 @@
 import { LoggerFactory } from '../../src/utils/logger/impl/loggerFactory';
-import { ILoggerFactory, ILoggerSettings } from '../../src/utils/logger';
-import { LogLevel } from '../../src/utils/logger/interfaces/ILogger';
+import { ILoggerFactory, ILoggerSettings, LogLevel } from '../../src/utils/logger';
 import * as fs from 'fs';
 
 export const loggerSettings: ILoggerSettings = {
diff --git a/tsconfig.test.json b/tsconfig.test.json
@@ -1,7 +1,9 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
+    "noEmit": false,
+    "outDir": "dist",
     "incremental": true,
-    "tsBuildInfoFile": ".buildcache"
+    "tsBuildInfoFile": ".cache/.buildcache"
   }
 }
