@leankylin-sheet/formula-parser 7.0.23 → 7.0.25

package/dist/evaluate-by-operator/operator/compare.d.ts

@@ -1 +1,2 @@
 export default function compareRange(exp1: any, exp2: any, type: any): boolean | (boolean | undefined)[] | undefined;
+export function toComparable(value: any): any;

package/dist/helper/cell.d.ts

@@ -4,3 +4,13 @@ export function columnLabelToIndex(label: string): number;
 export function columnIndexToLabel(column: number): string;
 export function extractLabel(label: string): any[];
 export function toLabel(row: Object, column: Object): string;
+export function isCellReference(value: any): boolean;
+export function toCellValue(value: any): any;
+export function isReferenceFormula(symbol: string): boolean;
+export class CellReference {
+    constructor(label: any, value: any);
+    label: any;
+    value: any;
+    valueOf(): any;
+}
+export const REFERENCE_FORMULAS: string[];

package/dist/helper/date.d.ts

@@ -0,0 +1,2 @@
+export function isDate(value: any): boolean;
+export function dateToSerialNumber(date: Date, date1904?: number | undefined): number;

package/dist/helper/number.d.ts

@@ -1,3 +1,3 @@
-export function toNumber(number: string | number): any;
-export function invertNumber(number: number): number;
+export function toNumber(number: string | number | Date): any;
+export function invertNumber(number: number | Date): number;
 export function toNumberNotNaN(number: any): number;

package/dist/index.esm.js

