@odoo/o-spreadsheet 16.2.18 → 16.2.20

package/dist/o-spreadsheet.cjs.js

@@ -4307,6 +4307,9 @@ exports.CommandResult = void 0;
     CommandResult[CommandResult["InvalidQuantity"] = 87] = "InvalidQuantity";
 })(exports.CommandResult || (exports.CommandResult = {}));
 
+function isMatrix(x) {
+    return Array.isArray(x) && Array.isArray(x[0]);
+}
 var DIRECTION;
 (function (DIRECTION) {
     DIRECTION["UP"] = "up";
@@ -15173,6 +15176,36 @@ const HLOOKUP = {
     isExported: true,
 };
 // -----------------------------------------------------------------------------
+// INDEX
+// -----------------------------------------------------------------------------
+const INDEX = {
+    description: _lt(`Returns the content of a cell, specified by row and column offset.`),
+    args: [
+        arg("reference (any, range)", _lt("The range of cells from which the values are returned.")),
+        arg("row (number)", _lt("The index of the row to be returned from within the reference range of cells.")),
+        arg("column (number)", _lt("The index of the column to be returned from within the reference range of cells.")),
+    ],
+    returns: ["ANY"],
+    computeFormat: (reference, row, column) => {
+        var _a;
+        const _row = toNumber(row.value);
+        const _column = toNumber(column.value);
+        return (_a = reference[_column - 1][_row - 1]) === null || _a === void 0 ? void 0 : _a.format;
+    },
+    compute: function (reference, row, column) {
+        const _reference = isMatrix(reference) ? reference : [[reference]];
+        const _row = toNumber(row);
+        const _column = toNumber(column);
+        assert(() => _column >= 0 &&
+            _column - 1 < _reference.length &&
+            _row >= 0 &&
+            _row - 1 < _reference[0].length, _lt("Index out of range."));
+        assert(() => row !== 0 && column !== 0, _lt("This function can only return a single cell value, not an array. Provide valid row and column indices."));
+        return _reference[_column - 1][_row - 1];
+    },
+    isExported: true,
+};
+// -----------------------------------------------------------------------------
 // LOOKUP
 // -----------------------------------------------------------------------------
 const LOOKUP = {
@@ -15367,6 +15400,7 @@ var lookup = /*#__PURE__*/Object.freeze({
   COLUMN: COLUMN,
   COLUMNS: COLUMNS,
   HLOOKUP: HLOOKUP,
+  INDEX: INDEX,
   LOOKUP: LOOKUP,
   MATCH: MATCH,
   ROW: ROW,
@@ -19364,7 +19398,7 @@ class ClientTag extends owl.Component {
             left: `${x - 1}px`,
             border: `1px solid ${color}`,
             "background-color": color,
-            opacity: this.props.active ? "opacity:1 !important" : undefined,
+            opacity: this.props.active ? "1 !important" : undefined,
         });
     }
 }
@@ -25526,12 +25560,15 @@ function createXMLFile(doc, path, contentType) {
     };
 }
 function xmlEscape(str) {
-    return String(str)
+    return (String(str)
         .replace(/\&/g, "&amp;")
         .replace(/\</g, "&lt;")
         .replace(/\>/g, "&gt;")
         .replace(/\"/g, "&quot;")
-        .replace(/\'/g, "&apos;");
+        .replace(/\'/g, "&apos;")
+        // Delete all ASCII control characters except for TAB (\x09), LF (\x0A) and CR (\x0D)
+        // They are not valid at all in XML 1.0 (even escaped)
+        .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F]/g, ""));
 }
 function formatAttributes(attrs) {
     return new XMLString(attrs.map(([key, val]) => `${key}="${xmlEscape(val)}"`).join(" "));
@@ -32594,6 +32631,10 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
         }
         currentRanges = currentRanges.concat(toAdd);
         const newRangesXC = recomputeZones(currentRanges, toRemove);
+        if (newRangesXC.length === 0) {
+            this.dispatch("REMOVE_CONDITIONAL_FORMAT", { id: cf.id, sheetId });
+            return;
+        }
         this.dispatch("ADD_CONDITIONAL_FORMAT", {
             cf: {
                 id: cf.id,
@@ -39339,11 +39380,19 @@ class GridSelectionPlugin extends UIPlugin {
         }
     }
     getStatisticFnResults() {
-        // get deduplicated cells in zones
-        const cells = new Set(this.gridSelection.zones
-            .map((zone) => this.getters.getEvaluatedCellsInZone(this.getters.getActiveSheetId(), zone))
-            .flat()
-            .filter((cell) => cell.type !== CellValueType.empty));
+        const sheetId = this.getters.getActiveSheetId();
+        const cells = new Set();
+        for (const zone of this.gridSelection.zones) {
+            for (const { col, row } of positions(zone)) {
+                if (this.getters.isRowHidden(sheetId, row) || this.getters.isColHidden(sheetId, col)) {
+                    continue; // Skip hidden cells
+                }
+                const evaluatedCell = this.getters.getEvaluatedCell({ sheetId, col, row });
+                if (evaluatedCell.type !== CellValueType.empty) {
+                    cells.add(evaluatedCell);
+                }
+            }
+        }
         let cellsTypes = new Set();
         let cellsValues = [];
         for (let cell of cells) {
@@ -45485,6 +45534,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.2.18';
-__info__.date = '2023-10-10T07:29:40.321Z';
-__info__.hash = '451fa09';
+__info__.version = '16.2.20';
+__info__.date = '2023-10-25T10:00:14.966Z';
+__info__.hash = '25a402d';

package/dist/o-spreadsheet.esm.js

@@ -4303,6 +4303,9 @@ var CommandResult;
     CommandResult[CommandResult["InvalidQuantity"] = 87] = "InvalidQuantity";
 })(CommandResult || (CommandResult = {}));
 
+function isMatrix(x) {
+    return Array.isArray(x) && Array.isArray(x[0]);
+}
 var DIRECTION;
 (function (DIRECTION) {
     DIRECTION["UP"] = "up";
@@ -15169,6 +15172,36 @@ const HLOOKUP = {
     isExported: true,
 };
 // -----------------------------------------------------------------------------
+// INDEX
+// -----------------------------------------------------------------------------
+const INDEX = {
+    description: _lt(`Returns the content of a cell, specified by row and column offset.`),
+    args: [
+        arg("reference (any, range)", _lt("The range of cells from which the values are returned.")),
+        arg("row (number)", _lt("The index of the row to be returned from within the reference range of cells.")),
+        arg("column (number)", _lt("The index of the column to be returned from within the reference range of cells.")),
+    ],
+    returns: ["ANY"],
+    computeFormat: (reference, row, column) => {
+        var _a;
+        const _row = toNumber(row.value);
+        const _column = toNumber(column.value);
+        return (_a = reference[_column - 1][_row - 1]) === null || _a === void 0 ? void 0 : _a.format;
+    },
+    compute: function (reference, row, column) {
+        const _reference = isMatrix(reference) ? reference : [[reference]];
+        const _row = toNumber(row);
+        const _column = toNumber(column);
+        assert(() => _column >= 0 &&
+            _column - 1 < _reference.length &&
+            _row >= 0 &&
+            _row - 1 < _reference[0].length, _lt("Index out of range."));
+        assert(() => row !== 0 && column !== 0, _lt("This function can only return a single cell value, not an array. Provide valid row and column indices."));
+        return _reference[_column - 1][_row - 1];
+    },
+    isExported: true,
+};
+// -----------------------------------------------------------------------------
 // LOOKUP
 // -----------------------------------------------------------------------------
 const LOOKUP = {
@@ -15363,6 +15396,7 @@ var lookup = /*#__PURE__*/Object.freeze({
   COLUMN: COLUMN,
   COLUMNS: COLUMNS,
   HLOOKUP: HLOOKUP,
+  INDEX: INDEX,
   LOOKUP: LOOKUP,
   MATCH: MATCH,
   ROW: ROW,
@@ -19360,7 +19394,7 @@ class ClientTag extends Component {
             left: `${x - 1}px`,
             border: `1px solid ${color}`,
             "background-color": color,
-            opacity: this.props.active ? "opacity:1 !important" : undefined,
+            opacity: this.props.active ? "1 !important" : undefined,
         });
     }
 }
@@ -25522,12 +25556,15 @@ function createXMLFile(doc, path, contentType) {
     };
 }
 function xmlEscape(str) {
-    return String(str)
+    return (String(str)
         .replace(/\&/g, "&amp;")
         .replace(/\</g, "&lt;")
         .replace(/\>/g, "&gt;")
         .replace(/\"/g, "&quot;")
-        .replace(/\'/g, "&apos;");
+        .replace(/\'/g, "&apos;")
+        // Delete all ASCII control characters except for TAB (\x09), LF (\x0A) and CR (\x0D)
+        // They are not valid at all in XML 1.0 (even escaped)
+        .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F]/g, ""));
 }
 function formatAttributes(attrs) {
     return new XMLString(attrs.map(([key, val]) => `${key}="${xmlEscape(val)}"`).join(" "));
@@ -32590,6 +32627,10 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
         }
         currentRanges = currentRanges.concat(toAdd);
         const newRangesXC = recomputeZones(currentRanges, toRemove);
+        if (newRangesXC.length === 0) {
+            this.dispatch("REMOVE_CONDITIONAL_FORMAT", { id: cf.id, sheetId });
+            return;
+        }
         this.dispatch("ADD_CONDITIONAL_FORMAT", {
             cf: {
                 id: cf.id,
@@ -39335,11 +39376,19 @@ class GridSelectionPlugin extends UIPlugin {
         }
     }
     getStatisticFnResults() {
-        // get deduplicated cells in zones
-        const cells = new Set(this.gridSelection.zones
-            .map((zone) => this.getters.getEvaluatedCellsInZone(this.getters.getActiveSheetId(), zone))
-            .flat()
-            .filter((cell) => cell.type !== CellValueType.empty));
+        const sheetId = this.getters.getActiveSheetId();
+        const cells = new Set();
+        for (const zone of this.gridSelection.zones) {
+            for (const { col, row } of positions(zone)) {
+                if (this.getters.isRowHidden(sheetId, row) || this.getters.isColHidden(sheetId, col)) {
+                    continue; // Skip hidden cells
+                }
+                const evaluatedCell = this.getters.getEvaluatedCell({ sheetId, col, row });
+                if (evaluatedCell.type !== CellValueType.empty) {
+                    cells.add(evaluatedCell);
+                }
+            }
+        }
         let cellsTypes = new Set();
         let cellsValues = [];
         for (let cell of cells) {
@@ -45453,6 +45502,6 @@ function addFunction(functionName, functionDescription) {
 export { AbstractChart, CommandResult, CorePlugin, DATETIME_FORMAT, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, components, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateEvaluationCommands, links, load, parse, readonlyAllowedCommands, registries, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.2.18';
-__info__.date = '2023-10-10T07:29:40.321Z';
-__info__.hash = '451fa09';
+__info__.version = '16.2.20';
+__info__.date = '2023-10-25T10:00:14.966Z';
+__info__.hash = '25a402d';

package/dist/o-spreadsheet.iife.js

@@ -4304,6 +4304,9 @@
       CommandResult[CommandResult["InvalidQuantity"] = 87] = "InvalidQuantity";
   })(exports.CommandResult || (exports.CommandResult = {}));
 
+  function isMatrix(x) {
+      return Array.isArray(x) && Array.isArray(x[0]);
+  }
   var DIRECTION;
   (function (DIRECTION) {
       DIRECTION["UP"] = "up";
@@ -15170,6 +15173,36 @@
       isExported: true,
   };
   // -----------------------------------------------------------------------------
+  // INDEX
+  // -----------------------------------------------------------------------------
+  const INDEX = {
+      description: _lt(`Returns the content of a cell, specified by row and column offset.`),
+      args: [
+          arg("reference (any, range)", _lt("The range of cells from which the values are returned.")),
+          arg("row (number)", _lt("The index of the row to be returned from within the reference range of cells.")),
+          arg("column (number)", _lt("The index of the column to be returned from within the reference range of cells.")),
+      ],
+      returns: ["ANY"],
+      computeFormat: (reference, row, column) => {
+          var _a;
+          const _row = toNumber(row.value);
+          const _column = toNumber(column.value);
+          return (_a = reference[_column - 1][_row - 1]) === null || _a === void 0 ? void 0 : _a.format;
+      },
+      compute: function (reference, row, column) {
+          const _reference = isMatrix(reference) ? reference : [[reference]];
+          const _row = toNumber(row);
+          const _column = toNumber(column);
+          assert(() => _column >= 0 &&
+              _column - 1 < _reference.length &&
+              _row >= 0 &&
+              _row - 1 < _reference[0].length, _lt("Index out of range."));
+          assert(() => row !== 0 && column !== 0, _lt("This function can only return a single cell value, not an array. Provide valid row and column indices."));
+          return _reference[_column - 1][_row - 1];
+      },
+      isExported: true,
+  };
+  // -----------------------------------------------------------------------------
   // LOOKUP
   // -----------------------------------------------------------------------------
   const LOOKUP = {
@@ -15364,6 +15397,7 @@
     COLUMN: COLUMN,
     COLUMNS: COLUMNS,
     HLOOKUP: HLOOKUP,
+    INDEX: INDEX,
     LOOKUP: LOOKUP,
     MATCH: MATCH,
     ROW: ROW,
@@ -19361,7 +19395,7 @@
               left: `${x - 1}px`,
               border: `1px solid ${color}`,
               "background-color": color,
-              opacity: this.props.active ? "opacity:1 !important" : undefined,
+              opacity: this.props.active ? "1 !important" : undefined,
           });
       }
   }
@@ -25523,12 +25557,15 @@
       };
   }
   function xmlEscape(str) {
-      return String(str)
+      return (String(str)
           .replace(/\&/g, "&amp;")
           .replace(/\</g, "&lt;")
           .replace(/\>/g, "&gt;")
           .replace(/\"/g, "&quot;")
-          .replace(/\'/g, "&apos;");
+          .replace(/\'/g, "&apos;")
+          // Delete all ASCII control characters except for TAB (\x09), LF (\x0A) and CR (\x0D)
+          // They are not valid at all in XML 1.0 (even escaped)
+          .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F]/g, ""));
   }
   function formatAttributes(attrs) {
       return new XMLString(attrs.map(([key, val]) => `${key}="${xmlEscape(val)}"`).join(" "));
@@ -32591,6 +32628,10 @@
           }
           currentRanges = currentRanges.concat(toAdd);
           const newRangesXC = recomputeZones(currentRanges, toRemove);
+          if (newRangesXC.length === 0) {
+              this.dispatch("REMOVE_CONDITIONAL_FORMAT", { id: cf.id, sheetId });
+              return;
+          }
           this.dispatch("ADD_CONDITIONAL_FORMAT", {
               cf: {
                   id: cf.id,
@@ -39336,11 +39377,19 @@
           }
       }
       getStatisticFnResults() {
-          // get deduplicated cells in zones
-          const cells = new Set(this.gridSelection.zones
-              .map((zone) => this.getters.getEvaluatedCellsInZone(this.getters.getActiveSheetId(), zone))
-              .flat()
-              .filter((cell) => cell.type !== CellValueType.empty));
+          const sheetId = this.getters.getActiveSheetId();
+          const cells = new Set();
+          for (const zone of this.gridSelection.zones) {
+              for (const { col, row } of positions(zone)) {
+                  if (this.getters.isRowHidden(sheetId, row) || this.getters.isColHidden(sheetId, col)) {
+                      continue; // Skip hidden cells
+                  }
+                  const evaluatedCell = this.getters.getEvaluatedCell({ sheetId, col, row });
+                  if (evaluatedCell.type !== CellValueType.empty) {
+                      cells.add(evaluatedCell);
+                  }
+              }
+          }
           let cellsTypes = new Set();
           let cellsValues = [];
           for (let cell of cells) {
@@ -45484,9 +45533,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.2.18';
-  __info__.date = '2023-10-10T07:29:40.321Z';
-  __info__.hash = '451fa09';
+  __info__.version = '16.2.20';
+  __info__.date = '2023-10-25T10:00:14.966Z';
+  __info__.hash = '25a402d';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);