baja-lite 1.3.51 → 1.3.53

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2024 void-soul
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2024 void-soul
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/code.js

@@ -104,7 +104,7 @@ console.log(`
     splitName					// 字符串,event/main/info
     SplitName					// 字符串,event/mainInfo
 	
-    columns						// 数组, 元素格式为{comment:注释,name: sku_id,Name: skuId,NAME: SkuId,Field:表示字段的注解,Type:表示JS类型}
+    columns						// 数组, 元素格式为{comment:注释,name: sku_id,Name: skuId,NAME: SkuId,Field:表示字段的注解,JSField_name, JSFieldName 分别表示JS的注解,Type:表示JS类型}
     column_names				// 数组, 元素是列名字符串，格式是 sku_id,sku_name
     ColumnNames					// 数组, 元素是列名字符串，格式是 skuId,skuName
     column_names_join 			// 字符串,列名join的字符串，格式是 "sku_id,sku_name"
@@ -113,20 +113,20 @@ console.log(`
     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类型}
+    columns_no_id 				// 数组, 不含主键, 元素格式为{comment:注释,name: sku_id,Name: skuId,NAME: SkuId,Field:表示字段的注解,JSField_name, JSFieldName 分别表示JS的注解,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"
 
 
-    columns_no_skip         	// 数组, 不含跳过的列，元素格式为{comment:注释,name: sku_id,Name: skuId,NAME: SkuId,Field:表示字段的注解,Type:表示JS类型}
+    columns_no_skip         	// 数组, 不含跳过的列，元素格式为{comment:注释,name: sku_id,Name: skuId,NAME: SkuId,Field:表示字段的注解,JSField_name, JSFieldName 分别表示JS的注解,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							// 数组, 只有主键, 元素格式为{comment:注释,name: sku_id,Name: skuId,NAME: SkuId,Field:表示字段的注解,Type:表示JS类型}
+    ids							// 数组, 只有主键, 元素格式为{comment:注释,name: sku_id,Name: skuId,NAME: SkuId,Field:表示字段的注解,JSField_name, JSFieldName 分别表示JS的注解,Type:表示JS类型}
     id_names					// 数组, 只有主键, 元素是列名字符串，格式是 sku_id,sku_name
     IdNames						// 数组, 只有主键, 元素是列名字符串，格式是 skuId,skuName
     id_names_join				// 字符串,列名join的字符串，格式是 "sku_id,sku_name"
@@ -262,9 +262,11 @@ try {
                 fields.push(`comment: '${r.comment}'`);
             }
             r.comment = r.comment ?? '';
-            r.Field = `@Field({${fields.join(',')}})`;
             r.Name = r.name.replace(/_(\w)/g, (a, b) => b.toUpperCase());
             r.NAME = r.Name.replace(/\w/, (v) => v.toUpperCase());
+            r.Field = `@Field({${fields.join(',')}})`;
+            r.JSField_name = `{${fields.join(',')}, P: '${r.name}'}`;
+            r.JSFieldName = `{${fields.join(',')}, P: '${r.Name}'}`;
             return r;
         });
         conn.release();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.3.51",
