vona-module-test-vona 5.0.86 → 5.0.88

package/dist/.metadata/index.d.ts

@@ -1740,44 +1740,9 @@ declare module 'vona-module-a-web' {
 /** config: begin */
 export * from '../config/config.ts';
 import type { config } from '../config/config.ts';
-export declare const locales: {
-    'en-us': {
-        Name: string;
-        User: string;
-        UserId: string;
-        Test: string;
-        TestHelloWorld: string;
-        TestApples_: string;
-        TestApples_0: string;
-        TestApples_1: string;
-        TestNameApples_: string;
-        TestNameApples_0_1: string;
-        TestNameApples_1_1: string;
-        Order: string;
-        OrderNo: string;
-        Remark: string;
-        Price: string;
-        Quantity: string;
-        Amount: string;
-    };
-    'zh-cn': {
-        Name: string;
-        User: string;
-        UserId: string;
-        Test: string;
-        TestHelloWorld: string;
-        TestApples_: string;
-        TestApples_0: string;
-        TestNameApples_: string;
-        TestNameApples_0_1: string;
-        Order: string;
-        OrderNo: string;
-        Remark: string;
-        Price: string;
-        Quantity: string;
-        Amount: string;
-    };
-};
+/** config: end */
+/** locale: begin */
+import { locales } from './locales.ts';
 /** locale: end */
 /** scope: begin */
 import { BeanScopeBase, type BeanScopeUtil, type TypeModuleConfig, type TypeModuleLocales, type TypeLocaleBase } from 'vona';
@@ -1814,5 +1779,4 @@ declare module 'vona' {
         'test-vona': (typeof locales)[TypeLocaleBase];
     }
 }
-export declare function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `test-vona::${K}`;
 /** scope: end */

package/dist/.metadata/locales.d.ts

@@ -0,0 +1,40 @@
+import type { TypeLocaleBase } from 'vona';
+export declare const locales: {
+    'en-us': {
+        Name: string;
+        User: string;
+        UserId: string;
+        Test: string;
+        TestHelloWorld: string;
+        TestApples_: string;
+        TestApples_0: string;
+        TestApples_1: string;
+        TestNameApples_: string;
+        TestNameApples_0_1: string;
+        TestNameApples_1_1: string;
+        Order: string;
+        OrderNo: string;
+        Remark: string;
+        Price: string;
+        Quantity: string;
+        Amount: string;
+    };
+    'zh-cn': {
+        Name: string;
+        User: string;
+        UserId: string;
+        Test: string;
+        TestHelloWorld: string;
+        TestApples_: string;
+        TestApples_0: string;
+        TestNameApples_: string;
+        TestNameApples_0_1: string;
+        Order: string;
+        OrderNo: string;
+        Remark: string;
+        Price: string;
+        Quantity: string;
+        Amount: string;
+    };
+};
+export declare function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `test-vona::${K}`;

package/dist/controller/onion.d.ts

@@ -1,6 +1,5 @@
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import { BeanBase } from 'vona';
-import '../.metadata/index.ts';
 import { DtoUser } from '../dto/user.ts';
 export interface IControllerOptionsOnion extends IDecoratorControllerOptions {
 }

package/dist/dto/user.d.ts

