From b5e9eb26baf4a0dd71f0d9c69a898fd747f59a71 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 17 Nov 2021 14:33:58 +0100 Subject: [PATCH] reduce size of ILogItem interface further --- src/logging/BaseLogger.ts | 2 +- src/logging/ConsoleLogger.ts | 5 +++-- src/logging/types.ts | 12 +++++------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/logging/BaseLogger.ts b/src/logging/BaseLogger.ts index 7112c948..723c2f17 100644 --- a/src/logging/BaseLogger.ts +++ b/src/logging/BaseLogger.ts @@ -139,7 +139,7 @@ export abstract class BaseLogger implements ILogger { this._openItems.clear(); } - abstract _persistItem(item: ILogItem, filter?: LogFilter, forced?: boolean): void; + abstract _persistItem(item: LogItem, filter?: LogFilter, forced?: boolean): void; abstract export(): Promise; diff --git a/src/logging/ConsoleLogger.ts b/src/logging/ConsoleLogger.ts index f2a2efd1..f48c72b2 100644 --- a/src/logging/ConsoleLogger.ts +++ b/src/logging/ConsoleLogger.ts @@ -14,10 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. */ import {BaseLogger} from "./BaseLogger"; +import {LogItem} from "./LogItem"; import type {ILogItem, LogItemValues, ILogExport} from "./types"; export class ConsoleLogger extends BaseLogger { - _persistItem(item: ILogItem): void { + _persistItem(item: LogItem): void { printToConsole(item); } @@ -37,7 +38,7 @@ function filterValues(values: LogItemValues): LogItemValues | null { }, null); } -function printToConsole(item: ILogItem): void { +function printToConsole(item: LogItem): void { const label = `${itemCaption(item)} (${item.duration}ms)`; const filteredValues = filterValues(item.values); const shouldGroup = item.children || filteredValues; diff --git a/src/logging/types.ts b/src/logging/types.ts index f90572e5..01755960 100644 --- a/src/logging/types.ts +++ b/src/logging/types.ts @@ -34,15 +34,13 @@ export interface ISerializedItem { }; export interface ILogItem { - logger: any; - level: typeof LogLevel; - duration?: number; - end?: number; - start?: number; logLevel: LogLevel; - children?: Array; - values: LogItemValues; error?: Error; + readonly logger: ILogger; + readonly level: typeof LogLevel; + readonly end?: number; + readonly start?: number; + readonly values: LogItemValues; wrap(labelOrValues: LabelOrValues, callback: LogCallback, logLevel?: LogLevel, filterCreator?: FilterCreator): T; log(labelOrValues: LabelOrValues, logLevel?: LogLevel): void; set(key: string | object, value: unknown): void;