vona-module-test-vona 5.0.69 → 5.0.70

package/dist/bean/aop.regExp.d.ts

@@ -1,7 +1,9 @@
+import type { AopAction, AopActionGetter, AopActionSetter } from 'vona-module-a-aspect';
+import type { BeanTestCtx } from './bean.testCtx.ts';
 import { BeanAopBase } from 'vona';
 export declare class AopRegExp extends BeanAopBase {
-    __get_name__(next: any): string;
-    __set_name__(value: any, next: any): any;
-    actionSync(_args: any, next: any): string;
-    actionAsync(_args: any, next: any): Promise<string>;
+    protected __get_name__: AopActionGetter<BeanTestCtx, 'name'>;
+    protected __set_name__: AopActionSetter<BeanTestCtx, 'name'>;
+    actionSync: AopAction<BeanTestCtx, 'actionSync', string>;
+    actionAsync: AopAction<BeanTestCtx, 'actionAsync', string>;
 }

package/dist/bean/aop.simple.d.ts

@@ -1,13 +1,17 @@
-import type { NextSync } from 'vona';
-import type { AopAction, AopActionDispose, AopActionGetter, AopActionInit, AopActionSetter } from 'vona-module-a-aspect';
+import type { AopAction, AopActionDispose, AopActionGet, AopActionGetter, AopActionInit, AopActionSet, AopActionSetter } from 'vona-module-a-aspect';
 import type { BeanTestCtx } from 'vona-module-test-vona';
 import { BeanAopBase } from 'vona';
