baja-lite 1.2.1 → 1.2.2

package/code.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
-import path from 'path';
 import fs from 'fs';
-import { start } from 'repl';
-import { createPool } from 'mysql2/promise';
 import mustache from 'mustache';
+import { createPool } from 'mysql2/promise';
+import path from 'path';
+import { start } from 'repl';
 import { mkdir } from 'shelljs';
 const lxMap = {
     tinyint: "number",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/util-man",
   "repository": {
@@ -61,8 +61,8 @@
     "@types/pg-pool": "2.0.6",
     "@types/shelljs": "0.8.15",
     "@types/sqlstring": "2.3.2",
-    "@typescript-eslint/eslint-plugin": "8.26.0",
-    "@typescript-eslint/parser": "8.26.0",
+    "@typescript-eslint/eslint-plugin": "8.26.1",
+    "@typescript-eslint/parser": "8.26.1",
     "better-sqlite3": "11.8.1",
     "ioredis": "5.6.0",
     "mongodb": "6.14.2",

package/sql.d.ts

@@ -1418,6 +1418,8 @@ export declare class SqlService<T extends object> {
      */
     private _createTable;
     private _matchSqlid;
+    private _setParam;
+    private _generSql;
 }
 declare class StreamQuery<T extends object> {
     private _prefix;

package/sql.js

@@ -271,7 +271,7 @@ class MysqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -304,7 +304,7 @@ class MysqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -340,7 +340,7 @@ class MysqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -374,7 +374,7 @@ class MysqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -408,7 +408,7 @@ class MysqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -550,7 +550,7 @@ class PostgresqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -587,7 +587,7 @@ class PostgresqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -627,7 +627,7 @@ class PostgresqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -665,7 +665,7 @@ class PostgresqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -703,7 +703,7 @@ class PostgresqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -850,7 +850,7 @@ class SqliteConnection {
             }
             ;
             if (globalThis[_GlobalSqlOption].log === 'trace') {
-                logger.trace(sql, params);
+                logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
             }
             const result = this[_daoConnection].prepare(sql).run(params ?? {});
             if (globalThis[_GlobalSqlOption].log === 'trace') {
@@ -881,7 +881,7 @@ class SqliteConnection {
             }
             ;
             if (globalThis[_GlobalSqlOption].log === 'trace') {
-                logger.trace(sql, params);
+                logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
             }
             return this[_daoConnection].prepare(sql).pluck().get(params ?? {});
         }
@@ -906,7 +906,7 @@ class SqliteConnection {
             }
             ;
             if (globalThis[_GlobalSqlOption].log === 'trace') {
-                logger.trace(sql, params);
+                logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
             }
             return this[_daoConnection].prepare(sql).get(params ?? {});
         }
@@ -932,7 +932,7 @@ class SqliteConnection {
             }
             ;
             if (globalThis[_GlobalSqlOption].log === 'trace') {
-                logger.trace(sql, params);
+                logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
             }
             return this[_daoConnection].prepare(sql).raw().all(params ?? {});
         }
@@ -958,7 +958,7 @@ class SqliteConnection {
             }
             ;
             if (globalThis[_GlobalSqlOption].log === 'trace') {
-                logger.trace(sql, params);
+                logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
             }
             return this[_daoConnection].prepare(sql).all(params ?? {});
         }
@@ -1055,7 +1055,7 @@ export class SqliteRemoteConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -1085,7 +1085,7 @@ export class SqliteRemoteConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -1115,7 +1115,7 @@ export class SqliteRemoteConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -1145,7 +1145,7 @@ export class SqliteRemoteConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -1175,7 +1175,7 @@ export class SqliteRemoteConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -3064,27 +3064,7 @@ export class SqlService {
         }
         const _params = Object.assign({}, option.context, option.params);
         option.sql ?? (option.sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: option.isCount, ..._params }));
