vona-module-test-vona 5.0.67 → 5.0.68

package/dist/index.js

@@ -1,13 +1,14 @@
 import { BeanInfo, BeanAopBase, BeanAopMethodBase, BeanBase, $Class, cast, retry, BeanScopeBase } from 'vona';
 import { Aop, AopMethod, Aspect } from 'vona-module-a-aspect';
 import { Api, v } from 'vona-module-a-openapi';
-import { Entity, EntityBase, Model, $relation, BeanModelBase, $relationDynamic, Database, $Dto, $tableName } from 'vona-module-a-orm';
+import { Entity, EntityBase, Model, $relation, BeanModelBase, $relationDynamic, $Dto, $tableName } from 'vona-module-a-orm';
 import { ModelCategoryChain as ModelCategoryChain$1, ModelOrder as ModelOrder$1 } from 'vona-module-test-vona';
 import moment from 'moment';
 import { Bean, Service, Scope } from 'vona-module-a-bean';
 import { getKeyHash, CacheMem, BeanCacheMemBase, CacheRedis, BeanCacheRedisBase } from 'vona-module-a-cache';
 import { Caching } from 'vona-module-a-caching';
 import assert from 'node:assert';
+import { Core } from 'vona-module-a-core';
 import { Broadcast, BeanBroadcastBase } from 'vona-module-a-broadcast';
 import { Event, BeanEventBase, EventListener } from 'vona-module-a-event';
 import { Meta } from 'vona-module-a-meta';
@@ -19,10 +20,8 @@ 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 { Captcha } from 'vona-module-a-captcha';
-import { Core } from 'vona-module-a-core';
 import { DtoJwtToken } from 'vona-module-a-jwt';