@@ -1,6 +1,5 @@
 import type { TableIdentity } from 'table-identity';
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
-import '../.metadata/index.ts';
 export interface IDtoOptionsUser extends IDecoratorDtoOptions {
 }
 export declare class DtoUser {

package/dist/entity/order.d.ts

@@ -1,7 +1,6 @@
 import type { TableIdentity } from 'table-identity';
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
 import { EntityBase } from 'vona-module-a-orm';
-import '../.metadata/index.ts';
 export interface IEntityOptionsOrder extends IDecoratorEntityOptions {
 }
 export declare class EntityOrder extends EntityBase {

package/dist/entity/product.d.ts

@@ -1,7 +1,6 @@
 import type { TableIdentity } from 'table-identity';
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
 import { EntityBase } from 'vona-module-a-orm';
-import '../.metadata/index.ts';
 export interface IEntityOptionsProduct extends IDecoratorEntityOptions {
 }
 export declare class EntityProduct extends EntityBase {

package/dist/entity/test.d.ts

@@ -1,6 +1,5 @@
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
 import { EntityBase } from 'vona-module-a-orm';
-import '../.metadata/index.ts';
 export interface IEntityOptionsTest extends IDecoratorEntityOptions {
 }
 export declare class EntityTest extends EntityBase {

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export * from './.metadata/index.ts';
+export * from './.metadata/locales.ts';
 export * from './lib/index.ts';
 export * from './types/index.ts';

package/dist/index.js

@@ -5,6 +5,7 @@ import { Entity, EntityBase, Model, $relation, BeanModelBase, $relationDynamic,
 import { ModelCategoryChain as ModelCategoryChain$1, ModelOrder as ModelOrder$1 } from 'vona-module-test-vona';
 import { DateTime } from 'luxon';
 import { Bean, Service, Scope } from 'vona-module-a-bean';
+import { cel, sleep } from '@cabloy/utils';
 import { Caching } from 'vona-module-a-caching';
 import assert from 'node:assert';
 import { Core } from 'vona-module-a-core';
@@ -20,7 +21,6 @@ import { SummerCache, BeanSummerCacheBase } from 'vona-module-a-summer';
 import { Dto, Controller, Web, Arg } from 'vona-module-a-web';
 import z, { z as z$1 } from 'zod';
 import { Passport } from 'vona-module-a-user';
-import { sleep } from '@cabloy/utils';
 import { DtoJwtToken } from 'vona-module-a-jwt';
 import { SymbolUploadValue } from 'vona-module-a-upload';
 
@@ -28,7 +28,7 @@ var _dec$1t, _dec2$1t, _class$1t;
 let AopRegExp = (_dec$1t = Aop({
   match: [/^test-vona\.service\.test\w+$/, 'testCtx'],
   meta: {
-    mode: 'test'
+    mode: ['test', 'dev']
   }
 }), _dec2$1t = BeanInfo({
   module: "test-vona"
@@ -73,7 +73,7 @@ let AopSimple = (_dec$1s = Aop({
   match: 'testCtx',
   dependencies: 'test-vona:regExp',
   meta: {
-    mode: 'test'
+    mode: ['test', 'dev']
   }
 }), _dec2$1s = BeanInfo({
   module: "test-vona"
@@ -199,6 +199,52 @@ let EntityCategory = (_dec$1q = Entity('testVonaCategory'), _dec2$1q = BeanInfo(
   initializer: null
 }), _class2$E)) || _class$1q) || _class$1q);
 
+var locale_en_us = {
+  Name: 'Name',
+  User: 'User',
+  UserId: 'User ID',
+  Test: 'Test',
+  TestHelloWorld: 'Hello World',
+  TestApples_: '%d apples',
+  TestApples_0: 'no apples',
+  TestApples_1: 'one apple',
+  TestNameApples_: '%s has %d apples',
+  TestNameApples_0_1: '%s has no apples',
+  TestNameApples_1_1: '%s has one apple',
+  Order: 'Order',
+  OrderNo: 'Order No',
+  Remark: 'Remark',
+  Price: 'Price',
+  Quantity: 'Quantity',
+  Amount: 'Amount'
+};
+
+var locale_zh_cn = {
+  Name: '名称',
+  User: '用户',
+  UserId: '用户ID',
+  Test: '测试',
+  TestHelloWorld: '您好，世界',
+  TestApples_: '%d个苹果',
+  TestApples_0: '没有苹果',
+  TestNameApples_: '%s有%d个苹果',
+  TestNameApples_0_1: '%s没有苹果',
+  Order: '订单',
+  OrderNo: '订单号',
+  Remark: '备注',
+  Price: '单价',
+  Quantity: '数量',
+  Amount: '金额'
+};
+
+const locales = {
+  'en-us': locale_en_us,
+  'zh-cn': locale_zh_cn
+};
+function $locale(key) {
+  return `test-vona::${key}`;
+}
+
 var _dec$1p, _dec2$1p, _dec3$D, _dec4$D, _dec5$A, _dec6$z, _dec7$t, _dec8$p, _class$1p, _class2$D, _descriptor$i, _descriptor2$f, _descriptor3$9;
 let EntityOrder = (_dec$1p = Entity('testVonaOrder', {
   openapi: {
@@ -761,7 +807,7 @@ let ServiceCaching = (_dec$11 = Service(), _dec2$11 = BeanInfo({
   cacheKeyFn
 }), _dec7$n = Reflect.metadata("design:type", Function), _dec8$j = Reflect.metadata("design:paramtypes", [Number]), _dec9$c = Caching.get({
   cacheName: 'test-vona:caching',
-  cacheKey: 'cel://args[0]'
+  cacheKey: cel('args[0]')
 }), _dec0$c = Reflect.metadata("design:type", Function), _dec1$c = Reflect.metadata("design:paramtypes", [Number]), _dec10$a = Caching.get({
   cacheName: 'test-vona:caching'
 }), _dec11$a = Reflect.metadata("design:type", Function), _dec12$a = Reflect.metadata("design:paramtypes", [Number]), _dec13$a = Caching.set({
@@ -770,8 +816,8 @@ let ServiceCaching = (_dec$11 = Service(), _dec2$11 = BeanInfo({
   cacheValueFn: 'cacheValue'
 }), _dec14$9 = Reflect.metadata("design:type", Function), _dec15$9 = Reflect.metadata("design:paramtypes", [Number, typeof TSummerCacheTestData === "undefined" ? Object : TSummerCacheTestData]), _dec16$9 = Caching.set({
   cacheName: 'test-vona:caching',
-  cacheKey: 'cel://args[0]',
-  cacheValue: 'cel://{"id": args[1].id, "name": args[1].name}'
+  cacheKey: cel('args[0]'),
+  cacheValue: cel('{"id": args[1].id, "name": args[1].name}')
 }), _dec17$8 = Reflect.metadata("design:type", Function), _dec18$8 = Reflect.metadata("design:paramtypes", [Number, typeof TSummerCacheTestData === "undefined" ? Object : TSummerCacheTestData]), _dec19$8 = Caching.set({
   cacheName: 'test-vona:caching',
   cacheKeyFn: 'cacheKey'
@@ -3124,55 +3170,11 @@ function config(_app) {
   return {};
 }
 
-var locale_en_us = {
-  Name: 'Name',
-  User: 'User',
-  UserId: 'User ID',
-  Test: 'Test',
-  TestHelloWorld: 'Hello World',
-  TestApples_: '%d apples',
-  TestApples_0: 'no apples',
-  TestApples_1: 'one apple',
-  TestNameApples_: '%s has %d apples',
-  TestNameApples_0_1: '%s has no apples',
-  TestNameApples_1_1: '%s has one apple',
-  Order: 'Order',
-  OrderNo: 'Order No',
-  Remark: 'Remark',
-  Price: 'Price',
-  Quantity: 'Quantity',
-  Amount: 'Amount'
-};
-
-var locale_zh_cn = {
-  Name: '名称',
-  User: '用户',
-  UserId: '用户ID',
-  Test: '测试',
-  TestHelloWorld: '您好，世界',
-  TestApples_: '%d个苹果',
-  TestApples_0: '没有苹果',
-  TestNameApples_: '%s有%d个苹果',
-  TestNameApples_0_1: '%s没有苹果',
-  Order: '订单',
-  OrderNo: '订单号',
-  Remark: '备注',
-  Price: '单价',
-  Quantity: '数量',
-  Amount: '金额'
-};
-
 var _dec, _dec2, _class;
-const locales = {
-  'en-us': locale_en_us,
-  'zh-cn': locale_zh_cn
-};
 let ScopeModuleTestVona = (_dec = Scope(), _dec2 = BeanInfo({
   module: "test-vona"
 }), _dec(_class = _dec2(_class = class ScopeModuleTestVona extends BeanScopeBase {}) || _class) || _class);
-function $locale(key) {
-  return `test-vona::${key}`;
-}
+
 /** scope: end */
 
 export { $locale, AopMethodTest, AopRegExp, AopSimple, BeanTestCtx, BroadcastTest, CacheMemTest, CacheRedisPost, CacheRedisTest, ControllerBean, ControllerCacheMem, ControllerCacheRedis, ControllerCaptcha, ControllerDtoTest, ControllerGuardPassport, ControllerOnion, ControllerOrder, ControllerPassport, ControllerPerformAction, ControllerPost, ControllerQueue, ControllerSerializer, ControllerSummer, ControllerTail, ControllerTransaction, ControllerUpload, DtoCategoryTree, DtoOrderCreate, DtoOrderQuery, DtoOrderQueryPage, DtoOrderResult, DtoOrderResultPage, DtoOrderUpdate, DtoPostAggregate, DtoPostCreate, DtoPostGroup, DtoPostQuery, DtoPostQueryRes, DtoProfile, DtoRoleLazy, DtoSerializerArray, DtoSerializerLazy, DtoSerializerSimple, DtoSignin, DtoUser, DtoUserCreate, DtoUserLazy, DtoUserUpdate, EntityCategory, EntityOrder, EntityPost, EntityPostContent, EntityProduct, EntityRole, EntityRoleUser, EntityTest, EntityUser, EventHelloEcho, EventListenerHelloEcho, MetaAsset, MetaStatic, MetaVersion, ModelCategory, ModelCategoryChain, ModelOrder, ModelOrderStats, ModelPost, ModelPostContent, ModelProduct, ModelRole, ModelRoleUser, ModelTest, ModelTestDynamicTable, ModelUser, ModelUserStats, ModelUserStatsGroup, QueueTest, ScheduleTest, ScheduleTest3, ScopeModuleTestVona, SensitiveEmail, SerializerTransformEmail, ServiceAopMethod, ServiceCaching, ServiceCategory, ServiceOrder, ServicePost, ServiceProduct, ServiceTest, ServiceTestApp, ServiceTestClass, ServiceTestData, ServiceTransaction, ServiceUser, SummerCacheCaching, SummerCacheTest, config, locales };

package/package.json

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

package/src/.metadata/index.ts

@@ -2124,12 +2124,7 @@ export * from '../config/config.ts';
 import type { config } from '../config/config.ts';
 /** config: end */
 /** locale: begin */
-import locale_en_us from '../config/locale/en-us.ts';
-import locale_zh_cn from '../config/locale/zh-cn.ts';
-export const locales = {
-  'en-us': locale_en_us,
-'zh-cn': locale_zh_cn,
-};
+import { locales } from './locales.ts'
 /** locale: end */
 /** scope: begin */
 import { BeanScopeBase, type BeanScopeUtil, type TypeModuleConfig, type TypeModuleLocales, type TypeLocaleBase } from 'vona';
@@ -2175,8 +2170,4 @@ declare module 'vona' {
 
   
 }
-
-export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `test-vona::${K}` {
-  return `test-vona::${key}`;
-}
 /** scope: end */

package/src/.metadata/locales.ts

@@ -0,0 +1,12 @@
+import type { TypeLocaleBase } from 'vona';
+import locale_en_us from '../config/locale/en-us.ts';
+import locale_zh_cn from '../config/locale/zh-cn.ts';
+
+export const locales = {
+  'en-us': locale_en_us,
+  'zh-cn': locale_zh_cn,
+};
+
+export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `test-vona::${K}` {
+  return `test-vona::${key}`;
+}

package/src/bean/aop.regExp.ts

@@ -3,7 +3,7 @@ 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' } })
+@Aop({ match: [/^test-vona\.service\.test\w+$/, 'testCtx'], meta: { mode: ['test', 'dev'] } })
 export class AopRegExp extends BeanAopBase {
   protected __get_name__: AopActionGetter<BeanTestCtx, 'name'> = function (next, _receiver) {
     const value = next();

package/src/bean/aop.simple.ts

@@ -16,7 +16,7 @@ class AopSimpleBase extends BeanAopBase {
   };
 }
 
-@Aop({ match: 'testCtx', dependencies: 'test-vona:regExp', meta: { mode: 'test' } })
+@Aop({ match: 'testCtx', dependencies: 'test-vona:regExp', meta: { mode: ['test', 'dev'] } })
 export class AopSimple extends AopSimpleBase {
   protected __get__: AopActionGet<BeanTestCtx> = (prop, next, _receiver) => {
     const value = next();

package/src/controller/onion.ts

@@ -6,7 +6,7 @@ import { Api, v } from 'vona-module-a-openapiutils';
 import { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 import { z } from 'zod';
-import { $locale } from '../.metadata/index.ts';
+import { $locale } from '../.metadata/locales.ts';
 import { DtoUser } from '../dto/user.ts';
 
 export interface IControllerOptionsOnion extends IDecoratorControllerOptions {}

package/src/dto/user.ts

@@ -2,7 +2,7 @@ import type { TableIdentity } from 'table-identity';
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
-import { $locale } from '../.metadata/index.ts';
+import { $locale } from '../.metadata/locales.ts';
 
 export interface IDtoOptionsUser extends IDecoratorDtoOptions {}
 

package/src/entity/order.ts

@@ -2,7 +2,7 @@ import type { TableIdentity } from 'table-identity';
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
 import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
-import { $locale } from '../.metadata/index.ts';
+import { $locale } from '../.metadata/locales.ts';
 
 export interface IEntityOptionsOrder extends IDecoratorEntityOptions {}
 

package/src/entity/product.ts

@@ -2,7 +2,7 @@ import type { TableIdentity } from 'table-identity';
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
 import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
-import { $locale } from '../.metadata/index.ts';
+import { $locale } from '../.metadata/locales.ts';
 
 export interface IEntityOptionsProduct extends IDecoratorEntityOptions {}
 

package/src/entity/test.ts

@@ -1,7 +1,7 @@
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
 import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
-import { $locale } from '../.metadata/index.ts';
+import { $locale } from '../.metadata/locales.ts';
 
 export interface IEntityOptionsTest extends IDecoratorEntityOptions {}
 

package/src/index.ts

@@ -1,3 +1,4 @@
 export * from './.metadata/index.ts';
+export * from './.metadata/locales.ts';
 export * from './lib/index.ts';
 export * from './types/index.ts';

package/src/service/caching.ts

@@ -1,5 +1,6 @@
 import type { ICachingActionKeyInfo, ICachingActionValueInfo, TypeCachingActionOptions } from 'vona-module-a-caching';
 import type { TSummerCacheTestData } from '../bean/summerCache.test.ts';
+import { cel } from '@cabloy/utils';
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
 import { Caching } from 'vona-module-a-caching';
@@ -31,7 +32,7 @@ export class ServiceCaching extends BeanBase {
     return undefined as any;
   }
 
-  @Caching.get({ cacheName: 'test-vona:caching', cacheKey: 'cel://args[0]' })
+  @Caching.get({ cacheName: 'test-vona:caching', cacheKey: cel('args[0]') })
   async get3(_id: number): Promise<TSummerCacheTestData> {
     return undefined as any;
   }
@@ -48,7 +49,7 @@ export class ServiceCaching extends BeanBase {
   }
 
   //
-  @Caching.set({ cacheName: 'test-vona:caching', cacheKey: 'cel://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
   }

package/test/utils/celjs.test.ts

@@ -1,6 +1,6 @@
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
-import { evaluateExpressions } from '@cabloy/utils';
+import { cel, evaluateExpressions } from '@cabloy/utils';
 import { cast } from 'vona';
 import { app } from 'vona-mock';
 
@@ -9,18 +9,18 @@ describe('celjs.test.ts', () => {
     await app.bean.executor.mockCtx(async () => {
       //
       const beanJwt = app.bean.jwt;
-      assert.equal(evaluateExpressions('cel://self.app.config.server.workers', { self: beanJwt, app: cast(beanJwt).app, ctx: cast(beanJwt).ctx }) > 0, true);
-      assert.equal(evaluateExpressions('cel://app.config.server.workers', { self: beanJwt, app: cast(beanJwt).app, ctx: cast(beanJwt).ctx }) > 0, true);
-      assert.equal(evaluateExpressions('cel://ctx.app.config.server.workers', { self: beanJwt, app: cast(beanJwt).app, ctx: cast(beanJwt).ctx }) > 0, true);
+      assert.equal(evaluateExpressions(cel('self.app.config.server.workers'), { self: beanJwt, app: cast(beanJwt).app, ctx: cast(beanJwt).ctx }) > 0, true);
+      assert.equal(evaluateExpressions(cel('app.config.server.workers'), { self: beanJwt, app: cast(beanJwt).app, ctx: cast(beanJwt).ctx }) > 0, true);
+      assert.equal(evaluateExpressions(cel('ctx.app.config.server.workers'), { self: beanJwt, app: cast(beanJwt).app, ctx: cast(beanJwt).ctx }) > 0, true);
       // map
-      assert.deepEqual(evaluateExpressions('cel://{"a": 1, "b": true}'), { a: 1, b: true });
-      assert.deepEqual(evaluateExpressions('cel://{"id": 1, "name": "tom"}'), { id: 1, name: 'tom' });
+      assert.deepEqual(evaluateExpressions(cel('{"a": 1, "b": true}')), { a: 1, b: true });
+      assert.deepEqual(evaluateExpressions(cel('{"id": 1, "name": "tom"}')), { id: 1, name: 'tom' });
       // array
-      assert.deepEqual(evaluateExpressions('cel://concat(1,[2,3],4)'), [1, 2, 3, 4]);
-      assert.deepEqual(evaluateExpressions('cel://join(concat(1,[2,3],4),"_")'), '1_2_3_4');
+      assert.deepEqual(evaluateExpressions(cel('concat(1,[2,3],4)')), [1, 2, 3, 4]);
+      assert.deepEqual(evaluateExpressions(cel('join(concat(1,[2,3],4),"_")')), '1_2_3_4');
       // +
-      assert.equal(evaluateExpressions('cel://1+"a"'), '1a');
-      assert.equal(evaluateExpressions('cel://"a"+1'), 'a1');
+      assert.equal(evaluateExpressions(cel('1+"a"')), '1a');
+      assert.equal(evaluateExpressions(cel('"a"+1')), 'a1');
     });
   });
 });