ts-ioc-container 30.3.0 → 30.4.0

package/cjm/container/Container.js

@@ -26,18 +26,15 @@ class Container {
     resolve(token, { args = [], child = this } = {}) {
         this.validateContainer();
         if ((0, IContainer_1.isConstructor)(token)) {
-            return this.resolveByConstructor(token, ...args);
+            const instance = this.injector.resolve(this, token, ...args);
+            this.instances.add(instance);
+            return instance;
         }
         const provider = this.providers.get(token);
         return provider?.isVisible(this, child)
             ? provider.resolve(this, ...args)
             : this.parent.resolve(token, { args, child });
     }
-    resolveByConstructor(token, ...args) {
-        const instance = this.injector.resolve(this, token, ...args);
-        this.instances.add(instance);
-        return instance;
-    }
     createScope(...tags) {
         this.validateContainer();
         const scope = new Container(this.injector, { parent: this, tags });

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.setVisibility = 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.SingletonProvider = exports.singleton = exports.ArgsProvider = exports.args = exports.argsFn = exports.scope = exports.visible = 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,8 @@ 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, "setVisibility", { enumerable: true, get: function () { return Provider_1.setVisibility; } });
+Object.defineProperty(exports, "visible", { enumerable: true, get: function () { return Provider_1.visible; } });
+Object.defineProperty(exports, "scope", { enumerable: true, get: function () { return Provider_1.scope; } });
 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; } });
@@ -24,9 +25,6 @@ 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 ScopeProvider_1 = require("./provider/ScopeProvider");
-Object.defineProperty(exports, "scope", { enumerable: true, get: function () { return ScopeProvider_1.scope; } });
-Object.defineProperty(exports, "ScopeProvider", { enumerable: true, get: function () { return ScopeProvider_1.ScopeProvider; } });
 var AutoMockedContainer_1 = require("./container/AutoMockedContainer");
 Object.defineProperty(exports, "AutoMockedContainer", { enumerable: true, get: function () { return AutoMockedContainer_1.AutoMockedContainer; } });
 var Registration_1 = require("./provider/Registration");

package/cjm/provider/Provider.js

