@odoo/o-spreadsheet 16.4.8 → 16.4.9

package/dist/o-spreadsheet.cjs.js

@@ -1197,7 +1197,17 @@ const timeRegexp = /((\d+(:\d+)?(:\d+)?\s*(AM|PM))|(\d+:\d+(:\d+)?))$/;
 function isDateTime(str, locale) {
     return parseDateTime(str, locale) !== null;
 }
+const CACHE = new Map();
 function parseDateTime(str, locale) {
+    if (!CACHE.has(locale)) {
+        CACHE.set(locale, new Map());
+    }
+    if (!CACHE.get(locale).has(str)) {
+        CACHE.get(locale).set(str, _parseDateTime(str, locale));
+    }
+    return CACHE.get(locale).get(str);
+}
+function _parseDateTime(str, locale) {
     str = str.trim();
     let time = null;
     const timeMatch = str.match(timeRegexp);
@@ -3016,8 +3026,9 @@ class RangeImpl {
     }
     get zone() {
         const { left, top, bottom, right } = this._zone;
-        if (right !== undefined && bottom !== undefined)
-            return { left, top, right, bottom };
+        if (right !== undefined && bottom !== undefined) {
+            return this._zone;
+        }
         else if (bottom === undefined && right !== undefined) {
             return { right, top, left, bottom: this.getSheetSize(this.sheetId).numberOfRows - 1 };
         }
@@ -4287,7 +4298,7 @@ var LAYERS;
 const SORT_TYPES_ORDER = ["number", "string", "boolean", "undefined"];
 function assert(condition, message) {
     if (!condition()) {
-        throw new Error(message);
+        throw new EvaluationError(CellErrorType.GenericError, message);
     }
 }
 // -----------------------------------------------------------------------------
@@ -4932,7 +4943,7 @@ function _createEvaluatedCell(value, localeFormat) {
         return textCell((value || "").toString(), localeFormat);
     }
     catch (error) {
-        return errorCell((value || "").toString(), new EvaluationError(CellErrorType.GenericError, error.message || DEFAULT_ERROR_MESSAGE));
+        return errorCell(new EvaluationError(CellErrorType.GenericError, error.message || DEFAULT_ERROR_MESSAGE));
     }
 }
 function textCell(value, localeFormat) {
@@ -4999,7 +5010,7 @@ function booleanCell(value, localeFormat) {
         formattedValue,
     };
 }
-function errorCell(content, error) {
+function errorCell(error) {
     return {
         type: CellValueType.error,
         value: error.errorType,
@@ -31821,10 +31832,11 @@ class CellPlugin extends CorePlugin {
      * Reconstructs the original formula string based on a normalized form and its dependencies
      */
     buildFormulaContent(sheetId, cell, dependencies) {
-        const ranges = dependencies || [...cell.dependencies];
+        const ranges = dependencies || cell.dependencies;
+        let rangeIndex = 0;
         return concat(cell.compiledFormula.tokens.map((token) => {
             if (token.type === "REFERENCE") {
-                const range = ranges.shift();
+                const range = ranges[rangeIndex++];
                 return this.getters.getRangeString(range, sheetId);
             }
             return token.value;
@@ -35432,7 +35444,7 @@ class CompilationParametersBuilder {
         const evaluatedCell = this.getEvaluatedCell(position);
         if (evaluatedCell.type === CellValueType.empty) {
             const cell = this.getters.getCell(position);
-            if (!cell || cell.content === "") {
+            if (!cell || (!cell.isFormula && cell.content === "")) {
                 return undefined;
             }
         }
@@ -35652,7 +35664,7 @@ class Evaluator {
     constructor(context, getters) {
         this.context = context;
         this.getters = getters;
-        this.compilationParams = buildCompilationParameters(context, getters, (position) => this.computeCell(this.encodePosition(position)));
+        this.compilationParams = buildCompilationParameters(this.context, this.getters, this.computeAndSave.bind(this));
     }
     getEvaluatedCell(position) {
         return (this.evaluatedCells.get(this.encodePosition(position)) ||
@@ -35680,7 +35692,7 @@ class Evaluator {
         this.formulaDependencies().addDependencies(positionId, dependencies);
     }
     updateCompilationParameters() {
-        this.compilationParams = buildCompilationParameters(this.context, this.getters, (position) => this.computeCell(this.encodePosition(position)));
+        this.compilationParams = buildCompilationParameters(this.context, this.getters, this.computeAndSave.bind(this));
     }
     evaluateCells(positions) {
         const cells = positions.map(this.encodePosition.bind(this));
@@ -35796,15 +35808,21 @@ class Evaluator {
             this.cellsBeingComputed.delete(cellId);
         }
     }
+    computeAndSave(position) {
+        const positionId = this.encodePosition(position);
+        const evaluatedCell = this.computeCell(positionId);
+        if (!this.evaluatedCells.has(positionId)) {
+            this.setEvaluatedCell(positionId, evaluatedCell);
+        }
+        return evaluatedCell;
+    }
     handleError(e, cell) {
-        if (!(e instanceof Error)) {
-            e = new Error(e);
+        if (!(e instanceof EvaluationError)) {
+            e = new EvaluationError(CellErrorType.GenericError, e.message);
         }
-        const msg = e?.errorType || CellErrorType.GenericError;
-        // apply function name
         const __lastFnCalled = this.compilationParams[2].__lastFnCalled || "";
-        const error = new EvaluationError(msg, e.message.replace("[[FUNCTION_NAME]]", __lastFnCalled), e.logLevel !== undefined ? e.logLevel : CellErrorLevel.error);
-        return errorCell(cell.content, error);
+        e.message = e.message.replace("[[FUNCTION_NAME]]", __lastFnCalled);
+        return errorCell(e);
     }
     computeFormulaCell(cellData) {
         const cellId = cellData.id;
@@ -50693,6 +50711,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.4.8';
-__info__.date = '2023-10-03T12:45:33.807Z';
-__info__.hash = 'c614d64';
+__info__.version = '16.4.9';
+__info__.date = '2023-10-10T07:28:12.772Z';
+__info__.hash = '998c612';

package/dist/o-spreadsheet.d.ts

@@ -962,7 +962,7 @@ declare class RangeImpl implements Range {
     constructor(args: ConstructorArgs, getSheetSize: (sheetId: UID) => ZoneDimension);
     static fromRange(range: Range, getters: CoreGetters): RangeImpl;
     get unboundedZone(): UnboundedZone;
-    get zone(): Zone;
+    get zone(): Readonly<Zone>;
     static getRangeParts(xc: string, zone: UnboundedZone): RangePart[];
     get isFullCol(): boolean;
     get isFullRow(): boolean;

package/dist/o-spreadsheet.esm.js

@@ -1193,7 +1193,17 @@ const timeRegexp = /((\d+(:\d+)?(:\d+)?\s*(AM|PM))|(\d+:\d+(:\d+)?))$/;
 function isDateTime(str, locale) {
     return parseDateTime(str, locale) !== null;
 }
+const CACHE = new Map();
 function parseDateTime(str, locale) {
+    if (!CACHE.has(locale)) {
+        CACHE.set(locale, new Map());
+    }
+    if (!CACHE.get(locale).has(str)) {
+        CACHE.get(locale).set(str, _parseDateTime(str, locale));
+    }
+    return CACHE.get(locale).get(str);
+}
+function _parseDateTime(str, locale) {
     str = str.trim();
     let time = null;
     const timeMatch = str.match(timeRegexp);
@@ -3012,8 +3022,9 @@ class RangeImpl {
     }
     get zone() {
         const { left, top, bottom, right } = this._zone;
-        if (right !== undefined && bottom !== undefined)
-            return { left, top, right, bottom };
+        if (right !== undefined && bottom !== undefined) {
+            return this._zone;
+        }
         else if (bottom === undefined && right !== undefined) {
             return { right, top, left, bottom: this.getSheetSize(this.sheetId).numberOfRows - 1 };
         }
@@ -4283,7 +4294,7 @@ var LAYERS;
 const SORT_TYPES_ORDER = ["number", "string", "boolean", "undefined"];
 function assert(condition, message) {
     if (!condition()) {
-        throw new Error(message);
+        throw new EvaluationError(CellErrorType.GenericError, message);
     }
 }
 // -----------------------------------------------------------------------------
@@ -4928,7 +4939,7 @@ function _createEvaluatedCell(value, localeFormat) {
         return textCell((value || "").toString(), localeFormat);
     }
     catch (error) {
-        return errorCell((value || "").toString(), new EvaluationError(CellErrorType.GenericError, error.message || DEFAULT_ERROR_MESSAGE));
+        return errorCell(new EvaluationError(CellErrorType.GenericError, error.message || DEFAULT_ERROR_MESSAGE));
     }
 }
 function textCell(value, localeFormat) {
@@ -4995,7 +5006,7 @@ function booleanCell(value, localeFormat) {
         formattedValue,
     };
 }
-function errorCell(content, error) {
+function errorCell(error) {
     return {
         type: CellValueType.error,
         value: error.errorType,
@@ -31817,10 +31828,11 @@ class CellPlugin extends CorePlugin {
      * Reconstructs the original formula string based on a normalized form and its dependencies
      */
     buildFormulaContent(sheetId, cell, dependencies) {
-        const ranges = dependencies || [...cell.dependencies];
+        const ranges = dependencies || cell.dependencies;
+        let rangeIndex = 0;
         return concat(cell.compiledFormula.tokens.map((token) => {
             if (token.type === "REFERENCE") {
-                const range = ranges.shift();
+                const range = ranges[rangeIndex++];
                 return this.getters.getRangeString(range, sheetId);
             }
             return token.value;
@@ -35428,7 +35440,7 @@ class CompilationParametersBuilder {
         const evaluatedCell = this.getEvaluatedCell(position);
         if (evaluatedCell.type === CellValueType.empty) {
             const cell = this.getters.getCell(position);
-            if (!cell || cell.content === "") {
+            if (!cell || (!cell.isFormula && cell.content === "")) {
                 return undefined;
             }
         }
@@ -35648,7 +35660,7 @@ class Evaluator {
     constructor(context, getters) {
         this.context = context;
         this.getters = getters;
-        this.compilationParams = buildCompilationParameters(context, getters, (position) => this.computeCell(this.encodePosition(position)));
+        this.compilationParams = buildCompilationParameters(this.context, this.getters, this.computeAndSave.bind(this));
     }
     getEvaluatedCell(position) {
         return (this.evaluatedCells.get(this.encodePosition(position)) ||
@@ -35676,7 +35688,7 @@ class Evaluator {
         this.formulaDependencies().addDependencies(positionId, dependencies);
     }
     updateCompilationParameters() {
-        this.compilationParams = buildCompilationParameters(this.context, this.getters, (position) => this.computeCell(this.encodePosition(position)));
+        this.compilationParams = buildCompilationParameters(this.context, this.getters, this.computeAndSave.bind(this));
     }
     evaluateCells(positions) {
         const cells = positions.map(this.encodePosition.bind(this));
@@ -35792,15 +35804,21 @@ class Evaluator {
             this.cellsBeingComputed.delete(cellId);
         }
     }
+    computeAndSave(position) {
+        const positionId = this.encodePosition(position);
+        const evaluatedCell = this.computeCell(positionId);
+        if (!this.evaluatedCells.has(positionId)) {
+            this.setEvaluatedCell(positionId, evaluatedCell);
+        }
+        return evaluatedCell;
+    }
     handleError(e, cell) {
-        if (!(e instanceof Error)) {
-            e = new Error(e);
+        if (!(e instanceof EvaluationError)) {
+            e = new EvaluationError(CellErrorType.GenericError, e.message);
         }
-        const msg = e?.errorType || CellErrorType.GenericError;
-        // apply function name
         const __lastFnCalled = this.compilationParams[2].__lastFnCalled || "";
-        const error = new EvaluationError(msg, e.message.replace("[[FUNCTION_NAME]]", __lastFnCalled), e.logLevel !== undefined ? e.logLevel : CellErrorLevel.error);
-        return errorCell(cell.content, error);
+        e.message = e.message.replace("[[FUNCTION_NAME]]", __lastFnCalled);
+        return errorCell(e);
     }
     computeFormulaCell(cellData) {
         const cellId = cellData.id;
@@ -50657,6 +50675,6 @@ const constants = {
 export { AbstractChart, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.4.8';
-__info__.date = '2023-10-03T12:45:33.807Z';
-__info__.hash = 'c614d64';
+__info__.version = '16.4.9';
+__info__.date = '2023-10-10T07:28:12.772Z';
+__info__.hash = '998c612';

package/dist/o-spreadsheet.iife.js

@@ -1194,7 +1194,17 @@
   function isDateTime(str, locale) {
       return parseDateTime(str, locale) !== null;
   }
+  const CACHE = new Map();
   function parseDateTime(str, locale) {
+      if (!CACHE.has(locale)) {
+          CACHE.set(locale, new Map());
+      }
+      if (!CACHE.get(locale).has(str)) {
+          CACHE.get(locale).set(str, _parseDateTime(str, locale));
+      }
+      return CACHE.get(locale).get(str);
+  }
+  function _parseDateTime(str, locale) {
       str = str.trim();
       let time = null;
       const timeMatch = str.match(timeRegexp);
@@ -3013,8 +3023,9 @@
       }
       get zone() {
           const { left, top, bottom, right } = this._zone;
-          if (right !== undefined && bottom !== undefined)
-              return { left, top, right, bottom };
+          if (right !== undefined && bottom !== undefined) {
+              return this._zone;
+          }
           else if (bottom === undefined && right !== undefined) {
               return { right, top, left, bottom: this.getSheetSize(this.sheetId).numberOfRows - 1 };
           }
@@ -4284,7 +4295,7 @@
   const SORT_TYPES_ORDER = ["number", "string", "boolean", "undefined"];
   function assert(condition, message) {
       if (!condition()) {
-          throw new Error(message);
+          throw new EvaluationError(CellErrorType.GenericError, message);
       }
   }
   // -----------------------------------------------------------------------------
@@ -4929,7 +4940,7 @@
           return textCell((value || "").toString(), localeFormat);
       }
       catch (error) {
-          return errorCell((value || "").toString(), new EvaluationError(CellErrorType.GenericError, error.message || DEFAULT_ERROR_MESSAGE));
+          return errorCell(new EvaluationError(CellErrorType.GenericError, error.message || DEFAULT_ERROR_MESSAGE));
       }
   }
   function textCell(value, localeFormat) {
@@ -4996,7 +5007,7 @@
           formattedValue,
       };
   }
-  function errorCell(content, error) {
+  function errorCell(error) {
       return {
           type: CellValueType.error,
           value: error.errorType,
@@ -31818,10 +31829,11 @@
        * Reconstructs the original formula string based on a normalized form and its dependencies
        */
       buildFormulaContent(sheetId, cell, dependencies) {
-          const ranges = dependencies || [...cell.dependencies];
+          const ranges = dependencies || cell.dependencies;
+          let rangeIndex = 0;
           return concat(cell.compiledFormula.tokens.map((token) => {
               if (token.type === "REFERENCE") {
-                  const range = ranges.shift();
+                  const range = ranges[rangeIndex++];
                   return this.getters.getRangeString(range, sheetId);
               }
               return token.value;
@@ -35429,7 +35441,7 @@
           const evaluatedCell = this.getEvaluatedCell(position);
           if (evaluatedCell.type === CellValueType.empty) {
               const cell = this.getters.getCell(position);
-              if (!cell || cell.content === "") {
+              if (!cell || (!cell.isFormula && cell.content === "")) {
                   return undefined;
               }
           }
@@ -35649,7 +35661,7 @@
       constructor(context, getters) {
           this.context = context;
           this.getters = getters;
-          this.compilationParams = buildCompilationParameters(context, getters, (position) => this.computeCell(this.encodePosition(position)));
+          this.compilationParams = buildCompilationParameters(this.context, this.getters, this.computeAndSave.bind(this));
       }
       getEvaluatedCell(position) {
           return (this.evaluatedCells.get(this.encodePosition(position)) ||
@@ -35677,7 +35689,7 @@
           this.formulaDependencies().addDependencies(positionId, dependencies);
       }
       updateCompilationParameters() {
-          this.compilationParams = buildCompilationParameters(this.context, this.getters, (position) => this.computeCell(this.encodePosition(position)));
+          this.compilationParams = buildCompilationParameters(this.context, this.getters, this.computeAndSave.bind(this));
       }
       evaluateCells(positions) {
           const cells = positions.map(this.encodePosition.bind(this));
@@ -35793,15 +35805,21 @@
               this.cellsBeingComputed.delete(cellId);
           }
       }
+      computeAndSave(position) {
+          const positionId = this.encodePosition(position);
+          const evaluatedCell = this.computeCell(positionId);
+          if (!this.evaluatedCells.has(positionId)) {
+              this.setEvaluatedCell(positionId, evaluatedCell);
+          }
+          return evaluatedCell;
+      }
       handleError(e, cell) {
-          if (!(e instanceof Error)) {
-              e = new Error(e);
+          if (!(e instanceof EvaluationError)) {
+              e = new EvaluationError(CellErrorType.GenericError, e.message);
           }
-          const msg = e?.errorType || CellErrorType.GenericError;
-          // apply function name
           const __lastFnCalled = this.compilationParams[2].__lastFnCalled || "";
-          const error = new EvaluationError(msg, e.message.replace("[[FUNCTION_NAME]]", __lastFnCalled), e.logLevel !== undefined ? e.logLevel : CellErrorLevel.error);
-          return errorCell(cell.content, error);
+          e.message = e.message.replace("[[FUNCTION_NAME]]", __lastFnCalled);
+          return errorCell(e);
       }
       computeFormulaCell(cellData) {
           const cellId = cellData.id;
@@ -50692,9 +50710,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.4.8';
-  __info__.date = '2023-10-03T12:45:33.807Z';
-  __info__.hash = 'c614d64';
+  __info__.version = '16.4.9';
+  __info__.date = '2023-10-10T07:28:12.772Z';
+  __info__.hash = '998c612';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);