refactor: use map to store instance id

src/helper/hook-helper.ts

@@ -203,7 +203,7 @@ export function createHookedFunction<ThisType, Args extends any[], Result>(
         },
         setArgs: (_args: Args) => {
           if (!_inThisHook) {
-            throw new Error('不允许在Hook作用时间结束后设置参数');
+            throw new Error('It is not allowed to set the parameters after the Hook effect time is over');
           }
           args = _args;
         },
@@ -237,7 +237,7 @@ export function createHookedFunction<ThisType, Args extends any[], Result>(
         },
         setResult: (_ret: Result) => {
           if (!_inThisHook) {
-            throw new Error('不允许在Hook作用时间结束后设置返回值');
+            throw new Error('It is not allowed to set the return value after the Hook effect time is over');
           }
           ret = _ret;
         },
@@ -478,9 +478,10 @@ export class HookStore implements IHookStore {
     if (!instanceHooks.has(hook.method)) {
       return;
     }
-    const index = instanceHooks.get(hook.method)!.indexOf(hook);
+    const methodHooks = instanceHooks.get(hook.method)!;
+    const index = methodHooks.indexOf(hook);
     if (index > -1) {
-      instanceHooks.get(hook.method)!.splice(index, 1);
+      methodHooks.splice(index, 1);
     }
   }
 }

src/helper/injector-helper.ts

@@ -39,3 +39,12 @@ let index = 0;
 export function createId(name: string) {
   return `${name}_${index++}`;
 }
+
+export function createIdFactory(name: string) {
+  let idx = 0;
+  return {
+    create() {
+      return `${name}_${idx++}`;
+    },
+  };
+}

src/injector.ts

