cabloy 5.1.136 → 5.1.138

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

@@ -6,15 +6,15 @@ export * from '../bean/interceptor.openapiSchema.ts';
 import type { IInterceptorOptionsOpenapiSchema } from '../bean/interceptor.openapiSchema.ts';
 import 'vona-module-a-aspect';
 declare module 'vona-module-a-aspect' {
-  
+
     export interface IInterceptorRecordGlobal {
       'a-openapischema:openapiSchema': IInterceptorOptionsOpenapiSchema;
     }
 
-  
+
 }
 declare module 'vona-module-a-openapischema' {
-  
+
         export interface InterceptorOpenapiSchema {
           /** @internal */
           get scope(): ScopeModuleAOpenapischema;
@@ -24,7 +24,7 @@ declare module 'vona-module-a-openapischema' {
             get $beanFullName(): 'a-openapischema.interceptor.openapiSchema';
             get $onionName(): 'a-openapischema:openapiSchema';
             get $onionOptions(): IInterceptorOptionsOpenapiSchema;
-          } 
+          }
 }
 /** interceptor: end */
 /** dto: begin */
@@ -32,21 +32,21 @@ export * from '../dto/bootstrap.tsx';
 import type { IDtoOptionsBootstrap } from '../dto/bootstrap.tsx';
 import 'vona-module-a-web';
 declare module 'vona-module-a-web' {
-  
+
     export interface IDtoRecord {
       'a-openapischema:bootstrap': IDtoOptionsBootstrap;
     }
 
-  
+
 }
 declare module 'vona-module-a-openapischema' {
-   
+
 }
 /** dto: end */
 /** dto: begin */
 import type { DtoBootstrap } from '../dto/bootstrap.tsx';
 declare module 'vona-module-a-openapischema' {
-  
+
     export interface IDtoOptionsBootstrap {
       fields?: TypeEntityOptionsFields<DtoBootstrap, IDtoOptionsBootstrap[TypeSymbolKeyFieldsMore]>;
     }
@@ -57,15 +57,15 @@ export * from '../controller/resource.ts';
 import type { IControllerOptionsResource } from '../controller/resource.ts';
 import 'vona-module-a-web';
 declare module 'vona-module-a-web' {
-  
+
     export interface IControllerRecord {
       'a-openapischema:resource': IControllerOptionsResource;
     }
 
-  
+
 }
 declare module 'vona-module-a-openapischema' {
-  
+
         export interface ControllerResource {
           /** @internal */
           get scope(): ScopeModuleAOpenapischema;
@@ -75,14 +75,14 @@ declare module 'vona-module-a-openapischema' {
             get $beanFullName(): 'a-openapischema.controller.resource';
             get $onionName(): 'a-openapischema:resource';
             get $onionOptions(): IControllerOptionsResource;
-          } 
+          }
 }
 /** controller: end */
 /** controller: begin */
 // @ts-ignore ignore
 import type { ControllerResource } from '../controller/resource.ts';
 declare module 'vona-module-a-openapischema' {
-  
+
     export interface IControllerOptionsResource {
       actions?: TypeControllerOptionsActions<ControllerResource>;
     }
@@ -115,11 +115,11 @@ declare module 'vona' {
   export interface IBeanScopeContainer {
     openapischema: ScopeModuleAOpenapischema;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
 /** scope: end */

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-openapiutils",
-  "version": "5.1.20",
+  "version": "5.1.21",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

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

@@ -23,13 +23,13 @@ declare module 'vona' {
   export interface IBeanScopeContainer {
     openapiutils: ScopeModuleAOpenapiutils;
   }
-  
-  
+
+
 
   export interface IBeanScopeLocale {
     'a-openapiutils': (typeof locales)[TypeLocaleBase];
   }
 
-  
+
 }
 /** scope: end */

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

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

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

@@ -4,15 +4,15 @@ export * from '../bean/aopMethod.transaction.ts';
 import type { IAopMethodOptionsTransaction } from '../bean/aopMethod.transaction.ts';
 import 'vona-module-a-aspect';
 declare module 'vona-module-a-aspect' {
-  
+
     export interface IAopMethodRecord {
       'a-orm:transaction': IAopMethodOptionsTransaction;
     }
 
-  
+
 }
 declare module 'vona-module-a-orm' {
-  
+
         export interface AopMethodTransaction {
           /** @internal */
           get scope(): ScopeModuleAOrm;
@@ -22,7 +22,7 @@ declare module 'vona-module-a-orm' {
             get $beanFullName(): 'a-orm.aopMethod.transaction';
             get $onionName(): 'a-orm:transaction';
             get $onionOptions(): IAopMethodOptionsTransaction;
-          } 
+          }
 }
 /** aopMethod: end */
 /** bean: begin */
@@ -31,15 +31,15 @@ export * from '../bean/bean.model.ts';
 
 import 'vona';
 declare module 'vona' {
-  
-  
+
+
 }
 declare module 'vona-module-a-orm' {
-  
+
         export interface BeanDatabase {
           /** @internal */
           get scope(): ScopeModuleAOrm;
-        } 
+        }
 }
 /** bean: end */
 /** bean: begin */
@@ -74,15 +74,15 @@ export * from '../service/transaction_.ts';
 
 import 'vona-module-a-bean';
 declare module 'vona-module-a-bean' {
-  
+
     export interface IServiceRecord {
       'a-orm:database': never;
     }
 
-  
+
 }
 declare module 'vona-module-a-orm' {
-  
+
         export interface ServiceDatabase {
           /** @internal */
           get scope(): ScopeModuleAOrm;
@@ -91,8 +91,7 @@ declare module 'vona-module-a-orm' {
           export interface ServiceDatabase {
             get $beanFullName(): 'a-orm.service.database';
             get $onionName(): 'a-orm:database';
-            
-          } 
+          }
 }
 /** service: end */
 /** service: begin */
@@ -115,15 +114,15 @@ export * from '../bean/broadcast.columnsClear.ts';
 
 import { type IDecoratorBroadcastOptions } from 'vona-module-a-broadcast';
 declare module 'vona-module-a-broadcast' {
-  
+
     export interface IBroadcastRecord {
       'a-orm:columnsClear': IDecoratorBroadcastOptions;
     }
 
-  
+
 }
 declare module 'vona-module-a-orm' {
-  
+
         export interface BroadcastColumnsClear {
           /** @internal */
           get scope(): ScopeModuleAOrm;
@@ -133,7 +132,7 @@ declare module 'vona-module-a-orm' {
             get $beanFullName(): 'a-orm.broadcast.columnsClear';
             get $onionName(): 'a-orm:columnsClear';
             get $onionOptions(): IDecoratorBroadcastOptions;
-          } 
+          }
 }
 /** broadcast: end */
 /** broadcast: begin */
@@ -148,11 +147,11 @@ export * from '../bean/event.columnsClear.ts';
 
 import 'vona';
 declare module 'vona' {
-  
-  
+
+
 }
 declare module 'vona-module-a-orm' {
-  
+
         export interface EventClientNameReal {
           /** @internal */
           get scope(): ScopeModuleAOrm;
@@ -161,7 +160,6 @@ declare module 'vona-module-a-orm' {
           export interface EventClientNameReal {
             get $beanFullName(): 'a-orm.event.clientNameReal';
             get $onionName(): 'a-orm:clientNameReal';
-            
           }
 
         export interface EventColumnsClear {
@@ -172,8 +170,7 @@ declare module 'vona-module-a-orm' {
           export interface EventColumnsClear {
             get $beanFullName(): 'a-orm.event.columnsClear';
             get $onionName(): 'a-orm:columnsClear';
-            
-          } 
+          }
 }
 /** event: end */
 /** event: begin */
@@ -187,7 +184,7 @@ export interface IModuleEvent {
 /** event: begin */
 import type { TypeEventClientNameRealData, TypeEventClientNameRealResult } from '../bean/event.clientNameReal.ts';
 import type { TypeEventColumnsClearData, TypeEventColumnsClearResult } from '../bean/event.columnsClear.ts';
-import type { EventOn } from 'vona-module-a-event'; 
+import type { EventOn } from 'vona-module-a-event';
 declare module 'vona-module-a-event' {
   export interface IEventRecord {
     'a-orm:clientNameReal': EventOn<TypeEventClientNameRealData, TypeEventClientNameRealResult>;
@@ -201,16 +198,16 @@ export * from '../bean/hmr.model.ts';
 
 import 'vona';
 declare module 'vona' {
-  
+
     export interface IHmrRecord {
       'a-orm:entity': never;
 'a-orm:model': never;
     }
 
-  
+
 }
 declare module 'vona-module-a-orm' {
-  
+
         export interface HmrEntity {
           /** @internal */
           get scope(): ScopeModuleAOrm;
@@ -219,7 +216,6 @@ declare module 'vona-module-a-orm' {
           export interface HmrEntity {
             get $beanFullName(): 'a-orm.hmr.entity';
             get $onionName(): 'a-orm:entity';
-            
           }
 
         export interface HmrModel {
@@ -230,8 +226,7 @@ declare module 'vona-module-a-orm' {
           export interface HmrModel {
             get $beanFullName(): 'a-orm.hmr.model';
             get $onionName(): 'a-orm:model';
-            
-          } 
+          }
 }
 /** hmr: end */
 /** queue: begin */
@@ -239,15 +234,15 @@ export * from '../bean/queue.doubleDelete.ts';
 
 import { type IDecoratorQueueOptions } from 'vona-module-a-queue';
 declare module 'vona-module-a-queue' {
-  
+
     export interface IQueueRecord {
       'a-orm:doubleDelete': IDecoratorQueueOptions;
     }
 
-  
+
 }
 declare module 'vona-module-a-orm' {
-  
+
         export interface QueueDoubleDelete {
           /** @internal */
           get scope(): ScopeModuleAOrm;
@@ -257,7 +252,7 @@ declare module 'vona-module-a-orm' {
             get $beanFullName(): 'a-orm.queue.doubleDelete';
             get $onionName(): 'a-orm:doubleDelete';
             get $onionOptions(): IDecoratorQueueOptions;
-          } 
+          }
 }
 /** queue: end */
 /** queue: begin */
@@ -271,15 +266,15 @@ export * from '../bean/schedule.softDeletionPrune.ts';
 
 import { type IDecoratorScheduleOptions } from 'vona-module-a-schedule';
 declare module 'vona-module-a-schedule' {
-  
+
     export interface IScheduleRecord {
       'a-orm:softDeletionPrune': IDecoratorScheduleOptions;
     }
 
-  
+
 }
 declare module 'vona-module-a-orm' {
-  
+
         export interface ScheduleSoftDeletionPrune {
           /** @internal */
           get scope(): ScopeModuleAOrm;
@@ -289,7 +284,7 @@ declare module 'vona-module-a-orm' {
             get $beanFullName(): 'a-orm.schedule.softDeletionPrune';
             get $onionName(): 'a-orm:softDeletionPrune';
             get $onionOptions(): IDecoratorScheduleOptions;
-          } 
+          }
 }
 /** schedule: end */
 /** config: begin */
@@ -333,7 +328,7 @@ declare module 'vona' {
   export interface IBeanScopeContainer {
     orm: ScopeModuleAOrm;
   }
-  
+
   export interface IBeanScopeConfig {
     'a-orm': ReturnType<typeof config>;
   }

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

@@ -62,10 +62,12 @@ export class BeanModelView<TRecord extends {}> extends BeanModelKnex<TRecord> {
     callback: (tableBuilder: Knex.CreateTableBuilder) => any,
   ): Promise<void> {
     await this.schema.createTable(tableName, callback);
+    this.db.columns.columnsClear(tableName);
   }
 
   async dropTable(tableName: string) {
     await this.schema.dropTable(tableName);
+    this.db.columns.columnsClear(tableName);
   }
 
   async alterTable(
@@ -75,15 +77,17 @@ export class BeanModelView<TRecord extends {}> extends BeanModelKnex<TRecord> {
   ): Promise<void> {
     if (!alterViewAuto) {
       // alter table
-      return await this.schema.alterTable(tableName, table => {
-        return callback(table);
-      });
-    }
-    await this._viewDependentsAll_handle(tableName, async () => {
       await this.schema.alterTable(tableName, table => {
         return callback(table);
       });
-    });
+    } else {
+      await this._viewDependentsAll_handle(tableName, async () => {
+        await this.schema.alterTable(tableName, table => {
+          return callback(table);
+        });
+      });
+    }
+    this.db.columns.columnsClear(tableName);
   }
 
   async viewDependents(viewName: string): Promise<string[]> {

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

@@ -32,8 +32,7 @@ export class ServiceColumns extends BeanBase {
     let columns = this.serviceColumnsCache.getColumnsCache(tableName);
     if (!columns) {
       const dialect = this.db.dialect;
-      const connection = this.db.connection;
-      const map = await connection(tableName).columnInfo();
+      const map = await dialect.fetchColumns(this.db.connection, tableName);
       columns = {};
       for (const name in map) {
         columns[name] = dialect.coerceColumn(map[name]);

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

@@ -79,6 +79,13 @@ export class ServiceDatabaseDialectBase extends BeanBase {
     return datas;
   }
 
+  async fetchColumns(
+    connection: Knex,
+    tableName: string,
+  ): Promise<Record<string, Knex.ColumnInfo>> {
+    return await connection(tableName).columnInfo();
+  }
+
   query(_result) {
     throw new Error('Not Implemented');
   }
@@ -90,9 +97,36 @@ export class ServiceDatabaseDialectBase extends BeanBase {
   coerceColumn(column: Knex.ColumnInfo): ITableColumn {
     const result = { type: column.type } as ITableColumn;
     result.default = this._coerceColumnValue(column.type, column.defaultValue);
+    const columnType = (column as Knex.ColumnInfo & { columnType?: string }).columnType;
+    if (columnType) result.columnType = columnType;
     return result;
   }
 
+  protected _isMysqlBooleanColumn(column: ITableColumn) {
+    return column.columnType?.trim().toLowerCase() === 'tinyint(1)';
+  }
+
+  protected async selectAsMysql(
+    _builder: Knex.QueryBuilder,
+    datas: any[],
+    fn: TypeDatabaseDialectTableColumnsFn,
+  ): Promise<any[]> {
+    const columns = await fn();
+    for (const data of datas) {
+      for (const columnName in columns) {
+        const column = columns[columnName];
+        if (
+          Object.prototype.hasOwnProperty.call(data, columnName) &&
+          this._isMysqlBooleanColumn(column)
+        ) {
+          const value = data[columnName];
+          if (!isNil(value)) data[columnName] = safeBoolean(value);
+        }
+      }
+    }
+    return datas;
+  }
+
   protected async selectAsSqlite3(
     _builder: Knex.QueryBuilder,
     datas: any[],
@@ -105,7 +139,9 @@ export class ServiceDatabaseDialectBase extends BeanBase {
         const column = columns[columnName];
         if (Object.prototype.hasOwnProperty.call(data, columnName)) {
           const value = data[columnName];
-          if (column.type === 'json' && !isNil(value) && typeof value === 'string') {
+          if (BOOLEAN_COLUMN_TYPES.includes(column.type) && !isNil(value)) {
+            data[columnName] = safeBoolean(value);
+          } else if (column.type === 'json' && !isNil(value) && typeof value === 'string') {
             data[columnName] = JSON.parse(value);
           } else if (column.type === 'datetime' && !isNil(value)) {
             data[columnName] = new Date(value);

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

@@ -30,13 +30,19 @@ export class ServiceTransactionFiber extends BeanBase {
 
   async doCommit() {
     await this._connection.commit();
-    await this._transactionConsistency.commitsDone();
     this._connection = undefined as any;
   }
 
   async doRollback() {
     await this._connection.rollback();
-    await this._transactionConsistency.compensatesDone();
     this._connection = undefined as any;
   }
+
+  async commitsDone() {
+    await this._transactionConsistency.commitsDone();
+  }
+
+  async compensatesDone() {
+    await this._transactionConsistency.compensatesDone();
+  }
 }

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

@@ -127,20 +127,17 @@ export class ServiceTransaction extends BeanBase {
       if (fiber) {
         await fiber.doRollback();
         this.transactionState.remove(this._db);
+        await fiber.compensatesDone();
       }
       throw err;
     }
-    try {
-      if (fiber) {
+    if (fiber) {
+      try {
         await fiber.doCommit();
+      } finally {
         this.transactionState.remove(this._db);
       }
-    } catch (err) {
-      if (fiber) {
-        await fiber.doRollback();
-        this.transactionState.remove(this._db);
-      }
-      throw err;
+      await fiber.commitsDone();
     }
     return res;
   }

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

@@ -1,6 +1,7 @@
 export interface ITableColumn {
   type: string;
   default: any;
+  columnType?: string;
 }
 
 export type ITableColumns = Record<string, ITableColumn>;

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-ormdialect",
-  "version": "5.1.16",
+  "version": "5.1.17",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

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

@@ -10,7 +10,7 @@ import type { IDatabaseDialectOptionsMysql3 } from '../bean/databaseDialect.mysq
 import type { IDatabaseDialectOptionsPg } from '../bean/databaseDialect.pg.ts';
 import 'vona-module-a-orm';
 declare module 'vona-module-a-orm' {
-  
+
     export interface IDatabaseDialectRecord {
       'a-ormdialect:betterSqlite3': IDatabaseDialectOptionsBetterSqlite3;
 'a-ormdialect:mysql': IDatabaseDialectOptionsMysql;
@@ -18,10 +18,10 @@ declare module 'vona-module-a-orm' {
 'a-ormdialect:pg': IDatabaseDialectOptionsPg;
     }
 
-  
+
 }
 declare module 'vona-module-a-ormdialect' {
-  
+
         export interface DatabaseDialectBetterSqlite3 {
           /** @internal */
           get scope(): ScopeModuleAOrmdialect;
@@ -53,7 +53,7 @@ declare module 'vona-module-a-ormdialect' {
             get $beanFullName(): 'a-ormdialect.databaseDialect.pg';
             get $onionName(): 'a-ormdialect:pg';
             get $onionOptions(): IDatabaseDialectOptionsPg;
-          } 
+          }
 }
 /** databaseDialect: end */
 /** databaseDialect: begin */
@@ -91,11 +91,11 @@ declare module 'vona' {
   export interface IBeanScopeContainer {
     ormdialect: ScopeModuleAOrmdialect;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
 /** scope: end */

package/vona/src/suite-vendor/a-vona/modules/a-ormdialect/src/bean/databaseDialect.mysql.ts

@@ -5,6 +5,7 @@ import type {
   IDatabaseDialectCapabilities,
   IDecoratorDatabaseDialectOptions,
   IFetchDatabasesResultItem,
+  TypeDatabaseDialectTableColumnsFn,
   IFetchIndexesResultItem,
 } from 'vona-module-a-orm';
 
@@ -74,6 +75,33 @@ export class DatabaseDialectMysql extends ServiceDatabaseDialectBase {
     return await this.insertAsMysql(builder, datas);
   }
 
+  async select(
+    builder: Knex.QueryBuilder,
+    datas: any[],
+    fn: TypeDatabaseDialectTableColumnsFn,
+  ): Promise<any[]> {
+    return await this.selectAsMysql(builder, datas, fn);
+  }
+
+  async fetchColumns(
+    connection: Knex,
+    tableName: string,
+  ): Promise<Record<string, Knex.ColumnInfo>> {
+    const columns = await super.fetchColumns(connection, tableName);
+    const result = await connection.raw(
+      `SELECT COLUMN_NAME AS columnName, COLUMN_TYPE AS columnType
+       FROM information_schema.columns
+       WHERE table_schema = database() AND table_name = ?`,
+      [tableName],
+    );
+    for (const item of result[0]) {
+      const column = columns[item.columnName];
+      if (column)
+        (column as Knex.ColumnInfo & { columnType?: string }).columnType = item.columnType;
+    }
+    return columns;
+  }
+
   query(result) {
     return result[0];
   }

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

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

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

@@ -19,11 +19,11 @@ declare module 'vona' {
   export interface IBeanScopeContainer {
     ormutils: ScopeModuleAOrmutils;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
 /** scope: end */