ts-ioc-container 55.4.1 → 55.6.0

package/README.md

@@ -19,7 +19,7 @@ provider pipelines, aliases, and custom injector strategies.
 - clean API for classes, keys, tokens, aliases, and scopes
 - no global container object; pass containers and scopes explicitly
 - supports tagged application, request, transaction, page, and widget scopes
-- decorator support with `@register`, `@inject`, `@onConstruct`, and `@onDispose`
+- decorator support with `@register`, `@inject`, `@onConstruct`, and `@onContainerDisposed`
 - can [inject properties](#inject-property)
 - can inject [lazy dependencies](#lazy)
 - composable provider and registration pipelines
@@ -27,6 +27,7 @@ provider pipelines, aliases, and custom injector strategies.
 ## Content
 
 - [Setup](#setup)
+- [Environment support](#environment-support)
 - [Quickstart](#quickstart)
 - [Cheatsheet](#cheatsheet)
 - [Container](#container)
@@ -52,7 +53,7 @@ provider pipelines, aliases, and custom injector strategies.
 - [Module](#module)
 - [Hook](#hook) `@hook`
   - [OnConstruct](#onconstruct) `@onConstruct`
-  - [OnDispose](#ondispose) `@onDispose`
+  - [OnContainerDisposed](#oncontainerdisposed) `@onContainerDisposed`
   - [Inject Property](#inject-property)
   - [Inject Method](#inject-method)
 - [Mock](#mock)
@@ -85,6 +86,28 @@ And `tsconfig.json` should have next options:
 }
 ```
 
+## Environment support
+
+`ts-ioc-container` ships both CommonJS and ES module builds (selected
+automatically via the package `exports` map) plus TypeScript declarations, so it
+runs anywhere modern JavaScript does. The package is `sideEffects`-free, so
+bundlers tree-shake unused exports.
+
+| Environment | Supported | Module format | Notes |
+| --- | :---: | --- | --- |
+| Node.js (ESM, `import`) | ✅ | ESM | Node.js 18+; resolved via the `import` condition. |
+| Node.js (CommonJS, `require`) | ✅ | CJS | Node.js 18+; resolved via the `require` condition. |
+| Browser / Web (via bundlers) | ✅ | ESM | webpack, Vite, Rollup, esbuild, Parcel; tree-shakeable. |
+| TypeScript | ✅ | CJS + ESM | Types shipped for both; needs `experimentalDecorators` for the metadata injector. |
+| Deno | ✅ | ESM | Use the `npm:ts-ioc-container` specifier. |
+| Bun | ✅ | CJS + ESM | Runs the native ESM/CJS builds directly. |
+
+> [!NOTE]
+> The default `MetadataInjector` (and the `@inject` / `@onConstruct` /
+> `@onContainerDisposed` decorators) rely on `reflect-metadata`. It is declared as an
+> optional peer dependency — install it and import it once at your entrypoint.
+> `SimpleInjector` and `ProxyInjector` do not need it.
+
 ## Quickstart
 
 ```typescript
@@ -426,7 +449,7 @@ describe('Instances', function () {
 Sometimes you want to dispose a container or scope. For example, when a request, page, widget, or other local lifecycle ends.
 
 - container can be disposed
-- when container is disposed then it runs its `onDispose` hooks, unregisters its providers, removes its local instances, and detaches from its parent
+- when container is disposed then it runs its `onContainerDisposed` hooks, unregisters its providers, removes its local instances, and detaches from its parent
 
 > [!IMPORTANT]
 > Dispose is local to the container being disposed. Child scopes are not disposed automatically; dispose them explicitly when their own lifecycle ends.
@@ -445,7 +468,7 @@ import { bindTo, Container, ContainerDisposedError, register, Registration as R,
  * - Cache entries cleared
  *
  * The container.dispose() method:
- * 1. Executes all onDispose hooks
+ * 1. Executes all onContainerDisposed hooks
  * 2. Clears all instances and registrations
  * 3. Detaches from parent scope
  * 4. Prevents further resolution
@@ -1542,7 +1565,7 @@ Constructor parameters that should pick up positional args from `ProviderOptions
 - `@inject(args(0))` — resolves the first element of the `args` array passed at resolution time
 - Works together with `token.args(...)` to pass typed dependencies through the args context
 
-`args(index)` and `argsFn(fn)` are thin shortcuts for an `InjectFn`. Every `InjectFn` receives `(scope, options)`, where `options.args` is the runtime args array — so `args(0)` is just `(scope, { args = [] }) => args[0]`, and `argsFn(fn)` is `(scope, { args = [] }) => fn(...args)` (the runtime args are spread into your callback as positional parameters).
+`argsFn(predicate)` is the general form: it iterates the runtime `args` array and returns the **first argument matching** `predicate(value, index)` — think `args.find(predicate)`. `args(index)` is just a shortcut for matching by position: `args(0)` is `argsFn((value, index) => index === 0)`. Every `InjectFn` receives `(scope, options)`, where `options.args` is the runtime args array.
 
 ### Immutable token chaining
 
@@ -2561,7 +2584,7 @@ describe('onConstruct', function () {
 
 ```
 
-### OnDispose
+### OnContainerDisposed
 
 ```typescript
 import 'reflect-metadata';
@@ -2571,7 +2594,7 @@ import {
   Container,
   type HookFn,
   inject,
-  onDispose,
+  onContainerDisposed,
   register,
   Registration as R,
   singleton,
@@ -2600,13 +2623,13 @@ class Logger {
     this.messages.push(message);
   }
 
-  @onDispose(execute)
+  @onContainerDisposed(execute)
   save() {
     this.logsRepo.saveLogs(this.messages);
   }
 }
 
-describe('onDispose', function () {
+describe('onContainerDisposed', function () {
   it('should invoke hooks on all instances when container is disposed', function () {
     const container = new Container()
       .useModule(new AddOnDisposeHookModule())

package/cjm/container/AliasMap.js

@@ -7,7 +7,6 @@ class AliasMap {
         return [...(this.aliasToKeySet.get(alias) ?? [])];
     }
     setAliasesByKey(key, aliases) {
-        // reset existing key's aliases
         for (const [alias, keySet] of this.aliasToKeySet) {
             keySet.delete(key);
             if (keySet.size === 0) {

package/cjm/container/Container.js

@@ -83,15 +83,12 @@ class Container {
     dispose() {
         this.validateContainer();
         this.isDisposed = true;
-        // Execute onDispose hooks
         while (this.onDisposeHookList.length) {
             const onDispose = this.onDisposeHookList.shift();
             onDispose(this);
         }
-        // Detach from parent
         this.parent.removeScope(this);
         this.parent = new EmptyContainer_1.EmptyContainer();
-        // Reset the state
         for (const [_, provider] of this.providers) {
             provider.dispose();
         }
@@ -99,7 +96,6 @@ class Container {
         this.aliases.destroy();
         this.instances = [];
         this.registrations = [];
-        // Clear hooks
         this.onConstructHookList.splice(0, this.onConstructHookList.length);
     }
     addRegistration(registration) {
@@ -123,7 +119,6 @@ class Container {
     }
     addInstance(instance) {
         this.instances.push(instance);
-        // Execute onConstruct hooks
         for (const onConstruct of this.onConstructHookList) {
             onConstruct(instance, this);
         }

package/cjm/hooks/HookContext.js

@@ -19,15 +19,12 @@ class HookContext {
         });
     }
     invokeMethod({ args = this.resolveArgs() } = {}) {
-        // @ts-ignore
         return this.instance[this.methodName](...args);
     }
     setProperty(fn) {
-        // @ts-ignore
         this.instance[this.methodName] = fn.resolve(this.scope);
     }
     getProperty() {
-        // @ts-ignore
         return this.instance[this.methodName];
     }
     setInitialArgs(...args) {

package/cjm/hooks/hook.js

@@ -13,7 +13,6 @@ exports.toHookFn = toHookFn;
 const getReflectionTarget = (target) => {
     return (0, proxy_1.isProxy)(target) ? (0, proxy_1.getProxyTarget)(target) : target;
 };
-// Walk the constructor's prototype chain (most-derived first) collecting each class.
 const getConstructorChain = (ctor) => {
     const chain = [];
     let current = ctor;
@@ -23,9 +22,6 @@ const getConstructorChain = (ctor) => {
     }
     return chain;
 };
-// Get hooks metadata, merging hooks declared on parent (extended-from) classes.
-// Hooks are collected from base to derived so a derived class's hooks for the same
-// method name take precedence over (replace) the parent's.
 function getHooks(target, key) {
     const reflectionTarget = getReflectionTarget(target);
     const merged = new Map();
@@ -43,7 +39,6 @@ function hasHooks(target, key) {
     const reflectionTarget = getReflectionTarget(target);
     return getConstructorChain(reflectionTarget.constructor).some((ctor) => Reflect.hasOwnMetadata(key, ctor));
 }
-// Hook decorator
 const hook = (key, ...fns) => (target, propertyKey) => {
     const hooks = Reflect.hasOwnMetadata(key, target.constructor)
         ? Reflect.getOwnMetadata(key, target.constructor)

package/cjm/hooks/onContainerDisposed.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AddOnDisposeHookModule = exports.onContainerDisposed = exports.onContainerDisposedHooksRunner = void 0;
+const hook_1 = require("./hook");
+const HooksRunner_1 = require("./HooksRunner");
+exports.onContainerDisposedHooksRunner = new HooksRunner_1.HooksRunner('onContainerDisposed');
+const onContainerDisposed = (...fns) => (0, hook_1.hook)('onContainerDisposed', ...fns);
+exports.onContainerDisposed = onContainerDisposed;
+class AddOnDisposeHookModule {
+    applyTo(container) {
+        container.addOnDisposeHook((scope) => {
+            for (const instance of scope.getInstances()) {
+                exports.onContainerDisposedHooksRunner.execute(instance, { scope });
+            }
+        });
+    }
+}
+exports.AddOnDisposeHookModule = AddOnDisposeHookModule;

package/cjm/index.js

@@ -1,15 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.InjectionToken = exports.HooksRunner = exports.AddOnDisposeHookModule = exports.onDispose = exports.onDisposeHooksRunner = exports.AddOnConstructHookModule = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = exports.createHookContext = exports.createHookContextFactory = exports.HookContext = exports.hasHooks = exports.hook = exports.getHooks = exports.CannonSingletonApplyTwiceError = exports.UnexpectedHookResultError = exports.ProviderDisposedError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.ContainerNotFoundError = exports.DependencyNotFoundError = exports.Registration = exports.appendArgsFn = exports.appendArgs = exports.decorate = exports.singleton = exports.lazy = exports.scopeAccess = exports.scope = exports.bindTo = exports.register = exports.Provider = exports.ProxyInjector = exports.SimpleInjector = exports.resolveArgs = exports.argsFn = exports.args = exports.inject = exports.MetadataInjector = exports.Injector = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.InjectionToken = exports.HooksRunner = exports.AddOnDisposeHookModule = exports.onContainerDisposed = exports.onContainerDisposedHooksRunner = exports.AddOnConstructHookModule = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = exports.createHookContext = exports.createHookContextFactory = exports.HookContext = exports.hasHooks = exports.hook = exports.getHooks = exports.CannonSingletonApplyTwiceError = exports.UnexpectedHookResultError = exports.ProviderDisposedError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.ContainerNotFoundError = exports.DependencyNotFoundError = exports.Registration = exports.appendArgsFn = exports.appendArgs = exports.decorate = exports.singleton = exports.lazy = exports.scopeAccess = exports.scope = exports.bindTo = exports.register = exports.Provider = exports.ProxyInjector = exports.SimpleInjector = exports.resolveArgs = exports.argsFn = exports.args = exports.inject = exports.MetadataInjector = exports.Injector = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
 exports.resolveConstructor = exports.Is = exports.pipe = exports.select = exports.once = exports.shallowCache = exports.debounce = exports.throttle = exports.handleAsyncError = exports.handleError = exports.getMethodTags = exports.addMethodTag = exports.getMethodLabels = exports.addMethodLabel = exports.getMethodMeta = exports.addMethodMeta = exports.getParamTags = exports.addParamTag = exports.getParamLabels = exports.addParamLabel = exports.getParamMeta = exports.addParamMeta = exports.getClassTags = exports.addClassTag = exports.getClassLabels = exports.addClassLabel = exports.getClassMeta = exports.addClassMeta = exports.GroupInstanceToken = exports.ConstantToken = exports.FunctionToken = exports.SingleToken = void 0;
-// Containers
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
 var Container_1 = require("./container/Container");
 Object.defineProperty(exports, "Container", { enumerable: true, get: function () { return Container_1.Container; } });
 var EmptyContainer_1 = require("./container/EmptyContainer");
 Object.defineProperty(exports, "EmptyContainer", { enumerable: true, get: function () { return EmptyContainer_1.EmptyContainer; } });
-// Injectors
 var IInjector_1 = require("./injector/IInjector");
 Object.defineProperty(exports, "Injector", { enumerable: true, get: function () { return IInjector_1.Injector; } });
 var MetadataInjector_1 = require("./injector/MetadataInjector");
@@ -24,7 +22,6 @@ var ProxyInjector_1 = require("./injector/ProxyInjector");
 Object.defineProperty(exports, "ProxyInjector", { enumerable: true, get: function () { return ProxyInjector_1.ProxyInjector; } });
 var Provider_1 = require("./provider/Provider");
 Object.defineProperty(exports, "Provider", { enumerable: true, get: function () { return Provider_1.Provider; } });
-// Registrations
 var IRegistration_1 = require("./registration/IRegistration");
 Object.defineProperty(exports, "register", { enumerable: true, get: function () { return IRegistration_1.register; } });
 Object.defineProperty(exports, "bindTo", { enumerable: true, get: function () { return IRegistration_1.bindTo; } });
@@ -37,7 +34,6 @@ Object.defineProperty(exports, "appendArgs", { enumerable: true, get: function (
 Object.defineProperty(exports, "appendArgsFn", { enumerable: true, get: function () { return IRegistration_1.appendArgsFn; } });
 var Registration_1 = require("./registration/Registration");
 Object.defineProperty(exports, "Registration", { enumerable: true, get: function () { return Registration_1.Registration; } });
-// Errors
 var DependencyNotFoundError_1 = require("./errors/DependencyNotFoundError");
 Object.defineProperty(exports, "DependencyNotFoundError", { enumerable: true, get: function () { return DependencyNotFoundError_1.DependencyNotFoundError; } });
 var ContainerNotFoundError_1 = require("./errors/ContainerNotFoundError");
@@ -54,7 +50,6 @@ var UnexpectedHookResultError_1 = require("./errors/UnexpectedHookResultError");
 Object.defineProperty(exports, "UnexpectedHookResultError", { enumerable: true, get: function () { return UnexpectedHookResultError_1.UnexpectedHookResultError; } });
 var CannonSingletonApplyTwiceError_1 = require("./errors/CannonSingletonApplyTwiceError");
 Object.defineProperty(exports, "CannonSingletonApplyTwiceError", { enumerable: true, get: function () { return CannonSingletonApplyTwiceError_1.CannonSingletonApplyTwiceError; } });
-// Hooks
 var hook_1 = require("./hooks/hook");
 Object.defineProperty(exports, "getHooks", { enumerable: true, get: function () { return hook_1.getHooks; } });
 Object.defineProperty(exports, "hook", { enumerable: true, get: function () { return hook_1.hook; } });
@@ -69,13 +64,12 @@ var onConstruct_1 = require("./hooks/onConstruct");
 Object.defineProperty(exports, "onConstructHooksRunner", { enumerable: true, get: function () { return onConstruct_1.onConstructHooksRunner; } });
 Object.defineProperty(exports, "onConstruct", { enumerable: true, get: function () { return onConstruct_1.onConstruct; } });
 Object.defineProperty(exports, "AddOnConstructHookModule", { enumerable: true, get: function () { return onConstruct_1.AddOnConstructHookModule; } });
-var onDispose_1 = require("./hooks/onDispose");
-Object.defineProperty(exports, "onDisposeHooksRunner", { enumerable: true, get: function () { return onDispose_1.onDisposeHooksRunner; } });
-Object.defineProperty(exports, "onDispose", { enumerable: true, get: function () { return onDispose_1.onDispose; } });
-Object.defineProperty(exports, "AddOnDisposeHookModule", { enumerable: true, get: function () { return onDispose_1.AddOnDisposeHookModule; } });
+var onContainerDisposed_1 = require("./hooks/onContainerDisposed");
+Object.defineProperty(exports, "onContainerDisposedHooksRunner", { enumerable: true, get: function () { return onContainerDisposed_1.onContainerDisposedHooksRunner; } });
+Object.defineProperty(exports, "onContainerDisposed", { enumerable: true, get: function () { return onContainerDisposed_1.onContainerDisposed; } });
+Object.defineProperty(exports, "AddOnDisposeHookModule", { enumerable: true, get: function () { return onContainerDisposed_1.AddOnDisposeHookModule; } });
 var HooksRunner_1 = require("./hooks/HooksRunner");
 Object.defineProperty(exports, "HooksRunner", { enumerable: true, get: function () { return HooksRunner_1.HooksRunner; } });
-// Tokens
 var InjectionToken_1 = require("./token/InjectionToken");
 Object.defineProperty(exports, "InjectionToken", { enumerable: true, get: function () { return InjectionToken_1.InjectionToken; } });
 var GroupAliasToken_1 = require("./token/GroupAliasToken");
@@ -94,7 +88,6 @@ var ConstantToken_1 = require("./token/ConstantToken");
 Object.defineProperty(exports, "ConstantToken", { enumerable: true, get: function () { return ConstantToken_1.ConstantToken; } });
 var GroupInstanceToken_1 = require("./token/GroupInstanceToken");
 Object.defineProperty(exports, "GroupInstanceToken", { enumerable: true, get: function () { return GroupInstanceToken_1.GroupInstanceToken; } });
-// Metadata
 var class_1 = require("./metadata/class");
 Object.defineProperty(exports, "addClassMeta", { enumerable: true, get: function () { return class_1.addClassMeta; } });
 Object.defineProperty(exports, "getClassMeta", { enumerable: true, get: function () { return class_1.getClassMeta; } });
@@ -127,7 +120,6 @@ var shallowCache_1 = require("./utils/shallowCache");
 Object.defineProperty(exports, "shallowCache", { enumerable: true, get: function () { return shallowCache_1.shallowCache; } });
 var once_1 = require("./utils/once");
 Object.defineProperty(exports, "once", { enumerable: true, get: function () { return once_1.once; } });
-// Utils
 var select_1 = require("./select");
 Object.defineProperty(exports, "select", { enumerable: true, get: function () { return select_1.select; } });
 var fp_1 = require("./utils/fp");

package/cjm/injector/IInjector.js

@@ -4,7 +4,6 @@ exports.Injector = void 0;
 const proxy_1 = require("../utils/proxy");
 class Injector {
     resolve(scope, Target, { args, lazy } = {}) {
-        // @ts-ignore
         return (0, proxy_1.toLazyIf)(() => {
             const instance = this.createInstance(scope, Target, { args });
             scope.addInstance(instance);

package/cjm/injector/MetadataInjector.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveArgs = exports.argsFn = exports.args = exports.inject = exports.MetadataInjector = void 0;
+exports.resolveArgs = exports.args = exports.argsFn = exports.inject = exports.MetadataInjector = void 0;
 const IInjector_1 = require("./IInjector");
 const basic_1 = require("../utils/basic");
 const parameter_1 = require("../metadata/parameter");
@@ -17,12 +17,10 @@ const inject = (fn) => (target, propertyKey, parameterIndex) => {
     (0, parameter_1.addParamMeta)(hookMetaKey(propertyKey), () => (0, toToken_1.toToken)(fn))(basic_1.Is.instance(target) ? target.constructor : target, propertyKey, parameterIndex);
 };
 exports.inject = inject;
-const args = (index) => (c, { args = [] }) => {
-    return args[index];
-};
-exports.args = args;
-const argsFn = (fn) => (c, options) => fn(...(options.args ?? []));
+const argsFn = (predicate) => (c, { args = [] }) => args.find((value, index) => predicate(value, index));
 exports.argsFn = argsFn;
+const args = (index) => (0, exports.argsFn)((value, i) => i === index);
+exports.args = args;
 const resolveArgs = (Target, methodName) => {
     const tokens = (0, parameter_1.getParamMeta)(hookMetaKey(methodName), Target);
     return (scope, { args = [], lazy }) => tokens.map((fn) => fn.resolve(scope, { args: args.map(toToken_1.argToToken).map((t) => t.resolve(scope)), lazy }));

package/cjm/utils/fp.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pipe = pipe;
-// Implementation
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function pipe(...mappers) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return (value) => mappers.reduce((acc, current) => current(acc), value);
 }

package/cjm/utils/proxy.js

@@ -25,7 +25,6 @@ function lazyProxy(resolveInstance) {
     const proxy = new Proxy({}, {
         get: (_, prop) => {
             const target = state.getTarget();
-            // @ts-ignore
             return target[prop];
         },
     });

package/esm/container/AliasMap.js

@@ -4,7 +4,6 @@ export class AliasMap {
         return [...(this.aliasToKeySet.get(alias) ?? [])];
     }
     setAliasesByKey(key, aliases) {
-        // reset existing key's aliases
         for (const [alias, keySet] of this.aliasToKeySet) {
             keySet.delete(key);
             if (keySet.size === 0) {

package/esm/container/Container.js

@@ -1,10 +1,10 @@
-import { EmptyContainer } from './EmptyContainer';
-import { ContainerDisposedError } from '../errors/ContainerDisposedError';
-import { MetadataInjector } from '../injector/MetadataInjector';
-import { AliasMap } from './AliasMap';
-import { DependencyNotFoundError } from '../errors/DependencyNotFoundError';
-import { Is } from '../utils/basic';
-import { Filter as F } from '../utils/array';
+import { EmptyContainer } from './EmptyContainer.js';
+import { ContainerDisposedError } from '../errors/ContainerDisposedError.js';
+import { MetadataInjector } from '../injector/MetadataInjector.js';
+import { AliasMap } from './AliasMap.js';
+import { DependencyNotFoundError } from '../errors/DependencyNotFoundError.js';
+import { Is } from '../utils/basic.js';
+import { Filter as F } from '../utils/array.js';
 export class Container {
     isDisposed = false;
     parent;
@@ -80,15 +80,12 @@ export class Container {
     dispose() {
         this.validateContainer();
         this.isDisposed = true;
-        // Execute onDispose hooks
         while (this.onDisposeHookList.length) {
             const onDispose = this.onDisposeHookList.shift();
             onDispose(this);
         }
-        // Detach from parent
         this.parent.removeScope(this);
         this.parent = new EmptyContainer();
-        // Reset the state
         for (const [_, provider] of this.providers) {
             provider.dispose();
         }
@@ -96,7 +93,6 @@ export class Container {
         this.aliases.destroy();
         this.instances = [];
         this.registrations = [];
-        // Clear hooks
         this.onConstructHookList.splice(0, this.onConstructHookList.length);
     }
     addRegistration(registration) {
@@ -120,7 +116,6 @@ export class Container {
     }
     addInstance(instance) {
         this.instances.push(instance);
-        // Execute onConstruct hooks
         for (const onConstruct of this.onConstructHookList) {
             onConstruct(instance, this);
         }

package/esm/container/EmptyContainer.js

@@ -1,6 +1,6 @@
-import { MethodNotImplementedError } from '../errors/MethodNotImplementedError';
-import { DependencyNotFoundError } from '../errors/DependencyNotFoundError';
-import { ContainerNotFoundError } from '../errors/ContainerNotFoundError';
+import { MethodNotImplementedError } from '../errors/MethodNotImplementedError.js';
+import { DependencyNotFoundError } from '../errors/DependencyNotFoundError.js';
+import { ContainerNotFoundError } from '../errors/ContainerNotFoundError.js';
 export class EmptyContainer {
     get isDisposed() {
         throw new MethodNotImplementedError();

package/esm/errors/CannonSingletonApplyTwiceError.js

@@ -1,4 +1,4 @@
-import { ContainerError } from './ContainerError';
+import { ContainerError } from './ContainerError.js';
 export class CannonSingletonApplyTwiceError extends ContainerError {
     name = 'CannonSingletonApplyTwiceError';
     constructor(message) {

package/esm/errors/ContainerDisposedError.js

@@ -1,4 +1,4 @@
-import { ContainerError } from './ContainerError';
+import { ContainerError } from './ContainerError.js';
 export class ContainerDisposedError extends ContainerError {
     name = 'ContainerDisposedError';
     constructor(message) {

package/esm/errors/ContainerNotFoundError.js

@@ -1,4 +1,4 @@
-import { ContainerError } from './ContainerError';
+import { ContainerError } from './ContainerError.js';
 export class ContainerNotFoundError extends ContainerError {
     name = 'ContainerNotFoundError';
     constructor(message) {

package/esm/errors/DependencyMissingKeyError.js

@@ -1,4 +1,4 @@
-import { ContainerError } from './ContainerError';
+import { ContainerError } from './ContainerError.js';
 export class DependencyMissingKeyError extends ContainerError {
     name = 'DependencyMissingKeyError';
     constructor(message) {

package/esm/errors/DependencyNotFoundError.js

@@ -1,4 +1,4 @@
-import { ContainerError } from './ContainerError';
+import { ContainerError } from './ContainerError.js';
 export class DependencyNotFoundError extends ContainerError {
     name = 'DependencyNotFoundError';
     constructor(message) {

package/esm/errors/MethodNotImplementedError.js

@@ -1,4 +1,4 @@
-import { ContainerError } from './ContainerError';
+import { ContainerError } from './ContainerError.js';
 export class MethodNotImplementedError extends ContainerError {
     name = 'MethodNotImplementedError';
     constructor(message) {

package/esm/errors/ProviderDisposedError.js

@@ -1,4 +1,4 @@
-import { ContainerError } from './ContainerError';
+import { ContainerError } from './ContainerError.js';
 export class ProviderDisposedError extends ContainerError {
     name = 'ProviderDisposedError';
     static assert(isTrue, failMessage) {

package/esm/errors/UnexpectedHookResultError.js

@@ -1,4 +1,4 @@
-import { ContainerError } from './ContainerError';
+import { ContainerError } from './ContainerError.js';
 export class UnexpectedHookResultError extends ContainerError {
     name = 'UnexpectedHookResultError';
     constructor(message) {

package/esm/errors/UnsupportedTokenTypeError.js

@@ -1,4 +1,4 @@
-import { ContainerError } from './ContainerError';
+import { ContainerError } from './ContainerError.js';
 export class UnsupportedTokenTypeError extends ContainerError {
     name = 'UnsupportedTokenTypeError';
     constructor(message) {

package/esm/hooks/HookContext.js

@@ -1,5 +1,5 @@
-import { getProxyTarget, isProxy } from '../utils/proxy';
-import { resolveArgs } from '../injector/MetadataInjector';
+import { getProxyTarget, isProxy } from '../utils/proxy.js';
+import { resolveArgs } from '../injector/MetadataInjector.js';
 export class HookContext {
     scope;
     methodName;
@@ -16,15 +16,12 @@ export class HookContext {
         });
     }
     invokeMethod({ args = this.resolveArgs() } = {}) {
-        // @ts-ignore
         return this.instance[this.methodName](...args);
     }
     setProperty(fn) {
-        // @ts-ignore
         this.instance[this.methodName] = fn.resolve(this.scope);
     }
     getProperty() {
-        // @ts-ignore
         return this.instance[this.methodName];
     }
     setInitialArgs(...args) {

package/esm/hooks/HooksRunner.js

@@ -1,7 +1,7 @@
-import { createHookContext } from './HookContext';
-import { getHooks, hasHooks, toHookFn } from './hook';
-import { UnexpectedHookResultError } from '../errors/UnexpectedHookResultError';
-import { promisify } from '../utils/promise';
+import { createHookContext } from './HookContext.js';
+import { getHooks, hasHooks, toHookFn } from './hook.js';
+import { UnexpectedHookResultError } from '../errors/UnexpectedHookResultError.js';
+import { promisify } from '../utils/promise.js';
 export class HooksRunner {
     key;
     constructor(key) {

package/esm/hooks/hook.js

@@ -1,5 +1,5 @@
-import { Is } from '../utils/basic';
-import { getProxyTarget, isProxy } from '../utils/proxy';
+import { Is } from '../utils/basic.js';
+import { getProxyTarget, isProxy } from '../utils/proxy.js';
 const isHookClassConstructor = (execute) => {
     return Is.constructor(execute) && execute.prototype.execute;
 };
@@ -7,7 +7,6 @@ export const toHookFn = (execute) => isHookClassConstructor(execute) ? (context)
 const getReflectionTarget = (target) => {
     return isProxy(target) ? getProxyTarget(target) : target;
 };
-// Walk the constructor's prototype chain (most-derived first) collecting each class.
 const getConstructorChain = (ctor) => {
     const chain = [];
     let current = ctor;
@@ -17,9 +16,6 @@ const getConstructorChain = (ctor) => {
     }
     return chain;
 };
-// Get hooks metadata, merging hooks declared on parent (extended-from) classes.
-// Hooks are collected from base to derived so a derived class's hooks for the same
-// method name take precedence over (replace) the parent's.
 export function getHooks(target, key) {
     const reflectionTarget = getReflectionTarget(target);
     const merged = new Map();
@@ -37,7 +33,6 @@ export function hasHooks(target, key) {
     const reflectionTarget = getReflectionTarget(target);
     return getConstructorChain(reflectionTarget.constructor).some((ctor) => Reflect.hasOwnMetadata(key, ctor));
 }
-// Hook decorator
 export const hook = (key, ...fns) => (target, propertyKey) => {
     const hooks = Reflect.hasOwnMetadata(key, target.constructor)
         ? Reflect.getOwnMetadata(key, target.constructor)

package/esm/hooks/injectProp.js

@@ -1,2 +1,2 @@
-import { toToken } from '../token/toToken';
+import { toToken } from '../token/toToken.js';
 export const injectProp = (fn) => (context) => context.setProperty(toToken(fn));

package/esm/hooks/onConstruct.js

@@ -1,5 +1,5 @@
-import { hook } from './hook';
-import { HooksRunner } from './HooksRunner';
+import { hook } from './hook.js';
+import { HooksRunner } from './HooksRunner.js';
 export const onConstructHooksRunner = new HooksRunner('onConstruct');
 export const onConstruct = (...fns) => hook('onConstruct', ...fns);
 export class AddOnConstructHookModule {

package/esm/hooks/onContainerDisposed.js

@@ -0,0 +1,13 @@
+import { hook } from './hook.js';
+import { HooksRunner } from './HooksRunner.js';
+export const onContainerDisposedHooksRunner = new HooksRunner('onContainerDisposed');
+export const onContainerDisposed = (...fns) => hook('onContainerDisposed', ...fns);
+export class AddOnDisposeHookModule {
+    applyTo(container) {
+        container.addOnDisposeHook((scope) => {
+            for (const instance of scope.getInstances()) {
+                onContainerDisposedHooksRunner.execute(instance, { scope });
+            }
+        });
+    }
+}