@@ -34,14 +34,17 @@ import { EventEmitter } from './helper/event';
 
 export class Injector {
   id = Helper.createId('Injector');
-  creatorMap = new Map<Token, InstanceCreator>();
+
   depth = 0;
   tag?: string;
   hookStore: IHookStore;
   parent?: Injector;
 
   private tagMatrix = new Map<Tag, Map<Token, Token>>();
   private domainMap = new Map<Domain, Token[]>();
+  creatorMap = new Map<Token, InstanceCreator>();
+  instanceRefMap = new Map<any, string>();
+
   private opts: InjectorOpts;
 
   constructor(providers: Provider[] = [], opts: InjectorOpts = {}, parent?: Injector) {
@@ -131,18 +134,18 @@ export class Injector {
         }
       }
     } else {
-      // 首先用 Tag 去置换 Token 进行对象实例化
+      // firstly, use tag to exchange token
       if (opts && Helper.hasTag(opts)) {
         const tagToken = this.exchangeToken(token, opts.tag);
         [creator, injector] = this.getCreator(tagToken);
       }
 
-      // if there is no Creator, 就从单纯的 Token 去查找创建器
+      // if there is no Creator, then use the token to find the Creator
       if (!creator) {
         [creator, injector] = this.getCreator(token);
       }
 
-      // 非严格模式下，会自动在 get 的时候去解析依赖和 provider
+      // if in non-strict mode, parse dependencies and providers automatically when get
       if (isTypeProvider(token) && !creator && !this.opts.strict) {
         this.parseDependencies(token);
         [creator, injector] = this.getCreator(token);
@@ -182,6 +185,9 @@ export class Injector {
     return tokens.map((token) => this.get(token));
   }
 
+  /**
+   * Only check this injector whether has the singleton instance.
+   */
   hasInstance(instance: any) {
     for (const creator of this.creatorMap.values()) {
       if (creator.instance === instance) {
@@ -222,7 +228,7 @@ export class Injector {
 
     this.setProviders(defaultProviders, { deep: true });
 
-    // 确保所有的依赖都有对应的 Provider
+    // make sure all dependencies have corresponding providers
     const notProvidedDeps = allDeps.filter((d) => !this.getCreator(d)[0]);
     if (notProvidedDeps.length) {
       throw InjectorError.noProviderError(...notProvidedDeps);
@@ -250,7 +256,7 @@ export class Injector {
     return this.hookStore.createOneHook(hook);
   }
 
-  private instanceDisposedEmitter = new EventEmitter<Token>();
+  private instanceDisposedEmitter = new EventEmitter<string>();
 
   onceInstanceDisposed(instance: any, cb: () => void) {
     const instanceId = this.getInstanceId(instance);
@@ -268,6 +274,8 @@ export class Injector {
 
     const instance = creator.instance;
     const instanceId = this.getInstanceId(instance);
+    this.instanceRefMap.delete(instance);
+
     let maybePromise: Promise<unknown> | undefined;
     if (instance && typeof instance[key] === 'function') {
       maybePromise = instance[key]();
@@ -278,10 +286,10 @@ export class Injector {
 
     if (maybePromise && Helper.isPromiseLike(maybePromise)) {
       maybePromise = maybePromise.then(() => {
-        this.instanceDisposedEmitter.emit(instanceId);
+        instanceId && this.instanceDisposedEmitter.emit(instanceId);
       });
     } else {
-      this.instanceDisposedEmitter.emit(instanceId);
+      instanceId && this.instanceDisposedEmitter.emit(instanceId);
     }
     return maybePromise;
   }
@@ -372,6 +380,11 @@ export class Injector {
     }
   }
 
+  private instanceIdGenerator = Helper.createIdFactory('Instance');
+  private getNextInstanceId() {
+    return this.instanceIdGenerator.create();
+  }
+
   private resolveToken(token: Token): [Token, InstanceCreator | undefined] {
     let creator = this.creatorMap.get(token);
 
@@ -404,16 +417,24 @@ export class Injector {
     return [null, this];
   }
 
+  private getOrSaveInstanceRef(instance: any, id: string) {
+    if (this.instanceRefMap.has(instance)) {
+      return this.instanceRefMap.get(instance)!;
+    }
+    this.instanceRefMap.set(instance, id);
+    return id;
+  }
+
   private createInstance(ctx: Context, defaultOpts?: InstanceOpts, args?: any[]) {
     const { creator, token } = ctx;
 
     if (creator.dropdownForTag && creator.tag !== this.tag) {
       throw InjectorError.tagOnlyError(String(creator.tag), String(this.tag));
     }
 
-    // ClassCreator 的时候，需要进行多例状态判断
     if (Helper.isClassCreator(creator)) {
       const opts = defaultOpts ?? creator.opts;
+      // if a class creator is singleton, and the instance is already created, return the instance.
       if (!opts.multiple && creator.status === CreatorStatus.done) {
         return creator.instance;
       }
@@ -444,7 +465,9 @@ export class Injector {
 
     try {
       const args = defaultArgs ?? this.getParameters(creator.parameters, ctx);
-      const instance = this.createInstanceWithInjector(cls, token, injector, args);
+      const nextId = this.getNextInstanceId();
+      const instance = this.createInstanceWithInjector(cls, token, injector, args, nextId);
+      void this.getOrSaveInstanceRef(instance, nextId);
       creator.status = CreatorStatus.init;
 
       // if not allow multiple, save the instance in creator.
@@ -485,24 +508,30 @@ export class Injector {
     });
   }
 
-  private createInstanceWithInjector(cls: ConstructorOf<any>, token: Token, injector: Injector, args: any[]) {
-    // 在创建对象的过程中，先把 injector 挂载到 prototype 上，让构造函数能够访问
-    // 创建完实例之后从 prototype 上去掉 injector，防止内存泄露
+  private createInstanceWithInjector(
+    cls: ConstructorOf<any>,
+    token: Token,
+    injector: Injector,
+    args: any[],
+    id: string,
+  ) {
+    // when creating an instance, set injector to prototype, so that the constructor can access it.
+    // after creating the instance, remove the injector from prototype to prevent memory leaks.
     setInjector(cls.prototype, injector);
     const ret = new cls(...args);
     removeInjector(cls.prototype);
 
-    // 在实例上挂载 injector，让以后的对象内部都能访问到 injector
+    // mount injector on the instance, so that the inner object can access the injector in the future.
     setInjector(ret, injector);
     Object.assign(ret, {
-      __id: Helper.createId('Instance'),
+      __id: id,
       __injectorId: injector.id,
     });
 
     return applyHooks(ret, token, this.hookStore);
   }
 
   getInstanceId(instance: any) {
-    return instance && instance.__id;
+    return this.instanceRefMap.get(instance);
   }
 }