baja-lite 1.6.7 → 1.7.1

package/boot-remote.js

@@ -1,5 +1,5 @@
 import { DBType, _Hump, getEnums } from 'baja-lite-field';
-import { ColumnMode, SqlCache, SqliteRemote, _Context, _DataConvert, _GlobalSqlOption, _dao, _defOption, _enum, _primaryDB, _sqlCache, logger } from './sql.js';
+import { ColumnMode, PrinterLogger, SqlCache, SqliteRemote, _Context, _DataConvert, _GlobalSqlOption, _LoggerService, _dao, _defOption, _enum, _primaryDB, _sqlCache } from './sql.js';
 export const BootRomote = async function (options) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption);
     if (options.skipEmptyString !== undefined) {
@@ -17,8 +17,14 @@ export const BootRomote = async function (options) {
     if (options.SqliteRemote !== undefined) {
         globalThis[_GlobalSqlOption].SqliteRemote = options.SqliteRemote;
     }
+    if (options.logger) {
+        globalThis[_LoggerService] = options.logger;
+    }
+    else {
+        globalThis[_LoggerService] = new PrinterLogger();
+    }
+    globalThis[_LoggerService].setLogLevels(options.log ? (options.log instanceof Array ? options.log : [options.log]) : ['info']);
     globalThis[_Hump] = options.columnMode === ColumnMode.HUMP;
-    logger.level = options.log ?? 'info';
     globalThis[_sqlCache] = new SqlCache();
     if (options.sqlMap) {
         await globalThis[_sqlCache].init(options);

package/boot.js

@@ -1,6 +1,6 @@
 import { _Hump, DBType, getEnums } from 'baja-lite-field';
 import events from 'events';
-import { _Context, _dao, _DataConvert, _defOption, _enum, _EventBus, _fs, _GlobalSqlOption, _path, _primaryDB, _sqlCache, ColumnMode, logger, Mysql, Postgresql, SqlCache, Sqlite, SqliteRemote } from './sql.js';
+import { _Context, _dao, _DataConvert, _defOption, _enum, _EventBus, _fs, _GlobalSqlOption, _LoggerService, _path, _primaryDB, _sqlCache, ColumnMode, Mysql, Postgresql, PrinterLogger, SqlCache, Sqlite, SqliteRemote } from './sql.js';
 export const Boot = async function (options) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption);
     if (options.skipEmptyString !== undefined) {
@@ -15,8 +15,14 @@ export const Boot = async function (options) {
     if (options.maxDeal !== undefined) {
         globalThis[_GlobalSqlOption].maxDeal = options.maxDeal;
     }
+    if (options.logger) {
+        globalThis[_LoggerService] = options.logger;
+    }
+    else {
+        globalThis[_LoggerService] = new PrinterLogger();
+    }
+    globalThis[_LoggerService].setLogLevels(options.log ? (options.log instanceof Array ? options.log : [options.log]) : ['info']);
     globalThis[_Hump] = options.columnMode === ColumnMode.HUMP;
-    logger.level = options.log ?? 'info';
     globalThis[_sqlCache] = new SqlCache();
     if (options.sqlDir) {
         globalThis[_path] = await import('path');
@@ -142,7 +148,7 @@ export const Boot = async function (options) {
         const { EventEmitter } = await import('events');
         const event = new EventEmitter({ captureRejections: true });
         event.on('error', error => {
-            logger.error('event-bus', error);
+            globalThis[_LoggerService].error('event-bus', error);
         });
         globalThis[_EventBus] = event;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.6.7",
+  "version": "1.7.1",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/baja-lite",
   "repository": {
@@ -44,11 +44,11 @@
     "iterare": "1.2.1",
     "mustache": "4.2.0",
     "pino": "10.1.0",
-    "pino-pretty": "13.1.2",
+    "pino-pretty": "13.1.3",
     "reflect-metadata": "0.2.2",
     "request": "2.88.2",
     "request-promise": "4.2.6",
-    "sql-formatter": "15.6.10",
+    "sql-formatter": "15.6.12",
     "sqlstring": "2.3.3",
     "tslib": "2.8.1"
   },

package/sql.d.ts

@@ -1,6 +1,5 @@
 import { ExtensionCodec } from "@msgpack/msgpack";
 import { _columns, _columnsNoId, _def, _deleteState, _fields, _ids, _index, _logicIds, _stateFileName, AField, DBType, EnumMap, FieldOption } from 'baja-lite-field';
-import pino from 'pino';
 import { XML } from './convert-xml.js';
 export declare const extensionCodec: ExtensionCodec<undefined>;
 declare const _daoDBName: unique symbol;
@@ -25,9 +24,9 @@ export declare const _Context: unique symbol;
 export declare const _enum: unique symbol;
 export declare const _GlobalSqlOption: unique symbol;
 export declare const _EventBus: unique symbol;
+export declare const _LoggerService: unique symbol;
 export declare const _path: unique symbol;
 export declare const _fs: unique symbol;
-export declare const logger: pino.Logger<never, boolean>;
 export declare enum MapperIfUndefined {
     Null = 0,
     Skip = 1,
@@ -209,7 +208,7 @@ export interface GlobalSqlOptionForWeb {
         service: SqliteRemoteInterface;
     };
     /** 日志等级 */
-    log?: 'trace' | 'debug' | 'info' | 'warn';
+    log?: LogLevel[] | LogLevel;
     /**
      作用与sqlDir类似，不同在于sqlMap`不需要`目录，而是直接指定一个sqlModel对象，对象的格式和sqlDir的文件内容一样。
      ** 适用于简单使用
@@ -260,6 +259,8 @@ export interface GlobalSqlOptionForWeb {
     dataConvert?: Record<string, (data: any) => any>;
     /** 公开上下文 */
     ctx?: any;
+    /** 日志服务 */
+    logger?: LoggerService;
 }
 /**
  # 全局行为配置文件
@@ -2148,4 +2149,48 @@ 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 type LogLevel = (typeof LOG_LEVELS)[number];
+export interface LoggerService {
+    /**
+     * Write a 'log' level log.
+     */
+    log(message: any, ...optionalParams: any[]): any;
+    /**
+     * Write an 'error' level log.
+     */
+    error(message: any, ...optionalParams: any[]): any;
+    /**
+     * Write a 'warn' level log.
+     */
+    warn(message: any, ...optionalParams: any[]): any;
+    /**
+     * Write a 'debug' level log.
+     */
+    debug?(message: any, ...optionalParams: any[]): any;
+    /**
+     * Write a 'verbose' level log.
+     */
+    verbose?(message: any, ...optionalParams: any[]): any;
+    /**
+     * Write a 'fatal' level log.
+     */
+    fatal?(message: any, ...optionalParams: any[]): any;
+    /**
+     * Set log levels.
+     * @param levels log levels
+     */
+    setLogLevels(levels: LogLevel[]): any;
+}
+export declare class PrinterLogger implements LoggerService {
+    private logger;
+    constructor();
+    log(message: any, ...optionalParams: any[]): void;
+    fatal(message: any, ...optionalParams: any[]): void;
+    error(message: any, ...optionalParams: any[]): void;
+    warn(message: any, ...optionalParams: any[]): void;
+    debug?(message: any, ...optionalParams: any[]): void;
+    verbose?(message: any, ...optionalParams: any[]): void;
+    setLogLevels(levels: LogLevel[]): void;
+}
 export {};