vona-module-test-vona 5.0.89 → 5.0.91

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,7 +1,7 @@
-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, $tableName } from 'vona-module-a-orm';
+import { Entity, EntityBase, Model, $relation, BeanModelBase, $relationDynamic, $Dto } from 'vona-module-a-orm';
 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';
@@ -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;
@@ -1840,13 +1840,13 @@ var _dec$B, _dec2$B, _dec3$r, _dec4$r, _class$B, _class2$r, _descriptor$a;
 let DtoOrderQuery = (_dec$B = Dto({
   openapi: {
     filter: {
-      table: $tableName(EntityOrder)
+      table: 'testVonaOrder'
     }
   }
 }), _dec2$B = BeanInfo({
   module: "test-vona"
 }), _dec3$r = Api.field(v.filter({
-  table: $tableName(EntityUser),
+  table: 'testVonaUser',
   joinType: 'innerJoin',
   joinOn: ['userId', 'testVonaUser.id'],
   originalName: 'name'
@@ -1928,7 +1928,7 @@ var _dec$t, _dec2$t, _dec3$p, _dec4$p, _dec5$p, _dec6$p, _dec7$l, _dec8$h, _clas
 let DtoPostQuery = (_dec$t = Dto({
   openapi: {
     filter: {
-      table: $tableName(EntityPost)
+      table: 'testVonaPost'
     }
   }
 }), _dec2$t = BeanInfo({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-test-vona",
   "type": "module",
-  "version": "5.0.89",
+  "version": "5.0.91",
   "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/src/dto/orderQuery.ts

@@ -1,20 +1,19 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 import { Api, v } from 'vona-module-a-openapiutils';
-import { $Dto, $tableName } from 'vona-module-a-orm';
+import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import { EntityOrder } from '../entity/order.ts';
-import { EntityUser } from '../entity/user.ts';
 
 export interface IDtoOptionsOrderQuery extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsOrderQuery>({
-  openapi: { filter: { table: $tableName(EntityOrder) } },
+  openapi: { filter: { table: 'testVonaOrder' } },
 })
 export class DtoOrderQuery
   extends $Dto.query(EntityOrder, ['orderNo', 'remark']) {
   @Api.field(
     v.filter({
-      table: $tableName(EntityUser),
+      table: 'testVonaUser',
       joinType: 'innerJoin',
       joinOn: ['userId', 'testVonaUser.id'],
       originalName: 'name',

package/src/dto/postQuery.ts

@@ -1,13 +1,13 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 import { Api, v } from 'vona-module-a-openapiutils';
-import { $Dto, $tableName } from 'vona-module-a-orm';
+import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import { EntityPost } from '../entity/post.ts';
 
 export interface IDtoOptionsPostQuery extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsPostQuery>({
-  openapi: { filter: { table: $tableName(EntityPost) } },
+  openapi: { filter: { table: 'testVonaPost' } },
 })
 export class DtoPostQuery extends $Dto.queryPage(EntityPost, ['title']) {
   @Api.field(v.optional())

package/test/queue.test.ts

@@ -4,8 +4,8 @@ import { app } from 'vona-mock';
 describe('queue.test.ts', () => {
   it('action:queue', async () => {
     await app.bean.executor.mockCtx(async () => {
-      await app.bean.executor.performAction('post', '/test/vona/queue/pushAsync');
       await app.bean.executor.performAction('post', '/test/vona/queue/push');
+      await app.bean.executor.performAction('post', '/test/vona/queue/pushAsync');
     });
   });
 });