baja-lite 1.6.5 → 1.6.7

package/boot-remote.js

@@ -1,5 +1,5 @@
 import { DBType, _Hump, getEnums } from 'baja-lite-field';
-import { ColumnMode, SqlCache, SqliteRemote, _DataConvert, _GlobalSqlOption, _dao, _defOption, _enum, _primaryDB, _sqlCache, logger } from './sql.js';
+import { ColumnMode, SqlCache, SqliteRemote, _Context, _DataConvert, _GlobalSqlOption, _dao, _defOption, _enum, _primaryDB, _sqlCache, logger } from './sql.js';
 export const BootRomote = async function (options) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption);
     if (options.skipEmptyString !== undefined) {
@@ -32,6 +32,9 @@ export const BootRomote = async function (options) {
     if (options.dataConvert) {
         globalThis[_DataConvert] = options.dataConvert;
     }
+    if (options.ctx) {
+        globalThis[_Context] = options.ctx;
+    }
     if (options.SqliteRemote && options.SqliteRemote.db) {
         if (typeof options.SqliteRemote.db === 'string') {
             options.SqliteRemote.service.initDB(options.SqliteRemote.db);

package/boot.js

@@ -1,6 +1,6 @@
 import { _Hump, DBType, getEnums } from 'baja-lite-field';
 import events from 'events';
-import { _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, _path, _primaryDB, _sqlCache, ColumnMode, logger, Mysql, Postgresql, SqlCache, Sqlite, SqliteRemote } from './sql.js';
 export const Boot = async function (options) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption);
     if (options.skipEmptyString !== undefined) {
@@ -39,6 +39,9 @@ export const Boot = async function (options) {
     if (options.dataConvert) {
         globalThis[_DataConvert] = options.dataConvert;
     }
+    if (options.ctx) {
+        globalThis[_Context] = options.ctx;
+    }
     if (options.Mysql) {
         const { createPool } = await import('mysql2/promise');
         if (options.Mysql['host']) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.6.5",
+  "version": "1.6.7",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/baja-lite",
   "repository": {
@@ -37,38 +37,38 @@
   "dependencies": {
     "@msgpack/msgpack": "3.1.2",
     "@types/request-promise": "4.1.51",
-    "axios": "1.11.0",
+    "axios": "1.13.2",
     "baja-lite-field": "1.4.20",
     "decimal.js": "10.6.0",
     "html-parse-stringify": "3.0.1",
     "iterare": "1.2.1",
     "mustache": "4.2.0",
-    "pino": "9.9.0",
-    "pino-pretty": "13.1.1",
+    "pino": "10.1.0",
+    "pino-pretty": "13.1.2",
     "reflect-metadata": "0.2.2",
     "request": "2.88.2",
     "request-promise": "4.2.6",
-    "sql-formatter": "15.6.6",
+    "sql-formatter": "15.6.10",
     "sqlstring": "2.3.3",
     "tslib": "2.8.1"
   },
   "devDependencies": {
     "@types/better-sqlite3": "7.6.13",
     "@types/mustache": "4.2.6",
-    "@types/node": "24.3.0",
+    "@types/node": "24.10.1",
     "@types/shelljs": "0.8.17",
     "@types/sqlstring": "2.3.2",
-    "@typescript-eslint/eslint-plugin": "8.40.0",
-    "@typescript-eslint/parser": "8.40.0",
-    "better-sqlite3": "12.2.0",
-    "ioredis": "5.7.0",
-    "mongodb": "6.18.0",
-    "mysql2": "3.14.3",
+    "@typescript-eslint/eslint-plugin": "8.48.0",
+    "@typescript-eslint/parser": "8.48.0",
+    "better-sqlite3": "12.5.0",
+    "ioredis": "5.8.2",
+    "mongodb": "7.0.0",
+    "mysql2": "3.15.3",
     "pg": "8.16.3",
     "pg-pool": "3.10.1",
     "redlock": "5.0.0-beta.2",
     "shelljs": "0.10.0",
-    "typescript": "5.9.2"
+    "typescript": "5.9.3"
   },
   "engines": {
     "node": ">=20"

package/sql.d.ts

@@ -21,6 +21,7 @@ declare const _daoDB: unique symbol;
 declare const _sqliteRemoteName: unique symbol;
 declare const _SqlOption: unique symbol;
 export declare const _DataConvert: unique symbol;
+export declare const _Context: unique symbol;
 export declare const _enum: unique symbol;
 export declare const _GlobalSqlOption: unique symbol;
 export declare const _EventBus: unique symbol;
@@ -257,6 +258,8 @@ export interface GlobalSqlOptionForWeb {
      * ```
      */
     dataConvert?: Record<string, (data: any) => any>;
+    /** 公开上下文 */
+    ctx?: any;
 }
 /**
  # 全局行为配置文件

package/sql.js

@@ -70,6 +70,7 @@ const _daoDB = Symbol('daoDB');
 const _sqliteRemoteName = Symbol('sqliteRemoteName');
 const _SqlOption = Symbol('SqlOption');
 export const _DataConvert = Symbol('DataConvert');
+export const _Context = Symbol('Context');
 const _resultMap = Symbol('resultMap');
 const _resultMap_SQLID = Symbol('resultMap_SQLID');
 export const _enum = Symbol('_enum');
@@ -2858,8 +2859,8 @@ export class SqlService {
         if (option.sqlId && globalThis[_resultMap_SQLID][option.sqlId] && !option.mapper) {
             option.mapper = globalThis[_resultMap_SQLID][option.sqlId];
         }
-        const _params = Object.assign({}, option.context, option.params);
-        option.sql ?? (option.sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: option.isCount, ..._params }));
+        const _params = Object.assign({}, option.params);
+        option.sql ?? (option.sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: Object.assign({}, option.context, globalThis[_Context]), isCount: option.isCount, ..._params }));
         const { sql, params } = this._generSql(option.dbType, option.sql, _params);
         if (option.sync === SyncMode.Sync) {
             const result = option.conn.query(SyncMode.Sync, sql, params);
@@ -2883,8 +2884,8 @@ export class SqlService {
         if (option.sqlId && globalThis[_resultMap_SQLID][option.sqlId] && !option.mapper) {
             option.mapper = globalThis[_resultMap_SQLID][option.sqlId];
         }
-        const _params = Object.assign({}, option.context, option.params);
-        option.sql ?? (option.sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: false, ..._params }));
+        const _params = Object.assign({}, option.params);
+        option.sql ?? (option.sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: Object.assign({}, option.context, globalThis[_Context]), isCount: false, ..._params }));
         const { sql, params } = this._generSql(option.dbType, option.sql, _params);
         if (option.sync === SyncMode.Sync) {
             const result = option.conn.query(SyncMode.Sync, sql, params);
@@ -2904,8 +2905,8 @@ export class SqlService {
     }
     excute(option) {
         Throw.if(!option.sqlId && !option.sql, 'not found sql!');
-        const _params = Object.assign({}, option.context, option.params);
-        option.sql ?? (option.sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, ..._params }));
+        const _params = Object.assign({}, option.params);
+        option.sql ?? (option.sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: Object.assign({}, option.context, globalThis[_Context]), ..._params }));
         const { sql, params } = this._generSql(option.dbType, option.sql, _params);
         if (option.sync === SyncMode.Sync) {
             const result = option.conn.execute(SyncMode.Sync, sql, params);
@@ -2960,15 +2961,16 @@ export class SqlService {
             sortName: option.sortName ?? undefined,
             sortType: option.sortType ?? undefined
         });
-        let sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: false, ...option.params });
+        const ctx = Object.assign({}, option.context, globalThis[_Context]);
+        let sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx, isCount: false, ...option.params });
         let sqlSum = '';
         let sqlCount = '';
         if (option.sum) {
             if (option.sumSelf) {
-                sqlCount = globalThis[_sqlCache].load(this._matchSqlid(`${option.sqlId}_sum`), { ctx: option.context, isCount: false, isSum: true, ...option.params });
+                sqlCount = globalThis[_sqlCache].load(this._matchSqlid(`${option.sqlId}_sum`), { ctx, isCount: false, isSum: true, ...option.params });
             }
             else {
-                sqlSum = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: false, isSum: true, ...option.params });
+                sqlSum = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx, isCount: false, isSum: true, ...option.params });
             }
         }
         if (option.limitSelf !== true && option.pageSize > 0) {
@@ -2976,10 +2978,10 @@ export class SqlService {
         }
         if (option.pageSize > 0) {
             if (option.countSelf) {
-                sqlCount = globalThis[_sqlCache].load(this._matchSqlid(`${option.sqlId}_count`), { ctx: option.context, isCount: true, isSum: false, ...option.params });
+                sqlCount = globalThis[_sqlCache].load(this._matchSqlid(`${option.sqlId}_count`), { ctx, isCount: true, isSum: false, ...option.params });
             }
             else {
-                sqlCount = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: true, isSum: false, ...option.params });
+                sqlCount = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx, isCount: true, isSum: false, ...option.params });
             }
         }
         if (option.sync === SyncMode.Sync) {