@odoo/o-spreadsheet 17.2.15 → 17.2.16

package/dist/o-spreadsheet.cjs.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.2.15
- * @date 2024-07-08T05:41:55.356Z
- * @hash acfb3e7
+ * @version 17.2.16
+ * @date 2024-07-11T06:38:53.101Z
+ * @hash 9f20685
  */
 
 'use strict';
@@ -577,7 +577,7 @@ function getAddHeaderStartIndex(position, base) {
 /**
  * Compares two objects.
  */
-function deepEquals(o1, o2, ignoreFunctions) {
+function deepEquals(o1, o2) {
     if (o1 === o2)
         return true;
     if ((o1 && !o2) || (o2 && !o1))
@@ -593,17 +593,13 @@ function deepEquals(o1, o2, ignoreFunctions) {
         }
     }
     for (const key in o1) {
-        const typeOfO1Key = typeof o1[key];
-        if (typeOfO1Key !== typeof o2[key])
+        if (typeof o1[key] !== typeof o2[key])
             return false;
-        if (typeOfO1Key === "object") {
-            if (!deepEquals(o1[key], o2[key], ignoreFunctions))
+        if (typeof o1[key] === "object") {
+            if (!deepEquals(o1[key], o2[key]))
                 return false;
         }
         else {
-            if (ignoreFunctions && typeOfO1Key === "function") {
-                continue;
-            }
             if (o1[key] !== o2[key])
                 return false;
         }
@@ -2648,6 +2644,9 @@ function getPredicate(descr, locale) {
  * If the character is a special regular expression character, it is escaped with "\\".
  */
 const wildcardToRegExp = memoize(function wildcardToRegExp(operand) {
+    if (operand === "*") {
+        return /.+/;
+    }
     let exp = "";
     let predecessor = "";
     for (let char of operand) {
@@ -2671,9 +2670,9 @@ const wildcardToRegExp = memoize(function wildcardToRegExp(operand) {
     }
     return new RegExp("^" + exp + "$", "i");
 });
-function evaluatePredicate(value, criterion) {
+function evaluatePredicate(value = "", criterion) {
     const { operator, operand } = criterion;
-    if (value === undefined || operand === undefined || value === null || operand === null) {
+    if (operand === undefined || value === null || operand === null) {
         return false;
     }
     if (typeof operand === "number" && operator === "=") {
@@ -9206,7 +9205,6 @@ class ChartJsComponent extends owl.Component {
     };
     canvas = owl.useRef("graphContainer");
     chart;
-    currentRuntime;
     get background() {
         return this.chartRuntime.background;
     }
@@ -9223,18 +9221,11 @@ class ChartJsComponent extends owl.Component {
     setup() {
         owl.onMounted(() => {
             const runtime = this.chartRuntime;
-            this.currentRuntime = runtime;
             // Note: chartJS modify the runtime in place, so it's important to give it a copy
             this.createChart(deepCopy(runtime.chartJsConfig));
         });
         owl.onWillUnmount(() => this.chart?.destroy());
-        owl.useEffect(() => {
-            const runtime = this.chartRuntime;
-            if (!deepEquals(runtime, this.currentRuntime, "ignoreFunctions")) {
-                this.currentRuntime = runtime;
-                this.updateChartJs(deepCopy(runtime));
-            }
-        });
+        owl.useEffect(() => this.updateChartJs(deepCopy(this.chartRuntime)), () => [this.chartRuntime]);
     }
     createChart(chartData) {
         const canvas = this.canvas.el;
@@ -19636,7 +19627,7 @@ function truncateLabel(label) {
 /**
  * Get a default chart js configuration
  */
-function getDefaultChartJsRuntime(chart, labels, fontColor, { format, locale, truncateLabels }) {
+function getDefaultChartJsRuntime(chart, labels, fontColor, { format, locale, truncateLabels = true }) {
     const options = {
         // https://www.chartjs.org/docs/latest/general/responsive.html
         responsive: true,
@@ -47508,7 +47499,7 @@ class PositionSet {
         return this.sheets[position.sheetId].getValue(position) === 1;
     }
     clear() {
-        const insertions = this.insertions;
+        const insertions = [...this];
         this.insertions = [];
         for (const sheetId in this.sheets) {
             this.sheets[sheetId].clear();
@@ -47826,6 +47817,7 @@ class Evaluator {
         }
         finally {
             this.cellsBeingComputed.delete(cellId);
+            this.nextPositionsToUpdate.delete(position);
         }
     }
     computeAndSave(position) {
@@ -47850,8 +47842,33 @@ class Evaluator {
         forEachSpreadPositionInMatrix(nbColumns, nbRows, 
         // thanks to the isMatrix check above, we know that formulaReturn is MatrixFunctionReturn
         this.spreadValues(formulaPosition, formulaReturn));
+        this.invalidatePositionsDependingOnSpread(formulaPosition, nbColumns, nbRows);
         return createEvaluatedCell(nullValueToZeroValue(formulaReturn[0][0]), this.getters.getLocale(), cellData);
     }
+    invalidatePositionsDependingOnSpread(arrayFormulaPosition, nbColumns, nbRows) {
+        // the result matrix is split in 2 zones to exclude the array formula position
+        const top = arrayFormulaPosition.row;
+        const left = arrayFormulaPosition.col;
+        const bottom = top + nbRows - 1;
+        const leftColumnZone = {
+            top: top + 1,
+            bottom,
+            left,
+            right: left,
+        };
+        const rightPartZone = {
+            top,
+            bottom,
+            left: left + 1,
+            right: left + nbColumns - 1,
+        };
+        const sheetId = arrayFormulaPosition.sheetId;
+        const invalidatedPositions = this.formulaDependencies().getCellsDependingOn([
+            { sheetId, zone: rightPartZone },
+            { sheetId, zone: leftColumnZone },
+        ]);
+        this.nextPositionsToUpdate.addMany(invalidatedPositions);
+    }
     assertSheetHasEnoughSpaceToSpreadFormulaResult({ sheetId, col, row }, matrixResult) {
         const numberOfCols = this.getters.getNumberCols(sheetId);
         const numberOfRows = this.getters.getNumberRows(sheetId);
@@ -47894,9 +47911,6 @@ class Evaluator {
             const cell = this.getters.getCell(position);
             const evaluatedCell = createEvaluatedCell(nullValueToZeroValue(matrixResult[i][j]), this.getters.getLocale(), cell);
             this.evaluatedCells.set(position, evaluatedCell);
-            // check if formula dependencies present in the spread zone
-            // if so, they need to be recomputed
-            this.nextPositionsToUpdate.addMany(this.getCellsDependingOn([position]));
         };
     }
     invalidateSpreading(position) {
@@ -60869,6 +60883,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.2.15";
-__info__.date = "2024-07-08T05:41:55.356Z";
-__info__.hash = "acfb3e7";
+__info__.version = "17.2.16";
+__info__.date = "2024-07-11T06:38:53.101Z";
+__info__.hash = "9f20685";

package/dist/o-spreadsheet.d.ts

@@ -4945,7 +4945,7 @@ declare function lazy<T>(fn: (() => T) | T): Lazy<T>;
 /**
  * Compares two objects.
  */
-declare function deepEquals(o1: any, o2: any, ignoreFunctions?: "ignoreFunctions"): boolean;
+declare function deepEquals(o1: any, o2: any): boolean;
 
 interface ConstructorArgs {
     readonly zone: Readonly<Zone | UnboundedZone>;
@@ -6870,7 +6870,6 @@ declare class ChartJsComponent extends Component<Props$y, SpreadsheetChildEnv> {
     };
     private canvas;
     private chart?;
-    private currentRuntime;
     get background(): string;
     get canvasStyle(): string;
     get chartRuntime(): ChartJSRuntime;

package/dist/o-spreadsheet.esm.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.2.15
- * @date 2024-07-08T05:41:55.356Z
- * @hash acfb3e7
+ * @version 17.2.16
+ * @date 2024-07-11T06:38:53.101Z
+ * @hash 9f20685
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw } from '@odoo/owl';
@@ -575,7 +575,7 @@ function getAddHeaderStartIndex(position, base) {
 /**
  * Compares two objects.
  */
-function deepEquals(o1, o2, ignoreFunctions) {
+function deepEquals(o1, o2) {
     if (o1 === o2)
         return true;
     if ((o1 && !o2) || (o2 && !o1))
@@ -591,17 +591,13 @@ function deepEquals(o1, o2, ignoreFunctions) {
         }
     }
     for (const key in o1) {
-        const typeOfO1Key = typeof o1[key];
-        if (typeOfO1Key !== typeof o2[key])
+        if (typeof o1[key] !== typeof o2[key])
             return false;
-        if (typeOfO1Key === "object") {
-            if (!deepEquals(o1[key], o2[key], ignoreFunctions))
+        if (typeof o1[key] === "object") {
+            if (!deepEquals(o1[key], o2[key]))
                 return false;
         }
         else {
-            if (ignoreFunctions && typeOfO1Key === "function") {
-                continue;
-            }
             if (o1[key] !== o2[key])
                 return false;
         }
@@ -2646,6 +2642,9 @@ function getPredicate(descr, locale) {
  * If the character is a special regular expression character, it is escaped with "\\".
  */
 const wildcardToRegExp = memoize(function wildcardToRegExp(operand) {
+    if (operand === "*") {
+        return /.+/;
+    }
     let exp = "";
     let predecessor = "";
     for (let char of operand) {
@@ -2669,9 +2668,9 @@ const wildcardToRegExp = memoize(function wildcardToRegExp(operand) {
     }
     return new RegExp("^" + exp + "$", "i");
 });
-function evaluatePredicate(value, criterion) {
+function evaluatePredicate(value = "", criterion) {
     const { operator, operand } = criterion;
-    if (value === undefined || operand === undefined || value === null || operand === null) {
+    if (operand === undefined || value === null || operand === null) {
         return false;
     }
     if (typeof operand === "number" && operator === "=") {
@@ -9204,7 +9203,6 @@ class ChartJsComponent extends Component {
     };
     canvas = useRef("graphContainer");
     chart;
-    currentRuntime;
     get background() {
         return this.chartRuntime.background;
     }
@@ -9221,18 +9219,11 @@ class ChartJsComponent extends Component {
     setup() {
         onMounted(() => {
             const runtime = this.chartRuntime;
-            this.currentRuntime = runtime;
             // Note: chartJS modify the runtime in place, so it's important to give it a copy
             this.createChart(deepCopy(runtime.chartJsConfig));
         });
         onWillUnmount(() => this.chart?.destroy());
-        useEffect(() => {
-            const runtime = this.chartRuntime;
-            if (!deepEquals(runtime, this.currentRuntime, "ignoreFunctions")) {
-                this.currentRuntime = runtime;
-                this.updateChartJs(deepCopy(runtime));
-            }
-        });
+        useEffect(() => this.updateChartJs(deepCopy(this.chartRuntime)), () => [this.chartRuntime]);
     }
     createChart(chartData) {
         const canvas = this.canvas.el;
@@ -19634,7 +19625,7 @@ function truncateLabel(label) {
 /**
  * Get a default chart js configuration
  */
-function getDefaultChartJsRuntime(chart, labels, fontColor, { format, locale, truncateLabels }) {
+function getDefaultChartJsRuntime(chart, labels, fontColor, { format, locale, truncateLabels = true }) {
     const options = {
         // https://www.chartjs.org/docs/latest/general/responsive.html
         responsive: true,
@@ -47506,7 +47497,7 @@ class PositionSet {
         return this.sheets[position.sheetId].getValue(position) === 1;
     }
     clear() {
-        const insertions = this.insertions;
+        const insertions = [...this];
         this.insertions = [];
         for (const sheetId in this.sheets) {
             this.sheets[sheetId].clear();
@@ -47824,6 +47815,7 @@ class Evaluator {
         }
         finally {
             this.cellsBeingComputed.delete(cellId);
+            this.nextPositionsToUpdate.delete(position);
         }
     }
     computeAndSave(position) {
@@ -47848,8 +47840,33 @@ class Evaluator {
         forEachSpreadPositionInMatrix(nbColumns, nbRows, 
         // thanks to the isMatrix check above, we know that formulaReturn is MatrixFunctionReturn
         this.spreadValues(formulaPosition, formulaReturn));
+        this.invalidatePositionsDependingOnSpread(formulaPosition, nbColumns, nbRows);
         return createEvaluatedCell(nullValueToZeroValue(formulaReturn[0][0]), this.getters.getLocale(), cellData);
     }
+    invalidatePositionsDependingOnSpread(arrayFormulaPosition, nbColumns, nbRows) {
+        // the result matrix is split in 2 zones to exclude the array formula position
+        const top = arrayFormulaPosition.row;
+        const left = arrayFormulaPosition.col;
+        const bottom = top + nbRows - 1;
+        const leftColumnZone = {
+            top: top + 1,
+            bottom,
+            left,
+            right: left,
+        };
+        const rightPartZone = {
+            top,
+            bottom,
+            left: left + 1,
+            right: left + nbColumns - 1,
+        };
+        const sheetId = arrayFormulaPosition.sheetId;
+        const invalidatedPositions = this.formulaDependencies().getCellsDependingOn([
+            { sheetId, zone: rightPartZone },
+            { sheetId, zone: leftColumnZone },
+        ]);
+        this.nextPositionsToUpdate.addMany(invalidatedPositions);
+    }
     assertSheetHasEnoughSpaceToSpreadFormulaResult({ sheetId, col, row }, matrixResult) {
         const numberOfCols = this.getters.getNumberCols(sheetId);
         const numberOfRows = this.getters.getNumberRows(sheetId);
@@ -47892,9 +47909,6 @@ class Evaluator {
             const cell = this.getters.getCell(position);
             const evaluatedCell = createEvaluatedCell(nullValueToZeroValue(matrixResult[i][j]), this.getters.getLocale(), cell);
             this.evaluatedCells.set(position, evaluatedCell);
-            // check if formula dependencies present in the spread zone
-            // if so, they need to be recomputed
-            this.nextPositionsToUpdate.addMany(this.getCellsDependingOn([position]));
         };
     }
     invalidateSpreading(position) {
@@ -60826,6 +60840,6 @@ const constants = {
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize };
 
 
-__info__.version = "17.2.15";
-__info__.date = "2024-07-08T05:41:55.356Z";
-__info__.hash = "acfb3e7";
+__info__.version = "17.2.16";
+__info__.date = "2024-07-11T06:38:53.101Z";
+__info__.hash = "9f20685";

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.2.15
- * @date 2024-07-08T05:41:55.356Z
- * @hash acfb3e7
+ * @version 17.2.16
+ * @date 2024-07-11T06:38:53.101Z
+ * @hash 9f20685
  */
 
 (function (exports, owl) {
@@ -576,7 +576,7 @@
   /**
    * Compares two objects.
    */
-  function deepEquals(o1, o2, ignoreFunctions) {
+  function deepEquals(o1, o2) {
       if (o1 === o2)
           return true;
       if ((o1 && !o2) || (o2 && !o1))
@@ -592,17 +592,13 @@
           }
       }
       for (const key in o1) {
-          const typeOfO1Key = typeof o1[key];
-          if (typeOfO1Key !== typeof o2[key])
+          if (typeof o1[key] !== typeof o2[key])
               return false;
-          if (typeOfO1Key === "object") {
-              if (!deepEquals(o1[key], o2[key], ignoreFunctions))
+          if (typeof o1[key] === "object") {
+              if (!deepEquals(o1[key], o2[key]))
                   return false;
           }
           else {
-              if (ignoreFunctions && typeOfO1Key === "function") {
-                  continue;
-              }
               if (o1[key] !== o2[key])
                   return false;
           }
@@ -2647,6 +2643,9 @@
    * If the character is a special regular expression character, it is escaped with "\\".
    */
   const wildcardToRegExp = memoize(function wildcardToRegExp(operand) {
+      if (operand === "*") {
+          return /.+/;
+      }
       let exp = "";
       let predecessor = "";
       for (let char of operand) {
@@ -2670,9 +2669,9 @@
       }
       return new RegExp("^" + exp + "$", "i");
   });
-  function evaluatePredicate(value, criterion) {
+  function evaluatePredicate(value = "", criterion) {
       const { operator, operand } = criterion;
-      if (value === undefined || operand === undefined || value === null || operand === null) {
+      if (operand === undefined || value === null || operand === null) {
           return false;
       }
       if (typeof operand === "number" && operator === "=") {
@@ -9205,7 +9204,6 @@ stores.inject(MyMetaStore, storeInstance);
       };
       canvas = owl.useRef("graphContainer");
       chart;
-      currentRuntime;
       get background() {
           return this.chartRuntime.background;
       }
@@ -9222,18 +9220,11 @@ stores.inject(MyMetaStore, storeInstance);
       setup() {
           owl.onMounted(() => {
               const runtime = this.chartRuntime;
-              this.currentRuntime = runtime;
               // Note: chartJS modify the runtime in place, so it's important to give it a copy
               this.createChart(deepCopy(runtime.chartJsConfig));
           });
           owl.onWillUnmount(() => this.chart?.destroy());
-          owl.useEffect(() => {
-              const runtime = this.chartRuntime;
-              if (!deepEquals(runtime, this.currentRuntime, "ignoreFunctions")) {
-                  this.currentRuntime = runtime;
-                  this.updateChartJs(deepCopy(runtime));
-              }
-          });
+          owl.useEffect(() => this.updateChartJs(deepCopy(this.chartRuntime)), () => [this.chartRuntime]);
       }
       createChart(chartData) {
           const canvas = this.canvas.el;
@@ -19635,7 +19626,7 @@ stores.inject(MyMetaStore, storeInstance);
   /**
    * Get a default chart js configuration
    */
-  function getDefaultChartJsRuntime(chart, labels, fontColor, { format, locale, truncateLabels }) {
+  function getDefaultChartJsRuntime(chart, labels, fontColor, { format, locale, truncateLabels = true }) {
       const options = {
           // https://www.chartjs.org/docs/latest/general/responsive.html
           responsive: true,
@@ -47507,7 +47498,7 @@ stores.inject(MyMetaStore, storeInstance);
           return this.sheets[position.sheetId].getValue(position) === 1;
       }
       clear() {
-          const insertions = this.insertions;
+          const insertions = [...this];
           this.insertions = [];
           for (const sheetId in this.sheets) {
               this.sheets[sheetId].clear();
@@ -47825,6 +47816,7 @@ stores.inject(MyMetaStore, storeInstance);
           }
           finally {
               this.cellsBeingComputed.delete(cellId);
+              this.nextPositionsToUpdate.delete(position);
           }
       }
       computeAndSave(position) {
@@ -47849,8 +47841,33 @@ stores.inject(MyMetaStore, storeInstance);
           forEachSpreadPositionInMatrix(nbColumns, nbRows, 
           // thanks to the isMatrix check above, we know that formulaReturn is MatrixFunctionReturn
           this.spreadValues(formulaPosition, formulaReturn));
+          this.invalidatePositionsDependingOnSpread(formulaPosition, nbColumns, nbRows);
           return createEvaluatedCell(nullValueToZeroValue(formulaReturn[0][0]), this.getters.getLocale(), cellData);
       }
+      invalidatePositionsDependingOnSpread(arrayFormulaPosition, nbColumns, nbRows) {
+          // the result matrix is split in 2 zones to exclude the array formula position
+          const top = arrayFormulaPosition.row;
+          const left = arrayFormulaPosition.col;
+          const bottom = top + nbRows - 1;
+          const leftColumnZone = {
+              top: top + 1,
+              bottom,
+              left,
+              right: left,
+          };
+          const rightPartZone = {
+              top,
+              bottom,
+              left: left + 1,
+              right: left + nbColumns - 1,
+          };
+          const sheetId = arrayFormulaPosition.sheetId;
+          const invalidatedPositions = this.formulaDependencies().getCellsDependingOn([
+              { sheetId, zone: rightPartZone },
+              { sheetId, zone: leftColumnZone },
+          ]);
+          this.nextPositionsToUpdate.addMany(invalidatedPositions);
+      }
       assertSheetHasEnoughSpaceToSpreadFormulaResult({ sheetId, col, row }, matrixResult) {
           const numberOfCols = this.getters.getNumberCols(sheetId);
           const numberOfRows = this.getters.getNumberRows(sheetId);
@@ -47893,9 +47910,6 @@ stores.inject(MyMetaStore, storeInstance);
               const cell = this.getters.getCell(position);
               const evaluatedCell = createEvaluatedCell(nullValueToZeroValue(matrixResult[i][j]), this.getters.getLocale(), cell);
               this.evaluatedCells.set(position, evaluatedCell);
-              // check if formula dependencies present in the spread zone
-              // if so, they need to be recomputed
-              this.nextPositionsToUpdate.addMany(this.getCellsDependingOn([position]));
           };
       }
       invalidateSpreading(position) {
@@ -60868,9 +60882,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.2.15";
-  __info__.date = "2024-07-08T05:41:55.356Z";
-  __info__.hash = "acfb3e7";
+  __info__.version = "17.2.16";
+  __info__.date = "2024-07-11T06:38:53.101Z";
+  __info__.hash = "9f20685";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);