@odoo/o-spreadsheet 17.4.0-alpha.3 → 17.4.0-alpha.4

package/dist/o-spreadsheet.iife.js

@@ -3,9 +3,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.4.0-alpha.3
- * @date 2024-06-10T09:38:53.982Z
- * @hash a45ed6a
+ * @version 17.4.0-alpha.4
+ * @date 2024-06-12T14:00:22.046Z
+ * @hash cefb0e4
  */
 
 (function (exports, owl) {
@@ -1827,22 +1827,28 @@
    */
   const getFormulaNumberRegex = memoize(function getFormulaNumberRegex(decimalSeparator) {
       decimalSeparator = escapeRegExp(decimalSeparator);
-      return new RegExp(`(^-?\\d+(${decimalSeparator}?\\d*(e\\d+)?)?|^-?${decimalSeparator}\\d+)(?!\\w|!)`);
+      return new RegExp(`(?:^-?\\d+(?:${decimalSeparator}?\\d*(?:e\\d+)?)?|^-?${decimalSeparator}\\d+)(?!\\w|!)`);
   });
   const getNumberRegex = memoize(function getNumberRegex(locale) {
       const decimalSeparator = escapeRegExp(locale.decimalSeparator);
       const thousandsSeparator = escapeRegExp(locale.thousandsSeparator);
-      const pIntegerAndDecimals = `(\\d+(${thousandsSeparator}\\d{3,})*(${decimalSeparator}\\d*)?)`; // pattern that match integer number with or without decimal digits
-      const pOnlyDecimals = `(${decimalSeparator}\\d+)`; // pattern that match only expression with decimal digits
-      const pScientificFormat = "(e(\\+|-)?\\d+)?"; // pattern that match scientific format between zero and one time (should be placed before pPercentFormat)
-      const pPercentFormat = "(\\s*%)?"; // pattern that match percent symbol between zero and one time
-      const pNumber = "(\\s*" + pIntegerAndDecimals + "|" + pOnlyDecimals + ")" + pScientificFormat + pPercentFormat;
-      const pMinus = "(\\s*-)?"; // pattern that match negative symbol between zero and one time
-      const pCurrencyFormat = "(\\s*[\\$€])?";
+      const pIntegerAndDecimals = `(?:\\d+(?:${thousandsSeparator}\\d{3,})*(?:${decimalSeparator}\\d*)?)`; // pattern that match integer number with or without decimal digits
+      const pOnlyDecimals = `(?:${decimalSeparator}\\d+)`; // pattern that match only expression with decimal digits
+      const pScientificFormat = "(?:e(?:\\+|-)?\\d+)?"; // pattern that match scientific format between zero and one time (should be placed before pPercentFormat)
+      const pPercentFormat = "(?:\\s*%)?"; // pattern that match percent symbol between zero and one time
+      const pNumber = "(?:\\s*" +
+          pIntegerAndDecimals +
+          "|" +
+          pOnlyDecimals +
+          ")" +
+          pScientificFormat +
+          pPercentFormat;
+      const pMinus = "(?:\\s*-)?"; // pattern that match negative symbol between zero and one time
+      const pCurrencyFormat = "(?:\\s*[\\$€])?";
       const p1 = pMinus + pCurrencyFormat + pNumber;
       const p2 = pMinus + pNumber + pCurrencyFormat;
       const p3 = pCurrencyFormat + pMinus + pNumber;
-      const pNumberExp = "^((" + [p1, p2, p3].join(")|(") + "))$";
+      const pNumberExp = "^(?:(?:" + [p1, p2, p3].join(")|(?:") + "))$";
       const numberRegexp = new RegExp(pNumberExp, "i");
       return numberRegexp;
   });
@@ -2780,7 +2786,7 @@
           return false;
       }
       if (typeof operand === "number" && operator === "=") {
-          return toString(value) === toString(operand);
+          return value.toString() === operand.toString();
       }
       if (operator === "<>" || operator === "=") {
           let result;
@@ -2840,14 +2846,13 @@
       if (countArg % 2 === 1) {
           throw new EvaluationError(_t("Function [[FUNCTION_NAME]] expects criteria_range and criterion to be in pairs."));
       }
-      const dimRow = args[0].length;
-      const dimCol = args[0][0].length;
+      const firstArg = toMatrix(args[0]);
+      const dimRow = firstArg.length;
+      const dimCol = firstArg[0].length;
       let predicates = [];
       for (let i = 0; i < countArg - 1; i += 2) {
-          const criteriaRange = args[i];
-          if (!isMatrix(criteriaRange) ||
-              criteriaRange.length !== dimRow ||
-              criteriaRange[0].length !== dimCol) {
+          const criteriaRange = toMatrix(args[i]);
+          if (criteriaRange.length !== dimRow || criteriaRange[0].length !== dimCol) {
               throw new EvaluationError(_t("Function [[FUNCTION_NAME]] expects criteria_range to have the same dimension"));
           }
           const description = toString(args[i + 1]);
@@ -2861,7 +2866,7 @@
           for (let j = 0; j < dimCol; j++) {
               let validatedPredicates = true;
               for (let k = 0; k < countArg - 1; k += 2) {
-                  const criteriaValue = args[k][i][j].value;
+                  const criteriaValue = toMatrix(args[k])[i][j].value;
                   const criterion = predicates[k / 2];
                   validatedPredicates = evaluatePredicate(criteriaValue ?? undefined, criterion);
                   if (!validatedPredicates) {
@@ -3526,10 +3531,8 @@
       const internalDate = parseDateTime(content, locale);
       return internalDate.format;
   }
+  /** use this function only if the content corresponds to a number (means that isNumber(content) return true */
   function detectNumberFormat(content) {
-      if (!isNumber(content, DEFAULT_LOCALE)) {
-          return undefined;
-      }
       const digitBase = content.includes(".") ? "0.00" : "0";
       const matchedCurrencies = content.match(/[\$€]/);
       if (matchedCurrencies) {
@@ -4732,21 +4735,16 @@
    * Check if two zones are contiguous, ie. that they share a border
    */
   function areZoneContiguous(zone1, zone2) {
-      const u = union(zone1, zone2);
       if (zone1.right + 1 === zone2.left || zone1.left === zone2.right + 1) {
-          return getZoneHeight(u) <= getZoneHeight(zone1) + getZoneHeight(zone2);
+          return ((zone1.top <= zone2.bottom && zone1.top >= zone2.top) ||
+              (zone2.top <= zone1.bottom && zone2.top >= zone1.top));
       }
       if (zone1.bottom + 1 === zone2.top || zone1.top === zone2.bottom + 1) {
-          return getZoneWidth(u) <= getZoneWidth(zone1) + getZoneWidth(zone2);
+          return ((zone1.left <= zone2.right && zone1.left >= zone2.left) ||
+              (zone2.left <= zone1.right && zone2.left >= zone1.left));
       }
       return false;
   }
-  function getZoneHeight(zone) {
-      return zone.bottom - zone.top + 1;
-  }
-  function getZoneWidth(zone) {
-      return zone.right - zone.left + 1;
-  }
   /**
    * Merge contiguous and overlapping zones that are in the array into bigger zones
    */
@@ -5502,7 +5500,7 @@
       }
   }
 
-  function getClipboardDataPositions(zones) {
+  function getClipboardDataPositions(sheetId, zones) {
       const lefts = new Set(zones.map((z) => z.left));
       const rights = new Set(zones.map((z) => z.right));
       const tops = new Set(zones.map((z) => z.top));
@@ -5516,7 +5514,7 @@
       const cellsPosition = clippedZones.map((zone) => positions(zone)).flat();
       const columnsIndexes = [...new Set(cellsPosition.map((p) => p.col))].sort((a, b) => a - b);
       const rowsIndexes = [...new Set(cellsPosition.map((p) => p.row))].sort((a, b) => a - b);
-      return { zones, clippedZones, columnsIndexes, rowsIndexes };
+      return { sheetId, zones, clippedZones, columnsIndexes, rowsIndexes };
   }
   /**
    * The clipped zone is copied as many times as it fits in the target.
@@ -5566,8 +5564,8 @@
       isCutAllowed(data) {
           return "Success" /* CommandResult.Success */;
       }
-      getPasteTarget(target, content, options) {
-          return { zones: [] };
+      getPasteTarget(sheetId, target, content, options) {
+          return { zones: [], sheetId };
       }
       convertOSClipboardData(data) {
           return;
@@ -5605,7 +5603,7 @@
 
   class BorderClipboardHandler extends AbstractCellClipboardHandler {
       copy(data) {
-          const sheetId = this.getters.getActiveSheetId();
+          const sheetId = data.sheetId;
           if (data.zones.length === 0) {
               return;
           }
@@ -5625,7 +5623,7 @@
           if (!content) {
               return;
           }
-          const sheetId = this.getters.getActiveSheetId();
+          const sheetId = target.sheetId;
           if (options?.pasteOption === "asValue") {
               return;
           }
@@ -6155,7 +6153,7 @@
           if (!("zones" in data) || !data.zones.length) {
               return;
           }
-          const sheetId = this.getters.getActiveSheetId();
+          const sheetId = data.sheetId;
           const zones = data.zones;
           if (!zones.length) {
               return {
@@ -6184,6 +6182,7 @@
                           format: evaluatedCell.format,
                           content,
                           isFormula: false,
+                          parsedValue: evaluatedCell.value,
                       };
                   }
                   cellsInRow.push({
@@ -6198,7 +6197,7 @@
           return {
               cells: clippedCells,
               zones: clippedZones,
-              sheetId: this.getters.getActiveSheetId(),
+              sheetId: data.sheetId,
           };
       }
       isPasteAllowed(sheetId, target, content, clipboardOptions) {
@@ -6226,7 +6225,7 @@
               return;
           }
           const zones = target.zones;
-          const sheetId = this.getters.getActiveSheetId();
+          const sheetId = target.sheetId;
           if (!options?.isCutOperation) {
               this.pasteFromCopy(sheetId, zones, content.cells, options);
           }
@@ -6234,11 +6233,12 @@
               this.pasteFromCut(sheetId, zones, content, options);
           }
       }
-      getPasteTarget(target, content, options) {
+      getPasteTarget(sheetId, target, content, options) {
           const width = content.cells[0].length;
           const height = content.cells.length;
           if (options?.isCutOperation) {
               return {
+                  sheetId,
                   zones: [
                       {
                           left: target[0].left,
@@ -6250,11 +6250,9 @@
               };
           }
           if (width === 1 && height === 1) {
-              return { zones: [] };
+              return { zones: [], sheetId };
           }
-          return {
-              zones: getPasteZones(target, content.cells),
-          };
+          return { sheetId, zones: getPasteZones(target, content.cells) };
       }
       pasteFromCut(sheetId, target, content, options) {
           this.clearClippedZones(content);
@@ -6377,7 +6375,7 @@
 
   class ChartClipboardHandler extends AbstractFigureClipboardHandler {
       copy(data) {
-          const sheetId = this.getters.getActiveSheetId();
+          const sheetId = data.sheetId;
           const figure = this.getters.getFigure(sheetId, data.figureId);
           if (!figure) {
               throw new Error(`No figure for the given id: ${data.figureId}`);
@@ -6397,22 +6395,19 @@
               copiedChart,
           };
       }
-      getPasteTarget(target, content, options) {
+      getPasteTarget(sheetId, target, content, options) {
           if (!content?.copiedFigure || !content?.copiedChart) {
-              return { zones: [] };
+              return { zones: [], sheetId };
           }
           const newId = new UuidGenerator().uuidv4();
-          return {
-              zones: [],
-              figureId: newId,
-          };
+          return { zones: [], figureId: newId, sheetId };
       }
       paste(target, clippedContent, options) {
           if (!clippedContent?.copiedFigure || !clippedContent?.copiedChart || !target.figureId) {
               return;
           }
           const { zones, figureId } = target;
-          const sheetId = this.getters.getActiveSheetId();
+          const sheetId = target.sheetId;
           const numCols = this.getters.getNumberCols(sheetId);
           const numRows = this.getters.getNumberRows(sheetId);
           const targetX = this.getters.getColDimensions(sheetId, zones[0].left).start;
@@ -6458,7 +6453,7 @@
               return;
           }
           const { rowsIndexes, columnsIndexes } = data;
-          const sheetId = this.getters.getActiveSheetId();
+          const sheetId = data.sheetId;
           const cellPositions = rowsIndexes.map((row) => columnsIndexes.map((col) => ({ col, row, sheetId })));
           return {
               cellPositions,
@@ -6472,7 +6467,7 @@
               return;
           }
           const zones = target.zones;
-          const sheetId = this.getters.getActiveSheetId();
+          const sheetId = target.sheetId;
           if (!options?.isCutOperation) {
               this.pasteFromCopy(sheetId, zones, clippedContent.cellPositions);
           }
@@ -6553,7 +6548,7 @@
               return;
           }
           const { rowsIndexes, columnsIndexes } = data;
-          const sheetId = this.getters.getActiveSheetId();
+          const sheetId = data.sheetId;
           const cellPositions = rowsIndexes.map((row) => columnsIndexes.map((col) => ({ col, row, sheetId })));
           return {
               cellPositions,
@@ -6570,7 +6565,7 @@
               return;
           }
           const zones = target.zones;
-          const sheetId = this.getters.getActiveSheetId();
+          const sheetId = target.sheetId;
           if (!options?.isCutOperation) {
               this.pasteFromCopy(sheetId, zones, clippedContent.cellPositions);
           }
@@ -6649,7 +6644,7 @@
 
   class ImageClipboardHandler extends AbstractFigureClipboardHandler {
       copy(data) {
-          const sheetId = this.getters.getActiveSheetId();
+          const sheetId = data.sheetId;
           const figure = this.getters.getFigure(sheetId, data.figureId);
           if (!figure) {
               throw new Error(`No figure for the given id: ${data.figureId}`);
@@ -6667,15 +6662,12 @@
               sheetId,
           };
       }
-      getPasteTarget(target, content, options) {
+      getPasteTarget(sheetId, target, content, options) {
           if (!content?.copiedFigure || !content?.copiedImage) {
-              return { zones: [] };
+              return { zones: [], sheetId };
           }
           const newId = new UuidGenerator().uuidv4();
-          return {
-              zones: [],
-              figureId: newId,
-          };
+          return { sheetId, zones: [], figureId: newId };
       }
       paste(target, clippedContent, options) {
           if (!clippedContent?.copiedFigure || !clippedContent?.copiedImage || !target.figureId) {
@@ -6746,8 +6738,7 @@
           if (options?.isCutOperation || !("zones" in target) || !target.zones.length) {
               return;
           }
-          const sheetId = this.getters.getActiveSheetId();
-          this.pasteFromCopy(sheetId, target.zones, content.cells, options);
+          this.pasteFromCopy(target.sheetId, target.zones, content.cells, options);
       }
       pasteZone(sheetId, col, row, cells) {
           for (const [r, rowCells] of cells.entries()) {
@@ -6807,7 +6798,7 @@
 
   class TableClipboardHandler extends AbstractCellClipboardHandler {
       copy(data) {
-          const sheetId = this.getters.getActiveSheetId();
+          const sheetId = data.sheetId;
           const { rowsIndexes, columnsIndexes, zones } = data;
           if (!zones || !rowsIndexes.length || !columnsIndexes.length) {
               return { tableCells: [[]], sheetId };
@@ -6849,7 +6840,7 @@
           }
           return {
               tableCells,
-              sheetId: this.getters.getActiveSheetId(),
+              sheetId: data.sheetId,
           };
       }
       /**
@@ -6871,7 +6862,7 @@
               return;
           }
           const zones = target.zones;
-          const sheetId = this.getters.getActiveSheetId();
+          const sheetId = target.sheetId;
           if (!options?.isCutOperation) {
               this.pasteFromCopy(sheetId, zones, content.tableCells, options);
           }
@@ -7633,10 +7624,8 @@
       return undefined;
   }
 
-  function evaluateLiteral(content = "", localeFormat) {
-      const value = localeFormat.format === PLAIN_TEXT_FORMAT
-          ? content
-          : parseLiteral(content, localeFormat.locale);
+  function evaluateLiteral(literalCell, localeFormat) {
+      const value = localeFormat.format === PLAIN_TEXT_FORMAT ? literalCell.content : literalCell.parsedValue;
       const fPayload = { value, format: localeFormat.format };
       return createEvaluatedCell(fPayload, localeFormat.locale);
   }
@@ -7648,10 +7637,11 @@
           return null;
       }
       if (isNumber(content, DEFAULT_LOCALE)) {
-          return toNumber(content, DEFAULT_LOCALE);
+          return parseNumber(content, DEFAULT_LOCALE);
       }
-      if (isDateTime(content, locale)) {
-          return toNumber(content, locale);
+      const internalDate = parseDateTime(content, locale);
+      if (internalDate) {
+          return internalDate.value;
       }
       if (isBoolean(content)) {
           return content.toUpperCase() === "TRUE" ? true : false;
@@ -7663,9 +7653,14 @@
       if (!link) {
           return _createEvaluatedCell(fPayload, locale, cell);
       }
+      const value = parseLiteral(link.label, locale);
+      const format = fPayload.format ||
+          (typeof value === "number"
+              ? detectDateFormat(link.label, locale) || detectNumberFormat(link.label)
+              : undefined);
       const linkPayload = {
-          value: parseLiteral(link.label, locale),
-          format: fPayload.format || detectDateFormat(link.label, locale) || detectNumberFormat(link.label),
+          value,
+          format,
       };
       return {
           ..._createEvaluatedCell(linkPayload, locale, cell),
@@ -10989,6 +10984,9 @@ stores.inject(MyMetaStore, storeInstance);
       if (types.some((t) => t.startsWith("RANGE"))) {
           result.acceptMatrix = true;
       }
+      if (types.every((t) => t.startsWith("RANGE"))) {
+          result.acceptMatrixOnly = true;
+      }
       return result;
   }
   /**
@@ -11243,7 +11241,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("rows (number)", _t("The number of rows in the constrained array.")),
           arg("columns (number)", _t("The number of columns in the constrained array.")),
       ],
-      returns: ["RANGE<ANY>"],
       compute: function (array, rows, columns) {
           const _array = toMatrix(array);
           const _rowsArg = toInteger(rows?.value, this.locale);
@@ -11266,15 +11263,19 @@ stores.inject(MyMetaStore, storeInstance);
           arg("col_num (number, range<number>)", _t("The first column index of the columns to be returned.")),
           arg("col_num2 (number, range<number>, repeating)", _t("The columns indexes of the columns to be returned.")),
       ],
-      returns: ["RANGE<ANY>"],
       compute: function (array, ...columns) {
           const _array = toMatrix(array);
           const _columns = flattenRowFirst(columns, (item) => toInteger(item?.value, this.locale));
-          assert(() => _columns.every((col) => col > 0 && col <= _array.length), _t("The columns arguments must be between 1 and %s (got %s).", _array.length.toString(), (_columns.find((col) => col <= 0 || col > _array.length) || 0).toString()));
+          const argOutOfRange = _columns.filter((col) => col === 0 || _array.length < Math.abs(col));
+          assert(() => argOutOfRange.length === 0, _t("The columns arguments must be between -%s and %s (got %s), excluding 0.", _array.length.toString(), _array.length.toString(), argOutOfRange.join(",")));
           const result = Array(_columns.length);
           for (let col = 0; col < _columns.length; col++) {
-              const colIndex = _columns[col] - 1; // -1 because columns arguments are 1-indexed
-              result[col] = _array[colIndex];
+              if (_columns[col] > 0) {
+                  result[col] = _array[_columns[col] - 1]; // -1 because columns arguments are 1-indexed
+              }
+              else {
+                  result[col] = _array[_array.length + _columns[col]];
+              }
           }
           return result;
       },
@@ -11290,13 +11291,18 @@ stores.inject(MyMetaStore, storeInstance);
           arg("row_num (number, range<number>)", _t("The first row index of the rows to be returned.")),
           arg("row_num2 (number, range<number>, repeating)", _t("The rows indexes of the rows to be returned.")),
       ],
-      returns: ["RANGE<ANY>"],
       compute: function (array, ...rows) {
           const _array = toMatrix(array);
           const _rows = flattenRowFirst(rows, (item) => toInteger(item?.value, this.locale));
           const _nbColumns = _array.length;
-          assert(() => _rows.every((row) => row > 0 && row <= _array[0].length), _t("The rows arguments must be between 1 and %s (got %s).", _array[0].length.toString(), (_rows.find((row) => row <= 0 || row > _array[0].length) || 0).toString()));
-          return generateMatrix(_nbColumns, _rows.length, (col, row) => _array[col][_rows[row] - 1]); // -1 because rows arguments are 1-indexed
+          const argOutOfRange = _rows.filter((row) => row === 0 || _array[0].length < Math.abs(row));
+          assert(() => argOutOfRange.length === 0, _t("The rows arguments must be between -%s and %s (got %s), excluding 0.", _array[0].length.toString(), _array[0].length.toString(), argOutOfRange.join(",")));
+          return generateMatrix(_nbColumns, _rows.length, (col, row) => {
+              if (_rows[row] > 0) {
+                  return _array[col][_rows[row] - 1]; // -1 because columns arguments are 1-indexed
+              }
+              return _array[col][_array[col].length + _rows[row]];
+          });
       },
       isExported: true,
   };
@@ -11311,7 +11317,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("columns (number, optional)", _t("The number of columns in the expanded array. If missing, columns will not be expanded.")),
           arg("pad_with (any, default=0)", _t("The value with which to pad.")), // @compatibility: on Excel, pad with #N/A
       ],
-      returns: ["RANGE<ANY>"],
       compute: function (arg, rows, columns, padWith = { value: 0 } // TODO : Replace with #N/A errors once it's supported
       ) {
           const _array = toMatrix(arg);
@@ -11332,7 +11337,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("range (any, range<any>)", _t("The first range to flatten.")),
           arg("range2 (any, range<any>, repeating)", _t("Additional ranges to flatten.")),
       ],
-      returns: ["RANGE<ANY>"],
       compute: function (...ranges) {
           return [flattenRowFirst(ranges, (val) => (val === undefined ? { value: "" } : val))];
       },
@@ -11347,7 +11351,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data (range<number>)", _t("The array of ranges containing the values to be counted.")),
           arg("classes (number, range<number>)", _t("The range containing the set of classes.")),
       ],
-      returns: ["RANGE<NUMBER>"],
       compute: function (data, classes) {
           const _data = flattenRowFirst([data], (data) => data.value).filter((val) => typeof val === "number");
           const _classes = flattenRowFirst([classes], (data) => data.value).filter((val) => typeof val === "number");
@@ -11395,7 +11398,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("range1 (any, range<any>)", _t("The first range to be appended.")),
           arg("range2 (any, range<any>, repeating)", _t("Additional ranges to add to range1.")),
       ],
-      returns: ["RANGE<ANY>"],
       compute: function (...ranges) {
           const nbRows = Math.max(...ranges.map((r) => r?.[0]?.length ?? 0));
           const result = [];
@@ -11422,7 +11424,6 @@ stores.inject(MyMetaStore, storeInstance);
       args: [
           arg("square_matrix (number, range<number>)", _t("An range with an equal number of rows and columns representing a matrix whose determinant will be calculated.")),
       ],
-      returns: ["NUMBER"],
       compute: function (matrix) {
           const _matrix = toNumberMatrix(matrix, "square_matrix");
           assertSquareMatrix(_t("The argument square_matrix must have the same number of columns and rows."), _matrix);
@@ -11438,7 +11439,6 @@ stores.inject(MyMetaStore, storeInstance);
       args: [
           arg("square_matrix (number, range<number>)", _t("An range with an equal number of rows and columns representing a matrix whose multiplicative inverse will be calculated.")),
       ],
-      returns: ["RANGE<NUMBER>"],
       compute: function (matrix) {
           const _matrix = toNumberMatrix(matrix, "square_matrix");
           assertSquareMatrix(_t("The argument square_matrix must have the same number of columns and rows."), _matrix);
@@ -11459,7 +11459,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("matrix1 (number, range<number>)", _t("The first matrix in the matrix multiplication operation.")),
           arg("matrix2 (number, range<number>)", _t("The second matrix in the matrix multiplication operation.")),
       ],
-      returns: ["RANGE<NUMBER>"],
       compute: function (matrix1, matrix2) {
           const _matrix1 = toNumberMatrix(matrix1, "matrix1");
           const _matrix2 = toNumberMatrix(matrix2, "matrix2");
@@ -11478,7 +11477,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("range1 (number, range<number>)", _t("The first range whose entries will be multiplied with corresponding entries in the other ranges.")),
           arg("range2 (number, range<number>, repeating)", _t("The other range whose entries will be multiplied with corresponding entries in the other ranges.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           assertSameDimensions(_t("All the ranges must have the same dimensions."), ...args);
           const _args = args.map(toMatrix);
@@ -11535,7 +11533,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("array_x (number, range<number>)", _t("The array or range of values whose squares will be reduced by the squares of corresponding entries in array_y and added together.")),
           arg("array_y (number, range<number>)", _t("The array or range of values whose squares will be subtracted from the squares of corresponding entries in array_x and added together.")),
       ],
-      returns: ["NUMBER"],
       compute: function (arrayX, arrayY) {
           return getSumXAndY(arrayX, arrayY, (x, y) => x ** 2 - y ** 2);
       },
@@ -11550,7 +11547,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("array_x (number, range<number>)", _t("The array or range of values whose squares will be added to the squares of corresponding entries in array_y and added together.")),
           arg("array_y (number, range<number>)", _t("The array or range of values whose squares will be added to the squares of corresponding entries in array_x and added together.")),
       ],
-      returns: ["NUMBER"],
       compute: function (arrayX, arrayY) {
           return getSumXAndY(arrayX, arrayY, (x, y) => x ** 2 + y ** 2);
       },
@@ -11565,7 +11561,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("array_x (number, range<number>)", _t("The array or range of values that will be reduced by corresponding entries in array_y, squared, and added together.")),
           arg("array_y (number, range<number>)", _t("The array or range of values that will be subtracted from corresponding entries in array_x, the result squared, and all such results added together.")),
       ],
-      returns: ["NUMBER"],
       compute: function (arrayX, arrayY) {
           return getSumXAndY(arrayX, arrayY, (x, y) => (x - y) ** 2);
       },
@@ -11601,7 +11596,6 @@ stores.inject(MyMetaStore, storeInstance);
   const TOCOL = {
       description: _t("Transforms a range of cells into a single column."),
       args: TO_COL_ROW_ARGS,
-      returns: ["RANGE<ANY>"],
       compute: function (array, ignore = { value: TO_COL_ROW_DEFAULT_IGNORE }, scanByColumn = { value: TO_COL_ROW_DEFAULT_SCAN }) {
           const _array = toMatrix(array);
           const _ignore = toNumber(ignore.value, this.locale);
@@ -11622,7 +11616,6 @@ stores.inject(MyMetaStore, storeInstance);
   const TOROW = {
       description: _t("Transforms a range of cells into a single row."),
       args: TO_COL_ROW_ARGS,
-      returns: ["RANGE<ANY>"],
       compute: function (array, ignore = { value: TO_COL_ROW_DEFAULT_IGNORE }, scanByColumn = { value: TO_COL_ROW_DEFAULT_SCAN }) {
           const _array = toMatrix(array);
           const _ignore = toNumber(ignore.value, this.locale);
@@ -11644,7 +11637,6 @@ stores.inject(MyMetaStore, storeInstance);
   const TRANSPOSE = {
       description: _t("Transposes the rows and columns of a range."),
       args: [arg("range (any, range<any>)", _t("The range to be transposed."))],
-      returns: ["RANGE"],
       compute: function (arg) {
           const _array = toMatrix(arg);
           const nbColumns = _array[0].length;
@@ -11662,7 +11654,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("range1 (any, range<any>)", _t("The first range to be appended.")),
           arg("range2 (any, range<any>, repeating)", _t("Additional ranges to add to range1.")),
       ],
-      returns: ["RANGE<ANY>"],
       compute: function (...ranges) {
           const nbColumns = Math.max(...ranges.map((range) => toMatrix(range).length));
           const nbRows = ranges.reduce((acc, range) => acc + toMatrix(range)[0].length, 0);
@@ -11694,7 +11685,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("pad_with  (any, default=0)", // TODO : replace with #N/A
           _t("The value with which to fill the extra cells in the range.")),
       ],
-      returns: ["RANGE<ANY>"],
       compute: function (range, wrapCount, padWith = { value: 0 }) {
           const _array = toMatrix(range);
           const nbRows = toInteger(wrapCount?.value, this.locale);
@@ -11719,7 +11709,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("pad_with  (any, default=0)", // TODO : replace with #N/A
           _t("The value with which to fill the extra cells in the range.")),
       ],
-      returns: ["RANGE<ANY>"],
       compute: function (range, wrapCount, padWith = { value: 0 }) {
           const _array = toMatrix(range);
           const nbColumns = toInteger(wrapCount?.value, this.locale);
@@ -11767,7 +11756,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value (number)", _t("The number.")),
           arg("unit (string, optional)", _t("The formatting unit. Use 'k', 'm', or 'b' to force the unit")),
       ],
-      returns: ["NUMBER"],
       compute: function (value, unite) {
           return {
               value: toNumber(value, this.locale),
@@ -11799,7 +11787,6 @@ stores.inject(MyMetaStore, storeInstance);
   const ABS = {
       description: _t("Absolute value of a number."),
       args: [arg("value (number)", _t("The number of which to return the absolute value."))],
-      returns: ["NUMBER"],
       compute: function (value) {
           return Math.abs(toNumber(value, this.locale));
       },
@@ -11813,7 +11800,6 @@ stores.inject(MyMetaStore, storeInstance);
       args: [
           arg("value (number)", _t("The value for which to calculate the inverse cosine. Must be between -1 and 1, inclusive.")),
       ],
-      returns: ["NUMBER"],
       compute: function (value) {
           const _value = toNumber(value, this.locale);
           assert(() => Math.abs(_value) <= 1, _t("The value (%s) must be between -1 and 1 inclusive.", _value.toString()));
@@ -11829,7 +11815,6 @@ stores.inject(MyMetaStore, storeInstance);
       args: [
           arg("value (number)", _t("The value for which to calculate the inverse hyperbolic cosine. Must be greater than or equal to 1.")),
       ],
-      returns: ["NUMBER"],
       compute: function (value) {
           const _value = toNumber(value, this.locale);
           assert(() => _value >= 1, _t("The value (%s) must be greater than or equal to 1.", _value.toString()));
@@ -11843,7 +11828,6 @@ stores.inject(MyMetaStore, storeInstance);
   const ACOT = {
       description: _t("Inverse cotangent of a value."),
       args: [arg("value (number)", _t("The value for which to calculate the inverse cotangent."))],
-      returns: ["NUMBER"],
       compute: function (value) {
           const _value = toNumber(value, this.locale);
           const sign = Math.sign(_value) || 1;
@@ -11862,7 +11846,6 @@ stores.inject(MyMetaStore, storeInstance);
       args: [
           arg("value (number)", _t("The value for which to calculate the inverse hyperbolic cotangent. Must not be between -1 and 1, inclusive.")),
       ],
-      returns: ["NUMBER"],
       compute: function (value) {
           const _value = toNumber(value, this.locale);
           assert(() => Math.abs(_value) > 1, _t("The value (%s) cannot be between -1 and 1 inclusive.", _value.toString()));
@@ -11878,7 +11861,6 @@ stores.inject(MyMetaStore, storeInstance);
       args: [
           arg("value (number)", _t("The value for which to calculate the inverse sine. Must be between -1 and 1, inclusive.")),
       ],
-      returns: ["NUMBER"],
       compute: function (value) {
           const _value = toNumber(value, this.locale);
           assert(() => Math.abs(_value) <= 1, _t("The value (%s) must be between -1 and 1 inclusive.", _value.toString()));
@@ -11894,7 +11876,6 @@ stores.inject(MyMetaStore, storeInstance);
       args: [
           arg("value (number)", _t("The value for which to calculate the inverse hyperbolic sine.")),
       ],
-      returns: ["NUMBER"],
       compute: function (value) {
           return Math.asinh(toNumber(value, this.locale));
       },
@@ -11906,7 +11887,6 @@ stores.inject(MyMetaStore, storeInstance);
   const ATAN = {
       description: _t("Inverse tangent of a value, in radians."),
       args: [arg("value (number)", _t("The value for which to calculate the inverse tangent."))],
-      returns: ["NUMBER"],
       compute: function (value) {
           return Math.atan(toNumber(value, this.locale));
       },
@@ -11921,7 +11901,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("x (number)", _t("The x coordinate of the endpoint of the line segment for which to calculate the angle from the x-axis.")),
           arg("y (number)", _t("The y coordinate of the endpoint of the line segment for which to calculate the angle from the x-axis.")),
       ],
-      returns: ["NUMBER"],
       compute: function (x, y) {
           const _x = toNumber(x, this.locale);
           const _y = toNumber(y, this.locale);
@@ -11938,7 +11917,6 @@ stores.inject(MyMetaStore, storeInstance);
       args: [
           arg("value (number)", _t("The value for which to calculate the inverse hyperbolic tangent. Must be between -1 and 1, exclusive.")),
       ],
-      returns: ["NUMBER"],
       compute: function (value) {
           const _value = toNumber(value, this.locale);
           assert(() => Math.abs(_value) < 1, _t("The value (%s) must be between -1 and 1 exclusive.", _value.toString()));
@@ -11955,7 +11933,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value (number)", _t("The value to round up to the nearest integer multiple of factor.")),
           arg(`factor (number, default=${DEFAULT_FACTOR})`, _t("The number to whose multiples value will be rounded.")),
       ],
-      returns: ["NUMBER"],
       compute: function (value, factor = { value: DEFAULT_FACTOR }) {
           const _value = toNumber(value, this.locale);
           const _factor = toNumber(factor, this.locale);
@@ -11990,7 +11967,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg(`significance (number, default=${DEFAULT_SIGNIFICANCE})`, _t("The number to whose multiples number will be rounded. The sign of significance will be ignored.")),
           arg(`mode (number, default=${DEFAULT_MODE})`, _t("If number is negative, specifies the rounding direction. If 0 or blank, it is rounded towards zero. Otherwise, it is rounded away from zero.")),
       ],
-      returns: ["NUMBER"],
       compute: function (number, significance = { value: DEFAULT_SIGNIFICANCE }, mode = { value: DEFAULT_MODE }) {
           const _significance = toNumber(significance, this.locale);
           const _number = toNumber(number, this.locale);
@@ -12011,7 +11987,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("number (number)", _t("The value to round up to the nearest integer multiple of significance.")),
           arg(`significance (number, default=${DEFAULT_SIGNIFICANCE})`, _t("The number to whose multiples number will be rounded.")),
       ],
-      returns: ["NUMBER"],
       compute: function (number, significance = { value: DEFAULT_SIGNIFICANCE }) {
           const _significance = toNumber(significance, this.locale);
           const _number = toNumber(number, this.locale);
@@ -12028,7 +12003,6 @@ stores.inject(MyMetaStore, storeInstance);
   const COS = {
       description: _t("Cosine of an angle provided in radians."),
       args: [arg("angle (number)", _t("The angle to find the cosine of, in radians."))],
-      returns: ["NUMBER"],
       compute: function (angle) {
           return Math.cos(toNumber(angle, this.locale));
       },
@@ -12040,7 +12014,6 @@ stores.inject(MyMetaStore, storeInstance);
   const COSH = {
       description: _t("Hyperbolic cosine of any real number."),
       args: [arg("value (number)", _t("Any real value to calculate the hyperbolic cosine of."))],
-      returns: ["NUMBER"],
       compute: function (value) {
           return Math.cosh(toNumber(value, this.locale));
       },
@@ -12052,7 +12025,6 @@ stores.inject(MyMetaStore, storeInstance);
   const COT = {
       description: _t("Cotangent of an angle provided in radians."),
       args: [arg("angle (number)", _t("The angle to find the cotangent of, in radians."))],
-      returns: ["NUMBER"],
       compute: function (angle) {
           const _angle = toNumber(angle, this.locale);
           assertNotZero(_angle);
@@ -12066,7 +12038,6 @@ stores.inject(MyMetaStore, storeInstance);
   const COTH = {
       description: _t("Hyperbolic cotangent of any real number."),
       args: [arg("value (number)", _t("Any real value to calculate the hyperbolic cotangent of."))],
-      returns: ["NUMBER"],
       compute: function (value) {
           const _value = toNumber(value, this.locale);
           assertNotZero(_value);
@@ -12083,7 +12054,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (any, range)", _t("The first value or range in which to count the number of blanks.")),
           arg("value2 (any, range, repeating)", _t("Additional values or ranges in which to count the number of blanks.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           return reduceAny(args, (acc, a) => {
               if (a === undefined) {
@@ -12109,7 +12079,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("range (range)", _t("The range that is tested against criterion.")),
           arg("criterion (string)", _t("The pattern or test to apply to range.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           let count = 0;
           visitMatchingRanges(args, (i, j) => {
@@ -12130,7 +12099,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("criteria_range2 (any, range, repeating)", _t("Additional ranges over which to evaluate the additional criteria. The filtered set will be the intersection of the sets produced by each criterion-range pair.")),
           arg("criterion2 (string, repeating)", _t("Additional criteria to check.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           let count = 0;
           visitMatchingRanges(args, (i, j) => {
@@ -12149,7 +12117,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (any, range)", _t("The first value or range to consider for uniqueness.")),
           arg("value2 (any, range, repeating)", _t("Additional values or ranges to consider for uniqueness.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           return countUnique(args);
       },
@@ -12166,7 +12133,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("criteria_range2 (any, range, repeating)", _t("Additional ranges over which to evaluate the additional criteria. The filtered set will be the intersection of the sets produced by each criterion-range pair.")),
           arg("criterion2 (string, repeating)", _t("The pattern or test to apply to criteria_range2.")),
       ],
-      returns: ["NUMBER"],
       compute: function (range, ...args) {
           let uniqueValues = new Set();
           visitMatchingRanges(args, (i, j) => {
@@ -12184,7 +12150,6 @@ stores.inject(MyMetaStore, storeInstance);
   const CSC = {
       description: _t("Cosecant of an angle provided in radians."),
       args: [arg("angle (number)", _t("The angle to find the cosecant of, in radians."))],
-      returns: ["NUMBER"],
       compute: function (angle) {
           const _angle = toNumber(angle, this.locale);
           assertNotZero(_angle);
@@ -12198,7 +12163,6 @@ stores.inject(MyMetaStore, storeInstance);
   const CSCH = {
       description: _t("Hyperbolic cosecant of any real number."),
       args: [arg("value (number)", _t("Any real value to calculate the hyperbolic cosecant of."))],
-      returns: ["NUMBER"],
       compute: function (value) {
           const _value = toNumber(value, this.locale);
           assertNotZero(_value);
@@ -12215,7 +12179,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value (string)", _t("The number to convert.")),
           arg("base (number)", _t("The base to convert the value from.")),
       ],
-      returns: ["NUMBER"],
       compute: function (value, base) {
           let _base = toNumber(base, this.locale);
           _base = Math.floor(_base);
@@ -12242,7 +12205,6 @@ stores.inject(MyMetaStore, storeInstance);
   const DEGREES = {
       description: _t("Converts an angle value in radians to degrees."),
       args: [arg("angle (number)", _t("The angle to convert from radians to degrees."))],
-      returns: ["NUMBER"],
       compute: function (angle) {
           return (toNumber(angle, this.locale) * 180) / Math.PI;
       },
@@ -12254,7 +12216,6 @@ stores.inject(MyMetaStore, storeInstance);
   const EXP = {
       description: _t("Euler's number, e (~2.718) raised to a power."),
       args: [arg("value (number)", _t("The exponent to raise e."))],
-      returns: ["NUMBER"],
       compute: function (value) {
           return Math.exp(toNumber(value, this.locale));
       },
@@ -12269,7 +12230,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value (number)", _t("The value to round down to the nearest integer multiple of factor.")),
           arg(`factor (number, default=${DEFAULT_FACTOR})`, _t("The number to whose multiples value will be rounded.")),
       ],
-      returns: ["NUMBER"],
       compute: function (value, factor = { value: DEFAULT_FACTOR }) {
           const _value = toNumber(value, this.locale);
           const _factor = toNumber(factor, this.locale);
@@ -12304,7 +12264,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg(`significance (number, default=${DEFAULT_SIGNIFICANCE})`, _t("The number to whose multiples number will be rounded. The sign of significance will be ignored.")),
           arg(`mode (number, default=${DEFAULT_MODE})`, _t("If number is negative, specifies the rounding direction. If 0 or blank, it is rounded away from zero. Otherwise, it is rounded towards zero.")),
       ],
-      returns: ["NUMBER"],
       compute: function (number, significance = { value: DEFAULT_SIGNIFICANCE }, mode = { value: DEFAULT_MODE }) {
           const _significance = toNumber(significance, this.locale);
           const _number = toNumber(number, this.locale);
@@ -12325,7 +12284,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("number (number)", _t("The value to round down to the nearest integer multiple of significance.")),
           arg(`significance (number, default=${DEFAULT_SIGNIFICANCE})`, _t("The number to whose multiples number will be rounded.")),
       ],
-      returns: ["NUMBER"],
       compute: function (number, significance = { value: DEFAULT_SIGNIFICANCE }) {
           const _significance = toNumber(significance, this.locale);
           const _number = toNumber(number, this.locale);
@@ -12342,7 +12300,6 @@ stores.inject(MyMetaStore, storeInstance);
   const ISEVEN = {
       description: _t("Whether the provided value is even."),
       args: [arg("value (number)", _t("The value to be verified as even."))],
-      returns: ["BOOLEAN"],
       compute: function (value) {
           const _value = strictToNumber(value, this.locale);
           return Math.floor(Math.abs(_value)) & 1 ? false : true;
@@ -12358,7 +12315,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("number (number)", _t("The value to round up to the nearest integer multiple of significance.")),
           arg(`significance (number, default=${DEFAULT_SIGNIFICANCE})`, _t("The number to whose multiples number will be rounded.")),
       ],
-      returns: ["NUMBER"],
       compute: function (number, significance = { value: DEFAULT_SIGNIFICANCE }) {
           const _number = toNumber(number, this.locale);
           const _significance = toNumber(significance, this.locale);
@@ -12375,7 +12331,6 @@ stores.inject(MyMetaStore, storeInstance);
   const ISODD = {
       description: _t("Whether the provided value is even."),
       args: [arg("value (number)", _t("The value to be verified as even."))],
-      returns: ["BOOLEAN"],
       compute: function (value) {
           const _value = strictToNumber(value, this.locale);
           return Math.floor(Math.abs(_value)) & 1 ? true : false;
@@ -12388,7 +12343,6 @@ stores.inject(MyMetaStore, storeInstance);
   const LN = {
       description: _t("The logarithm of a number, base e (euler's number)."),
       args: [arg("value (number)", _t("The value for which to calculate the logarithm, base e."))],
-      returns: ["NUMBER"],
       compute: function (value) {
           const _value = toNumber(value, this.locale);
           assert(() => _value > 0, _t("The value (%s) must be strictly positive.", _value.toString()));
@@ -12414,7 +12368,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("dividend (number)", _t("The number to be divided to find the remainder.")),
           arg("divisor (number)", _t("The number to divide by.")),
       ],
-      returns: ["NUMBER"],
       compute: function (dividend, divisor) {
           const _divisor = toNumber(divisor, this.locale);
           const _dividend = toNumber(dividend, this.locale);
@@ -12433,7 +12386,6 @@ stores.inject(MyMetaStore, storeInstance);
       args: [
           arg("dimension (number)", _t("An integer specifying the dimension size of the unit matrix. It must be positive.")),
       ],
-      returns: ["RANGE<NUMBER>"],
       compute: function (n) {
           const _n = toInteger(n, this.locale);
           assertPositive(_t("The argument dimension must be positive"), _n);
@@ -12447,7 +12399,6 @@ stores.inject(MyMetaStore, storeInstance);
   const ODD = {
       description: _t("Rounds a number up to the nearest odd integer."),
       args: [arg("value (number)", _t("The value to round to the next greatest odd number."))],
-      returns: ["NUMBER"],
       compute: function (value) {
           const _value = toNumber(value, this.locale);
           let temp = Math.ceil(Math.abs(_value));
@@ -12465,7 +12416,6 @@ stores.inject(MyMetaStore, storeInstance);
   const PI = {
       description: _t("The number pi."),
       args: [],
-      returns: ["NUMBER"],
       compute: function () {
           return Math.PI;
       },
@@ -12480,7 +12430,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("base (number)", _t("The number to raise to the exponent power.")),
           arg("exponent (number)", _t("The exponent to raise base to.")),
       ],
-      returns: ["NUMBER"],
       compute: function (base, exponent) {
           const _base = toNumber(base, this.locale);
           const _exponent = toNumber(exponent, this.locale);
@@ -12498,7 +12447,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("factor1 (number, range<number>)", _t("The first number or range to calculate for the product.")),
           arg("factor2 (number, range<number>, repeating)", _t("More numbers or ranges to calculate for the product.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...factors) {
           let count = 0;
           let acc = 1;
@@ -12535,7 +12483,6 @@ stores.inject(MyMetaStore, storeInstance);
   const RAND = {
       description: _t("A random number between 0 inclusive and 1 exclusive."),
       args: [],
-      returns: ["NUMBER"],
       compute: function () {
           return Math.random();
       },
@@ -12553,7 +12500,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("max (number, default=1)", _t("The maximum number you would like returned.")),
           arg("whole_number (number, default=FALSE)", _t("Return a whole number or a decimal value.")),
       ],
-      returns: ["RANGE<NUMBER>"],
       compute: function (rows = { value: 1 }, columns = { value: 1 }, min = { value: 0 }, max = { value: 1 }, wholeNumber = { value: false }) {
           const _cols = toInteger(columns, this.locale);
           const _rows = toInteger(rows, this.locale);
@@ -12591,7 +12537,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("low (number)", _t("The low end of the random range.")),
           arg("high (number)", _t("The high end of the random range.")),
       ],
-      returns: ["NUMBER"],
       compute: function (low, high) {
           let _low = toNumber(low, this.locale);
           if (!Number.isInteger(_low)) {
@@ -12618,7 +12563,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value (number)", _t("The value to round to places number of places.")),
           arg(`places (number, default=${DEFAULT_PLACES})`, _t("The number of decimal places to which to round.")),
       ],
-      returns: ["NUMBER"],
       compute: function (value, places = { value: DEFAULT_PLACES }) {
           const _value = toNumber(value, this.locale);
           let _places = toNumber(places, this.locale);
@@ -12649,7 +12593,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value (number)", _t("The value to round to places number of places, always rounding down.")),
           arg(`places (number, default=${DEFAULT_PLACES})`, _t("The number of decimal places to which to round.")),
       ],
-      returns: ["NUMBER"],
       compute: function (value, places = { value: DEFAULT_PLACES }) {
           const _value = toNumber(value, this.locale);
           let _places = toNumber(places, this.locale);
@@ -12680,7 +12623,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value (number)", _t("The value to round to places number of places, always rounding up.")),
           arg(`places (number, default=${DEFAULT_PLACES})`, _t("The number of decimal places to which to round.")),
       ],
-      returns: ["NUMBER"],
       compute: function (value, places = { value: DEFAULT_PLACES }) {
           const _value = toNumber(value, this.locale);
           let _places = toNumber(places, this.locale);
@@ -12708,7 +12650,6 @@ stores.inject(MyMetaStore, storeInstance);
   const SEC = {
       description: _t("Secant of an angle provided in radians."),
       args: [arg("angle (number)", _t("The angle to find the secant of, in radians."))],
-      returns: ["NUMBER"],
       compute: function (angle) {
           return 1 / Math.cos(toNumber(angle, this.locale));
       },
@@ -12720,7 +12661,6 @@ stores.inject(MyMetaStore, storeInstance);
   const SECH = {
       description: _t("Hyperbolic secant of any real number."),
       args: [arg("value (number)", _t("Any real value to calculate the hyperbolic secant of."))],
-      returns: ["NUMBER"],
       compute: function (value) {
           return 1 / Math.cosh(toNumber(value, this.locale));
       },
@@ -12732,7 +12672,6 @@ stores.inject(MyMetaStore, storeInstance);
   const SIN = {
       description: _t("Sine of an angle provided in radians."),
       args: [arg("angle (number)", _t("The angle to find the sine of, in radians."))],
-      returns: ["NUMBER"],
       compute: function (angle) {
           return Math.sin(toNumber(angle, this.locale));
       },
@@ -12744,7 +12683,6 @@ stores.inject(MyMetaStore, storeInstance);
   const SINH = {
       description: _t("Hyperbolic sine of any real number."),
       args: [arg("value (number)", _t("Any real value to calculate the hyperbolic sine of."))],
-      returns: ["NUMBER"],
       compute: function (value) {
           return Math.sinh(toNumber(value, this.locale));
       },
@@ -12756,7 +12694,6 @@ stores.inject(MyMetaStore, storeInstance);
   const SQRT = {
       description: _t("Positive square root of a positive number."),
       args: [arg("value (number)", _t("The number for which to calculate the positive square root."))],
-      returns: ["NUMBER"],
       compute: function (value) {
           const _value = toNumber(value, this.locale);
           assert(() => _value >= 0, _t("The value (%s) must be positive or null.", _value.toString()));
@@ -12773,7 +12710,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number, range<number>)", _t("The first number or range to add together.")),
           arg("value2 (number, range<number>, repeating)", _t("Additional numbers or ranges to add to value1.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...values) {
           const v1 = values[0];
           return {
@@ -12793,7 +12729,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("criterion (string)", _t("The pattern or test to apply to range.")),
           arg("sum_range (range, default=criteria_range)", _t("The range to be summed, if different from range.")),
       ],
-      returns: ["NUMBER"],
       compute: function (criteriaRange, criterion, sumRange) {
           if (sumRange === undefined) {
               sumRange = criteriaRange;
@@ -12821,7 +12756,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("criteria_range2 (any, range, repeating)", _t("Additional ranges to check.")),
           arg("criterion2 (string, repeating)", _t("Additional criteria to check.")),
       ],
-      returns: ["NUMBER"],
       compute: function (sumRange, ...criters) {
           let sum = 0;
           visitMatchingRanges(criters, (i, j) => {
@@ -12840,7 +12774,6 @@ stores.inject(MyMetaStore, storeInstance);
   const TAN = {
       description: _t("Tangent of an angle provided in radians."),
       args: [arg("angle (number)", _t("The angle to find the tangent of, in radians."))],
-      returns: ["NUMBER"],
       compute: function (angle) {
           return Math.tan(toNumber(angle, this.locale));
       },
@@ -12852,7 +12785,6 @@ stores.inject(MyMetaStore, storeInstance);
   const TANH = {
       description: _t("Hyperbolic tangent of any real number."),
       args: [arg("value (number)", _t("Any real value to calculate the hyperbolic tangent of."))],
-      returns: ["NUMBER"],
       compute: function (value) {
           return Math.tanh(toNumber(value, this.locale));
       },
@@ -12876,7 +12808,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value (number)", _t("The value to be truncated.")),
           arg(`places (number, default=${DEFAULT_PLACES})`, _t("The number of significant digits to the right of the decimal point to retain.")),
       ],
-      returns: ["NUMBER"],
       compute: function (value, places = { value: DEFAULT_PLACES }) {
           const _value = toNumber(value, this.locale);
           const _places = toNumber(places, this.locale);
@@ -12890,7 +12821,6 @@ stores.inject(MyMetaStore, storeInstance);
   const INT = {
       description: _t("Rounds a number down to the nearest integer that is less than or equal to it."),
       args: [arg("value (number)", _t("The number to round down to the nearest integer."))],
-      returns: ["NUMBER"],
       compute: function (value) {
           return Math.floor(toNumber(value, this.locale));
       },
@@ -13249,7 +13179,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number, range<number>)", _t("The first value or range of the sample.")),
           arg("value2 (number, range<number>, repeating)", _t("Additional values or ranges to include in the sample.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...values) {
           let count = 0;
           const sum = reduceNumbers(values, (acc, a) => {
@@ -13271,7 +13200,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number, range<number>)", _t("The first value or range to consider when calculating the average value.")),
           arg("value2 (number, range<number>, repeating)", _t("Additional values or ranges to consider when calculating the average value.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...values) {
           return {
               value: average(values, this.locale),
@@ -13293,7 +13221,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("additional_values (number, range<number>, repeating)", _t("Additional values to average.")),
           arg("additional_weights (number, range<number>, repeating)", _t("Additional weights.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           let sum = 0;
           let count = 0;
@@ -13341,7 +13268,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number, range<number>)", _t("The first value or range to consider when calculating the average value.")),
           arg("value2 (number, range<number>, repeating)", _t("Additional values or ranges to consider when calculating the average value.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           let count = 0;
           const sum = reduceNumbersTextAs0(args, (acc, a) => {
@@ -13366,7 +13292,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("criterion (string)", _t("The pattern or test to apply to criteria_range.")),
           arg("average_range (number, range<number>, default=criteria_range)", _t("The range to average. If not included, criteria_range is used for the average instead.")),
       ],
-      returns: ["NUMBER"],
       compute: function (criteriaRange, criterion, averageRange) {
           const _averageRange = averageRange === undefined ? toMatrix(criteriaRange) : toMatrix(averageRange);
           let count = 0;
@@ -13395,7 +13320,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("criteria_range2 (any, range, repeating)", _t("Additional criteria_range and criterion to check.")),
           arg("criterion2 (string, repeating)", _t("The pattern or test to apply to criteria_range2.")),
       ],
-      returns: ["NUMBER"],
       compute: function (averageRange, ...args) {
           const _averageRange = toMatrix(averageRange);
           let count = 0;
@@ -13421,7 +13345,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number, range<number>)", _t("The first value or range to consider when counting.")),
           arg("value2 (number, range<number>, repeating)", _t("Additional values or ranges to consider when counting.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...values) {
           return countNumbers(values, this.locale);
       },
@@ -13436,7 +13359,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (any, range)", _t("The first value or range to consider when counting.")),
           arg("value2 (any, range, repeating)", _t("Additional values or ranges to consider when counting.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...values) {
           return countAny(values);
       },
@@ -13453,7 +13375,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data_y (any, range)", _t("The range representing the array or matrix of dependent data.")),
           arg("data_x (any, range)", _t("The range representing the array or matrix of independent data.")),
       ],
-      returns: ["NUMBER"],
       compute: function (dataY, dataX) {
           return covariance(dataY, dataX, false);
       },
@@ -13468,7 +13389,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data_y (any, range)", _t("The range representing the array or matrix of dependent data.")),
           arg("data_x (any, range)", _t("The range representing the array or matrix of independent data.")),
       ],
-      returns: ["NUMBER"],
       compute: function (dataY, dataX) {
           return covariance(dataY, dataX, false);
       },
@@ -13483,7 +13403,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data_y (any, range)", _t("The range representing the array or matrix of dependent data.")),
           arg("data_x (any, range)", _t("The range representing the array or matrix of independent data.")),
       ],
-      returns: ["NUMBER"],
       compute: function (dataY, dataX) {
           return covariance(dataY, dataX, true);
       },
@@ -13499,7 +13418,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data_y (range<number>)", _t("The range representing the array or matrix of dependent data.")),
           arg("data_x (range<number>)", _t("The range representing the array or matrix of independent data.")),
       ],
-      returns: ["NUMBER"],
       compute: function (x, dataY, dataX) {
           const { flatDataX, flatDataY } = filterAndFlatData(dataY, dataX);
           return predictLinearValues([flatDataY], [flatDataX], matrixMap(toMatrix(x), (value) => toNumber(value, this.locale)), true);
@@ -13517,7 +13435,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("new_data_x (any, range, default=known_data_x)", _t("The data points to return the y values for on the ideal curve fit.")),
           arg("b (boolean, default=TRUE)", _t("Given a general exponential form of y = b*m^x for a curve fit, calculates b if TRUE or forces b to be 1 and only calculates the m values if FALSE.")),
       ],
-      returns: ["NUMBER"],
       compute: function (knownDataY, knownDataX = [[]], newDataX = [[]], b = { value: true }) {
           return expM(predictLinearValues(logM(toNumberMatrix(knownDataY, "the first argument (known_data_y)")), toNumberMatrix(knownDataX, "the second argument (known_data_x)"), toNumberMatrix(newDataX, "the third argument (new_data_y)"), toBoolean(b)));
       },
@@ -13531,7 +13448,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data_y (range<number>)", _t("The range representing the array or matrix of dependent data.")),
           arg("data_x (range<number>)", _t("The range representing the array or matrix of independent data.")),
       ],
-      returns: ["NUMBER"],
       compute: function (dataY, dataX) {
           const { flatDataX, flatDataY } = filterAndFlatData(dataY, dataX);
           const [[], [intercept]] = fullLinearRegression([flatDataX], [flatDataY]);
@@ -13548,7 +13464,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data (any, range)", _t("Array or range containing the dataset to consider.")),
           arg("n (number)", _t("The rank from largest to smallest of the element to return.")),
       ],
-      returns: ["NUMBER"],
       compute: function (data, n) {
           const _n = Math.trunc(toNumber(n?.value, this.locale));
           let largests = [];
@@ -13583,7 +13498,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("calculate_b (boolean, default=TRUE)", _t("A flag specifying wheter to compute the slope or not")),
           arg("verbose (boolean, default=FALSE)", _t("A flag specifying whether to return additional regression statistics or only the linear coefficients and the y-intercept")),
       ],
-      returns: ["NUMBER"],
       compute: function (dataY, dataX = [[]], calculateB = { value: true }, verbose = { value: false }) {
           return fullLinearRegression(toNumberMatrix(dataX, "the first argument (data_y)"), toNumberMatrix(dataY, "the second argument (data_x)"), toBoolean(calculateB), toBoolean(verbose));
       },
@@ -13600,7 +13514,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("calculate_b (boolean, default=TRUE)", _t("A flag specifying wheter to compute the slope or not")),
           arg("verbose (boolean, default=FALSE)", _t("A flag specifying whether to return additional regression statistics or only the linear coefficients and the y-intercept")),
       ],
-      returns: ["NUMBER"],
       compute: function (dataY, dataX = [[]], calculateB = { value: true }, verbose = { value: false }) {
           const coeffs = fullLinearRegression(toNumberMatrix(dataX, "the second argument (data_x)"), logM(toNumberMatrix(dataY, "the first argument (data_y)")), toBoolean(calculateB), toBoolean(verbose));
           for (let i = 0; i < coeffs.length; i++) {
@@ -13619,7 +13532,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data_x (range)", _t("The range representing the array or matrix of observed data.")),
           arg("data_y (range)", _t("The range representing the array or matrix of predicted data.")),
       ],
-      returns: ["NUMBER"],
       compute: function (dataX, dataY) {
           const flatX = dataX.flat();
           const flatY = dataY.flat();
@@ -13663,7 +13575,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number, range<number>)", _t("The first value or range to consider when calculating the maximum value.")),
           arg("value2 (number, range<number>, repeating)", _t("Additional values or ranges to consider when calculating the maximum value.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...values) {
           return {
               value: max(values, this.locale),
@@ -13681,7 +13592,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (any, range)", _t("The first value or range to consider when calculating the maximum value.")),
           arg("value2 (any, range, repeating)", _t("Additional values or ranges to consider when calculating the maximum value.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           const maxa = reduceNumbersTextAs0(args, (acc, a) => {
               return Math.max(a, acc);
@@ -13702,7 +13612,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("criteria_range2 (any, range, repeating)", _t("Additional ranges over which to evaluate the additional criteria. The filtered set will be the intersection of the sets produced by each criterion-range pair.")),
           arg("criterion2 (string, repeating)", _t("The pattern or test to apply to criteria_range2.")),
       ],
-      returns: ["NUMBER"],
       compute: function (range, ...args) {
           let result = -Infinity;
           visitMatchingRanges(args, (i, j) => {
@@ -13724,7 +13633,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (any, range)", _t("The first value or range to consider when calculating the median value.")),
           arg("value2 (any, range, repeating)", _t("Additional values or ranges to consider when calculating the median value.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...values) {
           let data = [];
           visitNumbers(values, (value) => {
@@ -13746,7 +13654,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number, range<number>)", _t("The first value or range to consider when calculating the minimum value.")),
           arg("value2 (number, range<number>, repeating)", _t("Additional values or ranges to consider when calculating the minimum value.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...values) {
           return {
               value: min(values, this.locale),
@@ -13764,7 +13671,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number, range<number>)", _t("The first value or range to consider when calculating the minimum value.")),
           arg("value2 (number, range<number>, repeating)", _t("Additional values or ranges to consider when calculating the minimum value.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           const mina = reduceNumbersTextAs0(args, (acc, a) => {
               return Math.min(a, acc);
@@ -13785,7 +13691,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("criteria_range2 (any, range, repeating)", _t("Additional ranges over which to evaluate the additional criteria. The filtered set will be the intersection of the sets produced by each criterion-range pair.")),
           arg("criterion2 (string, repeating)", _t("The pattern or test to apply to criteria_range2.")),
       ],
-      returns: ["NUMBER"],
       compute: function (range, ...args) {
           let result = Infinity;
           visitMatchingRanges(args, (i, j) => {
@@ -13828,7 +13733,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data_y (range<number>)", _t("The range representing the array or matrix of dependent data.")),
           arg("data_x (range<number>)", _t("The range representing the array or matrix of independent data.")),
       ],
-      returns: ["NUMBER"],
       compute: function (dataY, dataX) {
           return pearson(dataY, dataX);
       },
@@ -13845,7 +13749,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data (any, range)", _t("The array or range containing the dataset to consider.")),
           arg("percentile (number)", _t("The percentile whose value within data will be calculated and returned.")),
       ],
-      returns: ["NUMBER"],
       compute: function (data, percentile) {
           return PERCENTILE_INC.compute.bind(this)(data, percentile);
       },
@@ -13860,7 +13763,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data (any, range)", _t("The array or range containing the dataset to consider.")),
           arg("percentile (number)", _t("The percentile, exclusive of 0 and 1, whose value within 'data' will be calculated and returned.")),
       ],
-      returns: ["NUMBER"],
       compute: function (data, percentile) {
           return {
               value: centile([data], percentile, false, this.locale),
@@ -13878,7 +13780,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data (any, range)", _t("The array or range containing the dataset to consider.")),
           arg("percentile (number)", _t("The percentile whose value within data will be calculated and returned.")),
       ],
-      returns: ["NUMBER"],
       compute: function (data, percentile) {
           return {
               value: centile([data], percentile, true, this.locale),
@@ -13898,7 +13799,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("order (number)", _t("The order of the polynomial to fit the data, between 1 and 6.")),
           arg("intercept (boolean, default=TRUE)", _t("A flag specifying whether to compute the intercept or not.")),
       ],
-      returns: ["RANGE<NUMBER>"],
       compute: function (dataY, dataX, order, intercept = { value: true }) {
           const { flatDataX, flatDataY } = filterAndFlatData(dataY, dataX);
           return polynomialRegression(flatDataY, flatDataX, toNumber(order, this.locale), toBoolean(intercept));
@@ -13917,7 +13817,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("order (number)", _t("The order of the polynomial to fit the data, between 1 and 6.")),
           arg("intercept (boolean, default=TRUE)", _t("A flag specifying whether to compute the intercept or not.")),
       ],
-      returns: ["NUMBER"],
       compute: function (x, dataY, dataX, order, intercept = { value: true }) {
           const _order = toNumber(order, this.locale);
           const { flatDataX, flatDataY } = filterAndFlatData(dataY, dataX);
@@ -13935,7 +13834,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data (any, range)", _t("The array or range containing the dataset to consider.")),
           arg("quartile_number (number)", _t("Which quartile value to return.")),
       ],
-      returns: ["NUMBER"],
       compute: function (data, quartileNumber) {
           return QUARTILE_INC.compute.bind(this)(data, quartileNumber);
       },
@@ -13950,7 +13848,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data (any, range)", _t("The array or range containing the dataset to consider.")),
           arg("quartile_number (number)", _t("Which quartile value, exclusive of 0 and 4, to return.")),
       ],
-      returns: ["NUMBER"],
       compute: function (data, quartileNumber) {
           const _quartileNumber = Math.trunc(toNumber(quartileNumber, this.locale));
           const percent = { value: 0.25 * _quartileNumber };
@@ -13970,7 +13867,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data (any, range)", _t("The array or range containing the dataset to consider.")),
           arg("quartile_number (number)", _t("Which quartile value to return.")),
       ],
-      returns: ["NUMBER"],
       compute: function (data, quartileNumber) {
           const percent = { value: 0.25 * Math.trunc(toNumber(quartileNumber, this.locale)) };
           return {
@@ -13989,7 +13885,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data (range)", _t("The range containing the dataset to consider.")),
           arg("is_ascending (boolean, default=FALSE)", _t("Whether to consider the values in data in descending or ascending order.")),
       ],
-      returns: ["ANY"],
       compute: function (value, data, isAscending = { value: false }) {
           const _isAscending = toBoolean(isAscending);
           const _value = toNumber(value, this.locale);
@@ -14025,7 +13920,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data_y (range<number>)", _t("The range representing the array or matrix of dependent data.")),
           arg("data_x (range<number>)", _t("The range representing the array or matrix of independent data.")),
       ],
-      returns: ["NUMBER"],
       compute: function (dataY, dataX) {
           return Math.pow(pearson(dataX, dataY), 2.0);
       },
@@ -14040,7 +13934,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data_y (range<number>)", _t("The range representing the array or matrix of dependent data.")),
           arg("data_x (range<number>)", _t("The range representing the array or matrix of independent data.")),
       ],
-      returns: ["NUMBER"],
       compute: function (dataY, dataX) {
           const { flatDataX, flatDataY } = filterAndFlatData(dataY, dataX);
           const [[slope]] = fullLinearRegression([flatDataX], [flatDataY]);
@@ -14057,7 +13950,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data (any, range)", _t("The array or range containing the dataset to consider.")),
           arg("n (number)", _t("The rank from smallest to largest of the element to return.")),
       ],
-      returns: ["NUMBER"],
       compute: function (data, n) {
           const _n = Math.trunc(toNumber(n?.value, this.locale));
           let largests = [];
@@ -14090,7 +13982,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data_y (range<number>)", _t("The range representing the array or matrix of dependent data.")),
           arg("data_x (range<number>)", _t("The range representing the array or matrix of independent data.")),
       ],
-      returns: ["NUMBER"],
       compute: function (dataX, dataY) {
           const { flatDataX, flatDataY } = filterAndFlatData(dataY, dataX);
           const n = flatDataX.length;
@@ -14117,7 +14008,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number, range<number>)", _t("The first value or range of the sample.")),
           arg("value2 (number, range<number>, repeating)", _t("Additional values or ranges to include in the sample.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           return Math.sqrt(VAR.compute.bind(this)(...args));
       },
@@ -14132,7 +14022,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number, range<number>)", _t("The first value or range of the population.")),
           arg("value2 (number, range<number>, repeating)", _t("Additional values or ranges to include in the population.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           return Math.sqrt(VAR_P.compute.bind(this)(...args));
       },
@@ -14147,7 +14036,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number, range<number>)", _t("The first value or range of the sample.")),
           arg("value2 (number, range<number>, repeating)", _t("Additional values or ranges to include in the sample.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           return Math.sqrt(VAR_S.compute.bind(this)(...args));
       },
@@ -14162,7 +14050,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number, range<number>)", _t("The first value or range of the sample.")),
           arg("value2 (number, range<number>, repeating)", _t("Additional values or ranges to include in the sample.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           return Math.sqrt(VARA.compute.bind(this)(...args));
       },
@@ -14177,7 +14064,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number, range<number>)", _t("The first value or range of the population.")),
           arg("value2 (number, range<number>, repeating)", _t("Additional values or ranges to include in the population.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           return Math.sqrt(VARP.compute.bind(this)(...args));
       },
@@ -14192,7 +14078,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number, range<number>)", _t("The first value or range of the population.")),
           arg("value2 (number, range<number>, repeating)", _t("Additional values or ranges to include in the population.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           return Math.sqrt(VARPA.compute.bind(this)(...args));
       },
@@ -14207,7 +14092,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("data_y (range<number>)", _t("The range representing the array or matrix of dependent data.")),
           arg("data_x (range<number>)", _t("The range representing the array or matrix of independent data.")),
       ],
-      returns: ["NUMBER"],
       compute: function (dataY, dataX) {
           const { flatDataX, flatDataY } = filterAndFlatData(dataY, dataX);
           const data = fullLinearRegression([flatDataX], [flatDataY], true, true);
@@ -14226,7 +14110,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("new_data_x (number, range<number>, optional, default=known_data_x)", _t("The data points to return the y values for on the ideal curve fit.")),
           arg("b (boolean, optional, default=TRUE)", _t("Given a general linear form of y = m*x+b for a curve fit, calculates b if TRUE or forces b to be 0 and only calculates the m values if FALSE, i.e. forces the curve fit to pass through the origin.")),
       ],
-      returns: ["NUMBER"],
       compute: function (knownDataY, knownDataX = [[]], newDataX = [[]], b = { value: true }) {
           return predictLinearValues(toNumberMatrix(knownDataY, "the first argument (known_data_y)"), toNumberMatrix(knownDataX, "the second argument (known_data_x)"), toNumberMatrix(newDataX, "the third argument (new_data_y)"), toBoolean(b));
       },
@@ -14240,7 +14123,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number, range<number>)", _t("The first value or range of the sample.")),
           arg("value2 (number, range<number>, repeating)", _t("Additional values or ranges to include in the sample.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           return variance(args, true, false, this.locale);
       },
@@ -14255,7 +14137,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number, range<number>)", _t("The first value or range of the population.")),
           arg("value2 (number, range<number>, repeating)", _t("Additional values or ranges to include in the population.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           return variance(args, false, false, this.locale);
       },
@@ -14270,7 +14151,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number, range<number>)", _t("The first value or range of the sample.")),
           arg("value2 (number, range<number>, repeating)", _t("Additional values or ranges to include in the sample.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           return variance(args, true, false, this.locale);
       },
@@ -14285,7 +14165,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number, range<number>)", _t("The first value or range of the sample.")),
           arg("value2 (number, range<number>, repeating)", _t("Additional values or ranges to include in the sample.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           return variance(args, true, true, this.locale);
       },
@@ -14300,7 +14179,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number, range<number>)", _t("The first value or range of the population.")),
           arg("value2 (number, range<number>, repeating)", _t("Additional values or ranges to include in the population.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           return variance(args, false, false, this.locale);
       },
@@ -14315,7 +14193,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number, range<number>)", _t("The first value or range of the population.")),
           arg("value2 (number, range<number>, repeating)", _t("Additional values or ranges to include in the population.")),
       ],
-      returns: ["NUMBER"],
       compute: function (...args) {
           return variance(args, false, true, this.locale);
       },
@@ -14481,7 +14358,6 @@ stores.inject(MyMetaStore, storeInstance);
   const DAVERAGE = {
       description: _t("Average of a set of values from a table-like range."),
       args: databaseArgs,
-      returns: ["NUMBER"],
       compute: function (database, field, criteria) {
           const cells = getMatchingCells(database, field, criteria, this.locale);
           return AVERAGE.compute.bind(this)([cells]);
@@ -14494,7 +14370,6 @@ stores.inject(MyMetaStore, storeInstance);
   const DCOUNT = {
       description: _t("Counts values from a table-like range."),
       args: databaseArgs,
-      returns: ["NUMBER"],
       compute: function (database, field, criteria) {
           const cells = getMatchingCells(database, field, criteria, this.locale);
           return COUNT.compute.bind(this)([cells]);
@@ -14507,7 +14382,6 @@ stores.inject(MyMetaStore, storeInstance);
   const DCOUNTA = {
       description: _t("Counts values and text from a table-like range."),
       args: databaseArgs,
-      returns: ["NUMBER"],
       compute: function (database, field, criteria) {
           const cells = getMatchingCells(database, field, criteria, this.locale);
           return COUNTA.compute.bind(this)([cells]);
@@ -14520,7 +14394,6 @@ stores.inject(MyMetaStore, storeInstance);
   const DGET = {
       description: _t("Single value from a table-like range."),
       args: databaseArgs,
-      returns: ["NUMBER"],
       compute: function (database, field, criteria) {
           const cells = getMatchingCells(database, field, criteria, this.locale);
           assert(() => cells.length === 1, _t("More than one match found in DGET evaluation."));
@@ -14534,7 +14407,6 @@ stores.inject(MyMetaStore, storeInstance);
   const DMAX = {
       description: _t("Maximum of values from a table-like range."),
       args: databaseArgs,
-      returns: ["NUMBER"],
       compute: function (database, field, criteria) {
           const cells = getMatchingCells(database, field, criteria, this.locale);
           return MAX.compute.bind(this)([cells]);
@@ -14547,7 +14419,6 @@ stores.inject(MyMetaStore, storeInstance);
   const DMIN = {
       description: _t("Minimum of values from a table-like range."),
       args: databaseArgs,
-      returns: ["NUMBER"],
       compute: function (database, field, criteria) {
           const cells = getMatchingCells(database, field, criteria, this.locale);
           return MIN.compute.bind(this)([cells]);
@@ -14560,7 +14431,6 @@ stores.inject(MyMetaStore, storeInstance);
   const DPRODUCT = {
       description: _t("Product of values from a table-like range."),
       args: databaseArgs,
-      returns: ["NUMBER"],
       compute: function (database, field, criteria) {
           const cells = getMatchingCells(database, field, criteria, this.locale);
           return PRODUCT.compute.bind(this)([cells]);
@@ -14573,7 +14443,6 @@ stores.inject(MyMetaStore, storeInstance);
   const DSTDEV = {
       description: _t("Standard deviation of population sample from table."),
       args: databaseArgs,
-      returns: ["NUMBER"],
       compute: function (database, field, criteria) {
           const cells = getMatchingCells(database, field, criteria, this.locale);
           return STDEV.compute.bind(this)([cells]);
@@ -14586,7 +14455,6 @@ stores.inject(MyMetaStore, storeInstance);
   const DSTDEVP = {
       description: _t("Standard deviation of entire population from table."),
       args: databaseArgs,
-      returns: ["NUMBER"],
       compute: function (database, field, criteria) {
           const cells = getMatchingCells(database, field, criteria, this.locale);
           return STDEVP.compute.bind(this)([cells]);
@@ -14599,7 +14467,6 @@ stores.inject(MyMetaStore, storeInstance);
   const DSUM = {
       description: _t("Sum of values from a table-like range."),
       args: databaseArgs,
-      returns: ["NUMBER"],
       compute: function (database, field, criteria) {
           const cells = getMatchingCells(database, field, criteria, this.locale);
           return SUM.compute.bind(this)([cells]);
@@ -14612,7 +14479,6 @@ stores.inject(MyMetaStore, storeInstance);
   const DVAR = {
       description: _t("Variance of population sample from table-like range."),
       args: databaseArgs,
-      returns: ["NUMBER"],
       compute: function (database, field, criteria) {
           const cells = getMatchingCells(database, field, criteria, this.locale);
           return VAR.compute.bind(this)([cells]);
@@ -14625,7 +14491,6 @@ stores.inject(MyMetaStore, storeInstance);
   const DVARP = {
       description: _t("Variance of a population from a table-like range."),
       args: databaseArgs,
-      returns: ["NUMBER"],
       compute: function (database, field, criteria) {
           const cells = getMatchingCells(database, field, criteria, this.locale);
           return VARP.compute.bind(this)([cells]);
@@ -14670,7 +14535,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("month (number)", _t("The month component of the date.")),
           arg("day (number)", _t("The day component of the date.")),
       ],
-      returns: ["DATE"],
       compute: function (year, month, day) {
           let _year = Math.trunc(toNumber(year, this.locale));
           const _month = Math.trunc(toNumber(month, this.locale));
@@ -14701,7 +14565,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("end_date (date)", _t("The end date to consider in the calculation. Must be a reference to a cell containing a DATE, a function returning a DATE type, or a number.")),
           arg("unit (string)", _t('A text abbreviation for unit of time. Accepted values are "Y" (the number of whole years between start_date and end_date), "M" (the number of whole months between start_date and end_date), "D" (the number of days between start_date and end_date), "MD" (the number of days between start_date and end_date after subtracting whole months), "YM" (the number of whole months between start_date and end_date after subtracting whole years), "YD" (the number of days between start_date and end_date, assuming start_date and end_date were no more than one year apart).')),
       ],
-      returns: ["NUMBER"],
       compute: function (startDate, endDate, unit) {
           const _unit = toString(unit).toUpperCase();
           assert(() => Object.values(TIME_UNIT).includes(_unit), expectStringSetError(Object.values(TIME_UNIT), toString(unit)));
@@ -14754,7 +14617,6 @@ stores.inject(MyMetaStore, storeInstance);
   const DATEVALUE = {
       description: _t("Converts a date string to a date value."),
       args: [arg("date_string (string)", _t("The string representing the date."))],
-      returns: ["NUMBER"],
       compute: function (dateString) {
           const _dateString = toString(dateString);
           const internalDate = parseDateTime(_dateString, this.locale);
@@ -14769,7 +14631,6 @@ stores.inject(MyMetaStore, storeInstance);
   const DAY = {
       description: _t("Day of the month that a specific date falls on."),
       args: [arg("date (string)", _t("The date from which to extract the day."))],
-      returns: ["NUMBER"],
       compute: function (date) {
           return toJsDate(date, this.locale).getDate();
       },
@@ -14784,7 +14645,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("end_date (date)", _t("The end of the date range.")),
           arg("start_date (date)", _t("The start of the date range.")),
       ],
-      returns: ["NUMBER"],
       compute: function (endDate, startDate) {
           const _endDate = toJsDate(endDate, this.locale);
           const _startDate = toJsDate(startDate, this.locale);
@@ -14804,7 +14664,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("end_date (date)", _t("The end date to consider in the calculation.")),
           arg(`method (number, default=${DEFAULT_DAY_COUNT_METHOD})`, _t("An indicator of what day count method to use. (0) US NASD method (1) European method")),
       ],
-      returns: ["NUMBER"],
       compute: function (startDate, endDate, method = { value: DEFAULT_DAY_COUNT_METHOD }) {
           const _startDate = Math.trunc(toNumber(startDate, this.locale));
           const _endDate = Math.trunc(toNumber(endDate, this.locale));
@@ -14823,7 +14682,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("start_date (date)", _t("The date from which to calculate the result.")),
           arg("months (number)", _t("The number of months before (negative) or after (positive) 'start_date' to calculate.")),
       ],
-      returns: ["DATE"],
       compute: function (startDate, months) {
           const _startDate = toJsDate(startDate, this.locale);
           const _months = Math.trunc(toNumber(months, this.locale));
@@ -14844,7 +14702,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("start_date (date)", _t("The date from which to calculate the result.")),
           arg("months (number)", _t("The number of months before (negative) or after (positive) 'start_date' to consider.")),
       ],
-      returns: ["DATE"],
       compute: function (startDate, months) {
           const _startDate = toJsDate(startDate, this.locale);
           const _months = Math.trunc(toNumber(months, this.locale));
@@ -14864,7 +14721,6 @@ stores.inject(MyMetaStore, storeInstance);
   const HOUR = {
       description: _t("Hour component of a specific time."),
       args: [arg("time (date)", _t("The time from which to calculate the hour component."))],
-      returns: ["NUMBER"],
       compute: function (date) {
           return toJsDate(date, this.locale).getHours();
       },
@@ -14878,7 +14734,6 @@ stores.inject(MyMetaStore, storeInstance);
       args: [
           arg("date (date)", _t("The date for which to determine the ISO week number. Must be a reference to a cell containing a date, a function returning a date type, or a number.")),
       ],
-      returns: ["NUMBER"],
       compute: function (date) {
           const _date = toJsDate(date, this.locale);
           const y = _date.getFullYear();
@@ -14950,7 +14805,6 @@ stores.inject(MyMetaStore, storeInstance);
   const MINUTE = {
       description: _t("Minute component of a specific time."),
       args: [arg("time (date)", _t("The time from which to calculate the minute component."))],
-      returns: ["NUMBER"],
       compute: function (date) {
           return toJsDate(date, this.locale).getMinutes();
       },
@@ -14962,7 +14816,6 @@ stores.inject(MyMetaStore, storeInstance);
   const MONTH = {
       description: _t("Month of the year a specific date falls in"),
       args: [arg("date (date)", _t("The date from which to extract the month."))],
-      returns: ["NUMBER"],
       compute: function (date) {
           return toJsDate(date, this.locale).getMonth() + 1;
       },
@@ -14978,7 +14831,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("end_date (date)", _t("The end date of the period from which to calculate the number of net working days.")),
           arg("holidays (date, range<date>, optional)", _t("A range or array constant containing the date serial numbers to consider holidays.")),
       ],
-      returns: ["NUMBER"],
       compute: function (startDate, endDate, holidays) {
           return NETWORKDAYS_INTL.compute.bind(this)(startDate, endDate, { value: 1 }, holidays);
       },
@@ -15059,7 +14911,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg(`weekend (any, default=${DEFAULT_WEEKEND})`, _t("A number or string representing which days of the week are considered weekends.")),
           arg("holidays (date, range<date>, optional)", _t("A range or array constant containing the dates to consider as holidays.")),
       ],
-      returns: ["NUMBER"],
       compute: function (startDate, endDate, weekend = { value: DEFAULT_WEEKEND }, holidays) {
           const _startDate = toJsDate(startDate, this.locale);
           const _endDate = toJsDate(endDate, this.locale);
@@ -15094,7 +14945,6 @@ stores.inject(MyMetaStore, storeInstance);
   const NOW = {
       description: _t("Current date and time as a date value."),
       args: [],
-      returns: ["DATE"],
       compute: function () {
           const today = DateTime.now();
           const delta = today.getTime() - INITIAL_1900_DAY.getTime();
@@ -15112,7 +14962,6 @@ stores.inject(MyMetaStore, storeInstance);
   const SECOND = {
       description: _t("Minute component of a specific time."),
       args: [arg("time (date)", _t("The time from which to calculate the second component."))],
-      returns: ["NUMBER"],
       compute: function (date) {
           return toJsDate(date, this.locale).getSeconds();
       },
@@ -15128,7 +14977,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("minute (number)", _t("The minute component of the time.")),
           arg("second (number)", _t("The second component of the time.")),
       ],
-      returns: ["DATE"],
       compute: function (hour, minute, second) {
           let _hour = Math.trunc(toNumber(hour, this.locale));
           let _minute = Math.trunc(toNumber(minute, this.locale));
@@ -15152,7 +15000,6 @@ stores.inject(MyMetaStore, storeInstance);
   const TIMEVALUE = {
       description: _t("Converts a time string into its serial number representation."),
       args: [arg("time_string (string)", _t("The string that holds the time representation."))],
-      returns: ["NUMBER"],
       compute: function (timeString) {
           const _timeString = toString(timeString);
           const internalDate = parseDateTime(_timeString, this.locale);
@@ -15168,7 +15015,6 @@ stores.inject(MyMetaStore, storeInstance);
   const TODAY = {
       description: _t("Current date as a date value."),
       args: [],
-      returns: ["DATE"],
       compute: function () {
           const today = DateTime.now();
           const jsDate = new DateTime(today.getFullYear(), today.getMonth(), today.getDate());
@@ -15188,7 +15034,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("date (date)", _t("The date for which to determine the day of the week. Must be a reference to a cell containing a date, a function returning a date type, or a number.")),
           arg(`type (number, default=${DEFAULT_TYPE})`, _t("A number indicating which numbering system to use to represent weekdays. By default, counts starting with Sunday = 1.")),
       ],
-      returns: ["NUMBER"],
       compute: function (date, type = { value: DEFAULT_TYPE }) {
           const _date = toJsDate(date, this.locale);
           const _type = Math.round(toNumber(type, this.locale));
@@ -15211,7 +15056,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("date (date)", _t("The date for which to determine the week number. Must be a reference to a cell containing a date, a function returning a date type, or a number.")),
           arg(`type (number, default=${DEFAULT_TYPE})`, _t("A number representing the day that a week starts on. Sunday = 1.")),
       ],
-      returns: ["NUMBER"],
       compute: function (date, type = { value: DEFAULT_TYPE }) {
           const _date = toJsDate(date, this.locale);
           const _type = Math.round(toNumber(type, this.locale));
@@ -15252,7 +15096,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("num_days (number)", _t("The number of working days to advance from start_date. If negative, counts backwards.")),
           arg("holidays (date, range<date>, optional)", _t("A range or array constant containing the dates to consider holidays.")),
       ],
-      returns: ["NUMBER"],
       compute: function (startDate, numDays, holidays = { value: null }) {
           return WORKDAY_INTL.compute.bind(this)(startDate, numDays, { value: 1 }, holidays);
       },
@@ -15269,7 +15112,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg(`weekend (any, default=${DEFAULT_WEEKEND})`, _t("A number or string representing which days of the week are considered weekends.")),
           arg("holidays (date, range<date>, optional)", _t("A range or array constant containing the dates to consider holidays.")),
       ],
-      returns: ["DATE"],
       compute: function (startDate, numDays, weekend = { value: DEFAULT_WEEKEND }, holidays) {
           let _startDate = toJsDate(startDate, this.locale);
           let _numDays = Math.trunc(toNumber(numDays, this.locale));
@@ -15309,7 +15151,6 @@ stores.inject(MyMetaStore, storeInstance);
   const YEAR = {
       description: _t("Year specified by a given date."),
       args: [arg("date (date)", _t("The date from which to extract the year."))],
-      returns: ["NUMBER"],
       compute: function (date) {
           return toJsDate(date, this.locale).getFullYear();
       },
@@ -15326,7 +15167,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("end_date (date)", _t("The end date to consider in the calculation. Must be a reference to a cell containing a date, a function returning a date type, or a number.")),
           arg(`day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION$1})`, _t("An indicator of what day count method to use.")),
       ],
-      returns: ["NUMBER"],
       compute: function (startDate, endDate, dayCountConvention = { value: DEFAULT_DAY_COUNT_CONVENTION$1 }) {
           let _startDate = Math.trunc(toNumber(startDate, this.locale));
           let _endDate = Math.trunc(toNumber(endDate, this.locale));
@@ -15343,7 +15183,6 @@ stores.inject(MyMetaStore, storeInstance);
   const MONTH_START = {
       description: _t("First day of the month preceding a date."),
       args: [arg("date (date)", _t("The date from which to calculate the result."))],
-      returns: ["DATE"],
       compute: function (date) {
           const _startDate = toJsDate(date, this.locale);
           const yStart = _startDate.getFullYear();
@@ -15361,7 +15200,6 @@ stores.inject(MyMetaStore, storeInstance);
   const MONTH_END = {
       description: _t("Last day of the month following a date."),
       args: [arg("date (date)", _t("The date from which to calculate the result."))],
-      returns: ["DATE"],
       compute: function (date) {
           return EOMONTH.compute.bind(this)(date, { value: 0 });
       },
@@ -15372,7 +15210,6 @@ stores.inject(MyMetaStore, storeInstance);
   const QUARTER = {
       description: _t("Quarter of the year a specific date falls in"),
       args: [arg("date (date)", _t("The date from which to extract the quarter."))],
-      returns: ["NUMBER"],
       compute: function (date) {
           return Math.ceil((toJsDate(date, this.locale).getMonth() + 1) / 3);
       },
@@ -15383,7 +15220,6 @@ stores.inject(MyMetaStore, storeInstance);
   const QUARTER_START = {
       description: _t("First day of the quarter of the year a specific date falls in."),
       args: [arg("date (date)", _t("The date from which to calculate the start of quarter."))],
-      returns: ["DATE"],
       compute: function (date) {
           const quarter = QUARTER.compute.bind(this)(date);
           const year = YEAR.compute.bind(this)(date);
@@ -15400,7 +15236,6 @@ stores.inject(MyMetaStore, storeInstance);
   const QUARTER_END = {
       description: _t("Last day of the quarter of the year a specific date falls in."),
       args: [arg("date (date)", _t("The date from which to calculate the end of quarter."))],
-      returns: ["DATE"],
       compute: function (date) {
           const quarter = QUARTER.compute.bind(this)(date);
           const year = YEAR.compute.bind(this)(date);
@@ -15417,7 +15252,6 @@ stores.inject(MyMetaStore, storeInstance);
   const YEAR_START = {
       description: _t("First day of the year a specific date falls in."),
       args: [arg("date (date)", _t("The date from which to calculate the start of the year."))],
-      returns: ["DATE"],
       compute: function (date) {
           const year = YEAR.compute.bind(this)(date);
           const jsDate = new DateTime(year, 0, 1);
@@ -15433,7 +15267,6 @@ stores.inject(MyMetaStore, storeInstance);
   const YEAR_END = {
       description: _t("Last day of the year a specific date falls in."),
       args: [arg("date (date)", _t("The date from which to calculate the end of the year."))],
-      returns: ["DATE"],
       compute: function (date) {
           const year = YEAR.compute.bind(this)(date);
           const jsDate = new DateTime(year + 1, 0, 0);
@@ -15490,7 +15323,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("number1 (number)", _t("The first number to compare.")),
           arg(`number2 (number, default=${DEFAULT_DELTA_ARG})`, _t("The second number to compare.")),
       ],
-      returns: ["NUMBER"],
       compute: function (number1, number2 = { value: DEFAULT_DELTA_ARG }) {
           const _number1 = toNumber(number1, this.locale);
           const _number2 = toNumber(number2, this.locale);
@@ -15681,7 +15513,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("condition1 (boolean, range<boolean>)", _t("A column or row containing true or false values corresponding to the first column or row of range.")),
           arg("condition2 (boolean, range<boolean>, repeating)", _t("Additional column or row containing true or false values.")),
       ],
-      returns: ["RANGE<ANY>"],
       compute: function (range, ...conditions) {
           let _array = toMatrix(range);
           const _conditionsMatrices = conditions.map((cond) => matrixMap(toMatrix(cond), (data) => data.value));
@@ -15715,7 +15546,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("sort_column (any, range<number>, repeating)", _t("The index of the column in range or a range outside of range containing the values by which to sort.")),
           arg("is_ascending (boolean, repeating)", _t("TRUE or FALSE indicating whether to sort sort_column in ascending order. FALSE sorts in descending order.")),
       ],
-      returns: ["RANGE"],
       compute: function (range, ...sortingCriteria) {
           const _range = transposeMatrix(range);
           return transposeMatrix(sortMatrix(_range, this.locale, ...sortingCriteria));
@@ -15734,7 +15564,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("sort_column (number, range<number>, repeating)", _t("The index of the column in range or a range outside of range containing the values by which to sort.")),
           arg("is_ascending (boolean, repeating)", _t("TRUE or FALSE indicating whether to sort sort_column in ascending order. FALSE sorts in descending order.")),
       ],
-      returns: ["RANGE"],
       compute: function (range, n, displayTiesMode, ...sortingCriteria) {
           const _n = toNumber(n?.value ?? 1, this.locale);
           assert(() => _n >= 0, _t("Wrong value of 'n'. Expected a positive number. Got %s.", _n));
@@ -15802,7 +15631,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("by_column (boolean, default=FALSE)", _t("Whether to filter the data by columns or by rows.")),
           arg("exactly_once (boolean, default=FALSE)", _t("Whether to return only entries with no duplicates.")),
       ],
-      returns: ["RANGE<NUMBER>"],
       compute: function (range = { value: "" }, byColumn, exactlyOnce) {
           if (!isMatrix(range)) {
               return [[range]];
@@ -16027,7 +15855,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("redemption (number)", _t("The redemption amount per 100 face value, or par.")),
           arg(`day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} )`, _t("An indicator of what day count method to use.")),
       ],
-      returns: ["NUMBER"],
       compute: function (issue, maturity, rate, redemption, dayCountConvention = { value: DEFAULT_DAY_COUNT_CONVENTION }) {
           const start = Math.trunc(toNumber(issue, this.locale));
           const end = Math.trunc(toNumber(maturity, this.locale));
@@ -16058,7 +15885,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("rate (number)", _t("The deprecation rate.")),
           arg("day_count_convention (number, optional)", _t("An indicator of what day count method to use.")),
       ],
-      returns: ["NUMBER"],
       compute: function (cost, purchaseDate, firstPeriodEnd, salvage, period, rate, dayCountConvention = { value: DEFAULT_DAY_COUNT_CONVENTION }) {
           dayCountConvention = dayCountConvention || 0;
           const _cost = toNumber(cost, this.locale);
@@ -16107,7 +15933,6 @@ stores.inject(MyMetaStore, storeInstance);
   const COUPDAYS = {
       description: _t("Days in coupon period containing settlement date."),
       args: COUPON_FUNCTION_ARGS,
-      returns: ["NUMBER"],
       compute: function (settlement, maturity, frequency, dayCountConvention = { value: DEFAULT_DAY_COUNT_CONVENTION }) {
           dayCountConvention = dayCountConvention || 0;
           const start = Math.trunc(toNumber(settlement, this.locale));
@@ -16134,7 +15959,6 @@ stores.inject(MyMetaStore, storeInstance);
   const COUPDAYBS = {
       description: _t("Days from settlement until next coupon."),
       args: COUPON_FUNCTION_ARGS,
-      returns: ["NUMBER"],
       compute: function (settlement, maturity, frequency, dayCountConvention = { value: DEFAULT_DAY_COUNT_CONVENTION }) {
           dayCountConvention = dayCountConvention || 0;
           const start = Math.trunc(toNumber(settlement, this.locale));
@@ -16191,7 +16015,6 @@ stores.inject(MyMetaStore, storeInstance);
   const COUPDAYSNC = {
       description: _t("Days from settlement until next coupon."),
       args: COUPON_FUNCTION_ARGS,
-      returns: ["NUMBER"],
       compute: function (settlement, maturity, frequency, dayCountConvention = { value: DEFAULT_DAY_COUNT_CONVENTION }) {
           dayCountConvention = dayCountConvention || 0;
           const start = Math.trunc(toNumber(settlement, this.locale));
@@ -16221,7 +16044,6 @@ stores.inject(MyMetaStore, storeInstance);
   const COUPNCD = {
       description: _t("Next coupon date after the settlement date."),
       args: COUPON_FUNCTION_ARGS,
-      returns: ["NUMBER"],
       compute: function (settlement, maturity, frequency, dayCountConvention = { value: DEFAULT_DAY_COUNT_CONVENTION }) {
           dayCountConvention = dayCountConvention || 0;
           const start = Math.trunc(toNumber(settlement, this.locale));
@@ -16247,7 +16069,6 @@ stores.inject(MyMetaStore, storeInstance);
   const COUPNUM = {
       description: _t("Number of coupons between settlement and maturity."),
       args: COUPON_FUNCTION_ARGS,
-      returns: ["NUMBER"],
       compute: function (settlement, maturity, frequency, dayCountConvention = { value: DEFAULT_DAY_COUNT_CONVENTION }) {
           dayCountConvention = dayCountConvention || 0;
           const start = Math.trunc(toNumber(settlement, this.locale));
@@ -16274,7 +16095,6 @@ stores.inject(MyMetaStore, storeInstance);
   const COUPPCD = {
       description: _t("Last coupon date prior to or on the settlement date."),
       args: COUPON_FUNCTION_ARGS,
-      returns: ["NUMBER"],
       compute: function (settlement, maturity, frequency, dayCountConvention = { value: DEFAULT_DAY_COUNT_CONVENTION }) {
           dayCountConvention = dayCountConvention || 0;
           const start = Math.trunc(toNumber(settlement, this.locale));
@@ -16307,7 +16127,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("last_period (number)", _t("The number of the payment period to end the cumulative calculation.")),
           arg(`end_or_beginning (number, default=${DEFAULT_END_OR_BEGINNING})`, _t("Whether payments are due at the end (0) or beginning (1) of each period.")),
       ],
-      returns: ["NUMBER"],
       compute: function (rate, numberOfPeriods, presentValue, firstPeriod, lastPeriod, endOrBeginning = { value: DEFAULT_END_OR_BEGINNING }) {
           const first = toNumber(firstPeriod, this.locale);
           const last = toNumber(lastPeriod, this.locale);
@@ -16339,7 +16158,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("last_period (number)", _t("The number of the payment period to end the cumulative calculation.")),
           arg(`end_or_beginning (number, default=${DEFAULT_END_OR_BEGINNING})`, _t("Whether payments are due at the end (0) or beginning (1) of each period.")),
       ],
-      returns: ["NUMBER"],
       compute: function (rate, numberOfPeriods, presentValue, firstPeriod, lastPeriod, endOrBeginning = { value: DEFAULT_END_OR_BEGINNING }) {
           const first = toNumber(firstPeriod, this.locale);
           const last = toNumber(lastPeriod, this.locale);
@@ -16370,7 +16188,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("period (number)", _t("The single period within life for which to calculate depreciation.")),
           arg("month (number, optional)", _t("The number of months in the first year of depreciation.")),
       ],
-      returns: ["NUMBER"],
       // to do: replace by dollar format
       compute: function (cost, salvage, life, period, ...args) {
           const _cost = toNumber(cost, this.locale);
@@ -16439,7 +16256,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("period (number)", _t("The single period within life for which to calculate depreciation.")),
           arg(`factor (number, default=${DEFAULT_DDB_DEPRECIATION_FACTOR})`, _t("The factor by which depreciation decreases.")),
       ],
-      returns: ["NUMBER"],
       compute: function (cost, salvage, life, period, factor = { value: DEFAULT_DDB_DEPRECIATION_FACTOR }) {
           const _cost = toNumber(cost, this.locale);
           const _salvage = toNumber(salvage, this.locale);
@@ -16465,7 +16281,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("redemption (number)", _t("The redemption amount per 100 face value, or par.")),
           arg(`day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} )`, _t("An indicator of what day count method to use.")),
       ],
-      returns: ["NUMBER"],
       compute: function (settlement, maturity, price, redemption, dayCountConvention = { value: DEFAULT_DAY_COUNT_CONVENTION }) {
           dayCountConvention = dayCountConvention || 0;
           const _settlement = Math.trunc(toNumber(settlement, this.locale));
@@ -16501,7 +16316,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("fractional_price (number)", _t("The price quotation given using fractional decimal conventions.")),
           arg("unit (number)", _t("The units of the fraction, e.g. 8 for 1/8ths or 32 for 1/32nds.")),
       ],
-      returns: ["NUMBER"],
       compute: function (fractionalPrice, unit) {
           const price = toNumber(fractionalPrice, this.locale);
           const _unit = Math.trunc(toNumber(unit, this.locale));
@@ -16522,7 +16336,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("decimal_price (number)", _t("The price quotation given as a decimal value.")),
           arg("unit (number)", _t("The units of the desired fraction, e.g. 8 for 1/8ths or 32 for 1/32nds.")),
       ],
-      returns: ["NUMBER"],
       compute: function (decimalPrice, unit) {
           const price = toNumber(decimalPrice, this.locale);
           const _unit = Math.trunc(toNumber(unit, this.locale));
@@ -16547,7 +16360,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("frequency (number)", _t("The number of interest or coupon payments per year (1, 2, or 4).")),
           arg(`day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} )`, _t("An indicator of what day count method to use.")),
       ],
-      returns: ["NUMBER"],
       compute: function (settlement, maturity, rate, securityYield, frequency, dayCountConvention = { value: DEFAULT_DAY_COUNT_CONVENTION }) {
           const start = Math.trunc(toNumber(settlement, this.locale));
           const end = Math.trunc(toNumber(maturity, this.locale));
@@ -16588,7 +16400,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("nominal_rate (number)", _t("The nominal interest rate per year.")),
           arg("periods_per_year (number)", _t("The number of compounding periods per year.")),
       ],
-      returns: ["NUMBER"],
       compute: function (nominal_rate, periods_per_year) {
           const nominal = toNumber(nominal_rate, this.locale);
           const periods = Math.trunc(toNumber(periods_per_year, this.locale));
@@ -16618,7 +16429,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg(`present_value (number, default=${DEFAULT_PRESENT_VALUE})`, _t("The current value of the annuity.")),
           arg(`end_or_beginning (number, default=${DEFAULT_END_OR_BEGINNING})`, _t("Whether payments are due at the end (0) or beginning (1) of each period.")),
       ],
-      returns: ["NUMBER"],
       // to do: replace by dollar format
       compute: function (rate, numberOfPeriods, paymentAmount, presentValue = { value: DEFAULT_PRESENT_VALUE }, endOrBeginning = { value: DEFAULT_END_OR_BEGINNING }) {
           presentValue = presentValue || 0;
@@ -16644,7 +16454,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("principal (number)", _t("The amount of initial capital or value to compound against.")),
           arg("rate_schedule (number, range<number>)", _t("A series of interest rates to compound against the principal.")),
       ],
-      returns: ["NUMBER"],
       compute: function (principalAmount, rateSchedule) {
           const principal = toNumber(principalAmount, this.locale);
           return reduceAny([rateSchedule], (acc, rate) => acc * (1 + toNumber(rate, this.locale)), principal);
@@ -16663,7 +16472,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("redemption (number)", _t("The amount to be received at maturity.")),
           arg(`day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} )`, _t("An indicator of what day count method to use.")),
       ],
-      returns: ["NUMBER"],
       compute: function (settlement, maturity, investment, redemption, dayCountConvention = { value: DEFAULT_DAY_COUNT_CONVENTION }) {
           const _settlement = Math.trunc(toNumber(settlement, this.locale));
           const _maturity = Math.trunc(toNumber(maturity, this.locale));
@@ -16702,7 +16510,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg(`future_value (number, default=${DEFAULT_FUTURE_VALUE})`, _t("The future value remaining after the final payment has been made.")),
           arg(`end_or_beginning (number, default=${DEFAULT_END_OR_BEGINNING})`, _t("Whether payments are due at the end (0) or beginning (1) of each period.")),
       ],
-      returns: ["NUMBER"],
       compute: function (rate, currentPeriod, numberOfPeriods, presentValue, futureValue = { value: DEFAULT_FUTURE_VALUE }, endOrBeginning = { value: DEFAULT_END_OR_BEGINNING }) {
           const r = toNumber(rate, this.locale);
           const period = toNumber(currentPeriod, this.locale);
@@ -16727,7 +16534,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("cashflow_amounts (number, range<number>)", _t("An array or range containing the income or payments associated with the investment.")),
           arg(`rate_guess (number, default=${DEFAULT_RATE_GUESS})`, _t("An estimate for what the internal rate of return will be.")),
       ],
-      returns: ["NUMBER"],
       compute: function (cashFlowAmounts, rateGuess = { value: DEFAULT_RATE_GUESS }) {
           const _rateGuess = toNumber(rateGuess, this.locale);
           assertRateGuessStrictlyGreaterThanMinusOne(_rateGuess);
@@ -16789,7 +16595,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("number_of_periods (number)", _t("The number of payments to be made.")),
           arg("present_value (number)", _t("The current value of the annuity.")),
       ],
-      returns: ["NUMBER"],
       compute: function (rate, currentPeriod, numberOfPeriods, presentValue) {
           const interestRate = toNumber(rate, this.locale);
           const period = toNumber(currentPeriod, this.locale);
@@ -16814,7 +16619,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("frequency (number)", _t("The number of interest or coupon payments per year (1, 2, or 4).")),
           arg(`day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} )`, _t("An indicator of what day count method to use.")),
       ],
-      returns: ["NUMBER"],
       compute: function (settlement, maturity, rate, securityYield, frequency, dayCountConvention = { value: DEFAULT_DAY_COUNT_CONVENTION }) {
           const duration = DURATION.compute.bind(this)(settlement, maturity, rate, securityYield, frequency, dayCountConvention);
           const y = toNumber(securityYield, this.locale);
@@ -16833,7 +16637,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("financing_rate (number)", _t("The interest rate paid on funds invested.")),
           arg("reinvestment_return_rate (number)", _t("The return (as a percentage) earned on reinvestment of income received from the investment.")),
       ],
-      returns: ["NUMBER"],
       compute: function (cashflowAmount, financingRate, reinvestmentRate) {
           const fRate = toNumber(financingRate, this.locale);
           const rRate = toNumber(reinvestmentRate, this.locale);
@@ -16885,7 +16688,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("effective_rate (number)", _t("The effective interest rate per year.")),
           arg("periods_per_year (number)", _t("The number of compounding periods per year.")),
       ],
-      returns: ["NUMBER"],
       compute: function (effective_rate, periods_per_year) {
           const effective = toNumber(effective_rate, this.locale);
           const periods = Math.trunc(toNumber(periods_per_year, this.locale));
@@ -16908,7 +16710,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg(`future_value (number, default=${DEFAULT_FUTURE_VALUE})`, _t("The future value remaining after the final payment has been made.")),
           arg(`end_or_beginning (number, default=${DEFAULT_END_OR_BEGINNING})`, _t("Whether payments are due at the end (0) or beginning (1) of each period.")),
       ],
-      returns: ["NUMBER"],
       compute: function (rate, paymentAmount, presentValue, futureValue = { value: DEFAULT_FUTURE_VALUE }, endOrBeginning = { value: DEFAULT_END_OR_BEGINNING }) {
           futureValue = futureValue || 0;
           endOrBeginning = endOrBeginning || 0;
@@ -16956,7 +16757,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("cashflow1 (number, range<number>)", _t("The first future cash flow.")),
           arg("cashflow2 (number, range<number>, repeating)", _t("Additional future cash flows.")),
       ],
-      returns: ["NUMBER"],
       // to do: replace by dollar format
       compute: function (discount, ...values) {
           const _discount = toNumber(discount, this.locale);
@@ -16978,7 +16778,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("present_value (number)", _t("The investment's current value.")),
           arg("future_value (number)", _t("The investment's desired future value.")),
       ],
-      returns: ["NUMBER"],
       compute: function (rate, presentValue, futureValue) {
           const _rate = toNumber(rate, this.locale);
           const _presentValue = toNumber(presentValue, this.locale);
@@ -17018,7 +16817,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg(`future_value (number, default=${DEFAULT_FUTURE_VALUE})`, _t("The future value remaining after the final payment has been made.")),
           arg(`end_or_beginning (number, default=${DEFAULT_END_OR_BEGINNING})`, _t("Whether payments are due at the end (0) or beginning (1) of each period.")),
       ],
-      returns: ["NUMBER"],
       compute: function (rate, numberOfPeriods, presentValue, futureValue = { value: DEFAULT_FUTURE_VALUE }, endOrBeginning = { value: DEFAULT_END_OR_BEGINNING }) {
           const n = toNumber(numberOfPeriods, this.locale);
           const r = toNumber(rate, this.locale);
@@ -17054,7 +16852,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg(`future_value (number, default=${DEFAULT_FUTURE_VALUE})`, _t("The future value remaining after the final payment has been made.")),
           arg(`end_or_beginning (number, default=${DEFAULT_END_OR_BEGINNING})`, _t("Whether payments are due at the end (0) or beginning (1) of each period.")),
       ],
-      returns: ["NUMBER"],
       compute: function (rate, currentPeriod, numberOfPeriods, presentValue, futureValue = { value: DEFAULT_FUTURE_VALUE }, endOrBeginning = { value: DEFAULT_END_OR_BEGINNING }) {
           const n = toNumber(numberOfPeriods, this.locale);
           const r = toNumber(rate, this.locale);
@@ -17081,7 +16878,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg(`future_value (number, default=${DEFAULT_FUTURE_VALUE})`, _t("The future value remaining after the final payment has been made.")),
           arg(`end_or_beginning (number, default=${DEFAULT_END_OR_BEGINNING})`, _t("Whether payments are due at the end (0) or beginning (1) of each period.")),
       ],
-      returns: ["NUMBER"],
       // to do: replace by dollar format
       compute: function (rate, numberOfPeriods, paymentAmount, futureValue = { value: DEFAULT_FUTURE_VALUE }, endOrBeginning = { value: DEFAULT_END_OR_BEGINNING }) {
           futureValue = futureValue || 0;
@@ -17115,7 +16911,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("frequency (number)", _t("The number of interest or coupon payments per year (1, 2, or 4).")),
           arg(`day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} )`, _t("An indicator of what day count method to use.")),
       ],
-      returns: ["NUMBER"],
       compute: function (settlement, maturity, rate, securityYield, redemption, frequency, dayCountConvention = { value: DEFAULT_DAY_COUNT_CONVENTION }) {
           dayCountConvention = dayCountConvention || 0;
           const _settlement = Math.trunc(toNumber(settlement, this.locale));
@@ -17163,7 +16958,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("redemption (number)", _t("The redemption amount per 100 face value, or par.")),
           arg(`day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} )`, _t("An indicator of what day count method to use.")),
       ],
-      returns: ["NUMBER"],
       compute: function (settlement, maturity, discount, redemption, dayCountConvention = { value: DEFAULT_DAY_COUNT_CONVENTION }) {
           dayCountConvention = dayCountConvention || 0;
           const _settlement = Math.trunc(toNumber(settlement, this.locale));
@@ -17201,7 +16995,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("yield (number)", _t("The expected annual yield of the security.")),
           arg(`day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} )`, _t("An indicator of what day count method to use.")),
       ],
-      returns: ["NUMBER"],
       compute: function (settlement, maturity, issue, rate, securityYield, dayCountConvention = { value: DEFAULT_DAY_COUNT_CONVENTION }) {
           dayCountConvention = dayCountConvention || 0;
           const _settlement = Math.trunc(toNumber(settlement, this.locale));
@@ -17265,7 +17058,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg(`end_or_beginning (number, default=${DEFAULT_END_OR_BEGINNING})`, _t("Whether payments are due at the end (0) or beginning (1) of each period.")),
           arg(`rate_guess (number, default=${RATE_GUESS_DEFAULT})`, _t("An estimate for what the interest rate will be.")),
       ],
-      returns: ["NUMBER"],
       compute: function (numberOfPeriods, paymentPerPeriod, presentValue, futureValue = { value: DEFAULT_FUTURE_VALUE }, endOrBeginning = { value: DEFAULT_END_OR_BEGINNING }, rateGuess = { value: RATE_GUESS_DEFAULT }) {
           const n = toNumber(numberOfPeriods, this.locale);
           const payment = toNumber(paymentPerPeriod, this.locale);
@@ -17311,7 +17103,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("discount (number)", _t("The discount rate of the security invested in.")),
           arg(`day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} )`, _t("An indicator of what day count method to use.")),
       ],
-      returns: ["NUMBER"],
       compute: function (settlement, maturity, investment, discount, dayCountConvention = { value: DEFAULT_DAY_COUNT_CONVENTION }) {
           dayCountConvention = dayCountConvention || 0;
           const _settlement = Math.trunc(toNumber(settlement, this.locale));
@@ -17349,7 +17140,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("present_value (number)", _t("The present value of the investment.")),
           arg("future_value (number)", _t("The future value of the investment.")),
       ],
-      returns: ["NUMBER"],
       compute: function (numberOfPeriods, presentValue, futureValue) {
           const n = toNumber(numberOfPeriods, this.locale);
           const pv = toNumber(presentValue, this.locale);
@@ -17374,7 +17164,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("salvage (number)", _t("The value of the asset at the end of depreciation.")),
           arg("life (number)", _t("The number of periods over which the asset is depreciated.")),
       ],
-      returns: ["NUMBER"],
       compute: function (cost, salvage, life) {
           const _cost = toNumber(cost, this.locale);
           const _salvage = toNumber(salvage, this.locale);
@@ -17399,7 +17188,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("life (number)", _t("The number of periods over which the asset is depreciated.")),
           arg("period (number)", _t("The single period within life for which to calculate depreciation.")),
       ],
-      returns: ["NUMBER"],
       compute: function (cost, salvage, life, period) {
           const _cost = toNumber(cost, this.locale);
           const _salvage = toNumber(salvage, this.locale);
@@ -17448,7 +17236,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("maturity (date)", _t("The maturity or end date of the security, when it can be redeemed at face, or par value.")),
           arg("discount (number)", _t("The discount rate of the bill at time of purchase.")),
       ],
-      returns: ["NUMBER"],
       compute: function (settlement, maturity, discount) {
           const start = Math.trunc(toNumber(settlement, this.locale));
           const end = Math.trunc(toNumber(maturity, this.locale));
@@ -17471,7 +17258,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("maturity (date)", _t("The maturity or end date of the security, when it can be redeemed at face, or par value.")),
           arg("discount (number)", _t("The discount rate of the bill at time of purchase.")),
       ],
-      returns: ["NUMBER"],
       compute: function (settlement, maturity, discount) {
           const start = Math.trunc(toNumber(settlement, this.locale));
           const end = Math.trunc(toNumber(maturity, this.locale));
@@ -17529,7 +17315,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("maturity (date)", _t("The maturity or end date of the security, when it can be redeemed at face, or par value.")),
           arg("price (number)", _t("The price at which the security is bought per 100 face value.")),
       ],
-      returns: ["NUMBER"],
       compute: function (settlement, maturity, price) {
           const start = Math.trunc(toNumber(settlement, this.locale));
           const end = Math.trunc(toNumber(maturity, this.locale));
@@ -17569,7 +17354,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg(`factor (number, default=${DEFAULT_DDB_DEPRECIATION_FACTOR})`, _t("The number of months in the first year of depreciation.")),
           arg(`no_switch (number, default=${DEFAULT_VDB_NO_SWITCH})`, _t("Whether to switch to straight-line depreciation when the depreciation is greater than the declining balance calculation.")),
       ],
-      returns: ["NUMBER"],
       compute: function (cost, salvage, life, startPeriod, endPeriod, factor = { value: DEFAULT_DDB_DEPRECIATION_FACTOR }, noSwitch = { value: DEFAULT_VDB_NO_SWITCH }) {
           factor = factor || 0;
           const _cost = toNumber(cost, this.locale);
@@ -17634,7 +17418,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("cashflow_dates (range<number>)", _t("An range with dates corresponding to the cash flows in cashflow_amounts.")),
           arg(`rate_guess (number, default=${RATE_GUESS_DEFAULT})`, _t("An estimate for what the internal rate of return will be.")),
       ],
-      returns: ["NUMBER"],
       compute: function (cashflowAmounts, cashflowDates, rateGuess = { value: RATE_GUESS_DEFAULT }) {
           const guess = toNumber(rateGuess, this.locale);
           const _cashFlows = cashflowAmounts.flat().map((val) => toNumber(val, this.locale));
@@ -17705,7 +17488,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("cashflow_amounts (number, range<number>)", _t("An range containing the income or payments associated with the investment.")),
           arg("cashflow_dates (number, range<number>)", _t("An range with dates corresponding to the cash flows in cashflow_amounts.")),
       ],
-      returns: ["NUMBER"],
       compute: function (discount, cashflowAmounts, cashflowDates) {
           const rate = toNumber(discount, this.locale);
           const _cashFlows = isMatrix(cashflowAmounts)
@@ -17772,7 +17554,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("frequency (number)", _t("The number of interest or coupon payments per year (1, 2, or 4).")),
           arg(`day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} )`, _t("An indicator of what day count method to use.")),
       ],
-      returns: ["NUMBER"],
       compute: function (settlement, maturity, rate, price, redemption, frequency, dayCountConvention = { value: DEFAULT_DAY_COUNT_CONVENTION }) {
           dayCountConvention = dayCountConvention || 0;
           const _settlement = Math.trunc(toNumber(settlement, this.locale));
@@ -17847,7 +17628,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("redemption (number)", _t("The redemption amount per 100 face value, or par.")),
           arg(`day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} )`, _t("An indicator of what day count method to use.")),
       ],
-      returns: ["NUMBER"],
       compute: function (settlement, maturity, price, redemption, dayCountConvention = { value: DEFAULT_DAY_COUNT_CONVENTION }) {
           dayCountConvention = dayCountConvention || 0;
           const _settlement = Math.trunc(toNumber(settlement, this.locale));
@@ -17884,7 +17664,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("price (number)", _t("The price at which the security is bought.")),
           arg(`day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} )`, _t("An indicator of what day count method to use.")),
       ],
-      returns: ["NUMBER"],
       compute: function (settlement, maturity, issue, rate, price, dayCountConvention = { value: DEFAULT_DAY_COUNT_CONVENTION }) {
           dayCountConvention = dayCountConvention || 0;
           const _settlement = Math.trunc(toNumber(settlement, this.locale));
@@ -17971,7 +17750,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("info_type (string)", _t("The type of information requested. Can be one of %s", CELL_INFO_TYPES.join(", "))),
           arg("reference (meta)", _t("The reference to the cell.")),
       ],
-      returns: ["ANY"],
       compute: function (info, reference) {
           const _info = toString(info).toLowerCase();
           assert(() => CELL_INFO_TYPES.includes(_info), _t("The info_type should be one of %s.", CELL_INFO_TYPES.join(", ")));
@@ -18022,7 +17800,6 @@ stores.inject(MyMetaStore, storeInstance);
   const ISERR = {
       description: _t("Whether a value is an error other than #N/A."),
       args: [arg("value (any)", _t("The value to be verified as an error type."))],
-      returns: ["BOOLEAN"],
       compute: function (data) {
           const value = data?.value;
           return isEvaluationError(value) && value !== CellErrorType.NotAvailable;
@@ -18035,7 +17812,6 @@ stores.inject(MyMetaStore, storeInstance);
   const ISERROR = {
       description: _t("Whether a value is an error."),
       args: [arg("value (any)", _t("The value to be verified as an error type."))],
-      returns: ["BOOLEAN"],
       compute: function (data) {
           const value = data?.value;
           return isEvaluationError(value);
@@ -18048,7 +17824,6 @@ stores.inject(MyMetaStore, storeInstance);
   const ISLOGICAL = {
       description: _t("Whether a value is `true` or `false`."),
       args: [arg("value (any)", _t("The value to be verified as a logical TRUE or FALSE."))],
-      returns: ["BOOLEAN"],
       compute: function (value) {
           return typeof value?.value === "boolean";
       },
@@ -18060,7 +17835,6 @@ stores.inject(MyMetaStore, storeInstance);
   const ISNA = {
       description: _t("Whether a value is the error #N/A."),
       args: [arg("value (any)", _t("The value to be verified as an error type."))],
-      returns: ["BOOLEAN"],
       compute: function (data) {
           return data?.value === CellErrorType.NotAvailable;
       },
@@ -18072,7 +17846,6 @@ stores.inject(MyMetaStore, storeInstance);
   const ISNONTEXT = {
       description: _t("Whether a value is non-textual."),
       args: [arg("value (any)", _t("The value to be checked."))],
-      returns: ["BOOLEAN"],
       compute: function (value) {
           return !ISTEXT.compute.bind(this)(value);
       },
@@ -18084,7 +17857,6 @@ stores.inject(MyMetaStore, storeInstance);
   const ISNUMBER = {
       description: _t("Whether a value is a number."),
       args: [arg("value (any)", _t("The value to be verified as a number."))],
-      returns: ["BOOLEAN"],
       compute: function (value) {
           return typeof value?.value === "number";
       },
@@ -18096,7 +17868,6 @@ stores.inject(MyMetaStore, storeInstance);
   const ISTEXT = {
       description: _t("Whether a value is text."),
       args: [arg("value (any)", _t("The value to be verified as text."))],
-      returns: ["BOOLEAN"],
       compute: function (value) {
           return typeof value?.value === "string" && isEvaluationError(value?.value) === false;
       },
@@ -18108,7 +17879,6 @@ stores.inject(MyMetaStore, storeInstance);
   const ISBLANK = {
       description: _t("Whether the referenced cell is empty"),
       args: [arg("value (any)", _t("Reference to the cell that will be checked for emptiness."))],
-      returns: ["BOOLEAN"],
       compute: function (value) {
           return value?.value === null;
       },
@@ -18120,7 +17890,6 @@ stores.inject(MyMetaStore, storeInstance);
   const NA = {
       description: _t("Returns the error value #N/A."),
       args: [],
-      returns: ["BOOLEAN"],
       compute: function () {
           return { value: CellErrorType.NotAvailable };
       },
@@ -18177,7 +17946,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("logical_expression1 (boolean, range<boolean>)", _t("An expression or reference to a cell containing an expression that represents some logical value, i.e. TRUE or FALSE, or an expression that can be coerced to a logical value.")),
           arg("logical_expression2 (boolean, range<boolean>, repeating)", _t("More expressions that represent logical values.")),
       ],
-      returns: ["BOOLEAN"],
       compute: function (...logicalExpressions) {
           const { result, foundBoolean } = boolAnd(logicalExpressions);
           assert(() => foundBoolean, _t("[[FUNCTION_NAME]] has no valid input data."));
@@ -18191,7 +17959,6 @@ stores.inject(MyMetaStore, storeInstance);
   const FALSE = {
       description: _t("Logical value `false`."),
       args: [],
-      returns: ["BOOLEAN"],
       compute: function () {
           return false;
       },
@@ -18207,7 +17974,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value_if_true (any)", _t("The value the function returns if logical_expression is TRUE.")),
           arg("value_if_false (any, default=FALSE)", _t("The value the function returns if logical_expression is FALSE.")),
       ],
-      returns: ["ANY"],
       compute: function (logicalExpression, valueIfTrue, valueIfFalse) {
           const result = toBoolean(logicalExpression?.value) ? valueIfTrue : valueIfFalse;
           if (result === undefined) {
@@ -18229,7 +17995,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value (any)", _t("The value to return if value itself is not an error.")),
           arg(`value_if_error (any, default="empty")`, _t("The value the function returns if value is an error.")),
       ],
-      returns: ["ANY"],
       compute: function (value, valueIfError = { value: "" }) {
           const result = isEvaluationError(value?.value) ? valueIfError : value;
           if (result === undefined) {
@@ -18251,7 +18016,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value (any)", _t("The value to return if value itself is not #N/A an error.")),
           arg(`value_if_error (any, default="empty")`, _t("The value the function returns if value is an #N/A error.")),
       ],
-      returns: ["ANY"],
       compute: function (value, valueIfError = { value: "" }) {
           const result = value?.value === CellErrorType.NotAvailable ? valueIfError : value;
           if (result === undefined) {
@@ -18275,7 +18039,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("condition2 (boolean, repeating)", _t("Additional conditions to be evaluated if the previous ones are FALSE.")),
           arg("value2 (any, repeating)", _t("Additional values to be returned if their corresponding conditions are TRUE.")),
       ],
-      returns: ["ANY"],
       compute: function (...values) {
           assert(() => values.length % 2 === 0, _t("Wrong number of arguments. Expected an even number of arguments."));
           for (let n = 0; n < values.length - 1; n += 2) {
@@ -18302,7 +18065,6 @@ stores.inject(MyMetaStore, storeInstance);
       args: [
           arg("logical_expression (boolean)", _t("An expression or reference to a cell holding an expression that represents some logical value.")),
       ],
-      returns: ["BOOLEAN"],
       compute: function (logicalExpression) {
           return !toBoolean(logicalExpression);
       },
@@ -18317,7 +18079,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("logical_expression1 (boolean, range<boolean>)", _t("An expression or reference to a cell containing an expression that represents some logical value, i.e. TRUE or FALSE, or an expression that can be coerced to a logical value.")),
           arg("logical_expression2 (boolean, range<boolean>, repeating)", _t("More expressions that evaluate to logical values.")),
       ],
-      returns: ["BOOLEAN"],
       compute: function (...logicalExpressions) {
           const { result, foundBoolean } = boolOr(logicalExpressions);
           assert(() => foundBoolean, _t("[[FUNCTION_NAME]] has no valid input data."));
@@ -18331,7 +18092,6 @@ stores.inject(MyMetaStore, storeInstance);
   const TRUE = {
       description: _t("Logical value `true`."),
       args: [],
-      returns: ["BOOLEAN"],
       compute: function () {
           return true;
       },
@@ -18346,7 +18106,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("logical_expression1 (boolean, range<boolean>)", _t("An expression or reference to a cell containing an expression that represents some logical value, i.e. TRUE or FALSE, or an expression that can be coerced to a logical value.")),
           arg("logical_expression2 (boolean, range<boolean>, repeating)", _t("More expressions that evaluate to logical values.")),
       ],
-      returns: ["BOOLEAN"],
       compute: function (...logicalExpressions) {
           let foundBoolean = false;
           let acc = false;
@@ -18375,9 +18134,229 @@ stores.inject(MyMetaStore, storeInstance);
     XOR: XOR
   });
 
-  //TODO This registry is only used to disable the support of exploded pivot for spreadsheet
-  const supportedPivotExplodedFormulaRegistry = new Registry();
-  supportedPivotExplodedFormulaRegistry.add("SPREADSHEET", false);
+  const pivotTimeAdapterRegistry = new Registry();
+  function pivotTimeAdapter(granularity) {
+      return pivotTimeAdapterRegistry.get(granularity);
+  }
+  /**
+   * The Time Adapter: Managing Time Periods for Pivot Functions
+   *
+   * Overview:
+   * A time adapter is responsible for managing time periods associated with pivot functions.
+   * Each type of period (day, week, month, quarter, etc.) has its own dedicated adapter.
+   * The adapter's primary role is to normalize period values between spreadsheet functions,
+   * and the pivot.
+   * By normalizing the period value, it can be stored consistently in the pivot.
+   *
+   * Normalization Process:
+   * When working with functions in the spreadsheet, the time adapter normalizes
+   * the provided period to facilitate accurate lookup of values in the pivot.
+   * For instance, if the spreadsheet function represents a day period as a number generated
+   * by the DATE function (DATE(2023, 12, 25)), the time adapter will normalize it accordingly.
+   *
+   */
+  /**
+   * Normalized value: "12/25/2023"
+   *
+   * Note: Those two format are equivalent:
+   * - "MM/dd/yyyy" (luxon format)
+   * - "mm/dd/yyyy" (spreadsheet format)
+   **/
+  const dayAdapter = {
+      normalizeFunctionValue(value) {
+          const date = toNumber(value, DEFAULT_LOCALE);
+          return formatValue(date, { locale: DEFAULT_LOCALE, format: "mm/dd/yyyy" });
+      },
+      getFormat(locale) {
+          return (locale ?? DEFAULT_LOCALE).dateFormat;
+      },
+      formatValue(normalizedValue, locale) {
+          locale = locale ?? DEFAULT_LOCALE;
+          const value = toNumber(normalizedValue, DEFAULT_LOCALE);
+          return formatValue(value, { locale, format: this.getFormat(locale) });
+      },
+      toCellValue(normalizedValue) {
+          return toNumber(normalizedValue, DEFAULT_LOCALE);
+      },
+  };
+  /**
+   * normalizes day of month number
+   */
+  const dayOfMonthAdapter = {
+      normalizeFunctionValue(value) {
+          const day = toNumber(value, DEFAULT_LOCALE);
+          if (day < 1 || day > 31) {
+              throw new EvaluationError(_t("%s is not a valid day of month (it should be a number between 1 and 31)", day));
+          }
+          return day;
+      },
+      getFormat() {
+          return "0";
+      },
+      formatValue(normalizedValue, locale) {
+          locale = locale ?? DEFAULT_LOCALE;
+          const value = toNumber(normalizedValue, DEFAULT_LOCALE);
+          return formatValue(value, { locale, format: this.getFormat(locale) });
+      },
+      toCellValue(normalizedValue) {
+          return toNumber(normalizedValue, DEFAULT_LOCALE);
+      },
+  };
+  /**
+   * Normalized value: "2/2023" for week 2 of 2023
+   */
+  const weekAdapter = {
+      normalizeFunctionValue(value) {
+          const [week, year] = value.split("/");
+          return `${Number(week)}/${Number(year)}`;
+      },
+      getFormat() {
+          return undefined;
+      },
+      formatValue(normalizedValue) {
+          const [week, year] = normalizedValue.split("/");
+          return _t("W%(week)s %(year)s", { week, year });
+      },
+      toCellValue(normalizedValue) {
+          return this.formatValue(normalizedValue);
+      },
+  };
+  /**
+   * normalizes iso week number
+   */
+  const isoWeekNumberAdapter = {
+      normalizeFunctionValue(value) {
+          const isoWeek = toNumber(value, DEFAULT_LOCALE);
+          if (isoWeek < 0 || isoWeek > 53) {
+              throw new EvaluationError(_t("%s is not a valid week (it should be a number between 0 and 53)", isoWeek));
+          }
+          return isoWeek;
+      },
+      getFormat() {
+          return "0";
+      },
+      formatValue(normalizedValue, locale) {
+          locale = locale ?? DEFAULT_LOCALE;
+          const value = toNumber(normalizedValue, DEFAULT_LOCALE);
+          return formatValue(value, { locale, format: this.getFormat(locale) });
+      },
+      toCellValue(normalizedValue) {
+          return toNumber(normalizedValue, DEFAULT_LOCALE);
+      },
+  };
+  /**
+   * normalized month value is a string formatted as "MM/yyyy" (luxon format)
+   * e.g. "01/2020" for January 2020
+   */
+  const monthAdapter = {
+      normalizeFunctionValue(value) {
+          const date = toNumber(value, DEFAULT_LOCALE);
+          return formatValue(date, { locale: DEFAULT_LOCALE, format: "mm/yyyy" });
+      },
+      getFormat() {
+          return "mmmm yyyy";
+      },
+      formatValue(normalizedValue, locale) {
+          locale = locale ?? DEFAULT_LOCALE;
+          const value = toNumber(normalizedValue, DEFAULT_LOCALE);
+          return formatValue(value, { locale, format: this.getFormat(locale) });
+      },
+      toCellValue(normalizedValue) {
+          return toNumber(normalizedValue, DEFAULT_LOCALE);
+      },
+  };
+  /**
+   * normalizes month number
+   */
+  const monthNumberAdapter = {
+      normalizeFunctionValue(value) {
+          const month = toNumber(value, DEFAULT_LOCALE);
+          if (month < 1 || month > 12) {
+              throw new EvaluationError(_t("%s is not a valid month (it should be a number between 1 and 12)", month));
+          }
+          return month;
+      },
+      getFormat() {
+          return "0";
+      },
+      formatValue(normalizedValue, locale) {
+          locale = locale ?? DEFAULT_LOCALE;
+          const value = toNumber(normalizedValue, DEFAULT_LOCALE);
+          return formatValue(value, { locale, format: this.getFormat(locale) });
+      },
+      toCellValue(normalizedValue) {
+          return MONTHS[toNumber(normalizedValue, DEFAULT_LOCALE) - 1].toString();
+      },
+  };
+  /**
+   * normalized quarter value is "quarter/year"
+   * e.g. "1/2020" for Q1 2020
+   */
+  const quarterAdapter = {
+      normalizeFunctionValue(value) {
+          const [quarter, year] = value.split("/");
+          return `${quarter}/${year}`;
+      },
+      getFormat() {
+          return undefined;
+      },
+      formatValue(normalizedValue) {
+          const [quarter, year] = normalizedValue.split("/");
+          return _t("Q%(quarter)s %(year)s", { quarter, year });
+      },
+      toCellValue(normalizedValue) {
+          return this.formatValue(normalizedValue);
+      },
+  };
+  /**
+   * normalizes quarter number
+   */
+  const quarterNumberAdapter = {
+      normalizeFunctionValue(value) {
+          const quarter = toNumber(value, DEFAULT_LOCALE);
+          if (quarter < 1 || quarter > 4) {
+              throw new EvaluationError(_t("%s is not a valid quarter (it should be a number between 1 and 4)", quarter));
+          }
+          return quarter;
+      },
+      getFormat() {
+          return "0";
+      },
+      formatValue(normalizedValue, locale) {
+          locale = locale ?? DEFAULT_LOCALE;
+          const value = toNumber(normalizedValue, DEFAULT_LOCALE);
+          return formatValue(value, { locale, format: this.getFormat(locale) });
+      },
+      toCellValue(normalizedValue) {
+          return toNumber(normalizedValue, DEFAULT_LOCALE);
+      },
+  };
+  const yearAdapter = {
+      normalizeFunctionValue(value) {
+          return toNumber(value, DEFAULT_LOCALE);
+      },
+      getFormat() {
+          return "0";
+      },
+      formatValue(normalizedValue, locale) {
+          locale = locale ?? DEFAULT_LOCALE;
+          return formatValue(normalizedValue, { locale, format: "0" });
+      },
+      toCellValue(normalizedValue) {
+          return toNumber(normalizedValue, DEFAULT_LOCALE);
+      },
+  };
+  pivotTimeAdapterRegistry
+      .add("day", dayAdapter)
+      .add("week", weekAdapter)
+      .add("month", monthAdapter)
+      .add("quarter", quarterAdapter)
+      .add("year", yearAdapter)
+      .add("day_of_month", dayOfMonthAdapter)
+      .add("iso_week_number", isoWeekNumberAdapter)
+      .add("month_number", monthNumberAdapter)
+      .add("quarter_number", quarterNumberAdapter)
+      .add("year_number", yearAdapter);
 
   const AGGREGATOR_NAMES = {
       count: _t("Count"),
@@ -18393,7 +18372,7 @@ stores.inject(MyMetaStore, storeInstance);
   const AGGREGATORS_BY_FIELD_TYPE = {
       integer: NUMBER_CHAR_AGGREGATORS,
       char: NUMBER_CHAR_AGGREGATORS,
-      //TODO Support for date and boolean
+      boolean: ["count_distinct", "count", "bool_and", "bool_or"],
   };
   const AGGREGATORS = {};
   for (const type in AGGREGATORS_BY_FIELD_TYPE) {
@@ -18503,6 +18482,44 @@ stores.inject(MyMetaStore, storeInstance);
   function flatPivotDomain(domain) {
       return domain.flatMap((arg) => [arg.field, arg.value]);
   }
+  /**
+   * Parses the value defining a pivot group in a PIVOT formula
+   * e.g. given the following formula PIVOT.VALUE("1", "stage_id", "42", "status", "won"),
+   * the two group values are "42" and "won".
+   */
+  function toNormalizedPivotValue(dimension, groupValue) {
+      if (groupValue === null || groupValue === "null") {
+          return null;
+      }
+      const groupValueString = typeof groupValue === "boolean"
+          ? toString(groupValue).toLocaleLowerCase()
+          : toString(groupValue);
+      if (!pivotNormalizationValueRegistry.contains(dimension.type)) {
+          throw new EvaluationError(_t("Field %(field)s is not supported because of its type (%(type)s)", {
+              field: dimension.displayName,
+              type: dimension.type,
+          }));
+      }
+      // represents a field which is not set (=False server side)
+      if (groupValueString === "false") {
+          return false;
+      }
+      const normalizer = pivotNormalizationValueRegistry.get(dimension.type);
+      return normalizer(groupValueString, dimension.granularity);
+  }
+  function normalizeDateTime(value, granularity) {
+      if (!granularity) {
+          throw "";
+      }
+      return pivotTimeAdapter(granularity).normalizeFunctionValue(value);
+  }
+  const pivotNormalizationValueRegistry = new Registry();
+  pivotNormalizationValueRegistry
+      .add("date", normalizeDateTime)
+      .add("datetime", normalizeDateTime)
+      .add("integer", (value) => toNumber(value, DEFAULT_LOCALE))
+      .add("boolean", (value) => toBoolean(value))
+      .add("char", (value) => toString(value));
 
   /**
    * Get the pivot ID from the formula pivot ID.
@@ -18579,7 +18596,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("use_a1_notation (boolean, default=TRUE)", _t("A boolean indicating whether to use A1 style notation (TRUE) or R1C1 style notation (FALSE).")),
           arg("sheet (string, optional)", _t("A string indicating the name of the sheet into which the address points.")),
       ],
-      returns: ["STRING"],
       compute: function (row, column, absoluteRelativeMode = { value: DEFAULT_ABSOLUTE_RELATIVE_MODE }, useA1Notation = { value: true }, sheet) {
           const rowNumber = strictToInteger(row, this.locale);
           const colNumber = strictToInteger(column, this.locale);
@@ -18616,7 +18632,6 @@ stores.inject(MyMetaStore, storeInstance);
       args: [
           arg("cell_reference (meta, default='this cell')", _t("The cell whose column number will be returned. Column A corresponds to 1. By default, the function use the cell in which the formula is entered.")),
       ],
-      returns: ["NUMBER"],
       compute: function (cellReference) {
           if (isEvaluationError(cellReference?.value)) {
               throw cellReference;
@@ -18634,7 +18649,6 @@ stores.inject(MyMetaStore, storeInstance);
   const COLUMNS = {
       description: _t("Number of columns in a specified array or range."),
       args: [arg("range (meta)", _t("The range whose column count will be returned."))],
-      returns: ["NUMBER"],
       compute: function (range) {
           if (isEvaluationError(range?.value)) {
               throw range;
@@ -18655,7 +18669,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("index (number)", _t("The row index of the value to be returned, where the first row in range is numbered 1.")),
           arg(`is_sorted (boolean, default=${DEFAULT_IS_SORTED})`, _t("Indicates whether the row to be searched (the first row of the specified range) is sorted, in which case the closest match for search_key will be returned.")),
       ],
-      returns: ["ANY"],
       compute: function (searchKey, range, index, isSorted = { value: DEFAULT_IS_SORTED }) {
           const _index = Math.trunc(toNumber(index?.value, this.locale));
           assert(() => 1 <= _index && _index <= range[0].length, _t("[[FUNCTION_NAME]] evaluates to an out of bounds range."));
@@ -18685,7 +18698,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("row (number, default=0)", _t("The index of the row to be returned from within the reference range of cells.")),
           arg("column (number, default=0)", _t("The index of the column to be returned from within the reference range of cells.")),
       ],
-      returns: ["ANY"],
       compute: function (reference, row = { value: 0 }, column = { value: 0 }) {
           const _reference = toMatrix(reference);
           const _row = toNumber(row.value, this.locale);
@@ -18716,7 +18728,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("reference (string)", _t("The range of cells from which the values are returned.")),
           arg("use_a1_notation (boolean, default=TRUE)", _t("A boolean indicating whether to use A1 style notation (TRUE) or R1C1 style notation (FALSE).")),
       ],
-      returns: ["ANY"],
       compute: function (reference, useA1Notation = { value: true }) {
           let _reference = reference?.value?.toString();
           if (!_reference) {
@@ -18771,7 +18782,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("search_array (range)", _t("One method of using this function is to provide a single sorted row or column search_array to look through for the search_key with a second argument result_range. The other way is to combine these two arguments into one search_array where the first row or column is searched and a value is returned from the last row or column in the array. If search_key is not found, a non-exact match may be returned.")),
           arg("result_range (range, optional)", _t("The range from which to return a result. The value returned corresponds to the location where search_key is found in search_range. This range must be only a single row or column and should not be used if using the search_result_array method.")),
       ],
-      returns: ["ANY"],
       compute: function (searchKey, searchArray, resultRange) {
           let nbCol = searchArray.length;
           let nbRow = searchArray[0].length;
@@ -18812,7 +18822,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("range (any, range)", _t("The one-dimensional array to be searched.")),
           arg(`search_type (number, default=${DEFAULT_SEARCH_TYPE})`, _t("The search method. 1 (default) finds the largest value less than or equal to search_key when range is sorted in ascending order. 0 finds the exact value when range is unsorted. -1 finds the smallest value greater than or equal to search_key when range is sorted in descending order.")),
       ],
-      returns: ["NUMBER"],
       compute: function (searchKey, range, searchType = { value: DEFAULT_SEARCH_TYPE }) {
           let _searchType = toNumber(searchType, this.locale);
           const nbCol = range.length;
@@ -18851,7 +18860,6 @@ stores.inject(MyMetaStore, storeInstance);
       args: [
           arg("cell_reference (meta, default='this cell')", _t("The cell whose row number will be returned. By default, this function uses the cell in which the formula is entered.")),
       ],
-      returns: ["NUMBER"],
       compute: function (cellReference) {
           if (isEvaluationError(cellReference?.value)) {
               throw cellReference;
@@ -18869,7 +18877,6 @@ stores.inject(MyMetaStore, storeInstance);
   const ROWS = {
       description: _t("Number of rows in a specified array or range."),
       args: [arg("range (meta)", _t("The range whose row count will be returned."))],
-      returns: ["NUMBER"],
       compute: function (range) {
           if (isEvaluationError(range?.value)) {
               throw range;
@@ -18890,7 +18897,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("index (number)", _t("The column index of the value to be returned, where the first column in range is numbered 1.")),
           arg(`is_sorted (boolean, default=${DEFAULT_IS_SORTED})`, _t("Indicates whether the column to be searched (the first column of the specified range) is sorted, in which case the closest match for search_key will be returned.")),
       ],
-      returns: ["ANY"],
       compute: function (searchKey, range, index, isSorted = { value: DEFAULT_IS_SORTED }) {
           const _index = Math.trunc(toNumber(index?.value, this.locale));
           assert(() => 1 <= _index && _index <= range.length, _t("[[FUNCTION_NAME]] evaluates to an out of bounds range."));
@@ -18936,7 +18942,6 @@ stores.inject(MyMetaStore, storeInstance);
       (-2) Perform a binary search that relies on lookup_array being sorted in descending order. If not sorted, invalid results will be returned.\
       ")),
       ],
-      returns: ["ANY"],
       compute: function (searchKey, lookupRange, returnRange, defaultValue, matchMode = { value: DEFAULT_MATCH_MODE }, searchMode = { value: DEFAULT_SEARCH_MODE }) {
           const _matchMode = Math.trunc(toNumber(matchMode.value, this.locale));
           const _searchMode = Math.trunc(toNumber(searchMode.value, this.locale));
@@ -18992,12 +18997,6 @@ stores.inject(MyMetaStore, storeInstance);
           assertDomainLength(_domainArgs);
           const pivot = this.getters.getPivot(pivotId);
           const coreDefinition = this.getters.getPivotCoreDefinition(pivotId);
-          if (!supportedPivotExplodedFormulaRegistry.get(coreDefinition.type)) {
-              return {
-                  value: CellErrorType.GenericError,
-                  message: _t("This pivot does not support PIVOT.VALUE formula"),
-              };
-          }
           addPivotDependencies(this, coreDefinition);
           const error = pivot.assertIsValid({ throwOnError: false });
           if (error) {
@@ -19013,7 +19012,6 @@ stores.inject(MyMetaStore, storeInstance);
           }
           return { value, format };
       },
-      returns: ["NUMBER", "STRING"],
   };
   const PIVOT_HEADER = {
       description: _t("Get the header of a pivot."),
@@ -19029,12 +19027,6 @@ stores.inject(MyMetaStore, storeInstance);
           assertDomainLength(_domainArgs);
           const pivot = this.getters.getPivot(_pivotId);
           const coreDefinition = this.getters.getPivotCoreDefinition(_pivotId);
-          if (!supportedPivotExplodedFormulaRegistry.get(coreDefinition.type)) {
-              return {
-                  value: CellErrorType.GenericError,
-                  message: _t("This pivot does not support PIVOT.VALUE formula"),
-              };
-          }
           addPivotDependencies(this, coreDefinition);
           const error = pivot.assertIsValid({ throwOnError: false });
           if (error) {
@@ -19059,7 +19051,6 @@ stores.inject(MyMetaStore, storeInstance);
                   : format,
           };
       },
-      returns: ["NUMBER", "STRING"],
   };
   const PIVOT = {
       description: _t("Get a pivot table."),
@@ -19126,7 +19117,6 @@ stores.inject(MyMetaStore, storeInstance);
           }
           return result;
       },
-      returns: ["RANGE<ANY>"],
   };
 
   var lookup = /*#__PURE__*/Object.freeze({
@@ -19157,7 +19147,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number)", _t("The first addend.")),
           arg("value2 (number)", _t("The second addend.")),
       ],
-      returns: ["NUMBER"],
       compute: function (value1, value2) {
           return {
               value: toNumber(value1, this.locale) + toNumber(value2, this.locale),
@@ -19174,7 +19163,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (string)", _t("The value to which value2 will be appended.")),
           arg("value2 (string)", _t("The value to append to value1.")),
       ],
-      returns: ["STRING"],
       compute: function (value1, value2) {
           return toString(value1) + toString(value2);
       },
@@ -19189,7 +19177,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("dividend (number)", _t("The number to be divided.")),
           arg("divisor (number)", _t("The number to divide by.")),
       ],
-      returns: ["NUMBER"],
       compute: function (dividend, divisor) {
           const _divisor = toNumber(divisor, this.locale);
           assert(() => _divisor !== 0, _t("The divisor must be different from zero."), CellErrorType.DivisionByZero);
@@ -19212,7 +19199,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (any)", _t("The first value.")),
           arg("value2 (any)", _t("The value to test against value1 for equality.")),
       ],
-      returns: ["BOOLEAN"],
       compute: function (value1, value2) {
           let _value1 = isEmpty(value1) ? getNeutral[typeof value2?.value] : value1?.value;
           let _value2 = isEmpty(value2) ? getNeutral[typeof value1?.value] : value2?.value;
@@ -19265,7 +19251,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (any)", _t("The value to test as being greater than value2.")),
           arg("value2 (any)", _t("The second value.")),
       ],
-      returns: ["BOOLEAN"],
       compute: function (value1, value2) {
           return applyRelationalOperator(value1, value2, (v1, v2) => {
               return v1 > v2;
@@ -19281,7 +19266,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (any)", _t("The value to test as being greater than or equal to value2.")),
           arg("value2 (any)", _t("The second value.")),
       ],
-      returns: ["BOOLEAN"],
       compute: function (value1, value2) {
           return applyRelationalOperator(value1, value2, (v1, v2) => {
               return v1 >= v2;
@@ -19297,7 +19281,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (any)", _t("The value to test as being less than value2.")),
           arg("value2 (any)", _t("The second value.")),
       ],
-      returns: ["BOOLEAN"],
       compute: function (value1, value2) {
           return !GTE.compute.bind(this)(value1, value2);
       },
@@ -19311,7 +19294,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (any)", _t("The value to test as being less than or equal to value2.")),
           arg("value2 (any)", _t("The second value.")),
       ],
-      returns: ["BOOLEAN"],
       compute: function (value1, value2) {
           return !GT.compute.bind(this)(value1, value2);
       },
@@ -19325,7 +19307,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (number)", _t("The minuend, or number to be subtracted from.")),
           arg("value2 (number)", _t("The subtrahend, or number to subtract from value1.")),
       ],
-      returns: ["NUMBER"],
       compute: function (value1, value2) {
           return {
               value: toNumber(value1, this.locale) - toNumber(value2, this.locale),
@@ -19342,7 +19323,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("factor1 (number)", _t("The first multiplicand.")),
           arg("factor2 (number)", _t("The second multiplicand.")),
       ],
-      returns: ["NUMBER"],
       compute: function (factor1, factor2) {
           return {
               value: toNumber(factor1, this.locale) * toNumber(factor2, this.locale),
@@ -19359,7 +19339,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value1 (any)", _t("The first value.")),
           arg("value2 (any)", _t("The value to test against value1 for inequality.")),
       ],
-      returns: ["BOOLEAN"],
       compute: function (value1, value2) {
           return !EQ.compute.bind(this)(value1, value2);
       },
@@ -19373,7 +19352,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("base (number)", _t("The number to raise to the exponent power.")),
           arg("exponent (number)", _t("The exponent to raise base to.")),
       ],
-      returns: ["NUMBER"],
       compute: function (base, exponent) {
           return POWER.compute.bind(this)(base, exponent);
       },
@@ -19386,7 +19364,6 @@ stores.inject(MyMetaStore, storeInstance);
       args: [
           arg("value (number)", _t("The number to have its sign reversed. Equivalently, the number to multiply by -1.")),
       ],
-      returns: ["NUMBER"],
       compute: function (value) {
           return {
               value: -toNumber(value, this.locale),
@@ -19400,7 +19377,6 @@ stores.inject(MyMetaStore, storeInstance);
   const UNARY_PERCENT = {
       description: _t("Value interpreted as a percentage."),
       args: [arg("percentage (number)", _t("The value to interpret as a percentage."))],
-      returns: ["NUMBER"],
       compute: function (percentage) {
           return toNumber(percentage, this.locale) / 100;
       },
@@ -19411,7 +19387,6 @@ stores.inject(MyMetaStore, storeInstance);
   const UPLUS = {
       description: _t("A specified number, unchanged."),
       args: [arg("value (any)", _t("The number to return."))],
-      returns: ["ANY"],
       compute: function (value = { value: null }) {
           return value;
       },
@@ -19447,7 +19422,6 @@ stores.inject(MyMetaStore, storeInstance);
       args: [
           arg("table_number (number)", _t("The number of the character to look up from the current Unicode table in decimal format.")),
       ],
-      returns: ["STRING"],
       compute: function (tableNumber) {
           const _tableNumber = Math.trunc(toNumber(tableNumber, this.locale));
           assert(() => _tableNumber >= 1, _t("The table_number (%s) is out of range.", _tableNumber.toString()));
@@ -19461,7 +19435,6 @@ stores.inject(MyMetaStore, storeInstance);
   const CLEAN = {
       description: _t("Remove non-printable characters from a piece of text."),
       args: [arg("text (string)", _t("The text whose non-printable characters are to be removed."))],
-      returns: ["STRING"],
       compute: function (text) {
           const _text = toString(text);
           let cleanedStr = "";
@@ -19483,7 +19456,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("string1 (string, range<string>)", _t("The initial string.")),
           arg("string2 (string, range<string>, repeating)", _t("More strings to append in sequence.")),
       ],
-      returns: ["STRING"],
       compute: function (...datas) {
           return reduceAny(datas, (acc, a) => acc + toString(a), "");
       },
@@ -19498,7 +19470,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("string1 (string)", _t("The first string to compare.")),
           arg("string2 (string)", _t("The second string to compare.")),
       ],
-      returns: ["BOOLEAN"],
       compute: function (string1, string2) {
           return toString(string1) === toString(string2);
       },
@@ -19514,7 +19485,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("text_to_search (string)", _t("The text to search for the first occurrence of search_for.")),
           arg(`starting_at (number, default=${DEFAULT_STARTING_AT})`, _t("The character within text_to_search at which to start the search.")),
       ],
-      returns: ["NUMBER"],
       compute: function (searchFor, textToSearch, startingAt = { value: DEFAULT_STARTING_AT }) {
           const _searchFor = toString(searchFor);
           const _textToSearch = toString(textToSearch);
@@ -19537,7 +19507,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("value_or_array1 (string, range<string>)", _t("The value or values to be appended using delimiter.")),
           arg("value_or_array2 (string, range<string>, repeating)", _t("More values to be appended using delimiter.")),
       ],
-      returns: ["STRING"],
       compute: function (delimiter, ...valuesOrArrays) {
           const _delimiter = toString(delimiter);
           return reduceAny(valuesOrArrays, (acc, a) => (acc ? acc + _delimiter : "") + toString(a), "");
@@ -19552,7 +19521,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("text (string)", _t("The string from which the left portion will be returned.")),
           arg("number_of_characters (number, optional)", _t("The number of characters to return from the left side of string.")),
       ],
-      returns: ["STRING"],
       compute: function (text, ...args) {
           const _numberOfCharacters = args.length ? toNumber(args[0], this.locale) : 1;
           assert(() => _numberOfCharacters >= 0, _t("The number_of_characters (%s) must be positive or null.", _numberOfCharacters.toString()));
@@ -19566,7 +19534,6 @@ stores.inject(MyMetaStore, storeInstance);
   const LEN = {
       description: _t("Length of a string."),
       args: [arg("text (string)", _t("The string whose length will be returned."))],
-      returns: ["NUMBER"],
       compute: function (text) {
           return toString(text).length;
       },
@@ -19578,7 +19545,6 @@ stores.inject(MyMetaStore, storeInstance);
   const LOWER = {
       description: _t("Converts a specified string to lowercase."),
       args: [arg("text (string)", _t("The string to convert to lowercase."))],
-      returns: ["STRING"],
       compute: function (text) {
           return toString(text).toLowerCase();
       },
@@ -19594,7 +19560,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("starting_at (number)", _t("The index from the left of string from which to begin extracting. The first character in string has the index 1.")),
           arg("extract_length (number)", _t("The length of the segment to extract.")),
       ],
-      returns: ["STRING"],
       compute: function (text, starting_at, extract_length) {
           const _text = toString(text);
           const _starting_at = toNumber(starting_at, this.locale);
@@ -19613,7 +19578,6 @@ stores.inject(MyMetaStore, storeInstance);
       args: [
           arg("text_to_capitalize (string)", _t("The text which will be returned with the first letter of each word in uppercase and all other letters in lowercase.")),
       ],
-      returns: ["STRING"],
       compute: function (text) {
           const _text = toString(text);
           return _text.replace(wordRegex, (word) => {
@@ -19633,7 +19597,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("length (number)", _t("The number of characters in the text to be replaced.")),
           arg("new_text (string)", _t("The text which will be inserted into the original text.")),
       ],
-      returns: ["STRING"],
       compute: function (text, position, length, newText) {
           const _position = toNumber(position, this.locale);
           assert(() => _position >= 1, _t("The position (%s) must be greater than or equal to 1.", _position.toString()));
@@ -19653,7 +19616,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("text (string)", _t("The string from which the right portion will be returned.")),
           arg("number_of_characters (number, optional)", _t("The number of characters to return from the right side of string.")),
       ],
-      returns: ["STRING"],
       compute: function (text, ...args) {
           const _numberOfCharacters = args.length ? toNumber(args[0], this.locale) : 1;
           assert(() => _numberOfCharacters >= 0, _t("The number_of_characters (%s) must be positive or null.", _numberOfCharacters.toString()));
@@ -19673,7 +19635,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("text_to_search (string)", _t("The text to search for the first occurrence of search_for.")),
           arg(`starting_at (number, default=${DEFAULT_STARTING_AT})`, _t("The character within text_to_search at which to start the search.")),
       ],
-      returns: ["NUMBER"],
       compute: function (searchFor, textToSearch, startingAt = { value: DEFAULT_STARTING_AT }) {
           const _searchFor = toString(searchFor).toLowerCase();
           const _textToSearch = toString(textToSearch).toLowerCase();
@@ -19700,7 +19661,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg(`remove_empty_text (boolean, default=${SPLIT_DEFAULT_REMOVE_EMPTY_TEXT})`, _t("Whether or not to remove empty text messages from the split results. The default behavior is to treat \
         consecutive delimiters as one (if TRUE). If FALSE, empty cells values are added between consecutive delimiters.")),
       ],
-      returns: ["RANGE<STRING>"],
       compute: function (text, delimiter, splitByEach = { value: SPLIT_DEFAULT_SPLIT_BY_EACH }, removeEmptyText = { value: SPLIT_DEFAULT_REMOVE_EMPTY_TEXT }) {
           const _text = toString(text);
           const _delimiter = escapeRegExp(toString(delimiter));
@@ -19727,7 +19687,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("replace_with (string)", _t("The string that will replace search_for.")),
           arg("occurrence_number (number, optional)", _t("The instance of search_for within text_to_search to replace with replace_with. By default, all occurrences of search_for are replaced; however, if occurrence_number is specified, only the indicated instance of search_for is replaced.")),
       ],
-      returns: ["NUMBER"],
       compute: function (textToSearch, searchFor, replaceWith, occurrenceNumber) {
           const _occurrenceNumber = toNumber(occurrenceNumber, this.locale);
           assert(() => _occurrenceNumber >= 0, _t("The occurrenceNumber (%s) must be positive or null.", _occurrenceNumber.toString()));
@@ -19757,7 +19716,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("text1 (string, range<string>)", _t("Any text item. This could be a string, or an array of strings in a range.")),
           arg("text2 (string, range<string>, repeating)", _t("Additional text item(s).")),
       ],
-      returns: ["STRING"],
       compute: function (delimiter, ignoreEmpty, ...textsOrArrays) {
           const _delimiter = toString(delimiter);
           const _ignoreEmpty = toBoolean(ignoreEmpty);
@@ -19774,7 +19732,6 @@ stores.inject(MyMetaStore, storeInstance);
       args: [
           arg("text (string)", _t("The text or reference to a cell containing text to be trimmed.")),
       ],
-      returns: ["STRING"],
       compute: function (text) {
           return trimContent(toString(text));
       },
@@ -19786,7 +19743,6 @@ stores.inject(MyMetaStore, storeInstance);
   const UPPER = {
       description: _t("Converts a specified string to uppercase."),
       args: [arg("text (string)", _t("The string to convert to uppercase."))],
-      returns: ["STRING"],
       compute: function (text) {
           return toString(text).toUpperCase();
       },
@@ -19801,7 +19757,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("number (number)", _t("The number, date or time to format.")),
           arg("format (string)", _t("The pattern by which to format the number, enclosed in quotation marks.")),
       ],
-      returns: ["STRING"],
       compute: function (number, format) {
           const _number = toNumber(number, this.locale);
           return formatValue(_number, { format: toString(format), locale: this.locale });
@@ -19842,7 +19797,6 @@ stores.inject(MyMetaStore, storeInstance);
           arg("url (string)", _t("The full URL of the link enclosed in quotation marks.")),
           arg("link_label (string, optional)", _t("The text to display in the cell, enclosed in quotation marks.")),
       ],
-      returns: ["STRING"],
       compute: function (url, linkLabel) {
           const processedUrl = toString(url).trim();
           const processedLabel = toString(linkLabel) || processedUrl;
@@ -19901,6 +19855,9 @@ stores.inject(MyMetaStore, storeInstance);
                   }
                   args[i] = arg[0][0];
               }
+              if (!isMatrix(arg) && argDefinition.acceptMatrixOnly) {
+                  throw new BadExpressionError(_t("Function [[FUNCTION_NAME]] expects the parameter '%s' to be reference to a cell or range.", (i + 1).toString()));
+              }
           }
           return descr.compute.apply(this, args);
       }
@@ -21495,12 +21452,6 @@ stores.inject(MyMetaStore, storeInstance);
                   // detect when an argument need to be evaluated as a meta argument
                   const isMeta = argTypes.includes("META");
                   const hasRange = argTypes.some((t) => isRangeType(t));
-                  const isRangeOnly = argTypes.every((t) => isRangeType(t));
-                  if (isRangeOnly) {
-                      if (!isRangeInput(currentArg)) {
-                          throw new BadExpressionError(_t("Function %(function_name)s expects the parameter %(arg_index)s to be a reference to a cell or a range.", { function_name: functionName, arg_index: i + 1 }));
-                      }
-                  }
                   compiledArgs.push(compileAST(currentArg, isMeta, hasRange));
               }
               return compiledArgs;
@@ -21665,16 +21616,6 @@ stores.inject(MyMetaStore, storeInstance);
   function isRangeType(type) {
       return type.startsWith("RANGE");
   }
-  function isRangeInput(arg) {
-      if (arg.type === "REFERENCE") {
-          return true;
-      }
-      if (arg.type === "FUNCALL") {
-          const fnDef = functions$1[arg.value.toUpperCase()];
-          return fnDef && isRangeType(fnDef.returns[0]);
-      }
-      return false;
-  }
 
   const functions = functionRegistry.content;
   function isExportableToExcel(tokens) {
@@ -21718,11 +21659,14 @@ stores.inject(MyMetaStore, storeInstance);
   function makeFieldProposal(field, granularity) {
       const groupBy = granularity ? `${field.name}:${granularity}` : field.name;
       const quotedGroupBy = `"${groupBy}"`;
+      const fuzzySearchKey = field.string !== field.name
+          ? field.string + quotedGroupBy // search on translated name and on technical name
+          : quotedGroupBy;
       return {
           text: quotedGroupBy,
           description: field.string + (field.help ? ` (${field.help})` : ""),
           htmlContent: [{ value: quotedGroupBy, color: tokenColors.STRING }],
-          fuzzySearchKey: field.string + quotedGroupBy, // search on translated name and on technical name
+          fuzzySearchKey,
       };
   }
   /**
@@ -21782,6 +21726,14 @@ stores.inject(MyMetaStore, storeInstance);
       return getFunctionsFromTokens(tokens, PIVOT_FUNCTIONS).length;
   }
 
+  /**
+   * Registry to enable or disable the support of positional arguments
+   * (with a leading #) in pivot functions
+   * e.g. =PIVOT.VALUE(1,"probability","#stage",1)
+   */
+  const supportedPivotPositionalFormulaRegistry = new Registry();
+  supportedPivotPositionalFormulaRegistry.add("SPREADSHEET", false);
+
   autoCompleteProviders.add("pivot_ids", {
       sequence: 50,
       autoSelectFirstProposal: true,
@@ -21800,10 +21752,6 @@ stores.inject(MyMetaStore, storeInstance);
           return pivotIds
               .map((pivotId) => {
               const definition = this.getters.getPivotCoreDefinition(pivotId);
-              if (functionContext.parent.toUpperCase() !== "PIVOT" &&
-                  !supportedPivotExplodedFormulaRegistry.get(definition.type)) {
-                  return undefined;
-              }
               const formulaId = this.getters.getPivotFormulaId(pivotId);
               const str = `${formulaId}`;
               return {
@@ -21831,15 +21779,13 @@ stores.inject(MyMetaStore, storeInstance);
           if (!pivotId || !this.getters.isExistingPivot(pivotId)) {
               return [];
           }
-          const dataSource = this.getters.getPivot(pivotId);
-          const fields = dataSource.getFields();
+          const pivot = this.getters.getPivot(pivotId);
+          pivot.init();
+          const fields = pivot.getFields();
           if (!fields) {
               return [];
           }
           const definition = this.getters.getPivotCoreDefinition(pivotId);
-          if (!supportedPivotExplodedFormulaRegistry.get(definition.type)) {
-              return [];
-          }
           return definition.measures
               .map((measure) => {
               if (measure.name === "__count") {
@@ -21875,16 +21821,13 @@ stores.inject(MyMetaStore, storeInstance);
           if (!pivotId || !this.getters.isExistingPivot(pivotId)) {
               return;
           }
-          const dataSource = this.getters.getPivot(pivotId);
-          const fields = dataSource.getFields();
+          const pivot = this.getters.getPivot(pivotId);
+          pivot.init();
+          const fields = pivot.getFields();
           if (!fields) {
               return;
           }
-          const { type } = this.getters.getPivotCoreDefinition(pivotId);
-          const { columns, rows } = dataSource.definition;
-          if (!supportedPivotExplodedFormulaRegistry.get(type)) {
-              return [];
-          }
+          const { columns, rows } = pivot.definition;
           let args = functionContext.args;
           if (functionContext?.parent.toUpperCase() === "PIVOT.VALUE") {
               args = args.filter((ast, index) => index % 2 === 0); // keep only the field names
@@ -21921,6 +21864,9 @@ stores.inject(MyMetaStore, storeInstance);
               return field ? makeFieldProposal(field, granularity) : undefined;
           })
               .concat(groupBys.map((groupBy) => {
+              if (!supportedPivotPositionalFormulaRegistry.get(pivot.type)) {
+                  return undefined;
+              }
               const fieldName = groupBy.split(":")[0];
               const field = fields[fieldName];
               if (!field) {
@@ -21969,12 +21915,8 @@ stores.inject(MyMetaStore, storeInstance);
           if (!pivotId || !this.getters.isExistingPivot(pivotId)) {
               return;
           }
-          const { type } = this.getters.getPivotCoreDefinition(pivotId);
-          if (!supportedPivotExplodedFormulaRegistry.get(type)) {
-              return [];
-          }
-          const dataSource = this.getters.getPivot(pivotId);
-          if (!dataSource.isValid()) {
+          const pivot = this.getters.getPivot(pivotId);
+          if (!pivot.isValid()) {
               return;
           }
           const argPosition = functionContext.argPosition;
@@ -21982,7 +21924,46 @@ stores.inject(MyMetaStore, storeInstance);
           if (!groupByField) {
               return;
           }
-          return dataSource.getPossibleFieldValues(groupByField.split(":")[0]).map(({ value, label }) => {
+          let dimension;
+          try {
+              dimension = pivot.definition.getDimension(groupByField);
+          }
+          catch (error) {
+              return undefined;
+          }
+          if (dimension.granularity === "month_number") {
+              return Object.values(MONTHS).map((monthDisplayName, index) => ({
+                  text: `${index + 1}`,
+                  fuzzySearchKey: monthDisplayName.toString(),
+                  description: monthDisplayName.toString(),
+                  htmlContent: [{ value: `${index + 1}`, color: tokenColors.NUMBER }],
+              }));
+          }
+          else if (dimension.granularity === "quarter_number") {
+              return [1, 2, 3, 4].map((quarter) => ({
+                  text: `${quarter}`,
+                  fuzzySearchKey: `${quarter}`,
+                  description: _t("Quarter %s", quarter),
+                  htmlContent: [{ value: `${quarter}`, color: tokenColors.NUMBER }],
+              }));
+          }
+          else if (dimension.granularity === "day_of_month") {
+              return range(1, 32).map((dayOfMonth) => ({
+                  text: `${dayOfMonth}`,
+                  fuzzySearchKey: `${dayOfMonth}`,
+                  description: "",
+                  htmlContent: [{ value: `${dayOfMonth}`, color: tokenColors.NUMBER }],
+              }));
+          }
+          else if (dimension.granularity === "iso_week_number") {
+              return range(0, 54).map((isoWeekNumber) => ({
+                  text: `${isoWeekNumber}`,
+                  fuzzySearchKey: `${isoWeekNumber}`,
+                  description: "",
+                  htmlContent: [{ value: `${isoWeekNumber}`, color: tokenColors.NUMBER }],
+              }));
+          }
+          return pivot.getPossibleFieldValues(dimension).map(({ value, label }) => {
               const isString = typeof value === "string";
               const text = isString ? `"${value}"` : value.toString();
               const color = isString ? tokenColors.STRING : tokenColors.NUMBER;
@@ -22089,7 +22070,9 @@ stores.inject(MyMetaStore, storeInstance);
               tooltip: content
                   ? {
                       props: {
-                          content: evaluateLiteral(data.cell?.content, localeFormat).formattedValue,
+                          content: data.cell
+                              ? evaluateLiteral(data.cell, localeFormat).formattedValue
+                              : "",
                       },
                   }
                   : undefined,
@@ -22152,9 +22135,7 @@ stores.inject(MyMetaStore, storeInstance);
           if (x === cell) {
               found = true;
           }
-          const cellValue = x?.isFormula
-              ? undefined
-              : evaluateLiteral(x?.content, { locale: DEFAULT_LOCALE });
+          const cellValue = x === undefined || x.isFormula ? undefined : evaluateLiteral(x, { locale: DEFAULT_LOCALE });
           if (cellValue && filter(cellValue)) {
               group.push(cellValue);
           }
@@ -22202,7 +22183,7 @@ stores.inject(MyMetaStore, storeInstance);
   })
       .add("increment_alphanumeric_value", {
       condition: (cell) => !cell.isFormula &&
-          evaluateLiteral(cell.content, { locale: DEFAULT_LOCALE }).type === CellValueType.text &&
+          evaluateLiteral(cell, { locale: DEFAULT_LOCALE }).type === CellValueType.text &&
           alphaNumericValueRegExp.test(cell.content),
       generateRule: (cell, cells) => {
           const numberPostfix = parseInt(cell.content.match(numberPostfixRegExp)[0]);
@@ -22225,7 +22206,7 @@ stores.inject(MyMetaStore, storeInstance);
   })
       .add("copy_text", {
       condition: (cell) => !cell.isFormula &&
-          evaluateLiteral(cell.content, { locale: DEFAULT_LOCALE }).type === CellValueType.text,
+          evaluateLiteral(cell, { locale: DEFAULT_LOCALE }).type === CellValueType.text,
       generateRule: () => {
           return { type: "COPY_MODIFIER" };
       },
@@ -22240,11 +22221,11 @@ stores.inject(MyMetaStore, storeInstance);
   })
       .add("increment_number", {
       condition: (cell) => !cell.isFormula &&
-          evaluateLiteral(cell.content, { locale: DEFAULT_LOCALE }).type === CellValueType.number,
+          evaluateLiteral(cell, { locale: DEFAULT_LOCALE }).type === CellValueType.number,
       generateRule: (cell, cells) => {
           const group = getGroup(cell, cells, (evaluatedCell) => evaluatedCell.type === CellValueType.number).map((cell) => Number(cell.value));
           const increment = calculateIncrementBasedOnGroup(group);
-          const evaluation = evaluateLiteral(cell.content, { locale: DEFAULT_LOCALE });
+          const evaluation = evaluateLiteral(cell, { locale: DEFAULT_LOCALE });
           return {
               type: "INCREMENT_MODIFIER",
               increment,
@@ -25468,7 +25449,7 @@ stores.inject(MyMetaStore, storeInstance);
               if (!anchor)
                   return;
               const propsMaxSize = { width: this.props.maxWidth, height: this.props.maxHeight };
-              const elDims = {
+              let elDims = {
                   width: el.getBoundingClientRect().width,
                   height: el.getBoundingClientRect().height,
               };
@@ -25476,7 +25457,14 @@ stores.inject(MyMetaStore, storeInstance);
               const popoverPositionHelper = this.props.positioning === "BottomLeft"
                   ? new BottomLeftPopoverContext(anchor, this.containerRect, propsMaxSize, spreadsheetRect)
                   : new TopRightPopoverContext(anchor, this.containerRect, propsMaxSize, spreadsheetRect);
-              const style = popoverPositionHelper.getCss(elDims, this.props.verticalOffset);
+              el.style["max-height"] = popoverPositionHelper.getMaxHeight(elDims.height) + "px";
+              el.style["max-width"] = popoverPositionHelper.getMaxWidth(elDims.width) + "px";
+              // Re-compute the dimensions after setting the max-width and max-height
+              elDims = {
+                  width: el.getBoundingClientRect().width,
+                  height: el.getBoundingClientRect().height,
+              };
+              let style = popoverPositionHelper.getCss(elDims, this.props.verticalOffset);
               for (const property of Object.keys(style)) {
                   el.style[property] = style[property];
               }
@@ -25539,8 +25527,6 @@ stores.inject(MyMetaStore, storeInstance);
           const shouldRenderAtRight = this.shouldRenderAtRight(elDims.width);
           verticalOffset = shouldRenderAtBottom ? verticalOffset : -verticalOffset;
           const cssProperties = {
-              "max-height": maxHeight + "px",
-              "max-width": maxWidth + "px",
               top: this.getTopCoordinate(actualHeight, shouldRenderAtBottom) -
                   this.spreadsheetOffset.y -
                   verticalOffset +
@@ -31354,10 +31340,8 @@ stores.inject(MyMetaStore, storeInstance);
 
   class AxisDesignEditor extends owl.Component {
       static template = "o-spreadsheet-AxisDesignEditor";
-      static components = {
-          Section,
-          ChartTitle,
-      };
+      static components = { Section, ChartTitle };
+      static props = { figureId: String, definition: Object, updateChart: Function, axesList: Array };
       state = owl.useState({ currentAxis: "x" });
       get axisTitleStyle() {
           const axisDesign = this.props.definition.axesDesign?.[this.state.currentAxis] ?? {};
@@ -31508,6 +31492,12 @@ stores.inject(MyMetaStore, storeInstance);
           AxisDesignEditor,
           RoundColorPicker,
       };
+      static props = {
+          figureId: String,
+          definition: Object,
+          canUpdateChart: Function,
+          updateChart: Function,
+      };
       state = owl.useState({ index: 0 });
       get axesList() {
           const { useLeftAxis, useRightAxis } = getDefinedAxis(this.props.definition);
@@ -33452,13 +33442,17 @@ stores.inject(MyMetaStore, storeInstance);
           class: { type: String, optional: true },
       };
       static components = { Menu };
+      menuId = new UuidGenerator().uuidv4();
       selectRef = owl.useRef("select");
       selectRect = useAbsoluteBoundingRect(this.selectRef);
       state = owl.useState({
           isMenuOpen: false,
       });
-      onClick() {
-          this.state.isMenuOpen = true;
+      onClick(ev) {
+          if (ev.closedMenuId === this.menuId) {
+              return;
+          }
+          this.state.isMenuOpen = !this.state.isMenuOpen;
       }
       onMenuClosed() {
           this.state.isMenuOpen = false;
@@ -33466,7 +33460,7 @@ stores.inject(MyMetaStore, storeInstance);
       get menuPosition() {
           return {
               x: this.selectRect.x,
-              y: this.selectRect.y,
+              y: this.selectRect.y + this.selectRect.height,
           };
       }
   }
@@ -34406,9 +34400,9 @@ stores.inject(MyMetaStore, storeInstance);
       static props = {
           onCloseSidePanel: Function,
       };
-      dataRange = "";
       searchInput = owl.useRef("searchInput");
       store;
+      state;
       get hasSearchResult() {
           return this.store.selectedMatchIndex !== null;
       }
@@ -34438,6 +34432,7 @@ stores.inject(MyMetaStore, storeInstance);
       }
       setup() {
           this.store = useLocalStore(FindAndReplaceStore);
+          this.state = owl.useState({ dataRange: "" });
           owl.onMounted(() => this.searchInput.el?.focus());
       }
       onFocusSearch() {
@@ -34474,13 +34469,13 @@ stores.inject(MyMetaStore, storeInstance);
           this.store.updateSearchOptions({ searchScope });
       }
       onSearchRangeChanged(ranges) {
-          this.dataRange = ranges[0];
+          this.state.dataRange = ranges[0];
       }
       updateDataRange() {
-          if (!this.dataRange || this.searchOptions.searchScope !== "specificRange") {
+          if (!this.state.dataRange || this.searchOptions.searchScope !== "specificRange") {
               return;
           }
-          const specificRange = this.env.model.getters.getRangeFromSheetXC(this.env.model.getters.getActiveSheetId(), this.dataRange);
+          const specificRange = this.env.model.getters.getRangeFromSheetXC(this.env.model.getters.getActiveSheetId(), this.state.dataRange);
           this.store.updateSearchOptions({ specificRange });
       }
   }
@@ -34525,31 +34520,6 @@ stores.inject(MyMetaStore, storeInstance);
       }
   }
 
-  /** @odoo-module */
-  class EditableName extends owl.Component {
-      static template = "o-spreadsheet-EditableName";
-      static props = {
-          name: String,
-          displayName: String,
-          onChanged: Function,
-      };
-      state;
-      setup() {
-          this.state = owl.useState({
-              isEditing: false,
-              name: "",
-          });
-      }
-      rename() {
-          this.state.isEditing = true;
-          this.state.name = this.props.name;
-      }
-      save() {
-          this.props.onChanged(this.state.name.trim());
-          this.state.isEditing = false;
-      }
-  }
-
   css /* scss */ `
   .pivot-defer-update {
     min-height: 35px;
@@ -34915,6 +34885,135 @@ stores.inject(MyMetaStore, storeInstance);
       }
   }
 
+  css /* scss */ `
+  .os-cog-wheel-menu-icon {
+    cursor: pointer;
+  }
+
+  .os-cog-wheel-menu {
+    background: white;
+    .btn-link {
+      text-decoration: none;
+      color: #017e84;
+      font-weight: 500;
+      &:hover {
+        color: #01585c;
+      }
+    }
+  }
+`;
+  class CogWheelMenu extends owl.Component {
+      static template = "o-spreadsheet-CogWheelMenu";
+      static components = { Popover };
+      static props = {
+          items: Array,
+      };
+      buttonRef = owl.useRef("button");
+      popover = owl.useState({ isOpen: false });
+      setup() {
+          owl.useExternalListener(window, "click", (ev) => {
+              if (ev.target !== this.buttonRef.el) {
+                  this.popover.isOpen = false;
+              }
+          });
+      }
+      get popoverProps() {
+          const { x, y, width, height } = this.buttonRef.el.getBoundingClientRect();
+          return {
+              anchorRect: { x, y, width, height },
+              positioning: "BottomLeft",
+          };
+      }
+      togglePopover() {
+          this.popover.isOpen = !this.popover.isOpen;
+      }
+  }
+
+  /** @odoo-module */
+  class EditableName extends owl.Component {
+      static template = "o-spreadsheet-EditableName";
+      static props = {
+          name: String,
+          displayName: String,
+          onChanged: Function,
+      };
+      state;
+      setup() {
+          this.state = owl.useState({
+              isEditing: false,
+              name: "",
+          });
+      }
+      rename() {
+          this.state.isEditing = true;
+          this.state.name = this.props.name;
+      }
+      save() {
+          this.props.onChanged(this.state.name.trim());
+          this.state.isEditing = false;
+      }
+  }
+
+  class PivotTitleSection extends owl.Component {
+      static template = "o-spreadsheet-PivotTitleSection";
+      static components = { CogWheelMenu, Section, EditableName };
+      static props = {
+          pivotId: String,
+      };
+      get cogWheelMenuItems() {
+          return [
+              {
+                  name: "Duplicate",
+                  icon: "fa-copy",
+                  onClick: () => this.duplicatePivot(),
+              },
+              {
+                  name: "Delete",
+                  icon: "fa-trash",
+                  onClick: () => this.delete(),
+              },
+          ];
+      }
+      get name() {
+          return this.env.model.getters.getPivotName(this.props.pivotId);
+      }
+      get displayName() {
+          return this.env.model.getters.getPivotDisplayName(this.props.pivotId);
+      }
+      duplicatePivot() {
+          const newPivotId = this.env.model.uuidGenerator.uuidv4();
+          const result = this.env.model.dispatch("DUPLICATE_PIVOT", {
+              pivotId: this.props.pivotId,
+              newPivotId,
+          });
+          const text = result.isSuccessful ? _t("Pivot duplicated.") : _t("Pivot duplication failed");
+          const type = result.isSuccessful ? "success" : "danger";
+          this.env.notifyUser({
+              text,
+              sticky: false,
+              type,
+          });
+          if (result.isSuccessful) {
+              this.env.openSidePanel("PivotSidePanel", { pivotId: newPivotId });
+          }
+      }
+      delete() {
+          this.env.askConfirmation(_t("Are you sure you want to delete this pivot?"), () => {
+              this.env.model.dispatch("REMOVE_PIVOT", { pivotId: this.props.pivotId });
+          });
+      }
+      onNameChanged(name) {
+          const pivot = this.env.model.getters.getPivotCoreDefinition(this.props.pivotId);
+          this.env.model.dispatch("UPDATE_PIVOT", {
+              pivotId: this.props.pivotId,
+              pivot: {
+                  ...pivot,
+                  name,
+              },
+          });
+      }
+  }
+
   /**
    * Represent a pivot runtime definition. A pivot runtime definition is a pivot
    * definition that has been enriched to include the display name of its attributes
@@ -35219,7 +35318,7 @@ stores.inject(MyMetaStore, storeInstance);
       }
       const row = rows[index];
       const rowName = row.nameWithGranularity;
-      const groups = groupBy(dataEntries, row);
+      const groups = groupPivotDataEntriesBy(dataEntries, row);
       const orderedKeys = orderDataEntriesKeys(groups, row);
       const pivotTableRows = [];
       const _fields = fields.concat(rowName);
@@ -35249,7 +35348,7 @@ stores.inject(MyMetaStore, storeInstance);
       }
       const column = columns[index];
       const colName = columns[index].nameWithGranularity;
-      const groups = groupBy(dataEntries, column);
+      const groups = groupPivotDataEntriesBy(dataEntries, column);
       const orderedKeys = orderDataEntriesKeys(groups, columns[index]);
       return orderedKeys.map((value) => {
           return {
@@ -35347,7 +35446,7 @@ stores.inject(MyMetaStore, storeInstance);
   /**
    * Group the dataEntries based on the given dimension
    */
-  function groupBy(dataEntries, dimension) {
+  function groupPivotDataEntriesBy(dataEntries, dimension) {
       return Object.groupBy(dataEntries, keySelector(dimension));
   }
   /**
@@ -35397,7 +35496,7 @@ stores.inject(MyMetaStore, storeInstance);
                   number = Math.floor(date.getMonth() / 3) + 1;
                   break;
               case "month_number":
-                  number = date.getMonth();
+                  number = date.getMonth() + 1;
                   break;
               case "iso_week_number":
                   number = date.getIsoWeek();
@@ -35409,7 +35508,7 @@ stores.inject(MyMetaStore, storeInstance);
                   number = Math.floor(toNumber(value, locale));
                   break;
           }
-          MAP_VALUE_DIMENSION_DATE[granularity].values[`${value}`] = number;
+          MAP_VALUE_DIMENSION_DATE[granularity].values[`${value}`] = toNormalizedPivotValue(dimension, number);
       }
       return MAP_VALUE_DIMENSION_DATE[granularity].values[`${value}`];
   }
@@ -35555,7 +35654,7 @@ stores.inject(MyMetaStore, storeInstance);
           return this._definition;
       }
       isValid() {
-          if (this.invalidRangeError || !this._definition) {
+          if (this.invalidRangeError || !this.definition) {
               return false;
           }
           for (const measure of this.definition.measures) {
@@ -35612,25 +35711,19 @@ stores.inject(MyMetaStore, storeInstance);
           const dimension = this.getDimension(lastNode.field);
           const cells = this.filterDataEntriesFromDomain(this.dataEntries, domain);
           const finalCell = cells[0]?.[dimension.nameWithGranularity];
+          if (dimension.type === "date") {
+              const adapter = pivotTimeAdapter(dimension.granularity);
+              return {
+                  value: adapter.toCellValue(toNormalizedPivotValue(dimension, lastNode.value)),
+                  format: adapter.getFormat(this.getters.getLocale()),
+              };
+          }
           if (!finalCell) {
               return { value: "" };
           }
           if (finalCell.value === null) {
               return { value: _t("(Undefined)") };
           }
-          if (dimension.type === "date") {
-              if (dimension.granularity === "day") {
-                  return {
-                      value: toNumber(finalCell.value, this.getters.getLocale()),
-                      format: this.getters.getLocale().dateFormat,
-                  };
-              }
-              if (dimension.granularity === "month_number") {
-                  return {
-                      value: MONTHS[toNumber(finalCell.value, this.getters.getLocale())].toString(),
-                  };
-              }
-          }
           return {
               value: finalCell.value,
               format: finalCell.format,
@@ -35655,9 +35748,12 @@ stores.inject(MyMetaStore, storeInstance);
               format: operator.format(values[0]),
           };
       }
-      getPossibleFieldValues(groupBy) {
-          //TODO This method should be implemented for the autocomplete feature
-          throw new Error("Method not implemented.");
+      getPossibleFieldValues(dimension) {
+          const values = [];
+          for (const value in groupPivotDataEntriesBy(this.dataEntries, dimension)) {
+              values.push({ value, label: "" });
+          }
+          return values;
       }
       getTableStructure() {
           if (!this.isValid()) {
@@ -35677,7 +35773,8 @@ stores.inject(MyMetaStore, storeInstance);
       filterDataEntriesFromDomainNode(dataEntries, domain) {
           const { field, value } = domain;
           const dimension = this.getDimension(field);
-          return dataEntries.filter((entry) => `${entry[dimension.nameWithGranularity]?.value}` === value);
+          return dataEntries.filter((entry) => `${entry[dimension.nameWithGranularity]?.value}` ===
+              `${toNormalizedPivotValue(dimension, value)}`);
       }
       getDimension(nameWithGranularity) {
           return this.definition.getDimension(nameWithGranularity);
@@ -35813,15 +35910,8 @@ stores.inject(MyMetaStore, storeInstance);
 
   class PivotSidePanelStore extends SpreadsheetStore {
       pivotId;
-      mutators = [
-          "reset",
-          "deferUpdates",
-          "applyUpdate",
-          "discardPendingUpdate",
-          "renamePivot",
-          "update",
-      ];
-      updatesAreDeferred = true;
+      mutators = ["reset", "deferUpdates", "applyUpdate", "discardPendingUpdate", "update"];
+      updatesAreDeferred = false;
       draft = null;
       constructor(get, pivotId) {
           super(get);
@@ -35938,16 +36028,6 @@ stores.inject(MyMetaStore, storeInstance);
       discardPendingUpdate() {
           this.draft = null;
       }
-      renamePivot(name) {
-          const pivot = this.getters.getPivotCoreDefinition(this.pivotId);
-          this.model.dispatch("UPDATE_PIVOT", {
-              pivotId: this.pivotId,
-              pivot: {
-                  ...pivot,
-                  name,
-              },
-          });
-      }
       update(definitionUpdate) {
           const coreDefinition = this.getters.getPivotCoreDefinition(this.pivotId);
           const definition = { ...coreDefinition, ...this.draft, ...definitionUpdate };
@@ -36030,9 +36110,9 @@ stores.inject(MyMetaStore, storeInstance);
           PivotLayoutConfigurator,
           Section,
           SelectionInput,
-          EditableName,
           Checkbox,
           PivotDeferUpdate,
+          PivotTitleSection,
       };
       store;
       state;
@@ -36061,12 +36141,6 @@ stores.inject(MyMetaStore, storeInstance);
       get pivot() {
           return this.store.pivot;
       }
-      get name() {
-          return this.env.model.getters.getPivotName(this.props.pivotId);
-      }
-      get displayName() {
-          return this.env.model.getters.getPivotDisplayName(this.props.pivotId);
-      }
       get definition() {
           return this.store.definition;
       }
@@ -36090,35 +36164,9 @@ stores.inject(MyMetaStore, storeInstance);
               this.store.applyUpdate();
           }
       }
-      duplicatePivot() {
-          const newPivotId = this.env.model.uuidGenerator.uuidv4();
-          const result = this.env.model.dispatch("DUPLICATE_PIVOT", {
-              pivotId: this.props.pivotId,
-              newPivotId,
-          });
-          const text = result.isSuccessful ? _t("Pivot duplicated.") : _t("Pivot duplication failed");
-          const type = result.isSuccessful ? "success" : "danger";
-          this.env.notifyUser({
-              text,
-              sticky: false,
-              type,
-          });
-          if (result.isSuccessful) {
-              this.env.openSidePanel("PivotSidePanel", { pivotId: newPivotId });
-          }
-      }
-      onNameChanged(name) {
-          this.store.renamePivot(name);
-      }
       onDimensionsUpdated(definition) {
           this.store.update(definition);
       }
-      back() {
-          this.env.openSidePanel("PivotSidePanel", {});
-      }
-      delete() {
-          this.env.model.dispatch("REMOVE_PIVOT", { pivotId: this.props.pivotId });
-      }
   }
 
   const pivotSidePanelRegistry = new Registry();
@@ -36126,44 +36174,17 @@ stores.inject(MyMetaStore, storeInstance);
       editor: PivotSpreadsheetSidePanel,
   });
 
-  css /* scss */ `
-  .o_pivot_list_item {
-    cursor: pointer;
-    &:hover {
-      background-color: #f1f3f4;
-    }
-  }
-`;
-  class PivotListItem extends owl.Component {
-      static template = "o-spreadsheet-PivotListItem";
-      static props = { pivotId: String };
-      setup() {
-          const previewRef = owl.useRef("pivotListItem");
-          useHighlightsOnHover(previewRef, this);
-      }
-      selectPivot() {
-          this.env.openSidePanel("PivotSidePanel", { pivotId: this.props.pivotId });
-      }
-      get highlights() {
-          return getPivotHighlights(this.env.model.getters, this.props.pivotId);
-      }
-  }
-
   class PivotSidePanel extends owl.Component {
       static template = "o-spreadsheet-PivotSidePanel";
       static props = {
-          pivotId: { type: String, optional: true },
+          pivotId: String,
           onCloseSidePanel: Function,
       };
       static components = {
           PivotLayoutConfigurator,
           Section,
-          PivotListItem,
       };
       get sidePanelEditor() {
-          if (!this.props.pivotId) {
-              throw new Error("pivotId is required to call this function.");
-          }
           const pivot = this.env.model.getters.getPivotCoreDefinition(this.props.pivotId);
           if (!pivot) {
               throw new Error("pivotId does not correspond to a pivot.");
@@ -36180,6 +36201,7 @@ stores.inject(MyMetaStore, storeInstance);
   class RemoveDuplicatesPanel extends owl.Component {
       static template = "o-spreadsheet-RemoveDuplicatesPanel";
       static components = { ValidationMessages, Section, Checkbox };
+      static props = { onCloseSidePanel: Function };
       state = owl.useState({
           hasHeader: false,
           columns: {},
@@ -37322,21 +37344,15 @@ stores.inject(MyMetaStore, storeInstance);
   });
   sidePanelRegistry.add("PivotSidePanel", {
       title: (env, props) => {
-          if (props.pivotId) {
-              return _t("Pivot #%s", env.model.getters.getPivotFormulaId(props.pivotId));
-          }
-          return _t("List of Pivots");
+          return _t("Pivot #%s", env.model.getters.getPivotFormulaId(props.pivotId));
       },
       Body: PivotSidePanel,
-      computeState: (getters, initialProps) => {
-          if (!getters.getPivotIds().length) {
-              return { isOpen: false };
-          }
-          let { pivotId } = initialProps;
-          if (pivotId && !getters.isExistingPivot(pivotId)) {
-              pivotId = undefined;
-          }
-          return { isOpen: true, props: { pivotId }, key: `pivot_key_${pivotId}` };
+      computeState: (getters, props) => {
+          return {
+              isOpen: getters.isExistingPivot(props.pivotId),
+              props,
+              key: `pivot_key_${props.pivotId}`,
+          };
       },
   });
 
@@ -41594,133 +41610,6 @@ stores.inject(MyMetaStore, storeInstance);
       }
   }
 
-  const pivotTimeAdapterRegistry = new Registry();
-  function pivotTimeAdapter(granularity) {
-      return pivotTimeAdapterRegistry.get(granularity);
-  }
-  /**
-   * The Time Adapter: Managing Time Periods for Pivot Functions
-   *
-   * Overview:
-   * A time adapter is responsible for managing time periods associated with pivot functions.
-   * Each type of period (day, week, month, quarter, etc.) has its own dedicated adapter.
-   * The adapter's primary role is to normalize period values between spreadsheet functions,
-   * and the pivot.
-   * By normalizing the period value, it can be stored consistently in the pivot.
-   *
-   * Normalization Process:
-   * When working with functions in the spreadsheet, the time adapter normalizes
-   * the provided period to facilitate accurate lookup of values in the pivot.
-   * For instance, if the spreadsheet function represents a day period as a number generated
-   * by the DATE function (DATE(2023, 12, 25)), the time adapter will normalize it accordingly.
-   *
-   */
-  /**
-   * Normalized value: "12/25/2023"
-   *
-   * Note: Those two format are equivalent:
-   * - "MM/dd/yyyy" (luxon format)
-   * - "mm/dd/yyyy" (spreadsheet format)
-   **/
-  const dayAdapter = {
-      normalizeFunctionValue(value) {
-          const date = toNumber(value, DEFAULT_LOCALE);
-          return formatValue(date, { locale: DEFAULT_LOCALE, format: "mm/dd/yyyy" });
-      },
-      getFormat(locale) {
-          return (locale ?? DEFAULT_LOCALE).dateFormat;
-      },
-      formatValue(normalizedValue, locale) {
-          locale = locale ?? DEFAULT_LOCALE;
-          const value = toNumber(normalizedValue, DEFAULT_LOCALE);
-          return formatValue(value, { locale, format: this.getFormat(locale) });
-      },
-      toCellValue(normalizedValue) {
-          return toNumber(normalizedValue, DEFAULT_LOCALE);
-      },
-  };
-  /**
-   * Normalized value: "2/2023" for week 2 of 2023
-   */
-  const weekAdapter = {
-      normalizeFunctionValue(value) {
-          const [week, year] = value.split("/");
-          return `${Number(week)}/${Number(year)}`;
-      },
-      getFormat() {
-          return undefined;
-      },
-      formatValue(normalizedValue) {
-          const [week, year] = normalizedValue.split("/");
-          return _t("W%(week)s %(year)s", { week, year });
-      },
-      toCellValue(normalizedValue) {
-          return this.formatValue(normalizedValue);
-      },
-  };
-  /**
-   * normalized month value is a string formatted as "MM/yyyy" (luxon format)
-   * e.g. "01/2020" for January 2020
-   */
-  const monthAdapter = {
-      normalizeFunctionValue(value) {
-          const date = toNumber(value, DEFAULT_LOCALE);
-          return formatValue(date, { locale: DEFAULT_LOCALE, format: "mm/yyyy" });
-      },
-      getFormat() {
-          return "mmmm yyyy";
-      },
-      formatValue(normalizedValue, locale) {
-          locale = locale ?? DEFAULT_LOCALE;
-          const value = toNumber(normalizedValue, DEFAULT_LOCALE);
-          return formatValue(value, { locale, format: this.getFormat(locale) });
-      },
-      toCellValue(normalizedValue) {
-          return toNumber(normalizedValue, DEFAULT_LOCALE);
-      },
-  };
-  /**
-   * normalized quarter value is "quarter/year"
-   * e.g. "1/2020" for Q1 2020
-   */
-  const quarterAdapter = {
-      normalizeFunctionValue(value) {
-          const [quarter, year] = value.split("/");
-          return `${quarter}/${year}`;
-      },
-      getFormat() {
-          return undefined;
-      },
-      formatValue(normalizedValue) {
-          const [quarter, year] = normalizedValue.split("/");
-          return _t("Q%(quarter)s %(year)s", { quarter, year });
-      },
-      toCellValue(normalizedValue) {
-          return this.formatValue(normalizedValue);
-      },
-  };
-  const yearAdapter = {
-      normalizeFunctionValue(value) {
-          return toNumber(value, DEFAULT_LOCALE);
-      },
-      getFormat() {
-          return "0";
-      },
-      formatValue(normalizedValue, locale) {
-          locale = locale ?? DEFAULT_LOCALE;
-          return formatValue(normalizedValue, { locale, format: "0" });
-      },
-      toCellValue(normalizedValue) {
-          return normalizedValue;
-      },
-  };
-  pivotTimeAdapterRegistry
-      .add("day", dayAdapter)
-      .add("week", weekAdapter)
-      .add("month", monthAdapter)
-      .add("quarter", quarterAdapter)
-      .add("year", yearAdapter);
-
   /**
    * Represent a raw XML string
    */
@@ -46919,9 +46808,14 @@ stores.inject(MyMetaStore, storeInstance);
       }
       createLiteralCell(id, content, format, style) {
           const locale = this.getters.getLocale();
-          format = format || detectDateFormat(content, locale) || detectNumberFormat(content);
+          const parsedValue = parseLiteral(content, locale);
+          format =
+              format ||
+                  (typeof parsedValue === "number"
+                      ? detectDateFormat(content, locale) || detectNumberFormat(content)
+                      : undefined);
           if (format !== PLAIN_TEXT_FORMAT && !isEvaluationError(content)) {
-              content = toString(parseLiteral(content, locale));
+              content = toString(parsedValue);
           }
           return {
               id,
@@ -46929,6 +46823,7 @@ stores.inject(MyMetaStore, storeInstance);
               style,
               format,
               isFormula: false,
+              parsedValue,
           };
       }
       createFormulaCell(id, content, format, style, sheetId) {
@@ -51671,6 +51566,9 @@ stores.inject(MyMetaStore, storeInstance);
       get({ sheetId, col, row }) {
           return this.map[sheetId]?.[col]?.[row];
       }
+      getSheet(sheetId) {
+          return this.map[sheetId];
+      }
       has({ sheetId, col, row }) {
           return this.map[sheetId]?.[col]?.[row] !== undefined;
       }
@@ -51689,6 +51587,19 @@ stores.inject(MyMetaStore, storeInstance);
           }
           return keys;
       }
+      keysForSheet(sheetId) {
+          const map = this.map[sheetId];
+          if (!map) {
+              return [];
+          }
+          const keys = [];
+          for (const col in map) {
+              for (const row in map[col]) {
+                  keys.push({ sheetId, col: parseInt(col), row: parseInt(row) });
+              }
+          }
+          return keys;
+      }
   }
 
   function quickselect(arr, k, left, right, compare) {
@@ -52767,6 +52678,9 @@ stores.inject(MyMetaStore, storeInstance);
       getEvaluatedPositions() {
           return this.evaluatedCells.keys();
       }
+      getEvaluatedPositionsInSheet(sheetId) {
+          return this.evaluatedCells.keysForSheet(sheetId);
+      }
       getArrayFormulaSpreadingOn(position) {
           if (!this.spreadingRelations.hasArrayFormulaResult(position)) {
               return this.spreadingRelations.isArrayFormula(position) ? position : undefined;
@@ -52775,6 +52689,9 @@ stores.inject(MyMetaStore, storeInstance);
           return Array.from(arrayFormulas).find((position) => !this.blockedArrayFormulas.has(position));
       }
       updateDependencies(position) {
+          // removing dependencies is slow because it requires
+          // to traverse the entire r-tree.
+          // The data structure is optimized for searches the other way around
           this.formulaDependencies().removeAllDependencies(position);
           const dependencies = this.getDirectDependencies(position);
           this.formulaDependencies().addDependencies(position, dependencies);
@@ -52940,7 +52857,7 @@ stores.inject(MyMetaStore, storeInstance);
               this.cellsBeingComputed.add(cellId);
               return cell.isFormula
                   ? this.computeFormulaCell(position.sheetId, cell)
-                  : evaluateLiteral(cell.content, localeFormat);
+                  : evaluateLiteral(cell, localeFormat);
           }
           catch (e) {
               e.value = e?.value || CellErrorType.GenericError;
@@ -53210,6 +53127,7 @@ stores.inject(MyMetaStore, storeInstance);
           "getEvaluatedCell",
           "getEvaluatedCells",
           "getEvaluatedCellsInZone",
+          "getEvaluatedCellsPositions",
           "getSpreadZone",
           "getArrayFormulaSpreadingOn",
           "isEmpty",
@@ -53301,13 +53219,12 @@ stores.inject(MyMetaStore, storeInstance);
           return this.evaluator.getEvaluatedCell(position);
       }
       getEvaluatedCells(sheetId) {
-          const rawCells = this.getters.getCells(sheetId) || {};
-          const record = {};
-          for (let cellId of Object.keys(rawCells)) {
-              const position = this.getters.getCellPosition(cellId);
-              record[cellId] = this.getEvaluatedCell(position);
-          }
-          return record;
+          return this.evaluator
+              .getEvaluatedPositionsInSheet(sheetId)
+              .map((position) => this.getEvaluatedCell(position));
+      }
+      getEvaluatedCellsPositions(sheetId) {
+          return this.evaluator.getEvaluatedPositionsInSheet(sheetId);
       }
       getEvaluatedCellsInZone(sheetId, zone) {
           return positions(zone).map(({ col, row }) => this.getters.getEvaluatedCell({ sheetId, col, row }));
@@ -55975,7 +55892,10 @@ stores.inject(MyMetaStore, storeInstance);
       /**
        * Notify the server that the user client left the collaborative session
        */
-      leave() {
+      leave(data) {
+          if (Object.keys(this.clients).length === 1 && this.processedRevisions.size) {
+              this.snapshot(data);
+          }
           delete this.clients[this.clientId];
           this.transportService.leave(this.clientId);
           this.transportService.sendMessage({
@@ -56389,7 +56309,7 @@ stores.inject(MyMetaStore, storeInstance);
               bottom: rowIndex,
           }));
           const handler = new CellClipboardHandler(this.getters, this.dispatch);
-          const data = handler.copy(getClipboardDataPositions(rowsToKeep));
+          const data = handler.copy(getClipboardDataPositions(sheetId, rowsToKeep));
           if (!data) {
               return;
           }
@@ -56402,7 +56322,7 @@ stores.inject(MyMetaStore, storeInstance);
               right: zone.left,
               bottom: zone.top,
           };
-          handler.paste({ zones: [zonePasted] }, data, { isCutOperation: false });
+          handler.paste({ zones: [zonePasted], sheetId }, data, { isCutOperation: false });
           const remainingZone = {
               left: zone.left,
               top: zone.top - (hasHeader ? 1 : 0),
@@ -58276,12 +58196,14 @@ stores.inject(MyMetaStore, storeInstance);
           }
           let zone = undefined;
           let selectedZones = [];
+          const sheetId = this.getters.getActiveSheetId();
           let target = {
+              sheetId,
               zones,
           };
           const handlers = this.selectClipboardHandlers(copiedData);
           for (const handler of handlers) {
-              const currentTarget = handler.getPasteTarget(zones, copiedData, options);
+              const currentTarget = handler.getPasteTarget(sheetId, zones, copiedData, options);
               if (currentTarget.figureId) {
                   target.figureId = currentTarget.figureId;
               }
@@ -58450,11 +58372,12 @@ stores.inject(MyMetaStore, storeInstance);
           return { cut: [cut], paste: [paste] };
       }
       getClipboardData(zones) {
+          const sheetId = this.getters.getActiveSheetId();
           const selectedFigureId = this.getters.getSelectedFigureId();
           if (selectedFigureId) {
-              return { figureId: selectedFigureId };
+              return { figureId: selectedFigureId, sheetId };
           }
-          return getClipboardDataPositions(zones);
+          return getClipboardDataPositions(sheetId, zones);
       }
       // ---------------------------------------------------------------------------
       // Grid rendering
@@ -59120,8 +59043,9 @@ stores.inject(MyMetaStore, storeInstance);
                   bottom: !isCol ? end + deltaRow : this.getters.getNumberRows(cmd.sheetId) - 1,
               },
           ];
+          const sheetId = this.getActiveSheetId();
           const handler = new CellClipboardHandler(this.getters, this.dispatch);
-          const data = handler.copy(getClipboardDataPositions(target));
+          const data = handler.copy(getClipboardDataPositions(sheetId, target));
           if (!data) {
               return;
           }
@@ -59134,7 +59058,7 @@ stores.inject(MyMetaStore, storeInstance);
                   bottom: !isCol ? base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
               },
           ];
-          handler.paste({ zones: pasteTarget }, data, { isCutOperation: true });
+          handler.paste({ zones: pasteTarget, sheetId }, data, { isCutOperation: true });
           const toRemove = isBasedBefore ? cmd.elements.map((el) => el + thickness) : cmd.elements;
           let currentIndex = cmd.base;
           for (const element of toRemove) {
@@ -66498,7 +66422,7 @@ stores.inject(MyMetaStore, storeInstance);
           this.session.join(this.config.client);
       }
       leaveSession() {
-          this.session.leave();
+          this.session.leave(this.exportData());
       }
       setupUiPlugin(Plugin) {
           const plugin = new Plugin(this.uiPluginConfig);
@@ -66905,7 +66829,8 @@ stores.inject(MyMetaStore, storeInstance);
       pivotRegistry,
       pivotTimeAdapterRegistry,
       pivotSidePanelRegistry,
-      supportedPivotExplodedFormulaRegistry,
+      pivotNormalizationValueRegistry,
+      supportedPivotPositionalFormulaRegistry,
   };
   const helpers = {
       arg,
@@ -66914,6 +66839,7 @@ stores.inject(MyMetaStore, storeInstance);
       toJsDate,
       toNumber,
       toString,
+      toNormalizedPivotValue,
       toXC,
       toZone,
       toUnboundedZone,
@@ -67009,6 +66935,8 @@ stores.inject(MyMetaStore, storeInstance);
       PivotLayoutConfigurator,
       EditableName,
       PivotDeferUpdate,
+      PivotTitleSection,
+      CogWheelMenu,
   };
   const hooks = {
       useDragAndDropListItems,
@@ -67092,9 +67020,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.4.0-alpha.3";
-  __info__.date = "2024-06-10T09:38:53.982Z";
-  __info__.hash = "a45ed6a";
+  __info__.version = "17.4.0-alpha.4";
+  __info__.date = "2024-06-12T14:00:22.046Z";
+  __info__.hash = "cefb0e4";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);