@odoo/o-spreadsheet 15.0.15 → 15.0.17

package/dist/o-spreadsheet.iife.js

@@ -18727,15 +18727,20 @@
       // Getters
       // ---------------------------------------------------------------------------
       evaluateFormula(formulaString, sheetId = this.getters.getActiveSheetId()) {
-          let formula = normalize(formulaString);
-          const compiledFormula = compile(formula);
-          const params = this.getFormulaParameters(() => { });
-          const ranges = [];
-          for (let xc of formula.dependencies.references) {
-              ranges.push(this.getters.getRangeFromSheetXC(sheetId, xc));
+          try {
+              let formula = normalize(formulaString);
+              const compiledFormula = compile(formula);
+              const params = this.getFormulaParameters(() => { });
+              const ranges = [];
+              for (let xc of formula.dependencies.references) {
+                  ranges.push(this.getters.getRangeFromSheetXC(sheetId, xc));
+              }
+              const dependencies = { ...formula.dependencies, references: ranges };
+              return compiledFormula(dependencies, sheetId, ...params);
+          }
+          catch (error) {
+              return "#ERROR";
           }
-          const dependencies = { ...formula.dependencies, references: ranges };
-          return compiledFormula(dependencies, sheetId, ...params);
       }
       /**
        * Return the value of each cell in the range as they are displayed in the grid.
@@ -18816,17 +18821,10 @@
           const evalContext = Object.assign(Object.create(functionMap), this.evalContext, {
               getters: this.getters,
           });
-          const sheets = this.getters.getEvaluationSheets();
           function readCell(range) {
               var _a;
-              let cell;
-              const s = sheets[range.sheetId];
-              if (s) {
-                  cell = (_a = s.rows[range.zone.top]) === null || _a === void 0 ? void 0 : _a.cells[range.zone.left];
-              }
-              else {
-                  throw new Error(_lt("Invalid sheet name"));
-              }
+              const sheet = evalContext.getters.getSheet(range.sheetId);
+              const cell = (_a = sheet.rows[range.zone.top]) === null || _a === void 0 ? void 0 : _a.cells[range.zone.left];
               if (!cell || cell.isEmpty()) {
                   // magic "empty" value
                   // Returning null instead of undefined will ensure that we don't
@@ -18849,10 +18847,8 @@
            * that are actually present in the grid.
            */
           function _range(range) {
-              const sheet = sheets[range.sheetId];
-              if (!isZoneValid(range.zone)) {
-                  throw new Error(_lt("Invalid reference"));
-              }
+              assertRangeValid(range);
+              const sheet = evalContext.getters.getSheet(range.sheetId);
               // Performance issue: Avoid fetching data on positions that are out of the spreadsheet
               // e.g. A1:ZZZ9999 in a sheet with 10 cols and 10 rows should ignore everything past J10 and return a 10x10 array
               const sheetZone = {
@@ -18891,21 +18887,16 @@
            */
           function refFn(position, references, sheetId, isMeta, functionName, paramNumber) {
               const range = references[position];
+              assertRangeValid(range);
               if (isMeta) {
                   return evalContext.getters.getRangeString(range, sheetId);
               }
-              if (!isZoneValid(range.zone)) {
-                  throw new Error(_lt("Invalid reference"));
-              }
               // if the formula definition could have accepted a range, we would pass through the _range function and not here
               if (range.zone.bottom !== range.zone.top || range.zone.left !== range.zone.right) {
                   throw new Error(paramNumber
                       ? _lt("Function %s expects the parameter %s to be a single value or a single cell reference, not a range.", functionName.toString(), paramNumber.toString())
                       : _lt("Function %s expects its parameters to be single values or single cell references, not ranges.", functionName.toString()));
               }
-              if (range.invalidSheetName) {
-                  throw new Error(_lt("Invalid sheet name: %s", range.invalidSheetName));
-              }
               return readCell(range);
           }
           /**
@@ -18918,6 +18909,14 @@
           function range(position, references, sheetId) {
               return _range(references[position]);
           }
+          function assertRangeValid(range) {
+              if (!isZoneValid(range.zone)) {
+                  throw new Error(_lt("Invalid reference"));
+              }
+              if (range.invalidSheetName) {
+                  throw new Error(_lt("Invalid sheet name: %s", range.invalidSheetName));
+              }
+          }
           return [refFn, range, evalContext];
       }
       /**
@@ -19230,25 +19229,26 @@
            */
           this.rulePredicate = {
               CellIsRule: (cell, rule) => {
+                  var _a, _b, _c, _d, _e, _f;
                   if (cell && cell.evaluated.type === CellValueType.error) {
                       return false;
                   }
                   const values = rule.values.map(parsePrimitiveContent);
                   switch (rule.operator) {
                       case "IsEmpty":
-                          return !isDefined(cell) || cell.evaluated.value.toString().trim() === "";
+                          return !isDefined(cell) || ((_a = cell.evaluated.value) === null || _a === void 0 ? void 0 : _a.toString().trim()) === "";
                       case "IsNotEmpty":
-                          return isDefined(cell) && cell.evaluated.value.toString().trim() !== "";
+                          return isDefined(cell) && ((_b = cell.evaluated.value) === null || _b === void 0 ? void 0 : _b.toString().trim()) !== "";
                       case "BeginsWith":
                           if (!cell && values[0] === "") {
                               return false;
                           }
-                          return (isDefined(cell) && (cell === null || cell === void 0 ? void 0 : cell.evaluated.value.toString().startsWith(values[0].toString())));
+                          return (isDefined(cell) && ((_c = cell.evaluated.value) === null || _c === void 0 ? void 0 : _c.toString().startsWith(values[0].toString())));
                       case "EndsWith":
                           if (!cell && values[0] === "") {
                               return false;
                           }
-                          return isDefined(cell) && cell.evaluated.value.toString().endsWith(values[0].toString());
+                          return isDefined(cell) && ((_d = cell.evaluated.value) === null || _d === void 0 ? void 0 : _d.toString().endsWith(values[0].toString()));
                       case "Between":
                           return (isDefined(cell) &&
                               cell.evaluated.value >= values[0] &&
@@ -19258,11 +19258,11 @@
                               cell.evaluated.value >= values[0] &&
                               cell.evaluated.value <= values[1]);
                       case "ContainsText":
-                          return (isDefined(cell) && cell.evaluated.value.toString().indexOf(values[0].toString()) > -1);
+                          return (isDefined(cell) && ((_e = cell.evaluated.value) === null || _e === void 0 ? void 0 : _e.toString().indexOf(values[0].toString())) > -1);
                       case "NotContains":
                           return (!isDefined(cell) ||
                               !cell.evaluated.value ||
-                              cell.evaluated.value.toString().indexOf(values[0].toString()) == -1);
+                              ((_f = cell.evaluated.value) === null || _f === void 0 ? void 0 : _f.toString().indexOf(values[0].toString())) == -1);
                       case "GreaterThan":
                           return isDefined(cell) && cell.evaluated.value > values[0];
                       case "GreaterThanOrEqual":
@@ -19371,39 +19371,34 @@
           this.computedIcons[activeSheetId] = {};
           const computedStyle = this.computedStyles[activeSheetId];
           for (let cf of this.getters.getConditionalFormats(activeSheetId)) {
-              try {
-                  switch (cf.rule.type) {
-                      case "ColorScaleRule":
-                          for (let range of cf.ranges) {
-                              this.applyColorScale(range, cf.rule);
-                          }
-                          break;
-                      case "IconSetRule":
-                          for (let range of cf.ranges) {
-                              this.applyIcon(range, cf.rule);
-                          }
-                          break;
-                      default:
-                          for (let ref of cf.ranges) {
-                              const zone = toZone(ref);
-                              for (let row = zone.top; row <= zone.bottom; row++) {
-                                  for (let col = zone.left; col <= zone.right; col++) {
-                                      const pr = this.rulePredicate[cf.rule.type];
-                                      let cell = this.getters.getCell(activeSheetId, col, row);
-                                      if (pr && pr(cell, cf.rule)) {
-                                          if (!computedStyle[col])
-                                              computedStyle[col] = [];
-                                          // we must combine all the properties of all the CF rules applied to the given cell
-                                          computedStyle[col][row] = Object.assign(((_a = computedStyle[col]) === null || _a === void 0 ? void 0 : _a[row]) || {}, cf.rule.style);
-                                      }
+              switch (cf.rule.type) {
+                  case "ColorScaleRule":
+                      for (let range of cf.ranges) {
+                          this.applyColorScale(range, cf.rule);
+                      }
+                      break;
+                  case "IconSetRule":
+                      for (let range of cf.ranges) {
+                          this.applyIcon(range, cf.rule);
+                      }
+                      break;
+                  default:
+                      for (let ref of cf.ranges) {
+                          const zone = toZone(ref);
+                          for (let row = zone.top; row <= zone.bottom; row++) {
+                              for (let col = zone.left; col <= zone.right; col++) {
+                                  const pr = this.rulePredicate[cf.rule.type];
+                                  let cell = this.getters.getCell(activeSheetId, col, row);
+                                  if (pr && pr(cell, cf.rule)) {
+                                      if (!computedStyle[col])
+                                          computedStyle[col] = [];
+                                      // we must combine all the properties of all the CF rules applied to the given cell
+                                      computedStyle[col][row] = Object.assign(((_a = computedStyle[col]) === null || _a === void 0 ? void 0 : _a[row]) || {}, cf.rule.style);
                                   }
                               }
                           }
-                          break;
-                  }
-              }
-              catch (_) {
-                  // we don't care about the errors within the evaluation of a rule
+                      }
+                      break;
               }
           }
       }
@@ -19422,7 +19417,7 @@
                   return this.getters.evaluateFormula(`=PERCENTILE(${range},${Number(threshold.value) / 100})`);
               case "formula":
                   const value = threshold.value && this.getters.evaluateFormula(threshold.value);
-                  return !(value instanceof Promise) ? value : null;
+                  return typeof value === "number" ? value : null;
               default:
                   return null;
           }
@@ -31506,9 +31501,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '15.0.15';
-  __info__.date = '2024-01-12T13:39:45.422Z';
-  __info__.hash = 'c87764c';
+  __info__.version = '15.0.17';
+  __info__.date = '2024-01-29T13:46:44.293Z';
+  __info__.hash = '6944f99';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);