vona-module-test-vona 5.0.63 → 5.0.65

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

@@ -1,14 +1,17 @@
-import type { Next } from 'vona';
+import type { NextSync } from 'vona';
+import type { AopAction, AopActionDispose, AopActionGetter, AopActionInit, AopActionSetter } from 'vona-module-a-aspect';
 import type { BeanTestCtx } from 'vona-module-test-vona';
 import { BeanAopBase } from 'vona';
 declare class AopSimpleBase extends BeanAopBase {
-    actionSync(_args: any, next: any): string;
+    actionSync: AopAction<BeanTestCtx, 'actionSync', string>;
 }
 export declare class AopSimple extends AopSimpleBase {
-    __get__(prop: any, next: any): any;
-    __set__(prop: any, value: any, next: any): boolean;
-    __get_name__(next: any): string;
-    __set_name__(value: any, next: any): boolean;
-    actionAsync(_args: Parameters<BeanTestCtx['actionAsync']>, next: Next, _receiver: BeanTestCtx): Promise<string>;
+    protected __get__(prop: string, next: NextSync): any;
+    protected __set__(prop: string, value: any, next: NextSync): boolean;
+    protected __get_name__: AopActionGetter<BeanTestCtx, 'name'>;
+    protected __set_name__: AopActionSetter<BeanTestCtx, 'name'>;
+    protected __init__: AopActionInit<BeanTestCtx>;
+    protected __dispose__: AopActionDispose<BeanTestCtx>;
+    actionAsync: AopAction<BeanTestCtx, 'actionAsync', string>;
 }
 export {};

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

@@ -1,20 +1,30 @@
 import { BeanBase } from 'vona';
 declare class TestCtx0 extends BeanBase {
     _name: string;
-    protected __init__(moduleName: any): void;
-    protected __get__(prop: any): any;
-    protected __set__(prop: any, value: any): boolean;
+    protected __init__(moduleName: string): void;
+    protected __dispose__(): Promise<void>;
+    protected __get__(prop: string): any;
+    protected __set__(prop: string, value: any): boolean;
     get name(): string;
     set name(value: string);
-    actionSync({ a, b }: any): any;
+    actionSync({ a, b }: {
+        a: number;
+        b: number;
+    }): number;
     actionAsync({ a, b }: {
         a: number;
         b: number;
     }): Promise<number>;
-    actionAsync2({ a, b }: any): Promise<string>;
+    actionAsync2({ a, b }: {
+        a: number;
+        b: number;
+    }): Promise<string>;
 }
 declare class TestCtx1 extends TestCtx0 {
-    actionAsync3({ a, b }: any): Promise<string>;
+    actionAsync3({ a, b }: {
+        a: number;
+        b: number;
+    }): Promise<string>;
 }
 export declare class BeanTestCtx extends TestCtx1 {
 }

package/dist/index.js

