baja-lite 1.5.14 → 1.5.16

package/code.js

@@ -48,8 +48,13 @@ const lxMap = {
     geometrycollection: "Object"
 };
 let force = false;
-const basepath = path.join(import.meta.dirname, '..', '..');
-console.log(basepath);
+let basepath = path.join(import.meta.dirname, '..', '..');
+try {
+    fs.statSync(`${basepath}/baja.code.json`);
+}
+catch (error) {
+    basepath = path.join(import.meta.dirname, '..', '..', '..', '..', '..');
+}
 const config = path.join(basepath, 'baja.code.json');
 const templatePath = path.join(basepath, 'code-template');
 console.log(`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.5.14",
+  "version": "1.5.16",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/baja-lite",
   "repository": {
@@ -39,7 +39,7 @@
     "@types/request-promise": "4.1.51",
     "axios": "1.10.0",
     "baja-lite-field": "1.4.13",
-    "decimal.js": "10.5.0",
+    "decimal.js": "10.6.0",
     "html-parse-stringify": "3.0.1",
     "iterare": "1.2.1",
     "lodash.get": "4.4.2",
@@ -57,11 +57,11 @@
     "@types/better-sqlite3": "7.6.13",
     "@types/lodash.get": "4.4.9",
     "@types/mustache": "4.2.6",
-    "@types/node": "24.0.10",
+    "@types/node": "24.0.12",
     "@types/shelljs": "0.8.17",
     "@types/sqlstring": "2.3.2",
-    "@typescript-eslint/eslint-plugin": "8.35.1",
-    "@typescript-eslint/parser": "8.35.1",
+    "@typescript-eslint/eslint-plugin": "8.36.0",
+    "@typescript-eslint/parser": "8.36.0",
     "better-sqlite3": "12.2.0",
     "ioredis": "5.6.1",
     "mongodb": "6.17.0",

package/sql.d.ts

@@ -1641,6 +1641,10 @@ declare class StreamQuery<T extends object> {
     isNULL(key: keyof T): this;
     /** AND key IS NOT NULL */
     isNotNULL(key: keyof T): this;
+    /** AND (key IS NULL OR key = '') */
+    isEmpty(key: keyof T): this;
+    /** AND key IS NOT NULL AND key <> ''*/
+    isNotEmpty(key: keyof T): this;
     /** AND key BETWEEN :value1 AND :value2 */
     between(key: keyof T, value1: string | number, value2: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
@@ -1721,6 +1725,18 @@ declare class StreamQuery<T extends object> {
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
+    /** AND FIND_IN_SET(:value, key) */
+    findInSet(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND FIND_IN_SET(key, :value) */
+    findInSet2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
     and(fn: StreamQuery<T> | ((stream: StreamQuery<T>) => boolean | void)): this;
     or(fn: StreamQuery<T> | ((stream: StreamQuery<T>) => boolean | void)): this;
     /** SET key = IFNULL(key, 0) + :value */

package/sql.js

@@ -3601,6 +3601,16 @@ class StreamQuery {
     isNULL(key) { return this._null(key); }
     /** AND key IS NOT NULL */
     isNotNULL(key) { return this._null(key, 'NOT'); }
+    /** AND (key IS NULL OR key = '') */
+    isEmpty(key) {
+        this._wheres.push(`AND (${this[_fields][String(key)]?.C2()} IS NULL OR ${this[_fields][String(key)]?.C2()} = '')`);
+        return this;
+    }
+    /** AND key IS NOT NULL AND key <> ''*/
+    isNotEmpty(key) {
+        this._wheres.push(`AND ${this[_fields][String(key)]?.C2()} IS NOT NULL AND ${this[_fields][String(key)]?.C2()} <> ''`);
+        return this;
+    }
     /** AND key BETWEEN :value1 AND :value2 */
     between(key, value1, value2, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._between(key, value1, value2, { paramName, skipEmptyString, breakExcuteIfEmpty }); }
     /** AND key NOT BETWEEN :value1 AND :value2 */
@@ -3629,6 +3639,52 @@ class StreamQuery {
     includes(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._includes(key, value, { paramName, skipEmptyString, breakExcuteIfEmpty }); }
     /** AND NOT LOCATE(key, :value) = 0 */
     notIncludes(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._includes(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfEmpty }); }
+    /** AND FIND_IN_SET(:value, key) */
+    findInSet(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) {
+        if (value === null
+            || value === undefined
+            || (emptyString(`${value ?? ''}`) && skipEmptyString)) {
+            if (breakExcuteIfEmpty) {
+                this.if_exec = false;
+            }
+            return this;
+        }
+        if (paramName !== undefined && this._paramKeys.hasOwnProperty(paramName)) {
+            this._param[this._paramKeys[paramName]] = value;
+        }
+        else {
+            const pkey = `p${this._prefix}${this._index++}`;
+            this._wheres.push(`AND FIND_IN_SET(:${pkey}, ${this[_fields][String(key)]?.C2()})`);
+            this._param[pkey] = value;
+            if (paramName) {
+                this._paramKeys[paramName] = pkey;
+            }
+        }
+        return this;
+    }
+    /** AND FIND_IN_SET(key, :value) */
+    findInSet2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) {
+        if (value === null
+            || value === undefined
+            || (emptyString(`${value ?? ''}`) && skipEmptyString)) {
+            if (breakExcuteIfEmpty) {
+                this.if_exec = false;
+            }
+            return this;
+        }
+        if (paramName !== undefined && this._paramKeys.hasOwnProperty(paramName)) {
+            this._param[this._paramKeys[paramName]] = value;
+        }
+        else {
+            const pkey = `p${this._prefix}${this._index++}`;
+            this._wheres.push(`AND FIND_IN_SET(${this[_fields][String(key)]?.C2()}, :${pkey})`);
+            this._param[pkey] = value;
+            if (paramName) {
+                this._paramKeys[paramName] = pkey;
+            }
+        }
+        return this;
+    }
     and(fn) {
         if (fn instanceof StreamQuery) {
             this._andQuerys.push(fn);
@@ -4393,6 +4449,18 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
 ], StreamQuery.prototype, "isNotNULL", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "isEmpty", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "isNotEmpty", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
@@ -4477,6 +4545,18 @@ __decorate([
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
 ], StreamQuery.prototype, "notIncludes", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "findInSet", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "findInSet2", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),

package/test-mysql.d.ts

@@ -1,2 +0,0 @@
-import 'reflect-metadata';
-export declare function go2(): Promise<void>;

package/test-mysql.js

@@ -1,109 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import { Field, SqlType } from 'baja-lite-field';
-import 'reflect-metadata';
-import { Boot } from './boot.js';
-import { ColumnMode, DB, SqlService } from './sql.js';
-class BaseAuditUser {
-}
-__decorate([
-    Field({ type: SqlType.varchar, length: 32, id: true, notNull: true, uuidShort: true }),
-    __metadata("design:type", String)
-], BaseAuditUser.prototype, "auditId", void 0);
-__decorate([
-    Field({ type: SqlType.varchar, length: 32, comment: '密码' }),
-    __metadata("design:type", String)
-], BaseAuditUser.prototype, "password", void 0);
-__decorate([
-    Field({ type: SqlType.varchar, length: 255, comment: '省' }),
-    __metadata("design:type", String)
-], BaseAuditUser.prototype, "userProvinceCode", void 0);
-__decorate([
-    Field({ type: SqlType.varchar, length: 255, comment: '省' }),
-    __metadata("design:type", String)
-], BaseAuditUser.prototype, "userProvince", void 0);
-__decorate([
-    Field({ type: SqlType.varchar, length: 32, comment: '显示名称' }),
-    __metadata("design:type", String)
-], BaseAuditUser.prototype, "labelName", void 0);
-__decorate([
-    Field({ type: SqlType.varchar, length: 32, comment: '备注名称' }),
-    __metadata("design:type", String)
-], BaseAuditUser.prototype, "remarkName", void 0);
-__decorate([
-    Field({ type: SqlType.varchar, length: 32, comment: '初始密码' }),
-    __metadata("design:type", String)
-], BaseAuditUser.prototype, "upassword", void 0);
-__decorate([
-    Field({ type: SqlType.char, length: 1, def: 0, comment: '是否中心' }),
-    __metadata("design:type", String)
-], BaseAuditUser.prototype, "baseType", void 0);
-__decorate([
-    Field({ type: SqlType.varchar, length: 32 }),
-    __metadata("design:type", String)
-], BaseAuditUser.prototype, "userId", void 0);
-__decorate([
-    Field({ type: SqlType.varchar, length: 32 }),
-    __metadata("design:type", String)
-], BaseAuditUser.prototype, "companyId", void 0);
-__decorate([
-    Field({ type: SqlType.varchar, length: 32 }),
-    __metadata("design:type", String)
-], BaseAuditUser.prototype, "username", void 0);
-__decorate([
-    Field({ type: SqlType.char, length: 1, def: 0, comment: '状态' }),
-    __metadata("design:type", String)
-], BaseAuditUser.prototype, "userStatus", void 0);
-__decorate([
-    Field({ type: SqlType.char, length: 1, def: 0, comment: '账户分组' }),
-    __metadata("design:type", String)
-], BaseAuditUser.prototype, "groupId", void 0);
-__decorate([
-    Field({ type: SqlType.varchar, length: 10 }),
-    __metadata("design:type", String)
-], BaseAuditUser.prototype, "startDate", void 0);
-__decorate([
-    Field({ type: SqlType.varchar, length: 10 }),
-    __metadata("design:type", String)
-], BaseAuditUser.prototype, "endDate", void 0);
-let BaseAuditUserService = class BaseAuditUserService extends SqlService {
-};
-BaseAuditUserService = __decorate([
-    DB({ tableName: 'base_audit_user', clz: BaseAuditUser })
-], BaseAuditUserService);
-export async function go2() {
-    await Boot({
-        Mysql: {
-            host: '127.0.0.1',
-            port: 3306,
-            user: 'root',
-            password: 'abcd1234',
-            // 数据库名
-            database: 'sportevent',
-            debug: false
-        },
-        log: 'trace',
-        columnMode: ColumnMode.HUMP,
-        sqlDir: 'E:/pro/baja-lite/xml',
-        sqlMap: {
-            ['test.test']: `SELECT * FROM cp_user {{#username}} WHERE username = :username {{/username}}`
-        }
-    });
-    const service = new BaseAuditUserService();
-    const list = await service.transaction({
-        fn: async (conn) => {
-            await service.stream().eq('baseType', '0').in('auditId', ['162400829591265280', '162201628882247680']).excuteSelect();
-            const data = await service.stream().in('auditId', ['162400829591265280', '162201628882247680']).update('labelName', '333').excuteUpdate({ conn });
-            return data;
-        }
-    });
-    console.log(11, list);
-}
-go2();

