ts-ioc-container 30.1.0 → 30.2.0

package/README.md

@@ -849,13 +849,13 @@ describe('onDispose', function () {
 Sometimes you need to automatically mock all dependencies in container. This is what `AutoMockedContainer` is for.
 
 ```typescript
-import { AutoMockedContainer, Container, DependencyKey, MetadataInjector } from 'ts-ioc-container';
+import { AutoMockedContainer, Container, DependencyKey, MetadataInjector, Tagged } from 'ts-ioc-container';
 import { IMock, Mock } from 'moq.ts';
 
 export class MoqContainer extends AutoMockedContainer {
   private mocks = new Map<DependencyKey, IMock<any>>();
 
-  resolveFromChild<T>(key: DependencyKey): T {
+  resolveFromChild<T>(child: Tagged, key: DependencyKey): T {
     return this.resolveMock<T>(key).object();
   }
 

package/cjm/container/AutoMockedContainer.js

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

package/cjm/container/Container.js

@@ -29,17 +29,19 @@ class Container {
             return this.resolveByConstructor(token, ...args);
         }
         const provider = this.providers.get(token);
-        return provider?.isValid(this) ? provider.resolve(this, ...args) : this.parent.resolveFromChild(token, ...args);
+        return provider?.isVisible(this, this)
+            ? provider.resolve(this, ...args)
+            : this.parent.resolveFromChild(this, token, ...args);
     }
-    resolveFromChild(token, ...args) {
+    resolveFromChild(child, token, ...args) {
         this.validateContainer();
         if ((0, IContainer_1.isConstructor)(token)) {
             return this.resolveByConstructor(token, ...args);
         }
         const provider = this.providers.get(token);
-        return provider?.isValid(this, true)
+        return provider?.isVisible(this, child)
             ? provider.resolve(this, ...args)
-            : this.parent.resolveFromChild(token, ...args);
+            : this.parent.resolveFromChild(child, token, ...args);
     }
     resolveByConstructor(token, ...args) {
         const instance = this.injector.resolve(this, token, ...args);
@@ -97,7 +99,7 @@ class Container {
      */
     cloneValidProvidersFrom(source) {
         for (const [key, provider] of source.getAllProviders()) {
-            if (provider.isValid(this)) {
+            if (provider.isValidToClone(this)) {
                 this.providers.set(key, provider.clone());
             }
         }

package/cjm/container/EmptyContainer.js

@@ -25,7 +25,7 @@ class EmptyContainer {
     resolve(key) {
         throw new DependencyNotFoundError_1.DependencyNotFoundError(`Cannot find ${key.toString()}`);
     }
-    resolveFromChild(key, ...args) {
+    resolveFromChild(child, key, ...args) {
         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,13 +1,13 @@
 "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) ?? [];
@@ -16,25 +16,28 @@ class Provider {
     static fromValue(value) {
         return new Provider(() => value);
     }
-    constructor(resolveDependency) {
+    constructor(resolveDependency, isVisibleWhen = () => true) {
         this.resolveDependency = resolveDependency;
-        this.isHiddenFromChildren = false;
+        this.isVisibleWhen = isVisibleWhen;
     }
     pipe(...mappers) {
         return (0, utils_1.pipe)(...mappers)(this);
     }
     clone() {
-        return new Provider(this.resolveDependency);
+        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;
     }
-    isValid(container, fromChild = false) {
-        return !(this.isHiddenFromChildren && fromChild);
+    isVisible(parent, child) {
+        return this.isVisibleWhen(parent, child);
+    }
+    isValidToClone() {
+        return true;
     }
 }
 exports.Provider = Provider;

package/cjm/provider/ProviderDecorator.js

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

package/cjm/provider/ScopeProvider.js

@@ -15,8 +15,11 @@ class ScopeProvider extends ProviderDecorator_1.ProviderDecorator {
     clone() {
         return new ScopeProvider(this.provider.clone(), this.predicate);
     }
-    isValid(container) {
-        return this.predicate(container) && this.provider.isValid(container);
+    isValidToClone(container) {
+        return this.predicate(container) && this.provider.isValidToClone(container);
+    }
+    isVisible(container, child) {
+        return this.predicate(container) && this.provider.isVisible(container, child);
     }
 }
 exports.ScopeProvider = ScopeProvider;

package/esm/container/AutoMockedContainer.js

@@ -1,4 +1,5 @@
-import { MethodNotImplementedError, DependencyNotFoundError, } from '../index';
+import { MethodNotImplementedError } from '../errors/MethodNotImplementedError';
+import { DependencyNotFoundError } from '../errors/DependencyNotFoundError';
 export class AutoMockedContainer {
     getKeysByAlias(alias) {
         return [];

package/esm/container/Container.js

@@ -26,17 +26,19 @@ export class Container {
             return this.resolveByConstructor(token, ...args);
         }
         const provider = this.providers.get(token);
-        return provider?.isValid(this) ? provider.resolve(this, ...args) : this.parent.resolveFromChild(token, ...args);
+        return provider?.isVisible(this, this)
+            ? provider.resolve(this, ...args)
+            : this.parent.resolveFromChild(this, token, ...args);
     }
-    resolveFromChild(token, ...args) {
+    resolveFromChild(child, token, ...args) {
         this.validateContainer();
         if (isConstructor(token)) {
             return this.resolveByConstructor(token, ...args);
         }
         const provider = this.providers.get(token);
-        return provider?.isValid(this, true)
+        return provider?.isVisible(this, child)
             ? provider.resolve(this, ...args)
-            : this.parent.resolveFromChild(token, ...args);
+            : this.parent.resolveFromChild(child, token, ...args);
     }
     resolveByConstructor(token, ...args) {
         const instance = this.injector.resolve(this, token, ...args);
@@ -94,7 +96,7 @@ export class Container {
      */
     cloneValidProvidersFrom(source) {
         for (const [key, provider] of source.getAllProviders()) {
-            if (provider.isValid(this)) {
+            if (provider.isValidToClone(this)) {
                 this.providers.set(key, provider.clone());
             }
         }

package/esm/container/EmptyContainer.js

@@ -22,7 +22,7 @@ export class EmptyContainer {
     resolve(key) {
         throw new DependencyNotFoundError(`Cannot find ${key.toString()}`);
     }
-    resolveFromChild(key, ...args) {
+    resolveFromChild(child, key, ...args) {
         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,7 +2,7 @@ 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) ?? [];
@@ -11,24 +11,27 @@ export class Provider {
     static fromValue(value) {
         return new Provider(() => value);
     }
-    constructor(resolveDependency) {
+    constructor(resolveDependency, isVisibleWhen = () => true) {
         this.resolveDependency = resolveDependency;
-        this.isHiddenFromChildren = false;
+        this.isVisibleWhen = isVisibleWhen;
     }
     pipe(...mappers) {
         return pipe(...mappers)(this);
     }
     clone() {
-        return new Provider(this.resolveDependency);
+        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;
     }
-    isValid(container, fromChild = false) {
-        return !(this.isHiddenFromChildren && fromChild);
+    isVisible(parent, child) {
+        return this.isVisibleWhen(parent, child);
+    }
+    isValidToClone() {
+        return true;
     }
 }

package/esm/provider/ProviderDecorator.js

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

package/esm/provider/ScopeProvider.js

@@ -11,7 +11,10 @@ export class ScopeProvider extends ProviderDecorator {
     clone() {
         return new ScopeProvider(this.provider.clone(), this.predicate);
     }
-    isValid(container) {
-        return this.predicate(container) && this.provider.isValid(container);
+    isValidToClone(container) {
+        return this.predicate(container) && this.provider.isValidToClone(container);
+    }
+    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.0",
+  "version": "30.2.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -59,5 +59,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "2f754797a42e434073c21b71b0ac7cf76e8b4fec"
+  "gitHead": "fff52c43fd598f708261a295a5eb85c2385c32be"
 }

package/typings/container/AutoMockedContainer.d.ts

@@ -1,11 +1,11 @@
-import { IContainer, InjectionToken, IProvider, DependencyKey } from '../index';
-import { AliasPredicate } from './IContainer';
+import { AliasPredicate, DependencyKey, IContainer, InjectionToken, Tagged } 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 resolveFromChild<T>(child: Tagged, key: InjectionToken<T>, ...args: unknown[]): 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, Tag, Tagged } from './IContainer';
 import { IInjector } from '../injector/IInjector';
 import { IProvider } from '../provider/IProvider';
 export declare class Container implements IContainer {
@@ -16,7 +16,7 @@ export declare class Container implements IContainer {
     });
     register(key: DependencyKey, provider: IProvider, aliases?: Alias[]): this;
     resolve<T>(token: InjectionToken<T>, ...args: unknown[]): T;
-    resolveFromChild<T>(token: InjectionToken<T>, ...args: unknown[]): T;
+    resolveFromChild<T>(child: Tagged, token: InjectionToken<T>, ...args: unknown[]): 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, Tagged } from './IContainer';
 import { IProvider } from '../provider/IProvider';
 export declare class EmptyContainer implements IContainer {
     getKeysByAlias(alias: AliasPredicate): DependencyKey[];
@@ -8,7 +8,7 @@ export declare class EmptyContainer implements IContainer {
     dispose(): void;
     register(key: DependencyKey, value: IProvider): this;
     resolve<T>(key: InjectionToken<T>): T;
-    resolveFromChild<T>(key: InjectionToken<T>, ...args: unknown[]): T;
+    resolveFromChild<T>(child: Tagged, key: InjectionToken<T>, ...args: unknown[]): T;
     getAllProviders(): Map<DependencyKey, IProvider>;
     getInstances(): unknown[];
     removeScope(): void;

package/typings/container/IContainer.d.ts

@@ -7,7 +7,7 @@ export declare function isConstructor<T>(token: InjectionToken<T>): token is con
 export type InjectionToken<T = unknown> = constructor<T> | DependencyKey;
 export interface Resolvable {
     resolve<T>(key: InjectionToken<T>, ...args: unknown[]): T;
-    resolveFromChild<T>(key: InjectionToken<T>, ...args: unknown[]): T;
+    resolveFromChild<T>(child: Tagged, key: InjectionToken<T>, ...args: unknown[]): 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,10 +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;
-    isValid(container: Tagged, fromChild?: boolean): boolean;
+    isValidToClone(container: Tagged): 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,17 +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 isVisibleWhen;
     static fromClass<T>(Target: constructor<T>): IProvider<T>;
     static fromValue<T>(value: T): Provider<T>;
-    private isHiddenFromChildren;
-    constructor(resolveDependency: ResolveDependency<T>);
+    constructor(resolveDependency: ResolveDependency<T>, isVisibleWhen?: VisibilityPredicate);
     pipe(...mappers: MapFn<IProvider<T>>[]): IProvider<T>;
     clone(): Provider<T>;
     resolve(container: Resolvable, ...args: unknown[]): T;
-    hideFromChildren(): this;
-    isValid(container: Tagged, fromChild?: boolean): boolean;
+    setVisibility(isVisibleWhen: VisibilityPredicate): this;
+    isVisible(parent: Tagged, child: Tagged): boolean;
+    isValidToClone(): boolean;
 }

package/typings/provider/ProviderDecorator.d.ts

@@ -1,12 +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>;
-    isValid(container: Tagged): boolean;
+    isValidToClone(container: Tagged): 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

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