feat: let $ presets be composable (#883)

package.json

@@ -120,12 +120,12 @@
     "prettier": "^3.3.3",
     "size-limit": "^11.1.4",
     "ts-node": "^10.9.2",
-    "tsd": "^0.31.1",
+    "tsd": "^0.31.2",
     "tsx": "^4.19.0",
     "typescript": "^5.5.4",
     "which": "^4.0.0",
-    "yaml": "^2.5.0",
-    "zurk": "^0.3.0"
+    "yaml": "^2.5.1",
+    "zurk": "^0.3.1"
   },
   "publishConfig": {
     "registry": "https://wombat-dressing-room.appspot.com"

src/core.ts

@@ -164,11 +164,12 @@ function getStore() {
 
 export const $: Shell & Options = new Proxy<Shell & Options>(
   function (pieces, ...args) {
+    const snapshot = getStore()
     if (!Array.isArray(pieces)) {
       return function (this: any, ...args: any) {
         const self = this
         return within(() => {
-          return Object.assign($, pieces).apply(self, args)
+          return Object.assign($, snapshot, pieces).apply(self, args)
         })
       }
     }
@@ -186,7 +187,6 @@ export const $: Shell & Options = new Proxy<Shell & Options>(
       pieces as TemplateStringsArray,
       args
     ) as string
-    const snapshot = getStore()
     const sync = snapshot[syncExec]
     const callback = () => promise.isHalted() || promise.run()
 

test/core.test.js

@@ -168,14 +168,19 @@ describe('core', () => {
     test('`$.sync()` provides synchronous API', () => {
       const o1 = $.sync`echo foo`
       const o2 = $({ sync: true })`echo foo`
+      const o3 = $.sync({})`echo foo`
       assert.equal(o1.stdout, 'foo\n')
       assert.equal(o2.stdout, 'foo\n')
+      assert.equal(o3.stdout, 'foo\n')
     })
 
     describe('$({opts}) API', () => {
       test('provides presets', async () => {
         const $$ = $({ nothrow: true })
         assert.equal((await $$`exit 1`).exitCode, 1)
+
+        const $$$ = $$({ sync: true })
+        assert.equal($$$`exit 2`.exitCode, 2)
       })
 
       test('handles `input` option', async () => {