@odoo/o-spreadsheet 17.0.28 → 17.0.30

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.28
- * @date 2024-07-02T10:35:57.899Z
- * @hash 7f86a16
+ * @version 17.0.30
+ * @date 2024-07-11T06:34:04.932Z
+ * @hash a8eacf4
  */
 
 'use strict';
@@ -659,7 +659,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))
@@ -675,17 +675,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;
         }
@@ -756,11 +752,9 @@ class JetSet extends Set {
         return this;
     }
     deleteMany(iterable) {
-        let wasDeleted = false;
         for (const element of iterable) {
-            wasDeleted ||= super.delete(element);
+            super.delete(element);
         }
-        return wasDeleted;
     }
 }
 /**
@@ -1817,7 +1811,7 @@ const getFormulaNumberRegex = memoize(function getFormulaNumberRegex(decimalSepa
 });
 const getNumberRegex = memoize(function getNumberRegex(locale) {
     const decimalSeparator = escapeRegExp(locale.decimalSeparator);
-    const thousandsSeparator = escapeRegExp(locale.thousandsSeparator);
+    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)
@@ -1844,7 +1838,7 @@ function isNumber(value, locale) {
     return getNumberRegex(locale).test(value.trim());
 }
 const getInvaluableSymbolsRegexp = memoize(function getInvaluableSymbolsRegexp(locale) {
-    return new RegExp(`[\$€${escapeRegExp(locale.thousandsSeparator)}]`, "g");
+    return new RegExp(`[\$€${escapeRegExp(locale.thousandsSeparator || "")}]`, "g");
 });
 /**
  * Convert a string into a number. It assumes that the string actually represents
@@ -2546,6 +2540,9 @@ function getPredicate(descr, isQuery, locale) {
     return result;
 }
 function operandToRegExp(operand) {
+    if (operand === "*") {
+        return /.+/;
+    }
     let exp = "";
     let predecessor = "";
     for (let char of operand) {
@@ -2569,9 +2566,9 @@ function operandToRegExp(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 === "=") {
@@ -4784,7 +4781,6 @@ class ChartJsComponent extends owl.Component {
     static template = "o-spreadsheet-ChartJsComponent";
     canvas = owl.useRef("graphContainer");
     chart;
-    currentRuntime;
     get background() {
         return this.chartRuntime.background;
     }
@@ -4801,17 +4797,10 @@ 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.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;
@@ -7679,19 +7668,22 @@ class TokenizingChars {
 }
 
 function isValidLocale(locale) {
-    if (!(locale &&
-        typeof locale === "object" &&
-        typeof locale.name === "string" &&
-        typeof locale.code === "string" &&
-        typeof locale.thousandsSeparator === "string" &&
-        typeof locale.decimalSeparator === "string" &&
-        typeof locale.dateFormat === "string" &&
-        typeof locale.timeFormat === "string" &&
-        typeof locale.formulaArgSeparator === "string")) {
+    if (!locale ||
+        typeof locale !== "object" ||
+        !(!locale.thousandsSeparator || typeof locale.thousandsSeparator === "string")) {
         return false;
     }
-    if (!Object.values(locale).every((v) => v)) {
-        return false;
+    for (const property of [
+        "code",
+        "name",
+        "decimalSeparator",
+        "dateFormat",
+        "timeFormat",
+        "formulaArgSeparator",
+    ]) {
+        if (!locale[property] || typeof locale[property] !== "string") {
+            return false;
+        }
     }
     if (locale.formulaArgSeparator === locale.decimalSeparator) {
         return false;
@@ -7789,7 +7781,10 @@ function canonicalizeNumberLiteral(content, locale) {
     if (locale.decimalSeparator === "." || !isNumber(content, locale)) {
         return content;
     }
-    return content.replace(locale.thousandsSeparator, "").replace(locale.decimalSeparator, ".");
+    if (locale.thousandsSeparator) {
+        content = content.replaceAll(locale.thousandsSeparator, "");
+    }
+    return content.replace(locale.decimalSeparator, ".");
 }
 /**
  * Change a content string from the given locale to its canonical form (en_US locale). Also convert date string.
@@ -8435,7 +8430,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,
@@ -9467,15 +9462,6 @@ function createLineChartRuntime(chart, getters) {
     }
     const colors = new ChartColors();
     for (let [index, { label, data }] of dataSetsValues.entries()) {
-        if (["linear", "time"].includes(axisType)) {
-            // Replace empty string labels by undefined to make sure chartJS doesn't decide that "" is the same as 0
-            data = data.map((y, index) => ({ x: labels[index] || undefined, y }));
-        }
-        const color = colors.next();
-        let backgroundRGBA = colorToRGBA(color);
-        if (chart.stacked) {
-            backgroundRGBA.a = LINE_FILL_TRANSPARENCY;
-        }
         if (chart.cumulative) {
             let accumulator = 0;
             data = data.map((value) => {
@@ -9486,6 +9472,15 @@ function createLineChartRuntime(chart, getters) {
                 return value;
             });
         }
+        if (["linear", "time"].includes(axisType)) {
+            // Replace empty string labels by undefined to make sure chartJS doesn't decide that "" is the same as 0
+            data = data.map((y, index) => ({ x: labels[index] || undefined, y }));
+        }
+        const color = colors.next();
+        let backgroundRGBA = colorToRGBA(color);
+        if (chart.stacked) {
+            backgroundRGBA.a = LINE_FILL_TRANSPARENCY;
+        }
         const backgroundColor = rgbaToHex(backgroundRGBA);
         const dataset = {
             label,
@@ -24283,7 +24278,13 @@ class SettingsPanel extends owl.Component {
     }
     async loadLocales() {
         this.loadedLocales = (await this.env.loadLocales())
-            .filter(isValidLocale)
+            .filter((locale) => {
+            const isValid = isValidLocale(locale);
+            if (!isValid) {
+                console.warn(`Invalid locale: ${locale["code"]} ${locale}`);
+            }
+            return isValid;
+        })
             .sort((a, b) => a.name.localeCompare(b.name));
     }
     get numberFormatPreview() {
@@ -30066,6 +30067,7 @@ class Grid extends owl.Component {
             return;
         }
         if (clipboardData.types.indexOf(ClipboardMIMEType.PlainText) > -1) {
+            ev.preventDefault();
             const content = clipboardData.getData(ClipboardMIMEType.PlainText);
             const target = this.env.model.getters.getSelectedZones();
             const clipboardString = this.env.model.getters.getClipboardTextContent();
@@ -34641,6 +34643,21 @@ class BordersPlugin extends CorePlugin {
             return [];
         return Object.keys(sheetBorders).map((index) => parseInt(index, 10));
     }
+    /**
+     * Get all the rows which contains at least a border
+     */
+    getRowsWithBorders(sheetId) {
+        const sheetBorders = this.borders[sheetId]?.filter(isDefined$1);
+        if (!sheetBorders)
+            return [];
+        const rowsWithBorders = new Set();
+        for (const rowBorders of sheetBorders) {
+            for (const rowBorder in rowBorders) {
+                rowsWithBorders.add(parseInt(rowBorder, 10));
+            }
+        }
+        return Array.from(rowsWithBorders);
+    }
     /**
      * Get the range of all the rows in the sheet
      */
