baja-lite 1.3.25 → 1.3.27

package/{sqlite.js → src/sqlite.ts}

@@ -1,20 +1,34 @@
-import { extensionCodec, logger } from './sql.js';
+import { SqliteRemoteInterface, extensionCodec, logger } from './sql.js';
 import Sqlstring from 'sqlstring';
 import { encode, decode } from "@msgpack/msgpack";
-export class SqliteRemoteClass {
-    constructor() {
-        this.dbList = {};
-    }
-    async execute(inData) {
-        const [dbName, sql, params] = decode(inData);
+export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
+    private dbList: Record<string, any> = {};
+    /** 原始存放路径 */
+    abstract getStoreName(dbName: string): string;
+    /** 导入时，备份源文件路径 */
+    abstract getBackName(dbName: string): string;
+    abstract BetterSqlite3: any;
+
+
+    /** 实现复制 */
+    abstract cpSync(from: string, to: string, option?: { force: true }): void;
+    /**
+     * 设置可执行权限
+     ```
+        const fd = openSync(dbPath, 1);
+        fchmodSync(fd, 777);
+        closeSync(fd);
+     ```
+     */
+    abstract setMod(name: string): void;
+    abstract trace: boolean;
+    async execute(inData: Uint8Array): Promise<Uint8Array> {
+        const [dbName, sql, params] = decode(inData) as [dbName: string, sql?: string | undefined, params?: any];
         logger.debug(sql, params ?? '');
         try {
-            if (!sql) {
-                return encode({ affectedRows: 0, insertId: 0n }, { extensionCodec });
-            }
-            ;
+            if (!sql) { return encode({ affectedRows: 0, insertId: 0n }, { extensionCodec }); };
             if (this.trace) {
-                logger.trace(Sqlstring.format(sql, params));
+                logger.trace(Sqlstring.format(sql!, params));
             }
             const result = this.dbList[dbName].prepare(sql).run(params ?? {});
             if (this.trace) {
@@ -22,8 +36,7 @@ export class SqliteRemoteClass {
             }
             const { changes, lastInsertRowid } = result;
             return encode({ affectedRows: changes, insertId: lastInsertRowid ? BigInt(lastInsertRowid) : 0n }, { extensionCodec });
-        }
-        catch (error) {
+        } catch (error) {
             logger.error(`
                 error: ${error},
                 sql: ${sql},
@@ -32,21 +45,17 @@ export class SqliteRemoteClass {
             throw error;
         }
     }
-    async pluck(inData) {
-        const [dbName, sql, params] = decode(inData);
+    async pluck(inData: Uint8Array): Promise<Uint8Array> {
+        const [dbName, sql, params] = decode(inData) as [dbName: string, sql?: string | undefined, params?: any];
         logger.debug(sql, params ?? '');
         try {
             logger.debug(sql, params ?? '');
-            if (!sql) {
-                return encode(null);
-            }
-            ;
+            if (!sql) { return encode(null) };
             if (this.trace) {
-                logger.trace(Sqlstring.format(sql, params));
+                logger.trace(Sqlstring.format(sql!, params));
             }
             return encode(this.dbList[dbName].prepare(sql).pluck().get(params ?? {}), { extensionCodec });
-        }
-        catch (error) {
+        } catch (error) {
             logger.error(`
                 error: ${error},
                 sql: ${sql},
@@ -55,16 +64,15 @@ export class SqliteRemoteClass {
             throw error;
         }
     }
-    async get(inData) {
-        const [dbName, sql, params] = decode(inData);
+    async get(inData: Uint8Array): Promise<Uint8Array> {
+        const [dbName, sql, params] = decode(inData) as [dbName: string, sql?: string | undefined, params?: any];
         logger.debug(sql, params ?? '');
         try {
             if (this.trace) {
-                logger.trace(Sqlstring.format(sql, params));
+                logger.trace(Sqlstring.format(sql!, params));
             }
             return encode(this.dbList[dbName].prepare(sql).get(params ?? {}), { extensionCodec });
-        }
-        catch (error) {
+        } catch (error) {
             logger.error(`
                 error: ${error},
                 sql: ${sql},
@@ -73,20 +81,16 @@ export class SqliteRemoteClass {
             throw error;
         }
     }
-    async raw(inData) {
-        const [dbName, sql, params] = decode(inData);
+    async raw(inData: Uint8Array): Promise<Uint8Array> {
+        const [dbName, sql, params] = decode(inData) as [dbName: string, sql?: string | undefined, params?: any];
         logger.debug(sql, params ?? '');
         try {
-            if (!sql) {
-                return encode([]);
-            }
-            ;
+            if (!sql) { return encode([]); };
             if (this.trace) {
-                logger.trace(Sqlstring.format(sql, params));
+                logger.trace(Sqlstring.format(sql!, params));
             }
             return encode(this.dbList[dbName].prepare(sql).raw().all(params ?? {}), { extensionCodec });
-        }
-        catch (error) {
+        } catch (error) {
             logger.error(`
                 error: ${error},
                 sql: ${sql},
@@ -95,20 +99,16 @@ export class SqliteRemoteClass {
             throw error;
         }
     }
-    async query(inData) {
-        const [dbName, sql, params] = decode(inData);
+    async query(inData: Uint8Array): Promise<Uint8Array> {
+        const [dbName, sql, params] = decode(inData) as [dbName: string, sql?: string | undefined, params?: any];
         logger.debug(sql, params ?? '');
         try {
-            if (!sql) {
-                encode([]);
-            }
-            ;
+            if (!sql) { encode([]); };
             if (this.trace) {
-                logger.trace(Sqlstring.format(sql, params));
+                logger.trace(Sqlstring.format(sql!, params));
             }
             return encode(this.dbList[dbName].prepare(sql).all(params ?? {}), { extensionCodec });
-        }
-        catch (error) {
+        } catch (error) {
             logger.error(`
                 error: ${error},
                 sql: ${sql},
@@ -117,7 +117,7 @@ export class SqliteRemoteClass {
             throw error;
         }
     }
-    initDB(dbName) {
+    initDB(dbName: string) {
         if (!this.dbList[dbName]) {
             this.dbList[dbName] = new this.BetterSqlite3(this.getStoreName(dbName), { fileMustExist: false });
             this.dbList[dbName].pragma('journal_mode = WAL');
@@ -133,10 +133,10 @@ export class SqliteRemoteClass {
             `);
         }
     }
-    async export(dbName, exportPath) {
+    async export(dbName: string, exportPath: string): Promise<void> {
         await this.dbList[dbName].backup(exportPath);
     }
-    restore(dbName, importPath) {
+    restore(dbName: string, importPath: string) {
         if (this.dbList[dbName]) {
             this.dbList[dbName].close();
             this.dbList[dbName] = null;
@@ -147,16 +147,15 @@ export class SqliteRemoteClass {
         this.setMod(nn);
         this.initDB(dbName);
     }
-    close(dbName) {
+    close(dbName?: string) {
         if (dbName) {
             this.dbList[dbName]?.close();
             this.dbList[dbName] = null;
-        }
-        else {
+        } else {
             for (const db of Object.values(this.dbList)) {
                 db?.close();
             }
             this.dbList = {};
         }
     }
-}
+}

package/src/string.ts

@@ -0,0 +1,111 @@
+/**
+ * 通过uri获取key
+ * @param uri
+ */
+export const getPicKey = (uri: string): string => {
+  const arr = /key=([0-9a-zA-Z.]+)/.exec(uri);
+  if (arr && arr.length === 2) {
+    return arr[1]!;
+  }
+  return uri;
+};
+
+export const emptyString = (source: any, skipEmptyString = true): boolean => {
+  return (
+    source === null ||
+    source === undefined ||
+    (skipEmptyString === true && (source === '' || `${ source }`.replace(/\s/g, '') === ''))
+  );
+};
+
+export const notEmptyString = (source: any, skipEmptyString = true): boolean => {
+  return emptyString(source, skipEmptyString) === false;
+};
+
+export const safeString = (source?: string): string => {
+  if (source) {
+    return `${ source }`.replace(/'/g, '');
+  }
+  return '';
+};
+export const trimObject = <T>(data: any): T => {
+  if (data) {
+    for (const k in data) {
+      if (typeof data[k] === 'string') {
+        data[k] = data[k].trim();
+      }
+    }
+  }
+  return data;
+};
+
+export const randomNumber = (len: number): string => {
+  return `${ parseInt(`${ (Math.random() * 9 + 1) * Math.pow(10, (len - 1)) }`, 10) }`;
+};
+const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+const charLen = chars.length;
+export const randomString = (len: number): string => {
+  return Array.from(new Array(len)).map(() => chars.charAt(Math.floor(Math.random() * charLen))).join('');
+};
+const chars2 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+const charLen2 = chars2.length;
+export const randomString2 = (len: number): string => {
+  return Array.from(new Array(len)).map(() => chars2.charAt(Math.floor(Math.random() * charLen2))).join('');
+};
+const chars3 = 'abcdefghijklmnopqrstuvwxyz0123456789';
+const charLen3 = chars3.length;
+export const randomString3 = (len: number): string => {
+  return Array.from(new Array(len)).map(() => chars3.charAt(Math.floor(Math.random() * charLen3))).join('');
+};
+export const buildWxStr = (data: {[key: string]: string}, maxLabelLength: number, ...titles: string[]) => {
+  let str = titles.join('\r\n');
+  str += '\r\n\r\n';
+  const items = new Array<string>();
+  // const maxLength = maxLabelLength * 2;
+  for (const [key, value] of Object.entries(data)) {
+    if (notEmptyString(value)) {
+      const len = maxLabelLength - key.length;
+      items.push(`${ key }：${ ''.padEnd(len * 3 + (len > 0 ? 1 : 0), ' ') }${ value }`);
+    }
+  }
+  str += items.join('\r\n');
+  return str;
+};
+const chinese = /[\u3002|\uff1f|\uff01|\uff0c|\u3001|\uff1b|\uff1a|\u201c|\u201d|\u2018|\u2019|\uff08|\uff09|\u300a|\u300b|\u3008|\u3009|\u3010|\u3011|\u300e|\u300f|\u300c|\u300d|\ufe43|\ufe44|\u3014|\u3015|\u2026|\u2014|\uff5e|\ufe4f|\uffe5]/g;
+const table = {
+  '！': '!',
+  '￥': '$',
+  '…': '.',
+  '（': '(',
+  '）': ')',
+  '《': '<',
+  '》': '>',
+  '？': '?',
+  '：': ':',
+  '“': `'`,
+  '”': `'`,
+  '’': `'`,
+  '‘': `'`,
+  '，': ',',
+  '。': '.',
+  '、': '/',
+  '；': ';',
+  '〈': '<',
+  '〉': '>',
+  '【': '[',
+  '】': ']',
+  '『': '[',
+  '』': ']',
+  '「': '[',
+  '」': ']',
+  '﹃': '[',
+  '﹄': ']',
+  '〔': '(',
+  '〕': ')',
+  '—': '-',
+  '～': '~',
+  '﹏': '~'
+};
+export const replaceChineseCode = (str: string) => {
+  return str.replace(chinese, (a: string) => table[a] || '');
+};

package/src/test-mysql.ts

@@ -0,0 +1,144 @@
+import { Field, SqlType } from 'baja-lite-field';
+import 'reflect-metadata';
+import { Boot } from './boot.js';
+import { ColumnMode, DB, SqlService } from './sql.js';
+class BaseAuditUser {
+    /**
+    *
+    * @type { varchar }
+    * @memberof BaseAuditUser
+    */
+    @Field({ type: SqlType.varchar, length: 32, id: true, notNull: true, uuidShort: true })
+    auditId?: string;
+    /**
+    * 密码
+    * @type { varchar }
+    * @memberof BaseAuditUser
+    */
+    @Field({ type: SqlType.varchar, length: 32, comment: '密码' })
+    password?: string;
+    /**
+    * 省
+    * @type { varchar }
+    * @memberof BaseAuditUser
+    */
+    @Field({ type: SqlType.varchar, length: 255, comment: '省' })
+    userProvinceCode?: string;
+    /**
+    * 省
+    * @type { varchar }
+    * @memberof BaseAuditUser
+    */
+    @Field({ type: SqlType.varchar, length: 255, comment: '省' })
+    userProvince?: string;
+    /**
+    * 显示名称
+    * @type { varchar }
+    * @memberof BaseAuditUser
+    */
+    @Field({ type: SqlType.varchar, length: 32, comment: '显示名称' })
+    labelName?: string;
+    /**
+    * 备注名称
+    * @type { varchar }
+    * @memberof BaseAuditUser
+    */
+    @Field({ type: SqlType.varchar, length: 32, comment: '备注名称' })
+    remarkName?: string;
+    /**
+    * 初始密码
+    * @type { varchar }
+    * @memberof BaseAuditUser
+    */
+    @Field({ type: SqlType.varchar, length: 32, comment: '初始密码' })
+    upassword?: string;
+    /**
+    * 是否中心
+    * @type { char }
+    * @memberof BaseAuditUser
+    */
+    @Field({ type: SqlType.char, length: 1, def: 0, comment: '是否中心' })
+    baseType?: string;
+    /**
+    * 
+    * @type { varchar }
+    * @memberof BaseAuditUser
+    */
+    @Field({ type: SqlType.varchar, length: 32 })
+    userId?: string;
+    /**
+    * 
+    * @type { varchar }
+    * @memberof BaseAuditUser
+    */
+    @Field({ type: SqlType.varchar, length: 32 })
+    companyId?: string;
+    /**
+    * 
+    * @type { varchar }
+    * @memberof BaseAuditUser
+    */
+    @Field({ type: SqlType.varchar, length: 32 })
+    username?: string;
+    /**
+    * 状态
+    * @type { char }
+    * @memberof BaseAuditUser
+    */
+    @Field({ type: SqlType.char, length: 1, def: 0, comment: '状态' })
+    userStatus?: string;
+    /**
+    * 账户分组
+    * @type { char }
+    * @memberof BaseAuditUser
+    */
+    @Field({ type: SqlType.char, length: 1, def: 0, comment: '账户分组' })
+    groupId?: string;
+    /**
+    * 
+    * @type { varchar }
+    * @memberof BaseAuditUser
+    */
+    @Field({ type: SqlType.varchar, length: 10 })
+    startDate?: string;
+    /**
+    * 
+    * @type { varchar }
+    * @memberof BaseAuditUser
+    */
+    @Field({ type: SqlType.varchar, length: 10 })
+    endDate?: string;
+}
+@DB({ tableName: 'base_audit_user', clz: BaseAuditUser })
+class BaseAuditUserService extends SqlService<BaseAuditUser> {
+}
+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<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.js → src/test-postgresql.ts}

@@ -1,91 +1,80 @@
-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();
+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 {
+    @Field({ type: SqlType.int, length: 200, id: true, uuid: true })
+    userid?: number;
+    @Field({ type: SqlType.varchar, length: 200, def: '333' })
+    username?: string;
+    @Field({ type: SqlType.varchar, length: 200 })
+    pwd?: string;
+}
+
+@DB({
+    tableName: 'nfc_user', clz: AmaFuck2, dbType: DBType.Postgresql
+})
+class AmaService2 extends SqlService<AmaFuck2> {
+
+}
+
+// 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<number>({
+        fn: async conn => {
+            const rt5 = await service.select<{ username: string }>({
+                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();