cabloy 5.1.50 → 5.1.51

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> {}

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/lib/dto/dtoAggregate.ts

@@ -4,7 +4,7 @@ import { ensureArray } from '@cabloy/utils';
 import { Api, v } from 'vona-module-a-openapiutils';
 import z from 'zod';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 import type { TypeDtoAggrResult } from '../../types/dto/dtoAggregate.ts';
 import type { TypeModelSelectAggrParamsAggrs } from '../../types/modelAggr.ts';
 import type { IModelClassRecord } from '../../types/onion/model.ts';

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/lib/dto/dtoCreate.ts

@@ -1,6 +1,6 @@
 import type { Constructable } from 'vona';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 import type { IDtoMutateParams, TypeDtoMutateResult } from '../../types/dto/dtoMutate.ts';
 import type { IModelClassRecord } from '../../types/onion/model.ts';
 

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/lib/dto/dtoGet.ts

@@ -12,7 +12,7 @@ import {
 } from 'vona-module-a-openapiutils';
 import z from 'zod';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 import type { IDtoGetParams, TypeDtoGetResult } from '../../types/dto/dtoGet.ts';
 import type { TypeDtoMutateType } from '../../types/dto/dtoMutate.ts';
 import type { IModelRelationIncludeWrapper } from '../../types/model.ts';

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/lib/dto/dtoGroup.ts

@@ -3,7 +3,7 @@ import type { Constructable } from 'vona';
 import { ensureArray } from '@cabloy/utils';
 import { PickClassInner } from 'vona';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 import type { TypeDtoGroupResult } from '../../types/dto/dtoGroup.ts';
 import type { TypeModelSelectAggrParamsAggrs } from '../../types/modelAggr.ts';
 import type { TypeModelColumnsStrict } from '../../types/modelWhere.ts';

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/lib/dto/dtoMutate.ts

