vona-core 5.1.31 → 5.1.33

package/dist/index.js

@@ -873,22 +873,26 @@ class BeanBaseSimple extends BeanSimple {
   }
 }
 
-const SymbolText = Symbol('SymbolText');
+// import type { IModuleLocaleText } from './resource/locale/type.ts';
+
+
+// const SymbolText = Symbol('SymbolText');
 const SymbolLogger = Symbol('SymbolLogger');
 const SymbolLoggerChildren = Symbol('SymbolLoggerChildren');
 class BeanBase extends BeanBaseSimple {
   constructor(...args) {
     super(...args);
-    this[SymbolText] = void 0;
+    // private [SymbolText]: IModuleLocaleText;
     this[SymbolLogger] = {};
     this[SymbolLoggerChildren] = {};
   }
-  get $text() {
-    if (!this[SymbolText]) {
-      this[SymbolText] = this.app.meta.locale.createLocaleText(this[SymbolModuleBelong]);
-    }
-    return this[SymbolText];
-  }
+  // protected get $text(): IModuleLocaleText {
+  //   if (!this[SymbolText]) {
+  //     this[SymbolText] = this.app.meta.locale.createLocaleText(this[SymbolModuleBelong]);
+  //   }
+  //   return this[SymbolText];
+  // }
+
   get $logger() {
     return this.$loggerClient('default');
   }
@@ -1560,19 +1564,19 @@ class BeanContainer {
         fn = function ([receiver, _], next) {
           const beanInstance = self.app.bean._getBean(aopMethod.beanFullName);
           if (!beanInstance.get) throw new Error(`get property accessor not exists: ${aopMethod.onionName}`);
-          return beanInstance.get(aopMethod.options, _patchAopNext([receiver, _], next), receiver, prop);
+          return beanInstance.get(aopMethod.options, _patchAopMethodNext([receiver, _], next), receiver, prop);
         };
       } else if (methodType === 'set') {
         fn = function ([receiver, value], next) {
           const beanInstance = self.app.bean._getBean(aopMethod.beanFullName);
           if (!beanInstance.set) throw new Error(`set property accessor not exists: ${aopMethod.onionName}`);
-          return beanInstance.set(aopMethod.options, value, _patchAopNext([receiver, value], next), receiver, prop);
+          return beanInstance.set(aopMethod.options, value, _patchAopMethodNext([receiver, value], next), receiver, prop);
         };
       } else if (methodType === 'method') {
         fn = function ([receiver, args], next) {
           const beanInstance = self.app.bean._getBean(aopMethod.beanFullName);
           if (!beanInstance.execute) throw new Error(`execute method not exists: ${aopMethod.onionName}`);
-          return beanInstance.execute(aopMethod.options, args, _patchAopNext([receiver, args], next), receiver, prop);
+          return beanInstance.execute(aopMethod.options, args, _patchAopMethodNext([receiver, args], next), receiver, prop);
         };
       }
       chains.push([aopKey, fn]);
@@ -1598,6 +1602,17 @@ function _patchAopNext([receiver, context], next) {
     return next([receiver, context]);
   };
 }
+function _patchAopMethodNext([receiver, context], next) {
+  const nextPatched = (...args) => {
+    context = args.length === 0 ? context : args[0];
+    return next([receiver, context]);
+  };
+  nextPatched.replay = (...args) => {
+    const nextContext = args.length === 0 ? context : args[0];
+    return next.replay([receiver, nextContext]);
+  };
+  return nextPatched;
+}
 function __checkAopOfDescriptorInfo(descriptorInfo) {
   if (!descriptorInfo) return true;
   return !descriptorInfo.dynamic && !descriptorInfo.ofBeanBase;