baja-lite 1.5.16 → 1.5.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.5.16",
+  "version": "1.5.17",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/baja-lite",
   "repository": {

package/sql.d.ts

@@ -1125,26 +1125,15 @@ export declare class SqlService<T extends object> {
      //    或者自定义Mapper,自定义Mapper格式如下:
      [
      {columnName: 'dit_id', mapNames: ['DTID'], def: 0, convert: 转换函数},  // 列名ditid,对应属性DTID,如果没有值，将返回默认值0,其中默认值0是可选的
-     {columnName: 'event_id', mapNames: ['eventMainInfo', 'id'], def: 0,  convert: 转换函数},// 列名event_id对应属性eventMainInfo.id,这种方式将返回嵌套的json对象,其中默认值null是可选的
+     {columnName: 'event_id', mapNames: ['eventMainInfo', 'id'], def: 0,  convert: 转换函数},// 列名event_id对应属性eventMainInfo.id,这种方式将返回嵌套的json对象,其中默认值是可选的
      ]
-     ```
-     #TODO 未完成读取 sqlMapDir
-     #### sqlMapDir 目录定义如下，
-     `test.ts`
-     ```
-     export const dict:SqlMappers = [
-     {columnName: 'dit_id', mapNames: ['DTID'], def: 0, convert: 转换函数},  // 列名ditid,对应属性DTID,如果没有值，将返回默认值0,其中默认值0是可选的
-     {columnName: 'event_id', mapNames: ['eventMainInfo', 'id'], def: 0,  convert: 转换函数},// 列名event_id对应属性eventMainInfo.id,这种方式将返回嵌套的json对象,其中默认值null是可选的
-     ]
-     ```
-     将得到 test.dict 这个map
      12. dataConvert 数据转换器
      ```
      dataConvert: {
          fileName: 'qiniu'
      }
          // 表示列 fileName 按 qiniu的函数格式化
-         // qiniu 在开始时定义
+         // qiniu 在项目初始化时定义
      ```
      */
     select<L = T>(option: MethodOption & {
@@ -1267,6 +1256,67 @@ export declare class SqlService<T extends object> {
         mapperIfUndefined?: MapperIfUndefined;
         dataConvert?: Record<string, string>;
     }): L | null;
+    /**
+    # 自由查询:一次执行多个SQL语句!
+    0. `sync`: 同步（sqlite）或者异步（mysql、remote），影响返回值类型,默认`异步模式`
+    1. `sql` 或者 `sqlid`
+    2. `params`
+    3. `dbName`: 默认使用service注解的`dbName`,可以在某个方法中覆盖
+    4. `conn`: 仅在开启事务时需要主动传入,传入示例:
+        ```
+            service.transaction(async conn => {
+                service.insert({conn});
+            });
+        ```
+    5.  `dao`: 永远不需要传入该值
+    6. `hump`: 是否将列名改为驼峰写法？默认情况下按照全局配置
+    7. `mapper`: 列名-属性 映射工具，优先级高于hump
+     ```
+     //    该属性支持传入mybatis.xml中定义的resultMap块ID，或者读取sqlMapDir目录下的JSON文件(暂未实现).
+     //    注意：resultMap块的寻找逻辑与sql语句逻辑一致，同样是 文件名.ID
+     //    或者自定义Mapper,自定义Mapper格式如下:
+     [
+        // 数据列名ditid将转换为属性`DTID`,如果没有值，将返回默认值0,其中默认值0是可选的
+        {columnName: 'dit_id', mapNames: ['DTID'], def?: 0, convert: 转换函数},
+        // 数据列名event_id将转换为属性`eventMainInfo.id`,这种方式将返回嵌套的json对象,其中默认值0是可选的
+        {columnName: 'event_id', mapNames: ['eventMainInfo', 'id'], def?: 0,  convert: 转换函数},
+     ]
+     ```
+     8. `dataConvert` 数据转换器
+     ```
+     dataConvert: {
+         fileName: 'qiniu'
+     }
+    // 表示列 fileName 按 qiniu的函数格式化
+    // qiniu 在开始时定义
+     ```
+     */
+    selectMuit<T extends any[] = []>(option: MethodOption & {
+        sync?: SyncMode.Async;
+        sqlId?: string;
+        sql?: string;
+        params?: Record<string, any>;
+        context?: any;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
+    }): Promise<{
+        [K in keyof T]: T[K][];
+    }>;
+    selectMuit<T extends any[] = []>(option: MethodOption & {
+        sync: SyncMode.Sync;
+        sqlId?: string;
+        sql?: string;
+        params?: Record<string, any>;
+        context?: any;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
+    }): {
+        [K in keyof T]: T[K][];
+    };
     /**
      # 自由执行sql
      0. `sync`: 同步（sqlite）或者异步（mysql、remote），影响返回值类型,默认`异步模式`

package/sql.js

@@ -2884,6 +2884,30 @@ export class SqlService {
             });
         }
     }
+    selectMuit(option) {
+        Throw.if(!option.sqlId && !option.sql, 'not found sql!');
+        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 { sql, params } = this._generSql(option.dbType, option.sql, _params);
+        if (option.sync === SyncMode.Sync) {
+            const result = option.conn.query(SyncMode.Sync, sql, params);
+            return result.map(item => this._select(SelectResult.RS_CS, result, null, undefined, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert));
+        }
+        else {
+            return new Promise(async (resolve, reject) => {
+                try {
+                    const result = await option.conn.query(SyncMode.Async, sql, params);
+                    resolve(result.map(item => this._select(SelectResult.RS_CS, result, null, undefined, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert)));
+                }
+                catch (error) {
+                    reject(error);
+                }
+            });
+        }
+    }
     excute(option) {
         Throw.if(!option.sqlId && !option.sql, 'not found sql!');
         const _params = Object.assign({}, option.context, option.params);
@@ -3376,6 +3400,12 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Object)
 ], SqlService.prototype, "select", null);
+__decorate([
+    P(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Object)
+], SqlService.prototype, "selectMuit", null);
 __decorate([
     P(),
     __metadata("design:type", Function),

package/test-mysql.d.ts

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

package/test-mysql.js

@@ -0,0 +1,115 @@
+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/my-sdk/baja-lite/xml',
+        sqlMap: {
+            ['test.test']: `
+            SELECT * FROM base_user {{#realname}} WHERE realname LIKE CONCAT(:realname, '%') {{/realname}};
+            SELECT * FROM base_user {{#realname}} WHERE realname LIKE CONCAT(:realname, '%') {{/realname}};
+            `
+        }
+    });
+    const service = new BaseAuditUserService();
+    const data = await service.selectMuit({ sqlId: 'test.test', params: { realname: '张薇' } });
+    console.log(11, data[0][0]?.userProvinceCode);
+    console.log(11, data[1].length);
+    // const list = await service.transaction<number>({
+    //     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

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

package/test-postgresql.js

@@ -0,0 +1,91 @@
+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

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

package/test-sqlite.js

@@ -0,0 +1,90 @@
+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

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

package/test-xml.js

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

package/test.d.ts

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

package/test.js

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