Fix error with OFFSET range with multisheet cell reference

Author: sequba

jest.config.js

@@ -50,4 +50,11 @@ module.exports = {
   transform: {
     "^.+\\.(ts|tsx)$": "ts-jest"
   },
+
+  watchPathIgnorePatterns: [
+    '/node_modules/',
+    '/dist/',
+    '/commonjs/',
+    '/es/',
+  ]
 };

package.json

@@ -78,7 +78,7 @@
     "test": "npm-run-all lint test:unit test:browser test:compatibility",
     "test:unit": "cross-env NODE_ICU_DATA=node_modules/full-icu jest",
     "test:watch": "cross-env NODE_ICU_DATA=node_modules/full-icu jest --watch",
-    "test:tdd": "cross-env NODE_ICU_DATA=node_modules/full-icu jest --watch custom-functions",
+    "test:tdd": "cross-env NODE_ICU_DATA=node_modules/full-icu jest --watch offset",
     "test:coverage": "npm run test:unit -- --coverage",
     "test:logMemory": "cross-env NODE_ICU_DATA=node_modules/full-icu jest --runInBand --logHeapUsage",
     "test:unit.ci": "cross-env NODE_ICU_DATA=node_modules/full-icu node --expose-gc ./node_modules/jest/bin/jest --forceExit",

src/parser/FormulaParser.ts

@@ -843,8 +843,10 @@ export class FormulaParser extends EmbeddedActionsParser {
         topLeftCorner.col + width - 1,
         topLeftCorner.row + height - 1,
         topLeftCorner.type,
+        topLeftCorner.sheet,
       )
-      return buildCellRangeAst(topLeftCorner, bottomRightCorner, RangeSheetReferenceType.RELATIVE)
+      const rangeSheetReferenceType = cellArg.reference.sheet == null ? RangeSheetReferenceType.RELATIVE : RangeSheetReferenceType.BOTH_ABSOLUTE
+      return buildCellRangeAst(topLeftCorner, bottomRightCorner, rangeSheetReferenceType)
     }
   }
 

test/unit/parser/offset-translation.spec.ts

@@ -68,6 +68,18 @@ describe('Parser - OFFSET to reference translation', () => {
     expect(ast.end).toEqual(CellAddress.relative(8, 13))
   })
 
+  it('OFFSET parsing into cell range in different sheet', () => {
+    const sheetMapping = new SheetMapping(buildTranslationPackage(enUS))
+    sheetMapping.addSheet('Sheet1')
+    sheetMapping.addSheet('Sheet2')
+    const parser = buildEmptyParserWithCaching(new Config(), sheetMapping)
+
+    const ast = parser.parse('=OFFSET(Sheet2!F16, 0, 2, 1, 3)', adr('B3', 0)).ast as CellRangeAst
+    expect(ast.type).toBe(AstNodeType.CELL_RANGE)
+    expect(ast.start).toEqual(CellAddress.relative(6, 13, 1))
+    expect(ast.end).toEqual(CellAddress.relative(8, 13, 1))
+  })
+
   it('OFFSET first argument need to be reference', () => {
     const parser = buildEmptyParserWithCaching(new Config())
 
@@ -186,9 +198,9 @@ describe('Parser - OFFSET to reference translation', () => {
     sheetMapping.addSheet('Sheet2')
     const parser = buildEmptyParserWithCaching(new Config(), sheetMapping)
 
-    const ast = parser.parse('=OFFSET(Sheet1!A1, 0, 0)', adr('A1', 1)).ast as CellReferenceAst
+    const ast = parser.parse('=OFFSET(Sheet2!A1, 0, 0)', adr('A1', 0)).ast as CellReferenceAst
     expect(ast.type).toBe(AstNodeType.CELL_REFERENCE)
-    expect(ast.reference).toEqual(CellAddress.relative(0, 0, 0))
+    expect(ast.reference).toEqual(CellAddress.relative(0, 0, 1))
   })
 
   it('function OFFSET can reference a different sheet', () => {