Refactor

Author: sequba

src/DependencyGraph/DependencyGraph.ts

@@ -308,10 +308,6 @@ 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)) {
@@ -519,6 +515,9 @@ export class DependencyGraph {
     this.setAddressMappingForArrayVertex(vertex, address)
   }
 
+  /**
+   * TODO
+   */
   public* arrayFormulaNodes(): IterableIterator<ArrayVertex> {
     for (const vertex of this.graph.getNodes()) {
       if (vertex instanceof ArrayVertex) {
@@ -527,6 +526,9 @@ export class DependencyGraph {
     }
   }
 
+  /**
+   * TODO
+   */
   public* formulaNodes(): IterableIterator<FormulaVertex> {
     for (const vertex of this.graph.getNodes()) {
       if (vertex instanceof FormulaVertex) {

src/Operations.ts

@@ -245,25 +245,51 @@ export class Operations {
     this.columnSearch.removeSheet(sheetId)
   }
 
+  /**
+   * TODO
+   */
   public addSheet(name?: string): { addedSheetName: string, version: number } {
     const sheetId = this.sheetMapping.addSheet(name)
-    const sheet: Sheet = []
-    this.dependencyGraph.addressMapping.autoAddSheet(sheetId, findBoundaries(sheet))
     const addedSheetName = this.sheetMapping.fetchDisplayName(sheetId)
-    const quotedSheetName = `'${addedSheetName.replace(/'/g, "''")}'`
+    this.dependencyGraph.addressMapping.autoAddSheet(sheetId, findBoundaries([]))
+    this.reparseFormulasDependingOnSheet(addedSheetName)
+    return { addedSheetName, version: 0 } // TODO: calculate version
+  }
 
-    // TODO: move this code to dependencyGraph.addSheet()
-    this.stats.measure(StatType.TRANSFORM_ASTS, () => {
-      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
+  /**
+   * TODO
+   */
+  private reparseFormulasDependingOnSheet(sheetName: string): void {
+    const quotedSheetName = `'${sheetName.replace(/'/g, "''")}'`
+    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, sheetName, quotedSheetName)) {
+        const address = node.getAddress(this.dependencyGraph.lazilyTransformingAstService)
+        const formulaText = `=${ast.rawInput}`
+        const parserResult = this.parser.parse(formulaText, address)
+        const { ast: newAst, errors } = parserResult
+        if (errors.length > 0) {
+          this.setParsingErrorToCell(formulaText, errors, address)
+        } else {
+          try {
+            const size = this.arraySizePredictor.checkArraySize(newAst, address)
+
+            if (size.width <= 0 || size.height <= 0) {
+              throw Error('Incorrect array size')
+            }
+
+            this.setFormulaToCell(address, size, parserResult)
+          } catch (error) {
+            if (!(error as Error).message) {
+              throw error
+            }
+
+            const parsingError: ParsingError = { type: ParsingErrorType.InvalidRangeSize, message: 'Invalid range size.' }
+            this.setParsingErrorToCell(formulaText, [parsingError], address)
+          }
         }
       }
-    })
-
-    return { addedSheetName, version: 0 } // TODO: calculate version
+    }
   }
 
   private containsSheetName(rawInput: string, unquotedSheetNameLowercase: string, quotedSheetNameLowercase: string): boolean {

src/dependencyTransformers/RemoveSheetTransformer.ts

@@ -24,7 +24,7 @@ export class RemoveSheetTransformer extends Transformer {
   public performEagerTransformations(graph: DependencyGraph, parser: ParserWithCaching): void {
     for (const node of graph.arrayFormulaNodes()) {
       const [newAst] = this.transformSingleAst(node.getFormula(graph.lazilyTransformingAstService), node.getAddress(graph.lazilyTransformingAstService))
-      const cachedAst = parser.rememberNewAst(newAst)
+      const cachedAst = parser.rememberNewAst(newAst) // TODO: check if this is needed
       node.setFormula(cachedAst)
     }
   }