@odoo/o-spreadsheet 18.0.50 → 18.0.54

package/dist/o-spreadsheet.iife.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 18.0.50
- * @date 2025-12-02T05:32:00.480Z
- * @hash 7ed20c4
+ * @version 18.0.54
+ * @date 2026-01-14T10:00:02.287Z
+ * @hash c0048a0
  */
 
 (function (exports, owl) {
@@ -5839,17 +5839,41 @@
       const today = DateTime.now();
       switch (dateValue) {
           case "today":
-              return jsDateToNumber(today);
-          case "yesterday":
-              return jsDateToNumber(DateTime.fromTimestamp(today.setDate(today.getDate() - 1)));
-          case "tomorrow":
-              return jsDateToNumber(DateTime.fromTimestamp(today.setDate(today.getDate() + 1)));
+              return Math.floor(jsDateToNumber(today));
+          case "yesterday": {
+              today.setDate(today.getDate() - 1);
+              return Math.floor(jsDateToNumber(today));
+          }
+          case "tomorrow": {
+              today.setDate(today.getDate() + 1);
+              return Math.floor(jsDateToNumber(today));
+          }
           case "lastWeek":
-              return jsDateToNumber(DateTime.fromTimestamp(today.setDate(today.getDate() - 7)));
-          case "lastMonth":
-              return jsDateToNumber(DateTime.fromTimestamp(today.setMonth(today.getMonth() - 1)));
+              today.setDate(today.getDate() - 6);
+              return Math.floor(jsDateToNumber(today));
+          case "lastMonth": {
+              const lastMonth = today.getMonth() === 0 ? 11 : today.getMonth() - 1;
+              const dateInLastMonth = new DateTime(today.getFullYear(), lastMonth, 1);
+              if (today.getDate() > getDaysInMonth(dateInLastMonth)) {
+                  today.setDate(1);
+              }
+              else {
+                  today.setDate(today.getDate() + 1);
+                  today.setMonth(today.getMonth() - 1);
+              }
+              return Math.floor(jsDateToNumber(today));
+          }
           case "lastYear":
-              return jsDateToNumber(DateTime.fromTimestamp(today.setFullYear(today.getFullYear() - 1)));
+              // Handle leap year case
+              if (today.getMonth() === 1 && today.getDate() === 29) {
+                  today.setDate(28);
+                  today.setFullYear(today.getFullYear() - 1);
+              }
+              else {
+                  today.setDate(today.getDate() + 1);
+                  today.setFullYear(today.getFullYear() - 1);
+              }
+              return Math.floor(jsDateToNumber(today));
       }
   }
   /** Get all the dates values of a criterion converted to numbers, converting date values such as "today" to actual dates  */
@@ -18540,9 +18564,10 @@ stores.inject(MyMetaStore, storeInstance);
           throw new EvaluationError(_t("Function PIVOT takes an even number of arguments."));
       }
   }
