vona-module-a-orm 5.1.30 → 5.1.32

package/dist/service/databaseDialectBase_.d.ts

@@ -4,6 +4,16 @@ import { BeanBase } from 'vona';
 import type { ITableColumn } from '../types/columns.ts';
 import type { ConfigDatabaseClient } from '../types/config.ts';
 import type { IDatabaseDialectCapabilities, IFetchDatabasesResultItem, IFetchIndexesResultItem, TypeDatabaseDialectTableColumnsFn } from '../types/dialect.ts';
+type ColumnDefaultLiteral = {
+    kind: 'string';
+    value: string;
+} | {
+    kind: 'boolean';
+    value: boolean;
+} | {
+    kind: 'number';
+    value: string;
+};
 export declare class ServiceDatabaseDialectBase extends BeanBase {
     protected _capabilities?: IDatabaseDialectCapabilities;
     protected _configBase?: Partial<ConfigDatabaseClient>;
@@ -19,13 +29,21 @@ export declare class ServiceDatabaseDialectBase extends BeanBase {
     query(_result: any): void;
     viewDependents(_builder: Knex.QueryBuilder, _viewName: string): Promise<string[]>;
     coerceColumn(column: Knex.ColumnInfo): ITableColumn;
-    protected _isMysqlBooleanColumn(column: ITableColumn): boolean;
+    protected _isMysqlBooleanColumn(column: Pick<ITableColumn, 'columnType'>): boolean;
     protected selectAsMysql(_builder: Knex.QueryBuilder, datas: any[], fn: TypeDatabaseDialectTableColumnsFn): Promise<any[]>;
     protected selectAsSqlite3(_builder: Knex.QueryBuilder, datas: any[], fn: TypeDatabaseDialectTableColumnsFn): Promise<any[]>;
     protected insertAsMysql(builder: Knex.QueryBuilder, datas: any[]): Promise<[TableIdentity[], Knex.QueryBuilder]>;
     protected insertAsPg(builder: Knex.QueryBuilder, datas: any[]): Promise<[TableIdentity[], Knex.QueryBuilder]>;
-    protected _coerceColumnValue(type: string, value: any): any;
-    protected _safeNumber(value: any): number | undefined;
-    protected _columnTypePrefixes(type: string, prefixes: string[]): boolean;
+    protected _coerceColumnValue(column: Pick<ITableColumn, 'type' | 'columnType'>, value: unknown): {} | undefined;
+    protected _isBooleanColumn(column: Pick<ITableColumn, 'type' | 'columnType'>): boolean;
+    protected _columnTypeName(type: string): string;
+    protected _coerceColumnLiteral(value: string): ColumnDefaultLiteral | undefined;
+    protected _unwrapColumnDefault(value: string): string;
+    protected _isScalarColumnDefault(value: string): boolean;
+    protected _isColumnDefaultBalanced(value: string): boolean;
+    protected _isExpressionColumnDefault(value: string): boolean;
+    protected _safeInteger(value: string): string | number;
+    protected _safeNumber(value: string): number | undefined;
 }
+export {};
 //# sourceMappingURL=databaseDialectBase_.d.ts.map

package/dist/service/databaseDialectBase_.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"databaseDialectBase_.d.ts","sourceRoot":"","sources":["../../src/service/databaseDialectBase_.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAGpD,OAAO,EAAE,QAAQ,EAAW,MAAM,MAAM,CAAC;AAGzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,KAAK,EACV,4BAA4B,EAC5B,yBAAyB,EACzB,uBAAuB,EACvB,iCAAiC,EAClC,MAAM,qBAAqB,CAAC;AAe7B,qBAEa,0BAA2B,SAAQ,QAAQ;IACtD,SAAS,CAAC,aAAa,CAAC,EAAE,4BAA4B,CAAC;IACvD,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAEtD,IAAI,YAAY,iCAGf;IAED,IAAI,UAAU,8CAEb;IAEK,cAAc,CAClB,cAAc,EAAE,IAAI,CAAC,aAAa,EAClC,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,yBAAyB,EAAE,CAAC;IAIjC,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI1F,YAAY,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAItF,YAAY,CAChB,cAAc,EAAE,IAAI,CAAC,aAAa,EAClC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAI/B,MAAM,CACV,QAAQ,EAAE,IAAI,CAAC,YAAY,EAC3B,MAAM,EAAE,GAAG,EAAE,GACZ,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAI1C,MAAM,CACV,QAAQ,EAAE,IAAI,CAAC,YAAY,EAC3B,KAAK,EAAE,GAAG,EAAE,EACZ,GAAG,EAAE,iCAAiC,GACrC,OAAO,CAAC,GAAG,EAAE,CAAC;IAIX,YAAY,CAChB,UAAU,EAAE,IAAI,EAChB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAI3C,KAAK,CAAC,OAAO,KAAA;IAIP,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAIvF,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,GAAG,YAAY;IAQnD,SAAS,CAAC,qBAAqB,CAAC,MAAM,EAAE,YAAY;cAIpC,aAAa,CAC3B,QAAQ,EAAE,IAAI,CAAC,YAAY,EAC3B,KAAK,EAAE,GAAG,EAAE,EACZ,EAAE,EAAE,iCAAiC,GACpC,OAAO,CAAC,GAAG,EAAE,CAAC;cAiBD,eAAe,CAC7B,QAAQ,EAAE,IAAI,CAAC,YAAY,EAC3B,KAAK,EAAE,GAAG,EAAE,EACZ,EAAE,EAAE,iCAAiC,GACpC,OAAO,CAAC,GAAG,EAAE,CAAC;cAqBD,aAAa,CAC3B,OAAO,EAAE,IAAI,CAAC,YAAY,EAC1B,KAAK,EAAE,GAAG,EAAE,GACX,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;cAoBhC,UAAU,CACxB,OAAO,EAAE,IAAI,CAAC,YAAY,EAC1B,KAAK,EAAE,GAAG,EAAE,GACX,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAahD,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,KAAA;IAsBhD,SAAS,CAAC,WAAW,CAAC,KAAK,KAAA;IAK3B,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE;CAG/D"}
+{"version":3,"file":"databaseDialectBase_.d.ts","sourceRoot":"","sources":["../../src/service/databaseDialectBase_.ts"],"names":[],"mappings":"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"}

package/dist/service/transactionFiber_.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transactionFiber_.d.ts","sourceRoot":"","sources":["../../src/service/transactionFiber_.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAKhC,qBACa,uBAAwB,SAAQ,QAAQ;IACnD,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,uBAAuB,CAAiC;IAEhE,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;IAKpD,IAAW,UAAU,sCAEpB;IAED,MAAM,CAAC,EAAE,EAAE,WAAW;IAItB,UAAU,CAAC,EAAE,EAAE,WAAW;IAIpB,QAAQ;IAKR,UAAU;IAKV,WAAW;IAIX,eAAe;CAGtB"}
+{"version":3,"file":"transactionFiber_.d.ts","sourceRoot":"","sources":["../../src/service/transactionFiber_.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAKhC,qBACa,uBAAwB,SAAQ,QAAQ;IACnD,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,uBAAuB,CAAiC;IAEhE,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;IAKpD,IAAW,UAAU,sCAEpB;IAED,MAAM,CAAC,EAAE,EAAE,WAAW;IAItB,UAAU,CAAC,EAAE,EAAE,WAAW;IAIpB,QAAQ;IASR,UAAU;IAKV,WAAW;IAIX,eAAe;CAGtB"}

package/dist/service/transaction_.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transaction_.d.ts","sourceRoot":"","sources":["../../src/service/transaction_.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAEvD,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAGhC,OAAO,KAAK,EACV,oCAAoC,EACpC,mBAAmB,EACpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAKtE,qBACa,kBAAmB,SAAQ,QAAQ;IAC9C,OAAO,CAAC,GAAG,CAAY;IAEvB,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS;IAIhC,IAAI,gBAAgB,wDAEnB;IAED,IAAI,gBAAgB,IAAI,uBAAuB,GAAG,SAAS,CAE1D;IAED,IAAI,aAAa,YAEhB;IAED,IAAI,UAAU,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,SAAS,CAElD;IAEK,MAAM,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,oCAAoC;IAW5E,UAAU,CAAC,EAAE,EAAE,WAAW;IAOpB,KAAK,CAAC,MAAM,EAAE,EAAE,EAAE,aAAa,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC;YAiDhF,uBAAuB;CAmCtC"}
+{"version":3,"file":"transaction_.d.ts","sourceRoot":"","sources":["../../src/service/transaction_.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAEvD,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAGhC,OAAO,KAAK,EACV,oCAAoC,EACpC,mBAAmB,EACpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAKtE,qBACa,kBAAmB,SAAQ,QAAQ;IAC9C,OAAO,CAAC,GAAG,CAAY;IAEvB,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS;IAIhC,IAAI,gBAAgB,wDAEnB;IAED,IAAI,gBAAgB,IAAI,uBAAuB,GAAG,SAAS,CAE1D;IAED,IAAI,aAAa,YAEhB;IAED,IAAI,UAAU,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,SAAS,CAElD;IAEK,MAAM,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,oCAAoC;IAW5E,UAAU,CAAC,EAAE,EAAE,WAAW;IAOpB,KAAK,CAAC,MAAM,EAAE,EAAE,EAAE,aAAa,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC;YAiDhF,uBAAuB;CAsCtC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-orm",
-  "version": "5.1.30",
-  "gitHead": "eb85d771ef75776a439e56df3af8be6a3a36c1c2",
+  "version": "5.1.32",
+  "gitHead": "8d575dd958be6aa16daa249bdbdb024d20d0789d",
   "description": "db",
   "keywords": [
     "Cabloy Module"

package/src/service/databaseDialectBase_.ts

@@ -15,17 +15,17 @@ import type {
 } from '../types/dialect.ts';
 
 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',
-];
+const INTEGER_COLUMN_TYPES = ['tinyint', 'smallint', 'mediumint', 'int', 'integer'];
+const FLOAT_COLUMN_TYPES = ['float', 'double'];
+const GENERATED_DEFAULT_PATTERN =
+  /^(?:current_timestamp\b(?:\s*\(\s*\d*\s*\))?|current_date\b|current_time\b(?:\s*\(\s*\d*\s*\))?|now\s*\(\s*\)|nextval\s*\()/i;
+const NUMBER_LITERAL_PATTERN = /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:e[+-]?\d+)?$/i;
+const QUOTED_LITERAL_PATTERN = /^'((?:''|[^'])*)'$/;
+
+type ColumnDefaultLiteral =
+  | { kind: 'string'; value: string }
+  | { kind: 'boolean'; value: boolean }
+  | { kind: 'number'; value: string };
 
 @Service()
 @Virtual()
@@ -96,13 +96,13 @@ 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;
+    result.default = this._coerceColumnValue(result, column.defaultValue);
     return result;
   }
 
