vona-module-test-vona 5.0.44 → 5.0.46

package/test/database/dtoAggregate.test.ts

@@ -8,37 +8,35 @@ import { ModelUserStats } from 'vona-module-test-vona';
 describe('dtoAggregate.test.ts', () => {
   it('action:dtoAggregate', async () => {
     await app.bean.executor.mockCtx(async () => {
-      await app.bean.executor.mockCtx(async () => {
-        // aggr
-        const DtoUserAggr = $Dto.aggregate('test-vona:user', {
-          count: ['*', 'age'],
-          sum: ['age'],
-          avg: 'age',
-          // max: 'age',
-          // min: 'age',
-        });
-        let rules: any;
-        rules = getTargetDecoratorRules(DtoUserAggr.prototype);
-        assert.equal(rules.count_all._def.typeName, 'ZodOptional');
-        assert.equal(rules.count_all._def.innerType._def.typeName, 'ZodUnion');
-        assert.equal(rules.count_all._def.innerType._def.options[0]._def.typeName, 'ZodString');
-        assert.equal(rules.count_all._def.innerType._def.options[1]._def.typeName, 'ZodNumber');
-        assert.equal(rules.count_age._def.typeName, 'ZodOptional');
-        assert.equal(rules.sum_age._def.typeName, 'ZodOptional');
-        assert.equal(rules.avg_age._def.typeName, 'ZodOptional');
-        assert.equal(rules.max_age, undefined);
-        assert.equal(rules.min_age, undefined);
-        // aggr: usersStats: posts: autoload
-        const DtoUserStats = $Dto.get(() => ModelUserStats, {
-          columns: 'name',
-          include: { roles: true },
-        });
-        rules = getTargetDecoratorRules(DtoUserStats.prototype);
-        assert.equal(rules.name._def.typeName, 'ZodString');
-        assert.equal(rules.iid, undefined);
-        assert.equal(rules.posts._def.typeName, 'ZodOptional');
-        assert.equal(rules.roles._def.typeName, 'ZodOptional');
+      // aggr
+      const DtoUserAggr = $Dto.aggregate('test-vona:user', {
+        count: ['*', 'age'],
+        sum: ['age'],
+        avg: 'age',
+        // max: 'age',
+        // min: 'age',
       });
+      let rules: any;
+      rules = getTargetDecoratorRules(DtoUserAggr.prototype);
+      assert.equal(rules.count_all._def.typeName, 'ZodOptional');
+      assert.equal(rules.count_all._def.innerType._def.typeName, 'ZodUnion');
+      assert.equal(rules.count_all._def.innerType._def.options[0]._def.typeName, 'ZodString');
+      assert.equal(rules.count_all._def.innerType._def.options[1]._def.typeName, 'ZodNumber');
+      assert.equal(rules.count_age._def.typeName, 'ZodOptional');
+      assert.equal(rules.sum_age._def.typeName, 'ZodOptional');
+      assert.equal(rules.avg_age._def.typeName, 'ZodOptional');
+      assert.equal(rules.max_age, undefined);
+      assert.equal(rules.min_age, undefined);
+      // aggr: usersStats: posts: autoload
+      const DtoUserStats = $Dto.get(() => ModelUserStats, {
+        columns: 'name',
+        include: { roles: true },
+      });
+      rules = getTargetDecoratorRules(DtoUserStats.prototype);
+      assert.equal(rules.name._def.typeName, 'ZodString');
+      assert.equal(rules.iid, undefined);
+      assert.equal(rules.posts._def.typeName, 'ZodOptional');
+      assert.equal(rules.roles._def.typeName, 'ZodOptional');
     });
   });
 });

package/test/database/dtoGet.test.ts

@@ -8,54 +8,50 @@ import { ModelPost, ModelPostContent, ModelRole, ModelRoleUser, ModelUser } from
 describe('dtoGet.test.ts', () => {
   it('action:dtoGet', async () => {
     await app.bean.executor.mockCtx(async () => {
-      await app.bean.executor.mockCtx(async () => {
-        const DtoPostNew = $Dto.get(ModelPost, {
-          columns: ['id', 'title', 'userId'],
-          include: {
-            postContent: {
-              columns: ['id', 'content'],
-              include: {
-                post: { include: { user: { columns: ['id'] } } },
-              },
-              with: {
-                post3: $relationDynamic.belongsTo(() => ModelPostContent, () => ModelPost, 'postId', {
-                  include: {
-                    postContent: true,
-                  },
-                }),
-              },
+      const DtoPostNew = $Dto.get(ModelPost, {
+        columns: ['id', 'title', 'userId'],
+        include: {
+          postContent: {
+            columns: ['id', 'content'],
+            include: {
+              post: { include: { user: { columns: ['id'] } } },
+            },
+            with: {
+              post3: $relationDynamic.belongsTo(() => ModelPostContent, () => ModelPost, 'postId', {
+                include: {
+                  postContent: true,
+                },
+              }),
             },
           },
-          with: {
-            user3: $relationDynamic.belongsTo(ModelPost, () => ModelUser, 'userId', {
-              include: { posts: true },
-              with: { roles: $relationDynamic.belongsToMany(() => ModelRoleUser, () => ModelRole, 'userId', 'roleId') },
-              columns: ['id', 'name'],
-            }),
-          },
-        });
-        const rules: any = getTargetDecoratorRules(DtoPostNew.prototype);
-        assert.equal(['ZodString', 'ZodNumber'].includes(rules.id._def.typeName), true);
-        assert.equal(rules.title._def.typeName, 'ZodString');
-        assert.equal(['ZodString', 'ZodNumber'].includes(rules.userId._def.typeName), true);
-        assert.equal(rules.iid, undefined);
-        assert.equal(rules.postContent._def.typeName, 'ZodOptional');
-        assert.equal(rules.user._def.typeName, 'ZodOptional');
-        assert.equal(rules.user3._def.typeName, 'ZodOptional');
+        },
+        with: {
+          user3: $relationDynamic.belongsTo(ModelPost, () => ModelUser, 'userId', {
+            include: { posts: true },
+            with: { roles: $relationDynamic.belongsToMany(() => ModelRoleUser, () => ModelRole, 'userId', 'roleId') },
+            columns: ['id', 'name'],
+          }),
+        },
       });
+      const rules: any = getTargetDecoratorRules(DtoPostNew.prototype);
+      assert.equal(['ZodString', 'ZodNumber'].includes(rules.id._def.typeName), true);
+      assert.equal(rules.title._def.typeName, 'ZodString');
+      assert.equal(['ZodString', 'ZodNumber'].includes(rules.userId._def.typeName), true);
+      assert.equal(rules.iid, undefined);
+      assert.equal(rules.postContent._def.typeName, 'ZodOptional');
+      assert.equal(rules.user._def.typeName, 'ZodOptional');
+      assert.equal(rules.user3._def.typeName, 'ZodOptional');
     });
   });
   it('action:dtoGet:categoryTree', async () => {
     await app.bean.executor.mockCtx(async () => {
-      await app.bean.executor.mockCtx(async () => {
-        const DtoCategoryTree = $Dto.get('test-vona:category', { columns: ['id', 'name'], include: { children: { columns: ['id'] } } });
-        const rules: any = getTargetDecoratorRules(DtoCategoryTree.prototype);
-        assert.equal(rules.children._def.typeName, 'ZodEffects');
-        assert.equal(rules.iid, undefined);
-        const DtoCategoryChain = $Dto.get('test-vona:categoryChain', { columns: ['id', 'name', 'categoryIdParent'] });
-        const _apiJson = await app.bean.scope('a-openapi').service.openapi.generateJsonOfClass(DtoCategoryChain);
-        // console.log(JSON.stringify(apiJson.components));
-      });
+      const DtoCategoryTree = $Dto.get('test-vona:category', { columns: ['id', 'name'], include: { children: { columns: ['id'] } } });
+      const rules: any = getTargetDecoratorRules(DtoCategoryTree.prototype);
+      assert.equal(rules.children._def.typeName, 'ZodEffects');
+      assert.equal(rules.iid, undefined);
+      const DtoCategoryChain = $Dto.get('test-vona:categoryChain', { columns: ['id', 'name', 'categoryIdParent'] });
+      const _apiJson = await app.bean.scope('a-openapi').service.openapi.generateJsonOfClass(DtoCategoryChain);
+      // console.log(JSON.stringify(apiJson.components));
     });
   });
 });

package/test/database/dtoGroup.test.ts

@@ -8,37 +8,35 @@ import { ModelUserStatsGroup } from 'vona-module-test-vona';
 describe('dtoGroup.test.ts', () => {
   it('action:dtoGroup', async () => {
     await app.bean.executor.mockCtx(async () => {
-      await app.bean.executor.mockCtx(async () => {
-        const DtoUserAggr = $Dto.group('test-vona:user', ['name'], {
-          count: ['*', 'age'],
-          sum: ['age'],
-          avg: 'age',
-          // max: 'age',
-          // min: 'age',
-        });
-        let rules: any;
-        rules = getTargetDecoratorRules(DtoUserAggr.prototype);
-        assert.equal(rules.name._def.typeName, 'ZodString');
-        assert.equal(rules.count_all._def.typeName, 'ZodOptional');
-        assert.equal(rules.count_all._def.innerType._def.typeName, 'ZodUnion');
-        assert.equal(rules.count_all._def.innerType._def.options[0]._def.typeName, 'ZodString');
-        assert.equal(rules.count_all._def.innerType._def.options[1]._def.typeName, 'ZodNumber');
-        assert.equal(rules.count_age._def.typeName, 'ZodOptional');
-        assert.equal(rules.sum_age._def.typeName, 'ZodOptional');
-        assert.equal(rules.avg_age._def.typeName, 'ZodOptional');
-        assert.equal(rules.max_age, undefined);
-        assert.equal(rules.min_age, undefined);
-        // group: userStats: posts: autoload
-        const DtoUserStats = $Dto.get(() => ModelUserStatsGroup, {
-          columns: 'name',
-          include: { roles: true },
-        });
-        rules = getTargetDecoratorRules(DtoUserStats.prototype);
-        assert.equal(rules.name._def.typeName, 'ZodString');
-        assert.equal(rules.iid, undefined);
-        assert.equal(rules.posts._def.typeName, 'ZodEffects');
-        assert.equal(rules.roles._def.typeName, 'ZodEffects');
+      const DtoUserAggr = $Dto.group('test-vona:user', ['name'], {
+        count: ['*', 'age'],
+        sum: ['age'],
+        avg: 'age',
+        // max: 'age',
+        // min: 'age',
       });
+      let rules: any;
+      rules = getTargetDecoratorRules(DtoUserAggr.prototype);
+      assert.equal(rules.name._def.typeName, 'ZodString');
+      assert.equal(rules.count_all._def.typeName, 'ZodOptional');
+      assert.equal(rules.count_all._def.innerType._def.typeName, 'ZodUnion');
+      assert.equal(rules.count_all._def.innerType._def.options[0]._def.typeName, 'ZodString');
+      assert.equal(rules.count_all._def.innerType._def.options[1]._def.typeName, 'ZodNumber');
+      assert.equal(rules.count_age._def.typeName, 'ZodOptional');
+      assert.equal(rules.sum_age._def.typeName, 'ZodOptional');
+      assert.equal(rules.avg_age._def.typeName, 'ZodOptional');
+      assert.equal(rules.max_age, undefined);
+      assert.equal(rules.min_age, undefined);
+      // group: userStats: posts: autoload
+      const DtoUserStats = $Dto.get(() => ModelUserStatsGroup, {
+        columns: 'name',
+        include: { roles: true },
+      });
+      rules = getTargetDecoratorRules(DtoUserStats.prototype);
+      assert.equal(rules.name._def.typeName, 'ZodString');
+      assert.equal(rules.iid, undefined);
+      assert.equal(rules.posts._def.typeName, 'ZodEffects');
+      assert.equal(rules.roles._def.typeName, 'ZodEffects');
     });
   });
 });

package/test/database/dtoMutate.test.ts

@@ -8,49 +8,47 @@ import { ModelPost } from 'vona-module-test-vona';
 describe('dtoMutate.test.ts', () => {
   it('action:dtoMutate', async () => {
     await app.bean.executor.mockCtx(async () => {
-      await app.bean.executor.mockCtx(async () => {
-        // create
-        const DtoUserCreate = $Dto.create('test-vona:user', {
-          include: { posts: true },
-        });
-        let rules: any;
-        rules = getTargetDecoratorRules(DtoUserCreate.prototype);
-        assert.equal(rules.name._def.typeName, 'ZodString');
-        assert.equal(rules.id, undefined);
-        assert.equal(rules.iid, undefined);
-        assert.equal(rules.deleted, undefined);
-        assert.equal(rules.createdAt, undefined);
-        assert.equal(rules.updatedAt, undefined);
-        assert.equal(rules.posts._def.typeName, 'ZodOptional');
-        // update
-        const DtoUserUpdate = $Dto.update('test-vona:user', {
-          with: {
-            posts: $relationDynamic.hasMany(() => ModelPost, 'userId', { columns: ['id', 'title'] }),
-          },
-        });
-        rules = getTargetDecoratorRules(DtoUserUpdate.prototype);
-        assert.equal(rules.name._def.typeName, 'ZodString'); // ZodOptional
-        assert.equal(rules.id, undefined);
-        assert.equal(rules.iid, undefined);
-        assert.equal(rules.deleted, undefined);
-        assert.equal(rules.createdAt, undefined);
-        assert.equal(rules.updatedAt, undefined);
-        assert.equal(rules.posts._def.typeName, 'ZodOptional');
-        // create: not mutate post(belongsTo)
-        const DtoPostCreate = $Dto.create('test-vona:post', {
-          include: {
-            postContent: true,
-            user: true,
-          },
-        });
-        rules = getTargetDecoratorRules(DtoPostCreate.prototype);
-        assert.equal(rules.title._def.typeName, 'ZodString'); // ZodOptional
-        assert.equal(rules.stars._def.typeName, 'ZodOptional');
-        assert.equal(['ZodString', 'ZodNumber'].includes(rules.userId._def.typeName), true);
-        assert.equal(rules.postContent._def.typeName, 'ZodOptional');
-        assert.equal(rules.user, undefined);
-        assert.equal(rules.id, undefined);
+      // create
+      const DtoUserCreate = $Dto.create('test-vona:user', {
+        include: { posts: true },
       });
+      let rules: any;
+      rules = getTargetDecoratorRules(DtoUserCreate.prototype);
+      assert.equal(rules.name._def.typeName, 'ZodString');
+      assert.equal(rules.id, undefined);
+      assert.equal(rules.iid, undefined);
+      assert.equal(rules.deleted, undefined);
+      assert.equal(rules.createdAt, undefined);
+      assert.equal(rules.updatedAt, undefined);
+      assert.equal(rules.posts._def.typeName, 'ZodOptional');
+      // update
+      const DtoUserUpdate = $Dto.update('test-vona:user', {
+        with: {
+          posts: $relationDynamic.hasMany(() => ModelPost, 'userId', { columns: ['id', 'title'] }),
+        },
+      });
+      rules = getTargetDecoratorRules(DtoUserUpdate.prototype);
+      assert.equal(rules.name._def.typeName, 'ZodString'); // ZodOptional
+      assert.equal(rules.id, undefined);
+      assert.equal(rules.iid, undefined);
+      assert.equal(rules.deleted, undefined);
+      assert.equal(rules.createdAt, undefined);
+      assert.equal(rules.updatedAt, undefined);
+      assert.equal(rules.posts._def.typeName, 'ZodOptional');
+      // create: not mutate post(belongsTo)
+      const DtoPostCreate = $Dto.create('test-vona:post', {
+        include: {
+          postContent: true,
+          user: true,
+        },
+      });
+      rules = getTargetDecoratorRules(DtoPostCreate.prototype);
+      assert.equal(rules.title._def.typeName, 'ZodString'); // ZodOptional
+      assert.equal(rules.stars._def.typeName, 'ZodOptional');
+      assert.equal(['ZodString', 'ZodNumber'].includes(rules.userId._def.typeName), true);
+      assert.equal(rules.postContent._def.typeName, 'ZodOptional');
+      assert.equal(rules.user, undefined);
+      assert.equal(rules.id, undefined);
     });
   });
 });

package/test/database/dtoQuery.test.ts

@@ -0,0 +1,55 @@
+import type { IQueryParams } from 'vona-module-a-orm';
+import assert from 'node:assert';
+import { describe, it } from 'node:test';
+import { isNil } from '@cabloy/utils';
+import { app } from 'vona-mock';
+
+describe('dtoQuery.test.ts', () => {
+  it('action:dtoQuery', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      // findManyEcho
+      const resEcho: IQueryParams = await app.bean.executor.performAction('get', '/test/vona/post/findManyEcho', {
+        query: {
+          columns: 'id,title', // ['id', 'title'],
+          where: {
+            stars: {
+              _gt_: 12,
+            },
+          },
+          orders: [['testVonaPost.createdAt', 'desc']],
+          pageNo: 2,
+          pageSize: 30,
+          title: 'ai',
+          userName: 'tom',
+        },
+      });
+      assert.deepEqual(resEcho.columns, ['id', 'title']);
+      assert.deepEqual(resEcho.where, {
+        'stars': { _gt_: 12 },
+        'title': { _includesI_: 'ai' },
+        'testVonaUser.name': 'tom',
+      });
+      assert.deepEqual(resEcho.orders, [['testVonaPost.createdAt', 'desc']]);
+      assert.equal(resEcho.offset, 30);
+      assert.equal(resEcho.limit, 30);
+      // findMany
+      const res = await app.bean.executor.performAction('get', '/test/vona/post/findMany', {
+        query: {
+          columns: 'id,title', // ['id', 'title'],
+          where: {
+            stars: {
+              _gt_: 12,
+            },
+          },
+          orders: [['testVonaPost.createdAt', 'desc']],
+          pageNo: 2,
+          pageSize: 30,
+          title: 'ai',
+          userName: 'tom',
+        },
+      });
+      assert.equal(Array.isArray(res.list), true);
+      assert.equal(!isNil(res.total), true);
+    });
+  });
+});

package/test/database/modelRelationsJoins.test.ts

@@ -32,6 +32,17 @@ describe('modelRelationsJoins.test.ts', () => {
         orders: [['testVonaUser.id', 'asc']],
       }, {}, ['test-vona:user']);
       assert.equal(itemsJoins2.length, 0);
+      // joins: manual: no table prefix
+      const itemsJoins3 = await scopeTest.model.post.select({
+        columns: ['id', 'title'],
+        joins: [['innerJoin', 'testVonaUser', ['userId', 'testVonaUser.id']]],
+        where: {
+          'testVonaUser.id': userJimmy.id,
+          'userId': userJimmy.id,
+        },
+        orders: [['testVonaUser.id', 'asc'], ['testVonaPost.createdAt', 'asc']],
+      }, {}, ['test-vona:user']);
+      assert.equal(itemsJoins3.length, 0);
       // test data: delete
       await scopeTest.service.testData.drop(testData);
     });

package/test/utils/performAction.test.ts

@@ -18,7 +18,7 @@ describe('performAction.test.ts', () => {
     const result: { id: number; url: string } = await app.bean.executor.mockCtx(async () => {
       return await app.bean.executor.performAction('post', '/test/vona/performAction/echo', {
         onions: {
-          pipe: { 'a-validation:valid': { enable: false } },
+          pipe: { 'a-web:valid': { enable: false } },
         },
       });
     });