diff --git a/lib/from_array.js b/lib/from_array.js index ba064fd..bd7e363 100644 --- a/lib/from_array.js +++ b/lib/from_array.js @@ -23,7 +23,7 @@ var isUint64 = require( '@stdlib/assert-is-uint64' ); var toWords = require( '@stdlib/number-uint64-base-to-words' ).assign; var Uint64 = require( '@stdlib/number-uint64-ctor' ); -var format = require( '@stdlib/string-format' ); +var format = require( '@stdlib/error-tools-fmtprodmsg' ); var indices = require( './indices.js' ); diff --git a/lib/from_iterator.js b/lib/from_iterator.js index 91ebe52..7d547ee 100644 --- a/lib/from_iterator.js +++ b/lib/from_iterator.js @@ -23,7 +23,7 @@ var isUint64 = require( '@stdlib/assert-is-uint64' ); var toWords = require( '@stdlib/number-uint64-base-to-words' ).assign; var Uint64 = require( '@stdlib/number-uint64-ctor' ); -var format = require( '@stdlib/string-format' ); +var format = require( '@stdlib/error-tools-fmtprodmsg' ); // MAIN // diff --git a/lib/from_iterator_map.js b/lib/from_iterator_map.js index 4650fe7..caaa203 100644 --- a/lib/from_iterator_map.js +++ b/lib/from_iterator_map.js @@ -23,7 +23,7 @@ var isUint64 = require( '@stdlib/assert-is-uint64' ); var toWords = require( '@stdlib/number-uint64-base-to-words' ).assign; var Uint64 = require( '@stdlib/number-uint64-ctor' ); -var format = require( '@stdlib/string-format' ); +var format = require( '@stdlib/error-tools-fmtprodmsg' ); // MAIN // diff --git a/lib/main.js b/lib/main.js index 7efaaa1..79c6cb3 100644 --- a/lib/main.js +++ b/lib/main.js @@ -40,7 +40,7 @@ var Uint32Array = require( '@stdlib/array-uint32' ); var Number = require( '@stdlib/number-ctor' ); var Uint64 = require( '@stdlib/number-uint64-ctor' ); var toWords = require( '@stdlib/number-uint64-base-to-words' ).assign; -var format = require( '@stdlib/string-format' ); +var format = require( '@stdlib/error-tools-fmtprodmsg' ); var indices = require( './indices.js' ); var fromIterator = require( './from_iterator.js' ); var fromIteratorMap = require( './from_iterator_map.js' ); @@ -216,20 +216,20 @@ function Uint64Array() { } } else if ( isArrayBuffer( arg ) ) { if ( !isInteger( arg.byteLength/BYTES_PER_ELEMENT ) ) { - throw new RangeError( format( 'invalid argument. ArrayBuffer byte length must be a multiple of %u. Byte length: `%u`.', BYTES_PER_ELEMENT, arg.byteLength ) ); + throw new RangeError( format( 'nullE9', BYTES_PER_ELEMENT, arg.byteLength ) ); } buf = new Uint32Array( arg ); } else if ( isObject( arg ) ) { buf = arg; if ( HAS_ITERATOR_SYMBOL === false ) { - throw new TypeError( format( 'invalid argument. Environment lacks Symbol.iterator support. Must provide a length, ArrayBuffer, typed array, or array-like object. Value: `%s`.', buf ) ); + throw new TypeError( format( 'null29', buf ) ); } if ( !isFunction( buf[ ITERATOR_SYMBOL ] ) ) { - throw new TypeError( format( 'invalid argument. Must provide a length, ArrayBuffer, typed array, array-like object, or an iterable. Value: `%s`.', buf ) ); + throw new TypeError( format( 'null2A', buf ) ); } buf = buf[ ITERATOR_SYMBOL ](); if ( !isFunction( buf.next ) ) { - throw new TypeError( format( 'invalid argument. Must provide a length, ArrayBuffer, typed array, array-like object, or an iterable. Value: `%s`.', buf ) ); + throw new TypeError( format( 'null2A', buf ) ); } buf = fromIterator( buf ); if ( buf instanceof Error ) { @@ -243,33 +243,33 @@ function Uint64Array() { } buf = tmp; } else { - throw new TypeError( format( 'invalid argument. Must provide a length, ArrayBuffer, typed array, array-like object, or an iterable. Value: `%s`.', arg ) ); + throw new TypeError( format( 'null2A', arg ) ); } } else { buf = arguments[ 0 ]; if ( !isArrayBuffer( buf ) ) { - throw new TypeError( format( 'invalid argument. First argument must be an ArrayBuffer. Value: `%s`.', buf ) ); + throw new TypeError( format( 'null2B', buf ) ); } byteOffset = arguments[ 1 ]; if ( !isNonNegativeInteger( byteOffset ) ) { - throw new TypeError( format( 'invalid argument. Byte offset must be a nonnegative integer. Value: `%s`.', byteOffset ) ); + throw new TypeError( format( 'null2C', byteOffset ) ); } if ( !isInteger( byteOffset/BYTES_PER_ELEMENT ) ) { - throw new RangeError( format( 'invalid argument. Byte offset must be a multiple of %u. Value: `%u`.', BYTES_PER_ELEMENT, byteOffset ) ); + throw new RangeError( format( 'nullEA', BYTES_PER_ELEMENT, byteOffset ) ); } if ( nargs === 2 ) { len = buf.byteLength - byteOffset; if ( !isInteger( len/BYTES_PER_ELEMENT ) ) { - throw new RangeError( format( 'invalid arguments. ArrayBuffer view byte length must be a multiple of %u. View byte length: `%u`.', BYTES_PER_ELEMENT, len ) ); + throw new RangeError( format( 'null2E', BYTES_PER_ELEMENT, len ) ); } buf = new Uint32Array( buf, byteOffset ); } else { len = arguments[ 2 ]; if ( !isNonNegativeInteger( len ) ) { - throw new TypeError( format( 'invalid argument. Length must be a nonnegative integer. Value: `%s`.', len ) ); + throw new TypeError( format( 'null2F', len ) ); } if ( (len*BYTES_PER_ELEMENT) > (buf.byteLength-byteOffset) ) { - throw new RangeError( format( 'invalid arguments. ArrayBuffer has insufficient capacity. Either decrease the array length or provide a bigger buffer. Minimum capacity: `%u`.', len*BYTES_PER_ELEMENT ) ); + throw new RangeError( format( 'null2G', len*BYTES_PER_ELEMENT ) ); } buf = new Uint32Array( buf, byteOffset, len*2 ); } @@ -372,7 +372,7 @@ setReadOnly( Uint64Array, 'from', function from( src ) { var i; var j; if ( !isFunction( this ) ) { - throw new TypeError( 'invalid invocation. `this` context must be a constructor.' ); + throw new TypeError( format('null01') ); } if ( !isUint64ArrayConstructor( this ) ) { throw new TypeError( 'invalid invocation. `this` is not a 64-bit unsigned integer array.' ); @@ -381,7 +381,7 @@ setReadOnly( Uint64Array, 'from', function from( src ) { if ( nargs > 1 ) { clbk = arguments[ 1 ]; if ( !isFunction( clbk ) ) { - throw new TypeError( format( 'invalid argument. Second argument must be a function. Value: `%s`.', clbk ) ); + throw new TypeError( format( 'null2H', clbk ) ); } if ( nargs > 2 ) { thisArg = arguments[ 2 ]; @@ -421,7 +421,7 @@ setReadOnly( Uint64Array, 'from', function from( src ) { if ( isObject( src ) && HAS_ITERATOR_SYMBOL && isFunction( src[ ITERATOR_SYMBOL ] ) ) { // eslint-disable-line max-len buf = src[ ITERATOR_SYMBOL ](); if ( !isFunction( buf.next ) ) { - throw new TypeError( format( 'invalid argument. First argument must be an array-like object or an iterable. Value: `%s`.', src ) ); + throw new TypeError( format( 'null2J', src ) ); } if ( clbk ) { tmp = fromIteratorMap( buf, clbk, thisArg ); @@ -440,7 +440,7 @@ setReadOnly( Uint64Array, 'from', function from( src ) { } return out; } - throw new TypeError( format( 'invalid argument. First argument must be an array-like object or an iterable. Value: `%s`.', src ) ); + throw new TypeError( format( 'null2J', src ) ); }); /** @@ -465,7 +465,7 @@ setReadOnly( Uint64Array, 'of', function of() { var args; var i; if ( !isFunction( this ) ) { - throw new TypeError( 'invalid invocation. `this` context must be a constructor.' ); + throw new TypeError( format('null01') ); } if ( !isUint64ArrayConstructor( this ) ) { throw new TypeError( 'invalid invocation. `this` is not a 64-bit unsigned integer array.' ); @@ -515,7 +515,7 @@ setReadOnly( Uint64Array.prototype, 'at', function at( idx ) { throw new TypeError( 'invalid invocation. `this` is not a 64-bit unsigned integer array.' ); } if ( !isInteger( idx ) ) { - throw new TypeError( format( 'invalid argument. Must provide an integer. Value: `%s`.', idx ) ); + throw new TypeError( format( 'null8A', idx ) ); } if ( idx < 0 ) { idx += this._length; @@ -739,7 +739,7 @@ setReadOnly( Uint64Array.prototype, 'get', function get( idx ) { throw new TypeError( 'invalid invocation. `this` is not a 64-bit unsigned integer array.' ); } if ( !isNonNegativeInteger( idx ) ) { - throw new TypeError( format( 'invalid argument. Must provide a nonnegative integer. Value: `%s`.', idx ) ); + throw new TypeError( format( 'null2K', idx ) ); } if ( idx >= this._length ) { return; @@ -830,7 +830,7 @@ setReadOnly( Uint64Array.prototype, 'set', function set( value ) { if ( arguments.length > 1 ) { idx = arguments[ 1 ]; if ( !isNonNegativeInteger( idx ) ) { - throw new TypeError( format( 'invalid argument. Index argument must be a nonnegative integer. Value: `%s`.', idx ) ); + throw new TypeError( format( 'null2L', idx ) ); } } else { idx = 0; @@ -838,7 +838,7 @@ setReadOnly( Uint64Array.prototype, 'set', function set( value ) { words = [ 0, 0 ]; if ( isUint64( value ) ) { if ( idx >= this._length ) { - throw new RangeError( format( 'invalid argument. Index argument is out-of-bounds. Value: `%u`.', idx ) ); + throw new RangeError( format( 'null2M', idx ) ); } idx *= 2; toWords( value, words, 1, 0 ); @@ -848,7 +848,7 @@ setReadOnly( Uint64Array.prototype, 'set', function set( value ) { } if ( isNonNegativeInteger( value ) || ( isBigInt( value ) && isNonNegativeInteger( Number( value ) ) ) ) { if ( idx >= this._length ) { - throw new RangeError( format( 'invalid argument. Index argument is out-of-bounds. Value: `%u`.', idx ) ); + throw new RangeError( format( 'null2M', idx ) ); } value = new Uint64( value ); idx *= 2; @@ -860,7 +860,7 @@ setReadOnly( Uint64Array.prototype, 'set', function set( value ) { if ( isUint64Array( value ) ) { N = value._length; if ( idx+N > this._length ) { - throw new RangeError( 'invalid arguments. Target array lacks sufficient storage to accommodate source values.' ); + throw new RangeError( format('null03') ); } sbuf = value._buffer; @@ -893,7 +893,7 @@ setReadOnly( Uint64Array.prototype, 'set', function set( value ) { if ( isCollection( value ) ) { N = value.length; if ( idx+N > this._length ) { - throw new RangeError( 'invalid arguments. Target array lacks sufficient storage to accommodate source values.' ); + throw new RangeError( format('null03') ); } sbuf = value; diff --git a/package.json b/package.json index 254535e..de1213d 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@stdlib/number-ctor": "^0.2.3", "@stdlib/number-uint64-base-to-words": "github:stdlib-js/number-uint64-base-to-words#main", "@stdlib/number-uint64-ctor": "github:stdlib-js/number-uint64-ctor#main", - "@stdlib/string-format": "^0.2.3", + "@stdlib/error-tools-fmtprodmsg": "^0.2.3", "@stdlib/symbol-iterator": "^0.2.3", "@stdlib/types": "^0.5.1", "@stdlib/utils-define-nonenumerable-read-only-accessor": "^0.2.4",