-        const params = [];
-        const sql = formatDialect(option.sql?.replace(/\:([A-Za-z0-9._]+)/g, (txt, key) => {
-            let V = LGet(_params, key);
-            if (V !== undefined) {
-                params.push(V);
-                return '?';
-            }
-            const _key = C2P(key);
-            V = LGet(_params, _key);
-            if (V !== undefined) {
-                params.push(V);
-                return '?';
-            }
-            const __key = P2C(key);
-            V = LGet(_params, __key);
-            if (V !== undefined) {
-                params.push(V);
-                return '?';
-            }
-            return txt;
-        }), { dialect: formatDialects[option.dbType] });
+        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 this._select(option.selectResult, result, option.defValue, option.errorMsg, option.hump, option.mapper, option.mapperIfUndefined);
@@ -3105,27 +3085,7 @@ export class SqlService {
         Throw.if(!option.sqlId && !option.sql, 'not found sql!');
         const _params = Object.assign({}, option.context, option.params);
         option.sql ?? (option.sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, ..._params }));
-        const params = [];
-        const sql = formatDialect(option.sql?.replace(/\:(\w+)/g, (txt, key) => {
-            let V = LGet(_params, key);
-            if (V !== undefined) {
-                params.push(V);
-                return '?';
-            }
-            const _key = C2P(key);
-            V = LGet(_params, _key);
-            if (V !== undefined) {
-                params.push(V);
-                return '?';
-            }
-            const __key = P2C(key);
-            V = LGet(_params, __key);
-            if (V !== undefined) {
-                params.push(V);
-                return '?';
-            }
-            return txt;
-        }), { dialect: formatDialects[option.dbType] });
+        const { sql, params } = this._generSql(option.dbType, option.sql, _params);
         if (option.sync === SyncMode.Sync) {
             const result = option.conn.execute(SyncMode.Sync, sql, params);
             return result.affectedRows;
@@ -3549,6 +3509,37 @@ export class SqlService {
         else
             return [`${this[_tableName]}.${sqlid}`, `${this[_className]}.${sqlid}`, `${this[_ClassName]}.${sqlid}`, `${this[_vueName]}.${sqlid}`];
     }
+    _setParam(v, ps) {
+        if (v instanceof Array) {
+            ps.push(...v);
+            return v.map(i => '?').join(',');
+        }
+        else {
+            ps.push(v);
+            return '?';
+        }
+    }
+    _generSql(dbType, _sql, _params) {
+        const params = [];
+        const sql = formatDialect(_sql?.replace(/\:(\w+)/g, (txt, key) => {
+            let V = LGet(_params, key);
+            if (V !== undefined) {
+                return this._setParam(V, params);
+            }
+            const _key = C2P(key);
+            V = LGet(_params, _key);
+            if (V !== undefined) {
+                return this._setParam(V, params);
+            }
+            const __key = P2C(key);
+            V = LGet(_params, __key);
+            if (V !== undefined) {
+                return this._setParam(V, params);
+            }
+            return txt;
+        }), { dialect: formatDialects[dbType] });
+        return { params, sql };
+    }
 }
 __decorate([
     P(),

package/test-mysql.js

@@ -9,127 +9,100 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import 'reflect-metadata';
 import { Boot } from './boot.js';
-import { SqlService, Field, DB, DBType, SqlType, ColumnMode, SelectResult, } from './sql.js';
-class AmaFuck2 {
+import { ColumnMode, DB, Field, SqlService, SqlType } from './sql.js';
+class BaseAuditUser {
 }
 __decorate([
-    Field({ type: SqlType.varchar, length: 200, id: true, uuid: true }),
+    Field({ type: SqlType.varchar, length: 32, id: true, notNull: true, uuidShort: true }),
     __metadata("design:type", String)
-], AmaFuck2.prototype, "site", void 0);
+], BaseAuditUser.prototype, "auditId", void 0);
 __decorate([
-    Field({ type: SqlType.varchar, length: 200, def: '333' }),
+    Field({ type: SqlType.varchar, length: 32, comment: '密码' }),
     __metadata("design:type", String)
-], AmaFuck2.prototype, "sellerSku2", void 0);
+], BaseAuditUser.prototype, "password", void 0);
 __decorate([
-    Field({ type: SqlType.varchar, length: 200 }),
+    Field({ type: SqlType.varchar, length: 255, comment: '省' }),
     __metadata("design:type", String)
-], AmaFuck2.prototype, "sellerSku", void 0);
-let AmaService2 = class AmaService2 extends SqlService {
+], 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 {
 };