@@ -1,13 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Provider = exports.setVisibility = exports.provider = void 0;
+exports.Provider = exports.scope = exports.visible = 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 setVisibility = (isVisibleWhen) => (p) => p.setVisibility(isVisibleWhen);
-exports.setVisibility = setVisibility;
+const visible = (isVisibleWhen) => (p) => p.setVisibility(isVisibleWhen);
+exports.visible = visible;
+function scope(predicate) {
+    return (provider) => provider.setScopePredicate(predicate);
+}
+exports.scope = scope;
 class Provider {
     static fromClass(Target) {
         const mappers = (0, metadata_1.getMetadata)(Target, PROVIDER_KEY) ?? [];
@@ -16,28 +20,33 @@ class Provider {
     static fromValue(value) {
         return new Provider(() => value);
     }
-    constructor(resolveDependency, isVisibleWhen = () => true) {
+    constructor(resolveDependency, isVisibleWhen = () => true, isValidWhen = () => true) {
         this.resolveDependency = resolveDependency;
         this.isVisibleWhen = isVisibleWhen;
+        this.isValidWhen = isValidWhen;
     }
     pipe(...mappers) {
         return (0, utils_1.pipe)(...mappers)(this);
     }
     clone() {
-        return new Provider(this.resolveDependency, this.isVisibleWhen);
+        return new Provider(this.resolveDependency, this.isVisibleWhen, this.isValidWhen);
     }
     resolve(container, ...args) {
         return this.resolveDependency(container, ...args);
     }
-    setVisibility(isVisibleWhen) {
-        this.isVisibleWhen = isVisibleWhen;
+    setVisibility(predicate) {
+        this.isVisibleWhen = predicate;
+        return this;
+    }
+    setScopePredicate(isValidWhen) {
+        this.isValidWhen = isValidWhen;
         return this;
     }
     isVisible(parent, child) {
-        return this.isVisibleWhen(parent, child);
+        return this.isValidWhen(parent) && this.isVisibleWhen({ child, isParent: child === parent });
     }
-    isValidToClone() {
-        return true;
+    isValidToClone(container) {
+        return this.isValidWhen(container);
     }
 }
 exports.Provider = Provider;

package/cjm/provider/ProviderDecorator.js

@@ -6,6 +6,10 @@ class ProviderDecorator {
     constructor(decorated) {
         this.decorated = decorated;
     }
+    setScopePredicate(isValidWhen) {
+        this.decorated.setScopePredicate(isValidWhen);
+        return this;
+    }
     setVisibility(predicate) {
         this.decorated.setVisibility(predicate);
         return this;

package/esm/container/Container.js

@@ -23,18 +23,15 @@ export class Container {
     resolve(token, { args = [], child = this } = {}) {
         this.validateContainer();
         if (isConstructor(token)) {
-            return this.resolveByConstructor(token, ...args);
+            const instance = this.injector.resolve(this, token, ...args);
+            this.instances.add(instance);
+            return instance;
         }
         const provider = this.providers.get(token);
         return provider?.isVisible(this, child)
             ? provider.resolve(this, ...args)
             : this.parent.resolve(token, { args, child });
     }
-    resolveByConstructor(token, ...args) {
-        const instance = this.injector.resolve(this, token, ...args);
-        this.instances.add(instance);
-        return instance;
-    }
     createScope(...tags) {
         this.validateContainer();
         const scope = new Container(this.injector, { parent: this, tags });

package/esm/index.js

@@ -4,10 +4,9 @@ export { EmptyContainer } from './container/EmptyContainer';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
-export { Provider, provider, setVisibility } from './provider/Provider';
+export { Provider, provider, visible, scope } from './provider/Provider';
 export { argsFn, args, ArgsProvider } from './provider/ArgsProvider';
 export { singleton, SingletonProvider } from './provider/SingletonProvider';
-export { scope, ScopeProvider } from './provider/ScopeProvider';
 export { AutoMockedContainer } from './container/AutoMockedContainer';
 export { key, Registration, register, alias } from './provider/Registration';
 export { MetadataInjector, inject } from './injector/MetadataInjector';

package/esm/provider/Provider.js

@@ -2,7 +2,10 @@ import { pipe } from '../utils';
 import { getMetadata, setMetadata } from '../metadata';
 const PROVIDER_KEY = 'provider';
 export const provider = (...mappers) => setMetadata(PROVIDER_KEY, mappers);
-export const setVisibility = (isVisibleWhen) => (p) => p.setVisibility(isVisibleWhen);
+export const visible = (isVisibleWhen) => (p) => p.setVisibility(isVisibleWhen);
+export function scope(predicate) {
+    return (provider) => provider.setScopePredicate(predicate);
+}
 export class Provider {
     static fromClass(Target) {
         const mappers = getMetadata(Target, PROVIDER_KEY) ?? [];
@@ -11,27 +14,32 @@ export class Provider {
     static fromValue(value) {
         return new Provider(() => value);
     }
-    constructor(resolveDependency, isVisibleWhen = () => true) {
+    constructor(resolveDependency, isVisibleWhen = () => true, isValidWhen = () => true) {
         this.resolveDependency = resolveDependency;
         this.isVisibleWhen = isVisibleWhen;
+        this.isValidWhen = isValidWhen;
     }
     pipe(...mappers) {
         return pipe(...mappers)(this);
     }
     clone() {
-        return new Provider(this.resolveDependency, this.isVisibleWhen);
+        return new Provider(this.resolveDependency, this.isVisibleWhen, this.isValidWhen);
     }
     resolve(container, ...args) {
         return this.resolveDependency(container, ...args);
     }
-    setVisibility(isVisibleWhen) {
-        this.isVisibleWhen = isVisibleWhen;
+    setVisibility(predicate) {
+        this.isVisibleWhen = predicate;
+        return this;
+    }
+    setScopePredicate(isValidWhen) {
+        this.isValidWhen = isValidWhen;
         return this;
     }
     isVisible(parent, child) {
-        return this.isVisibleWhen(parent, child);
+        return this.isValidWhen(parent) && this.isVisibleWhen({ child, isParent: child === parent });
     }
-    isValidToClone() {
-        return true;
+    isValidToClone(container) {
+        return this.isValidWhen(container);
     }
 }

package/esm/provider/ProviderDecorator.js

@@ -3,6 +3,10 @@ export class ProviderDecorator {
     constructor(decorated) {
         this.decorated = decorated;
     }
+    setScopePredicate(isValidWhen) {
+        this.decorated.setScopePredicate(isValidWhen);
+        return this;
+    }
     setVisibility(predicate) {
         this.decorated.setVisibility(predicate);
         return this;

package/package.json

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

package/typings/container/Container.d.ts

@@ -16,7 +16,6 @@ export declare class Container implements IContainer {
     });
     register(key: DependencyKey, provider: IProvider, aliases?: Alias[]): this;
     resolve<T>(token: InjectionToken<T>, { args, child }?: ResolveOptions): T;
-    private resolveByConstructor;
     createScope(...tags: Tag[]): Container;
     dispose(): void;
     getInstances(): unknown[];

package/typings/index.d.ts

@@ -7,10 +7,9 @@ export { IInjector } from './injector/IInjector';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
-export { Provider, provider, setVisibility } from './provider/Provider';
+export { Provider, provider, visible, scope } from './provider/Provider';
 export { ArgsFn, argsFn, args, ArgsProvider } from './provider/ArgsProvider';
 export { singleton, SingletonProvider } from './provider/SingletonProvider';
-export { scope, ScopeProvider } from './provider/ScopeProvider';
 export { AutoMockedContainer } from './container/AutoMockedContainer';
 export { key, Registration, register, alias } from './provider/Registration';
 export { MetadataInjector, inject } from './injector/MetadataInjector';

package/typings/provider/IProvider.d.ts

@@ -1,12 +1,17 @@
-import { IContainer, Resolvable, Tagged } from '../container/IContainer';
+import { 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 type ChildrenVisibilityPredicate = (options: {
+    child: Tagged;
+    isParent: boolean;
+}) => boolean;
+export type ScopePredicate = (c: Tagged) => boolean;
 export interface IProvider<T = unknown> {
     clone(): IProvider<T>;
     resolve(container: Resolvable, ...args: unknown[]): T;
     isValidToClone(container: Tagged): boolean;
-    isVisible(parent: IContainer, child: Tagged): boolean;
+    isVisible(parent: Tagged, child: Tagged): boolean;
     pipe(...mappers: MapFn<IProvider<T>>[]): IProvider<T>;
-    setVisibility(isVisibleWhen: VisibilityPredicate): this;
+    setVisibility(isVisibleWhen: ChildrenVisibilityPredicate): this;
+    setScopePredicate(isValidWhen: ScopePredicate): this;
 }

package/typings/provider/Provider.d.ts

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

package/typings/provider/ProviderDecorator.d.ts

@@ -1,10 +1,11 @@
 import { IContainer, Resolvable, Tagged } from '../container/IContainer';
-import { VisibilityPredicate, IProvider } from './IProvider';
+import { ChildrenVisibilityPredicate, IProvider, ScopePredicate } from './IProvider';
 import { MapFn } from '../utils';
 export declare abstract class ProviderDecorator<T> implements IProvider<T> {
     private decorated;
     protected constructor(decorated: IProvider<T>);
-    setVisibility(predicate: VisibilityPredicate): this;
+    setScopePredicate(isValidWhen: ScopePredicate): this;
+    setVisibility(predicate: ChildrenVisibilityPredicate): this;
     abstract clone(): IProvider<T>;
     isValidToClone(container: Tagged): boolean;
     isVisible(parent: IContainer, child: Tagged): boolean;

package/cjm/provider/ScopeProvider.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ScopeProvider = exports.scope = void 0;
-const ProviderDecorator_1 = require("./ProviderDecorator");
-function scope(predicate) {
-    return (provider) => new ScopeProvider(provider, predicate);
-}
-exports.scope = scope;
-class ScopeProvider extends ProviderDecorator_1.ProviderDecorator {
-    constructor(provider, predicate) {
-        super(provider);
-        this.provider = provider;
-        this.predicate = predicate;
-    }
-    clone() {
-        return new ScopeProvider(this.provider.clone(), this.predicate);
-    }
-    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/provider/ScopeProvider.js

@@ -1,20 +0,0 @@
-import { ProviderDecorator } from './ProviderDecorator';
-export function scope(predicate) {
-    return (provider) => new ScopeProvider(provider, predicate);
-}
-export class ScopeProvider extends ProviderDecorator {
-    constructor(provider, predicate) {
-        super(provider);
-        this.provider = provider;
-        this.predicate = predicate;
-    }
-    clone() {
-        return new ScopeProvider(this.provider.clone(), this.predicate);
-    }
-    isValidToClone(container) {
-        return this.predicate(container) && this.provider.isValidToClone(container);
-    }
-    isVisible(container, child) {
-        return this.predicate(container) && this.provider.isVisible(container, child);
-    }
-}

package/typings/provider/ScopeProvider.d.ts

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