+  "version": "1.3.53",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/baja-lite",
   "repository": {
@@ -37,8 +37,8 @@
   "dependencies": {
     "@msgpack/msgpack": "3.1.2",
     "@types/request-promise": "4.1.51",
-    "axios": "1.9.0",
-    "baja-lite-field": "1.3.39",
+    "axios": "1.10.0",
+    "baja-lite-field": "1.3.40",
     "decimal.js": "10.5.0",
     "html-parse-stringify": "3.0.1",
     "iterare": "1.2.1",
@@ -49,7 +49,7 @@
     "reflect-metadata": "0.2.2",
     "request": "2.88.2",
     "request-promise": "4.2.6",
-    "sql-formatter": "15.6.2",
+    "sql-formatter": "15.6.4",
     "sqlstring": "2.3.3",
     "tslib": "2.8.1"
   },
@@ -57,15 +57,14 @@
     "@types/better-sqlite3": "7.6.13",
     "@types/lodash.get": "4.4.9",
     "@types/mustache": "4.2.6",
-    "@types/node": "22.15.21",
-    "@types/pg-pool": "2.0.6",
+    "@types/node": "24.0.2",
     "@types/shelljs": "0.8.16",
     "@types/sqlstring": "2.3.2",
-    "@typescript-eslint/eslint-plugin": "8.32.1",
-    "@typescript-eslint/parser": "8.32.1",
+    "@typescript-eslint/eslint-plugin": "8.34.0",
+    "@typescript-eslint/parser": "8.34.0",
     "better-sqlite3": "11.10.0",
     "ioredis": "5.6.1",
-    "mongodb": "6.16.0",
+    "mongodb": "6.17.0",
     "mysql2": "3.14.1",
     "pg": "8.16.0",
     "pg-pool": "3.10.0",

package/sql.js

@@ -1771,7 +1771,7 @@ function P(skipConn = false) {
                 }
                 try {
                     const result = fn.call(this, ...args);
-                    logger.info(`${propertyKey}:${option.tableName}:use ${+new Date() - startTime}ms`);
+                    logger.info(`${propertyKey}:${option.sqlId ?? option.tableName}:use ${+new Date() - startTime}ms`);
                     return result;
                 }
                 catch (error) {
@@ -1779,7 +1779,7 @@ function P(skipConn = false) {
                         console.error(`service ${propertyKey} have an error:${error}`);
                     }
                     catch (error) {
-                        console.error(`${option.tableName} service ${propertyKey} have an error:${error}`);
+                        console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}`);
                     }
                     throw error;
                 }
@@ -1814,12 +1814,12 @@ function P(skipConn = false) {
                     }
                     try {
                         const result = await fn.call(this, ...args);
-                        logger.info(`${propertyKey}:${option.tableName}:use ${+new Date() - startTime}ms`);
+                        logger.info(`${propertyKey}:${option.sqlId ?? option.tableName}:use ${+new Date() - startTime}ms`);
                         resolve(result);
                     }
                     catch (error) {
                         // console.error(`service ${propertyKey} have an error:${error}, it's argumens: ${JSON.stringify(args.filter(i => typeof i !== 'object' || (typeof i === 'object' && !i.insert)))}`)
-                        console.error(`${option.tableName} service ${propertyKey} have an error:${error}`);
+                        console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}`);
                         reject(error);
                     }
                     finally {
@@ -1845,12 +1845,12 @@ function P(skipConn = false) {
                             needRealseConn = false;
                         }
                         const result = await fn.call(this, ...args);
-                        logger.info(`${propertyKey}:${option.tableName}:use ${+new Date() - startTime}ms`);
+                        logger.info(`${propertyKey}:${option.sqlId ?? option.tableName}:use ${+new Date() - startTime}ms`);
                         resolve(result);
                     }
                     catch (error) {
                         // console.error(`service ${propertyKey} have an error:${error}, it's argumens: ${JSON.stringify(args.filter(i => typeof i !== 'object' || (typeof i === 'object' && !i.insert)))}`)
-                        console.error(`${option.tableName} service ${propertyKey} have an error:${error}`);
+                        console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}`);
                         reject(error);
                     }
                     finally {
@@ -1876,12 +1876,12 @@ function P(skipConn = false) {
                             needRealseConn = false;
                         }
                         const result = await fn.call(this, ...args);
-                        logger.info(`${propertyKey}:${option.tableName}:use ${+new Date() - startTime}ms`);
+                        logger.info(`${propertyKey}:${option.sqlId ?? option.tableName}:use ${+new Date() - startTime}ms`);
                         resolve(result);
                     }
                     catch (error) {
                         //console.error(`service ${propertyKey} have an error:${error}, it's argumens: ${JSON.stringify(args.filter(i => typeof i !== 'object' || (typeof i === 'object' && !i.insert)))}`)
-                        console.error(`${option.tableName} service ${propertyKey} have an error:${error}`);
+                        console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}`);
                         reject(error);
                     }
                     finally {

package/sqlite.js

@@ -24,10 +24,10 @@ export class SqliteRemoteClass {
             return encode({ affectedRows: changes, insertId: lastInsertRowid ? BigInt(lastInsertRowid) : 0n }, { extensionCodec });
         }
         catch (error) {
-            logger.error(`
-                error: ${error},
-                sql: ${sql},
-                params: ${params}
+            logger.error(`
+                error: ${error},
+                sql: ${sql},
+                params: ${params}
             `);
             throw error;
         }
