@kaokei/di 4.0.0 → 5.0.0

package/README.md

@@ -17,50 +17,28 @@
 - [入门指南](./docs/guide/index.md)
 - [API 文档](./docs/api/index.md)
 - [博客文章](./docs/note/01.什么是Token.md)
+- [CodeSandbox 在线示例](./docs/guide/EXAMPLES.md)
+
+## Todo
+
+- 完善docs中todo项目
+- 最低需要typescript@5.0.0版本，esbuild@0.24.0版本，vite@6.0.0版本，
+  这里主要是vite依赖了esbuild，但是低版本esbuild在stage3装饰器的翻译上存在bug，所以esbuild最低版本需要0.24.0，而对应的vite最低版本则是6.0.0
+  当然如果明确使用 useDefineForClassFields: true，低版本esbuild也是可以正常工作的。
+  https://chatgpt.com/share/69ca7982-2fd0-8321-8e6b-31867f5839e5
+- 需要重构当前的实现方案，应该通过context.metadata来收集依赖注入信息，然后通过类装饰器建立类和context.metadata的关联关系。
+  addInitializer → this.constructor → class
+  metadata → class decorator → WeakMap
+
+- stage3 装饰器执行顺序
+  enter method decorator --> 
+  enter field decorator --> 
+  enter class decorator -->
+  class decorator addInitializer callback -->
+  method decorator addInitializer callback -->
+  field decorator addInitializer callback -->
+  class constructor
+
+- 5.0.4，5.1.6并不支持context.metadata
+- 5.2.2 开始支持context.metadata
 
