Update parsing of sampling to match tsp specification (#354)

Update parsing of sampling to match tsp specification

The tsp-typescript-client was modified to comply to tsp
specification for sampling, update accordingly here.

Account for new xRanges and xCategories for generic xy output component.

Contributes to fix:
eclipse-tracecompass-incubator/org.eclipse.tracecompass.incubator#236

Upgrade to tsp-typescript-client v0.9.0.

Signed-off-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Co-authored-by: Siwei Zhang <siwei.zhang@ericsson.com>
Co-authored-by: Bernd Hufmann <bernd.hufmann@ericsson.com>

Author: 3 people

local-libs/traceviewer-libs/base/package.json

@@ -16,7 +16,7 @@
         "src"
     ],
     "dependencies": {
-        "tsp-typescript-client": "^0.8.0"
+        "tsp-typescript-client": "^0.9.0"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^6.0.0",

local-libs/traceviewer-libs/react-components/package.json

@@ -36,7 +36,7 @@
         "react-virtualized": "^9.21.0",
         "timeline-chart": "^0.4.2",
         "traceviewer-base": "0.9.1",
-        "tsp-typescript-client": "^0.8.0"
+        "tsp-typescript-client": "^0.9.0"
     },
     "devDependencies": {
         "@testing-library/react": "^15.0.6",

local-libs/traceviewer-libs/react-components/src/components/generic-xy-output-component.tsx

@@ -320,8 +320,7 @@ export class GenericXYOutputComponent extends AbstractTreeOutputComponent<Generi
 
         const style = (series[0] as any)?.style?.values?.['series-type'] as string | undefined;
         const st = style?.toLowerCase();
-        const xv = series[0].xValues as Sampling;
-        this.isTimeAxis = isTimestampSampling(xv);
+        this.isTimeAxis = !!series[0].xValues;
         this.mode = st === 'scatter' ? ChartMode.SCATTER : st === 'line' ? ChartMode.LINE : ChartMode.BAR;
 
         const xy = this.buildXYData(series, this.mode);
@@ -342,9 +341,9 @@ export class GenericXYOutputComponent extends AbstractTreeOutputComponent<Generi
     }
 
     private buildBarChartData(seriesObj: XYSeries[]): GenericXYData {
-        const xValues = seriesObj[0].xValues;
+        const xValues = seriesObj[0].xValues ?? seriesObj[0].xRanges ?? seriesObj[0].xCategories;
         const unit = seriesObj[0]?.xValuesDescription?.unit || '';
-        const labels = this.buildLabels(xValues, unit);
+        const labels = this.buildLabels(xValues as Sampling, unit);
         const datasets: GenericXYData['datasets'] = seriesObj.map(s => {
             const color = this.colors.get(s.seriesName);
             return {
@@ -361,9 +360,9 @@ export class GenericXYOutputComponent extends AbstractTreeOutputComponent<Generi
     }
 
     private buildLineOrScatterChartData(seriesObj: XYSeries[], mode: ChartMode): GenericXYData {
-        const xValues = seriesObj[0].xValues;
+        const xValues = seriesObj[0].xValues ?? seriesObj[0].xRanges ?? seriesObj[0].xCategories;
         const unit = seriesObj[0]?.xValuesDescription?.unit || '';
-        const labels = this.buildLabels(xValues, unit);
+        const labels = this.buildLabels(xValues as Sampling, unit);
 
         const datasets: GenericXYData['datasets'] = seriesObj.map(s => {
             const color = this.colors.get(s.seriesName);
@@ -388,7 +387,7 @@ export class GenericXYOutputComponent extends AbstractTreeOutputComponent<Generi
 
     private buildLabels(xValues: Sampling, unit: string): string[] {
         if (isRangeSampling(xValues)) {
-            return xValues.map(range => `[${range[0]} ${unit}, ${range[1]} ${unit}]`);
+            return xValues.map(range => `[${range.start} ${unit}, ${range.end} ${unit}]`);
         } else if (isCategorySampling(xValues)) {
             return xValues.map(val => `${val} ${unit}`);
         } else if (isTimestampSampling(xValues)) {

vscode-trace-common/package.json

@@ -10,7 +10,7 @@
     ],
     "dependencies": {
         "traceviewer-base": "^0.9.1",
-        "tsp-typescript-client": "^0.8.0",
+        "tsp-typescript-client": "^0.9.0",
         "vscode-messenger": "^0.5.0"
     },
     "devDependencies": {

yarn.lock

@@ -9786,10 +9786,10 @@ tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
 
-tsp-typescript-client@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/tsp-typescript-client/-/tsp-typescript-client-0.8.0.tgz#954a58acf53e52e57796e5fc2e3fe1f512c2af45"
-  integrity sha512-dad+EVvP3bIosuskKzZxPwiuT47ewq0rXOrg/SMnFqdE5QVXyn3MhDcXFYH9iNxRvu2zQcb+DMigN/WOcdMrEQ==
+tsp-typescript-client@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.npmjs.org/tsp-typescript-client/-/tsp-typescript-client-0.9.0.tgz#631b57635560f23a96dd8391db345bb0e645b7c5"
+  integrity sha512-tftuTbID6t9m+hJ6LRHbCC5dkRL//OcGladeDtbiwe1Te/HknO8XmYNvsx0xRa8MpPUG9Th15ON4whXfzzBUew==
   dependencies:
     json-bigint sidorares/json-bigint#2c0a5f896d7888e68e5f4ae3c7ea5cd42fd54473
     node-fetch "^2.6.0"