@@ -47,10 +47,10 @@ export class SqliteRemoteClass {
             return encode(this.dbList[dbName].prepare(sql).pluck().get(params ?? {}), { extensionCodec });
         }
         catch (error) {
-            logger.error(`
-                error: ${error},
-                sql: ${sql},
-                params: ${params}
+            logger.error(`
+                error: ${error},
+                sql: ${sql},
+                params: ${params}
             `);
             throw error;
         }
@@ -65,10 +65,10 @@ export class SqliteRemoteClass {
             return encode(this.dbList[dbName].prepare(sql).get(params ?? {}), { extensionCodec });
         }
         catch (error) {
-            logger.error(`
-                error: ${error},
-                sql: ${sql},
-                params: ${params}
+            logger.error(`
+                error: ${error},
+                sql: ${sql},
+                params: ${params}
             `);
             throw error;
         }
@@ -87,10 +87,10 @@ export class SqliteRemoteClass {
             return encode(this.dbList[dbName].prepare(sql).raw().all(params ?? {}), { extensionCodec });
         }
         catch (error) {
-            logger.error(`
-                error: ${error},
-                sql: ${sql},
-                params: ${params}
+            logger.error(`
+                error: ${error},
+                sql: ${sql},
+                params: ${params}
             `);
             throw error;
         }
@@ -109,10 +109,10 @@ export class SqliteRemoteClass {
             return encode(this.dbList[dbName].prepare(sql).all(params ?? {}), { extensionCodec });
         }
         catch (error) {
-            logger.error(`
-                error: ${error},
-                sql: ${sql},
-                params: ${params}
+            logger.error(`
+                error: ${error},
+                sql: ${sql},
+                params: ${params}
             `);
             throw error;
         }
@@ -121,15 +121,15 @@ export class SqliteRemoteClass {
         if (!this.dbList[dbName]) {
             this.dbList[dbName] = new this.BetterSqlite3(this.getStoreName(dbName), { fileMustExist: false });
             this.dbList[dbName].pragma('journal_mode = WAL');
-            this.dbList[dbName].exec(`
-                CREATE TABLE IF NOT EXISTS DUAL ( ______id INTEGER NOT NULL, PRIMARY KEY ( ______id ));
-                DELETE FROM DUAL;
-                INSERT INTO DUAL (______id ) VALUES ( 1 );
-                CREATE TABLE IF NOT EXISTS TABLE_VERSION (
-                ______tableName text NOT NULL,
-                ______version text NOT NULL,
-                PRIMARY KEY ( ______tableName )
-                );
+            this.dbList[dbName].exec(`
+                CREATE TABLE IF NOT EXISTS DUAL ( ______id INTEGER NOT NULL, PRIMARY KEY ( ______id ));
+                DELETE FROM DUAL;
+                INSERT INTO DUAL (______id ) VALUES ( 1 );
+                CREATE TABLE IF NOT EXISTS TABLE_VERSION (
+                ______tableName text NOT NULL,
+                ______version text NOT NULL,
+                PRIMARY KEY ( ______tableName )
+                );
             `);
         }
     }

package/test-xml.js

@@ -1,70 +1,70 @@
 import HTML from 'html-parse-stringify';
-console.log((HTML.parse(`
-    <sql id="reportField">
-            a.left_e_foul leftEFoul,
-            a.right_e_foul rightEFoul,
-            a.left_em_foul leftEmFoul,
-            a.right_em_foul rightEmFoul,
-            a.left_s_foul leftSFoul,
-            a.right_s_foul rightSFoul,
-            a.left_sb_foul leftSbFoul,
-            a.right_sb_foul rightSbFoul,
-            a.left_p_foul leftPFoul,
-            a.right_p_foul rightPFoul,
-            a.left_attack_goal leftAttackGoal,
-            a.right_attack_goal rightAttackGoal,
-            a.left_point_goal leftPointGoal,
-            a.right_point_goal rightPointGoal,
-            a.left_over_time_goal leftOverTimeGoal,
-            a.right_over_time_goal rightOverTimeGoal,
-            a.left_normal_goal leftNormalGoal,
-            a.right_normal_goal rightNormalGoal,
-            a.left_own_goal leftOwnGoal,
-            a.right_own_goal rightOwnGoal,
-            a.left_time_out leftTimeOut,
-            a.right_time_out rightTimeOut,
-            a.left_coach_y_card leftCoachYCard,
-            a.right_coach_y_card rightCoachYCard,
-            a.left_player_r_card leftPlayerRCard,
-            a.right_player_r_card rightPlayerRCard,
-            a.left_jump_ball leftJumpBall,
-            a.right_jump_ball rightJumpBall
-    </sql>
-    <select id="matchReport" resultType="org.jeecg.modules.event.entity.EventMatchReport">
-        select
-        b.event_name eventName,
-        a.match_id matchId,
-        a.event_times eventTimes,
-        a.team_left_id teamLeftId,
-        a.team_RIGHt_id teamRightId,
-        a.team_left_name teamLeftName,
-        a.team_right_name teamRightName,
-        a.team_left_image teamLeftImage,
-        a.team_right_image teamRightImage,
-        <include refid="reportField" />
-        <if test="matchInfo.reportType!=null and matchInfo.reportType!=''">
-            from view_match_report a
-        </if>
-        <if test="matchInfo.reportType==null or matchInfo.reportType==''">
-            from event_match_report a
-        </if>
-        left join event_main_info b on a.event_id = b.id
-        <where>
-            <if test="matchInfo.id!=null and matchInfo.id!=''">
-                and a.match_id = #{matchInfo.id}
-            </if>
-            <if test="matchInfo.eventId!=null and matchInfo.eventId!=''">
-                and a.event_id = #{matchInfo.eventId}
-            </if>
-            <if test="matchInfo.teamLeftId!=null and matchInfo.teamLeftId!=''">
-                and (a.team_left_id = #{matchInfo.teamLeftId} OR a.team_right_id = #{matchInfo.teamLeftId})
-            </if>
-            <if test="dataIdList!=null">
-                and a.event_id in
-                <foreach collection="dataIdList" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
-    </select>
+console.log((HTML.parse(`
+    <sql id="reportField">
+            a.left_e_foul leftEFoul,
+            a.right_e_foul rightEFoul,
+            a.left_em_foul leftEmFoul,
+            a.right_em_foul rightEmFoul,
+            a.left_s_foul leftSFoul,
+            a.right_s_foul rightSFoul,
+            a.left_sb_foul leftSbFoul,
+            a.right_sb_foul rightSbFoul,
+            a.left_p_foul leftPFoul,
+            a.right_p_foul rightPFoul,
+            a.left_attack_goal leftAttackGoal,
+            a.right_attack_goal rightAttackGoal,
+            a.left_point_goal leftPointGoal,
+            a.right_point_goal rightPointGoal,
+            a.left_over_time_goal leftOverTimeGoal,
+            a.right_over_time_goal rightOverTimeGoal,
+            a.left_normal_goal leftNormalGoal,
+            a.right_normal_goal rightNormalGoal,
+            a.left_own_goal leftOwnGoal,
+            a.right_own_goal rightOwnGoal,
+            a.left_time_out leftTimeOut,
+            a.right_time_out rightTimeOut,
+            a.left_coach_y_card leftCoachYCard,
+            a.right_coach_y_card rightCoachYCard,
+            a.left_player_r_card leftPlayerRCard,
+            a.right_player_r_card rightPlayerRCard,
+            a.left_jump_ball leftJumpBall,
+            a.right_jump_ball rightJumpBall
+    </sql>
+    <select id="matchReport" resultType="org.jeecg.modules.event.entity.EventMatchReport">
+        select
+        b.event_name eventName,
+        a.match_id matchId,
+        a.event_times eventTimes,
+        a.team_left_id teamLeftId,
+        a.team_RIGHt_id teamRightId,
+        a.team_left_name teamLeftName,
+        a.team_right_name teamRightName,
+        a.team_left_image teamLeftImage,
+        a.team_right_image teamRightImage,
+        <include refid="reportField" />
+        <if test="matchInfo.reportType!=null and matchInfo.reportType!=''">
+            from view_match_report a
+        </if>
+        <if test="matchInfo.reportType==null or matchInfo.reportType==''">
+            from event_match_report a
+        </if>
+        left join event_main_info b on a.event_id = b.id
+        <where>
+            <if test="matchInfo.id!=null and matchInfo.id!=''">
+                and a.match_id = #{matchInfo.id}
+            </if>
+            <if test="matchInfo.eventId!=null and matchInfo.eventId!=''">
+                and a.event_id = #{matchInfo.eventId}
+            </if>
+            <if test="matchInfo.teamLeftId!=null and matchInfo.teamLeftId!=''">
+                and (a.team_left_id = #{matchInfo.teamLeftId} OR a.team_right_id = #{matchInfo.teamLeftId})
+            </if>
+            <if test="dataIdList!=null">
+                and a.event_id in
+                <foreach collection="dataIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
 >`)));