ts-ioc-container 69.2.0 → 70.0.0

package/cjm/index.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.injectProp = exports.createHookExecutionContext = exports.createHookContextFactory = exports.HookContext = exports.toHookFn = exports.hasHooks = exports.hook = exports.getHooks = exports.ArgumentNotFoundError = exports.TypedEventDisposedError = exports.UnsupportedTokenTypeError = exports.CannonSingletonApplyTwiceError = exports.ProviderDisposedError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.ContainerNotFoundError = exports.DependencyNotFoundError = exports.ContainerError = exports.Registration = exports.onResolve = exports.appendArgsFn = exports.appendArgs = exports.decorate = exports.singleton = exports.autoResolve = exports.lazy = exports.scopeAccess = exports.scope = exports.bindTo = exports.register = exports.toRegistrationFn = exports.toProviderFn = exports.toBindToken = exports.registerPipe = exports.isProviderPipe = exports.Provider = exports.ProxyInjector = exports.SimpleInjector = exports.resolveArgs = exports.argsFn = exports.args = exports.arg = exports.inject = exports.MetadataInjector = exports.Injector = exports.EmptyContainer = exports.AutoResolveModule = exports.Container = exports.isDependencyKey = void 0;
 exports.TypedEvent = exports.getConstructorChain = exports.memoize = exports.once = exports.shallowCache = exports.debounce = exports.throttle = exports.runAtOnce = exports.runInOrder = exports.handleAsyncError = exports.handleError = exports.getMethodTags = exports.addMethodTag = exports.getMethodLabels = exports.addMethodLabel = exports.getMethodMeta = exports.addMethodMeta = exports.getParamTags = exports.addParamTag = exports.getParamLabels = exports.addParamLabel = exports.getParamMeta = exports.addParamMeta = exports.getClassTags = exports.addClassTag = exports.getClassLabels = exports.addClassLabel = exports.getClassMeta = exports.addClassMeta = exports.resolveConstructor = exports.GroupInstanceToken = exports.ConstantToken = exports.FunctionToken = exports.SingleToken = exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.argToToken = exports.toMappedToken = exports.toToken = exports.forwardArgs = exports.isInjectionToken = exports.InjectionToken = exports.toTask = exports.HookCollector = exports.oncePerInstance = exports.parallel = exports.sequential = void 0;
-exports.Is = exports.unwrapProxy = exports.ProxyRegistry = exports.findOrFail = exports.pipe = exports.select = void 0;
+exports.isSerializable = exports.Is = exports.unwrapProxy = exports.ProxyRegistry = exports.findOrFail = exports.pipe = exports.select = 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");
@@ -163,3 +163,4 @@ Object.defineProperty(exports, "ProxyRegistry", { enumerable: true, get: functio
 Object.defineProperty(exports, "unwrapProxy", { enumerable: true, get: function () { return ProxyRegistry_1.unwrapProxy; } });
 var basic_1 = require("./utils/basic");
 Object.defineProperty(exports, "Is", { enumerable: true, get: function () { return basic_1.Is; } });
+Object.defineProperty(exports, "isSerializable", { enumerable: true, get: function () { return basic_1.isSerializable; } });

package/cjm/provider/Provider.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Provider = void 0;
+const basic_1 = require("../utils/basic");
 const CannonSingletonApplyTwiceError_1 = require("../errors/CannonSingletonApplyTwiceError");
 const ProviderDisposedError_1 = require("../errors/ProviderDisposedError");
 class Provider {
@@ -31,7 +32,7 @@ class Provider {
         if (!this.getKey) {
             return this.resolveDep(scope, options);
         }
-        const key = this.getKey(...(options.args ?? []));
+        const key = (0, basic_1.toString)(this.getKey(...(options.args ?? [])));
         if (!this.cache.has(key)) {
             this.cache.set(key, this.resolveDep(scope, options));
         }

package/cjm/token/ClassToken.js

@@ -41,8 +41,8 @@ class ClassToken extends InjectionToken_1.InjectionToken {
             isLazy: true,
         });
     }
-    getKey() {
-        return this.target;
+    toString() {
+        return this.target.name;
     }
 }
 exports.ClassToken = ClassToken;

package/cjm/token/ConstantToken.js

@@ -21,7 +21,7 @@ class ConstantToken extends InjectionToken_1.InjectionToken {
     lazy() {
         throw new MethodNotImplementedError_1.MethodNotImplementedError('not implemented');
     }
-    getKey() {
+    toString() {
         throw new MethodNotImplementedError_1.MethodNotImplementedError('not implemented');
     }
 }

package/cjm/token/FunctionToken.js

@@ -39,7 +39,7 @@ class FunctionToken extends InjectionToken_1.InjectionToken {
             isLazy: true,
         });
     }
-    getKey() {
+    toString() {
         throw new MethodNotImplementedError_1.MethodNotImplementedError('not implemented');
     }
 }

package/cjm/token/GroupAliasToken.js

@@ -44,8 +44,8 @@ class GroupAliasToken extends InjectionToken_1.InjectionToken {
             isLazy: true,
         });
     }
