Skip to content

Commit e7a6a4f

Browse files
PlaneshifterPlaneshifter
committed
Format error messages
1 parent 4b4b573 commit e7a6a4f

File tree

13 files changed

+85
-72
lines changed

13 files changed

+85
-72
lines changed

‎lib/node_modules/@stdlib/simulate/iter/bartlett-hann-pulse/lib/validate.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ var isPositiveNumber = require( '@stdlib/assert/is-positive-number' ).isPrimitiv
2626
var isInteger = require( '@stdlib/assert/is-integer' ).isPrimitive;
2727
var isPositiveInteger = require( '@stdlib/assert/is-positive-integer' ).isPrimitive;
2828
var isNonNegativeInteger = require( '@stdlib/assert/is-nonnegative-integer' ).isPrimitive;
29+
var format = require( '@stdlib/string/format' );
2930

3031

3132
// MAIN //
@@ -55,36 +56,36 @@ var isNonNegativeInteger = require( '@stdlib/assert/is-nonnegative-integer' ).is
5556
*/
5657
function validate( opts, options ) {
5758
if ( !isPlainObject( options ) ) {
58-
return new TypeError( 'invalid argument. Options argument must be an object. Value: `' + options + '`.' );
59+
return new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', options ) );
5960
}
6061
if ( hasOwnProp( options, 'duration' ) ) {
6162
opts.duration = options.duration;
6263
if ( !isPositiveInteger( options.duration ) ) {
63-
return new TypeError( 'invalid option. `duration` option must be a positive integer. Option: `' + options.duration + '`.' );
64+
return new TypeError( format( 'invalid option. `%s` option must be a positive integer. Option: `%s`.', 'duration', options.duration ) );
6465
}
6566
}
6667
if ( hasOwnProp( options, 'period' ) ) {
6768
opts.period = options.period;
6869
if ( !isPositiveInteger( options.period ) ) {
69-
return new TypeError( 'invalid option. `period` option must be a positive integer. Option: `' + options.period + '`.' );
70+
return new TypeError( format( 'invalid option. `%s` option must be a positive integer. Option: `%s`.', 'period', options.period ) );
7071
}
7172
}
7273
if ( hasOwnProp( options, 'amplitude' ) ) {
7374
opts.amplitude = options.amplitude;
7475
if ( !isPositiveNumber( options.amplitude ) ) {
75-
return new TypeError( 'invalid option. `amplitude` option must be a positive number. Option: `' + options.amplitude + '`.' );
76+
return new TypeError( format( 'invalid option. `%s` option must be a positive number. Option: `%s`.', 'amplitude', options.amplitude ) );
7677
}
7778
}
7879
if ( hasOwnProp( options, 'offset' ) ) {
7980
opts.offset = options.offset;
8081
if ( !isInteger( options.offset ) ) {
81-
return new TypeError( 'invalid option. `offset` option must be an integer. Option: `' + options.offset + '`.' );
82+
return new TypeError( format( 'invalid option. `%s` option must be an integer. Option: `%s`.', 'offset', options.offset ) );
8283
}
8384
}
8485
if ( hasOwnProp( options, 'iter' ) ) {
8586
opts.iter = options.iter;
8687
if ( !isNonNegativeInteger( options.iter ) ) {
87-
return new TypeError( 'invalid option. `iter` option must be a nonnegative integer. Option: `' + options.iter + '`.' );
88+
return new TypeError( format( 'invalid option. `%s` option must be a nonnegative integer. Option: `%s`.', 'iter', options.iter ) );
8889
}
8990
}
9091
return null;

‎lib/node_modules/@stdlib/simulate/iter/bartlett-pulse/lib/validate.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ var isPositiveNumber = require( '@stdlib/assert/is-positive-number' ).isPrimitiv
2626
var isInteger = require( '@stdlib/assert/is-integer' ).isPrimitive;
2727
var isPositiveInteger = require( '@stdlib/assert/is-positive-integer' ).isPrimitive;
2828
var isNonNegativeInteger = require( '@stdlib/assert/is-nonnegative-integer' ).isPrimitive;
29+
var format = require( '@stdlib/string/format' );
2930

3031

3132
// MAIN //
@@ -55,36 +56,36 @@ var isNonNegativeInteger = require( '@stdlib/assert/is-nonnegative-integer' ).is
5556
*/
5657
function validate( opts, options ) {
5758
if ( !isPlainObject( options ) ) {
58-
return new TypeError( 'invalid argument. Options argument must be an object. Value: `' + options + '`.' );
59+
return new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', options ) );
5960
}
6061
if ( hasOwnProp( options, 'duration' ) ) {
6162
opts.duration = options.duration;
6263
if ( !isPositiveInteger( options.duration ) ) {
63-
return new TypeError( 'invalid option. `duration` option must be a positive integer. Option: `' + options.duration + '`.' );
64+
return new TypeError( format( 'invalid option. `%s` option must be a positive integer. Option: `%s`.', 'duration', options.duration ) );
6465
}
6566
}
6667
if ( hasOwnProp( options, 'period' ) ) {
6768
opts.period = options.period;
6869
if ( !isPositiveInteger( options.period ) ) {
69-
return new TypeError( 'invalid option. `period` option must be a positive integer. Option: `' + options.period + '`.' );
70+
return new TypeError( format( 'invalid option. `%s` option must be a positive integer. Option: `%s`.', 'period', options.period ) );
7071
}
7172
}
7273
if ( hasOwnProp( options, 'amplitude' ) ) {
7374
opts.amplitude = options.amplitude;
7475
if ( !isPositiveNumber( options.amplitude ) ) {
75-
return new TypeError( 'invalid option. `amplitude` option must be a positive number. Option: `' + options.amplitude + '`.' );
76+
return new TypeError( format( 'invalid option. `%s` option must be a positive number. Option: `%s`.', 'amplitude', options.amplitude ) );
7677
}
7778
}
7879
if ( hasOwnProp( options, 'offset' ) ) {
7980
opts.offset = options.offset;
8081
if ( !isInteger( options.offset ) ) {
81-
return new TypeError( 'invalid option. `offset` option must be an integer. Option: `' + options.offset + '`.' );
82+
return new TypeError( format( 'invalid option. `%s` option must be an integer. Option: `%s`.', 'offset', options.offset ) );
8283
}
8384
}
8485
if ( hasOwnProp( options, 'iter' ) ) {
8586
opts.iter = options.iter;
8687
if ( !isNonNegativeInteger( options.iter ) ) {
87-
return new TypeError( 'invalid option. `iter` option must be a nonnegative integer. Option: `' + options.iter + '`.' );
88+
return new TypeError( format( 'invalid option. `%s` option must be a nonnegative integer. Option: `%s`.', 'iter', options.iter ) );
8889
}
8990
}
9091
return null;

‎lib/node_modules/@stdlib/simulate/iter/cosine-wave/lib/validate.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ var isInteger = require( '@stdlib/assert/is-integer' ).isPrimitive;
2626
var isPositiveInteger = require( '@stdlib/assert/is-positive-integer' ).isPrimitive;
2727
var isNonNegativeInteger = require( '@stdlib/assert/is-nonnegative-integer' ).isPrimitive;
2828
var isNonNegativeNumber = require( '@stdlib/assert/is-nonnegative-number' ).isPrimitive;
29+
var format = require( '@stdlib/string/format' );
2930

3031

3132
// MAIN //
@@ -54,30 +55,30 @@ var isNonNegativeNumber = require( '@stdlib/assert/is-nonnegative-number' ).isPr
5455
*/
5556
function validate( opts, options ) {
5657
if ( !isPlainObject( options ) ) {
57-
return new TypeError( 'invalid argument. Options argument must be an object. Value: `' + options + '`.' );
58+
return new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', options ) );
5859
}
5960
if ( hasOwnProp( options, 'period' ) ) {
6061
opts.period = options.period;
6162
if ( !isPositiveInteger( options.period ) ) {
62-
return new TypeError( 'invalid option. `period` option must be an positive integer. Option: `' + options.period + '`.' );
63+
return new TypeError( format( 'invalid option. `%s` option must be an positive integer. Option: `%s`.', 'period', options.period ) );
6364
}
6465
}
6566
if ( hasOwnProp( options, 'amplitude' ) ) {
6667
opts.amplitude = options.amplitude;
6768
if ( !isNonNegativeNumber( options.amplitude ) ) {
68-
return new TypeError( 'invalid option. `amplitude` option must be a nonnegative number. Option: `' + options.amplitude + '`.' );
69+
return new TypeError( format( 'invalid option. `%s` option must be a nonnegative number. Option: `%s`.', 'amplitude', options.amplitude ) );
6970
}
7071
}
7172
if ( hasOwnProp( options, 'offset' ) ) {
7273
opts.offset = options.offset;
7374
if ( !isInteger( options.offset ) ) {
74-
return new TypeError( 'invalid option. `offset` option must be an integer. Option: `' + options.offset + '`.' );
75+
return new TypeError( format( 'invalid option. `%s` option must be an integer. Option: `%s`.', 'offset', options.offset ) );
7576
}
7677
}
7778
if ( hasOwnProp( options, 'iter' ) ) {
7879
opts.iter = options.iter;
7980
if ( !isNonNegativeInteger( options.iter ) ) {
80-
return new TypeError( 'invalid option. `iter` option must be a nonnegative integer. Option: `' + options.iter + '`.' );
81+
return new TypeError( format( 'invalid option. `%s` option must be a nonnegative integer. Option: `%s`.', 'iter', options.iter ) );
8182
}
8283
}
8384
return null;

‎lib/node_modules/@stdlib/simulate/iter/dirac-comb/lib/validate.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ var hasOwnProp = require( '@stdlib/assert/has-own-property' );
2525
var isInteger = require( '@stdlib/assert/is-integer' ).isPrimitive;
2626
var isPositiveInteger = require( '@stdlib/assert/is-positive-integer' ).isPrimitive;
2727
var isNonNegativeInteger = require( '@stdlib/assert/is-nonnegative-integer' ).isPrimitive;
28+
var format = require( '@stdlib/string/format' );
2829

2930

3031
// MAIN //
@@ -52,24 +53,24 @@ var isNonNegativeInteger = require( '@stdlib/assert/is-nonnegative-integer' ).is
5253
*/
5354
function validate( opts, options ) {
5455
if ( !isPlainObject( options ) ) {
55-
return new TypeError( 'invalid argument. Options argument must be an object. Value: `' + options + '`.' );
56+
return new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', options ) );
5657
}
5758
if ( hasOwnProp( options, 'period' ) ) {
5859
opts.period = options.period;
5960
if ( !isPositiveInteger( options.period ) ) {
60-
return new TypeError( 'invalid option. `period` option must be an positive integer. Option: `' + options.period + '`.' );
61+
return new TypeError( format( 'invalid option. `%s` option must be an positive integer. Option: `%s`.', 'period', options.period ) );
6162
}
6263
}
6364
if ( hasOwnProp( options, 'offset' ) ) {
6465
opts.offset = options.offset;
6566
if ( !isInteger( options.offset ) ) {
66-
return new TypeError( 'invalid option. `offset` option must be an integer. Option: `' + options.offset + '`.' );
67+
return new TypeError( format( 'invalid option. `%s` option must be an integer. Option: `%s`.', 'offset', options.offset ) );
6768
}
6869
}
6970
if ( hasOwnProp( options, 'iter' ) ) {
7071
opts.iter = options.iter;
7172
if ( !isNonNegativeInteger( options.iter ) ) {
72-
return new TypeError( 'invalid option. `iter` option must be a nonnegative integer. Option: `' + options.iter + '`.' );
73+
return new TypeError( format( 'invalid option. `%s` option must be a nonnegative integer. Option: `%s`.', 'iter', options.iter ) );
7374
}
7475
}
7576
return null;

‎lib/node_modules/@stdlib/simulate/iter/flat-top-pulse/lib/validate.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ var isPositiveNumber = require( '@stdlib/assert/is-positive-number' ).isPrimitiv
2626
var isInteger = require( '@stdlib/assert/is-integer' ).isPrimitive;
2727
var isPositiveInteger = require( '@stdlib/assert/is-positive-integer' ).isPrimitive;
2828
var isNonNegativeInteger = require( '@stdlib/assert/is-nonnegative-integer' ).isPrimitive;
29+
var format = require( '@stdlib/string/format' );
2930

3031

3132
// MAIN //
@@ -55,36 +56,36 @@ var isNonNegativeInteger = require( '@stdlib/assert/is-nonnegative-integer' ).is
5556
*/
5657
function validate( opts, options ) {
5758
if ( !isPlainObject( options ) ) {
58-
return new TypeError( 'invalid argument. Options argument must be an object. Value: `' + options + '`.' );
59+
return new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', options ) );
5960
}
6061
if ( hasOwnProp( options, 'duration' ) ) {
6162
opts.duration = options.duration;
6263
if ( !isPositiveInteger( options.duration ) ) {
63-
return new TypeError( 'invalid option. `duration` option must be a positive integer. Option: `' + options.duration + '`.' );
64+
return new TypeError( format( 'invalid option. `%s` option must be a positive integer. Option: `%s`.', 'duration', options.duration ) );
6465
}
6566
}
6667
if ( hasOwnProp( options, 'period' ) ) {
6768
opts.period = options.period;
6869
if ( !isPositiveInteger( options.period ) ) {
69-
return new TypeError( 'invalid option. `period` option must be a positive integer. Option: `' + options.period + '`.' );
70+
return new TypeError( format( 'invalid option. `%s` option must be a positive integer. Option: `%s`.', 'period', options.period ) );
7071
}
7172
}
7273
if ( hasOwnProp( options, 'amplitude' ) ) {
7374
opts.amplitude = options.amplitude;
7475
if ( !isPositiveNumber( options.amplitude ) ) {
75-
return new TypeError( 'invalid option. `amplitude` option must be a positive number. Option: `' + options.amplitude + '`.' );
76+
return new TypeError( format( 'invalid option. `%s` option must be a positive number. Option: `%s`.', 'amplitude', options.amplitude ) );
7677
}
7778
}
7879
if ( hasOwnProp( options, 'offset' ) ) {
7980
opts.offset = options.offset;
8081
if ( !isInteger( options.offset ) ) {
81-
return new TypeError( 'invalid option. `offset` option must be an integer. Option: `' + options.offset + '`.' );
82+
return new TypeError( format( 'invalid option. `%s` option must be an integer. Option: `%s`.', 'offset', options.offset ) );
8283
}
8384
}
8485
if ( hasOwnProp( options, 'iter' ) ) {
8586
opts.iter = options.iter;
8687
if ( !isNonNegativeInteger( options.iter ) ) {
87-
return new TypeError( 'invalid option. `iter` option must be a nonnegative integer. Option: `' + options.iter + '`.' );
88+
return new TypeError( format( 'invalid option. `%s` option must be a nonnegative integer. Option: `%s`.', 'iter', options.iter ) );
8889
}
8990
}
9091
return null;

‎lib/node_modules/@stdlib/simulate/iter/hann-pulse/lib/validate.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ var isPositiveNumber = require( '@stdlib/assert/is-positive-number' ).isPrimitiv
2626
var isInteger = require( '@stdlib/assert/is-integer' ).isPrimitive;
2727
var isPositiveInteger = require( '@stdlib/assert/is-positive-integer' ).isPrimitive;
2828
var isNonNegativeInteger = require( '@stdlib/assert/is-nonnegative-integer' ).isPrimitive;
29+
var format = require( '@stdlib/string/format' );
2930

3031

3132
// MAIN //
@@ -55,36 +56,36 @@ var isNonNegativeInteger = require( '@stdlib/assert/is-nonnegative-integer' ).is
5556
*/
5657
function validate( opts, options ) {
5758
if ( !isPlainObject( options ) ) {
58-
return new TypeError( 'invalid argument. Options argument must be an object. Value: `' + options + '`.' );
59+
return new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', options ) );
5960
}
6061
if ( hasOwnProp( options, 'duration' ) ) {
6162
opts.duration = options.duration;
6263
if ( !isPositiveInteger( options.duration ) ) {
63-
return new TypeError( 'invalid option. `duration` option must be a positive integer. Option: `' + options.duration + '`.' );
64+
return new TypeError( format( 'invalid option. `%s` option must be a positive integer. Option: `%s`.', 'duration', options.duration ) );
6465
}
6566
}
6667
if ( hasOwnProp( options, 'period' ) ) {
6768
opts.period = options.period;
6869
if ( !isPositiveInteger( options.period ) ) {
69-
return new TypeError( 'invalid option. `period` option must be a positive integer. Option: `' + options.period + '`.' );
70+
return new TypeError( format( 'invalid option. `%s` option must be a positive integer. Option: `%s`.', 'period', options.period ) );
7071
}
7172
}
7273
if ( hasOwnProp( options, 'amplitude' ) ) {
7374
opts.amplitude = options.amplitude;
7475
if ( !isPositiveNumber( options.amplitude ) ) {
75-
return new TypeError( 'invalid option. `amplitude` option must be a positive number. Option: `' + options.amplitude + '`.' );
76+
return new TypeError( format( 'invalid option. `%s` option must be a positive number. Option: `%s`.', 'amplitude', options.amplitude ) );
7677
}
7778
}
7879
if ( hasOwnProp( options, 'offset' ) ) {
7980
opts.offset = options.offset;
8081
if ( !isInteger( options.offset ) ) {
81-
return new TypeError( 'invalid option. `offset` option must be an integer. Option: `' + options.offset + '`.' );
82+
return new TypeError( format( 'invalid option. `%s` option must be an integer. Option: `%s`.', 'offset', options.offset ) );
8283
}
8384
}
8485
if ( hasOwnProp( options, 'iter' ) ) {
8586
opts.iter = options.iter;
8687
if ( !isNonNegativeInteger( options.iter ) ) {
87-
return new TypeError( 'invalid option. `iter` option must be a nonnegative integer. Option: `' + options.iter + '`.' );
88+
return new TypeError( format( 'invalid option. `%s` option must be a nonnegative integer. Option: `%s`.', 'iter', options.iter ) );
8889
}
8990
}
9091
return null;

‎lib/node_modules/@stdlib/simulate/iter/lanczos-pulse/lib/validate.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ var isPositiveNumber = require( '@stdlib/assert/is-positive-number' ).isPrimitiv
2626
var isInteger = require( '@stdlib/assert/is-integer' ).isPrimitive;
2727
var isPositiveInteger = require( '@stdlib/assert/is-positive-integer' ).isPrimitive;
2828
var isNonNegativeInteger = require( '@stdlib/assert/is-nonnegative-integer' ).isPrimitive;
29+
var format = require( '@stdlib/string/format' );
2930

3031

3132
// MAIN //
@@ -55,36 +56,36 @@ var isNonNegativeInteger = require( '@stdlib/assert/is-nonnegative-integer' ).is
5556
*/
5657
function validate( opts, options ) {
5758
if ( !isPlainObject( options ) ) {
58-
return new TypeError( 'invalid argument. Options argument must be an object. Value: `' + options + '`.' );
59+
return new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', options ) );
5960
}
6061
if ( hasOwnProp( options, 'duration' ) ) {
6162
opts.duration = options.duration;
6263
if ( !isPositiveInteger( options.duration ) ) {
63-
return new TypeError( 'invalid option. `duration` option must be a positive integer. Option: `' + options.duration + '`.' );
64+
return new TypeError( format( 'invalid option. `%s` option must be a positive integer. Option: `%s`.', 'duration', options.duration ) );
6465
}
6566
}
6667
if ( hasOwnProp( options, 'period' ) ) {
6768
opts.period = options.period;
6869
if ( !isPositiveInteger( options.period ) ) {
69-
return new TypeError( 'invalid option. `period` option must be a positive integer. Option: `' + options.period + '`.' );
70+
return new TypeError( format( 'invalid option. `%s` option must be a positive integer. Option: `%s`.', 'period', options.period ) );
7071
}
7172
}
7273
if ( hasOwnProp( options, 'amplitude' ) ) {
7374
opts.amplitude = options.amplitude;
7475
if ( !isPositiveNumber( options.amplitude ) ) {
75-
return new TypeError( 'invalid option. `amplitude` option must be a positive number. Option: `' + options.amplitude + '`.' );
76+
return new TypeError( format( 'invalid option. `%s` option must be a positive number. Option: `%s`.', 'amplitude', options.amplitude ) );
7677
}
7778
}
7879
if ( hasOwnProp( options, 'offset' ) ) {
7980
opts.offset = options.offset;
8081
if ( !isInteger( options.offset ) ) {
81-
return new TypeError( 'invalid option. `offset` option must be an integer. Option: `' + options.offset + '`.' );
82+
return new TypeError( format( 'invalid option. `%s` option must be an integer. Option: `%s`.', 'offset', options.offset ) );
8283
}
8384
}
8485
if ( hasOwnProp( options, 'iter' ) ) {
8586
opts.iter = options.iter;
8687
if ( !isNonNegativeInteger( options.iter ) ) {
87-
return new TypeError( 'invalid option. `iter` option must be a nonnegative integer. Option: `' + options.iter + '`.' );
88+
return new TypeError( format( 'invalid option. `%s` option must be a nonnegative integer. Option: `%s`.', 'iter', options.iter ) );
8889
}
8990
}
9091
return null;

0 commit comments

Comments
 (0)