@odoo/o-spreadsheet 17.0.33 → 17.0.34

package/dist/o-spreadsheet.cjs.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.0.33
- * @date 2024-08-02T08:18:55.061Z
- * @hash 4ad4049
+ * @version 17.0.34
+ * @date 2024-08-09T12:20:17.042Z
+ * @hash 1573912
  */
 
 'use strict';
@@ -38662,7 +38662,7 @@ class RangeAdapter {
      * @param sheetXC the string description of a range, in the form SheetName!XC:XC
      */
     getRangeFromSheetXC(defaultSheetId, sheetXC) {
-        if (!rangeReference.test(sheetXC)) {
+        if (!rangeReference.test(sheetXC) || !this.getters.tryGetSheet(defaultSheetId)) {
             return new RangeImpl({
                 sheetId: "",
                 zone: { left: -1, top: -1, right: -1, bottom: -1 },
@@ -41604,15 +41604,16 @@ class Evaluator {
         this.evaluatedCells = new Map();
         this.evaluate(this.getAllCells());
     }
-    evaluateFormula(sheetId, formulaString) {
-        const compiledFormula = compile(formulaString);
-        const ranges = compiledFormula.dependencies.map((xc) => this.getters.getRangeFromSheetXC(sheetId, xc));
-        this.updateCompilationParameters();
-        const array = compiledFormula.execute(ranges, ...this.compilationParams);
-        if (isMatrix(array)) {
-            return matrixMap(array, (cell) => cell.value);
+    evaluateFormulaResult(sheetId, formulaString) {
+        try {
+            const compiledFormula = compile(formulaString);
+            const ranges = compiledFormula.dependencies.map((xc) => this.getters.getRangeFromSheetXC(sheetId, xc));
+            this.updateCompilationParameters();
+            return compiledFormula.execute(ranges, ...this.compilationParams);
+        }
+        catch (error) {
+            return this.handleError(error);
         }
-        return array.value;
     }
     getAllCells() {
         const positionIds = new JetSet();
@@ -41688,7 +41689,7 @@ class Evaluator {
                 : evaluateLiteral(cell.content, { format: cell.format, locale: this.getters.getLocale() });
         }
         catch (e) {
-            return this.handleError(e, cell);
+            return this.handleError(e);
         }
         finally {
             this.cellsBeingComputed.delete(cellId);
@@ -41703,7 +41704,7 @@ class Evaluator {
         }
         return evaluatedCell;
     }
-    handleError(e, cell) {
+    handleError(e) {
         if (!(e instanceof EvaluationError)) {
             e = new EvaluationError(CellErrorType.GenericError, e.message);
         }
@@ -42037,6 +42038,7 @@ class PositionBitsEncoder {
 class EvaluationPlugin extends UIPlugin {
     static getters = [
         "evaluateFormula",
+        "evaluateFormulaResult",
         "getCorrespondingFormulaCell",
         "getRangeFormattedValues",
         "getRangeValues",
@@ -42094,12 +42096,14 @@ class EvaluationPlugin extends UIPlugin {
     // Getters
     // ---------------------------------------------------------------------------
     evaluateFormula(sheetId, formulaString) {
-        try {
-            return this.evaluator.evaluateFormula(sheetId, formulaString);
-        }
-        catch (error) {
-            return error instanceof EvaluationError ? error.errorType : CellErrorType.GenericError;
+        const result = this.evaluateFormulaResult(sheetId, formulaString);
+        if (isMatrix(result)) {
+            return matrixMap(result, (cell) => cell.value);
         }
+        return result.value;
+    }
+    evaluateFormulaResult(sheetId, formulaString) {
+        return this.evaluator.evaluateFormulaResult(sheetId, formulaString);
     }
     /**
      * Return the value of each cell in the range as they are displayed in the grid.
@@ -45899,6 +45903,7 @@ class FormatPlugin extends UIPlugin {
      * evaluated and updated with the number type.
      */
     setDecimal(sheetId, zones, step) {
+        const positionsByFormat = {};
         // Find the each cell with a number value and get the format
         for (const zone of zones) {
             for (const position of positions(zone)) {
@@ -45908,15 +45913,20 @@ class FormatPlugin extends UIPlugin {
                     // of the format
                     this.getters.getLocale();
                     const newFormat = changeDecimalPlaces(numberFormat, step);
-                    // Apply the new format on the whole zone
-                    this.dispatch("SET_FORMATTING", {
-                        sheetId,
-                        target: [positionToZone(position)],
-                        format: newFormat,
-                    });
+                    positionsByFormat[newFormat] = positionsByFormat[newFormat] || [];
+                    positionsByFormat[newFormat].push(position);
                 }
             }
         }
+        // consolidate all positions with the same format in bigger zones
+        for (const newFormat in positionsByFormat) {
+            const zones = futureRecomputeZones(positionsByFormat[newFormat].map((position) => positionToZone(position)));
+            this.dispatch("SET_FORMATTING", {
+                sheetId,
+                format: newFormat,
+                target: zones,
+            });
+        }
     }
     /**
      * Take a range of cells and return the format of the first cell containing a
@@ -57586,6 +57596,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.0.33";
-__info__.date = "2024-08-02T08:18:55.061Z";
-__info__.hash = "4ad4049";
+__info__.version = "17.0.34";
+__info__.date = "2024-08-09T12:20:17.042Z";
+__info__.hash = "1573912";

package/dist/o-spreadsheet.d.ts

@@ -4134,7 +4134,7 @@ declare class SheetPlugin extends CorePlugin<SheetState> implements SheetState {
 }
 
 declare class EvaluationPlugin extends UIPlugin {
-    static getters: readonly ["evaluateFormula", "getCorrespondingFormulaCell", "getRangeFormattedValues", "getRangeValues", "getRangeFormats", "getEvaluatedCell", "getEvaluatedCells", "getEvaluatedCellsInZone", "getSpreadPositionsOf", "getArrayFormulaSpreadingOn", "isEmpty"];
+    static getters: readonly ["evaluateFormula", "evaluateFormulaResult", "getCorrespondingFormulaCell", "getRangeFormattedValues", "getRangeValues", "getRangeFormats", "getEvaluatedCell", "getEvaluatedCells", "getEvaluatedCellsInZone", "getSpreadPositionsOf", "getArrayFormulaSpreadingOn", "isEmpty"];
     private shouldRebuildDependenciesGraph;
     private evaluator;
     private positionsToUpdate;
@@ -4143,6 +4143,7 @@ declare class EvaluationPlugin extends UIPlugin {
     handle(cmd: CoreViewCommand): void;
     finalize(): void;
     evaluateFormula(sheetId: UID, formulaString: string): CellValue | Matrix<CellValue>;
+    evaluateFormulaResult(sheetId: UID, formulaString: string): ValueAndFormat | Matrix<ValueAndFormat>;
     /**
      * Return the value of each cell in the range as they are displayed in the grid.
      */

package/dist/o-spreadsheet.esm.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.0.33
- * @date 2024-08-02T08:18:55.061Z
- * @hash 4ad4049
+ * @version 17.0.34
+ * @date 2024-08-09T12:20:17.042Z
+ * @hash 1573912
  */
 
 import { Component, useRef, onMounted, useEffect, onWillPatch, useState, onWillUpdateProps, onPatched, useComponent, useExternalListener, onWillUnmount, onWillStart, xml, useChildSubEnv, useSubEnv, markRaw } from '@odoo/owl';
@@ -38660,7 +38660,7 @@ class RangeAdapter {
      * @param sheetXC the string description of a range, in the form SheetName!XC:XC
      */
     getRangeFromSheetXC(defaultSheetId, sheetXC) {
-        if (!rangeReference.test(sheetXC)) {
+        if (!rangeReference.test(sheetXC) || !this.getters.tryGetSheet(defaultSheetId)) {
             return new RangeImpl({
                 sheetId: "",
                 zone: { left: -1, top: -1, right: -1, bottom: -1 },
@@ -41602,15 +41602,16 @@ class Evaluator {
         this.evaluatedCells = new Map();
         this.evaluate(this.getAllCells());
     }
-    evaluateFormula(sheetId, formulaString) {
-        const compiledFormula = compile(formulaString);
-        const ranges = compiledFormula.dependencies.map((xc) => this.getters.getRangeFromSheetXC(sheetId, xc));
-        this.updateCompilationParameters();
-        const array = compiledFormula.execute(ranges, ...this.compilationParams);
-        if (isMatrix(array)) {
-            return matrixMap(array, (cell) => cell.value);
+    evaluateFormulaResult(sheetId, formulaString) {
+        try {
+            const compiledFormula = compile(formulaString);
+            const ranges = compiledFormula.dependencies.map((xc) => this.getters.getRangeFromSheetXC(sheetId, xc));
+            this.updateCompilationParameters();
+            return compiledFormula.execute(ranges, ...this.compilationParams);
+        }
+        catch (error) {
+            return this.handleError(error);
         }
-        return array.value;
     }
     getAllCells() {
         const positionIds = new JetSet();
@@ -41686,7 +41687,7 @@ class Evaluator {
                 : evaluateLiteral(cell.content, { format: cell.format, locale: this.getters.getLocale() });
         }
         catch (e) {
-            return this.handleError(e, cell);
+            return this.handleError(e);
         }
         finally {
             this.cellsBeingComputed.delete(cellId);
@@ -41701,7 +41702,7 @@ class Evaluator {
         }
         return evaluatedCell;
     }
-    handleError(e, cell) {
+    handleError(e) {
         if (!(e instanceof EvaluationError)) {
             e = new EvaluationError(CellErrorType.GenericError, e.message);
         }
@@ -42035,6 +42036,7 @@ class PositionBitsEncoder {
 class EvaluationPlugin extends UIPlugin {
     static getters = [
         "evaluateFormula",
+        "evaluateFormulaResult",
         "getCorrespondingFormulaCell",
         "getRangeFormattedValues",
         "getRangeValues",
@@ -42092,12 +42094,14 @@ class EvaluationPlugin extends UIPlugin {
     // Getters
     // ---------------------------------------------------------------------------
     evaluateFormula(sheetId, formulaString) {
-        try {
-            return this.evaluator.evaluateFormula(sheetId, formulaString);
-        }
-        catch (error) {
-            return error instanceof EvaluationError ? error.errorType : CellErrorType.GenericError;
+        const result = this.evaluateFormulaResult(sheetId, formulaString);
+        if (isMatrix(result)) {
+            return matrixMap(result, (cell) => cell.value);
         }
+        return result.value;
+    }
+    evaluateFormulaResult(sheetId, formulaString) {
+        return this.evaluator.evaluateFormulaResult(sheetId, formulaString);
     }
     /**
      * Return the value of each cell in the range as they are displayed in the grid.
@@ -45897,6 +45901,7 @@ class FormatPlugin extends UIPlugin {
      * evaluated and updated with the number type.
      */
     setDecimal(sheetId, zones, step) {
+        const positionsByFormat = {};
         // Find the each cell with a number value and get the format
         for (const zone of zones) {
             for (const position of positions(zone)) {
@@ -45906,15 +45911,20 @@ class FormatPlugin extends UIPlugin {
                     // of the format
                     this.getters.getLocale();
                     const newFormat = changeDecimalPlaces(numberFormat, step);
-                    // Apply the new format on the whole zone
-                    this.dispatch("SET_FORMATTING", {
-                        sheetId,
-                        target: [positionToZone(position)],
-                        format: newFormat,
-                    });
+                    positionsByFormat[newFormat] = positionsByFormat[newFormat] || [];
+                    positionsByFormat[newFormat].push(position);
                 }
             }
         }
+        // consolidate all positions with the same format in bigger zones
+        for (const newFormat in positionsByFormat) {
+            const zones = futureRecomputeZones(positionsByFormat[newFormat].map((position) => positionToZone(position)));
+            this.dispatch("SET_FORMATTING", {
+                sheetId,
+                format: newFormat,
+                target: zones,
+            });
+        }
     }
     /**
      * Take a range of cells and return the format of the first cell containing a
@@ -57549,6 +57559,6 @@ const constants = {
 export { AbstractChart, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, tokenize };
 
 
-__info__.version = "17.0.33";
-__info__.date = "2024-08-02T08:18:55.061Z";
-__info__.hash = "4ad4049";
+__info__.version = "17.0.34";
+__info__.date = "2024-08-09T12:20:17.042Z";
+__info__.hash = "1573912";

package/dist/o-spreadsheet.iife.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.0.33
- * @date 2024-08-02T08:18:55.061Z
- * @hash 4ad4049
+ * @version 17.0.34
+ * @date 2024-08-09T12:20:17.042Z
+ * @hash 1573912
  */
 
 (function (exports, owl) {
@@ -38661,7 +38661,7 @@
        * @param sheetXC the string description of a range, in the form SheetName!XC:XC
        */
       getRangeFromSheetXC(defaultSheetId, sheetXC) {
-          if (!rangeReference.test(sheetXC)) {
+          if (!rangeReference.test(sheetXC) || !this.getters.tryGetSheet(defaultSheetId)) {
               return new RangeImpl({
                   sheetId: "",
                   zone: { left: -1, top: -1, right: -1, bottom: -1 },
@@ -41603,15 +41603,16 @@
           this.evaluatedCells = new Map();
           this.evaluate(this.getAllCells());
       }
-      evaluateFormula(sheetId, formulaString) {
-          const compiledFormula = compile(formulaString);
-          const ranges = compiledFormula.dependencies.map((xc) => this.getters.getRangeFromSheetXC(sheetId, xc));
-          this.updateCompilationParameters();
-          const array = compiledFormula.execute(ranges, ...this.compilationParams);
-          if (isMatrix(array)) {
-              return matrixMap(array, (cell) => cell.value);
+      evaluateFormulaResult(sheetId, formulaString) {
+          try {
+              const compiledFormula = compile(formulaString);
+              const ranges = compiledFormula.dependencies.map((xc) => this.getters.getRangeFromSheetXC(sheetId, xc));
+              this.updateCompilationParameters();
+              return compiledFormula.execute(ranges, ...this.compilationParams);
+          }
+          catch (error) {
+              return this.handleError(error);
           }
-          return array.value;
       }
       getAllCells() {
           const positionIds = new JetSet();
@@ -41687,7 +41688,7 @@
                   : evaluateLiteral(cell.content, { format: cell.format, locale: this.getters.getLocale() });
           }
           catch (e) {
-              return this.handleError(e, cell);
+              return this.handleError(e);
           }
           finally {
               this.cellsBeingComputed.delete(cellId);
@@ -41702,7 +41703,7 @@
           }
           return evaluatedCell;
       }
-      handleError(e, cell) {
+      handleError(e) {
           if (!(e instanceof EvaluationError)) {
               e = new EvaluationError(CellErrorType.GenericError, e.message);
           }
@@ -42036,6 +42037,7 @@
   class EvaluationPlugin extends UIPlugin {
       static getters = [
           "evaluateFormula",
+          "evaluateFormulaResult",
           "getCorrespondingFormulaCell",
           "getRangeFormattedValues",
           "getRangeValues",
@@ -42093,12 +42095,14 @@
       // Getters
       // ---------------------------------------------------------------------------
       evaluateFormula(sheetId, formulaString) {
-          try {
-              return this.evaluator.evaluateFormula(sheetId, formulaString);
-          }
-          catch (error) {
-              return error instanceof EvaluationError ? error.errorType : CellErrorType.GenericError;
+          const result = this.evaluateFormulaResult(sheetId, formulaString);
+          if (isMatrix(result)) {
+              return matrixMap(result, (cell) => cell.value);
           }
+          return result.value;
+      }
+      evaluateFormulaResult(sheetId, formulaString) {
+          return this.evaluator.evaluateFormulaResult(sheetId, formulaString);
       }
       /**
        * Return the value of each cell in the range as they are displayed in the grid.
@@ -45898,6 +45902,7 @@
        * evaluated and updated with the number type.
        */
       setDecimal(sheetId, zones, step) {
+          const positionsByFormat = {};
           // Find the each cell with a number value and get the format
           for (const zone of zones) {
               for (const position of positions(zone)) {
@@ -45907,15 +45912,20 @@
                       // of the format
                       this.getters.getLocale();
                       const newFormat = changeDecimalPlaces(numberFormat, step);
-                      // Apply the new format on the whole zone
-                      this.dispatch("SET_FORMATTING", {
-                          sheetId,
-                          target: [positionToZone(position)],
-                          format: newFormat,
-                      });
+                      positionsByFormat[newFormat] = positionsByFormat[newFormat] || [];
+                      positionsByFormat[newFormat].push(position);
                   }
               }
           }
+          // consolidate all positions with the same format in bigger zones
+          for (const newFormat in positionsByFormat) {
+              const zones = futureRecomputeZones(positionsByFormat[newFormat].map((position) => positionToZone(position)));
+              this.dispatch("SET_FORMATTING", {
+                  sheetId,
+                  format: newFormat,
+                  target: zones,
+              });
+          }
       }
       /**
        * Take a range of cells and return the format of the first cell containing a
@@ -57585,9 +57595,9 @@
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.0.33";
-  __info__.date = "2024-08-02T08:18:55.061Z";
-  __info__.hash = "4ad4049";
+  __info__.version = "17.0.34";
+  __info__.date = "2024-08-09T12:20:17.042Z";
+  __info__.hash = "1573912";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);