-    getKey() {
-        return this.token;
+    toString() {
+        return this.token.toString();
     }
 }
 exports.GroupAliasToken = GroupAliasToken;

package/cjm/token/GroupInstanceToken.js

@@ -29,7 +29,7 @@ class GroupInstanceToken extends InjectionToken_1.InjectionToken {
     resolve(c) {
         return c.getInstances(this.isCascade).filter(this.predicate);
     }
-    getKey() {
+    toString() {
         throw new MethodNotImplementedError_1.MethodNotImplementedError('not implemented');
     }
 }

package/cjm/token/SingleAliasToken.js

@@ -44,8 +44,8 @@ class SingleAliasToken extends InjectionToken_1.InjectionToken {
             isLazy: true,
         });
     }
-    getKey() {
-        return this.token;
+    toString() {
+        return this.token.toString();
     }
 }
 exports.SingleAliasToken = SingleAliasToken;

package/cjm/token/SingleToken.js

@@ -44,8 +44,8 @@ class SingleToken extends InjectionToken_1.InjectionToken {
             isLazy: true,
         });
     }
-    getKey() {
-        return this.token;
+    toString() {
+        return this.token.toString();
     }
 }
 exports.SingleToken = SingleToken;

package/cjm/utils/basic.js

@@ -1,9 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Is = void 0;
+exports.toString = exports.Is = void 0;
+exports.isSerializable = isSerializable;
 exports.Is = {
     nullish: (value) => value === undefined || value === null,
     object: (target) => target !== null && typeof target === 'object',
     instance: (target) => Object.prototype.hasOwnProperty.call(target, 'constructor'),
     constructor: (target) => typeof target === 'function' && !!target.prototype,
 };
+function isSerializable(target) {
+    return exports.Is.object(target) && typeof target.toString === 'function' && target.toString !== Object.prototype.toString;
+}
+const toString = (target) => (isSerializable(target) ? target.toString() : String(target));
+exports.toString = toString;

package/esm/index.js

@@ -51,4 +51,4 @@ export { select } from './select.js';
 export { pipe } from './utils/fp.js';
 export { findOrFail } from './utils/array.js';
 export { ProxyRegistry, unwrapProxy } from './utils/ProxyRegistry.js';
-export { Is } from './utils/basic.js';
+export { Is, isSerializable } from './utils/basic.js';

package/esm/provider/Provider.js

@@ -1,3 +1,4 @@
+import { toString } from '../utils/basic.js';
 import { CannonSingletonApplyTwiceError } from '../errors/CannonSingletonApplyTwiceError.js';
 import { ProviderDisposedError } from '../errors/ProviderDisposedError.js';
 export class Provider {
@@ -28,7 +29,7 @@ export class Provider {
         if (!this.getKey) {
             return this.resolveDep(scope, options);
         }
-        const key = this.getKey(...(options.args ?? []));
+        const key = toString(this.getKey(...(options.args ?? [])));
         if (!this.cache.has(key)) {
             this.cache.set(key, this.resolveDep(scope, options));
         }

package/esm/token/ClassToken.js

@@ -38,7 +38,7 @@ export class ClassToken extends InjectionToken {
             isLazy: true,
         });
     }
-    getKey() {
-        return this.target;
+    toString() {
+        return this.target.name;
     }
 }

package/esm/token/ConstantToken.js

