Skip to content

fix(scale): reject non-decimal numeric options #802

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
aiirvizionz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(scale): reject non-decimal numeric options #802

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
6 changes: 3 additions & 3 deletions packages/cli/src/commands/scale.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,21 +74,21 @@ describe('scale numeric option parsers', () => {
expect(parsePercentage('100')).toBe(100);
});

it.each(['nope', '1.5', '0', '-1', 'Infinity', 'NaN', ''])(
it.each(['nope', '1.5', '1e2', '0x10', '0', '-1', 'Infinity', 'NaN', ''])(
'rejects invalid positive integers: %s',
(value) => {
expect(() => parsePositiveInteger(value)).toThrow();
},
);

it.each(['nope', '1.5', '-1', 'Infinity', 'NaN', ''])(
it.each(['nope', '1.5', '1e2', '0x10', '-1', 'Infinity', 'NaN', ''])(
'rejects invalid non-negative integers: %s',
(value) => {
expect(() => parseNonNegativeInteger(value)).toThrow();
},
);

it.each(['nope', '0', '-1', 'Infinity', 'NaN', ''])(
it.each(['nope', '1e2', '0x10', '0', '-1', 'Infinity', 'NaN', ''])(
'rejects invalid positive finite numbers: %s',
(value) => {
expect(() => parsePositiveNumber(value)).toThrow();
Expand Down
24 changes: 18 additions & 6 deletions packages/cli/src/commands/scale.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,29 +122,41 @@ export function getNextId(instances: FleetEntry[]): string {
}

export function parsePositiveInteger(value: string): number {
const parsed = Number(value);
if (value.trim() === '' || !Number.isSafeInteger(parsed) || parsed < 1) {
const parsed = parseDecimalInteger(value);
if (parsed === null || parsed < 1) {
throw new InvalidArgumentError('must be a positive integer');
}
return parsed;
}

export function parseNonNegativeInteger(value: string): number {
const parsed = Number(value);
if (value.trim() === '' || !Number.isSafeInteger(parsed) || parsed < 0) {
const parsed = parseDecimalInteger(value);
if (parsed === null || parsed < 0) {
throw new InvalidArgumentError('must be zero or a positive integer');
}
return parsed;
}

export function parsePositiveNumber(value: string): number {
const parsed = Number(value);
if (value.trim() === '' || !Number.isFinite(parsed) || parsed <= 0) {
const parsed = parseDecimalNumber(value);
if (parsed === null || parsed <= 0) {
throw new InvalidArgumentError('must be a positive finite number');
}
return parsed;
}

function parseDecimalInteger(value: string): number | null {
if (!/^\d+$/.test(value.trim())) return null;
const parsed = Number(value);
return Number.isSafeInteger(parsed) ? parsed : null;
}

function parseDecimalNumber(value: string): number | null {
if (!/^\d+(?:\.\d+)?$/.test(value.trim())) return null;
const parsed = Number(value);
return Number.isFinite(parsed) ? parsed : null;
}

export function parsePercentage(value: string): number {
const parsed = parsePositiveInteger(value);
if (parsed > 100) {
Expand Down
Loading