baja-lite 1.0.5 → 1.0.6

package/cjs/test-mysql.d.ts

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

package/cjs/test-mysql.js

@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.go2 = go2;
 require("reflect-metadata");
 const boot_1 = require("./boot");
 const sql_1 = require("./sql");
@@ -44,7 +45,7 @@ async function go2() {
             database: 'dmce',
             debug: false
         },
-        log: 'trace',
+        log: 'info',
         columnMode: sql_1.ColumnMode.HUMP,
         sqlDir: 'E:/pro/baja-lite/xml'
     });
@@ -112,6 +113,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/es/boot-remote.d.ts

@@ -1,2 +1,2 @@
-import { GlobalSqlOption2 } from './sql';
-export declare const BootRomote: (options: GlobalSqlOption2) => Promise<void>;
+import { GlobalSqlOptionForWeb } from './sql';
+export declare const BootRomote: (options: GlobalSqlOptionForWeb) => Promise<void>;

package/es/code.js

@@ -74,6 +74,7 @@ console.log(`
             "s": ["entity", "controller", "service", "sql", "module"]
         },
         "output": "{ClassName}Module",
+        "id"? : "uuidShort: true, notNull: true, uuid: true"
     }
     command是生成命令，这里声明命令同时定义文件生成路径:可用下面的变量替换.同时必须有同名模板.
     路径是相对于项目根目录的
@@ -87,16 +88,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类型
@@ -193,9 +196,13 @@ try {
             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, b) => b.toUpperCase());
+            r.NAME = r.Name.replace(/\w/, (v) => v.toUpperCase());
             return r;
         });
         conn.release();
@@ -218,6 +225,7 @@ try {
             const ClassName = className.replace(/\w/, (v) => v.toUpperCase());
             const vueName = tableName.replace(/_/g, '-');
             const splitName = tableName.replace(/_/g, '/');
+            const SplitName = tableName.replace(/_/, '/').replace(/_(\w)/g, (a, b) => b.toUpperCase());
             const data = {
                 title,
                 tableName,
@@ -225,16 +233,22 @@ 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/es/convert-xml.js

@@ -124,8 +124,9 @@ const convertIf = function (children, param, parentIds, myBatisMapper) {
         evalString = evalString.replace(/ and /gi, ' && ');
         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/es/index.d.ts

@@ -7,3 +7,4 @@ export * from './set-ex';
 export * from './sql';
 export * from './string';
 export * from './enum';
+export * from './list';

package/es/index.js

@@ -7,3 +7,4 @@ export * from './set-ex';
 export * from './sql';
 export * from './string';
 export * from './enum';
+export * from './list';

package/es/list.d.ts

@@ -0,0 +1,10 @@
+export declare class ArrayList<T> extends Array<T> {
+    constructor(array?: Array<T> | T | undefined);
+    add(...items: T[]): void;
+    size(): number;
+    isEmpty(): boolean;
+    get(index: number): T | undefined;
+    clear(): void;
+    set(index: number, item: T): void;
+    remove(index: number): void;
+}

package/es/list.js

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

package/es/object.js

@@ -197,7 +197,7 @@ export const arraySplit = (datas, { everyLength = 0, groupCount = 0 } = {}) => {
 const P2CEX = /[A-Z]/g;
 export const P2C = (pro, IF = true) => IF ? pro.replace(P2CEX, (a) => `_${a.toLowerCase()}`) : pro;
 const C2PEX = /_([a-z])/g;
-export const C2P = (pro, IF = true) => IF ? pro.replace(C2PEX, (a, b) => `_${b.toUpperCase()}`) : pro;
+export const C2P = (pro, IF = true) => IF ? pro.replace(C2PEX, (a, b) => `${b.toUpperCase()}`) : pro;
 export function C2P2(datas) {
     if (datas instanceof Array) {
         return iterate(datas).map((data) => Object.fromEntries(Object.entries(data).map(([K, V]) => [C2P(K), V]))).toArray();

package/es/set-ex.d.ts

@@ -1,8 +1,11 @@
 export declare class SetEx<T> extends Set {
-    private uniqueKey;
-    private whenOnExist?;
-    private whenOnNotExist?;
-    private replaceItemWhenExits;
+    private _key;
+    private _onExist1?;
+    private _onNotExist1?;
+    private _replaceIfExits1;
+    private _onExist2?;
+    private _onNotExist2?;
+    private _replaceIfExits2;
     /**
      * @param key 识别是否存在的对象的属性名
      * @param onExist 当存在时作何操作? oldData/newData 哪个将添加到set,由replaceItemWhenExits决定,默认是oldData生效
@@ -10,13 +13,22 @@ export declare class SetEx<T> extends Set {
      * @param replaceWhenExits 当存在时是否覆盖？
      * @param values 初始数组
      */
-    constructor(key: keyof T | {
+    constructor(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?: boolean, values?: ReadonlyArray<T> | null, onNotExist?: (newData: T) => void);
+    });
     /**
      *
      * 添加返回
@@ -117,11 +129,21 @@ export declare 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;
     /**
      *
@@ -165,7 +187,11 @@ export declare class SetEx<T> extends Set {
             name: T[keyof T];
         }[];
     };
-    set onExist(onExist: ((oldData: T, newData: T) => void) | undefined);
+    set onExist1(onExist1: ((oldData: T, newData: T) => void) | undefined);
+    set onExist2(onExist2: ((oldData: T, newData: T) => void) | undefined);
+    set onNotExist1(onNotExist1: ((newData: T) => void) | undefined);
+    set onNotExist2(onNotExist2: ((newData: T) => void) | undefined);
+    set replaceIfExits1(replaceIfExits1: boolean);
+    set replaceIfExits2(replaceIfExits2: boolean);
     set key(key: keyof T);
-    set replaceWhenExits(replaceWhenExits: boolean);
 }

package/es/set-ex.js

@@ -6,25 +6,17 @@ export class SetEx extends Set {
      * @param replaceWhenExits 当存在时是否覆盖？
      * @param values 初始数组
      */
-    constructor(key, onExist, replaceWhenExits = false, values, onNotExist) {
+    constructor(option) {
         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);
         }
     }
     /**
@@ -36,12 +28,12 @@ export class SetEx extends Set {
     add(value) {
         let flag = false;
         this.forEach((item) => {
-            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;
                 }
@@ -50,8 +42,8 @@ export class SetEx extends Set {
         });
         if (flag === false) {
             super.add(value);
-            if (this.whenOnNotExist) {
-                this.whenOnNotExist(value);
+            if (this._onNotExist1) {
+                this._onNotExist1(value);
             }
         }
         return this;
@@ -77,13 +69,13 @@ export class SetEx extends Set {
         let flag = false;
         let tmp = value;
         this.forEach((item) => {
-            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 {
@@ -94,8 +86,8 @@ export class SetEx extends Set {
         });
         if (flag === false) {
             super.add(value);
-            if (this.whenOnNotExist) {
-                this.whenOnNotExist(value);
+            if (this._onNotExist2) {
+                this._onNotExist2(value);
             }
         }
         return tmp;
@@ -120,7 +112,7 @@ export class SetEx extends Set {
      */
     find(value) {
         for (const item of this) {
-            if (item[this.uniqueKey] === value) {
+            if (item[this._key] === value) {
                 return item;
             }
         }
@@ -134,7 +126,7 @@ export class SetEx extends Set {
     findAll(value) {
         const res = new Array();
         this.forEach((item) => {
-            if (item[this.uniqueKey] === value) {
+            if (item[this._key] === value) {
                 res.push(item);
             }
         });
@@ -177,7 +169,7 @@ export class SetEx extends Set {
      */
     has(value) {
         for (const item of this) {
-            if (item[this.uniqueKey] === value) {
+            if (item[this._key] === value) {
                 return true;
             }
         }
@@ -222,7 +214,7 @@ export class SetEx extends Set {
      */
     delete(value) {
         for (const item of this) {
-            if (item[this.uniqueKey] === value) {
+            if (item[this._key] === value) {
                 super.delete(item);
                 return true;
             }
@@ -236,20 +228,32 @@ export class SetEx extends Set {
      * @param {(oldData: T, newData: T) => void} [onExist]
      * @param {boolean} [replaceWhenExits=false]
      */
-    reset({ key, onExist, onNotExist, replaceWhenExits }) {
-        if (onExist !== undefined) {
-            this.whenOnExist = onExist;
+    reset(option) {
+        this.clear();
+        if (option.key) {
+            this._key = option.key;
         }
-        if (onNotExist !== undefined) {
-            this.whenOnNotExist = onNotExist;
+        if (option.onExist1) {
+            this._onExist1 = option.onExist1;
         }
-        if (key) {
-            this.uniqueKey = key;
+        if (option.onNotExist1) {
+            this._onNotExist1 = option.onNotExist1;
         }
-        if (replaceWhenExits !== undefined) {
-            this.replaceItemWhenExits = replaceWhenExits;
+        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);
         }
-        this.clear();
         return this;
     }
     /**
@@ -310,7 +314,7 @@ export class SetEx extends Set {
         const result = {};
         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] = [];
@@ -320,13 +324,25 @@ export class SetEx extends Set {
         }
         return result;
     }
-    set onExist(onExist) {
-        this.whenOnExist = onExist;
+    set onExist1(onExist1) {
+        this._onExist1 = onExist1;
     }
-    set key(key) {
-        this.uniqueKey = key;
+    set onExist2(onExist2) {
+        this._onExist2 = onExist2;
+    }
+    set onNotExist1(onNotExist1) {
+        this._onNotExist1 = onNotExist1;
     }
-    set replaceWhenExits(replaceWhenExits) {
-        this.replaceItemWhenExits = replaceWhenExits;
+    set onNotExist2(onNotExist2) {
+        this._onNotExist2 = onNotExist2;
+    }
+    set replaceIfExits1(replaceIfExits1) {
+        this._replaceIfExits1 = replaceIfExits1;
+    }
+    set replaceIfExits2(replaceIfExits2) {
+        this._replaceIfExits2 = replaceIfExits2;
+    }
+    set key(key) {
+        this._key = key;
     }
 }