vona-module-test-vona 5.0.82 → 5.0.84

package/src/service/caching.ts

@@ -1,29 +1,24 @@
-import type { TypeCachingActionOptions } from 'vona-module-a-caching';
+import type { ICachingActionKeyInfo, ICachingActionValueInfo, TypeCachingActionOptions } from 'vona-module-a-caching';
 import type { TSummerCacheTestData } from '../bean/summerCache.test.ts';
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
-import { getKeyHash } from 'vona-module-a-cache';
 import { Caching } from 'vona-module-a-caching';
 
-function cacheKeyFn(this: ServiceCaching, args: [], prop: string, options: TypeCachingActionOptions): any {
-  return `${this.$beanFullName}_${options.cacheProp ?? prop}_${getKeyHash(args)}`;
+function cacheKeyFn(this: ServiceCaching, info: ICachingActionKeyInfo, _options: TypeCachingActionOptions): any {
+  return info.args[0];
 }
 
 @Service()
 export class ServiceCaching extends BeanBase {
-  cacheKey(args: any[], prop: string, options: TypeCachingActionOptions) {
-    return `${this.$beanFullName}_${options.cacheProp ?? prop}_${getKeyHash(args)}`;
+  cacheKey(info: ICachingActionKeyInfo, _options: TypeCachingActionOptions) {
+    return info.args[0];
   }
 
-  cacheKeySet(args: any[], prop: string, options: TypeCachingActionOptions) {
-    return `${this.$beanFullName}_${options.cacheProp ?? prop}_${getKeyHash(args.slice(0, -1))}`;
+  cacheValue(info: ICachingActionValueInfo, _options: TypeCachingActionOptions) {
+    return info.args[1];
   }
 
-  cacheValueSet(_value: any, args: any[], _prop: string, _options: TypeCachingActionOptions) {
-    return args[args.length - 1];
-  }
-
-  @Caching.get({ cacheName: 'test-vona:test', cacheProp: 'test', cacheKeyFn: 'cacheKey' })
+  @Caching.get({ cacheName: 'test-vona:caching', cacheKeyFn: 'cacheKey' })
   async get(id: number): Promise<TSummerCacheTestData> {
     return {
       id,
@@ -31,44 +26,44 @@ export class ServiceCaching extends BeanBase {
     };
   }
 
-  @Caching.get({ cacheName: 'test-vona:test', cacheProp: 'test', cacheKeyFn })
+  @Caching.get({ cacheName: 'test-vona:caching', cacheKeyFn })
   async get2(_id: number): Promise<TSummerCacheTestData> {
     return undefined as any;
   }
 
-  @Caching.get({ cacheName: 'test-vona:test', cacheProp: 'test', cacheKey: 'cel://join([get(self,"$beanFullName"),options.cacheProp,hashkey(args)],"_")' })
+  @Caching.get({ cacheName: 'test-vona:caching', cacheKey: 'cel://args[0]' })
   async get3(_id: number): Promise<TSummerCacheTestData> {
     return undefined as any;
   }
 
   // default cacheKey
-  @Caching.get({ cacheName: 'test-vona:test', cacheProp: 'test' })
+  @Caching.get({ cacheName: 'test-vona:caching' })
   async get4(_id: number): Promise<TSummerCacheTestData> {
     return undefined as any;
   }
 
-  @Caching.set({ cacheName: 'test-vona:test', cacheProp: 'test', cacheKeyFn: 'cacheKeySet', cacheValueFn: 'cacheValueSet' })
+  @Caching.set({ cacheName: 'test-vona:caching', cacheKeyFn: 'cacheKey', cacheValueFn: 'cacheValue' })
   async set(_id: number, _value: TSummerCacheTestData): Promise<void> {
     // do nothing
   }
 
   //
-  @Caching.set({ cacheName: 'test-vona:test', cacheProp: 'test', cacheKey: 'cel://join([get(self,"$beanFullName"),options.cacheProp,hashkey([args[0]])],"_")', cacheValue: 'cel://{"id": args[1].id, "name": args[1].name}' })
+  @Caching.set({ cacheName: 'test-vona:caching', cacheKey: 'cel://args[0]', cacheValue: 'cel://{"id": args[1].id, "name": args[1].name}' })
   async set2(_id: number, _value: TSummerCacheTestData): Promise<void> {
     // do nothing
   }
 
-  @Caching.set({ cacheName: 'test-vona:test', cacheProp: 'test', cacheKeyFn: 'cacheKeySet' })
+  @Caching.set({ cacheName: 'test-vona:caching', cacheKeyFn: 'cacheKey' })
   async set3(_id: number, value: TSummerCacheTestData): Promise<TSummerCacheTestData> {
     return value;
   }
 
-  @Caching.del({ cacheName: 'test-vona:test', cacheProp: 'test' })
+  @Caching.del({ cacheName: 'test-vona:caching' })
   async del(_id: number): Promise<void> {
     // do nothing
   }
 
-  @Caching.clear({ cacheName: 'test-vona:test' })
+  @Caching.clear({ cacheName: 'test-vona:caching' })
   async clear(): Promise<void> {
     // do nothing
   }

package/test/cache/caching.test.ts

@@ -45,8 +45,11 @@ describe('caching.test.ts', () => {
       const res9 = await scopeTest.service.caching.get4(2);
       assert.equal(res9, undefined);
       // cache again
-      const res10 = await scopeTest.service.caching.get(2);
-      assert.equal(res10.id, 2);
+      const res10_1 = await scopeTest.service.caching.get(2);
+      assert.equal(res10_1, undefined);
+      await scopeTest.service.caching.del(2);
+      const res10_2 = await scopeTest.service.caching.get(2);
+      assert.equal(res10_2.id, 2);
       const res11 = await scopeTest.service.caching.get4(2);
       assert.equal(res11.id, 2);
       // clear

package/test/database/database.test.ts

@@ -1,7 +1,7 @@
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
 import { catchError } from '@cabloy/utils';
-import moment from 'moment';
+import { DateTime } from 'luxon';
 import { app } from 'vona-mock';
 
 describe('database.test.ts', () => {
@@ -100,7 +100,7 @@ describe('database.test.ts', () => {
       const entityTest = scopeTest.entity.test;
       const modelTest = scopeTest.model.testDynamicTable;
       // tableName
-      const tableName = `${entityTest.$table}_${moment().format('YYYYMMDD')}`;
+      const tableName = `${entityTest.$table}_${DateTime.now().toFormat('yyyyMMdd')}`;
       // create table
       await app.bean.model.createTable(tableName, table => {
         table.basicFields();

package/test/database/dtoAggregate.test.ts

@@ -3,7 +3,7 @@ import type z from 'zod';
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
 import { app } from 'vona-mock';
-import { getTargetDecoratorRules } from 'vona-module-a-openapi';
+import { getTargetDecoratorRules } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { ModelUserStats } from 'vona-module-test-vona';
 

package/test/database/dtoGet.test.ts

@@ -2,7 +2,7 @@ import type { TypeDecoratorRules } from 'vona-module-a-openapiutils';
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
 import { app } from 'vona-mock';
-import { getTargetDecoratorRules } from 'vona-module-a-openapi';
+import { getTargetDecoratorRules } from 'vona-module-a-openapiutils';
 import { $Dto, $relationDynamic } from 'vona-module-a-orm';
 import { ModelPost, ModelPostContent, ModelRole, ModelRoleUser, ModelUser } from 'vona-module-test-vona';
 
@@ -35,9 +35,9 @@ describe('dtoGet.test.ts', () => {
         },
       });
       const rules: TypeDecoratorRules = getTargetDecoratorRules(DtoPostNew.prototype);
-      assert.equal(['string', 'number'].includes(rules.id?.type as string), true);
+      assert.equal(rules.id?.type === 'pipe', true);
       assert.equal(rules.title?.type === 'string', true);
-      assert.equal(['string', 'number'].includes(rules.userId?.type as string), true);
+      assert.equal(rules.userId?.type === 'pipe', true);
       assert.equal(rules.iid, undefined);
       assert.equal(rules.postContent?.type === 'optional', true);
       assert.equal(rules.user?.type === 'optional', true);

package/test/database/dtoGroup.test.ts

@@ -3,7 +3,7 @@ import type z from 'zod';
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
 import { app } from 'vona-mock';
-import { getTargetDecoratorRules } from 'vona-module-a-openapi';
+import { getTargetDecoratorRules } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { ModelUserStatsGroup } from 'vona-module-test-vona';
 

package/test/database/dtoLazy.test.ts

@@ -3,7 +3,7 @@ import { describe, it } from 'node:test';
 import { OpenApiGeneratorV31, OpenAPIRegistry } from '@cabloy/zod-to-openapi';
 import { appResource, cast } from 'vona';
 import { app } from 'vona-mock';
-import { $schema } from 'vona-module-a-openapi';
+import { $schema } from 'vona-module-a-openapiutils';
 import { DtoUserLazy } from 'vona-module-test-vona';
 
 describe('dtoLazy.test.ts', () => {

package/test/database/dtoMutate.test.ts

@@ -2,7 +2,7 @@ import type { TypeDecoratorRules } from 'vona-module-a-openapiutils';
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
 import { app } from 'vona-mock';
-import { getTargetDecoratorRules } from 'vona-module-a-openapi';
+import { getTargetDecoratorRules } from 'vona-module-a-openapiutils';
 import { $Dto, $relationDynamic } from 'vona-module-a-orm';
 import { ModelPost } from 'vona-module-test-vona';
 
@@ -46,7 +46,7 @@ describe('dtoMutate.test.ts', () => {
       rules = getTargetDecoratorRules(DtoPostCreate.prototype);
       assert.equal(rules.title?.type === 'string', true); // ZodOptional
       assert.equal(rules.stars?.type === 'optional', true);
-      assert.equal(['string', 'number'].includes(rules.userId?.type as string), true);
+      assert.equal(rules.userId?.type === 'pipe', true);
       assert.equal(rules.postContent?.type === 'optional', true);
       assert.equal(rules.user, undefined);
       assert.equal(rules.id, undefined);

package/test/database/dtoQuery.test.ts

@@ -2,6 +2,7 @@ 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 { $customKey } from 'vona';
 import { app } from 'vona-mock';
 
 describe('dtoQuery.test.ts', () => {
@@ -9,6 +10,9 @@ describe('dtoQuery.test.ts', () => {
     await app.bean.executor.mockCtx(async () => {
       // findManyEcho
       const resEcho: IQueryParams = await app.bean.executor.performAction('get', '/test/vona/post/findManyEcho', {
+        headers: {
+          [$customKey('x-vona-tz')]: 'Asia/Tokyo',
+        },
         query: {
           columns: 'id,title', // ['id', 'title'],
           where: {
@@ -22,6 +26,7 @@ describe('dtoQuery.test.ts', () => {
           pageSize: 30,
           title: 'ai',
           userName: 'tom',
+          createdAt: '2025-12-01 - 2025-12-02',
         },
       });
       assert.deepEqual(resEcho.columns, ['id', 'title']);
@@ -29,6 +34,10 @@ describe('dtoQuery.test.ts', () => {
         'stars': { _gt_: 12 },
         'title': { _includesI_: 'ai' },
         'testVonaUser.name': { _eqI_: 'tom' },
+        'createdAt': {
+          _gte_: new Date('2025-11-30T15:00:00.000Z'),
+          _lt_: new Date('2025-12-02T15:00:00.000Z'),
+        },
       });
       assert.deepEqual(resEcho.orders, [['testVonaPost.createdAt', 'desc']]);
       assert.equal(resEcho.offset, 30);

package/test/upload.test.ts

@@ -2,7 +2,7 @@ import assert from 'node:assert';
 import { Blob } from 'node:buffer';
 import { describe, it } from 'node:test';
 import { app } from 'vona-mock';
-import { $apiPath } from 'vona-module-a-web';
+import { $apiPath } from 'vona-module-a-openapiutils';
 
 describe('upload.test.ts', () => {
   it('action:upload:fields', async () => {

package/test/utils/mappedTypes.test.ts

@@ -4,7 +4,7 @@ import { describe, it } from 'node:test';
 import { catchError } from '@cabloy/utils';
 import { $Class, cast } from 'vona';
 import { app } from 'vona-mock';
-import { Api } from 'vona-module-a-openapi';
+import { Api } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
 import { DtoProfile } from '../../src/dto/profile.ts';
 import { DtoUser } from '../../src/dto/user.ts';