@odoo/o-spreadsheet 17.1.0-alpha.2 → 17.1.0-alpha.3

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.1.0-alpha.2
- * @date 2023-11-03T12:24:57.341Z
- * @hash 0595868
+ * @version 17.1.0-alpha.3
+ * @date 2023-11-16T12:04:09.636Z
+ * @hash 2ef5b1a
  */
 
 'use strict';
@@ -5968,7 +5968,7 @@ autofillModifiersRegistry
             return { cellData: {} };
         }
         const sheetId = data.sheetId;
-        const content = getters.getTranslatedCellFormula(sheetId, x, y, cell.compiledFormula, cell.dependencies);
+        const content = getters.getTranslatedCellFormula(sheetId, x, y, cell.compiledFormula);
         return {
             cellData: {
                 border: data.border,
@@ -10720,6 +10720,17 @@ const SELECTION_CONTAINS_FILTER = (env) => {
 const IS_ONLY_ONE_RANGE = (env) => {
     return env.model.getters.getSelectedZones().length === 1;
 };
+const CAN_INSERT_HEADER = (env, dimension) => {
+    if (!IS_ONLY_ONE_RANGE(env)) {
+        return false;
+    }
+    const activeHeaders = dimension === "COL" ? env.model.getters.getActiveCols() : env.model.getters.getActiveRows();
+    const ortogonalActiveHeaders = dimension === "COL" ? env.model.getters.getActiveRows() : env.model.getters.getActiveCols();
+    const sheetId = env.model.getters.getActiveSheetId();
+    const zone = env.model.getters.getSelectedZone();
+    const allSheetSelected = isEqual(zone, env.model.getters.getSheetZone(sheetId));
+    return isConsecutive(activeHeaders) && (ortogonalActiveHeaders.size === 0 || allSheetSelected);
+};
 
 const undo = {
     name: _t("Undo"),
@@ -19397,9 +19408,7 @@ const insertRow = {
         const number = getRowsNumber(env);
         return number === 1 ? _t("Insert row") : _t("Insert %s rows", number.toString());
     },
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveRows()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveCols().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "ROW"),
     icon: "o-spreadsheet-Icon.INSERT_ROW",
 };
 const rowInsertRowBefore = {
@@ -19408,9 +19417,7 @@ const rowInsertRowBefore = {
         return number === 1 ? _t("Insert row above") : _t("Insert %s rows above", number.toString());
     },
     execute: INSERT_ROWS_BEFORE_ACTION,
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveRows()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveCols().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "ROW"),
     icon: "o-spreadsheet-Icon.INSERT_ROW_BEFORE",
 };
 const topBarInsertRowsBefore = {
@@ -19441,9 +19448,7 @@ const rowInsertRowsAfter = {
         const number = getRowsNumber(env);
         return number === 1 ? _t("Insert row below") : _t("Insert %s rows below", number.toString());
     },
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveRows()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveCols().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "ROW"),
     icon: "o-spreadsheet-Icon.INSERT_ROW_AFTER",
 };
 const topBarInsertRowsAfter = {
@@ -19461,9 +19466,7 @@ const insertCol = {
         const number = getColumnsNumber(env);
         return number === 1 ? _t("Insert column") : _t("Insert %s columns", number.toString());
     },
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveCols()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveRows().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "COL"),
     icon: "o-spreadsheet-Icon.INSERT_COL",
 };
 const colInsertColsBefore = {
@@ -19474,9 +19477,7 @@ const colInsertColsBefore = {
             : _t("Insert %s columns left", number.toString());
     },
     execute: INSERT_COLUMNS_BEFORE_ACTION,
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveCols()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveRows().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "COL"),
     icon: "o-spreadsheet-Icon.INSERT_COL_BEFORE",
 };
 const topBarInsertColsBefore = {
@@ -19509,9 +19510,7 @@ const colInsertColsAfter = {
             : _t("Insert %s columns right", number.toString());
     },
     execute: INSERT_COLUMNS_AFTER_ACTION,
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveCols()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveRows().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "COL"),
     icon: "o-spreadsheet-Icon.INSERT_COL_AFTER",
 };
 const topBarInsertColsAfter = {
@@ -23852,7 +23851,7 @@ css /* scss */ `
       }
       .o-input-count {
         width: fit-content;
-        padding: 4 0 4 4;
+        padding: 4px 0 4px 4px;
       }
     }
   }
@@ -34968,6 +34967,9 @@ const functionCache = {};
 // -----------------------------------------------------------------------------
 function compile(formula) {
     const tokens = rangeTokenize(formula);
+    return compileTokens(tokens);
+}
+function compileTokens(tokens) {
     const { dependencies, constantValues } = formulaArguments(tokens);
     const cacheKey = compilationCacheKey(tokens, dependencies, constantValues);
     if (!functionCache[cacheKey]) {
@@ -35334,11 +35336,11 @@ class CellPlugin extends CorePlugin {
         for (const sheet of Object.keys(this.cells)) {
             for (const cell of Object.values(this.cells[sheet] || {})) {
                 if (cell.isFormula) {
-                    for (const range of cell.dependencies) {
+                    for (const range of cell.compiledFormula.dependencies) {
                         if (!sheetId || range.sheetId === sheetId) {
                             const change = applyChange(range);
                             if (change.changeType !== "NONE") {
-                                this.history.update("cells", sheet, cell.id, "dependencies", cell.dependencies.indexOf(range), change.range);
+                                this.history.update("cells", sheet, cell.id, "compiledFormula", "dependencies", cell.compiledFormula.dependencies.indexOf(range), change.range);
                             }
                         }
                     }
@@ -35534,10 +35536,10 @@ class CellPlugin extends CorePlugin {
     /*
      * Reconstructs the original formula string based on a normalized form and its dependencies
      */
-    getFormulaCellContent(sheetId, cell, dependencies) {
-        const ranges = dependencies || cell.dependencies;
+    getFormulaCellContent(sheetId, compiledFormula, dependencies) {
+        const ranges = dependencies || compiledFormula.dependencies;
         let rangeIndex = 0;
-        return concat(cell.compiledFormula.tokens.map((token) => {
+        return concat(compiledFormula.tokens.map((token) => {
             if (token.type === "REFERENCE") {
                 const range = ranges[rangeIndex++];
                 return this.getters.getRangeString(range, sheetId);
@@ -35548,12 +35550,9 @@ class CellPlugin extends CorePlugin {
     /*
      * Constructs a formula string based on an initial formula and a translation vector
      */
-    getTranslatedCellFormula(sheetId, offsetX, offsetY, compiledFormula, dependencies) {
-        const adaptedDependencies = this.getters.createAdaptedRanges(dependencies, offsetX, offsetY, sheetId);
-        return this.getFormulaCellContent(sheetId, {
-            compiledFormula,
-            dependencies: adaptedDependencies,
-        });
+    getTranslatedCellFormula(sheetId, offsetX, offsetY, compiledFormula) {
+        const adaptedDependencies = this.getters.createAdaptedRanges(compiledFormula.dependencies, offsetX, offsetY, sheetId);
+        return this.getFormulaCellContent(sheetId, compiledFormula, adaptedDependencies);
     }
     getCellStyle(position) {
         return this.getters.getCell(position)?.style || {};
@@ -35733,8 +35732,10 @@ class CellPlugin extends CorePlugin {
             style,
             format,
             isFormula: true,
-            compiledFormula,
-            dependencies: [],
+            compiledFormula: {
+                ...compiledFormula,
+                dependencies: [],
+            },
         };
     }
     /**
@@ -35743,7 +35744,7 @@ class CellPlugin extends CorePlugin {
      */
     createFormulaCellWithDependencies(id, compiledFormula, format, style, sheetId) {
         const dependencies = compiledFormula.dependencies.map((xc) => this.getters.getRangeFromSheetXC(sheetId, xc));
-        return new FormulaCellWithDependencies(id, compiledFormula, format, style, dependencies, sheetId, this.getFormulaCellContent.bind(this));
+        return new FormulaCellWithDependencies(id, compiledFormula, format, style, dependencies, sheetId, this.getters.getRangeString.bind(this));
     }
     createErrorFormula(id, content, format, style, error) {
         return {
@@ -35753,13 +35754,12 @@ class CellPlugin extends CorePlugin {
             format,
             isFormula: true,
             compiledFormula: {
-                dependencies: [],
                 tokens: tokenize(content),
+                dependencies: [],
                 execute: function () {
                     throw error;
                 },
             },
-            dependencies: [],
         };
     }
     checkCellOutOfSheet(sheetId, col, row) {
@@ -35772,27 +35772,44 @@ class CellPlugin extends CorePlugin {
 }
 class FormulaCellWithDependencies {
     id;
-    compiledFormula;
     format;
     style;
-    dependencies;
     sheetId;
-    getFormulaCellContent;
+    getRangeString;
     isFormula = true;
-    constructor(id, compiledFormula, format, style, dependencies, sheetId, getFormulaCellContent) {
+    compiledFormula;
+    constructor(id, compiledFormula, format, style, dependencies, sheetId, getRangeString) {
         this.id = id;
-        this.compiledFormula = compiledFormula;
         this.format = format;
         this.style = style;
-        this.dependencies = dependencies;
         this.sheetId = sheetId;
-        this.getFormulaCellContent = getFormulaCellContent;
+        this.getRangeString = getRangeString;
+        let rangeIndex = 0;
+        const tokens = compiledFormula.tokens.map((token) => {
+            if (token.type === "REFERENCE") {
+                const index = rangeIndex++;
+                return new RangeReferenceToken(() => this.getRangeString(dependencies[index], this.sheetId));
+            }
+            return token;
+        });
+        this.compiledFormula = {
+            ...compiledFormula,
+            dependencies,
+            tokens,
+        };
     }
     get content() {
-        return this.getFormulaCellContent(this.sheetId, {
-            dependencies: this.dependencies,
-            compiledFormula: this.compiledFormula,
-        });
+        return concat(this.compiledFormula.tokens.map((token) => token.value));
+    }
+}
+class RangeReferenceToken {
+    getValue;
+    type = "REFERENCE";
+    constructor(getValue) {
+        this.getValue = getValue;
+    }
+    get value() {
+        return this.getValue();
     }
 }
 
@@ -36937,6 +36954,13 @@ class FiltersPlugin extends CorePlugin {
     }
     onDeleteColumnsRows(cmd) {
         for (const table of this.getFilterTables(cmd.sheetId)) {
+            // Remove the filter tables whose data filter headers are in the removed rows.
+            if (cmd.dimension === "ROW" && cmd.elements.includes(table.zone.top)) {
+                const tables = { ...this.tables[cmd.sheetId] };
+                delete tables[table.id];
+                this.history.update("tables", cmd.sheetId, tables);
+                continue;
+            }
             const zone = reduceZoneOnDeletion(table.zone, cmd.dimension === "COL" ? "left" : "top", cmd.elements);
             if (!zone) {
                 const tables = { ...this.tables[cmd.sheetId] };
@@ -39985,6 +40009,13 @@ class Evaluator {
         return (this.evaluatedCells.get(this.encodePosition(position)) ||
             createEvaluatedCell("", { locale: this.getters.getLocale() }));
     }
+    getSpreadPositionsOf(position) {
+        const positionId = this.encodePosition(position);
+        if (!this.spreadingRelations.isArrayFormula(positionId)) {
+            return [];
+        }
+        return Array.from(this.spreadingRelations.getArrayResultPositionIds(positionId)).map(this.decodePosition.bind(this));
+    }
     getArrayFormulaSpreadingOn(position) {
         const positionId = this.encodePosition(position);
         const formulaPosition = this.getArrayFormulaSpreadingOnId(positionId);
@@ -40143,7 +40174,7 @@ class Evaluator {
             const position = this.compilationParams[2].getters.getCellPosition(cellId);
             return toXC(position.col, position.row);
         };
-        const formulaReturn = cellData.compiledFormula.execute(cellData.dependencies, ...this.compilationParams);
+        const formulaReturn = cellData.compiledFormula.execute(cellData.compiledFormula.dependencies, ...this.compilationParams);
         if (!isMatrix(formulaReturn)) {
             return createEvaluatedCell(formulaReturn.value, {
                 format: cellData.format || formulaReturn.format,
@@ -40243,7 +40274,7 @@ class Evaluator {
             return [];
         }
         const dependencies = [];
-        for (const range of cell.dependencies) {
+        for (const range of cell.compiledFormula.dependencies) {
             if (range.invalidSheetName || range.invalidXc) {
                 continue;
             }
@@ -40449,6 +40480,7 @@ class EvaluationPlugin extends UIPlugin {
         "getEvaluatedCell",
         "getEvaluatedCells",
         "getEvaluatedCellsInZone",
+        "getSpreadPositionsOf",
     ];
     shouldRebuildDependenciesGraph = true;
     evaluator;
@@ -40558,6 +40590,9 @@ class EvaluationPlugin extends UIPlugin {
     getEvaluatedCellsInZone(sheetId, zone) {
         return positions(zone).map(({ col, row }) => this.getters.getEvaluatedCell({ sheetId, col, row }));
     }
+    getSpreadPositionsOf(position) {
+        return this.evaluator.getSpreadPositionsOf(position);
+    }
     // ---------------------------------------------------------------------------
     // Export
     // ---------------------------------------------------------------------------
@@ -40595,10 +40630,10 @@ class EvaluationPlugin extends UIPlugin {
      */
     getCorrespondingFormulaCell(position) {
         const cell = this.getters.getCell(position);
-        if (cell && cell.content) {
-            if (cell.isFormula && !isBadExpression(cell.content)) {
-                return cell;
-            }
+        if (cell && cell.isFormula) {
+            return isBadExpression(cell.compiledFormula.tokens) ? undefined : cell;
+        }
+        else if (cell && cell.content) {
             return undefined;
         }
         const spreadingFormulaPosition = this.evaluator.getArrayFormulaSpreadingOn(position);
@@ -40615,9 +40650,9 @@ class EvaluationPlugin extends UIPlugin {
         return buildCompilationParameters(this.config.custom, this.getters, (position) => this.evaluator.getEvaluatedCell(position));
     }
 }
-function isBadExpression(formula) {
+function isBadExpression(tokens) {
     try {
-        compile(formula);
+        compileTokens(tokens);
         return false;
     }
     catch (error) {
@@ -40786,22 +40821,20 @@ class EvaluationChartPlugin extends UIPlugin {
             invalidateCFEvaluationCommands.has(cmd.type) ||
             cmd.type === "EVALUATE_CELLS" ||
             cmd.type === "UPDATE_CELL") {
-            if (cmd.type !== "UNDO" && cmd.type !== "REDO") {
-                for (const chartId in this.charts) {
-                    this.history.update("charts", chartId, undefined);
-                }
+            for (const chartId in this.charts) {
+                this.charts[chartId] = undefined;
             }
         }
         switch (cmd.type) {
             case "UPDATE_CHART":
             case "CREATE_CHART":
             case "DELETE_FIGURE":
-                this.history.update("charts", cmd.id, undefined);
+                this.charts[cmd.id] = undefined;
                 break;
             case "DELETE_SHEET":
                 for (let chartId in this.charts) {
                     if (!this.getters.isChartDefined(chartId)) {
-                        this.history.update("charts", chartId, undefined);
+                        this.charts[chartId] = undefined;
                     }
                 }
                 break;
@@ -40813,8 +40846,7 @@ class EvaluationChartPlugin extends UIPlugin {
             if (!chart) {
                 throw new Error(`No chart for the given id: ${figureId}`);
             }
-            const runtime = this.createRuntimeChart(chart);
-            this.history.update("charts", figureId, runtime);
+            this.charts[figureId] = this.createRuntimeChart(chart);
         }
         return this.charts[figureId];
     }
@@ -40966,7 +40998,10 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
                                     const values = cf.rule.values.map((value, i) => {
                                         const compiledFormula = formulas[i];
                                         if (compiledFormula) {
-                                            return this.getters.getTranslatedCellFormula(sheetId, col - zone.left, row - zone.top, compiledFormula, compiledFormula.dependencies.map((d) => this.getters.getRangeFromSheetXC(sheetId, d)));
+                                            return this.getters.getTranslatedCellFormula(sheetId, col - zone.left, row - zone.top, {
+                                                ...compiledFormula,
+                                                dependencies: compiledFormula.dependencies.map((d) => this.getters.getRangeFromSheetXC(sheetId, d)),
+                                            });
                                         }
                                         return value;
                                     });
@@ -41338,7 +41373,10 @@ class EvaluationDataValidationPlugin extends UIPlugin {
             }
             try {
                 const formula = compile(value);
-                const translatedFormula = this.getters.getTranslatedCellFormula(sheetId, offset.col, offset.row, formula, formula.dependencies.map((d) => this.getters.getRangeFromSheetXC(sheetId, d)));
+                const translatedFormula = this.getters.getTranslatedCellFormula(sheetId, offset.col, offset.row, {
+                    ...formula,
+                    dependencies: formula.dependencies.map((d) => this.getters.getRangeFromSheetXC(sheetId, d)),
+                });
                 const evaluated = this.getters.evaluateFormula(sheetId, translatedFormula);
                 return evaluated && !isMatrix(evaluated) ? evaluated.toString() : "";
             }
@@ -43592,7 +43630,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
             }
             let content = origin.cell.content;
             if (origin.cell.isFormula && operation === "COPY") {
-                content = this.getters.getTranslatedCellFormula(sheetId, col - origin.position.col, row - origin.position.row, origin.cell.compiledFormula, origin.cell.dependencies);
+                content = this.getters.getTranslatedCellFormula(sheetId, col - origin.position.col, row - origin.position.row, origin.cell.compiledFormula);
             }
             this.dispatch("UPDATE_CELL", {
                 ...target,
@@ -44124,20 +44162,29 @@ class FindAndReplacePlugin extends UIPlugin {
         const sheetId = this.getters.getActiveSheetId();
         const cells = this.getters.getCells(sheetId);
         const matches = [];
-        if (this.toSearch) {
+        if (this.toSearch && this.currentSearchRegex) {
             for (const cell of Object.values(cells)) {
                 const { col, row } = this.getters.getCellPosition(cell.id);
+                const cellPosition = { sheetId, col, row };
                 const isColHidden = this.getters.isColHidden(sheetId, col);
                 const isRowHidden = this.getters.isRowHidden(sheetId, row);
                 if (isColHidden || isRowHidden) {
                     continue;
                 }
-                if (cell &&
-                    this.currentSearchRegex &&
-                    this.currentSearchRegex.test(this.getSearchableString({ sheetId, col, row }))) {
+                if (this.currentSearchRegex.test(this.getSearchableString(cellPosition))) {
                     const match = { col, row, selected: false };
                     matches.push(match);
                 }
+                for (const spreadPosition of this.getters.getSpreadPositionsOf(cellPosition)) {
+                    if (this.currentSearchRegex.test(this.getSearchableString(spreadPosition))) {
+                        const match = {
+                            col: spreadPosition.col,
+                            row: spreadPosition.row,
+                            selected: false,
+                        };
+                        matches.push(match);
+                    }
+                }
             }
         }
         return matches.sort(this.sortByRowThenColumn);
@@ -44198,16 +44245,19 @@ class FindAndReplacePlugin extends UIPlugin {
             return;
         }
         const sheetId = this.getters.getActiveSheetId();
-        const cell = this.getters.getCell({ sheetId, ...selectedMatch });
-        const { col, row } = selectedMatch;
+        const position = { sheetId, ...selectedMatch };
+        const cell = this.getters.getCell(position);
+        if (!cell?.content) {
+            return;
+        }
         if (cell?.isFormula && !this.searchOptions.searchFormulas) {
             return;
         }
         const replaceRegex = new RegExp(this.currentSearchRegex.source, this.currentSearchRegex.flags + "g");
-        const toReplace = this.getSearchableString({ sheetId, col, row });
+        const toReplace = this.getSearchableString(position);
         const content = toReplace.replace(replaceRegex, replaceWith);
         const canonicalContent = canonicalizeNumberContent(content, this.getters.getLocale());
-        this.dispatch("UPDATE_CELL", { sheetId, col, row, content: canonicalContent });
+        this.dispatch("UPDATE_CELL", { ...position, content: canonicalContent });
     }
     /**
      * Replace the value of the currently selected match
@@ -45536,7 +45586,6 @@ class SelectionInputsManagerPlugin extends UIPlugin {
 }
 
 class SortPlugin extends UIPlugin {
-    static getters = ["getContiguousZone"];
     allowDispatch(cmd) {
         switch (cmd.type) {
             case "SORT_CELLS":
@@ -45584,143 +45633,6 @@ class SortPlugin extends UIPlugin {
         }
         return "Success" /* CommandResult.Success */;
     }
-    // getContiguousZone helpers
-    /**
-     * safe-version of expandZone to make sure we don't get out of the grid
-     */
-    expand(sheetId, z) {
-        const { left, right, top, bottom } = this.getters.expandZone(sheetId, z);
-        return {
-            left: Math.max(0, left),
-            right: Math.min(this.getters.getNumberCols(sheetId) - 1, right),
-            top: Math.max(0, top),
-            bottom: Math.min(this.getters.getNumberRows(sheetId) - 1, bottom),
-        };
-    }
-    /**
-     * verifies the presence of at least one non-empty cell in the given zone
-     */
-    checkExpandedValues(sheetId, z) {
-        const expandedZone = this.expand(sheetId, z);
-        let cell;
-        if (this.getters.doesIntersectMerge(sheetId, expandedZone)) {
-            const { left, right, top, bottom } = expandedZone;
-            for (let c = left; c <= right; c++) {
-                for (let r = top; r <= bottom; r++) {
-                    const { col, row } = this.getters.getMainCellPosition({ sheetId, col: c, row: r });
-                    cell = this.getters.getEvaluatedCell({ sheetId, col, row });
-                    if (cell.formattedValue) {
-                        return true;
-                    }
-                }
-            }
-        }
-        else {
-            for (let cell of this.getters.getEvaluatedCellsInZone(sheetId, expandedZone)) {
-                if (cell.formattedValue) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-    /**
-     * This function will expand the provided zone in directions (top, bottom, left, right) for which there
-     * are non-null cells on the external boundary of the zone in the given direction.
-     *
-     * Example:
-     *          A     B     C     D     E
-     *         ___   ___   ___   ___   ___
-     *    1  |     |  D  |     |     |     |
-     *         ___   ___   ___   ___   ___
-     *    2  |  5  |     |  1  |  D  |     |
-     *         ___   ___   ___   ___   ___
-     *    3  |     |     |  A  |  X  |     |
-     *         ___   ___   ___   ___   ___
-     *    4  |     |     |     |     |     |
-     *         ___   ___   ___   ___   ___
-     *
-     *  Let's consider a provided zone corresponding to (C2:D3) - (left:2, right: 3, top:1, bottom:2)
-     *  - the top external boundary is (B1:E1)
-     *    Since we have B1='D' != "", we expand to the top: => (C1:D3)
-     *    The top boundary having reached the top of the grid, we cannot expand in that direction anymore
-     *
-     *  - the left boundary is (B1:B4)
-     *    since we have B1 again, we expand to the left  => (B1:D3)
-     *
-     *  - the right and bottom boundaries are a dead end for now as (E1:E4) and (A4:E4) are empty.
-     *
-     *  - the left boundary is now (A1:A4)
-     *    Since we have A2=5 != "", we can therefore expand to the left => (A1:D3)
-     *
-     *  This will be the final zone as left and top have reached the boundaries of the grid and
-     *  the other boundaries (E1:E4) and (A4:E4) are empty.
-     *
-     * @param sheetId UID of concerned sheet
-     * @param zone Zone
-     *
-     */
-    getContiguousZone(sheetId, zone) {
-        let { top, bottom, left, right } = zone;
-        let canExpand;
-        let stop = false;
-        while (!stop) {
-            stop = true;
-            /** top row external boundary */
-            if (top > 0) {
-                canExpand = this.checkExpandedValues(sheetId, {
-                    left: left - 1,
-                    right: right + 1,
-                    top: top - 1,
-                    bottom: top - 1,
-                });
-                if (canExpand) {
-                    stop = false;
-                    top--;
-                }
-            }
-            /** left column external boundary */
-            if (left > 0) {
-                canExpand = this.checkExpandedValues(sheetId, {
-                    left: left - 1,
-                    right: left - 1,
-                    top: top - 1,
-                    bottom: bottom + 1,
-                });
-                if (canExpand) {
-                    stop = false;
-                    left--;
-                }
-            }
-            /** right column external boundary */
-            if (right < this.getters.getNumberCols(sheetId) - 1) {
-                canExpand = this.checkExpandedValues(sheetId, {
-                    left: right + 1,
-                    right: right + 1,
-                    top: top - 1,
-                    bottom: bottom + 1,
-                });
-                if (canExpand) {
-                    stop = false;
-                    right++;
-                }
-            }
-            /** bottom row external boundary */
-            if (bottom < this.getters.getNumberRows(sheetId) - 1) {
-                canExpand = this.checkExpandedValues(sheetId, {
-                    left: left - 1,
-                    right: right + 1,
-                    top: bottom + 1,
-                    bottom: bottom + 1,
-                });
-                if (canExpand) {
-                    stop = false;
-                    bottom++;
-                }
-            }
-        }
-        return { left, right, top, bottom };
-    }
     /**
      * This function evaluates if the top row of a provided zone can be considered as a `header`
      * by checking the following criteria:
@@ -45785,7 +45697,7 @@ class SortPlugin extends UIPlugin {
                     if (cell.isFormula) {
                         const position = this.getters.getCellPosition(cell.id);
                         // we only have a vertical offset
-                        content = this.getters.getTranslatedCellFormula(sheetId, 0, newRow - position.row, cell.compiledFormula, cell.dependencies);
+                        content = this.getters.getTranslatedCellFormula(sheetId, 0, newRow - position.row, cell.compiledFormula);
                     }
                     newCellValues.style = cell.style;
                     newCellValues.content = content;
@@ -45854,6 +45766,8 @@ class SheetUIPlugin extends UIPlugin {
         "getTextWidth",
         "getCellText",
         "getCellMultiLineText",
+        "getContiguousZone",
+        "isCellEmpty",
     ];
     ctx = document.createElement("canvas").getContext("2d");
     // ---------------------------------------------------------------------------
@@ -45943,9 +45857,52 @@ class SheetUIPlugin extends UIPlugin {
         const hasListIcon = !this.getters.isReadonly() && this.getters.cellHasListDataValidationIcon(position);
         return isFilterHeader || hasListIcon;
     }
-    // ---------------------------------------------------------------------------
-    // Grid manipulation
-    // ---------------------------------------------------------------------------
+    /**
+     * Expands the given zone until bordered by empty cells or reached the sheet boundaries.
+     */
+    getContiguousZone(sheetId, zoneToExpand) {
+        /** Try to expand the zone by one col/row in any direction to include a new non-empty cell */
+        const expandZone = (zone) => {
+            for (const col of range(zone.left, zone.right + 1)) {
+                if (!this.isCellEmpty({ sheetId, col, row: zone.top - 1 })) {
+                    return { ...zone, top: zone.top - 1 };
+                }
+                if (!this.isCellEmpty({ sheetId, col, row: zone.bottom + 1 })) {
+                    return { ...zone, bottom: zone.bottom + 1 };
+                }
+            }
+            for (const row of range(zone.top, zone.bottom + 1)) {
+                if (!this.isCellEmpty({ sheetId, col: zone.left - 1, row })) {
+                    return { ...zone, left: zone.left - 1 };
+                }
+                if (!this.isCellEmpty({ sheetId, col: zone.right + 1, row })) {
+                    return { ...zone, right: zone.right + 1 };
+                }
+            }
+            return zone;
+        };
+        let hasExpanded = false;
+        let zone = zoneToExpand;
+        do {
+            hasExpanded = false;
+            const newZone = expandZone(zone);
+            if (!isEqual(zone, newZone)) {
+                hasExpanded = true;
+                zone = newZone;
+                continue;
+            }
+        } while (hasExpanded);
+        return zone;
+    }
+    /**
+     * Check if a cell is empty. If the cell is part of a merge,
+     * check if the merge containing the cell is empty.
+     */
+    isCellEmpty(position) {
+        const mainPosition = this.getters.getMainCellPosition(position);
+        const cell = this.getters.getEvaluatedCell(mainPosition);
+        return cell.type === CellValueType.empty;
+    }
     getColMaxWidth(sheetId, index) {
         const cellsPositions = positions(this.getters.getColsZone(sheetId, index, index));
         const sizes = cellsPositions.map((position) => this.getCellWidth({ sheetId, ...position }));
@@ -47850,6 +47807,8 @@ class FilterEvaluationPlugin extends UIPlugin {
             case "EVALUATE_CELLS":
             case "ACTIVATE_SHEET":
             case "REMOVE_FILTER_TABLE":
+            case "ADD_COLUMNS_ROWS":
+            case "REMOVE_COLUMNS_ROWS":
                 this.isEvaluationDirty = true;
                 break;
             case "START":
@@ -53368,7 +53327,7 @@ class SelectionStreamProcessorImpl {
                 scrollIntoView: false,
             });
         }
-        const tableZone = this.expandZoneToTable(anchor.zone);
+        const tableZone = this.getters.getContiguousZone(sheetId, anchor.zone);
         return !deepEquals(tableZone, anchor.zone)
             ? this.modifyAnchor({ ...anchor, zone: tableZone }, "updateAnchor", {
                 scrollIntoView: false,
@@ -53381,7 +53340,8 @@ class SelectionStreamProcessorImpl {
      * cells bordering it
      */
     selectTableAroundSelection() {
-        const tableZone = this.expandZoneToTable(this.anchor.zone);
+        const sheetId = this.getters.getActiveSheetId();
+        const tableZone = this.getters.getContiguousZone(sheetId, this.anchor.zone);
         return this.modifyAnchor({ ...this.anchor, zone: tableZone }, "updateAnchor", {
             scrollIntoView: false,
         });
@@ -53558,11 +53518,12 @@ class SelectionStreamProcessorImpl {
      * next cluster if the given cell is outside a cluster or at the border of a cluster in the given direction.
      */
     getEndOfCluster(startPosition, dim, dir) {
-        const sheet = this.getters.getActiveSheet();
+        const sheetId = this.getters.getActiveSheetId();
         let currentPosition = startPosition;
         // If both the current cell and the next cell are not empty, we want to go to the end of the cluster
         const nextCellPosition = this.getNextCellPosition(startPosition, dim, dir);
-        let mode = !this.isCellEmpty(currentPosition, sheet.id) && !this.isCellEmpty(nextCellPosition, sheet.id)
+        let mode = !this.getters.isCellEmpty({ ...currentPosition, sheetId }) &&
+            !this.getters.isCellEmpty({ ...nextCellPosition, sheetId })
             ? "endOfCluster"
             : "nextCluster";
         while (true) {
@@ -53572,7 +53533,7 @@ class SelectionStreamProcessorImpl {
                 currentPosition.row === nextCellPosition.row) {
                 break;
             }
-            const isNextCellEmpty = this.isCellEmpty(nextCellPosition, sheet.id);
+            const isNextCellEmpty = this.getters.isCellEmpty({ ...nextCellPosition, sheetId });
             if (mode === "endOfCluster" && isNextCellEmpty) {
                 break;
             }
@@ -53585,15 +53546,6 @@ class SelectionStreamProcessorImpl {
         }
         return dim === "cols" ? currentPosition.col : currentPosition.row;
     }
-    /**
-     * Check if a cell is empty or undefined in the model. If the cell is part of a merge,
-     * check if the merge containing the cell is empty.
-     */
-    isCellEmpty({ col, row }, sheetId = this.getters.getActiveSheetId()) {
-        const position = this.getters.getMainCellPosition({ sheetId, col, row });
-        const cell = this.getters.getEvaluatedCell(position);
-        return cell.type === CellValueType.empty;
-    }
     /** Computes the next cell position in the given direction by crossing through merges and skipping hidden cells.
      *
      * This has the same behaviour as getNextAvailablePosition() for certain arguments, but use this method instead
@@ -53612,45 +53564,6 @@ class SelectionStreamProcessorImpl {
     getPosition() {
         return { ...this.anchor.cell };
     }
-    /**
-     * Expand the given zone to a table.
-     * We define a table by the smallest zone that contain the anchor and that have only empty
-     * cells bordering it
-     */
-    expandZoneToTable(zoneToExpand) {
-        /** Try to expand the zone by one col/row in any direction to include a new non-empty cell */
-        const expandZone = (zone) => {
-            for (const col of range(zone.left, zone.right + 1)) {
-                if (!this.isCellEmpty({ col, row: zone.top - 1 })) {
-                    return { ...zone, top: zone.top - 1 };
-                }
-                if (!this.isCellEmpty({ col, row: zone.bottom + 1 })) {
-                    return { ...zone, bottom: zone.bottom + 1 };
-                }
-            }
-            for (const row of range(zone.top, zone.bottom + 1)) {
-                if (!this.isCellEmpty({ col: zone.left - 1, row })) {
-                    return { ...zone, left: zone.left - 1 };
-                }
-                if (!this.isCellEmpty({ col: zone.right + 1, row })) {
-                    return { ...zone, right: zone.right + 1 };
-                }
-            }
-            return zone;
-        };
-        let hasExpanded = false;
-        let zone = zoneToExpand;
-        do {
-            hasExpanded = false;
-            const newZone = expandZone(zone);
-            if (!isEqual(zone, newZone)) {
-                hasExpanded = true;
-                zone = newZone;
-                continue;
-            }
-        } while (hasExpanded);
-        return zone;
-    }
 }
 
 class StateObserver {
@@ -55873,6 +55786,7 @@ exports.__info__ = __info__;
 exports.addFunction = addFunction;
 exports.astToFormula = astToFormula;
 exports.compile = compile;
+exports.compileTokens = compileTokens;
 exports.components = components;
 exports.constants = constants;
 exports.convertAstNodes = convertAstNodes;
@@ -55888,6 +55802,7 @@ exports.iterateAstNodes = iterateAstNodes;
 exports.links = links;
 exports.load = load;
 exports.parse = parse;
+exports.parseTokens = parseTokens;
 exports.readonlyAllowedCommands = readonlyAllowedCommands;
 exports.registries = registries;
 exports.setDefaultSheetViewSize = setDefaultSheetViewSize;
@@ -55895,6 +55810,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.1.0-alpha.2";
-__info__.date = "2023-11-03T12:24:57.341Z";
-__info__.hash = "0595868";
+__info__.version = "17.1.0-alpha.3";
+__info__.date = "2023-11-16T12:04:09.636Z";
+__info__.hash = "2ef5b1a";