package/test-postgresql.d.ts

@@ -1,2 +0,0 @@
-import 'reflect-metadata';
-export declare function go2(): Promise<void>;

package/test-postgresql.js

@@ -1,91 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import { DBType, Field, SqlType } from 'baja-lite-field';
-import 'reflect-metadata';
-import { Boot } from './boot.js';
-import { ColumnMode, DB, SelectResult, SqlService, } from './sql.js';
-class AmaFuck2 {
-}
-__decorate([
-    Field({ type: SqlType.int, length: 200, id: true, uuid: true }),
-    __metadata("design:type", Number)
-], AmaFuck2.prototype, "userid", void 0);
-__decorate([
-    Field({ type: SqlType.varchar, length: 200, def: '333' }),
-    __metadata("design:type", String)
-], AmaFuck2.prototype, "username", void 0);
-__decorate([
-    Field({ type: SqlType.varchar, length: 200 }),
-    __metadata("design:type", String)
-], AmaFuck2.prototype, "pwd", void 0);
-let AmaService2 = class AmaService2 extends SqlService {
-};
-AmaService2 = __decorate([
-    DB({
-        tableName: 'nfc_user', clz: AmaFuck2, dbType: DBType.Postgresql
-    })
-], AmaService2);
-// interface Menu {
-//     resourceid: string;
-//     resourcepid: string;
-//     resourcename: string;
-//     children: Menu[];
-// }
-export async function go2() {
-    await Boot({
-        Postgresql: {
-            database: 'nfc',
-            user: 'postgres',
-            password: 'abcd1234',
-            port: 5432,
-            host: '127.0.0.1'
-        },
-        log: 'info',
-        columnMode: ColumnMode.HUMP,
-        sqlDir: 'E:/pro/baja-lite/xml',
-        sqlMap: {
-            ['test.test']: `SELECT * FROM nfc_user {{#username}} WHERE username = :username {{/username}}`
-        }
-    });
-    const service = new AmaService2();
-    await service.transaction({
-        fn: async (conn) => {
-            const rt5 = await service.select({
-                sqlId: 'test.test',
-                params: { username: '1111' },
-                selectResult: SelectResult.RS_CS,
-                conn
-            });
-            console.log(55, rt5.length);
-            await service.insert({
-                data: {
-                    userid: 22,
-                    username: '222',
-                    pwd: '333'
-                }
-            });
-            return 1;
-        }
-    });
-    // const data = await service.select<Menu>({
-    //     sql: 'SELECT resourceid, resourcepid,resourcename FROM cp_resource ',
-    //     params: {
-    //         site: '1234',
-    //         matchInfo: { reportType: 'yyyy', id: '11' }
-    //     },
-    //     // mapper: [
-    //     //     ['site', ['info', 'bSist'], 989],
-    //     //     ['site', ['info2', 'bSist'], 33],
-    //     //     ['site', ['Bsite'], 0]
-    //     // ]
-    // });
-    // console.log(data);
-}
-go2();

