ts-ioc-container 43.4.0 → 43.5.2

package/README.md

@@ -861,13 +861,13 @@ import {
   argsFn,
   bindTo,
   Container,
+  IDToken,
   inject,
   MultiCache,
   register,
   Registration as R,
   resolveByArgs,
   singleton,
-  UniqToken,
 } from 'ts-ioc-container';
 
 @register(bindTo('logger'))
@@ -911,8 +911,8 @@ describe('ArgsProvider', function () {
       name: string;
     }
 
-    const IUserRepositoryKey = new UniqToken<IRepository>('IUserRepository');
-    const ITodoRepositoryKey = new UniqToken<IRepository>('ITodoRepository');
+    const IUserRepositoryKey = new IDToken<IRepository>('IUserRepository');
+    const ITodoRepositoryKey = new IDToken<IRepository>('ITodoRepository');
 
     @register(bindTo(IUserRepositoryKey))
     class UserRepository implements IRepository {
@@ -928,7 +928,7 @@ describe('ArgsProvider', function () {
       repository: IRepository;
     }
 
-    const IEntityManagerKey = new UniqToken<IEntityManager>('IEntityManager');
+    const IEntityManagerKey = new IDToken<IEntityManager>('IEntityManager');
 
     @register(bindTo(IEntityManagerKey), argsFn(resolveByArgs))
     class EntityManager {
@@ -957,8 +957,8 @@ describe('ArgsProvider', function () {
       name: string;
     }
 
-    const IUserRepositoryKey = new UniqToken<IRepository>('IUserRepository');
-    const ITodoRepositoryKey = new UniqToken<IRepository>('ITodoRepository');
+    const IUserRepositoryKey = new IDToken<IRepository>('IUserRepository');
+    const ITodoRepositoryKey = new IDToken<IRepository>('ITodoRepository');
 
     @register(bindTo(IUserRepositoryKey))
     class UserRepository implements IRepository {
@@ -974,7 +974,7 @@ describe('ArgsProvider', function () {
       repository: IRepository;
     }
 
-    const IEntityManagerKey = new UniqToken<IEntityManager>('IEntityManager');
+    const IEntityManagerKey = new IDToken<IEntityManager>('IEntityManager');
 
     @register(bindTo(IEntityManagerKey), argsFn(resolveByArgs), singleton(MultiCache.fromFirstArg))
     class EntityManager {
@@ -1130,7 +1130,7 @@ describe('alias', () => {
 
     const container = new Container().addRegistration(R.fromClass(FileLogger));
 
-    expect(container.resolveByAlias('ILogger', { takeFirst: 1 })[0]).toBeInstanceOf(FileLogger);
+    expect(container.resolveOneByAlias('ILogger')).toBeInstanceOf(FileLogger);
     expect(() => container.resolve('logger')).toThrowError(DependencyNotFoundError);
   });
 
@@ -1145,9 +1145,9 @@ describe('alias', () => {
       .addRegistration(R.fromClass(FileLogger))
       .addRegistration(R.fromClass(DbLogger));
 
-    const [result1] = container.resolveByAlias('ILogger', { takeFirst: 1 });
+    const result1 = container.resolveOneByAlias('ILogger');
     const child = container.createScope({ tags: ['child'] });
-    const [result2] = child.resolveByAlias('ILogger', { takeFirst: 1 });
+    const result2 = child.resolveOneByAlias('ILogger');
 
     expect(result1).toBeInstanceOf(FileLogger);
     expect(result2).toBeInstanceOf(DbLogger);
@@ -1536,62 +1536,6 @@ describe('inject property', () => {
 
 ```
 
-## Mock
-Sometimes you need to automatically mock all dependencies in container. This is what `AutoMockedContainer` is for.
-
-```typescript
-import {
-  AutoMockedContainer,
-  Container,
-  type DependencyKey,
-  MethodNotImplementedError,
-  ResolveOneOptions,
-} from 'ts-ioc-container';
-import { type IMock, Mock } from 'moq.ts';
-
-export class MoqContainer extends AutoMockedContainer {
-  private mocks = new Map<DependencyKey, IMock<any>>();
-
-  resolve<T>(key: DependencyKey): T {
-    return this.resolveMock<T>(key).object();
-  }
-
-  resolveOneByAlias<T>(alias: DependencyKey, options?: ResolveOneOptions): T {
-    throw new MethodNotImplementedError('resolveOneByAlias');
-  }
-
-  resolveMock<T>(key: DependencyKey): IMock<T> {
-    if (!this.mocks.has(key)) {
-      this.mocks.set(key, new Mock());
-    }
-    return this.mocks.get(key) as IMock<T>;
-  }
-
-  resolveByAlias<T>(alias: DependencyKey): T[] {
-    throw new Error('Method not implemented.');
-  }
-}
-
-interface IEngine {
-  getRegistrationNumber(): string;
-}
-
-describe('Mocking', () => {
-  it('should auto-mock dependencies', () => {
-    const mockContainer = new MoqContainer();
-    const container = new Container({ parent: mockContainer });
-
-    const engineMock = mockContainer.resolveMock<IEngine>('IEngine');
-    engineMock.setup((i) => i.getRegistrationNumber()).returns('123');
-
-    const engine = container.resolve<IEngine>('IEngine');
-
-    expect(engine.getRegistrationNumber()).toBe('123');
-  });
-});
-
-```
-
 ## Error
 
 - [DependencyNotFoundError.ts](..%2F..%2Flib%2Ferrors%2FDependencyNotFoundError.ts)

package/cjm/container/Container.js

@@ -32,7 +32,7 @@ class Container {
         this.onDisposeHookList.push(...hooks);
         return this;
     }
-    onInstanceCreated(instance) {
+    addInstance(instance) {
         this.instances.add(instance);
         // Execute onConstruct hooks
         for (const onConstruct of this.onConstructHookList) {
@@ -64,9 +64,8 @@ class Container {
             ? provider.resolve(this, { args, lazy })
             : this.parent.resolve(keyOrAlias, { args, child, lazy });
     }
-    resolveByAlias(alias, { args = [], child = this, lazy, excludedKeys = [], takeFirst = -1 } = {}) {
+    resolveByAlias(alias, { args = [], child = this, lazy, excludedKeys = [] } = {}) {
         this.validateContainer();
-        let left = takeFirst;
         const keys = [];
         const deps = [];
         for (const key of this.aliases.getKeysByAlias(alias).filter(utils_1.Filter.exclude(excludedKeys))) {
@@ -76,11 +75,6 @@ class Container {
             }
             keys.push(key);
             deps.push(provider.resolve(this, { args, lazy }));
-            if (left < 0 || left > 0) {
-                left--;
-                continue;
-            }
-            break;
         }
         const parentDeps = this.parent.resolveByAlias(alias, {
             args,
@@ -100,14 +94,12 @@ class Container {
     }
     createScope({ tags = [] } = {}) {
         this.validateContainer();
-        const scope = new Container({
-            injector: this.injector,
-            parent: this,
-            tags,
-        })
+        const scope = new Container({ injector: this.injector, parent: this, tags })
             .addOnConstructHook(...this.onConstructHookList)
             .addOnDisposeHook(...this.onDisposeHookList);
-        scope.applyRegistrationsFrom(this);
+        for (const registration of this.getRegistrations()) {
+            registration.applyTo(scope);
+        }
         this.scopes.add(scope);
         return scope;
     }
@@ -149,14 +141,6 @@ class Container {
             onDispose(this);
         }
     }
-    /**
-     * @private
-     */
-    applyRegistrationsFrom(source) {
-        for (const registration of source.getRegistrations()) {
-            registration.applyTo(this);
-        }
-    }
     validateContainer() {
         if (this.isDisposed) {
             throw new ContainerDisposedError_1.ContainerDisposedError('Container is already disposed');

package/cjm/container/EmptyContainer.js

@@ -7,7 +7,7 @@ class EmptyContainer {
     get isDisposed() {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
-    onInstanceCreated(instance) { }
+    addInstance(instance) { }
     getParent() {
         return undefined;
     }

package/cjm/container/IContainer.js

@@ -1,2 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isDependencyKey = isDependencyKey;
+function isDependencyKey(target) {
+    return typeof target === 'symbol' || typeof target === 'string';
+}

package/cjm/index.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AliasUniqToken = exports.toAlias = exports.AliasToken = exports.InjectionToken = exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.SyncHooksRunner = exports.AsyncHooksRunner = exports.onDispose = exports.onDisposeHooksRunner = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = exports.HookContext = exports.hasHooks = exports.hook = exports.getHooks = exports.UnexpectedHookResultError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.DependencyNotFoundError = exports.Registration = exports.bindTo = exports.register = exports.scope = exports.decorate = exports.MultiCache = exports.multiCache = exports.SingletonProvider = exports.singleton = exports.Provider = exports.resolveByArgs = exports.ProviderDecorator = exports.args = exports.argsFn = exports.lazy = exports.scopeAccess = exports.ProxyInjector = exports.SimpleInjector = exports.MetadataInjector = exports.resolveArgs = exports.inject = exports.AutoMockedContainer = exports.EmptyContainer = exports.Container = void 0;
-exports.Is = exports.select = exports.toToken = exports.InstanceListToken = exports.ConstantToken = exports.FunctionToken = exports.UniqToken = exports.ClassToken = exports.toAliasUniq = void 0;
+exports.AliasUniqToken = exports.toAlias = exports.AliasToken = exports.InjectionToken = exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.SyncHooksRunner = exports.AsyncHooksRunner = exports.onDispose = exports.onDisposeHooksRunner = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = exports.HookContext = exports.hasHooks = exports.hook = exports.getHooks = exports.UnexpectedHookResultError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.DependencyNotFoundError = exports.Registration = exports.bindTo = exports.register = exports.scope = exports.decorate = exports.MultiCache = exports.multiCache = exports.SingletonProvider = exports.singleton = exports.Provider = exports.resolveByArgs = exports.ProviderDecorator = exports.args = exports.argsFn = exports.lazy = exports.scopeAccess = exports.ProxyInjector = exports.SimpleInjector = exports.MetadataInjector = exports.resolveArgs = exports.inject = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.Is = exports.select = exports.toToken = exports.InstanceListToken = exports.ConstantToken = exports.FunctionToken = exports.IDToken = exports.ClassToken = exports.toAliasUniq = 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; } });
-var AutoMockedContainer_1 = require("./container/AutoMockedContainer");
-Object.defineProperty(exports, "AutoMockedContainer", { enumerable: true, get: function () { return AutoMockedContainer_1.AutoMockedContainer; } });
 // Injectors
 var inject_1 = require("./injector/inject");
 Object.defineProperty(exports, "inject", { enumerable: true, get: function () { return inject_1.inject; } });
@@ -92,8 +93,8 @@ Object.defineProperty(exports, "AliasUniqToken", { enumerable: true, get: functi
 Object.defineProperty(exports, "toAliasUniq", { enumerable: true, get: function () { return AliasUniqToken_1.toAliasUniq; } });
 var ClassToken_1 = require("./token/ClassToken");
 Object.defineProperty(exports, "ClassToken", { enumerable: true, get: function () { return ClassToken_1.ClassToken; } });
-var UniqToken_1 = require("./token/UniqToken");
-Object.defineProperty(exports, "UniqToken", { enumerable: true, get: function () { return UniqToken_1.UniqToken; } });
+var IDToken_1 = require("./token/IDToken");
+Object.defineProperty(exports, "IDToken", { enumerable: true, get: function () { return IDToken_1.IDToken; } });
 var FunctionToken_1 = require("./token/FunctionToken");
 Object.defineProperty(exports, "FunctionToken", { enumerable: true, get: function () { return FunctionToken_1.FunctionToken; } });
 var ConstantToken_1 = require("./token/ConstantToken");

package/cjm/injector/IInjector.js

@@ -4,7 +4,7 @@ exports.Injector = void 0;
 class Injector {
     resolve(scope, Target, options) {
         const instance = this.createInstance(scope, Target, options);
-        scope.onInstanceCreated(instance);
+        scope.addInstance(instance);
         return instance;
     }
 }

package/cjm/registration/IRegistration.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.bindTo = exports.register = exports.getTransformers = exports.scope = void 0;
 const metadata_1 = require("../metadata");
 const ProviderPipe_1 = require("../provider/ProviderPipe");
-const UniqToken_1 = require("../token/UniqToken");
+const IDToken_1 = require("../token/IDToken");
 const BindToken_1 = require("../token/BindToken");
 const scope = (...predicates) => (r) => r.when(...predicates);
 exports.scope = scope;
@@ -14,7 +14,7 @@ const register = (...mappers) => (0, metadata_1.setMetadata)(METADATA_KEY, mappe
 exports.register = register;
 const bindTo = (...tokens) => (r) => {
     for (const token of tokens) {
-        const targetToken = (0, BindToken_1.isBindToken)(token) ? token : new UniqToken_1.UniqToken(token);
+        const targetToken = (0, BindToken_1.isBindToken)(token) ? token : new IDToken_1.IDToken(token);
         targetToken.bindTo(r);
     }
     return r;

package/cjm/registration/Registration.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Registration = void 0;
+const IContainer_1 = require("../container/IContainer");
 const utils_1 = require("../utils");
 const Provider_1 = require("../provider/Provider");
 const DependencyMissingKeyError_1 = require("../errors/DependencyMissingKeyError");
 const IRegistration_1 = require("./IRegistration");
 const ProviderPipe_1 = require("../provider/ProviderPipe");
-const UniqToken_1 = require("../token/UniqToken");
+const IDToken_1 = require("../token/IDToken");
 class Registration {
     createProvider;
     key;
@@ -53,8 +54,8 @@ class Registration {
         return this;
     }
     bindTo(key) {
-        if (utils_1.Is.dependencyKey(key)) {
-            new UniqToken_1.UniqToken(key).bindTo(this);
+        if ((0, IContainer_1.isDependencyKey)(key)) {
+            new IDToken_1.IDToken(key).bindTo(this);
             return this;
         }
         key.bindTo(this);

package/cjm/token/{UniqToken.js → IDToken.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UniqToken = void 0;
+exports.IDToken = void 0;
 const InjectionToken_1 = require("./InjectionToken");
-class UniqToken extends InjectionToken_1.InjectionToken {
+class IDToken extends InjectionToken_1.InjectionToken {
     token;
     options;
     constructor(token, options = {}) {
@@ -22,20 +22,20 @@ class UniqToken extends InjectionToken_1.InjectionToken {
     }
     args(...args) {
         const argsFn = this.options.argsFn ?? (0, InjectionToken_1.setArgs)();
-        return new UniqToken(this.token, {
+        return new IDToken(this.token, {
             ...this.options,
             argsFn: (s) => [...argsFn(s), ...args],
         });
     }
     argsFn(getArgsFn) {
         const argsFn = this.options.argsFn ?? (0, InjectionToken_1.setArgs)();
-        return new UniqToken(this.token, {
+        return new IDToken(this.token, {
             ...this.options,
             argsFn: (s) => [...argsFn(s), ...getArgsFn(s)],
         });
     }
     lazy() {
-        return new UniqToken(this.token, { ...this.options, lazy: true });
+        return new IDToken(this.token, { ...this.options, lazy: true });
     }
 }
-exports.UniqToken = UniqToken;
+exports.IDToken = IDToken;

package/cjm/token/toToken.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toToken = void 0;
+const IContainer_1 = require("../container/IContainer");
 const utils_1 = require("../utils");
-const UniqToken_1 = require("./UniqToken");
+const IDToken_1 = require("./IDToken");
 const ClassToken_1 = require("./ClassToken");
 const FunctionToken_1 = require("./FunctionToken");
 const UnsupportedTokenTypeError_1 = require("../errors/UnsupportedTokenTypeError");
@@ -11,8 +12,8 @@ const toToken = (token) => {
     if (token instanceof InjectionToken_1.InjectionToken) {
         return token;
     }
-    if (utils_1.Is.dependencyKey(token)) {
-        return new UniqToken_1.UniqToken(token);
+    if ((0, IContainer_1.isDependencyKey)(token)) {
+        return new IDToken_1.IDToken(token);
     }
     if (utils_1.Is.constructor(token)) {
         return new ClassToken_1.ClassToken(token);

package/cjm/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/cjm/utils.js

@@ -45,5 +45,4 @@ exports.Is = {
     object: (target) => target !== null && typeof target === 'object',
     instance: (target) => Object.prototype.hasOwnProperty.call(target, 'constructor'),
     constructor: (target) => typeof target === 'function' && !!target.prototype,
-    dependencyKey: (target) => ['string', 'symbol'].includes(typeof target),
 };

package/esm/container/Container.js

@@ -29,7 +29,7 @@ export class Container {
         this.onDisposeHookList.push(...hooks);
         return this;
     }
-    onInstanceCreated(instance) {
+    addInstance(instance) {
         this.instances.add(instance);
         // Execute onConstruct hooks
         for (const onConstruct of this.onConstructHookList) {
@@ -61,9 +61,8 @@ export class Container {
             ? provider.resolve(this, { args, lazy })
             : this.parent.resolve(keyOrAlias, { args, child, lazy });
     }
-    resolveByAlias(alias, { args = [], child = this, lazy, excludedKeys = [], takeFirst = -1 } = {}) {
+    resolveByAlias(alias, { args = [], child = this, lazy, excludedKeys = [] } = {}) {
         this.validateContainer();
-        let left = takeFirst;
         const keys = [];
         const deps = [];
         for (const key of this.aliases.getKeysByAlias(alias).filter(F.exclude(excludedKeys))) {
@@ -73,11 +72,6 @@ export class Container {
             }
             keys.push(key);
             deps.push(provider.resolve(this, { args, lazy }));
-            if (left < 0 || left > 0) {
-                left--;
-                continue;
-            }
-            break;
         }
         const parentDeps = this.parent.resolveByAlias(alias, {
             args,
@@ -97,14 +91,12 @@ export class Container {
     }
     createScope({ tags = [] } = {}) {
         this.validateContainer();
-        const scope = new Container({
-            injector: this.injector,
-            parent: this,
-            tags,
-        })
+        const scope = new Container({ injector: this.injector, parent: this, tags })
             .addOnConstructHook(...this.onConstructHookList)
             .addOnDisposeHook(...this.onDisposeHookList);
-        scope.applyRegistrationsFrom(this);
+        for (const registration of this.getRegistrations()) {
+            registration.applyTo(scope);
+        }
         this.scopes.add(scope);
         return scope;
     }
@@ -146,14 +138,6 @@ export class Container {
             onDispose(this);
         }
     }
-    /**
-     * @private
-     */
-    applyRegistrationsFrom(source) {
-        for (const registration of source.getRegistrations()) {
-            registration.applyTo(this);
-        }
-    }
     validateContainer() {
         if (this.isDisposed) {
             throw new ContainerDisposedError('Container is already disposed');

package/esm/container/EmptyContainer.js

@@ -4,7 +4,7 @@ export class EmptyContainer {
     get isDisposed() {
         throw new MethodNotImplementedError();
     }
-    onInstanceCreated(instance) { }
+    addInstance(instance) { }
     getParent() {
         return undefined;
     }

package/esm/container/IContainer.js

@@ -1 +1,3 @@
-export {};
+export function isDependencyKey(target) {
+    return typeof target === 'symbol' || typeof target === 'string';
+}

package/esm/index.js

@@ -1,6 +1,7 @@
+// Containers
+export { isDependencyKey, } from './container/IContainer';
 export { Container } from './container/Container';
 export { EmptyContainer } from './container/EmptyContainer';
-export { AutoMockedContainer } from './container/AutoMockedContainer';
 // Injectors
 export { inject, resolveArgs } from './injector/inject';
 export { MetadataInjector } from './injector/MetadataInjector';
@@ -36,7 +37,7 @@ export { InjectionToken } from './token/InjectionToken';
 export { AliasToken, toAlias } from './token/AliasToken';
 export { AliasUniqToken, toAliasUniq } from './token/AliasUniqToken';
 export { ClassToken } from './token/ClassToken';
-export { UniqToken } from './token/UniqToken';
+export { IDToken } from './token/IDToken';
 export { FunctionToken } from './token/FunctionToken';
 export { ConstantToken } from './token/ConstantToken';
 export { InstanceListToken } from './token/InstanceListToken';

package/esm/injector/IInjector.js

@@ -1,7 +1,7 @@
 export class Injector {
     resolve(scope, Target, options) {
         const instance = this.createInstance(scope, Target, options);
-        scope.onInstanceCreated(instance);
+        scope.addInstance(instance);
         return instance;
     }
 }

package/esm/registration/IRegistration.js

@@ -1,6 +1,6 @@
 import { getMetadata, setMetadata } from '../metadata';
 import { isProviderPipe } from '../provider/ProviderPipe';
-import { UniqToken } from '../token/UniqToken';
+import { IDToken } from '../token/IDToken';
 import { isBindToken } from '../token/BindToken';
 export const scope = (...predicates) => (r) => r.when(...predicates);
 const METADATA_KEY = 'registration';
@@ -8,7 +8,7 @@ export const getTransformers = (Target) => getMetadata(Target, METADATA_KEY) ??
 export const register = (...mappers) => setMetadata(METADATA_KEY, mappers.map((m) => (isProviderPipe(m) ? (r) => m.mapRegistration(r) : m)));
 export const bindTo = (...tokens) => (r) => {
     for (const token of tokens) {
-        const targetToken = isBindToken(token) ? token : new UniqToken(token);
+        const targetToken = isBindToken(token) ? token : new IDToken(token);
         targetToken.bindTo(r);
     }
     return r;

package/esm/registration/Registration.js

@@ -1,9 +1,10 @@
+import { isDependencyKey } from '../container/IContainer';
 import { Is, pipe } from '../utils';
 import { Provider } from '../provider/Provider';
 import { DependencyMissingKeyError } from '../errors/DependencyMissingKeyError';
 import { getTransformers } from './IRegistration';
 import { isProviderPipe } from '../provider/ProviderPipe';
-import { UniqToken } from '../token/UniqToken';
+import { IDToken } from '../token/IDToken';
 export class Registration {
     createProvider;
     key;
@@ -50,8 +51,8 @@ export class Registration {
         return this;
     }
     bindTo(key) {
-        if (Is.dependencyKey(key)) {
-            new UniqToken(key).bindTo(this);
+        if (isDependencyKey(key)) {
+            new IDToken(key).bindTo(this);
             return this;
         }
         key.bindTo(this);

package/esm/token/{UniqToken.js → IDToken.js}

@@ -1,5 +1,5 @@
 import { InjectionToken, setArgs } from './InjectionToken';
-export class UniqToken extends InjectionToken {
+export class IDToken extends InjectionToken {
     token;
     options;
     constructor(token, options = {}) {
@@ -19,19 +19,19 @@ export class UniqToken extends InjectionToken {
     }
     args(...args) {
         const argsFn = this.options.argsFn ?? setArgs();
-        return new UniqToken(this.token, {
+        return new IDToken(this.token, {
             ...this.options,
             argsFn: (s) => [...argsFn(s), ...args],
         });
     }
     argsFn(getArgsFn) {
         const argsFn = this.options.argsFn ?? setArgs();
-        return new UniqToken(this.token, {
+        return new IDToken(this.token, {
             ...this.options,
             argsFn: (s) => [...argsFn(s), ...getArgsFn(s)],
         });
     }
     lazy() {
-        return new UniqToken(this.token, { ...this.options, lazy: true });
+        return new IDToken(this.token, { ...this.options, lazy: true });
     }
 }

package/esm/token/toToken.js

@@ -1,5 +1,6 @@
+import { isDependencyKey } from '../container/IContainer';
 import { Is } from '../utils';
-import { UniqToken } from './UniqToken';
+import { IDToken } from './IDToken';
 import { ClassToken } from './ClassToken';
 import { FunctionToken } from './FunctionToken';
 import { UnsupportedTokenTypeError } from '../errors/UnsupportedTokenTypeError';
@@ -8,8 +9,8 @@ export const toToken = (token) => {
     if (token instanceof InjectionToken) {
         return token;
     }
-    if (Is.dependencyKey(token)) {
-        return new UniqToken(token);
+    if (isDependencyKey(token)) {
+        return new IDToken(token);
     }
     if (Is.constructor(token)) {
         return new ClassToken(token);

package/esm/types.js

@@ -0,0 +1 @@
+export {};

package/esm/utils.js

@@ -37,5 +37,4 @@ export const Is = {
     object: (target) => target !== null && typeof target === 'object',
     instance: (target) => Object.prototype.hasOwnProperty.call(target, 'constructor'),
     constructor: (target) => typeof target === 'function' && !!target.prototype,
-    dependencyKey: (target) => ['string', 'symbol'].includes(typeof target),
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "43.4.0",
+  "version": "43.5.2",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",

package/typings/container/Container.d.ts

@@ -1,10 +1,10 @@
-import { type CreateScopeOptions, type DependencyKey, type IContainer, type IContainerModule, type Instance, type RegisterOptions, ResolveManyOptions, type ResolveOneOptions, type Tag } from './IContainer';
+import { type CreateScopeOptions, type DependencyKey, type IContainer, type IContainerModule, type RegisterOptions, ResolveManyOptions, type ResolveOneOptions, type Tag } from './IContainer';
 import { type IInjector } from '../injector/IInjector';
 import { type IProvider } from '../provider/IProvider';
 import { type IRegistration } from '../registration/IRegistration';
-import { type constructor } from '../utils';
 import { OnConstructHook } from '../hooks/onConstruct';
 import { OnDisposeHook } from '../hooks/onDispose';
+import { constructor, Instance } from '../types';
 export declare class Container implements IContainer {
     isDisposed: boolean;
     private parent;
@@ -24,12 +24,12 @@ export declare class Container implements IContainer {
     });
     addOnConstructHook(...hooks: OnConstructHook[]): this;
     addOnDisposeHook(...hooks: OnDisposeHook[]): this;
-    onInstanceCreated(instance: Instance): void;
+    addInstance(instance: Instance): void;
     register(key: DependencyKey, provider: IProvider, { aliases }?: RegisterOptions): this;
     addRegistration(registration: IRegistration): this;
     getRegistrations(): IRegistration[];
     resolve<T>(keyOrAlias: constructor<T> | DependencyKey, { args, child, lazy }?: ResolveOneOptions): T;
-    resolveByAlias<T>(alias: DependencyKey, { args, child, lazy, excludedKeys, takeFirst }?: ResolveManyOptions): T[];
+    resolveByAlias<T>(alias: DependencyKey, { args, child, lazy, excludedKeys }?: ResolveManyOptions): T[];
     resolveOneByAlias<T>(alias: DependencyKey, { args, child, lazy }?: ResolveOneOptions): T;
     createScope({ tags }?: CreateScopeOptions): IContainer;
     getScopes(): IContainer[];
@@ -39,10 +39,6 @@ export declare class Container implements IContainer {
     getInstances(): Instance<unknown>[];
     hasTag(tag: Tag): boolean;
     dispose(): void;
-    /**
-     * @private
-     */
-    applyRegistrationsFrom(source: Container): void;
     private validateContainer;
     private findProviderByKeyOrFail;
 }

package/typings/container/EmptyContainer.d.ts

@@ -1,10 +1,10 @@
-import { type DependencyKey, type IContainer, type IContainerModule, Instance, type ResolveManyOptions, type ResolveOneOptions, type Tag } from './IContainer';
+import { type DependencyKey, type IContainer, type IContainerModule, type ResolveManyOptions, type ResolveOneOptions, type Tag } from './IContainer';
 import { type IProvider } from '../provider/IProvider';
 import { type IRegistration } from '../registration/IRegistration';
-import { type constructor } from '../utils';
+import { constructor, Instance } from '../types';
 export declare class EmptyContainer implements IContainer {
     get isDisposed(): boolean;
-    onInstanceCreated(instance: Instance): void;
+    addInstance(instance: Instance): void;
     getParent(): undefined;
     getScopes(): never[];
     getInstances(): never[];

package/typings/container/IContainer.d.ts

@@ -1,35 +1,30 @@
 import { type IProvider, ProviderOptions } from '../provider/IProvider';
-import { type constructor } from '../utils';
 import { type IRegistration } from '../registration/IRegistration';
-export type Tag = string;
+import { constructor, Instance } from '../types';
 export type DependencyKey = string | symbol;
+export declare function isDependencyKey(target: unknown): target is DependencyKey;
+export type Tag = string;
+type WithTags = {
+    tags: Tag[];
+};
 type WithChild = {
     child: Tagged;
 };
-export type ResolveOneOptions = ProviderOptions & Partial<WithChild>;
 type WithExcludedKeys = {
     excludedKeys: DependencyKey[];
 };
-type TakeFirst = {
-    takeFirst: number;
-};
-export type ResolveManyOptions = ResolveOneOptions & Partial<WithExcludedKeys> & Partial<TakeFirst>;
+export interface Tagged {
+    hasTag(tag: Tag): boolean;
+}
+export type ResolveOneOptions = ProviderOptions & Partial<WithChild>;
+export type ResolveManyOptions = ResolveOneOptions & Partial<WithExcludedKeys>;
 export interface Resolvable {
     resolve<T>(key: constructor<T> | DependencyKey, options?: ResolveOneOptions): T;
 }
 export interface IContainerModule {
     applyTo(container: IContainer): void;
 }
-export interface Tagged {
-    hasTag(tag: Tag): boolean;
-}
-type WithTags = {
-    tags: Tag[];
-};
 export type CreateScopeOptions = Partial<WithTags>;
-export interface Instance<T = unknown> {
-    new (...args: unknown[]): T;
-}
 export type RegisterOptions = {
     aliases?: DependencyKey[];
 };
@@ -48,6 +43,6 @@ export interface IContainer extends Tagged {
     getParent(): IContainer | undefined;
     getInstances(): Instance[];
     dispose(): void;
-    onInstanceCreated(instance: Instance): void;
+    addInstance(instance: Instance): void;
 }
 export {};

package/typings/hooks/HookContext.d.ts

@@ -1,6 +1,5 @@
 import type { IContainer } from '../container/IContainer';
 import { InjectionToken } from '../token/InjectionToken';
-export type InjectFn<T = unknown> = (s: IContainer) => T;
 export interface IHookContext {
     instance: object;
     scope: IContainer;

package/typings/hooks/hook.d.ts

@@ -1,5 +1,7 @@
 import { type IHookContext } from './HookContext';
-import { type constructor } from '../utils';
+import type { IContainer } from '../container/IContainer';
+import { constructor } from '../types';
+export type InjectFn<T = unknown> = (s: IContainer) => T;
 export type HookFn<T extends IHookContext = IHookContext> = (context: T) => void | Promise<void>;
 export interface HookClass<T extends IHookContext = IHookContext> {
     execute(context: Omit<T, 'scope'>): void | Promise<void>;

package/typings/hooks/injectProp.d.ts

@@ -1,6 +1,5 @@
-import type { InjectFn } from './HookContext';
 import { DependencyKey } from '../container/IContainer';
-import type { constructor } from '../utils';
-import { HookFn } from './hook';
+import { HookFn, InjectFn } from './hook';
 import { InjectionToken } from '../token/InjectionToken';
+import { constructor } from '../types';
 export declare const injectProp: (fn: InjectFn | InjectionToken | DependencyKey | constructor<unknown>) => HookFn;

package/typings/hooks/onConstruct.d.ts

@@ -1,6 +1,7 @@
 import { HookFn } from './hook';
 import { SyncHooksRunner } from './runner/SyncHooksRunner';
-import type { IContainer, Instance } from '../container/IContainer';
+import type { IContainer } from '../container/IContainer';
+import { Instance } from '../types';
 export declare const onConstructHooksRunner: SyncHooksRunner;
 export declare const onConstruct: (fn: HookFn) => (target: object, propertyKey: string | symbol) => void;
 export type OnConstructHook = (instance: Instance, scope: IContainer) => void;

package/typings/index.d.ts

@@ -1,7 +1,6 @@
-export { type IContainer, type Resolvable, type IContainerModule, type DependencyKey, type Tag, type Tagged, type Instance, type ResolveOneOptions, type ResolveManyOptions, } from './container/IContainer';
+export { type IContainer, type Resolvable, type IContainerModule, type DependencyKey, type Tag, type Tagged, type ResolveOneOptions, type ResolveManyOptions, isDependencyKey, } from './container/IContainer';
 export { Container } from './container/Container';
 export { EmptyContainer } from './container/EmptyContainer';
-export { AutoMockedContainer } from './container/AutoMockedContainer';
 export { inject, resolveArgs } from './injector/inject';
 export { type IInjector, type InjectOptions, type IInjectFnResolver } from './injector/IInjector';
 export { MetadataInjector } from './injector/MetadataInjector';
@@ -21,7 +20,7 @@ export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
 export { UnexpectedHookResultError } from './errors/UnexpectedHookResultError';
 export { getHooks, hook, hasHooks, type HookFn, type HookClass } from './hooks/hook';
-export { HookContext, type InjectFn, type IHookContext } from './hooks/HookContext';
+export { HookContext, type IHookContext } from './hooks/HookContext';
 export { injectProp } from './hooks/injectProp';
 export { onConstructHooksRunner, onConstruct } from './hooks/onConstruct';
 export { onDisposeHooksRunner, onDispose } from './hooks/onDispose';
@@ -33,10 +32,13 @@ export { InjectionToken } from './token/InjectionToken';
 export { AliasToken, toAlias } from './token/AliasToken';
 export { AliasUniqToken, toAliasUniq } from './token/AliasUniqToken';
 export { ClassToken } from './token/ClassToken';
-export { UniqToken } from './token/UniqToken';
+export { IDToken } from './token/IDToken';
 export { FunctionToken } from './token/FunctionToken';
 export { ConstantToken } from './token/ConstantToken';
 export { type InstancePredicate, InstanceListToken } from './token/InstanceListToken';
 export { toToken } from './token/toToken';
 export { select } from './select';
-export { type constructor, Is } from './utils';
+export { Is } from './utils';
+export { InjectFn } from './hooks/hook';
+export { Instance } from './types';
+export { constructor } from './types';

package/typings/injector/IInjector.d.ts

@@ -1,5 +1,5 @@
-import { type constructor } from '../utils';
 import { type IContainer, ResolveOneOptions } from '../container/IContainer';
+import { constructor } from '../types';
 type WithArgs = {
     args: unknown[];
 };

package/typings/injector/MetadataInjector.d.ts

@@ -1,6 +1,6 @@
 import { IInjector, InjectOptions, Injector } from './IInjector';
 import type { IContainer } from '../container/IContainer';
-import type { constructor } from '../utils';
+import { constructor } from '../types';
 export declare class MetadataInjector extends Injector implements IInjector {
     protected createInstance<T>(scope: IContainer, Target: constructor<T>, { args: deps }?: InjectOptions): T;
 }

package/typings/injector/ProxyInjector.d.ts

@@ -1,6 +1,6 @@
 import { IInjector, InjectOptions, Injector } from './IInjector';
 import type { IContainer } from '../container/IContainer';
-import type { constructor } from '../utils';
+import { constructor } from '../types';
 export declare class ProxyInjector extends Injector implements IInjector {
     protected createInstance<T>(scope: IContainer, Target: constructor<T>, { args: deps }?: InjectOptions): T;
 }

package/typings/injector/SimpleInjector.d.ts

@@ -1,6 +1,6 @@
 import { IInjector, InjectOptions, Injector } from './IInjector';
 import type { IContainer } from '../container/IContainer';
-import { constructor } from '../utils';
+import { constructor } from '../types';
 export declare class SimpleInjector extends Injector implements IInjector {
     protected createInstance<T>(container: IContainer, Target: constructor<T>, { args }?: InjectOptions): T;
 }

package/typings/injector/inject.d.ts

@@ -1,6 +1,6 @@
-import { type constructor } from '../utils';
 import { type IContainer } from '../container/IContainer';
-import { type InjectFn } from '../hooks/HookContext';
 import { InjectionToken } from '../token/InjectionToken';
+import { InjectFn } from '../hooks/hook';
+import { constructor } from '../types';
 export declare const inject: <T>(fn: InjectionToken<T> | InjectFn<T> | symbol | string | constructor<T>) => ParameterDecorator;
 export declare const resolveArgs: (Target: constructor<unknown>, methodName?: string) => (scope: IContainer, ...deps: unknown[]) => unknown[];

package/typings/metadata.d.ts

@@ -1,4 +1,4 @@
-import type { constructor } from './utils';
+import { constructor } from './types';
 export declare const setMetadata: <T>(key: string | symbol, value: T) => ClassDecorator;
 export declare function getMetadata<T>(target: object, key: string | symbol): T | undefined;
 export declare const setParameterMetadata: (key: string | symbol, value: unknown) => ParameterDecorator;

package/typings/provider/IProvider.d.ts

@@ -1,7 +1,7 @@
 import { IContainer, Tagged } from '../container/IContainer';
-import { MapFn } from '../utils';
 import { ProviderPipe } from './ProviderPipe';
 import { InjectOptions } from '../injector/IInjector';
+import { MapFn } from '../types';
 export type WithLazy = {
     lazy: boolean;
 };

package/typings/provider/Provider.d.ts

@@ -1,7 +1,7 @@
 import { ArgsFn, IProvider, ProviderOptions, ResolveDependency, ScopeAccessFn, ScopeAccessOptions } from './IProvider';
 import type { DependencyKey, IContainer } from '../container/IContainer';
-import { constructor, MapFn } from '../utils';
 import type { ProviderPipe } from './ProviderPipe';
+import { constructor, MapFn } from '../types';
 export declare class Provider<T = any> implements IProvider<T> {
     private readonly resolveDependency;
     static fromClass<T>(Target: constructor<T>): IProvider<T>;

package/typings/registration/IRegistration.d.ts

@@ -1,8 +1,8 @@
 import type { DependencyKey, IContainer, IContainerModule } from '../container/IContainer';
-import { constructor, MapFn } from '../utils';
 import type { IProvider } from '../provider/IProvider';
 import { ProviderPipe } from '../provider/ProviderPipe';
 import { BindToken } from '../token/BindToken';
+import { constructor, MapFn } from '../types';
 export type ScopePredicate = (s: IContainer, prev?: boolean) => boolean;
 export interface IRegistration<T = any> extends IContainerModule {
     when(...predicates: ScopePredicate[]): this;

package/typings/registration/Registration.d.ts

@@ -1,9 +1,9 @@
-import type { DependencyKey, IContainer } from '../container/IContainer';
-import { constructor, MapFn } from '../utils';
+import { DependencyKey, IContainer } from '../container/IContainer';
 import type { IProvider, ResolveDependency } from '../provider/IProvider';
 import type { IRegistration, ScopePredicate } from './IRegistration';
 import type { ProviderPipe } from '../provider/ProviderPipe';
 import { BindToken } from '../token/BindToken';
+import { constructor, MapFn } from '../types';
 export declare class Registration<T = any> implements IRegistration<T> {
     private createProvider;
     private key?;

package/typings/select.d.ts

@@ -3,7 +3,7 @@ import { FunctionToken } from './token/FunctionToken';
 import { InstanceListToken, InstancePredicate } from './token/InstanceListToken';
 export declare const select: {
     alias: (token: import("./container/IContainer").DependencyKey) => import("./token/AliasToken").AliasToken<any>;
-    token: <T = any>(token: import(".").InjectFn<T> | import(".").InjectionToken<T> | import("./container/IContainer").DependencyKey | import("./utils").constructor<T>) => import(".").InjectionToken<T>;
+    token: <T = any>(token: import(".").InjectFn<T> | import(".").InjectionToken<T> | import("./container/IContainer").DependencyKey | import("./types").constructor<T>) => import(".").InjectionToken<T>;
     instances: (predicate?: InstancePredicate) => InstanceListToken;
     scope: {
         current: FunctionToken<IContainer>;

package/typings/token/ClassToken.d.ts

@@ -1,6 +1,6 @@
 import type { IContainer } from '../container/IContainer';
 import { InjectionToken, TokenOptions } from './InjectionToken';
-import { constructor } from '../utils';
+import { constructor } from '../types';
 export declare class ClassToken<T = any> extends InjectionToken<T> {
     private readonly token;
     private options;

package/typings/token/FunctionToken.d.ts

@@ -1,6 +1,6 @@
-import type { InjectFn } from '../hooks/HookContext';
 import type { IContainer } from '../container/IContainer';
 import { InjectionToken } from './InjectionToken';
+import { InjectFn } from '../hooks/hook';
 export declare class FunctionToken<T = any> extends InjectionToken<T> {
     private readonly fn;
     constructor(fn: InjectFn<T>);

package/typings/token/{UniqToken.d.ts → IDToken.d.ts}

@@ -1,13 +1,13 @@
 import type { IContainer } from '../container/IContainer';
 import { InjectionToken, TokenOptions } from './InjectionToken';
 import { IRegistration } from '../registration/IRegistration';
-export declare class UniqToken<T = any> extends InjectionToken {
+export declare class IDToken<T = any> extends InjectionToken {
     token: string | symbol;
     private options;
     constructor(token: string | symbol, options?: TokenOptions);
     resolve(s: IContainer): T;
     bindTo(r: IRegistration<T>): void;
-    args(...args: unknown[]): UniqToken<T>;
-    argsFn(getArgsFn: (s: IContainer) => unknown[]): UniqToken<T>;
-    lazy(): UniqToken<T>;
+    args(...args: unknown[]): IDToken<T>;
+    argsFn(getArgsFn: (s: IContainer) => unknown[]): IDToken<T>;
+    lazy(): IDToken<T>;
 }

package/typings/token/InstanceListToken.d.ts

@@ -1,5 +1,6 @@
 import { InjectionToken } from './InjectionToken';
-import type { IContainer, Instance } from '../container/IContainer';
+import type { IContainer } from '../container/IContainer';
+import { Instance } from '../types';
 export type InstancePredicate = (dep: unknown) => boolean;
 export declare class InstanceListToken extends InjectionToken<Instance[]> {
     private predicate;

package/typings/token/toToken.d.ts

@@ -1,5 +1,5 @@
-import type { InjectFn } from '../hooks/HookContext';
 import { DependencyKey } from '../container/IContainer';
-import { constructor } from '../utils';
 import { InjectionToken } from './InjectionToken';
+import { InjectFn } from '../hooks/hook';
+import { constructor } from '../types';
 export declare const toToken: <T = any>(token: InjectFn<T> | InjectionToken<T> | DependencyKey | constructor<T>) => InjectionToken<T>;

package/typings/types.d.ts

@@ -0,0 +1,8 @@
+export type constructor<T> = new (...args: any[]) => T;
+export interface InstanceOfClass<T = unknown> {
+    new (...args: unknown[]): T;
+}
+export interface Instance<T = unknown> {
+    new (...args: unknown[]): T;
+}
+export type MapFn<T> = (value: T) => T;

package/typings/utils.d.ts

@@ -1,9 +1,4 @@
-import { DependencyKey } from './container/IContainer';
-export type constructor<T> = new (...args: any[]) => T;
-export interface InstanceOfClass<T = unknown> {
-    new (...args: unknown[]): T;
-}
-export type MapFn<T> = (value: T) => T;
+import { constructor, InstanceOfClass, MapFn } from './types';
 export declare const pipe: <T>(...mappers: MapFn<T>[]) => MapFn<T>;
 export declare function fillEmptyIndexes<T>(baseArr: (T | undefined)[], insertArr: T[]): T[];
 export declare function lazyProxy<T>(resolveInstance: () => T): T;
@@ -17,5 +12,4 @@ export declare const Is: {
     object: (target: unknown) => target is object;
     instance: (target: unknown) => target is InstanceOfClass;
     constructor: (target: unknown) => target is constructor<unknown>;
-    dependencyKey: (target: unknown) => target is DependencyKey;
 };

package/cjm/container/AutoMockedContainer.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AutoMockedContainer = void 0;
-const MethodNotImplementedError_1 = require("../errors/MethodNotImplementedError");
-class AutoMockedContainer {
-    isDisposed = false;
-    onInstanceCreated(instance) { }
-    createScope() {
-        throw new MethodNotImplementedError_1.MethodNotImplementedError();
-    }
-    dispose() { }
-    register() {
-        return this;
-    }
-    getParent() {
-        return undefined;
-    }
-    getScopes() {
-        return [];
-    }
-    getInstances() {
-        return [];
-    }
-    hasTag(tag) {
-        return false;
-    }
-    removeScope() { }
-    useModule() {
-        return this;
-    }
-    getRegistrations() {
-        return [];
-    }
-    addRegistration(registration) {
-        return this;
-    }
-}
-exports.AutoMockedContainer = AutoMockedContainer;

package/esm/container/AutoMockedContainer.js

@@ -1,34 +0,0 @@
-import { MethodNotImplementedError } from '../errors/MethodNotImplementedError';
-export class AutoMockedContainer {
-    isDisposed = false;
-    onInstanceCreated(instance) { }
-    createScope() {
-        throw new MethodNotImplementedError();
-    }
-    dispose() { }
-    register() {
-        return this;
-    }
-    getParent() {
-        return undefined;
-    }
-    getScopes() {
-        return [];
-    }
-    getInstances() {
-        return [];
-    }
-    hasTag(tag) {
-        return false;
-    }
-    removeScope() { }
-    useModule() {
-        return this;
-    }
-    getRegistrations() {
-        return [];
-    }
-    addRegistration(registration) {
-        return this;
-    }
-}

package/typings/container/AutoMockedContainer.d.ts

@@ -1,21 +0,0 @@
-import { type DependencyKey, type IContainer, type Instance, type ResolveManyOptions, ResolveOneOptions, type Tag } from './IContainer';
-import { type IRegistration } from '../registration/IRegistration';
-import { type constructor } from '../utils';
-export declare abstract class AutoMockedContainer implements IContainer {
-    isDisposed: boolean;
-    onInstanceCreated(instance: Instance): void;
-    createScope(): IContainer;
-    dispose(): void;
-    register(): this;
-    getParent(): undefined;
-    getScopes(): never[];
-    getInstances(): Instance[];
-    hasTag(tag: Tag): boolean;
-    removeScope(): void;
-    useModule(): this;
-    getRegistrations(): never[];
-    addRegistration(registration: IRegistration): this;
-    abstract resolveByAlias<T>(alias: DependencyKey, options?: ResolveManyOptions): T[];
-    abstract resolve<T>(alias: constructor<T> | DependencyKey, options?: ResolveManyOptions): T;
-    abstract resolveOneByAlias<T>(alias: DependencyKey, options?: ResolveOneOptions): T;
-}