@@ -18,7 +18,7 @@ export class ConstantToken extends InjectionToken {
     lazy() {
         throw new MethodNotImplementedError('not implemented');
     }
-    getKey() {
+    toString() {
         throw new MethodNotImplementedError('not implemented');
     }
 }

package/esm/token/FunctionToken.js

@@ -36,7 +36,7 @@ export class FunctionToken extends InjectionToken {
             isLazy: true,
         });
     }
-    getKey() {
+    toString() {
         throw new MethodNotImplementedError('not implemented');
     }
 }

package/esm/token/GroupAliasToken.js

@@ -41,8 +41,8 @@ export class GroupAliasToken extends InjectionToken {
             isLazy: true,
         });
     }
-    getKey() {
-        return this.token;
+    toString() {
+        return this.token.toString();
     }
 }
 export const toGroupAlias = (token) => new GroupAliasToken(token);

package/esm/token/GroupInstanceToken.js

@@ -26,7 +26,7 @@ export class GroupInstanceToken extends InjectionToken {
     resolve(c) {
         return c.getInstances(this.isCascade).filter(this.predicate);
     }
-    getKey() {
+    toString() {
         throw new MethodNotImplementedError('not implemented');
     }
 }

package/esm/token/SingleAliasToken.js

@@ -41,8 +41,8 @@ export class SingleAliasToken extends InjectionToken {
             isLazy: true,
         });
     }
-    getKey() {
-        return this.token;
+    toString() {
+        return this.token.toString();
     }
 }
 export const toSingleAlias = (token) => new SingleAliasToken(token);

package/esm/token/SingleToken.js

@@ -41,7 +41,7 @@ export class SingleToken extends InjectionToken {
             isLazy: true,
         });
     }
-    getKey() {
-        return this.token;
+    toString() {
+        return this.token.toString();
     }
 }

package/esm/utils/basic.js

@@ -4,3 +4,7 @@ export const Is = {
     instance: (target) => Object.prototype.hasOwnProperty.call(target, 'constructor'),
     constructor: (target) => typeof target === 'function' && !!target.prototype,
 };
