Pu/issue617

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - GPU.js constructor needs to be provided directly to engine configuration. (#355)
+- A **breaking change**: `'` symbol on the input is preserved in the value. (#617)
 
 ### Added
 - Added support for row and column reordering. (#343)

jest.config.js

@@ -44,7 +44,7 @@ module.exports = {
     "<rootDir>/test/**/*spec.(ts|js)"
   ],
 
-  silent: true,
+  silent: false,
 
   // A map from regular expressions to paths to transformers
   transform: {

src/CellContentParser.ts

@@ -173,9 +173,7 @@ export class CellContentParser {
         if (parsedDateNumber !== undefined) {
           return new CellContent.Number(parsedDateNumber)
         } else {
-          return new CellContent.String(
-            content.startsWith('\'') ? content.slice(1) : content,
-          )
+          return new CellContent.String(content)
         }
       }
     } else {

src/DependencyGraph/AddressMapping/AddressMapping.ts

@@ -65,15 +65,15 @@ export class AddressMapping {
     this.addSheet(sheetId, new strategyConstructor(width, height))
   }
 
-  public getCellValue(address: SimpleCellAddress): InterpreterValue {
+  public getCellValue(address: SimpleCellAddress, literalValue?: boolean): InterpreterValue {
     const vertex = this.getCell(address)
 
     if (vertex === null) {
       return EmptyValue
     } else if (vertex instanceof MatrixVertex) {
       return vertex.getMatrixCellValue(address)
     } else {
-      return vertex.getCellValue()
+      return vertex.getCellValue(literalValue)
     }
   }
 

src/DependencyGraph/DependencyGraph.ts

@@ -601,12 +601,12 @@ export class DependencyGraph {
     return this.addressMapping.getCell(address)
   }
 
-  public getCellValue(address: SimpleCellAddress): InterpreterValue {
-    return this.addressMapping.getCellValue(address)
+  public getCellValue(address: SimpleCellAddress, literalValue?: boolean): InterpreterValue {
+    return this.addressMapping.getCellValue(address, literalValue)
   }
 
-  public getScalarValue(address: SimpleCellAddress): InternalScalarValue {
-    const value = this.addressMapping.getCellValue(address)
+  public getScalarValue(address: SimpleCellAddress, literalValue?: boolean): InternalScalarValue {
+    const value = this.addressMapping.getCellValue(address, literalValue)
     if (value instanceof SimpleRangeValue) {
       return new CellError(ErrorType.VALUE, ErrorMessage.ScalarExpected)
     }

src/DependencyGraph/ValueCellVertex.ts

@@ -22,7 +22,10 @@ export class ValueCellVertex {
   /**
    * Returns cell value stored in vertex
    */
-  public getCellValue(): ValueCellVertexValue {
+  public getCellValue(literalValue?: boolean): ValueCellVertexValue {
+    if(!literalValue && typeof this.cellValue === 'string') {
+      return this.cellValue.startsWith('\'') ? this.cellValue.slice(1) : this.cellValue
+    }
     return this.cellValue
   }
 

src/Serialization.ts

@@ -49,7 +49,7 @@ export class Serialization {
     if (formula !== undefined) {
       return formula
     } else {
-      const value: CellValue = this.getCellValue(address)
+      const value: CellValue = this.getCellValue(address, true)
       if (value instanceof DetailedCellError) {
         return this.config.translationPackage.getErrorTranslation(value.type)
       } else {
@@ -58,8 +58,8 @@ export class Serialization {
     }
   }
 
-  public getCellValue(address: SimpleCellAddress): CellValue {
-    return this.exporter.exportValue(this.dependencyGraph.getScalarValue(address))
+  public getCellValue(address: SimpleCellAddress, literalValue?: boolean): CellValue {
+    return this.exporter.exportValue(this.dependencyGraph.getScalarValue(address, literalValue))
   }
 
   public getSheetValues(sheet: number): CellValue[][] {

test/CellContentParser.spec.ts

@@ -125,12 +125,12 @@ describe('CellContentParser', () => {
   })
 
   it( 'starts with \'', () => {
-    expect(cellContentParser.parse('\'123')).toEqual(new CellContent.String('123'))
-    expect(cellContentParser.parse('\'=1+1')).toEqual(new CellContent.String('=1+1'))
-    expect(cellContentParser.parse('\'\'1')).toEqual(new CellContent.String('\'1'))
-    expect(cellContentParser.parse('\' 1')).toEqual(new CellContent.String(' 1'))
+    expect(cellContentParser.parse('\'123')).toEqual(new CellContent.String('\'123'))
+    expect(cellContentParser.parse('\'=1+1')).toEqual(new CellContent.String('\'=1+1'))
+    expect(cellContentParser.parse('\'\'1')).toEqual(new CellContent.String('\'\'1'))
+    expect(cellContentParser.parse('\' 1')).toEqual(new CellContent.String('\' 1'))
     expect(cellContentParser.parse(' \'1')).toEqual(new CellContent.String(' \'1'))
-    expect(cellContentParser.parse('\'02-02-2020')).toEqual(new CellContent.String('02-02-2020'))
+    expect(cellContentParser.parse('\'02-02-2020')).toEqual(new CellContent.String('\'02-02-2020'))
   })
 
   it('currency parsing', () => {

test/escaping-support.spec.ts

@@ -0,0 +1,10 @@
+import {HyperFormula} from '../src'
+import {adr} from './testUtils'
+
+describe('escaped formulas', () => {
+  it('should serialize properly', () => {
+    const engine = HyperFormula.buildFromArray([['\'=SUM(2,2)']])
+    expect(engine.getCellSerialized(adr('A1'))).toEqual('\'=SUM(2,2)')
+    expect(engine.getCellValue(adr('A1'))).toEqual('=SUM(2,2)')
+  })
+})