diff --git a/lib/assign.js b/lib/assign.js index f9ee6b2..5e230fc 100644 --- a/lib/assign.js +++ b/lib/assign.js @@ -24,7 +24,7 @@ var isNonNegativeIntegerArray = require( '@stdlib/assert-is-nonnegative-integer- var isInteger = require( '@stdlib/assert-is-integer' ).isPrimitive; var shape2strides = require( '@stdlib/ndarray-base-shape2strides' ); var getSubscripts = require( '@stdlib/ndarray-base-ind2sub' ).assign; -var format = require( '@stdlib/string-format' ); +var format = require( '@stdlib/error-tools-fmtprodmsg' ); var defaults = require( './defaults.json' ); var validate = require( './validate.js' ); @@ -81,20 +81,20 @@ function ind2sub( shape, idx, options, out ) { throw err; } if ( typeof out !== 'object' || out === null ) { - throw new TypeError( format( 'invalid argument. Output argument must be either an array, typed array, or object. Value: `%s`.', out ) ); + throw new TypeError( format( '0jx5j', out ) ); } dest = out; } else { dest = options; if ( typeof dest !== 'object' || dest === null ) { - throw new TypeError( format( 'invalid argument. Output argument must be either an array, typed array, or object. Value: `%s`.', dest ) ); + throw new TypeError( format( '0jx5j', dest ) ); } } if ( !isNonNegativeIntegerArray( shape ) ) { - throw new TypeError( format( 'invalid argument. Shape argument must be an array-like object containing nonnegative integers. Value: `%s`.', shape ) ); + throw new TypeError( format( '0jx5k', shape ) ); } if ( !isInteger( idx ) ) { - throw new TypeError( format( 'invalid argument. Linear index must be integer valued. Value: `%s`.', idx ) ); + throw new TypeError( format( '0jx5l', idx ) ); } // Note: strides are positive, so offset is always zero return getSubscripts( shape, shape2strides( shape, opts.order ), 0, opts.order, idx, opts.mode, dest ); // eslint-disable-line max-len diff --git a/lib/main.js b/lib/main.js index 58fdf93..697ffa9 100644 --- a/lib/main.js +++ b/lib/main.js @@ -24,7 +24,7 @@ var isNonNegativeIntegerArray = require( '@stdlib/assert-is-nonnegative-integer- var isInteger = require( '@stdlib/assert-is-integer' ).isPrimitive; var shape2strides = require( '@stdlib/ndarray-base-shape2strides' ); var getSubscripts = require( '@stdlib/ndarray-base-ind2sub' ); -var format = require( '@stdlib/string-format' ); +var format = require( '@stdlib/error-tools-fmtprodmsg' ); var defaults = require( './defaults.json' ); var validate = require( './validate.js' ); @@ -73,10 +73,10 @@ function ind2sub( shape, idx, options ) { } } if ( !isNonNegativeIntegerArray( shape ) ) { - throw new TypeError( format( 'invalid argument. Shape argument must be an array-like object containing nonnegative integers. Value: `%s`.', shape ) ); + throw new TypeError( format( '0jx5k', shape ) ); } if ( !isInteger( idx ) ) { - throw new TypeError( format( 'invalid argument. Linear index must be integer valued. Value: `%s`.', idx ) ); + throw new TypeError( format( '0jx5l', idx ) ); } // Note: strides are positive, so offset is always zero return getSubscripts( shape, shape2strides( shape, opts.order ), 0, opts.order, idx, opts.mode ); // eslint-disable-line max-len diff --git a/lib/validate.js b/lib/validate.js index ee01d90..2413b4f 100644 --- a/lib/validate.js +++ b/lib/validate.js @@ -24,7 +24,7 @@ var isObject = require( '@stdlib/assert-is-plain-object' ); var hasOwnProp = require( '@stdlib/assert-has-own-property' ); var isOrder = require( '@stdlib/ndarray-base-assert-is-order' ); var isIndexMode = require( '@stdlib/ndarray-base-assert-is-index-mode' ); -var format = require( '@stdlib/string-format' ); +var format = require( '@stdlib/error-tools-fmtprodmsg' ); // MAIN // @@ -52,18 +52,18 @@ var format = require( '@stdlib/string-format' ); */ function validate( opts, options ) { if ( !isObject( options ) ) { - return new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', options ) ); + return new TypeError( format( '0jx2V', options ) ); } if ( hasOwnProp( options, 'mode' ) ) { opts.mode = options.mode; if ( !isIndexMode( opts.mode ) ) { - return new TypeError( format( 'invalid option. `%s` option must be a supported/recognized mode. Option: `%s`.', 'mode', opts.mode ) ); + return new TypeError( format( '0jx5m', 'mode', opts.mode ) ); } } if ( hasOwnProp( options, 'order' ) ) { opts.order = options.order; if ( !isOrder( opts.order ) ) { - return new TypeError( format( 'invalid option. `%s` option must be a supported/recognized order. Option: `%s`.', 'order', opts.order ) ); + return new TypeError( format( '0jx5n', 'order', opts.order ) ); } } return null; diff --git a/package.json b/package.json index 1cf74ee..75cb997 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "@stdlib/ndarray-base-assert-is-order": "^0.2.2", "@stdlib/ndarray-base-ind2sub": "^0.2.3", "@stdlib/ndarray-base-shape2strides": "^0.2.3", - "@stdlib/string-format": "^0.2.3", + "@stdlib/error-tools-fmtprodmsg": "^0.2.3", "@stdlib/types": "^0.4.3", "@stdlib/utils-define-nonenumerable-read-only-property": "^0.2.3", "@stdlib/error-tools-fmtprodmsg": "^0.2.3"