@odoo/o-spreadsheet 15.0.16 → 15.0.18

package/dist/o-spreadsheet.cjs.js

@@ -8113,6 +8113,9 @@ const cellRegistry = new Registry();
 function formatValue(value, format) {
     switch (typeof value) {
         case "string":
+            if (value.includes('\\"')) {
+                return value.replace(/\\"/g, '"');
+            }
             return value;
         case "boolean":
             return value ? "TRUE" : "FALSE";
@@ -18824,17 +18827,10 @@ class EvaluationPlugin extends UIPlugin {
         const evalContext = Object.assign(Object.create(functionMap), this.evalContext, {
             getters: this.getters,
         });
-        const sheets = this.getters.getEvaluationSheets();
         function readCell(range) {
             var _a;
-            let cell;
-            const s = sheets[range.sheetId];
-            if (s) {
-                cell = (_a = s.rows[range.zone.top]) === null || _a === void 0 ? void 0 : _a.cells[range.zone.left];
-            }
-            else {
-                throw new Error(_lt("Invalid sheet name"));
-            }
+            const sheet = evalContext.getters.getSheet(range.sheetId);
+            const cell = (_a = sheet.rows[range.zone.top]) === null || _a === void 0 ? void 0 : _a.cells[range.zone.left];
             if (!cell || cell.isEmpty()) {
                 // magic "empty" value
                 // Returning null instead of undefined will ensure that we don't
@@ -18857,10 +18853,8 @@ class EvaluationPlugin extends UIPlugin {
          * that are actually present in the grid.
          */
         function _range(range) {
-            const sheet = sheets[range.sheetId];
-            if (!isZoneValid(range.zone)) {
-                throw new Error(_lt("Invalid reference"));
-            }
+            assertRangeValid(range);
+            const sheet = evalContext.getters.getSheet(range.sheetId);
             // 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 = {
@@ -18899,21 +18893,16 @@ class EvaluationPlugin extends UIPlugin {
          */
         function refFn(position, references, sheetId, isMeta, functionName, paramNumber) {
             const range = references[position];
+            assertRangeValid(range);
             if (isMeta) {
                 return evalContext.getters.getRangeString(range, sheetId);
             }
-            if (!isZoneValid(range.zone)) {
-                throw new Error(_lt("Invalid reference"));
-            }
             // 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
                     ? _lt("Function %s expects the parameter %s to be a single value or a single cell reference, not a range.", functionName.toString(), paramNumber.toString())
                     : _lt("Function %s expects its parameters to be single values or single cell references, not ranges.", functionName.toString()));
             }
-            if (range.invalidSheetName) {
-                throw new Error(_lt("Invalid sheet name: %s", range.invalidSheetName));
-            }
             return readCell(range);
         }
         /**
@@ -18926,6 +18915,14 @@ class EvaluationPlugin extends UIPlugin {
         function range(position, references, sheetId) {
             return _range(references[position]);
         }
+        function assertRangeValid(range) {
+            if (!isZoneValid(range.zone)) {
+                throw new Error(_lt("Invalid reference"));
+            }
+            if (range.invalidSheetName) {
+                throw new Error(_lt("Invalid sheet name: %s", range.invalidSheetName));
+            }
+        }
         return [refFn, range, evalContext];
     }
     /**
@@ -31508,6 +31505,6 @@ exports.registries = registries;
 exports.setTranslationMethod = setTranslationMethod;
 
 
-__info__.version = '15.0.16';
-__info__.date = '2024-01-17T10:23:17.942Z';
-__info__.hash = '3a9ce19';
+__info__.version = '15.0.18';
+__info__.date = '2024-02-02T13:41:26.005Z';
+__info__.hash = 'd1605d8';

package/dist/o-spreadsheet.esm.js

@@ -8090,6 +8090,9 @@ const cellRegistry = new Registry();
 function formatValue(value, format) {
     switch (typeof value) {
         case "string":
+            if (value.includes('\\"')) {
+                return value.replace(/\\"/g, '"');
+            }
             return value;
         case "boolean":
             return value ? "TRUE" : "FALSE";
@@ -18801,17 +18804,10 @@ class EvaluationPlugin extends UIPlugin {
         const evalContext = Object.assign(Object.create(functionMap), this.evalContext, {
             getters: this.getters,
         });
-        const sheets = this.getters.getEvaluationSheets();
         function readCell(range) {
             var _a;
-            let cell;
-            const s = sheets[range.sheetId];
-            if (s) {
-                cell = (_a = s.rows[range.zone.top]) === null || _a === void 0 ? void 0 : _a.cells[range.zone.left];
-            }
-            else {
-                throw new Error(_lt("Invalid sheet name"));
-            }
+            const sheet = evalContext.getters.getSheet(range.sheetId);
+            const cell = (_a = sheet.rows[range.zone.top]) === null || _a === void 0 ? void 0 : _a.cells[range.zone.left];
             if (!cell || cell.isEmpty()) {
                 // magic "empty" value
                 // Returning null instead of undefined will ensure that we don't
@@ -18834,10 +18830,8 @@ class EvaluationPlugin extends UIPlugin {
          * that are actually present in the grid.
          */
         function _range(range) {
-            const sheet = sheets[range.sheetId];
-            if (!isZoneValid(range.zone)) {
-                throw new Error(_lt("Invalid reference"));
-            }
+            assertRangeValid(range);
+            const sheet = evalContext.getters.getSheet(range.sheetId);
             // 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 = {
@@ -18876,21 +18870,16 @@ class EvaluationPlugin extends UIPlugin {
          */
         function refFn(position, references, sheetId, isMeta, functionName, paramNumber) {
             const range = references[position];
+            assertRangeValid(range);
             if (isMeta) {
                 return evalContext.getters.getRangeString(range, sheetId);
             }
-            if (!isZoneValid(range.zone)) {
-                throw new Error(_lt("Invalid reference"));
-            }
             // 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
                     ? _lt("Function %s expects the parameter %s to be a single value or a single cell reference, not a range.", functionName.toString(), paramNumber.toString())
                     : _lt("Function %s expects its parameters to be single values or single cell references, not ranges.", functionName.toString()));
             }
-            if (range.invalidSheetName) {
-                throw new Error(_lt("Invalid sheet name: %s", range.invalidSheetName));
-            }
             return readCell(range);
         }
         /**
@@ -18903,6 +18892,14 @@ class EvaluationPlugin extends UIPlugin {
         function range(position, references, sheetId) {
             return _range(references[position]);
         }
+        function assertRangeValid(range) {
+            if (!isZoneValid(range.zone)) {
+                throw new Error(_lt("Invalid reference"));
+            }
+            if (range.invalidSheetName) {
+                throw new Error(_lt("Invalid sheet name: %s", range.invalidSheetName));
+            }
+        }
         return [refFn, range, evalContext];
     }
     /**
@@ -31463,6 +31460,6 @@ const helpers = {
 export { CommandResult, CorePlugin, DATETIME_FORMAT, DataSource, DispatchResult, Model, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, DEBUG as __DEBUG__, __info__, astToFormula, cellTypes, convertAstNodes, coreTypes, functionCache, helpers, invalidateEvaluationCommands, normalize, parse, readonlyAllowedCommands, registries, setTranslationMethod };
 
 
-__info__.version = '15.0.16';
-__info__.date = '2024-01-17T10:23:17.942Z';
-__info__.hash = '3a9ce19';
+__info__.version = '15.0.18';
+__info__.date = '2024-02-02T13:41:26.005Z';
+__info__.hash = 'd1605d8';

package/dist/o-spreadsheet.iife.js

@@ -8110,6 +8110,9 @@
   function formatValue(value, format) {
       switch (typeof value) {
           case "string":
+              if (value.includes('\\"')) {
+                  return value.replace(/\\"/g, '"');
+              }
               return value;
           case "boolean":
               return value ? "TRUE" : "FALSE";
@@ -18821,17 +18824,10 @@
           const evalContext = Object.assign(Object.create(functionMap), this.evalContext, {
               getters: this.getters,
           });
-          const sheets = this.getters.getEvaluationSheets();
           function readCell(range) {
               var _a;
-              let cell;
-              const s = sheets[range.sheetId];
-              if (s) {
-                  cell = (_a = s.rows[range.zone.top]) === null || _a === void 0 ? void 0 : _a.cells[range.zone.left];
-              }
-              else {
-                  throw new Error(_lt("Invalid sheet name"));
-              }
+              const sheet = evalContext.getters.getSheet(range.sheetId);
+              const cell = (_a = sheet.rows[range.zone.top]) === null || _a === void 0 ? void 0 : _a.cells[range.zone.left];
               if (!cell || cell.isEmpty()) {
                   // magic "empty" value
                   // Returning null instead of undefined will ensure that we don't
@@ -18854,10 +18850,8 @@
            * that are actually present in the grid.
            */
           function _range(range) {
-              const sheet = sheets[range.sheetId];
-              if (!isZoneValid(range.zone)) {
-                  throw new Error(_lt("Invalid reference"));
-              }
+              assertRangeValid(range);
+              const sheet = evalContext.getters.getSheet(range.sheetId);
               // 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 = {
@@ -18896,21 +18890,16 @@
            */
           function refFn(position, references, sheetId, isMeta, functionName, paramNumber) {
               const range = references[position];
+              assertRangeValid(range);
               if (isMeta) {
                   return evalContext.getters.getRangeString(range, sheetId);
               }
-              if (!isZoneValid(range.zone)) {
-                  throw new Error(_lt("Invalid reference"));
-              }
               // 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
                       ? _lt("Function %s expects the parameter %s to be a single value or a single cell reference, not a range.", functionName.toString(), paramNumber.toString())
                       : _lt("Function %s expects its parameters to be single values or single cell references, not ranges.", functionName.toString()));
               }
-              if (range.invalidSheetName) {
-                  throw new Error(_lt("Invalid sheet name: %s", range.invalidSheetName));
-              }
               return readCell(range);
           }
           /**
@@ -18923,6 +18912,14 @@
           function range(position, references, sheetId) {
               return _range(references[position]);
           }
+          function assertRangeValid(range) {
+              if (!isZoneValid(range.zone)) {
+                  throw new Error(_lt("Invalid reference"));
+              }
+              if (range.invalidSheetName) {
+                  throw new Error(_lt("Invalid sheet name: %s", range.invalidSheetName));
+              }
+          }
           return [refFn, range, evalContext];
       }
       /**
@@ -31507,9 +31504,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '15.0.16';
-  __info__.date = '2024-01-17T10:23:17.942Z';
-  __info__.hash = '3a9ce19';
+  __info__.version = '15.0.18';
+  __info__.date = '2024-02-02T13:41:26.005Z';
+  __info__.hash = 'd1605d8';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);