Skip to content

Commit 249d2b2

Browse files
PlaneshifterPlaneshifter
committed
Format error messages
1 parent 30e88de commit 249d2b2

File tree

63 files changed

+196
-135
lines changed

Some content is hidden

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

63 files changed

+196
-135
lines changed

‎lib/node_modules/@stdlib/_tools/docs/www/benchmark-bundles/lib/main.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 copy = require( '@stdlib/utils/copy' );
2828
var cwd = require( '@stdlib/process/cwd' );
2929
var findPkgs = require( '@stdlib/_tools/pkgs/find' );
30+
var format = require( '@stdlib/string/format' );
3031
var bundle = require( './bundle.js' );
3132
var validate = require( './validate.js' );
3233
var DEFAULTS = require( './defaults.json' );
@@ -88,10 +89,10 @@ function build( dest, options, clbk ) {
8889
cb = options;
8990
}
9091
if ( !isString( dest ) ) {
91-
throw new TypeError( 'invalid argument. First argument must be a string. Value: `' + dest + '`.' );
92+
throw new TypeError( format( 'invalid argument. First argument must be a string primitive. Value: `%s`.', dest ) );
9293
}
9394
if ( !isFunction( cb ) ) {
94-
throw new TypeError( 'invalid argument. Last argument must be a callback function. Value: `' + cb + '`.' );
95+
throw new TypeError( format( 'invalid argument. Last argument must be a callback function. Value: `%s`.', cb ) );
9596
}
9697
cd = cwd();
9798
if ( opts.dir ) {

‎lib/node_modules/@stdlib/_tools/github/dispatch-workflow/lib/main.js

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

2323
var isFunction = require( '@stdlib/assert/is-function' );
2424
var isString = require( '@stdlib/assert/is-string' ).isPrimitive;
25+
var format = require( '@stdlib/string/format' );
2526
var copy = require( '@stdlib/utils/copy' );
2627
var validate = require( './validate.js' );
2728
var defaults = require( './defaults.json' );
@@ -82,10 +83,10 @@ function dispatch( slug, id, options, clbk ) {
8283
var opts;
8384
var err;
8485
if ( !isString( slug ) ) {
85-
throw new TypeError( 'invalid argument. Repository slug must be a string primitive. Value: `' + slug + '`.' );
86+
throw new TypeError( format( 'invalid argument. Repository slug must be a string primitive. Value: `%s`.', slug ) );
8687
}
8788
if ( !isString( id ) ) {
88-
throw new TypeError( 'invalid argument. Workflow identifier must be a string primitive. Value: `' + id + '`.' );
89+
throw new TypeError( format( 'invalid argument. Workflow identifier must be a string primitive. Value: `%s`.', id ) );
8990
}
9091
opts = copy( defaults );
9192
err = validate( opts, options );
@@ -100,7 +101,7 @@ function dispatch( slug, id, options, clbk ) {
100101
}
101102
}
102103
if ( !isFunction( clbk ) ) {
103-
throw new TypeError( 'invalid argument. Callback argument must be a function. Value: `' + clbk + '`.' );
104+
throw new TypeError( format( 'invalid argument. Callback argument must be a function. Value: `%s`.', clbk ) );
104105
}
105106
query( slug, id, opts, done );
106107

‎lib/node_modules/@stdlib/_tools/github/following/lib/factory.js

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

2323
var isFunction = require( '@stdlib/assert/is-function' );
24+
var format = require( '@stdlib/string/format' );
2425
var merge = require( '@stdlib/utils/merge' );
2526
var get = require( '@stdlib/_tools/github/get' ).factory;
2627
var validate = require( './validate.js' );
@@ -50,7 +51,7 @@ function factory( options, clbk ) {
5051
throw err;
5152
}
5253
if ( !isFunction( clbk ) ) {
53-
throw new TypeError( 'invalid argument. Callback argument must be a function. Value: `' + clbk + '`.' );
54+
throw new TypeError( format( 'invalid argument. Callback argument must be a function. Value: `%s`.', clbk ) );
5455
}
5556
if (
5657
opts.token === void 0 &&

‎lib/node_modules/@stdlib/_tools/github/user-rate-limit/lib/factory.js

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

2323
var isFunction = require( '@stdlib/assert/is-function' );
24+
var format = require( '@stdlib/string/format' );
2425
var merge = require( '@stdlib/utils/merge' );
2526
var request = require( '@stdlib/_tools/github/get' ).factory;
2627
var validate = require( './validate.js' );
@@ -48,7 +49,7 @@ function factory( options, clbk ) {
4849
throw err;
4950
}
5051
if ( !isFunction( clbk ) ) {
51-
throw new TypeError( 'invalid argument. Callback argument must be a function. Value: `' + clbk + '`.' );
52+
throw new TypeError( format( 'invalid argument. Callback argument must be a function. Value: `%s`.', clbk ) );
5253
}
5354
return request( opts, done );
5455
/**

‎lib/node_modules/@stdlib/_tools/licenses/insert-header/lib/main.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
var isBuffer = require( '@stdlib/assert/is-buffer' );
2424
var isString = require( '@stdlib/assert/is-string' ).isPrimitive;
2525
var string2buffer = require( '@stdlib/buffer/from-string' );
26+
var format = require( '@stdlib/string/format' );
2627
var SHEBANGS = require( './shebangs.js' );
2728

2829

@@ -66,12 +67,12 @@ function insertHeader( src, header ) {
6667

6768
isStr = isString( src );
6869
if ( !isStr && !isBuffer( src ) ) {
69-
throw new TypeError( 'invalid argument. First argument must be either a string or Buffer. Value: `' + src + '`.' );
70+
throw new TypeError( format( 'invalid argument. First argument must be either a string or Buffer. Value: `%s`.', src ) );
7071
} else {
7172
src = src.toString();
7273
}
7374
if ( !isString( header ) && !isBuffer( header ) ) {
74-
throw new TypeError( 'invalid argument. Second argument must be either a string or Buffer. Value: `' + header + '`.' );
75+
throw new TypeError( format( 'invalid argument. Second argument must be either a string or Buffer. Value: `%s`.', header ) );
7576
} else {
7677
header = header.toString();
7778
}

‎lib/node_modules/@stdlib/_tools/licenses/remove-header/lib/main.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ var isRegExp = require( '@stdlib/assert/is-regexp' );
2626
var string2buffer = require( '@stdlib/buffer/from-string' );
2727
var reFromString = require( '@stdlib/utils/regexp-from-string' );
2828
var replace = require( '@stdlib/string/replace' );
29+
var format = require( '@stdlib/string/format' );
2930
var SHEBANGS = require( './shebangs.js' );
3031

3132

@@ -68,7 +69,7 @@ function removeHeader( src, header ) {
6869

6970
isStr = isString( src );
7071
if ( !isStr && !isBuffer( src ) ) {
71-
throw new TypeError( 'invalid argument. First argument must be either a string or Buffer. Value: `' + src + '`.' );
72+
throw new TypeError( format( 'invalid argument. First argument must be either a string or Buffer. Value: `%s`.', src ) );
7273
} else {
7374
src = src.toString();
7475
}
@@ -98,7 +99,7 @@ function removeHeader( src, header ) {
9899
}
99100
}
100101
} else {
101-
throw new TypeError( 'invalid argument. Second argument must be either a string, Buffer, or regular expression. Value: `' + header + '`.' );
102+
throw new TypeError( format( 'invalid argument. Second argument must be either a string, Buffer, or regular expression. Value: `%s`.', header ) );
102103
}
103104
// Remove the header (if present):
104105
src = replace( src, header, '' );

‎lib/node_modules/@stdlib/_tools/licenses/update-header/lib/main.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ var isRegExp = require( '@stdlib/assert/is-regexp' );
2626
var string2buffer = require( '@stdlib/buffer/from-string' );
2727
var removeHeader = require( '@stdlib/_tools/licenses/remove-header' );
2828
var insertHeader = require( '@stdlib/_tools/licenses/insert-header' );
29+
var format = require( '@stdlib/string/format' );
2930

3031

3132
// MAIN //
@@ -61,15 +62,15 @@ var insertHeader = require( '@stdlib/_tools/licenses/insert-header' );
6162
function updateHeader( src, old, header ) {
6263
var isStr = isString( src );
6364
if ( !isStr && !isBuffer( src ) ) {
64-
throw new TypeError( 'invalid argument. First argument must be either a string or Buffer. Value: `' + src + '`.' );
65+
throw new TypeError( format( 'invalid argument. First argument must be either a string or Buffer. Value: `%s`.', src ) );
6566
} else {
6667
src = src.toString();
6768
}
6869
if ( !isRegExp( old ) && !isString( old ) && !isBuffer( old ) ) {
69-
throw new TypeError( 'invalid argument. Second argument must be either a string, Buffer, or regular expression. Value: `' + old + '`.' );
70+
throw new TypeError( format( 'invalid argument. Second argument must be either a string, Buffer, or regular expression. Value: `%s`.', old ) );
7071
}
7172
if ( !isString( header ) && !isBuffer( header ) ) {
72-
throw new TypeError( 'invalid argument. Third argument must be either a string or Buffer. Value: `' + header + '`.' );
73+
throw new TypeError( format( 'invalid argument. Third argument must be either a string or Buffer. Value: `%s`.', header ) );
7374
}
7475
src = removeHeader( src, old );
7576
src = insertHeader( src, header );

‎lib/node_modules/@stdlib/_tools/markdown/inline-svg-equation/lib/main.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
var copy = require( '@stdlib/utils/copy' );
2424
var isFunction = require( '@stdlib/assert/is-function' );
2525
var tex2svg = require( '@stdlib/_tools/utils/tex-equation-to-svg' );
26+
var format = require( '@stdlib/string/format' );
2627
var defaults = require( './defaults.json' );
2728
var validate = require( './validate.js' );
2829
var render = require( './render.js' );
@@ -74,7 +75,7 @@ function createElement( options, clbk ) {
7475
cb = options;
7576
}
7677
if ( !isFunction( cb ) ) {
77-
throw new TypeError( 'invalid argument. Last argument must be a callback function. Value: `'+cb+'`.' );
78+
throw new TypeError( format( 'invalid argument. Last argument must be a callback function. Value: `%s`.', cb ) );
7879
}
7980
tex2svg( opts.raw, done );
8081

‎lib/node_modules/@stdlib/_tools/markdown/namespace-toc/lib/async.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ var isFunction = require( '@stdlib/assert/is-function' );
3030
var contains = require( '@stdlib/assert/contains' );
3131
var removeFirst = require( '@stdlib/string/remove-first' );
3232
var startsWith = require( '@stdlib/string/starts-with' );
33+
var format = require( '@stdlib/string/format' );
3334
var trim = require( '@stdlib/string/trim' );
3435
var cwd = require( '@stdlib/process/cwd' );
3536
var validate = require( './validate.js' );
@@ -96,7 +97,7 @@ function createTOC() {
9697
}
9798
}
9899
if ( !isFunction( clbk ) ) {
99-
throw new TypeError( 'invalid argument. Callback argument must be a function. Value: `' + clbk + '`.' );
100+
throw new TypeError( format( 'invalid argument. Callback argument must be a function. Value: `%s`.', clbk ) );
100101
}
101102
if ( opts.dir ) {
102103
opts.dir = resolve( cwd(), opts.dir );

‎lib/node_modules/@stdlib/_tools/markdown/namespace-toc/lib/validate.js

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

2829

2930
// MAIN //
@@ -54,37 +55,36 @@ var isStringArray = require( '@stdlib/assert/is-string-array' ).primitives;
5455
*/
5556
function validate( opts, options ) {
5657
if ( !isObject( options ) ) {
57-
return new TypeError( 'invalid argument. Options argument must be an object. Value: `' + options +
58-
'`.' );
58+
return new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', options ) );
5959
}
6060
if ( hasOwnProp( options, 'dir' ) ) {
6161
opts.dir = options.dir;
6262
if ( !isString( opts.dir ) ) {
63-
return new TypeError( 'invalid option. `dir` option must be a primitive string. Option: `' + opts.dir + '`.' );
63+
return new TypeError( format( 'invalid option. `%s` option must be a string primitive. Option: `%s`.', 'dir', opts.dir ) );
6464
}
6565
}
6666
if ( hasOwnProp( options, 'keywords' ) ) {
6767
opts.keywords = options.keywords;
6868
if ( !isString( opts.keywords ) ) {
69-
return new TypeError( 'invalid option. `keywords` option must be a string primitive. Option: `' + opts.keywords + '`.' );
69+
return new TypeError( format( 'invalid option. `%s` option must be a string primitive. Option: `%s`.', 'keywords', opts.keywords ) );
7070
}
7171
}
7272
if ( hasOwnProp( options, 'pattern' ) ) {
7373
opts.pattern = options.pattern;
7474
if ( !isString( opts.pattern ) ) {
75-
return new TypeError( 'invalid option. `pattern` option must be a primitive string. Option: `' + opts.pattern + '`.' );
75+
return new TypeError( format( 'invalid option. `%s` option must be a string primitive. Option: `%s`.', 'pattern', opts.pattern ) );
7676
}
7777
}
7878
if ( hasOwnProp( options, 'blacklist' ) ) {
7979
opts.blacklist = options.blacklist;
8080
if ( !isStringArray( opts.blacklist ) ) {
81-
return new TypeError( 'invalid option. `blacklist` option must be an array of package names. Option: `' + opts.blacklist + '`.' );
81+
return new TypeError( format( 'invalid option. `%s` option must be an array of package names. Option: `%s`.', 'blacklist', opts.blacklist ) );
8282
}
8383
}
8484
if ( hasOwnProp( options, 'ignore' ) ) {
8585
opts.ignore = options.ignore;
8686
if ( !isStringArray( opts.ignore ) ) {
87-
return new TypeError( 'invalid option. `ignore` option must be an array of string primitives. Option: `' + opts.ignore + '`.' );
87+
return new TypeError( format( 'invalid option. `%s` option must be an array of string primitives. Option: `%s`.', 'ignore', opts.ignore ) );
8888
}
8989
}
9090
return null;

‎lib/node_modules/@stdlib/_tools/markdown/to-html/lib/convert.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ var isFunction = require( '@stdlib/assert/is-function' );
3131
var noHighlightText = require( '@stdlib/_tools/rehype/plugins/rehype-no-highlight-text' );
3232
var equations = require( '@stdlib/_tools/remark/plugins/remark-svg-equations' );
3333
var linkify = require( '@stdlib/_tools/remark/plugins/remark-stdlib-urls-www' );
34+
var format = require( '@stdlib/string/format' );
3435
var postProcess = require( './post_process.js' );
3536

3637

@@ -77,23 +78,23 @@ function convert( markdown ) {
7778
!isString( markdown ) &&
7879
!isBuffer( markdown )
7980
) {
80-
throw new TypeError( 'invalid argument. First argument must be either a string or a Buffer. Value: `'+markdown+'`.' );
81+
throw new TypeError( format( 'invalid argument. First argument must be either a string or a Buffer. Value: `%s`.', markdown ) );
8182
}
8283
if ( arguments.length === 2 ) {
8384
base = '/docs/api/develop/';
8485
clbk = arguments[ 1 ];
8586
if ( !isFunction( clbk ) ) {
86-
throw new TypeError( 'invalid argument. Last argument must be a callback function. Value: `'+clbk+'`.' );
87+
throw new TypeError( format( 'invalid argument. Last argument must be a callback function. Value: `%s`.', clbk ) );
8788
}
8889
}
8990
else {
9091
base = arguments[ 1 ];
9192
clbk = arguments[ 2 ];
9293
if ( !isString( base ) ) {
93-
throw new TypeError( 'invalid argument. Version argument must be a string primitive. Value: `'+base+'`.' );
94+
throw new TypeError( format( 'invalid argument. Version argument must be a string primitive. Value: `%s`.', base ) );
9495
}
9596
if ( !isFunction( clbk ) ) {
96-
throw new TypeError( 'invalid argument. Last argument must be a callback function. Value: `'+clbk+'`.' );
97+
throw new TypeError( format( 'invalid argument. Last argument must be a callback function. Value: `%s`.', clbk ) );
9798
}
9899
}
99100
mTransform = remark()

‎lib/node_modules/@stdlib/_tools/markdown/to-vdom/lib/convert.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ var toVirtualDOM = require( 'remark-vdom' );
2525
var headingSlugs = require( 'remark-slug' );
2626
var isString = require( '@stdlib/assert/is-string' ).isPrimitive;
2727
var isBuffer = require( '@stdlib/assert/is-buffer' );
28+
var format = require( '@stdlib/string/format' );
2829

2930

3031
// VARIABLES //
@@ -54,7 +55,7 @@ function convert( markdown ) {
5455
!isString( markdown ) &&
5556
!isBuffer( markdown )
5657
) {
57-
throw new TypeError( 'invalid argument. Must provide either a string or a Buffer. Value: `'+markdown+'`.' );
58+
throw new TypeError( format( 'invalid argument. Must provide either a string or a Buffer. Value: `%s`.', markdown ) );
5859
}
5960
return transform( markdown.toString() ).contents;
6061
}

‎lib/node_modules/@stdlib/_tools/modules/import-require-glob/lib/async.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ var glob = require( 'glob' );
2626
var isFunction = require( '@stdlib/assert/is-function' );
2727
var copy = require( '@stdlib/utils/copy' );
2828
var readFileList = require( '@stdlib/fs/read-file-list' );
29+
var format = require( '@stdlib/string/format' );
2930
var cwd = require( '@stdlib/process/cwd' );
3031
var defaults = require( './defaults.json' );
3132
var validate = require( './validate.js' );
@@ -80,7 +81,7 @@ function ls() {
8081
}
8182
}
8283
if ( !isFunction( clbk ) ) {
83-
throw new TypeError( 'invalid argument. Callback argument must be a function. Value: `' + clbk + '`.' );
84+
throw new TypeError( format( 'invalid argument. Callback argument must be a function. Value: `%s`.', clbk ) );
8485
}
8586
debug( 'Options: %s', JSON.stringify( opts ) );
8687
if ( opts.dir ) {

‎lib/node_modules/@stdlib/_tools/modules/import-require/lib/ls.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var logger = require( 'debug' );
2424
var parse = require( 'acorn' ).parse;
2525
var isBuffer = require( '@stdlib/assert/is-buffer' );
2626
var isString = require( '@stdlib/assert/is-string' ).isPrimitive;
27+
var format = require( '@stdlib/string/format' );
2728
var walk = require( './walk.js' );
2829

2930

@@ -57,7 +58,7 @@ function ls( src ) {
5758
if ( isBuffer( src ) ) {
5859
src = src.toString();
5960
} else if ( !isString( src ) ) {
60-
throw new TypeError( 'invalid argument. Must provide either a string or Buffer. Value: `' + src + '`.' );
61+
throw new TypeError( format( 'invalid argument. Must provide either a string or Buffer. Value: `%s`.', src ) );
6162
}
6263
opts = {
6364
'ecmaVersion': 6,

‎lib/node_modules/@stdlib/_tools/modules/pkg-deps/lib/sync.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ var isStringArray = require( '@stdlib/assert/is-string-array' ).primitives;
2727
var copy = require( '@stdlib/utils/copy' );
2828
var cwd = require( '@stdlib/process/cwd' );
2929
var dirname = require( '@stdlib/utils/dirname' );
30+
var format = require( '@stdlib/string/format' );
3031
var defaults = require( './defaults.json' );
3132
var validate = require( './validate.js' );
3233
var walkFile = require( './walk_file.sync.js' );
@@ -77,7 +78,7 @@ function pkgDeps( files, options ) {
7778
!isStr &&
7879
!isStringArray( files )
7980
) {
80-
throw new TypeError( 'invalid argument. First argument must be either a string or string array. Value: `' + files + '`.' );
81+
throw new TypeError( format( 'invalid argument. First argument must be either a string or string array. Value: `%s`.', files ) );
8182
}
8283
if ( isStr ) {
8384
list = [ files ];

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
var resolve = require( 'path' ).resolve;
2424
var glob = require( 'glob' );
2525
var isFunction = require( '@stdlib/assert/is-function' );
26+
var format = require( '@stdlib/string/format' );
2627
var copy = require( '@stdlib/utils/copy' );
2728
var cwd = require( '@stdlib/process/cwd' );
2829
var config = require( './config.json' );
@@ -75,7 +76,7 @@ function findAddons() {
7576
}
7677
}
7778
if ( !isFunction( clbk ) ) {
78-
throw new TypeError( 'invalid argument. Callback argument must be a function. Value: `' + clbk + '`.' );
79+
throw new TypeError( format( 'invalid argument. Callback argument must be a function. Value: `%s`.', clbk ) );
7980
}
8081
if ( opts.dir ) {
8182
dir = resolve( cwd(), opts.dir );

‎lib/node_modules/@stdlib/_tools/pkgs/browser-compatible/lib/async.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
var logger = require( 'debug' );
2424
var pkgNames = require( '@stdlib/_tools/pkgs/names' );
2525
var isFunction = require( '@stdlib/assert/is-function' );
26+
var format = require( '@stdlib/string/format' );
2627
var copy = require( '@stdlib/utils/copy' );
2728
var validate = require( './validate.js' );
2829
var filter = require( './filter.js' );
@@ -78,7 +79,7 @@ function ls() {
7879
}
7980
}
8081
if ( !isFunction( clbk ) ) {
81-
throw new TypeError( 'invalid argument. Callback argument must be a function. Value: `' + clbk + '`.' );
82+
throw new TypeError( format( 'invalid argument. Callback argument must be a function. Value: `%s`.', clbk ) );
8283
}
8384
debug( 'Options: %s', JSON.stringify( opts ) );
8485

0 commit comments

Comments
 (0)