@@ -58,9 +58,12 @@ let AopRegExp = (_dec$1q = Aop({
 
 var _dec$1p, _dec2$1p, _class$1p;
 class AopSimpleBase extends BeanAopBase {
-  actionSync(_args, next) {
-    const result = next();
-    return `${result}:simpleaop`;
+  constructor(...args) {
+    super(...args);
+    this.actionSync = (_args, next, _receiver) => {
+      const result = next();
+      return `${result}:simpleaop`;
+    };
   }
 }
 let AopSimple = (_dec$1p = Aop({
@@ -72,6 +75,32 @@ let AopSimple = (_dec$1p = Aop({
 }), _dec2$1p = BeanInfo({
   module: "test-vona"
 }), _dec$1p(_class$1p = _dec2$1p(_class$1p = class AopSimple extends AopSimpleBase {
+  constructor(...args) {
+    super(...args);
+    this.__get_name__ = function (next, _receiver) {
+      const value = next();
+      return `${value}:simpleaop`;
+    };
+    this.__set_name__ = function (value, next, _receiver) {
+      const parts = value.split(':');
+      const index = parts.indexOf('simpleaop');
+      if (index > -1) {
+        parts.splice(index, 1);
+      }
+      value = parts.join(':');
+      return next(value);
+    };
+    this.__init__ = (_args, next, _receiver) => {
+      next();
+    };
+    this.__dispose__ = async (_args, next, _receiver) => {
+      await next();
+    };
+    this.actionAsync = async (_args, next, _receiver) => {
+      const result = await next(_args);
+      return `${result}:simpleaop`;
+    };
+  }
   // magic
   __get__(prop, next) {
     const value = next();
@@ -94,23 +123,6 @@ let AopSimple = (_dec$1p = Aop({
     }
     return next(value);
   }
-  __get_name__(next) {
-    const value = next();
-    return `${value}:simpleaop`;
-  }
-  __set_name__(value, next) {
-    const parts = value.split(':');
-    const index = parts.indexOf('simpleaop');
-    if (index > -1) {
-      parts.splice(index, 1);
-    }
-    value = parts.join(':');
-    return next(value);
-  }
-  async actionAsync(_args, next, _receiver) {
-    const result = await next();
-    return `${result}:simpleaop`;
-  }
 }) || _class$1p) || _class$1p);
 
 var _dec$1o, _dec2$1o, _class$1o;
@@ -632,6 +644,9 @@ class TestCtx0 extends BeanBase {
   __init__(moduleName) {
     this._name = moduleName;
   }
+  async __dispose__() {
+    this._name = '';
+  }
   __get__(prop) {
     if (prop === 'magicSelf') {
       return this['magic:self'];
@@ -1905,7 +1920,7 @@ let DtoProfile = (_dec$r = Dto(), _dec2$r = BeanInfo({
 var _dec$q, _dec2$q, _dec3$n, _dec4$n, _dec5$n, _dec6$n, _dec7$k, _dec8$g, _class$q, _class2$n, _descriptor$6, _descriptor2$6, _descriptor3$3;
 let DtoUserLazy = (_dec$q = Dto(), _dec2$q = BeanInfo({
   module: "test-vona"
-}), _dec3$n = Api.field(), _dec4$n = Reflect.metadata("design:type", String), _dec5$n = Api.field(v.lazy(v.optional(), () => DtoUserLazy)), _dec6$n = Reflect.metadata("design:type", Object), _dec7$k = Api.field(v.optional(), v.array(v.lazy(() => DtoRoleLazy))), _dec8$g = Reflect.metadata("design:type", Array), _dec$q(_class$q = _dec2$q(_class$q = (_class2$n = class DtoUserLazy {
+}), _dec3$n = Api.field(), _dec4$n = Reflect.metadata("design:type", String), _dec5$n = Api.field(v.optional(), v.lazy(() => DtoUserLazy)), _dec6$n = Reflect.metadata("design:type", Object), _dec7$k = Api.field(v.optional(), v.array(v.lazy(() => DtoRoleLazy))), _dec8$g = Reflect.metadata("design:type", Array), _dec$q(_class$q = _dec2$q(_class$q = (_class2$n = class DtoUserLazy {
   constructor() {
     _initializerDefineProperty(this, "name", _descriptor$6, this);
     _initializerDefineProperty(this, "user", _descriptor2$6, this);

package/package.json

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

package/src/bean/aop.simple.ts

@@ -1,19 +1,20 @@
-import type { Next } from 'vona';
+import type { NextSync } from 'vona';
+import type { AopAction, AopActionDispose, AopActionGetter, AopActionInit, 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';
 
 class AopSimpleBase extends BeanAopBase {
-  actionSync(_args, next) {
+  actionSync: AopAction<BeanTestCtx, 'actionSync', string> = (_args, next, _receiver) => {
     const result = next();
     return `${result}:simpleaop`;
-  }
+  };
 }
 
 @Aop({ match: 'testCtx', dependencies: 'test-vona:regExp', meta: { mode: 'test' } })
 export class AopSimple extends AopSimpleBase {
   // magic
-  __get__(prop, next) {
+  protected __get__(prop: string, next: NextSync) {
     const value = next();
     if (prop === 'magic') {
       return 'magic:simpleaop';
@@ -24,7 +25,7 @@ export class AopSimple extends AopSimpleBase {
     return value;
   }
 
-  __set__(prop, value, next): boolean {
+  protected __set__(prop: string, value: any, next: NextSync): boolean {
     if (prop === 'name') {
       const parts = value.split(':');
       const index = parts.indexOf('simpleaop');
@@ -36,12 +37,12 @@ export class AopSimple extends AopSimpleBase {
     return next(value);
   }
 
-  __get_name__(next) {
+  protected __get_name__: AopActionGetter<BeanTestCtx, 'name'> = function (next, _receiver) {
     const value = next();
     return `${value}:simpleaop`;
-  }
+  };
 
-  __set_name__(value, next): boolean {
+  protected __set_name__: AopActionSetter<BeanTestCtx, 'name'> = function (value, next, _receiver) {
     const parts = value.split(':');
     const index = parts.indexOf('simpleaop');
     if (index > -1) {
@@ -49,10 +50,18 @@ export class AopSimple extends AopSimpleBase {
     }
     value = parts.join(':');
     return next(value);
-  }
+  };
 
-  async actionAsync(_args: Parameters<BeanTestCtx['actionAsync']>, next: Next, _receiver: BeanTestCtx) {
-    const result = await next();
+  protected __init__: AopActionInit<BeanTestCtx> = (_args, next, _receiver) => {
+    next();
+  };
+
+  protected __dispose__: AopActionDispose<BeanTestCtx> = async (_args, next, _receiver) => {
+    await next();
+  };
+
+  actionAsync: AopAction<BeanTestCtx, 'actionAsync', string> = async (_args, next, _receiver) => {
+    const result = await next(_args);
     return `${result}:simpleaop`;
-  }
+  };
 }

package/src/bean/bean.testCtx.ts

@@ -4,17 +4,21 @@ import { Bean } from 'vona-module-a-bean';
 class TestCtx0 extends BeanBase {
   _name: string;
 
-  protected __init__(moduleName) {
+  protected __init__(moduleName: string) {
     this._name = moduleName;
   }
 
-  protected __get__(prop) {
+  protected async __dispose__() {
+    this._name = '';
+  }
+
+  protected __get__(prop: string) {
     if (prop === 'magicSelf') {
       return this['magic:self'];
     }
   }
 
-  protected __set__(prop, value): boolean {
+  protected __set__(prop: string, value: any): boolean {
     if (prop === 'magicSelf') {
       this['magic:self'] = value;
       return true;
@@ -30,7 +34,7 @@ class TestCtx0 extends BeanBase {
     this._name = value;
   }
 
-  actionSync({ a, b }: any) {
+  actionSync({ a, b }: { a: number; b: number }) {
     return a + b;
   }
 
@@ -38,7 +42,7 @@ class TestCtx0 extends BeanBase {
     return Promise.resolve(a + b);
   }
 
-  async actionAsync2({ a, b }: any) {
+  async actionAsync2({ a, b }: { a: number; b: number }) {
     const name = this.name;
     const value = await this.actionAsync({ a, b });
     return `${name}:${value}`;
@@ -46,7 +50,7 @@ class TestCtx0 extends BeanBase {
 }
 
 class TestCtx1 extends TestCtx0 {
-  async actionAsync3({ a, b }: any) {
+  async actionAsync3({ a, b }: { a: number; b: number }) {
     return await this.actionAsync2({ a, b });
   }
 }

package/src/dto/userLazy.ts

@@ -10,7 +10,7 @@ export class DtoUserLazy {
   @Api.field()
   name: string;
 
-  @Api.field(v.lazy(v.optional(), () => DtoUserLazy))
+  @Api.field(v.optional(), v.lazy(() => DtoUserLazy))
   user?: DtoUserLazy;
 
   @Api.field(v.optional(), v.array(v.lazy(() => DtoRoleLazy)))