test(core): enhance cwd related test fot within

src/core.ts

@@ -41,11 +41,12 @@ import {
   exitCodeInfo,
   formatCmd,
   getCallerLocation,
+  isString,
   noop,
   parseDuration,
+  preferNmBin,
   quote,
   quotePowerShell,
-  preferNmBin,
 } from './util.js'
 
 export interface Shell {
@@ -283,7 +284,7 @@ export class ProcessPromise extends Promise<ProcessOutput> {
       cwd: $.cwd ?? $[processCwd],
       ac: $.ac,
       signal: $.signal,
-      shell: typeof $.shell === 'string' ? $.shell : true,
+      shell: isString($.shell) ? $.shell : true,
       env: $.env,
       spawn: $.spawn,
       spawnSync: $.spawnSync,
@@ -445,7 +446,7 @@ export class ProcessPromise extends Promise<ProcessOutput> {
   }
 
   pipe(dest: Writable | ProcessPromise): ProcessPromise {
-    if (typeof dest === 'string')
+    if (isString(dest))
       throw new Error('The pipe() method does not take strings. Forgot $?')
     if (this._resolved) {
       if (dest instanceof ProcessPromise) dest.stdin.end() // In case of piped stdin, we may want to close stdin of dest as well.

test/core.test.js

@@ -740,22 +740,29 @@ describe('core', () => {
       await promise
     })
 
-    test('restores previous cwd', async () => {
+    test('keeps the cwd ref for internal $ calls', async () => {
       let resolve, reject
       let promise = new Promise((...args) => ([resolve, reject] = args))
-
+      let cwd = process.cwd()
       let pwd = await $`pwd`
 
       within(async () => {
         cd('/tmp')
+        assert.ok(process.cwd().endsWith('/tmp'))
+        assert.ok((await $`pwd`).stdout.trim().endsWith('/tmp'))
+
         setTimeout(async () => {
+          assert.equal(process.cwd(), '/')
           assert.ok((await $`pwd`).stdout.trim().endsWith('/tmp'))
           resolve()
         }, 1000)
       })
 
+      setTimeout(async () => cd('/'), 500)
+
       assert.equal((await $`pwd`).stdout, pwd.stdout)
       await promise
+      assert.equal((await $`pwd`).stdout.trim(), '/')
     })
 
     test(`isolates nested context and returns cb result`, async () => {