@fougere/container 0.11.0-alpha.0 → 0.12.0-alpha.0

package/dist/ContainerError.d.ts

@@ -0,0 +1,5 @@
+export declare class ContainerError extends Error {
+    constructor(message: string);
+    static all(failures: unknown[], message: string): AggregateError;
+}
+//# sourceMappingURL=ContainerError.d.ts.map

package/dist/ContainerError.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ContainerError.d.ts","sourceRoot":"","sources":["../src/ContainerError.ts"],"names":[],"mappings":"AAAA,qBAAa,cAAe,SAAQ,KAAK;IACvC,YAAY,OAAO,EAAE,MAAM,EAI1B;IAED,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,cAAc,CAE/D;CACF"}

package/dist/ContainerError.js

@@ -0,0 +1,10 @@
+export class ContainerError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = new.target.name;
+    }
+    static all(failures, message) {
+        return new AggregateError(failures, message);
+    }
+}
+//# sourceMappingURL=ContainerError.js.map

package/dist/ContainerError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ContainerError.js","sourceRoot":"","sources":["../src/ContainerError.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,cAAe,SAAQ,KAAK;IACvC,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,IAAI,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,QAAmB,EAAE,OAAe;QAC7C,OAAO,IAAI,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;CACF"}

package/dist/Disposable.d.ts

@@ -1,7 +1,4 @@
-export interface Disposable {
-    dispose(): void | Promise<void>;
-}
 export declare class Disposables {
-    static is(value: unknown): value is Disposable;
+    static is(value: unknown): value is AsyncDisposable;
 }
 //# sourceMappingURL=Disposable.d.ts.map

package/dist/Disposable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Disposable.d.ts","sourceRoot":"","sources":["../src/Disposable.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,UAAU;IACzB,OAAO,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC;AAED,qBAAa,WAAW;IACtB,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,UAAU,CAM7C;CACF"}
+{"version":3,"file":"Disposable.d.ts","sourceRoot":"","sources":["../src/Disposable.ts"],"names":[],"mappings":"AAAA,qBAAa,WAAW;IACtB,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,eAAe,CAGlD;CACF"}

package/dist/Disposable.js

@@ -1,8 +1,7 @@
 export class Disposables {
     static is(value) {
-        return (typeof value === 'object' &&
-            value !== null &&
-            typeof value.dispose === 'function');
+        return typeof value === 'object' && value !== null
+            && typeof value[Symbol.asyncDispose] === 'function';
     }
 }
 //# sourceMappingURL=Disposable.js.map

package/dist/Disposable.js.map

