Skip to content

Commit 03f124f

Browse files
PlaneshifterPlaneshifter
committed
Format error messages
1 parent 8455073 commit 03f124f

File tree

29 files changed

+200
-173
lines changed

29 files changed

+200
-173
lines changed

‎lib/node_modules/@stdlib/array/complex128/lib/main.js

+12-11
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ var imag = require( '@stdlib/complex/imag' );
4343
var reinterpret64 = require( '@stdlib/strided/base/reinterpret-complex64' );
4444
var reinterpret128 = require( '@stdlib/strided/base/reinterpret-complex128' );
4545
var arraylike2object = require( '@stdlib/array/base/arraylike2object' );
46+
var format = require( '@stdlib/string/format' );
4647
var fromIterator = require( './from_iterator.js' );
4748
var fromIteratorMap = require( './from_iterator_map.js' );
4849
var fromArray = require( './from_array.js' );
@@ -262,7 +263,7 @@ function Complex128Array() {
262263
throw new TypeError( 'invalid argument. Environment lacks Symbol.iterator support. Must provide a length, ArrayBuffer, typed array, or array-like object. Value: `'+buf+'`.' );
263264
}
264265
if ( !isFunction( buf[ ITERATOR_SYMBOL ] ) ) {
265-
throw new TypeError( 'invalid argument. Must provide a length, ArrayBuffer, typed array, array-like object, or an iterable. Value: `'+buf+'`.' );
266+
throw new TypeError( format( 'invalid argument. Must provide a length, ArrayBuffer, typed array, array-like object, or an iterable. Value: `%s`.', buf ) );
266267
}
267268
buf = buf[ ITERATOR_SYMBOL ]();
268269
if ( !isFunction( buf.next ) ) {
@@ -279,11 +280,11 @@ function Complex128Array() {
279280
} else {
280281
buf = arguments[ 0 ];
281282
if ( !isArrayBuffer( buf ) ) {
282-
throw new TypeError( 'invalid argument. First argument must be an array buffer. Value: `'+buf+'`.' );
283+
throw new TypeError( format( 'invalid argument. First argument must be an array buffer. Value: `%s`.', buf ) );
283284
}
284285
byteOffset = arguments[ 1 ];
285286
if ( !isNonNegativeInteger( byteOffset ) ) {
286-
throw new TypeError( 'invalid argument. Byte offset must be a nonnegative integer. Value: `'+byteOffset+'`.' );
287+
throw new TypeError( format( 'invalid argument. Byte offset must be a nonnegative integer. Value: `%s`.', byteOffset ) );
287288
}
288289
if ( !isInteger( byteOffset/BYTES_PER_ELEMENT ) ) {
289290
throw new RangeError( 'invalid argument. Byte offset must be a multiple of '+BYTES_PER_ELEMENT+'. Value: `'+byteOffset+'`.' );
@@ -297,7 +298,7 @@ function Complex128Array() {
297298
} else {
298299
len = arguments[ 2 ];
299300
if ( !isNonNegativeInteger( len ) ) {
300-
throw new TypeError( 'invalid argument. Length must be a nonnegative integer. Value: `'+len+'`.' );
301+
throw new TypeError( format( 'invalid argument. Length must be a nonnegative integer. Value: `%s`.', len ) );
301302
}
302303
if ( (len*BYTES_PER_ELEMENT) > (buf.byteLength-byteOffset) ) {
303304
throw new RangeError( 'invalid arguments. ArrayBuffer has insufficient capacity. Either decrease the array length or provide a bigger buffer. Minimum capacity: `'+(len*BYTES_PER_ELEMENT)+'`.' );
@@ -412,7 +413,7 @@ setReadOnly( Complex128Array, 'from', function from( src ) {
412413
if ( nargs > 1 ) {
413414
clbk = arguments[ 1 ];
414415
if ( !isFunction( clbk ) ) {
415-
throw new TypeError( 'invalid argument. Second argument must be a function. Value: `'+clbk+'`.' );
416+
throw new TypeError( format( 'invalid argument. Second argument must be a function. Value: `%s`.', clbk ) );
416417
}
417418
if ( nargs > 2 ) {
418419
thisArg = arguments[ 2 ];
@@ -433,7 +434,7 @@ setReadOnly( Complex128Array, 'from', function from( src ) {
433434
buf[ j ] = v[ 0 ];
434435
buf[ j+1 ] = v[ 1 ];
435436
} else {
436-
throw new TypeError( 'invalid argument. Callback must return either a two-element array containing real and imaginary components or a complex number. Value: `'+v+'`.' );
437+
throw new TypeError( format( 'invalid argument. Callback must return either a two-element array containing real and imaginary components or a complex number. Value: `%s`.', v ) );
437438
}
438439
j += 2; // stride
439440
}
@@ -480,7 +481,7 @@ setReadOnly( Complex128Array, 'from', function from( src ) {
480481
buf[ j ] = v[ 0 ];
481482
buf[ j+1 ] = v[ 1 ];
482483
} else {
483-
throw new TypeError( 'invalid argument. Callback must return either a two-element array containing real and imaginary components or a complex number. Value: `'+v+'`.' );
484+
throw new TypeError( format( 'invalid argument. Callback must return either a two-element array containing real and imaginary components or a complex number. Value: `%s`.', v ) );
484485
}
485486
j += 2; // stride
486487
}
@@ -509,7 +510,7 @@ setReadOnly( Complex128Array, 'from', function from( src ) {
509510
}
510511
return out;
511512
}
512-
throw new TypeError( 'invalid argument. First argument must be an array-like object or an iterable. Value: `'+src+'`.' );
513+
throw new TypeError( format( 'invalid argument. First argument must be an array-like object or an iterable. Value: `%s`.', src ) );
513514
});
514515

515516
/**
@@ -829,7 +830,7 @@ setReadOnly( Complex128Array.prototype, 'get', function get( idx ) {
829830
throw new TypeError( 'invalid invocation. `this` is not a complex number array.' );
830831
}
831832
if ( !isNonNegativeInteger( idx ) ) {
832-
throw new TypeError( 'invalid argument. Must provide a nonnegative integer. Value: `'+idx+'`.' );
833+
throw new TypeError( format( 'invalid argument. Must provide a nonnegative integer. Value: `%s`.', idx ) );
833834
}
834835
if ( idx >= this._length ) {
835836
return;
@@ -938,7 +939,7 @@ setReadOnly( Complex128Array.prototype, 'set', function set( value ) {
938939
if ( arguments.length > 1 ) {
939940
idx = arguments[ 1 ];
940941
if ( !isNonNegativeInteger( idx ) ) {
941-
throw new TypeError( 'invalid argument. Index argument must be a nonnegative integer. Value: `'+idx+'`.' );
942+
throw new TypeError( format( 'invalid argument. Index argument must be a nonnegative integer. Value: `%s`.', idx ) );
942943
}
943944
} else {
944945
idx = 0;
@@ -1044,7 +1045,7 @@ setReadOnly( Complex128Array.prototype, 'set', function set( value ) {
10441045
}
10451046
return;
10461047
}
1047-
throw new TypeError( 'invalid argument. First argument must be either a complex number, an array-like object, or a complex number array. Value: `'+value+'`.' );
1048+
throw new TypeError( format( 'invalid argument. First argument must be either a complex number, an array-like object, or a complex number array. Value: `%s`.', value ) );
10481049

10491050
/* eslint-enable no-underscore-dangle */
10501051
});

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

+12-11
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ var setReadOnly = require( '@stdlib/utils/define-nonenumerable-read-only-propert
3838
var setReadOnlyAccessor = require( '@stdlib/utils/define-nonenumerable-read-only-accessor' );
3939
var Float32Array = require( '@stdlib/array/float32' );
4040
var Complex64 = require( '@stdlib/complex/float32' );
41+
var format = require( '@stdlib/string/format' );
4142
var realf = require( '@stdlib/complex/realf' );
4243
var imagf = require( '@stdlib/complex/imagf' );
4344
var reinterpret64 = require( '@stdlib/strided/base/reinterpret-complex64' );
@@ -262,7 +263,7 @@ function Complex64Array() {
262263
throw new TypeError( 'invalid argument. Environment lacks Symbol.iterator support. Must provide a length, ArrayBuffer, typed array, or array-like object. Value: `'+buf+'`.' );
263264
}
264265
if ( !isFunction( buf[ ITERATOR_SYMBOL ] ) ) {
265-
throw new TypeError( 'invalid argument. Must provide a length, ArrayBuffer, typed array, array-like object, or an iterable. Value: `'+buf+'`.' );
266+
throw new TypeError( format( 'invalid argument. Must provide a length, ArrayBuffer, typed array, array-like object, or an iterable. Value: `%s`.', buf ) );
266267
}
267268
buf = buf[ ITERATOR_SYMBOL ]();
268269
if ( !isFunction( buf.next ) ) {
@@ -279,11 +280,11 @@ function Complex64Array() {
279280
} else {
280281
buf = arguments[ 0 ];
281282
if ( !isArrayBuffer( buf ) ) {
282-
throw new TypeError( 'invalid argument. First argument must be an array buffer. Value: `'+buf+'`.' );
283+
throw new TypeError( format( 'invalid argument. First argument must be an array buffer. Value: `%s`.', buf ) );
283284
}
284285
byteOffset = arguments[ 1 ];
285286
if ( !isNonNegativeInteger( byteOffset ) ) {
286-
throw new TypeError( 'invalid argument. Byte offset must be a nonnegative integer. Value: `'+byteOffset+'`.' );
287+
throw new TypeError( format( 'invalid argument. Byte offset must be a nonnegative integer. Value: `%s`.', byteOffset ) );
287288
}
288289
if ( !isInteger( byteOffset/BYTES_PER_ELEMENT ) ) {
289290
throw new RangeError( 'invalid argument. Byte offset must be a multiple of '+BYTES_PER_ELEMENT+'. Value: `'+byteOffset+'`.' );
@@ -297,7 +298,7 @@ function Complex64Array() {
297298
} else {
298299
len = arguments[ 2 ];
299300
if ( !isNonNegativeInteger( len ) ) {
300-
throw new TypeError( 'invalid argument. Length must be a nonnegative integer. Value: `'+len+'`.' );
301+
throw new TypeError( format( 'invalid argument. Length must be a nonnegative integer. Value: `%s`.', len ) );
301302
}
302303
if ( (len*BYTES_PER_ELEMENT) > (buf.byteLength-byteOffset) ) {
303304
throw new RangeError( 'invalid arguments. ArrayBuffer has insufficient capacity. Either decrease the array length or provide a bigger buffer. Minimum capacity: `'+(len*BYTES_PER_ELEMENT)+'`.' );
@@ -412,7 +413,7 @@ setReadOnly( Complex64Array, 'from', function from( src ) {
412413
if ( nargs > 1 ) {
413414
clbk = arguments[ 1 ];
414415
if ( !isFunction( clbk ) ) {
415-
throw new TypeError( 'invalid argument. Second argument must be a function. Value: `'+clbk+'`.' );
416+
throw new TypeError( format( 'invalid argument. Second argument must be a function. Value: `%s`.', clbk ) );
416417
}
417418
if ( nargs > 2 ) {
418419
thisArg = arguments[ 2 ];
@@ -433,7 +434,7 @@ setReadOnly( Complex64Array, 'from', function from( src ) {
433434
buf[ j ] = v[ 0 ];
434435
buf[ j+1 ] = v[ 1 ];
435436
} else {
436-
throw new TypeError( 'invalid argument. Callback must return either a two-element array containing real and imaginary components or a complex number. Value: `'+v+'`.' );
437+
throw new TypeError( format( 'invalid argument. Callback must return either a two-element array containing real and imaginary components or a complex number. Value: `%s`.', v ) );
437438
}
438439
j += 2; // stride
439440
}
@@ -480,7 +481,7 @@ setReadOnly( Complex64Array, 'from', function from( src ) {
480481
buf[ j ] = v[ 0 ];
481482
buf[ j+1 ] = v[ 1 ];
482483
} else {
483-
throw new TypeError( 'invalid argument. Callback must return either a two-element array containing real and imaginary components or a complex number. Value: `'+v+'`.' );
484+
throw new TypeError( format( 'invalid argument. Callback must return either a two-element array containing real and imaginary components or a complex number. Value: `%s`.', v ) );
484485
}
485486
j += 2; // stride
486487
}
@@ -509,7 +510,7 @@ setReadOnly( Complex64Array, 'from', function from( src ) {
509510
}
510511
return out;
511512
}
512-
throw new TypeError( 'invalid argument. First argument must be an array-like object or an iterable. Value: `'+src+'`.' );
513+
throw new TypeError( format( 'invalid argument. First argument must be an array-like object or an iterable. Value: `%s`.', src ) );
513514
});
514515

515516
/**
@@ -829,7 +830,7 @@ setReadOnly( Complex64Array.prototype, 'get', function get( idx ) {
829830
throw new TypeError( 'invalid invocation. `this` is not a complex number array.' );
830831
}
831832
if ( !isNonNegativeInteger( idx ) ) {
832-
throw new TypeError( 'invalid argument. Must provide a nonnegative integer. Value: `'+idx+'`.' );
833+
throw new TypeError( format( 'invalid argument. Must provide a nonnegative integer. Value: `%s`.', idx ) );
833834
}
834835
if ( idx >= this._length ) {
835836
return;
@@ -938,7 +939,7 @@ setReadOnly( Complex64Array.prototype, 'set', function set( value ) {
938939
if ( arguments.length > 1 ) {
939940
idx = arguments[ 1 ];
940941
if ( !isNonNegativeInteger( idx ) ) {
941-
throw new TypeError( 'invalid argument. Index argument must be a nonnegative integer. Value: `'+idx+'`.' );
942+
throw new TypeError( format( 'invalid argument. Index argument must be a nonnegative integer. Value: `%s`.', idx ) );
942943
}
943944
} else {
944945
idx = 0;
@@ -1044,7 +1045,7 @@ setReadOnly( Complex64Array.prototype, 'set', function set( value ) {
10441045
}
10451046
return;
10461047
}
1047-
throw new TypeError( 'invalid argument. First argument must be either a complex number, an array-like object, or a complex number array. Value: `'+value+'`.' );
1048+
throw new TypeError( format( 'invalid argument. First argument must be either a complex number, an array-like object, or a complex number array. Value: `%s`.', value ) );
10481049

10491050
/* eslint-enable no-underscore-dangle */
10501051
});

‎lib/node_modules/@stdlib/array/datespace/lib/main.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var hasOwnProp = require( '@stdlib/assert/has-own-property' );
2424
var isInteger = require( '@stdlib/assert/is-integer' );
2525
var isString = require( '@stdlib/assert/is-string' ).isPrimitive;
2626
var isObject = require( '@stdlib/assert/is-object' );
27+
var format = require( '@stdlib/string/format' );
2728
var floor = require( '@stdlib/math/base/special/floor' );
2829
var round = require( '@stdlib/math/base/special/round' );
2930
var ceil = require( '@stdlib/math/base/special/ceil' );
@@ -54,7 +55,7 @@ function validDate( value, name ) {
5455
if ( type === 'string' ) {
5556
value = Date.parse( value );
5657
if ( value !== value ) {
57-
throw new Error( 'invalid argument. Unable to parse ' + name.toLowerCase() + ' date.' );
58+
throw new Error( format( 'invalid argument. Unable to parse %s date.', name.toLowerCase() ) );
5859
}
5960
value = new Date( value );
6061
}
@@ -144,14 +145,14 @@ function datespace( start, stop, length, options ) {
144145
}
145146
if ( flg ) {
146147
if ( !isObject( opts ) ) {
147-
throw new TypeError( 'invalid argument. Options argument must be an object. Value: `' + opts + '`.' );
148+
throw new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', opts ) );
148149
}
149150
if ( hasOwnProp( opts, 'round' ) ) {
150151
if ( !isString( opts.round ) ) {
151-
throw new TypeError( 'invalid option. `round` option must be a string.' );
152+
throw new TypeError( format( 'invalid option. `%s` option must be a string. Option: `%s`.', 'round', opts.round ) );
152153
}
153154
if ( rounders.indexOf( opts.round ) === -1 ) {
154-
throw new Error( 'invalid input option. `round` option must be one of [' + rounders.join( ',' ) + '].' );
155+
throw new Error( format( 'invalid option. `%s` option must be one of [%s].', 'round', rounders.join( ',' ) ) );
155156
}
156157
}
157158
}
@@ -163,8 +164,8 @@ function datespace( start, stop, length, options ) {
163164
case 'ceil':
164165
fcn = ceil;
165166
break;
166-
default:
167167
case 'floor':
168+
default:
168169
fcn = floor;
169170
break;
170171
}

‎lib/node_modules/@stdlib/bench/harness/lib/harness/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ function createHarness( options, clbk ) {
145145
var err;
146146
var b;
147147
if ( !isString( name ) ) {
148-
throw new TypeError( format( 'invalid argument. First argument must be a string primitive. Value: `%1`.', name ) );
148+
throw new TypeError( format( 'invalid argument. First argument must be a string primitive. Value: `%s`.', name ) );
149149
}
150150
opts = copy( DEFAULTS );
151151
if ( arguments.length === 2 ) {

‎lib/node_modules/@stdlib/ml/incr/binary-classification/lib/main.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var isPositiveInteger = require( '@stdlib/assert/is-positive-integer' ).isPrimit
2424
var isVectorLike = require( '@stdlib/assert/is-vector-like' );
2525
var isndarrayLike = require( '@stdlib/assert/is-ndarray-like' );
2626
var setReadOnly = require( '@stdlib/utils/define-nonenumerable-read-only-property' );
27+
var format = require( '@stdlib/string/format' );
2728
var Model = require( './model.js' );
2829
var LEARNING_RATE_DEFAULTS = require( './learning_rate_defaults.json' );
2930
var validate = require( './validate.js' );
@@ -85,7 +86,7 @@ function incrBinaryClassification( N, options ) {
8586
var err;
8687

8788
if ( !isPositiveInteger( N ) ) {
88-
throw new TypeError( 'invalid argument. First argument must be a positive integer. Value: `' + N + '`.' );
89+
throw new TypeError( format( 'invalid argument. First argument must be a positive integer. Value: `%s`.', N ) );
8990
}
9091
opts = {
9192
'intercept': true,
@@ -136,10 +137,10 @@ function incrBinaryClassification( N, options ) {
136137
return model.coefficients;
137138
}
138139
if ( !isVectorLike( x ) ) {
139-
throw new TypeError( 'invalid argument. First argument must be a one-dimensional ndarray. Value: `' + x + '`.' );
140+
throw new TypeError( format( 'invalid argument. First argument must be a one-dimensional ndarray. Value: `%s`.', x ) );
140141
}
141142
if ( y !== -1 && y !== 1 ) {
142-
throw new TypeError( 'invalid argument. Second argument must be either +1 or -1. Value: `' + y + '`.' );
143+
throw new TypeError( format( 'invalid argument. Second argument must be either +1 or -1. Value: `%s`.', y ) );
143144
}
144145
if ( x.shape[ 0 ] !== model.nfeatures ) {
145146
throw new TypeError( 'invalid argument. First argument must be a one-dimensional ndarray of length ' + model.nfeatures + '. Actual length: `' + x.shape[ 0 ] + '`.' );
@@ -180,7 +181,7 @@ function incrBinaryClassification( N, options ) {
180181
var sh;
181182
var t;
182183
if ( !isndarrayLike( X ) ) {
183-
throw new TypeError( 'invalid argument. First argument must be an ndarray. Value: `' + X + '`.' );
184+
throw new TypeError( format( 'invalid argument. First argument must be an ndarray. Value: `%s`.', X ) );
184185
}
185186
sh = X.shape;
186187
if ( sh[ sh.length-1 ] !== N ) {
@@ -193,7 +194,7 @@ function incrBinaryClassification( N, options ) {
193194
throw new Error( 'invalid argument. Second argument is incompatible with model loss function. Probability predictions are only supported when the loss function is either `log` or `modifiedHuber`. Model loss function: `' + opts.loss + '`.' );
194195
}
195196
} else if ( type !== 'label' && type !== 'linear' ) {
196-
throw new TypeError( 'invalid argument. Second argument must be a string value equal to either \'label\', \'probability\', or \'linear\'. Value: `' + type + '`.' );
197+
throw new TypeError( format( 'invalid argument. Second argument must be a string value equal to either \'label\', \'probability\', or \'linear\'. Value: `%s`.', type ) );
197198
}
198199
t = type;
199200
}

‎lib/node_modules/@stdlib/ml/incr/binary-classification/lib/validate.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ var isArrayLikeObject = require( '@stdlib/assert/is-array-like-object' );
2828
var isObject = require( '@stdlib/assert/is-plain-object' );
2929
var hasOwnProp = require( '@stdlib/assert/has-own-property' );
3030
var contains = require( '@stdlib/assert/contains' );
31+
var format = require( '@stdlib/string/format' );
3132
var LEARNING_RATES = require( './learning_rates.json' );
3233
var LOSS_FUNCTIONS = require( './loss_functions.json' );
3334

@@ -57,23 +58,23 @@ var LOSS_FUNCTIONS = require( './loss_functions.json' );
5758
function validate( opts, options ) {
5859
var name;
5960
if ( !isObject( options ) ) {
60-
return new TypeError( 'invalid argument. Options argument must be an object. Value: `' + options + '`.' );
61+
return new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', options ) );
6162
}
6263
if ( hasOwnProp( options, 'intercept' ) ) {
6364
opts.intercept = options.intercept;
6465
if ( !isBoolean( opts.intercept ) ) {
65-
return new TypeError( 'invalid option. `intercept` option must be a boolean. Option: `' + opts.intercept + '`.' );
66+
return new TypeError( format( 'invalid option. `%s` option must be a boolean primitive. Option: `%s`.', 'intercept', opts.intercept ) );
6667
}
6768
}
6869
if ( hasOwnProp( options, 'lambda' ) ) {
6970
opts.lambda = options.lambda;
7071
if ( !isNonNegativeNumber( opts.lambda ) ) {
71-
return new TypeError( 'invalid option. `lambda` option must be a nonnegative number. Option: `' + opts.lambda + '`.' );
72+
return new TypeError( format( 'invalid option. `%s` option must be a nonnegative number. Option: `%s`.', 'lambda', opts.lambda ) );
7273
}
7374
}
7475
if ( hasOwnProp( options, 'learningRate' ) ) {
7576
if ( !isArrayLikeObject( options.learningRate ) ) {
76-
return new TypeError( 'invalid option. `learningRate` option must be an array-like object. Option: `' + options.learningRate + '`.' );
77+
return new TypeError( format( 'invalid option. `%s` option must be an array-like object. Option: `%s`.', 'learningRate', options.learningRate ) );
7778
}
7879
name = options.learningRate[ 0 ];
7980
opts.learningRate[ 0 ] = name;

0 commit comments

Comments
 (0)