Browse Source

Merge branch 'main' into bugfix/fix-json-scraper

pull/4115/head
Thomas Kaul 9 months ago
committed by GitHub
parent
commit
408d89f6d8
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 4
      CHANGELOG.md
  2. 14
      libs/common/src/lib/helper.spec.ts
  3. 8
      package-lock.json
  4. 2
      package.json

4
CHANGELOG.md

@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased
### Changed
- Upgraded `@internationalized/number` from version `3.5.2` to `3.6.0`
### Fixed
- Fixed the import of `jsonpath` to support REST APIs (`JSON`) via the scraper configuration

14
libs/common/src/lib/helper.spec.ts

@ -2,37 +2,37 @@ import { extractNumberFromString } from '@ghostfolio/common/helper';
describe('Helper', () => {
describe('Extract number from string', () => {
it('Get decimal number', async () => {
it('Get decimal number', () => {
expect(extractNumberFromString({ value: '999.99' })).toEqual(999.99);
});
it('Get decimal number (with spaces)', async () => {
it('Get decimal number (with spaces)', () => {
expect(extractNumberFromString({ value: ' 999.99 ' })).toEqual(999.99);
});
it('Get decimal number (with currency)', async () => {
it('Get decimal number (with currency)', () => {
expect(extractNumberFromString({ value: '999.99 CHF' })).toEqual(999.99);
});
it('Get decimal number (comma notation)', async () => {
it('Get decimal number (comma notation)', () => {
expect(
extractNumberFromString({ locale: 'de-DE', value: '999,99' })
).toEqual(999.99);
});
it('Get decimal number with group (dot notation)', async () => {
it('Get decimal number with group (dot notation)', () => {
expect(
extractNumberFromString({ locale: 'de-CH', value: '99’999.99' })
).toEqual(99999.99);
});
it('Get decimal number with group (comma notation)', async () => {
it('Get decimal number with group (comma notation)', () => {
expect(
extractNumberFromString({ locale: 'de-DE', value: '99.999,99' })
).toEqual(99999.99);
});
it('Not a number', async () => {
it('Not a number', () => {
expect(extractNumberFromString({ value: 'X' })).toEqual(NaN);
});
});

8
package-lock.json

@ -28,7 +28,7 @@
"@dfinity/identity": "0.15.7",
"@dfinity/principal": "0.15.7",
"@dinero.js/currencies": "2.0.0-alpha.8",
"@internationalized/number": "3.5.2",
"@internationalized/number": "3.6.0",
"@nestjs/bull": "10.0.1",
"@nestjs/cache-manager": "2.2.2",
"@nestjs/common": "10.1.3",
@ -4126,9 +4126,9 @@
}
},
"node_modules/@internationalized/number": {
"version": "3.5.2",
"resolved": "https://registry.npmjs.org/@internationalized/number/-/number-3.5.2.tgz",
"integrity": "sha512-4FGHTi0rOEX1giSkt5MH4/te0eHBq3cvAYsfLlpguV6pzJAReXymiYpE5wPCqKqjkUO3PIsyvk+tBiIV1pZtbA==",
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/@internationalized/number/-/number-3.6.0.tgz",
"integrity": "sha512-PtrRcJVy7nw++wn4W2OuePQQfTqDzfusSuY1QTtui4wa7r+rGVtR75pO8CyKvHvzyQYi3Q1uO5sY0AsB4e65Bw==",
"license": "Apache-2.0",
"dependencies": {
"@swc/helpers": "^0.5.0"

2
package.json

@ -74,7 +74,7 @@
"@dfinity/identity": "0.15.7",
"@dfinity/principal": "0.15.7",
"@dinero.js/currencies": "2.0.0-alpha.8",
"@internationalized/number": "3.5.2",
"@internationalized/number": "3.6.0",
"@nestjs/bull": "10.0.1",
"@nestjs/cache-manager": "2.2.2",
"@nestjs/common": "10.1.3",

Loading…
Cancel
Save