@@ -1 +1 @@
-{"version":3,"file":"Disposable.js","sourceRoot":"","sources":["../src/Disposable.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,WAAW;IACtB,MAAM,CAAC,EAAE,CAAC,KAAc;QACtB,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;YACzB,KAAK,KAAK,IAAI;YACd,OAAQ,KAAoB,CAAC,OAAO,KAAK,UAAU,CACpD,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"Disposable.js","sourceRoot":"","sources":["../src/Disposable.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,WAAW;IACtB,MAAM,CAAC,EAAE,CAAC,KAAc;QACtB,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;eAC7C,OAAQ,KAAyB,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,UAAU,CAAC;IAC7E,CAAC;CACF"}

package/dist/ScopeContainer.d.ts

@@ -4,11 +4,11 @@ import type { RegisterOptions } from './registration/RegisterOptions.js';
 /** A scope reaches its parent and its children through members only a scope can read. */
 export declare class ScopeContainer implements Container {
     private readonly parent?;
-    private readonly registry;
     private readonly built;
     private readonly children;
-    private fallback;
+    private readonly registry;
     private readonly resolving;
+    private fallback;
     constructor(parent?: ScopeContainer | undefined);
     register<T>(name: string, ctor: Constructor<T>, options?: RegisterOptions): void;
     registerValue<T>(name: string, value: T): void;
@@ -16,12 +16,14 @@ export declare class ScopeContainer implements Container {
     has(name: string): boolean;
     createScope(): Container;
     dispose(): Promise<void>;
+    private disposeChildren;
+    private disposeBuilt;
     setFallback(resolve: (name: string) => unknown): void;
-    private entryOf;
-    /** Set on the root, honoured from any scope — a scope inherits it by asking upward. */
-    private fallbackOf;
+    private build;
+    private buildFallback;
     private forget;
-    private through;
+    /** What this scope will close. A value that answers no `[Symbol.asyncDispose]` is not one of them. */
     private remember;
+    private errorMessage;
 }
 //# sourceMappingURL=ScopeContainer.d.ts.map

package/dist/ScopeContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ScopeContainer.d.ts","sourceRoot":"","sources":["../src/ScopeContainer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAEjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAQzE,yFAAyF;AACzF,qBAAa,cAAe,YAAW,SAAS;IAgBlC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAfpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA4B;IAErD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiB;IAIvC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwB;IAEjD,OAAO,CAAC,QAAQ,CAA0C;IAK1D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IAErC,YAA6B,MAAM,CAAC,EAAE,cAAc,YAAA,EAEnD;IAED,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,IAAI,CAS/E;IAED,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAO7C;IAED,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,CAgD1B;IAED,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEzB;IAED,WAAW,IAAI,SAAS,CAKvB;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CA4B7B;IAED,WAAW,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,GAAG,IAAI,CAEpD;IAED,OAAO,CAAC,OAAO;IAIf,uFAAuF;IACvF,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,MAAM;IAKd,OAAO,CAAC,OAAO;IAMf,OAAO,CAAC,QAAQ;CAKjB"}
+{"version":3,"file":"ScopeContainer.d.ts","sourceRoot":"","sources":["../src/ScopeContainer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAGhD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAEjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAQzE,yFAAyF;AACzF,qBAAa,cAAe,YAAW,SAAS;IAQlC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAPpC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyB;IAC/C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwB;IACjD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA4B;IACrD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IAErC,OAAO,CAAC,QAAQ,CAA0C;IAE1D,YAA6B,MAAM,CAAC,EAAE,cAAc,YAAA,EAEnD;IAED,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,IAAI,CAS/E;IAED,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAM7C;IAED,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,CAY1B;IAED,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEzB;IAED,WAAW,IAAI,SAAS,CAMvB;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAoB7B;YAEa,eAAe;YAkBf,YAAY;IAa1B,WAAW,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,GAAG,IAAI,CAIpD;IAED,OAAO,CAAC,KAAK;IAwBb,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,MAAM;IAMd,sGAAsG;IACtG,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,YAAY;CAQrB"}

package/dist/ScopeContainer.js

@@ -1,17 +1,13 @@
 import { Disposables } from './Disposable.js';
+import { ContainerError } from './ContainerError.js';
 /** A scope reaches its parent and its children through members only a scope can read. */
 export class ScopeContainer {
     parent;
-    registry = new Map();
     built = [];
-    // Closed by this container, and before `built` — a child may hold what this scope built,
-    // never the other way round.
     children = [];
-    fallback;
-    // The names being built right now, shared by the whole tree: a miss here is answered by the
-    // parent and the descent continues there, so only one stack can name the path whole —
-    // `child.resolve('A')` reaching a parent's `B` that asks for `A` back reports `A → B → A`.
+    registry = new Map();
     resolving;
+    fallback;
     constructor(parent) {
         this.parent = parent;
         this.resolving = parent?.resolving ?? [];
@@ -25,7 +21,6 @@ export class ScopeContainer {
         });
     }
     registerValue(name, value) {
-        // A value the container did not build is not the container's to dispose.
         this.registry.set(name, {
             factory: () => value,
             lifetime: 'singleton',
@@ -34,45 +29,14 @@ export class ScopeContainer {
     }
     resolve(name) {
         const entry = this.registry.get(name);
-        // Not found locally — the parent holds it, and holds its instance too.
-        if (!entry && this.parent?.entryOf(name)) {
-            return this.parent.resolve(name);
-        }
-        // Nobody holds it. A frond declared in `remotes` registers nothing here, so its
-        // façade is fabricated by the fallback rather than found.
         if (!entry) {
-            const made = this.fallbackOf()?.(name);
-            if (made !== undefined) {
-                this.registry.set(name, {
-                    factory: () => made,
-                    lifetime: 'singleton',
-                    instance: made,
-                });
-                return made;
-            }
-            throw new Error(`[container] '${name}' is not registered${this.through(name)}`);
+            if (this.parent)
+                return this.parent.resolve(name);
+            return this.buildFallback(name);
         }
         if (entry.instance !== undefined)
             return entry.instance;
-        if (this.resolving.includes(name)) {
-            throw new Error(`[container] dependency cycle: ${[...this.resolving, name].join(' → ')}`);
-        }
-        // Popped in a finally, because a constructor that throws leaves the name on the stack
-        // otherwise and the next resolution of it reports a cycle that is not there.
-        this.resolving.push(name);
-        try {
-            const value = entry.factory(this);
-            // The container disposes what it KEEPS: a transient is handed over and forgotten,
-            // and its caller is the one who knows when it is done.
-            if (entry.lifetime === 'singleton') {
-                entry.instance = value;
-                this.remember(value);
-            }
-            return value;
-        }
-        finally {
-            this.resolving.pop();
-        }
+        return this.build(name, entry);
     }
     has(name) {
         return this.registry.has(name) || (this.parent?.has(name) ?? false);
@@ -83,60 +47,93 @@ export class ScopeContainer {
         return child;
     }
     async dispose() {
-        // Everything is told before anything throws, then the failures travel together.
-        // Dropped from the parent first: a scope that closes itself leaves a reference the
-        // parent would hold for the life of the process.
         this.parent?.forget(this);
+        const failures = await this.disposeChildren();
+        failures.push(...(await this.disposeBuilt()));
+        this.registry.clear();
+        if (this.children.length > 0) {
+            failures.push(new ContainerError(`${this.children.length} scope(s) still held after this one closed — probably opened while it was closing.`));
+        }
+        if (failures.length > 0) {
+            throw ContainerError.all(failures, 'one or more disposals failed');
+        }
+    }
+    async disposeChildren() {
         const failures = [];
-        // A copy: closing a child splices it out of `children`, so walking the array
-        // itself stepped over every second sibling.
-        for (const child of [...this.children].reverse()) {
+        while (this.children.length > 0) {
+            const child = this.children[this.children.length - 1];
             try {
                 await child.dispose();
             }
             catch (error) {
                 failures.push(error);
             }
+            finally {
+                this.forget(child);
+            }
         }
-        this.children.length = 0;
-        for (const value of this.built.reverse()) {
+        return failures;
+    }
+    async disposeBuilt() {
+        const failures = [];
+        while (this.built.length > 0) {
             try {
-                await value.dispose();
+                await this.built.pop()?.[Symbol.asyncDispose]();
             }
             catch (error) {
                 failures.push(error);
             }
         }
-        this.built.length = 0;
-        this.registry.clear();
-        if (failures.length > 0) {
-            throw new AggregateError(failures, '[container] one or more disposals failed');
-        }
+        return failures;
     }
     setFallback(resolve) {
+        if (this.parent)
+            return this.parent.setFallback(resolve);
         this.fallback = resolve;
     }
-    entryOf(name) {
-        return this.registry.get(name) ?? this.parent?.entryOf(name);
+    build(name, entry) {
+        if (this.resolving.includes(name)) {
+            throw new ContainerError(`dependency cycle: ${[...this.resolving, name].join(' → ')}`);
+        }
+        this.resolving.push(name);
+        try {
+            const value = entry.factory(this);
+            if (entry.lifetime === 'singleton') {
+                entry.instance = value;
+                this.remember(value);
+            }
+            return value;
+        }
+        finally {
+            this.resolving.pop();
+        }
     }
-    /** Set on the root, honoured from any scope — a scope inherits it by asking upward. */
-    fallbackOf() {
-        return this.fallback ?? this.parent?.fallbackOf();
+    buildFallback(name) {
+        const made = this.fallback?.(name);
+        if (made === undefined)
+            throw new ContainerError(this.errorMessage(name));
+        this.registry.set(name, {
+            factory: () => made,
+            lifetime: 'singleton',
+            instance: made,
+        });
+        return made;
     }
     forget(child) {
         const at = this.children.indexOf(child);
         if (at !== -1)
             this.children.splice(at, 1);
     }
-    through(name) {
-        return this.resolving.length > 0
-            ? ` (resolving: ${[...this.resolving, name].join(' → ')})`
-            : '';
-    }
+    /** What this scope will close. A value that answers no `[Symbol.asyncDispose]` is not one of them. */
     remember(value) {
         if (Disposables.is(value))
             this.built.push(value);
-        return value;
+    }
+    errorMessage(name) {
+        const path = this.resolving.length > 0
+            ? ` (resolving: ${[...this.resolving, name].join(' → ')})`
+            : '';
+        return `'${name}' is not registered${path}`;
     }
 }
 //# sourceMappingURL=ScopeContainer.js.map

package/dist/ScopeContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"ScopeContainer.js","sourceRoot":"","sources":["../src/ScopeContainer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ScopeContainer.js","sourceRoot":"","sources":["../src/ScopeContainer.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,5 +1,9 @@
+import { ContainerError } from './ContainerError.js';
 import type { Container } from './Container.js';
 import type { Constructor } from './registration/Constructor.js';
-export type { Container, Constructor };
+import type { Lifetime } from './registration/Lifetime.js';
+import type { RegisterOptions } from './registration/RegisterOptions.js';
+export type { Container, Constructor, RegisterOptions, Lifetime };
+export { ContainerError };
 export declare function createContainer(): Container;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAEjE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;AAEvC,wBAAgB,eAAe,IAAI,SAAS,CAE3C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAEzE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,CAAC;AAE1B,wBAAgB,eAAe,IAAI,SAAS,CAE3C"}

package/dist/index.js

@@ -1,4 +1,6 @@
 import { ScopeContainer } from './ScopeContainer.js';
+import { ContainerError } from './ContainerError.js';
+export { ContainerError };
 export function createContainer() {
     return new ScopeContainer();
 }

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAMrD,MAAM,UAAU,eAAe;IAC7B,OAAO,IAAI,cAAc,EAAE,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAOrD,OAAO,EAAE,cAAc,EAAE,CAAC;AAE1B,MAAM,UAAU,eAAe;IAC7B,OAAO,IAAI,cAAc,EAAE,CAAC;AAC9B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fougere/container",
-  "version": "0.11.0-alpha.0",
+  "version": "0.12.0-alpha.0",
   "description": "Fougere's DI container: resolution by type, wired from the AST scan. Zero dependencies.",
   "keywords": [
     "fougere",

package/src/ContainerError.ts

@@ -0,0 +1,11 @@
+export class ContainerError extends Error {
+  constructor(message: string) {
+    super(message);
+
+    this.name = new.target.name;
+  }
+
+  static all(failures: unknown[], message: string): AggregateError {
+    return new AggregateError(failures, message);
+  }
+}

package/src/Disposable.ts

@@ -1,13 +1,6 @@
-export interface Disposable {
-  dispose(): void | Promise<void>;
-}
-
 export class Disposables {
-  static is(value: unknown): value is Disposable {
-    return (
-      typeof value === 'object' &&
-      value !== null &&
-      typeof (value as Disposable).dispose === 'function'
-    );
+  static is(value: unknown): value is AsyncDisposable {
+    return typeof value === 'object' && value !== null
+      && typeof (value as AsyncDisposable)[Symbol.asyncDispose] === 'function';
   }
 }

package/src/ScopeContainer.ts

@@ -1,5 +1,6 @@
 import type { Container } from './Container.js';
-import { Disposables, type Disposable } from './Disposable.js';
+import { Disposables } from './Disposable.js';
+import { ContainerError } from './ContainerError.js';
 import type { Constructor } from './registration/Constructor.js';
 import type { Lifetime } from './registration/Lifetime.js';
 import type { RegisterOptions } from './registration/RegisterOptions.js';
@@ -12,21 +13,13 @@ interface Entry {
 
 /** A scope reaches its parent and its children through members only a scope can read. */
 export class ScopeContainer implements Container {
-  private readonly registry = new Map<string, Entry>();
-
-  private readonly built: unknown[] = [];
-
-  // Closed by this container, and before `built` — a child may hold what this scope built,
-  // never the other way round.
+  private readonly built: AsyncDisposable[] = [];
   private readonly children: ScopeContainer[] = [];
+  private readonly registry = new Map<string, Entry>();
+  private readonly resolving: string[];
 
   private fallback: ((name: string) => unknown) | undefined;
 
-  // The names being built right now, shared by the whole tree: a miss here is answered by the
-  // parent and the descent continues there, so only one stack can name the path whole —
-  // `child.resolve('A')` reaching a parent's `B` that asks for `A` back reports `A → B → A`.
-  private readonly resolving: string[];
-
   constructor(private readonly parent?: ScopeContainer) {
     this.resolving = parent?.resolving ?? [];
   }
@@ -43,7 +36,6 @@ export class ScopeContainer implements Container {
   }
 
   registerValue<T>(name: string, value: T): void {
-    // A value the container did not build is not the container's to dispose.
     this.registry.set(name, {
       factory: () => value,
       lifetime: 'singleton',
@@ -54,51 +46,15 @@ export class ScopeContainer implements Container {
   resolve<T>(name: string): T {
     const entry = this.registry.get(name);
 
-    // Not found locally — the parent holds it, and holds its instance too.
-    if (!entry && this.parent?.entryOf(name)) {
-      return this.parent.resolve<T>(name);
-    }
-
-    // Nobody holds it. A frond declared in `remotes` registers nothing here, so its
-    // façade is fabricated by the fallback rather than found.
     if (!entry) {
-      const made = this.fallbackOf()?.(name);
-      if (made !== undefined) {
-        this.registry.set(name, {
-          factory: () => made,
-          lifetime: 'singleton',
-          instance: made,
-        });
-
-        return made as T;
-      }
-      throw new Error(`[container] '${name}' is not registered${this.through(name)}`);
-    }
-
-    if (entry.instance !== undefined) return entry.instance as T;
+      if (this.parent) return this.parent.resolve<T>(name);
 
-    if (this.resolving.includes(name)) {
-      throw new Error(
-        `[container] dependency cycle: ${[...this.resolving, name].join(' → ')}`,
-      );
+      return this.buildFallback<T>(name);
     }
 
-    // Popped in a finally, because a constructor that throws leaves the name on the stack
-    // otherwise and the next resolution of it reports a cycle that is not there.
-    this.resolving.push(name);
-    try {
-      const value = entry.factory(this) as T;
-      // The container disposes what it KEEPS: a transient is handed over and forgotten,
-      // and its caller is the one who knows when it is done.
-      if (entry.lifetime === 'singleton') {
-        entry.instance = value;
-        this.remember(value);
-      }
+    if (entry.instance !== undefined) return entry.instance as T;
 
-      return value;
-    } finally {
-      this.resolving.pop();
-    }
+    return this.build<T>(name, entry);
   }
 
   has(name: string): boolean {
@@ -107,68 +63,126 @@ export class ScopeContainer implements Container {
 
   createScope(): Container {
     const child = new ScopeContainer(this);
+
     this.children.push(child);
 
     return child;
   }
 
   async dispose(): Promise<void> {
-    // Everything is told before anything throws, then the failures travel together.
-    // Dropped from the parent first: a scope that closes itself leaves a reference the
-    // parent would hold for the life of the process.
     this.parent?.forget(this);
+
+    const failures = await this.disposeChildren();
+
+    failures.push(...(await this.disposeBuilt()));
+
+    this.registry.clear();
+
+    if (this.children.length > 0) {
+      failures.push(
+        new ContainerError(
+          `${this.children.length} scope(s) still held after this one closed — probably opened while it was closing.`,
+        ),
+      );
+    }
+
+    if (failures.length > 0) {
+      throw ContainerError.all(failures, 'one or more disposals failed');
+    }
+  }
+
+  private async disposeChildren(): Promise<unknown[]> {
     const failures: unknown[] = [];
-    // A copy: closing a child splices it out of `children`, so walking the array
-    // itself stepped over every second sibling.
-    for (const child of [...this.children].reverse()) {
+
+    while (this.children.length > 0) {
+      const child = this.children[this.children.length - 1]!;
+
       try {
         await child.dispose();
       } catch (error) {
         failures.push(error);
+      } finally {
+        this.forget(child);
       }
     }
-    this.children.length = 0;
-    for (const value of this.built.reverse()) {
+
+    return failures;
+  }
+
+  private async disposeBuilt(): Promise<unknown[]> {
+    const failures: unknown[] = [];
+    while (this.built.length > 0) {
       try {
-        await (value as Disposable).dispose();
+        await this.built.pop()?.[Symbol.asyncDispose]();
       } catch (error) {
         failures.push(error);
       }
     }
-    this.built.length = 0;
-    this.registry.clear();
-    if (failures.length > 0) {
-      throw new AggregateError(failures, '[container] one or more disposals failed');
-    }
+
+    return failures;
   }
 
   setFallback(resolve: (name: string) => unknown): void {
+    if (this.parent) return this.parent.setFallback(resolve);
+
     this.fallback = resolve;
   }
 
-  private entryOf(name: string): Entry | undefined {
-    return this.registry.get(name) ?? this.parent?.entryOf(name);
+  private build<T>(name: string, entry: Entry): T {
+    if (this.resolving.includes(name)) {
+      throw new ContainerError(
+        `dependency cycle: ${[...this.resolving, name].join(' → ')}`,
+      );
+    }
+
+    this.resolving.push(name);
+
+    try {
+      const value = entry.factory(this) as T;
+
+      if (entry.lifetime === 'singleton') {
+        entry.instance = value;
+
+        this.remember(value);
+      }
+
+      return value;
+    } finally {
+      this.resolving.pop();
+    }
   }
 
-  /** Set on the root, honoured from any scope — a scope inherits it by asking upward. */
-  private fallbackOf(): ((name: string) => unknown) | undefined {
-    return this.fallback ?? this.parent?.fallbackOf();
+  private buildFallback<T>(name: string): T {
+    const made = this.fallback?.(name);
+
+    if (made === undefined) throw new ContainerError(this.errorMessage(name));
+
+    this.registry.set(name, {
+      factory: () => made,
+      lifetime: 'singleton',
+      instance: made,
+    });
+
+    return made as T;
   }
 
   private forget(child: ScopeContainer): void {
     const at = this.children.indexOf(child);
+
     if (at !== -1) this.children.splice(at, 1);
   }
 
-  private through(name: string): string {
-    return this.resolving.length > 0
-      ? ` (resolving: ${[...this.resolving, name].join(' → ')})`
-      : '';
+  /** What this scope will close. A value that answers no `[Symbol.asyncDispose]` is not one of them. */
+  private remember(value: unknown): void {
+    if (Disposables.is(value)) this.built.push(value);
   }
 
-  private remember<T>(value: T): T {
-    if (Disposables.is(value)) this.built.push(value);
+  private errorMessage(name: string): string {
+    const path =
+      this.resolving.length > 0
+        ? ` (resolving: ${[...this.resolving, name].join(' → ')})`
+        : '';
 
-    return value;
+    return `'${name}' is not registered${path}`;
   }
 }

package/src/index.ts

@@ -1,8 +1,12 @@
 import { ScopeContainer } from './ScopeContainer.js';
+import { ContainerError } from './ContainerError.js';
 import type { Container } from './Container.js';
 import type { Constructor } from './registration/Constructor.js';
+import type { Lifetime } from './registration/Lifetime.js';
+import type { RegisterOptions } from './registration/RegisterOptions.js';
 
-export type { Container, Constructor };
+export type { Container, Constructor, RegisterOptions, Lifetime };
+export { ContainerError };
 
 export function createContainer(): Container {
   return new ScopeContainer();