ts-ioc-container 30.1.1 → 30.3.0

package/README.md

@@ -318,7 +318,7 @@ describe('SimpleInjector', function () {
     }
 
     const container = new Container(new SimpleInjector()).use(R.fromClass(App).to('App'));
-    const app = container.resolve<App>('App', 'Hello world');
+    const app = container.resolve<App>('App', { args: ['Hello world'] });
 
     expect(app.greeting).toBe('Hello world');
   });
@@ -378,7 +378,7 @@ describe('ProxyInjector', function () {
       .use(R.fromClass(App).to('App').pipe(args({ greetingTemplate })))
       .use(R.fromClass(Logger).to('logger'));
 
-    const app = container.resolve<App>('App', { name: `world` });
+    const app = container.resolve<App>('App', { args: [{ name: `world` }] });
     expect(app.greeting).toBe('Hello world');
   });
 });
@@ -592,7 +592,7 @@ describe('ArgsProvider', function () {
   it('should set provider arguments with highest priority in compare to resolve arguments', function () {
     const root = createContainer().use(R.fromClass(Logger).pipe(args('name')));
 
-    const logger = root.resolve<Logger>('logger', 'file');
+    const logger = root.resolve<Logger>('logger', { args: ['file'] });
 
     expect(logger.name).toBe('name');
     expect(logger.type).toBe('file');
@@ -855,7 +855,7 @@ import { IMock, Mock } from 'moq.ts';
 export class MoqContainer extends AutoMockedContainer {
   private mocks = new Map<DependencyKey, IMock<any>>();
 
-  resolveFromChild<T>(key: DependencyKey): T {
+  resolve<T>(key: DependencyKey): T {
     return this.resolveMock<T>(key).object();
   }
 

package/cjm/by.js

@@ -8,7 +8,7 @@ const isPresent = (value) => value !== null && value !== undefined;
 exports.isPresent = isPresent;
 const resolveSilently = (c, ...args) => (key) => {
     try {
-        return c.resolve(key, ...args);
+        return c.resolve(key, { args });
     }
     catch (e) {
         if (e instanceof DependencyNotFoundError_1.DependencyNotFoundError) {
@@ -27,13 +27,13 @@ exports.by = {
      * Get all instances that match the given keys
      * @param keys
      */
-    keys: (...keys) => (с, ...args) => keys.map((t) => с.resolve(t, ...args)),
+    keys: (...keys) => (с, ...args) => keys.map((t) => с.resolve(t, { args })),
     /**
      * Get the instance that matches the given key
      * @param key
      * @param deps
      */
-    key: (key, ...deps) => (c, ...args) => c.resolve(key, ...deps, ...args),
+    key: (key, ...deps) => (c, ...args) => c.resolve(key, { args: [...deps, ...args] }),
     /**
      * Get all instances that match the given predicate
      * @param predicate

package/cjm/container/AutoMockedContainer.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AutoMockedContainer = void 0;
-const index_1 = require("../index");
+const MethodNotImplementedError_1 = require("../errors/MethodNotImplementedError");
 class AutoMockedContainer {
     getKeysByAlias(alias) {
         return [];
@@ -10,10 +10,7 @@ class AutoMockedContainer {
         return false;
     }
     createScope() {
-        throw new index_1.MethodNotImplementedError();
-    }
-    resolve(key, ...args) {
-        throw new index_1.DependencyNotFoundError(`Cannot find ${key.toString()}`);
+        throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
     dispose() { }
     register() {

package/cjm/container/Container.js

@@ -23,25 +23,15 @@ class Container {
         }
         return this;
     }
-    resolve(token, ...args) {
+    resolve(token, { args = [], child = this } = {}) {
         this.validateContainer();
         if ((0, IContainer_1.isConstructor)(token)) {
             return this.resolveByConstructor(token, ...args);
         }
         const provider = this.providers.get(token);
-        return provider?.isValidToResolve(this)
+        return provider?.isVisible(this, child)
             ? provider.resolve(this, ...args)
-            : this.parent.resolveFromChild(token, ...args);
-    }
-    resolveFromChild(token, ...args) {
-        this.validateContainer();
-        if ((0, IContainer_1.isConstructor)(token)) {
-            return this.resolveByConstructor(token, ...args);
-        }
-        const provider = this.providers.get(token);
-        return provider?.isValidToResolve(this, true)
-            ? provider.resolve(this, ...args)
-            : this.parent.resolveFromChild(token, ...args);
+            : this.parent.resolve(token, { args, child });
     }
     resolveByConstructor(token, ...args) {
         const instance = this.injector.resolve(this, token, ...args);

package/cjm/container/EmptyContainer.js

@@ -22,10 +22,7 @@ class EmptyContainer {
     register(key, value) {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
-    resolve(key) {
-        throw new DependencyNotFoundError_1.DependencyNotFoundError(`Cannot find ${key.toString()}`);
-    }
-    resolveFromChild(key, ...args) {
+    resolve(key, options) {
         throw new DependencyNotFoundError_1.DependencyNotFoundError(`Cannot find ${key.toString()}`);
     }
     getAllProviders() {

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.alias = exports.register = exports.Registration = exports.key = exports.AutoMockedContainer = exports.ScopeProvider = exports.scope = exports.SingletonProvider = exports.singleton = exports.ArgsProvider = exports.args = exports.argsFn = exports.hideFromChildren = exports.provider = exports.Provider = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = 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.setVisibility = 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");
@@ -16,7 +16,7 @@ Object.defineProperty(exports, "ContainerDisposedError", { enumerable: true, get
 var Provider_1 = require("./provider/Provider");
 Object.defineProperty(exports, "Provider", { enumerable: true, get: function () { return Provider_1.Provider; } });
 Object.defineProperty(exports, "provider", { enumerable: true, get: function () { return Provider_1.provider; } });
-Object.defineProperty(exports, "hideFromChildren", { enumerable: true, get: function () { return Provider_1.hideFromChildren; } });
+Object.defineProperty(exports, "setVisibility", { enumerable: true, get: function () { return Provider_1.setVisibility; } });
 var ArgsProvider_1 = require("./provider/ArgsProvider");
 Object.defineProperty(exports, "argsFn", { enumerable: true, get: function () { return ArgsProvider_1.argsFn; } });
 Object.defineProperty(exports, "args", { enumerable: true, get: function () { return ArgsProvider_1.args; } });

package/cjm/provider/Provider.js

@@ -1,40 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Provider = exports.hideFromChildren = exports.provider = void 0;
+exports.Provider = exports.setVisibility = exports.provider = void 0;
 const utils_1 = require("../utils");
 const metadata_1 = require("../metadata");
 const PROVIDER_KEY = 'provider';
 const provider = (...mappers) => (0, metadata_1.setMetadata)(PROVIDER_KEY, mappers);
 exports.provider = provider;
-const hideFromChildren = (p) => p.hideFromChildren();
-exports.hideFromChildren = hideFromChildren;
+const setVisibility = (isVisibleWhen) => (p) => p.setVisibility(isVisibleWhen);
+exports.setVisibility = setVisibility;
 class Provider {
     static fromClass(Target) {
         const mappers = (0, metadata_1.getMetadata)(Target, PROVIDER_KEY) ?? [];
-        return new Provider((container, ...args) => container.resolve(Target, ...args)).pipe(...mappers);
+        return new Provider((container, ...args) => container.resolve(Target, { args })).pipe(...mappers);
     }
     static fromValue(value) {
         return new Provider(() => value);
     }
-    constructor(resolveDependency, isHiddenFromChildren = false) {
+    constructor(resolveDependency, isVisibleWhen = () => true) {
         this.resolveDependency = resolveDependency;
-        this.isHiddenFromChildren = isHiddenFromChildren;
+        this.isVisibleWhen = isVisibleWhen;
     }
     pipe(...mappers) {
         return (0, utils_1.pipe)(...mappers)(this);
     }
     clone() {
-        return new Provider(this.resolveDependency, this.isHiddenFromChildren);
+        return new Provider(this.resolveDependency, this.isVisibleWhen);
     }
     resolve(container, ...args) {
         return this.resolveDependency(container, ...args);
     }
-    hideFromChildren() {
-        this.isHiddenFromChildren = true;
+    setVisibility(isVisibleWhen) {
+        this.isVisibleWhen = isVisibleWhen;
         return this;
     }
-    isValidToResolve(container, fromChild) {
-        return !(this.isHiddenFromChildren && fromChild);
+    isVisible(parent, child) {
+        return this.isVisibleWhen(parent, child);
     }
     isValidToClone() {
         return true;

package/cjm/provider/ProviderDecorator.js

@@ -6,15 +6,15 @@ class ProviderDecorator {
     constructor(decorated) {
         this.decorated = decorated;
     }
-    hideFromChildren() {
-        this.decorated.hideFromChildren();
+    setVisibility(predicate) {
+        this.decorated.setVisibility(predicate);
         return this;
     }
     isValidToClone(container) {
         return this.decorated.isValidToClone(container);
     }
-    isValidToResolve(container, fromChild) {
-        return this.decorated.isValidToResolve(container, fromChild);
+    isVisible(parent, child) {
+        return this.decorated.isVisible(parent, child);
     }
     resolve(container, ...args) {
         return this.decorated.resolve(container, ...args);

package/cjm/provider/ScopeProvider.js

@@ -18,8 +18,8 @@ class ScopeProvider extends ProviderDecorator_1.ProviderDecorator {
     isValidToClone(container) {
         return this.predicate(container) && this.provider.isValidToClone(container);
     }
-    isValidToResolve(container, fromChild) {
-        return this.predicate(container) && this.provider.isValidToResolve(container, fromChild);
+    isVisible(container, child) {
+        return this.predicate(container) && this.provider.isVisible(container, child);
     }
 }
 exports.ScopeProvider = ScopeProvider;

package/esm/by.js

@@ -3,7 +3,7 @@ export const all = () => true;
 export const isPresent = (value) => value !== null && value !== undefined;
 export const resolveSilently = (c, ...args) => (key) => {
     try {
-        return c.resolve(key, ...args);
+        return c.resolve(key, { args });
     }
     catch (e) {
         if (e instanceof DependencyNotFoundError) {
@@ -21,13 +21,13 @@ export const by = {
      * Get all instances that match the given keys
      * @param keys
      */
-    keys: (...keys) => (с, ...args) => keys.map((t) => с.resolve(t, ...args)),
+    keys: (...keys) => (с, ...args) => keys.map((t) => с.resolve(t, { args })),
     /**
      * Get the instance that matches the given key
      * @param key
      * @param deps
      */
-    key: (key, ...deps) => (c, ...args) => c.resolve(key, ...deps, ...args),
+    key: (key, ...deps) => (c, ...args) => c.resolve(key, { args: [...deps, ...args] }),
     /**
      * Get all instances that match the given predicate
      * @param predicate

package/esm/container/AutoMockedContainer.js

@@ -1,4 +1,4 @@
-import { MethodNotImplementedError, DependencyNotFoundError, } from '../index';
+import { MethodNotImplementedError } from '../errors/MethodNotImplementedError';
 export class AutoMockedContainer {
     getKeysByAlias(alias) {
         return [];
@@ -9,9 +9,6 @@ export class AutoMockedContainer {
     createScope() {
         throw new MethodNotImplementedError();
     }
-    resolve(key, ...args) {
-        throw new DependencyNotFoundError(`Cannot find ${key.toString()}`);
-    }
     dispose() { }
     register() {
         return this;

package/esm/container/Container.js

@@ -20,25 +20,15 @@ export class Container {
         }
         return this;
     }
-    resolve(token, ...args) {
+    resolve(token, { args = [], child = this } = {}) {
         this.validateContainer();
         if (isConstructor(token)) {
             return this.resolveByConstructor(token, ...args);
         }
         const provider = this.providers.get(token);
-        return provider?.isValidToResolve(this)
+        return provider?.isVisible(this, child)
             ? provider.resolve(this, ...args)
-            : this.parent.resolveFromChild(token, ...args);
-    }
-    resolveFromChild(token, ...args) {
-        this.validateContainer();
-        if (isConstructor(token)) {
-            return this.resolveByConstructor(token, ...args);
-        }
-        const provider = this.providers.get(token);
-        return provider?.isValidToResolve(this, true)
-            ? provider.resolve(this, ...args)
-            : this.parent.resolveFromChild(token, ...args);
+            : this.parent.resolve(token, { args, child });
     }
     resolveByConstructor(token, ...args) {
         const instance = this.injector.resolve(this, token, ...args);

package/esm/container/EmptyContainer.js

@@ -19,10 +19,7 @@ export class EmptyContainer {
     register(key, value) {
         throw new MethodNotImplementedError();
     }
-    resolve(key) {
-        throw new DependencyNotFoundError(`Cannot find ${key.toString()}`);
-    }
-    resolveFromChild(key, ...args) {
+    resolve(key, options) {
         throw new DependencyNotFoundError(`Cannot find ${key.toString()}`);
     }
     getAllProviders() {

package/esm/index.js

@@ -4,7 +4,7 @@ export { EmptyContainer } from './container/EmptyContainer';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
-export { Provider, provider, hideFromChildren } from './provider/Provider';
+export { Provider, provider, setVisibility } from './provider/Provider';
 export { argsFn, args, ArgsProvider } from './provider/ArgsProvider';
 export { singleton, SingletonProvider } from './provider/SingletonProvider';
 export { scope, ScopeProvider } from './provider/ScopeProvider';

package/esm/provider/Provider.js

@@ -2,34 +2,34 @@ import { pipe } from '../utils';
 import { getMetadata, setMetadata } from '../metadata';
 const PROVIDER_KEY = 'provider';
 export const provider = (...mappers) => setMetadata(PROVIDER_KEY, mappers);
-export const hideFromChildren = (p) => p.hideFromChildren();
+export const setVisibility = (isVisibleWhen) => (p) => p.setVisibility(isVisibleWhen);
 export class Provider {
     static fromClass(Target) {
         const mappers = getMetadata(Target, PROVIDER_KEY) ?? [];
-        return new Provider((container, ...args) => container.resolve(Target, ...args)).pipe(...mappers);
+        return new Provider((container, ...args) => container.resolve(Target, { args })).pipe(...mappers);
     }
     static fromValue(value) {
         return new Provider(() => value);
     }
-    constructor(resolveDependency, isHiddenFromChildren = false) {
+    constructor(resolveDependency, isVisibleWhen = () => true) {
         this.resolveDependency = resolveDependency;
-        this.isHiddenFromChildren = isHiddenFromChildren;
+        this.isVisibleWhen = isVisibleWhen;
     }
     pipe(...mappers) {
         return pipe(...mappers)(this);
     }
     clone() {
-        return new Provider(this.resolveDependency, this.isHiddenFromChildren);
+        return new Provider(this.resolveDependency, this.isVisibleWhen);
     }
     resolve(container, ...args) {
         return this.resolveDependency(container, ...args);
     }
-    hideFromChildren() {
-        this.isHiddenFromChildren = true;
+    setVisibility(isVisibleWhen) {
+        this.isVisibleWhen = isVisibleWhen;
         return this;
     }
-    isValidToResolve(container, fromChild) {
-        return !(this.isHiddenFromChildren && fromChild);
+    isVisible(parent, child) {
+        return this.isVisibleWhen(parent, child);
     }
     isValidToClone() {
         return true;

package/esm/provider/ProviderDecorator.js

@@ -3,15 +3,15 @@ export class ProviderDecorator {
     constructor(decorated) {
         this.decorated = decorated;
     }
-    hideFromChildren() {
-        this.decorated.hideFromChildren();
+    setVisibility(predicate) {
+        this.decorated.setVisibility(predicate);
         return this;
     }
     isValidToClone(container) {
         return this.decorated.isValidToClone(container);
     }
-    isValidToResolve(container, fromChild) {
-        return this.decorated.isValidToResolve(container, fromChild);
+    isVisible(parent, child) {
+        return this.decorated.isVisible(parent, child);
     }
     resolve(container, ...args) {
         return this.decorated.resolve(container, ...args);

package/esm/provider/ScopeProvider.js

@@ -14,7 +14,7 @@ export class ScopeProvider extends ProviderDecorator {
     isValidToClone(container) {
         return this.predicate(container) && this.provider.isValidToClone(container);
     }
-    isValidToResolve(container, fromChild) {
-        return this.predicate(container) && this.provider.isValidToResolve(container, fromChild);
+    isVisible(container, child) {
+        return this.predicate(container) && this.provider.isVisible(container, child);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "30.1.1",
+  "version": "30.3.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -59,5 +59,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "9ca59e3a16fb4683f00a01d5b0d75dc96151bc8e"
+  "gitHead": "d5b0081792a674f41d74a8c716482270de229e93"
 }

package/typings/container/AutoMockedContainer.d.ts

@@ -1,11 +1,10 @@
-import { IContainer, InjectionToken, IProvider, DependencyKey } from '../index';
-import { AliasPredicate } from './IContainer';
+import { AliasPredicate, DependencyKey, IContainer, InjectionToken, ResolveOptions } from './IContainer';
+import { IProvider } from '../provider/IProvider';
 export declare abstract class AutoMockedContainer implements IContainer {
     getKeysByAlias(alias: AliasPredicate): DependencyKey[];
     hasDependency(key: string): boolean;
     createScope(): IContainer;
-    resolve<T>(key: InjectionToken<T>, ...args: unknown[]): T;
-    abstract resolveFromChild<T>(key: InjectionToken<T>, ...args: unknown[]): T;
+    abstract resolve<T>(key: InjectionToken<T>, options?: ResolveOptions): T;
     dispose(): void;
     register(): this;
     getInstances(): unknown[];

package/typings/container/Container.d.ts

@@ -1,4 +1,4 @@
-import { Alias, AliasPredicate, DependencyKey, IContainer, IContainerModule, InjectionToken, Tag } from './IContainer';
+import { Alias, AliasPredicate, DependencyKey, IContainer, IContainerModule, InjectionToken, ResolveOptions, Tag } from './IContainer';
 import { IInjector } from '../injector/IInjector';
 import { IProvider } from '../provider/IProvider';
 export declare class Container implements IContainer {
@@ -15,8 +15,7 @@ export declare class Container implements IContainer {
         tags?: Tag[];
     });
     register(key: DependencyKey, provider: IProvider, aliases?: Alias[]): this;
-    resolve<T>(token: InjectionToken<T>, ...args: unknown[]): T;
-    resolveFromChild<T>(token: InjectionToken<T>, ...args: unknown[]): T;
+    resolve<T>(token: InjectionToken<T>, { args, child }?: ResolveOptions): T;
     private resolveByConstructor;
     createScope(...tags: Tag[]): Container;
     dispose(): void;

package/typings/container/EmptyContainer.d.ts

@@ -1,4 +1,4 @@
-import { AliasPredicate, DependencyKey, IContainer, IContainerModule, InjectionToken } from './IContainer';
+import { AliasPredicate, DependencyKey, IContainer, IContainerModule, InjectionToken, ResolveOptions } from './IContainer';
 import { IProvider } from '../provider/IProvider';
 export declare class EmptyContainer implements IContainer {
     getKeysByAlias(alias: AliasPredicate): DependencyKey[];
@@ -7,8 +7,7 @@ export declare class EmptyContainer implements IContainer {
     createScope(): IContainer;
     dispose(): void;
     register(key: DependencyKey, value: IProvider): this;
-    resolve<T>(key: InjectionToken<T>): T;
-    resolveFromChild<T>(key: InjectionToken<T>, ...args: unknown[]): T;
+    resolve<T>(key: InjectionToken<T>, options: ResolveOptions): T;
     getAllProviders(): Map<DependencyKey, IProvider>;
     getInstances(): unknown[];
     removeScope(): void;

package/typings/container/IContainer.d.ts

@@ -5,9 +5,12 @@ 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 type InjectionToken<T = unknown> = constructor<T> | DependencyKey;
+export type ResolveOptions = {
+    args?: unknown[];
+    child?: Tagged;
+};
 export interface Resolvable {
-    resolve<T>(key: InjectionToken<T>, ...args: unknown[]): T;
-    resolveFromChild<T>(key: InjectionToken<T>, ...args: unknown[]): T;
+    resolve<T>(key: InjectionToken<T>, options?: ResolveOptions): T;
 }
 export interface IContainerModule {
     applyTo(container: IContainer): void;

package/typings/index.d.ts

@@ -7,7 +7,7 @@ export { IInjector } from './injector/IInjector';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
-export { Provider, provider, hideFromChildren } from './provider/Provider';
+export { Provider, provider, setVisibility } from './provider/Provider';
 export { ArgsFn, argsFn, args, ArgsProvider } from './provider/ArgsProvider';
 export { singleton, SingletonProvider } from './provider/SingletonProvider';
 export { scope, ScopeProvider } from './provider/ScopeProvider';

package/typings/provider/IProvider.d.ts

@@ -1,11 +1,12 @@
-import { Resolvable, Tagged } from '../container/IContainer';
+import { IContainer, Resolvable, Tagged } from '../container/IContainer';
 import { MapFn } from '../utils';
 export type ResolveDependency<T = unknown> = (container: Resolvable, ...args: unknown[]) => T;
+export type VisibilityPredicate = (parent: Tagged, child: Tagged) => boolean;
 export interface IProvider<T = unknown> {
     clone(): IProvider<T>;
     resolve(container: Resolvable, ...args: unknown[]): T;
     isValidToClone(container: Tagged): boolean;
-    isValidToResolve(container: Tagged, fromChild?: boolean): boolean;
+    isVisible(parent: IContainer, child: Tagged): boolean;
     pipe(...mappers: MapFn<IProvider<T>>[]): IProvider<T>;
-    hideFromChildren(): this;
+    setVisibility(isVisibleWhen: VisibilityPredicate): this;
 }

package/typings/provider/Provider.d.ts

@@ -1,18 +1,18 @@
-import { IProvider, ResolveDependency } from './IProvider';
+import { VisibilityPredicate, IProvider, ResolveDependency } from './IProvider';
 import { Resolvable, Tagged } from '../container/IContainer';
 import { constructor, MapFn } from '../utils';
 export declare const provider: (...mappers: MapFn<IProvider>[]) => ClassDecorator;
-export declare const hideFromChildren: MapFn<IProvider>;
+export declare const setVisibility: (isVisibleWhen: VisibilityPredicate) => MapFn<IProvider>;
 export declare class Provider<T> implements IProvider<T> {
     private readonly resolveDependency;
-    private isHiddenFromChildren;
+    private isVisibleWhen;
     static fromClass<T>(Target: constructor<T>): IProvider<T>;
     static fromValue<T>(value: T): Provider<T>;
-    constructor(resolveDependency: ResolveDependency<T>, isHiddenFromChildren?: boolean);
+    constructor(resolveDependency: ResolveDependency<T>, isVisibleWhen?: VisibilityPredicate);
     pipe(...mappers: MapFn<IProvider<T>>[]): IProvider<T>;
     clone(): Provider<T>;
     resolve(container: Resolvable, ...args: unknown[]): T;
-    hideFromChildren(): this;
-    isValidToResolve(container: Tagged, fromChild?: boolean): boolean;
+    setVisibility(isVisibleWhen: VisibilityPredicate): this;
+    isVisible(parent: Tagged, child: Tagged): boolean;
     isValidToClone(): boolean;
 }

package/typings/provider/ProviderDecorator.d.ts

@@ -1,13 +1,13 @@
-import { Resolvable, Tagged } from '../container/IContainer';
-import { IProvider } from './IProvider';
+import { IContainer, Resolvable, Tagged } from '../container/IContainer';
+import { VisibilityPredicate, IProvider } from './IProvider';
 import { MapFn } from '../utils';
 export declare abstract class ProviderDecorator<T> implements IProvider<T> {
     private decorated;
     protected constructor(decorated: IProvider<T>);
-    hideFromChildren(): this;
+    setVisibility(predicate: VisibilityPredicate): this;
     abstract clone(): IProvider<T>;
     isValidToClone(container: Tagged): boolean;
-    isValidToResolve(container: Tagged, fromChild?: boolean): boolean;
+    isVisible(parent: IContainer, child: Tagged): boolean;
     resolve(container: Resolvable, ...args: any[]): T;
     pipe(...mappers: MapFn<IProvider<T>>[]): IProvider<T>;
 }

package/typings/provider/ScopeProvider.d.ts

@@ -10,6 +10,6 @@ export declare class ScopeProvider<T> extends ProviderDecorator<T> {
     constructor(provider: IProvider<T>, predicate: ContainerPredicate);
     clone(): ScopeProvider<T>;
     isValidToClone(container: IContainer): boolean;
-    isValidToResolve(container: IContainer, fromChild?: boolean): boolean;
+    isVisible(container: IContainer, child: Tagged): boolean;
 }
 export {};