From 479fd71873d96fc22688c8588579ed5b2bf89605 Mon Sep 17 00:00:00 2001 From: Junhao Liao Date: Sun, 10 Nov 2024 20:39:28 -0500 Subject: [PATCH] Rename `DecodeResultType` -> `DecodeResult`; Update `DecodeResult` as per https://github.com/y-scope/clp-ffi-js/pull/34 --- src/services/decoders/ClpIrDecoder.ts | 6 +++--- src/services/decoders/JsonlDecoder/index.ts | 10 +++++----- src/typings/decoders.ts | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/services/decoders/ClpIrDecoder.ts b/src/services/decoders/ClpIrDecoder.ts index c4895a5a..df59c9f3 100644 --- a/src/services/decoders/ClpIrDecoder.ts +++ b/src/services/decoders/ClpIrDecoder.ts @@ -4,7 +4,7 @@ import {Dayjs} from "dayjs"; import {Nullable} from "../../typings/common"; import { Decoder, - DecodeResultType, + DecodeResult, DecoderOptions, FilteredLogEventMap, LogEventCount, @@ -95,8 +95,8 @@ class ClpIrDecoder implements Decoder { beginIdx: number, endIdx: number, useFilter: boolean - ): Nullable { - const results: DecodeResultType[] = + ): Nullable { + const results: DecodeResult[] = this.#streamReader.decodeRange(beginIdx, endIdx, useFilter); if (this.#streamType === CLP_IR_STREAM_TYPE.UNSTRUCTURED) { diff --git a/src/services/decoders/JsonlDecoder/index.ts b/src/services/decoders/JsonlDecoder/index.ts index 63ad2ce3..5b873ed7 100644 --- a/src/services/decoders/JsonlDecoder/index.ts +++ b/src/services/decoders/JsonlDecoder/index.ts @@ -3,7 +3,7 @@ import {Dayjs} from "dayjs"; import {Nullable} from "../../../typings/common"; import { Decoder, - DecodeResultType, + DecodeResult, DecoderOptions, FilteredLogEventMap, LogEventCount, @@ -91,7 +91,7 @@ class JsonlDecoder implements Decoder { beginIdx: number, endIdx: number, useFilter: boolean, - ): Nullable { + ): Nullable { if (useFilter && null === this.#filteredLogEventMap) { return null; } @@ -104,7 +104,7 @@ class JsonlDecoder implements Decoder { return null; } - const results: DecodeResultType[] = []; + const results: DecodeResult[] = []; for (let i = beginIdx; i < endIdx; i++) { // Explicit cast since typescript thinks `#filteredLogEventMap[i]` can be undefined, but // it shouldn't be since we performed a bounds check at the beginning of the method. @@ -204,12 +204,12 @@ class JsonlDecoder implements Decoder { } /** - * Decodes a log event into a `DecodeResultType`. + * Decodes a log event into a `DecodeResult`. * * @param logEventIdx * @return The decoded log event. */ - #decodeLogEvent = (logEventIdx: number): DecodeResultType => { + #decodeLogEvent = (logEventIdx: number): DecodeResult => { let timestamp: number; let message: string; let logLevel: LOG_LEVEL; diff --git a/src/typings/decoders.ts b/src/typings/decoders.ts index fb7552a6..1eaa0cb5 100644 --- a/src/typings/decoders.ts +++ b/src/typings/decoders.ts @@ -27,7 +27,7 @@ interface DecoderOptions { * @property level * @property number */ -type DecodeResultType = [string, number, number, number]; +type DecodeResult = [string, bigint, number, number]; /** * Mapping between an index in the filtered log events collection to an index in the unfiltered log @@ -97,13 +97,13 @@ interface Decoder { beginIdx: number, endIdx: number, useFilter: boolean - ): Nullable; + ): Nullable; } export type { ActiveLogCollectionEventIdx, Decoder, - DecodeResultType, + DecodeResult, DecoderOptions, FilteredLogEventMap, LogEventCount,