Different approach - no transformer

Author: sequba

CHANGELOG.md

@@ -9,7 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Fixed
 
-- Fixed an issue where cells where not recalculated after adding new sheet. [#1116](https://github.com/handsontable/hyperformula/issues/1116)
+- Fixed an issue where cells were not recalculated after adding new sheet. [#1116](https://github.com/handsontable/hyperformula/issues/1116)
 
 ## [3.1.0] - 2025-10-14
 

src/DependencyGraph/DependencyGraph.ts

@@ -24,7 +24,7 @@ import {SimpleRangeValue} from '../SimpleRangeValue'
 import {LazilyTransformingAstService} from '../LazilyTransformingAstService'
 import {Maybe} from '../Maybe'
 import {NamedExpressions} from '../NamedExpressions'
-import {Ast, collectDependencies, NamedExpressionDependency} from '../parser'
+import {Ast, AstNodeType, collectDependencies, NamedExpressionDependency} from '../parser'
 import {ColumnsSpan, RowsSpan, Span} from '../Span'
 import {Statistics, StatType} from '../statistics'
 import {
@@ -308,6 +308,10 @@ export class DependencyGraph {
     })
   }
 
+  public addSheet(sheetName: string): void {
+    // TODO
+  }
+
   public clearSheet(sheetId: number) {
     const arrays: Set<ArrayVertex> = new Set()
     for (const [address, vertex] of this.addressMapping.sheetEntries(sheetId)) {
@@ -523,6 +527,14 @@ export class DependencyGraph {
     }
   }
 
+  public* formulaNodes(): IterableIterator<FormulaVertex> {
+    for (const vertex of this.graph.getNodes()) {
+      if (vertex instanceof FormulaVertex) {
+        yield vertex
+      }
+    }
+  }
+
   public* entriesFromRowsSpan(rowsSpan: RowsSpan): IterableIterator<[SimpleCellAddress, CellVertex]> {
     yield* this.addressMapping.entriesFromRowsSpan(rowsSpan)
   }

src/HyperFormula.ts

@@ -2635,7 +2635,7 @@ export class HyperFormula implements TypedEmitter {
       validateArgToType(sheetName, 'string', 'sheetName')
     }
     const addedSheetName = this._crudOperations.addSheet(sheetName)
-    this.recomputeIfDependencyGraphNeedsIt() //?
+    this.recomputeIfDependencyGraphNeedsIt()
     this._emitter.emit(Events.SheetAdded, addedSheetName)
     return addedSheetName
   }

src/Operations.ts

@@ -28,7 +28,6 @@ import { FormulaVertex } from './DependencyGraph/FormulaCellVertex'
 import { RawAndParsedValue } from './DependencyGraph/ValueCellVertex'
 import { AddColumnsTransformer } from './dependencyTransformers/AddColumnsTransformer'
 import { AddRowsTransformer } from './dependencyTransformers/AddRowsTransformer'
-import { AddSheetTransformer } from './dependencyTransformers/AddSheetTransformer'
 import { CleanOutOfScopeDependenciesTransformer } from './dependencyTransformers/CleanOutOfScopeDependenciesTransformer'
 import { MoveCellsTransformer } from './dependencyTransformers/MoveCellsTransformer'
 import { RemoveColumnsTransformer } from './dependencyTransformers/RemoveColumnsTransformer'
@@ -52,7 +51,7 @@ import {
   NamedExpressions
 } from './NamedExpressions'
 import { NamedExpressionDependency, ParserWithCaching, ParsingErrorType, RelativeDependency } from './parser'
-import { ParsingError } from './parser/Ast'
+import { AstNodeType, ParsingError } from './parser/Ast'
 import { ParsingResult } from './parser/ParserWithCaching'
 import { findBoundaries, Sheet } from './Sheet'
 import { ColumnsSpan, RowsSpan } from './Span'
@@ -251,38 +250,27 @@ export class Operations {
     const sheet: Sheet = []
     this.dependencyGraph.addressMapping.autoAddSheet(sheetId, findBoundaries(sheet))
     const addedSheetName = this.sheetMapping.fetchDisplayName(sheetId)
+    const quotedSheetName = `'${addedSheetName.replace(/'/g, "''")}'`
 
-    // Rebuild formulas that reference the newly added sheet
-    let version = 0
+    // TODO: move this code to dependencyGraph.addSheet()
     this.stats.measure(StatType.TRANSFORM_ASTS, () => {
-      const transformation = new AddSheetTransformer(sheetId, addedSheetName)
-      transformation.performEagerTransformations(this.dependencyGraph, this.parser)
-
-      // TODO: move this logic to the transformer
-      // Rebuild non-array formulas that were transformed
-      for (const vertex of this.dependencyGraph.graph.getNodes()) {
-        if (vertex instanceof FormulaCellVertex) {
-          const originalAst = vertex.getFormula(this.lazilyTransformingAstService)
-          const address = vertex.getAddress(this.lazilyTransformingAstService)
-          const [transformedAst] = transformation.transformSingleAst(originalAst, address)
-
-          // Check if the AST actually changed
-          const originalHash = this.parser.computeHashFromAst(originalAst)
-          const transformedHash = this.parser.computeHashFromAst(transformedAst)
-
-          if (originalHash !== transformedHash) {
-            // The formula was transformed (ERROR_WITH_RAW_INPUT -> valid reference)
-            // We need to rebuild it with proper dependencies using setFormulaToCellFromCache
-            this.parser.rememberNewAst(transformedAst)
-            this.setFormulaToCellFromCache(transformedHash, address)
-          }
+      for (const node of this.dependencyGraph.formulaNodes()) {
+        const ast = node.getFormula(this.dependencyGraph.lazilyTransformingAstService)
+        if (ast.type === AstNodeType.ERROR_WITH_RAW_INPUT && this.containsSheetName(ast.rawInput, addedSheetName, quotedSheetName)) {
+          const address = node.getAddress(this.dependencyGraph.lazilyTransformingAstService)
+          this.setCellContent(address, `=${ast.rawInput}`) // or maybe take just the inner part of this function body
         }
       }
-
-      version = this.lazilyTransformingAstService.addTransformation(transformation)
     })
 
-    return { addedSheetName, version }
+    return { addedSheetName, version: 0 } // TODO: calculate version
+  }
+
+  private containsSheetName(rawInput: string, unquotedSheetNameLowercase: string, quotedSheetNameLowercase: string): boolean {
+    const lowerInput = rawInput.toLowerCase()
+
+    return lowerInput.includes(`${unquotedSheetNameLowercase}!`)
+        || lowerInput.includes(`${quotedSheetNameLowercase}!`)
   }
 
   public renameSheet(sheetId: number, newName: string) {

src/dependencyTransformers/AddSheetTransformer.ts

@@ -117,6 +117,9 @@ describe('add sheet to engine', () => {
     expect(engine.getCellValue(adr('A1', engine.getSheetId(table1Name)))).toEqualError(detailedError(ErrorType.REF))
 
     engine.addSheet(table2Name)
+
+    expect(engine.getCellValue(adr('A1', engine.getSheetId(table1Name)))).toBeNull()
+
     engine.setCellContents(adr('A1', engine.getSheetId(table2Name)), 10)
 
     expect(engine.getCellValue(adr('A1', engine.getSheetId(table1Name)))).toBe(10)
@@ -130,7 +133,6 @@ describe('add sheet to engine', () => {
     engine.batch(() => {
       engine.addSheet(table1Name)
       engine.setCellContents(adr('A1', engine.getSheetId(table1Name)), `='${table2Name}'!A1`)
-
       engine.addSheet(table2Name)
       engine.setCellContents(adr('A1', engine.getSheetId(table2Name)), 10)
     })
@@ -144,13 +146,10 @@ describe('add sheet to engine', () => {
     const table2Name = 'table2'
 
     engine.suspendEvaluation()
-
     engine.addSheet(table1Name)
     engine.setCellContents(adr('A1', engine.getSheetId(table1Name)), `='${table2Name}'!A1`)
-
     engine.addSheet(table2Name)
     engine.setCellContents(adr('A1', engine.getSheetId(table2Name)), 10)
-
     engine.resumeEvaluation()
 
     expect(engine.getCellValue(adr('A1', engine.getSheetId(table1Name)))).toBe(10)