@@ -34,26 +34,23 @@ const {
34
34
errnoException,
35
35
codes : {
36
36
ERR_ASSERTION ,
37
- ERR_INVALID_ARG_TYPE ,
38
37
ERR_INVALID_ARG_VALUE ,
39
38
ERR_OUT_OF_RANGE ,
40
39
ERR_UNKNOWN_SIGNAL
41
40
}
42
41
} = require ( 'internal/errors' ) ;
43
42
const format = require ( 'internal/util/inspect' ) . format ;
44
43
const {
44
+ isInt32,
45
45
validateArray,
46
46
validateNumber,
47
47
validateObject,
48
48
} = require ( 'internal/validators' ) ;
49
+ const assert = require ( 'assert' ) ;
49
50
const constants = internalBinding ( 'constants' ) . os . signals ;
50
51
51
52
const kInternal = Symbol ( 'internal properties' ) ;
52
53
53
- function assert ( x , msg ) {
54
- if ( ! x ) throw new ERR_ASSERTION ( msg || 'assertion error' ) ;
55
- }
56
-
57
54
function getFastAPIs ( binding ) {
58
55
const {
59
56
hrtime : _hrtime
@@ -120,9 +117,9 @@ function wrapProcessMethods(binding) {
120
117
function cpuUsage ( prevValue ) {
121
118
// If a previous value was passed in, ensure it has the correct shape.
122
119
if ( prevValue ) {
123
- if ( ! previousValueIsValid ( prevValue . user ) ) {
124
- validateObject ( prevValue , 'prevValue' ) ;
120
+ validateObject ( prevValue , 'prevValue' ) ;
125
121
122
+ if ( ! previousValueIsValid ( prevValue . user ) ) {
126
123
validateNumber ( prevValue . user , 'prevValue.user' ) ;
127
124
throw new ERR_INVALID_ARG_VALUE . RangeError ( 'prevValue.user' ,
128
125
prevValue . user ) ;
@@ -192,18 +189,15 @@ function wrapProcessMethods(binding) {
192
189
function kill ( pid , sig ) {
193
190
let err ;
194
191
195
- // eslint-disable-next-line eqeqeq
196
- if ( pid != ( pid | 0 ) ) {
197
- throw new ERR_INVALID_ARG_TYPE ( 'pid' , 'number' , pid ) ;
198
- }
192
+ validateNumber ( pid , 'pid' ) ;
199
193
200
194
// Preserve null signal
201
- if ( sig === ( sig | 0 ) ) {
195
+ if ( isInt32 ( sig ) ) {
202
196
// XXX(joyeecheung): we have to use process._kill here because
203
197
// it's monkey-patched by tests.
204
198
err = process . _kill ( pid , sig ) ;
205
199
} else {
206
- sig = sig || 'SIGTERM' ;
200
+ sig ||= 'SIGTERM' ;
207
201
if ( constants [ sig ] ) {
208
202
err = process . _kill ( pid , constants [ sig ] ) ;
209
203
} else {
@@ -251,7 +245,6 @@ function wrapProcessMethods(binding) {
251
245
} ;
252
246
}
253
247
254
- const replaceUnderscoresRegex = / _ / g;
255
248
const leadingDashesRegex = / ^ - - ? / ;
256
249
const trailingValuesRegex = / = .* $ / ;
257
250
@@ -333,7 +326,7 @@ function buildAllowedFlags() {
333
326
// on a dummy option set and see whether it rejects the argument or
334
327
// not.
335
328
if ( typeof key === 'string' ) {
336
- key = StringPrototypeReplace ( key , replaceUnderscoresRegex , '-' ) ;
329
+ key = StringPrototypeReplaceAll ( key , '_' , '-' ) ;
337
330
if ( RegExpPrototypeTest ( leadingDashesRegex , key ) ) {
338
331
key = StringPrototypeReplace ( key , trailingValuesRegex , '' ) ;
339
332
return ArrayPrototypeIncludes ( this [ kInternal ] . array , key ) ;
0 commit comments