baja-lite 1.0.5 → 1.0.6

package/es/test-mysql.d.ts

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

package/es/test-mysql.js

@@ -31,7 +31,7 @@ AmaService2 = __decorate([
         tableName: 'ama_fuck', clz: AmaFuck2, dbType: DBType.Mysql
     })
 ], AmaService2);
-async function go2() {
+export async function go2() {
     await Boot({
         Mysql: {
             host: '39.98.58.252',
@@ -42,7 +42,7 @@ async function go2() {
             database: 'dmce',
             debug: false
         },
-        log: 'trace',
+        log: 'info',
         columnMode: ColumnMode.HUMP,
         sqlDir: 'E:/pro/baja-lite/xml'
     });
@@ -110,6 +110,18 @@ async function go2() {
             return 1;
         }
     });
-    await service.select({ sqlId: 'event-report.matchSectionTempWGoalPlayerList', params: { searchVo: { matchId: 'yyyy', matchSection: 'oooo' } } });
+    const data = await service.select({
+        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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/util-man",
   "repository": {
@@ -30,9 +30,11 @@
     "sqlite": "node inspect ./dist/cjs/test-sqlite.js"
   },
   "dependencies": {
+    "@types/lodash.get": "^4.4.9",
     "decimal.js": "10.4.3",
     "html-parse-stringify": "3.0.1",
     "iterare": "1.2.1",
+    "lodash.get": "^4.4.2",
     "mustache": "4.2.0",
     "pino": "9.2.0",
     "pino-pretty": "11.2.1",
@@ -44,17 +46,17 @@
   "devDependencies": {
     "@types/better-sqlite3": "7.6.10",
     "@types/mustache": "4.2.5",
-    "@types/node": "20.14.2",
+    "@types/node": "20.14.9",
     "@types/sqlstring": "2.3.2",
-    "@typescript-eslint/eslint-plugin": "7.13.0",
-    "@typescript-eslint/parser": "7.13.0",
+    "@typescript-eslint/eslint-plugin": "7.14.1",
+    "@typescript-eslint/parser": "7.14.1",
     "better-sqlite3": "11.0.0",
     "ioredis": "5.4.1",
     "mongodb": "6.7.0",
-    "mysql2": "3.10.0",
+    "mysql2": "3.10.1",
     "redlock": "5.0.0-beta.2",
     "shelljs": "0.8.5",
-    "typescript": "5.4.5"
+    "typescript": "5.5.2"
   },
   "engines": {
     "node": "20",

package/src/boot-remote.ts

@@ -1,6 +1,6 @@
-import { _primaryDB, _dao, logger, DBType, _sqlCache, _GlobalSqlOption, GlobalSqlOption2, _defOption, SqlCache, SqliteRemote, _Hump, ColumnMode } from './sql';
+import { _primaryDB, _dao, logger, DBType, _sqlCache, _GlobalSqlOption, GlobalSqlOptionForWeb, _defOption, SqlCache, SqliteRemote, _Hump, ColumnMode } from './sql';
 
-export const BootRomote = async function (options: GlobalSqlOption2) {
+export const BootRomote = async function (options: GlobalSqlOptionForWeb) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption, options);
     globalThis[_Hump] = globalThis[_GlobalSqlOption].columnMode === ColumnMode.HUMP;
     logger.level = options.log ?? 'info';

package/src/code.ts

@@ -75,6 +75,7 @@ console.log(`
             "s": ["entity", "controller", "service", "sql", "module"]
         },
         "output": "{ClassName}Module",
+        "id"? : "uuidShort: true, notNull: true, uuid: true"
     }
     command是生成命令，这里声明命令同时定义文件生成路径:可用下面的变量替换.同时必须有同名模板.
     路径是相对于项目根目录的
@@ -88,16 +89,18 @@ console.log(`
     请在项目根目录的code-template添加模板文件， 按照mustache(标签定义成了[ '<%', '%>' ])进行格式化,变量：
         title,
 
-        tableName,
-        className,
-        ClassName,
-        vueName,
-        splitName,
+        tableName, event_main_info
+        className, eventMainInfo
+        ClassName, EventMainInfo
+        vueName, event-main-info
+        splitName, event/main/info
+        SplitName, event/mainInfo
 
         columns: [
             comment:
             name: sku_id
             Name: skuId
+            NAME: SkuId
             Field
             Type
         ], Field(类型string)，表示字段的注解, Type 表示JS类型
@@ -125,7 +128,7 @@ console.log(`
 try {
     const outputs = new Set<string>();
     const _configData = fs.readFileSync(config, { encoding: 'utf-8' }).toString();
-    const configData = JSON.parse(_configData) ;
+    const configData = JSON.parse(_configData);
     const templates = Object.fromEntries(fs.readdirSync(templatePath).map(r => [path.basename(r, '.mu'), fs.readFileSync(path.join(templatePath, r), { encoding: 'utf-8' }).toString()]));
     const pool = createPool({
         host: configData.host,
@@ -167,7 +170,7 @@ try {
             else delete r.id;
             if (r.notNull === 1) { r.notNull = true; }
             else delete r.notNull;
-            r.comment = `* ${r.comment??''}(\`${tableName}.${r.name}\`)`;
+            r.comment = `* ${r.comment ?? ''}(\`${tableName}.${r.name}\`)`;
             const fields = new Array<string>(`type:SqlType.${r.type}`);
             if (r.length !== null) { fields.push(`length:${r.length}`); }
             if (r.scale !== null) { fields.push(`scale:${r.scale}`); }
@@ -179,11 +182,17 @@ try {
                     fields.push(`def:${r.def}`);
                 }
             }
-            if (r.id === true) { fields.push(`id:true`); }
+            if (r.id === true) {
+                fields.push(`id:true`);
+            }
             if (r.notNull === true) { fields.push(`notNull:true`); }
+            if (r.id === true && configData.id) {
+                fields.push(configData.id);
+            }
             r.Type = lxMap[r.type];
             r.Field = `@Field({${fields.join(',')}})`;
             r.Name = r.name.replace(/_(\w)/g, (a: string, b: string) => b.toUpperCase());
+            r.NAME = r.Name.replace(/\w/, (v: string) => v.toUpperCase());
             return r;
         });
         conn.release();
@@ -206,6 +215,7 @@ try {
             const ClassName = className.replace(/\w/, (v: string) => v.toUpperCase());
             const vueName = tableName.replace(/_/g, '-');
             const splitName = tableName.replace(/_/g, '/');
+            const SplitName = tableName.replace(/_/, '/').replace(/_(\w)/g, (a: string, b: string) => b.toUpperCase());
             const data = {
                 title,
 
@@ -214,19 +224,25 @@ try {
                 ClassName,
                 vueName,
                 splitName,
+                SplitName,
 
                 columns,
                 columnNames: columns?.map(i => i.name),
+                ColumnNames: columns?.map(i => i.Name),
                 columnNames_join: columns?.map(i => i.name).join(','),
                 ColumnNames_join: columns?.map(i => `${i.name} ${i.Name}`).join(','),
 
                 columns_no_id: columns?.filter(i => !i.id),
                 columnNames_no_id: columns?.filter(i => !i.id).map(i => i.name),
+                ColumnNames_no_id: columns?.filter(i => !i.id).map(i => i.Name),
                 columnNames_no_id_join: columns?.filter(i => !i.id).map(i => i.name).join(','),
+                ColumnNames_no_id_join: columns?.filter(i => !i.id).map(i => i.Name).join(','),
 
                 ids: columns?.filter(i => i.id),
                 idNames: columns?.filter(i => i.id).map(i => i.name),
+                IdNames: columns?.filter(i => i.id).map(i => i.Name),
                 idNames_join: columns?.filter(i => i.id).map(i => i.name).join(','),
+                IdNames_join: columns?.filter(i => i.id).map(i => i.Name).join(','),
 
                 modelName,
                 modelPath

package/src/convert-xml.ts

@@ -143,8 +143,9 @@ const convertIf = function (children: XML, param: Record<string, any>, parentIds
         evalString = evalString.replace(/ or /gi, ' || ');
 
         // replace == to === for strict evaluate
-        evalString = evalString.replace(/==/g, '===');
-        evalString = evalString.replace(/!=/g, '!==');
+        // TODO: fix != null & != ''
+        // evalString = evalString.replace(/==/g, '===');
+        // evalString = evalString.replace(/!=/g, '!==');
 
         evalString = evalString.replace(/^'(.*?)'\.equalsIgnoreCase\( ([a-zA-Z]+\.[a-zA-Z]+) \)/i, `($2 && $2.toUpperCase() === '$1'.toUpperCase())`);
         evalString = evalString.replace(/\('(.*?)'\.equalsIgnoreCase\( ([a-zA-Z]+\.[a-zA-Z]+) \)/i, `(($2 && $2.toUpperCase() === '$1'.toUpperCase())`);

package/src/index.ts

@@ -6,4 +6,5 @@ export * from './object';
 export * from './set-ex';
 export * from './sql';
 export * from './string';
-export * from './enum';
+export * from './enum';
+export * from './list';

package/src/list.ts

@@ -0,0 +1,31 @@
+export class ArrayList<T> extends Array<T> {
+    constructor(array?: Array<T> | T | undefined) {
+        super();
+        if (array instanceof Array) {
+            super.push(...array);
+        } else if (typeof array !== 'undefined') {
+            super.push(array);
+        }
+    }
+    add(...items: T[]) {
+        this.push(...items);
+    }
+    size() {
+        return this.length;
+    }
+    isEmpty() {
+        return this.length === 0;
+    }
+    get(index: number) {
+        return this[index];
+    }
+    clear() {
+        this.length = 0;
+    }
+    set(index: number, item: T) {
+        this[index] = item;
+    }
+    remove(index: number) {
+        this.splice(index, 1);
+    }
+}

package/src/object.ts

@@ -218,7 +218,7 @@ export const arraySplit = <T = any>(datas: T[], { everyLength = 0, groupCount =
 const P2CEX = /[A-Z]/g;
 export const P2C = (pro: string, IF = true) => IF ? pro.replace(P2CEX, (a: string) => `_${a.toLowerCase()}`) : pro;
 const C2PEX = /_([a-z])/g;
-export const C2P = (pro: string, IF = true) => IF ? pro.replace(C2PEX, (a: string, b: string) => `_${b.toUpperCase()}`) : pro;
+export const C2P = (pro: string, IF = true) => IF ? pro.replace(C2PEX, (a: string, b: string) => `${b.toUpperCase()}`) : pro;
 
 
 export function C2P2<T extends Object = any, L extends Object = T>(datas: L[]): T[];
@@ -243,4 +243,5 @@ export function P2C2<T extends Object = any, L extends Object = T>(datas: L | L[
   } else {
     return datas;
   }
-}
+}
+

package/src/set-ex.ts

@@ -1,8 +1,11 @@
 export class SetEx<T> extends Set {
-  private uniqueKey: keyof T;
-  private whenOnExist?: (oldData: T, newData: T) => void | null;
-  private whenOnNotExist?: (newData: T) => void | null;
-  private replaceItemWhenExits: boolean;
+  private _key: keyof T;
+  private _onExist1?: (oldData: T, newData: T) => void | null;
+  private _onNotExist1?: (newData: T) => void | null;
+  private _replaceIfExits1: boolean;
+  private _onExist2?: (oldData: T, newData: T) => void | null;
+  private _onNotExist2?: (newData: T) => void | null;
+  private _replaceIfExits2: boolean;
   /**
    * @param key 识别是否存在的对象的属性名
    * @param onExist 当存在时作何操作? oldData/newData 哪个将添加到set,由replaceItemWhenExits决定,默认是oldData生效
@@ -11,35 +14,33 @@ export class SetEx<T> extends Set {
    * @param values 初始数组
    */
   constructor(
-    key: keyof T | {
+    option: {
       key: keyof T;
-      onExist?: (oldData: T, newData: T) => void;
-      onNotExist?: (newData: T) => void;
-      replaceWhenExits?: boolean;
+      /** add&addAll触发 */
+      onExist1?: (oldData: T, newData: T) => void;
+      /** add&addAll触发 */
+      onNotExist1?: (newData: T) => void;
+      /** add&addAll触发 */
+      replaceIfExits1?: boolean;
+      /** add2&addAll2触发 */
+      onExist2?: (oldData: T, newData: T) => void;
+      /** add2&addAll2触发 */
+      onNotExist2?: (newData: T) => void;
+      /** add2&addAll2触发 */
+      replaceIfExits2?: boolean;
       values?: ReadonlyArray<T> | null;
-    },
-    onExist?: (oldData: T, newData: T) => void,
-    replaceWhenExits = false,
-    values?: ReadonlyArray<T> | null,
-    onNotExist?: (newData: T) => void
+    }
   ) {
     super();
-    if (typeof key === 'object') {
-      this.whenOnExist = key.onExist;
-      this.uniqueKey = key.key;
-      this.replaceItemWhenExits = key.replaceWhenExits === true;
-      this.whenOnNotExist = key.onNotExist;
-      if (key.values) {
-        this.addAll(...key.values);
-      }
-    } else {
-      this.whenOnExist = onExist;
-      this.uniqueKey = key;
-      this.replaceItemWhenExits = replaceWhenExits;
-      this.whenOnNotExist = onNotExist;
-      if (values) {
-        this.addAll(...values);
-      }
+    this._key = option.key;
+    this._onExist1 = option.onExist1;
+    this._onNotExist1 = option.onNotExist1;
+    this._replaceIfExits1 = option.replaceIfExits1 === true;
+    this._onExist2 = option.onExist2;
+    this._onNotExist2 = option.onNotExist2;
+    this._replaceIfExits2 = option.replaceIfExits2 === true;
+    if (option.values) {
+      this.addAll(...option.values);
     }
   }
 
@@ -52,12 +53,12 @@ export class SetEx<T> extends Set {
   override add(value: T): this {
     let flag = false;
     this.forEach((item: T): any => {
-      if (item[this.uniqueKey] === value[this.uniqueKey]) {
+      if (item[this._key] === value[this._key]) {
         flag = true;
-        if (this.whenOnExist) {
-          this.whenOnExist(item, value);
+        if (this._onExist1) {
+          this._onExist1(item, value);
         }
-        if (this.replaceItemWhenExits === true) {
+        if (this._replaceIfExits1 === true) {
           super.delete(item);
           flag = false;
         }
@@ -66,8 +67,8 @@ export class SetEx<T> extends Set {
     });
     if (flag === false) {
       super.add(value);
-      if (this.whenOnNotExist) {
-        this.whenOnNotExist(value);
+      if (this._onNotExist1) {
+        this._onNotExist1(value);
       }
     }
     return this;
@@ -93,13 +94,13 @@ export class SetEx<T> extends Set {
     let flag = false;
     let tmp = value;
     this.forEach((item: T): any => {
-      if (item[this.uniqueKey] === value[this.uniqueKey]) {
+      if (item[this._key] === value[this._key]) {
         flag = true;
-        if (this.whenOnExist) {
-          this.whenOnExist(item, value);
+        if (this._onExist2) {
+          this._onExist2(item, value);
         }
-        if (this.replaceItemWhenExits === true) {
-          super.delete(item);
+        if (this._replaceIfExits2 === true) {
+          super.delete(value);
           flag = false;
         } else {
           tmp = item;
@@ -109,8 +110,8 @@ export class SetEx<T> extends Set {
     });
     if (flag === false) {
       super.add(value);
-      if (this.whenOnNotExist) {
-        this.whenOnNotExist(value);
+      if (this._onNotExist2) {
+        this._onNotExist2(value);
       }
     }
     return tmp;
@@ -135,7 +136,7 @@ export class SetEx<T> extends Set {
    */
   find(value: T[keyof T]): T | null {
     for (const item of this) {
-      if (item[this.uniqueKey] === value) {
+      if (item[this._key] === value) {
         return item;
       }
     }
@@ -149,7 +150,7 @@ export class SetEx<T> extends Set {
   findAll(value: T[keyof T]): T[] {
     const res = new Array<T>();
     this.forEach((item) => {
-      if (item[this.uniqueKey] === value) {
+      if (item[this._key] === value) {
         res.push(item);
       }
     });
@@ -190,9 +191,9 @@ export class SetEx<T> extends Set {
    * @param {*} value 这是对象的关键属性,而非对象
    * @returns {boolean}
    */
-  override has(value: T[keyof T]): boolean {
+  override has(value: T[keyof T] ): boolean {
     for (const item of this) {
-      if (item[this.uniqueKey] === value) {
+      if (item[this._key] === value) {
         return true;
       }
     }
@@ -239,7 +240,7 @@ export class SetEx<T> extends Set {
    */
   override delete(value: T[keyof T]): boolean {
     for (const item of this) {
-      if (item[this.uniqueKey] === value) {
+      if (item[this._key] === value) {
         super.delete(item);
         return true;
       }
@@ -253,25 +254,33 @@ export class SetEx<T> extends Set {
    * @param {(oldData: T, newData: T) => void} [onExist]
    * @param {boolean} [replaceWhenExits=false]
    */
-  reset({ key, onExist, onNotExist, replaceWhenExits }: {
+  reset(option: {
     key?: keyof T;
-    onExist?: (oldData: T, newData: T) => void | null;
-    onNotExist?: (newData: T) => void | null;
-    replaceWhenExits?: boolean;
+    /** add&addAll触发 */
+    onExist1?: (oldData: T, newData: T) => void;
+    /** add&addAll触发 */
+    onNotExist1?: (newData: T) => void;
+    /** add&addAll触发 */
+    replaceIfExits1?: boolean;
+    /** add2&addAll2触发 */
+    onExist2?: (oldData: T, newData: T) => void;
+    /** add2&addAll2触发 */
+    onNotExist2?: (newData: T) => void;
+    /** add2&addAll2触发 */
+    replaceIfExits2?: boolean;
+    values?: ReadonlyArray<T> | null;
   }): this {
-    if (onExist !== undefined) {
-      this.whenOnExist = onExist;
-    }
-    if (onNotExist !== undefined) {
-      this.whenOnNotExist = onNotExist;
-    }
-    if (key) {
-      this.uniqueKey = key;
-    }
-    if (replaceWhenExits !== undefined) {
-      this.replaceItemWhenExits = replaceWhenExits;
-    }
     this.clear();
+    if (option.key) { this._key = option.key; }
+    if (option.onExist1) { this._onExist1 = option.onExist1; }
+    if (option.onNotExist1) { this._onNotExist1 = option.onNotExist1; }
+    if (option.replaceIfExits1) { this._replaceIfExits1 = option.replaceIfExits1; }
+    if (option.onExist2) { this._onExist2 = option.onExist2; }
+    if (option.onNotExist2) { this._onNotExist2 = option.onNotExist2; }
+    if (option.replaceIfExits2) { this._replaceIfExits2 = option.replaceIfExits2; }
+    if (option.values) {
+      this.addAll(...option.values);
+    }
     return this;
   }
   /**
@@ -339,7 +348,7 @@ export class SetEx<T> extends Set {
     const result: { [k: string]: { value: T[keyof T], name: T[keyof T] }[] } = {};
     const list = this.toArray({ sort, each, filter, map });
     for (const item of list) {
-      const name = item[this.uniqueKey];
+      const name = item[this._key];
       for (const key in item) {
         if (!result[key]) {
           result[key] = [];
@@ -350,13 +359,25 @@ export class SetEx<T> extends Set {
     return result;
   }
 
-  set onExist(onExist: ((oldData: T, newData: T) => void) | undefined) {
-    this.whenOnExist = onExist;
+  set onExist1(onExist1: ((oldData: T, newData: T) => void) | undefined) {
+    this._onExist1 = onExist1;
   }
-  set key(key: keyof T) {
-    this.uniqueKey = key;
+  set onExist2(onExist2: ((oldData: T, newData: T) => void) | undefined) {
+    this._onExist2 = onExist2;
+  }
+  set onNotExist1(onNotExist1: ((newData: T) => void) | undefined) {
+    this._onNotExist1 = onNotExist1;
+  }
+  set onNotExist2(onNotExist2: ((newData: T) => void) | undefined) {
+    this._onNotExist2 = onNotExist2;
   }
-  set replaceWhenExits(replaceWhenExits: boolean) {
-    this.replaceItemWhenExits = replaceWhenExits;
+  set replaceIfExits1(replaceIfExits1: boolean) {
+    this._replaceIfExits1 = replaceIfExits1;
+  }
+  set replaceIfExits2(replaceIfExits2: boolean) {
+    this._replaceIfExits2 = replaceIfExits2;
+  }
+  set key(key: keyof T) {
+    this._key = key;
   }
 }