@univerjs/engine-formula 0.4.0-alpha.1 → 0.4.0-experimental.d7288c0-20241017

package/lib/es/index.js

@@ -263,7 +263,7 @@ function deserializeRangeWithSheet(refString) {
       }
     };
   }
-  const refStartString = refBody.substring(0, colonIndex), refEndString = refBody.substring(colonIndex + 1), startGrid = singleReferenceToGrid(refStartString), endGrid = singleReferenceToGrid(refEndString), startRow = startGrid.row, startColumn = startGrid.column, endRow = endGrid.row, endColumn = endGrid.column;
+  const refStartString = refBody.substring(0, colonIndex), refEndString = refBody.substring(colonIndex + 1), startGrid = singleReferenceToGrid(refStartString), endGrid = singleReferenceToGrid(refEndString), startRow = startGrid.row > endGrid.row ? endGrid.row : startGrid.row, startColumn = startGrid.column > endGrid.column ? endGrid.column : startGrid.column, endRow = startGrid.row > endGrid.row ? startGrid.row : endGrid.row, endColumn = startGrid.column > endGrid.column ? startGrid.column : endGrid.column;
   let rangeType = RANGE_TYPE.NORMAL;
   return Number.isNaN(startRow) && Number.isNaN(endRow) ? rangeType = RANGE_TYPE.COLUMN : Number.isNaN(startColumn) && Number.isNaN(endColumn) && (rangeType = RANGE_TYPE.ROW), {
     unitId,
@@ -4353,16 +4353,21 @@ const NUMBER_CACHE_LRU_COUNT = 2e5, NumberValueObjectCache = new FormulaAstLRU(N
   pow(valueObject) {
     if (valueObject.isArray())
       return valueObject.powInverse(this);
-    const currentValue = this.getValue(), value = valueObject.getValue();
-    if (typeof value == "string")
+    if (this.isError())
+      return this;
+    const currentValue = this.getValue();
+    let _valueObject = valueObject;
+    if (valueObject.isString() && (_valueObject = valueObject.convertToNumberObjectValue()), _valueObject.isError())
+      return _valueObject;
+    const value = +_valueObject.getValue();
+    if (Number.isNaN(value))
       return ErrorValueObject.create(ErrorType$1.VALUE);
-    if (typeof value == "number") {
-      if (!Number.isFinite(currentValue) || !Number.isFinite(value))
-        return ErrorValueObject.create(ErrorType$1.NUM);
-      const result = pow(currentValue, value);
-      return Number.isFinite(result) ? _NumberValueObject.create(result) : ErrorValueObject.create(ErrorType$1.NUM);
-    }
-    return typeof value == "boolean" ? _NumberValueObject.create(pow(currentValue, value ? 1 : 0)) : this;
+    if (!Number.isFinite(currentValue) || !Number.isFinite(value))
+      return ErrorValueObject.create(ErrorType$1.NUM);
+    if (currentValue === 0)
+      return value < 0 ? ErrorValueObject.create(ErrorType$1.DIV_BY_ZERO) : value === 0 ? ErrorValueObject.create(ErrorType$1.NUM) : _NumberValueObject.create(0);
+    const result = pow(currentValue, value);
+    return Number.isFinite(result) ? _NumberValueObject.create(result) : ErrorValueObject.create(ErrorType$1.NUM);
   }
   sqrt() {
     const currentValue = this.getValue();
@@ -5478,6 +5483,8 @@ const _ArrayValueObject = class _ArrayValueObject extends BaseValueObject {
           valueObject.getValue()
         );
         rowPositions != null && rowPositions.forEach((row) => {
+          if (row < startRow || row > startRow + rowCount - 1)
+            return;
           const r = row - startRow;
           result[r] == null && (result[r] = []), result[r][column] = BooleanValueObject.create(!0);
         });
@@ -6079,7 +6086,13 @@ let FormulaRuntimeService = (_a5 = class extends Disposable {
       const objectValueRefOrArray = functionVariant, { startRow, startColumn, endRow, endColumn } = objectValueRefOrArray.getRangePosition();
       if (startRow === endRow && startColumn === endColumn) {
         const firstCell = objectValueRefOrArray.getFirstCell(), valueObject = objectValueToCellValue(firstCell);
-        sheetData.setValue(row, column, valueObject), clearArrayUnitData.setValue(row, column, valueObject);
+        sheetData.setValue(row, column, valueObject), clearArrayUnitData.setValue(row, column, valueObject), CELL_INVERTED_INDEX_CACHE.set(
+          unitId,
+          sheetId,
+          column,
+          firstCell.getValue(),
+          row
+        );
         return;
       }
       const arrayRange = {
@@ -6090,7 +6103,13 @@ let FormulaRuntimeService = (_a5 = class extends Disposable {
       };
       if (arrayData.setValue(row, column, arrayRange), arrayFormulaRange[sheetId] = arrayData.getData(), this._checkIfArrayFormulaRangeHasData(unitId, sheetId, row, column, arrayRange) || this._checkIfArrayFormulaExceeded(rowCount, columnCount, arrayRange)) {
         const errorObject = objectValueToCellValue(ErrorValueObject.create(ErrorType$1.SPILL));
-        sheetData.setValue(row, column, errorObject), clearArrayUnitData.setValue(row, column, errorObject);
+        sheetData.setValue(row, column, errorObject), clearArrayUnitData.setValue(row, column, errorObject), CELL_INVERTED_INDEX_CACHE.set(
+          unitId,
+          sheetId,
+          column,
+          ErrorType$1.SPILL,
+          row
+        );
         const unitData2 = this._currentConfigService.getUnitData();
         objectValueRefOrArray.iterator((_, rowIndex, columnIndex) => {
           var _a27, _b;
@@ -6108,6 +6127,13 @@ let FormulaRuntimeService = (_a5 = class extends Disposable {
       } else {
         const spillError = ErrorValueObject.create(ErrorType$1.SPILL);
         objectValueRefOrArray.iterator((valueObject, rowIndex, columnIndex) => {
+          CELL_INVERTED_INDEX_CACHE.set(
+            unitId,
+            sheetId,
+            column - startColumn + columnIndex,
+            valueObject ? valueObject.getValue() : 0,
+            row - startRow + rowIndex
+          );
           const value = objectValueToCellValue(valueObject);
           if (rowIndex === startRow && columnIndex === startColumn) {
             if (valueObject != null && valueObject.isError() && valueObject.isEqualType(spillError))
@@ -6120,7 +6146,13 @@ let FormulaRuntimeService = (_a5 = class extends Disposable {
       }
     } else {
       const valueObject = objectValueToCellValue(functionVariant);
-      sheetData.setValue(row, column, valueObject), clearArrayUnitData.setValue(row, column, valueObject);
+      sheetData.setValue(row, column, valueObject), CELL_INVERTED_INDEX_CACHE.set(
+        unitId,
+        sheetId,
+        column,
+        functionVariant.getValue(),
+        row
+      ), clearArrayUnitData.setValue(row, column, valueObject);
     }
   }
   getUnitData() {
@@ -11401,23 +11433,30 @@ const _Datedif = class _Datedif extends BaseFunction {
   }
   _getResultByUnit(startDateSerialNumber, endDateSerialNumber, unit) {
     const startDateDate = excelSerialToDate(startDateSerialNumber), startYear = startDateDate.getUTCFullYear(), startMonth = startDateDate.getUTCMonth() + 1, startDay = startDateDate.getUTCDate(), endDateDate = excelSerialToDate(endDateSerialNumber), endYear = endDateDate.getUTCFullYear(), endMonth = endDateDate.getUTCMonth() + 1, endDay = endDateDate.getUTCDate(), unitValue = `${unit.getValue()}`.toLocaleUpperCase();
-    let _endDateSerialNumber;
+    let diff = 0, newDate;
     switch (unitValue) {
       case "Y":
-        return NumberValueObject.create(endYear - startYear);
+        diff = endYear - startYear, (endMonth < startMonth || endMonth === startMonth && endDay < startDay) && (diff -= 1);
+        break;
       case "M":
-        return NumberValueObject.create((endYear - startYear) * 12 + endMonth - startMonth);
+        diff = (endYear - startYear) * 12 + endMonth - startMonth, endDay < startDay && (diff -= 1);
+        break;
       case "D":
-        return NumberValueObject.create(Math.floor(endDateSerialNumber) - Math.floor(startDateSerialNumber));
+        diff = Math.floor(endDateSerialNumber) - Math.floor(startDateSerialNumber);
+        break;
       case "MD":
-        return NumberValueObject.create(endDay - startDay);
+        diff = endDay - startDay, endDay < startDay && (newDate = new Date(Date.UTC(endYear, endMonth - 1, 0)), diff += getDaysInMonth(newDate.getUTCFullYear(), newDate.getUTCMonth()));
+        break;
       case "YM":
-        return NumberValueObject.create(endMonth - startMonth);
+        diff = endMonth - startMonth, (endMonth < startMonth || endMonth === startMonth && endDay < startDay) && (diff += 12), endDay < startDay && (diff -= 1);
+        break;
       case "YD":
-        return _endDateSerialNumber = excelDateSerial(new Date(Date.UTC(startYear, endMonth - 1, endDay))), NumberValueObject.create(Math.floor(_endDateSerialNumber) - Math.floor(startDateSerialNumber));
+        newDate = new Date(Date.UTC(startYear, endMonth - 1, endDay)), (endMonth < startMonth || endMonth === startMonth && endDay < startDay) && (newDate = new Date(Date.UTC(startYear + 1, endMonth - 1, endDay))), diff = Math.floor(excelDateSerial(newDate)) - Math.floor(startDateSerialNumber);
+        break;
       default:
         return ErrorValueObject.create(ErrorType$1.NUM);
     }
+    return NumberValueObject.create(diff);
   }
 };
 __name(_Datedif, "Datedif");

package/lib/types/engine/value-object/primitive-object.d.ts

@@ -1,5 +1,5 @@
-import { compareToken } from '../../basics/token';
 import { FormulaAstLRU } from '../../basics/cache-lru';
+import { compareToken } from '../../basics/token';
 import { BaseValueObject, ErrorValueObject } from './base-value-object';
 export type PrimitiveValueType = string | boolean | number | null;
 export declare class NullValueObject extends BaseValueObject {