@univerjs/engine-formula 0.4.0-alpha.0 → 0.4.0-alpha.2

package/lib/es/index.js

@@ -5478,6 +5478,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);
         });
@@ -7590,7 +7592,10 @@ const _ColumnReferenceObject = class _ColumnReferenceObject extends BaseReferenc
     const columnReferenceObject = referenceObject;
     if (columnReferenceObject.getForcedSheetName() !== void 0 && columnReferenceObject.getForcedSheetName() !== "")
       return ErrorValueObject.create(ErrorType$1.REF);
-    const currentRangeData = this.getRangeData(), newColumnRange = columnReferenceObject.getRangeData(), newColumn = newColumnRange.startColumn, column = currentRangeData.startColumn;
+    const currentRangeData = this.getRangeData(), newColumnRange = columnReferenceObject.getRangeData(), newColumn = newColumnRange.startColumn;
+    if (newColumn >= currentRangeData.startColumn && newColumn <= currentRangeData.endColumn)
+      return this;
+    const column = currentRangeData.startColumn;
     return newColumn > column ? currentRangeData.endColumn = newColumn : (currentRangeData.startColumn = newColumn, currentRangeData.endColumn = column), newColumnRange.startAbsoluteRefType && (currentRangeData.endAbsoluteRefType = newColumnRange.startAbsoluteRefType), currentRangeData.rangeType = RANGE_TYPE.COLUMN, this.setToken(`${this.getToken()}${matchToken.COLON}${columnReferenceObject.getToken()}`), this;
   }
 };
@@ -7618,7 +7623,10 @@ const _RowReferenceObject = class _RowReferenceObject extends BaseReferenceObjec
     const rowReferenceObject = referenceObject;
     if (rowReferenceObject.getForcedSheetName() !== void 0 && rowReferenceObject.getForcedSheetName() !== "")
       return ErrorValueObject.create(ErrorType$1.REF);
-    const currentRangeData = this.getRangeData(), newRowRange = rowReferenceObject.getRangeData(), newRow = newRowRange.startRow, row = currentRangeData.startRow;
+    const currentRangeData = this.getRangeData(), newRowRange = rowReferenceObject.getRangeData(), newRow = newRowRange.startRow;
+    if (newRow >= currentRangeData.startRow && newRow <= currentRangeData.endRow)
+      return this;
+    const row = currentRangeData.startRow;
     return newRow > row ? currentRangeData.endRow = newRow : (currentRangeData.startRow = newRow, currentRangeData.endRow = row), newRowRange.startAbsoluteRefType && (currentRangeData.endAbsoluteRefType = newRowRange.startAbsoluteRefType), currentRangeData.rangeType = RANGE_TYPE.ROW, this.setToken(`${this.getToken()}${matchToken.COLON}${rowReferenceObject.getToken()}`), this;
   }
 };
@@ -11395,23 +11403,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");