ts-ioc-container 28.1.0 → 29.0.0

package/README.md

@@ -33,7 +33,7 @@
     - [Registration module (Provider + DependencyKey)](#registration-and-providers) `@key`
     - [Provider](#provider) `@provider`
     - [Singleton provider](#singleton-provider)
-    - [Tagged provider](#tagged-provider)
+    - [Predicate provider](#predicate-provider)
     - [Args provider](#args-provider)
     - [Aliases](#aliases) `alias`
 - [Container modules](#container-modules)
@@ -137,15 +137,16 @@ import {
   Container,
   DependencyNotFoundError,
   key,
-  tags,
+  whenScope,
   provider,
   MetadataInjector,
   Registration as R,
   by,
+  hasTags,
 } from 'ts-ioc-container';
 
 @key('ILogger')
-@provider(singleton(), tags('child'))
+@provider(singleton(), whenScope(hasTags.someOf('child')))
 class Logger {}
 
 describe('Scopes', function () {
@@ -310,7 +311,10 @@ describe('SimpleInjector', function () {
 
   it('should pass parameters alongside with container', function () {
     class App {
-      constructor(container: IContainer, public greeting: string) {}
+      constructor(
+        container: IContainer,
+        public greeting: string,
+      ) {}
     }
 
     const container = new Container(new SimpleInjector()).use(R.fromClass(App).to('App'));
@@ -390,7 +394,7 @@ describe('ProxyInjector', function () {
 There are next types of providers:
 - `Provider` - basic provider. It can be used with `@provider` decorator
 - `SingletonProvider` - provider that creates only one instance in every scope where it's resolved
-- `TaggedProvider` - provider that can be resolved only from container with certain tags and their sub scopes
+- `PredicateProvider` - provider that can be resolved only from container with certain tags and their sub scopes
 - `ArgsProvider` - provider that encapsulates arguments to pass it to constructor.
 
 `Registration` - just a helper to register provider with certain key. `(preferrably to use)`
@@ -400,7 +404,16 @@ Sometimes you need to keep dependency key with class together. For example, you
 
 ```typescript
 import 'reflect-metadata';
-import { singleton, Container, tags, provider, MetadataInjector, Registration as R, key } from 'ts-ioc-container';
+import {
+  singleton,
+  Container,
+  provider,
+  MetadataInjector,
+  Registration as R,
+  key,
+  whenScope,
+  hasTags,
+} from 'ts-ioc-container';
 import { DependencyMissingKeyError } from '../../lib/errors/DependencyMissingKeyError';
 
 describe('Registration module', function () {
@@ -408,7 +421,7 @@ describe('Registration module', function () {
 
   it('should register class', function () {
     @key('ILogger')
-    @provider(singleton(), tags('root'))
+    @provider(singleton(), whenScope(hasTags.someOf('root')))
     class Logger {}
 
     const root = createContainer().use(R.fromClass(Logger));
@@ -449,7 +462,7 @@ describe('Registration module', function () {
 
 ```typescript
 import 'reflect-metadata';
-import { singleton, Container, tags, Provider, MetadataInjector } from 'ts-ioc-container';
+import { singleton, Container, Provider, MetadataInjector, whenScope, hasTags } from 'ts-ioc-container';
 
 class Logger {}
 
@@ -475,7 +488,7 @@ describe('Provider', function () {
   it('can be featured by pipe method', function () {
     const root = new Container(new MetadataInjector(), { tags: ['root'] }).register(
       'ILogger',
-      Provider.fromClass(Logger).pipe(singleton(), tags('root')),
+      Provider.fromClass(Logger).pipe(singleton(), whenScope(hasTags.someOf('root'))),
     );
 
     expect(root.resolve('ILogger')).toBe(root.resolve('ILogger'));
@@ -526,18 +539,18 @@ describe('Singleton', function () {
 
 ```
 
-### Tagged provider
-Sometimes you need to resolve provider only from container with certain tags and their sub scopes. Especially if you want to register dependency as singleton for some tags, for example `root`
-- NOTICE: It doesn't make clones in not tagged-matched scopes. Usually it's used with `SingletonProvider`.
+### Predicate provider
+Sometimes you need to resolve provider only from container which matches to certain predicate and their sub scopes. Especially if you want to register dependency as singleton for some tags, for example `root`
+- NOTICE: It doesn't make clones in not predicate-matched scopes. Usually it's used with `SingletonProvider`.
 
 ```typescript
 import 'reflect-metadata';
-import { singleton, Container, key, tags, provider, MetadataInjector, Registration as R } from 'ts-ioc-container';
+import { singleton, Container, key, whenScope, hasTags, provider, MetadataInjector, Registration as R } from 'ts-ioc-container';
 
 @key('ILogger')
-@provider(singleton(), tags('root')) // the same as .pipe(singleton(), tags('root'))
+@provider(singleton(), whenScope(hasTags.someOf('root'))) // the same as .pipe(singleton(), tags('root'))
 class Logger {}
-describe('TaggedProvider', function () {
+describe('PredicateProvider', function () {
   it('should return the same instance', function () {
     const root = new Container(new MetadataInjector(), { tags: ['root'] }).use(R.fromClass(Logger));
     const child = root.createScope();
@@ -557,7 +570,10 @@ import { Container, key, argsFn, args, MetadataInjector, Registration as R } fro
 
 @key('logger')
 class Logger {
-  constructor(public name: string, public type?: string) {}
+  constructor(
+    public name: string,
+    public type?: string,
+  ) {}
 }
 
 describe('ArgsProvider', function () {

package/cjm/by.js

@@ -16,16 +16,6 @@ exports.by = {
          */
         all: (...aliases) => (c, ...args) => c.getTokensByProvider((p) => aliases.every((alias) => p.hasAlias(alias))).map((t) => c.resolve(t, ...args)),
     },
-    scopedAliases: {
-        some: (c, ...args) => {
-            const aliases = c.tags;
-            return exports.by.alias.some(...aliases)(c, ...args);
-        },
-        all: (c, ...args) => {
-            const aliases = c.tags;
-            return exports.by.alias.all(...aliases)(c, ...args);
-        },
-    },
     /**
      * Get all instances that match the given keys
      * @param keys

package/cjm/errors/ContainerDisposedError.js

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContainerDisposedError = void 0;
 class ContainerDisposedError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = 'ContainerDisposedError';
-        Object.setPrototypeOf(this, ContainerDisposedError.prototype);
-    }
     static assert(isTrue, failMessage) {
         if (!isTrue) {
             throw new ContainerDisposedError(failMessage);
         }
     }
+    constructor(message) {
+        super(message);
+        this.name = 'ContainerDisposedError';
+        Object.setPrototypeOf(this, ContainerDisposedError.prototype);
+    }
 }
 exports.ContainerDisposedError = ContainerDisposedError;

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.TaggedProvider = 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.Registration = exports.key = exports.AutoMockedContainer = exports.PredicateProvider = exports.hasTags = exports.whenScope = 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");
@@ -25,9 +25,10 @@ Object.defineProperty(exports, "ArgsProvider", { enumerable: true, get: function
 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 TaggedProvider_1 = require("./provider/TaggedProvider");
-Object.defineProperty(exports, "tags", { enumerable: true, get: function () { return TaggedProvider_1.tags; } });
-Object.defineProperty(exports, "TaggedProvider", { enumerable: true, get: function () { return TaggedProvider_1.TaggedProvider; } });
+var PredicateProvider_1 = require("./provider/PredicateProvider");
+Object.defineProperty(exports, "whenScope", { enumerable: true, get: function () { return PredicateProvider_1.whenScope; } });
+Object.defineProperty(exports, "hasTags", { enumerable: true, get: function () { return PredicateProvider_1.hasTags; } });
+Object.defineProperty(exports, "PredicateProvider", { enumerable: true, get: function () { return PredicateProvider_1.PredicateProvider; } });
 var AutoMockedContainer_1 = require("./container/AutoMockedContainer");
 Object.defineProperty(exports, "AutoMockedContainer", { enumerable: true, get: function () { return AutoMockedContainer_1.AutoMockedContainer; } });
 var Registration_1 = require("./provider/Registration");

package/cjm/provider/PredicateProvider.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PredicateProvider = exports.whenScope = exports.hasTags = void 0;
+const ProviderDecorator_1 = require("./ProviderDecorator");
+exports.hasTags = {
+    someOf: (...tags) => {
+        return (c) => tags.some((t) => c.hasTag(t));
+    },
+    allOf: (...tags) => {
+        return (c) => tags.every((t) => c.hasTag(t));
+    },
+};
+function whenScope(predicate) {
+    return (provider) => new PredicateProvider(provider, predicate);
+}
+exports.whenScope = whenScope;
+class PredicateProvider extends ProviderDecorator_1.ProviderDecorator {
+    constructor(provider, predicate) {
+        super(provider);
+        this.provider = provider;
+        this.predicate = predicate;
+    }
+    clone() {
+        return new PredicateProvider(this.provider.clone(), this.predicate);
+    }
+    isValid(container) {
+        return this.predicate(container) && this.provider.isValid(container);
+    }
+}
+exports.PredicateProvider = PredicateProvider;

package/cjm/provider/Provider.js

@@ -7,10 +7,6 @@ const PROVIDER_KEY = 'provider';
 const provider = (...mappers) => (0, metadata_1.setMetadata)(PROVIDER_KEY, mappers);
 exports.provider = provider;
 class Provider {
-    constructor(resolveDependency) {
-        this.resolveDependency = resolveDependency;
-        this.aliases = new Set();
-    }
     static fromClass(Target) {
         var _a;
         const mappers = (_a = (0, metadata_1.getMetadata)(Target, PROVIDER_KEY)) !== null && _a !== void 0 ? _a : [];
@@ -19,6 +15,10 @@ class Provider {
     static fromValue(value) {
         return new Provider(() => value);
     }
+    constructor(resolveDependency) {
+        this.resolveDependency = resolveDependency;
+        this.aliases = new Set();
+    }
     pipe(...mappers) {
         return (0, utils_1.pipe)(...mappers)(this);
     }

package/cjm/provider/ProviderDecorator.js

@@ -13,8 +13,8 @@ class ProviderDecorator {
     hasAlias(alias) {
         return this.decorated.hasAlias(alias);
     }
-    isValid(filters) {
-        return this.decorated.isValid(filters);
+    isValid(container) {
+        return this.decorated.isValid(container);
     }
     resolve(container, ...args) {
         return this.decorated.resolve(container, ...args);

package/cjm/provider/Registration.js

@@ -8,10 +8,6 @@ const DEPENDENCY_KEY = 'DEPENDENCY_KEY';
 const key = (value) => (0, metadata_1.setMetadata)(DEPENDENCY_KEY, value);
 exports.key = key;
 class Registration {
-    constructor(provider, key) {
-        this.provider = provider;
-        this.key = key;
-    }
     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);
@@ -22,6 +18,10 @@ class Registration {
     static fromFn(fn) {
         return new Registration(new Provider_1.Provider(fn));
     }
+    constructor(provider, key) {
+        this.provider = provider;
+        this.key = key;
+    }
     to(key) {
         this.key = key;
         return this;

package/esm/by.js

@@ -12,16 +12,6 @@ export const by = {
          */
         all: (...aliases) => (c, ...args) => c.getTokensByProvider((p) => aliases.every((alias) => p.hasAlias(alias))).map((t) => c.resolve(t, ...args)),
     },
-    scopedAliases: {
-        some: (c, ...args) => {
-            const aliases = c.tags;
-            return by.alias.some(...aliases)(c, ...args);
-        },
-        all: (c, ...args) => {
-            const aliases = c.tags;
-            return by.alias.all(...aliases)(c, ...args);
-        },
-    },
     /**
      * Get all instances that match the given keys
      * @param keys

package/esm/errors/ContainerDisposedError.js

@@ -1,12 +1,12 @@
 export class ContainerDisposedError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = 'ContainerDisposedError';
-        Object.setPrototypeOf(this, ContainerDisposedError.prototype);
-    }
     static assert(isTrue, failMessage) {
         if (!isTrue) {
             throw new ContainerDisposedError(failMessage);
         }
     }
+    constructor(message) {
+        super(message);
+        this.name = 'ContainerDisposedError';
+        Object.setPrototypeOf(this, ContainerDisposedError.prototype);
+    }
 }

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 { tags, TaggedProvider } from './provider/TaggedProvider';
+export { whenScope, hasTags, PredicateProvider } from './provider/PredicateProvider';
 export { AutoMockedContainer } from './container/AutoMockedContainer';
 export { key, Registration } from './provider/Registration';
 export { MetadataInjector, inject } from './injector/MetadataInjector';

package/esm/provider/PredicateProvider.js

@@ -0,0 +1,25 @@
+import { ProviderDecorator } from './ProviderDecorator';
+export const hasTags = {
+    someOf: (...tags) => {
+        return (c) => tags.some((t) => c.hasTag(t));
+    },
+    allOf: (...tags) => {
+        return (c) => tags.every((t) => c.hasTag(t));
+    },
+};
+export function whenScope(predicate) {
+    return (provider) => new PredicateProvider(provider, predicate);
+}
+export class PredicateProvider extends ProviderDecorator {
+    constructor(provider, predicate) {
+        super(provider);
+        this.provider = provider;
+        this.predicate = predicate;
+    }
+    clone() {
+        return new PredicateProvider(this.provider.clone(), this.predicate);
+    }
+    isValid(container) {
+        return this.predicate(container) && this.provider.isValid(container);
+    }
+}

package/esm/provider/Provider.js

@@ -3,10 +3,6 @@ import { getMetadata, setMetadata } from '../metadata';
 const PROVIDER_KEY = 'provider';
 export const provider = (...mappers) => setMetadata(PROVIDER_KEY, mappers);
 export class Provider {
-    constructor(resolveDependency) {
-        this.resolveDependency = resolveDependency;
-        this.aliases = new Set();
-    }
     static fromClass(Target) {
         var _a;
         const mappers = (_a = getMetadata(Target, PROVIDER_KEY)) !== null && _a !== void 0 ? _a : [];
@@ -15,6 +11,10 @@ export class Provider {
     static fromValue(value) {
         return new Provider(() => value);
     }
+    constructor(resolveDependency) {
+        this.resolveDependency = resolveDependency;
+        this.aliases = new Set();
+    }
     pipe(...mappers) {
         return pipe(...mappers)(this);
     }

package/esm/provider/ProviderDecorator.js

@@ -10,8 +10,8 @@ export class ProviderDecorator {
     hasAlias(alias) {
         return this.decorated.hasAlias(alias);
     }
-    isValid(filters) {
-        return this.decorated.isValid(filters);
+    isValid(container) {
+        return this.decorated.isValid(container);
     }
     resolve(container, ...args) {
         return this.decorated.resolve(container, ...args);

package/esm/provider/Registration.js

@@ -4,10 +4,6 @@ import { DependencyMissingKeyError } from '../errors/DependencyMissingKeyError';
 const DEPENDENCY_KEY = 'DEPENDENCY_KEY';
 export const key = (value) => setMetadata(DEPENDENCY_KEY, value);
 export class Registration {
-    constructor(provider, key) {
-        this.provider = provider;
-        this.key = key;
-    }
     static fromClass(Target) {
         const dependencyKey = getMetadata(Target, DEPENDENCY_KEY);
         return new Registration(Provider.fromClass(Target), dependencyKey !== null && dependencyKey !== void 0 ? dependencyKey : Target.name);
@@ -18,6 +14,10 @@ export class Registration {
     static fromFn(fn) {
         return new Registration(new Provider(fn));
     }
+    constructor(provider, key) {
+        this.provider = provider;
+        this.key = key;
+    }
     to(key) {
         this.key = key;
         return this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "28.1.0",
+  "version": "29.0.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -58,7 +58,7 @@
     "rimraf": "3.0.2",
     "ts-jest": "27.0.5",
     "ts-node": "^10.9.1",
-    "typescript": "4.4.3"
+    "typescript": "5.4.3"
   },
-  "gitHead": "e69612c0f14d298af86263fc197b48ee4a1d8acd"
+  "gitHead": "9dac9e73a0d041ec58d7d2b8cdcb734cea57fc18"
 }

package/typings/by.d.ts

@@ -1,5 +1,5 @@
 import { DependencyKey, IContainer, InjectionToken } from './container/IContainer';
-export declare type InstancePredicate = (dep: unknown) => boolean;
+export type InstancePredicate = (dep: unknown) => boolean;
 export declare const all: InstancePredicate;
 export declare const by: {
     alias: {
@@ -14,10 +14,6 @@ export declare const by: {
          */
         all: (...aliases: DependencyKey[]) => (c: IContainer, ...args: unknown[]) => unknown[];
     };
-    scopedAliases: {
-        some: (c: IContainer, ...args: unknown[]) => unknown[];
-        all: (c: IContainer, ...args: unknown[]) => unknown[];
-    };
     /**
      * Get all instances that match the given keys
      * @param keys

package/typings/container/IContainer.d.ts

@@ -1,14 +1,14 @@
 import { IProvider } from '../provider/IProvider';
 import { constructor } from '../utils';
-export declare type Tag = string;
+export type Tag = string;
 export interface Tagged {
     readonly tags: Tag[];
     hasTag(tag: Tag): boolean;
 }
-export declare type DependencyKey = string | symbol;
+export type DependencyKey = string | symbol;
 export declare function isDependencyKey<T>(token: InjectionToken<T>): token is DependencyKey;
 export declare function isConstructor<T>(token: InjectionToken<T>): token is constructor<T>;
-export declare type InjectionToken<T = unknown> = constructor<T> | DependencyKey;
+export type InjectionToken<T = unknown> = constructor<T> | DependencyKey;
 export interface Resolvable {
     resolve<T>(key: InjectionToken<T>, ...args: unknown[]): T;
 }

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 { tags, TaggedProvider } from './provider/TaggedProvider';
+export { whenScope, hasTags, PredicateProvider } from './provider/PredicateProvider';
 export { AutoMockedContainer } from './container/AutoMockedContainer';
 export { key, Registration } from './provider/Registration';
 export { MetadataInjector, inject } from './injector/MetadataInjector';

package/typings/injector/MetadataInjector.d.ts

@@ -1,7 +1,7 @@
 import { IInjector } from './IInjector';
 import { IContainer } from '../container/IContainer';
 import { constructor } from '../utils';
-declare type InjectFn<T = unknown> = (l: IContainer, ...args: unknown[]) => T;
+type InjectFn<T = unknown> = (l: IContainer, ...args: unknown[]) => T;
 export declare const inject: (fn: InjectFn) => ParameterDecorator;
 export declare class MetadataInjector implements IInjector {
     resolve<T>(container: IContainer, Target: constructor<T>, ...deps: unknown[]): T;

package/typings/provider/ArgsProvider.d.ts

@@ -2,7 +2,7 @@ import { ProviderDecorator } from './ProviderDecorator';
 import { Resolvable } from '../container/IContainer';
 import { IProvider } from './IProvider';
 import { MapFn } from '../utils';
-export declare type ArgsFn = (l: Resolvable) => unknown[];
+export type ArgsFn = (l: Resolvable) => unknown[];
 export declare function args<T = unknown>(...extraArgs: unknown[]): MapFn<IProvider<T>>;
 export declare function argsFn<T = unknown>(value: ArgsFn): MapFn<IProvider<T>>;
 export declare class ArgsProvider<T> extends ProviderDecorator<T> {

package/typings/provider/IProvider.d.ts

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

package/typings/provider/PredicateProvider.d.ts

@@ -0,0 +1,18 @@
+import { IProvider } from './IProvider';
+import { ProviderDecorator } from './ProviderDecorator';
+import { IContainer, Tag } from '../container/IContainer';
+import { MapFn } from '../utils';
+type ContainerPredicate = (c: IContainer) => boolean;
+export declare const hasTags: {
+    someOf: (...tags: Tag[]) => ContainerPredicate;
+    allOf: (...tags: Tag[]) => ContainerPredicate;
+};
+export declare function whenScope<T = unknown>(predicate: ContainerPredicate): MapFn<IProvider<T>>;
+export declare class PredicateProvider<T> extends ProviderDecorator<T> {
+    private provider;
+    private predicate;
+    constructor(provider: IProvider<T>, predicate: ContainerPredicate);
+    clone(): PredicateProvider<T>;
+    isValid(container: IContainer): boolean;
+}
+export {};

package/typings/provider/ProviderDecorator.d.ts

@@ -1,4 +1,4 @@
-import { DependencyKey, Resolvable, Tagged } from '../container/IContainer';
+import { DependencyKey, IContainer, Resolvable } from '../container/IContainer';
 import { IProvider } from './IProvider';
 import { MapFn } from '../utils';
 export declare abstract class ProviderDecorator<T> implements IProvider<T> {
@@ -7,7 +7,7 @@ export declare abstract class ProviderDecorator<T> implements IProvider<T> {
     addAliases(...aliases: DependencyKey[]): this;
     hasAlias(alias: DependencyKey): boolean;
     abstract clone(): IProvider<T>;
-    isValid(filters: Tagged): boolean;
+    isValid(container: IContainer): boolean;
     resolve(container: Resolvable, ...args: any[]): T;
     pipe(...mappers: MapFn<IProvider<T>>[]): IProvider<T>;
 }

package/typings/utils.d.ts

@@ -1,5 +1,5 @@
-export declare type constructor<T> = new (...args: any[]) => T;
-export declare type MapFn<T> = (value: T) => T;
+export type constructor<T> = new (...args: any[]) => T;
+export type MapFn<T> = (value: T) => T;
 export declare const pipe: <T>(...mappers: MapFn<T>[]) => MapFn<T>;
 export declare function fillEmptyIndexes<T>(baseArr: (T | undefined)[], insertArr: T[]): T[];
 export declare const constant: <T>(value: T) => () => T;

package/cjm/provider/TaggedProvider.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TaggedProvider = exports.tags = void 0;
-const ProviderDecorator_1 = require("./ProviderDecorator");
-function tags(...values) {
-    return (provider) => new TaggedProvider(provider, values);
-}
-exports.tags = tags;
-class TaggedProvider extends ProviderDecorator_1.ProviderDecorator {
-    constructor(provider, tags) {
-        super(provider);
-        this.provider = provider;
-        this.tags = tags;
-    }
-    clone() {
-        return new TaggedProvider(this.provider.clone(), this.tags);
-    }
-    isValid(filters) {
-        return this.tags.some((t) => filters.hasTag(t)) && this.provider.isValid(filters);
-    }
-}
-exports.TaggedProvider = TaggedProvider;

package/esm/provider/TaggedProvider.js

@@ -1,17 +0,0 @@
-import { ProviderDecorator } from './ProviderDecorator';
-export function tags(...values) {
-    return (provider) => new TaggedProvider(provider, values);
-}
-export class TaggedProvider extends ProviderDecorator {
-    constructor(provider, tags) {
-        super(provider);
-        this.provider = provider;
-        this.tags = tags;
-    }
-    clone() {
-        return new TaggedProvider(this.provider.clone(), this.tags);
-    }
-    isValid(filters) {
-        return this.tags.some((t) => filters.hasTag(t)) && this.provider.isValid(filters);
-    }
-}

package/typings/provider/TaggedProvider.d.ts

@@ -1,12 +0,0 @@
-import { IProvider } from './IProvider';
-import { ProviderDecorator } from './ProviderDecorator';
-import { Tag, Tagged } from '../container/IContainer';
-import { MapFn } from '../utils';
-export declare function tags<T = unknown>(...values: Tag[]): MapFn<IProvider<T>>;
-export declare class TaggedProvider<T> extends ProviderDecorator<T> {
-    private provider;
-    private readonly tags;
-    constructor(provider: IProvider<T>, tags: Tag[]);
-    clone(): TaggedProvider<T>;
-    isValid(filters: Tagged): boolean;
-}