From 7db5de9469094f76ea8177ef0acaa12c73b3119a Mon Sep 17 00:00:00 2001 From: Matthew Khouzam Date: Mon, 23 Jan 2023 21:58:36 -0500 Subject: [PATCH 1/2] Update to speedytsp Signed-off-by: Matthew Khouzam --- tsp-typescript-client/src/models/timegraph.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tsp-typescript-client/src/models/timegraph.ts b/tsp-typescript-client/src/models/timegraph.ts index 07a21a1..2f06e84 100644 --- a/tsp-typescript-client/src/models/timegraph.ts +++ b/tsp-typescript-client/src/models/timegraph.ts @@ -64,6 +64,8 @@ export interface TimeGraphState { } export const TimeGraphRow = createNormalizer({ + labels: array(String), + styles: array(OutputElementStyle), entryId: assertNumber, states: array(TimeGraphState), }); @@ -72,6 +74,15 @@ export const TimeGraphRow = createNormalizer({ * Time graph row described by an array of states for a specific entry */ export interface TimeGraphRow { + /** + * Labels for the row + */ + labels: String[]; + + /** + * Styles for the row + */ + styles: OutputElementStyle[] /** * Entry Id associated to the state array */ From c053e5c7bd0fc086531fea01083dcf89b36b2d03 Mon Sep 17 00:00:00 2001 From: Matthew Khouzam Date: Mon, 23 Jan 2023 22:54:30 -0500 Subject: [PATCH 2/2] update tsp-client for speedyTSP. I wish I knew how to fix the deserialization so it would be transparent to clients Signed-off-by: Matthew Khouzam --- tsp-typescript-client/src/models/timegraph.ts | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tsp-typescript-client/src/models/timegraph.ts b/tsp-typescript-client/src/models/timegraph.ts index 2f06e84..0049065 100644 --- a/tsp-typescript-client/src/models/timegraph.ts +++ b/tsp-typescript-client/src/models/timegraph.ts @@ -29,8 +29,9 @@ export interface TimeGraphEntry extends Entry { const TimeGraphState = createNormalizer({ end: BigInt, start: BigInt, + label: assertNumber, tags: assertNumber, - style: OutputElementStyle, + style: assertNumber, }); /** @@ -50,7 +51,7 @@ export interface TimeGraphState { /** * Label to apply to the state */ - label?: string; + label?: number; /** * Tags for the state, used when the state pass a filter @@ -60,13 +61,13 @@ export interface TimeGraphState { /** * Optional information on the style to format this state */ - style?: OutputElementStyle; + style?: number; } export const TimeGraphRow = createNormalizer({ - labels: array(String), styles: array(OutputElementStyle), entryId: assertNumber, + startTime: BigInt, states: array(TimeGraphState), }); @@ -77,17 +78,23 @@ export interface TimeGraphRow { /** * Labels for the row */ - labels: String[]; + labels: string[]; /** * Styles for the row */ styles: OutputElementStyle[] + /** * Entry Id associated to the state array */ entryId: number; + /** + * Start time of the row + */ + startTime: bigint; + /** * Array of states */