child_process: use internal/errors

PR-URL: #14009
Refs: #11273
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>

Author: tniessen

lib/internal/child_process.js

@@ -264,8 +264,10 @@ ChildProcess.prototype.spawn = function(options) {
 varipcFd;
 vari;
 
-if(options===null||typeofoptions!=='object')
-thrownewTypeError('"options" must be an object');
+if(options===null||typeofoptions!=='object'){
+thrownewerrors.TypeError('ERR_INVALID_ARG_TYPE','options','object',
+options);
+}
 
 // If no `stdio` option was given - use default
 varstdio=options.stdio||'pipe';
@@ -280,23 +282,27 @@ ChildProcess.prototype.spawn = function(options) {
 // Let child process know about opened IPC channel
 if(options.envPairs===undefined)
 options.envPairs=[];
-elseif(!Array.isArray(options.envPairs))
-thrownewTypeError('"envPairs" must be an array');
+elseif(!Array.isArray(options.envPairs)){
+thrownewerrors.TypeError('ERR_INVALID_ARG_TYPE','options.envPairs',
+'array',options.envPairs);
+}
 
 options.envPairs.push('NODE_CHANNEL_FD='+ipcFd);
 }
 
-if(typeofoptions.file==='string')
-this.spawnfile=options.file;
-else
-thrownewTypeError('"file" must be a string');
+if(typeofoptions.file!=='string'){
+thrownewerrors.TypeError('ERR_INVALID_ARG_TYPE','options.file','string',
+options.file);
+}
+this.spawnfile=options.file;
 
 if(Array.isArray(options.args))
 this.spawnargs=options.args;
 elseif(options.args===undefined)
 this.spawnargs=[];
 else
-thrownewTypeError('"args" must be an array');
+thrownewerrors.TypeError('ERR_INVALID_ARG_TYPE','options.args','array',
+options.args);
 
 varerr=this._handle.spawn(options);
 
@@ -574,7 +580,8 @@ function setupChannel(target, channel) {
 options=undefined;
 }elseif(options!==undefined&&
 (options===null||typeofoptions!=='object')){
-thrownewerrors.TypeError('ERR_INVALID_ARG_TYPE','options','Object');
+thrownewerrors.TypeError('ERR_INVALID_ARG_TYPE','options','object',
+options);
 }
 
 options=Object.assign({swallowErrors: false},options);

test/parallel/test-child-process-constructor.js

@@ -5,51 +5,71 @@ const assert = require('assert');
 const{ ChildProcess }=require('child_process');
 assert.strictEqual(typeofChildProcess,'function');
 
+functiontypeName(value){
+returnvalue===null ? 'null' : typeofvalue;
+}
+
 {
 // Verify that invalid options to spawn() throw.
 constchild=newChildProcess();
-constre=/^TypeError:"options"mustbeanobject$/;
 
 [undefined,null,'foo',0,1,NaN,true,false].forEach((options)=>{
 assert.throws(()=>{
 child.spawn(options);
-},re);
+},common.expectsError({
+code: 'ERR_INVALID_ARG_TYPE',
+type: TypeError,
+message: 'The "options" argument must be of type object. Received type '+
+typeName(options)
+}));
 });
 }
 
 {
 // Verify that spawn throws if file is not a string.
 constchild=newChildProcess();
-constre=/^TypeError:"file"mustbeastring$/;
 
 [undefined,null,0,1,NaN,true,false,{}].forEach((file)=>{
 assert.throws(()=>{
 child.spawn({ file });
-},re);
+},common.expectsError({
+code: 'ERR_INVALID_ARG_TYPE',
+type: TypeError,
+message: 'The "options.file" property must be of type string. Received '+
+'type '+typeName(file)
+}));
 });
 }
 
 {
 // Verify that spawn throws if envPairs is not an array or undefined.
 constchild=newChildProcess();
-constre=/^TypeError:"envPairs"mustbeanarray$/;
 
 [null,0,1,NaN,true,false,{},'foo'].forEach((envPairs)=>{
 assert.throws(()=>{
 child.spawn({ envPairs,stdio: ['ignore','ignore','ignore','ipc']});
-},re);
+},common.expectsError({
+code: 'ERR_INVALID_ARG_TYPE',
+type: TypeError,
+message: 'The "options.envPairs" property must be of type array. '+
+'Received type '+typeName(envPairs)
+}));
 });
 }
 
 {
 // Verify that spawn throws if args is not an array or undefined.
 constchild=newChildProcess();
-constre=/^TypeError:"args"mustbeanarray$/;
 
 [null,0,1,NaN,true,false,{},'foo'].forEach((args)=>{
 assert.throws(()=>{
 child.spawn({file: 'foo', args });
-},re);
+},common.expectsError({
+code: 'ERR_INVALID_ARG_TYPE',
+type: TypeError,
+message: 'The "options.args" property must be of type array. Received '+
+'type '+typeName(args)
+}));
 });
 }