vona-module-a-orm 5.1.30 → 5.1.32

package/dist/index.js

@@ -359,8 +359,12 @@ let ServiceTransactionFiber = class ServiceTransactionFiber extends BeanBase {
     this._transactionConsistency.compensate(cb);
   }
   async doCommit() {
-    await this._connection.commit();
-    this._connection = undefined;
+    const connection = this._connection;
+    try {
+      await Promise.all([connection.executionPromise, connection.commit()]);
+    } finally {
+      this._connection = undefined;
+    }
   }
   async doRollback() {
     await this._connection.rollback();
@@ -539,9 +543,12 @@ let ServiceTransaction = 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;
@@ -2156,10 +2163,11 @@ ServiceCacheQuery = __decorate([Service(), BeanInfo({
 })], ServiceCacheQuery);
 
 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 = /^'((?:''|[^'])*)'$/;
 let ServiceDatabaseDialectBase = class ServiceDatabaseDialectBase extends BeanBase {
   constructor(...args) {
     super(...args);
@@ -2204,9 +2212,9 @@ let ServiceDatabaseDialectBase = class ServiceDatabaseDialectBase extends BeanBa
     const result = {
       type: column.type
     };
-    result.default = this._coerceColumnValue(column.type, column.defaultValue);
     const columnType = column.columnType;
     if (columnType) result.columnType = columnType;
+    result.default = this._coerceColumnValue(result, column.defaultValue);
     return result;
   }
   _isMysqlBooleanColumn(column) {
@@ -2274,30 +2282,101 @@ let ServiceDatabaseDialectBase = class ServiceDatabaseDialectBase extends BeanBa
     const items = await builder;
     return [items.map(item => item.id), builder];
   }
-  _coerceColumnValue(type, value) {
+  _coerceColumnValue(column, value) {
     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 (this._columnTypePrefixes(type, FLOAT_COLUMN_TYPE_PREFIXES)) {
-      return this._safeNumber(value);
-    }
-    if (this._columnTypePrefixes(type, INTEGER_COLUMN_TYPE_PREFIXES)) {
-      return this._safeNumber(value);
+    if (typeof value !== 'string') {
+      return this._isBooleanColumn(column) ? safeBoolean(value) : 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;
+  }
+  _isBooleanColumn(column) {
+    return this._isMysqlBooleanColumn(column) || BOOLEAN_COLUMN_TYPES.includes(this._columnTypeName(column.type));
+  }
+  _columnTypeName(type) {
+    return type.trim().toLowerCase().match(/^\w+/)?.[0] ?? '';
+  }
+  _coerceColumnLiteral(value) {
+    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
+    };
+  }
+  _unwrapColumnDefault(value) {
+    let literal = value.trim();
+    while (literal.startsWith('(') && literal.endsWith(')')) {
+      const inner = literal.slice(1, -1).trim();
+      if (!inner || !this._isColumnDefaultBalanced(inner)) break;
+      literal = inner;
+    }
+    const castIndex = literal.indexOf('::');
+    if (castIndex > 0 && this._isScalarColumnDefault(literal.slice(0, castIndex).trim())) {
+      literal = literal.slice(0, castIndex).trim();
+    }
+    return literal;
+  }
+  _isScalarColumnDefault(value) {
+    return value.toLowerCase() === 'null' || QUOTED_LITERAL_PATTERN.test(value) || value.toLowerCase() === 'true' || value.toLowerCase() === 'false' || NUMBER_LITERAL_PATTERN.test(value);
+  }
+  _isColumnDefaultBalanced(value) {
+    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--;
+      }
     }
-    // pg: NULL::character varying
-    if (value.indexOf('NULL::') === 0) return undefined;
-    return value;
+    return !quoted && depth === 0;
   }
-  // pg: nextval
-  _safeNumber(value) {
+  _isExpressionColumnDefault(value) {
+    return /[()*/+\-\s]/.test(value);
+  }
+  _safeInteger(value) {
     const num = Number(value);
-    return Number.isNaN(num) ? undefined : num;
+    return Number.isSafeInteger(num) ? num : value;
   }
-  _columnTypePrefixes(type, prefixes) {
-    return prefixes.some(prefix => type.includes(prefix));
+  _safeNumber(value) {
+    const num = Number(value);
+    return Number.isFinite(num) ? num : undefined;
   }
 };
 ServiceDatabaseDialectBase = __decorate([Service(), Virtual(), BeanInfo({