cabloy 5.1.50 → 5.1.52

package/vona/src/suite-vendor/a-cabloy/modules/a-datasharding/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-datasharding",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-cabloy/modules/a-datasharding/src/bean/summerCache.datasourceWrite.ts

@@ -1,7 +1,7 @@
 import type { TableIdentity } from 'table-identity';
 import type { IDatabaseClientRecord } from 'vona-module-a-orm';
 
-import { BeanSummerCacheBase, SummerCache } from 'vona-module-a-summer';
+import { ServiceSummerCacheBase, SummerCache } from 'vona-module-a-summer';
 
 export type TSummerCacheDatasourceWriteKey = TableIdentity;
 export type TSummerCacheDatasourceWriteData = keyof IDatabaseClientRecord;
@@ -14,7 +14,7 @@ export type TSummerCacheDatasourceWriteData = keyof IDatabaseClientRecord;
     ttl: 3 * 1000, // 3s
   },
 })
-export class SummerCacheDatasourceWrite extends BeanSummerCacheBase<
+export class SummerCacheDatasourceWrite extends ServiceSummerCacheBase<
   TSummerCacheDatasourceWriteKey,
   TSummerCacheDatasourceWriteData
 > {}

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-ssr",
-  "version": "5.1.14",
+  "version": "5.1.15",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/.metadata/index.ts

@@ -1,4 +1,5 @@
 // eslint-disable
+import type { TypeControllerOptionsActions } from 'vona-module-a-openapi';
 /** interceptor: begin */
 export * from '../bean/interceptor.ssrRedirect.ts';
 export * from '../bean/interceptor.ssrRender.ts';
