diff --git a/lib/child_process.js b/lib/child_process.js index 0fd372e3112736..66be7611dc9587 100644 --- a/lib/child_process.js +++ b/lib/child_process.js @@ -51,9 +51,7 @@ const { const MAX_BUFFER = 1024 * 1024; -exports.ChildProcess = ChildProcess; - -exports.fork = function fork(modulePath /* , args, options */) { +function fork(modulePath /* , args, options */) { validateString(modulePath, 'modulePath'); // Get options and args arguments. @@ -108,10 +106,9 @@ exports.fork = function fork(modulePath /* , args, options */) { options.shell = false; return spawn(options.execPath, args, options); -}; - +} -exports._forkChild = function _forkChild(fd) { +function _forkChild(fd) { // set process.send() const p = new Pipe(PipeConstants.IPC); p.open(fd); @@ -123,8 +120,7 @@ exports._forkChild = function _forkChild(fd) { process.on('removeListener', function onRemoveListener(name) { if (name === 'message' || name === 'disconnect') control.unref(); }); -}; - +} function normalizeExecArgs(command, options, callback) { if (typeof options === 'function') { @@ -144,12 +140,12 @@ function normalizeExecArgs(command, options, callback) { } -exports.exec = function exec(command, options, callback) { +function exec(command, options, callback) { const opts = normalizeExecArgs(command, options, callback); - return exports.execFile(opts.file, - opts.options, - opts.callback); -}; + return module.exports.execFile(opts.file, + opts.options, + opts.callback); +} const customPromiseExecFunction = (orig) => { return (...args) => { @@ -167,12 +163,12 @@ const customPromiseExecFunction = (orig) => { }; }; -Object.defineProperty(exports.exec, promisify.custom, { +Object.defineProperty(exec, promisify.custom, { enumerable: false, - value: customPromiseExecFunction(exports.exec) + value: customPromiseExecFunction(exec) }); -exports.execFile = function execFile(file /* , args, options, callback */) { +function execFile(file /* , args, options, callback */) { let args = []; let callback; let options; @@ -386,11 +382,11 @@ exports.execFile = function execFile(file /* , args, options, callback */) { child.addListener('error', errorhandler); return child; -}; +} -Object.defineProperty(exports.execFile, promisify.custom, { +Object.defineProperty(execFile, promisify.custom, { enumerable: false, - value: customPromiseExecFunction(exports.execFile) + value: customPromiseExecFunction(execFile) }); function normalizeSpawnArguments(file, args, options) { @@ -529,7 +525,7 @@ function normalizeSpawnArguments(file, args, options) { } -var spawn = exports.spawn = function spawn(file, args, options) { +function spawn(file, args, options) { const opts = normalizeSpawnArguments(file, args, options); const child = new ChildProcess(); @@ -550,7 +546,7 @@ var spawn = exports.spawn = function spawn(file, args, options) { }); return child; -}; +} function spawnSync(file, args, options) { const opts = normalizeSpawnArguments(file, args, options); @@ -605,7 +601,6 @@ function spawnSync(file, args, options) { return child_process.spawnSync(opts); } -exports.spawnSync = spawnSync; function checkExecSyncError(ret, args, cmd) { @@ -643,7 +638,6 @@ function execFileSync(command, args, options) { return ret.stdout; } -exports.execFileSync = execFileSync; function execSync(command, options) { @@ -662,7 +656,6 @@ function execSync(command, options) { return ret.stdout; } -exports.execSync = execSync; function validateTimeout(timeout) { @@ -690,3 +683,15 @@ function sanitizeKillSignal(killSignal) { killSignal); } } + +module.exports = { + _forkChild, + ChildProcess, + exec, + execFile, + execFileSync, + execSync, + fork, + spawn, + spawnSync +};