-  function addPivotDependencies(evalContext, coreDefinition, forMeasures) {
+  function addPivotDependencies(evalContext, pivotId, forMeasures) {
       //TODO This function can be very costly when used with PIVOT.VALUE and PIVOT.HEADER
       const dependencies = [];
+      const coreDefinition = evalContext.getters.getPivotCoreDefinition(pivotId);
       if (coreDefinition.type === "SPREADSHEET" && coreDefinition.dataSet) {
           const { sheetId, zone } = coreDefinition.dataSet;
           const xc = zoneToXc(zone);
@@ -18559,8 +18584,7 @@ stores.inject(MyMetaStore, storeInstance);
       }
       for (const measure of forMeasures) {
           if (measure.computedBy) {
-              const formula = evalContext.getters.getMeasureCompiledFormula(measure);
-              dependencies.push(...formula.dependencies.filter((range) => !range.invalidXc));
+              dependencies.push(...evalContext.getters.getMeasureFullDependencies(pivotId, measure));
           }
       }
       const originPosition = evalContext.__originCellPosition;
@@ -19001,7 +19025,7 @@ stores.inject(MyMetaStore, storeInstance);
           assertDomainLength(domainArgs);
           const pivot = this.getters.getPivot(pivotId);
           const coreDefinition = this.getters.getPivotCoreDefinition(pivotId);
-          addPivotDependencies(this, coreDefinition, coreDefinition.measures.filter((m) => m.id === _measure));
+          addPivotDependencies(this, pivotId, coreDefinition.measures.filter((m) => m.id === _measure));
           pivot.init({ reload: pivot.needsReevaluation });
           const error = pivot.assertIsValid({ throwOnError: false });
           if (error) {
@@ -19034,8 +19058,7 @@ stores.inject(MyMetaStore, storeInstance);
           const _pivotId = getPivotId(_pivotFormulaId, this.getters);
           assertDomainLength(domainArgs);
           const pivot = this.getters.getPivot(_pivotId);
-          const coreDefinition = this.getters.getPivotCoreDefinition(_pivotId);
-          addPivotDependencies(this, coreDefinition, []);
+          addPivotDependencies(this, _pivotId, []);
           pivot.init({ reload: pivot.needsReevaluation });
           const error = pivot.assertIsValid({ throwOnError: false });
           if (error) {
@@ -19089,7 +19112,7 @@ stores.inject(MyMetaStore, storeInstance);
           const pivotId = getPivotId(_pivotFormulaId, this.getters);
           const pivot = this.getters.getPivot(pivotId);
           const coreDefinition = this.getters.getPivotCoreDefinition(pivotId);
-          addPivotDependencies(this, coreDefinition, coreDefinition.measures);
+          addPivotDependencies(this, pivotId, coreDefinition.measures);
           pivot.init({ reload: pivot.needsReevaluation });
           const error = pivot.assertIsValid({ throwOnError: false });
           if (error) {
@@ -40346,14 +40369,15 @@ stores.inject(MyMetaStore, storeInstance);
   }
 
   css /* scss */ `
-  .o-cf-preview {
+  .o-spreadsheet .o-cf-preview {
     &.o-cf-cursor-ptr {
       cursor: pointer;
     }
 
     border-bottom: 1px solid ${GRAY_300};
-    height: 60px;
+    height: 80px;
     padding: 10px;
+    box-sizing: border-box;
     position: relative;
     cursor: pointer;
     &:hover,
@@ -40367,7 +40391,6 @@ stores.inject(MyMetaStore, storeInstance);
     .o-cf-preview-icon {
       border: 1px solid ${GRAY_300};
       background-color: #fff;
-      position: absolute;
       height: 50px;
       width: 50px;
       .o-icon {
@@ -40376,12 +40399,6 @@ stores.inject(MyMetaStore, storeInstance);
       }
     }
     .o-cf-preview-description {
-      left: 65px;
-      margin-bottom: auto;
-      margin-right: 8px;
-      margin-top: auto;
-      position: relative;
-      width: 142px;
       .o-cf-preview-description-rule {
         margin-bottom: 4px;
         max-height: 2.8em;
@@ -40391,16 +40408,11 @@ stores.inject(MyMetaStore, storeInstance);
         font-size: 12px;
       }
     }
-    .o-cf-delete {
-      left: 90%;
-      top: 39%;
-      position: absolute;
-    }
     &:not(:hover):not(.o-cf-dragging) .o-cf-drag-handle {
       display: none !important;
     }
     .o-cf-drag-handle {
-      left: -8px;
+      left: 2px;
       cursor: move;
       .o-icon {
         width: 6px;
@@ -41285,7 +41297,7 @@ stores.inject(MyMetaStore, storeInstance);
               return false;
           }
           if (["lastWeek", "lastMonth", "lastYear"].includes(criterion.dateValue)) {
-              const today = jsDateToRoundNumber(DateTime.now());
+              const today = Math.floor(jsDateToNumber(DateTime.now()));
               return isDateBetween(dateValue, today, criterionValue);
           }
           return areDatesSameDay(dateValue, criterionValue);
@@ -42447,6 +42459,11 @@ stores.inject(MyMetaStore, storeInstance);
               case "UPDATE_CELL":
               case "ACTIVATE_SHEET":
                   this.isSearchDirty = true;
+                  if (this.searchOptions.specificRange) {
+                      this.searchOptions.specificRange = this.searchOptions.specificRange.clone({
+                          sheetId: this.getters.getActiveSheetId(),
+                      });
+                  }
                   break;
               case "REPLACE_SEARCH":
                   for (const match of cmd.matches) {
@@ -42852,9 +42869,20 @@ stores.inject(MyMetaStore, storeInstance);
           const specificRange = this.env.model.getters.getRangeFromSheetXC(this.env.model.getters.getActiveSheetId(), this.state.dataRange);
           this.store.updateSearchOptions({ specificRange });
       }
+      get specificRange() {
+          const range = this.store.searchOptions.specificRange;
+          return range ? this.env.model.getters.getRangeString(range, "forceSheetReference") : "";
+      }
       get pendingSearch() {
           return this.updateSearchContent.isDebouncePending();
       }
+      get selectionInputKey() {
+          // Selections input are made to work with objects linked to a sheet id. They store the active sheet id at their creation,
+          // and have specific behaviour linked to it (eg. go back to the initial sheet after confirmation).
+          // We don't want all those behaviors here, so we force the recreation of the component when the active sheet changes.
+          // The only drawback is that the input loses focus when changing sheet.
+          return this.env.model.getters.getActiveSheetId();
+      }
   }
 
   css /* scss */ `
@@ -44989,7 +45017,37 @@ stores.inject(MyMetaStore, storeInstance);
       datetimeGranularities: [...dateGranularities, "hour_number", "minute_number", "second_number"],
       isMeasureCandidate: (field) => !["datetime", "boolean"].includes(field.type),
       isGroupable: () => true,
+      adaptRanges: (getters, definition, applyChange) => {
+          if (definition.type !== "SPREADSHEET" || !definition.dataSet) {
+              return definition;
+          }
+          const { sheetId, zone } = definition.dataSet;
+          const range = getters.getRangeFromZone(sheetId, zone);
+          const adaptedRange = adaptPivotRange(range, applyChange);
+          if (adaptedRange === range) {
+              return definition;
+          }
+          const dataSet = adaptedRange && {
+              sheetId: adaptedRange.sheetId,
+              zone: adaptedRange.zone,
+          };
+          return { ...definition, dataSet };
+      },
   });
+  function adaptPivotRange(range, applyChange) {
+      if (!range) {
+          return undefined;
+      }
+      const change = applyChange(range);
+      switch (change.changeType) {
+          case "NONE":
+              return range;
+          case "REMOVE":
+              return undefined;
+          default:
+              return change.range;
+      }
+  }
 
   class PivotSidePanelStore extends SpreadsheetStore {
       pivotId;
@@ -46876,21 +46934,20 @@ stores.inject(MyMetaStore, storeInstance);
           this.highlightStore.register(this);
       }
       get highlights() {
-          let zone;
           const position = this.model.getters.getActivePosition();
-          const cell = this.getters.getEvaluatedCell(position);
           const spreader = this.model.getters.getArrayFormulaSpreadingOn(position);
-          zone = spreader
+          const zone = spreader
               ? this.model.getters.getSpreadZone(spreader, { ignoreSpillError: true })
               : this.model.getters.getSpreadZone(position, { ignoreSpillError: true });
           if (!zone) {
               return [];
           }
+          const isArrayFormulaBlocked = this.model.getters.isArrayFormulaSpillBlocked(spreader ?? position);
           return [
               {
                   sheetId: position.sheetId,
                   zone,
-                  dashed: cell.value === CellErrorType.SpilledBlocked,
+                  dashed: isArrayFormulaBlocked,
                   color: "#17A2B8",
                   noFill: true,
                   thinLine: true,
@@ -54951,6 +55008,7 @@ stores.inject(MyMetaStore, storeInstance);
   class RangeAdapter {
       getters;
       providers = [];
+      isAdaptingRanges = false;
       constructor(getters) {
           this.getters = getters;
       }
@@ -54979,6 +55037,9 @@ stores.inject(MyMetaStore, storeInstance);
       }
       beforeHandle(command) { }
       handle(cmd) {
+          if (this.isAdaptingRanges) {
+              throw new Error("Plugins cannot dispatch commands during adaptRanges phase");
+          }
           switch (cmd.type) {
               case "REMOVE_COLUMNS_ROWS": {
                   let start = cmd.dimension === "COL" ? "left" : "top";
@@ -55134,10 +55195,12 @@ stores.inject(MyMetaStore, storeInstance);
           return adaptedRange;
       }
       executeOnAllRanges(adaptRange, sheetId) {
+          this.isAdaptingRanges = true;
           const func = this.verifyRangeRemoved(adaptRange);
           for (const provider of this.providers) {
               provider(func, sheetId);
           }
+          this.isAdaptingRanges = false;
       }
       /**
        * Stores the functions bound to each plugin to be able to iterate over all ranges of the application,
@@ -57156,6 +57219,7 @@ stores.inject(MyMetaStore, storeInstance);
           "getMeasureCompiledFormula",
           "getPivotName",
           "isExistingPivot",
+          "getMeasureFullDependencies",
       ];
       nextFormulaId = 1;
       pivots = {};
@@ -57238,15 +57302,32 @@ stores.inject(MyMetaStore, storeInstance);
               }
               case "UPDATE_PIVOT": {
                   this.history.update("pivots", cmd.pivotId, "definition", deepCopy(cmd.pivot));
-                  this.compileCalculatedMeasures(cmd.pivot.measures);
+                  this.compileCalculatedMeasures(cmd.pivotId, cmd.pivot.measures);
                   break;
               }
           }
       }
       adaptRanges(applyChange) {
-          for (const sheetId in this.compiledMeasureFormulas) {
-              for (const formulaString in this.compiledMeasureFormulas[sheetId]) {
-                  const compiledFormula = this.compiledMeasureFormulas[sheetId][formulaString];
+          for (const pivotId in this.pivots) {
+              const definition = deepCopy(this.pivots[pivotId]?.definition);
+              if (!definition) {
+                  continue;
+              }
+              const newDefinition = pivotRegistry
+                  .get(definition.type)
+                  ?.adaptRanges?.(this.getters, definition, applyChange);
+              if (newDefinition && !deepEquals(definition, newDefinition)) {
+                  this.history.update("pivots", pivotId, "definition", newDefinition);
+              }
+          }
+          for (const pivotId in this.compiledMeasureFormulas) {
+              for (const measureId in this.compiledMeasureFormulas[pivotId]) {
+                  const measure = this.pivots[pivotId]?.definition.measures.find((m) => m.id === measureId);
+                  if (!measure || !measure.computedBy) {
+                      continue;
+                  }
+                  const sheetId = measure.computedBy.sheetId;
+                  const compiledFormula = this.compiledMeasureFormulas[pivotId][measureId].formula;
                   const newDependencies = [];
                   for (const range of compiledFormula.dependencies) {
                       const change = applyChange(range);
@@ -57258,8 +57339,9 @@ stores.inject(MyMetaStore, storeInstance);
                       }
                   }
                   const newFormulaString = this.getters.getFormulaString(sheetId, compiledFormula.tokens, newDependencies);
-                  if (newFormulaString !== formulaString) {
-                      this.replaceMeasureFormula(sheetId, formulaString, newFormulaString);
+                  const oldFormulaString = measure.computedBy.formula;
+                  if (newFormulaString !== oldFormulaString) {
+                      this.replaceMeasureFormula(pivotId, measure, newFormulaString);
                   }
               }
           }
@@ -57297,31 +57379,60 @@ stores.inject(MyMetaStore, storeInstance);
       isExistingPivot(pivotId) {
           return pivotId in this.pivots;
       }
-      getMeasureCompiledFormula(measure) {
+      getMeasureCompiledFormula(pivotId, measure) {
+          if (!measure.computedBy) {
+              throw new Error(`Measure ${measure.fieldName} is not computed by formula`);
+          }
+          return this.compiledMeasureFormulas[pivotId][measure.id].formula;
+      }
+      getMeasureFullDependencies(pivotId, measure) {
           if (!measure.computedBy) {
               throw new Error(`Measure ${measure.fieldName} is not computed by formula`);
           }
-          const sheetId = measure.computedBy.sheetId;
-          return this.compiledMeasureFormulas[sheetId][measure.computedBy.formula];
+          return this.compiledMeasureFormulas[pivotId][measure.id].dependencies;
       }
       // -------------------------------------------------------------------------
       // Private
       // -------------------------------------------------------------------------
       addPivot(pivotId, pivot, formulaId = this.nextFormulaId.toString()) {
           this.history.update("pivots", pivotId, { definition: deepCopy(pivot), formulaId });
-          this.compileCalculatedMeasures(pivot.measures);
+          this.compileCalculatedMeasures(pivotId, pivot.measures);
           this.history.update("formulaIds", formulaId, pivotId);
           this.history.update("nextFormulaId", this.nextFormulaId + 1);
       }
-      compileCalculatedMeasures(measures) {
+      compileCalculatedMeasures(pivotId, measures) {
           for (const measure of measures) {
               if (measure.computedBy) {
-                  const sheetId = measure.computedBy.sheetId;
                   const compiledFormula = this.compileMeasureFormula(measure.computedBy.sheetId, measure.computedBy.formula);
-                  this.history.update("compiledMeasureFormulas", sheetId, measure.computedBy.formula, compiledFormula);
+                  this.history.update("compiledMeasureFormulas", pivotId, measure.id, "formula", compiledFormula);
+              }
+          }
+          for (const measure of measures) {
+              if (measure.computedBy) {
+                  const dependencies = this.computeMeasureFullDependencies(pivotId, measure);
+                  this.history.update("compiledMeasureFormulas", pivotId, measure.id, "dependencies", dependencies);
               }
           }
       }
+      computeMeasureFullDependencies(pivotId, measure, exploredMeasures = new Set()) {
+          const rangeDependencies = [];
+          const definition = this.getPivotCoreDefinition(pivotId);
+          const formula = this.getMeasureCompiledFormula(pivotId, measure);
+          exploredMeasures.add(measure.id);
+          for (const token of formula.tokens) {
+              if (token.type !== "SYMBOL") {
+                  continue;
+              }
+              const otherMeasure = definition.measures.find((measureCandidate) => getCanonicalSymbolName(measureCandidate.id) === token.value &&
+                  measure.id !== measureCandidate.id);
+              if (!otherMeasure || exploredMeasures.has(otherMeasure.id) || !otherMeasure.computedBy) {
+                  continue;
+              }
+              rangeDependencies.push(...this.computeMeasureFullDependencies(pivotId, otherMeasure, exploredMeasures));
+          }
+          rangeDependencies.push(...formula.dependencies.filter((range) => !range.invalidXc));
+          return rangeDependencies;
+      }
       insertPivot(position, formulaId, table) {
           this.resizeSheet(position.sheetId, position, table);
           const pivotCells = table.getPivotCells();
@@ -57378,28 +57489,17 @@ stores.inject(MyMetaStore, storeInstance);
               dependencies: rangeDependencies,
           };
       }
-      replaceMeasureFormula(sheetId, formulaString, newFormulaString) {
-          this.history.update("compiledMeasureFormulas", sheetId, formulaString, undefined);
-          this.history.update("compiledMeasureFormulas", sheetId, newFormulaString, this.compileMeasureFormula(sheetId, newFormulaString));
-          for (const pivotId in this.pivots) {
-              const pivot = this.pivots[pivotId];
-              if (!pivot) {
-                  continue;
-              }
-              const def = deepCopy(pivot.definition);
-              for (const measure of def.measures) {
-                  if (measure.computedBy?.formula === formulaString) {
-                      const measureIndex = def.measures.indexOf(measure);
-                      if (measureIndex !== -1) {
-                          def.measures[measureIndex].computedBy = {
-                              formula: newFormulaString,
-                              sheetId,
-                          };
-                      }
-                      this.dispatch("UPDATE_PIVOT", { pivotId, pivot: def });
-                  }
-              }
+      replaceMeasureFormula(pivotId, measure, newFormulaString) {
+          const pivot = this.pivots[pivotId];
+          if (!pivot) {
+              return;
           }
+          const measureIndex = pivot.definition.measures.indexOf(measure);
+          this.history.update("pivots", pivotId, "definition", "measures", measureIndex, "computedBy", {
+              formula: newFormulaString,
+              sheetId: measure.computedBy.sheetId,
+          });
+          this.compileCalculatedMeasures(pivotId, pivot.definition.measures);
       }
       checkDuplicatedMeasureIds(definition) {
           const uniqueIds = new Set(definition.measures.map((m) => m.id));
@@ -57495,20 +57595,6 @@ stores.inject(MyMetaStore, storeInstance);
       }
   }
 
-  function adaptPivotRange(range, applyChange) {
-      if (!range) {
-          return undefined;
-      }
-      const change = applyChange(range);
-      switch (change.changeType) {
-          case "NONE":
-              return range;
-          case "REMOVE":
-              return undefined;
-          default:
-              return change.range;
-      }
-  }
   class SpreadsheetPivotCorePlugin extends CorePlugin {
       allowDispatch(cmd) {
           switch (cmd.type) {
@@ -57519,27 +57605,6 @@ stores.inject(MyMetaStore, storeInstance);
           }
           return "Success" /* CommandResult.Success */;
       }
-      adaptRanges(applyChange) {
-          for (const pivotId of this.getters.getPivotIds()) {
-              const definition = this.getters.getPivotCoreDefinition(pivotId);
-              if (definition.type !== "SPREADSHEET") {
-                  continue;
-              }
-              if (definition.dataSet) {
-                  const { sheetId, zone } = definition.dataSet;
-                  const range = this.getters.getRangeFromZone(sheetId, zone);
-                  const adaptedRange = adaptPivotRange(range, applyChange);
-                  if (adaptedRange === range) {
-                      return;
-                  }
-                  const dataSet = adaptedRange && {
-                      sheetId: adaptedRange.sheetId,
-                      zone: adaptedRange.zone,
-                  };
-                  this.dispatch("UPDATE_PIVOT", { pivotId, pivot: { ...definition, dataSet } });
-              }
-          }
-      }
       checkDataSetValidity(definition) {
           if (definition.type === "SPREADSHEET" && definition.dataSet) {
               const { zone, sheetId } = definition.dataSet;
@@ -58897,6 +58962,9 @@ stores.inject(MyMetaStore, storeInstance);
           const arrayFormulas = this.spreadingRelations.searchFormulaPositionsSpreadingOn(position.sheetId, positionToZone(position));
           return Array.from(arrayFormulas).find((position) => !this.blockedArrayFormulas.has(position));
       }
+      isArrayFormulaSpillBlocked(position) {
+          return this.blockedArrayFormulas.has(position);
+      }
       updateDependencies(position) {
           // removing dependencies is slow because it requires
           // to traverse the entire r-tree.
@@ -58908,13 +58976,8 @@ stores.inject(MyMetaStore, storeInstance);
       addDependencies(position, dependencies) {
           this.formulaDependencies().addDependencies(position, dependencies);
           for (const range of dependencies) {
-              const sheetId = range.sheetId;
-              const { left, bottom, right, top } = range.zone;
-              for (let col = left; col <= right; col++) {
-                  for (let row = top; row <= bottom; row++) {
-                      this.computeAndSave({ sheetId, col, row });
-                  }
-              }
+              // ensure that all ranges are computed
+              this.compilationParams.ensureRange(range);
           }
       }
       updateCompilationParameters() {
@@ -59113,6 +59176,10 @@ stores.inject(MyMetaStore, storeInstance);
           this.assertSheetHasEnoughSpaceToSpreadFormulaResult(formulaPosition, formulaReturn);
           const nbColumns = formulaReturn.length;
           const nbRows = formulaReturn[0].length;
+          if (nbRows === 0) {
+              // empty matrix
+              return createEvaluatedCell({ value: 0 }, this.getters.getLocale(), cellData);
+          }
           const resultZone = {
               top: formulaPosition.row,
               bottom: formulaPosition.row + nbRows - 1,
@@ -59385,6 +59452,7 @@ stores.inject(MyMetaStore, storeInstance);
           "getEvaluatedCellsPositions",
           "getSpreadZone",
           "getArrayFormulaSpreadingOn",
+          "isArrayFormulaSpillBlocked",
           "isEmpty",
       ];
       shouldRebuildDependenciesGraph = true;
@@ -59497,6 +59565,9 @@ stores.inject(MyMetaStore, storeInstance);
       getArrayFormulaSpreadingOn(position) {
           return this.evaluator.getArrayFormulaSpreadingOn(position);
       }
+      isArrayFormulaSpillBlocked(position) {
+          return this.evaluator.isArrayFormulaSpillBlocked(position);
+      }
       /**
        * Check if a zone only contains empty cells
        */
@@ -60720,14 +60791,16 @@ stores.inject(MyMetaStore, storeInstance);
   function withPivotPresentationLayer (PivotClass) {
       class PivotPresentationLayer extends PivotClass {
           getters;
+          pivotId;
           cache = {};
           rankAsc = {};
           rankDesc = {};
           runningTotal = {};
           runningTotalInPercent = {};
-          constructor(custom, params) {
+          constructor(pivotId, custom, params) {
               super(custom, params);
               this.getters = params.getters;
+              this.pivotId = pivotId;
           }
           markAsDirtyForEvaluation() {
               this.cache = {};
@@ -60777,7 +60850,7 @@ stores.inject(MyMetaStore, storeInstance);
                       return handleError(error, measure.aggregator.toUpperCase());
                   }
               }
-              const formula = this.getters.getMeasureCompiledFormula(measure);
+              const formula = this.getters.getMeasureCompiledFormula(this.pivotId, measure);
               const getSymbolValue = (symbolName) => {
                   const { columns, rows } = this.definition;
                   if (columns.find((col) => col.nameWithGranularity === symbolName)) {
@@ -61495,7 +61568,7 @@ stores.inject(MyMetaStore, storeInstance);
           const definition = deepCopy(this.getters.getPivotCoreDefinition(pivotId));
           if (!(pivotId in this.pivots)) {
               const Pivot = withPivotPresentationLayer(pivotRegistry.get(definition.type).ui);
-              this.pivots[pivotId] = new Pivot(this.custom, { definition, getters: this.getters });
+              this.pivots[pivotId] = new Pivot(pivotId, this.custom, { definition, getters: this.getters });
           }
           else if (recreate) {
               this.pivots[pivotId].onDefinitionChange(definition);
@@ -74769,9 +74842,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.0.50";
-  __info__.date = "2025-12-02T05:32:00.480Z";
-  __info__.hash = "7ed20c4";
+  __info__.version = "18.0.54";
+  __info__.date = "2026-01-14T10:00:02.287Z";
+  __info__.hash = "c0048a0";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);