baja-lite 1.8.4 → 1.8.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.8.4",
+  "version": "1.8.6",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/baja-lite",
   "repository": {
@@ -43,7 +43,7 @@
     "pino": "10.3.1",
     "pino-pretty": "13.1.3",
     "reflect-metadata": "0.2.2",
-    "sql-formatter": "15.7.3",
+    "sql-formatter": "15.8.1",
     "sqlstring": "2.3.3",
     "tslib": "2.8.1"
   },

package/sql.d.ts

@@ -2158,13 +2158,14 @@ export declare function MethodCache<T = any>(config: {
     /** 随着当前用户sesion的清空而一起清空 */
     clearWithSession?: boolean;
 }): (target: T, _propertyKey: string, descriptor: PropertyDescriptor) => void;
-export declare const LOG_LEVELS: ["verbose", "debug", "info", "warn", "error", "fatal"];
+export declare const LOG_LEVELS: ["verbose", "debug", "info", "log", "warn", "error", "fatal"];
 export type LogLevel = (typeof LOG_LEVELS)[number];
 export interface LoggerService {
     /**
      * Write a 'log' level log.
      */
     log(message: any, ...optionalParams: any[]): any;
+    info(message: any, ...optionalParams: any[]): any;
     /**
      * Write an 'error' level log.
      */
@@ -2195,6 +2196,7 @@ export declare class PrinterLogger implements LoggerService {
     private logger;
     constructor();
     log(message: any, ...optionalParams: any[]): void;
+    info(message: any, ...optionalParams: any[]): void;
     fatal(message: any, ...optionalParams: any[]): void;
     error(message: any, ...optionalParams: any[]): void;
     warn(message: any, ...optionalParams: any[]): void;

package/sql.js

@@ -18,7 +18,7 @@ import pino from 'pino';
 import { formatDialect, mysql, postgresql, sqlite } from 'sql-formatter';
 import tslib from 'tslib';
 import { convert } from './convert-xml.js';
-import { DatabaseError, Throw } from './error.js';
+import { Throw } from './error.js';
 import { excuteSplit, ExcuteSplitMode, sleep } from './fn.js';
 import { add, calc, ten2Any } from './math.js';
 import { C2P, C2P2, P2C } from './object.js';
@@ -248,9 +248,8 @@ class MysqlConnection {
                 resolve({ affectedRows: result.affectedRows, insertId: result.insertId });
             }
             catch (error) {
-                const dbError = DatabaseError.query('MySQL execute failed', sql, params, error);
-                globalThis[_LoggerService].error(dbError.getSafeMessage(), { cause: error });
-                reject(dbError);
+                globalThis[_LoggerService].error(error.message, { cause: error });
+                reject(error);
             }
         });
     }
@@ -443,9 +442,8 @@ export class Mysql {
                 resolve(new MysqlConnection(connection));
             }
             catch (error) {
-                const dbError = DatabaseError.connection('Failed to create MySQL connection', error);
-                globalThis[_LoggerService].error(dbError.getSafeMessage(), { cause: error });
-                reject(dbError);
+                globalThis[_LoggerService].error(error.message, { cause: error });
+                reject(error);
             }
         });
     }
@@ -484,9 +482,8 @@ export class Mysql {
                     await conn[_daoConnection].rollback();
                     globalThis[_LoggerService].debug?.('rollback end!');
                 }
-                const dbError = error instanceof DatabaseError ? error : DatabaseError.transaction('MySQL transaction failed', error);
-                globalThis[_LoggerService].error(dbError.getSafeMessage(), { cause: error });
-                reject(dbError);
+                globalThis[_LoggerService].error(error.message, { cause: error });
+                reject(error);
             }
             finally {
                 try {
@@ -802,9 +799,8 @@ export class Postgresql {
                     await conn[_daoConnection].query('ROLLBACK');
                     globalThis[_LoggerService].debug?.('rollback end!');
                 }
-                const dbError = error instanceof DatabaseError ? error : DatabaseError.transaction('PostgreSQL transaction failed', error);
-                globalThis[_LoggerService].error(dbError.getSafeMessage(), { cause: error });
-                reject(dbError);
+                globalThis[_LoggerService].error(error.message, { cause: error });
+                reject(error);
             }
             finally {
                 try {
@@ -5451,6 +5447,9 @@ export class PrinterLogger {
     log(message, ...optionalParams) {
         this.logger.info(message, ...optionalParams);
     }
+    info(message, ...optionalParams) {
+        this.logger.info(message, ...optionalParams);
+    }
     fatal(message, ...optionalParams) {
         this.logger.fatal(message, ...optionalParams);
     }