Fix handling ranges in updateCellValue

Author: iddan

src/engine.spec.ts

@@ -1,7 +1,8 @@
 import * as Formula from "./formula";
-import { getFormulaComputedValue } from "./engine";
+import { getFormulaComputedValue, updateCellValue, Model } from "./engine";
+import { CellBase } from "./types";
 import FormulaParser from "fast-formula-parser";
-import { ORIGIN } from "./point";
+import { ORIGIN, Point } from "./point";
 
 const MOCK_PARSE = jest.fn();
 const MOCK_FORMULA_PARSER = {
@@ -41,3 +42,36 @@ describe("getFormulaComputedValue()", () => {
     );
   });
 });
+
+describe("updateCellValue", () => {
+  test("update simple cell", () => {
+    const model = new Model([]);
+    const cell: CellBase = { value: "1" };
+    const point: Point = { row: 0, column: 0 };
+    const nextModel = updateCellValue(model, point, cell);
+    expect(nextModel.data).toEqual([[cell]]);
+    expect(nextModel.evaluatedData).toEqual([[cell]]);
+  });
+  test("update simple formula cell", () => {
+    const model = new Model([[{ value: 1 }], [{ value: 2 }]]);
+    const cell: CellBase = { value: "=A1" };
+    const point: Point = { row: 0, column: 1 };
+    const nextModel = updateCellValue(model, point, cell);
+    expect(nextModel.data).toEqual([[{ value: 1 }, cell], [{ value: 2 }]]);
+    expect(nextModel.evaluatedData).toEqual([
+      [{ value: 1 }, { value: 1 }],
+      [{ value: 2 }],
+    ]);
+  });
+  test("update range formula cell", () => {
+    const model = new Model([[{ value: 1 }], [{ value: 2 }]]);
+    const cell: CellBase = { value: "=SUM(A:A)" };
+    const point: Point = { row: 0, column: 1 };
+    const nextModel = updateCellValue(model, point, cell);
+    expect(nextModel.data).toEqual([[{ value: 1 }, cell], [{ value: 2 }]]);
+    expect(nextModel.evaluatedData).toEqual([
+      [{ value: 1 }, { value: 3 }],
+      [{ value: 2 }],
+    ]);
+  });
+});

src/formula.ts

@@ -40,15 +40,18 @@ export function createBoundFormulaParser(
       return cell?.value;
     },
     onRange: (ref) => {
+      const data = getData();
+      const size = matrix.getSize(data);
       const start: Point = {
         row: ref.from.row - 1,
         column: ref.from.col - 1,
       };
       const end: Point = {
-        row: ref.to.row - 1,
-        column: ref.to.col - 1,
+        row: Math.min(ref.to.row - 1, size.rows - 1),
+        column: Math.min(ref.to.col - 1, size.columns - 1),
       };
-      return matrix.toArray(matrix.slice(start, end, getData()), (cell) => {
+      const dataSlice = matrix.slice(start, end, data);
+      return matrix.toArray(dataSlice, (cell) => {
         if (!isNaN(cell?.value as number)) return Number(cell?.value);
         return cell?.value;
       });
@@ -112,7 +115,8 @@ export function evaluate(
   formulaParser: FormulaParser
 ): Value {
   try {
-    const returned = formulaParser.parse(formula, convertPointToCellRef(point));
+    const position = convertPointToCellRef(point);
+    const returned = formulaParser.parse(formula, position);
     return returned instanceof FormulaError ? returned.toString() : returned;
   } catch (error) {
     if (error instanceof FormulaError) {