ts-ioc-container 35.6.2 → 35.7.0

package/cjm/container/Container.js

@@ -74,13 +74,13 @@ class Container {
     }
     dispose() {
         this.validateContainer();
+        for (const scope of this.scopes) {
+            scope.dispose();
+        }
         this.onDispose.emit(this);
         this.isDisposed = true;
         this.parent.removeScope(this);
         this.parent = new EmptyContainer_1.EmptyContainer();
-        for (const scope of this.scopes) {
-            scope.dispose();
-        }
         this.providers.clear();
         this.instances.clear();
         this.registrations.splice(0, this.registrations.length);

package/cjm/registration/IRegistration.js

@@ -11,7 +11,7 @@ const key = (...keys) => (r) => {
 exports.key = key;
 const redirectFrom = (...keys) => (r) => r.redirectFrom(...keys);
 exports.redirectFrom = redirectFrom;
-const scope = (predicate) => (r) => r.when(predicate);
+const scope = (...predicates) => (r) => r.when(...predicates);
 exports.scope = scope;
 const METADATA_KEY = 'registration';
 const getTransformers = (Target) => (0, metadata_1.getMetadata)(Target, METADATA_KEY) ?? [];

package/cjm/registration/Registration.js

@@ -23,10 +23,10 @@ class Registration {
     static toKey(key) {
         return new Registration(() => Provider_1.Provider.fromKey(key));
     }
-    constructor(createProvider, key, matchScope = () => true) {
+    constructor(createProvider, key, scopePredicates = []) {
         this.createProvider = createProvider;
         this.key = key;
-        this.matchScope = matchScope;
+        this.scopePredicates = scopePredicates;
         this.redirectKeys = new Set();
         this.mappers = [];
     }
@@ -44,10 +44,17 @@ class Registration {
         this.mappers.push(...mappers);
         return this;
     }
-    when(isValidWhen) {
-        this.matchScope = isValidWhen;
+    when(...predicates) {
+        this.scopePredicates.push(...predicates);
         return this;
     }
+    matchScope(container) {
+        if (this.scopePredicates.length === 0) {
+            return true;
+        }
+        const [first, ...rest] = this.scopePredicates;
+        return rest.reduce((prev, curr) => curr(container, prev), first(container));
+    }
     applyTo(container) {
         if (!this.matchScope(container)) {
             return;

package/esm/container/Container.js

@@ -71,13 +71,13 @@ export class Container {
     }
     dispose() {
         this.validateContainer();
+        for (const scope of this.scopes) {
+            scope.dispose();
+        }
         this.onDispose.emit(this);
         this.isDisposed = true;
         this.parent.removeScope(this);
         this.parent = new EmptyContainer();
-        for (const scope of this.scopes) {
-            scope.dispose();
-        }
         this.providers.clear();
         this.instances.clear();
         this.registrations.splice(0, this.registrations.length);

package/esm/registration/IRegistration.js

@@ -6,7 +6,7 @@ export const key = (...keys) => (r) => {
     return r.fromKey(originalKey).redirectFrom(...redirectKeys);
 };
 export const redirectFrom = (...keys) => (r) => r.redirectFrom(...keys);
-export const scope = (predicate) => (r) => r.when(predicate);
+export const scope = (...predicates) => (r) => r.when(...predicates);
 const METADATA_KEY = 'registration';
 export const getTransformers = (Target) => getMetadata(Target, METADATA_KEY) ?? [];
 export const register = (...mappers) => setMetadata(METADATA_KEY, mappers.map((m, index) => {

package/esm/registration/Registration.js

@@ -20,10 +20,10 @@ export class Registration {
     static toKey(key) {
         return new Registration(() => Provider.fromKey(key));
     }
-    constructor(createProvider, key, matchScope = () => true) {
+    constructor(createProvider, key, scopePredicates = []) {
         this.createProvider = createProvider;
         this.key = key;
-        this.matchScope = matchScope;
+        this.scopePredicates = scopePredicates;
         this.redirectKeys = new Set();
         this.mappers = [];
     }
@@ -41,10 +41,17 @@ export class Registration {
         this.mappers.push(...mappers);
         return this;
     }
-    when(isValidWhen) {
-        this.matchScope = isValidWhen;
+    when(...predicates) {
+        this.scopePredicates.push(...predicates);
         return this;
     }
+    matchScope(container) {
+        if (this.scopePredicates.length === 0) {
+            return true;
+        }
+        const [first, ...rest] = this.scopePredicates;
+        return rest.reduce((prev, curr) => curr(container, prev), first(container));
+    }
     applyTo(container) {
         if (!this.matchScope(container)) {
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "35.6.2",
+  "version": "35.7.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -59,5 +59,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "ad0b8fd07c4deeb317db9876ab77b0672b62a802"
+  "gitHead": "b86fcf49ce85d9ce8a99b323b1745f14c7f0c9da"
 }

package/typings/registration/IRegistration.d.ts

@@ -2,9 +2,9 @@ import { DependencyKey, IContainer, IContainerModule } from '../container/IConta
 import { constructor, MapFn } from '../utils';
 import { IProvider } from '../provider/IProvider';
 import { DepKey } from '../by';
-export type ScopePredicate = (s: IContainer) => boolean;
+export type ScopePredicate = (s: IContainer, prev?: boolean) => boolean;
 export interface IRegistration<T = any> extends IContainerModule {
-    when(isValidWhen: ScopePredicate): this;
+    when(...predicates: ScopePredicate[]): this;
     fromKey(key: DependencyKey): this;
     pipe(...mappers: MapFn<IProvider<T>>[]): this;
     redirectFrom(...keys: DependencyKey[]): this;
@@ -12,6 +12,6 @@ export interface IRegistration<T = any> extends IContainerModule {
 export type ReturnTypeOfRegistration<T> = T extends IRegistration<infer R> ? R : never;
 export declare const key: (...keys: DependencyKey[]) => MapFn<IRegistration>;
 export declare const redirectFrom: (...keys: DependencyKey[]) => MapFn<IRegistration>;
-export declare const scope: (predicate: ScopePredicate) => MapFn<IRegistration>;
+export declare const scope: (...predicates: ScopePredicate[]) => MapFn<IRegistration>;
 export declare const getTransformers: (Target: constructor<unknown>) => MapFn<IRegistration<any>>[];
 export declare const register: (...mappers: (MapFn<IRegistration> | DepKey<any> | DependencyKey)[]) => ClassDecorator;

package/typings/registration/Registration.d.ts

@@ -5,17 +5,18 @@ import { IRegistration, ScopePredicate } from './IRegistration';
 export declare class Registration<T = any> implements IRegistration<T> {
     private createProvider;
     private key?;
-    private matchScope;
+    private scopePredicates;
     private redirectKeys;
     static toClass<T>(Target: constructor<T>): IRegistration<any>;
     static toValue<T>(value: T): IRegistration<any>;
     static toFn<T>(fn: ResolveDependency<T>): Registration<T>;
     static toKey<T>(key: DependencyKey): Registration<T>;
     private mappers;
-    constructor(createProvider: (key: DependencyKey) => IProvider<T>, key?: DependencyKey | undefined, matchScope?: ScopePredicate);
+    constructor(createProvider: (key: DependencyKey) => IProvider<T>, key?: DependencyKey | undefined, scopePredicates?: ScopePredicate[]);
     fromKey(key: DependencyKey): this;
     redirectFrom(...keys: DependencyKey[]): this;
     pipe(...mappers: MapFn<IProvider<T>>[]): this;
-    when(isValidWhen: ScopePredicate): this;
+    when(...predicates: ScopePredicate[]): this;
+    private matchScope;
     applyTo(container: IContainer): void;
 }