vona-module-test-vona 5.0.86 → 5.0.87

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"
@@ -761,7 +761,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 +770,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'

package/package.json

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

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/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');
     });
   });
 });