errors,util: migrate to use internal/errors.js
PR-URL: https://github.com/nodejs/node/pull/13293 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
This commit is contained in:
parent
84c066a9ce
commit
1609899142
14
lib/util.js
14
lib/util.js
@ -25,6 +25,7 @@ const uv = process.binding('uv');
|
||||
const Buffer = require('buffer').Buffer;
|
||||
const internalUtil = require('internal/util');
|
||||
const binding = process.binding('util');
|
||||
const errors = require('internal/errors');
|
||||
|
||||
const isError = internalUtil.isError;
|
||||
|
||||
@ -194,7 +195,7 @@ Object.defineProperty(inspect, 'defaultOptions', {
|
||||
},
|
||||
set: function(options) {
|
||||
if (options === null || typeof options !== 'object') {
|
||||
throw new TypeError('"options" must be an object');
|
||||
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'options', 'object');
|
||||
}
|
||||
Object.assign(inspectDefaultOptions, options);
|
||||
return inspectDefaultOptions;
|
||||
@ -946,17 +947,14 @@ exports.log = function() {
|
||||
exports.inherits = function(ctor, superCtor) {
|
||||
|
||||
if (ctor === undefined || ctor === null)
|
||||
throw new TypeError('The constructor to "inherits" must not be ' +
|
||||
'null or undefined');
|
||||
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'ctor', 'function');
|
||||
|
||||
if (superCtor === undefined || superCtor === null)
|
||||
throw new TypeError('The super constructor to "inherits" must not ' +
|
||||
'be null or undefined');
|
||||
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'superCtor', 'function');
|
||||
|
||||
if (superCtor.prototype === undefined)
|
||||
throw new TypeError('The super constructor to "inherits" must ' +
|
||||
'have a prototype');
|
||||
|
||||
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'superCtor.prototype',
|
||||
'function');
|
||||
ctor.super_ = superCtor;
|
||||
Object.setPrototypeOf(ctor.prototype, superCtor.prototype);
|
||||
};
|
||||
|
@ -1,11 +1,13 @@
|
||||
'use strict';
|
||||
|
||||
require('../common');
|
||||
const common = require('../common');
|
||||
const assert = require('assert');
|
||||
const inherits = require('util').inherits;
|
||||
const errCheck =
|
||||
/^TypeError: The super constructor to "inherits" must not be null or undefined$/;
|
||||
|
||||
const errCheck = common.expectsError({
|
||||
code: 'ERR_INVALID_ARG_TYPE',
|
||||
type: TypeError,
|
||||
message: 'The "superCtor" argument must be of type function'
|
||||
});
|
||||
|
||||
// super constructor
|
||||
function A() {
|
||||
@ -80,10 +82,20 @@ assert.strictEqual(e.constructor, E);
|
||||
// should throw with invalid arguments
|
||||
assert.throws(function() {
|
||||
inherits(A, {});
|
||||
}, /^TypeError: The super constructor to "inherits" must have a prototype$/);
|
||||
}, common.expectsError({
|
||||
code: 'ERR_INVALID_ARG_TYPE',
|
||||
type: TypeError,
|
||||
message: 'The "superCtor.prototype" argument must be of type function'
|
||||
})
|
||||
);
|
||||
assert.throws(function() {
|
||||
inherits(A, null);
|
||||
}, errCheck);
|
||||
assert.throws(function() {
|
||||
inherits(null, A);
|
||||
}, /^TypeError: The constructor to "inherits" must not be null or undefined$/);
|
||||
}, common.expectsError({
|
||||
code: 'ERR_INVALID_ARG_TYPE',
|
||||
type: TypeError,
|
||||
message: 'The "ctor" argument must be of type function'
|
||||
})
|
||||
);
|
||||
|
@ -1028,11 +1028,21 @@ if (typeof Symbol !== 'undefined') {
|
||||
|
||||
assert.throws(() => {
|
||||
util.inspect.defaultOptions = null;
|
||||
}, /"options" must be an object/);
|
||||
}, common.expectsError({
|
||||
code: 'ERR_INVALID_ARG_TYPE',
|
||||
type: TypeError,
|
||||
message: 'The "options" argument must be of type object'
|
||||
})
|
||||
);
|
||||
|
||||
assert.throws(() => {
|
||||
util.inspect.defaultOptions = 'bad';
|
||||
}, /"options" must be an object/);
|
||||
}, common.expectsError({
|
||||
code: 'ERR_INVALID_ARG_TYPE',
|
||||
type: TypeError,
|
||||
message: 'The "options" argument must be of type object'
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
assert.doesNotThrow(() => util.inspect(process));
|
||||
|
Loading…
x
Reference in New Issue
Block a user