Skip to content

Commit 1a88cea

Browse files
PlaneshifterPlaneshifter
committed
Format error messages
1 parent ba7f4e5 commit 1a88cea

File tree

46 files changed

+159
-113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+159
-113
lines changed

‎lib/node_modules/@stdlib/_tools/markdown/img-svg-equation/lib/validate.js‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var hasOwnProp = require( '@stdlib/assert/has-own-property' );
2424
var isObject = require( '@stdlib/assert/is-plain-object' );
2525
var isString = require( '@stdlib/assert/is-string' ).isPrimitive;
2626
var isURI = require( '@stdlib/assert/is-uri' );
27+
var format = require( '@stdlib/string/format' );
2728

2829

2930
// MAIN //
@@ -59,42 +60,42 @@ var isURI = require( '@stdlib/assert/is-uri' );
5960
*/
6061
function validate( opts, options ) {
6162
if ( !isObject( options ) ) {
62-
return new TypeError( 'invalid argument. Options argument must be an object. Value: `' + options + '`.' );
63+
return new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', options ) );
6364
}
6465
if ( hasOwnProp( options, 'className' ) ) {
6566
opts.className = options.className;
6667
if ( !isString( opts.className ) ) {
67-
return new TypeError( 'invalid option. `className` option must be a string primitive. Option: `' + opts.className + '`.' );
68+
return new TypeError( format( 'invalid option. `%s` option must be a string primitive. Option: `%s`.', 'className', opts.className ) );
6869
}
6970
}
7071
if ( hasOwnProp( options, 'align' ) ) {
7172
opts.align = options.align;
7273
if ( !isString( opts.align ) ) {
73-
return new TypeError( 'invalid option. `align` option must be a string primitive. Option: `' + opts.align + '`.' );
74+
return new TypeError( format( 'invalid option. `%s` option must be a string primitive. Option: `%s`.', 'align', opts.align ) );
7475
}
7576
}
7677
if ( hasOwnProp( options, 'raw' ) ) {
7778
opts.raw = options.raw;
7879
if ( !isString( opts.raw ) ) {
79-
return new TypeError( 'invalid option. `raw` option must be a string primitive. Option: `' + opts.raw + '`.' );
80+
return new TypeError( format( 'invalid option. `%s` option must be a string primitive. Option: `%s`.', 'raw', opts.raw ) );
8081
}
8182
}
8283
if ( hasOwnProp( options, 'label' ) ) {
8384
opts.label = options.label;
8485
if ( !isString( opts.label ) ) {
85-
return new TypeError( 'invalid option. `label` option must be a string primitive. Option: `' + opts.label + '`.' );
86+
return new TypeError( format( 'invalid option. `%s` option must be a string primitive. Option: `%s`.', 'label', opts.label ) );
8687
}
8788
}
8889
if ( hasOwnProp( options, 'src' ) ) {
8990
opts.src = options.src;
9091
if ( !isURI( opts.src ) ) {
91-
return new TypeError( 'invalid option. `src` option must be a valid URI. Option: `' + opts.src + '`.' );
92+
return new TypeError( format( 'invalid option. `%s` option must be a valid URI. Option: `%s`.', 'src', opts.src ) );
9293
}
9394
}
9495
if ( hasOwnProp( options, 'alt' ) ) {
9596
opts.alt = options.alt;
9697
if ( !isString( opts.alt ) ) {
97-
return new TypeError( 'invalid option. `alt` option must be a string primitive. Option: `' + opts.alt + '`.' );
98+
return new TypeError( format( 'invalid option. `%s` option must be a string primitive. Option: `%s`.', 'alt', opts.alt ) );
9899
}
99100
}
100101
return null;

‎lib/node_modules/@stdlib/_tools/pkgs/deps/lib/async.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ var isFunction = require( '@stdlib/assert/is-function' );
2727
var cwd = require( '@stdlib/process/cwd' );
2828
var copy = require( '@stdlib/utils/copy' );
2929
var entryPoints = require( '@stdlib/_tools/pkgs/entry-points' );
30+
var format = require( '@stdlib/string/format' );
3031
var defaults = require( './defaults.json' );
3132
var validate = require( './validate.js' );
3233
var resolveDeps = require( './resolve.js' );
@@ -71,7 +72,7 @@ function pkgDeps( pkgs, options, clbk ) {
7172
var err;
7273
var cb;
7374
if ( !isStringArray( pkgs ) ) {
74-
throw new TypeError( 'invalid argument. First argument must be a string array. Value: `' + pkgs + '`.' );
75+
throw new TypeError( format( 'invalid argument. First argument must be a string array. Value: `%s`.', pkgs ) );
7576
}
7677
opts = copy( defaults );
7778
if ( arguments.length < 3 ) {
@@ -84,7 +85,7 @@ function pkgDeps( pkgs, options, clbk ) {
8485
}
8586
}
8687
if ( !isFunction( cb ) ) {
87-
throw new TypeError( 'invalid argument. Callback argument must be a function. Value: `' + cb + '`.' );
88+
throw new TypeError( format( 'invalid argument. Callback argument must be a function. Value: `%s`.', cb ) );
8889
}
8990
debug( 'Options: %s', JSON.stringify( opts ) );
9091
if ( opts.dir ) {

‎lib/node_modules/@stdlib/array/complex64/lib/from_iterator.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var isArrayLikeObject = require( '@stdlib/assert/is-array-like-object' );
2424
var isComplexLike = require( '@stdlib/assert/is-complex-like' );
2525
var realf = require( '@stdlib/complex/realf' );
2626
var imagf = require( '@stdlib/complex/imagf' );
27+
var format = require( '@stdlib/string/format' );
2728

2829

2930
// MAIN //
@@ -52,7 +53,7 @@ function fromIterator( it ) {
5253
} else if ( isComplexLike( z ) ) {
5354
out.push( realf( z ), imagf( z ) );
5455
} else {
55-
return new TypeError( 'invalid argument. An iterator must return either a two-element array containing real and imaginary components or a complex number. Value: `'+z+'`.' );
56+
return new TypeError( format( 'invalid argument. An iterator must return either a two-element array containing real and imaginary components or a complex number. Value: `%s`.', z ) );
5657
}
5758
}
5859
return out;

‎lib/node_modules/@stdlib/array/complex64/lib/from_iterator_map.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var isArrayLikeObject = require( '@stdlib/assert/is-array-like-object' );
2424
var isComplexLike = require( '@stdlib/assert/is-complex-like' );
2525
var realf = require( '@stdlib/complex/realf' );
2626
var imagf = require( '@stdlib/complex/imagf' );
27+
var format = require( '@stdlib/string/format' );
2728

2829

2930
// MAIN //
@@ -57,7 +58,7 @@ function fromIteratorMap( it, clbk, thisArg ) {
5758
} else if ( isComplexLike( z ) ) {
5859
out.push( realf( z ), imagf( z ) );
5960
} else {
60-
return new TypeError( 'invalid argument. Callback must return either a two-element array containing real and imaginary components or a complex number. Value: `'+z+'`.' );
61+
return new TypeError( format( 'invalid argument. Callback must return either a two-element array containing real and imaginary components or a complex number. Value: `%s`.', z ) );
6162
}
6263
}
6364
return out;

‎lib/node_modules/@stdlib/buffer/to-json/lib/main.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
// MODULES //
2222

2323
var isBuffer = require( '@stdlib/assert/is-buffer' );
24+
var format = require( '@stdlib/string/format' );
2425

2526

2627
// MAIN //
@@ -45,7 +46,7 @@ function toJSON( buffer ) {
4546
var out;
4647
var i;
4748
if ( !isBuffer( buffer ) ) {
48-
throw new TypeError( 'invalid argument. Must provide a Buffer. Value: `' + buffer + '`.' );
49+
throw new TypeError( format( 'invalid argument. Must provide a Buffer. Value: `%s`.', buffer ) );
4950
}
5051
out = {};
5152
out.type = 'Buffer';

‎lib/node_modules/@stdlib/iter/advance/lib/main.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
var isIteratorLike = require( '@stdlib/assert/is-iterator-like' );
2424
var isNonNegativeInteger = require( '@stdlib/assert/is-nonnegative-integer' ).isPrimitive;
25+
var format = require( '@stdlib/string/format' );
2526

2627

2728
// MAIN //
@@ -53,11 +54,11 @@ function iterAdvance( iterator, n ) {
5354
var v;
5455
var i;
5556
if ( !isIteratorLike( iterator ) ) {
56-
throw new TypeError( 'invalid argument. First argument must be an iterator. Value: `'+iterator+'`.' );
57+
throw new TypeError( format( 'invalid argument. First argument must be an iterator. Value: `%s`.', iterator ) );
5758
}
5859
if ( arguments.length > 1 ) {
5960
if ( !isNonNegativeInteger( n ) ) {
60-
throw new TypeError( 'invalid argument. Second argument must be a nonnegative integer. Value: `' + n + '`.' );
61+
throw new TypeError( format( 'invalid argument. Second argument must be a nonnegative integer. Value: `%s`.', n ) );
6162
}
6263
N = n;
6364
} else {

‎lib/node_modules/@stdlib/iter/any-by/lib/main.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
var isIteratorLike = require( '@stdlib/assert/is-iterator-like' );
2424
var isFunction = require( '@stdlib/assert/is-function' );
25+
var format = require( '@stdlib/string/format' );
2526

2627

2728
// MAIN //
@@ -52,10 +53,10 @@ function iterAnyBy( iterator, predicate, thisArg ) {
5253
var v;
5354
var i;
5455
if ( !isIteratorLike( iterator ) ) {
55-
throw new TypeError( 'invalid argument. First argument must be an iterator. Value: `'+iterator+'`.' );
56+
throw new TypeError( format( 'invalid argument. First argument must be an iterator. Value: `%s`.', iterator ) );
5657
}
5758
if ( !isFunction( predicate ) ) {
58-
throw new TypeError( 'invalid argument. Second argument must be a function. Value: `' + predicate + '`.' );
59+
throw new TypeError( format( 'invalid argument. Second argument must be a function. Value: `%s`.', predicate ) );
5960
}
6061
i = -1;
6162
while ( true ) {

‎lib/node_modules/@stdlib/iter/any/lib/main.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
// MODULES //
2222

2323
var isIteratorLike = require( '@stdlib/assert/is-iterator-like' );
24+
var format = require( '@stdlib/string/format' );
2425

2526

2627
// MAIN //
@@ -43,7 +44,7 @@ var isIteratorLike = require( '@stdlib/assert/is-iterator-like' );
4344
function iterAny( iterator ) {
4445
var v;
4546
if ( !isIteratorLike( iterator ) ) {
46-
throw new TypeError( 'invalid argument. Must provide an iterator. Value: `'+iterator+'`.' );
47+
throw new TypeError( format( 'invalid argument. Must provide an iterator. Value: `%s`.', iterator ) );
4748
}
4849
while ( true ) {
4950
v = iterator.next();

‎lib/node_modules/@stdlib/iter/constant/lib/main.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ var hasOwnProp = require( '@stdlib/assert/has-own-property' );
2525
var isPlainObject = require( '@stdlib/assert/is-plain-object' );
2626
var isNonNegativeInteger = require( '@stdlib/assert/is-nonnegative-integer' ).isPrimitive;
2727
var iteratorSymbol = require( '@stdlib/symbol/iterator' );
28+
var format = require( '@stdlib/string/format' );
2829

2930

3031
// MAIN //
@@ -66,12 +67,12 @@ function iterConstant( value ) {
6667
if ( arguments.length > 1 ) {
6768
options = arguments[ 1 ];
6869
if ( !isPlainObject( options ) ) {
69-
throw new TypeError( 'invalid argument. Options argument must be an object. Value: `' + options + '`.' );
70+
throw new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', options ) );
7071
}
7172
if ( hasOwnProp( options, 'iter' ) ) {
7273
opts.iter = options.iter;
7374
if ( !isNonNegativeInteger( options.iter ) ) {
74-
throw new TypeError( 'invalid option. `iter` option must be a nonnegative integer. Option: `' + options.iter + '`.' );
75+
throw new TypeError( format( 'invalid option. `%s` option must be a nonnegative integer. Option: `%s`.', 'iter', options.iter ) );
7576
}
7677
}
7778
}

‎lib/node_modules/@stdlib/iter/counter/lib/main.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var setReadOnly = require( '@stdlib/utils/define-nonenumerable-read-only-propert
2424
var isFunction = require( '@stdlib/assert/is-function' );
2525
var isIteratorLike = require( '@stdlib/assert/is-iterator-like' );
2626
var iteratorSymbol = require( '@stdlib/symbol/iterator' );
27+
var format = require( '@stdlib/string/format' );
2728

2829

2930
// MAIN //
@@ -56,7 +57,7 @@ function iterCounter( iterator ) {
5657
var FLG;
5758
var i;
5859
if ( !isIteratorLike( iterator ) ) {
59-
throw new TypeError( 'invalid argument. Must provide an iterator protocol-compliant object. Value: `' + iterator + '`.' );
60+
throw new TypeError( format( 'invalid argument. Must provide an iterator protocol-compliant object. Value: `%s`.', iterator ) );
6061
}
6162
i = 0;
6263

0 commit comments

Comments
 (0)