wardens 0.5.1 → 0.6.0-rc.0

package/CHANGELOG.md

@@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Added
+
+- New context API carries state down the tree without plumbing through arguments.
+
+### Changed
+
+- Renamed public type `ResourceContext` to `ResourceControls`.
+
 ## [0.5.1] - 2023-08-12
 
 ### Fixed

package/README.md

@@ -30,7 +30,7 @@ Now define a pool that creates and manages workers:
 
 ```typescript
 async function WorkerPool(
-  { create }: ResourceContext,
+  { create }: ResourceControls,
   config: { poolSize: number },
 ) {
   const promises = Array(config.poolSize).fill(Worker).map(create);

package/dist/wardens.cjs

@@ -1 +1 @@
-"use strict";var E=Object.defineProperty;var C=(t,e,r)=>e in t?E(t,e,{enumerable:!0,configurable:!0,writable:!0,value:r}):t[e]=r;var h=(t,e,r)=>(C(t,typeof e!="symbol"?e+"":e,r),r),g=(t,e,r)=>{if(!e.has(t))throw TypeError("Cannot "+r)};var a=(t,e,r)=>(g(t,e,"read from private field"),r?r.call(t):e.get(t)),f=(t,e,r)=>{if(e.has(t))throw TypeError("Cannot add the same private member more than once");e instanceof WeakSet?e.add(t):e.set(t,r)},y=(t,e,r,o)=>(g(t,e,"write to private field"),o?o.call(t,r):e.set(t,r),r);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function W(t){const e=new WeakMap;return new Proxy(t,{get(r,o){const s=Reflect.get(r,o,r);if(typeof s=="function"){if(e.has(s)===!1){const n=s.bind(r);Object.defineProperties(n,Object.getOwnPropertyDescriptors(s)),e.set(s,n)}return e.get(s)}return s},set(r,o,s){return Reflect.set(r,o,s,r)}})}const p=new WeakMap,S=new WeakSet;function O(t){return Proxy.revocable(t,{})}var l,i,u;class R{constructor(e,r){f(this,l,new WeakSet);f(this,i,void 0);f(this,u,void 0);h(this,"create",async(e,...r)=>{if(a(this,u).enforced)throw new Error("Cannot create new resources after teardown.");const o=await x(e,...r);return a(this,i).add(o),o});h(this,"destroy",async e=>{if(a(this,l).has(e))throw new Error("Resource already destroyed.");if(!a(this,i).has(e))throw new Error("You do not own this resource.");a(this,i).delete(e),a(this,l).add(e),await m(e)});y(this,i,e),y(this,u,r)}}l=new WeakMap,i=new WeakMap,u=new WeakMap;const x=async(t,...e)=>{const r={enforced:!1},o=new Set,s=new R(o,r);let n;try{n=await t(s,...e)}catch(v){const k=Array.from(o).reverse(),b=(await Promise.allSettled(k.map(d=>s.destroy(d)))).filter(d=>d.status==="rejected");throw b.length?P(b.map(d=>d.reason),{cause:v}):v}const c=n.value,{proxy:w,revoke:j}=O(c);return S.add(w),p.set(w,{curfew:r,resource:n,children:o,revoke:j}),w},m=async t=>{if(!S.has(t))throw new Error("Cannot destroy object. It is not a resource.");const e=p.get(t);if(e){p.delete(t),e.revoke();let r={status:"fulfilled",value:void 0};if(e.resource.destroy)try{await e.resource.destroy()}catch(c){r={status:"rejected",reason:c}}e.curfew.enforced=!0;const o=Array.from(e.children).reverse().map(m),s=await Promise.allSettled(o),n=[r].concat(s).filter(c=>c.status==="rejected");if(n.length)throw P(n.map(c=>c.reason))}},P=(t,e)=>t.length===1?t[0]:new B(t,e);class B extends Error{constructor(e,r){super("Some resources could not be destroyed. See the `failures` property for details.",r),this.failures=e}}exports.bindContext=W;exports.create=x;exports.destroy=m;
+"use strict";var I=Object.defineProperty;var R=(r,e,t)=>e in r?I(r,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):r[e]=t;var f=(r,e,t)=>(R(r,typeof e!="symbol"?e+"":e,t),t),j=(r,e,t)=>{if(!e.has(r))throw TypeError("Cannot "+t)};var n=(r,e,t)=>(j(r,e,"read from private field"),t?t.call(r):e.get(r)),l=(r,e,t)=>{if(e.has(r))throw TypeError("Cannot add the same private member more than once");e instanceof WeakSet?e.add(r):e.set(r,t)},h=(r,e,t,s)=>(j(r,e,"write to private field"),s?s.call(r,t):e.set(r,t),t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function B(r){const e=new WeakMap;return new Proxy(r,{get(t,s){const o=Reflect.get(t,s,t);if(typeof o=="function"){if(e.has(o)===!1){const a=o.bind(t);Object.defineProperties(a,Object.getOwnPropertyDescriptors(o)),e.set(o,a)}return e.get(o)}return o},set(t,s,o){return Reflect.set(t,s,o,t)}})}const m=new WeakMap,P=new WeakSet;function M(r){return Proxy.revocable(r,{})}var g,w;class x{constructor(e){l(this,g,Symbol("Context ID"));l(this,w,void 0);h(this,w,e)}static getId(e){return n(e,g)}static getDefaultValue(e){var t;return n(t=e,w).call(t)}}g=new WeakMap,w=new WeakMap;const A=r=>new x(r);var y,u,p,i;class T{constructor(e,t,s){l(this,y,new WeakSet);l(this,u,void 0);l(this,p,void 0);l(this,i,void 0);f(this,"create",async(e,...t)=>{if(n(this,p).enforced)throw new Error("Cannot create new resources after teardown.");const s=Object.create(n(this,i)),o=await k(s,e,...t);return n(this,u).add(o),o});f(this,"destroy",async e=>{if(n(this,y).has(e))throw new Error("Resource already destroyed.");if(!n(this,u).has(e))throw new Error("You do not own this resource.");n(this,u).delete(e),n(this,y).add(e),await b(e)});f(this,"setContext",(e,t)=>{n(this,i)[x.getId(e)]=t});f(this,"getContext",e=>{const t=x.getId(e);return t in n(this,i)?n(this,i)[t]:x.getDefaultValue(e)});h(this,i,e),h(this,u,t),h(this,p,s)}}y=new WeakMap,u=new WeakMap,p=new WeakMap,i=new WeakMap;const k=async(r,e,...t)=>{const s={enforced:!1},o=new Set,a=new T(r,o,s);let c;try{c=await e(a,...t)}catch(v){const W=Array.from(o).reverse(),S=(await Promise.allSettled(W.map(d=>a.destroy(d)))).filter(d=>d.status==="rejected");throw S.length?D(S.map(d=>d.reason),{cause:v}):v}const E=c.value,{proxy:C,revoke:O}=M(E);return P.add(C),m.set(C,{curfew:s,resource:c,children:o,revoke:O}),C},b=async r=>{if(!P.has(r))throw new Error("Cannot destroy object. It is not a resource.");const e=m.get(r);if(e){m.delete(r),e.revoke();let t={status:"fulfilled",value:void 0};if(e.resource.destroy)try{await e.resource.destroy()}catch(c){t={status:"rejected",reason:c}}e.curfew.enforced=!0;const s=Array.from(e.children).reverse().map(b),o=await Promise.allSettled(s),a=[t].concat(o).filter(c=>c.status==="rejected");if(a.length)throw D(a.map(c=>c.reason))}},D=(r,e)=>r.length===1?r[0]:new V(r,e);class V extends Error{constructor(e,t){super("Some resources could not be destroyed. See the `failures` property for details.",t),this.failures=e}}const H=async(r,...e)=>k(Object.create(null),r,...e);exports.bindContext=B;exports.create=H;exports.createContext=A;exports.destroy=b;

package/dist/wardens.js

@@ -1,98 +1,125 @@
-var P = Object.defineProperty;
-var j = (t, e, r) => e in t ? P(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
-var h = (t, e, r) => (j(t, typeof e != "symbol" ? e + "" : e, r), r), x = (t, e, r) => {
-  if (!e.has(t))
-    throw TypeError("Cannot " + r);
+var O = Object.defineProperty;
+var R = (r, e, t) => e in r ? O(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t;
+var f = (r, e, t) => (R(r, typeof e != "symbol" ? e + "" : e, t), t), S = (r, e, t) => {
+  if (!e.has(r))
+    throw TypeError("Cannot " + t);
 };
-var a = (t, e, r) => (x(t, e, "read from private field"), r ? r.call(t) : e.get(t)), f = (t, e, r) => {
-  if (e.has(t))
+var n = (r, e, t) => (S(r, e, "read from private field"), t ? t.call(r) : e.get(r)), l = (r, e, t) => {
+  if (e.has(r))
     throw TypeError("Cannot add the same private member more than once");
-  e instanceof WeakSet ? e.add(t) : e.set(t, r);
-}, y = (t, e, r, o) => (x(t, e, "write to private field"), o ? o.call(t, r) : e.set(t, r), r);
-function A(t) {
+  e instanceof WeakSet ? e.add(r) : e.set(r, t);
+}, h = (r, e, t, s) => (S(r, e, "write to private field"), s ? s.call(r, t) : e.set(r, t), t);
+function T(r) {
   const e = /* @__PURE__ */ new WeakMap();
-  return new Proxy(t, {
-    get(r, o) {
-      const s = Reflect.get(r, o, r);
-      if (typeof s == "function") {
-        if (e.has(s) === !1) {
-          const n = s.bind(r);
+  return new Proxy(r, {
+    get(t, s) {
+      const o = Reflect.get(t, s, t);
+      if (typeof o == "function") {
+        if (e.has(o) === !1) {
+          const a = o.bind(t);
           Object.defineProperties(
-            n,
-            Object.getOwnPropertyDescriptors(s)
-          ), e.set(s, n);
+            a,
+            Object.getOwnPropertyDescriptors(o)
+          ), e.set(o, a);
         }
-        return e.get(s);
+        return e.get(o);
       }
-      return s;
+      return o;
     },
-    set(r, o, s) {
-      return Reflect.set(r, o, s, r);
+    set(t, s, o) {
+      return Reflect.set(t, s, o, t);
     }
   });
 }
-const p = /* @__PURE__ */ new WeakMap(), g = /* @__PURE__ */ new WeakSet();
-function W(t) {
-  return Proxy.revocable(t, {});
+const C = /* @__PURE__ */ new WeakMap(), j = /* @__PURE__ */ new WeakSet();
+function B(r) {
+  return Proxy.revocable(r, {});
 }
-var l, i, u;
-class C {
-  constructor(e, r) {
-    f(this, l, /* @__PURE__ */ new WeakSet());
-    f(this, i, void 0);
-    f(this, u, void 0);
+var g, w;
+class x {
+  constructor(e) {
+    l(this, g, Symbol("Context ID"));
+    l(this, w, void 0);
+    h(this, w, e);
+  }
+  static getId(e) {
+    return n(e, g);
+  }
+  static getDefaultValue(e) {
+    var t;
+    return n(t = e, w).call(t);
+  }
+}
+g = new WeakMap(), w = new WeakMap();
+const U = (r) => new x(r);
+var y, u, p, i;
+class A {
+  constructor(e, t, s) {
+    l(this, y, /* @__PURE__ */ new WeakSet());
+    l(this, u, void 0);
+    l(this, p, void 0);
+    l(this, i, void 0);
     /** Provision an owned resource and make sure it doesn't outlive us. */
-    h(this, "create", async (e, ...r) => {
-      if (a(this, u).enforced)
+    f(this, "create", async (e, ...t) => {
+      if (n(this, p).enforced)
         throw new Error("Cannot create new resources after teardown.");
-      const o = await R(e, ...r);
-      return a(this, i).add(o), o;
+      const s = Object.create(n(this, i)), o = await k(s, e, ...t);
+      return n(this, u).add(o), o;
     });
     /**
      * Tear down a resource. Happens automatically when resource owners are
      * deallocated.
      */
-    h(this, "destroy", async (e) => {
-      if (a(this, l).has(e))
+    f(this, "destroy", async (e) => {
+      if (n(this, y).has(e))
         throw new Error("Resource already destroyed.");
-      if (!a(this, i).has(e))
+      if (!n(this, u).has(e))
         throw new Error("You do not own this resource.");
-      a(this, i).delete(e), a(this, l).add(e), await S(e);
+      n(this, u).delete(e), n(this, y).add(e), await D(e);
+    });
+    /** Store a value in context. Anything down the chain can read it. */
+    f(this, "setContext", (e, t) => {
+      n(this, i)[x.getId(e)] = t;
+    });
+    /** Retrieve a value from context, or a default if it is unset. */
+    f(this, "getContext", (e) => {
+      const t = x.getId(e);
+      return t in n(this, i) ? n(this, i)[t] : x.getDefaultValue(e);
     });
-    y(this, i, e), y(this, u, r);
+    h(this, i, e), h(this, u, t), h(this, p, s);
   }
 }
-l = new WeakMap(), i = new WeakMap(), u = new WeakMap();
-const R = async (t, ...e) => {
-  const r = { enforced: !1 }, o = /* @__PURE__ */ new Set(), s = new C(o, r);
-  let n;
+y = new WeakMap(), u = new WeakMap(), p = new WeakMap(), i = new WeakMap();
+const k = async (r, e, ...t) => {
+  const s = { enforced: !1 }, o = /* @__PURE__ */ new Set(), a = new A(r, o, s);
+  let c;
   try {
-    n = await t(s, ...e);
-  } catch (m) {
-    const E = Array.from(o).reverse(), v = (await Promise.allSettled(
-      E.map((d) => s.destroy(d))
+    c = await e(a, ...t);
+  } catch (b) {
+    const I = Array.from(o).reverse(), v = (await Promise.allSettled(
+      I.map((d) => a.destroy(d))
     )).filter(
       (d) => d.status === "rejected"
     );
-    throw v.length ? b(
+    throw v.length ? E(
       v.map((d) => d.reason),
-      { cause: m }
-    ) : m;
+      { cause: b }
+    ) : b;
   }
-  const c = n.value, { proxy: w, revoke: k } = W(c);
-  return g.add(w), p.set(w, {
-    curfew: r,
-    resource: n,
+  const P = c.value, { proxy: m, revoke: W } = B(P);
+  return j.add(m), C.set(m, {
+    curfew: s,
+    resource: c,
     children: o,
-    revoke: k
-  }), w;
-}, S = async (t) => {
-  if (!g.has(t))
+    revoke: W
+  }), m;
+}, D = async (r) => {
+  if (!j.has(r))
     throw new Error("Cannot destroy object. It is not a resource.");
-  const e = p.get(t);
+  const e = C.get(r);
   if (e) {
-    p.delete(t), e.revoke();
-    let r = {
+    C.delete(r), e.revoke();
+    let t = {
       status: "fulfilled",
       value: void 0
     };
@@ -100,26 +127,28 @@ const R = async (t, ...e) => {
       try {
         await e.resource.destroy();
       } catch (c) {
-        r = { status: "rejected", reason: c };
+        t = { status: "rejected", reason: c };
       }
     e.curfew.enforced = !0;
-    const o = Array.from(e.children).reverse().map(S), s = await Promise.allSettled(o), n = [r].concat(s).filter(
+    const s = Array.from(e.children).reverse().map(D), o = await Promise.allSettled(s), a = [t].concat(o).filter(
       (c) => c.status === "rejected"
     );
-    if (n.length)
-      throw b(n.map((c) => c.reason));
+    if (a.length)
+      throw E(a.map((c) => c.reason));
   }
-}, b = (t, e) => t.length === 1 ? t[0] : new B(t, e);
-class B extends Error {
-  constructor(e, r) {
+}, E = (r, e) => r.length === 1 ? r[0] : new M(r, e);
+class M extends Error {
+  constructor(e, t) {
     super(
       "Some resources could not be destroyed. See the `failures` property for details.",
-      r
+      t
     ), this.failures = e;
   }
 }
+const Y = async (r, ...e) => k(/* @__PURE__ */ Object.create(null), r, ...e);
 export {
-  A as bindContext,
-  R as create,
-  S as destroy
+  T as bindContext,
+  Y as create,
+  U as createContext,
+  D as destroy
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wardens",
-  "version": "0.5.1",
+  "version": "0.6.0-rc.0",
   "description": "A framework for resource management",
   "type": "module",
   "main": "./dist/wardens.cjs",
@@ -79,11 +79,11 @@
     }
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "6.3.0",
-    "@typescript-eslint/parser": "6.3.0",
+    "@typescript-eslint/eslint-plugin": "6.4.0",
+    "@typescript-eslint/parser": "6.4.0",
     "eslint": "8.47.0",
     "husky": "8.0.3",
-    "lint-staged": "13.2.3",
+    "lint-staged": "14.0.0",
     "prettier": "2.8.8",
     "typescript": "5.1.6",
     "vite": "4.4.9",

package/src/__tests__/resource-api.test.ts

@@ -0,0 +1,186 @@
+import ResourceControls from '../resource-controls';
+import { create } from '../';
+import { createContext } from '../inherited-context';
+
+describe('ResourceControls', () => {
+  async function Test() {
+    return { value: {} };
+  }
+
+  it('can spawn children of its own', async () => {
+    const Child = async () => ({
+      value: { child: true },
+    });
+
+    const Parent = async (resource: ResourceControls) => {
+      return { value: await resource.create(Child) };
+    };
+
+    await expect(create(Parent)).resolves.toEqual({ child: true });
+  });
+
+  it('can deallocate child resources on demand', async () => {
+    const spy = vi.fn();
+
+    const Child = async () => ({
+      value: { child: true },
+      destroy: spy,
+    });
+
+    const Parent = async (resource: ResourceControls) => {
+      const child = await resource.create(Child);
+      await resource.destroy(child);
+
+      return {
+        value: { parent: true },
+      };
+    };
+
+    await expect(create(Parent)).resolves.toEqual({ parent: true });
+    expect(spy).toHaveBeenCalled();
+  });
+
+  it('fails to destroy resources owned by someone else', async () => {
+    const test = await create(Test);
+
+    const Sneaky = async (resource: ResourceControls) => {
+      await resource.destroy(test);
+      return { value: {} };
+    };
+
+    await expect(create(Sneaky)).rejects.toThrow(/do not own/i);
+  });
+
+  it('binds create/destroy handlers to the class instance', async () => {
+    async function Allocator({ create, destroy }: ResourceControls) {
+      const test = await create(Test);
+      await destroy(test);
+
+      return { value: [] };
+    }
+
+    await expect(create(Allocator)).resolves.not.toThrow();
+  });
+
+  it('indicates if a resource was already destroyed', async () => {
+    async function Allocator(resource: ResourceControls) {
+      const test = await resource.create(Test);
+      await resource.destroy(test);
+      await resource.destroy(test);
+
+      return { value: [] };
+    }
+
+    await expect(create(Allocator)).rejects.toThrow(/already destroyed/i);
+  });
+
+  it('can set and retrieve context', async () => {
+    const SharedValue = createContext(() => 'none');
+
+    const Test = async (resource: ResourceControls) => {
+      expect(resource.getContext(SharedValue)).toBe('none');
+
+      resource.setContext(SharedValue, 'saved');
+      expect(resource.getContext(SharedValue)).toBe('saved');
+
+      resource.setContext(SharedValue, 'updated');
+      expect(resource.getContext(SharedValue)).toBe('updated');
+
+      return { value: [] };
+    };
+
+    await expect(create(Test)).resolves.toEqual([]);
+  });
+
+  it('passes context to child resources', async () => {
+    const SharedValue = createContext<null | string>(() => null);
+
+    const Child = async (ctx: ResourceControls) => ({
+      value: { content: ctx.getContext(SharedValue) },
+    });
+
+    const Parent = async (resource: ResourceControls) => {
+      resource.setContext(SharedValue, 'inherited');
+      return { value: await resource.create(Child) };
+    };
+
+    await expect(create(Parent)).resolves.toEqual({ content: 'inherited' });
+  });
+
+  it('can override context without affecting the parent', async () => {
+    const Message = createContext<null | string>(() => null);
+    const Child = async (resource: ResourceControls) => {
+      // This should *NOT* affect the parent context.
+      resource.setContext(Message, 'child context');
+
+      return {
+        value: { content: resource.getContext(Message) },
+      };
+    };
+
+    const Parent = async (resource: ResourceControls) => {
+      resource.setContext(Message, 'parent context');
+      const child = await resource.create(Child);
+
+      expect(resource.getContext(Message)).toBe('parent context');
+
+      return {
+        value: {
+          content: resource.getContext(Message),
+          child,
+        },
+      };
+    };
+
+    await expect(create(Parent)).resolves.toEqual({
+      content: 'parent context',
+      child: { content: 'child context' },
+    });
+  });
+
+  it('allows two siblings to have different context values', async () => {
+    const Message = createContext<null | string>(() => null);
+    const Child = async (resource: ResourceControls, msg: string) => {
+      resource.setContext(Message, msg);
+
+      return {
+        value: { getMessage: () => resource.getContext(Message) },
+      };
+    };
+
+    const Parent = async (resource: ResourceControls) => {
+      resource.setContext(Message, 'parent context');
+
+      return {
+        value: await Promise.all([
+          resource.create(Child, 'child context 1'),
+          resource.create(Child, 'child context 2'),
+        ]),
+      };
+    };
+
+    const [child1, child2] = await create(Parent);
+    expect(child1.getMessage()).toBe('child context 1');
+    expect(child2.getMessage()).toBe('child context 2');
+  });
+
+  it('provides a live view of the current value, not just a snapshot', async () => {
+    const Message = createContext(() => 'default');
+    const Child = async (resource: ResourceControls) => ({
+      value: { getMessage: () => resource.getContext(Message) },
+    });
+
+    const Parent = async (resource: ResourceControls) => ({
+      value: {
+        setMessage: (msg: string) => resource.setContext(Message, msg),
+        child: await resource.create(Child),
+      },
+    });
+
+    const { setMessage, child } = await create(Parent);
+    expect(child.getMessage()).toBe('default');
+
+    setMessage('updated');
+    expect(child.getMessage()).toBe('updated');
+  });
+});

package/src/__tests__/{allocation.test.ts → root-lifecycle.test.ts}

@@ -1,13 +1,13 @@
-import type ResourceContext from '../resource-context';
-import { create, destroy } from '../allocation';
+import type ResourceControls from '../resource-controls';
+import { create, destroy } from '../root-lifecycle';
 import bindContext from '../bind-context';
 
-describe('allocation', () => {
+describe('roots', () => {
   describe('create', () => {
     it('allocates the resource', async () => {
       const config = { test: 'init-args' };
       const Test = vi.fn(
-        async (_resource: ResourceContext, config: { test: string }) => ({
+        async (_resource: ResourceControls, config: { test: string }) => ({
           value: config,
         }),
       );
@@ -22,7 +22,7 @@ describe('allocation', () => {
         const First = async () => ({ value: [], destroy: () => spy('1st') });
         const Second = async () => ({ value: [], destroy: () => spy('2nd') });
 
-        const Parent = async (resource: ResourceContext) => {
+        const Parent = async (resource: ResourceControls) => {
           await resource.create(First);
           await resource.create(Second);
           throw new Error('Testing resource initialization errors');
@@ -42,7 +42,7 @@ describe('allocation', () => {
           },
         });
 
-        const Parent = async (resource: ResourceContext) => {
+        const Parent = async (resource: ResourceControls) => {
           await resource.create(Child);
           await resource.create(Child);
           throw parentError;
@@ -89,7 +89,7 @@ describe('allocation', () => {
     it('automatically unmounts all children', async () => {
       const spy = vi.fn();
       const Child = async () => ({ value: [], destroy: spy });
-      async function Parent(resource: ResourceContext) {
+      async function Parent(resource: ResourceControls) {
         await resource.create(Child);
         return { value: [] };
       }
@@ -109,7 +109,7 @@ describe('allocation', () => {
         },
       });
 
-      const Parent = async (resource: ResourceContext) => {
+      const Parent = async (resource: ResourceControls) => {
         await resource.create(Child);
         return { value: [] };
       };
@@ -123,7 +123,7 @@ describe('allocation', () => {
       const First = async () => ({ value: [], destroy: () => spy('1st') });
       const Second = async () => ({ value: [], destroy: () => spy('2nd') });
 
-      const Parent = async (resource: ResourceContext) => {
+      const Parent = async (resource: ResourceControls) => {
         await resource.create(First);
         await resource.create(Second);
         return { value: [] };
@@ -144,7 +144,7 @@ describe('allocation', () => {
         },
       });
 
-      const Parent = async (resource: ResourceContext) => {
+      const Parent = async (resource: ResourceControls) => {
         await resource.create(Child);
         await resource.create(Child);
         return { value: [] };
@@ -158,7 +158,7 @@ describe('allocation', () => {
 
     it('ensures child resources outlive their consumers', async () => {
       const Child = async () => ({ value: [1] });
-      const Parent = async (resource: ResourceContext) => {
+      const Parent = async (resource: ResourceControls) => {
         const child = await resource.create(Child);
         return {
           value: [],
@@ -176,7 +176,7 @@ describe('allocation', () => {
     it('destroys child resources even if the parent fails to close', async () => {
       const spy = vi.fn();
       const Child = async () => ({ value: [], destroy: spy });
-      const Parent = async (resource: ResourceContext) => {
+      const Parent = async (resource: ResourceControls) => {
         await resource.create(Child);
         return {
           value: [],
@@ -202,7 +202,7 @@ describe('allocation', () => {
         },
       });
 
-      const Parent = async (resource: ResourceContext) => {
+      const Parent = async (resource: ResourceControls) => {
         await resource.create(Child);
         return {
           value: [],
@@ -220,7 +220,7 @@ describe('allocation', () => {
 
     it('guards against creating new resources after teardown', async () => {
       const Child = async () => ({ value: [] });
-      const Parent = async (resource: ResourceContext) => ({
+      const Parent = async (resource: ResourceControls) => ({
         value: bindContext(resource),
       });