feat: 通过container收集依赖

Author: hubvue

packages/ioc/src/inject.ts

@@ -1,6 +1,13 @@
 import { logger } from '@kever/logger'
-import { construct, defineProperty, Container } from '@kever/shared'
-import { InstanceType, Tag } from './utils'
+import {
+  construct,
+  defineProperty,
+  Container,
+  Tag,
+  InstanceType,
+  poolContainer,
+  isBoolean,
+} from '@kever/shared'
 
 const injectContainer = new Container<Tag, InstanceType>()
 
@@ -42,6 +49,10 @@ export const Inject =
         }
         value = construct(instance, parameter)
       }
-      defineProperty(target, propertyKey, value)
+      let pool = poolContainer.use(target)
+      if (isBoolean(pool)) {
+        pool = new Container<PropertyKey, unknown>()
+      }
+      pool.bind(propertyKey, value)
     })
   }

packages/ioc/src/middleware/middleware.ts

@@ -3,14 +3,16 @@ import { MType, BaseMiddleware, Aop, KoaMiddleware } from './constants'
 import { logger } from '@kever/logger'
 import {
   construct,
-  defineProperty,
   META_MIDDLEWARE_ALL,
   META_MIDDLEWARE_GLOBAL,
   META_MIDDLEWARE_ROUTER,
   Container,
+  Tag,
+  poolContainer,
+  isBoolean,
 } from '@kever/shared'
 import { middlewarePatchPool } from './patch'
-import { isPromise, Tag } from '../utils'
+import { isPromise } from '../utils'
 
 export const middlewareGlobalContainer = Object.create({})
 export const middlewareAllContainer = Object.create({})
@@ -37,7 +39,11 @@ const propertyMiddleware =
         logger.error(`${tag.toString()} type property middleware no exists`)
         return
       }
-      defineProperty(target, propertyKey, middleware)
+      let pool = poolContainer.use(target)
+      if (isBoolean(pool)) {
+        pool = new Container<PropertyKey, unknown>()
+      }
+      pool.bind(propertyKey, middleware)
     })
   }
 

packages/ioc/src/utils/index.ts

@@ -1,4 +1,2 @@
-export * from './types'
-
 export const isPromise = <T>(object: T) =>
   Object.prototype.toString.call(object).slice(8, -1) === 'Promise'

packages/shared/src/construct.ts

@@ -1,8 +1,19 @@
-export const instancePool = new Map<Object, Object>()
+import { Container } from './container'
+import { isBoolean } from './type'
+
+export const poolContainer = new Container<
+  Object,
+  Container<PropertyKey, unknown>
+>()
 
 export const construct = (target: Function, params: unknown[] = []) => {
   const instance = Reflect.construct(target, params)
-  instancePool.set(target.prototype, instance)
+  const instanceContainer = poolContainer.use(target.prototype)
+  if (!isBoolean(instanceContainer)) {
+    for (let [key, value] of instanceContainer.getPool().entries()) {
+      defineProperty(instance, key, value)
+    }
+  }
   return instance
 }
 
@@ -11,9 +22,7 @@ export const defineProperty = (
   propertyKey: PropertyKey,
   value: unknown
 ) => {
-  const instance = instancePool.get(target)
-
-  Object.defineProperty(instance ? instance : target, propertyKey, {
+  Object.defineProperty(target, propertyKey, {
     value,
     writable: false,
     enumerable: false,

packages/shared/src/index.ts

@@ -1,3 +1,5 @@
 export * from './metakey'
 export * from './construct'
 export * from './container'
+export * from './types'
+export * from './type'

packages/shared/src/metakey.ts

@@ -1,4 +1,7 @@
 // middleware
-export const META_MIDDLEWARE_GLOBAL = Symbol.for('ioc#middleware_global')
-export const META_MIDDLEWARE_ALL = Symbol.for('ioc#middleware_all')
-export const META_MIDDLEWARE_ROUTER = Symbol.for('ioc#middleware_router')
+export const META_MIDDLEWARE_GLOBAL = Symbol.for('meta#middleware_global')
+export const META_MIDDLEWARE_ALL = Symbol.for('meta#middleware_all')
+export const META_MIDDLEWARE_ROUTER = Symbol.for('meta#middleware_router')
+
+// inject property
+export const META_INJECT_PROPERTY = Symbol.for('meta#inject_property')

packages/shared/src/type.ts

@@ -0,0 +1,2 @@
+export const isBoolean = (value: any): value is boolean =>
+  typeof value === 'boolean'