From bbff7403fbf46f9ad92240ac213df8d30ef31b64 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 20 Sep 2018 02:56:13 +0200 Subject: update packages --- node_modules/flagged-respawn/index.js | 38 +++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) (limited to 'node_modules/flagged-respawn/index.js') diff --git a/node_modules/flagged-respawn/index.js b/node_modules/flagged-respawn/index.js index b1234003e..15b4bf70d 100644 --- a/node_modules/flagged-respawn/index.js +++ b/node_modules/flagged-respawn/index.js @@ -1,18 +1,52 @@ const reorder = require('./lib/reorder'); const respawn = require('./lib/respawn'); +const remover = require('./lib/remover'); -module.exports = function (flags, argv, execute) { +const FORBID_RESPAWNING_FLAG = '--no-respawning'; + +module.exports = function (flags, argv, forcedFlags, execute) { if (!flags) { throw new Error('You must specify flags to respawn with.'); } if (!argv) { throw new Error('You must specify an argv array.'); } + + if (typeof forcedFlags === 'function') { + execute = forcedFlags; + forcedFlags = []; + } + + if (typeof forcedFlags === 'string') { + forcedFlags = [forcedFlags]; + } + + if (!Array.isArray(forcedFlags)) { + forcedFlags = []; + } + + var index = argv.indexOf(FORBID_RESPAWNING_FLAG); + if (index >= 0) { + argv = argv.slice(0, index).concat(argv.slice(index + 1)); + argv = remover(flags, argv); + execute(true, process, argv); + return; + } + var proc = process; var reordered = reorder(flags, argv); var ready = JSON.stringify(argv) === JSON.stringify(reordered); + + if (forcedFlags.length) { + reordered = reordered.slice(0, 1) + .concat(forcedFlags) + .concat(reordered.slice(1)); + ready = false; + } + if (!ready) { + reordered.push(FORBID_RESPAWNING_FLAG); proc = respawn(reordered); } - execute(ready, proc); + execute(ready, proc, reordered); }; -- cgit v1.2.3