ts-ioc-container 37.0.3 → 37.1.0

package/cjm/container/Container.js

@@ -47,7 +47,7 @@ class Container {
         this.scopes.add(scope);
         return scope;
     }
-    dispose() {
+    dispose({ cascade = true } = {}) {
         this.validateContainer();
         this.isDisposed = true;
         // Detach from parent
@@ -58,9 +58,11 @@ class Container {
         this.instances.clear();
         this.registrations.clear();
         this.onDispose(this);
-        // Dispose all scopes
-        for (const scope of this.scopes) {
-            scope.dispose();
+        if (cascade) {
+            // Dispose all scopes
+            for (const scope of this.scopes) {
+                scope.dispose({ cascade });
+            }
         }
     }
     use(module) {

package/cjm/index.js

@@ -80,8 +80,8 @@ Object.defineProperty(exports, "setParameterMetadata", { enumerable: true, get:
 Object.defineProperty(exports, "setMethodMetadata", { enumerable: true, get: function () { return metadata_1.setMethodMetadata; } });
 Object.defineProperty(exports, "getMethodMetadata", { enumerable: true, get: function () { return metadata_1.getMethodMetadata; } });
 Object.defineProperty(exports, "getParameterMetadata", { enumerable: true, get: function () { return metadata_1.getParameterMetadata; } });
-var isDepKey_1 = require("./isDepKey");
-Object.defineProperty(exports, "depKey", { enumerable: true, get: function () { return isDepKey_1.depKey; } });
+var DepKey_1 = require("./DepKey");
+Object.defineProperty(exports, "depKey", { enumerable: true, get: function () { return DepKey_1.depKey; } });
 var Cache_1 = require("./provider/Cache");
 Object.defineProperty(exports, "multiCache", { enumerable: true, get: function () { return Cache_1.multiCache; } });
 var Cache_2 = require("./provider/Cache");

package/cjm/injector/inject.js

@@ -4,9 +4,9 @@ exports.resolveArgs = exports.inject = void 0;
 const metadata_1 = require("../metadata");
 const utils_1 = require("../utils");
 const HookContext_1 = require("../hooks/HookContext");
-const isDepKey_1 = require("../isDepKey");
+const DepKey_1 = require("../DepKey");
 const inject = (fn) => (target, propertyKey, parameterIndex) => {
-    (0, metadata_1.setParameterMetadata)((0, HookContext_1.hookMetaKey)(propertyKey), (0, isDepKey_1.isDepKey)(fn) ? fn.resolve : fn)((0, utils_1.isInstance)(target) ? target.constructor : target, propertyKey, parameterIndex);
+    (0, metadata_1.setParameterMetadata)((0, HookContext_1.hookMetaKey)(propertyKey), (0, DepKey_1.isDepKey)(fn) ? fn.resolve : fn)((0, utils_1.isInstance)(target) ? target.constructor : target, propertyKey, parameterIndex);
 };
 exports.inject = inject;
 const resolveArgs = (Target, methodName) => {

package/cjm/provider/IProvider.js

@@ -24,12 +24,6 @@ class ProviderDecorator {
     constructor(decorated) {
         this.decorated = decorated;
     }
-    get key() {
-        return this.decorated.key;
-    }
-    set key(value) {
-        this.decorated.key = value;
-    }
     setVisibility(predicate) {
         this.decorated.setVisibility(predicate);
         return this;

package/cjm/registration/IRegistration.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = exports.getTransformers = exports.scope = exports.redirectFrom = exports.key = void 0;
 const IContainer_1 = require("../container/IContainer");
 const metadata_1 = require("../metadata");
-const isDepKey_1 = require("../isDepKey");
+const DepKey_1 = require("../DepKey");
 const key = (...keys) => (r) => {
     const [originalKey, ...redirectKeys] = keys;
     return r.fromKey(originalKey).redirectFrom(...redirectKeys);
@@ -17,7 +17,7 @@ const METADATA_KEY = 'registration';
 const getTransformers = (Target) => (0, metadata_1.getMetadata)(Target, METADATA_KEY) ?? [];
 exports.getTransformers = getTransformers;
 const register = (...mappers) => (0, metadata_1.setMetadata)(METADATA_KEY, mappers.map((m, index) => {
-    if ((0, isDepKey_1.isDepKey)(m)) {
+    if ((0, DepKey_1.isDepKey)(m)) {
         return index === 0 ? m.assignTo.bind(m) : m.redirectFrom.bind(m);
     }
     if ((0, IContainer_1.isDependencyKey)(m)) {

package/cjm/registration/Registration.js

@@ -63,7 +63,7 @@ class Registration {
             throw new DependencyMissingKeyError_1.DependencyMissingKeyError('No key provided for registration');
         }
         const key = this.key;
-        container.register(key, this.createProvider(key).pipe(...this.mappers));
+        container.register(key, this.createProvider().pipe(...this.mappers));
         for (const redirectKey of this.redirectKeys) {
             container.register(redirectKey, new Provider_1.Provider((s) => s.resolve(key)));
         }

package/esm/container/Container.js

@@ -44,7 +44,7 @@ export class Container {
         this.scopes.add(scope);
         return scope;
     }
-    dispose() {
+    dispose({ cascade = true } = {}) {
         this.validateContainer();
         this.isDisposed = true;
         // Detach from parent
@@ -55,9 +55,11 @@ export class Container {
         this.instances.clear();
         this.registrations.clear();
         this.onDispose(this);
-        // Dispose all scopes
-        for (const scope of this.scopes) {
-            scope.dispose();
+        if (cascade) {
+            // Dispose all scopes
+            for (const scope of this.scopes) {
+                scope.dispose({ cascade });
+            }
         }
     }
     use(module) {

package/esm/index.js

@@ -27,6 +27,6 @@ export { HookContext } from './hooks/HookContext';
 // Others
 export { by, IMemoKey, byAlias, byAliases } from './by';
 export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';
-export { depKey } from './isDepKey';
+export { depKey } from './DepKey';
 export { multiCache } from './provider/Cache';
 export { MultiCache } from './provider/Cache';

package/esm/injector/inject.js

@@ -1,7 +1,7 @@
 import { getParameterMetadata, setParameterMetadata } from '../metadata';
 import { constant, fillEmptyIndexes, isInstance } from '../utils';
 import { hookMetaKey } from '../hooks/HookContext';
-import { isDepKey } from '../isDepKey';
+import { isDepKey } from '../DepKey';
 export const inject = (fn) => (target, propertyKey, parameterIndex) => {
     setParameterMetadata(hookMetaKey(propertyKey), isDepKey(fn) ? fn.resolve : fn)(isInstance(target) ? target.constructor : target, propertyKey, parameterIndex);
 };

package/esm/provider/IProvider.js

@@ -15,12 +15,6 @@ export class ProviderDecorator {
     constructor(decorated) {
         this.decorated = decorated;
     }
-    get key() {
-        return this.decorated.key;
-    }
-    set key(value) {
-        this.decorated.key = value;
-    }
     setVisibility(predicate) {
         this.decorated.setVisibility(predicate);
         return this;

package/esm/registration/IRegistration.js

@@ -1,6 +1,6 @@
 import { isDependencyKey } from '../container/IContainer';
 import { getMetadata, setMetadata } from '../metadata';
-import { isDepKey } from '../isDepKey';
+import { isDepKey } from '../DepKey';
 export const key = (...keys) => (r) => {
     const [originalKey, ...redirectKeys] = keys;
     return r.fromKey(originalKey).redirectFrom(...redirectKeys);

package/esm/registration/Registration.js

@@ -60,7 +60,7 @@ export class Registration {
             throw new DependencyMissingKeyError('No key provided for registration');
         }
         const key = this.key;
-        container.register(key, this.createProvider(key).pipe(...this.mappers));
+        container.register(key, this.createProvider().pipe(...this.mappers));
         for (const redirectKey of this.redirectKeys) {
             container.register(redirectKey, new Provider((s) => s.resolve(key)));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "37.0.3",
+  "version": "37.1.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",

package/typings/container/Container.d.ts

@@ -23,7 +23,9 @@ export declare class Container implements IContainer {
     register(key: DependencyKey, provider: IProvider): this;
     resolve<T>(token: InjectionToken<T>, { args, child, lazy }?: ResolveOptions): T;
     createScope({ tags }?: CreateScopeOptions): IContainer;
-    dispose(): void;
+    dispose({ cascade }?: {
+        cascade?: boolean;
+    }): void;
     use(module: IContainerModule): this;
     hasProvider(key: DependencyKey): boolean;
     resolveManyByAlias(predicate: AliasPredicate, { args, child, lazy }?: ResolveOptions, result?: Map<DependencyKey, unknown>): Map<DependencyKey, unknown>;

package/typings/container/IContainer.d.ts

@@ -35,7 +35,9 @@ export interface IContainer extends Resolvable, Tagged {
     register(key: DependencyKey, value: IProvider): this;
     add(registration: IRegistration): this;
     removeScope(child: IContainer): void;
-    dispose(): void;
+    dispose(options?: {
+        cascade?: boolean;
+    }): void;
     use(module: IContainerModule): this;
     getRegistrations(): IRegistration[];
     hasProvider(key: DependencyKey): boolean;

package/typings/index.d.ts

@@ -23,7 +23,6 @@ export { HookContext, InjectFn, IHookContext } from './hooks/HookContext';
 export { by, InstancePredicate, IMemo, IMemoKey, byAlias, byAliases } from './by';
 export { constructor, Branded } from './utils';
 export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';
-export { depKey } from './isDepKey';
-export { DepKey } from './isDepKey';
+export { depKey, DepKey } from './DepKey';
 export { multiCache } from './provider/Cache';
 export { MultiCache } from './provider/Cache';

package/typings/injector/inject.d.ts

@@ -1,6 +1,6 @@
 import { constructor } from '../utils';
 import { IContainer } from '../container/IContainer';
 import { InjectFn } from '../hooks/HookContext';
-import { DepKey } from '../isDepKey';
+import { DepKey } from '../DepKey';
 export declare const inject: <T>(fn: InjectFn | DepKey<T>) => ParameterDecorator;
 export declare const resolveArgs: (Target: constructor<unknown>, methodName?: string) => (scope: IContainer, ...deps: unknown[]) => unknown[];

package/typings/provider/IProvider.d.ts

@@ -1,4 +1,4 @@
-import { Alias, AliasPredicate, DependencyKey, IContainer, Tagged } from '../container/IContainer';
+import { Alias, AliasPredicate, IContainer, Tagged } from '../container/IContainer';
 import { constructor, MapFn } from '../utils';
 export type ProviderResolveOptions = {
     args: unknown[];
@@ -13,7 +13,6 @@ export type ArgsFn = (l: IContainer, ...args: unknown[]) => unknown[];
 export declare function args<T = unknown>(...extraArgs: unknown[]): MapFn<IProvider<T>>;
 export declare function argsFn<T = unknown>(fn: ArgsFn): MapFn<IProvider<T>>;
 export interface IProvider<T = any> {
-    key?: DependencyKey;
     resolve(container: IContainer, options: ProviderResolveOptions): T;
     isVisible(parent: Tagged, child: Tagged): boolean;
     pipe(...mappers: MapFn<IProvider<T>>[]): IProvider<T>;
@@ -29,8 +28,6 @@ export declare const visible: (isVisibleWhen: ChildrenVisibilityPredicate) => Ma
 export declare abstract class ProviderDecorator<T> implements IProvider<T> {
     private decorated;
     protected constructor(decorated: IProvider<T>);
-    get key(): DependencyKey | undefined;
-    set key(value: DependencyKey | undefined);
     setVisibility(predicate: ChildrenVisibilityPredicate): this;
     isVisible(parent: IContainer, child: Tagged): boolean;
     resolve(container: IContainer, options: ProviderResolveOptions): T;

package/typings/provider/Provider.d.ts

@@ -6,7 +6,6 @@ export declare class Provider<T = any> implements IProvider<T> {
     static fromClass<T>(Target: constructor<T>): IProvider<T>;
     static fromValue<T>(value: T): IProvider<T>;
     static fromKey<T>(key: DependencyKey): Provider<T>;
-    key?: DependencyKey;
     private readonly aliases;
     private argsFn;
     private isVisibleWhen;

package/typings/registration/IRegistration.d.ts

@@ -1,7 +1,7 @@
 import { DependencyKey, IContainer, IContainerModule } from '../container/IContainer';
 import { constructor, MapFn } from '../utils';
 import { IProvider } from '../provider/IProvider';
-import { DepKey } from '../isDepKey';
+import { DepKey } from '../DepKey';
 export type ScopePredicate = (s: IContainer, prev?: boolean) => boolean;
 export interface IRegistration<T = any> extends IContainerModule {
     when(...predicates: ScopePredicate[]): this;

package/typings/registration/Registration.d.ts

@@ -12,7 +12,7 @@ export declare class Registration<T = any> implements IRegistration<T> {
     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, scopePredicates?: ScopePredicate[]);
+    constructor(createProvider: () => IProvider<T>, key?: DependencyKey | undefined, scopePredicates?: ScopePredicate[]);
     fromKey(key: DependencyKey): this;
     redirectFrom(...keys: DependencyKey[]): this;
     pipe(...mappers: MapFn<IProvider<T>>[]): this;