vona-module-test-vona 5.0.43 → 5.0.45

package/dist/service/category.d.ts

@@ -1,5 +1,6 @@
 import { BeanBase } from 'vona';
 export declare class ServiceCategory extends BeanBase {
+    categoryTreeDynamic(): Promise<void>;
     categoryTreeReverse(): Promise<void>;
     categoryTree(): Promise<void>;
 }

package/dist/service/post.d.ts

@@ -1,32 +1,47 @@
 import type { TableIdentity } from 'table-identity';
 import { BeanBase } from 'vona';
+import { ModelPost } from '../model/post.ts';
 export declare class ServicePost extends BeanBase {
+    group(): Promise<({
+        userId: TableIdentity;
+    } & import("vona-module-a-orm").TypeRecordAggrsValuesToObject<import("vona-module-a-orm").TypeRecordAggrsValues<{
+        count: "count_all";
+        sum: "sum_stars";
+    }>>)[]>;
+    aggregate(): Promise<import("vona-module-a-orm").TypeRecordAggrsValuesToObject<import("vona-module-a-orm").TypeRecordAggrsValues<{
+        count: "count_all" | "count_stars";
+        sum: "sum_stars";
+        avg: "avg_stars";
+        min: "min_stars";
+        max: "max_stars";
+    }>>>;
+    count(): Promise<BigNumber | undefined>;
     relationBelongsTo(): Promise<void>;
     relationHasOne(): Promise<void>;
     transaction(): Promise<void>;
     transactionManually(): Promise<void>;
-    create(): Promise<import("vona-module-a-orm").TypeModelMutateRelationData<import("vona-module-test-vona").EntityPost, import("vona-module-test-vona").ModelPost, import("vona-module-a-orm").IModelInsertOptions<import("vona-module-test-vona").EntityPost, import("vona-module-test-vona").ModelPost>, true>>;
-    createBulk(): Promise<import("vona-module-a-orm").TypeModelMutateRelationData<import("vona-module-test-vona").EntityPost, import("vona-module-test-vona").ModelPost, import("vona-module-a-orm").IModelInsertOptions<import("vona-module-test-vona").EntityPost, import("vona-module-test-vona").ModelPost>, true>[]>;
-    update(): Promise<import("vona-module-a-orm").TypeModelMutateRelationData<import("vona-module-test-vona").EntityPost, import("vona-module-test-vona").ModelPost, import("vona-module-a-orm").IModelUpdateOptions<import("vona-module-test-vona").EntityPost, import("vona-module-test-vona").ModelPost>>>;
-    update2(): Promise<import("vona-module-a-orm").TypeModelMutateRelationData<import("vona-module-test-vona").EntityPost, import("vona-module-test-vona").ModelPost, {
+    create(): Promise<import("vona-module-a-orm").TypeModelMutateRelationData<import("vona-module-test-vona").EntityPost, ModelPost, import("vona-module-a-orm").IModelInsertOptions<import("vona-module-test-vona").EntityPost, ModelPost>, true>>;
+    createBulk(): Promise<import("vona-module-a-orm").TypeModelMutateRelationData<import("vona-module-test-vona").EntityPost, ModelPost, import("vona-module-a-orm").IModelInsertOptions<import("vona-module-test-vona").EntityPost, ModelPost>, true>[]>;
+    update(): Promise<import("vona-module-a-orm").TypeModelMutateRelationData<import("vona-module-test-vona").EntityPost, ModelPost, import("vona-module-a-orm").IModelUpdateOptions<import("vona-module-test-vona").EntityPost, ModelPost>>>;
+    update2(): Promise<import("vona-module-a-orm").TypeModelMutateRelationData<import("vona-module-test-vona").EntityPost, ModelPost, {
         where: {
             title: {
                 _startsWith_: string;
             };
         };
     }>>;
-    updateBulk(): Promise<import("vona-module-a-orm").TypeModelMutateRelationData<import("vona-module-test-vona").EntityPost, import("vona-module-test-vona").ModelPost, import("vona-module-a-orm").IModelUpdateOptions<import("vona-module-test-vona").EntityPost, import("vona-module-test-vona").ModelPost>>[]>;
+    updateBulk(): Promise<import("vona-module-a-orm").TypeModelMutateRelationData<import("vona-module-test-vona").EntityPost, ModelPost, import("vona-module-a-orm").IModelUpdateOptions<import("vona-module-test-vona").EntityPost, ModelPost>>[]>;
     delete(): Promise<void>;
     delete2(): Promise<void>;
     deleteBulk(): Promise<void>;
     mutate(): Promise<void>;
     mutateBulk(): Promise<void>;
-    select(): Promise<import("vona-module-a-orm").TypeModelRelationResult_Normal<import("vona-module-test-vona").EntityPost, import("vona-module-test-vona").ModelPost, {
+    select(): Promise<import("vona-module-a-orm").TypeModelRelationResult_Normal<import("vona-module-test-vona").EntityPost, ModelPost, {
         where: {
             stars: "_skip_";
         };
     }, undefined, 50>[]>;
-    select2(): Promise<import("vona-module-a-orm").TypeModelRelationResult_Normal<import("vona-module-test-vona").EntityPost, import("vona-module-test-vona").ModelPost, {
+    select2(): Promise<import("vona-module-a-orm").TypeModelRelationResult_Normal<import("vona-module-test-vona").EntityPost, ModelPost, {
         columns: ("id" | "title" | "userId")[];
         where: {
             id: {
@@ -39,7 +54,6 @@ export declare class ServicePost extends BeanBase {
         limit: number;
         orders: ["createdAt", "desc"][];
     }, undefined, 50>[]>;
-    get(id: TableIdentity): Promise<import("vona-module-a-orm").TypeModelRelationResult_Normal<import("vona-module-test-vona").EntityPost, import("vona-module-test-vona").ModelPost, import("vona-module-a-orm").IModelGetOptions<import("vona-module-test-vona").EntityPost, import("vona-module-test-vona").ModelPost>, undefined, 50> | undefined>;
-    mget(ids: TableIdentity[]): Promise<import("vona-module-a-orm").TypeModelRelationResult_Normal<import("vona-module-test-vona").EntityPost, import("vona-module-test-vona").ModelPost, import("vona-module-a-orm").IModelGetOptions<import("vona-module-test-vona").EntityPost, import("vona-module-test-vona").ModelPost>, undefined, 50>[]>;
-    count(): Promise<BigNumber | undefined>;
+    get(id: TableIdentity): Promise<import("vona-module-a-orm").TypeModelRelationResult_Normal<import("vona-module-test-vona").EntityPost, ModelPost, import("vona-module-a-orm").IModelGetOptions<import("vona-module-test-vona").EntityPost, ModelPost>, undefined, 50> | undefined>;
+    mget(ids: TableIdentity[]): Promise<import("vona-module-a-orm").TypeModelRelationResult_Normal<import("vona-module-test-vona").EntityPost, ModelPost, import("vona-module-a-orm").IModelGetOptions<import("vona-module-test-vona").EntityPost, ModelPost>, undefined, 50>[]>;
 }

package/dist/service/product.d.ts

@@ -0,0 +1,3 @@
+import { BeanBase } from 'vona';
+export declare class ServiceProduct extends BeanBase {
+}

package/dist/service/user.d.ts

@@ -1,4 +1,17 @@
 import { BeanBase } from 'vona';
 export declare class ServiceUser extends BeanBase {
+    userStats(): Promise<import("vona-module-a-orm").TypeRecordAggrsValuesToObject<import("vona-module-a-orm").TypeRecordAggrsValues<{
+        count: "count_all";
+        sum: "sum_scores";
+        max: "max_age";
+        min: "min_age";
+    }>>>;
+    findUsers(): Promise<import("vona-module-a-orm").TypeModelRelationResult_Normal<import("vona-module-test-vona").EntityUser, import("vona-module-test-vona").ModelUser, {
+        where: {
+            age: {
+                _gt_: number;
+            };
+        };
+    }, undefined, 50>[]>;
     relationBelongsToMany(): Promise<void>;
 }

package/package.json

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

package/src/.metadata/index.ts

@@ -821,6 +821,7 @@ export * from '../service/caching.ts';
 export * from '../service/category.ts';
 export * from '../service/order.ts';
 export * from '../service/post.ts';
+export * from '../service/product.ts';
 export * from '../service/test.ts';
 export * from '../service/testApp.ts';
 export * from '../service/testClass.ts';
@@ -837,6 +838,7 @@ declare module 'vona-module-a-bean' {
 'test-vona:category': never;
 'test-vona:order': never;
 'test-vona:post': never;
+'test-vona:product': never;
 'test-vona:test': never;
 'test-vona:testApp': never;
 'test-vona:testClass': never;
@@ -899,6 +901,16 @@ declare module 'vona-module-test-vona' {
             get $onionName(): 'test-vona:post';
           }
 
+        export interface ServiceProduct {
+          /** @internal */
+          get scope(): ScopeModuleTestVona;
+        }
+
+          export interface ServiceProduct {
+            get $beanFullName(): 'test-vona.service.product';
+            get $onionName(): 'test-vona:product';
+          }
+
         export interface ServiceTest {
           /** @internal */
           get scope(): ScopeModuleTestVona;
@@ -966,6 +978,7 @@ import type { ServiceCaching } from '../service/caching.ts';
 import type { ServiceCategory } from '../service/category.ts';
 import type { ServiceOrder } from '../service/order.ts';
 import type { ServicePost } from '../service/post.ts';
+import type { ServiceProduct } from '../service/product.ts';
 import type { ServiceTest } from '../service/test.ts';
 import type { ServiceTestApp } from '../service/testApp.ts';
 import type { ServiceTestClass } from '../service/testClass.ts';
@@ -978,6 +991,7 @@ export interface IModuleService {
 'category': ServiceCategory;
 'order': ServiceOrder;
 'post': ServicePost;
+'product': ServiceProduct;
 'test': ServiceTest;
 'testApp': ServiceTestApp;
 'testClass': ServiceTestClass;
@@ -996,6 +1010,7 @@ declare module 'vona' {
 'test-vona.service.category': ServiceCategory;
 'test-vona.service.order': ServiceOrder;
 'test-vona.service.post': ServicePost;
+'test-vona.service.product': ServiceProduct;
 'test-vona.service.test': ServiceTest;
 'test-vona.service.testApp': ServiceTestApp;
 'test-vona.service.testClass': ServiceTestClass;
@@ -1305,6 +1320,7 @@ export * from '../dto/orderUpdate.ts';
 export * from '../dto/postCreate.ts';
 export * from '../dto/profile.ts';
 export * from '../dto/roleLazy.ts';
+export * from '../dto/signin.ts';
 export * from '../dto/user.ts';
 export * from '../dto/userCreate.ts';
 export * from '../dto/userLazy.ts';
@@ -1316,6 +1332,7 @@ import type { IDtoOptionsOrderUpdate } from '../dto/orderUpdate.ts';
 import type { IDtoOptionsPostCreate } from '../dto/postCreate.ts';
 import type { IDtoOptionsProfile } from '../dto/profile.ts';
 import type { IDtoOptionsRoleLazy } from '../dto/roleLazy.ts';
+import type { IDtoOptionsSignin } from '../dto/signin.ts';
 import type { IDtoOptionsUser } from '../dto/user.ts';
 import type { IDtoOptionsUserCreate } from '../dto/userCreate.ts';
 import type { IDtoOptionsUserLazy } from '../dto/userLazy.ts';
@@ -1331,6 +1348,7 @@ declare module 'vona-module-a-web' {
 'test-vona:postCreate': IDtoOptionsPostCreate;
 'test-vona:profile': IDtoOptionsProfile;
 'test-vona:roleLazy': IDtoOptionsRoleLazy;
+'test-vona:signin': IDtoOptionsSignin;
 'test-vona:user': IDtoOptionsUser;
 'test-vona:userCreate': IDtoOptionsUserCreate;
 'test-vona:userLazy': IDtoOptionsUserLazy;
@@ -1351,6 +1369,7 @@ import type { DtoOrderUpdate } from '../dto/orderUpdate.ts';
 import type { DtoPostCreate } from '../dto/postCreate.ts';
 import type { DtoProfile } from '../dto/profile.ts';
 import type { DtoRoleLazy } from '../dto/roleLazy.ts';
+import type { DtoSignin } from '../dto/signin.ts';
 import type { DtoUser } from '../dto/user.ts';
 import type { DtoUserCreate } from '../dto/userCreate.ts';
 import type { DtoUserLazy } from '../dto/userLazy.ts';
@@ -1385,6 +1404,10 @@ declare module 'vona-module-test-vona' {
       fields?: TypeEntityOptionsFields<DtoRoleLazy, IDtoOptionsRoleLazy[TypeSymbolKeyFieldsMore]>;
     }
 
+    export interface IDtoOptionsSignin {
+      fields?: TypeEntityOptionsFields<DtoSignin, IDtoOptionsSignin[TypeSymbolKeyFieldsMore]>;
+    }
+
     export interface IDtoOptionsUser {
       fields?: TypeEntityOptionsFields<DtoUser, IDtoOptionsUser[TypeSymbolKeyFieldsMore]>;
     }
@@ -1406,6 +1429,7 @@ declare module 'vona-module-test-vona' {
 export * from '../controller/bean.ts';
 export * from '../controller/cacheMem.ts';
 export * from '../controller/cacheRedis.ts';
+export * from '../controller/captcha.ts';
 export * from '../controller/dtoTest.ts';
 export * from '../controller/guardPassport.ts';
 export * from '../controller/onion.ts';
@@ -1419,6 +1443,7 @@ export * from '../controller/upload.ts';
 import type { IControllerOptionsBean } from '../controller/bean.ts';
 import type { IControllerOptionsCacheMem } from '../controller/cacheMem.ts';
 import type { IControllerOptionsCacheRedis } from '../controller/cacheRedis.ts';
+import type { IControllerOptionsCaptcha } from '../controller/captcha.ts';
 import type { IControllerOptionsDtoTest } from '../controller/dtoTest.ts';
 import type { IControllerOptionsGuardPassport } from '../controller/guardPassport.ts';
 import type { IControllerOptionsOnion } from '../controller/onion.ts';
@@ -1436,6 +1461,7 @@ declare module 'vona-module-a-web' {
       'test-vona:bean': IControllerOptionsBean;
 'test-vona:cacheMem': IControllerOptionsCacheMem;
 'test-vona:cacheRedis': IControllerOptionsCacheRedis;
+'test-vona:captcha': IControllerOptionsCaptcha;
 'test-vona:dtoTest': IControllerOptionsDtoTest;
 'test-vona:guardPassport': IControllerOptionsGuardPassport;
 'test-vona:onion': IControllerOptionsOnion;
@@ -1482,6 +1508,16 @@ declare module 'vona-module-test-vona' {
             get $onionName(): 'test-vona:cacheRedis';
           }
 
+        export interface ControllerCaptcha {
+          /** @internal */
+          get scope(): ScopeModuleTestVona;
+        }
+
+          export interface ControllerCaptcha {
+            get $beanFullName(): 'test-vona.controller.captcha';
+            get $onionName(): 'test-vona:captcha';
+          }
+
         export interface ControllerDtoTest {
           /** @internal */
           get scope(): ScopeModuleTestVona;
@@ -1591,6 +1627,8 @@ import type { ControllerCacheMem } from '../controller/cacheMem.ts';
 // @ts-ignore ignore
 import type { ControllerCacheRedis } from '../controller/cacheRedis.ts';
 // @ts-ignore ignore
+import type { ControllerCaptcha } from '../controller/captcha.ts';
+// @ts-ignore ignore
 import type { ControllerDtoTest } from '../controller/dtoTest.ts';
 // @ts-ignore ignore
 import type { ControllerGuardPassport } from '../controller/guardPassport.ts';
@@ -1624,6 +1662,10 @@ declare module 'vona-module-test-vona' {
       actions?: TypeControllerOptionsActions<ControllerCacheRedis>;
     }
 
+    export interface IControllerOptionsCaptcha {
+      actions?: TypeControllerOptionsActions<ControllerCaptcha>;
+    }
+
     export interface IControllerOptionsDtoTest {
       actions?: TypeControllerOptionsActions<ControllerDtoTest>;
     }
@@ -1688,6 +1730,7 @@ declare module 'vona-module-a-web' {
 export interface IApiPathPostRecord{
         '/test/vona/cacheMem': undefined;
 '/test/vona/cacheRedis': undefined;
+'/test/vona/captcha/signin': undefined;
 '/test/vona/dtoTest/createUser': undefined;
 '//echo': undefined;
 '/test/vona/onion/echo2/:userId/:userName': undefined;

package/src/controller/captcha.ts

@@ -0,0 +1,18 @@
+import type { IDecoratorControllerOptions } from 'vona-module-a-web';
+import { BeanBase } from 'vona';
+import { Aspect } from 'vona-module-a-aspect';
+import { Arg } from 'vona-module-a-openapi';
+import { Passport } from 'vona-module-a-user';
+import { Controller, Web } from 'vona-module-a-web';
+import { DtoSignin } from '../dto/signin.ts';
+
+export interface IControllerOptionsCaptcha extends IDecoratorControllerOptions {}
+
+@Controller<IControllerOptionsCaptcha>({ path: 'captcha', meta: { mode: ['test', 'dev'] } })
+export class ControllerCaptcha extends BeanBase {
+  @Web.post('signin')
+  @Passport.public()
+  @Aspect.middleware('a-captcha:captcha', { scene: 'a-captchasimple:simple' })
+  async signin(@Arg.body() _user: DtoSignin) {
+  }
+}

package/src/dto/signin.ts

@@ -0,0 +1,14 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+import { Api, v } from 'vona-module-a-openapi';
+import { Dto } from 'vona-module-a-web';
+
+export interface IDtoOptionsSignin extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsSignin>()
+export class DtoSignin {
+  @Api.field()
+  username: string;
+
+  @Api.field(v.min(3))
+  password: string;
+}

package/src/service/category.ts

@@ -1,9 +1,97 @@
 import assert from 'node:assert';
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
+import { $relationDynamic } from 'vona-module-a-orm';
+import { ModelCategory } from '../model/category.ts';
 
 @Service()
 export class ServiceCategory extends BeanBase {
+  async categoryTreeDynamic() {
+    // create
+    const treeCreate = await this.scope.model.category.insert(
+      {
+        name: 'Category-1',
+        children2: [
+          {
+            name: 'Category-1-1',
+            children2: [
+              { name: 'Category-1-1-1' },
+            ],
+          },
+          {
+            name: 'Category-1-2',
+          },
+        ],
+      },
+      {
+        with: {
+          children2: $relationDynamic.hasMany(() => ModelCategory, 'categoryIdParent', {
+            with: {
+              children2: $relationDynamic.hasMany(() => ModelCategory, 'categoryIdParent', {
+              }),
+            },
+          }),
+        },
+      },
+    );
+    // get
+    const tree = await this.scope.model.category.get(
+      {
+        id: treeCreate.id,
+      },
+      {
+        with: {
+          children2: $relationDynamic.hasMany(() => ModelCategory, 'categoryIdParent', {
+            columns: ['id', 'name'],
+            with: {
+              children2: $relationDynamic.hasMany(() => ModelCategory, 'categoryIdParent', {
+                columns: ['id', 'name'],
+              }),
+            },
+          }),
+        },
+      },
+    );
+    assert.equal(tree?.children2.length, 2);
+    assert.equal(tree?.children2[0].children2.length, 1);
+    // update
+    await this.scope.model.category.update(
+      {
+        id: treeCreate.id,
+        name: 'Category-1-Update',
+        children2: [
+          // create
+          { name: 'Category-1-3' },
+          // update
+          { id: treeCreate.children2?.[0].id, name: 'Category-1-1-Update' },
+          // delete
+          { id: treeCreate.children2?.[1].id, deleted: true },
+        ],
+      },
+      {
+        with: {
+          children2: $relationDynamic.hasMany(() => ModelCategory, 'categoryIdParent'),
+        },
+      },
+    );
+    // delete
+    await this.scope.model.category.delete(
+      {
+        id: treeCreate.id,
+      },
+      {
+        with: {
+          children2: $relationDynamic.hasMany(() => ModelCategory, 'categoryIdParent', {
+            with: {
+              children2: $relationDynamic.hasMany(() => ModelCategory, 'categoryIdParent', {
+              }),
+            },
+          }),
+        },
+      },
+    );
+  }
+
   async categoryTreeReverse() {
     // create
     const treeCreate = await this.scope.model.category.insert({

package/src/service/order.ts

@@ -1,5 +1,7 @@
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
+import { $relationDynamic } from 'vona-module-a-orm';
+import { ModelProduct } from '../model/product.ts';
 
 @Service()
 export class ServiceOrder extends BeanBase {
@@ -8,14 +10,14 @@ export class ServiceOrder extends BeanBase {
     const orderCreate = await this.scope.model.order.insert(
       {
         orderNo: 'Order001',
-        products: [
+        products2: [
           { name: 'Apple' },
           { name: 'Pear' },
         ],
       },
       {
-        include: {
-          products: true,
+        with: {
+          products2: $relationDynamic.hasMany(() => ModelProduct, 'orderId'),
         },
       },
     );
@@ -25,8 +27,10 @@ export class ServiceOrder extends BeanBase {
         id: orderCreate.id,
       },
       {
-        include: {
-          products: true,
+        with: {
+          products2: $relationDynamic.hasMany(() => ModelProduct, 'orderId', {
+            columns: ['id', 'name', 'price', 'quantity', 'amount'],
+          }),
         },
       },
     );
@@ -35,7 +39,7 @@ export class ServiceOrder extends BeanBase {
       {
         id: orderCreate.id,
         orderNo: 'Order001-Update',
-        products: [
+        products2: [
           // create product: Peach
           { name: 'Peach' },
           // update product: Apple
@@ -45,8 +49,8 @@ export class ServiceOrder extends BeanBase {
         ],
       },
       {
-        include: {
-          products: true,
+        with: {
+          products2: $relationDynamic.hasMany(() => ModelProduct, 'orderId'),
         },
       },
     );
@@ -56,8 +60,8 @@ export class ServiceOrder extends BeanBase {
         id: orderCreate.id,
       },
       {
-        include: {
-          products: true,
+        with: {
+          products2: $relationDynamic.hasMany(() => ModelProduct, 'orderId'),
         },
       },
     );

package/src/service/post.ts

@@ -1,14 +1,47 @@
 import type { TableIdentity } from 'table-identity';
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
-import { Database } from 'vona-module-a-orm';
+import { $relationDynamic, Database } from 'vona-module-a-orm';
+import { ModelPost } from '../model/post.ts';
+import { ModelPostContent } from '../model/postContent.ts';
 
 @Service()
 export class ServicePost extends BeanBase {
+  async group() {
+    const result = await this.scope.model.post.group({
+      groups: 'userId',
+      aggrs: {
+        count: '*',
+        sum: 'stars',
+      },
+      orders: [['count_all', 'desc']],
+    });
+    return result;
+  }
+
+  async aggregate() {
+    const result = await this.scope.model.post.aggregate({
+      aggrs: {
+        count: ['*', 'stars'],
+        sum: 'stars',
+        avg: 'stars',
+        min: 'stars',
+        max: 'stars',
+      },
+    });
+    return result;
+  }
+
+  async count() {
+    return await this.scope.model.post.count();
+  }
+
   async relationBelongsTo() {
     const postContent = await this.scope.model.postContent.select({
-      include: {
-        post: true,
+      with: {
+        post: $relationDynamic.belongsTo(() => ModelPostContent, () => ModelPost, 'postId', {
+          columns: ['id', 'title'],
+        }),
       },
     });
     console.log(postContent[0]?.post?.title);
@@ -24,8 +57,10 @@ export class ServicePost extends BeanBase {
         },
       },
       {
-        include: {
-          postContent: true,
+        with: {
+          postContent: $relationDynamic.hasOne(() => ModelPostContent, 'postId', {
+            columns: ['id', 'content'],
+          }),
         },
       },
     );
@@ -35,8 +70,10 @@ export class ServicePost extends BeanBase {
         id: postCreate.id,
       },
       {
-        include: {
-          postContent: true,
+        with: {
+          postContent: $relationDynamic.hasOne(() => ModelPostContent, 'postId', {
+            columns: ['id', 'content'],
+          }),
         },
       },
     );
@@ -50,8 +87,10 @@ export class ServicePost extends BeanBase {
         },
       },
       {
-        include: {
-          postContent: true,
+        with: {
+          postContent: $relationDynamic.hasOne(() => ModelPostContent, 'postId', {
+            columns: ['id', 'content'],
+          }),
         },
       },
     );
@@ -61,8 +100,8 @@ export class ServicePost extends BeanBase {
         id: postCreate.id,
       },
       {
-        include: {
-          postContent: true,
+        with: {
+          postContent: $relationDynamic.hasOne(() => ModelPostContent, 'postId'),
         },
       },
     );
@@ -213,7 +252,7 @@ export class ServicePost extends BeanBase {
     return await this.scope.model.post.mget(ids);
   }
 
-  async count() {
-    return await this.scope.model.post.count();
-  }
+  // async count() {
+  //   return await this.scope.model.post.count();
+  // }
 }

package/src/service/product.ts

@@ -0,0 +1,6 @@
+import { BeanBase } from 'vona';
+import { Service } from 'vona-module-a-bean';
+
+@Service()
+export class ServiceProduct extends BeanBase {
+}

package/src/service/user.ts

@@ -1,8 +1,35 @@
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
+import { $relationDynamic } from 'vona-module-a-orm';
+import { ModelRole } from '../model/role.ts';
+import { ModelRoleUser } from '../model/roleUser.ts';
 
 @Service()
 export class ServiceUser extends BeanBase {
+  async userStats() {
+    const userStats = await this.scope.model.user.aggregate({
+      aggrs: {
+        count: '*',
+        sum: 'scores',
+        max: 'age',
+        min: 'age',
+      },
+      where: {
+        scores: { _gt_: 30 },
+      },
+    });
+    return userStats;
+  }
+
+  async findUsers() {
+    const users = await this.scope.model.user.select({
+      where: {
+        age: { _gt_: 18 },
+      },
+    });
+    return users;
+  }
+
   async relationBelongsToMany() {
     // insert: roles
     const roles = await this.scope.model.role.insertBulk([
@@ -20,8 +47,8 @@ export class ServiceUser extends BeanBase {
         }],
       },
       {
-        include: {
-          roles: true,
+        with: {
+          roles: $relationDynamic.belongsToMany(() => ModelRoleUser, () => ModelRole, 'userId', 'roleId'),
         },
       },
     );
@@ -31,8 +58,10 @@ export class ServiceUser extends BeanBase {
         id: userCreate.id,
       },
       {
-        include: {
-          roles: true,
+        with: {
+          roles: $relationDynamic.belongsToMany(() => ModelRoleUser, () => ModelRole, 'userId', 'roleId', {
+            columns: ['id', 'name'],
+          }),
         },
       },
     );
@@ -48,8 +77,10 @@ export class ServiceUser extends BeanBase {
         ],
       },
       {
-        include: {
-          roles: true,
+        with: {
+          roles: $relationDynamic.belongsToMany(() => ModelRoleUser, () => ModelRole, 'userId', 'roleId', {
+            columns: ['id', 'name'],
+          }),
         },
       },
     );
@@ -59,8 +90,8 @@ export class ServiceUser extends BeanBase {
         id: userCreate.id,
       },
       {
-        include: {
-          roles: true,
+        with: {
+          roles: $relationDynamic.belongsToMany(() => ModelRoleUser, () => ModelRole, 'userId', 'roleId'),
         },
       },
     );