@@ -83,13 +84,60 @@ declare module 'vona-module-a-ssr' {
 /** bean: end */
 /** bean: begin */
 import type { BeanSsr } from '../bean/bean.ssr.ts';
-import 'vona';  
+import 'vona';
 declare module 'vona' {
   export interface IBeanRecordGlobal {
     'ssr': BeanSsr;
   }
 }
 /** bean: end */
+/** controller: begin */
+export * from '../controller/memoryDiag.ts';
+import type { IControllerOptionsMemoryDiag } from '../controller/memoryDiag.ts';
+import 'vona-module-a-web';
+declare module 'vona-module-a-web' {
+
+    export interface IControllerRecord {
+      'a-ssr:memoryDiag': IControllerOptionsMemoryDiag;
+    }
+
+
+}
+declare module 'vona-module-a-ssr' {
+
+        export interface ControllerMemoryDiag {
+          /** @internal */
+          get scope(): ScopeModuleASsr;
+        }
+
+          export interface ControllerMemoryDiag {
+            get $beanFullName(): 'a-ssr.controller.memoryDiag';
+            get $onionName(): 'a-ssr:memoryDiag';
+            get $onionOptions(): IControllerOptionsMemoryDiag;
+          }
+}
+/** controller: end */
+/** controller: begin */
+// @ts-ignore ignore
+import type { ControllerMemoryDiag } from '../controller/memoryDiag.ts';
+declare module 'vona-module-a-ssr' {
+
+    export interface IControllerOptionsMemoryDiag {
+      actions?: TypeControllerOptionsActions<ControllerMemoryDiag>;
+    }
+}
+declare module 'vona-module-a-web' {
+  export interface IApiPathGetRecord{
+        '/ssr/memoryDiag/stats': undefined;
+    }
+export interface IApiPathPostRecord{
+        '/ssr/memoryDiag/gc': undefined;
+'/ssr/memoryDiag/heapSnapshot': undefined;
+    }
+
+}
+
+/** controller: end */
 /** service: begin */
 export * from '../service/devProxy.ts';
 export * from '../service/ssr.ts';

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/controller/memoryDiag.ts

@@ -0,0 +1,97 @@
+import type { IDecoratorControllerOptions } from 'vona-module-a-web';
+
+import inspector from 'node:inspector';
+import v8 from 'node:v8';
+import { BeanBase } from 'vona';
+import { Passport } from 'vona-module-a-user';
+import { Controller, Web } from 'vona-module-a-web';
+
+const HEADER_MEMORY_DIAG_TOKEN = 'x-ssr-memory-diag-token';
+const ENV_MEMORY_DIAG_TOKEN = 'SSR_MEMORY_DIAG_TOKEN';
+
+export interface IControllerOptionsMemoryDiag extends IDecoratorControllerOptions {}
+
+@Controller<IControllerOptionsMemoryDiag>('memoryDiag', {
+  exclude: true,
+})
+export class ControllerMemoryDiag extends BeanBase {
+  @Web.get('stats')
+  @Passport.public()
+  async stats() {
+    this._checkAccess();
+    const mem = process.memoryUsage();
+    const heap = v8.getHeapStatistics();
+    return {
+      pid: process.pid,
+      timestamp: Date.now(),
+      memoryUsage: {
+        rss: mem.rss,
+        heapTotal: mem.heapTotal,
+        heapUsed: mem.heapUsed,
+        external: mem.external,
+        arrayBuffers: mem.arrayBuffers,
+      },
+      heapStatistics: {
+        used_heap_size: heap.used_heap_size,
+        total_heap_size: heap.total_heap_size,
+        total_available_size: heap.total_available_size,
+        heap_size_limit: heap.heap_size_limit,
+        malloced_memory: heap.malloced_memory,
+        number_of_native_contexts: heap.number_of_native_contexts,
+        number_of_detached_contexts: heap.number_of_detached_contexts,
+      },
+    };
+  }
+
+  @Web.post('gc')
+  @Passport.public()
+  async forceGc() {
+    this._checkAccess();
+    const session = new inspector.Session();
+    session.connect();
+    try {
+      await this._postHeapProfiler(session, 'HeapProfiler.enable');
+      await this._postHeapProfiler(session, 'HeapProfiler.collectGarbage');
+    } finally {
+      session.disconnect();
+    }
+    return await this.stats();
+  }
+
+  @Web.post('heapSnapshot')
+  @Passport.public()
+  async heapSnapshot() {
+    this._checkAccess();
+    const fileName = v8.writeHeapSnapshot(
+      `/tmp/heapdump-${process.pid}-${Date.now()}.heapsnapshot`,
+    );
+    return { pid: process.pid, file: fileName };
+  }
+
+  private _postHeapProfiler(session: inspector.Session, method: string): Promise<void> {
+    return new Promise<void>(function postHeapProfiler(resolve, reject) {
+      session.post(method, function onPost(err) {
+        if (err) {
+          reject(err);
+          return;
+        }
+        resolve();
+      });
+    });
+  }
+
+  private _checkAccess() {
+    const token = process.env[ENV_MEMORY_DIAG_TOKEN];
+    if (!token) {
+      if (!this.app.meta.isDev && !this.app.meta.isTest) {
+        this.app.throw(403);
+      }
+      return;
+    }
+
+    const tokenHeader = this.ctx.get(HEADER_MEMORY_DIAG_TOKEN);
+    if (tokenHeader !== token) {
+      this.app.throw(403);
+    }
+  }
+}

package/vona/src/suite-vendor/a-cabloy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.28",
+  "version": "5.1.30",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

package/vona/src/suite-vendor/a-captcha/modules/a-captcha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-captcha",
-  "version": "5.1.6",
+  "version": "5.1.7",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-captcha/modules/a-captcha/src/bean/cacheRedis.captcha.ts

@@ -1,4 +1,4 @@
-import { BeanCacheRedisBase, CacheRedis } from 'vona-module-a-cache';
+import { ServiceCacheRedisBase, CacheRedis } from 'vona-module-a-cache';
 
 import type { ICaptchaDataCache } from '../types/captcha.ts';
 
@@ -6,7 +6,7 @@ export type TCacheRedisCaptchaKey = string;
 export type TCacheRedisCaptchaData = ICaptchaDataCache;
 
 @CacheRedis({ disableTransactionCompensate: true })
-export class CacheRedisCaptcha extends BeanCacheRedisBase<
+export class CacheRedisCaptcha extends ServiceCacheRedisBase<
   TCacheRedisCaptchaKey,
   TCacheRedisCaptchaData
 > {}

package/vona/src/suite-vendor/a-captcha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-captcha",
-  "version": "5.1.10",
+  "version": "5.1.11",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

package/vona/src/suite-vendor/a-vona/modules/a-bean/cli/bean/metadata/generate.ts

@@ -5,20 +5,19 @@ export default async function (options: IMetadataCustomGenerateOptions): Promise
   const contentImports: string[] = [];
   const contentRecordsGlobal: string[] = [];
   for (const globFile of globFiles) {
-    const { className, beanName, fileNameJSRelative, isIgnore, isVirtual } = globFile;
-    if (isIgnore || isVirtual) continue;
-    const beanFullName = beanName;
+    const { className, beanName, fileNameJSRelative, isIgnore } = globFile;
+    if (isIgnore) continue;
     contentImports.push(`import type { ${className} } from '${fileNameJSRelative}';`);
-    contentRecordsGlobal.push(`'${beanFullName}': ${className};`);
+    contentRecordsGlobal.push(`    '${beanName}': ${className};`);
   }
   if (contentImports.length === 0) return '';
   // combine
   const content = `/** ${sceneName}: begin */
 ${contentImports.join('\n')}
-import 'vona';  
+import 'vona';
 declare module 'vona' {
   export interface IBeanRecordGlobal {
-    ${contentRecordsGlobal.join('\n')}
+${contentRecordsGlobal.join('\n')}
   }
 }
 /** ${sceneName}: end */

package/vona/src/suite-vendor/a-vona/modules/a-bean/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-bean",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-cache/cli/cacheMem/boilerplate/{{sceneName}}.{{beanName}}.ts_

@@ -1,8 +1,8 @@
-import { BeanCacheMemBase, CacheMem } from 'vona-module-a-cache';
+import { ServiceCacheMemBase, CacheMem } from 'vona-module-a-cache';
 
 export type TCacheMem<%=argv.beanNameCapitalize%>Key = any;
 export type TCacheMem<%=argv.beanNameCapitalize%>Data = any;
 
 @CacheMem()
 export class CacheMem<%=argv.beanNameCapitalize%>
-  extends BeanCacheMemBase<TCacheMem<%=argv.beanNameCapitalize%>Key, TCacheMem<%=argv.beanNameCapitalize%>Data> {}
+  extends ServiceCacheMemBase<TCacheMem<%=argv.beanNameCapitalize%>Key, TCacheMem<%=argv.beanNameCapitalize%>Data> {}

package/vona/src/suite-vendor/a-vona/modules/a-cache/cli/cacheRedis/boilerplate/{{sceneName}}.{{beanName}}.ts_

@@ -1,8 +1,8 @@
-import { BeanCacheRedisBase, CacheRedis } from 'vona-module-a-cache';
+import { ServiceCacheRedisBase, CacheRedis } from 'vona-module-a-cache';
 
 export type TCacheRedis<%=argv.beanNameCapitalize%>Key = any;
 export type TCacheRedis<%=argv.beanNameCapitalize%>Data = any;
 
 @CacheRedis()
 export class CacheRedis<%=argv.beanNameCapitalize%>
-  extends BeanCacheRedisBase<TCacheRedis<%=argv.beanNameCapitalize%>Key, TCacheRedis<%=argv.beanNameCapitalize%>Data> {}
+  extends ServiceCacheRedisBase<TCacheRedis<%=argv.beanNameCapitalize%>Key, TCacheRedis<%=argv.beanNameCapitalize%>Data> {}

package/vona/src/suite-vendor/a-vona/modules/a-cache/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-cache",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-cache/src/.metadata/index.ts

@@ -1,8 +1,6 @@
 // eslint-disable
 /** bean: begin */
 export * from '../bean/bean.cache.ts';
-export * from '../bean/bean.cacheMemBase.ts';
-export * from '../bean/bean.cacheRedisBase.ts';
 
 import 'vona';
 declare module 'vona' {
@@ -26,6 +24,19 @@ declare module 'vona' {
   }
 }
 /** bean: end */
+/** service: begin */
+export * from '../service/cacheMemBase_.ts';
+export * from '../service/cacheRedisBase_.ts';
+
+import 'vona-module-a-bean';
+declare module 'vona-module-a-bean' {
+  
+  
+}
+declare module 'vona-module-a-cache' {
+   
+}
+/** service: end */
 /** broadcast: begin */
 export * from '../bean/broadcast.memClear.ts';
 export * from '../bean/broadcast.memDel.ts';

package/vona/src/suite-vendor/a-vona/modules/a-cache/src/bean/bean.cache.ts

@@ -4,28 +4,27 @@ import { Bean } from 'vona-module-a-bean';
 import type { IDecoratorCacheMemOptions } from '../types/cacheMem.ts';
 import type { IDecoratorCacheRedisOptions } from '../types/cacheRedis.ts';
 
-import { BeanCacheMemBase } from './bean.cacheMemBase.ts';
-import { BeanCacheRedisBase } from './bean.cacheRedisBase.ts';
-
+import { ServiceCacheMemBase } from '../service/cacheMemBase_.ts';
+import { ServiceCacheRedisBase } from '../service/cacheRedisBase_.ts';
 @Bean()
 export class BeanCache extends BeanBase {
   mem<KEY, DATA>(
     cacheName: string,
     cacheOptions?: IDecoratorCacheMemOptions,
-  ): BeanCacheMemBase<KEY, DATA> {
+  ): ServiceCacheMemBase<KEY, DATA> {
     if (cacheName.includes('.cacheMem.')) {
       return this.app.bean._getBeanSelector(cacheName as any, undefined, cacheOptions);
     }
-    return this.app.bean._getBeanSelector(BeanCacheMemBase, cacheName, cacheOptions);
+    return this.app.bean._getBeanSelector(ServiceCacheMemBase, cacheName, cacheOptions);
   }
 
   redis<KEY, DATA>(
     cacheName: string,
     cacheOptions?: IDecoratorCacheRedisOptions,
-  ): BeanCacheRedisBase<KEY, DATA> {
+  ): ServiceCacheRedisBase<KEY, DATA> {
     if (cacheName.includes('.cacheRedis.')) {
       return this.app.bean._getBeanSelector(cacheName as any, undefined, cacheOptions);
     }
-    return this.app.bean._getBeanSelector(BeanCacheRedisBase, cacheName, cacheOptions);
+    return this.app.bean._getBeanSelector(ServiceCacheRedisBase, cacheName, cacheOptions);
   }
 }

package/vona/src/suite-vendor/a-vona/modules/a-cache/src/{bean/bean.cacheMemBase.ts → service/cacheMemBase_.ts}

@@ -1,6 +1,6 @@
 import { LRUCache } from 'lru-cache';
 import { Virtual } from 'vona';
-import { Bean } from 'vona-module-a-bean';
+import { Service } from 'vona-module-a-bean';
 
 import type { ICacheMemGetOptions, ICacheMemSetOptions } from '../types/cache.ts';
 import type { IDecoratorCacheMemOptions } from '../types/cacheMem.ts';
@@ -8,9 +8,9 @@ import type { IDecoratorCacheMemOptions } from '../types/cacheMem.ts';
 import { CacheBase } from '../common/cacheBase.ts';
 import { getCacheMemories } from '../lib/const.ts';
 
-@Bean()
+@Service()
 @Virtual()
-export class BeanCacheMemBase<KEY = any, DATA = any> extends CacheBase<
+export class ServiceCacheMemBase<KEY = any, DATA = any> extends CacheBase<
   IDecoratorCacheMemOptions,
   KEY
 > {

package/vona/src/suite-vendor/a-vona/modules/a-cache/src/{bean/bean.cacheRedisBase.ts → service/cacheRedisBase_.ts}

@@ -1,16 +1,16 @@
 import type { Redis } from 'ioredis';
 
 import { Virtual } from 'vona';
-import { Bean } from 'vona-module-a-bean';
+import { Service } from 'vona-module-a-bean';
 
 import type { ICacheRedisGetOptions, ICacheRedisSetOptions } from '../types/cache.ts';
 import type { IDecoratorCacheRedisOptions } from '../types/cacheRedis.ts';
 
 import { CacheBase } from '../common/cacheBase.ts';
 
-@Bean()
+@Service()
 @Virtual()
-export class BeanCacheRedisBase<KEY = any, DATA = any> extends CacheBase<
+export class ServiceCacheRedisBase<KEY = any, DATA = any> extends CacheBase<
   IDecoratorCacheRedisOptions,
   KEY
 > {

package/vona/src/suite-vendor/a-vona/modules/a-mailconfirm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-mailconfirm",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-mailconfirm/src/bean/cacheRedis.emailConfirm.ts

@@ -1,6 +1,6 @@
 import type { TableIdentity } from 'table-identity';
 
-import { BeanCacheRedisBase, CacheRedis } from 'vona-module-a-cache';
+import { ServiceCacheRedisBase, CacheRedis } from 'vona-module-a-cache';
 
 export type TCacheRedisEmailConfirmKey = string;
 export interface TCacheRedisEmailConfirmData {
@@ -11,7 +11,7 @@ export interface TCacheRedisEmailConfirmData {
 @CacheRedis({
   ttl: 30 * 60 * 1000, // 30 minutes
 })
-export class CacheRedisEmailConfirm extends BeanCacheRedisBase<
+export class CacheRedisEmailConfirm extends ServiceCacheRedisBase<
   TCacheRedisEmailConfirmKey,
   TCacheRedisEmailConfirmData
 > {}

package/vona/src/suite-vendor/a-vona/modules/a-mailconfirm/src/bean/cacheRedis.passwordReset.ts

@@ -1,6 +1,6 @@
 import type { TableIdentity } from 'table-identity';
 
-import { BeanCacheRedisBase, CacheRedis } from 'vona-module-a-cache';
+import { ServiceCacheRedisBase, CacheRedis } from 'vona-module-a-cache';
 
 export type TCacheRedisPasswordResetKey = string;
 export interface TCacheRedisPasswordResetData {
@@ -10,7 +10,7 @@ export interface TCacheRedisPasswordResetData {
 @CacheRedis({
   ttl: 30 * 60 * 1000, // 30 minutes
 })
-export class CacheRedisPasswordReset extends BeanCacheRedisBase<
+export class CacheRedisPasswordReset extends ServiceCacheRedisBase<
   TCacheRedisPasswordResetKey,
   TCacheRedisPasswordResetData
 > {}

package/vona/src/suite-vendor/a-vona/modules/a-openapi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-openapi",
-  "version": "5.1.8",
+  "version": "5.1.9",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-openapi/src/bean/summerCache.json.ts

@@ -1,13 +1,13 @@
 import type { ISummerCacheGet, TSummerCacheActionOptions } from 'vona-module-a-summer';
 
-import { BeanSummerCacheBase, SummerCache } from 'vona-module-a-summer';
+import { ServiceSummerCacheBase, SummerCache } from 'vona-module-a-summer';
 
 export type TSummerCacheJsonKey = any;
 export type TSummerCacheJsonData = any;
 
 @SummerCache({ preset: 'mem' })
 export class SummerCacheJson
-  extends BeanSummerCacheBase<TSummerCacheJsonKey, TSummerCacheJsonData>
+  extends ServiceSummerCacheBase<TSummerCacheJsonKey, TSummerCacheJsonData>
   implements ISummerCacheGet<TSummerCacheJsonKey, TSummerCacheJsonData>
 {
   async getNative(

package/vona/src/suite-vendor/a-vona/modules/a-orm/cli/databaseDialect/boilerplate/{{sceneName}}.{{beanName}}.ts_

@@ -1,7 +1,7 @@
 import type { IDecoratorDatabaseDialectOptions } from 'vona-module-a-orm';
-import { BeanDatabaseDialectBase, DatabaseDialect } from 'vona-module-a-orm';
+import { ServiceDatabaseDialectBase, DatabaseDialect } from 'vona-module-a-orm';
 
 export interface IDatabaseDialectOptions<%=argv.beanNameCapitalize%> extends IDecoratorDatabaseDialectOptions {}
 
 @DatabaseDialect<IDatabaseDialectOptions<%=argv.beanNameCapitalize%>>()
-export class DatabaseDialect<%=argv.beanNameCapitalize%> extends BeanDatabaseDialectBase {}
+export class DatabaseDialect<%=argv.beanNameCapitalize%> extends ServiceDatabaseDialectBase {}

package/vona/src/suite-vendor/a-vona/modules/a-orm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-orm",
-  "version": "5.1.8",
+  "version": "5.1.9",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "db",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/.metadata/index.ts

@@ -27,9 +27,7 @@ declare module 'vona-module-a-orm' {
 /** aopMethod: end */
 /** bean: begin */
 export * from '../bean/bean.database.ts';
-export * from '../bean/bean.databaseDialectBase.ts';
 export * from '../bean/bean.model.ts';
-export * from '../bean/bean.modelBase.ts';
 
 import 'vona';
 declare module 'vona' {
@@ -46,10 +44,12 @@ declare module 'vona-module-a-orm' {
 /** bean: end */
 /** bean: begin */
 import type { BeanDatabase } from '../bean/bean.database.ts';
-import 'vona';  
+import type { BeanModel } from '../bean/bean.model.ts';
+import 'vona';
 declare module 'vona' {
   export interface IBeanRecordGlobal {
     'database': BeanDatabase;
+    'model': BeanModel;
   }
 }
 /** bean: end */
@@ -61,6 +61,7 @@ export * from '../service/columns_.ts';
 export * from '../service/database.ts';
 export * from '../service/databaseAsyncLocalStorage_.ts';
 export * from '../service/databaseClient_.ts';
+export * from '../service/databaseDialectBase_.ts';
 export * from '../service/db_.ts';
 export * from '../service/entityResolver_.ts';
 export * from '../service/modelResolver_.ts';

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/bean/bean.database.ts

@@ -9,7 +9,7 @@ import type {
   IDatabaseClientRecord,
   IDbInfo,
 } from '../types/database.ts';
-import type { BeanDatabaseDialectBase } from './bean.databaseDialectBase.ts';
+import type { ServiceDatabaseDialectBase } from '../service/databaseDialectBase_.ts';
 
 import { ServiceDatabaseAsyncLocalStorage } from '../service/databaseAsyncLocalStorage_.ts';
 import { ServiceDatabaseClient } from '../service/databaseClient_.ts';
@@ -44,13 +44,13 @@ export class BeanDatabase extends BeanBase {
     return this.getClient(dbInfoOrClientName, clientConfig).db;
   }
 
-  getDialect(client: keyof IDatabaseClientDialectRecord): BeanDatabaseDialectBase {
+  getDialect(client: keyof IDatabaseClientDialectRecord): ServiceDatabaseDialectBase {
     if (!client) throw new Error('database dialect not specified');
     const beanFullName = beanFullNameFromOnionName(
       this.scope.config.dialects[client],
       'databaseDialect',
     );
-    const dialect = this.app.bean._getBean(beanFullName) as BeanDatabaseDialectBase;
+    const dialect = this.app.bean._getBean(beanFullName) as ServiceDatabaseDialectBase;
     if (!dialect) throw new Error(`database dialect not found: ${client}`);
     return dialect;
   }

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/bean/bean.model.ts

@@ -1,7 +1,7 @@
 import { Virtual } from 'vona';
 import { Bean } from 'vona-module-a-bean';
 
-import { BeanModelCrudTable } from './bean.model/bean.model_crud_table.ts';
+import { BeanModelCrudTable } from '../lib/bean.model/bean.model_crud_table.ts';
 
 @Bean()
 @Virtual()

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/bean/schedule.softDeletionPrune.ts

@@ -5,7 +5,7 @@ import { BeanBase } from 'vona';
 import { Schedule } from 'vona-module-a-schedule';
 
 import type { IModelRecord, ISoftDeletionPrune } from '../types/onion/model.ts';
-import type { BeanModelCache } from './bean.model/bean.model_cache.ts';
+import type { BeanModelCache } from '../lib/bean.model/bean.model_cache.ts';
 
 @Schedule({ repeat: { every: 24 * 3600 * 1000 } })
 export class ScheduleSoftDeletionPrune extends BeanBase implements IScheduleExecute {

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/common/utils.ts

@@ -3,7 +3,7 @@ import type { Constructable } from 'vona';
 import { appResource, beanFullNameFromOnionName } from 'vona';
 import { prepareClassType } from 'vona-module-a-openapiutils';
 
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { TypeModelColumn, TypeModelColumns } from '../types/modelWhere.ts';
 import type { IDecoratorModelOptions, IModelClassRecord } from '../types/onion/model.ts';
 

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/index.ts

@@ -3,7 +3,7 @@ import 'bignumber.js';
 export * from './.metadata/index.ts';
 
 export * from './.metadata/locales.ts';
-export * from './bean/bean.model/bean.model_meta.ts';
+export * from './lib/bean.model/bean.model_meta.ts';
 export * from './common/index.ts';
 export * from './extend/index.ts';
 export * from './lib/index.ts';

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/{bean → lib}/bean.model/bean.model_cache.ts

@@ -31,7 +31,7 @@ import type {
   TypeModelsClassLikeGeneral,
   TypeModelWhere,
 } from '../../types/index.ts';
-import type { TypeQueueDoubleDeleteJobData } from '../queue.doubleDelete.ts';
+import type { TypeQueueDoubleDeleteJobData } from '../../bean/queue.doubleDelete.ts';
 
 import { getTargetColumnName } from '../../common/utils.ts';
 import { getCacheModelsClear } from '../../lib/const.ts';

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/{bean → lib}/bean.model/bean.model_meta.ts

@@ -15,7 +15,7 @@ import type {
   TypeModelOptionsTable,
   TypeModelRelationOptionsMetaClient,
 } from '../../types/index.ts';
-import type { BeanModel } from '../bean.model.ts';
+import type { BeanModel } from '../../bean/bean.model.ts';
 
 import { getTableOrTableAlias, prepareClassModel } from '../../common/utils.ts';
 import { SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyModelOptions } from '../../types/index.ts';

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/{bean → lib}/bean.modelBase.ts

@@ -1,8 +1,3 @@
-import { Virtual } from 'vona';
-import { Bean } from 'vona-module-a-bean';
-
 import { BeanModelCache } from './bean.model/bean.model_cache.ts';
 
-@Bean()
-@Virtual()
 export class BeanModelBase<TRecord extends {} = any> extends BeanModelCache<TRecord> {}