baja-lite 1.3.47 → 1.3.49

package/boot.js

@@ -1,4 +1,5 @@
 import { _Hump, DBType, getEnums } from 'baja-lite-field';
+import events from 'events';
 import { _dao, _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, options);
@@ -85,6 +86,7 @@ export const Boot = async function (options) {
         }
     }
     if (options.Redis) {
+        events.setMaxListeners(0);
         const { Redis } = await import('ioredis');
         if (options.Redis['host']) {
             globalThis[_dao][DBType.Redis][_primaryDB] = new Redis(options.Redis);

package/code.js

@@ -55,7 +55,7 @@ const templatePath = path.join(basepath, 'code-template');
 console.log(`
     **********************-----------
     配置文件：
-    请在项目根目录添加文件:baja.code.json!配置如下:
+    请在项目根目录添加文件:baja.code.json!配置示例:
     {
         "host": "",
         "port": "",
@@ -80,7 +80,8 @@ console.log(`
         "id"? : "uuidShort: true, notNull: true, uuid: true",
         "logicDeleteK"?: "逻辑删除字段名",
         "logicDeleteV"?: "逻辑删除值",如果是字符串需要这样 logicDeleteV: "'0'"
-        "NotlogicDeleteV"?: "未逻辑删除值",如果是字符串需要这样 NotlogicDeleteV: "'0'"
+        "NotlogicDeleteV"?: "未逻辑删除值",如果是字符串需要这样 NotlogicDeleteV: "'0'",
+        "skipColumns"?: ["跳过的列名1", "跳过的列名2"]
     }
     command是生成命令，这里声明命令同时定义文件生成路径:可用下面的变量替换.同时必须有同名模板.
     路径是相对于项目根目录的
@@ -91,40 +92,50 @@ console.log(`
     **********************-----------
     **********************-----------
     模板文件
-    请在项目根目录的code-template添加模板文件， 按照mustache(标签定义成了[ '<%', '%>' ])进行格式化,变量：
-        title,
+    请在项目根目录的code-template添加模板文件， 按照mustache(标签定义成了[ '<%', '%>' ])进行格式化,支持使用的变量：
+************* 以下假设表名为event_main_info,列名为sku_id，sku_name
+    title						// 字符串,表的注释
+	
+    tableName					// 字符串,event_main_info
+    className					// 字符串,eventMainInfo
+    ClassName					// 字符串,EventMainInfo
+    vueName						// 字符串,event-main-info
+    splitVueName				// 字符串,event/main-info
+    splitName					// 字符串,event/main/info
+    SplitName					// 字符串,event/mainInfo
+	
+    columns						// 数组, 元素格式为{comment:注释,name: sku_id,Name: skuId,NAME: SkuId,Field:表示字段的注解,Type:表示JS类型}
+    column_names				// 数组, 元素是列名字符串，格式是 sku_id,sku_name
+    ColumnNames					// 数组, 元素是列名字符串，格式是 skuId,skuName
+    column_names_join 			// 字符串,列名join的字符串，格式是 "sku_id,sku_name"
+    ColumnNames_join			// 字符串,列名join的字符串，格式是 "skuId,skuName"
+	
+    column_names_joinT			// 字符串,列名join的字符串，格式是 "t.sku_id,t.sku_name"
+    ColumnNames_joinT 			// 字符串,列名join的字符串，格式是 "t.skuId,t.skuName"
+	
+    columns_no_id 				// 数组, 不含主键, 元素格式为{comment:注释,name: sku_id,Name: skuId,NAME: SkuId,Field:表示字段的注解,Type:表示JS类型}
+    column_names_no_id			// 数组, 不含主键, 元素是列名字符串，格式是 sku_id,sku_name
+    ColumnNames_no_id			// 数组, 不含主键, 元素是列名字符串，格式是 skuId,skuName
+    column_names_no_id_join		// 字符串, 不含主键, 列名join的字符串，格式是 "sku_id,sku_name"
+    ColumnNames_no_id_join		// 字符串, 不含主键, 列名join的字符串，格式是 "skuId,skuName"
 
-        tableName, event_main_info
-        className, eventMainInfo
-        ClassName, EventMainInfo
-        vueName, event-main-info
-        splitVueName, event/main-info
-        splitName, event/main/info
-        SplitName, event/mainInfo
 
-        columns: [
-            comment:
-            name: sku_id
-            Name: skuId
-            NAME: SkuId
-            Field
-            Type
-        ], Field(类型string)，表示字段的注解, Type 表示JS类型
-        columnNames_join: 'sku_id, sku_name'
-        ColumnNames_join: 'sku_id skuId, sku_name skuName'
-        columnNames_joinT: 't.sku_id, t.sku_name'
-        ColumnNames_joinT: 't.sku_id skuId, t.sku_name skuName'
-        columns_no_id: [], 同columns，没有ID而已
-        columnNames_no_id: [],
+    columns_no_skip         	// 数组, 不含跳过的列，元素格式为{comment:注释,name: sku_id,Name: skuId,NAME: SkuId,Field:表示字段的注解,Type:表示JS类型}
+    column_names_no_skip    	// 数组, 不含跳过的列, 元素是列名字符串，格式是 sku_id,sku_name
+    ColumnNames_no_skip     	// 数组, 不含跳过的列, 元素是列名字符串，格式是 skuId,skuName
+    column_names_no_skip_join	// 数组, 不含跳过的列, 元素是列名字符串，格式是 "sku_id,sku_name"
+    ColumnNames_no_skip_join	// 数组, 不含跳过的列, 元素是列名字符串，格式是 "skuId,skuName"
 
-        ids: [], 参见 FieldOption,多一个参数Field，表示字段的注解, Type 表示JS类型
-        idNames: [], 主键字段数组
-        idNames_join: []
-
-        modelName: 模块名称，可能为空字符串 event
-        modelPath: 模块名称实际就影响访问路径，所以这里会直接拼好controller的模块访问路径，如果模块为空，则该属性就是空字符串,否则是 /模块名称/
-
-        logicDelete: 逻辑删除的查询条件，可以附加在sql条件的末尾，可能是空的
+    ids							// 数组, 只有主键, 元素格式为{comment:注释,name: sku_id,Name: skuId,NAME: SkuId,Field:表示字段的注解,Type:表示JS类型}
+    id_names					// 数组, 只有主键, 元素是列名字符串，格式是 sku_id,sku_name
+    IdNames						// 数组, 只有主键, 元素是列名字符串，格式是 skuId,skuName
+    id_names_join				// 字符串,列名join的字符串，格式是 "sku_id,sku_name"
+    IdNames_join				// 字符串,列名join的字符串，格式是 "skuId,skuName"
+	
+    modelName					// 推断出的模块名称，可能为空字符串, 如果表名为event_main_info, 则模块为  event
+    modelPath					// 模块名称实际就影响访问路径，所以这里会直接拼好controller的模块访问路径，如果模块为空，则该属性就是空字符串,否则是 /模块名称/
+	
+    logicDelete					// 逻辑删除的查询条件，可以附加在sql条件的末尾，可能是空的
     -----
     命令 table1,table2,table3:模块名称
     table=. 表示扫描全库表
@@ -136,6 +147,20 @@ try {
     const outputs = new Set();
     const _configData = fs.readFileSync(config, { encoding: 'utf-8' }).toString();
     const configData = JSON.parse(_configData);
+    configData.skipColumns ?? (configData.skipColumns = []);
+    configData.command ?? (configData.command = {});
+    configData.commands ?? (configData.commands = {});
+    configData.output ?? (configData.output = '');
+    configData.id ?? (configData.id = 'uuidShort: true, notNull: true, uuid: true');
+    configData.logicDeleteK ?? (configData.logicDeleteK = '');
+    configData.logicDeleteV ?? (configData.logicDeleteV = 0);
+    configData.NotlogicDeleteV ?? (configData.NotlogicDeleteV = 0);
+    if (!configData.host || !configData.port || !configData.user || !configData.password || !configData.database) {
+        console.error(`[错误]配置文件缺少必要的参数: host, port, user, password, database`);
+    }
+    if (!fs.existsSync(templatePath)) {
+        console.error(`[错误]模板文件夹不存在，请在项目根目录创建code-template文件夹`);
+    }
     const templates = Object.fromEntries(fs.readdirSync(templatePath).map(r => [path.basename(r, '.mu'), fs.readFileSync(path.join(templatePath, r), { encoding: 'utf-8' }).toString()]));
     const pool = createPool({
         host: configData.host,
@@ -275,21 +300,26 @@ try {
                 splitName,
                 SplitName,
                 columns,
-                columnNames: columns?.map(i => i.name),
+                column_names: columns?.map(i => i.name),
                 ColumnNames: columns?.map(i => i.Name),
-                columnNames_join: columns?.map(i => i.name).join(','),
+                column_names_join: columns?.map(i => i.name).join(','),
                 ColumnNames_join: columns?.map(i => `${i.name} ${i.Name}`).join(','),
-                columnNames_joinT: columns?.map(i => `t.${i.name}`).join(','),
+                column_names_joinT: columns?.map(i => `t.${i.name}`).join(','),
                 ColumnNames_joinT: columns?.map(i => `t.${i.name} ${i.Name}`).join(','),
                 columns_no_id: columns?.filter(i => !i.id),
-                columnNames_no_id: columns?.filter(i => !i.id).map(i => i.name),
+                column_names_no_id: columns?.filter(i => !i.id).map(i => i.name),
                 ColumnNames_no_id: columns?.filter(i => !i.id).map(i => i.Name),
-                columnNames_no_id_join: columns?.filter(i => !i.id).map(i => i.name).join(','),
+                column_names_no_id_join: columns?.filter(i => !i.id).map(i => i.name).join(','),
                 ColumnNames_no_id_join: columns?.filter(i => !i.id).map(i => i.Name).join(','),
+                columns_no_skip: columns?.filter(i => !configData.skipColumns.includes(i.name)),
+                column_names_no_skip: columns?.filter(i => !configData.skipColumns.includes(i.name)).map(i => i.name),
+                ColumnNames_no_skip: columns?.filter(i => !configData.skipColumns.includes(i.name)).map(i => i.Name),
+                column_names_no_skip_join: columns?.filter(i => !configData.skipColumns.includes(i.name)).map(i => i.name).join(','),
+                ColumnNames_no_skip_join: columns?.filter(i => !configData.skipColumns.includes(i.name)).map(i => i.Name).join(','),
                 ids: columns?.filter(i => i.id),
-                idNames: columns?.filter(i => i.id).map(i => i.name),
+                id_names: columns?.filter(i => i.id).map(i => i.name),
                 IdNames: columns?.filter(i => i.id).map(i => i.Name),
-                idNames_join: columns?.filter(i => i.id).map(i => i.name).join(','),
+                id_names_join: columns?.filter(i => i.id).map(i => i.name).join(','),
                 IdNames_join: columns?.filter(i => i.id).map(i => i.Name).join(','),
                 modelName,
                 modelPath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.3.47",
+  "version": "1.3.49",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/baja-lite",
   "repository": {
@@ -44,12 +44,12 @@
     "iterare": "1.2.1",
     "lodash.get": "4.4.2",
     "mustache": "4.2.0",
-    "pino": "9.6.0",
+    "pino": "9.7.0",
     "pino-pretty": "13.0.0",
     "reflect-metadata": "0.2.2",
     "request": "2.88.2",
     "request-promise": "4.2.6",
-    "sql-formatter": "15.6.1",
+    "sql-formatter": "15.6.2",
     "sqlstring": "2.3.3",
     "tslib": "2.8.1"
   },
@@ -57,20 +57,20 @@
     "@types/better-sqlite3": "7.6.13",
     "@types/lodash.get": "4.4.9",
     "@types/mustache": "4.2.6",
-    "@types/node": "22.15.17",
+    "@types/node": "22.15.21",
     "@types/pg-pool": "2.0.6",
     "@types/shelljs": "0.8.16",
     "@types/sqlstring": "2.3.2",
-    "@typescript-eslint/eslint-plugin": "8.32.0",
-    "@typescript-eslint/parser": "8.32.0",
+    "@typescript-eslint/eslint-plugin": "8.32.1",
+    "@typescript-eslint/parser": "8.32.1",
     "better-sqlite3": "11.10.0",
     "ioredis": "5.6.1",
     "mongodb": "6.16.0",
     "mysql2": "3.14.1",
-    "pg": "8.15.6",
-    "pg-pool": "3.9.6",
+    "pg": "8.16.0",
+    "pg-pool": "3.10.0",
     "redlock": "5.0.0-beta.2",
-    "shelljs": "0.9.2",
+    "shelljs": "0.10.0",
     "typescript": "5.8.3"
   },
   "engines": {