+declare module 'vona-module-test-vona' {
+    interface BeanTestCtx {
+        magic: string;
+    }
+}
 declare class AopSimpleBase extends BeanAopBase {
     actionSync: AopAction<BeanTestCtx, 'actionSync', string>;
 }
 export declare class AopSimple extends AopSimpleBase {
-    protected __get__(prop: string, next: NextSync): any;
-    protected __set__(prop: string, value: any, next: NextSync): boolean;
+    protected __get__: AopActionGet<BeanTestCtx>;
+    protected __set__: AopActionSet<BeanTestCtx>;
     protected __get_name__: AopActionGetter<BeanTestCtx, 'name'>;
     protected __set_name__: AopActionSetter<BeanTestCtx, 'name'>;
     protected __init__: AopActionInit<BeanTestCtx>;

package/dist/bean/bean.testCtx.d.ts

@@ -1,6 +1,6 @@
 import { BeanBase } from 'vona';
 declare class TestCtx0 extends BeanBase {
-    _name: string;
+    private _name;
     protected __init__(moduleName: string): void;
     protected __dispose__(): Promise<void>;
     protected __get__(prop: string): any;

package/dist/index.js

@@ -32,26 +32,29 @@ let AopRegExp = (_dec$1q = Aop({
 }), _dec2$1q = BeanInfo({
   module: "test-vona"
 }), _dec$1q(_class$1q = _dec2$1q(_class$1q = class AopRegExp extends BeanAopBase {
-  __get_name__(next) {
-    const value = next();
-    return `${value}:regexpaop`;
-  }
-  __set_name__(value, next) {
-    const parts = value.split(':');
-    const index = parts.indexOf('regexpaop');
-    if (index > -1) {
-      parts.splice(index, 1);
-    }
-    value = parts.join(':');
-    return next(value);
-  }
-  actionSync(_args, next) {
-    const result = next();
-    return `${result}:regexpaop`;
-  }
-  async actionAsync(_args, next) {
-    const result = await next();
-    return `${result}:regexpaop`;
+  constructor(...args) {
+    super(...args);
+    this.__get_name__ = function (next, _receiver) {
+      const value = next();
+      return `${value}:regexpaop`;
+    };
+    this.__set_name__ = function (value, next, _receiver) {
+      const parts = value.split(':');
+      const index = parts.indexOf('regexpaop');
+      if (index > -1) {
+        parts.splice(index, 1);
+      }
+      value = parts.join(':');
+      return next(value);
+    };
+    this.actionSync = (_args, next, _receiver) => {
+      const result = next();
+      return `${result}:regexpaop`;
+    };
+    this.actionAsync = async (_args, next, _receiver) => {
+      const result = await next();
+      return `${result}:regexpaop`;
+    };
   }
 }) || _class$1q) || _class$1q);
 
@@ -76,6 +79,27 @@ let AopSimple = (_dec$1p = Aop({
 }), _dec$1p(_class$1p = _dec2$1p(_class$1p = class AopSimple extends AopSimpleBase {
   constructor(...args) {
     super(...args);
+    this.__get__ = (prop, next, _receiver) => {
+      const value = next();
+      if (prop === 'magic') {
+        return 'magic:simpleaop';
+      }
+      // if (prop === 'name') {
+      //   return `${value}:simpleaop`;
+      // }
+      return value;
+    };
+    this.__set__ = (_prop, value, next, _receiver) => {
+      // if (prop === 'name') {
+      //   const parts = value.split(':');
+      //   const index = parts.indexOf('simpleaop');
+      //   if (index > -1) {
+      //     parts.splice(index, 1);
+      //   }
+      //   value = parts.join(':');
+      // }
+      return next(value);
+    };
     this.__get_name__ = function (next, _receiver) {
       const value = next();
       return `${value}:simpleaop`;
@@ -100,28 +124,6 @@ let AopSimple = (_dec$1p = Aop({
       return `${result}:simpleaop`;
     };
   }
-  // magic
-  __get__(prop, next) {
-    const value = next();
-    if (prop === 'magic') {
-      return 'magic:simpleaop';
-    }
-    if (prop === 'name') {
-      return `${value}:simpleaop`;
-    }
-    return value;
-  }
-  __set__(prop, value, next) {
-    if (prop === 'name') {
-      const parts = value.split(':');
-      const index = parts.indexOf('simpleaop');
-      if (index > -1) {
-        parts.splice(index, 1);
-      }
-      value = parts.join(':');
-    }
-    return next(value);
-  }
 }) || _class$1p) || _class$1p);
 
 var _dec$1o, _dec2$1o, _class$1o;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-test-vona",
   "type": "module",
-  "version": "5.0.69",
+  "version": "5.0.70",
   "title": "test-vona",
   "vonaModule": {
     "fileVersion": 1,

package/src/bean/aop.regExp.ts

@@ -1,14 +1,16 @@
+import type { AopAction, AopActionGetter, AopActionSetter } from 'vona-module-a-aspect';
+import type { BeanTestCtx } from './bean.testCtx.ts';
 import { BeanAopBase } from 'vona';
 import { Aop } from 'vona-module-a-aspect';
 
 @Aop({ match: [/^test-vona\.service\.test\w+$/, 'testCtx'], meta: { mode: 'test' } })
 export class AopRegExp extends BeanAopBase {
-  __get_name__(next) {
+  protected __get_name__: AopActionGetter<BeanTestCtx, 'name'> = function (next, _receiver) {
     const value = next();
     return `${value}:regexpaop`;
-  }
+  };
 
-  __set_name__(value, next) {
+  protected __set_name__: AopActionSetter<BeanTestCtx, 'name'> = function (value, next, _receiver) {
     const parts = value.split(':');
     const index = parts.indexOf('regexpaop');
     if (index > -1) {
@@ -16,15 +18,15 @@ export class AopRegExp extends BeanAopBase {
     }
     value = parts.join(':');
     return next(value);
-  }
+  };
 
-  actionSync(_args, next) {
+  actionSync: AopAction<BeanTestCtx, 'actionSync', string> = (_args, next, _receiver) => {
     const result = next();
     return `${result}:regexpaop`;
-  }
+  };
 
-  async actionAsync(_args, next) {
+  actionAsync: AopAction<BeanTestCtx, 'actionAsync', string> = async (_args, next, _receiver) => {
     const result = await next();
     return `${result}:regexpaop`;
-  }
+  };
 }

package/src/bean/aop.simple.ts

@@ -1,9 +1,14 @@
-import type { NextSync } from 'vona';
-import type { AopAction, AopActionDispose, AopActionGetter, AopActionInit, AopActionSetter } from 'vona-module-a-aspect';
+import type { AopAction, AopActionDispose, AopActionGet, AopActionGetter, AopActionInit, AopActionSet, AopActionSetter } from 'vona-module-a-aspect';
 import type { BeanTestCtx } from 'vona-module-test-vona';
 import { BeanAopBase } from 'vona';
 import { Aop } from 'vona-module-a-aspect';
 
+declare module 'vona-module-test-vona' {
+  export interface BeanTestCtx {
+    magic: string;
+  }
+}
+
 class AopSimpleBase extends BeanAopBase {
   actionSync: AopAction<BeanTestCtx, 'actionSync', string> = (_args, next, _receiver) => {
     const result = next();
@@ -13,29 +18,28 @@ class AopSimpleBase extends BeanAopBase {
 
 @Aop({ match: 'testCtx', dependencies: 'test-vona:regExp', meta: { mode: 'test' } })
 export class AopSimple extends AopSimpleBase {
-  // magic
-  protected __get__(prop: string, next: NextSync) {
+  protected __get__: AopActionGet<BeanTestCtx> = (prop, next, _receiver) => {
     const value = next();
     if (prop === 'magic') {
       return 'magic:simpleaop';
     }
-    if (prop === 'name') {
-      return `${value}:simpleaop`;
-    }
+    // if (prop === 'name') {
+    //   return `${value}:simpleaop`;
+    // }
     return value;
-  }
+  };
 
-  protected __set__(prop: string, value: any, next: NextSync): boolean {
-    if (prop === 'name') {
-      const parts = value.split(':');
-      const index = parts.indexOf('simpleaop');
-      if (index > -1) {
-        parts.splice(index, 1);
-      }
-      value = parts.join(':');
-    }
+  protected __set__: AopActionSet<BeanTestCtx> = (_prop, value, next, _receiver) => {
+    // if (prop === 'name') {
+    //   const parts = value.split(':');
+    //   const index = parts.indexOf('simpleaop');
+    //   if (index > -1) {
+    //     parts.splice(index, 1);
+    //   }
+    //   value = parts.join(':');
+    // }
     return next(value);
-  }
+  };
 
   protected __get_name__: AopActionGetter<BeanTestCtx, 'name'> = function (next, _receiver) {
     const value = next();

package/src/bean/bean.testCtx.ts

@@ -2,7 +2,7 @@ import { BeanBase } from 'vona';
 import { Bean } from 'vona-module-a-bean';
 
 class TestCtx0 extends BeanBase {
-  _name: string;
+  private _name: string;
 
   protected __init__(moduleName: string) {
     this._name = moduleName;