-## CodeSandbox 在线示例
-
-以下示例托管在 GitHub 仓库的 `examples/` 目录中，可通过 CodeSandbox 直接在线运行。
-
-URL 格式：`https://codesandbox.io/p/github/kaokei/di/main?file=/examples/<示例目录>/src/index.ts`
-
-| 示例                      | 说明                                              | 在线运行                                                                                                     |
-| ------------------------- | ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------ |
-| 01-basic-usage            | 基础用法：创建容器、绑定服务、属性注入、单例验证  | [打开](https://codesandbox.io/p/github/kaokei/di/main?file=/examples/01-basic-usage/src/index.ts)            |
-| 02-token-usage            | Token 用法：Token 实例作为标识符，三种绑定方式    | [打开](https://codesandbox.io/p/github/kaokei/di/main?file=/examples/02-token-usage/src/index.ts)            |
-| 03-optional-inject        | Optional 注入：依赖不存在时返回 undefined         | [打开](https://codesandbox.io/p/github/kaokei/di/main?file=/examples/03-optional-inject/src/index.ts)        |
-| 04-hierarchical-di        | 层级容器：父子容器创建与依赖查找                  | [打开](https://codesandbox.io/p/github/kaokei/di/main?file=/examples/04-hierarchical-di/src/index.ts)        |
-| 05-self-skipself          | Self 和 SkipSelf：控制依赖查找范围                | [打开](https://codesandbox.io/p/github/kaokei/di/main?file=/examples/05-self-skipself/src/index.ts)          |
-| 06-lifecycle-activation   | 激活生命周期：onActivation 钩子与执行顺序         | [打开](https://codesandbox.io/p/github/kaokei/di/main?file=/examples/06-lifecycle-activation/src/index.ts)   |
-| 07-lifecycle-deactivation | 销毁生命周期：onDeactivation 钩子与执行顺序       | [打开](https://codesandbox.io/p/github/kaokei/di/main?file=/examples/07-lifecycle-deactivation/src/index.ts) |
-| 08-post-construct         | PostConstruct：同步/异步初始化与继承行为          | [打开](https://codesandbox.io/p/github/kaokei/di/main?file=/examples/08-post-construct/src/index.ts)         |
-| 09-pre-destroy            | PreDestroy：服务销毁前的清理钩子                  | [打开](https://codesandbox.io/p/github/kaokei/di/main?file=/examples/09-pre-destroy/src/index.ts)            |
-| 10-circular-dependency    | 循环依赖：属性注入原生支持循环依赖                | [打开](https://codesandbox.io/p/github/kaokei/di/main?file=/examples/10-circular-dependency/src/index.ts)    |
-| 11-lazy-inject            | LazyInject：延迟注入，首次访问时才从容器解析      | [打开](https://codesandbox.io/p/github/kaokei/di/main?file=/examples/11-lazy-inject/src/index.ts)            |
-| 12-inheritance            | 继承：子类继承父类的属性注入与 PostConstruct 规则 | [打开](https://codesandbox.io/p/github/kaokei/di/main?file=/examples/12-inheritance/src/index.ts)            |
-| 13-to-service             | toService 别名：接口 token 映射到实现类           | [打开](https://codesandbox.io/p/github/kaokei/di/main?file=/examples/13-to-service/src/index.ts)             |
-| 14-dynamic-value          | 动态值：toDynamicValue 工厂函数与条件注入         | [打开](https://codesandbox.io/p/github/kaokei/di/main?file=/examples/14-dynamic-value/src/index.ts)          |
-| 15-error-handling         | 错误处理：各种错误类型的触发场景与捕获方式        | [打开](https://codesandbox.io/p/github/kaokei/di/main?file=/examples/15-error-handling/src/index.ts)         |
-| 16-javascript-usage       | JavaScript 用法：使用 decorate 函数手动应用装饰器 | [打开](https://codesandbox.io/p/github/kaokei/di/main?file=/examples/16-javascript-usage/src/index.js)       |
-| 17-container-destroy      | 容器销毁：destroy 递归销毁子容器与 getContainerOf | [打开](https://codesandbox.io/p/github/kaokei/di/main?file=/examples/17-container-destroy/src/index.ts)      |
-| 18-deep-circular-dependency | 深层循环依赖：属性注入支持深层循环链，以及循环依赖检测 | [打开](https://codesandbox.io/p/github/kaokei/di/main?file=/examples/18-deep-circular-dependency/src/index.ts) |
-
-每个示例目录包含独立的 `package.json`（依赖已发布的 `@kaokei/di` 版本）和 `tsconfig.json`，与主包构建流程完全隔离，可直接在 CodeSandbox 中运行。
-
-## 项目特点
-
-本项目只有单例模式，没有inversify中其他模式。
-
-本项目中@LazyInject 和 @PostConstruct 只支持class服务。
-
-inversify中执行顺序是：  
-postConstruct --> binding handler --> container handlers  
-container handlers --> binding handler --> preDestroy  
-本项目执行顺序：  
-binding handler --> container handlers --> postConstruct  
-container handlers --> binding handler --> preDestroy
-
-@postConstruct装饰器在inversify中，如果A类继承了B类。  
-此时如果A类和B类都有 @postConstruct，那么B类不会执行，只有A类会执行。  
-如果A类没有@postConstruct，那么会执行B类的。  
-如果A继承B继承C，并且A，B都没有@postConstruct，那么会执行C类的。

package/dist/cachemap.d.cts

@@ -1,25 +1,40 @@
 import { CommonToken, PostConstructParam } from './interfaces';
-import { KEYS } from './constants';
-export interface MetadataMap {
-    [KEYS.INJECTED_PROPS]: Record<string, Record<string, unknown>>;
-    [KEYS.POST_CONSTRUCT]: {
-        key: string;
-        value?: PostConstructParam;
-    };
-    [KEYS.PRE_DESTROY]: {
-        key: string;
-    };
-}
-export declare function defineMetadata<K extends keyof MetadataMap>(metadataKey: K, metadataValue: MetadataMap[K], target: CommonToken): void;
-export declare function defineMetadata(metadataKey: string, metadataValue: unknown, target: CommonToken): void;
-export declare function getOwnMetadata<K extends keyof MetadataMap>(metadataKey: K, target: CommonToken): MetadataMap[K] | undefined;
-export declare function getOwnMetadata(metadataKey: string, target: CommonToken): unknown | undefined;
 /**
- * 使用 hasParentClass 判断当前 target 有没有父类
- * 如果没有父类直接使用 getOwnMetadata 获取数据
- * 如果有父类，那么需要合并 getOwnMetadata(target) 和 getMetadata(target 的父类)
- * 统一使用展开运算符合并，返回外层新对象、内层原始引用
- * 不支持 META_KEY_INJECTED_PARAMS 作为 metadataKey
+ * 关联 target 和 metadata 对象
+ * 由 @Injectable 类装饰器调用，直接存储 context.metadata
  */
-export declare function getMetadata<K extends keyof MetadataMap>(metadataKey: K, target: CommonToken): MetadataMap[K] | undefined;
-export declare function getMetadata(metadataKey: string, target: CommonToken): unknown | undefined;
+export declare function defineMetadata(target: CommonToken, metadata: Record<string, unknown>): void;
+/**
+ * 获取 PostConstruct 元数据
+ *
+ * 如果 target 在 map 中注册了（使用了 @Injectable），
+ * 直接读取 metadata[key]，原型链自动处理继承。
+ * 如果 target 未注册但有父类，递归向上查找。
+ */
+export declare function getPostConstruct(target: CommonToken): {
+    key: string;
+    value?: PostConstructParam;
+} | undefined;
+/**
+ * 获取 PreDestroy 元数据
+ *
+ * 与 getPostConstruct 同理。
+ */
+export declare function getPreDestroy(target: CommonToken): {
+    key: string;
+} | undefined;
+/**
+ * 获取属性注入元数据（需要手动处理继承链中嵌套对象的合并）
+ *
+ * context.metadata 的原型链继承只对第一层属性有效。
+ * INJECTED_PROPS 对应的值是一个嵌套对象 { propName: { inject, self, ... } }，
+ * 原型链无法自动合并嵌套属性。
+ *
+ * 例如：父类有 { a: {...}, b: {...} }，子类有 { a: {...} }
+ * 通过原型链读取子类的 INJECTED_PROPS 只能拿到子类自己的 { a: {...} }，
+ * 无法自动合并父类的 b 属性。
+ *
+ * 所以需要手动递归处理：合并当前类和父类的 INJECTED_PROPS，
+ * 子类同名属性覆盖父类。
+ */
+export declare function getInjectedProps(target: CommonToken): Record<string, Record<string, unknown>> | undefined;

package/dist/cachemap.d.ts

@@ -1,25 +1,40 @@
 import { CommonToken, PostConstructParam } from './interfaces';
-import { KEYS } from './constants';
-export interface MetadataMap {
-    [KEYS.INJECTED_PROPS]: Record<string, Record<string, unknown>>;
-    [KEYS.POST_CONSTRUCT]: {
-        key: string;
-        value?: PostConstructParam;
-    };
-    [KEYS.PRE_DESTROY]: {
-        key: string;
-    };
-}
-export declare function defineMetadata<K extends keyof MetadataMap>(metadataKey: K, metadataValue: MetadataMap[K], target: CommonToken): void;
-export declare function defineMetadata(metadataKey: string, metadataValue: unknown, target: CommonToken): void;
-export declare function getOwnMetadata<K extends keyof MetadataMap>(metadataKey: K, target: CommonToken): MetadataMap[K] | undefined;
-export declare function getOwnMetadata(metadataKey: string, target: CommonToken): unknown | undefined;
 /**
- * 使用 hasParentClass 判断当前 target 有没有父类
- * 如果没有父类直接使用 getOwnMetadata 获取数据
- * 如果有父类，那么需要合并 getOwnMetadata(target) 和 getMetadata(target 的父类)
- * 统一使用展开运算符合并，返回外层新对象、内层原始引用
- * 不支持 META_KEY_INJECTED_PARAMS 作为 metadataKey
+ * 关联 target 和 metadata 对象
+ * 由 @Injectable 类装饰器调用，直接存储 context.metadata
  */
-export declare function getMetadata<K extends keyof MetadataMap>(metadataKey: K, target: CommonToken): MetadataMap[K] | undefined;
-export declare function getMetadata(metadataKey: string, target: CommonToken): unknown | undefined;
+export declare function defineMetadata(target: CommonToken, metadata: Record<string, unknown>): void;
+/**
+ * 获取 PostConstruct 元数据
+ *
+ * 如果 target 在 map 中注册了（使用了 @Injectable），
+ * 直接读取 metadata[key]，原型链自动处理继承。
+ * 如果 target 未注册但有父类，递归向上查找。
+ */
+export declare function getPostConstruct(target: CommonToken): {
+    key: string;
+    value?: PostConstructParam;
+} | undefined;
+/**
+ * 获取 PreDestroy 元数据
+ *
+ * 与 getPostConstruct 同理。
+ */
+export declare function getPreDestroy(target: CommonToken): {
+    key: string;
+} | undefined;
+/**
+ * 获取属性注入元数据（需要手动处理继承链中嵌套对象的合并）
+ *
+ * context.metadata 的原型链继承只对第一层属性有效。
+ * INJECTED_PROPS 对应的值是一个嵌套对象 { propName: { inject, self, ... } }，
+ * 原型链无法自动合并嵌套属性。
+ *
+ * 例如：父类有 { a: {...}, b: {...} }，子类有 { a: {...} }
+ * 通过原型链读取子类的 INJECTED_PROPS 只能拿到子类自己的 { a: {...} }，
+ * 无法自动合并父类的 b 属性。
+ *
+ * 所以需要手动递归处理：合并当前类和父类的 INJECTED_PROPS，
+ * 子类同名属性覆盖父类。
+ */
+export declare function getInjectedProps(target: CommonToken): Record<string, Record<string, unknown>> | undefined;

package/dist/decorator.d.cts

@@ -3,8 +3,8 @@ import { InjectFunction, GenericToken } from './interfaces';
 /**
  * 创建属性装饰器的高阶函数（Stage 3 Field Decorator）
  *
- * 通过 context.addInitializer 在实例化时获取构造函数引用，
- * 并将装饰器元数据存储到 CacheMap 的 INJECTED_PROPS 分区。
+ * 直接在装饰器执行阶段将元数据写入 context.metadata，
+ * 不再使用 context.addInitializer，消除实例化时的重复回调。
  *
  * @param decoratorKey 装饰器名称（如 'inject'、'self' 等）
  * @param defaultValue 装饰器的默认参数值
@@ -17,6 +17,16 @@ export declare const SkipSelf: (decoratorValue?: any) => (_value: undefined, con
 export declare const Optional: (decoratorValue?: any) => (_value: undefined, context: ClassFieldDecoratorContext) => void;
 export declare const PostConstruct: (metaValue?: any) => (_value: Function, context: ClassMethodDecoratorContext) => void;
 export declare const PreDestroy: (metaValue?: any) => (_value: Function, context: ClassMethodDecoratorContext) => void;
+/**
+ * 类装饰器：在类定义阶段关联 target（类构造函数）和 context.metadata
+ *
+ * 当所有成员装饰器（@Inject、@PostConstruct 等）执行完毕后，
+ * @Injectable 读取 context.metadata 并通过 defineMetadata 写入 CacheMap，
+ * 建立 target → metadata 的映射关系。
+ *
+ * 使用方式：@Injectable（无参数，直接作为装饰器使用）
+ */
+export declare function Injectable(Ctor: Function, context: ClassDecoratorContext): void;
 /**
  * 延迟注入装饰器，Stage 3 Field Decorator 签名。
  * 通过 context.addInitializer 在实例上定义 getter/setter，

package/dist/decorator.d.ts

@@ -3,8 +3,8 @@ import { InjectFunction, GenericToken } from './interfaces';
 /**
  * 创建属性装饰器的高阶函数（Stage 3 Field Decorator）
  *
- * 通过 context.addInitializer 在实例化时获取构造函数引用，
- * 并将装饰器元数据存储到 CacheMap 的 INJECTED_PROPS 分区。
+ * 直接在装饰器执行阶段将元数据写入 context.metadata，
+ * 不再使用 context.addInitializer，消除实例化时的重复回调。
  *
  * @param decoratorKey 装饰器名称（如 'inject'、'self' 等）
  * @param defaultValue 装饰器的默认参数值
@@ -17,6 +17,16 @@ export declare const SkipSelf: (decoratorValue?: any) => (_value: undefined, con
 export declare const Optional: (decoratorValue?: any) => (_value: undefined, context: ClassFieldDecoratorContext) => void;
 export declare const PostConstruct: (metaValue?: any) => (_value: Function, context: ClassMethodDecoratorContext) => void;
 export declare const PreDestroy: (metaValue?: any) => (_value: Function, context: ClassMethodDecoratorContext) => void;
+/**
+ * 类装饰器：在类定义阶段关联 target（类构造函数）和 context.metadata
+ *
+ * 当所有成员装饰器（@Inject、@PostConstruct 等）执行完毕后，
+ * @Injectable 读取 context.metadata 并通过 defineMetadata 写入 CacheMap，
+ * 建立 target → metadata 的映射关系。
+ *
+ * 使用方式：@Injectable（无参数，直接作为装饰器使用）
+ */
+export declare function Injectable(Ctor: Function, context: ClassDecoratorContext): void;
 /**
  * 延迟注入装饰器，Stage 3 Field Decorator 签名。
  * 通过 context.addInitializer 在实例上定义 getter/setter，

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";var F=Object.defineProperty;var x=(n,t,e)=>t in n?F(n,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):n[t]=e;var r=(n,t,e)=>x(n,typeof t!="symbol"?t+"":t,e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l={INJECTED_PROPS:"injected:props",INJECT:"inject",SELF:"self",SKIP_SELF:"skipSelf",OPTIONAL:"optional",POST_CONSTRUCT:"postConstruct",PRE_DESTROY:"preDestroy"},f={DEFAULT:"default",INITING:"initing",ACTIVATED:"activated"},d={Invalid:"Invalid",Instance:"Instance",ConstantValue:"ConstantValue",DynamicValue:"DynamicValue"},T={POST_CONSTRUCT:"Multiple @PostConstruct decorators are not allowed in a single class.",PRE_DESTROY:"Multiple @PreDestroy decorators are not allowed in a single class.",INVALID_TOKEN:"@Inject or @LazyInject requires a valid token, but received null or undefined.",LAZY_INJECT_INVALID_TOKEN:"@LazyInject requires a valid token, but received null or undefined."};function O(n,t){return Object.prototype.hasOwnProperty.call(n,t)}const N=Symbol("UNINITIALIZED"),A=new WeakMap;function U(n){return typeof n=="function"&&Object.getPrototypeOf(n)!==Function.prototype}function V(n,t,e){const i=A.get(e)||{};i[n]=t,A.set(e,i)}function w(n,t){return(A.get(t)||{})[n]}function y(n,t){const e=w(n,t);if(!U(t))return e;const i=y(n,Object.getPrototypeOf(t));if(i||e)return{...i||{},...e||{}}}class J{constructor(t){r(this,"name");this.name=t}}class R{constructor(t){r(this,"_callback");this._callback=t}resolve(){return this._callback()}}function b(n){if(!n)throw new Error(T.INVALID_TOKEN);return n instanceof R?n.resolve():n}class I extends Error{constructor(e,i){const s=(i==null?void 0:i.name)||"<unknown token>";super(`${e}${s}`);r(this,"token");this.name=this.constructor.name,this.token=i}}class m extends I{constructor(t){super("");const e=[];let i=t;for(;i&&i.token;)e.push(i.token),i=i.parent;const s=e.reverse().map(o=>o.name||"<anonymous>").join(" --> ");this.message=`Circular dependency found: ${s}`}}class j extends I{constructor(t){super("Invalid binding: ",t)}}class L extends m{constructor(t){super(t),this.name="CircularDependencyError inside @PostConstruct"}}const E=class E{constructor(t,e){r(this,"container");r(this,"context");r(this,"token");r(this,"type",d.Invalid);r(this,"status",f.DEFAULT);r(this,"classValue");r(this,"constantValue");r(this,"dynamicValue");r(this,"cache");r(this,"postConstructResult",N);r(this,"onActivationHandler");r(this,"onDeactivationHandler");this.container=e,this.context={container:this.container},this.token=t}onActivation(t){this.onActivationHandler=t}onDeactivation(t){this.onDeactivationHandler=t}activate(t){const e=this.onActivationHandler?this.onActivationHandler(this.context,t):t;return this.container.activate(e,this.token)}deactivate(){this.onDeactivationHandler&&this.onDeactivationHandler(this.cache)}to(t){return this.type=d.Instance,this.classValue=t,this}toSelf(){return this.to(this.token)}toConstantValue(t){return this.type=d.ConstantValue,this.constantValue=t,this}toDynamicValue(t){return this.type=d.DynamicValue,this.dynamicValue=t,this}toService(t){return this.toDynamicValue(e=>e.container.get(t,{parent:{token:this.token}}))}get(t){if(f.INITING===this.status)throw new m(t);if(f.ACTIVATED===this.status)return this.cache;const e=E._resolvers[this.type];if(e)return this[e](t);throw new j(this.token)}_getAwaitBindings(t,e){return e===!0?t:Array.isArray(e)?t.filter(i=>e.includes(i.token)):typeof e=="function"?t.filter(e):[]}_postConstruct(t,e){if(d.Instance===this.type){const{key:i,value:s}=y(l.POST_CONSTRUCT,this.classValue)||{};if(i)if(s){const o=e.filter(c=>d.Instance===(c==null?void 0:c.type)),a=this._getAwaitBindings(o,s);for(const c of a)if(c&&c.postConstructResult===N)throw new L({token:c.token,parent:t});const u=a.map(c=>c.postConstructResult);this.postConstructResult=Promise.all(u).then(()=>this._execute(i))}else this.postConstructResult=this._execute(i);else this.postConstructResult=void 0}}preDestroy(){if(d.Instance===this.type){const{key:t}=y(l.PRE_DESTROY,this.classValue)||{};t&&this._execute(t)}_._instanceContainerMap.delete(this.cache),this.container=null,this.context=null,this.classValue=void 0,this.constantValue=void 0,this.dynamicValue=void 0,this.cache=void 0,this.postConstructResult=N,this.onActivationHandler=void 0,this.onDeactivationHandler=void 0}_execute(t){const e=this.cache[t];return e==null?void 0:e.call(this.cache)}_resolveInstanceValue(t){this.status=f.INITING;const e=this._createInstance();this.cache=this.activate(e),this.status=f.ACTIVATED,this._registerInstance();const{properties:i,bindings:s}=this._getInjectProperties(t);return this._injectProperties(i),this._postConstruct(t,s),this.cache}_createInstance(){const t=this.classValue;return new t}_registerInstance(){_._instanceContainerMap.set(this.cache,this.container)}_injectProperties(t){Object.assign(this.cache,t)}_resolveConstantValue(){return this.status=f.INITING,this.cache=this.activate(this.constantValue),this.status=f.ACTIVATED,this.cache}_resolveDynamicValue(){this.status=f.INITING;const t=this.dynamicValue(this.context);return this.cache=this.activate(t),this.status=f.ACTIVATED,this.cache}_getInjectProperties(t){const e=y(l.INJECTED_PROPS,this.classValue)||{},i=Object.keys(e),s=Object.create(null),o=[];for(let a=0;a<i.length;a++){const u=i[a],c=e[u],{inject:p,...v}=c;v.parent=t;const h=this.container.get(b(p),v);h===void 0&&c.optional||(s[u]=h),o.push(v.binding)}return{properties:s,bindings:o}}};r(E,"_resolvers",{[d.Instance]:"_resolveInstanceValue",[d.ConstantValue]:"_resolveConstantValue",[d.DynamicValue]:"_resolveDynamicValue"});let C=E;class k extends I{constructor(t){super("No matching binding found for token: ",t)}}class B extends I{constructor(t){super("Cannot bind token multiple times: ",t)}}const g=class g{constructor(){r(this,"parent");r(this,"children");r(this,"_bindings",new Map);r(this,"_onActivationHandler");r(this,"_onDeactivationHandler")}static getContainerOf(t){return g._instanceContainerMap.get(t)}bind(t){if(this._bindings.has(t))throw new B(t);const e=this._buildBinding(t);return this._bindings.set(t,e),e}unbind(t){if(this._bindings.has(t)){const e=this._getBinding(t);this.deactivate(e),e.deactivate(),e.preDestroy(),this._bindings.delete(t)}}unbindAll(){const t=Array.from(this._bindings.keys());for(const e of t)this.unbind(e)}isCurrentBound(t){return this._bindings.has(t)}isBound(t){return this.isCurrentBound(t)||!!this.parent&&this.parent.isBound(t)}createChild(){const t=new g;return t.parent=this,this.children||(this.children=new Set),this.children.add(t),t}destroy(){var t,e;if(this.children){const i=Array.from(this.children);for(const s of i)s.destroy()}this.unbindAll(),this._bindings.clear(),(e=(t=this.parent)==null?void 0:t.children)==null||e.delete(this),this.parent=void 0,this.children=void 0,this._onActivationHandler=void 0,this._onDeactivationHandler=void 0}get(t,e={}){return e.skipSelf?this._resolveSkipSelf(t,e):e.self?this._resolveSelf(t,e):this._resolveDefault(t,e)}_resolveSkipSelf(t,e){return this.parent?(e.skipSelf=!1,this.parent.get(t,e)):this._checkBindingNotFoundError(t,e)}_resolveSelf(t,e){const i=this._getBinding(t);return i?(e.token=t,e.binding=i,i.get(e)):this._checkBindingNotFoundError(t,e)}_resolveDefault(t,e){const i=this._getBinding(t);return i?(e.token=t,e.binding=i,i.get(e)):this.parent?this.parent.get(t,e):this._checkBindingNotFoundError(t,e)}onActivation(t){this._onActivationHandler=t}onDeactivation(t){this._onDeactivationHandler=t}activate(t,e){return this._onActivationHandler?this._onActivationHandler({container:this},t,e):t}deactivate(t){this._onDeactivationHandler&&this._onDeactivationHandler(t.cache,t.token)}_buildBinding(t){return new C(t,this)}_getBinding(t){return this._bindings.get(t)}_checkBindingNotFoundError(t,e){if(!e.optional)throw new k(t)}};r(g,"_instanceContainerMap",new WeakMap);let _=g;class H extends I{constructor(t,e){super(`@LazyInject(${t==null?void 0:t.name}) in class ${e.name} requires a registered container but none was found. Token: `,t)}}function D(n,t){return function(e){return function(i,s){s.addInitializer(function(){const o=this.constructor,a=s.name,u=w(l.INJECTED_PROPS,o)||{},c=u[a]||{};c[n]=e===void 0?t:e,u[a]=c,V(l.INJECTED_PROPS,u,o)})}}}function M(n,t){return e=>(i,s)=>{const o=s.name,a=s.metadata;if(O(a,n))throw new Error(t);a[n]=!0,s.addInitializer(function(){const u=this.constructor;V(n,{key:o,value:e},u)})}}const Y=D(l.INJECT),G=D(l.SELF,!0),K=D(l.SKIP_SELF,!0),$=D(l.OPTIONAL,!0),Z=M(l.POST_CONSTRUCT,T.POST_CONSTRUCT),q=M(l.PRE_DESTROY,T.PRE_DESTROY);function W(n,t,e,i){if(e==null)throw new Error(T.LAZY_INJECT_INVALID_TOKEN);const s=Symbol.for(t);Object.defineProperty(n,t,{configurable:!0,enumerable:!0,get(){if(!O(n,s)){const o=i||_.getContainerOf(n),a=n.constructor;if(!o)throw new H(b(e),a);n[s]=o.get(b(e),{parent:{token:a}})}return n[s]},set(o){n[s]=o}})}function z(n,t){return function(e,i){const s=i.name;i.addInitializer(function(){W(this,s,n,t)})}}function Q(n){return function(t){return z(t,n)}}const S=Symbol("decorate.metadata");function X(n,t,e){const i=Array.isArray(n)?n:[n],s=t.prototype,o=typeof s[e]=="function",a=[];O(t,S)||(t[S]={});const u=t[S],c={kind:o?"method":"field",name:e,static:!1,private:!1,addInitializer(h){a.push(h)},metadata:u};let p=o?s[e]:void 0;for(let h=i.length-1;h>=0;h--){const P=i[h](p,c);o&&typeof P=="function"&&(p=P)}o&&p!==s[e]&&(s[e]=p);const v=Object.create(s);for(const h of a)h.call(v)}exports.BaseError=I;exports.Binding=C;exports.BindingNotFoundError=k;exports.BindingNotValidError=j;exports.CircularDependencyError=m;exports.Container=_;exports.ContainerNotFoundError=H;exports.DuplicateBindingError=B;exports.Inject=Y;exports.LazyInject=z;exports.LazyToken=R;exports.Optional=$;exports.PostConstruct=Z;exports.PostConstructError=L;exports.PreDestroy=q;exports.Self=G;exports.SkipSelf=K;exports.Token=J;exports.createLazyInject=Q;exports.decorate=X;
+"use strict";var z=Object.defineProperty;var J=(n,t,e)=>t in n?z(n,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):n[t]=e;var r=(n,t,e)=>J(n,typeof t!="symbol"?t+"":t,e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u={INJECTED_PROPS:"injected:props",INJECT:"inject",SELF:"self",SKIP_SELF:"skipSelf",OPTIONAL:"optional",POST_CONSTRUCT:"postConstruct",PRE_DESTROY:"preDestroy"},f={DEFAULT:"default",INITING:"initing",ACTIVATED:"activated"},d={Invalid:"Invalid",Instance:"Instance",ConstantValue:"ConstantValue",DynamicValue:"DynamicValue"},T={POST_CONSTRUCT:"Multiple @PostConstruct decorators are not allowed in a single class.",PRE_DESTROY:"Multiple @PreDestroy decorators are not allowed in a single class.",INVALID_TOKEN:"@Inject or @LazyInject requires a valid token, but received null or undefined.",LAZY_INJECT_INVALID_TOKEN:"@LazyInject requires a valid token, but received null or undefined."};function y(n,t){return Object.prototype.hasOwnProperty.call(n,t)}const m=Symbol("UNINITIALIZED"),D=new WeakMap;function b(n){return typeof n=="function"&&Object.getPrototypeOf(n)!==Function.prototype}function A(n,t){D.set(n,t)}function V(n){const t=D.get(n);if(t)return t[u.POST_CONSTRUCT];if(b(n))return V(Object.getPrototypeOf(n))}function w(n){const t=D.get(n);if(t)return t[u.PRE_DESTROY];if(b(n))return w(Object.getPrototypeOf(n))}function j(n){const t=D.get(n),e=t&&y(t,u.INJECTED_PROPS)?t[u.INJECTED_PROPS]:void 0;if(!b(n))return e;const i=j(Object.getPrototypeOf(n));if(i||e)return{...i||{},...e||{}}}class U{constructor(t){r(this,"name");this.name=t}}class R{constructor(t){r(this,"_callback");this._callback=t}resolve(){return this._callback()}}function P(n){if(!n)throw new Error(T.INVALID_TOKEN);return n instanceof R?n.resolve():n}class I extends Error{constructor(e,i){const s=(i==null?void 0:i.name)||"<unknown token>";super(`${e}${s}`);r(this,"token");this.name=this.constructor.name,this.token=i}}class O extends I{constructor(t){super("");const e=[];let i=t;for(;i&&i.token;)e.push(i.token),i=i.parent;const s=e.reverse().map(o=>o.name||"<anonymous>").join(" --> ");this.message=`Circular dependency found: ${s}`}}class L extends I{constructor(t){super("Invalid binding: ",t)}}class k extends O{constructor(t){super(t),this.name="CircularDependencyError inside @PostConstruct"}}const C=class C{constructor(t,e){r(this,"container");r(this,"context");r(this,"token");r(this,"type",d.Invalid);r(this,"status",f.DEFAULT);r(this,"classValue");r(this,"constantValue");r(this,"dynamicValue");r(this,"cache");r(this,"postConstructResult",m);r(this,"onActivationHandler");r(this,"onDeactivationHandler");this.container=e,this.context={container:this.container},this.token=t}onActivation(t){this.onActivationHandler=t}onDeactivation(t){this.onDeactivationHandler=t}activate(t){const e=this.onActivationHandler?this.onActivationHandler(this.context,t):t;return this.container.activate(e,this.token)}deactivate(){this.onDeactivationHandler&&this.onDeactivationHandler(this.cache)}to(t){return this.type=d.Instance,this.classValue=t,this}toSelf(){return this.to(this.token)}toConstantValue(t){return this.type=d.ConstantValue,this.constantValue=t,this}toDynamicValue(t){return this.type=d.DynamicValue,this.dynamicValue=t,this}toService(t){return this.toDynamicValue(e=>e.container.get(t,{parent:{token:this.token}}))}get(t){if(f.INITING===this.status)throw new O(t);if(f.ACTIVATED===this.status)return this.cache;const e=C._resolvers[this.type];if(e)return this[e](t);throw new L(this.token)}_getAwaitBindings(t,e){return e===!0?t:Array.isArray(e)?t.filter(i=>e.includes(i.token)):typeof e=="function"?t.filter(e):[]}_postConstruct(t,e){if(d.Instance===this.type){const{key:i,value:s}=V(this.classValue)||{};if(i)if(s){const o=e.filter(c=>d.Instance===(c==null?void 0:c.type)),a=this._getAwaitBindings(o,s);for(const c of a)if(c&&c.postConstructResult===m)throw new k({token:c.token,parent:t});const l=a.map(c=>c.postConstructResult);this.postConstructResult=Promise.all(l).then(()=>this._execute(i))}else this.postConstructResult=this._execute(i);else this.postConstructResult=void 0}}preDestroy(){if(d.Instance===this.type){const{key:t}=w(this.classValue)||{};t&&this._execute(t)}v._instanceContainerMap.delete(this.cache),this.container=null,this.context=null,this.classValue=void 0,this.constantValue=void 0,this.dynamicValue=void 0,this.cache=void 0,this.postConstructResult=m,this.onActivationHandler=void 0,this.onDeactivationHandler=void 0}_execute(t){const e=this.cache[t];return e==null?void 0:e.call(this.cache)}_resolveInstanceValue(t){this.status=f.INITING;const e=this._createInstance();this.cache=this.activate(e),this.status=f.ACTIVATED,this._registerInstance();const{properties:i,bindings:s}=this._getInjectProperties(t);return this._injectProperties(i),this._postConstruct(t,s),this.cache}_createInstance(){const t=this.classValue;return new t}_registerInstance(){v._instanceContainerMap.set(this.cache,this.container)}_injectProperties(t){Object.assign(this.cache,t)}_resolveConstantValue(){return this.status=f.INITING,this.cache=this.activate(this.constantValue),this.status=f.ACTIVATED,this.cache}_resolveDynamicValue(){this.status=f.INITING;const t=this.dynamicValue(this.context);return this.cache=this.activate(t),this.status=f.ACTIVATED,this.cache}_getInjectProperties(t){const e=j(this.classValue)||{},i=Object.keys(e),s=Object.create(null),o=[];for(let a=0;a<i.length;a++){const l=i[a],c=e[l],{inject:_,...h}=c;h.parent=t;const p=this.container.get(P(_),h);p===void 0&&c.optional||(s[l]=p),o.push(h.binding)}return{properties:s,bindings:o}}};r(C,"_resolvers",{[d.Instance]:"_resolveInstanceValue",[d.ConstantValue]:"_resolveConstantValue",[d.DynamicValue]:"_resolveDynamicValue"});let E=C;class B extends I{constructor(t){super("No matching binding found for token: ",t)}}class H extends I{constructor(t){super("Cannot bind token multiple times: ",t)}}const g=class g{constructor(){r(this,"parent");r(this,"children");r(this,"_bindings",new Map);r(this,"_onActivationHandler");r(this,"_onDeactivationHandler")}static getContainerOf(t){return g._instanceContainerMap.get(t)}bind(t){if(this._bindings.has(t))throw new H(t);const e=this._buildBinding(t);return this._bindings.set(t,e),e}unbind(t){if(this._bindings.has(t)){const e=this._getBinding(t);this.deactivate(e),e.deactivate(),e.preDestroy(),this._bindings.delete(t)}}unbindAll(){const t=Array.from(this._bindings.keys());for(const e of t)this.unbind(e)}isCurrentBound(t){return this._bindings.has(t)}isBound(t){return this.isCurrentBound(t)||!!this.parent&&this.parent.isBound(t)}createChild(){const t=new g;return t.parent=this,this.children||(this.children=new Set),this.children.add(t),t}destroy(){var t,e;if(this.children){const i=Array.from(this.children);for(const s of i)s.destroy()}this.unbindAll(),this._bindings.clear(),(e=(t=this.parent)==null?void 0:t.children)==null||e.delete(this),this.parent=void 0,this.children=void 0,this._onActivationHandler=void 0,this._onDeactivationHandler=void 0}get(t,e={}){return e.skipSelf?this._resolveSkipSelf(t,e):e.self?this._resolveSelf(t,e):this._resolveDefault(t,e)}_resolveSkipSelf(t,e){return this.parent?(e.skipSelf=!1,this.parent.get(t,e)):this._checkBindingNotFoundError(t,e)}_resolveSelf(t,e){const i=this._getBinding(t);return i?(e.token=t,e.binding=i,i.get(e)):this._checkBindingNotFoundError(t,e)}_resolveDefault(t,e){const i=this._getBinding(t);return i?(e.token=t,e.binding=i,i.get(e)):this.parent?this.parent.get(t,e):this._checkBindingNotFoundError(t,e)}onActivation(t){this._onActivationHandler=t}onDeactivation(t){this._onDeactivationHandler=t}activate(t,e){return this._onActivationHandler?this._onActivationHandler({container:this},t,e):t}deactivate(t){this._onDeactivationHandler&&this._onDeactivationHandler(t.cache,t.token)}_buildBinding(t){return new E(t,this)}_getBinding(t){return this._bindings.get(t)}_checkBindingNotFoundError(t,e){if(!e.optional)throw new B(t)}};r(g,"_instanceContainerMap",new WeakMap);let v=g;class x extends I{constructor(t,e){super(`@LazyInject(${t==null?void 0:t.name}) in class ${e.name} requires a registered container but none was found. Token: `,t)}}function N(n,t){return function(e){return function(i,s){const o=s.name,a=s.metadata;y(a,u.INJECTED_PROPS)||(a[u.INJECTED_PROPS]={});const l=a[u.INJECTED_PROPS];l[o]||(l[o]={}),l[o][n]=e===void 0?t:e}}}function F(n,t){return e=>(i,s)=>{const o=s.name,a=s.metadata;if(y(a,n))throw new Error(t);a[n]={key:o,value:e}}}const K=N(u.INJECT),Y=N(u.SELF,!0),G=N(u.SKIP_SELF,!0),$=N(u.OPTIONAL,!0),Z=F(u.POST_CONSTRUCT,T.POST_CONSTRUCT),q=F(u.PRE_DESTROY,T.PRE_DESTROY);function W(n,t){const e=t.metadata;A(n,e)}function Q(n,t,e,i){if(e==null)throw new Error(T.LAZY_INJECT_INVALID_TOKEN);const s=Symbol.for(t);Object.defineProperty(n,t,{configurable:!0,enumerable:!0,get(){if(!y(n,s)){const o=i||v.getContainerOf(n),a=n.constructor;if(!o)throw new x(P(e),a);n[s]=o.get(P(e),{parent:{token:a}})}return n[s]},set(o){n[s]=o}})}function M(n,t){return function(e,i){const s=i.name;i.addInitializer(function(){Q(this,s,n,t)})}}function X(n){return function(t){return M(t,n)}}const S=Symbol("decorate.metadata");function tt(n,t,e){const i=Array.isArray(n)?n:[n],s=t.prototype,o=typeof s[e]=="function",a=[];y(t,S)||(t[S]={});const l=t[S],c={kind:o?"method":"field",name:e,static:!1,private:!1,addInitializer(h){a.push(h)},metadata:l};let _=o?s[e]:void 0;for(let h=i.length-1;h>=0;h--){const p=i[h](_,c);o&&typeof p=="function"&&(_=p)}if(o&&_!==s[e]&&(s[e]=_),A(t,l),a.length>0){const h=Object.create(s);for(const p of a)p.call(h)}}exports.BaseError=I;exports.Binding=E;exports.BindingNotFoundError=B;exports.BindingNotValidError=L;exports.CircularDependencyError=O;exports.Container=v;exports.ContainerNotFoundError=x;exports.DuplicateBindingError=H;exports.Inject=K;exports.Injectable=W;exports.LazyInject=M;exports.LazyToken=R;exports.Optional=$;exports.PostConstruct=Z;exports.PostConstructError=k;exports.PreDestroy=q;exports.Self=Y;exports.SkipSelf=G;exports.Token=U;exports.createLazyInject=X;exports.decorate=tt;

package/dist/index.d.cts

@@ -2,7 +2,7 @@ export type { Newable, InjectFunction, CommonToken, TokenType, GenericToken, Laz
 export { Container } from './container';
 export { Binding } from './binding';
 export { Token, LazyToken } from './token';
-export { Inject, Self, SkipSelf, Optional, PostConstruct, PreDestroy, decorate, LazyInject, createLazyInject, } from './decorator';
+export { Inject, Self, SkipSelf, Optional, PostConstruct, PreDestroy, Injectable, decorate, LazyInject, createLazyInject, } from './decorator';
 export { BaseError } from './errors/BaseError';
 export { BindingNotFoundError } from './errors/BindingNotFoundError';
 export { BindingNotValidError } from './errors/BindingNotValidError';

package/dist/index.d.ts

@@ -2,7 +2,7 @@ export type { Newable, InjectFunction, CommonToken, TokenType, GenericToken, Laz
 export { Container } from './container';
 export { Binding } from './binding';
 export { Token, LazyToken } from './token';
-export { Inject, Self, SkipSelf, Optional, PostConstruct, PreDestroy, decorate, LazyInject, createLazyInject, } from './decorator';
+export { Inject, Self, SkipSelf, Optional, PostConstruct, PreDestroy, Injectable, decorate, LazyInject, createLazyInject, } from './decorator';
 export { BaseError } from './errors/BaseError';
 export { BindingNotFoundError } from './errors/BindingNotFoundError';
 export { BindingNotValidError } from './errors/BindingNotValidError';

package/dist/index.js

@@ -1,7 +1,7 @@
 var L = Object.defineProperty;
-var j = (n, t, e) => t in n ? L(n, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[t] = e;
-var r = (n, t, e) => j(n, typeof t != "symbol" ? t + "" : t, e);
-const l = {
+var k = (n, t, e) => t in n ? L(n, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[t] = e;
+var r = (n, t, e) => k(n, typeof t != "symbol" ? t + "" : t, e);
+const u = {
   // 记录实例属性装饰器对应的数据的键
   INJECTED_PROPS: "injected:props",
   // Inject 装饰器的键
@@ -25,7 +25,7 @@ const l = {
   Instance: "Instance",
   ConstantValue: "ConstantValue",
   DynamicValue: "DynamicValue"
-}, C = {
+}, E = {
   // 用于 decorator.ts 的 createMetaDecorator —— 重复装饰器检测
   POST_CONSTRUCT: "Multiple @PostConstruct decorators are not allowed in a single class.",
   PRE_DESTROY: "Multiple @PreDestroy decorators are not allowed in a single class.",
@@ -34,35 +34,42 @@ const l = {
   // 用于 decorator.ts 的 defineLazyProperty —— 无效 token
   LAZY_INJECT_INVALID_TOKEN: "@LazyInject requires a valid token, but received null or undefined."
 };
-function m(n, t) {
+function g(n, t) {
   return Object.prototype.hasOwnProperty.call(n, t);
 }
-const D = Symbol("UNINITIALIZED"), A = /* @__PURE__ */ new WeakMap();
-function k(n) {
+const m = Symbol("UNINITIALIZED"), C = /* @__PURE__ */ new WeakMap();
+function O(n) {
   return typeof n == "function" && Object.getPrototypeOf(n) !== Function.prototype;
 }
-function V(n, t, e) {
-  const i = A.get(e) || {};
-  i[n] = t, A.set(e, i);
-}
 function P(n, t) {
-  return (A.get(t) || {})[n];
+  C.set(n, t);
+}
+function S(n) {
+  const t = C.get(n);
+  if (t)
+    return t[u.POST_CONSTRUCT];
+  if (O(n))
+    return S(Object.getPrototypeOf(n));
+}
+function V(n) {
+  const t = C.get(n);
+  if (t)
+    return t[u.PRE_DESTROY];
+  if (O(n))
+    return V(Object.getPrototypeOf(n));
 }
-function T(n, t) {
-  const e = P(n, t);
-  if (!k(t))
+function w(n) {
+  const t = C.get(n), e = t && g(t, u.INJECTED_PROPS) ? t[u.INJECTED_PROPS] : void 0;
+  if (!O(n))
     return e;
-  const i = T(
-    n,
-    Object.getPrototypeOf(t)
-  );
+  const i = w(Object.getPrototypeOf(n));
   if (i || e)
     return {
       ...i || {},
       ...e || {}
     };
 }
-class G {
+class Y {
   constructor(t) {
     // 仅类型层面存在，无运行时开销
     r(this, "name");
@@ -78,12 +85,12 @@ class B {
     return this._callback();
   }
 }
-function S(n) {
+function b(n) {
   if (!n)
-    throw new Error(C.INVALID_TOKEN);
+    throw new Error(E.INVALID_TOKEN);
   return n instanceof B ? n.resolve() : n;
 }
-class g extends Error {
+class y extends Error {
   constructor(e, i) {
     const s = (i == null ? void 0 : i.name) || "<unknown token>";
     super(`${e}${s}`);
@@ -91,28 +98,28 @@ class g extends Error {
     this.name = this.constructor.name, this.token = i;
   }
 }
-class w extends g {
+class R extends y {
   constructor(t) {
     super("");
     const e = [];
     let i = t;
     for (; i && i.token; )
       e.push(i.token), i = i.parent;
-    const s = e.reverse().map((a) => a.name || "<anonymous>").join(" --> ");
+    const s = e.reverse().map((o) => o.name || "<anonymous>").join(" --> ");
     this.message = `Circular dependency found: ${s}`;
   }
 }
-class H extends g {
+class H extends y {
   constructor(t) {
     super("Invalid binding: ", t);
   }
 }
-class M extends w {
+class x extends R {
   constructor(t) {
     super(t), this.name = "CircularDependencyError inside @PostConstruct";
   }
 }
-const y = class y {
+const T = class T {
   constructor(t, e) {
     r(this, "container");
     r(this, "context");
@@ -123,7 +130,7 @@ const y = class y {
     r(this, "constantValue");
     r(this, "dynamicValue");
     r(this, "cache");
-    r(this, "postConstructResult", D);
+    r(this, "postConstructResult", m);
     r(this, "onActivationHandler");
     r(this, "onDeactivationHandler");
     this.container = e, this.context = { container: this.container }, this.token = t;
@@ -160,10 +167,10 @@ const y = class y {
   }
   get(t) {
     if (f.INITING === this.status)
-      throw new w(t);
+      throw new R(t);
     if (f.ACTIVATED === this.status)
       return this.cache;
-    const e = y._resolvers[this.type];
+    const e = T._resolvers[this.type];
     if (e)
       return this[e](t);
     throw new H(this.token);
@@ -186,20 +193,20 @@ const y = class y {
    */
   _postConstruct(t, e) {
     if (d.Instance === this.type) {
-      const { key: i, value: s } = T(l.POST_CONSTRUCT, this.classValue) || {};
+      const { key: i, value: s } = S(this.classValue) || {};
       if (i)
         if (s) {
-          const a = e.filter(
+          const o = e.filter(
             (c) => d.Instance === (c == null ? void 0 : c.type)
-          ), o = this._getAwaitBindings(a, s);
-          for (const c of o)
-            if (c && c.postConstructResult === D)
-              throw new M({
+          ), a = this._getAwaitBindings(o, s);
+          for (const c of a)
+            if (c && c.postConstructResult === m)
+              throw new x({
                 token: c.token,
                 parent: t
               });
-          const u = o.map((c) => c.postConstructResult);
-          this.postConstructResult = Promise.all(u).then(
+          const l = a.map((c) => c.postConstructResult);
+          this.postConstructResult = Promise.all(l).then(
             () => this._execute(i)
           );
         } else
@@ -210,10 +217,10 @@ const y = class y {
   }
   preDestroy() {
     if (d.Instance === this.type) {
-      const { key: t } = T(l.PRE_DESTROY, this.classValue) || {};
+      const { key: t } = V(this.classValue) || {};
       t && this._execute(t);
     }
-    I._instanceContainerMap.delete(this.cache), this.container = null, this.context = null, this.classValue = void 0, this.constantValue = void 0, this.dynamicValue = void 0, this.cache = void 0, this.postConstructResult = D, this.onActivationHandler = void 0, this.onDeactivationHandler = void 0;
+    I._instanceContainerMap.delete(this.cache), this.container = null, this.context = null, this.classValue = void 0, this.constantValue = void 0, this.dynamicValue = void 0, this.cache = void 0, this.postConstructResult = m, this.onActivationHandler = void 0, this.onDeactivationHandler = void 0;
   }
   _execute(t) {
     const e = this.cache[t];
@@ -248,32 +255,32 @@ const y = class y {
     return this.cache = this.activate(t), this.status = f.ACTIVATED, this.cache;
   }
   _getInjectProperties(t) {
-    const e = T(l.INJECTED_PROPS, this.classValue) || {}, i = Object.keys(e), s = /* @__PURE__ */ Object.create(null), a = [];
-    for (let o = 0; o < i.length; o++) {
-      const u = i[o], c = e[u], { inject: p, ..._ } = c;
-      _.parent = t;
-      const h = this.container.get(
-        S(p),
-        _
+    const e = w(this.classValue) || {}, i = Object.keys(e), s = /* @__PURE__ */ Object.create(null), o = [];
+    for (let a = 0; a < i.length; a++) {
+      const l = i[a], c = e[l], { inject: _, ...h } = c;
+      h.parent = t;
+      const p = this.container.get(
+        b(_),
+        h
       );
-      h === void 0 && c.optional || (s[u] = h), a.push(_.binding);
+      p === void 0 && c.optional || (s[l] = p), o.push(h.binding);
     }
-    return { properties: s, bindings: a };
+    return { properties: s, bindings: o };
   }
 };
 // 类型到解析方法的静态映射表，用于替代 get 方法中的 if-else 链
-r(y, "_resolvers", {
+r(T, "_resolvers", {
   [d.Instance]: "_resolveInstanceValue",
   [d.ConstantValue]: "_resolveConstantValue",
   [d.DynamicValue]: "_resolveDynamicValue"
 });
-let b = y;
-class x extends g {
+let A = T;
+class M extends y {
   constructor(t) {
     super("No matching binding found for token: ", t);
   }
 }
-class F extends g {
+class F extends y {
   constructor(t) {
     super("Cannot bind token multiple times: ", t);
   }
@@ -356,14 +363,14 @@ const v = class v {
     this._onDeactivationHandler && this._onDeactivationHandler(t.cache, t.token);
   }
   _buildBinding(t) {
-    return new b(t, this);
+    return new A(t, this);
   }
   _getBinding(t) {
     return this._bindings.get(t);
   }
   _checkBindingNotFoundError(t, e) {
     if (!e.optional)
-      throw new x(t);
+      throw new M(t);
   }
 };
 // 实例到容器的映射表，用于 @LazyInject 查找实例所属容器
@@ -374,7 +381,7 @@ const v = class v {
 // 由于 Instance 类型每次都通过 new ClassName() 创建新实例，不存在同一实例被多个容器注册的覆盖风险
 r(v, "_instanceContainerMap", /* @__PURE__ */ new WeakMap());
 let I = v;
-class z extends g {
+class z extends y {
   constructor(t, e) {
     super(
       `@LazyInject(${t == null ? void 0 : t.name}) in class ${e.name} requires a registered container but none was found. Token: `,
@@ -382,113 +389,116 @@ class z extends g {
     );
   }
 }
-function E(n, t) {
+function D(n, t) {
   return function(e) {
     return function(i, s) {
-      s.addInitializer(function() {
-        const a = this.constructor, o = s.name, u = P(l.INJECTED_PROPS, a) || {}, c = u[o] || {};
-        c[n] = e === void 0 ? t : e, u[o] = c, V(l.INJECTED_PROPS, u, a);
-      });
+      const o = s.name, a = s.metadata;
+      g(a, u.INJECTED_PROPS) || (a[u.INJECTED_PROPS] = {});
+      const l = a[u.INJECTED_PROPS];
+      l[o] || (l[o] = {}), l[o][n] = e === void 0 ? t : e;
     };
   };
 }
-function R(n, t) {
+function j(n, t) {
   return (e) => (i, s) => {
-    const a = s.name, o = s.metadata;
-    if (m(o, n))
+    const o = s.name, a = s.metadata;
+    if (g(a, n))
       throw new Error(t);
-    o[n] = !0, s.addInitializer(function() {
-      const u = this.constructor;
-      V(n, { key: a, value: e }, u);
-    });
+    a[n] = { key: o, value: e };
   };
 }
-const K = E(l.INJECT), $ = E(l.SELF, !0), Z = E(l.SKIP_SELF, !0), q = E(l.OPTIONAL, !0), W = R(
-  l.POST_CONSTRUCT,
-  C.POST_CONSTRUCT
-), Q = R(
-  l.PRE_DESTROY,
-  C.PRE_DESTROY
+const G = D(u.INJECT), $ = D(u.SELF, !0), Z = D(u.SKIP_SELF, !0), q = D(u.OPTIONAL, !0), W = j(
+  u.POST_CONSTRUCT,
+  E.POST_CONSTRUCT
+), Q = j(
+  u.PRE_DESTROY,
+  E.PRE_DESTROY
 );
-function U(n, t, e, i) {
+function X(n, t) {
+  const e = t.metadata;
+  P(n, e);
+}
+function J(n, t, e, i) {
   if (e == null)
-    throw new Error(C.LAZY_INJECT_INVALID_TOKEN);
+    throw new Error(E.LAZY_INJECT_INVALID_TOKEN);
   const s = Symbol.for(t);
   Object.defineProperty(n, t, {
     configurable: !0,
     enumerable: !0,
     get() {
-      if (!m(n, s)) {
-        const a = i || I.getContainerOf(n), o = n.constructor;
-        if (!a)
-          throw new z(S(e), o);
-        n[s] = a.get(S(e), {
-          parent: { token: o }
+      if (!g(n, s)) {
+        const o = i || I.getContainerOf(n), a = n.constructor;
+        if (!o)
+          throw new z(b(e), a);
+        n[s] = o.get(b(e), {
+          parent: { token: a }
         });
       }
       return n[s];
     },
-    set(a) {
-      n[s] = a;
+    set(o) {
+      n[s] = o;
     }
   });
 }
-function J(n, t) {
+function U(n, t) {
   return function(e, i) {
     const s = i.name;
     i.addInitializer(function() {
-      U(this, s, n, t);
+      J(this, s, n, t);
     });
   };
 }
-function X(n) {
+function tt(n) {
   return function(t) {
-    return J(t, n);
+    return U(t, n);
   };
 }
 const N = Symbol("decorate.metadata");
-function tt(n, t, e) {
-  const i = Array.isArray(n) ? n : [n], s = t.prototype, a = typeof s[e] == "function", o = [];
-  m(t, N) || (t[N] = {});
-  const u = t[N], c = {
-    kind: a ? "method" : "field",
+function et(n, t, e) {
+  const i = Array.isArray(n) ? n : [n], s = t.prototype, o = typeof s[e] == "function", a = [];
+  g(t, N) || (t[N] = {});
+  const l = t[N], c = {
+    kind: o ? "method" : "field",
     name: e,
     static: !1,
     private: !1,
     addInitializer(h) {
-      o.push(h);
+      a.push(h);
     },
-    metadata: u
+    metadata: l
   };
-  let p = a ? s[e] : void 0;
+  let _ = o ? s[e] : void 0;
   for (let h = i.length - 1; h >= 0; h--) {
-    const O = i[h](p, c);
-    a && typeof O == "function" && (p = O);
+    const p = i[h](_, c);
+    o && typeof p == "function" && (_ = p);
+  }
+  if (o && _ !== s[e] && (s[e] = _), P(t, l), a.length > 0) {
+    const h = Object.create(s);
+    for (const p of a)
+      p.call(h);
   }
-  a && p !== s[e] && (s[e] = p);
-  const _ = Object.create(s);
-  for (const h of o)
-    h.call(_);
 }
 export {
-  g as BaseError,
-  b as Binding,
-  x as BindingNotFoundError,
+  y as BaseError,
+  A as Binding,
+  M as BindingNotFoundError,
   H as BindingNotValidError,
-  w as CircularDependencyError,
+  R as CircularDependencyError,
   I as Container,
   z as ContainerNotFoundError,
   F as DuplicateBindingError,
-  K as Inject,
-  J as LazyInject,
+  G as Inject,
+  X as Injectable,
+  U as LazyInject,
   B as LazyToken,
   q as Optional,
   W as PostConstruct,
-  M as PostConstructError,
+  x as PostConstructError,
   Q as PreDestroy,
   $ as Self,
   Z as SkipSelf,
-  G as Token,
-  X as createLazyInject,
-  tt as decorate
+  Y as Token,
+  tt as createLazyInject,
+  et as decorate
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaokei/di",
-  "version": "4.0.0",
+  "version": "5.0.0",
   "type": "module",
   "description": "Tiny di library depends on typescript decorator.",
   "main": "./dist/index.cjs",
@@ -62,7 +62,7 @@
     "reflect-metadata": "^0.2.2",
     "standard-version": "^9.5.0",
     "typescript": "~5.6.3",
-    "vite": "^5.4.14",
+    "vite": "^6.0.0",
     "vite-plugin-dts": "^4.5.0",
     "vitepress": "^1.6.3",
     "vitest": "^3.1.1",