ts-ioc-container 52.0.1 → 54.0.0

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/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.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.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");
@@ -50,8 +50,8 @@ 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,7 @@
 "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;
@@ -63,13 +63,12 @@ class Provider {
         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();

package/cjm/utils/once.js

@@ -1,11 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.once = void 0;
-const once = (target, propertyKey, descriptor) => {
+const once = ({ onRepeat } = {}) => (target, propertyKey, descriptor) => {
     const originalMethod = descriptor.value;
     const cacheMap = new WeakMap();
+    let index = 0;
     descriptor.value = function (...args) {
+        index++;
         if (cacheMap.has(this)) {
+            onRepeat?.({ index: index - 1, args });
             return cacheMap.get(this);
         }
         const result = originalMethod.apply(this, args);

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/index.js

@@ -18,7 +18,7 @@ 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,4 @@
-import { CannonSingletonApplyError } from '../errors/CannonSingletonApplyError';
+import { CannonSingletonApplyTwiceError } from '../errors/CannonSingletonApplyTwiceError';
 import { ProviderDisposedError } from '../errors/ProviderDisposedError';
 export class Provider {
     resolveDependency;
@@ -60,13 +60,12 @@ export class Provider {
         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();

package/esm/utils/once.js

@@ -1,8 +1,11 @@
-export const once = (target, propertyKey, descriptor) => {
+export const once = ({ onRepeat } = {}) => (target, propertyKey, descriptor) => {
     const originalMethod = descriptor.value;
     const cacheMap = new WeakMap();
+    let index = 0;
     descriptor.value = function (...args) {
+        index++;
         if (cacheMap.has(this)) {
+            onRepeat?.({ index: index - 1, args });
             return cacheMap.get(this);
         }
         const result = originalMethod.apply(this, args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "52.0.1",
+  "version": "54.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/index.d.ts

@@ -15,7 +15,7 @@ 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/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> {

package/typings/utils/once.d.ts

@@ -1 +1,8 @@
-export declare const once: MethodDecorator;
+type RepeatOptions = {
+    index: number;
+    args: unknown[];
+};
+export declare const once: ({ onRepeat }?: {
+    onRepeat?: (options: RepeatOptions) => void;
+}) => MethodDecorator;
+export {};

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);
-}