ts-ioc-container 29.2.0 → 30.0.0

package/README.md

@@ -141,11 +141,12 @@ import {
   MetadataInjector,
   Registration as R,
   by,
-  tags,
+  scope,
+  register,
 } from 'ts-ioc-container';
 
-@key('ILogger')
-@provider(singleton(), tags((s) => s.hasTag('child')))
+@register(key('ILogger'))
+@provider(singleton(), scope((s) => s.hasTag('child')))
 class Logger {}
 
 describe('Scopes', function () {
@@ -180,10 +181,10 @@ Sometimes you want to get all instances from container and its scopes. For examp
 
 ```typescript
 import 'reflect-metadata';
-import { inject, key, Registration as R, Container, MetadataInjector, by } from 'ts-ioc-container';
+import { inject, key, Registration as R, Container, MetadataInjector, by, register } from 'ts-ioc-container';
 
 describe('Instances', function () {
-  @key('ILogger')
+  @register(key('ILogger'))
   class Logger {}
 
   it('should return injected instances', () => {
@@ -403,15 +404,15 @@ Sometimes you need to keep dependency key with class together. For example, you
 
 ```typescript
 import 'reflect-metadata';
-import { singleton, Container, provider, MetadataInjector, Registration as R, key, tags } from 'ts-ioc-container';
+import { singleton, Container, provider, MetadataInjector, Registration as R, key, scope, register } from 'ts-ioc-container';
 import { DependencyMissingKeyError } from '../../lib/errors/DependencyMissingKeyError';
 
 describe('Registration module', function () {
   const createContainer = () => new Container(new MetadataInjector(), { tags: ['root'] });
 
   it('should register class', function () {
-    @key('ILogger')
-    @provider(singleton(), tags((s) => s.hasTag('root')))
+    @register(key('ILogger'))
+    @provider(singleton(), scope((s) => s.hasTag('root')))
     class Logger {}
 
     const root = createContainer().use(R.fromClass(Logger));
@@ -452,7 +453,7 @@ describe('Registration module', function () {
 
 ```typescript
 import 'reflect-metadata';
-import { singleton, Container, Provider, MetadataInjector, tags } from 'ts-ioc-container';
+import { singleton, Container, Provider, MetadataInjector, scope } from 'ts-ioc-container';
 
 class Logger {}
 
@@ -480,7 +481,7 @@ describe('Provider', function () {
       'ILogger',
       Provider.fromClass(Logger).pipe(
         singleton(),
-        tags((s) => s.hasTag('root')),
+        scope((s) => s.hasTag('root')),
       ),
     );
 
@@ -498,9 +499,9 @@ Sometimes you need to create only one instance of dependency per scope. For exam
 
 ```typescript
 import 'reflect-metadata';
-import { singleton, Container, key, provider, MetadataInjector, Registration as R } from 'ts-ioc-container';
+import { singleton, Container, key, provider, MetadataInjector, Registration as R, register } from 'ts-ioc-container';
 
-@key('logger')
+@register(key('logger'))
 @provider(singleton())
 class Logger {}
 
@@ -538,10 +539,10 @@ Sometimes you need to resolve provider only from scope which matches to certain
 
 ```typescript
 import 'reflect-metadata';
-import { singleton, Container, key, provider, MetadataInjector, Registration as R, tags } from 'ts-ioc-container';
+import { singleton, Container, key, provider, MetadataInjector, Registration as R, scope, register } from 'ts-ioc-container';
 
-@key('ILogger')
-@provider(singleton(), tags((s) => s.hasTag('root'))) // the same as .pipe(singleton(), scope((s) => s.hasTag('root')))
+@register(key('ILogger'))
+@provider(singleton(), scope((s) => s.hasTag('root'))) // the same as .pipe(singleton(), scope((s) => s.hasTag('root')))
 class Logger {}
 describe('ScopeProvider', function () {
   it('should return the same instance', function () {
@@ -559,9 +560,9 @@ Sometimes you want to bind some arguments to provider. This is what `ArgsProvide
 
 ```typescript
 import 'reflect-metadata';
-import { Container, key, argsFn, args, MetadataInjector, Registration as R } from 'ts-ioc-container';
+import { Container, key, argsFn, args, MetadataInjector, Registration as R, register } from 'ts-ioc-container';
 
-@key('logger')
+@register(key('logger'))
 class Logger {
   constructor(
     public name: string,
@@ -608,11 +609,11 @@ Sometimes you want to register the same provider with different keys. This is wh
 
 ```typescript
 import 'reflect-metadata';
-import { alias, by, Container, inject, provider, MetadataInjector, Registration as R } from 'ts-ioc-container';
+import { by, Container, inject, MetadataInjector, Registration as R, register, alias } from 'ts-ioc-container';
 
 describe('alias', () => {
   const IMiddlewareKey = 'IMiddleware';
-  const middleware = provider(alias(IMiddlewareKey));
+  const middleware = register(alias(IMiddlewareKey));
 
   interface IMiddleware {
     applyTo(application: IApplication): void;
@@ -640,7 +641,7 @@ describe('alias', () => {
   it('should resolve by some alias', () => {
     class App implements IApplication {
       private appliedMiddleware: Set<string> = new Set();
-      constructor(@inject(by.aliases((d) => d.hasAlias(IMiddlewareKey))) public middleware: IMiddleware[]) {}
+      constructor(@inject(by.aliases((it) => it.includes(IMiddlewareKey))) public middleware: IMiddleware[]) {}
 
       markMiddlewareAsApplied(name: string): void {
         this.appliedMiddleware.add(name);
@@ -680,12 +681,12 @@ Sometimes you want to encapsulate registration logic in separate module. This is
 
 ```typescript
 import 'reflect-metadata';
-import { IContainerModule, Registration as R, IContainer, key, Container, MetadataInjector } from 'ts-ioc-container';
+import { IContainerModule, Registration as R, IContainer, key, Container, MetadataInjector, register } from 'ts-ioc-container';
 
-@key('ILogger')
+@register(key('ILogger'))
 class Logger {}
 
-@key('ILogger')
+@register(key('ILogger'))
 class TestLogger {}
 
 class Production implements IContainerModule {
@@ -736,6 +737,7 @@ import {
   IInjector,
   MetadataInjector,
   Registration as R,
+  register,
 } from 'ts-ioc-container';
 
 class MyInjector implements IInjector {
@@ -752,7 +754,7 @@ class MyInjector implements IInjector {
   }
 }
 
-@key('logger')
+@register(key('logger'))
 class Logger {
   isReady = false;
 
@@ -792,9 +794,10 @@ import {
   provider,
   Registration as R,
   MetadataInjector,
+  register,
 } from 'ts-ioc-container';
 
-@key('logsRepo')
+@register(key('logsRepo'))
 @provider(singleton())
 class LogsRepo {
   savedLogs: string[] = [];
@@ -804,7 +807,7 @@ class LogsRepo {
   }
 }
 
-@key('logger')
+@register(key('logger'))
 class Logger {
   private messages: string[] = [];
 

package/cjm/by.js

@@ -1,10 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.by = exports.all = void 0;
+exports.by = exports.resolveSilently = exports.isPresent = exports.all = void 0;
+const DependencyNotFoundError_1 = require("./errors/DependencyNotFoundError");
 const all = () => true;
 exports.all = all;
+const isPresent = (value) => value !== null && value !== undefined;
+exports.isPresent = isPresent;
+const resolveSilently = (c, ...args) => (key) => {
+    try {
+        return c.resolve(key, ...args);
+    }
+    catch (e) {
+        if (e instanceof DependencyNotFoundError_1.DependencyNotFoundError) {
+            return undefined;
+        }
+        throw e;
+    }
+};
+exports.resolveSilently = resolveSilently;
 exports.by = {
-    aliases: (predicate) => (c, ...args) => c.getTokensByProvider(predicate).map((t) => c.resolve(t, ...args)),
+    aliases: (predicate) => (c, ...args) => c
+        .getKeysByAlias(predicate)
+        .map((0, exports.resolveSilently)(c, ...args))
+        .filter(exports.isPresent),
     /**
      * Get all instances that match the given keys
      * @param keys

package/cjm/container/AutoMockedContainer.js

@@ -3,15 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AutoMockedContainer = void 0;
 const index_1 = require("../index");
 class AutoMockedContainer {
-    constructor() {
-        this.tags = [];
+    getKeysByAlias(alias) {
+        return [];
     }
     hasDependency(key) {
         return false;
     }
-    getTokensByProvider() {
-        return [];
-    }
     createScope() {
         throw new index_1.MethodNotImplementedError();
     }

package/cjm/container/Container.js

@@ -6,18 +6,21 @@ const EmptyContainer_1 = require("./EmptyContainer");
 const ContainerDisposedError_1 = require("../errors/ContainerDisposedError");
 class Container {
     constructor(injector, options = {}) {
-        var _a, _b;
         this.injector = injector;
         this.providers = new Map();
+        this.aliases = new Map();
         this.isDisposed = false;
         this.scopes = new Set();
         this.instances = new Set();
-        this.parent = (_a = options.parent) !== null && _a !== void 0 ? _a : new EmptyContainer_1.EmptyContainer();
-        this.tags = new Set((_b = options.tags) !== null && _b !== void 0 ? _b : []);
+        this.parent = options.parent ?? new EmptyContainer_1.EmptyContainer();
+        this.tags = new Set(options.tags ?? []);
     }
-    register(key, provider) {
+    register(key, provider, aliases) {
         this.validateContainer();
         this.providers.set(key, provider);
+        if (aliases && aliases.length > 0) {
+            this.aliases.set(key, aliases);
+        }
         return this;
     }
     resolve(token, ...args) {
@@ -28,16 +31,7 @@ class Container {
             return instance;
         }
         const provider = this.providers.get(token);
-        return (provider === null || provider === void 0 ? void 0 : provider.isValid(this)) ? provider.resolve(this, ...args) : this.parent.resolve(token, ...args);
-    }
-    getTokensByProvider(predicate) {
-        const keys = new Set(this.parent.getTokensByProvider(predicate));
-        for (const [key, provider] of this.providers) {
-            if (predicate(provider)) {
-                keys.add(key);
-            }
-        }
-        return Array.from(keys);
+        return provider?.isValid(this) ? provider.resolve(this, ...args) : this.parent.resolve(token, ...args);
     }
     createScope(...tags) {
         this.validateContainer();
@@ -74,8 +68,16 @@ class Container {
         return this;
     }
     hasDependency(key) {
-        var _a;
-        return (_a = this.providers.has(key)) !== null && _a !== void 0 ? _a : this.parent.hasDependency(key);
+        return this.providers.has(key) ?? this.parent.hasDependency(key);
+    }
+    getKeysByAlias(predicate) {
+        const result = new Set(this.parent.getKeysByAlias(predicate));
+        for (const [key, aliases] of this.aliases.entries()) {
+            if (predicate(aliases)) {
+                result.add(key);
+            }
+        }
+        return Array.from(result);
     }
     /**
      * @private

package/cjm/container/EmptyContainer.js

@@ -4,15 +4,12 @@ exports.EmptyContainer = void 0;
 const MethodNotImplementedError_1 = require("../errors/MethodNotImplementedError");
 const DependencyNotFoundError_1 = require("../errors/DependencyNotFoundError");
 class EmptyContainer {
-    constructor() {
-        this.tags = [];
+    getKeysByAlias(alias) {
+        return [];
     }
     hasDependency(key) {
         return false;
     }
-    getTokensByProvider() {
-        return [];
-    }
     hasTag() {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }

package/cjm/index.js

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.by = exports.hook = exports.getHooks = exports.ProxyInjector = exports.SimpleInjector = exports.inject = exports.MetadataInjector = exports.Registration = exports.key = exports.AutoMockedContainer = exports.ScopeProvider = exports.tags = exports.SingletonProvider = exports.singleton = exports.ArgsProvider = exports.args = exports.argsFn = exports.provider = exports.Provider = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.alias = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.by = exports.hook = exports.getHooks = exports.ProxyInjector = exports.SimpleInjector = exports.inject = exports.MetadataInjector = exports.alias = exports.register = exports.Registration = exports.key = exports.AutoMockedContainer = exports.ScopeProvider = exports.scope = exports.SingletonProvider = exports.singleton = exports.ArgsProvider = exports.args = exports.argsFn = exports.provider = exports.Provider = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
 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 IProvider_1 = require("./provider/IProvider");
-Object.defineProperty(exports, "alias", { enumerable: true, get: function () { return IProvider_1.alias; } });
 var DependencyNotFoundError_1 = require("./errors/DependencyNotFoundError");
 Object.defineProperty(exports, "DependencyNotFoundError", { enumerable: true, get: function () { return DependencyNotFoundError_1.DependencyNotFoundError; } });
 var MethodNotImplementedError_1 = require("./errors/MethodNotImplementedError");
@@ -26,13 +24,15 @@ var SingletonProvider_1 = require("./provider/SingletonProvider");
 Object.defineProperty(exports, "singleton", { enumerable: true, get: function () { return SingletonProvider_1.singleton; } });
 Object.defineProperty(exports, "SingletonProvider", { enumerable: true, get: function () { return SingletonProvider_1.SingletonProvider; } });
 var ScopeProvider_1 = require("./provider/ScopeProvider");
-Object.defineProperty(exports, "tags", { enumerable: true, get: function () { return ScopeProvider_1.tags; } });
+Object.defineProperty(exports, "scope", { enumerable: true, get: function () { return ScopeProvider_1.scope; } });
 Object.defineProperty(exports, "ScopeProvider", { enumerable: true, get: function () { return ScopeProvider_1.ScopeProvider; } });
 var AutoMockedContainer_1 = require("./container/AutoMockedContainer");
 Object.defineProperty(exports, "AutoMockedContainer", { enumerable: true, get: function () { return AutoMockedContainer_1.AutoMockedContainer; } });
 var Registration_1 = require("./provider/Registration");
 Object.defineProperty(exports, "key", { enumerable: true, get: function () { return Registration_1.key; } });
 Object.defineProperty(exports, "Registration", { enumerable: true, get: function () { return Registration_1.Registration; } });
+Object.defineProperty(exports, "register", { enumerable: true, get: function () { return Registration_1.register; } });
+Object.defineProperty(exports, "alias", { enumerable: true, get: function () { return Registration_1.alias; } });
 var MetadataInjector_1 = require("./injector/MetadataInjector");
 Object.defineProperty(exports, "MetadataInjector", { enumerable: true, get: function () { return MetadataInjector_1.MetadataInjector; } });
 Object.defineProperty(exports, "inject", { enumerable: true, get: function () { return MetadataInjector_1.inject; } });

package/cjm/injector/ProxyInjector.js

@@ -9,7 +9,7 @@ function getProp(target, key) {
 class ProxyInjector {
     // eslint-disable-next-line @typescript-eslint/ban-types
     resolve(container, Target, ...deps) {
-        const args = deps.reduce((acc, it) => (Object.assign(Object.assign({}, acc), it)), {});
+        const args = deps.reduce((acc, it) => ({ ...acc, ...it }), {});
         const proxy = new Proxy({}, {
             // eslint-disable-next-line @typescript-eslint/ban-types
             get(target, prop) {

package/cjm/metadata.js

@@ -11,14 +11,12 @@ function getMetadata(target, key) {
 }
 exports.getMetadata = getMetadata;
 const setParameterMetadata = (key, value) => (target, propertyKey, parameterIndex) => {
-    var _a;
-    const metadata = (_a = Reflect.getOwnMetadata(key, target)) !== null && _a !== void 0 ? _a : [];
+    const metadata = Reflect.getOwnMetadata(key, target) ?? [];
     metadata[parameterIndex] = value;
     Reflect.defineMetadata(key, metadata, target);
 };
 exports.setParameterMetadata = setParameterMetadata;
 const getParameterMetadata = (key, target) => {
-    var _a;
-    return (_a = Reflect.getOwnMetadata(key, target)) !== null && _a !== void 0 ? _a : [];
+    return Reflect.getOwnMetadata(key, target) ?? [];
 };
 exports.getParameterMetadata = getParameterMetadata;

package/cjm/provider/IProvider.js

@@ -1,7 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.alias = void 0;
-function alias(...tokens) {
-    return (provider) => provider.addAliases(...tokens);
-}
-exports.alias = alias;

package/cjm/provider/Provider.js

@@ -8,8 +8,7 @@ const provider = (...mappers) => (0, metadata_1.setMetadata)(PROVIDER_KEY, mappe
 exports.provider = provider;
 class Provider {
     static fromClass(Target) {
-        var _a;
-        const mappers = (_a = (0, metadata_1.getMetadata)(Target, PROVIDER_KEY)) !== null && _a !== void 0 ? _a : [];
+        const mappers = (0, metadata_1.getMetadata)(Target, PROVIDER_KEY) ?? [];
         return new Provider((container, ...args) => container.resolve(Target, ...args)).pipe(...mappers);
     }
     static fromValue(value) {
@@ -17,20 +16,10 @@ class Provider {
     }
     constructor(resolveDependency) {
         this.resolveDependency = resolveDependency;
-        this.aliases = new Set();
     }
     pipe(...mappers) {
         return (0, utils_1.pipe)(...mappers)(this);
     }
-    addAliases(...aliases) {
-        for (const alias of aliases) {
-            this.aliases.add(alias);
-        }
-        return this;
-    }
-    hasAlias(alias) {
-        return this.aliases.has(alias);
-    }
     clone() {
         return new Provider(this.resolveDependency);
     }

package/cjm/provider/ProviderDecorator.js

@@ -6,13 +6,6 @@ class ProviderDecorator {
     constructor(decorated) {
         this.decorated = decorated;
     }
-    addAliases(...aliases) {
-        this.decorated.addAliases(...aliases);
-        return this;
-    }
-    hasAlias(alias) {
-        return this.decorated.hasAlias(alias);
-    }
     isValid(container) {
         return this.decorated.isValid(container);
     }

package/cjm/provider/Registration.js

@@ -1,16 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Registration = exports.key = void 0;
+exports.alias = exports.key = exports.register = exports.Registration = void 0;
+const utils_1 = require("../utils");
 const metadata_1 = require("../metadata");
 const Provider_1 = require("./Provider");
 const DependencyMissingKeyError_1 = require("../errors/DependencyMissingKeyError");
 const DEPENDENCY_KEY = 'DEPENDENCY_KEY';
-const key = (value) => (0, metadata_1.setMetadata)(DEPENDENCY_KEY, value);
-exports.key = key;
 class Registration {
     static fromClass(Target) {
-        const dependencyKey = (0, metadata_1.getMetadata)(Target, DEPENDENCY_KEY);
-        return new Registration(Provider_1.Provider.fromClass(Target), dependencyKey !== null && dependencyKey !== void 0 ? dependencyKey : Target.name);
+        const transform = (0, utils_1.pipe)(...((0, metadata_1.getMetadata)(Target, DEPENDENCY_KEY) ?? []));
+        return transform(new Registration(Provider_1.Provider.fromClass(Target), Target.name));
     }
     static fromValue(value) {
         return new Registration(Provider_1.Provider.fromValue(value));
@@ -18,14 +17,21 @@ class Registration {
     static fromFn(fn) {
         return new Registration(new Provider_1.Provider(fn));
     }
-    constructor(provider, key) {
+    constructor(provider, key, aliases = []) {
         this.provider = provider;
         this.key = key;
+        this.aliases = aliases;
     }
     to(key) {
         this.key = key;
         return this;
     }
+    addAliases(...aliases) {
+        for (const alias of aliases) {
+            this.aliases.push(alias);
+        }
+        return this;
+    }
     pipe(...mappers) {
         this.provider = this.provider.pipe(...mappers);
         return this;
@@ -34,7 +40,13 @@ class Registration {
         if (!this.key) {
             throw new DependencyMissingKeyError_1.DependencyMissingKeyError('No key provided for registration');
         }
-        container.register(this.key, this.provider);
+        container.register(this.key, this.provider, this.aliases);
     }
 }
 exports.Registration = Registration;
+const register = (...mappers) => (0, metadata_1.setMetadata)(DEPENDENCY_KEY, mappers);
+exports.register = register;
+const key = (key) => (r) => r.to(key);
+exports.key = key;
+const alias = (...aliases) => (r) => r.addAliases(...aliases);
+exports.alias = alias;

package/cjm/provider/ScopeProvider.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ScopeProvider = exports.tags = void 0;
+exports.ScopeProvider = exports.scope = void 0;
 const ProviderDecorator_1 = require("./ProviderDecorator");
-function tags(predicate) {
+function scope(predicate) {
     return (provider) => new ScopeProvider(provider, predicate);
 }
-exports.tags = tags;
+exports.scope = scope;
 class ScopeProvider extends ProviderDecorator_1.ProviderDecorator {
     constructor(provider, predicate) {
         super(provider);

package/cjm/provider/SingletonProvider.js

@@ -15,8 +15,7 @@ class SingletonProvider extends ProviderDecorator_1.ProviderDecorator {
         return new SingletonProvider(this.provider.clone());
     }
     resolve(container, ...args) {
-        var _a;
-        this.instance = (_a = this.instance) !== null && _a !== void 0 ? _a : { value: this.provider.resolve(container, ...args) };
+        this.instance = this.instance ?? { value: this.provider.resolve(container, ...args) };
         return this.instance.value;
     }
 }

package/esm/by.js

@@ -1,6 +1,22 @@
+import { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export const all = () => true;
+export const isPresent = (value) => value !== null && value !== undefined;
+export const resolveSilently = (c, ...args) => (key) => {
+    try {
+        return c.resolve(key, ...args);
+    }
+    catch (e) {
+        if (e instanceof DependencyNotFoundError) {
+            return undefined;
+        }
+        throw e;
+    }
+};
 export const by = {
-    aliases: (predicate) => (c, ...args) => c.getTokensByProvider(predicate).map((t) => c.resolve(t, ...args)),
+    aliases: (predicate) => (c, ...args) => c
+        .getKeysByAlias(predicate)
+        .map(resolveSilently(c, ...args))
+        .filter(isPresent),
     /**
      * Get all instances that match the given keys
      * @param keys

package/esm/container/AutoMockedContainer.js

@@ -1,14 +1,11 @@
 import { MethodNotImplementedError } from '../index';
 export class AutoMockedContainer {
-    constructor() {
-        this.tags = [];
+    getKeysByAlias(alias) {
+        return [];
     }
     hasDependency(key) {
         return false;
     }
-    getTokensByProvider() {
-        return [];
-    }
     createScope() {
         throw new MethodNotImplementedError();
     }

package/esm/container/Container.js

@@ -1,20 +1,23 @@
-import { isConstructor } from './IContainer';
+import { isConstructor, } from './IContainer';
 import { EmptyContainer } from './EmptyContainer';
 import { ContainerDisposedError } from '../errors/ContainerDisposedError';
 export class Container {
     constructor(injector, options = {}) {
-        var _a, _b;
         this.injector = injector;
         this.providers = new Map();
+        this.aliases = new Map();
         this.isDisposed = false;
         this.scopes = new Set();
         this.instances = new Set();
-        this.parent = (_a = options.parent) !== null && _a !== void 0 ? _a : new EmptyContainer();
-        this.tags = new Set((_b = options.tags) !== null && _b !== void 0 ? _b : []);
+        this.parent = options.parent ?? new EmptyContainer();
+        this.tags = new Set(options.tags ?? []);
     }
-    register(key, provider) {
+    register(key, provider, aliases) {
         this.validateContainer();
         this.providers.set(key, provider);
+        if (aliases && aliases.length > 0) {
+            this.aliases.set(key, aliases);
+        }
         return this;
     }
     resolve(token, ...args) {
@@ -25,16 +28,7 @@ export class Container {
             return instance;
         }
         const provider = this.providers.get(token);
-        return (provider === null || provider === void 0 ? void 0 : provider.isValid(this)) ? provider.resolve(this, ...args) : this.parent.resolve(token, ...args);
-    }
-    getTokensByProvider(predicate) {
-        const keys = new Set(this.parent.getTokensByProvider(predicate));
-        for (const [key, provider] of this.providers) {
-            if (predicate(provider)) {
-                keys.add(key);
-            }
-        }
-        return Array.from(keys);
+        return provider?.isValid(this) ? provider.resolve(this, ...args) : this.parent.resolve(token, ...args);
     }
     createScope(...tags) {
         this.validateContainer();
@@ -71,8 +65,16 @@ export class Container {
         return this;
     }
     hasDependency(key) {
-        var _a;
-        return (_a = this.providers.has(key)) !== null && _a !== void 0 ? _a : this.parent.hasDependency(key);
+        return this.providers.has(key) ?? this.parent.hasDependency(key);
+    }
+    getKeysByAlias(predicate) {
+        const result = new Set(this.parent.getKeysByAlias(predicate));
+        for (const [key, aliases] of this.aliases.entries()) {
+            if (predicate(aliases)) {
+                result.add(key);
+            }
+        }
+        return Array.from(result);
     }
     /**
      * @private

package/esm/container/EmptyContainer.js

@@ -1,15 +1,12 @@
 import { MethodNotImplementedError } from '../errors/MethodNotImplementedError';
 import { DependencyNotFoundError } from '../errors/DependencyNotFoundError';
 export class EmptyContainer {
-    constructor() {
-        this.tags = [];
+    getKeysByAlias(alias) {
+        return [];
     }
     hasDependency(key) {
         return false;
     }
-    getTokensByProvider() {
-        return [];
-    }
     hasTag() {
         throw new MethodNotImplementedError();
     }

package/esm/index.js

@@ -1,16 +1,15 @@
 export { isDependencyKey, } from './container/IContainer';
 export { Container } from './container/Container';
 export { EmptyContainer } from './container/EmptyContainer';
-export { alias } from './provider/IProvider';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
 export { Provider, provider } from './provider/Provider';
 export { argsFn, args, ArgsProvider } from './provider/ArgsProvider';
 export { singleton, SingletonProvider } from './provider/SingletonProvider';
-export { tags, ScopeProvider } from './provider/ScopeProvider';
+export { scope, ScopeProvider } from './provider/ScopeProvider';
 export { AutoMockedContainer } from './container/AutoMockedContainer';
-export { key, Registration } from './provider/Registration';
+export { key, Registration, register, alias } from './provider/Registration';
 export { MetadataInjector, inject } from './injector/MetadataInjector';
 export { SimpleInjector } from './injector/SimpleInjector';
 export { ProxyInjector } from './injector/ProxyInjector';

package/esm/injector/ProxyInjector.js

@@ -6,7 +6,7 @@ function getProp(target, key) {
 export class ProxyInjector {
     // eslint-disable-next-line @typescript-eslint/ban-types
     resolve(container, Target, ...deps) {
-        const args = deps.reduce((acc, it) => (Object.assign(Object.assign({}, acc), it)), {});
+        const args = deps.reduce((acc, it) => ({ ...acc, ...it }), {});
         const proxy = new Proxy({}, {
             // eslint-disable-next-line @typescript-eslint/ban-types
             get(target, prop) {

package/esm/metadata.js

@@ -6,12 +6,10 @@ export function getMetadata(target, key) {
     return Reflect.getOwnMetadata(key, target);
 }
 export const setParameterMetadata = (key, value) => (target, propertyKey, parameterIndex) => {
-    var _a;
-    const metadata = (_a = Reflect.getOwnMetadata(key, target)) !== null && _a !== void 0 ? _a : [];
+    const metadata = Reflect.getOwnMetadata(key, target) ?? [];
     metadata[parameterIndex] = value;
     Reflect.defineMetadata(key, metadata, target);
 };
 export const getParameterMetadata = (key, target) => {
-    var _a;
-    return (_a = Reflect.getOwnMetadata(key, target)) !== null && _a !== void 0 ? _a : [];
+    return Reflect.getOwnMetadata(key, target) ?? [];
 };

package/esm/provider/IProvider.js

@@ -1,3 +1 @@
-export function alias(...tokens) {
-    return (provider) => provider.addAliases(...tokens);
-}
+export {};

package/esm/provider/Provider.js

@@ -4,8 +4,7 @@ const PROVIDER_KEY = 'provider';
 export const provider = (...mappers) => setMetadata(PROVIDER_KEY, mappers);
 export class Provider {
     static fromClass(Target) {
-        var _a;
-        const mappers = (_a = getMetadata(Target, PROVIDER_KEY)) !== null && _a !== void 0 ? _a : [];
+        const mappers = getMetadata(Target, PROVIDER_KEY) ?? [];
         return new Provider((container, ...args) => container.resolve(Target, ...args)).pipe(...mappers);
     }
     static fromValue(value) {
@@ -13,20 +12,10 @@ export class Provider {
     }
     constructor(resolveDependency) {
         this.resolveDependency = resolveDependency;
-        this.aliases = new Set();
     }
     pipe(...mappers) {
         return pipe(...mappers)(this);
     }
-    addAliases(...aliases) {
-        for (const alias of aliases) {
-            this.aliases.add(alias);
-        }
-        return this;
-    }
-    hasAlias(alias) {
-        return this.aliases.has(alias);
-    }
     clone() {
         return new Provider(this.resolveDependency);
     }

package/esm/provider/ProviderDecorator.js

@@ -3,13 +3,6 @@ export class ProviderDecorator {
     constructor(decorated) {
         this.decorated = decorated;
     }
-    addAliases(...aliases) {
-        this.decorated.addAliases(...aliases);
-        return this;
-    }
-    hasAlias(alias) {
-        return this.decorated.hasAlias(alias);
-    }
     isValid(container) {
         return this.decorated.isValid(container);
     }

package/esm/provider/Registration.js

@@ -1,12 +1,12 @@
+import { pipe } from '../utils';
 import { getMetadata, setMetadata } from '../metadata';
 import { Provider } from './Provider';
 import { DependencyMissingKeyError } from '../errors/DependencyMissingKeyError';
 const DEPENDENCY_KEY = 'DEPENDENCY_KEY';
-export const key = (value) => setMetadata(DEPENDENCY_KEY, value);
 export class Registration {
     static fromClass(Target) {
-        const dependencyKey = getMetadata(Target, DEPENDENCY_KEY);
-        return new Registration(Provider.fromClass(Target), dependencyKey !== null && dependencyKey !== void 0 ? dependencyKey : Target.name);
+        const transform = pipe(...(getMetadata(Target, DEPENDENCY_KEY) ?? []));
+        return transform(new Registration(Provider.fromClass(Target), Target.name));
     }
     static fromValue(value) {
         return new Registration(Provider.fromValue(value));
@@ -14,14 +14,21 @@ export class Registration {
     static fromFn(fn) {
         return new Registration(new Provider(fn));
     }
-    constructor(provider, key) {
+    constructor(provider, key, aliases = []) {
         this.provider = provider;
         this.key = key;
+        this.aliases = aliases;
     }
     to(key) {
         this.key = key;
         return this;
     }
+    addAliases(...aliases) {
+        for (const alias of aliases) {
+            this.aliases.push(alias);
+        }
+        return this;
+    }
     pipe(...mappers) {
         this.provider = this.provider.pipe(...mappers);
         return this;
@@ -30,6 +37,9 @@ export class Registration {
         if (!this.key) {
             throw new DependencyMissingKeyError('No key provided for registration');
         }
-        container.register(this.key, this.provider);
+        container.register(this.key, this.provider, this.aliases);
     }
 }
+export const register = (...mappers) => setMetadata(DEPENDENCY_KEY, mappers);
+export const key = (key) => (r) => r.to(key);
+export const alias = (...aliases) => (r) => r.addAliases(...aliases);

package/esm/provider/ScopeProvider.js

@@ -1,5 +1,5 @@
 import { ProviderDecorator } from './ProviderDecorator';
-export function tags(predicate) {
+export function scope(predicate) {
     return (provider) => new ScopeProvider(provider, predicate);
 }
 export class ScopeProvider extends ProviderDecorator {

package/esm/provider/SingletonProvider.js

@@ -11,8 +11,7 @@ export class SingletonProvider extends ProviderDecorator {
         return new SingletonProvider(this.provider.clone());
     }
     resolve(container, ...args) {
-        var _a;
-        this.instance = (_a = this.instance) !== null && _a !== void 0 ? _a : { value: this.provider.resolve(container, ...args) };
+        this.instance = this.instance ?? { value: this.provider.resolve(container, ...args) };
         return this.instance.value;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "29.2.0",
+  "version": "30.0.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -60,5 +60,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "d4bc7b89f638eda046f554f353d5a81ff07bdc49"
+  "gitHead": "454ff1ea7e43f331cf36f64973d1373d9d87f8a4"
 }

package/typings/by.d.ts

@@ -1,9 +1,10 @@
-import { IContainer, InjectionToken } from './container/IContainer';
-import { Aliased } from './provider/IProvider';
+import { AliasPredicate, DependencyKey, IContainer, InjectionToken } from './container/IContainer';
 export type InstancePredicate = (dep: unknown) => boolean;
 export declare const all: InstancePredicate;
+export declare const isPresent: <T>(value: T | null | undefined) => value is T;
+export declare const resolveSilently: (c: IContainer, ...args: unknown[]) => (key: DependencyKey) => unknown;
 export declare const by: {
-    aliases: (predicate: (dep: Aliased) => boolean) => (c: IContainer, ...args: unknown[]) => unknown[];
+    aliases: (predicate: AliasPredicate) => (c: IContainer, ...args: unknown[]) => unknown[];
     /**
      * Get all instances that match the given keys
      * @param keys

package/typings/container/AutoMockedContainer.d.ts

@@ -1,8 +1,8 @@
 import { IContainer, InjectionToken, IProvider, DependencyKey } from '../index';
+import { AliasPredicate } from './IContainer';
 export declare abstract class AutoMockedContainer implements IContainer {
-    tags: string[];
+    getKeysByAlias(alias: AliasPredicate): DependencyKey[];
     hasDependency(key: string): boolean;
-    getTokensByProvider(): DependencyKey[];
     createScope(): IContainer;
     abstract resolve<T>(key: InjectionToken<T>): T;
     dispose(): void;

package/typings/container/Container.d.ts

@@ -1,9 +1,10 @@
-import { DependencyKey, IContainer, IContainerModule, InjectionToken, Tag } from './IContainer';
+import { Alias, AliasPredicate, DependencyKey, IContainer, IContainerModule, InjectionToken, Tag } from './IContainer';
 import { IInjector } from '../injector/IInjector';
-import { IProvider, ProviderPredicate } from '../provider/IProvider';
+import { IProvider } from '../provider/IProvider';
 export declare class Container implements IContainer {
     private readonly injector;
-    readonly providers: Map<DependencyKey, IProvider<unknown>>;
+    private readonly providers;
+    private readonly aliases;
     private tags;
     private isDisposed;
     private parent;
@@ -13,15 +14,15 @@ export declare class Container implements IContainer {
         parent?: IContainer;
         tags?: Tag[];
     });
-    register(key: DependencyKey, provider: IProvider): this;
+    register(key: DependencyKey, provider: IProvider, aliases?: Alias[]): this;
     resolve<T>(token: InjectionToken<T>, ...args: unknown[]): T;
-    getTokensByProvider(predicate: ProviderPredicate): DependencyKey[];
     createScope(...tags: Tag[]): Container;
     dispose(): void;
     getInstances(): unknown[];
     hasTag(tag: Tag): boolean;
     use(...modules: IContainerModule[]): this;
     hasDependency(key: DependencyKey): boolean;
+    getKeysByAlias(predicate: AliasPredicate): DependencyKey[];
     /**
      * @private
      */

package/typings/container/EmptyContainer.d.ts

@@ -1,9 +1,8 @@
-import { DependencyKey, IContainer, IContainerModule, InjectionToken } from './IContainer';
+import { AliasPredicate, DependencyKey, IContainer, IContainerModule, InjectionToken } from './IContainer';
 import { IProvider } from '../provider/IProvider';
 export declare class EmptyContainer implements IContainer {
-    tags: string[];
+    getKeysByAlias(alias: AliasPredicate): DependencyKey[];
     hasDependency(key: string): boolean;
-    getTokensByProvider(): DependencyKey[];
     hasTag(): boolean;
     createScope(): IContainer;
     dispose(): void;

package/typings/container/IContainer.d.ts

@@ -1,4 +1,4 @@
-import { IProvider, ProviderPredicate } from '../provider/IProvider';
+import { IProvider } from '../provider/IProvider';
 import { constructor } from '../utils';
 export type Tag = string;
 export type DependencyKey = string | symbol;
@@ -14,14 +14,16 @@ export interface IContainerModule {
 export interface Tagged {
     hasTag(tag: Tag): boolean;
 }
+export type Alias = string;
+export type AliasPredicate = (aliases: Alias[]) => boolean;
 export interface IContainer extends Resolvable, Tagged {
     createScope(...tags: Tag[]): IContainer;
-    register(key: DependencyKey, value: IProvider): this;
+    register(key: DependencyKey, value: IProvider, aliases?: Alias[]): this;
     removeScope(child: IContainer): void;
     getInstances(): unknown[];
     dispose(): void;
     use(...modules: IContainerModule[]): this;
     getAllProviders(): Map<DependencyKey, IProvider>;
-    getTokensByProvider(predicate: ProviderPredicate): DependencyKey[];
     hasDependency(key: DependencyKey): boolean;
+    getKeysByAlias(alias: AliasPredicate): DependencyKey[];
 }

package/typings/index.d.ts

@@ -2,7 +2,7 @@ export { IContainer, Resolvable, IContainerModule, isDependencyKey, DependencyKe
 export { constructor } from './utils';
 export { Container } from './container/Container';
 export { EmptyContainer } from './container/EmptyContainer';
-export { ResolveDependency, IProvider, alias } from './provider/IProvider';
+export { ResolveDependency, IProvider } from './provider/IProvider';
 export { IInjector } from './injector/IInjector';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
@@ -10,9 +10,9 @@ export { ContainerDisposedError } from './errors/ContainerDisposedError';
 export { Provider, provider } from './provider/Provider';
 export { ArgsFn, argsFn, args, ArgsProvider } from './provider/ArgsProvider';
 export { singleton, SingletonProvider } from './provider/SingletonProvider';
-export { tags, ScopeProvider } from './provider/ScopeProvider';
+export { scope, ScopeProvider } from './provider/ScopeProvider';
 export { AutoMockedContainer } from './container/AutoMockedContainer';
-export { key, Registration } from './provider/Registration';
+export { key, Registration, register, alias } from './provider/Registration';
 export { MetadataInjector, inject } from './injector/MetadataInjector';
 export { SimpleInjector } from './injector/SimpleInjector';
 export { ProxyInjector } from './injector/ProxyInjector';

package/typings/provider/IProvider.d.ts

@@ -1,16 +1,9 @@
 import { Resolvable, Tagged } from '../container/IContainer';
 import { MapFn } from '../utils';
 export type ResolveDependency<T = unknown> = (container: Resolvable, ...args: unknown[]) => T;
-export type Alias = string;
-export interface Aliased {
-    hasAlias(alias: Alias): boolean;
-}
-export interface IProvider<T = unknown> extends Aliased {
+export interface IProvider<T = unknown> {
     clone(): IProvider<T>;
     resolve(container: Resolvable, ...args: unknown[]): T;
     isValid(container: Tagged): boolean;
     pipe(...mappers: MapFn<IProvider<T>>[]): IProvider<T>;
-    addAliases(...aliases: Alias[]): this;
 }
-export type ProviderPredicate = (provider: IProvider) => boolean;
-export declare function alias<T = unknown>(...tokens: Alias[]): MapFn<IProvider<T>>;

package/typings/provider/Provider.d.ts

@@ -1,4 +1,4 @@
-import { Alias, IProvider, ResolveDependency } from './IProvider';
+import { IProvider, ResolveDependency } from './IProvider';
 import { Resolvable } from '../container/IContainer';
 import { constructor, MapFn } from '../utils';
 export declare const provider: (...mappers: MapFn<IProvider>[]) => ClassDecorator;
@@ -6,11 +6,8 @@ export declare class Provider<T> implements IProvider<T> {
     private readonly resolveDependency;
     static fromClass<T>(Target: constructor<T>): IProvider<T>;
     static fromValue<T>(value: T): Provider<T>;
-    private aliases;
     constructor(resolveDependency: ResolveDependency<T>);
     pipe(...mappers: MapFn<IProvider<T>>[]): IProvider<T>;
-    addAliases(...aliases: Alias[]): this;
-    hasAlias(alias: Alias): boolean;
     clone(): Provider<T>;
     resolve(container: Resolvable, ...args: unknown[]): T;
     isValid(): boolean;

package/typings/provider/ProviderDecorator.d.ts

@@ -1,11 +1,9 @@
 import { Resolvable, Tagged } from '../container/IContainer';
-import { Alias, IProvider } from './IProvider';
+import { IProvider } from './IProvider';
 import { MapFn } from '../utils';
 export declare abstract class ProviderDecorator<T> implements IProvider<T> {
     private decorated;
     protected constructor(decorated: IProvider<T>);
-    addAliases(...aliases: Alias[]): this;
-    hasAlias(alias: Alias): boolean;
     abstract clone(): IProvider<T>;
     isValid(container: Tagged): boolean;
     resolve(container: Resolvable, ...args: any[]): T;

package/typings/provider/Registration.d.ts

@@ -1,15 +1,19 @@
-import { DependencyKey, IContainer, IContainerModule } from '../container/IContainer';
+import { Alias, DependencyKey, IContainer, IContainerModule } from '../container/IContainer';
 import { constructor, MapFn } from '../utils';
 import { IProvider, ResolveDependency } from './IProvider';
-export declare const key: (value: DependencyKey) => ClassDecorator;
-export declare class Registration<T> implements IContainerModule {
+export declare class Registration<T = unknown> implements IContainerModule {
     private provider;
     private key?;
-    static fromClass<T>(Target: constructor<T>): Registration<T>;
+    private aliases;
+    static fromClass<T>(Target: constructor<T>): Registration<unknown>;
     static fromValue<T>(value: T): Registration<T>;
     static fromFn<T>(fn: ResolveDependency<T>): Registration<T>;
-    constructor(provider: IProvider<T>, key?: DependencyKey | undefined);
+    constructor(provider: IProvider<T>, key?: DependencyKey | undefined, aliases?: string[]);
     to(key: DependencyKey): this;
+    addAliases(...aliases: Alias[]): this;
     pipe(...mappers: MapFn<IProvider<T>>[]): this;
     applyTo(container: IContainer): void;
 }
+export declare const register: (...mappers: MapFn<Registration>[]) => ClassDecorator;
+export declare const key: (key: DependencyKey) => MapFn<Registration>;
+export declare const alias: (...aliases: Alias[]) => MapFn<Registration>;

package/typings/provider/ScopeProvider.d.ts

@@ -3,7 +3,7 @@ import { ProviderDecorator } from './ProviderDecorator';
 import { IContainer, Tagged } from '../container/IContainer';
 import { MapFn } from '../utils';
 type ContainerPredicate = (c: IContainer) => boolean;
-export declare function tags<T = unknown>(predicate: (c: Tagged) => boolean): MapFn<IProvider<T>>;
+export declare function scope<T = unknown>(predicate: (c: Tagged) => boolean): MapFn<IProvider<T>>;
 export declare class ScopeProvider<T> extends ProviderDecorator<T> {
     private provider;
     private predicate;