@@ -34690,7 +34707,7 @@ class BordersPlugin extends CorePlugin {
                 destructive: false,
             });
         }
-        this.getRowsRange(sheetId)
+        this.getRowsWithBorders(sheetId)
             .filter((row) => row >= start)
             .sort((a, b) => (delta < 0 ? a - b : b - a)) // start by the end when moving up
             .forEach((row) => {
@@ -35154,7 +35171,7 @@ function parseExpression(tokens, parent_priority = 0) {
  * Parse an expression (as a string) into an AST.
  */
 function parse(str) {
-    return parseTokens(tokenize(str));
+    return parseTokens(rangeTokenize(str));
 }
 function parseTokens(tokens) {
     tokens = tokens.filter((x) => x.type !== "SPACE");
@@ -41672,6 +41689,7 @@ class Evaluator {
         }
         finally {
             this.cellsBeingComputed.delete(cellId);
+            this.nextPositionsToUpdate.delete(positionId);
         }
     }
     computeAndSave(position) {
@@ -41713,11 +41731,36 @@ 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(formulaReturn[0][0].value, {
             format: cellData.format || formulaReturn[0][0]?.format,
             locale: this.getters.getLocale(),
         });
     }
+    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);
@@ -41766,9 +41809,6 @@ class Evaluator {
             });
             const positionId = this.encoder.encode(position);
             this.setEvaluatedCell(positionId, evaluatedCell);
-            // check if formula dependencies present in the spread zone
-            // if so, they need to be recomputed
-            this.nextPositionsToUpdate.addMany(this.getCellsDependingOn([positionId]));
         };
     }
     invalidateSpreading(positionId) {
@@ -57538,6 +57578,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.0.28";
-__info__.date = "2024-07-02T10:35:57.899Z";
-__info__.hash = "7f86a16";
+__info__.version = "17.0.30";
+__info__.date = "2024-07-11T06:34:04.932Z";
+__info__.hash = "a8eacf4";

package/dist/o-spreadsheet.d.ts

@@ -996,7 +996,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>;
@@ -2819,7 +2819,7 @@ type LocaleCode = string & Alias;
 interface Locale {
     name: string;
     code: LocaleCode;
-    thousandsSeparator: string;
+    thousandsSeparator?: string;
     decimalSeparator: string;
     dateFormat: string;
     timeFormat: string;
@@ -3317,6 +3317,10 @@ declare class BordersPlugin extends CorePlugin<BordersPluginState> implements Bo
      * Get all the columns which contains at least a border
      */
     private getColumnsWithBorders;
+    /**
+     * Get all the rows which contains at least a border
+     */
+    private getRowsWithBorders;
     /**
      * Get the range of all the rows in the sheet
      */
@@ -5956,7 +5960,6 @@ declare class ChartJsComponent extends Component<Props$B, SpreadsheetChildEnv> {
     static template: string;
     private canvas;
     private chart?;
-    private currentRuntime;
     get background(): string;
     get canvasStyle(): string;
     get chartRuntime(): ChartJSRuntime;