-import { File, SymbolUploadValue } from 'vona-module-a-upload';
+import { SymbolUploadValue } from 'vona-module-a-upload';
 
 var _dec$1q, _dec2$1q, _class$1q;
 let AopRegExp = (_dec$1q = Aop({
@@ -1045,7 +1044,7 @@ let ServiceOrder = (_dec$Y = Service(), _dec2$Y = BeanInfo({
 var _dec$X, _dec2$X, _dec3$t, _dec4$t, _dec5$q, _class$X, _class2$t;
 let ServicePost = (_dec$X = Service(), _dec2$X = BeanInfo({
   module: "test-vona"
-}), _dec3$t = Database.transaction(), _dec4$t = Reflect.metadata("design:type", Function), _dec5$q = Reflect.metadata("design:paramtypes", []), _dec$X(_class$X = _dec2$X(_class$X = (_class2$t = class ServicePost extends BeanBase {
+}), _dec3$t = Core.transaction(), _dec4$t = Reflect.metadata("design:type", Function), _dec5$q = Reflect.metadata("design:paramtypes", []), _dec$X(_class$X = _dec2$X(_class$X = (_class2$t = class ServicePost extends BeanBase {
   async findMany(params) {
     return await this.scope.model.post.selectAndCount({
       ...params,
@@ -1438,7 +1437,7 @@ const tableNameFail$1 = '__tempTransactionFail';
 const tableNameSuccess$1 = '__tempTransactionSuccess';
 let ServiceTransaction = (_dec$R = Service(), _dec2$R = BeanInfo({
   module: "test-vona"
-}), _dec3$s = Database.transaction(), _dec4$s = Reflect.metadata("design:type", Function), _dec5$p = Reflect.metadata("design:paramtypes", [Object]), _dec6$p = Database.transaction(), _dec7$l = Reflect.metadata("design:type", Function), _dec8$h = Reflect.metadata("design:paramtypes", [Object]), _dec$R(_class$R = _dec2$R(_class$R = (_class2$s = class ServiceTransaction extends BeanBase {
+}), _dec3$s = Core.transaction(), _dec4$s = Reflect.metadata("design:type", Function), _dec5$p = Reflect.metadata("design:paramtypes", [Object]), _dec6$p = Core.transaction(), _dec7$l = Reflect.metadata("design:type", Function), _dec8$h = Reflect.metadata("design:paramtypes", [Object]), _dec$R(_class$R = _dec2$R(_class$R = (_class2$s = class ServiceTransaction extends BeanBase {
   async fail(item) {
     await this.bean.model.update(`${tableNameFail$1}`, item);
     await this.bean.model.update(`${tableNameFail$1}error`, item);
@@ -2459,7 +2458,7 @@ let ControllerCaptcha = (_dec$e = Controller({
   }
 }), _dec2$e = BeanInfo({
   module: "test-vona"
-}), _dec3$d = Web.post('signin'), _dec4$d = Passport.public(), _dec5$d = Captcha.verify({
+}), _dec3$d = Web.post('signin'), _dec4$d = Passport.public(), _dec5$d = Core.captchaVerify({
   scene: 'a-captchasimple:simple'
 }), _dec6$d = function (target, key) {
   return Arg.body()(target, key, 0);
@@ -2560,7 +2559,7 @@ let ControllerOnion = (_dec$b = Controller({
 }), _dec10$6 = Aspect.aopMethod('a-orm:transaction', {
   isolationLevel: 'SERIALIZABLE',
   readOnly: true
-}), _dec11$6 = Database.transaction({
+}), _dec11$6 = Core.transaction({
   isolationLevel: 'READ_COMMITTED',
   readOnly: false
 }), _dec12$6 = Api.body(v.optional(), z$1.string()), _dec13$6 = function (target, key) {
@@ -3031,9 +3030,9 @@ let ControllerTransaction = (_dec$2 = Controller({
   }
 }), _dec2$2 = Api.exclude(), _dec3$1 = BeanInfo({
   module: "test-vona"
-}), _dec4$1 = Web.post('fail'), _dec5$1 = Database.transaction(), _dec6$1 = Passport.public(), _dec7$1 = function (target, key) {
+}), _dec4$1 = Web.post('fail'), _dec5$1 = Core.transaction(), _dec6$1 = Passport.public(), _dec7$1 = function (target, key) {
   return Arg.body()(target, key, 0);
-}, _dec8$1 = Reflect.metadata("design:type", Function), _dec9$1 = Reflect.metadata("design:paramtypes", [Object]), _dec0$1 = Web.post('success'), _dec1$1 = Database.transaction(), _dec10$1 = Passport.public(), _dec11$1 = function (target, key) {
+}, _dec8$1 = Reflect.metadata("design:type", Function), _dec9$1 = Reflect.metadata("design:paramtypes", [Object]), _dec0$1 = Web.post('success'), _dec1$1 = Core.transaction(), _dec10$1 = Passport.public(), _dec11$1 = function (target, key) {
   return Arg.body()(target, key, 0);
 }, _dec12$1 = Reflect.metadata("design:type", Function), _dec13$1 = Reflect.metadata("design:paramtypes", [Object]), _dec$2(_class$2 = _dec2$2(_class$2 = _dec3$1(_class$2 = (_class2$1 = class ControllerTransaction extends BeanBase {
   async fail(item) {
@@ -3053,17 +3052,17 @@ let ControllerUpload = (_dec$1 = Controller({
   }
 }), _dec2$1 = BeanInfo({
   module: "test-vona"
-}), _dec3 = Web.post('fields'), _dec4 = Passport.public(), _dec5 = File.upload(), _dec6 = Api.contentType('application/json'), _dec7 = function (target, key) {
+}), _dec3 = Web.post('fields'), _dec4 = Passport.public(), _dec5 = Core.fileUpload(), _dec6 = Api.contentType('application/json'), _dec7 = function (target, key) {
   return Arg.fields()(target, key, 0);
 }, _dec8 = function (target, key) {
   return Arg.fields('checkes', v.array(z$1.string()))(target, key, 1);
 }, _dec9 = function (target, key) {
   return Arg.field('name', v.default('zhennann'), v.title('your name'))(target, key, 2);
-}, _dec0 = Reflect.metadata("design:type", Function), _dec1 = Reflect.metadata("design:paramtypes", [Array, Array, String]), _dec10 = Web.post('file'), _dec11 = Passport.public(), _dec12 = File.upload(), _dec13 = Api.contentType('application/json'), _dec14 = function (target, key) {
+}, _dec0 = Reflect.metadata("design:type", Function), _dec1 = Reflect.metadata("design:paramtypes", [Array, Array, String]), _dec10 = Web.post('file'), _dec11 = Passport.public(), _dec12 = Core.fileUpload(), _dec13 = Api.contentType('application/json'), _dec14 = function (target, key) {
   return Arg.field('name', v.default('zhennann'))(target, key, 0);
 }, _dec15 = function (target, key) {
   return Arg.file('welcome')(target, key, 1);
-}, _dec16 = Reflect.metadata("design:type", Function), _dec17 = Reflect.metadata("design:paramtypes", [String, typeof IUploadFile === "undefined" ? Object : IUploadFile]), _dec18 = Web.post('files'), _dec19 = Passport.public(), _dec20 = File.upload(), _dec21 = Api.contentType('application/json'), _dec22 = function (target, key) {
+}, _dec16 = Reflect.metadata("design:type", Function), _dec17 = Reflect.metadata("design:paramtypes", [String, typeof IUploadFile === "undefined" ? Object : IUploadFile]), _dec18 = Web.post('files'), _dec19 = Passport.public(), _dec20 = Core.fileUpload(), _dec21 = Api.contentType('application/json'), _dec22 = function (target, key) {
   return Arg.files(v.title('more files'))(target, key, 0);
 }, _dec23 = function (target, key) {
   return Arg.files('images', v.title('images'))(target, key, 1);

package/package.json

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

package/src/controller/captcha.ts

@@ -1,6 +1,6 @@
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import { BeanBase } from 'vona';
-import { Captcha } from 'vona-module-a-captcha';
+import { Core } from 'vona-module-a-core';
 import { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 import { DtoSignin } from '../dto/signin.ts';
@@ -11,7 +11,7 @@ export interface IControllerOptionsCaptcha extends IDecoratorControllerOptions {
 export class ControllerCaptcha extends BeanBase {
   @Web.post('signin')
   @Passport.public()
-  @Captcha.verify({ scene: 'a-captchasimple:simple' })
+  @Core.captchaVerify({ scene: 'a-captchasimple:simple' })
   async signin(@Arg.body() _user: DtoSignin) {
   }
 }

package/src/controller/onion.ts

@@ -3,7 +3,6 @@ import { BeanBase } from 'vona';
 import { Aspect } from 'vona-module-a-aspect';
 import { Core } from 'vona-module-a-core';
 import { Api, v } from 'vona-module-a-openapi';
-import { Database } from 'vona-module-a-orm';
 import { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 import { z } from 'zod';
@@ -27,7 +26,7 @@ export class ControllerOnion extends BeanBase {
   @Aspect.middlewareGlobal('a-core:gate', { gate: { mode: 'dev' } })
   @Core.gate({ gate: { mode: 'dev' } })
   @Aspect.aopMethod('a-orm:transaction', { isolationLevel: 'SERIALIZABLE', readOnly: true })
-  @Database.transaction({ isolationLevel: 'READ_COMMITTED', readOnly: false })
+  @Core.transaction({ isolationLevel: 'READ_COMMITTED', readOnly: false })
   @Api.body(v.optional(), z.string())
   echo(
     @Arg.query('id', v.default(0), z.number()) id: number,

package/src/controller/transaction.ts

@@ -1,7 +1,7 @@
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import { BeanBase } from 'vona';
+import { Core } from 'vona-module-a-core';
 import { Api } from 'vona-module-a-openapi';
-import { Database } from 'vona-module-a-orm';
 import { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 
@@ -13,7 +13,7 @@ export interface IControllerOptionsTransaction extends IDecoratorControllerOptio
 @Api.exclude()
 export class ControllerTransaction extends BeanBase {
   @Web.post('fail')
-  @Database.transaction()
+  @Core.transaction()
   @Passport.public()
   async fail(@Arg.body() item: object) {
     await this.bean.model.update(`${tableNameFail}` as any, item);
@@ -21,7 +21,7 @@ export class ControllerTransaction extends BeanBase {
   }
 
   @Web.post('success')
-  @Database.transaction()
+  @Core.transaction()
   @Passport.public()
   async success(@Arg.body() item: object) {
     await this.bean.model.update(tableNameSuccess as any, item);

package/src/controller/upload.ts

@@ -2,8 +2,9 @@ import type { IUploadField, IUploadFile } from 'vona-module-a-upload';
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import assert from 'node:assert';
 import { BeanBase } from 'vona';
+import { Core } from 'vona-module-a-core';
 import { Api, v } from 'vona-module-a-openapi';
-import { File, SymbolUploadValue } from 'vona-module-a-upload';
+import { SymbolUploadValue } from 'vona-module-a-upload';
 import { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 import { z } from 'zod';
@@ -14,7 +15,7 @@ export interface IControllerOptionsUpload extends IDecoratorControllerOptions {}
 export class ControllerUpload extends BeanBase {
   @Web.post('fields')
   @Passport.public()
-  @File.upload()
+  @Core.fileUpload()
   @Api.contentType('application/json')
   fields(
     @Arg.fields() fields: IUploadField[],
@@ -29,7 +30,7 @@ export class ControllerUpload extends BeanBase {
 
   @Web.post('file')
   @Passport.public()
-  @File.upload()
+  @Core.fileUpload()
   @Api.contentType('application/json')
   file(@Arg.field('name', v.default('zhennann')) name: string, @Arg.file('welcome') file: IUploadFile) {
     assert.equal(name, 'zhennann');
@@ -39,7 +40,7 @@ export class ControllerUpload extends BeanBase {
 
   @Web.post('files')
   @Passport.public()
-  @File.upload()
+  @Core.fileUpload()
   @Api.contentType('application/json')
   files(
     @Arg.files(v.title('more files')) files: IUploadFile[],

package/src/service/post.ts

@@ -2,7 +2,8 @@ import type { TableIdentity } from 'table-identity';
 import type { IQueryParams } from 'vona-module-a-orm';
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
-import { $relationDynamic, Database } from 'vona-module-a-orm';
+import { Core } from 'vona-module-a-core';
+import { $relationDynamic } from 'vona-module-a-orm';
 import { ModelPost } from '../model/post.ts';
 import { ModelPostContent } from '../model/postContent.ts';
 
@@ -118,7 +119,7 @@ export class ServicePost extends BeanBase {
     console.log(post?.postContent?.id);
   }
 
-  @Database.transaction()
+  @Core.transaction()
   async transaction() {
     // insert
     const post = await this.scope.model.post.insert({

package/src/service/transaction.ts

@@ -1,19 +1,19 @@
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
-import { Database } from 'vona-module-a-orm';
+import { Core } from 'vona-module-a-core';
 
 const tableNameFail = '__tempTransactionFail';
 const tableNameSuccess = '__tempTransactionSuccess';
 
 @Service()
 export class ServiceTransaction extends BeanBase {
-  @Database.transaction()
+  @Core.transaction()
   async fail(item: object) {
     await this.bean.model.update(`${tableNameFail}` as any, item);
     await this.bean.model.update(`${tableNameFail}error` as any, item);
   }
 
-  @Database.transaction()
+  @Core.transaction()
   async success(item: object) {
     await this.bean.model.update(tableNameSuccess as any, item);
   }