vona-module-test-vona 5.0.24 → 5.0.27

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

@@ -52,6 +52,11 @@ export interface IModuleEntity {
 /** entity: end */
 /** entity: begin */
 export type EntityTestTableName = 'testVona';
+declare module 'vona-module-a-database' {
+    interface ITableRecord {
+        'testVona': never;
+    }
+}
 declare module 'vona-module-test-vona' {
     interface IEntityOptionsTest {
         fields?: TypeEntityOptionsFields<EntityTest, IEntityOptionsTest['_fieldsMore_']>;
@@ -60,21 +65,27 @@ declare module 'vona-module-test-vona' {
 /** entity: end */
 /** model: begin */
 export * from '../model/test.ts';
+export * from '../model/testDynamicTable.ts';
 import { type IDecoratorModelOptions } from 'vona-module-a-database';
 declare module 'vona-module-a-database' {
     interface IModelRecord {
         'test-vona:test': IDecoratorModelOptions;
+        'test-vona:testDynamicTable': IDecoratorModelOptions;
     }
 }
 declare module 'vona-module-test-vona' {
     interface ModelTest {
     }
+    interface ModelTestDynamicTable {
+    }
 }
 /** model: end */
 /** model: begin */
 import type { ModelTest } from '../model/test.ts';
+import type { ModelTestDynamicTable } from '../model/testDynamicTable.ts';
 export interface IModuleModel {
     'test': ModelTest;
+    'testDynamicTable': ModelTestDynamicTable;
 }
 /** model: end */
 /** bean: begin */

package/dist/index.js

@@ -2,6 +2,7 @@ import { BeanInfo, BeanAopBase, BeanAopMethodBase, BeanBase, cast, retry, BeanSc
 import { Aop, AopMethod, Aspect } from 'vona-module-a-aspect';
 import { Entity, EntityBase, Model, BeanModelBase, Database } from 'vona-module-a-database';
 import { Api, v, Arg } from 'vona-module-a-openapi';
+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';
@@ -20,15 +21,15 @@ import { z } from 'zod';
 import { DtoJwtToken } from 'vona-module-a-jwt';
 import { SymbolUploadValue } from 'vona-module-a-upload';
 
-var _dec$A, _dec2$A, _class$A;
-let AopRegExp = (_dec$A = Aop({
+var _dec$B, _dec2$B, _class$B;
+let AopRegExp = (_dec$B = Aop({
   match: [/^test-vona\.service\.test\w+$/, 'testCtx'],
   meta: {
     mode: 'test'
   }
-}), _dec2$A = BeanInfo({
+}), _dec2$B = BeanInfo({
   module: "test-vona"
-}), _dec$A(_class$A = _dec2$A(_class$A = class AopRegExp extends BeanAopBase {
+}), _dec$B(_class$B = _dec2$B(_class$B = class AopRegExp extends BeanAopBase {
   __get_name__(next) {
     const value = next();
     return `${value}:regexpaop`;
@@ -50,24 +51,24 @@ let AopRegExp = (_dec$A = Aop({
     const result = await next();
     return `${result}:regexpaop`;
   }
-}) || _class$A) || _class$A);
+}) || _class$B) || _class$B);
 
-var _dec$z, _dec2$z, _class$z;
+var _dec$A, _dec2$A, _class$A;
 class AopSimpleBase extends BeanAopBase {
   actionSync(_args, next) {
     const result = next();
     return `${result}:simpleaop`;
   }
 }
-let AopSimple = (_dec$z = Aop({
+let AopSimple = (_dec$A = Aop({
   match: 'testCtx',
   dependencies: 'test-vona:regExp',
   meta: {
     mode: 'test'
   }
-}), _dec2$z = BeanInfo({
+}), _dec2$A = BeanInfo({
   module: "test-vona"
-}), _dec$z(_class$z = _dec2$z(_class$z = class AopSimple extends AopSimpleBase {
+}), _dec$A(_class$A = _dec2$A(_class$A = class AopSimple extends AopSimpleBase {
   // magic
   __get__(prop, next) {
     const value = next();
@@ -107,14 +108,14 @@ let AopSimple = (_dec$z = Aop({
     const result = await next();
     return `${result}:simpleaop`;
   }
-}) || _class$z) || _class$z);
+}) || _class$A) || _class$A);
 
-var _dec$y, _dec2$y, _class$y;
-let AopMethodTest = (_dec$y = AopMethod({
+var _dec$z, _dec2$z, _class$z;
+let AopMethodTest = (_dec$z = AopMethod({
   wrapper: ''
-}), _dec2$y = BeanInfo({
+}), _dec2$z = BeanInfo({
   module: "test-vona"
-}), _dec$y(_class$y = _dec2$y(_class$y = class AopMethodTest extends BeanAopMethodBase {
+}), _dec$z(_class$z = _dec2$z(_class$z = class AopMethodTest extends BeanAopMethodBase {
   get(options, next, _receiver, _prop) {
     const res = next();
     return this._wrapper(options.wrapper, res);
@@ -141,7 +142,7 @@ let AopMethodTest = (_dec$y = AopMethod({
     if (index === data.length - wrapper.length) data = data.substring(0, index);
     return data;
   }
-}) || _class$y) || _class$y);
+}) || _class$z) || _class$z);
 
 function _applyDecoratedDescriptor(i, e, r, n, l) {
   var a = {};
@@ -160,10 +161,10 @@ function _initializerDefineProperty(e, i, r, l) {
   });
 }
 
-var _dec$x, _dec2$x, _dec3$h, _dec4$h, _dec5$h, _dec6$h, _class$x, _class2$h, _descriptor$2, _descriptor2$2;
-let EntityTest = (_dec$x = Entity('testVona'), _dec2$x = BeanInfo({
+var _dec$y, _dec2$y, _dec3$h, _dec4$h, _dec5$h, _dec6$h, _class$y, _class2$h, _descriptor$2, _descriptor2$2;
+let EntityTest = (_dec$y = Entity('testVona'), _dec2$y = BeanInfo({
   module: "test-vona"
-}), _dec3$h = Api.field(), _dec4$h = Reflect.metadata("design:type", String), _dec5$h = Api.field(), _dec6$h = Reflect.metadata("design:type", String), _dec$x(_class$x = _dec2$x(_class$x = (_class2$h = class EntityTest extends EntityBase {
+}), _dec3$h = Api.field(), _dec4$h = Reflect.metadata("design:type", String), _dec5$h = Api.field(), _dec6$h = Reflect.metadata("design:type", String), _dec$y(_class$y = _dec2$y(_class$y = (_class2$h = class EntityTest extends EntityBase {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "title", _descriptor$2, this);
@@ -179,15 +180,26 @@ let EntityTest = (_dec$x = Entity('testVona'), _dec2$x = BeanInfo({
   enumerable: true,
   writable: true,
   initializer: null
-}), _class2$h)) || _class$x) || _class$x);
+}), _class2$h)) || _class$y) || _class$y);
 
-var _dec$w, _dec2$w, _class$w;
-let ModelTest = (_dec$w = Model({
+var _dec$x, _dec2$x, _class$x;
+let ModelTest = (_dec$x = Model({
   entity: EntityTest,
   clientName: 'default'
+}), _dec2$x = BeanInfo({
+  module: "test-vona"
+}), _dec$x(_class$x = _dec2$x(_class$x = class ModelTest extends BeanModelBase {}) || _class$x) || _class$x);
+
+var _dec$w, _dec2$w, _class$w;
+let ModelTestDynamicTable = (_dec$w = Model({
+  entity: EntityTest,
+  table(ctx, defaultTable) {
+    if (ctx.instanceName !== '') return defaultTable;
+    return `${defaultTable}_${moment().format('YYYYMMDD')}`;
+  }
 }), _dec2$w = BeanInfo({
   module: "test-vona"
-}), _dec$w(_class$w = _dec2$w(_class$w = class ModelTest extends BeanModelBase {}) || _class$w) || _class$w);
+}), _dec$w(_class$w = _dec2$w(_class$w = class ModelTestDynamicTable extends BeanModelBase {}) || _class$w) || _class$w);
 
 var _dec$v, _dec2$v, _class$v;
 class TestCtx0 extends BeanBase {
@@ -315,7 +327,7 @@ let ServiceCaching = (_dec$t = Service(), _dec2$t = BeanInfo({
 }), _dec7$e = Reflect.metadata("design:type", Function), _dec8$a = Reflect.metadata("design:paramtypes", [Number]), _dec9$7 = Caching.get({
   cacheName: 'test-vona:test',
   cacheProp: 'test',
-  cacheKey: '#!#get(self,"$beanFullName")+"_"+options.cacheProp+"_"+hashkey(args)'
+  cacheKey: 'cel://join([get(self,"$beanFullName"),options.cacheProp,hashkey(args)],"_")'
 }), _dec0$7 = Reflect.metadata("design:type", Function), _dec1$7 = Reflect.metadata("design:paramtypes", [Number]), _dec10$5 = Caching.get({
   cacheName: 'test-vona:test',
   cacheProp: 'test'
@@ -327,8 +339,8 @@ let ServiceCaching = (_dec$t = Service(), _dec2$t = BeanInfo({
 }), _dec14$4 = Reflect.metadata("design:type", Function), _dec15$4 = Reflect.metadata("design:paramtypes", [Number, typeof TSummerCacheTestData === "undefined" ? Object : TSummerCacheTestData]), _dec16$4 = Caching.set({
   cacheName: 'test-vona:test',
   cacheProp: 'test',
-  cacheKey: '#!#get(self,"$beanFullName")+"_"+options.cacheProp+"_"+hashkey([args[0]])',
-  cacheValue: '#!#{"id": args[1].id, "name": args[1].name}'
+  cacheKey: 'cel://join([get(self,"$beanFullName"),options.cacheProp,hashkey([args[0]])],"_")',
+  cacheValue: 'cel://{"id": args[1].id, "name": args[1].name}'
 }), _dec17$3 = Reflect.metadata("design:type", Function), _dec18$3 = Reflect.metadata("design:paramtypes", [Number, typeof TSummerCacheTestData === "undefined" ? Object : TSummerCacheTestData]), _dec19$3 = Caching.set({
   cacheName: 'test-vona:test',
   cacheProp: 'test',
@@ -348,8 +360,6 @@ let ServiceCaching = (_dec$t = Service(), _dec2$t = BeanInfo({
   cacheValueSet(_value, args, _prop, _options) {
     return args[args.length - 1];
   }
-
-  // cacheKey: '#!# concat(prop,args[0])'
   async get(id) {
     return {
       id,
@@ -1324,4 +1334,4 @@ function $locale(key) {
 }
 /** scope: end */
 
-export { $locale, AopMethodTest, AopRegExp, AopSimple, BeanTestCtx, BroadcastTest, CacheMemTest, CacheRedisTest, ControllerBean, ControllerCacheMem, ControllerCacheRedis, ControllerGuardPassport, ControllerOnion, ControllerPassport, ControllerPerformAction, ControllerQueue, ControllerSummer, ControllerTail, ControllerTransaction, ControllerUpload, DtoProfile, DtoUser, EntityTest, EventHelloEcho, EventListenerHelloEcho, MetaVersion, ModelTest, QueueTest, ScheduleTest, ScheduleTest3, ScopeModuleTestVona, ServiceAopMethod, ServiceCaching, ServiceTest, ServiceTestApp, ServiceTestClass, ServiceTransaction, SummerCacheTest, config, locales };
+export { $locale, AopMethodTest, AopRegExp, AopSimple, BeanTestCtx, BroadcastTest, CacheMemTest, CacheRedisTest, ControllerBean, ControllerCacheMem, ControllerCacheRedis, ControllerGuardPassport, ControllerOnion, ControllerPassport, ControllerPerformAction, ControllerQueue, ControllerSummer, ControllerTail, ControllerTransaction, ControllerUpload, DtoProfile, DtoUser, EntityTest, EventHelloEcho, EventListenerHelloEcho, MetaVersion, ModelTest, ModelTestDynamicTable, QueueTest, ScheduleTest, ScheduleTest3, ScopeModuleTestVona, ServiceAopMethod, ServiceCaching, ServiceTest, ServiceTestApp, ServiceTestClass, ServiceTransaction, SummerCacheTest, config, locales };

package/dist/model/testDynamicTable.d.ts

@@ -0,0 +1,4 @@
+import { BeanModelBase } from 'vona-module-a-database';
+import { EntityTest } from '../entity/test.ts';
+export declare class ModelTestDynamicTable extends BeanModelBase<EntityTest> {
+}

package/package.json

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