zova-core 5.1.90 → 5.1.91

package/dist/bean/beanContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"beanContainer.d.ts","sourceRoot":"","sources":["../../src/bean/beanContainer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"beanContainer.d.ts","sourceRoot":"","sources":["../../src/bean/beanContainer.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EACV,aAAa,EACb,aAAa,EAEb,oBAAoB,EAErB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EACV,WAAW,EACX,gBAAgB,EAEhB,uBAAuB,EACxB,MAAM,WAAW,CAAC;AAiBnB,QAAA,MAAM,kCAAkC,eAA+C,CAAC;AACxF,eAAO,MAAM,4BAA4B,eAAyC,CAAC;AAEnF,qBAAa,aAAa;IACxB,OAAO,CAAC,GAAG,CAAU;IACrB,OAAO,CAAC,GAAG,CAAkB;IAC7B,OAAO,CAAC,GAAG,CAAc;IAGzB,OAAO,CAAC,CAAC,4BAA4B,CAAC,CAAqD;IAE3F,OAAO,CAAC,CAAC,kCAAkC,CAAC,CAAgD;IAE5F,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,WAAW,GAAG,IAAI;IAYzE,SAAS,aAAa,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,WAAW,GAAG,IAAI;IA+FjF,IAAI,aAAa,IAAI,aAAa,CAIjC;IAED,IAAI,MAAM,IAAI,aAAa,GAAG,IAAI,CAKjC;IAED,OAAO,CAAC,UAAU;IAWlB,gCAAgC,CAAC,EAAE,KAAA,EAAE,QAAQ,CAAC,EAAE,OAAO;IASvD,OAAO,CAAC,CAAC,SAAS,MAAM,aAAa,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC;IAM5E,MAAM,CAAC,CAAC,SAAS,MAAM,aAAa,EAAE,SAAS,EAAE,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC;IACrE,MAAM,CAAC,CAAC,SAAS,MAAM,aAAa,EAClC,SAAS,EAAE,CAAC,EACZ,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC,EAC9B,qBAAqB,CAAC,EAAE,KAAK,GAC5B,aAAa,CAAC,CAAC,CAAC;IACnB,MAAM,CAAC,CAAC,SAAS,MAAM,aAAa,EAClC,SAAS,EAAE,CAAC,EACZ,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,aAAa,CAAC,CAAC,CAAC,CAAC,EACzD,qBAAqB,CAAC,EAAE,IAAI,GAC3B,aAAa,CAAC,CAAC,CAAC;IAOnB,cAAc,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC;IAkB1F,kCAAkC;IAClC,KAAK,CAAC,CAAC,SAAS,uBAAuB,EAAE,WAAW,EAAE,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC;IAWvE,QAAQ,CAAC,CAAC,SAAS,uBAAuB,EAAE,WAAW,EAAE,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAY/F,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;IAIpC,YAAY,CAAC,CAAC,SAAS,MAAM,WAAW,EACtC,YAAY,EAAE,CAAC,EACf,YAAY,CAAC,EAAE,OAAO,EACtB,SAAS,CAAC,EAAE,OAAO,GAClB,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS;IAC7B,YAAY,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,OAAO,GAAG,CAAC,GAAG,SAAS;IAgBxF,gBAAgB,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,GAAG,CAAC;IAIlC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,OAAO,EAAE,GAAG,IAAI,OAAA,GAAG,OAAO,CAAC,CAAC,CAAC;IAC7E,QAAQ,CAAC,CAAC,SAAS,MAAM,WAAW,EACxC,YAAY,EAAE,CAAC,EACf,YAAY,CAAC,EAAE,OAAO,EACtB,GAAG,IAAI,OAAA,GACN,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAUpB,gBAAgB,CAAC,CAAC,EACtB,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,EACnB,YAAY,CAAC,EAAE,OAAO,EACtB,QAAQ,CAAC,EAAE,MAAM,EACjB,GAAG,IAAI,OAAA,GACN,OAAO,CAAC,CAAC,CAAC;IACP,gBAAgB,CAAC,CAAC,SAAS,MAAM,WAAW,EAChD,YAAY,EAAE,CAAC,EACf,YAAY,CAAC,EAAE,OAAO,EACtB,QAAQ,CAAC,EAAE,MAAM,EACjB,GAAG,IAAI,OAAA,GACN,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAmB1B,yBAAyB,CAAC,CAAC,EACzB,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,SAAS,EACnD,QAAQ,CAAC,EAAE,MAAM,GAChB,CAAC;IAWE,qBAAqB,CAAC,CAAC,EAC3B,YAAY,EAAE,OAAO,EACrB,UAAU,EAAE,WAAW,GAAG,IAAI,EAC9B,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,SAAS,EACnD,YAAY,CAAC,EAAE,OAAO,EACtB,YAAY,CAAC,EAAE,OAAO,EACtB,GAAG,IAAI,OAAA,GACN,OAAO,CAAC,CAAC,CAAC;YA4BC,4BAA4B;IAmB1C,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,IAAI,OAAA,GAAG,CAAC;IAWnE,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,OAAO,EAAE,GAAG,IAAI,OAAA,GAAG,OAAO,CAAC,CAAC,CAAC;IAC7E,QAAQ,CAAC,CAAC,SAAS,MAAM,WAAW,EACxC,YAAY,EAAE,CAAC,EACf,YAAY,CAAC,EAAE,OAAO,EACtB,GAAG,IAAI,OAAA,GACN,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAmBpB,gBAAgB,CAAC,CAAC,EACtB,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,EACnB,YAAY,CAAC,EAAE,OAAO,EACtB,QAAQ,CAAC,EAAE,MAAM,EACjB,GAAG,IAAI,OAAA,GACN,OAAO,CAAC,CAAC,CAAC;IACP,gBAAgB,CAAC,CAAC,SAAS,MAAM,WAAW,EAChD,YAAY,EAAE,CAAC,EACf,YAAY,CAAC,EAAE,OAAO,EACtB,QAAQ,CAAC,EAAE,MAAM,EACjB,GAAG,IAAI,OAAA,GACN,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IA+D1B,OAAO,CAAC,uCAAuC;YAUjC,mCAAmC;IAejD,OAAO,CAAC,wBAAwB;YAIlB,oBAAoB;YAapB,mBAAmB;YA6CnB,oBAAoB;IAqBlC,OAAO,CAAC,0BAA0B;IAoBlC,OAAO,CAAC,0BAA0B;YAsCpB,iBAAiB;YAkDjB,mBAAmB;YAuCnB,uBAAuB;IAmF9B,gBAAgB,CAAC,CAAC,GAAG,OAAO,EAAE,UAAU,EAAE,oBAAoB,GAAG,CAAC;IAClE,gBAAgB,CAAC,CAAC,SAAS,MAAM,WAAW,EACjD,YAAY,EAAE,CAAC,EACf,UAAU,CAAC,EAAE,oBAAoB,GAChC,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS;IAetB,qBAAqB,CAC1B,MAAM,EAAE,OAAO,EACf,UAAU,EAAE,WAAW,GAAG,SAAS,EACnC,kBAAkB,EAAE,MAAM,GAAG,SAAS,EACtC,UAAU,EAAE,oBAAoB;IA6BlC,OAAO,CAAC,sBAAsB;YAkBhB,+BAA+B;YAY/B,kBAAkB;IAYhC,OAAO,CAAC,wBAAwB;IAUhC,OAAO,CAAC,aAAa;IA0FrB,OAAO,CAAC,uBAAuB;YA8BjB,iBAAiB;IA8C/B,OAAO,CAAC,uBAAuB;IAmB/B,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,iBAAiB;IAoFzB,OAAO,CAAC,4BAA4B;IA6CpC,OAAO,CAAC,YAAY;YAcN,UAAU;CAOzB"}

package/dist/index.js

@@ -1419,6 +1419,10 @@ class BeanContainer {
       // throw new Error(`bean not found: ${beanFullName}`);
       return null;
     }
+    // controller module: ensure route resources are ready before controller data initialization
+    if (controllerData) {
+      await this._useModule(beanOptions.module);
+    }
     // beanFullName
     return await this._createBeanInstance(record, recordProp, controllerData, beanOptions.beanFullName, beanOptions.beanClass, args, cast(beanOptions.scene) === 'aop',
     // default is true: same as inject prop
@@ -4091,6 +4095,7 @@ async function _useController(controllerData, controllerBeanFullName, renderBean
     ctx.meta.state.setLoadRetryEnabled(boundary?.retry);
   }
   function isAttemptActive(attemptId) {
+    if (ctx.disposed || !ctx.meta) return false;
     return ctx.meta.state.isLoadAttemptActive(attemptId);
   }
   function getLoadLoadingDelay() {
@@ -4102,9 +4107,9 @@ async function _useController(controllerData, controllerBeanFullName, renderBean
     // controller
     if (!isAttemptActive(attemptId)) return false;
     await ctx.bean._newBeanInner(true, BeanControllerIdentifier, controllerData, controllerBeanFullName, true, false, controller => {
+      if (!isAttemptActive(attemptId)) return;
       loadBeans.add(controller);
       ctx.meta.state.setLoadBeanAttempt(controller, attemptId);
-      if (!isAttemptActive(attemptId)) return;
       ctx.meta.state.setLoadController(controller);
       setLoadBoundaryOptions(controller.constructor);
     });
@@ -4112,6 +4117,7 @@ async function _useController(controllerData, controllerBeanFullName, renderBean
     // style
     if (styleBeanFullName) {
       await ctx.bean._newBeanInner(true, BeanStyleIdentifier, undefined, styleBeanFullName, true, false, style => {
+        if (!isAttemptActive(attemptId)) return;
         loadBeans.add(style);
         ctx.meta.state.setLoadBeanAttempt(style, attemptId);
       });
@@ -4120,6 +4126,7 @@ async function _useController(controllerData, controllerBeanFullName, renderBean
     // render
     if (renderBeanFullName) {
       await ctx.bean._newBeanInner(true, BeanRenderIdentifier, undefined, renderBeanFullName, true, false, render => {
+        if (!isAttemptActive(attemptId)) return;
         loadBeans.add(render);
         ctx.meta.state.setLoadBeanAttempt(render, attemptId);
       });