ts-ioc-container 29.1.2 → 29.2.0

package/README.md

@@ -137,15 +137,15 @@ import {
   Container,
   DependencyNotFoundError,
   key,
-  scope,
   provider,
   MetadataInjector,
   Registration as R,
   by,
+  tags,
 } from 'ts-ioc-container';
 
 @key('ILogger')
-@provider(singleton(), scope((s) => s.hasTag('child')))
+@provider(singleton(), tags((s) => s.hasTag('child')))
 class Logger {}
 
 describe('Scopes', function () {
@@ -403,7 +403,7 @@ 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, scope } from 'ts-ioc-container';
+import { singleton, Container, provider, MetadataInjector, Registration as R, key, tags } from 'ts-ioc-container';
 import { DependencyMissingKeyError } from '../../lib/errors/DependencyMissingKeyError';
 
 describe('Registration module', function () {
@@ -411,7 +411,7 @@ describe('Registration module', function () {
 
   it('should register class', function () {
     @key('ILogger')
-    @provider(singleton(), scope((s) => s.hasTag('root')))
+    @provider(singleton(), tags((s) => s.hasTag('root')))
     class Logger {}
 
     const root = createContainer().use(R.fromClass(Logger));
@@ -452,7 +452,7 @@ describe('Registration module', function () {
 
 ```typescript
 import 'reflect-metadata';
-import { singleton, Container, Provider, MetadataInjector, scope } from 'ts-ioc-container';
+import { singleton, Container, Provider, MetadataInjector, tags } from 'ts-ioc-container';
 
 class Logger {}
 
@@ -480,7 +480,7 @@ describe('Provider', function () {
       'ILogger',
       Provider.fromClass(Logger).pipe(
         singleton(),
-        scope((s) => s.hasTag('root')),
+        tags((s) => s.hasTag('root')),
       ),
     );
 
@@ -538,10 +538,10 @@ Sometimes you need to resolve provider only from scope which matches to certain
 
 ```typescript
 import 'reflect-metadata';
-import { singleton, Container, key, scope, provider, MetadataInjector, Registration as R } from 'ts-ioc-container';
+import { singleton, Container, key, provider, MetadataInjector, Registration as R, tags } from 'ts-ioc-container';
 
 @key('ILogger')
-@provider(singleton(), scope((s) => s.hasTag('root'))) // the same as .pipe(singleton(), scope((s) => s.hasTag('root')))
+@provider(singleton(), tags((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 () {
@@ -611,7 +611,7 @@ import 'reflect-metadata';
 import { alias, by, Container, inject, provider, MetadataInjector, Registration as R } from 'ts-ioc-container';
 
 describe('alias', () => {
-  const IMiddlewareKey = Symbol('IMiddleware');
+  const IMiddlewareKey = 'IMiddleware';
   const middleware = provider(alias(IMiddlewareKey));
 
   interface IMiddleware {
@@ -640,7 +640,7 @@ describe('alias', () => {
   it('should resolve by some alias', () => {
     class App implements IApplication {
       private appliedMiddleware: Set<string> = new Set();
-      constructor(@inject(by.alias.some(IMiddlewareKey)) public middleware: IMiddleware[]) {}
+      constructor(@inject(by.aliases((d) => d.hasAlias(IMiddlewareKey))) public middleware: IMiddleware[]) {}
 
       markMiddlewareAsApplied(name: string): void {
         this.appliedMiddleware.add(name);

package/cjm/by.js

@@ -4,18 +4,7 @@ exports.by = exports.all = void 0;
 const all = () => true;
 exports.all = all;
 exports.by = {
-    alias: {
-        /**
-         * Get all instances that have at least one of the given aliases
-         * @param aliases
-         */
-        some: (...aliases) => (c, ...args) => c.getTokensByProvider((p) => aliases.some((alias) => p.hasAlias(alias))).map((t) => c.resolve(t, ...args)),
-        /**
-         * Get all instances that have all of the given aliases
-         * @param aliases
-         */
-        all: (...aliases) => (c, ...args) => c.getTokensByProvider((p) => aliases.every((alias) => p.hasAlias(alias))).map((t) => c.resolve(t, ...args)),
-    },
+    aliases: (predicate) => (c, ...args) => c.getTokensByProvider(predicate).map((t) => c.resolve(t, ...args)),
     /**
      * Get all instances that match the given keys
      * @param keys

package/cjm/container/Container.js

@@ -13,7 +13,7 @@ class Container {
         this.scopes = new Set();
         this.instances = new Set();
         this.parent = (_a = options.parent) !== null && _a !== void 0 ? _a : new EmptyContainer_1.EmptyContainer();
-        this.tags = (_b = options.tags) !== null && _b !== void 0 ? _b : [];
+        this.tags = new Set((_b = options.tags) !== null && _b !== void 0 ? _b : []);
     }
     register(key, provider) {
         this.validateContainer();
@@ -65,7 +65,7 @@ class Container {
         return instances;
     }
     hasTag(tag) {
-        return this.tags.includes(tag);
+        return this.tags.has(tag);
     }
     use(...modules) {
         for (const module of modules) {

package/cjm/index.js

@@ -1,6 +1,6 @@
 "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.scope = 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.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;
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
 var Container_1 = require("./container/Container");
@@ -26,7 +26,7 @@ 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, "scope", { enumerable: true, get: function () { return ScopeProvider_1.scope; } });
+Object.defineProperty(exports, "tags", { enumerable: true, get: function () { return ScopeProvider_1.tags; } });
 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; } });

package/cjm/provider/ScopeProvider.js

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

package/esm/by.js

@@ -1,17 +1,6 @@
 export const all = () => true;
 export const by = {
-    alias: {
-        /**
-         * Get all instances that have at least one of the given aliases
-         * @param aliases
-         */
-        some: (...aliases) => (c, ...args) => c.getTokensByProvider((p) => aliases.some((alias) => p.hasAlias(alias))).map((t) => c.resolve(t, ...args)),
-        /**
-         * Get all instances that have all of the given aliases
-         * @param aliases
-         */
-        all: (...aliases) => (c, ...args) => c.getTokensByProvider((p) => aliases.every((alias) => p.hasAlias(alias))).map((t) => c.resolve(t, ...args)),
-    },
+    aliases: (predicate) => (c, ...args) => c.getTokensByProvider(predicate).map((t) => c.resolve(t, ...args)),
     /**
      * Get all instances that match the given keys
      * @param keys

package/esm/container/Container.js

@@ -10,7 +10,7 @@ export class Container {
         this.scopes = new Set();
         this.instances = new Set();
         this.parent = (_a = options.parent) !== null && _a !== void 0 ? _a : new EmptyContainer();
-        this.tags = (_b = options.tags) !== null && _b !== void 0 ? _b : [];
+        this.tags = new Set((_b = options.tags) !== null && _b !== void 0 ? _b : []);
     }
     register(key, provider) {
         this.validateContainer();
@@ -62,7 +62,7 @@ export class Container {
         return instances;
     }
     hasTag(tag) {
-        return this.tags.includes(tag);
+        return this.tags.has(tag);
     }
     use(...modules) {
         for (const module of modules) {

package/esm/index.js

@@ -8,7 +8,7 @@ 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 { scope, ScopeProvider } from './provider/ScopeProvider';
+export { tags, ScopeProvider } from './provider/ScopeProvider';
 export { AutoMockedContainer } from './container/AutoMockedContainer';
 export { key, Registration } from './provider/Registration';
 export { MetadataInjector, inject } from './injector/MetadataInjector';

package/esm/provider/ScopeProvider.js

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

package/package.json

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

package/typings/by.d.ts

@@ -1,19 +1,9 @@
-import { DependencyKey, IContainer, InjectionToken } from './container/IContainer';
+import { IContainer, InjectionToken } from './container/IContainer';
+import { Aliased } from './provider/IProvider';
 export type InstancePredicate = (dep: unknown) => boolean;
 export declare const all: InstancePredicate;
 export declare const by: {
-    alias: {
-        /**
-         * Get all instances that have at least one of the given aliases
-         * @param aliases
-         */
-        some: (...aliases: DependencyKey[]) => (c: IContainer, ...args: unknown[]) => unknown[];
-        /**
-         * Get all instances that have all of the given aliases
-         * @param aliases
-         */
-        all: (...aliases: DependencyKey[]) => (c: IContainer, ...args: unknown[]) => unknown[];
-    };
+    aliases: (predicate: (dep: Aliased) => boolean) => (c: IContainer, ...args: unknown[]) => unknown[];
     /**
      * Get all instances that match the given keys
      * @param keys

package/typings/container/Container.d.ts

@@ -1,10 +1,10 @@
 import { DependencyKey, IContainer, IContainerModule, InjectionToken, Tag } from './IContainer';
 import { IInjector } from '../injector/IInjector';
-import { IProvider } from '../provider/IProvider';
+import { IProvider, ProviderPredicate } from '../provider/IProvider';
 export declare class Container implements IContainer {
     private readonly injector;
     readonly providers: Map<DependencyKey, IProvider<unknown>>;
-    private readonly tags;
+    private tags;
     private isDisposed;
     private parent;
     private scopes;
@@ -15,7 +15,7 @@ export declare class Container implements IContainer {
     });
     register(key: DependencyKey, provider: IProvider): this;
     resolve<T>(token: InjectionToken<T>, ...args: unknown[]): T;
-    getTokensByProvider(predicate: (provider: IProvider) => boolean): DependencyKey[];
+    getTokensByProvider(predicate: ProviderPredicate): DependencyKey[];
     createScope(...tags: Tag[]): Container;
     dispose(): void;
     getInstances(): unknown[];

package/typings/container/IContainer.d.ts

@@ -1,4 +1,4 @@
-import { IProvider } from '../provider/IProvider';
+import { IProvider, ProviderPredicate } from '../provider/IProvider';
 import { constructor } from '../utils';
 export type Tag = string;
 export type DependencyKey = string | symbol;
@@ -11,7 +11,10 @@ export interface Resolvable {
 export interface IContainerModule {
     applyTo(container: IContainer): void;
 }
-export interface IContainer extends Resolvable {
+export interface Tagged {
+    hasTag(tag: Tag): boolean;
+}
+export interface IContainer extends Resolvable, Tagged {
     createScope(...tags: Tag[]): IContainer;
     register(key: DependencyKey, value: IProvider): this;
     removeScope(child: IContainer): void;
@@ -19,7 +22,6 @@ export interface IContainer extends Resolvable {
     dispose(): void;
     use(...modules: IContainerModule[]): this;
     getAllProviders(): Map<DependencyKey, IProvider>;
-    getTokensByProvider(predicate: (provider: IProvider) => boolean): DependencyKey[];
+    getTokensByProvider(predicate: ProviderPredicate): DependencyKey[];
     hasDependency(key: DependencyKey): boolean;
-    hasTag(tag: Tag): boolean;
 }

package/typings/index.d.ts

@@ -10,7 +10,7 @@ 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 { scope, ScopeProvider } from './provider/ScopeProvider';
+export { tags, ScopeProvider } from './provider/ScopeProvider';
 export { AutoMockedContainer } from './container/AutoMockedContainer';
 export { key, Registration } from './provider/Registration';
 export { MetadataInjector, inject } from './injector/MetadataInjector';

package/typings/provider/IProvider.d.ts

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

package/typings/provider/Provider.d.ts

@@ -1,5 +1,5 @@
-import { IProvider, ResolveDependency } from './IProvider';
-import { DependencyKey, Resolvable } from '../container/IContainer';
+import { Alias, IProvider, ResolveDependency } from './IProvider';
+import { Resolvable } from '../container/IContainer';
 import { constructor, MapFn } from '../utils';
 export declare const provider: (...mappers: MapFn<IProvider>[]) => ClassDecorator;
 export declare class Provider<T> implements IProvider<T> {
@@ -9,8 +9,8 @@ export declare class Provider<T> implements IProvider<T> {
     private aliases;
     constructor(resolveDependency: ResolveDependency<T>);
     pipe(...mappers: MapFn<IProvider<T>>[]): IProvider<T>;
-    addAliases(...aliases: DependencyKey[]): this;
-    hasAlias(alias: DependencyKey): boolean;
+    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,13 +1,13 @@
-import { DependencyKey, IContainer, Resolvable } from '../container/IContainer';
-import { IProvider } from './IProvider';
+import { Resolvable, Tagged } from '../container/IContainer';
+import { Alias, 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: DependencyKey[]): this;
-    hasAlias(alias: DependencyKey): boolean;
+    addAliases(...aliases: Alias[]): this;
+    hasAlias(alias: Alias): boolean;
     abstract clone(): IProvider<T>;
-    isValid(container: IContainer): boolean;
+    isValid(container: Tagged): boolean;
     resolve(container: Resolvable, ...args: any[]): T;
     pipe(...mappers: MapFn<IProvider<T>>[]): IProvider<T>;
 }

package/typings/provider/ScopeProvider.d.ts

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