proxydi 0.0.11 → 0.0.13

package/CHANGELOG.md

@@ -5,11 +5,27 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [[0.0.10](https://www.npmjs.com/package/proxydi/v/0.0.11)] - 2025-03-03
+## [[0.0.13](https://www.npmjs.com/package/proxydi/v/0.0.13)] - 2025-03-04
 
 ### Added
 
-- resolveInjectables() method [#12](https://github.com/proxy-di/proxydi/pull/13)
+- inject, resolve register by class [#15](https://github.com/proxy-di/proxydi/pull/15)
+
+### Changed
+
+- remove event requires dependency
+
+## [[0.0.12](https://www.npmjs.com/package/proxydi/v/0.0.12)] - 2025-03-04
+
+### Added
+
+- Experimental @middleware [#14](https://github.com/proxy-di/proxydi/pull/14)
+
+## [[0.0.11](https://www.npmjs.com/package/proxydi/v/0.0.11)] - 2025-03-03
+
+### Added
+
+- resolveInjectables() method [#13](https://github.com/proxy-di/proxydi/pull/13)
 
 ## [[0.0.10](https://www.npmjs.com/package/proxydi/v/0.0.10)] - 2025-03-02
 

package/README.md

@@ -17,6 +17,7 @@ Core features:
 Eperimemntal features:
 
 - Construtor injections (see unit tests for examples)
+- Middleware listeners (see unit tests for examples)
 - Matches dependencies by unique identifiers or automatically using class names and property names
 
 ## Quick start

package/dist/ProxyDiContainer.d.ts

@@ -29,6 +29,7 @@ export declare class ProxyDiContainer implements IProxyDiContainer {
      * Settings that control the behavior of the container and it's children
      */
     readonly settings: Required<ContainerSettings>;
+    private middlewareListener;
     /**
      * Creates a new instance of ProxyDiContainer.
      * @param settings Optional container settings to override defaults.
@@ -44,15 +45,9 @@ export declare class ProxyDiContainer implements IProxyDiContainer {
      * @throws Error if dependency is already registered and rewriting is not allowed or if invalid dependency (not object) is provided and this it now allowed.
      * @returns Dependency instance, registered in container
      */
-    register<T>(DependencyClass: DependencyClass<T>, dependencyId: DependencyId): T & ContainerizedDependency;
+    register<T>(DependencyClass: DependencyClass<T>, dependencyId?: DependencyId): T & ContainerizedDependency;
     register<T>(dependency: T extends new (...args: any[]) => any ? never : T, dependencyId: DependencyId): T & ContainerizedDependency;
     private createInstance;
-    /**
-     * Internal method that implements registeration of dependency and prepare it for injection.
-     * @param dependencyId The unique identifier of the dependency.
-     * @param dependency The dependency instance.
-     */
-    private registerImpl;
     /**
      * Checks if a dependency with the given ID is known to the container or its ancestors which means that it can be resolved by this container
      * @param dependencyId The identifier of the dependency.

package/dist/index.cjs

@@ -1,5 +1,40 @@
 'use strict';
 
+const injectableClasses = {};
+const constructorInjections = {};
+function injectable(dependencyOrDependencies, autoInjecions) {
+    return function (value, context) {
+        if ((context === null || context === undefined ? undefined : context.kind) !== 'class') {
+            throw new Error('@injectable decorator should decorate classes');
+        }
+        const name = dependencyOrDependencies
+            ? Array.isArray(dependencyOrDependencies)
+                ? context.name
+                : dependencyOrDependencies
+            : context.name;
+        const injectToConstructor = dependencyOrDependencies
+            ? Array.isArray(dependencyOrDependencies)
+                ? dependencyOrDependencies
+                : autoInjecions
+            : autoInjecions;
+        if (injectableClasses[name]) {
+            throw new Error(`ProxyDi has already regisered dependency ${String(name)} by @injectable`);
+        }
+        injectableClasses[name] = value;
+        if (injectToConstructor) {
+            constructorInjections[name] = injectToConstructor;
+        }
+    };
+}
+function findInjectableId(injectable) {
+    for (const [id, DependencyClass] of Object.entries(injectableClasses)) {
+        if (DependencyClass === injectable) {
+            return id;
+        }
+    }
+    throw new Error(`Class is not @injectable: ${injectable.name}`);
+}
+
 const INJECTIONS = Symbol('injections');
 /**
  * This symbol constant defines a property name.
@@ -28,7 +63,11 @@ const IS_INSTANCE_PROXY = Symbol('isInstanceProxy');
 const inject = (dependencyId) => {
     return function (_value, context) {
         if ((context === null || context === undefined ? undefined : context.kind) === 'field') {
-            const id = dependencyId ? dependencyId : context.name;
+            const id = dependencyId
+                ? typeof dependencyId === 'function'
+                    ? findInjectableId(dependencyId)
+                    : dependencyId
+                : context.name;
             const injection = {
                 property: context.name,
                 dependencyId: id,
@@ -47,41 +86,6 @@ const inject = (dependencyId) => {
     };
 };
 
-const injectableClasses = {};
-const constructorInjections = {};
-function injectable(dependencyOrDependencies, autoInjecions) {
-    return function (value, context) {
-        if ((context === null || context === undefined ? undefined : context.kind) !== 'class') {
-            throw new Error('@injectable decorator should decorate classes');
-        }
-        const name = dependencyOrDependencies
-            ? Array.isArray(dependencyOrDependencies)
-                ? context.name
-                : dependencyOrDependencies
-            : context.name;
-        const injectToConstructor = dependencyOrDependencies
-            ? Array.isArray(dependencyOrDependencies)
-                ? dependencyOrDependencies
-                : autoInjecions
-            : autoInjecions;
-        if (injectableClasses[name]) {
-            throw new Error(`ProxyDi has already regisered dependency ${String(name)} by @injectable`);
-        }
-        injectableClasses[name] = value;
-        if (injectToConstructor) {
-            constructorInjections[name] = injectToConstructor;
-        }
-    };
-}
-function findInjectableId(injectable) {
-    for (const [id, DependencyClass] of Object.entries(injectableClasses)) {
-        if (DependencyClass === injectable) {
-            return id;
-        }
-    }
-    throw new Error(`Class is not @injectable: ${injectable.name}`);
-}
-
 const DEFAULT_SETTINGS = {
     allowRegisterAnything: false,
     allowRewriteDependencies: false,
@@ -190,6 +194,72 @@ function makeConstructorDependencyProxy(container, dependencyId) {
     });
 }
 
+const middlewaresClasses = {};
+function middleware() {
+    return function (value, context) {
+        if ((context === null || context === undefined ? undefined : context.kind) !== 'class') {
+            throw new Error('@middleware decorator should decorate classes');
+        }
+        const name = context.name;
+        if (middlewaresClasses[name]) {
+            throw new Error(`ProxyDi has already regisered middleware ${String(name)} by @middleware`);
+        }
+        middlewaresClasses[name] = value;
+    };
+}
+
+class MiddlewareListener {
+    constructor(parent) {
+        this.parent = parent;
+        this.listeners = {
+            register: [],
+            remove: [],
+        };
+    }
+    add(middleware) {
+        if (isRegistingMiddleware(middleware)) {
+            middleware.onRegister && this.on('register', middleware.onRegister);
+        }
+        if (isRemovingMiddleware(middleware)) {
+            middleware.onRemove && this.on('remove', middleware.onRemove);
+        }
+    }
+    remove(middleware) {
+        if (isRegistingMiddleware(middleware)) {
+            middleware.onRegister &&
+                this.off('register', middleware.onRegister);
+        }
+        if (isRemovingMiddleware(middleware)) {
+            middleware.onRemove && this.off('remove', middleware.onRemove);
+        }
+    }
+    on(event, listener) {
+        this.listeners[event].push(listener);
+    }
+    onRegister(container, dependencyId, dependency) {
+        var _a;
+        this.listeners.register.forEach((listener) => listener(container, dependencyId, dependency));
+        (_a = this.parent) === null || _a === undefined ? undefined : _a.onRegister(container, dependencyId, dependency);
+    }
+    onRemove(container, dependencyId, dependency) {
+        var _a;
+        this.listeners.remove.forEach((listener) => listener(container, dependencyId, dependency));
+        (_a = this.parent) === null || _a === undefined ? undefined : _a.onRemove(container, dependencyId, dependency);
+    }
+    off(event, listener) {
+        const index = this.listeners[event].indexOf(listener);
+        if (index !== -1) {
+            this.listeners[event].splice(index, 1);
+        }
+    }
+}
+function isRegistingMiddleware(middleware) {
+    return middleware.onRegister;
+}
+function isRemovingMiddleware(middleware) {
+    return middleware.onRemove;
+}
+
 /**
  * A dependency injection container
  */
@@ -210,35 +280,55 @@ class ProxyDiContainer {
          */
         this.parentDependencyProxies = {};
         this.id = ProxyDiContainer.idCounter++;
+        this.middlewareListener = new MiddlewareListener(parent === null || parent === undefined ? undefined : parent.middlewareListener);
         if (parent) {
             this.parent = parent;
             this.parent.addChild(this);
         }
         this.settings = Object.assign(Object.assign({}, DEFAULT_SETTINGS), settings);
     }
-    register(dependency, dependencyId) {
-        if (this.dependencies[dependencyId]) {
+    register(dependency, dependecyId) {
+        var _a;
+        let id = dependecyId;
+        if (!id) {
+            if (typeof dependency === 'function') {
+                try {
+                    id = findInjectableId(dependency);
+                }
+                catch (_b) {
+                    id = dependency.name;
+                }
+            }
+        }
+        if (this.dependencies[id]) {
             if (!this.settings.allowRewriteDependencies) {
-                throw new Error(`ProxyDi already has dependency for ${String(dependencyId)}`);
+                throw new Error(`ProxyDi already has dependency for ${String(id)}`);
             }
         }
-        let dependencyInstance;
+        let instance;
         const isClass = typeof dependency === 'function';
         if (isClass) {
-            dependencyInstance = this.createInstance(dependency, dependencyId);
+            instance = this.createInstance(dependency, id);
         }
         else {
-            dependencyInstance = dependency;
-            if (!(typeof dependencyInstance === 'object') &&
-                !this.settings.allowRegisterAnything) {
-                throw new Error(`Can't register as dependency (allowRegisterAnything is off for this contatiner): ${dependencyInstance}`);
-            }
+            instance = dependency;
         }
-        if (typeof dependencyInstance === 'object') {
-            dependencyInstance[PROXYDI_CONTAINER] = this;
+        const isObject = typeof instance === 'object';
+        if (!isObject && !this.settings.allowRegisterAnything) {
+            throw new Error(`Can't register as dependency (allowRegisterAnything is off for this contatiner): ${instance}`);
         }
-        this.registerImpl(dependencyInstance, dependencyId);
-        return dependencyInstance;
+        if (isObject) {
+            instance[PROXYDI_CONTAINER] = this;
+            instance[DEPENDENCY_ID] = id;
+        }
+        this.injectDependenciesTo(instance);
+        this.dependencies[id] = instance;
+        const constructorName = (_a = instance.constructor) === null || _a === undefined ? undefined : _a.name;
+        if (constructorName && middlewaresClasses[constructorName]) {
+            this.middlewareListener.add(instance);
+        }
+        this.middlewareListener.onRegister(this, id, instance);
+        return instance;
     }
     createInstance(Dependency, dependencyId) {
         const paramIds = constructorInjections[dependencyId] || [];
@@ -249,18 +339,6 @@ class ProxyDiContainer {
         }
         return new Dependency(...params);
     }
-    /**
-     * Internal method that implements registeration of dependency and prepare it for injection.
-     * @param dependencyId The unique identifier of the dependency.
-     * @param dependency The dependency instance.
-     */
-    registerImpl(dependency, dependencyId) {
-        this.injectDependenciesTo(dependency);
-        if (typeof dependency === 'object') {
-            dependency[DEPENDENCY_ID] = dependencyId;
-        }
-        this.dependencies[dependencyId] = dependency;
-    }
     /**
      * Checks if a dependency with the given ID is known to the container or its ancestors which means that it can be resolved by this container
      * @param dependencyId The identifier of the dependency.
@@ -274,7 +352,13 @@ class ProxyDiContainer {
     }
     resolve(dependency) {
         if (typeof dependency === 'function') {
-            const id = findInjectableId(dependency);
+            let id;
+            try {
+                id = findInjectableId(dependency);
+            }
+            catch (_a) {
+                id = dependency.name;
+            }
             return this.resolve(id);
         }
         if (!this.isKnown(dependency)) {
@@ -349,11 +433,16 @@ class ProxyDiContainer {
      * @param dependencyOrId The dependency instance or dependency identifier to remove.
      */
     remove(dependencyOrId) {
+        var _a;
         const id = isDependency(dependencyOrId)
             ? dependencyOrId[DEPENDENCY_ID]
             : dependencyOrId;
         const dependency = this.dependencies[id];
         if (dependency) {
+            const constructorName = (_a = dependency.constructor) === null || _a === undefined ? undefined : _a.name;
+            if (constructorName && middlewaresClasses[constructorName]) {
+                this.middlewareListener.remove(dependency);
+            }
             const dependencyInjects = dependency[INJECTIONS]
                 ? dependency[INJECTIONS]
                 : {};
@@ -362,6 +451,7 @@ class ProxyDiContainer {
             });
             delete dependency[DEPENDENCY_ID];
             delete this.dependencies[id];
+            this.middlewareListener.onRemove(this, id, dependency);
         }
     }
     /**
@@ -477,4 +567,5 @@ exports.PROXYDI_CONTAINER = PROXYDI_CONTAINER;
 exports.ProxyDiContainer = ProxyDiContainer;
 exports.inject = inject;
 exports.injectable = injectable;
+exports.middleware = middleware;
 exports.resolveAll = resolveAll;

package/dist/index.d.ts

@@ -1,5 +1,7 @@
 export { inject } from './inject';
 export { ProxyDiContainer } from './ProxyDiContainer';
 export { injectable } from './injectable';
+export { middleware } from './middleware/middleware';
+export { MiddlewareRegisteringListener, MiddlewareRemovingListener, } from './middleware/MiddlewareListener';
 export { Injection, DependencyId, DependencyClass, ContainerSettings, PROXYDI_CONTAINER, DEPENDENCY_ID, } from './types';
 export { resolveAll } from './resolveAll';

package/dist/index.js

@@ -1,3 +1,38 @@
+const injectableClasses = {};
+const constructorInjections = {};
+function injectable(dependencyOrDependencies, autoInjecions) {
+    return function (value, context) {
+        if ((context === null || context === undefined ? undefined : context.kind) !== 'class') {
+            throw new Error('@injectable decorator should decorate classes');
+        }
+        const name = dependencyOrDependencies
+            ? Array.isArray(dependencyOrDependencies)
+                ? context.name
+                : dependencyOrDependencies
+            : context.name;
+        const injectToConstructor = dependencyOrDependencies
+            ? Array.isArray(dependencyOrDependencies)
+                ? dependencyOrDependencies
+                : autoInjecions
+            : autoInjecions;
+        if (injectableClasses[name]) {
+            throw new Error(`ProxyDi has already regisered dependency ${String(name)} by @injectable`);
+        }
+        injectableClasses[name] = value;
+        if (injectToConstructor) {
+            constructorInjections[name] = injectToConstructor;
+        }
+    };
+}
+function findInjectableId(injectable) {
+    for (const [id, DependencyClass] of Object.entries(injectableClasses)) {
+        if (DependencyClass === injectable) {
+            return id;
+        }
+    }
+    throw new Error(`Class is not @injectable: ${injectable.name}`);
+}
+
 const INJECTIONS = Symbol('injections');
 /**
  * This symbol constant defines a property name.
@@ -26,7 +61,11 @@ const IS_INSTANCE_PROXY = Symbol('isInstanceProxy');
 const inject = (dependencyId) => {
     return function (_value, context) {
         if ((context === null || context === undefined ? undefined : context.kind) === 'field') {
-            const id = dependencyId ? dependencyId : context.name;
+            const id = dependencyId
+                ? typeof dependencyId === 'function'
+                    ? findInjectableId(dependencyId)
+                    : dependencyId
+                : context.name;
             const injection = {
                 property: context.name,
                 dependencyId: id,
@@ -45,41 +84,6 @@ const inject = (dependencyId) => {
     };
 };
 
-const injectableClasses = {};
-const constructorInjections = {};
-function injectable(dependencyOrDependencies, autoInjecions) {
-    return function (value, context) {
-        if ((context === null || context === undefined ? undefined : context.kind) !== 'class') {
-            throw new Error('@injectable decorator should decorate classes');
-        }
-        const name = dependencyOrDependencies
-            ? Array.isArray(dependencyOrDependencies)
-                ? context.name
-                : dependencyOrDependencies
-            : context.name;
-        const injectToConstructor = dependencyOrDependencies
-            ? Array.isArray(dependencyOrDependencies)
-                ? dependencyOrDependencies
-                : autoInjecions
-            : autoInjecions;
-        if (injectableClasses[name]) {
-            throw new Error(`ProxyDi has already regisered dependency ${String(name)} by @injectable`);
-        }
-        injectableClasses[name] = value;
-        if (injectToConstructor) {
-            constructorInjections[name] = injectToConstructor;
-        }
-    };
-}
-function findInjectableId(injectable) {
-    for (const [id, DependencyClass] of Object.entries(injectableClasses)) {
-        if (DependencyClass === injectable) {
-            return id;
-        }
-    }
-    throw new Error(`Class is not @injectable: ${injectable.name}`);
-}
-
 const DEFAULT_SETTINGS = {
     allowRegisterAnything: false,
     allowRewriteDependencies: false,
@@ -188,6 +192,72 @@ function makeConstructorDependencyProxy(container, dependencyId) {
     });
 }
 
+const middlewaresClasses = {};
+function middleware() {
+    return function (value, context) {
+        if ((context === null || context === undefined ? undefined : context.kind) !== 'class') {
+            throw new Error('@middleware decorator should decorate classes');
+        }
+        const name = context.name;
+        if (middlewaresClasses[name]) {
+            throw new Error(`ProxyDi has already regisered middleware ${String(name)} by @middleware`);
+        }
+        middlewaresClasses[name] = value;
+    };
+}
+
+class MiddlewareListener {
+    constructor(parent) {
+        this.parent = parent;
+        this.listeners = {
+            register: [],
+            remove: [],
+        };
+    }
+    add(middleware) {
+        if (isRegistingMiddleware(middleware)) {
+            middleware.onRegister && this.on('register', middleware.onRegister);
+        }
+        if (isRemovingMiddleware(middleware)) {
+            middleware.onRemove && this.on('remove', middleware.onRemove);
+        }
+    }
+    remove(middleware) {
+        if (isRegistingMiddleware(middleware)) {
+            middleware.onRegister &&
+                this.off('register', middleware.onRegister);
+        }
+        if (isRemovingMiddleware(middleware)) {
+            middleware.onRemove && this.off('remove', middleware.onRemove);
+        }
+    }
+    on(event, listener) {
+        this.listeners[event].push(listener);
+    }
+    onRegister(container, dependencyId, dependency) {
+        var _a;
+        this.listeners.register.forEach((listener) => listener(container, dependencyId, dependency));
+        (_a = this.parent) === null || _a === undefined ? undefined : _a.onRegister(container, dependencyId, dependency);
+    }
+    onRemove(container, dependencyId, dependency) {
+        var _a;
+        this.listeners.remove.forEach((listener) => listener(container, dependencyId, dependency));
+        (_a = this.parent) === null || _a === undefined ? undefined : _a.onRemove(container, dependencyId, dependency);
+    }
+    off(event, listener) {
+        const index = this.listeners[event].indexOf(listener);
+        if (index !== -1) {
+            this.listeners[event].splice(index, 1);
+        }
+    }
+}
+function isRegistingMiddleware(middleware) {
+    return middleware.onRegister;
+}
+function isRemovingMiddleware(middleware) {
+    return middleware.onRemove;
+}
+
 /**
  * A dependency injection container
  */
@@ -208,35 +278,55 @@ class ProxyDiContainer {
          */
         this.parentDependencyProxies = {};
         this.id = ProxyDiContainer.idCounter++;
+        this.middlewareListener = new MiddlewareListener(parent === null || parent === undefined ? undefined : parent.middlewareListener);
         if (parent) {
             this.parent = parent;
             this.parent.addChild(this);
         }
         this.settings = Object.assign(Object.assign({}, DEFAULT_SETTINGS), settings);
     }
-    register(dependency, dependencyId) {
-        if (this.dependencies[dependencyId]) {
+    register(dependency, dependecyId) {
+        var _a;
+        let id = dependecyId;
+        if (!id) {
+            if (typeof dependency === 'function') {
+                try {
+                    id = findInjectableId(dependency);
+                }
+                catch (_b) {
+                    id = dependency.name;
+                }
+            }
+        }
+        if (this.dependencies[id]) {
             if (!this.settings.allowRewriteDependencies) {
-                throw new Error(`ProxyDi already has dependency for ${String(dependencyId)}`);
+                throw new Error(`ProxyDi already has dependency for ${String(id)}`);
             }
         }
-        let dependencyInstance;
+        let instance;
         const isClass = typeof dependency === 'function';
         if (isClass) {
-            dependencyInstance = this.createInstance(dependency, dependencyId);
+            instance = this.createInstance(dependency, id);
         }
         else {
-            dependencyInstance = dependency;
-            if (!(typeof dependencyInstance === 'object') &&
-                !this.settings.allowRegisterAnything) {
-                throw new Error(`Can't register as dependency (allowRegisterAnything is off for this contatiner): ${dependencyInstance}`);
-            }
+            instance = dependency;
         }
-        if (typeof dependencyInstance === 'object') {
-            dependencyInstance[PROXYDI_CONTAINER] = this;
+        const isObject = typeof instance === 'object';
+        if (!isObject && !this.settings.allowRegisterAnything) {
+            throw new Error(`Can't register as dependency (allowRegisterAnything is off for this contatiner): ${instance}`);
         }
-        this.registerImpl(dependencyInstance, dependencyId);
-        return dependencyInstance;
+        if (isObject) {
+            instance[PROXYDI_CONTAINER] = this;
+            instance[DEPENDENCY_ID] = id;
+        }
+        this.injectDependenciesTo(instance);
+        this.dependencies[id] = instance;
+        const constructorName = (_a = instance.constructor) === null || _a === undefined ? undefined : _a.name;
+        if (constructorName && middlewaresClasses[constructorName]) {
+            this.middlewareListener.add(instance);
+        }
+        this.middlewareListener.onRegister(this, id, instance);
+        return instance;
     }
     createInstance(Dependency, dependencyId) {
         const paramIds = constructorInjections[dependencyId] || [];
@@ -247,18 +337,6 @@ class ProxyDiContainer {
         }
         return new Dependency(...params);
     }
-    /**
-     * Internal method that implements registeration of dependency and prepare it for injection.
-     * @param dependencyId The unique identifier of the dependency.
-     * @param dependency The dependency instance.
-     */
-    registerImpl(dependency, dependencyId) {
-        this.injectDependenciesTo(dependency);
-        if (typeof dependency === 'object') {
-            dependency[DEPENDENCY_ID] = dependencyId;
-        }
-        this.dependencies[dependencyId] = dependency;
-    }
     /**
      * Checks if a dependency with the given ID is known to the container or its ancestors which means that it can be resolved by this container
      * @param dependencyId The identifier of the dependency.
@@ -272,7 +350,13 @@ class ProxyDiContainer {
     }
     resolve(dependency) {
         if (typeof dependency === 'function') {
-            const id = findInjectableId(dependency);
+            let id;
+            try {
+                id = findInjectableId(dependency);
+            }
+            catch (_a) {
+                id = dependency.name;
+            }
             return this.resolve(id);
         }
         if (!this.isKnown(dependency)) {
@@ -347,11 +431,16 @@ class ProxyDiContainer {
      * @param dependencyOrId The dependency instance or dependency identifier to remove.
      */
     remove(dependencyOrId) {
+        var _a;
         const id = isDependency(dependencyOrId)
             ? dependencyOrId[DEPENDENCY_ID]
             : dependencyOrId;
         const dependency = this.dependencies[id];
         if (dependency) {
+            const constructorName = (_a = dependency.constructor) === null || _a === undefined ? undefined : _a.name;
+            if (constructorName && middlewaresClasses[constructorName]) {
+                this.middlewareListener.remove(dependency);
+            }
             const dependencyInjects = dependency[INJECTIONS]
                 ? dependency[INJECTIONS]
                 : {};
@@ -360,6 +449,7 @@ class ProxyDiContainer {
             });
             delete dependency[DEPENDENCY_ID];
             delete this.dependencies[id];
+            this.middlewareListener.onRemove(this, id, dependency);
         }
     }
     /**
@@ -470,4 +560,4 @@ function recursiveResolveAll(container, dependencyId) {
     return all;
 }
 
-export { DEPENDENCY_ID, PROXYDI_CONTAINER, ProxyDiContainer, inject, injectable, resolveAll };
+export { DEPENDENCY_ID, PROXYDI_CONTAINER, ProxyDiContainer, inject, injectable, middleware, resolveAll };

package/dist/index.umd.js

@@ -4,6 +4,41 @@
     (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.YourLibraryName = {}));
 })(this, (function (exports) { 'use strict';
 
+    const injectableClasses = {};
+    const constructorInjections = {};
+    function injectable(dependencyOrDependencies, autoInjecions) {
+        return function (value, context) {
+            if ((context === null || context === undefined ? undefined : context.kind) !== 'class') {
+                throw new Error('@injectable decorator should decorate classes');
+            }
+            const name = dependencyOrDependencies
+                ? Array.isArray(dependencyOrDependencies)
+                    ? context.name
+                    : dependencyOrDependencies
+                : context.name;
+            const injectToConstructor = dependencyOrDependencies
+                ? Array.isArray(dependencyOrDependencies)
+                    ? dependencyOrDependencies
+                    : autoInjecions
+                : autoInjecions;
+            if (injectableClasses[name]) {
+                throw new Error(`ProxyDi has already regisered dependency ${String(name)} by @injectable`);
+            }
+            injectableClasses[name] = value;
+            if (injectToConstructor) {
+                constructorInjections[name] = injectToConstructor;
+            }
+        };
+    }
+    function findInjectableId(injectable) {
+        for (const [id, DependencyClass] of Object.entries(injectableClasses)) {
+            if (DependencyClass === injectable) {
+                return id;
+            }
+        }
+        throw new Error(`Class is not @injectable: ${injectable.name}`);
+    }
+
     const INJECTIONS = Symbol('injections');
     /**
      * This symbol constant defines a property name.
@@ -32,7 +67,11 @@
     const inject = (dependencyId) => {
         return function (_value, context) {
             if ((context === null || context === undefined ? undefined : context.kind) === 'field') {
-                const id = dependencyId ? dependencyId : context.name;
+                const id = dependencyId
+                    ? typeof dependencyId === 'function'
+                        ? findInjectableId(dependencyId)
+                        : dependencyId
+                    : context.name;
                 const injection = {
                     property: context.name,
                     dependencyId: id,
@@ -51,41 +90,6 @@
         };
     };
 
-    const injectableClasses = {};
-    const constructorInjections = {};
-    function injectable(dependencyOrDependencies, autoInjecions) {
-        return function (value, context) {
-            if ((context === null || context === undefined ? undefined : context.kind) !== 'class') {
-                throw new Error('@injectable decorator should decorate classes');
-            }
-            const name = dependencyOrDependencies
-                ? Array.isArray(dependencyOrDependencies)
-                    ? context.name
-                    : dependencyOrDependencies
-                : context.name;
-            const injectToConstructor = dependencyOrDependencies
-                ? Array.isArray(dependencyOrDependencies)
-                    ? dependencyOrDependencies
-                    : autoInjecions
-                : autoInjecions;
-            if (injectableClasses[name]) {
-                throw new Error(`ProxyDi has already regisered dependency ${String(name)} by @injectable`);
-            }
-            injectableClasses[name] = value;
-            if (injectToConstructor) {
-                constructorInjections[name] = injectToConstructor;
-            }
-        };
-    }
-    function findInjectableId(injectable) {
-        for (const [id, DependencyClass] of Object.entries(injectableClasses)) {
-            if (DependencyClass === injectable) {
-                return id;
-            }
-        }
-        throw new Error(`Class is not @injectable: ${injectable.name}`);
-    }
-
     const DEFAULT_SETTINGS = {
         allowRegisterAnything: false,
         allowRewriteDependencies: false,
@@ -194,6 +198,72 @@
         });
     }
 
+    const middlewaresClasses = {};
+    function middleware() {
+        return function (value, context) {
+            if ((context === null || context === undefined ? undefined : context.kind) !== 'class') {
+                throw new Error('@middleware decorator should decorate classes');
+            }
+            const name = context.name;
+            if (middlewaresClasses[name]) {
+                throw new Error(`ProxyDi has already regisered middleware ${String(name)} by @middleware`);
+            }
+            middlewaresClasses[name] = value;
+        };
+    }
+
+    class MiddlewareListener {
+        constructor(parent) {
+            this.parent = parent;
+            this.listeners = {
+                register: [],
+                remove: [],
+            };
+        }
+        add(middleware) {
+            if (isRegistingMiddleware(middleware)) {
+                middleware.onRegister && this.on('register', middleware.onRegister);
+            }
+            if (isRemovingMiddleware(middleware)) {
+                middleware.onRemove && this.on('remove', middleware.onRemove);
+            }
+        }
+        remove(middleware) {
+            if (isRegistingMiddleware(middleware)) {
+                middleware.onRegister &&
+                    this.off('register', middleware.onRegister);
+            }
+            if (isRemovingMiddleware(middleware)) {
+                middleware.onRemove && this.off('remove', middleware.onRemove);
+            }
+        }
+        on(event, listener) {
+            this.listeners[event].push(listener);
+        }
+        onRegister(container, dependencyId, dependency) {
+            var _a;
+            this.listeners.register.forEach((listener) => listener(container, dependencyId, dependency));
+            (_a = this.parent) === null || _a === undefined ? undefined : _a.onRegister(container, dependencyId, dependency);
+        }
+        onRemove(container, dependencyId, dependency) {
+            var _a;
+            this.listeners.remove.forEach((listener) => listener(container, dependencyId, dependency));
+            (_a = this.parent) === null || _a === undefined ? undefined : _a.onRemove(container, dependencyId, dependency);
+        }
+        off(event, listener) {
+            const index = this.listeners[event].indexOf(listener);
+            if (index !== -1) {
+                this.listeners[event].splice(index, 1);
+            }
+        }
+    }
+    function isRegistingMiddleware(middleware) {
+        return middleware.onRegister;
+    }
+    function isRemovingMiddleware(middleware) {
+        return middleware.onRemove;
+    }
+
     /**
      * A dependency injection container
      */
@@ -214,35 +284,55 @@
              */
             this.parentDependencyProxies = {};
             this.id = ProxyDiContainer.idCounter++;
+            this.middlewareListener = new MiddlewareListener(parent === null || parent === undefined ? undefined : parent.middlewareListener);
             if (parent) {
                 this.parent = parent;
                 this.parent.addChild(this);
             }
             this.settings = Object.assign(Object.assign({}, DEFAULT_SETTINGS), settings);
         }
-        register(dependency, dependencyId) {
-            if (this.dependencies[dependencyId]) {
+        register(dependency, dependecyId) {
+            var _a;
+            let id = dependecyId;
+            if (!id) {
+                if (typeof dependency === 'function') {
+                    try {
+                        id = findInjectableId(dependency);
+                    }
+                    catch (_b) {
+                        id = dependency.name;
+                    }
+                }
+            }
+            if (this.dependencies[id]) {
                 if (!this.settings.allowRewriteDependencies) {
-                    throw new Error(`ProxyDi already has dependency for ${String(dependencyId)}`);
+                    throw new Error(`ProxyDi already has dependency for ${String(id)}`);
                 }
             }
-            let dependencyInstance;
+            let instance;
             const isClass = typeof dependency === 'function';
             if (isClass) {
-                dependencyInstance = this.createInstance(dependency, dependencyId);
+                instance = this.createInstance(dependency, id);
             }
             else {
-                dependencyInstance = dependency;
-                if (!(typeof dependencyInstance === 'object') &&
-                    !this.settings.allowRegisterAnything) {
-                    throw new Error(`Can't register as dependency (allowRegisterAnything is off for this contatiner): ${dependencyInstance}`);
-                }
+                instance = dependency;
             }
-            if (typeof dependencyInstance === 'object') {
-                dependencyInstance[PROXYDI_CONTAINER] = this;
+            const isObject = typeof instance === 'object';
+            if (!isObject && !this.settings.allowRegisterAnything) {
+                throw new Error(`Can't register as dependency (allowRegisterAnything is off for this contatiner): ${instance}`);
             }
-            this.registerImpl(dependencyInstance, dependencyId);
-            return dependencyInstance;
+            if (isObject) {
+                instance[PROXYDI_CONTAINER] = this;
+                instance[DEPENDENCY_ID] = id;
+            }
+            this.injectDependenciesTo(instance);
+            this.dependencies[id] = instance;
+            const constructorName = (_a = instance.constructor) === null || _a === undefined ? undefined : _a.name;
+            if (constructorName && middlewaresClasses[constructorName]) {
+                this.middlewareListener.add(instance);
+            }
+            this.middlewareListener.onRegister(this, id, instance);
+            return instance;
         }
         createInstance(Dependency, dependencyId) {
             const paramIds = constructorInjections[dependencyId] || [];
@@ -253,18 +343,6 @@
             }
             return new Dependency(...params);
         }
-        /**
-         * Internal method that implements registeration of dependency and prepare it for injection.
-         * @param dependencyId The unique identifier of the dependency.
-         * @param dependency The dependency instance.
-         */
-        registerImpl(dependency, dependencyId) {
-            this.injectDependenciesTo(dependency);
-            if (typeof dependency === 'object') {
-                dependency[DEPENDENCY_ID] = dependencyId;
-            }
-            this.dependencies[dependencyId] = dependency;
-        }
         /**
          * Checks if a dependency with the given ID is known to the container or its ancestors which means that it can be resolved by this container
          * @param dependencyId The identifier of the dependency.
@@ -278,7 +356,13 @@
         }
         resolve(dependency) {
             if (typeof dependency === 'function') {
-                const id = findInjectableId(dependency);
+                let id;
+                try {
+                    id = findInjectableId(dependency);
+                }
+                catch (_a) {
+                    id = dependency.name;
+                }
                 return this.resolve(id);
             }
             if (!this.isKnown(dependency)) {
@@ -353,11 +437,16 @@
          * @param dependencyOrId The dependency instance or dependency identifier to remove.
          */
         remove(dependencyOrId) {
+            var _a;
             const id = isDependency(dependencyOrId)
                 ? dependencyOrId[DEPENDENCY_ID]
                 : dependencyOrId;
             const dependency = this.dependencies[id];
             if (dependency) {
+                const constructorName = (_a = dependency.constructor) === null || _a === undefined ? undefined : _a.name;
+                if (constructorName && middlewaresClasses[constructorName]) {
+                    this.middlewareListener.remove(dependency);
+                }
                 const dependencyInjects = dependency[INJECTIONS]
                     ? dependency[INJECTIONS]
                     : {};
@@ -366,6 +455,7 @@
                 });
                 delete dependency[DEPENDENCY_ID];
                 delete this.dependencies[id];
+                this.middlewareListener.onRemove(this, id, dependency);
             }
         }
         /**
@@ -481,6 +571,7 @@
     exports.ProxyDiContainer = ProxyDiContainer;
     exports.inject = inject;
     exports.injectable = injectable;
+    exports.middleware = middleware;
     exports.resolveAll = resolveAll;
 
 }));

package/dist/inject.d.ts

@@ -1,4 +1,4 @@
-import { DependencyId } from './types';
+import { DependencyId, DependencyClass } from './types';
 /**
  * Registers an injection for dependency injection.
  *
@@ -7,4 +7,4 @@ import { DependencyId } from './types';
  *
  * The decorated field will receive its dependency from the same container as the injection owner.
  */
-export declare const inject: (dependencyId?: DependencyId) => (_value: unknown, context: ClassFieldDecoratorContext) => void;
+export declare const inject: (dependencyId?: DependencyId | DependencyClass<any>) => (_value: unknown, context: ClassFieldDecoratorContext) => void;

package/dist/middleware/MiddlewareListener.d.ts

@@ -0,0 +1,29 @@
+import { ProxyDiContainer } from '../ProxyDiContainer';
+import { DependencyId } from '../types';
+export interface MiddlewareListenerEvent {
+    register: (container: ProxyDiContainer, dependencyId: DependencyId, dependency: any) => void;
+    remove: (container: ProxyDiContainer, dependencyId: DependencyId, dependency: any) => void;
+}
+/**
+ * Describe the middleware that able to listen to the registering of a dependency in containers hierarchy
+ */
+export interface MiddlewareRegisteringListener {
+    onRegister(container: ProxyDiContainer, dependencyId: DependencyId, dependency: any): void;
+}
+/**
+ * Describe the middleware that able to listen to the removing of a dependency in containers hierarchy
+ */
+export interface MiddlewareRemovingListener {
+    onRemove(container: ProxyDiContainer, dependencyId: DependencyId, dependency: any): void;
+}
+export declare class MiddlewareListener {
+    private parent?;
+    private listeners;
+    constructor(parent?: MiddlewareListener | undefined);
+    add(middleware: any): void;
+    remove(middleware: any): void;
+    private on;
+    onRegister(container: ProxyDiContainer, dependencyId: DependencyId, dependency: any): void;
+    onRemove(container: ProxyDiContainer, dependencyId: DependencyId, dependency: any): void;
+    private off;
+}

package/dist/middleware/middleware.d.ts

@@ -0,0 +1,3 @@
+import { DependencyClass, DependencyId } from '../types';
+export declare const middlewaresClasses: Record<DependencyId, DependencyClass<any>>;
+export declare function middleware(): any;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "proxydi",
-    "version": "0.0.11",
+    "version": "0.0.13",
     "description": "A typed hierarchical DI container that resolves circular dependencies via Proxy",
     "type": "module",
     "main": "./dist/index.cjs",