-  protected _isMysqlBooleanColumn(column: ITableColumn) {
+  protected _isMysqlBooleanColumn(column: Pick<ITableColumn, 'columnType'>) {
     return column.columnType?.trim().toLowerCase() === 'tinyint(1)';
   }
 
@@ -191,34 +191,105 @@ export class ServiceDatabaseDialectBase extends BeanBase {
     return [items.map(item => item.id), builder];
   }
 
-  protected _coerceColumnValue(type: string, value) {
+  protected _coerceColumnValue(column: Pick<ITableColumn, 'type' | 'columnType'>, value: unknown) {
     if (isNil(value)) return undefined;
-    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 (typeof value !== 'string') {
+      return this._isBooleanColumn(column) ? safeBoolean(value as any) : value;
     }
-    if (this._columnTypePrefixes(type, FLOAT_COLUMN_TYPE_PREFIXES)) {
-      return this._safeNumber(value);
+
+    const literal = this._coerceColumnLiteral(value);
+    if (literal === undefined) return undefined;
+    if (this._isBooleanColumn(column)) return safeBoolean(literal.value);
+    if (literal.kind === 'boolean') return literal.value;
+
+    const type = this._columnTypeName(column.type);
+    if (literal.kind === 'string') return literal.value;
+    if (INTEGER_COLUMN_TYPES.includes(type)) return this._safeInteger(literal.value);
+    if (FLOAT_COLUMN_TYPES.includes(type)) return this._safeNumber(literal.value);
+    return literal.value;
+  }
+
+  protected _isBooleanColumn(column: Pick<ITableColumn, 'type' | 'columnType'>) {
+    return (
+      this._isMysqlBooleanColumn(column) ||
+      BOOLEAN_COLUMN_TYPES.includes(this._columnTypeName(column.type))
+    );
+  }
+
+  protected _columnTypeName(type: string) {
+    return type.trim().toLowerCase().match(/^\w+/)?.[0] ?? '';
+  }
+
+  protected _coerceColumnLiteral(value: string): ColumnDefaultLiteral | undefined {
+    const literal = this._unwrapColumnDefault(value);
+    if (literal === '') return undefined;
+    const literalLower = literal.toLowerCase();
+    if (literalLower === 'null' || GENERATED_DEFAULT_PATTERN.test(literal)) return undefined;
+    const quoted = literal.match(QUOTED_LITERAL_PATTERN);
+    if (quoted) return { kind: 'string', value: quoted[1].replaceAll("''", "'") };
+    if (literalLower === 'true' || literalLower === 't') return { kind: 'boolean', value: true };
+    if (literalLower === 'false' || literalLower === 'f') return { kind: 'boolean', value: false };
+    if (NUMBER_LITERAL_PATTERN.test(literal)) return { kind: 'number', value: literal };
+    if (this._isExpressionColumnDefault(literal)) return undefined;
+    return { kind: 'string', value: literal };
+  }
+
+  protected _unwrapColumnDefault(value: string) {
+    let literal = value.trim();
+    while (literal.startsWith('(') && literal.endsWith(')')) {
+      const inner = literal.slice(1, -1).trim();
+      if (!inner || !this._isColumnDefaultBalanced(inner)) break;
+      literal = inner;
     }
-    if (this._columnTypePrefixes(type, INTEGER_COLUMN_TYPE_PREFIXES)) {
-      return this._safeNumber(value);
+    const castIndex = literal.indexOf('::');
+    if (castIndex > 0 && this._isScalarColumnDefault(literal.slice(0, castIndex).trim())) {
+      literal = literal.slice(0, castIndex).trim();
     }
-    // pg: NULL::character varying
-    if (value.indexOf('NULL::') === 0) return undefined;
-    return value;
+    return literal;
   }
 
-  // pg: nextval
-  protected _safeNumber(value) {
+  protected _isScalarColumnDefault(value: string) {
+    return (
+      value.toLowerCase() === 'null' ||
+      QUOTED_LITERAL_PATTERN.test(value) ||
+      value.toLowerCase() === 'true' ||
+      value.toLowerCase() === 'false' ||
+      NUMBER_LITERAL_PATTERN.test(value)
+    );
+  }
+
+  protected _isColumnDefaultBalanced(value: string) {
+    let depth = 0;
+    let quoted = false;
+    for (let index = 0; index < value.length; index++) {
+      const char = value[index];
+      if (char === "'") {
+        if (quoted && value[index + 1] === "'") {
+          index++;
+        } else {
+          quoted = !quoted;
+        }
+      } else if (!quoted && char === '(') {
+        depth++;
+      } else if (!quoted && char === ')') {
+        if (depth === 0) return false;
+        depth--;
+      }
+    }
+    return !quoted && depth === 0;
+  }
+
+  protected _isExpressionColumnDefault(value: string) {
+    return /[()*/+\-\s]/.test(value);
+  }
+
+  protected _safeInteger(value: string) {
     const num = Number(value);
-    return Number.isNaN(num) ? undefined : num;
+    return Number.isSafeInteger(num) ? num : value;
   }
 
-  protected _columnTypePrefixes(type: string, prefixes: string[]) {
-    return prefixes.some(prefix => type.includes(prefix));
+  protected _safeNumber(value: string) {
+    const num = Number(value);
+    return Number.isFinite(num) ? num : undefined;
   }
 }

package/src/service/transactionFiber_.ts

@@ -29,8 +29,12 @@ export class ServiceTransactionFiber extends BeanBase {
   }
 
   async doCommit() {
-    await this._connection.commit();
-    this._connection = undefined as any;
+    const connection = this._connection;
+    try {
+      await Promise.all([connection.executionPromise, connection.commit()]);
+    } finally {
+      this._connection = undefined as any;
+    }
   }
 
   async doRollback() {

package/src/service/transaction_.ts

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