@odoo/o-spreadsheet 17.0.8 → 17.0.9

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.8
- * @date 2024-01-17T10:27:32.736Z
- * @hash 0f2d46e
+ * @version 17.0.9
+ * @date 2024-01-29T13:53:22.963Z
+ * @hash 3c1209a
  */
 
 'use strict';
@@ -2122,6 +2122,7 @@ exports.CommandResult = void 0;
     CommandResult["BlockingValidationRule"] = "BlockingValidationRule";
     CommandResult["InvalidCopyPasteSelection"] = "InvalidCopyPasteSelection";
     CommandResult["NoChanges"] = "NoChanges";
+    CommandResult["InvalidInputId"] = "InvalidInputId";
 })(exports.CommandResult || (exports.CommandResult = {}));
 
 const DEFAULT_LOCALES = [
@@ -3266,27 +3267,30 @@ function roundFormat(format) {
 }
 function createLargeNumberFormat(format, magnitude, postFix, locale) {
     const internalFormat = parseFormat(format || "#,##0");
-    const largeNumberFormat = internalFormat
-        .map((formatPart) => {
-        if (formatPart.type === "NUMBER") {
-            return [
-                {
-                    ...formatPart,
-                    format: {
-                        ...formatPart.format,
-                        magnitude,
-                        decimalPart: undefined,
-                    },
-                },
-                {
-                    type: "STRING",
-                    format: postFix,
-                },
-            ];
+    const largeNumberFormat = [];
+    for (let i = 0; i < internalFormat.length; i++) {
+        const formatPart = internalFormat[i];
+        if (formatPart.type !== "NUMBER") {
+            largeNumberFormat.push(formatPart);
+            continue;
         }
-        return formatPart;
-    })
-        .flat();
+        largeNumberFormat.push({
+            ...formatPart,
+            format: {
+                ...formatPart.format,
+                magnitude,
+                decimalPart: undefined,
+            },
+        });
+        largeNumberFormat.push({
+            type: "STRING",
+            format: postFix,
+        });
+        const nextFormatPart = internalFormat[i + 1];
+        if (nextFormatPart?.type === "STRING" && ["k", "m", "b"].includes(nextFormatPart.format)) {
+            i++;
+        }
+    }
     return convertInternalFormatToFormat(largeNumberFormat);
 }
 function changeDecimalPlaces(format, step, locale) {
@@ -26808,6 +26812,9 @@ class Composer extends owl.Component {
             const token = tokens.filter((token) => token.value.includes(currentSelectedText) &&
                 token.start <= currentSelection.start &&
                 token.end >= currentSelection.end)[0];
+            if (!token) {
+                return;
+            }
             if (token.type === "REFERENCE") {
                 this.env.model.dispatch("CHANGE_COMPOSER_CURSOR_SELECTION", {
                     start: token.start,
@@ -39838,22 +39845,17 @@ class CompilationParametersBuilder {
      *        The `compute` of the formula's function must process it completely
      */
     refFn(range, isMeta, functionName, paramNumber) {
+        this.assertRangeValid(range);
         if (isMeta) {
             // Use zoneToXc of zone instead of getRangeString to avoid sending unbounded ranges
             return { value: zoneToXc(range.zone) };
         }
-        if (!isZoneValid(range.zone)) {
-            throw new InvalidReferenceError();
-        }
         // if the formula definition could have accepted a range, we would pass through the _range function and not here
         if (range.zone.bottom !== range.zone.top || range.zone.left !== range.zone.right) {
             throw new Error(paramNumber
                 ? _t("Function %s expects the parameter %s to be a single value or a single cell reference, not a range.", functionName.toString(), paramNumber.toString())
                 : _t("Function %s expects its parameters to be single values or single cell references, not ranges.", functionName.toString()));
         }
-        if (range.invalidSheetName) {
-            throw new Error(_t("Invalid sheet name: %s", range.invalidSheetName));
-        }
         const position = { sheetId: range.sheetId, col: range.zone.left, row: range.zone.top };
         return this.readCell(position);
     }
@@ -39888,10 +39890,10 @@ class CompilationParametersBuilder {
      * Note that each col is possibly sparse: it only contain the values of cells
      * that are actually present in the grid.
      */
-    range({ sheetId, zone }) {
-        if (!isZoneValid(zone)) {
-            throw new InvalidReferenceError();
-        }
+    range(range) {
+        this.assertRangeValid(range);
+        const sheetId = range.sheetId;
+        const zone = range.zone;
         // Performance issue: Avoid fetching data on positions that are out of the spreadsheet
         // e.g. A1:ZZZ9999 in a sheet with 10 cols and 10 rows should ignore everything past J10 and return a 10x10 array
         const sheetZone = this.getters.getSheetZone(sheetId);
@@ -39928,6 +39930,14 @@ class CompilationParametersBuilder {
         this.rangeCache[cacheKey] = matrix;
         return matrix;
     }
+    assertRangeValid(range) {
+        if (!isZoneValid(range.zone)) {
+            throw new InvalidReferenceError();
+        }
+        if (range.invalidSheetName) {
+            throw new Error(_t("Invalid sheet name: %s", range.invalidSheetName));
+        }
+    }
 }
 
 function quickselect(arr, k, left, right, compare) {
@@ -46000,27 +46010,6 @@ class SelectionInputPlugin extends UIPlugin {
     // ---------------------------------------------------------------------------
     // Command Handling
     // ---------------------------------------------------------------------------
-    allowDispatch(cmd) {
-        switch (cmd.type) {
-            case "ADD_RANGE":
-            case "ADD_EMPTY_RANGE":
-                if (this.inputHasSingleRange && this.ranges.length === 1) {
-                    return "MaximumRangesReached" /* CommandResult.MaximumRangesReached */;
-                }
-                break;
-            case "REMOVE_RANGE":
-                if (this.ranges.length === 1) {
-                    return "MinimumRangesReached" /* CommandResult.MinimumRangesReached */;
-                }
-                break;
-            case "CHANGE_RANGE":
-                if (this.inputHasSingleRange && cmd.value.split(",").length > 1) {
-                    return "MaximumRangesReached" /* CommandResult.MaximumRangesReached */;
-                }
-                break;
-        }
-        return "Success" /* CommandResult.Success */;
-    }
     handleEvent(event) {
         if (this.focusedRangeIndex === null) {
             return;
@@ -46258,6 +46247,15 @@ class SelectionInputsManagerPlugin extends UIPlugin {
     // Command Handling
     // ---------------------------------------------------------------------------
     allowDispatch(cmd) {
+        switch (cmd.type) {
+            case "FOCUS_RANGE":
+            case "CHANGE_RANGE":
+            case "ADD_EMPTY_RANGE":
+            case "REMOVE_RANGE":
+                if (!this.inputs[cmd.id]) {
+                    return "InvalidInputId" /* CommandResult.InvalidInputId */;
+                }
+        }
         switch (cmd.type) {
             case "FOCUS_RANGE":
                 const index = this.currentInput?.getIndex(cmd.rangeId);
@@ -46265,9 +46263,25 @@ class SelectionInputsManagerPlugin extends UIPlugin {
                     return "InputAlreadyFocused" /* CommandResult.InputAlreadyFocused */;
                 }
                 break;
-        }
-        if (this.currentInput) {
-            return this.currentInput.allowDispatch(cmd);
+            case "ADD_RANGE":
+            case "ADD_EMPTY_RANGE":
+                const input = this.inputs[cmd.id];
+                if (input.inputHasSingleRange && input.ranges.length === 1) {
+                    return "MaximumRangesReached" /* CommandResult.MaximumRangesReached */;
+                }
+                break;
+            case "REMOVE_RANGE":
+                if (this.inputs[cmd.id].ranges.length === 1) {
+                    return "MinimumRangesReached" /* CommandResult.MinimumRangesReached */;
+                }
+                break;
+            case "CHANGE_RANGE": {
+                const input = this.inputs[cmd.id];
+                if (input.inputHasSingleRange && cmd.value.split(",").length > 1) {
+                    return "MaximumRangesReached" /* CommandResult.MaximumRangesReached */;
+                }
+                break;
+            }
         }
         return "Success" /* CommandResult.Success */;
     }
@@ -48576,9 +48590,10 @@ class EditionPlugin extends UIPlugin {
      */
     getReferencedRanges() {
         const editionSheetId = this.getters.getCurrentEditedCell().sheetId;
-        return this.currentTokens
+        const referenceRanges = this.currentTokens
             .filter((token) => token.type === "REFERENCE")
             .map((token) => this.getters.getRangeFromSheetXC(editionSheetId, token.value));
+        return referenceRanges.filter((range) => !range.invalidSheetName && !range.invalidXc);
     }
     getAutoCompleteDataValidationValues() {
         if (this.mode === "inactive") {
@@ -56770,6 +56785,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.0.8";
-__info__.date = "2024-01-17T10:27:32.736Z";
-__info__.hash = "0f2d46e";
+__info__.version = "17.0.9";
+__info__.date = "2024-01-29T13:53:22.963Z";
+__info__.hash = "3c1209a";

package/dist/o-spreadsheet.d.ts

@@ -2531,7 +2531,8 @@ declare const enum CommandResult {
     InvalidNumberOfCriterionValues = "InvalidNumberOfCriterionValues",
     BlockingValidationRule = "BlockingValidationRule",
     InvalidCopyPasteSelection = "InvalidCopyPasteSelection",
-    NoChanges = "NoChanges"
+    NoChanges = "NoChanges",
+    InvalidInputId = "InvalidInputId"
 }
 interface CommandHandler<T> {
     allowDispatch(command: T): CommandResult | CommandResult[];
@@ -4603,14 +4604,13 @@ interface RangeInputValue {
  * This plugin handles this internal state.
  */
 declare class SelectionInputPlugin extends UIPlugin implements StreamCallbacks<SelectionEvent> {
-    private readonly inputHasSingleRange;
+    readonly inputHasSingleRange: boolean;
     static layers: LAYERS[];
     static getters: never[];
     ranges: RangeInputValue[];
     focusedRangeIndex: number | null;
     private inputSheetId;
     constructor(config: UIPluginConfig, initialRanges: string[], inputHasSingleRange: boolean);
-    allowDispatch(cmd: LocalCommand): CommandResult;
     handleEvent(event: SelectionEvent): void;
     handle(cmd: Command): void;
     getSelectionInputValue(): string[];

package/dist/o-spreadsheet.esm.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.0.8
- * @date 2024-01-17T10:27:32.736Z
- * @hash 0f2d46e
+ * @version 17.0.9
+ * @date 2024-01-29T13:53:22.963Z
+ * @hash 3c1209a
  */
 
 import { Component, useRef, onMounted, useEffect, onWillPatch, useState, onWillUpdateProps, onPatched, useComponent, useExternalListener, onWillUnmount, onWillStart, xml, useChildSubEnv, useSubEnv, markRaw } from '@odoo/owl';
@@ -2120,6 +2120,7 @@ var CommandResult;
     CommandResult["BlockingValidationRule"] = "BlockingValidationRule";
     CommandResult["InvalidCopyPasteSelection"] = "InvalidCopyPasteSelection";
     CommandResult["NoChanges"] = "NoChanges";
+    CommandResult["InvalidInputId"] = "InvalidInputId";
 })(CommandResult || (CommandResult = {}));
 
 const DEFAULT_LOCALES = [
@@ -3264,27 +3265,30 @@ function roundFormat(format) {
 }
 function createLargeNumberFormat(format, magnitude, postFix, locale) {
     const internalFormat = parseFormat(format || "#,##0");
-    const largeNumberFormat = internalFormat
-        .map((formatPart) => {
-        if (formatPart.type === "NUMBER") {
-            return [
-                {
-                    ...formatPart,
-                    format: {
-                        ...formatPart.format,
-                        magnitude,
-                        decimalPart: undefined,
-                    },
-                },
-                {
-                    type: "STRING",
-                    format: postFix,
-                },
-            ];
+    const largeNumberFormat = [];
+    for (let i = 0; i < internalFormat.length; i++) {
+        const formatPart = internalFormat[i];
+        if (formatPart.type !== "NUMBER") {
+            largeNumberFormat.push(formatPart);
+            continue;
         }
-        return formatPart;
-    })
-        .flat();
+        largeNumberFormat.push({
+            ...formatPart,
+            format: {
+                ...formatPart.format,
+                magnitude,
+                decimalPart: undefined,
+            },
+        });
+        largeNumberFormat.push({
+            type: "STRING",
+            format: postFix,
+        });
+        const nextFormatPart = internalFormat[i + 1];
+        if (nextFormatPart?.type === "STRING" && ["k", "m", "b"].includes(nextFormatPart.format)) {
+            i++;
+        }
+    }
     return convertInternalFormatToFormat(largeNumberFormat);
 }
 function changeDecimalPlaces(format, step, locale) {
@@ -26806,6 +26810,9 @@ class Composer extends Component {
             const token = tokens.filter((token) => token.value.includes(currentSelectedText) &&
                 token.start <= currentSelection.start &&
                 token.end >= currentSelection.end)[0];
+            if (!token) {
+                return;
+            }
             if (token.type === "REFERENCE") {
                 this.env.model.dispatch("CHANGE_COMPOSER_CURSOR_SELECTION", {
                     start: token.start,
@@ -39836,22 +39843,17 @@ class CompilationParametersBuilder {
      *        The `compute` of the formula's function must process it completely
      */
     refFn(range, isMeta, functionName, paramNumber) {
+        this.assertRangeValid(range);
         if (isMeta) {
             // Use zoneToXc of zone instead of getRangeString to avoid sending unbounded ranges
             return { value: zoneToXc(range.zone) };
         }
-        if (!isZoneValid(range.zone)) {
-            throw new InvalidReferenceError();
-        }
         // if the formula definition could have accepted a range, we would pass through the _range function and not here
         if (range.zone.bottom !== range.zone.top || range.zone.left !== range.zone.right) {
             throw new Error(paramNumber
                 ? _t("Function %s expects the parameter %s to be a single value or a single cell reference, not a range.", functionName.toString(), paramNumber.toString())
                 : _t("Function %s expects its parameters to be single values or single cell references, not ranges.", functionName.toString()));
         }
-        if (range.invalidSheetName) {
-            throw new Error(_t("Invalid sheet name: %s", range.invalidSheetName));
-        }
         const position = { sheetId: range.sheetId, col: range.zone.left, row: range.zone.top };
         return this.readCell(position);
     }
@@ -39886,10 +39888,10 @@ class CompilationParametersBuilder {
      * Note that each col is possibly sparse: it only contain the values of cells
      * that are actually present in the grid.
      */
-    range({ sheetId, zone }) {
-        if (!isZoneValid(zone)) {
-            throw new InvalidReferenceError();
-        }
+    range(range) {
+        this.assertRangeValid(range);
+        const sheetId = range.sheetId;
+        const zone = range.zone;
         // Performance issue: Avoid fetching data on positions that are out of the spreadsheet
         // e.g. A1:ZZZ9999 in a sheet with 10 cols and 10 rows should ignore everything past J10 and return a 10x10 array
         const sheetZone = this.getters.getSheetZone(sheetId);
@@ -39926,6 +39928,14 @@ class CompilationParametersBuilder {
         this.rangeCache[cacheKey] = matrix;
         return matrix;
     }
+    assertRangeValid(range) {
+        if (!isZoneValid(range.zone)) {
+            throw new InvalidReferenceError();
+        }
+        if (range.invalidSheetName) {
+            throw new Error(_t("Invalid sheet name: %s", range.invalidSheetName));
+        }
+    }
 }
 
 function quickselect(arr, k, left, right, compare) {
@@ -45998,27 +46008,6 @@ class SelectionInputPlugin extends UIPlugin {
     // ---------------------------------------------------------------------------
     // Command Handling
     // ---------------------------------------------------------------------------
-    allowDispatch(cmd) {
-        switch (cmd.type) {
-            case "ADD_RANGE":
-            case "ADD_EMPTY_RANGE":
-                if (this.inputHasSingleRange && this.ranges.length === 1) {
-                    return "MaximumRangesReached" /* CommandResult.MaximumRangesReached */;
-                }
-                break;
-            case "REMOVE_RANGE":
-                if (this.ranges.length === 1) {
-                    return "MinimumRangesReached" /* CommandResult.MinimumRangesReached */;
-                }
-                break;
-            case "CHANGE_RANGE":
-                if (this.inputHasSingleRange && cmd.value.split(",").length > 1) {
-                    return "MaximumRangesReached" /* CommandResult.MaximumRangesReached */;
-                }
-                break;
-        }
-        return "Success" /* CommandResult.Success */;
-    }
     handleEvent(event) {
         if (this.focusedRangeIndex === null) {
             return;
@@ -46256,6 +46245,15 @@ class SelectionInputsManagerPlugin extends UIPlugin {
     // Command Handling
     // ---------------------------------------------------------------------------
     allowDispatch(cmd) {
+        switch (cmd.type) {
+            case "FOCUS_RANGE":
+            case "CHANGE_RANGE":
+            case "ADD_EMPTY_RANGE":
+            case "REMOVE_RANGE":
+                if (!this.inputs[cmd.id]) {
+                    return "InvalidInputId" /* CommandResult.InvalidInputId */;
+                }
+        }
         switch (cmd.type) {
             case "FOCUS_RANGE":
                 const index = this.currentInput?.getIndex(cmd.rangeId);
@@ -46263,9 +46261,25 @@ class SelectionInputsManagerPlugin extends UIPlugin {
                     return "InputAlreadyFocused" /* CommandResult.InputAlreadyFocused */;
                 }
                 break;
-        }
-        if (this.currentInput) {
-            return this.currentInput.allowDispatch(cmd);
+            case "ADD_RANGE":
+            case "ADD_EMPTY_RANGE":
+                const input = this.inputs[cmd.id];
+                if (input.inputHasSingleRange && input.ranges.length === 1) {
+                    return "MaximumRangesReached" /* CommandResult.MaximumRangesReached */;
+                }
+                break;
+            case "REMOVE_RANGE":
+                if (this.inputs[cmd.id].ranges.length === 1) {
+                    return "MinimumRangesReached" /* CommandResult.MinimumRangesReached */;
+                }
+                break;
+            case "CHANGE_RANGE": {
+                const input = this.inputs[cmd.id];
+                if (input.inputHasSingleRange && cmd.value.split(",").length > 1) {
+                    return "MaximumRangesReached" /* CommandResult.MaximumRangesReached */;
+                }
+                break;
+            }
         }
         return "Success" /* CommandResult.Success */;
     }
@@ -48574,9 +48588,10 @@ class EditionPlugin extends UIPlugin {
      */
     getReferencedRanges() {
         const editionSheetId = this.getters.getCurrentEditedCell().sheetId;
-        return this.currentTokens
+        const referenceRanges = this.currentTokens
             .filter((token) => token.type === "REFERENCE")
             .map((token) => this.getters.getRangeFromSheetXC(editionSheetId, token.value));
+        return referenceRanges.filter((range) => !range.invalidSheetName && !range.invalidXc);
     }
     getAutoCompleteDataValidationValues() {
         if (this.mode === "inactive") {
@@ -56733,6 +56748,6 @@ const constants = {
 export { AbstractChart, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, tokenize };
 
 
-__info__.version = "17.0.8";
-__info__.date = "2024-01-17T10:27:32.736Z";
-__info__.hash = "0f2d46e";
+__info__.version = "17.0.9";
+__info__.date = "2024-01-29T13:53:22.963Z";
+__info__.hash = "3c1209a";