baja-lite 1.6.2 → 1.6.4

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

@@ -1,127 +1,127 @@
-import { decode, encode } from "@msgpack/msgpack";
-import Sqlstring from 'sqlstring';
-import { snowflake } from './snowflake.js';
-import { extensionCodec, logger } from './sql.js';
-export class SqliteRemoteClass {
-    constructor() {
-        this.dbList = {};
-    }
-    async execute(inData) {
-        const [dbName, sql, params] = decode(inData);
-        logger.debug(sql, params ?? '');
-        try {
-            if (!sql) {
-                return encode({ affectedRows: 0, insertId: 0n }, { extensionCodec });
-            }
-            ;
-            if (this.trace) {
-                logger.trace(Sqlstring.format(sql, params));
-            }
-            const result = this.dbList[dbName].prepare(sql).run(params ?? {});
-            if (this.trace) {
-                logger.trace(result);
-            }
-            const { changes, lastInsertRowid } = result;
-            return encode({ affectedRows: changes, insertId: lastInsertRowid ? BigInt(lastInsertRowid) : 0n }, { extensionCodec });
-        }
-        catch (error) {
+import { decode, encode } from "@msgpack/msgpack";
+import Sqlstring from 'sqlstring';
+import { snowflake } from './snowflake.js';
+import { SqliteRemoteInterface, extensionCodec, logger } from './sql.js';
+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 (this.trace) {
+                logger.trace(Sqlstring.format(sql!, params));
+            }
+            const result = this.dbList[dbName].prepare(sql).run(params ?? {});
+            if (this.trace) {
+                logger.trace(result);
+            }
+            const { changes, lastInsertRowid } = result;
+            return encode({ affectedRows: changes, insertId: lastInsertRowid ? BigInt(lastInsertRowid) : 0n }, { extensionCodec });
+        } catch (error) {
             logger.error(`
                 error: ${error},
                 sql: ${sql},
                 params: ${params}
-            `);
-            throw error;
-        }
-    }
-    async pluck(inData) {
-        const [dbName, sql, params] = decode(inData);
-        logger.debug(sql, params ?? '');
-        try {
-            logger.debug(sql, params ?? '');
-            if (!sql) {
-                return encode(null);
-            }
-            ;
-            if (this.trace) {
-                logger.trace(Sqlstring.format(sql, params));
-            }
-            return encode(this.dbList[dbName].prepare(sql).pluck().get(params ?? {}), { extensionCodec });
-        }
-        catch (error) {
+            `);
+            throw error;
+        }
+    }
+    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 (this.trace) {
+                logger.trace(Sqlstring.format(sql!, params));
+            }
+            return encode(this.dbList[dbName].prepare(sql).pluck().get(params ?? {}), { extensionCodec });
+        } catch (error) {
             logger.error(`
                 error: ${error},
                 sql: ${sql},
                 params: ${params}
-            `);
-            throw error;
-        }
-    }
-    async get(inData) {
-        const [dbName, sql, params] = decode(inData);
-        logger.debug(sql, params ?? '');
-        try {
-            if (this.trace) {
-                logger.trace(Sqlstring.format(sql, params));
-            }
-            return encode(this.dbList[dbName].prepare(sql).get(params ?? {}), { extensionCodec });
-        }
-        catch (error) {
+            `);
+            throw error;
+        }
+    }
+    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));
+            }
+            return encode(this.dbList[dbName].prepare(sql).get(params ?? {}), { extensionCodec });
+        } catch (error) {
             logger.error(`
                 error: ${error},
                 sql: ${sql},
                 params: ${params}
-            `);
-            throw error;
-        }
-    }
-    async raw(inData) {
-        const [dbName, sql, params] = decode(inData);
-        logger.debug(sql, params ?? '');
-        try {
-            if (!sql) {
-                return encode([]);
-            }
-            ;
-            if (this.trace) {
-                logger.trace(Sqlstring.format(sql, params));
-            }
-            return encode(this.dbList[dbName].prepare(sql).raw().all(params ?? {}), { extensionCodec });
-        }
-        catch (error) {
+            `);
+            throw error;
+        }
+    }
+    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 (this.trace) {
+                logger.trace(Sqlstring.format(sql!, params));
+            }
+            return encode(this.dbList[dbName].prepare(sql).raw().all(params ?? {}), { extensionCodec });
+        } catch (error) {
             logger.error(`
                 error: ${error},
                 sql: ${sql},
                 params: ${params}
-            `);
-            throw error;
-        }
-    }
-    async query(inData) {
-        const [dbName, sql, params] = decode(inData);
-        logger.debug(sql, params ?? '');
-        try {
-            if (!sql) {
-                encode([]);
-            }
-            ;
-            if (this.trace) {
-                logger.trace(Sqlstring.format(sql, params));
-            }
-            return encode(this.dbList[dbName].prepare(sql).all(params ?? {}), { extensionCodec });
-        }
-        catch (error) {
+            `);
+            throw error;
+        }
+    }
+    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 (this.trace) {
+                logger.trace(Sqlstring.format(sql!, params));
+            }
+            return encode(this.dbList[dbName].prepare(sql).all(params ?? {}), { extensionCodec });
+        } catch (error) {
             logger.error(`
                 error: ${error},
                 sql: ${sql},
                 params: ${params}
-            `);
-            throw error;
-        }
-    }
-    initDB(dbName) {
-        if (!this.dbList[dbName]) {
-            this.dbList[dbName] = new this.BetterSqlite3(this.getStoreName(dbName), { fileMustExist: false });
-            this.dbList[dbName].pragma('journal_mode = WAL');
+            `);
+            throw error;
+        }
+    }
+    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');
             this.dbList[dbName].exec(`
                 CREATE TABLE IF NOT EXISTS DUAL ( ______id INTEGER NOT NULL, PRIMARY KEY ( ______id ));
                 DELETE FROM DUAL;
@@ -131,55 +131,56 @@ export class SqliteRemoteClass {
                 ______version text NOT NULL,
                 PRIMARY KEY ( ______tableName )
                 );
-            `);
-            this.dbList[dbName].function('UUID_SHORT', { deterministic: false }, () => snowflake.generate());
-            this.dbList[dbName].function('UUID', { deterministic: false }, () => snowflake.generate());
-            this.dbList[dbName].function('TIME_TO_SEC', { deterministic: true }, (time) => time.split(':').map((v, i) => parseInt(v) * (i === 0 ? 360 : i === 1 ? 60 : 0)).reduce((a, b) => a + b, 0));
-            this.dbList[dbName].function('IF', { deterministic: true }, (condition, v1, v2) => condition ? v1 : v2);
-            this.dbList[dbName].function('RIGHT', { deterministic: true }, (src, p) => src.slice(p * -1));
-            this.dbList[dbName].function('LEFT', { deterministic: true }, (str, len) => str?.substring(0, len) || null);
-            this.dbList[dbName].function('NOW', { deterministic: false }, () => new Date().toISOString().slice(0, 19).replace('T', ' '));
-            this.dbList[dbName].function('CURDATE', { deterministic: false }, () => new Date().toISOString().split('T')[0]);
-            this.dbList[dbName].function('DATE_FORMAT', { deterministic: true }, (dateStr, format) => {
-                const date = new Date(dateStr);
-                return format
-                    .replace('%Y', date.getFullYear().toString())
-                    .replace('%m', (date.getMonth() + 1).toString().padStart(2, '0'))
-                    .replace('%d', date.getDate().toString().padStart(2, '0'))
-                    .replace('%H', date.getHours().toString().padStart(2, '0'))
-                    .replace('%i', date.getMinutes().toString().padStart(2, '0'))
-                    .replace('%s', date.getSeconds().toString().padStart(2, '0'));
-            });
-            this.dbList[dbName].function('RAND', { deterministic: false }, () => Math.random());
-            this.dbList[dbName].function('UNIX_TIMESTAMP', { deterministic: false }, (dateStr) => dateStr
-                ? Math.floor(new Date(dateStr).getTime() / 1000)
-                : Math.floor(Date.now() / 1000));
-        }
-    }
-    async export(dbName, exportPath) {
-        await this.dbList[dbName].backup(exportPath);
-    }
-    restore(dbName, importPath) {
-        if (this.dbList[dbName]) {
-            this.dbList[dbName].close();
-            this.dbList[dbName] = null;
-        }
-        const nn = this.getStoreName(dbName);
-        this.cpSync(nn, this.getBackName(dbName));
-        this.cpSync(importPath, nn, { force: true });
-        this.setMod(nn);
-        this.initDB(dbName);
-    }
-    close(dbName) {
-        if (dbName) {
-            this.dbList[dbName]?.close();
-            this.dbList[dbName] = null;
-        }
-        else {
-            for (const db of Object.values(this.dbList)) {
-                db?.close();
-            }
-            this.dbList = {};
-        }
-    }
-}
+            `);
+            this.dbList[dbName].function('UUID_SHORT', { deterministic: false }, () => snowflake.generate());
+            this.dbList[dbName].function('UUID', { deterministic: false }, () => snowflake.generate());
+            this.dbList[dbName].function('TIME_TO_SEC', { deterministic: true }, (time: string) => time.split(':').map((v, i) => parseInt(v) * (i===0?360:i===1?60:0)).reduce((a, b) => a + b, 0));
+            this.dbList[dbName].function('IF', { deterministic: true }, (condition: any, v1: any, v2: any) => condition ? v1 : v2);
+            this.dbList[dbName].function('RIGHT', { deterministic: true }, (src: string, p: number) => src.slice(p * -1));
+            this.dbList[dbName].function('LEFT', { deterministic: true }, (str: string, len: number) => str?.substring(0, len) || null);
+            this.dbList[dbName].function('NOW', { deterministic: false }, () => new Date().toISOString().slice(0, 19).replace('T', ' '));
+            this.dbList[dbName].function('CURDATE', { deterministic: false }, () => new Date().toISOString().split('T')[0]);
+            this.dbList[dbName].function('DATE_FORMAT', { deterministic: true }, (dateStr: string, format: string) => {
+                const date = new Date(dateStr);
+                return format
+                    .replace('%Y', date.getFullYear().toString())
+                    .replace('%m', (date.getMonth() + 1).toString().padStart(2, '0'))
+                    .replace('%d', date.getDate().toString().padStart(2, '0'))
+                    .replace('%H', date.getHours().toString().padStart(2, '0'))
+                    .replace('%i', date.getMinutes().toString().padStart(2, '0'))
+                    .replace('%s', date.getSeconds().toString().padStart(2, '0'));
+            });
+            this.dbList[dbName].function('RAND', { deterministic: false }, () => Math.random());
+            this.dbList[dbName].function('UNIX_TIMESTAMP', { deterministic: false },
+                (dateStr?: string) => dateStr
+                    ? Math.floor(new Date(dateStr).getTime() / 1000)
+                    : Math.floor(Date.now() / 1000)
+            );
+        }
+    }
+    async export(dbName: string, exportPath: string): Promise<void> {
+        await this.dbList[dbName].backup(exportPath);
+    }
+    restore(dbName: string, importPath: string) {
+        if (this.dbList[dbName]) {
+            this.dbList[dbName].close();
+            this.dbList[dbName] = null;
+        }
+        const nn = this.getStoreName(dbName);
+        this.cpSync(nn, this.getBackName(dbName));
+        this.cpSync(importPath, nn, { force: true });
+        this.setMod(nn);
+        this.initDB(dbName);
+    }
+    close(dbName?: string) {
+        if (dbName) {
+            this.dbList[dbName]?.close();
+            this.dbList[dbName] = null;
+        } 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,148 @@
+import { Field, SqlType } from 'baja-lite-field';
+import 'reflect-metadata';
+import { Boot } from './boot.js';
+import { ColumnMode, DB, SelectResult, 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/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 rt = await service.stream().eq('auditId', '100987125344341382').select('labelName').where('audit_id > 0').excuteSelect({selectResult:SelectResult.R_C_Assert});
+    console.log(rt);
+    // 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();