@@ -169,10 +169,54 @@ function _nonIterableRest() {
   throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 
+var MS_PER_DAY = 24 * 60 * 60 * 1000;
+
+/**
+ * 1900 日期系统下 Excel 的 0 点（1899-12-31 00:00:00 UTC）。
+ */
+var EXCEL_EPOCH_UTC = Date.UTC(1899, 11, 31, 0, 0, 0);
+
+/**
+ * Excel 虚构的 1900-02-29 之后的第一天（1900-03-01）。
+ * 当天及之后的日期需要补 1 天，才能和 Excel 的序列号对齐。
+ */
+var EXCEL_LEAP_BUG_BASE = new Date(1900, 2, 1, 0, 0, 0);
+
+/**
+ * 判断是否为有效的 Date 对象。
+ *
+ * @param {*} value 待判断的值。
+ * @returns {Boolean}
+ */
+function isDate(value) {
+  return value instanceof Date && !Number.isNaN(value.getTime());
+}
+
+/**
+ * 把 Date 转成 Excel 日期序列号。
+ *
+ * 与 core 中 modules/format.ts 的 datenum_local 保持完全一致：
+ * 取本地年月日时分秒再按 UTC 计算，避免时区和夏令时带来的偏移；
+ * 1900-03-01 及之后的日期补 1 天，对齐 Excel 的 1900 闰年 bug。
+ *
+ * @param {Date} date 待转换的日期。
+ * @param {Number} [date1904] 是否使用 1904 日期系统。
+ * @returns {Number} Excel 序列号，整数部分为日期，小数部分为时间。
+ */
+function dateToSerialNumber(date, date1904) {
+  var epoch = Date.UTC(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds());
+  if (date1904) {
+    epoch -= 1461 * MS_PER_DAY;
+  } else if (date >= EXCEL_LEAP_BUG_BASE) {
+    epoch += MS_PER_DAY;
+  }
+  return (epoch - EXCEL_EPOCH_UTC) / MS_PER_DAY;
+}
+
 /**
  * Convert value into number.
  *
- * @param {String|Number} number
+ * @param {String|Number|Date} number
  * @returns {*}
  */
 function toNumber(number) {
@@ -180,6 +224,10 @@ function toNumber(number) {
   if (number === true) {
     return 1;
   }
+  // DATE/TODAY/NOW 等函数返回 Date 对象，按 Excel 序列号参与运算
+  if (isDate(number)) {
+    return dateToSerialNumber(number);
+  }
   if (typeof number === 'number') {
     result = number;
   } else if (typeof number === 'string') {
@@ -191,7 +239,7 @@ function toNumber(number) {
 /**
  * Invert provided number.
  *
- * @param {Number} number
+ * @param {Number|Date} number Provided number.
  * @returns {Number} Returns inverted number.
  */
 function invertNumber(number) {
@@ -203,6 +251,9 @@ function toNumberNotNaN(number) {
   if (number === true) {
     return 1;
   }
+  if (isDate(number)) {
+    return dateToSerialNumber(number);
+  }
   if (typeof number === 'number') {
     result = number;
   } else if (typeof number === 'string') {
@@ -278,9 +329,14 @@ function func$1() {
     params[_key] = arguments[_key];
   }
   return params.reduce(function (acc, value) {
-    return acc + value.toString();
+    return acc + toString(value);
   }, '');
 }
+
+// Date 拼接时取 Excel 序列号，避免出现 "Tue Oct 20 2026 ..." 这类 JS 默认格式
+function toString(value) {
+  return isDate(value) ? String(dateToSerialNumber(value)) : value.toString();
+}
 func$1.SYMBOL = SYMBOL$1;
 
 var SYMBOL$2 = '/';
@@ -334,9 +390,23 @@ function compare(exp1, exp2, type) {
     return tsValue(exp1) === tsValue(exp2);
   }
 }
-function tsValue(value) {
+
+/**
+ * 比较前的取值归一化：Date 统一转成 Excel 序列号，
+ * 这样 =TODAY()>A1、=TODAY()=TODAY() 才能按日期天数比较。
+ *
+ * @param {*} value 待归一化的值。
+ * @returns {*}
+ */
+function toComparable(value) {
+  if (isDate(value)) {
+    return dateToSerialNumber(value);
+  }
   return value !== null && value !== void 0 ? value : 0;
 }
+function tsValue(value) {
+  return toComparable(value);
+}
 
 var SYMBOL$3 = '=';
 function func$3(exp1, exp2) {
@@ -344,6 +414,172 @@ function func$3(exp1, exp2) {
 }
 func$3.SYMBOL = SYMBOL$3;
 
+/**
+ * Convert row label to index.
+ *
+ * @param {String} label Row label (eq. '1', '5')
+ * @returns {Number} Returns -1 if label is not recognized otherwise proper row index.
+ */
+function rowLabelToIndex(label) {
+  var result = parseInt(label, 10);
+  if (isNaN(result)) {
+    result = -1;
+  } else {
+    result = Math.max(result - 1, -1);
+  }
+  return result;
+}
+
+/**
+ * Convert row index to label.
+ *
+ * @param {Number} row Row index.
+ * @returns {String} Returns row label (eq. '1', '7').
+ */
+function rowIndexToLabel(row) {
+  var result = "";
+  if (row >= 0) {
+    result = "".concat(row + 1);
+  }
+  return result;
+}
+var COLUMN_LABEL_BASE = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+var COLUMN_LABEL_BASE_LENGTH = COLUMN_LABEL_BASE.length;
+
+/**
+ * Convert column label to index.
+ *
+ * @param {String} label Column label (eq. 'ABB', 'CNQ')
+ * @returns {Number} Returns -1 if label is not recognized otherwise proper column index.
+ */
+function columnLabelToIndex(label) {
+  var result = 0;
+  if (typeof label === "string") {
+    label = label.toUpperCase();
+    for (var i = 0, j = label.length - 1; i < label.length; i += 1, j -= 1) {
+      result += Math.pow(COLUMN_LABEL_BASE_LENGTH, j) * (COLUMN_LABEL_BASE.indexOf(label[i]) + 1);
+    }
+  }
+  --result;
+  return result;
+}
+
+/**
+ * Convert column index to label.
+ *
+ * @param {Number} column Column index.
+ * @returns {String} Returns column label (eq. 'ABB', 'CNQ').
+ */
+function columnIndexToLabel(column) {
+  var result = "";
+  while (column >= 0) {
+    result = String.fromCharCode(column % COLUMN_LABEL_BASE_LENGTH + 97) + result;
+    column = Math.floor(column / COLUMN_LABEL_BASE_LENGTH) - 1;
+  }
+  return result.toUpperCase();
+}
+var simpleSheetName = "[A-Za-z0-9_\u4E00-\u9FFF]+";
+var quotedSheetName = "'(?:(?!').|'')*'";
+var sheetNameRegexp = "(".concat(simpleSheetName, "|").concat(quotedSheetName, ")!");
+var LABEL_EXTRACT_REGEXP = new RegExp("^(?:".concat(sheetNameRegexp, ")?([$])?([A-Za-z]*)([$])?([0-9]*)$"));
+
+/**
+ * Extract cell coordinates.
+ *
+ * @param {String} label Cell coordinates (eq. 'A1', '$B6', '$N$98').
+ * @returns {Array} Returns an array of objects.
+ */
+function extractLabel(label) {
+  if (typeof label !== "string" || !LABEL_EXTRACT_REGEXP.test(label)) {
+    return [];
+  }
+  var _label$toUpperCase$ma = label.toUpperCase().match(LABEL_EXTRACT_REGEXP),
+    _label$toUpperCase$ma2 = _slicedToArray(_label$toUpperCase$ma, 6),
+    sheetNameStr = _label$toUpperCase$ma2[1],
+    columnAbs = _label$toUpperCase$ma2[2],
+    column = _label$toUpperCase$ma2[3],
+    rowAbs = _label$toUpperCase$ma2[4],
+    row = _label$toUpperCase$ma2[5];
+  if (column == null && row == null) return [];
+  var sheetName = sheetNameStr == null ? null : label.slice(0, sheetNameStr.length).replace(/^'|'$/g, "").replace(/''/g, "'");
+  return [{
+    index: rowLabelToIndex(row),
+    label: row,
+    isAbsolute: rowAbs === "$"
+  }, {
+    index: columnLabelToIndex(column),
+    label: column,
+    isAbsolute: columnAbs === "$"
+  }, sheetName];
+}
+
+/**
+ * Convert row and column indexes into cell label.
+ *
+ * @param {Object} row Object with `index` and `isAbsolute` properties.
+ * @param {Object} column Object with `index` and `isAbsolute` properties.
+ * @returns {String} Returns cell label.
+ */
+function toLabel(row, column) {
+  var rowLabel = (row.isAbsolute ? "$" : "") + rowIndexToLabel(row.index);
+  var columnLabel = (column.isAbsolute ? "$" : "") + columnIndexToLabel(column.index);
+  return columnLabel + rowLabel;
+}
+
+/**
+ * Cell reference wrapper which keeps both the cell value and its label
+ * (eq. `A1`, `Sheet1!$B$3`). Functions like ROW/COLUMN need the position
+ * info instead of the value, so the parser must not unwrap it too early.
+ */
+var CellReference = /*#__PURE__*/function () {
+  function CellReference(label, value) {
+    _classCallCheck(this, CellReference);
+    this.label = label;
+    this.value = value;
+  }
+  return _createClass(CellReference, [{
+    key: "valueOf",
+    value: function valueOf() {
+      return this.value;
+    }
+  }]);
+}();
+
+/**
+ * Check whether the value is a cell reference wrapper.
+ *
+ * @param {*} value
+ * @returns {Boolean}
+ */
+function isCellReference(value) {
+  return value instanceof CellReference;
+}
+
+/**
+ * Get the real value out of a cell reference wrapper.
+ *
+ * @param {*} value
+ * @returns {*}
+ */
+function toCellValue(value) {
+  return isCellReference(value) ? value.value : value;
+}
+
+/**
+ * Functions whose arguments are cell references instead of cell values
+ */
+var REFERENCE_FORMULAS = ["ROW", "COLUMN"];
+
+/**
+ * Check whether the function needs cell references (labels) as params.
+ *
+ * @param {String} symbol Function name.
+ * @returns {Boolean}
+ */
+function isReferenceFormula(symbol) {
+  return REFERENCE_FORMULAS.includes(String(symbol).toUpperCase());
+}
+
 var SUPPORTED_FORMULAS = Object.keys(formulajs);
 
 var SYMBOL$4 = SUPPORTED_FORMULAS;
@@ -353,11 +589,15 @@ function func$4(symbol) {
     for (var _len = arguments.length, _params = new Array(_len), _key = 0; _key < _len; _key++) {
       _params[_key] = arguments[_key];
     }
+    if (isReferenceFormula(symbol)) {
+      return referenceResult(symbol, _params);
+    }
     var params = _params === null || _params === void 0 ? void 0 : _params.map(function (item) {
-      if (errors_formula_map[item]) {
-        return errors_formula_map[item];
+      var value = toCellValue(item);
+      if (errors_formula_map[value]) {
+        return errors_formula_map[value];
       } else {
-        return item;
+        return value;
       }
     });
     var symbolParts = symbol.split(".");
@@ -395,6 +635,33 @@ function func$4(symbol) {
 }
 func$4.isFactory = true;
 func$4.SYMBOL = SYMBOL$4;
+
+/**
+ * 计算 ROW/COLUMN 一类以单元格引用（而不是单元格的值）作为入参的函数
+ *
+ * @param {String} fnName Function name.
+ * @param {Array} params Function params, may contain cell references.
+ * @returns {*}
+ */
+function referenceResult(fnName, params) {
+  var first = params[0];
+  if (isCellReference(first)) {
+    var _extractLabel = extractLabel(first.label),
+      _extractLabel2 = _slicedToArray(_extractLabel, 2),
+      row = _extractLabel2[0],
+      column = _extractLabel2[1];
+    var index = fnName === "ROW" ? row === null || row === void 0 ? void 0 : row.index : column === null || column === void 0 ? void 0 : column.index;
+    if (typeof index === "number" && index >= 0) {
+      return index + 1;
+    }
+  } else if (errors_formula_map[first]) {
+    return errors_formula_map[first];
+  } else if (typeof first === "number") {
+    // 兼容直接传入行号/列号的情况，如 ROW(3)
+    return first;
+  }
+  return errors_formula_map[ERROR_VALUE];
+}
 function tsParams(fnName, params) {
   if (fnName === "SUMPRODUCT") {
     var _params2;
@@ -536,7 +803,12 @@ func$a.SYMBOL = SYMBOL$a;
 
 var SYMBOL$b = '<>';
 function func$b(exp1, exp2) {
-  return exp1 !== exp2;
+  return normalize(exp1) !== normalize(exp2);
+}
+
+// Date 按 Excel 序列号比较，=TODAY()<>TODAY() 才是 FALSE
+function normalize(value) {
+  return isDate(value) ? dateToSerialNumber(value) : value;
 }
 func$b.SYMBOL = SYMBOL$b;
 
@@ -600,13 +872,13 @@ registerOperation(func$a.SYMBOL, func$a);
 registerOperation(func$b.SYMBOL, func$b);
 registerOperation(func$9.SYMBOL, func$9);
 
-var simpleSheetName = "[A-Za-z0-9_\u4E00-\u9FFF]+";
-var quotedSheetName = "'(?:(?!').|'')*'";
-var sheetNameRegexp = "(?:".concat(simpleSheetName, "|").concat(quotedSheetName, ")!");
-var ABSOLUTE_CELL = new RegExp("^(?:".concat(sheetNameRegexp, ")?(?:[$][A-Za-z]+[$][0-9]+)"));
-var MIXED_CELL_COL = new RegExp("^(?:".concat(sheetNameRegexp, ")?(?:[$][A-Za-z]+[0-9]*)"));
-var MIXED_CELL_ROW = new RegExp("^(?:".concat(sheetNameRegexp, ")?(?:[A-Za-z]*[$][0-9]+)"));
-var RELATIVE_CELL = new RegExp("^(?:".concat(sheetNameRegexp, ")?(?:(?:[A-Za-z]+[0-9]*)|(?:[A-Za-z]*[0-9]+))(?!\\d)(?!\\.)"));
+var simpleSheetName$1 = "[A-Za-z0-9_\u4E00-\u9FFF]+";
+var quotedSheetName$1 = "'(?:(?!').|'')*'";
+var sheetNameRegexp$1 = "(?:".concat(simpleSheetName$1, "|").concat(quotedSheetName$1, ")!");
+var ABSOLUTE_CELL = new RegExp("^(?:".concat(sheetNameRegexp$1, ")?(?:[$][A-Za-z]+[$][0-9]+)"));
+var MIXED_CELL_COL = new RegExp("^(?:".concat(sheetNameRegexp$1, ")?(?:[$][A-Za-z]+[0-9]*)"));
+var MIXED_CELL_ROW = new RegExp("^(?:".concat(sheetNameRegexp$1, ")?(?:[A-Za-z]*[$][0-9]+)"));
+var RELATIVE_CELL = new RegExp("^(?:".concat(sheetNameRegexp$1, ")?(?:(?:[A-Za-z]+[0-9]*)|(?:[A-Za-z]*[0-9]+))(?!\\d)(?!\\.)"));
 var NUMONLY = /^(?:[0-9]+$)/;
 var stackCache;
 var o = function o(k, v, _o, l) {
@@ -2021,118 +2293,6 @@ function trimEdges(string) {
   return string;
 }
 
-/**
- * Convert row label to index.
- *
- * @param {String} label Row label (eq. '1', '5')
- * @returns {Number} Returns -1 if label is not recognized otherwise proper row index.
- */
-function rowLabelToIndex(label) {
-  var result = parseInt(label, 10);
-  if (isNaN(result)) {
-    result = -1;
-  } else {
-    result = Math.max(result - 1, -1);
-  }
-  return result;
-}
-
-/**
- * Convert row index to label.
- *
- * @param {Number} row Row index.
- * @returns {String} Returns row label (eq. '1', '7').
- */
-function rowIndexToLabel(row) {
-  var result = "";
-  if (row >= 0) {
-    result = "".concat(row + 1);
-  }
-  return result;
-}
-var COLUMN_LABEL_BASE = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-var COLUMN_LABEL_BASE_LENGTH = COLUMN_LABEL_BASE.length;
-
-/**
- * Convert column label to index.
- *
- * @param {String} label Column label (eq. 'ABB', 'CNQ')
- * @returns {Number} Returns -1 if label is not recognized otherwise proper column index.
- */
-function columnLabelToIndex(label) {
-  var result = 0;
-  if (typeof label === "string") {
-    label = label.toUpperCase();
-    for (var i = 0, j = label.length - 1; i < label.length; i += 1, j -= 1) {
-      result += Math.pow(COLUMN_LABEL_BASE_LENGTH, j) * (COLUMN_LABEL_BASE.indexOf(label[i]) + 1);
-    }
-  }
-  --result;
-  return result;
-}
-
-/**
- * Convert column index to label.
- *
- * @param {Number} column Column index.
- * @returns {String} Returns column label (eq. 'ABB', 'CNQ').
- */
-function columnIndexToLabel(column) {
-  var result = "";
-  while (column >= 0) {
-    result = String.fromCharCode(column % COLUMN_LABEL_BASE_LENGTH + 97) + result;
-    column = Math.floor(column / COLUMN_LABEL_BASE_LENGTH) - 1;
-  }
-  return result.toUpperCase();
-}
-var simpleSheetName$1 = "[A-Za-z0-9_\u4E00-\u9FFF]+";
-var quotedSheetName$1 = "'(?:(?!').|'')*'";
-var sheetNameRegexp$1 = "(".concat(simpleSheetName$1, "|").concat(quotedSheetName$1, ")!");
-var LABEL_EXTRACT_REGEXP = new RegExp("^(?:".concat(sheetNameRegexp$1, ")?([$])?([A-Za-z]*)([$])?([0-9]*)$"));
-
-/**
- * Extract cell coordinates.
- *
- * @param {String} label Cell coordinates (eq. 'A1', '$B6', '$N$98').
- * @returns {Array} Returns an array of objects.
- */
-function extractLabel(label) {
-  if (typeof label !== "string" || !LABEL_EXTRACT_REGEXP.test(label)) {
-    return [];
-  }
-  var _label$toUpperCase$ma = label.toUpperCase().match(LABEL_EXTRACT_REGEXP),
-    _label$toUpperCase$ma2 = _slicedToArray(_label$toUpperCase$ma, 6),
-    sheetNameStr = _label$toUpperCase$ma2[1],
-    columnAbs = _label$toUpperCase$ma2[2],
-    column = _label$toUpperCase$ma2[3],
-    rowAbs = _label$toUpperCase$ma2[4],
-    row = _label$toUpperCase$ma2[5];
-  if (column == null && row == null) return [];
-  var sheetName = sheetNameStr == null ? null : label.slice(0, sheetNameStr.length).replace(/^'|'$/g, "").replace(/''/g, "'");
-  return [{
-    index: rowLabelToIndex(row),
-    label: row,
-    isAbsolute: rowAbs === "$"
-  }, {
-    index: columnLabelToIndex(column),
-    label: column,
-    isAbsolute: columnAbs === "$"
-  }, sheetName];
-}
-
-/**
- * Convert row and column indexes into cell label.
- *
- * @param {Object} row Object with `index` and `isAbsolute` properties.
- * @param {Object} column Object with `index` and `isAbsolute` properties.
- * @returns {String} Returns cell label.
- */
-function toLabel(row, column) {
-  var rowLabel = (row.isAbsolute ? "$" : "") + rowIndexToLabel(row.index);
-  var columnLabel = (column.isAbsolute ? "$" : "") + columnIndexToLabel(column.index);
-  return columnLabel + rowLabel;
-}
-
 /**
  * @class Parser
  */
@@ -2143,16 +2303,24 @@ var Parser$1 = /*#__PURE__*/function (_Emitter) {
     _this = _callSuper(this, Parser$1);
     _this.parser = new Parser();
     _this.parser.yy = {
-      toNumber: toNumber,
+      toNumber: function toNumber$1(value) {
+        return toNumber(toCellValue(value));
+      },
       trimEdges: trimEdges,
-      invertNumber: invertNumber,
+      invertNumber: function invertNumber$1(value) {
+        return invertNumber(toCellValue(value));
+      },
       throwError: function throwError(errorName) {
         return _this._throwError(errorName);
       },
       callVariable: function callVariable(variable) {
         return _this._callVariable(variable);
       },
-      evaluateByOperator: evaluateByOperator,
+      // ROW/COLUMN 的入参需要引用（label），不能解包成值
+      evaluateByOperator: function evaluateByOperator$1(operator) {
+        var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+        return evaluateByOperator(operator, isReferenceFormula(operator) ? params : params.map(toCellValue));
+      },
       callFunction: function callFunction(name, params) {
         return _this._callFunction(name, params);
       },
@@ -2205,6 +2373,9 @@ var Parser$1 = /*#__PURE__*/function (_Emitter) {
       if (result instanceof Error) {
         error$1 = error(result.message) || error(ERROR);
         result = null;
+      } else {
+        // `=A1` 这类表达式的结果是引用包装对象，对外只返回值本身
+        result = toCellValue(result);
       }
       return {
         error: error$1,
@@ -2309,15 +2480,18 @@ var Parser$1 = /*#__PURE__*/function (_Emitter) {
     value: function _callFunction(name) {
       var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
       var fn = this.getFunction(name);
+      var args = params.map(toCellValue);
       var value;
       if (fn) {
-        value = fn(params);
+        value = fn(args);
       }
-      this.emit("callFunction", name, params, function (newValue) {
+      this.emit("callFunction", name, args, function (newValue) {
         if (newValue !== void 0) {
           value = newValue;
         }
       });
+
+      // `params` 里可能带着单元格引用（ROW/COLUMN 需要），由 formula-function 自行解包
       return value === void 0 ? evaluateByOperator(name, params) : value;
     }
 
@@ -2353,7 +2527,9 @@ var Parser$1 = /*#__PURE__*/function (_Emitter) {
       }, this.options, function (_value) {
         value = _value;
       });
-      return value;
+
+      // 同时保留 label，供 ROW/COLUMN 等需要引用位置的函数使用
+      return new CellReference(label, value);
     }
 
     /**

package/dist/index.js

@@ -197,10 +197,54 @@ function _nonIterableRest() {
   throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 
+var MS_PER_DAY = 24 * 60 * 60 * 1000;
+
+/**
+ * 1900 日期系统下 Excel 的 0 点（1899-12-31 00:00:00 UTC）。
+ */
+var EXCEL_EPOCH_UTC = Date.UTC(1899, 11, 31, 0, 0, 0);
+
+/**
+ * Excel 虚构的 1900-02-29 之后的第一天（1900-03-01）。
+ * 当天及之后的日期需要补 1 天，才能和 Excel 的序列号对齐。
+ */
+var EXCEL_LEAP_BUG_BASE = new Date(1900, 2, 1, 0, 0, 0);
+
+/**
+ * 判断是否为有效的 Date 对象。
+ *
+ * @param {*} value 待判断的值。
+ * @returns {Boolean}
+ */
+function isDate(value) {
+  return value instanceof Date && !Number.isNaN(value.getTime());
+}
+
+/**
+ * 把 Date 转成 Excel 日期序列号。
+ *
+ * 与 core 中 modules/format.ts 的 datenum_local 保持完全一致：
+ * 取本地年月日时分秒再按 UTC 计算，避免时区和夏令时带来的偏移；
+ * 1900-03-01 及之后的日期补 1 天，对齐 Excel 的 1900 闰年 bug。
+ *
+ * @param {Date} date 待转换的日期。
+ * @param {Number} [date1904] 是否使用 1904 日期系统。
+ * @returns {Number} Excel 序列号，整数部分为日期，小数部分为时间。
+ */
+function dateToSerialNumber(date, date1904) {
+  var epoch = Date.UTC(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds());
+  if (date1904) {
+    epoch -= 1461 * MS_PER_DAY;
+  } else if (date >= EXCEL_LEAP_BUG_BASE) {
+    epoch += MS_PER_DAY;
+  }
+  return (epoch - EXCEL_EPOCH_UTC) / MS_PER_DAY;
+}
+
 /**
  * Convert value into number.
  *
- * @param {String|Number} number
+ * @param {String|Number|Date} number
  * @returns {*}
  */
 function toNumber(number) {
@@ -208,6 +252,10 @@ function toNumber(number) {
   if (number === true) {
     return 1;
   }
+  // DATE/TODAY/NOW 等函数返回 Date 对象，按 Excel 序列号参与运算
+  if (isDate(number)) {
+    return dateToSerialNumber(number);
+  }
   if (typeof number === 'number') {
     result = number;
   } else if (typeof number === 'string') {
@@ -219,7 +267,7 @@ function toNumber(number) {
 /**
  * Invert provided number.
  *
- * @param {Number} number
+ * @param {Number|Date} number Provided number.
  * @returns {Number} Returns inverted number.
  */
 function invertNumber(number) {
@@ -231,6 +279,9 @@ function toNumberNotNaN(number) {
   if (number === true) {
     return 1;
   }
+  if (isDate(number)) {
+    return dateToSerialNumber(number);
+  }
   if (typeof number === 'number') {
     result = number;
   } else if (typeof number === 'string') {
@@ -306,9 +357,14 @@ function func$1() {
     params[_key] = arguments[_key];
   }
   return params.reduce(function (acc, value) {
-    return acc + value.toString();
+    return acc + toString(value);
   }, '');
 }
+
+// Date 拼接时取 Excel 序列号，避免出现 "Tue Oct 20 2026 ..." 这类 JS 默认格式
+function toString(value) {
+  return isDate(value) ? String(dateToSerialNumber(value)) : value.toString();
+}
 func$1.SYMBOL = SYMBOL$1;
 
 var SYMBOL$2 = '/';
@@ -362,9 +418,23 @@ function compare(exp1, exp2, type) {
     return tsValue(exp1) === tsValue(exp2);
   }
 }
-function tsValue(value) {
+
+/**
+ * 比较前的取值归一化：Date 统一转成 Excel 序列号，
+ * 这样 =TODAY()>A1、=TODAY()=TODAY() 才能按日期天数比较。
+ *
+ * @param {*} value 待归一化的值。
+ * @returns {*}
+ */
+function toComparable(value) {
+  if (isDate(value)) {
+    return dateToSerialNumber(value);
+  }
   return value !== null && value !== void 0 ? value : 0;
 }
+function tsValue(value) {
+  return toComparable(value);
+}
 
 var SYMBOL$3 = '=';
 function func$3(exp1, exp2) {
@@ -372,6 +442,172 @@ function func$3(exp1, exp2) {
 }
 func$3.SYMBOL = SYMBOL$3;
 
+/**
+ * Convert row label to index.
+ *
+ * @param {String} label Row label (eq. '1', '5')
+ * @returns {Number} Returns -1 if label is not recognized otherwise proper row index.
+ */
+function rowLabelToIndex(label) {
+  var result = parseInt(label, 10);
+  if (isNaN(result)) {
+    result = -1;
+  } else {
+    result = Math.max(result - 1, -1);
+  }
+  return result;
+}
+
+/**
+ * Convert row index to label.
+ *
+ * @param {Number} row Row index.
+ * @returns {String} Returns row label (eq. '1', '7').
+ */
+function rowIndexToLabel(row) {
+  var result = "";
+  if (row >= 0) {
+    result = "".concat(row + 1);
+  }
+  return result;
+}
+var COLUMN_LABEL_BASE = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+var COLUMN_LABEL_BASE_LENGTH = COLUMN_LABEL_BASE.length;
+
+/**
+ * Convert column label to index.
+ *
+ * @param {String} label Column label (eq. 'ABB', 'CNQ')
+ * @returns {Number} Returns -1 if label is not recognized otherwise proper column index.
+ */
+function columnLabelToIndex(label) {
+  var result = 0;
+  if (typeof label === "string") {
+    label = label.toUpperCase();
+    for (var i = 0, j = label.length - 1; i < label.length; i += 1, j -= 1) {
+      result += Math.pow(COLUMN_LABEL_BASE_LENGTH, j) * (COLUMN_LABEL_BASE.indexOf(label[i]) + 1);
+    }
+  }
+  --result;
+  return result;
+}
+
+/**
+ * Convert column index to label.
+ *
+ * @param {Number} column Column index.
+ * @returns {String} Returns column label (eq. 'ABB', 'CNQ').
+ */
+function columnIndexToLabel(column) {
+  var result = "";
+  while (column >= 0) {
+    result = String.fromCharCode(column % COLUMN_LABEL_BASE_LENGTH + 97) + result;
+    column = Math.floor(column / COLUMN_LABEL_BASE_LENGTH) - 1;
+  }
+  return result.toUpperCase();
+}
+var simpleSheetName = "[A-Za-z0-9_\u4E00-\u9FFF]+";
+var quotedSheetName = "'(?:(?!').|'')*'";
+var sheetNameRegexp = "(".concat(simpleSheetName, "|").concat(quotedSheetName, ")!");
+var LABEL_EXTRACT_REGEXP = new RegExp("^(?:".concat(sheetNameRegexp, ")?([$])?([A-Za-z]*)([$])?([0-9]*)$"));
+
+/**
+ * Extract cell coordinates.
+ *
+ * @param {String} label Cell coordinates (eq. 'A1', '$B6', '$N$98').
+ * @returns {Array} Returns an array of objects.
+ */
+function extractLabel(label) {
+  if (typeof label !== "string" || !LABEL_EXTRACT_REGEXP.test(label)) {
+    return [];
+  }
+  var _label$toUpperCase$ma = label.toUpperCase().match(LABEL_EXTRACT_REGEXP),
+    _label$toUpperCase$ma2 = _slicedToArray(_label$toUpperCase$ma, 6),
+    sheetNameStr = _label$toUpperCase$ma2[1],
+    columnAbs = _label$toUpperCase$ma2[2],
+    column = _label$toUpperCase$ma2[3],
+    rowAbs = _label$toUpperCase$ma2[4],
+    row = _label$toUpperCase$ma2[5];
+  if (column == null && row == null) return [];
+  var sheetName = sheetNameStr == null ? null : label.slice(0, sheetNameStr.length).replace(/^'|'$/g, "").replace(/''/g, "'");
+  return [{
+    index: rowLabelToIndex(row),
+    label: row,
+    isAbsolute: rowAbs === "$"
+  }, {
+    index: columnLabelToIndex(column),
+    label: column,
+    isAbsolute: columnAbs === "$"
+  }, sheetName];
+}
+
+/**
+ * Convert row and column indexes into cell label.
+ *
+ * @param {Object} row Object with `index` and `isAbsolute` properties.
+ * @param {Object} column Object with `index` and `isAbsolute` properties.
+ * @returns {String} Returns cell label.
+ */
+function toLabel(row, column) {
+  var rowLabel = (row.isAbsolute ? "$" : "") + rowIndexToLabel(row.index);
+  var columnLabel = (column.isAbsolute ? "$" : "") + columnIndexToLabel(column.index);
+  return columnLabel + rowLabel;
+}
+
+/**
+ * Cell reference wrapper which keeps both the cell value and its label
+ * (eq. `A1`, `Sheet1!$B$3`). Functions like ROW/COLUMN need the position
+ * info instead of the value, so the parser must not unwrap it too early.
+ */
+var CellReference = /*#__PURE__*/function () {
+  function CellReference(label, value) {
+    _classCallCheck(this, CellReference);
+    this.label = label;
+    this.value = value;
+  }
+  return _createClass(CellReference, [{
+    key: "valueOf",
+    value: function valueOf() {
+      return this.value;
+    }
+  }]);
+}();
+
+/**
+ * Check whether the value is a cell reference wrapper.
+ *
+ * @param {*} value
+ * @returns {Boolean}
+ */
+function isCellReference(value) {
+  return value instanceof CellReference;
+}
+
+/**
+ * Get the real value out of a cell reference wrapper.
+ *
+ * @param {*} value
+ * @returns {*}
+ */
+function toCellValue(value) {
+  return isCellReference(value) ? value.value : value;
+}
+
+/**
+ * Functions whose arguments are cell references instead of cell values
+ */
+var REFERENCE_FORMULAS = ["ROW", "COLUMN"];
+
+/**
+ * Check whether the function needs cell references (labels) as params.
+ *
+ * @param {String} symbol Function name.
+ * @returns {Boolean}
+ */
+function isReferenceFormula(symbol) {
+  return REFERENCE_FORMULAS.includes(String(symbol).toUpperCase());
+}
+
 var SUPPORTED_FORMULAS = Object.keys(formulajs__namespace);
 
 var SYMBOL$4 = SUPPORTED_FORMULAS;
@@ -381,11 +617,15 @@ function func$4(symbol) {
     for (var _len = arguments.length, _params = new Array(_len), _key = 0; _key < _len; _key++) {
       _params[_key] = arguments[_key];
     }
+    if (isReferenceFormula(symbol)) {
+      return referenceResult(symbol, _params);
+    }
     var params = _params === null || _params === void 0 ? void 0 : _params.map(function (item) {
-      if (errors_formula_map[item]) {
-        return errors_formula_map[item];
+      var value = toCellValue(item);
+      if (errors_formula_map[value]) {
+        return errors_formula_map[value];
       } else {
-        return item;
+        return value;
       }
     });
     var symbolParts = symbol.split(".");
@@ -423,6 +663,33 @@ function func$4(symbol) {
 }
 func$4.isFactory = true;
 func$4.SYMBOL = SYMBOL$4;
+
+/**
+ * 计算 ROW/COLUMN 一类以单元格引用（而不是单元格的值）作为入参的函数
+ *
+ * @param {String} fnName Function name.
+ * @param {Array} params Function params, may contain cell references.
+ * @returns {*}
+ */
+function referenceResult(fnName, params) {
+  var first = params[0];
+  if (isCellReference(first)) {
+    var _extractLabel = extractLabel(first.label),
+      _extractLabel2 = _slicedToArray(_extractLabel, 2),
+      row = _extractLabel2[0],
+      column = _extractLabel2[1];
+    var index = fnName === "ROW" ? row === null || row === void 0 ? void 0 : row.index : column === null || column === void 0 ? void 0 : column.index;
+    if (typeof index === "number" && index >= 0) {
+      return index + 1;
+    }
+  } else if (errors_formula_map[first]) {
+    return errors_formula_map[first];
+  } else if (typeof first === "number") {
+    // 兼容直接传入行号/列号的情况，如 ROW(3)
+    return first;
+  }
+  return errors_formula_map[ERROR_VALUE];
+}
 function tsParams(fnName, params) {
   if (fnName === "SUMPRODUCT") {
     var _params2;
@@ -564,7 +831,12 @@ func$a.SYMBOL = SYMBOL$a;
 
 var SYMBOL$b = '<>';
 function func$b(exp1, exp2) {
-  return exp1 !== exp2;
+  return normalize(exp1) !== normalize(exp2);
+}
+
+// Date 按 Excel 序列号比较，=TODAY()<>TODAY() 才是 FALSE
+function normalize(value) {
+  return isDate(value) ? dateToSerialNumber(value) : value;
 }
 func$b.SYMBOL = SYMBOL$b;
 
@@ -628,13 +900,13 @@ registerOperation(func$a.SYMBOL, func$a);
 registerOperation(func$b.SYMBOL, func$b);
 registerOperation(func$9.SYMBOL, func$9);
 
-var simpleSheetName = "[A-Za-z0-9_\u4E00-\u9FFF]+";
-var quotedSheetName = "'(?:(?!').|'')*'";
-var sheetNameRegexp = "(?:".concat(simpleSheetName, "|").concat(quotedSheetName, ")!");
-var ABSOLUTE_CELL = new RegExp("^(?:".concat(sheetNameRegexp, ")?(?:[$][A-Za-z]+[$][0-9]+)"));
-var MIXED_CELL_COL = new RegExp("^(?:".concat(sheetNameRegexp, ")?(?:[$][A-Za-z]+[0-9]*)"));
-var MIXED_CELL_ROW = new RegExp("^(?:".concat(sheetNameRegexp, ")?(?:[A-Za-z]*[$][0-9]+)"));
-var RELATIVE_CELL = new RegExp("^(?:".concat(sheetNameRegexp, ")?(?:(?:[A-Za-z]+[0-9]*)|(?:[A-Za-z]*[0-9]+))(?!\\d)(?!\\.)"));
+var simpleSheetName$1 = "[A-Za-z0-9_\u4E00-\u9FFF]+";
+var quotedSheetName$1 = "'(?:(?!').|'')*'";
+var sheetNameRegexp$1 = "(?:".concat(simpleSheetName$1, "|").concat(quotedSheetName$1, ")!");
+var ABSOLUTE_CELL = new RegExp("^(?:".concat(sheetNameRegexp$1, ")?(?:[$][A-Za-z]+[$][0-9]+)"));
+var MIXED_CELL_COL = new RegExp("^(?:".concat(sheetNameRegexp$1, ")?(?:[$][A-Za-z]+[0-9]*)"));
+var MIXED_CELL_ROW = new RegExp("^(?:".concat(sheetNameRegexp$1, ")?(?:[A-Za-z]*[$][0-9]+)"));
+var RELATIVE_CELL = new RegExp("^(?:".concat(sheetNameRegexp$1, ")?(?:(?:[A-Za-z]+[0-9]*)|(?:[A-Za-z]*[0-9]+))(?!\\d)(?!\\.)"));
 var NUMONLY = /^(?:[0-9]+$)/;
 var stackCache;
 var o = function o(k, v, _o, l) {
@@ -2049,118 +2321,6 @@ function trimEdges(string) {
   return string;
 }
 
-/**
- * Convert row label to index.
- *
- * @param {String} label Row label (eq. '1', '5')
- * @returns {Number} Returns -1 if label is not recognized otherwise proper row index.
- */
-function rowLabelToIndex(label) {
-  var result = parseInt(label, 10);
-  if (isNaN(result)) {
-    result = -1;
-  } else {
-    result = Math.max(result - 1, -1);
-  }
-  return result;
-}
-
-/**
- * Convert row index to label.
- *
- * @param {Number} row Row index.
- * @returns {String} Returns row label (eq. '1', '7').
- */
-function rowIndexToLabel(row) {
-  var result = "";
-  if (row >= 0) {
-    result = "".concat(row + 1);
-  }
-  return result;
-}
-var COLUMN_LABEL_BASE = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-var COLUMN_LABEL_BASE_LENGTH = COLUMN_LABEL_BASE.length;
-
-/**
- * Convert column label to index.
- *
- * @param {String} label Column label (eq. 'ABB', 'CNQ')
- * @returns {Number} Returns -1 if label is not recognized otherwise proper column index.
- */
-function columnLabelToIndex(label) {
-  var result = 0;
-  if (typeof label === "string") {
-    label = label.toUpperCase();
-    for (var i = 0, j = label.length - 1; i < label.length; i += 1, j -= 1) {
-      result += Math.pow(COLUMN_LABEL_BASE_LENGTH, j) * (COLUMN_LABEL_BASE.indexOf(label[i]) + 1);
-    }
-  }
-  --result;
-  return result;
-}
-
-/**
- * Convert column index to label.
- *
- * @param {Number} column Column index.
- * @returns {String} Returns column label (eq. 'ABB', 'CNQ').
- */
-function columnIndexToLabel(column) {
-  var result = "";
-  while (column >= 0) {
-    result = String.fromCharCode(column % COLUMN_LABEL_BASE_LENGTH + 97) + result;
-    column = Math.floor(column / COLUMN_LABEL_BASE_LENGTH) - 1;
-  }
-  return result.toUpperCase();
-}
-var simpleSheetName$1 = "[A-Za-z0-9_\u4E00-\u9FFF]+";
-var quotedSheetName$1 = "'(?:(?!').|'')*'";
-var sheetNameRegexp$1 = "(".concat(simpleSheetName$1, "|").concat(quotedSheetName$1, ")!");
-var LABEL_EXTRACT_REGEXP = new RegExp("^(?:".concat(sheetNameRegexp$1, ")?([$])?([A-Za-z]*)([$])?([0-9]*)$"));
-
-/**
- * Extract cell coordinates.
- *
- * @param {String} label Cell coordinates (eq. 'A1', '$B6', '$N$98').
- * @returns {Array} Returns an array of objects.
- */
-function extractLabel(label) {
-  if (typeof label !== "string" || !LABEL_EXTRACT_REGEXP.test(label)) {
-    return [];
-  }
-  var _label$toUpperCase$ma = label.toUpperCase().match(LABEL_EXTRACT_REGEXP),
-    _label$toUpperCase$ma2 = _slicedToArray(_label$toUpperCase$ma, 6),
-    sheetNameStr = _label$toUpperCase$ma2[1],
-    columnAbs = _label$toUpperCase$ma2[2],
-    column = _label$toUpperCase$ma2[3],
-    rowAbs = _label$toUpperCase$ma2[4],
-    row = _label$toUpperCase$ma2[5];
-  if (column == null && row == null) return [];
-  var sheetName = sheetNameStr == null ? null : label.slice(0, sheetNameStr.length).replace(/^'|'$/g, "").replace(/''/g, "'");
-  return [{
-    index: rowLabelToIndex(row),
-    label: row,
-    isAbsolute: rowAbs === "$"
-  }, {
-    index: columnLabelToIndex(column),
-    label: column,
-    isAbsolute: columnAbs === "$"
-  }, sheetName];
-}
-
-/**
- * Convert row and column indexes into cell label.
- *
- * @param {Object} row Object with `index` and `isAbsolute` properties.
- * @param {Object} column Object with `index` and `isAbsolute` properties.
- * @returns {String} Returns cell label.
- */
-function toLabel(row, column) {
-  var rowLabel = (row.isAbsolute ? "$" : "") + rowIndexToLabel(row.index);
-  var columnLabel = (column.isAbsolute ? "$" : "") + columnIndexToLabel(column.index);
-  return columnLabel + rowLabel;
-}
-
 /**
  * @class Parser
  */
@@ -2171,16 +2331,24 @@ var Parser$1 = /*#__PURE__*/function (_Emitter) {
     _this = _callSuper(this, Parser$1);
     _this.parser = new Parser();
     _this.parser.yy = {
-      toNumber: toNumber,
+      toNumber: function toNumber$1(value) {
+        return toNumber(toCellValue(value));
+      },
       trimEdges: trimEdges,
-      invertNumber: invertNumber,
+      invertNumber: function invertNumber$1(value) {
+        return invertNumber(toCellValue(value));
+      },
       throwError: function throwError(errorName) {
         return _this._throwError(errorName);
       },
       callVariable: function callVariable(variable) {
         return _this._callVariable(variable);
       },
-      evaluateByOperator: evaluateByOperator,
+      // ROW/COLUMN 的入参需要引用（label），不能解包成值
+      evaluateByOperator: function evaluateByOperator$1(operator) {
+        var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+        return evaluateByOperator(operator, isReferenceFormula(operator) ? params : params.map(toCellValue));
+      },
       callFunction: function callFunction(name, params) {
         return _this._callFunction(name, params);
       },
@@ -2233,6 +2401,9 @@ var Parser$1 = /*#__PURE__*/function (_Emitter) {
       if (result instanceof Error) {
         error$1 = error(result.message) || error(ERROR);
         result = null;
+      } else {
+        // `=A1` 这类表达式的结果是引用包装对象，对外只返回值本身
+        result = toCellValue(result);
       }
       return {
         error: error$1,
@@ -2337,15 +2508,18 @@ var Parser$1 = /*#__PURE__*/function (_Emitter) {
     value: function _callFunction(name) {
       var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
       var fn = this.getFunction(name);
+      var args = params.map(toCellValue);
       var value;
       if (fn) {
-        value = fn(params);
+        value = fn(args);
       }
-      this.emit("callFunction", name, params, function (newValue) {
+      this.emit("callFunction", name, args, function (newValue) {
         if (newValue !== void 0) {
           value = newValue;
         }
       });
+
+      // `params` 里可能带着单元格引用（ROW/COLUMN 需要），由 formula-function 自行解包
       return value === void 0 ? evaluateByOperator(name, params) : value;
     }
 
@@ -2381,7 +2555,9 @@ var Parser$1 = /*#__PURE__*/function (_Emitter) {
       }, this.options, function (_value) {
         value = _value;
       });
-      return value;
+
+      // 同时保留 label，供 ROW/COLUMN 等需要引用位置的函数使用
+      return new CellReference(label, value);
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/formula-parser",
-  "version": "7.0.23",
+  "version": "7.0.25",
   "description": "Formula parser",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",