@kaokei/di 3.0.6 → 3.0.8

package/dist/binding.d.cts

@@ -26,7 +26,7 @@ export declare class Binding<T = unknown> {
     get(options: Options<T>): T;
     private getAwaitBindings;
     private postConstruct;
-    preDestroy(): any;
+    preDestroy(): void;
     private execute;
     private resolveInstanceValue;
     private resolveConstantValue;

package/dist/binding.d.ts

@@ -26,7 +26,7 @@ export declare class Binding<T = unknown> {
     get(options: Options<T>): T;
     private getAwaitBindings;
     private postConstruct;
-    preDestroy(): any;
+    preDestroy(): void;
     private execute;
     private resolveInstanceValue;
     private resolveConstantValue;

package/dist/cachemap.d.cts

@@ -1,13 +1,5 @@
-import { CommonToken, META_KEY_INJECTED_PARAMS, META_KEY_INJECTED_PROPS, META_KEY_POST_CONSTRUCT, META_KEY_PRE_DESTROY, META_VALUE_INJECTED_PARAMS, META_VALUE_INJECTED_PROPS, META_VALUE_POST_CONSTRUCT, META_VALUE_PRE_DESTROY } from './interfaces';
-export declare function defineMetadata(metadataKey: META_KEY_INJECTED_PARAMS, metadataValue: META_VALUE_INJECTED_PARAMS, target: CommonToken): void;
-export declare function defineMetadata(metadataKey: META_KEY_INJECTED_PROPS, metadataValue: META_VALUE_INJECTED_PROPS, target: CommonToken): void;
-export declare function defineMetadata(metadataKey: META_KEY_POST_CONSTRUCT, metadataValue: META_VALUE_POST_CONSTRUCT, target: CommonToken): void;
-export declare function defineMetadata(metadataKey: META_KEY_PRE_DESTROY, metadataValue: META_VALUE_PRE_DESTROY, target: CommonToken): void;
+import { CommonToken } from './interfaces';
 export declare function defineMetadata(metadataKey: string, metadataValue: any, target: CommonToken): void;
-export declare function getOwnMetadata(metadataKey: META_KEY_INJECTED_PARAMS, target: CommonToken): META_VALUE_INJECTED_PARAMS | undefined;
-export declare function getOwnMetadata(metadataKey: META_KEY_INJECTED_PROPS, target: CommonToken): META_VALUE_INJECTED_PROPS | undefined;
-export declare function getOwnMetadata(metadataKey: META_KEY_POST_CONSTRUCT, target: CommonToken): META_VALUE_POST_CONSTRUCT | undefined;
-export declare function getOwnMetadata(metadataKey: META_KEY_PRE_DESTROY, target: CommonToken): META_VALUE_PRE_DESTROY | undefined;
 export declare function getOwnMetadata(metadataKey: string, target: CommonToken): any | undefined;
 /**
  * 使用hasParentClass判断当前target有没有父类
@@ -15,7 +7,4 @@ export declare function getOwnMetadata(metadataKey: string, target: CommonToken)
  * 如果有父类，那么需要合并getOwnMetadata(target)和getMetadata(target的父类)
  * 不支持META_KEY_INJECTED_PARAMS作为metadataKey
  */
-export declare function getMetadata(metadataKey: META_KEY_INJECTED_PROPS, target: CommonToken): META_VALUE_INJECTED_PROPS | undefined;
-export declare function getMetadata(metadataKey: META_KEY_POST_CONSTRUCT, target: CommonToken): META_VALUE_POST_CONSTRUCT | undefined;
-export declare function getMetadata(metadataKey: META_KEY_PRE_DESTROY, target: CommonToken): META_VALUE_PRE_DESTROY | undefined;
 export declare function getMetadata(metadataKey: string, target: CommonToken): any | undefined;

package/dist/cachemap.d.ts

@@ -1,13 +1,5 @@
-import { CommonToken, META_KEY_INJECTED_PARAMS, META_KEY_INJECTED_PROPS, META_KEY_POST_CONSTRUCT, META_KEY_PRE_DESTROY, META_VALUE_INJECTED_PARAMS, META_VALUE_INJECTED_PROPS, META_VALUE_POST_CONSTRUCT, META_VALUE_PRE_DESTROY } from './interfaces';
-export declare function defineMetadata(metadataKey: META_KEY_INJECTED_PARAMS, metadataValue: META_VALUE_INJECTED_PARAMS, target: CommonToken): void;
-export declare function defineMetadata(metadataKey: META_KEY_INJECTED_PROPS, metadataValue: META_VALUE_INJECTED_PROPS, target: CommonToken): void;
-export declare function defineMetadata(metadataKey: META_KEY_POST_CONSTRUCT, metadataValue: META_VALUE_POST_CONSTRUCT, target: CommonToken): void;
-export declare function defineMetadata(metadataKey: META_KEY_PRE_DESTROY, metadataValue: META_VALUE_PRE_DESTROY, target: CommonToken): void;
+import { CommonToken } from './interfaces';
 export declare function defineMetadata(metadataKey: string, metadataValue: any, target: CommonToken): void;
-export declare function getOwnMetadata(metadataKey: META_KEY_INJECTED_PARAMS, target: CommonToken): META_VALUE_INJECTED_PARAMS | undefined;
-export declare function getOwnMetadata(metadataKey: META_KEY_INJECTED_PROPS, target: CommonToken): META_VALUE_INJECTED_PROPS | undefined;
-export declare function getOwnMetadata(metadataKey: META_KEY_POST_CONSTRUCT, target: CommonToken): META_VALUE_POST_CONSTRUCT | undefined;
-export declare function getOwnMetadata(metadataKey: META_KEY_PRE_DESTROY, target: CommonToken): META_VALUE_PRE_DESTROY | undefined;
 export declare function getOwnMetadata(metadataKey: string, target: CommonToken): any | undefined;
 /**
  * 使用hasParentClass判断当前target有没有父类
@@ -15,7 +7,4 @@ export declare function getOwnMetadata(metadataKey: string, target: CommonToken)
  * 如果有父类，那么需要合并getOwnMetadata(target)和getMetadata(target的父类)
  * 不支持META_KEY_INJECTED_PARAMS作为metadataKey
  */
-export declare function getMetadata(metadataKey: META_KEY_INJECTED_PROPS, target: CommonToken): META_VALUE_INJECTED_PROPS | undefined;
-export declare function getMetadata(metadataKey: META_KEY_POST_CONSTRUCT, target: CommonToken): META_VALUE_POST_CONSTRUCT | undefined;
-export declare function getMetadata(metadataKey: META_KEY_PRE_DESTROY, target: CommonToken): META_VALUE_PRE_DESTROY | undefined;
 export declare function getMetadata(metadataKey: string, target: CommonToken): any | undefined;

package/dist/container.d.cts

@@ -1,6 +1,7 @@
 import { Binding } from './binding';
 import { Options, CommonToken, ActivationHandler, DeactivationHandler } from './interfaces';
 export declare class Container {
+    static map: WeakMap<any, Container>;
     parent?: Container;
     children?: Set<Container>;
     private bindings;
@@ -28,4 +29,3 @@ export declare class Container {
     private getBinding;
     private checkBindingNotFoundError;
 }
-export declare const CONTAINER_MAP: WeakMap<any, Container>;

package/dist/container.d.ts

@@ -1,6 +1,7 @@
 import { Binding } from './binding';
 import { Options, CommonToken, ActivationHandler, DeactivationHandler } from './interfaces';
 export declare class Container {
+    static map: WeakMap<any, Container>;
     parent?: Container;
     children?: Set<Container>;
     private bindings;
@@ -28,4 +29,3 @@ export declare class Container {
     private getBinding;
     private checkBindingNotFoundError;
 }
-export declare const CONTAINER_MAP: WeakMap<any, Container>;

package/dist/decorator.d.cts

@@ -12,7 +12,7 @@ export declare const Inject: InjectFunction<ReturnType<typeof createDecorator>>;
 export declare const Self: (decoratorValue?: any) => (target: any, targetKey?: string, index?: number) => void;
 export declare const SkipSelf: (decoratorValue?: any) => (target: any, targetKey?: string, index?: number) => void;
 export declare const Optional: (decoratorValue?: any) => (target: any, targetKey?: string, index?: number) => void;
-export declare const PostConstruct: (metaValue: import('./interfaces').PostConstructParam) => (target: any, propertyKey: string) => void;
-export declare const PreDestroy: (metaValue: void) => (target: any, propertyKey: string) => void;
+export declare const PostConstruct: (metaValue: any) => (target: any, propertyKey: string) => void;
+export declare const PreDestroy: (metaValue: any) => (target: any, propertyKey: string) => void;
 export declare function decorate(decorator: any, target: any, key: number | string): void;
 export {};

package/dist/decorator.d.ts

@@ -12,7 +12,7 @@ export declare const Inject: InjectFunction<ReturnType<typeof createDecorator>>;
 export declare const Self: (decoratorValue?: any) => (target: any, targetKey?: string, index?: number) => void;
 export declare const SkipSelf: (decoratorValue?: any) => (target: any, targetKey?: string, index?: number) => void;
 export declare const Optional: (decoratorValue?: any) => (target: any, targetKey?: string, index?: number) => void;
-export declare const PostConstruct: (metaValue: import('./interfaces').PostConstructParam) => (target: any, propertyKey: string) => void;
-export declare const PreDestroy: (metaValue: void) => (target: any, propertyKey: string) => void;
+export declare const PostConstruct: (metaValue: any) => (target: any, propertyKey: string) => void;
+export declare const PreDestroy: (metaValue: any) => (target: any, propertyKey: string) => void;
 export declare function decorate(decorator: any, target: any, key: number | string): void;
 export {};

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";var w=Object.defineProperty;var _=(n,t,e)=>t in n?w(n,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):n[t]=e;var r=(n,t,e)=>_(n,typeof t!="symbol"?t+"":t,e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l={INJECTED_PARAMS:"injected:params",INJECTED_PROPS:"injected:props",INJECT:"inject",SELF:"self",SKIP_SELF:"skipSelf",OPTIONAL:"optional",POST_CONSTRUCT:"postConstruct",PRE_DESTROY:"preDestroy"},p={DEFAULT:"default",INITING:"initing",ACTIVATED:"activated"},d={Invalid:"Invalid",Instance:"Instance",ConstantValue:"ConstantValue",DynamicValue:"DynamicValue"},C={POST_CONSTRUCT:"Cannot apply @PostConstruct decorator multiple times in the same class.",PRE_DESTROY:"Cannot apply @PreDestroy decorator multiple times in the same class.",MISS_INJECT:"Expected a @Inject decorator to explicitly specify the token.",MISS_CONTAINER:"@LazyInject decorator cannot find the corresponding container."},P=Symbol(),v=new WeakMap;function M(n){return typeof n=="function"&&Object.getPrototypeOf(n)!==Function.prototype}function D(n,t,e){const s=v.get(e)||{};s[n]=t,v.set(e,s)}function I(n,t){return(v.get(t)||{})[n]}function g(n,t){const e=I(n,t);if(!M(t))return e;const s=g(n,Object.getPrototypeOf(t));if(s||e)return{...s||{},...e||{}}}class j{constructor(t){r(this,"_","");r(this,"name");this.name=t}}class N{constructor(t){r(this,"callback");this.callback=t}resolve(){return this.callback()}}function S(n){if(!n)throw new Error(C.MISS_INJECT);return n instanceof N?n.resolve():n}class T extends Error{constructor(t,e){super(),this.name=this.constructor.name,this.message=`${t}${e==null?void 0:e.name}`}}class O extends T{constructor(t){super("");const e=[];let s=t;for(;s&&s.token;)e.push(s.token),s=s.parent;const i=e.reverse().map(o=>o.name).join(" --> ");this.message=`Circular dependency found: ${i}`}}class B extends T{constructor(t){super("Invalid binding: ",t)}}class k extends O{constructor(t){super(t),this.name="CircularDependencyError inside @PostConstruct"}}class L{constructor(t,e){r(this,"container");r(this,"context");r(this,"token");r(this,"type",d.Invalid);r(this,"status",p.DEFAULT);r(this,"classValue");r(this,"constantValue");r(this,"dynamicValue");r(this,"cache");r(this,"postConstructResult",P);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(p.INITING===this.status)throw new O(t);if(p.ACTIVATED===this.status)return this.cache;if(d.Instance===this.type)return this.resolveInstanceValue(t);if(d.ConstantValue===this.type)return this.resolveConstantValue();if(d.DynamicValue===this.type)return this.resolveDynamicValue();throw new B(this.token)}getAwaitBindings(t,e){return e===!0?t:Array.isArray(e)?t.filter(s=>e.includes(s.token)):typeof e=="function"?t.filter(e):[]}postConstruct(t,e,s){if(d.Instance===this.type){const{key:i,value:o}=g(l.POST_CONSTRUCT,this.classValue)||{};if(i)if(o){const a=[...e,...s].filter(u=>d.Instance===(u==null?void 0:u.type)),c=this.getAwaitBindings(a,o);for(const u of c)if(u&&u.postConstructResult===P)throw new k({token:u.token,parent:t});const h=c.map(u=>u.postConstructResult);this.postConstructResult=Promise.all(h).then(()=>this.execute(i))}else this.postConstructResult=this.execute(i);else this.postConstructResult=void 0}}preDestroy(){if(d.Instance===this.type){const{key:t}=g(l.PRE_DESTROY,this.classValue)||{};if(t)return this.execute(t)}this.container=null,this.context=null}execute(t){const e=this.cache[t];return e==null?void 0:e.call(this.cache)}resolveInstanceValue(t){this.status=p.INITING;const e=this.classValue,[s,i]=this.getConstructorParameters(t),o=new e(...s);this.cache=this.activate(o),this.status=p.ACTIVATED,A.set(this.cache,this.container);const[a,c]=this.getInjectProperties(t);return Object.assign(this.cache,a),this.postConstruct(t,i,c),this.cache}resolveConstantValue(){return this.status=p.INITING,this.cache=this.activate(this.constantValue),this.status=p.ACTIVATED,this.cache}resolveDynamicValue(){this.status=p.INITING;const t=this.dynamicValue.call(this,this.context);return this.cache=this.activate(t),this.status=p.ACTIVATED,this.cache}getConstructorParameters(t){const e=I(l.INJECTED_PARAMS,this.classValue)||[],s=[],i=[];for(let o=0;o<e.length;o++){const a=e[o],{inject:c,...h}=a;h.parent=t;const u=this.container.get(S(c),h);s.push(u),i.push(h.binding)}return[s,i]}getInjectProperties(t){const e=g(l.INJECTED_PROPS,this.classValue)||{},s=Object.keys(e),i=Object.create(null),o=[];for(let a=0;a<s.length;a++){const c=s[a],h=e[c],{inject:u,...f}=h;f.parent=t;const y=this.container.get(S(u),f);y===void 0&&h.optional||(i[c]=y),o.push(f.binding)}return[i,o]}}class H extends T{constructor(t){super("No matching binding found for token: ",t)}}class x extends T{constructor(t){super("Cannot bind token multiple times: ",t)}}class m{constructor(){r(this,"parent");r(this,"children");r(this,"bindings",new Map);r(this,"onActivationHandler");r(this,"onDeactivationHandler")}bind(t){if(this.bindings.has(t))throw new x(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.preDestroy(),this.bindings.delete(t)}}unbindAll(){this.bindings.forEach(t=>{this.unbind(t.token)})}isCurrentBound(t){return this.bindings.has(t)}isBound(t){return this.isCurrentBound(t)||!!this.parent&&this.parent.isBound(t)}createChild(){const t=new m;return t.parent=this,this.children||(this.children=new Set),this.children.add(t),t}destroy(){var t,e,s;(e=(t=this.parent)==null?void 0:t.children)==null||e.delete(this),this.unbindAll(),this.bindings.clear(),this.parent=void 0,(s=this.children)==null||s.clear(),this.children=void 0,this.onActivationHandler=void 0,this.onDeactivationHandler=void 0}get(t,e={}){const s=this.getBinding(t);if(e.skipSelf){if(this.parent)return e.skipSelf=!1,this.parent.get(t,e)}else if(e.self||s){if(s)return e.token=t,e.binding=s,s.get(e)}else if(this.parent)return this.parent.get(t,e);return 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),t.deactivate()}buildBinding(t){return new L(t,this)}getBinding(t){return this.bindings.get(t)}checkBindingNotFoundError(t,e){if(!e.optional)throw new H(t)}}const A=new WeakMap;function E(n,t){return function(e){return function(s,i,o){const a=typeof o=="number",c=a?s:s.constructor,h=a?o:i,u=a?l.INJECTED_PARAMS:l.INJECTED_PROPS,f=a?I(u,c)||[]:g(u,c)||{},y=f[h]||{};y[n]=e===void 0?t:e,f[h]=y,D(u,f,c)}}}function V(n,t){return e=>(s,i)=>{if(I(n,s.constructor))throw new Error(t);D(n,{key:i,value:e},s.constructor)}}const F=E(l.INJECT),J=E(l.SELF,!0),U=E(l.SKIP_SELF,!0),z=E(l.OPTIONAL,!0),G=V(l.POST_CONSTRUCT,C.POST_CONSTRUCT),Y=V(l.PRE_DESTROY,C.PRE_DESTROY);function b(n,t,e,s){for(let i=n.length-1;i>=0;i--)n[i](t,e,s)}function K(n,t,e){n=Array.isArray(n)?n:[n],typeof e=="number"?b(n,t,void 0,e):typeof e=="string"&&b(n,t.prototype,e)}function $(n,t,e,s){function i(){const a=Symbol.for(t);if(!this.hasOwnProperty(a)){const c=s||A.get(this),h=this.constructor;if(!c)throw new Error(`${C.MISS_CONTAINER} ${h.name}`);this[a]=c.get(S(e),{parent:{token:h}})}return this[a]}function o(a){const c=Symbol.for(t);this[c]=a}Object.defineProperty(n,t,{configurable:!0,enumerable:!0,get:i,set:o})}function R(n,t){return function(e,s){$(e,s,n,t)}}function W(n){return function(t){return R(t,n)}}exports.CONTAINER_MAP=A;exports.Container=m;exports.Inject=F;exports.LazyInject=R;exports.LazyToken=N;exports.Optional=z;exports.PostConstruct=G;exports.PreDestroy=Y;exports.Self=J;exports.SkipSelf=U;exports.Token=j;exports.createLazyInject=W;exports.decorate=K;exports.defineMetadata=D;exports.getMetadata=g;exports.getOwnMetadata=I;
+"use strict";var w=Object.defineProperty;var j=(n,t,e)=>t in n?w(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 h={INJECTED_PARAMS:"injected:params",INJECTED_PROPS:"injected:props",INJECT:"inject",SELF:"self",SKIP_SELF:"skipSelf",OPTIONAL:"optional",POST_CONSTRUCT:"postConstruct",PRE_DESTROY:"preDestroy"},p={DEFAULT:"default",INITING:"initing",ACTIVATED:"activated"},d={Invalid:"Invalid",Instance:"Instance",ConstantValue:"ConstantValue",DynamicValue:"DynamicValue"},v={POST_CONSTRUCT:"Cannot apply @PostConstruct decorator multiple times in the same class.",PRE_DESTROY:"Cannot apply @PreDestroy decorator multiple times in the same class.",MISS_INJECT:"Expected a @Inject decorator to explicitly specify the token.",MISS_CONTAINER:"@LazyInject decorator cannot find the corresponding container."},m=Symbol(),D=new WeakMap;function B(n){return typeof n=="function"&&Object.getPrototypeOf(n)!==Function.prototype}function b(n,t,e){const s=D.get(e)||{};s[n]=t,D.set(e,s)}function T(n,t){return(D.get(t)||{})[n]}function I(n,t){const e=T(n,t);if(!B(t))return e;const s=I(n,Object.getPrototypeOf(t));if(s||e)return{...s||{},...e||{}}}class _{constructor(t){r(this,"_","");r(this,"name");this.name=t}}class O{constructor(t){r(this,"callback");this.callback=t}resolve(){return this.callback()}}function A(n){if(!n)throw new Error(v.MISS_INJECT);return n instanceof O?n.resolve():n}class E extends Error{constructor(t,e){super(),this.name=this.constructor.name,this.message=`${t}${e==null?void 0:e.name}`}}class V extends E{constructor(t){super("");const e=[];let s=t;for(;s&&s.token;)e.push(s.token),s=s.parent;const i=e.reverse().map(o=>o.name).join(" --> ");this.message=`Circular dependency found: ${i}`}}class k extends E{constructor(t){super("Invalid binding: ",t)}}class H extends V{constructor(t){super(t),this.name="CircularDependencyError inside @PostConstruct"}}class L{constructor(t,e){r(this,"container");r(this,"context");r(this,"token");r(this,"type",d.Invalid);r(this,"status",p.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(p.INITING===this.status)throw new V(t);if(p.ACTIVATED===this.status)return this.cache;if(d.Instance===this.type)return this.resolveInstanceValue(t);if(d.ConstantValue===this.type)return this.resolveConstantValue();if(d.DynamicValue===this.type)return this.resolveDynamicValue();throw new k(this.token)}getAwaitBindings(t,e){return e===!0?t:Array.isArray(e)?t.filter(s=>e.includes(s.token)):typeof e=="function"?t.filter(e):[]}postConstruct(t,e,s){if(d.Instance===this.type){const{key:i,value:o}=I(h.POST_CONSTRUCT,this.classValue)||{};if(i)if(o){const a=[...e,...s].filter(u=>d.Instance===(u==null?void 0:u.type)),c=this.getAwaitBindings(a,o);for(const u of c)if(u&&u.postConstructResult===m)throw new H({token:u.token,parent:t});const l=c.map(u=>u.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}=I(h.PRE_DESTROY,this.classValue)||{};t&&this.execute(t)}y.map.delete(this.cache),this.container=null,this.context=null,this.classValue=null,this.constantValue=null,this.dynamicValue=null,this.cache=null,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=p.INITING;const e=this.classValue,[s,i]=this.getConstructorParameters(t),o=new e(...s);this.cache=this.activate(o),this.status=p.ACTIVATED,y.map.set(this.cache,this.container);const[a,c]=this.getInjectProperties(t);return Object.assign(this.cache,a),this.postConstruct(t,i,c),this.cache}resolveConstantValue(){return this.status=p.INITING,this.cache=this.activate(this.constantValue),this.status=p.ACTIVATED,this.cache}resolveDynamicValue(){this.status=p.INITING;const t=this.dynamicValue.call(this,this.context);return this.cache=this.activate(t),this.status=p.ACTIVATED,this.cache}getConstructorParameters(t){const e=T(h.INJECTED_PARAMS,this.classValue)||[],s=[],i=[];for(let o=0;o<e.length;o++){const a=e[o],{inject:c,...l}=a;l.parent=t;const u=this.container.get(A(c),l);s.push(u),i.push(l.binding)}return[s,i]}getInjectProperties(t){const e=I(h.INJECTED_PROPS,this.classValue)||{},s=Object.keys(e),i=Object.create(null),o=[];for(let a=0;a<s.length;a++){const c=s[a],l=e[c],{inject:u,...f}=l;f.parent=t;const g=this.container.get(A(u),f);g===void 0&&l.optional||(i[c]=g),o.push(f.binding)}return[i,o]}}class M extends E{constructor(t){super("No matching binding found for token: ",t)}}class x extends E{constructor(t){super("Cannot bind token multiple times: ",t)}}const C=class C{constructor(){r(this,"parent");r(this,"children");r(this,"bindings",new Map);r(this,"onActivationHandler");r(this,"onDeactivationHandler")}bind(t){if(this.bindings.has(t))throw new x(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(){this.bindings.forEach(t=>{this.unbind(t.token)})}isCurrentBound(t){return this.bindings.has(t)}isBound(t){return this.isCurrentBound(t)||!!this.parent&&this.parent.isBound(t)}createChild(){const t=new C;return t.parent=this,this.children||(this.children=new Set),this.children.add(t),t}destroy(){var t,e,s;this.unbindAll(),this.bindings.clear(),(e=(t=this.parent)==null?void 0:t.children)==null||e.delete(this),this.parent=void 0,(s=this.children)==null||s.clear(),this.children=void 0,this.onActivationHandler=void 0,this.onDeactivationHandler=void 0}get(t,e={}){const s=this.getBinding(t);if(e.skipSelf){if(this.parent)return e.skipSelf=!1,this.parent.get(t,e)}else if(e.self||s){if(s)return e.token=t,e.binding=s,s.get(e)}else if(this.parent)return this.parent.get(t,e);return 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 L(t,this)}getBinding(t){return this.bindings.get(t)}checkBindingNotFoundError(t,e){if(!e.optional)throw new M(t)}};r(C,"map",new WeakMap);let y=C;function S(n,t){return function(e){return function(s,i,o){const a=typeof o=="number",c=a?s:s.constructor,l=a?o:i,u=a?h.INJECTED_PARAMS:h.INJECTED_PROPS,f=a?T(u,c)||[]:I(u,c)||{},g=f[l]||{};g[n]=e===void 0?t:e,f[l]=g,b(u,f,c)}}}function N(n,t){return e=>(s,i)=>{if(T(n,s.constructor))throw new Error(t);b(n,{key:i,value:e},s.constructor)}}const F=S(h.INJECT),J=S(h.SELF,!0),U=S(h.SKIP_SELF,!0),z=S(h.OPTIONAL,!0),G=N(h.POST_CONSTRUCT,v.POST_CONSTRUCT),Y=N(h.PRE_DESTROY,v.PRE_DESTROY);function P(n,t,e,s){for(let i=n.length-1;i>=0;i--)n[i](t,e,s)}function K(n,t,e){n=Array.isArray(n)?n:[n],typeof e=="number"?P(n,t,void 0,e):typeof e=="string"&&P(n,t.prototype,e)}function $(n,t,e,s){function i(){const a=Symbol.for(t);if(!this.hasOwnProperty(a)){const c=s||y.map.get(this),l=this.constructor;if(!c)throw new Error(`${v.MISS_CONTAINER} ${l.name}`);this[a]=c.get(A(e),{parent:{token:l}})}return this[a]}function o(a){const c=Symbol.for(t);this[c]=a}Object.defineProperty(n,t,{configurable:!0,enumerable:!0,get:i,set:o})}function R(n,t){return function(e,s){$(e,s,n,t)}}function W(n){return function(t){return R(t,n)}}exports.Container=y;exports.Inject=F;exports.LazyInject=R;exports.LazyToken=O;exports.Optional=z;exports.PostConstruct=G;exports.PreDestroy=Y;exports.Self=J;exports.SkipSelf=U;exports.Token=_;exports.createLazyInject=W;exports.decorate=K;

package/dist/index.d.cts

@@ -1,6 +1,5 @@
 export * from './interfaces';
-export { Container, CONTAINER_MAP } from './container';
+export { Container } from './container';
 export { Token, LazyToken } from './token';
 export { Inject, Self, SkipSelf, Optional, PostConstruct, PreDestroy, decorate, } from './decorator';
 export { LazyInject, createLazyInject } from './lazyinject';
-export { defineMetadata, getOwnMetadata, getMetadata } from './cachemap';

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 export * from './interfaces';
-export { Container, CONTAINER_MAP } from './container';
+export { Container } from './container';
 export { Token, LazyToken } from './token';
 export { Inject, Self, SkipSelf, Optional, PostConstruct, PreDestroy, decorate, } from './decorator';
 export { LazyInject, createLazyInject } from './lazyinject';
-export { defineMetadata, getOwnMetadata, getMetadata } from './cachemap';

package/dist/index.js

@@ -1,5 +1,5 @@
-var V = Object.defineProperty;
-var R = (e, t, n) => t in e ? V(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
+var O = Object.defineProperty;
+var R = (e, t, n) => t in e ? O(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
 var r = (e, t, n) => R(e, typeof t != "symbol" ? t + "" : t, n);
 const l = {
   // 记录构造函数参数装饰器对应的数据的key
@@ -32,22 +32,19 @@ const l = {
   PRE_DESTROY: "Cannot apply @PreDestroy decorator multiple times in the same class.",
   MISS_INJECT: "Expected a @Inject decorator to explicitly specify the token.",
   MISS_CONTAINER: "@LazyInject decorator cannot find the corresponding container."
-}, S = Symbol(), v = /* @__PURE__ */ new WeakMap();
+}, D = Symbol(), S = /* @__PURE__ */ new WeakMap();
 function w(e) {
   return typeof e == "function" && Object.getPrototypeOf(e) !== Function.prototype;
 }
-function A(e, t, n) {
-  const s = v.get(n) || {};
-  s[e] = t, v.set(n, s);
+function b(e, t, n) {
+  const s = S.get(n) || {};
+  s[e] = t, S.set(n, s);
 }
-function I(e, t) {
-  return (v.get(t) || {})[e];
+function E(e, t) {
+  return (S.get(t) || {})[e];
 }
 function y(e, t) {
-  const n = I(
-    e,
-    t
-  );
+  const n = E(e, t);
   if (!w(t))
     return n;
   const s = y(
@@ -67,7 +64,7 @@ class J {
     this.name = t;
   }
 }
-class _ {
+class B {
   constructor(t) {
     r(this, "callback");
     this.callback = t;
@@ -76,17 +73,17 @@ class _ {
     return this.callback();
   }
 }
-function D(e) {
+function A(e) {
   if (!e)
     throw new Error(C.MISS_INJECT);
-  return e instanceof _ ? e.resolve() : e;
+  return e instanceof B ? e.resolve() : e;
 }
-class E extends Error {
+class T extends Error {
   constructor(t, n) {
     super(), this.name = this.constructor.name, this.message = `${t}${n == null ? void 0 : n.name}`;
   }
 }
-class P extends E {
+class V extends T {
   constructor(t) {
     super("");
     const n = [];
@@ -97,17 +94,17 @@ class P extends E {
     this.message = `Circular dependency found: ${i}`;
   }
 }
-class B extends E {
+class _ extends T {
   constructor(t) {
     super("Invalid binding: ", t);
   }
 }
-class j extends P {
+class H extends V {
   constructor(t) {
     super(t), this.name = "CircularDependencyError inside @PostConstruct";
   }
 }
-class M {
+class j {
   constructor(t, n) {
     r(this, "container");
     r(this, "context");
@@ -118,7 +115,7 @@ class M {
     r(this, "constantValue");
     r(this, "dynamicValue");
     r(this, "cache");
-    r(this, "postConstructResult", S);
+    r(this, "postConstructResult", D);
     r(this, "onActivationHandler");
     r(this, "onDeactivationHandler");
     this.container = n, this.context = { container: this.container }, this.token = t;
@@ -155,7 +152,7 @@ class M {
   }
   get(t) {
     if (p.INITING === this.status)
-      throw new P(t);
+      throw new V(t);
     if (p.ACTIVATED === this.status)
       return this.cache;
     if (d.Instance === this.type)
@@ -164,7 +161,7 @@ class M {
       return this.resolveConstantValue();
     if (d.DynamicValue === this.type)
       return this.resolveDynamicValue();
-    throw new B(this.token);
+    throw new _(this.token);
   }
   getAwaitBindings(t, n) {
     return n === !0 ? t : Array.isArray(n) ? t.filter((s) => n.includes(s.token)) : typeof n == "function" ? t.filter(n) : [];
@@ -178,8 +175,8 @@ class M {
             (u) => d.Instance === (u == null ? void 0 : u.type)
           ), c = this.getAwaitBindings(a, o);
           for (const u of c)
-            if (u && u.postConstructResult === S)
-              throw new j({
+            if (u && u.postConstructResult === D)
+              throw new H({
                 token: u.token,
                 parent: t
               });
@@ -196,10 +193,9 @@ class M {
   preDestroy() {
     if (d.Instance === this.type) {
       const { key: t } = y(l.PRE_DESTROY, this.classValue) || {};
-      if (t)
-        return this.execute(t);
+      t && this.execute(t);
     }
-    this.container = null, this.context = null;
+    I.map.delete(this.cache), this.container = null, this.context = null, this.classValue = null, this.constantValue = null, this.dynamicValue = null, this.cache = null, this.postConstructResult = D, this.onActivationHandler = void 0, this.onDeactivationHandler = void 0;
   }
   execute(t) {
     const n = this.cache[t];
@@ -208,7 +204,7 @@ class M {
   resolveInstanceValue(t) {
     this.status = p.INITING;
     const n = this.classValue, [s, i] = this.getConstructorParameters(t), o = new n(...s);
-    this.cache = this.activate(o), this.status = p.ACTIVATED, N.set(this.cache, this.container);
+    this.cache = this.activate(o), this.status = p.ACTIVATED, I.map.set(this.cache, this.container);
     const [a, c] = this.getInjectProperties(t);
     return Object.assign(this.cache, a), this.postConstruct(t, i, c), this.cache;
   }
@@ -221,11 +217,11 @@ class M {
     return this.cache = this.activate(t), this.status = p.ACTIVATED, this.cache;
   }
   getConstructorParameters(t) {
-    const n = I(l.INJECTED_PARAMS, this.classValue) || [], s = [], i = [];
+    const n = E(l.INJECTED_PARAMS, this.classValue) || [], s = [], i = [];
     for (let o = 0; o < n.length; o++) {
       const a = n[o], { inject: c, ...h } = a;
       h.parent = t;
-      const u = this.container.get(D(c), h);
+      const u = this.container.get(A(c), h);
       s.push(u), i.push(h.binding);
     }
     return [s, i];
@@ -235,23 +231,23 @@ class M {
     for (let a = 0; a < s.length; a++) {
       const c = s[a], h = n[c], { inject: u, ...f } = h;
       f.parent = t;
-      const g = this.container.get(D(u), f);
+      const g = this.container.get(A(u), f);
       g === void 0 && h.optional || (i[c] = g), o.push(f.binding);
     }
     return [i, o];
   }
 }
-class k extends E {
+class k extends T {
   constructor(t) {
     super("No matching binding found for token: ", t);
   }
 }
-class x extends E {
+class x extends T {
   constructor(t) {
     super("Cannot bind token multiple times: ", t);
   }
 }
-class b {
+const v = class v {
   constructor() {
     r(this, "parent");
     r(this, "children");
@@ -268,7 +264,7 @@ class b {
   unbind(t) {
     if (this.bindings.has(t)) {
       const n = this.getBinding(t);
-      this.deactivate(n), n.preDestroy(), this.bindings.delete(t);
+      this.deactivate(n), n.deactivate(), n.preDestroy(), this.bindings.delete(t);
     }
   }
   unbindAll() {
@@ -283,12 +279,12 @@ class b {
     return this.isCurrentBound(t) || !!this.parent && this.parent.isBound(t);
   }
   createChild() {
-    const t = new b();
+    const t = new v();
     return t.parent = this, this.children || (this.children = /* @__PURE__ */ new Set()), this.children.add(t), t;
   }
   destroy() {
     var t, n, s;
-    (n = (t = this.parent) == null ? void 0 : t.children) == null || n.delete(this), this.unbindAll(), this.bindings.clear(), this.parent = void 0, (s = this.children) == null || s.clear(), this.children = void 0, this.onActivationHandler = void 0, this.onDeactivationHandler = void 0;
+    this.unbindAll(), this.bindings.clear(), (n = (t = this.parent) == null ? void 0 : t.children) == null || n.delete(this), this.parent = void 0, (s = this.children) == null || s.clear(), this.children = void 0, this.onActivationHandler = void 0, this.onDeactivationHandler = void 0;
   }
   get(t, n = {}) {
     const s = this.getBinding(t);
@@ -312,10 +308,10 @@ class b {
     return this.onActivationHandler ? this.onActivationHandler({ container: this }, t, n) : t;
   }
   deactivate(t) {
-    this.onDeactivationHandler && this.onDeactivationHandler(t.cache, t.token), t.deactivate();
+    this.onDeactivationHandler && this.onDeactivationHandler(t.cache, t.token);
   }
   buildBinding(t) {
-    return new M(t, this);
+    return new j(t, this);
   }
   getBinding(t) {
     return this.bindings.get(t);
@@ -324,49 +320,50 @@ class b {
     if (!n.optional)
       throw new k(t);
   }
-}
-const N = /* @__PURE__ */ new WeakMap();
-function T(e, t) {
+};
+r(v, "map", /* @__PURE__ */ new WeakMap());
+let I = v;
+function m(e, t) {
   return function(n) {
     return function(s, i, o) {
-      const a = typeof o == "number", c = a ? s : s.constructor, h = a ? o : i, u = a ? l.INJECTED_PARAMS : l.INJECTED_PROPS, f = a ? I(u, c) || [] : y(u, c) || {}, g = f[h] || {};
-      g[e] = n === void 0 ? t : n, f[h] = g, A(u, f, c);
+      const a = typeof o == "number", c = a ? s : s.constructor, h = a ? o : i, u = a ? l.INJECTED_PARAMS : l.INJECTED_PROPS, f = a ? E(u, c) || [] : y(u, c) || {}, g = f[h] || {};
+      g[e] = n === void 0 ? t : n, f[h] = g, b(u, f, c);
     };
   };
 }
-function O(e, t) {
+function N(e, t) {
   return (n) => (s, i) => {
-    if (I(e, s.constructor))
+    if (E(e, s.constructor))
       throw new Error(t);
-    A(
+    b(
       e,
       { key: i, value: n },
       s.constructor
     );
   };
 }
-const U = T(l.INJECT), G = T(l.SELF, !0), Y = T(l.SKIP_SELF, !0), z = T(l.OPTIONAL, !0), K = O(
+const U = m(l.INJECT), G = m(l.SELF, !0), Y = m(l.SKIP_SELF, !0), z = m(l.OPTIONAL, !0), K = N(
   l.POST_CONSTRUCT,
   C.POST_CONSTRUCT
-), $ = O(
+), $ = N(
   l.PRE_DESTROY,
   C.PRE_DESTROY
 );
-function m(e, t, n, s) {
+function P(e, t, n, s) {
   for (let i = e.length - 1; i >= 0; i--)
     e[i](t, n, s);
 }
 function W(e, t, n) {
-  e = Array.isArray(e) ? e : [e], typeof n == "number" ? m(e, t, void 0, n) : typeof n == "string" && m(e, t.prototype, n);
+  e = Array.isArray(e) ? e : [e], typeof n == "number" ? P(e, t, void 0, n) : typeof n == "string" && P(e, t.prototype, n);
 }
-function H(e, t, n, s) {
+function M(e, t, n, s) {
   function i() {
     const a = Symbol.for(t);
     if (!this.hasOwnProperty(a)) {
-      const c = s || N.get(this), h = this.constructor;
+      const c = s || I.map.get(this), h = this.constructor;
       if (!c)
         throw new Error(`${C.MISS_CONTAINER} ${h.name}`);
-      this[a] = c.get(D(n), {
+      this[a] = c.get(A(n), {
         parent: { token: h }
       });
     }
@@ -385,7 +382,7 @@ function H(e, t, n, s) {
 }
 function L(e, t) {
   return function(n, s) {
-    H(n, s, e, t);
+    M(n, s, e, t);
   };
 }
 function q(e) {
@@ -394,11 +391,10 @@ function q(e) {
   };
 }
 export {
-  N as CONTAINER_MAP,
-  b as Container,
+  I as Container,
   U as Inject,
   L as LazyInject,
-  _ as LazyToken,
+  B as LazyToken,
   z as Optional,
   K as PostConstruct,
   $ as PreDestroy,
@@ -406,8 +402,5 @@ export {
   Y as SkipSelf,
   J as Token,
   q as createLazyInject,
-  W as decorate,
-  A as defineMetadata,
-  y as getMetadata,
-  I as getOwnMetadata
+  W as decorate
 };

package/dist/interfaces.d.cts

@@ -1,7 +1,6 @@
 import { Token, LazyToken } from './token';
 import { Container } from './container';
 import { Binding } from './binding';
-import { KEYS } from './constants';
 export type Newable<TInstance = unknown, TArgs extends unknown[] = any[]> = new (...args: TArgs) => TInstance;
 export type InjectFunction<R extends (...args: any) => any> = (token: GenericToken) => ReturnType<R>;
 export type CommonToken<T = unknown> = Token<T> | Newable<T>;
@@ -25,25 +24,3 @@ export interface Options<T = unknown> {
 export type ActivationHandler<T = unknown> = (ctx: Context, input: T, token?: CommonToken<T>) => T;
 export type DeactivationHandler<T = unknown> = (input: T, token?: CommonToken<T>) => void;
 export type PostConstructParam = void | true | CommonToken[] | ((item: Binding, index: number, arr: Binding[]) => boolean);
-export type META_KEY_INJECTED_PARAMS = typeof KEYS.INJECTED_PARAMS;
-export type META_KEY_INJECTED_PROPS = typeof KEYS.INJECTED_PROPS;
-export type META_KEY_POST_CONSTRUCT = typeof KEYS.POST_CONSTRUCT;
-export type META_KEY_PRE_DESTROY = typeof KEYS.PRE_DESTROY;
-export type META_KEYS = META_KEY_INJECTED_PARAMS | META_KEY_INJECTED_PROPS | META_KEY_POST_CONSTRUCT | META_KEY_PRE_DESTROY;
-export type META_VALUE_INJECTED_PARAMS = Options[];
-export type META_VALUE_INJECTED_PROPS = Record<string, Options>;
-export type META_VALUE_POST_CONSTRUCT = KV<PostConstructParam>;
-export type META_VALUE_PRE_DESTROY = KV<void>;
-export type META_VALUES = META_VALUE_INJECTED_PARAMS | META_VALUE_INJECTED_PROPS | META_VALUE_POST_CONSTRUCT | META_VALUE_PRE_DESTROY;
-export interface KV<T> {
-    key: string;
-    value: T;
-}
-export type ExtractKV<T> = T extends META_KEY_POST_CONSTRUCT ? PostConstructParam : T extends META_KEY_PRE_DESTROY ? void : never;
-export interface CacheMapValue {
-    [KEYS.INJECTED_PARAMS]: Options[];
-    [KEYS.INJECTED_PROPS]: Record<string, Options>;
-    [KEYS.POST_CONSTRUCT]: KV<PostConstructParam>;
-    [KEYS.PRE_DESTROY]: KV<void>;
-    [key: string]: any;
-}

package/dist/interfaces.d.ts

@@ -1,7 +1,6 @@
 import { Token, LazyToken } from './token';
 import { Container } from './container';
 import { Binding } from './binding';
-import { KEYS } from './constants';
 export type Newable<TInstance = unknown, TArgs extends unknown[] = any[]> = new (...args: TArgs) => TInstance;
 export type InjectFunction<R extends (...args: any) => any> = (token: GenericToken) => ReturnType<R>;
 export type CommonToken<T = unknown> = Token<T> | Newable<T>;
@@ -25,25 +24,3 @@ export interface Options<T = unknown> {
 export type ActivationHandler<T = unknown> = (ctx: Context, input: T, token?: CommonToken<T>) => T;
 export type DeactivationHandler<T = unknown> = (input: T, token?: CommonToken<T>) => void;
 export type PostConstructParam = void | true | CommonToken[] | ((item: Binding, index: number, arr: Binding[]) => boolean);
-export type META_KEY_INJECTED_PARAMS = typeof KEYS.INJECTED_PARAMS;
-export type META_KEY_INJECTED_PROPS = typeof KEYS.INJECTED_PROPS;
-export type META_KEY_POST_CONSTRUCT = typeof KEYS.POST_CONSTRUCT;
-export type META_KEY_PRE_DESTROY = typeof KEYS.PRE_DESTROY;
-export type META_KEYS = META_KEY_INJECTED_PARAMS | META_KEY_INJECTED_PROPS | META_KEY_POST_CONSTRUCT | META_KEY_PRE_DESTROY;
-export type META_VALUE_INJECTED_PARAMS = Options[];
-export type META_VALUE_INJECTED_PROPS = Record<string, Options>;
-export type META_VALUE_POST_CONSTRUCT = KV<PostConstructParam>;
-export type META_VALUE_PRE_DESTROY = KV<void>;
-export type META_VALUES = META_VALUE_INJECTED_PARAMS | META_VALUE_INJECTED_PROPS | META_VALUE_POST_CONSTRUCT | META_VALUE_PRE_DESTROY;
-export interface KV<T> {
-    key: string;
-    value: T;
-}
-export type ExtractKV<T> = T extends META_KEY_POST_CONSTRUCT ? PostConstructParam : T extends META_KEY_PRE_DESTROY ? void : never;
-export interface CacheMapValue {
-    [KEYS.INJECTED_PARAMS]: Options[];
-    [KEYS.INJECTED_PROPS]: Record<string, Options>;
-    [KEYS.POST_CONSTRUCT]: KV<PostConstructParam>;
-    [KEYS.PRE_DESTROY]: KV<void>;
-    [key: string]: any;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaokei/di",
-  "version": "3.0.6",
+  "version": "3.0.8",
   "type": "module",
   "description": "Tiny di library depends on typescript decorator.",
   "main": "./dist/index.cjs",