[REF] charts: dataset with { value, format }

`data` was typed as `any`.
This is not a good thing in itself.
Moreover, it was only the values without the format.
Also typeof is extremely permissive

Author: LucasLefevre

packages/o-spreadsheet-engine/src/helpers/cells/cell_evaluation.ts

@@ -129,6 +129,48 @@ function _createEvaluatedCell(
   return textCell(value, format, formattedValue);
 }
 
+export function isNumberCell(
+  result: FunctionResultObject | undefined
+): result is { value: number } {
+  return !!result && getEvaluatedCellType(result) === CellValueType.number;
+}
+
+export function isTextCell(result: FunctionResultObject | undefined): result is { value: string } {
+  return !!result && getEvaluatedCellType(result) === CellValueType.text;
+}
+
+export function isBooleanCell(
+  result: FunctionResultObject | undefined
+): result is { value: boolean } {
+  return !!result && getEvaluatedCellType(result) === CellValueType.boolean;
+}
+
+export function isEmptyCell(result: FunctionResultObject | undefined): result is { value: null } {
+  return !!result && getEvaluatedCellType(result) === CellValueType.empty;
+}
+
+export function isErrorCell(result: FunctionResultObject | undefined): result is { value: string } {
+  return !!result && getEvaluatedCellType(result) === CellValueType.error;
+}
+
+function getEvaluatedCellType({ value, format }: FunctionResultObject): CellValueType {
+  if (value === null) {
+    return CellValueType.empty;
+  } else if (isEvaluationError(value)) {
+    return CellValueType.error;
+  } else if (isTextFormat(format)) {
+    return CellValueType.text;
+  }
+  switch (typeof value) {
+    case "number":
+      return CellValueType.number;
+    case "boolean":
+      return CellValueType.boolean;
+    case "string":
+      return CellValueType.text;
+  }
+}
+
 function textCell(
   value: string,
   format: string | undefined,

packages/o-spreadsheet-engine/src/plugins/ui_core_views/cell_evaluation/evaluation_plugin.ts

@@ -259,10 +259,10 @@ export class EvaluationPlugin extends CoreViewPlugin {
   /**
    * Return the value of each cell in the range.
    */
-  getRangeValues(range: Range): CellValue[] {
+  getRangeValues(range: Range): EvaluatedCell[] {
     const sheet = this.getters.tryGetSheet(range.sheetId);
     if (sheet === undefined) return [];
-    return this.mapVisiblePositions(range, (p) => this.getters.getEvaluatedCell(p).value);
+    return this.mapVisiblePositions(range, (p) => this.getters.getEvaluatedCell(p));
   }
 
   /**

packages/o-spreadsheet-engine/src/types/chart/chart.ts

@@ -1,5 +1,5 @@
 import { Point } from "chart.js";
-import { Align, Color, VerticalAlign } from "../misc";
+import { Align, Color, FunctionResultObject, VerticalAlign } from "../misc";
 import { XlsxHexColor } from "../xlsx";
 import { BarChartDefinition, BarChartRuntime } from "./bar_chart";
 import { ComboChartDefinition, ComboChartRuntime } from "./combo_chart";
@@ -93,7 +93,7 @@ export interface LabelValues {
 
 export interface DatasetValues {
   readonly label?: string;
-  readonly data: any[];
+  readonly data: FunctionResultObject[];
   readonly hidden?: boolean;
 }
 

src/helpers/figures/charts/pyramid_chart.ts

@@ -1,5 +1,6 @@
 import { CoreGetters, Validator } from "@odoo/o-spreadsheet-engine";
 import { BACKGROUND_CHART_COLOR } from "@odoo/o-spreadsheet-engine/constants";
+import { isNumberCell } from "@odoo/o-spreadsheet-engine/helpers/cells/cell_evaluation";
 import { AbstractChart } from "@odoo/o-spreadsheet-engine/helpers/figures/charts/abstract_chart";
 import {
   chartFontColor,
@@ -197,7 +198,11 @@ export class PyramidChart extends AbstractChart {
     const chartData = getPyramidChartData(definition, this.dataSets, this.labelRange, getters);
     const { dataSetsValues } = chartData;
     const maxValue = Math.max(
-      ...dataSetsValues.map((dataSet) => Math.max(...dataSet.data.map(Math.abs)))
+      ...dataSetsValues.map((dataSet) =>
+        Math.max(
+          ...dataSet.data.map((cell) => (isNumberCell(cell) ? Math.abs(cell.value) : -Infinity))
+        )
+      )
     );
     return {
       ...definition,