fix(ios): 在注入之前创建injectContainer

Author: hubvue

packages/ioc/src/inject.ts

@@ -34,6 +34,13 @@ export const Injectable =
 export const Inject =
   <T>(tag: Tag, unNew = false, param?: T): PropertyDecorator =>
   (target, propertyKey) => {
+    let pool = poolContainer.use(target)
+    if (isBoolean(pool)) {
+      pool = new Container<PropertyKey, unknown>()
+    }
+    pool.bind(propertyKey, undefined)
+    poolContainer.bind(target, pool)
+
     injectContainer.on(tag, (instance) => {
       if (!instance) {
         logger.error(` ${tag.toString()} injectable model not existence`)
@@ -49,11 +56,8 @@ export const Inject =
         }
         value = construct(instance, parameter)
       }
-      let pool = poolContainer.use(target)
-      if (isBoolean(pool)) {
-        pool = new Container<PropertyKey, unknown>()
+      if (!isBoolean(pool)) {
+        pool.bind(propertyKey, value)
       }
-      pool.bind(propertyKey, value)
-      poolContainer.bind(target, pool)
     })
   }

packages/ioc/src/middleware/middleware.ts

@@ -34,17 +34,20 @@ const middlewareRouteContainer = new Container<
 const propertyMiddleware =
   (tag: Tag): PropertyDecorator =>
   (target, propertyKey) => {
+    let pool = poolContainer.use(target)
+    if (isBoolean(pool)) {
+      pool = new Container<PropertyKey, unknown>()
+    }
+    pool.bind(propertyKey, undefined)
+    poolContainer.bind(target, pool)
     middlewarePropertyContainer.on(tag, (middleware) => {
       if (!middleware) {
         logger.error(`${tag.toString()} type property middleware no exists`)
         return
       }
-      let pool = poolContainer.use(target)
-      if (isBoolean(pool)) {
-        pool = new Container<PropertyKey, unknown>()
+      if (!isBoolean(pool)) {
+        pool.bind(propertyKey, middleware)
       }
-      pool.bind(propertyKey, middleware)
-      poolContainer.bind(target, pool)
     })
   }
 

packages/shared/src/construct.ts

@@ -1,5 +1,5 @@
 import { Container } from './container'
-import { isBoolean } from './type'
+import { isBoolean, isUndef } from './type'
 
 export const poolContainer = new Container<
   Object,
@@ -10,8 +10,10 @@ export const construct = (target: Function, params: unknown[] = []) => {
   const instance = Reflect.construct(target, params)
   const instanceContainer = poolContainer.use(target.prototype)
   if (!isBoolean(instanceContainer)) {
-    for (let key in instance) {
-      if (instance.hasOwnProperty(key)) {
+    for (let [key, value] of instanceContainer.getPool().entries()) {
+      if (isUndef(value)) {
+        defineProperty(instance, key, value)
+      } else {
         instanceContainer.on(key, (inject) => {
           defineProperty(instance, key, inject)
         })

packages/shared/src/type.ts

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