ts-ioc-container 52.0.0 → 53.0.0

package/cjm/container/Container.js

@@ -92,6 +92,9 @@ class Container {
         this.parent.removeScope(this);
         this.parent = new EmptyContainer_1.EmptyContainer();
         // Reset the state
+        for (const [_, provider] of this.providers) {
+            provider.dispose();
+        }
         this.providers.clear();
         this.aliases.destroy();
         this.instances = [];

package/cjm/errors/CannonSingletonApplyTwiceError.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CannonSingletonApplyTwiceError = void 0;
+const ContainerError_1 = require("./ContainerError");
+class CannonSingletonApplyTwiceError extends ContainerError_1.ContainerError {
+    name = 'CannonSingletonApplyTwiceError';
+    constructor(message) {
+        super(message);
+        Object.setPrototypeOf(this, CannonSingletonApplyTwiceError.prototype);
+    }
+    static assert(isTrue, failMessage) {
+        if (!isTrue) {
+            throw new CannonSingletonApplyTwiceError(failMessage);
+        }
+    }
+}
+exports.CannonSingletonApplyTwiceError = CannonSingletonApplyTwiceError;

package/cjm/errors/ProviderDisposedError.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProviderDisposedError = void 0;
+const ContainerError_1 = require("./ContainerError");
+class ProviderDisposedError extends ContainerError_1.ContainerError {
+    name = 'ProviderDisposedError';
+    static assert(isTrue, failMessage) {
+        if (!isTrue) {
+            throw new ProviderDisposedError(failMessage);
+        }
+    }
+    constructor(message) {
+        super(message);
+        Object.setPrototypeOf(this, ProviderDisposedError.prototype);
+    }
+}
+exports.ProviderDisposedError = ProviderDisposedError;

package/cjm/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FunctionToken = exports.SingleToken = exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.InjectionToken = exports.HooksRunner = exports.AddOnDisposeHookModule = exports.onDispose = exports.onDisposeHooksRunner = exports.AddOnConstructHookModule = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = exports.createHookContext = exports.createHookContextFactory = exports.HookContext = exports.hasHooks = exports.hook = exports.getHooks = exports.CannonSingletonApplyError = exports.UnexpectedHookResultError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.DependencyNotFoundError = exports.Registration = exports.appendArgsFn = exports.appendArgs = exports.decorate = exports.singleton = exports.lazy = exports.scopeAccess = exports.scope = exports.bindTo = exports.register = exports.Provider = exports.ProxyInjector = exports.SimpleInjector = exports.resolveArgs = exports.argsFn = exports.args = exports.inject = exports.MetadataInjector = exports.Injector = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
-exports.resolveConstructor = exports.Is = exports.pipe = exports.select = exports.once = exports.shallowCache = exports.debounce = exports.throttle = exports.handleAsyncError = exports.handleError = exports.getMethodTags = exports.methodTag = exports.getMethodLabels = exports.methodLabel = exports.getMethodMeta = exports.methodMeta = exports.getParamTags = exports.paramTag = exports.getParamLabels = exports.paramLabel = exports.getParamMeta = exports.paramMeta = exports.getClassTags = exports.classTag = exports.getClassLabels = exports.classLabel = exports.getClassMeta = exports.classMeta = exports.GroupInstanceToken = exports.ConstantToken = void 0;
+exports.SingleToken = exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.InjectionToken = exports.HooksRunner = exports.AddOnDisposeHookModule = exports.onDispose = exports.onDisposeHooksRunner = exports.AddOnConstructHookModule = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = exports.createHookContext = exports.createHookContextFactory = exports.HookContext = exports.hasHooks = exports.hook = exports.getHooks = exports.CannonSingletonApplyTwiceError = exports.UnexpectedHookResultError = exports.ProviderDisposedError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.DependencyNotFoundError = exports.Registration = exports.appendArgsFn = exports.appendArgs = exports.decorate = exports.singleton = exports.lazy = exports.scopeAccess = exports.scope = exports.bindTo = exports.register = exports.Provider = exports.ProxyInjector = exports.SimpleInjector = exports.resolveArgs = exports.argsFn = exports.args = exports.inject = exports.MetadataInjector = exports.Injector = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.resolveConstructor = exports.Is = exports.pipe = exports.select = exports.once = exports.shallowCache = exports.debounce = exports.throttle = exports.handleAsyncError = exports.handleError = exports.getMethodTags = exports.methodTag = exports.getMethodLabels = exports.methodLabel = exports.getMethodMeta = exports.methodMeta = exports.getParamTags = exports.paramTag = exports.getParamLabels = exports.paramLabel = exports.getParamMeta = exports.paramMeta = exports.getClassTags = exports.classTag = exports.getClassLabels = exports.classLabel = exports.getClassMeta = exports.classMeta = exports.GroupInstanceToken = exports.ConstantToken = exports.FunctionToken = void 0;
 // Containers
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
@@ -46,10 +46,12 @@ var MethodNotImplementedError_1 = require("./errors/MethodNotImplementedError");
 Object.defineProperty(exports, "MethodNotImplementedError", { enumerable: true, get: function () { return MethodNotImplementedError_1.MethodNotImplementedError; } });
 var ContainerDisposedError_1 = require("./errors/ContainerDisposedError");
 Object.defineProperty(exports, "ContainerDisposedError", { enumerable: true, get: function () { return ContainerDisposedError_1.ContainerDisposedError; } });
+var ProviderDisposedError_1 = require("./errors/ProviderDisposedError");
+Object.defineProperty(exports, "ProviderDisposedError", { enumerable: true, get: function () { return ProviderDisposedError_1.ProviderDisposedError; } });
 var UnexpectedHookResultError_1 = require("./errors/UnexpectedHookResultError");
 Object.defineProperty(exports, "UnexpectedHookResultError", { enumerable: true, get: function () { return UnexpectedHookResultError_1.UnexpectedHookResultError; } });
-var CannonSingletonApplyError_1 = require("./errors/CannonSingletonApplyError");
-Object.defineProperty(exports, "CannonSingletonApplyError", { enumerable: true, get: function () { return CannonSingletonApplyError_1.CannonSingletonApplyError; } });
+var CannonSingletonApplyTwiceError_1 = require("./errors/CannonSingletonApplyTwiceError");
+Object.defineProperty(exports, "CannonSingletonApplyTwiceError", { enumerable: true, get: function () { return CannonSingletonApplyTwiceError_1.CannonSingletonApplyTwiceError; } });
 // Hooks
 var hook_1 = require("./hooks/hook");
 Object.defineProperty(exports, "getHooks", { enumerable: true, get: function () { return hook_1.getHooks; } });

package/cjm/provider/Provider.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Provider = void 0;
-const CannonSingletonApplyError_1 = require("../errors/CannonSingletonApplyError");
+const CannonSingletonApplyTwiceError_1 = require("../errors/CannonSingletonApplyTwiceError");
+const ProviderDisposedError_1 = require("../errors/ProviderDisposedError");
 class Provider {
     resolveDependency;
     static fromClass(Target) {
@@ -19,10 +20,12 @@ class Provider {
     isLazy = false;
     cache = new Map();
     getKey;
+    isDisposed = false;
     constructor(resolveDependency) {
         this.resolveDependency = resolveDependency;
     }
     resolve(scope, options) {
+        ProviderDisposedError_1.ProviderDisposedError.assert(!this.isDisposed, 'Provider is already disposed');
         if (!this.getKey) {
             return this.resolveDep(scope, options);
         }
@@ -56,14 +59,22 @@ class Provider {
         return this;
     }
     hasAccess(options) {
+        ProviderDisposedError_1.ProviderDisposedError.assert(!this.isDisposed, 'Provider is already disposed');
         return this.accessRules.reduce((acc, rule) => rule(options, acc), true);
     }
     singleton(getCacheKey = () => '1') {
-        if (this.getKey) {
-            throw new CannonSingletonApplyError_1.CannonSingletonApplyError('Provider is already singleton');
-        }
+        CannonSingletonApplyTwiceError_1.CannonSingletonApplyTwiceError.assert(!this.getKey, 'Provider is already singleton');
         this.getKey = getCacheKey;
         return this;
     }
+    dispose() {
+        ProviderDisposedError_1.ProviderDisposedError.assert(!this.isDisposed, 'Provider is already disposed');
+        this.isDisposed = true;
+        this.getKey = undefined;
+        this.cache.clear();
+        this.accessRules.splice(0, this.accessRules.length);
+        this.mappers.splice(0, this.mappers.length);
+        this.argsFnList.splice(0, this.argsFnList.length);
+    }
 }
 exports.Provider = Provider;

package/esm/container/Container.js

@@ -89,6 +89,9 @@ export class Container {
         this.parent.removeScope(this);
         this.parent = new EmptyContainer();
         // Reset the state
+        for (const [_, provider] of this.providers) {
+            provider.dispose();
+        }
         this.providers.clear();
         this.aliases.destroy();
         this.instances = [];

package/esm/errors/CannonSingletonApplyTwiceError.js

@@ -0,0 +1,13 @@
+import { ContainerError } from './ContainerError';
+export class CannonSingletonApplyTwiceError extends ContainerError {
+    name = 'CannonSingletonApplyTwiceError';
+    constructor(message) {
+        super(message);
+        Object.setPrototypeOf(this, CannonSingletonApplyTwiceError.prototype);
+    }
+    static assert(isTrue, failMessage) {
+        if (!isTrue) {
+            throw new CannonSingletonApplyTwiceError(failMessage);
+        }
+    }
+}

package/esm/errors/ProviderDisposedError.js

@@ -0,0 +1,13 @@
+import { ContainerError } from './ContainerError';
+export class ProviderDisposedError extends ContainerError {
+    name = 'ProviderDisposedError';
+    static assert(isTrue, failMessage) {
+        if (!isTrue) {
+            throw new ProviderDisposedError(failMessage);
+        }
+    }
+    constructor(message) {
+        super(message);
+        Object.setPrototypeOf(this, ProviderDisposedError.prototype);
+    }
+}

package/esm/index.js

@@ -16,8 +16,9 @@ export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export { DependencyMissingKeyError } from './errors/DependencyMissingKeyError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
+export { ProviderDisposedError } from './errors/ProviderDisposedError';
 export { UnexpectedHookResultError } from './errors/UnexpectedHookResultError';
-export { CannonSingletonApplyError } from './errors/CannonSingletonApplyError';
+export { CannonSingletonApplyTwiceError } from './errors/CannonSingletonApplyTwiceError';
 // Hooks
 export { getHooks, hook, hasHooks } from './hooks/hook';
 export { HookContext, createHookContextFactory, createHookContext } from './hooks/HookContext';

package/esm/provider/Provider.js

@@ -1,4 +1,5 @@
-import { CannonSingletonApplyError } from '../errors/CannonSingletonApplyError';
+import { CannonSingletonApplyTwiceError } from '../errors/CannonSingletonApplyTwiceError';
+import { ProviderDisposedError } from '../errors/ProviderDisposedError';
 export class Provider {
     resolveDependency;
     static fromClass(Target) {
@@ -16,10 +17,12 @@ export class Provider {
     isLazy = false;
     cache = new Map();
     getKey;
+    isDisposed = false;
     constructor(resolveDependency) {
         this.resolveDependency = resolveDependency;
     }
     resolve(scope, options) {
+        ProviderDisposedError.assert(!this.isDisposed, 'Provider is already disposed');
         if (!this.getKey) {
             return this.resolveDep(scope, options);
         }
@@ -53,13 +56,21 @@ export class Provider {
         return this;
     }
     hasAccess(options) {
+        ProviderDisposedError.assert(!this.isDisposed, 'Provider is already disposed');
         return this.accessRules.reduce((acc, rule) => rule(options, acc), true);
     }
     singleton(getCacheKey = () => '1') {
-        if (this.getKey) {
-            throw new CannonSingletonApplyError('Provider is already singleton');
-        }
+        CannonSingletonApplyTwiceError.assert(!this.getKey, 'Provider is already singleton');
         this.getKey = getCacheKey;
         return this;
     }
+    dispose() {
+        ProviderDisposedError.assert(!this.isDisposed, 'Provider is already disposed');
+        this.isDisposed = true;
+        this.getKey = undefined;
+        this.cache.clear();
+        this.accessRules.splice(0, this.accessRules.length);
+        this.mappers.splice(0, this.mappers.length);
+        this.argsFnList.splice(0, this.argsFnList.length);
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "52.0.0",
+  "version": "53.0.0",
   "description": "Fast, lightweight TypeScript dependency injection container with a clean API, scoped lifecycles, decorators, tokens, hooks, lazy injection, customizable providers, and no global container objects.",
   "workspaces": [
     "docs"

package/typings/errors/CannonSingletonApplyTwiceError.d.ts

@@ -0,0 +1,6 @@
+import { ContainerError } from './ContainerError';
+export declare class CannonSingletonApplyTwiceError extends ContainerError {
+    name: string;
+    constructor(message?: string);
+    static assert(isTrue: boolean, failMessage: string): void;
+}

package/typings/errors/ProviderDisposedError.d.ts

@@ -0,0 +1,6 @@
+import { ContainerError } from './ContainerError';
+export declare class ProviderDisposedError extends ContainerError {
+    name: string;
+    static assert(isTrue: boolean, failMessage: string): void;
+    constructor(message: string);
+}

package/typings/index.d.ts

@@ -13,8 +13,9 @@ export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export { DependencyMissingKeyError } from './errors/DependencyMissingKeyError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
+export { ProviderDisposedError } from './errors/ProviderDisposedError';
 export { UnexpectedHookResultError } from './errors/UnexpectedHookResultError';
-export { CannonSingletonApplyError } from './errors/CannonSingletonApplyError';
+export { CannonSingletonApplyTwiceError } from './errors/CannonSingletonApplyTwiceError';
 export { getHooks, hook, hasHooks, type HookFn, type HookClass, type InjectFn, type HooksOfClass } from './hooks/hook';
 export { HookContext, createHookContextFactory, createHookContext, type IHookContext } from './hooks/HookContext';
 export { injectProp } from './hooks/injectProp';

package/typings/provider/IProvider.d.ts

@@ -22,4 +22,5 @@ export interface IProvider<T = any> {
     addArgsFn(argsFn: ArgsFn): this;
     lazy(): this;
     singleton(getCacheKey?: GetCacheKey): this;
+    dispose(): void;
 }

package/typings/provider/Provider.d.ts

@@ -1,4 +1,4 @@
-import { ArgsFn, DecorateFn, GetCacheKey, IProvider, ProviderOptions, ResolveDependency, ScopeAccessOptions, ScopeAccessRule } from './IProvider';
+import { type ArgsFn, type DecorateFn, type GetCacheKey, type IProvider, type ProviderOptions, type ResolveDependency, type ScopeAccessOptions, type ScopeAccessRule } from './IProvider';
 import type { DependencyKey, IContainer } from '../container/IContainer';
 import { type constructor } from '../utils/basic';
 export declare class Provider<T = any> implements IProvider<T> {
@@ -6,12 +6,13 @@ 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>;
-    private argsFnList;
+    private readonly argsFnList;
     private readonly accessRules;
     private readonly mappers;
     private isLazy;
     private cache;
     private getKey;
+    private isDisposed;
     constructor(resolveDependency: ResolveDependency<T>);
     resolve(scope: IContainer, options: ProviderOptions): T;
     private resolveDep;
@@ -21,4 +22,5 @@ export declare class Provider<T = any> implements IProvider<T> {
     addArgsFn(...fns: ArgsFn[]): this;
     hasAccess(options: ScopeAccessOptions): boolean;
     singleton(getCacheKey?: GetCacheKey): this;
+    dispose(): void;
 }

package/cjm/errors/CannonSingletonApplyError.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CannonSingletonApplyError = void 0;
-const ContainerError_1 = require("./ContainerError");
-class CannonSingletonApplyError extends ContainerError_1.ContainerError {
-    name = 'CannonSingletonApplyError';
-    constructor(message) {
-        super(message);
-        Object.setPrototypeOf(this, CannonSingletonApplyError.prototype);
-    }
-}
-exports.CannonSingletonApplyError = CannonSingletonApplyError;

package/esm/errors/CannonSingletonApplyError.js

@@ -1,8 +0,0 @@
-import { ContainerError } from './ContainerError';
-export class CannonSingletonApplyError extends ContainerError {
-    name = 'CannonSingletonApplyError';
-    constructor(message) {
-        super(message);
-        Object.setPrototypeOf(this, CannonSingletonApplyError.prototype);
-    }
-}

package/typings/errors/CannonSingletonApplyError.d.ts

@@ -1,5 +0,0 @@
-import { ContainerError } from './ContainerError';
-export declare class CannonSingletonApplyError extends ContainerError {
-    name: string;
-    constructor(message?: string);
-}