package/test-sqlite.d.ts

@@ -1 +0,0 @@
-import 'reflect-metadata';

package/test-sqlite.js

@@ -1,90 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import { DBType, Field, SqlType } from 'baja-lite-field';
-import 'reflect-metadata';
-import { Boot } from './boot';
-import { DB, DeleteMode, InsertMode, SqlService, SyncMode } from './sql';
-class AmaFuck {
-}
-__decorate([
-    Field({ type: SqlType.varchar }),
-    __metadata("design:type", String)
-], AmaFuck.prototype, "site", void 0);
-__decorate([
-    Field({ type: SqlType.varchar }),
-    __metadata("design:type", String)
-], AmaFuck.prototype, "SellerSKU2", void 0);
-__decorate([
-    Field({ type: SqlType.varchar, id: true }),
-    __metadata("design:type", String)
-], AmaFuck.prototype, "SellerSKU", void 0);
-let AmaService = class AmaService extends SqlService {
-};
-AmaService = __decorate([
-    DB({
-        tableName: 'ama_fuck2', clz: AmaFuck, dbType: DBType.Sqlite, sqliteVersion: '0.0.3'
-    })
-], AmaService);
-async function go() {
-    await Boot({
-        Sqlite: 'd:1.db',
-        log: 'info'
-    });
-    const service = new AmaService();
-    const ret = service.transaction({
-        sync: SyncMode.Sync,
-        fn: conn => {
-            const list = new Array({
-                SellerSKU: '1',
-                site: '111'
-            }, {
-                SellerSKU: '2',
-                SellerSKU2: '22',
-            }, {
-                SellerSKU2: '33',
-                SellerSKU: '3',
-                site: '333'
-            }, {
-                SellerSKU2: '44',
-                SellerSKU: '4',
-                site: '444'
-            }, {
-                SellerSKU2: '',
-                SellerSKU: '66',
-                site: undefined
-            });
-            const rt = service.insert({
-                sync: SyncMode.Sync,
-                data: list,
-                conn, skipEmptyString: false, mode: InsertMode.InsertWithTempTable
-            });
-            console.log(rt);
-            const rt2 = service.update({
-                sync: SyncMode.Sync,
-                data: list,
-                conn, skipEmptyString: false
-            });
-            console.log(rt2);
-            const rt3 = service.delete({
-                sync: SyncMode.Sync,
-                where: [
-                    { SellerSKU2: '11', SellerSKU: '1' },
-                    { SellerSKU2: '22', SellerSKU: '2' },
-                    { SellerSKU2: '33', SellerSKU: '3' }
-                ],
-                mode: DeleteMode.TempTable
-            });
-            console.log(rt3);
-            return 1;
-        }
-    });
-    return ret;
-}
-go();

package/test-xml.d.ts

@@ -1 +0,0 @@
-export {};

package/test-xml.js

@@ -1,70 +0,0 @@
-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>
->`)));

package/test.d.ts

@@ -1 +0,0 @@
-export {};

package/test.js

@@ -1,2 +0,0 @@
-import { snowflake } from "snowflake";
-console.log(snowflake.generate());