baja-lite 1.0.5 → 1.0.7

package/cjs/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/cjs/code.js

@@ -79,6 +79,7 @@ console.log(`
             "s": ["entity", "controller", "service", "sql", "module"]
         },
         "output": "{ClassName}Module",
+        "id"? : "uuidShort: true, notNull: true, uuid: true"
     }
     command是生成命令，这里声明命令同时定义文件生成路径:可用下面的变量替换.同时必须有同名模板.
     路径是相对于项目根目录的
@@ -92,16 +93,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类型
@@ -198,9 +201,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();
@@ -223,6 +230,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,
@@ -230,16 +238,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/cjs/convert-xml.js

@@ -8,9 +8,8 @@ const convert = function (childrens, param, parentIds, myBatisMapper) {
         statement += convertChildren(children, param, parentIds, myBatisMapper);
     }
     // Check not converted Parameters
-    var regexList = ['\\#{\\S*}', '\\${\\S*}'];
-    for (var i = 0, regexString; regexString = regexList[i]; i++) {
-        var regex = new RegExp(regex, 'g');
+    const regexList = ['\\#{\\S*}', '\\${\\S*}'];
+    for (let i = 0, regexString; regexString = regexList[i]; i++) {
         var checkParam = statement.match(regexString);
         if (checkParam != null && checkParam.length > 0) {
             throw new Error("Parameter " + checkParam.join(",") + " is not converted.");
@@ -128,8 +127,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/cjs/fn.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.excuteSplit = exports.ExcuteSplitMode = exports.dieTrying = exports.sleep = exports.promise = void 0;
+exports.ExcuteSplitMode = exports.sleep = exports.promise = void 0;
+exports.dieTrying = dieTrying;
+exports.excuteSplit = excuteSplit;
 const object_1 = require("./object");
 const error_1 = require("./error");
 /**
@@ -74,7 +76,6 @@ async function dieTrying(fn, { ifFinish = (result) => !!result, maxTryTimes = 20
     }
     return result;
 }
-exports.dieTrying = dieTrying;
 var ExcuteSplitMode;
 (function (ExcuteSplitMode) {
     ExcuteSplitMode[ExcuteSplitMode["SyncTrust"] = 0] = "SyncTrust";
@@ -166,4 +167,3 @@ function excuteSplit(sync, datas, fn, { everyLength = 0, groupCount = 0, settled
         return reasons;
     }
 }
-exports.excuteSplit = excuteSplit;

package/cjs/index.d.ts

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

package/cjs/index.js

@@ -23,3 +23,4 @@ __exportStar(require("./set-ex"), exports);
 __exportStar(require("./sql"), exports);
 __exportStar(require("./string"), exports);
 __exportStar(require("./enum"), exports);
+__exportStar(require("./list"), exports);

package/cjs/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/cjs/list.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ArrayList = void 0;
+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);
+    }
+}
+exports.ArrayList = ArrayList;

package/cjs/object.js

@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.P2C2 = exports.C2P2 = exports.C2P = exports.P2C = exports.arraySplit = exports.array2map = exports.mixList = exports.mixArray = exports.fixEmptyPrototy = exports.coverComplexBean = exports.createBeanFromArray = exports.emptyBean = exports.convertBeans = exports.convertBean = exports.copyBean = void 0;
+exports.C2P = exports.P2C = exports.arraySplit = exports.array2map = exports.mixList = exports.mixArray = exports.fixEmptyPrototy = exports.coverComplexBean = exports.createBeanFromArray = exports.emptyBean = exports.convertBeans = exports.convertBean = exports.copyBean = void 0;
+exports.C2P2 = C2P2;
+exports.P2C2 = P2C2;
 const iterare_1 = __importDefault(require("iterare"));
 /**
  * 对象对象（等同与convertBean）
@@ -214,7 +216,7 @@ const P2CEX = /[A-Z]/g;
 const P2C = (pro, IF = true) => IF ? pro.replace(P2CEX, (a) => `_${a.toLowerCase()}`) : pro;
 exports.P2C = P2C;
 const C2PEX = /_([a-z])/g;
-const C2P = (pro, IF = true) => IF ? pro.replace(C2PEX, (a, b) => `_${b.toUpperCase()}`) : pro;
+const C2P = (pro, IF = true) => IF ? pro.replace(C2PEX, (a, b) => `${b.toUpperCase()}`) : pro;
 exports.C2P = C2P;
 function C2P2(datas) {
     if (datas instanceof Array) {
@@ -227,7 +229,6 @@ function C2P2(datas) {
         return datas;
     }
 }
-exports.C2P2 = C2P2;
 function P2C2(datas) {
     if (datas instanceof Array) {
         return (0, iterare_1.default)(datas).map((data) => Object.fromEntries(Object.entries(data).map(([K, V]) => [(0, exports.P2C)(K), V]))).toArray();
@@ -239,4 +240,3 @@ function P2C2(datas) {
         return datas;
     }
 }
-exports.P2C2 = P2C2;

package/cjs/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/cjs/set-ex.js

@@ -9,25 +9,17 @@ 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);
         }
     }
     /**
@@ -39,12 +31,12 @@ 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;
                 }
@@ -53,8 +45,8 @@ class SetEx extends Set {
         });
         if (flag === false) {
             super.add(value);
-            if (this.whenOnNotExist) {
-                this.whenOnNotExist(value);
+            if (this._onNotExist1) {
+                this._onNotExist1(value);
             }
         }
         return this;
@@ -80,13 +72,13 @@ 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 {
@@ -97,8 +89,8 @@ class SetEx extends Set {
         });
         if (flag === false) {
             super.add(value);
-            if (this.whenOnNotExist) {
-                this.whenOnNotExist(value);
+            if (this._onNotExist2) {
+                this._onNotExist2(value);
             }
         }
         return tmp;
@@ -123,7 +115,7 @@ class SetEx extends Set {
      */
     find(value) {
         for (const item of this) {
-            if (item[this.uniqueKey] === value) {
+            if (item[this._key] === value) {
                 return item;
             }
         }
@@ -137,7 +129,7 @@ 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);
             }
         });
@@ -180,7 +172,7 @@ class SetEx extends Set {
      */
     has(value) {
         for (const item of this) {
-            if (item[this.uniqueKey] === value) {
+            if (item[this._key] === value) {
                 return true;
             }
         }
@@ -225,7 +217,7 @@ 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;
             }
@@ -239,20 +231,32 @@ 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;
     }
     /**
@@ -313,7 +317,7 @@ 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] = [];
@@ -323,14 +327,26 @@ 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;
     }
 }
 exports.SetEx = SetEx;