@@ -3,7 +3,7 @@ import type { Constructable } from 'vona';
 import { mutate } from 'mutate-on-copy';
 import { $Class } from 'vona';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 import type {
   IDtoMutateParams,
   TypeDtoMutateResult,

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/lib/dto/dtoSelectAndCount.ts

@@ -1,6 +1,6 @@
 import type { Constructable } from 'vona';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 import type { IDtoGetParams } from '../../types/dto/dtoGet.ts';
 import type { TypeDtoSelectAndCountResult } from '../../types/dto/dtoSelectAndCount.ts';
 import type { IModelClassRecord } from '../../types/onion/model.ts';

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/lib/dto/dtoUpdate.ts

@@ -1,6 +1,6 @@
 import type { Constructable } from 'vona';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 import type { IDtoMutateParams, TypeDtoMutateResult } from '../../types/dto/dtoMutate.ts';
 import type { IModelClassRecord } from '../../types/onion/model.ts';
 

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

@@ -3,6 +3,7 @@ export * from './databaseDialect.ts';
 export * from './dto/index.ts';
 export * from './entity.ts';
 export * from './model.ts';
+export * from './bean.modelBase.ts';
 export * from './relations.ts';
 export * from './relationsDynamic.ts';
 export * from './relationsMutate.ts';

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

@@ -1,8 +1,8 @@
-import type { BeanSummerCacheBase, IDecoratorSummerCacheOptions } from 'vona-module-a-summer';
+import type { ServiceSummerCacheBase, IDecoratorSummerCacheOptions } from 'vona-module-a-summer';
 
 import { BeanBase, deepExtend } from 'vona';
 
-import type { BeanModelCache } from '../bean/bean.model/bean.model_cache.ts';
+import type { BeanModelCache } from './bean.model/bean.model_cache.ts';
 import type { TypeModelCacheType } from '../types/model.ts';
 import type { ITableRecord } from '../types/onion/table.ts';
 
@@ -25,7 +25,7 @@ export class ModelCacheBase extends BeanBase {
     return this.$scope.orm;
   }
 
-  public getInstance(table: keyof ITableRecord): BeanSummerCacheBase {
+  public getInstance(table: keyof ITableRecord): ServiceSummerCacheBase {
     if (this.options === false) throw new Error('cache disabled');
     const beanFullName = this._model.$beanFullName;
     const cacheName = this.getName(table);

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

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from './bean.model/bean.model_meta.ts';
 import type { IModelClassRecord } from '../types/onion/model.ts';
 import type {
   TypeModelClassLike,

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

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from './bean.model/bean.model_meta.ts';
 import type { IModelClassRecord } from '../types/onion/model.ts';
 import type {
   TypeModelClassLike,

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

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from './bean.model/bean.model_meta.ts';
 import type { IModelClassRecord } from '../types/onion/model.ts';
 import type {
   TypeModelClassLike,

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

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from './bean.model/bean.model_meta.ts';
 import type { TypeModelsClassLikeGeneral } from '../types/relations.ts';
 import type {
   IModelRelationOptionsManyDynamic,

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

@@ -2,7 +2,7 @@ import type { TableIdentity } from 'table-identity';
 
 import { Service } from 'vona-module-a-bean';
 
-import type { BeanModelCache } from '../bean/bean.model/bean.model_cache.ts';
+import type { BeanModelCache } from '../lib/bean.model/bean.model_cache.ts';
 import type { ITableRecord } from '../types/onion/table.ts';
 
 import { ModelCacheBase } from '../lib/modelCacheBase.ts';

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

@@ -1,6 +1,6 @@
 import { Service } from 'vona-module-a-bean';
 
-import type { BeanModelCache } from '../bean/bean.model/bean.model_cache.ts';
+import type { BeanModelCache } from '../lib/bean.model/bean.model_cache.ts';
 import type { ITableRecord } from '../types/onion/table.ts';
 
 import { ModelCacheBase } from '../lib/modelCacheBase.ts';

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

@@ -2,7 +2,7 @@ import { isNil } from '@cabloy/utils';
 import { appResource, BeanBase, deepExtend } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
-import type { BeanDatabaseDialectBase } from '../bean/bean.databaseDialectBase.ts';
+import type { ServiceDatabaseDialectBase } from './databaseDialectBase_.ts';
 import type { ConfigDatabaseClient } from '../types/config.ts';
 import type {
   IDatabaseClientDialectRecord,
@@ -61,7 +61,7 @@ export class ServiceDatabase extends BeanBase {
 
   prepareClientNameSelector(
     dbInfo: IDbInfo,
-    dialect: BeanDatabaseDialectBase | keyof IDatabaseClientDialectRecord,
+    dialect: ServiceDatabaseDialectBase | keyof IDatabaseClientDialectRecord,
   ) {
     const dialect2 = typeof dialect === 'string' ? this.bean.database.getDialect(dialect) : dialect;
     if (!dialect2.capabilities.level) return dbInfo.clientName;

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/{bean/bean.databaseDialectBase.ts → service/databaseDialectBase_.ts}

@@ -3,7 +3,7 @@ import type { TableIdentity } from 'table-identity';
 
 import { isNil, safeBoolean } from '@cabloy/utils';
 import { BeanBase, Virtual } from 'vona';
-import { Bean } from 'vona-module-a-bean';
+import { Service } from 'vona-module-a-bean';
 
 import type { ITableColumn } from '../types/columns.ts';
 import type { ConfigDatabaseClient } from '../types/config.ts';
@@ -14,9 +14,22 @@ import type {
   TypeDatabaseDialectTableColumnsFn,
 } from '../types/dialect.ts';
 
-@Bean()
+const BOOLEAN_COLUMN_TYPES = ['bit', 'bool', 'boolean'];
+const NUMBER_COLUMN_TYPES = ['int'];
+const TIMESTAMP_COLUMN_TYPE_PREFIXES = ['timestamp'];
+const FLOAT_COLUMN_TYPE_PREFIXES = ['float', 'double'];
+const INTEGER_COLUMN_TYPE_PREFIXES = [
+  'tinyint',
+  'smallint',
+  'mediumint',
+  'bigint',
+  'numeric',
+  'integer',
+];
+
+@Service()
 @Virtual()
-export class BeanDatabaseDialectBase extends BeanBase {
+export class ServiceDatabaseDialectBase extends BeanBase {
   protected _capabilities?: IDatabaseDialectCapabilities;
   protected _configBase?: Partial<ConfigDatabaseClient>;
 
@@ -75,11 +88,8 @@ export class BeanDatabaseDialectBase extends BeanBase {
   }
 
   coerceColumn(column: Knex.ColumnInfo): ITableColumn {
-    // result
     const result = { type: column.type } as ITableColumn;
-    // coerce
     result.default = this._coerceColumnValue(column.type, column.defaultValue);
-    // ok
     return result;
   }
 
@@ -111,22 +121,22 @@ export class BeanDatabaseDialectBase extends BeanBase {
     datas: any[],
   ): Promise<[TableIdentity[], Knex.QueryBuilder]> {
     if (datas.length === 0) return [[], builder];
-    if (isNil(datas[0].id)) {
-      let builderFirst: Knex.QueryBuilder | undefined = undefined;
-      const ids: TableIdentity[] = [];
-      for (const data of datas) {
-        const builder2 = builder.clone();
-        builder2.insert(data);
-        const items = await builder2;
-        ids.push(items[0]);
-        if (!builderFirst) builderFirst = builder2;
-      }
-      return [ids, builderFirst ?? builder];
-    } else {
+    if (!isNil(datas[0].id)) {
       builder.insert(datas);
       await builder;
       return [datas.map(item => item.id), builder];
     }
+
+    let builderFirst: Knex.QueryBuilder | undefined = undefined;
+    const ids: TableIdentity[] = [];
+    for (const data of datas) {
+      const builder2 = builder.clone();
+      builder2.insert(data);
+      const items = await builder2;
+      ids.push(items[0]);
+      if (!builderFirst) builderFirst = builder2;
+    }
+    return [ids, builderFirst ?? builder];
   }
 
   protected async insertAsPg(
@@ -134,41 +144,28 @@ export class BeanDatabaseDialectBase extends BeanBase {
     datas: any[],
   ): Promise<[TableIdentity[], Knex.QueryBuilder]> {
     if (datas.length === 0) return [[], builder];
-    if (isNil(datas[0].id)) {
-      builder.insert(datas).returning('id');
-      const items = await builder;
-      return [items.map(item => item.id), builder];
-    } else {
+    if (!isNil(datas[0].id)) {
       builder.insert(datas);
       await builder;
       return [datas.map(item => item.id), builder];
     }
+
+    builder.insert(datas).returning('id');
+    const items = await builder;
+    return [items.map(item => item.id), builder];
   }
 
   protected _coerceColumnValue(type: string, value) {
-    // null
     if (isNil(value)) return undefined;
-    // type
-    if (['bit', 'bool', 'boolean'].includes(type)) return safeBoolean(value);
-    if (['int'].includes(type)) return this._safeNumber(value);
-    if (this._columnTypePrefixes(type, ['timestamp']) && value === 'CURRENT_TIMESTAMP')
+    if (BOOLEAN_COLUMN_TYPES.includes(type)) return safeBoolean(value);
+    if (NUMBER_COLUMN_TYPES.includes(type)) return this._safeNumber(value);
+    if (this._columnTypePrefixes(type, TIMESTAMP_COLUMN_TYPE_PREFIXES) && value === 'CURRENT_TIMESTAMP') {
       return undefined; // new Date();
-    if (this._columnTypePrefixes(type, ['float', 'double'])) return this._safeNumber(value);
-    if (
-      this._columnTypePrefixes(type, [
-        'tinyint',
-        'smallint',
-        'mediumint',
-        'bigint',
-        'numeric',
-        'integer',
-      ])
-    ) {
-      return this._safeNumber(value);
     }
+    if (this._columnTypePrefixes(type, FLOAT_COLUMN_TYPE_PREFIXES)) return this._safeNumber(value);
+    if (this._columnTypePrefixes(type, INTEGER_COLUMN_TYPE_PREFIXES)) return this._safeNumber(value);
     // pg: NULL::character varying
     if (value.indexOf('NULL::') === 0) return undefined;
-    // others
     return value;
   }
 

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

@@ -3,7 +3,7 @@ import type { FunctionAny } from 'vona';
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
-import type { BeanDatabaseDialectBase } from '../bean/bean.databaseDialectBase.ts';
+import type { ServiceDatabaseDialectBase } from './databaseDialectBase_.ts';
 import type { IDatabaseClientDialectRecord, IDbInfo } from '../types/database.ts';
 import type { ITransactionConsistencyCommitOptions } from '../types/transaction.ts';
 import type { ServiceDatabaseClient } from './databaseClient_.ts';
@@ -63,7 +63,7 @@ export class ServiceDb extends BeanBase {
     return this.client.clientConfig.client;
   }
 
-  get dialect(): BeanDatabaseDialectBase {
+  get dialect(): ServiceDatabaseDialectBase {
     return this.bean.database.getDialect(this.dialectName);
   }
 

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

@@ -4,9 +4,9 @@ import { isNil } from '@cabloy/utils';
 import { BeanBase, cast, deepExtend } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
-import type { BeanModelCache } from '../bean/bean.model/bean.model_cache.ts';
-import type { BeanModelCrud } from '../bean/bean.model/bean.model_crud.ts';
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelCache } from '../lib/bean.model/bean.model_cache.ts';
+import type { BeanModelCrud } from '../lib/bean.model/bean.model_crud.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IModelMethodOptions, IModelRelationIncludeWrapper } from '../types/model.ts';
 import type { IModelClassRecord } from '../types/onion/model.ts';
 import type { TypeModelClassLike } from '../types/relations.ts';