diff --git a/lib/factory.js b/lib/factory.js index fe6c483..4c31a6d 100644 --- a/lib/factory.js +++ b/lib/factory.js @@ -22,7 +22,7 @@ var isPlainObject = require( '@stdlib/assert-is-plain-object' ); var assign = require( '@stdlib/object-assign' ); -var format = require( '@stdlib/string-format' ); +var format = require( '@stdlib/error-tools-fmtprodmsg' ); var RandomStream = require( './main.js' ); @@ -73,12 +73,12 @@ function factory( a, b, c, options ) { nargs = arguments.length; if ( nargs === 1 ) { if ( !isPlainObject( a ) ) { - throw new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', a ) ); + throw new TypeError( format( '0rx2V', a ) ); } opts = assign( {}, a ); } else if ( nargs > 3 ) { if ( !isPlainObject( options ) ) { - throw new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', options ) ); + throw new TypeError( format( '0rx2V', options ) ); } opts = assign( {}, options ); } else { diff --git a/lib/main.js b/lib/main.js index 600300d..1002933 100644 --- a/lib/main.js +++ b/lib/main.js @@ -33,7 +33,7 @@ var setReadWriteAccessor = require( '@stdlib/utils-define-read-write-accessor' ) var rtriang = require( '@stdlib/random-base-triangular' ).factory; var string2buffer = require( '@stdlib/buffer-from-string' ); var nextTick = require( '@stdlib/utils-next-tick' ); -var format = require( '@stdlib/string-format' ); +var format = require( '@stdlib/error-tools-fmtprodmsg' ); var DEFAULTS = require( './defaults.json' ); var validate = require( './validate.js' ); var debug = require( './debug.js' ); @@ -238,16 +238,16 @@ function RandomStream( a, b, c, options ) { return new RandomStream( a, b, c ); } if ( !isNumber( a ) || isnan( a ) ) { - throw new TypeError( format( 'invalid argument. First argument must be a number and not NaN. Value: `%s`.', a ) ); + throw new TypeError( format( '0rx6v', a ) ); } if ( !isNumber( b ) || isnan( b ) ) { - throw new TypeError( format( 'invalid argument. Second argument must be a number and not NaN. Value: `%s`.', b ) ); + throw new TypeError( format( '0rx6w', b ) ); } if ( !isNumber( c ) || isnan( c ) ) { - throw new TypeError( format( 'invalid argument. Third argument must be a number and not NaN. Value: `%s`.', c ) ); + throw new TypeError( format( '0rx7C', c ) ); } if ( !(a <= c && c <= b) ) { - throw new RangeError( format( 'invalid arguments. Parameters must satisfy the following condition: %s. a: `%f`. b: `%f`. c: `%f`.', 'a <= c <= b', a, b, c ) ); + throw new RangeError( format( '0rx9C', 'a <= c <= b', a, b, c ) ); } opts = assign( {}, DEFAULTS ); if ( arguments.length > 3 ) { diff --git a/lib/object_mode.js b/lib/object_mode.js index 0f7eefd..45ab7fe 100644 --- a/lib/object_mode.js +++ b/lib/object_mode.js @@ -22,7 +22,7 @@ var isObject = require( '@stdlib/assert-is-plain-object' ); var assign = require( '@stdlib/object-assign' ); -var format = require( '@stdlib/string-format' ); +var format = require( '@stdlib/error-tools-fmtprodmsg' ); var RandomStream = require( './main.js' ); @@ -72,7 +72,7 @@ function objectMode( a, b, c, options ) { if ( arguments.length > 3 ) { opts = options; if ( !isObject( opts ) ) { - throw new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', opts ) ); + throw new TypeError( format( '0rx2V', opts ) ); } opts = assign( {}, options ); } else { diff --git a/lib/validate.js b/lib/validate.js index 3a4eefd..0dc4962 100644 --- a/lib/validate.js +++ b/lib/validate.js @@ -27,7 +27,7 @@ var isNonNegative = require( '@stdlib/assert-is-nonnegative-number' ).isPrimitiv var isString = require( '@stdlib/assert-is-string' ).isPrimitive; var isPositiveInteger = require( '@stdlib/assert-is-positive-integer' ).isPrimitive; var isNonNegativeInteger = require( '@stdlib/assert-is-nonnegative-integer' ).isPrimitive; -var format = require( '@stdlib/string-format' ); +var format = require( '@stdlib/error-tools-fmtprodmsg' ); // MAIN // @@ -62,42 +62,42 @@ 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( '0rx2V', options ) ); } if ( hasOwnProp( options, 'sep' ) ) { opts.sep = options.sep; if ( !isString( opts.sep ) ) { - return new TypeError( format( 'invalid option. `%s` option must be a string. Option: `%s`.', 'sep', opts.sep ) ); + return new TypeError( format( '0rx2W', 'sep', opts.sep ) ); } } if ( hasOwnProp( options, 'objectMode' ) ) { opts.objectMode = options.objectMode; if ( !isBoolean( opts.objectMode ) ) { - return new TypeError( format( 'invalid option. `%s` option must be a boolean. Option: `%s`.', 'objectMode', opts.objectMode ) ); + return new TypeError( format( '0rx2o', 'objectMode', opts.objectMode ) ); } } if ( hasOwnProp( options, 'encoding' ) ) { opts.encoding = options.encoding; if ( !isString( opts.encoding ) && opts.encoding !== null ) { - return new TypeError( format( 'invalid option. `%s` option must be a string or null. Option: `%s`.', 'encoding', opts.encoding ) ); + return new TypeError( format( '0rx7n', 'encoding', opts.encoding ) ); } } if ( hasOwnProp( options, 'highWaterMark' ) ) { opts.highWaterMark = options.highWaterMark; if ( !isNonNegative( opts.highWaterMark ) ) { - return new TypeError( format( 'invalid option. `%s` option must be a nonnegative number. Option: `%s`.', 'highWaterMark', opts.highWaterMark ) ); + return new TypeError( format( '0rx4k', 'highWaterMark', opts.highWaterMark ) ); } } if ( hasOwnProp( options, 'iter' ) ) { opts.iter = options.iter; if ( !isNonNegativeInteger( opts.iter ) ) { - return new TypeError( format( 'invalid option. `%s` option must be a nonnegative integer. Option: `%s`.', 'iter', opts.iter ) ); + return new TypeError( format( '0rx2t', 'iter', opts.iter ) ); } } if ( hasOwnProp( options, 'siter' ) ) { opts.siter = options.siter; if ( !isPositiveInteger( opts.siter ) ) { - return new TypeError( format( 'invalid option. `%s` option must be a positive integer. Option: `%s`.', 'siter', opts.siter ) ); + return new TypeError( format( '0rx3P', 'siter', opts.siter ) ); } } // Pass through options... diff --git a/package.json b/package.json index 9799fa2..e11d914 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "@stdlib/process-cwd": "^0.2.3", "@stdlib/random-base-triangular": "^0.2.2", "@stdlib/streams-node-stdout": "^0.2.3", - "@stdlib/string-format": "^0.2.3", + "@stdlib/error-tools-fmtprodmsg": "^0.2.3", "@stdlib/types": "^0.5.1", "@stdlib/utils-define-nonenumerable-property": "^0.2.3", "@stdlib/utils-define-nonenumerable-read-only-property": "^0.2.3",