diff --git a/lib/exec_wrapper.js b/lib/exec_wrapper.js index cabf03f5e..4d1ee6f27 100644 --- a/lib/exec_wrapper.js +++ b/lib/exec_wrapper.js @@ -15,17 +15,26 @@ async function exec_wrapper(commandLine, args, options) { let stderr = ''; let listeners = { stdout: (data) => { - var _a, _b, _c; + var _a; stdout += data.toString(); - // NB change behaviour to only write to stdout/err if no listener passed - process.stdout.write(data); - (_c = (_a = originalListener) === null || _a === void 0 ? void 0 : (_b = _a).stdout) === null || _c === void 0 ? void 0 : _c.call(_b, data); + if (((_a = originalListener) === null || _a === void 0 ? void 0 : _a.stdout) !== undefined) { + originalListener.stdout(data); + } + else { + // if no stdout listener was originally defined then match behaviour of exec.exec + process.stdout.write(data); + } }, stderr: (data) => { - var _a, _b, _c; + var _a; stderr += data.toString(); - process.stderr.write(data); - (_c = (_a = originalListener) === null || _a === void 0 ? void 0 : (_b = _a).stderr) === null || _c === void 0 ? void 0 : _c.call(_b, data); + if (((_a = originalListener) === null || _a === void 0 ? void 0 : _a.stderr) !== undefined) { + originalListener.stderr(data); + } + else { + // if no stderr listener was originally defined then match behaviour of exec.exec + process.stderr.write(data); + } } }; const returnCode = await exec.exec(commandLine, args, { diff --git a/lib/exec_wrapper.js.map b/lib/exec_wrapper.js.map index a05333309..9782a3592 100644 --- a/lib/exec_wrapper.js.map +++ b/lib/exec_wrapper.js.map @@ -1 +1 @@ -{"version":3,"file":"exec_wrapper.js","sourceRoot":"","sources":["../src/exec_wrapper.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oDAAsC;AAG/B,KAAK,UAAU,YAAY,CAAC,WAAmB,EAAE,IAAe,EAAE,OAAwB;;IAE/F,MAAM,gBAAgB,SAAG,OAAO,0CAAE,SAAS,CAAC;IAE5C,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,IAAI,SAAS,GAAG;QACd,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;;YACvB,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1B,wEAAwE;YACxE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC3B,YAAA,gBAAgB,iDAAE,MAAM,mDAAG,IAAI,EAAE;QACnC,CAAC;QACD,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;;YACvB,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC3B,YAAA,gBAAgB,iDAAE,MAAM,mDAAG,IAAI,EAAE;QACnC,CAAC;KACF,CAAC;IAEF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAI,CAChC,WAAW,EACX,IAAI,EACJ;QACE,SAAS,EAAE,SAAS;QACpB,GAAG,OAAO;KACX,CAAC,CAAC;IAEL,IAAI,MAAM,KAAK,MAAM,EAAG;QACtB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;KACxB;IAED,OAAO,UAAU,CAAC;AAEpB,CAAC;AAnCD,oCAmCC"} \ No newline at end of file +{"version":3,"file":"exec_wrapper.js","sourceRoot":"","sources":["../src/exec_wrapper.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oDAAsC;AAG/B,KAAK,UAAU,YAAY,CAAC,WAAmB,EAAE,IAAe,EAAE,OAAwB;;IAE/F,MAAM,gBAAgB,SAAG,OAAO,0CAAE,SAAS,CAAC;IAE5C,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,IAAI,SAAS,GAAG;QACd,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;;YACvB,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1B,IAAI,OAAA,gBAAgB,0CAAE,MAAM,MAAK,SAAS,EAAE;gBAC1C,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aAC/B;iBAAM;gBACL,iFAAiF;gBACjF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC5B;QAEH,CAAC;QACD,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;;YACvB,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1B,IAAI,OAAA,gBAAgB,0CAAE,MAAM,MAAK,SAAS,EAAE;gBAC1C,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aAC/B;iBAAM;gBACL,iFAAiF;gBACjF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC5B;QACH,CAAC;KACF,CAAC;IAEF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAI,CAChC,WAAW,EACX,IAAI,EACJ;QACE,SAAS,EAAE,SAAS;QACpB,GAAG,OAAO;KACX,CAAC,CAAC;IAEL,IAAI,MAAM,KAAK,MAAM,EAAG;QACtB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;KACxB;IAED,OAAO,UAAU,CAAC;AAEpB,CAAC;AA3CD,oCA2CC"} \ No newline at end of file diff --git a/src/exec_wrapper.ts b/src/exec_wrapper.ts index 6ddbad7d5..484e64121 100644 --- a/src/exec_wrapper.ts +++ b/src/exec_wrapper.ts @@ -11,14 +11,22 @@ export async function exec_wrapper(commandLine: string, args?: string[], options let listeners = { stdout: (data: Buffer) => { stdout += data.toString(); - // NB change behaviour to only write to stdout/err if no listener passed - process.stdout.write(data); - originalListener?.stdout?.(data); + if (originalListener?.stdout !== undefined) { + originalListener.stdout(data); + } else { + // if no stdout listener was originally defined then match behaviour of exec.exec + process.stdout.write(data); + } + }, stderr: (data: Buffer) => { stderr += data.toString(); - process.stderr.write(data); - originalListener?.stderr?.(data); + if (originalListener?.stderr !== undefined) { + originalListener.stderr(data); + } else { + // if no stderr listener was originally defined then match behaviour of exec.exec + process.stderr.write(data); + } } };