-AmaService2 = __decorate([
-    DB({
-        tableName: 'ama_fuck', clz: AmaFuck2, dbType: DBType.Mysql
-    })
-], AmaService2);
-// interface Menu {
-//     resourceid: string;
-//     resourcepid: string;
-//     resourcename: string;
-//     children: Menu[];
-// }
+BaseAuditUserService = __decorate([
+    DB({ tableName: 'base_audit_user', clz: BaseAuditUser })
+], BaseAuditUserService);
 export async function go2() {
     await Boot({
         Mysql: {
-            host: '39.98.58.252',
-            port: 3308,
+            host: '127.0.0.1',
+            port: 3306,
             user: 'root',
-            password: 'Eme!2#456$&*',
+            password: 'abcd1234',
             // 数据库名
-            database: 'dmce',
+            database: 'sportevent',
             debug: false
         },
-        log: 'info',
+        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 AmaService2();
-    await service.transaction({
+    const service = new BaseAuditUserService();
+    const list = await service.transaction({
         fn: async (conn) => {
-            // const list = new Array<AmaFuck2>({
-            //     sellerSku: 'SellerSKU1',
-            // }, {
-            //     sellerSku: 'sellerSku1',
-            //     sellerSku2: 'SellerSKU11',
-            // }, {
-            //     sellerSku2: 'SellerSKU2',
-            //     sellerSku: 'SellerSKU22',
-            // }, {
-            //     sellerSku2: 'SellerSKU3',
-            //     sellerSku: 'SellerSKU33',
-            // }, {
-            //     sellerSku2: '',
-            //     sellerSku: 'SellerSKU44',
-            //     site: '1234'
-            // });
-            // const rt = await service.insert({
-            //     data: list,
-            //     conn,
-            //     // skipEmptyString: false,
-            //     // skipUndefined: false
-            //     mode: InsertMode.InsertWithTempTable,
-            //     existConditionOtherThanIds: ['sellerSku']
-            // });
-            // console.log(11, rt);
-            // const rt2 = await service.update({
-            //     data: {
-            //         sellerSku: 'SellerSKU1',
-            //         sellerSku2: 'SellerSKU21',
-            //         site: 'site1'
-            //     },
-            //     conn, skipEmptyString: false
-            // });
-            // console.log(22, rt2);
-            // const rt3 = await service.delete({
-            //     where: [
-            //         { sellerSku2: 'SellerSKU23', sellerSku: 'SellerSKU3' }
-            //     ],
-            //     mode: DeleteMode.TempTable,
-            //     conn
-            // });
-            // console.log(33, rt3);
-            // const rt4 = await service.template({
-            //     where: { sellerSku2: 'SellerSKU22', sellerSku: 'sellerSku2' },
-            //     templateResult: TemplateResult.Many
-            // })
-            // console.log(44, rt4);
-            const rt5 = await service.select({
-                sqlId: 'test.test',
-                params: { username: '1111' },
-                selectResult: SelectResult.RS_CS
-            });
-            console.log(55, rt5.length);
-            // const rt6 = await service.stream().eq('sellerSku', 'SellerSKU1').excuteSelect({
-            //     selectResult: SelectResult.Many_Row_Many_Column,
-            // });
-            // console.log(66, rt6);
-            return 1;
+            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;
         }
     });
-    // 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);
+    console.log(11, list);
 }
 go2();