@odoo/o-spreadsheet 17.4.0-alpha.11 → 17.4.0-alpha.12

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.4.0-alpha.11
- * @date 2024-07-02T10:38:50.116Z
- * @hash 9fe9477
+ * @version 17.4.0-alpha.12
+ * @date 2024-07-08T05:43:07.933Z
+ * @hash 7cfe14a
  */
 
 'use strict';
@@ -1805,7 +1805,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)
@@ -1838,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
@@ -5862,19 +5862,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;
@@ -5972,7 +5975,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.
@@ -6324,7 +6330,7 @@ const quarterNumberAdapter = {
     },
     toValueAndFormat(normalizedValue) {
         return {
-            value: toNumber(normalizedValue, DEFAULT_LOCALE),
+            value: _t("Q%(quarter_number)s", { quarter_number: normalizedValue }),
             format: "0",
         };
     },
@@ -6454,9 +6460,9 @@ function getMaxObjectId(o) {
 }
 const ALL_PERIODS = {
     year: _t("Year"),
-    quarter: _t("Quarter"),
-    month: _t("Month"),
-    week: _t("Week"),
+    quarter: _t("Quarter & Year"),
+    month: _t("Month & Year"),
+    week: _t("Week & Year"),
     day: _t("Day"),
     quarter_number: _t("Quarter"),
     month_number: _t("Month"),
@@ -6608,7 +6614,7 @@ class CellClipboardHandler extends AbstractCellClipboardHandler {
                 const pivotId = this.getters.getPivotIdFromPosition(position);
                 const spreader = this.getters.getArrayFormulaSpreadingOn(position);
                 if (pivotId) {
-                    if (!deepEquals(spreader, position) || !isCopyingOneCell) {
+                    if (spreader && (!deepEquals(spreader, position) || !isCopyingOneCell)) {
                         const pivotCell = this.getters.getPivotCellFromPosition(position);
                         const formulaPivotId = this.getters.getPivotFormulaId(pivotId);
                         const pivotFormula = createPivotFormula(formulaPivotId, pivotCell);
@@ -7413,6 +7419,146 @@ function transformRangeData(range, executed) {
     return undefined;
 }
 
+var State;
+(function (State) {
+    /**
+     * Initial state.
+     * Expecting any reference for the left part of a range
+     * e.g. "A1", "1", "A", "Sheet1!A1", "Sheet1!A"
+     */
+    State[State["LeftRef"] = 0] = "LeftRef";
+    /**
+     * Expecting any reference for the right part of a range
+     * e.g. "A1", "1", "A", "Sheet1!A1", "Sheet1!A"
+     */
+    State[State["RightRef"] = 1] = "RightRef";
+    /**
+     * Expecting the separator without any constraint on the right part
+     */
+    State[State["Separator"] = 2] = "Separator";
+    /**
+     * Expecting the separator for a full column range
+     */
+    State[State["FullColumnSeparator"] = 3] = "FullColumnSeparator";
+    /**
+     * Expecting the separator for a full row range
+     */
+    State[State["FullRowSeparator"] = 4] = "FullRowSeparator";
+    /**
+     * Expecting the right part of a full column range
+     * e.g. "1", "A1"
+     */
+    State[State["RightColumnRef"] = 5] = "RightColumnRef";
+    /**
+     * Expecting the right part of a full row range
+     * e.g. "A", "A1"
+     */
+    State[State["RightRowRef"] = 6] = "RightRowRef";
+    /**
+     * Final state. A range has been matched
+     */
+    State[State["Found"] = 7] = "Found";
+})(State || (State = {}));
+const goTo = (state, guard = () => true) => [
+    {
+        goTo: state,
+        guard,
+    },
+];
+const goToMulti = (state, guard = () => true) => ({
+    goTo: state,
+    guard,
+});
+const machine = {
+    [State.LeftRef]: {
+        REFERENCE: goTo(State.Separator),
+        NUMBER: goTo(State.FullRowSeparator),
+        SYMBOL: [
+            goToMulti(State.FullColumnSeparator, (token) => isColReference(token.value)),
+            goToMulti(State.FullRowSeparator, (token) => isRowReference(token.value)),
+        ],
+    },
+    [State.FullColumnSeparator]: {
+        SPACE: goTo(State.FullColumnSeparator),
+        OPERATOR: goTo(State.RightColumnRef, (token) => token.value === ":"),
+    },
+    [State.FullRowSeparator]: {
+        SPACE: goTo(State.FullRowSeparator),
+        OPERATOR: goTo(State.RightRowRef, (token) => token.value === ":"),
+    },
+    [State.Separator]: {
+        SPACE: goTo(State.Separator),
+        OPERATOR: goTo(State.RightRef, (token) => token.value === ":"),
+    },
+    [State.RightRef]: {
+        SPACE: goTo(State.RightRef),
+        NUMBER: goTo(State.Found),
+        REFERENCE: goTo(State.Found, (token) => isSingleCellReference(token.value)),
+        SYMBOL: goTo(State.Found, (token) => isColHeader(token.value) || isRowHeader(token.value)),
+    },
+    [State.RightColumnRef]: {
+        SPACE: goTo(State.RightColumnRef),
+        SYMBOL: goTo(State.Found, (token) => isColHeader(token.value)),
+        REFERENCE: goTo(State.Found, (token) => isSingleCellReference(token.value)),
+    },
+    [State.RightRowRef]: {
+        SPACE: goTo(State.RightRowRef),
+        NUMBER: goTo(State.Found),
+        REFERENCE: goTo(State.Found, (token) => isSingleCellReference(token.value)),
+        SYMBOL: goTo(State.Found, (token) => isRowHeader(token.value)),
+    },
+    [State.Found]: {},
+};
+/**
+ * Check if the list of tokens starts with a sequence of tokens representing
+ * a range.
+ * If a range is found, the sequence is removed from the list and is returned
+ * as a single token.
+ */
+function matchReference(tokens) {
+    let head = 0;
+    let transitions = machine[State.LeftRef];
+    let matchedTokens = "";
+    while (transitions !== undefined) {
+        const token = tokens[head++];
+        if (!token) {
+            return null;
+        }
+        const transition = transitions[token.type]?.find((transition) => transition.guard(token));
+        const nextState = transition ? transition.goTo : undefined;
+        switch (nextState) {
+            case undefined:
+                return null;
+            case State.Found:
+                matchedTokens += token.value;
+                tokens.splice(0, head);
+                return {
+                    type: "REFERENCE",
+                    value: matchedTokens,
+                };
+            default:
+                transitions = machine[nextState];
+                matchedTokens += token.value;
+                break;
+        }
+    }
+    return null;
+}
+/**
+ * Take the result of the tokenizer and transform it to be usable in the
+ * manipulations of range
+ *
+ * @param formula
+ */
+function rangeTokenize(formula, locale = DEFAULT_LOCALE) {
+    const tokens = tokenize(formula, locale);
+    const result = [];
+    while (tokens.length) {
+        result.push(matchReference(tokens) || tokens.shift());
+    }
+    return result;
+}
+
 const functionRegex = /[a-zA-Z0-9\_]+(\.[a-zA-Z0-9\_]+)*/;
 const UNARY_OPERATORS_PREFIX = ["-", "+"];
 const UNARY_OPERATORS_POSTFIX = ["%"];
@@ -7561,7 +7707,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");
@@ -7697,146 +7843,6 @@ function rightOperandToFormula(operationAST) {
     return needParenthesis ? `(${astToFormula(rightOperation)})` : astToFormula(rightOperation);
 }
 
-var State;
-(function (State) {
-    /**
-     * Initial state.
-     * Expecting any reference for the left part of a range
-     * e.g. "A1", "1", "A", "Sheet1!A1", "Sheet1!A"
-     */
-    State[State["LeftRef"] = 0] = "LeftRef";
-    /**
-     * Expecting any reference for the right part of a range
-     * e.g. "A1", "1", "A", "Sheet1!A1", "Sheet1!A"
-     */
-    State[State["RightRef"] = 1] = "RightRef";
-    /**
-     * Expecting the separator without any constraint on the right part
-     */
-    State[State["Separator"] = 2] = "Separator";
-    /**
-     * Expecting the separator for a full column range
-     */
-    State[State["FullColumnSeparator"] = 3] = "FullColumnSeparator";
-    /**
-     * Expecting the separator for a full row range
-     */
-    State[State["FullRowSeparator"] = 4] = "FullRowSeparator";
-    /**
-     * Expecting the right part of a full column range
-     * e.g. "1", "A1"
-     */
-    State[State["RightColumnRef"] = 5] = "RightColumnRef";
-    /**
-     * Expecting the right part of a full row range
-     * e.g. "A", "A1"
-     */
-    State[State["RightRowRef"] = 6] = "RightRowRef";
-    /**
-     * Final state. A range has been matched
-     */
-    State[State["Found"] = 7] = "Found";
-})(State || (State = {}));
-const goTo = (state, guard = () => true) => [
-    {
-        goTo: state,
-        guard,
-    },
-];
-const goToMulti = (state, guard = () => true) => ({
-    goTo: state,
-    guard,
-});
-const machine = {
-    [State.LeftRef]: {
-        REFERENCE: goTo(State.Separator),
-        NUMBER: goTo(State.FullRowSeparator),
-        SYMBOL: [
-            goToMulti(State.FullColumnSeparator, (token) => isColReference(token.value)),
-            goToMulti(State.FullRowSeparator, (token) => isRowReference(token.value)),
-        ],
-    },
-    [State.FullColumnSeparator]: {
-        SPACE: goTo(State.FullColumnSeparator),
-        OPERATOR: goTo(State.RightColumnRef, (token) => token.value === ":"),
-    },
-    [State.FullRowSeparator]: {
-        SPACE: goTo(State.FullRowSeparator),
-        OPERATOR: goTo(State.RightRowRef, (token) => token.value === ":"),
-    },
-    [State.Separator]: {
-        SPACE: goTo(State.Separator),
-        OPERATOR: goTo(State.RightRef, (token) => token.value === ":"),
-    },
-    [State.RightRef]: {
-        SPACE: goTo(State.RightRef),
-        NUMBER: goTo(State.Found),
-        REFERENCE: goTo(State.Found, (token) => isSingleCellReference(token.value)),
-        SYMBOL: goTo(State.Found, (token) => isColHeader(token.value) || isRowHeader(token.value)),
-    },
-    [State.RightColumnRef]: {
-        SPACE: goTo(State.RightColumnRef),
-        SYMBOL: goTo(State.Found, (token) => isColHeader(token.value)),
-        REFERENCE: goTo(State.Found, (token) => isSingleCellReference(token.value)),
-    },
-    [State.RightRowRef]: {
-        SPACE: goTo(State.RightRowRef),
-        NUMBER: goTo(State.Found),
-        REFERENCE: goTo(State.Found, (token) => isSingleCellReference(token.value)),
-        SYMBOL: goTo(State.Found, (token) => isRowHeader(token.value)),
-    },
-    [State.Found]: {},
-};
-/**
- * Check if the list of tokens starts with a sequence of tokens representing
- * a range.
- * If a range is found, the sequence is removed from the list and is returned
- * as a single token.
- */
-function matchReference(tokens) {
-    let head = 0;
-    let transitions = machine[State.LeftRef];
-    let matchedTokens = "";
-    while (transitions !== undefined) {
-        const token = tokens[head++];
-        if (!token) {
-            return null;
-        }
-        const transition = transitions[token.type]?.find((transition) => transition.guard(token));
-        const nextState = transition ? transition.goTo : undefined;
-        switch (nextState) {
-            case undefined:
-                return null;
-            case State.Found:
-                matchedTokens += token.value;
-                tokens.splice(0, head);
-                return {
-                    type: "REFERENCE",
-                    value: matchedTokens,
-                };
-            default:
-                transitions = machine[nextState];
-                matchedTokens += token.value;
-                break;
-        }
-    }
-    return null;
-}
-/**
- * Take the result of the tokenizer and transform it to be usable in the
- * manipulations of range
- *
- * @param formula
- */
-function rangeTokenize(formula, locale = DEFAULT_LOCALE) {
-    const tokens = tokenize(formula, locale);
-    const result = [];
-    while (tokens.length) {
-        result.push(matchReference(tokens) || tokens.shift());
-    }
-    return result;
-}
-
 /**
  * Add the following information on tokens:
  * - length
@@ -24027,10 +24033,6 @@ function createLineOrScatterChartRuntime(chart, getters) {
     const colors = new ColorGenerator();
     const definition = chart.getDefinition();
     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 (areaChart) {
@@ -24046,6 +24048,10 @@ function createLineOrScatterChartRuntime(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 backgroundColor = rgbaToHex(backgroundRGBA);
         const dataset = {
             label,
@@ -34638,6 +34644,8 @@ class FindAndReplaceStore extends SpreadsheetStore {
     isSearchDirty = false;
     initialShowFormulaState;
     preserveSelectedMatchIndex = false;
+    irreplaceableMatchCount = 0;
+    notificationStore = this.get(NotificationStore);
     // fixme: why do we make selectedMatchIndex on top of a selected
     // property in the matches?
     selectedMatchIndex = null;
@@ -34714,6 +34722,11 @@ class FindAndReplaceStore extends SpreadsheetStore {
                 for (const match of cmd.matches) {
                     this.replaceMatch(match, cmd.searchString, cmd.replaceWith, cmd.searchOptions);
                 }
+                if (this.irreplaceableMatchCount > 0) {
+                    this.showReplaceWarningMessage(cmd.matches.length, this.irreplaceableMatchCount);
+                }
+                this.irreplaceableMatchCount = 0;
+                break;
         }
     }
     finalize() {
@@ -34895,12 +34908,36 @@ class FindAndReplaceStore extends SpreadsheetStore {
             searchOptions: this.searchOptions,
         });
     }
+    /**
+     * Show a warning message based on the number of matches replaced and irreplaceable.
+     */
+    showReplaceWarningMessage(totalMatches, irreplaceableMatches) {
+        const replaceableMatches = totalMatches - irreplaceableMatches;
+        if (replaceableMatches === 0) {
+            this.notificationStore.notifyUser({
+                type: "warning",
+                sticky: false,
+                text: _t("Match(es) cannot be replaced as they are part of a formula."),
+            });
+        }
+        else {
+            this.notificationStore.notifyUser({
+                type: "warning",
+                sticky: false,
+                text: _t("%(replaceable_count)s match(es) replaced. %(irreplaceable_count)s match(es) cannot be replaced as they are part of a formula.", {
+                    replaceable_count: replaceableMatches,
+                    irreplaceable_count: irreplaceableMatches,
+                }),
+            });
+        }
+    }
     replaceMatch(selectedMatch, searchString, replaceWith, searchOptions) {
         const cell = this.getters.getCell(selectedMatch);
         if (!cell?.content) {
             return;
         }
         if (cell?.isFormula && !searchOptions.searchFormulas) {
+            this.irreplaceableMatchCount++;
             return;
         }
         const searchRegex = getSearchRegex(searchString, searchOptions);
@@ -36966,7 +37003,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() {
@@ -38025,6 +38068,9 @@ class TopBarComponentRegistry extends Registry {
         const component = { ...value, id: this.uuidGenerator.uuidv4() };
         return super.add(name, component);
     }
+    getAllOrdered() {
+        return this.getAll().sort((a, b) => a.sequence - b.sequence);
+    }
 }
 const topbarComponentRegistry = new TopBarComponentRegistry();
 
@@ -42135,6 +42181,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();
@@ -46798,6 +46845,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);
+        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
      */
@@ -46847,7 +46909,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) => {
@@ -63140,7 +63202,7 @@ class TopBar extends owl.Component {
     }
     get topbarComponents() {
         return topbarComponentRegistry
-            .getAll()
+            .getAllOrdered()
             .filter((item) => !item.isVisible || item.isVisible(this.env));
     }
     onExternalClick(ev) {
@@ -67771,6 +67833,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.4.0-alpha.11";
-__info__.date = "2024-07-02T10:38:50.116Z";
-__info__.hash = "9fe9477";
+__info__.version = "17.4.0-alpha.12";
+__info__.date = "2024-07-08T05:43:07.933Z";
+__info__.hash = "7cfe14a";

package/dist/o-spreadsheet.d.ts

@@ -1855,7 +1855,7 @@ type LocaleCode = string & Alias;
 interface Locale {
     name: string;
     code: LocaleCode;
-    thousandsSeparator: string;
+    thousandsSeparator?: string;
     decimalSeparator: string;
     dateFormat: string;
     timeFormat: string;
@@ -2606,6 +2606,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
      */
@@ -6255,6 +6259,7 @@ interface TopbarComponent {
     id: UID;
     component: any;
     isVisible?: (env: SpreadsheetChildEnv) => boolean;
+    sequence: number;
 }
 
 /**
@@ -9055,6 +9060,8 @@ declare class FindAndReplaceStore extends SpreadsheetStore implements HighlightP
     private isSearchDirty;
     private initialShowFormulaState;
     private preserveSelectedMatchIndex;
+    private irreplaceableMatchCount;
+    private notificationStore;
     selectedMatchIndex: number | null;
     toSearch: string;
     toReplace: string;
@@ -9105,6 +9112,10 @@ declare class FindAndReplaceStore extends SpreadsheetStore implements HighlightP
      * Apply the replace function to all the matches one time.
      */
     replaceAll(): void;
+    /**
+     * Show a warning message based on the number of matches replaced and irreplaceable.
+     */
+    private showReplaceWarningMessage;
     private replaceMatch;
     private getSearchableString;
     get highlights(): Highlight$1[];
@@ -10477,6 +10488,7 @@ declare const registries: {
         };
         uuidGenerator: UuidGenerator;
         add(name: string, value: Omit<TopbarComponent, "id">): Registry<TopbarComponent>;
+        getAllOrdered(): TopbarComponent[];
         content: {
             [key: string]: TopbarComponent;
         };