Skip to content

Improve number transform (ie: do not treat 1e-4 as invalid number) #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Improve number transform (ie: do not treat 1e-4 as invalid number) #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/types/TypeNumber.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ export class TypeNumber extends TypeAny {

// Function when test and transform param
_isTypeNum = () => typeof this._value === 'number';
_isInteger = () => !!`${this._value}`.match(/^-{0,1}\d+$/);
_isFloat = () => !!`${this._value}`.match(/^-?\d+\.\d+$/);
_isInteger = () => !Number.isNaN(+`${this._value}`) && !Number.isNaN(Number.parseInt(`${this._value}`, 10));
_isFloat = () => !Number.isNaN(+`${this._value}`) && !Number.isNaN(Number.parseFloat(`${this._value}`));
_isNumber = () => this._isInteger() || this._isFloat();

_testType() {
Expand Down
45 changes: 42 additions & 3 deletions test/types/TypeNumber.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,14 @@ describe('TypeNumber', () => {
ok5: Types.number().integer(),
ok6: Types.number().integer(),
ok7: Types.number().integer(),
ok8: Types.number().integer(),
ok9: Types.number().integer(),
ok10: Types.number().integer(),
ok11: Types.number().integer(),
ko1: Types.number().integer(),
ko2: Types.number().integer(),
ko3: Types.number().integer(),
ko4: Types.number().integer(),
});

const ok = {
Expand All @@ -30,8 +35,17 @@ describe('TypeNumber', () => {
ok5: '0',
ok6: '-20',
ok7: '20.10',
ok8: 0.001,
ok9: 1e3,
ok10: 1e-3,
ok11: 1e-2,
};
const ko = {
ko1: 'a20',
ko2: '20a',
ko3: '20,10',
ko4: '20ee2',
};
const ko = { ko1: 'a20', ko2: '20a', ko3: '20,10' };
const value = { ...ok, ...ko };

schema.test(value);
Expand All @@ -42,6 +56,9 @@ describe('TypeNumber', () => {
ok5: 0,
ok6: -20,
ok7: 20,
ok8: 0,
ok10: 0,
ok11: 0,
});
expect(Object.keys(ko)).toEqual(Object.keys(schema._errors));
});
Expand All @@ -54,9 +71,15 @@ describe('TypeNumber', () => {
ok4: Types.number(),
ok5: Types.number(),
ok6: Types.number(),
ok7: Types.number(),
ok8: Types.number(),
ok9: Types.number(),
ok10: Types.number(),
ok11: Types.number(),
ko1: Types.number(),
ko2: Types.number(),
ko3: Types.number(),
ko4: Types.number(),
});

const ok = {
Expand All @@ -66,13 +89,29 @@ describe('TypeNumber', () => {
ok4: '20.30',
ok5: '0.30',
ok6: '-20.30',
ok7: '20.10',
ok8: 0.001,
ok9: 1e3,
ok10: 1e-3,
ok11: 1e-2,
};
const ko = {
ko1: 'a20',
ko2: '20a',
ko3: '20,10',
ko4: '20ee2',
};
const ko = { ko1: 'a20', ko2: '20a', ko3: '20,10' };
const value = { ...ok, ...ko };

schema.test(value);

expect(schema.value).toEqual({ ...ok, ok4: 20.3, ok5: 0.3, ok6: -20.3 });
expect(schema.value).toEqual({
...ok,
ok4: 20.3,
ok5: 0.3,
ok6: -20.3,
ok7: 20.1,
});
expect(Object.keys(ko)).toEqual(Object.keys(schema._errors));
});
});
Expand Down