vona-module-test-vona 5.0.90 → 5.0.92

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

@@ -126,15 +126,15 @@ export type EntityTestMeta = TypeEntityMeta<EntityTest, EntityTestTableName>;
 export type EntityUserMeta = TypeEntityMeta<EntityUser, EntityUserTableName>;
 declare module 'vona-module-a-orm' {
     interface ITableRecord {
-        'testVonaCategory': never;
-        'testVonaOrder': never;
-        'testVonaPost': never;
-        'testVonaPostContent': never;
-        'testVonaProduct': never;
-        'testVonaRole': never;
-        'testVonaRoleUser': never;
-        'testVonaTest': never;
-        'testVonaUser': never;
+        'testVonaCategory': EntityCategoryMeta;
+        'testVonaOrder': EntityOrderMeta;
+        'testVonaPost': EntityPostMeta;
+        'testVonaPostContent': EntityPostContentMeta;
+        'testVonaProduct': EntityProductMeta;
+        'testVonaRole': EntityRoleMeta;
+        'testVonaRoleUser': EntityRoleUserMeta;
+        'testVonaTest': EntityTestMeta;
+        'testVonaUser': EntityUserMeta;
     }
 }
 declare module 'vona-module-test-vona' {

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

@@ -37,4 +37,4 @@ export declare const locales: {
         Amount: string;
     };
 };
-export declare function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `test-vona::${K}`;
+export declare function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): import("vona").ILocaleMagic<`test-vona::${K}`>;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { BeanInfo, BeanAopBase, BeanAopMethodBase, BeanBase, $Class, cast, retry, BeanScopeBase } from 'vona';
+import { BeanInfo, BeanAopBase, BeanAopMethodBase, $makeLocaleMagic, BeanBase, $Class, cast, retry, BeanScopeBase } from 'vona';
 import { Aop, AopMethod, Aspect } from 'vona-module-a-aspect';
 import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase, Model, $relation, BeanModelBase, $relationDynamic, $Dto } from 'vona-module-a-orm';
@@ -242,7 +242,7 @@ const locales = {
   'zh-cn': locale_zh_cn
 };
 function $locale(key) {
-  return `test-vona::${key}`;
+  return $makeLocaleMagic(`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;

package/package.json

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

package/src/.metadata/index.ts

@@ -150,15 +150,15 @@ export type EntityTestMeta=TypeEntityMeta<EntityTest,EntityTestTableName>;
 export type EntityUserMeta=TypeEntityMeta<EntityUser,EntityUserTableName>;
 declare module 'vona-module-a-orm' {
   export interface ITableRecord {
-    'testVonaCategory': never;
-'testVonaOrder': never;
-'testVonaPost': never;
-'testVonaPostContent': never;
-'testVonaProduct': never;
-'testVonaRole': never;
-'testVonaRoleUser': never;
-'testVonaTest': never;
-'testVonaUser': never;
+    'testVonaCategory': EntityCategoryMeta;
+'testVonaOrder': EntityOrderMeta;
+'testVonaPost': EntityPostMeta;
+'testVonaPostContent': EntityPostContentMeta;
+'testVonaProduct': EntityProductMeta;
+'testVonaRole': EntityRoleMeta;
+'testVonaRoleUser': EntityRoleUserMeta;
+'testVonaTest': EntityTestMeta;
+'testVonaUser': EntityUserMeta;
   }
 }
 declare module 'vona-module-test-vona' {

package/src/.metadata/locales.ts

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

package/test/utils/celjs.test.ts

@@ -1,17 +1,13 @@
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
 import { cel, evaluateExpressions } from '@cabloy/utils';
-import { cast } from 'vona';
 import { app } from 'vona-mock';
 
 describe('celjs.test.ts', () => {
   it('action:celjs', async () => {
     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('app.config.server.workers'), { app: { ...app } }) > 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' });
@@ -21,6 +17,11 @@ describe('celjs.test.ts', () => {
       // +
       assert.equal(evaluateExpressions(cel('1+"a"')), '1a');
       assert.equal(evaluateExpressions(cel('"a"+1')), 'a1');
+      // optional
+      assert.equal(evaluateExpressions(cel('a.?b.hasValue()'), { a: {} }), false);
+      assert.equal(evaluateExpressions(cel('a.?b.value()'), { a: { b: 1 } }), 1);
+      assert.equal(evaluateExpressions(cel('get(a, "b.c")'), { a: { b: 1 } }), undefined);
+      assert.equal(evaluateExpressions(cel('get(a, "b.c")'), { a: { b: { c: 1 } } }), 1);
     });
   });
 });