Merge branch 'release/0.6.1'

Author: jansiegel

CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.6.1] - 2021-05-24
+
+### Changed
+- Remove redundant `'assert'` dependency from the code. (#672)
+
+### Fixed
+- Fixed library support for IE11. The `unorm` package is added to the dependencies. (#675)
+
 ## [0.6.0] - 2021-04-27
 
 ### Changed

docs/guide/dependencies.md

@@ -6,13 +6,14 @@ features.
 
 | Name | License | Author |
 | :--- | :--- | :--- |
+| [bessel](https://github.com/SheetJS/bessel) | Apache v2.0 | SheetJS |
 | [Chevrotain](https://github.com/SAP/chevrotain) | Apache v2.0 | SAP SE or an SAP affiliate company |
-| [GPU.js](https://github.com/gpujs/gpu.js/) ([optional](enabling-gpu-acceleration.md)) | The MIT License | gpu.js Team |
 | [core-js](https://github.com/zloirock/core-js) | The MIT License | Denis Pushkarev |
-| [tiny-emitter](https://github.com/scottcorgan/tiny-emitter) | The MIT License | Scott Corgan |
-| [regenerator-runtime](https://github.com/facebook/regenerator/tree/master/packages/regenerator-runtime) | The MIT License | Facebook, Inc. |
+| [GPU.js](https://github.com/gpujs/gpu.js/) ([optional](enabling-gpu-acceleration.md)) | The MIT License | gpu.js Team |
 | [jStat](https://github.com/jstat/jstat) | The MIT License | jStat |
-| [bessel](https://github.com/SheetJS/bessel) | Apache v2.0 | SheetJS |
+| [regenerator-runtime](https://github.com/facebook/regenerator/tree/master/packages/regenerator-runtime) | The MIT License | Facebook, Inc. |
+| [tiny-emitter](https://github.com/scottcorgan/tiny-emitter) | The MIT License | Scott Corgan |
+| [unorm](https://github.com/walling/unorm) | The MIT or GPL-2.0 License | Matsuza, Bjarke Walling |
 
 <br>
 

ht.config.js

@@ -6,5 +6,5 @@ module.exports = {
   HT_VERSION: packageBody.version,
   HT_PACKAGE_NAME: packageBody.name,
   HT_BUILD_DATE: moment().format('DD/MM/YYYY HH:mm:ss'),
-  HT_RELEASE_DATE: '27/04/2021',
+  HT_RELEASE_DATE: '24/05/2021',
 };

package-lock.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/handsontable/hyperformula/issues"
   },
   "author": "Handsoncode <hello@handsontable.com>",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "keywords": [
     "formula",
     "spreadsheet",
@@ -94,6 +94,7 @@
     "@types/jest": "^25.1.3",
     "@types/jsdom": "^16.2.1",
     "@types/node": "^10.17.19",
+    "@types/unorm": "^1.3.28",
     "@types/webpack-env": "^1.15.2",
     "@typescript-eslint/eslint-plugin": "^2.20.0",
     "@typescript-eslint/parser": "^2.20.0",
@@ -144,7 +145,8 @@
     "chevrotain": "^6.5.0",
     "core-js": "^3.6.4",
     "regenerator-runtime": "^0.13.3",
-    "tiny-emitter": "^2.1.0"
+    "tiny-emitter": "^2.1.0",
+    "unorm": "^1.6.0"
   },
   "optionalDependencies": {
     "gpu.js": "2.3.0"

package.json

@@ -3,7 +3,6 @@
  * Copyright (c) 2021 Handsoncode. All rights reserved.
  */
 
-import assert from 'assert'
 import {AbsoluteCellRange} from '../AbsoluteCellRange'
 import {absolutizeDependencies} from '../absolutizeDependencies'
 import {
@@ -157,7 +156,9 @@ export class DependencyGraph {
   }
 
   public ensureThatVertexIsNonMatrixCellVertex(vertex: CellVertex | null) {
-    assert.ok(!(vertex instanceof MatrixVertex), 'Illegal operation')
+    if (vertex instanceof MatrixVertex) {
+      throw new Error('Illegal operation')
+    }
   }
 
   public clearRecentlyChangedVertices() {

src/DependencyGraph/DependencyGraph.ts

@@ -3,6 +3,7 @@
  * Copyright (c) 2021 Handsoncode. All rights reserved.
  */
 
+import unorm from 'unorm'
 import {CellError, CellValueTypeOrd, ErrorType, getCellValueType} from '../Cell'
 import {Config} from '../Config'
 import {DateTimeHelper} from '../DateTimeHelper'
@@ -115,7 +116,7 @@ export class ArithmeticHelper {
       str = str.toLowerCase()
     }
     if(!this.config.accentSensitive) {
-      str = str.normalize('NFD').replace(/[\u0300-\u036f]/g, '')
+      str = normalizeString(str, 'nfd').replace(/[\u0300-\u036f]/g, '')
     }
     return str
   }
@@ -758,6 +759,12 @@ function inferExtendedNumberTypeMultiplicative(leftArg: ExtendedNumber, rightArg
 }
 
 export function forceNormalizeString(str: string): string {
-  return str.toLowerCase().normalize('NFD').replace(/[\u0300-\u036f]/g, '')
+  return normalizeString(str.toLowerCase(), 'nfd').replace(/[\u0300-\u036f]/g, '')
 }
 
+type NormalizationForm = 'nfc' | 'nfd' | 'nfkc' | 'nfkd'
+
+export function normalizeString(str: string, form: NormalizationForm): string {
+  return typeof str.normalize === 'function'
+    ? str.normalize(form.toUpperCase()) : unorm[form](str)
+}

src/interpreter/ArithmeticHelper.ts

@@ -3,7 +3,6 @@
  * Copyright (c) 2021 Handsoncode. All rights reserved.
  */
 
-import assert from 'assert'
 import {AbsoluteCellRange, DIFFERENT_SHEETS_ERROR} from '../../AbsoluteCellRange'
 import {CellError, ErrorType, SimpleCellAddress} from '../../Cell'
 import {ErrorMessage} from '../../error-message'
@@ -545,7 +544,10 @@ export class NumericAggregationPlugin extends FunctionPlugin {
     const rangeStart = range.start
     const rangeEnd = range.end
     const rangeVertex = this.dependencyGraph.getRange(rangeStart, rangeEnd)!
-    assert.ok(rangeVertex, 'Range does not exists in graph')
+
+    if (!rangeVertex) {
+      throw new Error('Range does not exists in graph')
+    }
 
     let value = rangeVertex.getFunctionValue(functionName) as (T | CellError)
     if (!value) {
@@ -629,4 +631,3 @@ function numbersBooleans(arg: InternalScalarValue): Maybe<CellError | ExtendedNu
     return undefined
   }
 }
-

src/interpreter/plugin/NumericAggregationPlugin.ts

@@ -95,10 +95,21 @@ describe('ColumnIndex#add', () => {
     index.add('A', adr('A2'))
     index.add('ą', adr('A3'))
 
+    // Some strings don't have a canonical form, so for them, the index is created as usual.
+    index.add('l', adr('A4'))
+    index.add('ł', adr('A5'))
+    index.add('t', adr('A6'))
+    index.add('ŧ', adr('A7'))
+
     const columnMap = index.getColumnMap(0, 0)
 
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    // eslint-disable @typescript-eslint/no-non-null-assertion
     expect(columnMap.get('a')!.index.length).toBe(3)
+    expect(columnMap.get('l')!.index.length).toBe(1)
+    expect(columnMap.get('ł')!.index.length).toBe(1)
+    expect(columnMap.get('t')!.index.length).toBe(1)
+    expect(columnMap.get('ŧ')!.index.length).toBe(1)
+    // eslint-enable @typescript-eslint/no-non-null-assertion
   })
 })