+export function isSerializable(target) {
+    return Is.object(target) && typeof target.toString === 'function' && target.toString !== Object.prototype.toString;
+}
+export const toString = (target) => (isSerializable(target) ? target.toString() : String(target));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "69.2.0",
+  "version": "70.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.",
   "publishConfig": {
     "access": "public",

package/typings/index.d.ts

@@ -53,4 +53,4 @@ export { select } from './select.js';
 export { pipe, type MapFn } from './utils/fp.js';
 export { findOrFail, type Predicate } from './utils/array.js';
 export { ProxyRegistry, unwrapProxy, type IProxyRegistry } from './utils/ProxyRegistry.js';
-export { type Branded, type constructor, type Instance, Is } from './utils/basic.js';
+export { type Branded, type constructor, type Instance, type Serializable, Is, isSerializable } from './utils/basic.js';

package/typings/provider/IProvider.d.ts

@@ -1,5 +1,6 @@
 import { IContainer, Tagged } from '../container/IContainer.js';
 import { InjectOptions } from '../injector/IInjector.js';
+import { Serializable } from '../utils/basic.js';
 export type WithLazy = {
     lazy: boolean;
 };
@@ -12,7 +13,7 @@ export type ScopeAccessOptions = {
 };
 export type ScopeAccessRule = (options: ScopeAccessOptions, prev: boolean) => boolean;
 export type ArgsFn = (l: IContainer, options?: InjectOptions) => unknown[];
-export type GetCacheKey = (...args: unknown[]) => string | symbol;
+export type GetCacheKey = (...args: unknown[]) => string | Serializable;
 export type DecorateFn<Instance = any> = (dep: Instance, scope: IContainer) => Instance;
 export type ProviderHook = (dependency: unknown, scope: IContainer) => void;
 export interface IProvider<T = any> {

package/typings/token/ClassToken.d.ts

@@ -1,8 +1,8 @@
 import { IContainer } from '../container/IContainer.js';
 import { InjectionToken } from './InjectionToken.js';
-import { type constructor } from '../utils/basic.js';
+import { type constructor, Serializable } from '../utils/basic.js';
 import { ArgsFn, ProviderOptions } from '../provider/IProvider.js';
-export declare class ClassToken<T = any> extends InjectionToken<T> {
+export declare class ClassToken<T = any> extends InjectionToken<T> implements Serializable {
     private readonly target;
     private readonly _getArgsFn;
     private readonly _isLazy;
@@ -15,5 +15,5 @@ export declare class ClassToken<T = any> extends InjectionToken<T> {
     args(...newArgs: unknown[]): ClassToken<T>;
     argsFn(fn: (s: IContainer) => unknown[]): ClassToken<T>;
     lazy(): ClassToken<T>;
-    getKey(): constructor<T>;
+    toString(): string;
 }

package/typings/token/ConstantToken.d.ts

@@ -1,12 +1,12 @@
-import type { DependencyKey, IContainer } from '../container/IContainer.js';
+import type { IContainer } from '../container/IContainer.js';
 import { InjectionToken } from './InjectionToken.js';
-import { type constructor } from '../utils/basic.js';
-export declare class ConstantToken<T = any> extends InjectionToken<T> {
+import { Serializable } from '../utils/basic.js';
+export declare class ConstantToken<T = any> extends InjectionToken<T> implements Serializable {
     private readonly token;
     constructor(token: T);
     resolve(s: IContainer): T;
     args(...deps: unknown[]): InjectionToken<T>;
     argsFn(getArgsFn: (s: IContainer) => unknown[]): InjectionToken<T>;
     lazy(): InjectionToken<T>;
-    getKey(): DependencyKey | constructor<T>;
+    toString(): string;
 }

package/typings/token/FunctionToken.d.ts

@@ -1,9 +1,9 @@
-import type { DependencyKey, IContainer } from '../container/IContainer.js';
+import type { IContainer } from '../container/IContainer.js';
 import { InjectionToken } from './InjectionToken.js';
 import { InjectFn } from '../hooks/hook.js';
 import { ArgsFn, ProviderOptions } from '../provider/IProvider.js';
-import { type constructor } from '../utils/basic.js';
-export declare class FunctionToken<T = any> extends InjectionToken<T> {
+import { Serializable } from '../utils/basic.js';
+export declare class FunctionToken<T = any> extends InjectionToken<T> implements Serializable {
     private readonly fn;
     private readonly _getArgsFn;
     private readonly _isLazy;
@@ -15,5 +15,5 @@ export declare class FunctionToken<T = any> extends InjectionToken<T> {
     args(...newArgs: unknown[]): InjectionToken<T>;
     argsFn(fn: (s: IContainer) => unknown[]): InjectionToken<T>;
     lazy(): InjectionToken<T>;
-    getKey(): DependencyKey | constructor<T>;
+    toString(): string;
 }

package/typings/token/GroupAliasToken.d.ts

@@ -3,7 +3,8 @@ import { InjectionToken } from './InjectionToken.js';
 import { IRegistration } from '../registration/IRegistration.js';
 import { BindToken } from './BindToken.js';
 import { ArgsFn, ProviderOptions } from '../provider/IProvider.js';
-export declare class GroupAliasToken<T = any> extends InjectionToken<T[]> implements BindToken<T> {
+import { Serializable } from '../utils/basic.js';
+export declare class GroupAliasToken<T = any> extends InjectionToken<T[]> implements BindToken<T>, Serializable {
     readonly token: DependencyKey;
     private readonly _getArgsFn;
     private readonly _isLazy;
@@ -17,6 +18,6 @@ export declare class GroupAliasToken<T = any> extends InjectionToken<T[]> implem
     args(...newArgs: unknown[]): GroupAliasToken<T>;
     argsFn(fn: (s: IContainer) => unknown[]): GroupAliasToken<T>;
     lazy(): GroupAliasToken<T>;
-    getKey(): DependencyKey;
+    toString(): string;
 }
 export declare const toGroupAlias: <T>(token: DependencyKey) => GroupAliasToken<T>;

package/typings/token/GroupInstanceToken.d.ts

@@ -1,8 +1,8 @@
 import { InjectionToken } from './InjectionToken.js';
-import type { DependencyKey, IContainer } from '../container/IContainer.js';
-import { type constructor, Instance } from '../utils/basic.js';
+import type { IContainer } from '../container/IContainer.js';
+import { Instance, Serializable } from '../utils/basic.js';
 export type InstancePredicate = (dep: unknown) => boolean;
-export declare class GroupInstanceToken extends InjectionToken<Instance[]> {
+export declare class GroupInstanceToken extends InjectionToken<Instance[]> implements Serializable {
     private predicate;
     private isCascade;
     constructor(predicate: InstancePredicate);
@@ -12,5 +12,5 @@ export declare class GroupInstanceToken extends InjectionToken<Instance[]> {
     lazy(): InjectionToken<Instance[]>;
     cascade(isTrue: boolean): this;
     resolve(c: IContainer): Instance[];
-    getKey(): DependencyKey | constructor<Instance[]>;
+    toString(): string;
 }

package/typings/token/InjectionToken.d.ts

@@ -1,12 +1,10 @@
-import { type DependencyKey, type IContainer } from '../container/IContainer.js';
+import { type IContainer } from '../container/IContainer.js';
 import { ArgsFn, ProviderOptions } from '../provider/IProvider.js';
-import { type constructor } from '../utils/basic.js';
 export declare const forwardArgs: ArgsFn;
 export declare abstract class InjectionToken<T = any> {
     abstract resolve(s: IContainer, options?: ProviderOptions): T;
     abstract args(...deps: unknown[]): InjectionToken<T>;
     abstract argsFn(getArgsFn: (s: IContainer) => unknown[]): InjectionToken<T>;
     abstract lazy(): InjectionToken<T>;
-    abstract getKey(): DependencyKey | constructor<T>;
 }
 export declare function isInjectionToken(target: unknown): target is InjectionToken;

package/typings/token/SingleAliasToken.d.ts

@@ -3,7 +3,8 @@ import { InjectionToken } from './InjectionToken.js';
 import { IRegistration } from '../registration/IRegistration.js';
 import { BindToken } from './BindToken.js';
 import { ArgsFn } from '../provider/IProvider.js';
-export declare class SingleAliasToken<T = any> extends InjectionToken<T> implements BindToken<T> {
+import { Serializable } from '../utils/basic.js';
+export declare class SingleAliasToken<T = any> extends InjectionToken<T> implements BindToken<T>, Serializable {
     readonly token: DependencyKey;
     private readonly _getArgsFn;
     private readonly _isLazy;
@@ -17,6 +18,6 @@ export declare class SingleAliasToken<T = any> extends InjectionToken<T> impleme
     args(...newArgs: unknown[]): SingleAliasToken<T>;
     argsFn(fn: (s: IContainer) => unknown[]): SingleAliasToken<T>;
     lazy(): SingleAliasToken<T>;
-    getKey(): DependencyKey;
+    toString(): string;
 }
 export declare const toSingleAlias: <T>(token: DependencyKey) => SingleAliasToken<T>;

package/typings/token/SingleToken.d.ts

@@ -2,7 +2,8 @@ import { DependencyKey, IContainer } from '../container/IContainer.js';
 import { InjectionToken } from './InjectionToken.js';
 import { IRegistration } from '../registration/IRegistration.js';
 import { ArgsFn, ProviderOptions } from '../provider/IProvider.js';
-export declare class SingleToken<T = any> extends InjectionToken<T> {
+import { Serializable } from '../utils/basic.js';
+export declare class SingleToken<T = any> extends InjectionToken<T> implements Serializable {
     token: DependencyKey;
     private readonly _getArgsFn;
     private readonly _isLazy;
@@ -16,5 +17,5 @@ export declare class SingleToken<T = any> extends InjectionToken<T> {
     args(...newArgs: unknown[]): SingleToken<T>;
     argsFn(fn: (s: IContainer) => unknown[]): SingleToken<T>;
     lazy(): SingleToken<T>;
-    getKey(): DependencyKey;
+    toString(): string;
 }

package/typings/utils/basic.d.ts

@@ -1,4 +1,7 @@
 export type constructor<T> = new (...args: any[]) => T;
+export interface Serializable {
+    toString(): string;
+}
 export type Branded<TBrand extends string, T> = T & {
     readonly __brand?: TBrand;
 };
@@ -9,3 +12,5 @@ export declare const Is: {
     instance: (target: unknown) => target is Instance;
     constructor: (target: unknown) => target is constructor<unknown>;
 };
+export declare function isSerializable(target: unknown): target is Serializable;
+export declare const toString: (target: unknown) => string;