diff --git a/src/core.ts b/src/core.ts index 57cf06d54e..3a1e2b3e8d 100644 --- a/src/core.ts +++ b/src/core.ts @@ -41,7 +41,7 @@ export const $: Zx = function (pieces: TemplateStringsArray, ...args: any[]) { let cmd = pieces[0], i = 0 - let quote = getCtx().quote + let quote = promise.ctx.quote while (i < args.length) { let s if (Array.isArray(args[i])) { @@ -52,14 +52,12 @@ export const $: Zx = function (pieces: TemplateStringsArray, ...args: any[]) { cmd += s + pieces[++i] } - const ctx = { - ...getCtx(), + Object.assign(promise.ctx, { cmd, __from: new Error().stack!.split(/^\s*at\s/m)[2].trim(), resolve, reject, - } - Object.defineProperty(promise, 'ctx', { value: ctx }) + }) setImmediate(() => promise._run()) // Make sure all subprocesses are started, if not explicitly by await or then(). @@ -88,7 +86,12 @@ export class ProcessPromise extends Promise { _piped = false _prerun: any = undefined _postrun: any = undefined - ctx?: Context + readonly ctx: Context + constructor(cb: (resolve: Function, reject?: Function) => void) { + super(cb) + this.ctx = {...getCtx()} + Object.defineProperty(this, 'ctx', { value: this.ctx, writable: false, configurable: false }) + } get stdin() { this._inheritStdin = false @@ -168,7 +171,7 @@ export class ProcessPromise extends Promise { if (this.child) return // The _run() called from two places: then() and setTimeout(). if (this._prerun) this._prerun() // In case $1.pipe($2), the $2 returned, and on $2._run() invoke $1._run(). - runInCtx(this.ctx!, () => { + runInCtx(this.ctx, () => { const { nothrow, cmd, @@ -180,7 +183,7 @@ export class ProcessPromise extends Promise { __from, resolve, reject, - } = this.ctx! + } = this.ctx printCmd(cmd) diff --git a/test/index.test.js b/test/index.test.js index 5377030a58..a4b2816d34 100755 --- a/test/index.test.js +++ b/test/index.test.js @@ -167,6 +167,17 @@ test('ProcessPromise: inherits native Promise', async () => { assert.ok(p2 !== p3) assert.ok(p3 !== p4) assert.ok(p5 !== p1) + + assert.ok(p1.ctx) + assert.ok(p2.ctx) + assert.ok(p3.ctx) + assert.ok(p4.ctx) + assert.ok(p5.ctx) + + assert.not.equal(p1.ctx, p2.ctx) + assert.equal(p2.ctx, p3.ctx) + assert.equal(p3.ctx, p4.ctx) + assert.equal(p4.ctx, p5.ctx) }) test('ProcessPromise: ctx is protected from removal', async () => {