From 6fbe21a52d7c300bd074a1d3e0e709a42d89d5bf Mon Sep 17 00:00:00 2001 From: stdlib-bot Date: Wed, 24 Jun 2026 11:17:34 +0000 Subject: [PATCH] Transform error messages --- lib/factory.js | 2 +- lib/main.js | 36 ++++++++++++++++++------------------ lib/validate.js | 6 +++--- package.json | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/factory.js b/lib/factory.js index 29796e2..321f881 100644 --- a/lib/factory.js +++ b/lib/factory.js @@ -28,7 +28,7 @@ var isArrayBuffer = require( '@stdlib/assert-is-arraybuffer' ); var isCollection = require( '@stdlib/assert-is-collection' ); var isDataType = require( '@stdlib/ndarray-base-assert-is-data-type' ); var objectAssign = require( '@stdlib/object-assign' ); -var format = require( '@stdlib/string-format' ); +var format = require( '@stdlib/error-tools-fmtprodmsg' ); var validate = require( './validate.js' ); var main = require( './main.js' ); diff --git a/lib/main.js b/lib/main.js index 1f88cd8..441b5f0 100644 --- a/lib/main.js +++ b/lib/main.js @@ -44,7 +44,7 @@ var copyBuffer = require( '@stdlib/buffer-from-buffer' ); var iterator2array = require( '@stdlib/array-from-iterator' ); var bytesPerElement = require( '@stdlib/ndarray-base-bytes-per-element' ); var ITERATOR_SYMBOL = require( '@stdlib/symbol-iterator' ); -var format = require( '@stdlib/string-format' ); +var format = require( '@stdlib/error-tools-fmtprodmsg' ); // VARIABLES // @@ -462,7 +462,7 @@ function vector() { // Case: vector( dtype, options ) if ( isDataType( arg0 ) ) { if ( arg1 === null ) { - throw new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', arg1 ) ); + throw new TypeError( format( 'null2V', arg1 ) ); } return vectorWithDType( 0, arg0, arg1 ); } @@ -477,13 +477,13 @@ function vector() { // Case: vector( ArrayBuffer, byteOffset ) if ( isNonNegativeInteger( arg1 ) ) { if ( !isArrayBuffer( arg0 ) ) { - throw new TypeError( format( 'invalid argument. First argument must be an ArrayBuffer. Value: `%s`.', arg0 ) ); + throw new TypeError( format( 'null2B', arg0 ) ); } return arraybuffer2vector( DEFAULT_DTYPE, arg0, (arg0.byteLength-arg1)/bytesPerElement( DEFAULT_DTYPE ), 1, arg1, DEFAULT_ORDER ); } // Case: vector( arg0, options ) if ( arg1 === null ) { - throw new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', arg1 ) ); + throw new TypeError( format( 'null2V', arg1 ) ); } out = vectorWithDType( arg0, DEFAULT_DTYPE, arg1 ); if ( out === null ) { @@ -498,17 +498,17 @@ function vector() { // Case: vector( ArrayBuffer, byteOffset, dtype ) if ( isDataType( arg2 ) ) { if ( !isArrayBuffer( arg0 ) ) { - throw new TypeError( format( 'invalid argument. First argument must be an ArrayBuffer. Value: `%s`.', arg0 ) ); + throw new TypeError( format( 'null2B', arg0 ) ); } if ( !isNonNegativeInteger( arg1 ) ) { - throw new TypeError( format( 'invalid argument. Byte offset must be a nonnegative integer. Value: `%s`.', arg1 ) ); + throw new TypeError( format( 'null2C', arg1 ) ); } return arraybuffer2vector( arg2, arg0, (arg0.byteLength-arg1)/bytesPerElement( arg2 ), 1, arg1, DEFAULT_ORDER ); } // Case: vector( arg0, dtype, options ) if ( isDataType( arg1 ) ) { if ( arg2 === null ) { - throw new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', arg2 ) ); + throw new TypeError( format( 'null2V', arg2 ) ); } out = vectorWithDType( arg0, arg1, arg2 ); if ( out === null ) { @@ -518,10 +518,10 @@ function vector() { } // Case: vector( ArrayBuffer, byteOffset, arg2 ) if ( !isArrayBuffer( arg0 ) ) { - throw new TypeError( format( 'invalid argument. First argument must be an ArrayBuffer. Value: `%s`.', arg0 ) ); + throw new TypeError( format( 'null2B', arg0 ) ); } if ( !isNonNegativeInteger( arg1 ) ) { - throw new TypeError( format( 'invalid argument. Byte offset must be a nonnegative integer. Value: `%s`.', arg1 ) ); + throw new TypeError( format( 'null2C', arg1 ) ); } // Case: vector( ArrayBuffer, byteOffset, length ) if ( isNonNegativeInteger( arg2 ) ) { @@ -529,7 +529,7 @@ function vector() { } // Case: vector( ArrayBuffer, byteOffset, options ) if ( arg2 === null ) { - throw new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', arg2 ) ); + throw new TypeError( format( 'null2V', arg2 ) ); } return arraybuffer2vector( DEFAULT_DTYPE, arg0, (arg0.byteLength-arg1)/bytesPerElement( DEFAULT_DTYPE ), 1, arg1, resolveOrder( arg2 ), arg2 ); } @@ -538,10 +538,10 @@ function vector() { // Case: vector( ArrayBuffer, byteOffset, arg2, arg3 ) if ( nargs === 4 ) { if ( !isArrayBuffer( arg0 ) ) { - throw new TypeError( format( 'invalid argument. First argument must be an ArrayBuffer. Value: `%s`.', arg0 ) ); + throw new TypeError( format( 'null2B', arg0 ) ); } if ( !isNonNegativeInteger( arg1 ) ) { - throw new TypeError( format( 'invalid argument. Byte offset must be a nonnegative integer. Value: `%s`.', arg1 ) ); + throw new TypeError( format( 'null2C', arg1 ) ); } // Case: vector( ArrayBuffer, byteOffset, length, dtype ) if ( isNonNegativeInteger( arg2 ) ) { @@ -550,7 +550,7 @@ function vector() { } // Case: vector( ArrayBuffer, byteOffset, length, options ) if ( !isPlainObject( arg3 ) ) { - throw new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', arg3 ) ); + throw new TypeError( format( 'null2V', arg3 ) ); } return arraybuffer2vector( DEFAULT_DTYPE, arg0, arg2, 1, arg1, resolveOrder( arg3 ), arg3 ); } @@ -559,7 +559,7 @@ function vector() { throw new TypeError( format( 'invalid argument. Third argument must be a recognized/supported data type. Value: `%s`.', arg2 ) ); } if ( !isPlainObject( arg3 ) ) { - throw new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', arg3 ) ); + throw new TypeError( format( 'null2V', arg3 ) ); } return arraybuffer2vector( arg2, arg0, (arg0.byteLength-arg1)/bytesPerElement( arg2 ), 1, arg1, resolveOrder( arg3 ), arg3 ); } @@ -567,19 +567,19 @@ function vector() { // Case: vector( ArrayBuffer, byteOffset, length, dtype, options ) if ( !isArrayBuffer( arg0 ) ) { - throw new TypeError( format( 'invalid argument. First argument must be an ArrayBuffer. Value: `%s`.', arg0 ) ); + throw new TypeError( format( 'null2B', arg0 ) ); } if ( !isNonNegativeInteger( arg1 ) ) { - throw new TypeError( format( 'invalid argument. Byte offset must be a nonnegative integer. Value: `%s`.', arg1 ) ); + throw new TypeError( format( 'null2C', arg1 ) ); } if ( !isNonNegativeInteger( arg2 ) ) { - throw new TypeError( format( 'invalid argument. Length must be a nonnegative integer. Value: `%s`.', arg2 ) ); + throw new TypeError( format( 'null2F', arg2 ) ); } if ( !isDataType( arg3 ) ) { throw new TypeError( format( 'invalid argument. Fourth argument must be a recognized/supported data type. Value: `%s`.', arg3 ) ); } if ( !isPlainObject( arg4 ) ) { - throw new TypeError( format( 'invalid argument. Options argument must be an object. Value: `%s`.', arg4 ) ); + throw new TypeError( format( 'null2V', arg4 ) ); } return arraybuffer2vector( arg3, arg0, arg2, 1, arg1, resolveOrder( arg4 ), arg4 ); } diff --git a/lib/validate.js b/lib/validate.js index dc0185e..672dfb6 100644 --- a/lib/validate.js +++ b/lib/validate.js @@ -25,7 +25,7 @@ var hasOwnProp = require( '@stdlib/assert-has-own-property' ); var isBoolean = require( '@stdlib/assert-is-boolean' ).isPrimitive; var isIndexMode = require( '@stdlib/ndarray-base-assert-is-index-mode' ); var isOrder = require( '@stdlib/ndarray-base-assert-is-order' ); -var format = require( '@stdlib/string-format' ); +var format = require( '@stdlib/error-tools-fmtprodmsg' ); // MAIN // @@ -53,12 +53,12 @@ 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( 'null2V', options ) ); } if ( hasOwnProp( options, 'readonly' ) ) { opts.readonly = options.readonly; if ( !isBoolean( opts.readonly ) ) { - return new TypeError( format( 'invalid option. `%s` option must be a boolean. Option: `%s`.', 'readonly', opts.readonly ) ); + return new TypeError( format( 'null2o', 'readonly', opts.readonly ) ); } } if ( hasOwnProp( options, 'mode' ) ) { diff --git a/package.json b/package.json index abb61a9..5577a04 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "@stdlib/ndarray-ctor": "^0.3.1", "@stdlib/ndarray-defaults": "^0.4.1", "@stdlib/object-assign": "^0.2.3", - "@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-property": "^0.2.3",