proxydi 0.0.12 → 0.0.13

package/CHANGELOG.md

@@ -5,6 +5,16 @@ 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.13](https://www.npmjs.com/package/proxydi/v/0.0.13)] - 2025-03-04
+
+### Added
+
+- 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

package/dist/ProxyDiContainer.d.ts

@@ -45,7 +45,7 @@ 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;
     /**

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,
@@ -237,10 +241,10 @@ class MiddlewareListener {
         this.listeners.register.forEach((listener) => listener(container, dependencyId, dependency));
         (_a = this.parent) === null || _a === undefined ? undefined : _a.onRegister(container, dependencyId, dependency);
     }
-    onRemove(container, dependencyId) {
+    onRemove(container, dependencyId, dependency) {
         var _a;
-        this.listeners.remove.forEach((listener) => listener(container, dependencyId));
-        (_a = this.parent) === null || _a === undefined ? undefined : _a.onRemove(container, dependencyId);
+        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);
@@ -283,17 +287,28 @@ class ProxyDiContainer {
         }
         this.settings = Object.assign(Object.assign({}, DEFAULT_SETTINGS), settings);
     }
-    register(dependency, dependencyId) {
+    register(dependency, dependecyId) {
         var _a;
-        if (this.dependencies[dependencyId]) {
+        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 instance;
         const isClass = typeof dependency === 'function';
         if (isClass) {
-            instance = this.createInstance(dependency, dependencyId);
+            instance = this.createInstance(dependency, id);
         }
         else {
             instance = dependency;
@@ -304,15 +319,15 @@ class ProxyDiContainer {
         }
         if (isObject) {
             instance[PROXYDI_CONTAINER] = this;
-            instance[DEPENDENCY_ID] = dependencyId;
+            instance[DEPENDENCY_ID] = id;
         }
         this.injectDependenciesTo(instance);
-        this.dependencies[dependencyId] = 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, dependencyId, instance);
+        this.middlewareListener.onRegister(this, id, instance);
         return instance;
     }
     createInstance(Dependency, dependencyId) {
@@ -337,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)) {
@@ -430,7 +451,7 @@ class ProxyDiContainer {
             });
             delete dependency[DEPENDENCY_ID];
             delete this.dependencies[id];
-            this.middlewareListener.onRemove(this, id);
+            this.middlewareListener.onRemove(this, id, dependency);
         }
     }
     /**

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,
@@ -235,10 +239,10 @@ class MiddlewareListener {
         this.listeners.register.forEach((listener) => listener(container, dependencyId, dependency));
         (_a = this.parent) === null || _a === undefined ? undefined : _a.onRegister(container, dependencyId, dependency);
     }
-    onRemove(container, dependencyId) {
+    onRemove(container, dependencyId, dependency) {
         var _a;
-        this.listeners.remove.forEach((listener) => listener(container, dependencyId));
-        (_a = this.parent) === null || _a === undefined ? undefined : _a.onRemove(container, dependencyId);
+        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);
@@ -281,17 +285,28 @@ class ProxyDiContainer {
         }
         this.settings = Object.assign(Object.assign({}, DEFAULT_SETTINGS), settings);
     }
-    register(dependency, dependencyId) {
+    register(dependency, dependecyId) {
         var _a;
-        if (this.dependencies[dependencyId]) {
+        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 instance;
         const isClass = typeof dependency === 'function';
         if (isClass) {
-            instance = this.createInstance(dependency, dependencyId);
+            instance = this.createInstance(dependency, id);
         }
         else {
             instance = dependency;
@@ -302,15 +317,15 @@ class ProxyDiContainer {
         }
         if (isObject) {
             instance[PROXYDI_CONTAINER] = this;
-            instance[DEPENDENCY_ID] = dependencyId;
+            instance[DEPENDENCY_ID] = id;
         }
         this.injectDependenciesTo(instance);
-        this.dependencies[dependencyId] = 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, dependencyId, instance);
+        this.middlewareListener.onRegister(this, id, instance);
         return instance;
     }
     createInstance(Dependency, dependencyId) {
@@ -335,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)) {
@@ -428,7 +449,7 @@ class ProxyDiContainer {
             });
             delete dependency[DEPENDENCY_ID];
             delete this.dependencies[id];
-            this.middlewareListener.onRemove(this, id);
+            this.middlewareListener.onRemove(this, id, dependency);
         }
     }
     /**

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,
@@ -241,10 +245,10 @@
             this.listeners.register.forEach((listener) => listener(container, dependencyId, dependency));
             (_a = this.parent) === null || _a === undefined ? undefined : _a.onRegister(container, dependencyId, dependency);
         }
-        onRemove(container, dependencyId) {
+        onRemove(container, dependencyId, dependency) {
             var _a;
-            this.listeners.remove.forEach((listener) => listener(container, dependencyId));
-            (_a = this.parent) === null || _a === undefined ? undefined : _a.onRemove(container, dependencyId);
+            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);
@@ -287,17 +291,28 @@
             }
             this.settings = Object.assign(Object.assign({}, DEFAULT_SETTINGS), settings);
         }
-        register(dependency, dependencyId) {
+        register(dependency, dependecyId) {
             var _a;
-            if (this.dependencies[dependencyId]) {
+            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 instance;
             const isClass = typeof dependency === 'function';
             if (isClass) {
-                instance = this.createInstance(dependency, dependencyId);
+                instance = this.createInstance(dependency, id);
             }
             else {
                 instance = dependency;
@@ -308,15 +323,15 @@
             }
             if (isObject) {
                 instance[PROXYDI_CONTAINER] = this;
-                instance[DEPENDENCY_ID] = dependencyId;
+                instance[DEPENDENCY_ID] = id;
             }
             this.injectDependenciesTo(instance);
-            this.dependencies[dependencyId] = 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, dependencyId, instance);
+            this.middlewareListener.onRegister(this, id, instance);
             return instance;
         }
         createInstance(Dependency, dependencyId) {
@@ -341,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)) {
@@ -434,7 +455,7 @@
                 });
                 delete dependency[DEPENDENCY_ID];
                 delete this.dependencies[id];
-                this.middlewareListener.onRemove(this, id);
+                this.middlewareListener.onRemove(this, id, dependency);
             }
         }
         /**

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

@@ -2,7 +2,7 @@ import { ProxyDiContainer } from '../ProxyDiContainer';
 import { DependencyId } from '../types';
 export interface MiddlewareListenerEvent {
     register: (container: ProxyDiContainer, dependencyId: DependencyId, dependency: any) => void;
-    remove: (container: ProxyDiContainer, dependencyId: DependencyId) => 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
@@ -14,7 +14,7 @@ export interface MiddlewareRegisteringListener {
  * Describe the middleware that able to listen to the removing of a dependency in containers hierarchy
  */
 export interface MiddlewareRemovingListener {
-    onRemove(container: ProxyDiContainer, dependencyId: DependencyId): void;
+    onRemove(container: ProxyDiContainer, dependencyId: DependencyId, dependency: any): void;
 }
 export declare class MiddlewareListener {
     private parent?;
@@ -24,6 +24,6 @@ export declare class MiddlewareListener {
     remove(middleware: any): void;
     private on;
     onRegister(container: ProxyDiContainer, dependencyId: DependencyId, dependency: any): void;
-    onRemove(container: ProxyDiContainer, dependencyId: DependencyId): void;
+    onRemove(container: ProxyDiContainer, dependencyId: DependencyId, dependency: any): void;
     private off;
 }

package/package.json

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