baja-lite 1.0.7 → 1.0.10

package/cjs/boot-remote.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BootRomote = void 0;
+const enum_1 = require("./enum");
 const sql_1 = require("./sql");
 const BootRomote = async function (options) {
     globalThis[sql_1._GlobalSqlOption] = Object.assign({}, sql_1._defOption, options);
@@ -13,6 +14,9 @@ const BootRomote = async function (options) {
     globalThis[sql_1._dao] = {
         [sql_1.DBType.SqliteRemote]: {},
     };
+    if (options.enums) {
+        globalThis[sql_1._enums] = (0, enum_1.getEnums)(options.enums);
+    }
     if (options.SqliteRemote) {
         if (typeof options.SqliteRemote.db === 'string') {
             await options.SqliteRemote.service.initDB(options.SqliteRemote.db);

package/cjs/boot.js

@@ -24,6 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Boot = void 0;
+const enum_1 = require("./enum");
 const sql_1 = require("./sql");
 const Boot = async function (options) {
     globalThis[sql_1._GlobalSqlOption] = Object.assign({}, sql_1._defOption, options);
@@ -44,6 +45,9 @@ const Boot = async function (options) {
         [sql_1.DBType.SqliteRemote]: {},
         [sql_1.DBType.Redis]: {}
     };
+    if (options.enums) {
+        globalThis[sql_1._enums] = (0, enum_1.getEnums)(options.enums);
+    }
     if (options.Mysql) {
         const { createPool } = await Promise.resolve().then(() => __importStar(require('mysql2/promise')));
         if (options.Mysql['host']) {

package/cjs/code.js

@@ -9,6 +9,7 @@ const fs_1 = __importDefault(require("fs"));
 const repl_1 = require("repl");
 const promise_1 = require("mysql2/promise");
 const mustache_1 = __importDefault(require("mustache"));
+const shelljs_1 = require("shelljs");
 const lxMap = {
     tinyint: "number",
     smallint: "number",
@@ -79,7 +80,10 @@ console.log(`
             "s": ["entity", "controller", "service", "sql", "module"]
         },
         "output": "{ClassName}Module",
-        "id"? : "uuidShort: true, notNull: true, uuid: true"
+        "id"? : "uuidShort: true, notNull: true, uuid: true",
+        "logicDeleteK"?: "逻辑删除字段名",
+        "logicDeleteV"?: "逻辑删除值",如果是字符串需要这样 logicDeleteV: "'0'"
+        "NotlogicDeleteV"?: "未逻辑删除值",如果是字符串需要这样 NotlogicDeleteV: "'0'"
     }
     command是生成命令，这里声明命令同时定义文件生成路径:可用下面的变量替换.同时必须有同名模板.
     路径是相对于项目根目录的
@@ -120,6 +124,8 @@ console.log(`
 
         modelName: 模块名称，可能为空字符串
         modelPath: 模块名称实际就影响访问路径，所以这里会直接拼好controller的模块访问路径，如果模块为空，则该属性就是空字符串,否则是 /模块名称/
+
+        logicDelete: 逻辑删除的查询条件，可以附加在sql条件的末尾，可能是空的
     -----
     命令 table1,table2,table3:模块名称
     table=. 表示扫描全库表
@@ -167,6 +173,7 @@ try {
                 COLUMN_COMMENT \`comment\`
             FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=? AND TABLE_NAME = ?;
         `, [configData.database, tableName]);
+        let logicDelete = '';
         const columns = result.map(r => {
             if (r.id === 1) {
                 r.id = true;
@@ -178,7 +185,6 @@ try {
             }
             else
                 delete r.notNull;
-            r.comment = `* ${r.comment ?? ''}(\`${tableName}.${r.name}\`)`;
             const fields = new Array(`type:SqlType.${r.type}`);
             if (r.length !== null) {
                 fields.push(`length:${r.length}`);
@@ -204,6 +210,14 @@ try {
             if (r.id === true && configData.id) {
                 fields.push(configData.id);
             }
+            if (r.name === configData.logicDeleteK) {
+                fields.push(`logicDelete: ${configData.logicDeleteV}`);
+                logicDelete = `AND ${r.name} = ${configData.NotlogicDeleteV}`;
+            }
+            if (r.comment) {
+                fields.push(`comment: '${r.comment}'`);
+            }
+            r.comment = r.comment ?? '';
             r.Type = lxMap[r.type];
             r.Field = `@Field({${fields.join(',')}})`;
             r.Name = r.name.replace(/_(\w)/g, (a, b) => b.toUpperCase());
@@ -211,7 +225,7 @@ try {
             return r;
         });
         conn.release();
-        return columns;
+        return { columns, logicDelete };
     }
     async function excute(command, input, modelName) {
         const tables = await getTables(input);
@@ -225,7 +239,7 @@ try {
         modelName ?? (modelName = '');
         const modelPath = modelName ? `/${modelName}/` : '';
         for (const { tableName, title } of tables) {
-            const columns = await getColumns(tableName);
+            const { columns, logicDelete } = await getColumns(tableName);
             const className = tableName.replace(/_(\w)/g, (a, b) => b.toUpperCase());
             const ClassName = className.replace(/\w/, (v) => v.toUpperCase());
             const vueName = tableName.replace(/_/g, '-');
@@ -255,7 +269,8 @@ try {
                 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
+                modelPath,
+                logicDelete
             };
             const template = templates[command];
             if (!template) {
@@ -266,13 +281,13 @@ try {
             const fileName = configData.command[command].replace(/{([a-zA-Z]+)}/g, (a, b) => data[b]);
             const filePath = path_1.default.join(basepath, fileName);
             const dirname = path_1.default.dirname(filePath);
-            try {
-                fs_1.default.statSync(dirname);
-            }
-            catch (error) {
-                fs_1.default.mkdirSync(dirname);
-                console.info(`[生成] ${dirname}`);
-            }
+            (0, shelljs_1.mkdir)('-p', dirname);
+            // try {
+            //     fs.statSync(dirname);
+            // } catch (error) {
+            //     fs.mkdirSync(dirname);
+            //     console.info(`[生成] ${dirname}`);
+            // }
             try {
                 fs_1.default.statSync(filePath);
                 if (force === false) {

package/cjs/convert-xml.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convert = void 0;
+const lodash_get_1 = __importDefault(require("lodash.get"));
 const convert = function (childrens, param, parentIds, myBatisMapper) {
     let statement = '';
     for (let i = 0, children; children = childrens[i]; i++) {
@@ -89,7 +93,7 @@ const convertParametersInner = function (change, convertString, param) {
         for (let i = 0; i < _stringTarget.length; i++) {
             target = _stringTarget[i];
             const t = target.replace(change + '{', '').replace('}', '');
-            let tempParamKey = eval('param.' + t);
+            let tempParamKey = (0, lodash_get_1.default)(param, t);
             if (tempParamKey !== undefined) {
                 const reg = new RegExp('\\' + change + '{' + t + '}', 'g');
                 if (tempParamKey === null) {

package/cjs/enum.d.ts

@@ -8,3 +8,11 @@ export declare class Enum {
     desc(): string;
     config(): string[];
 }
+export type EnumMap = Record<string, Enum>;
+export type GlobalArray = Record<string, Array<[string, string]>>;
+export type GlobalMap = Record<string, Record<string, string>>;
+export interface EnmuJson {
+    GlobalArray: GlobalArray;
+    GlobalMap: GlobalMap;
+}
+export declare const getEnums: (GlobalValues?: EnumMap) => EnmuJson;

package/cjs/enum.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Enum = void 0;
+exports.getEnums = exports.Enum = void 0;
+const sql_1 = require("./sql");
 class Enum {
     constructor(value, desc, ...config) {
         this._value = value;
@@ -30,3 +31,34 @@ class Enum {
     }
 }
 exports.Enum = Enum;
+let configData = null;
+const getEnums = (GlobalValues) => {
+    if (!GlobalValues) {
+        return globalThis[sql_1._enums];
+    }
+    if (configData) {
+        return configData;
+    }
+    const result = {
+        GlobalArray: {},
+        GlobalMap: {}
+    };
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+    Object.keys(GlobalValues).forEach((item) => {
+        // const guess = /([\w\W]+)_([^_]+)$/.exec(item);
+        const guess = item.replace(new RegExp(`_${GlobalValues[item].value()}`, 'i'), '');
+        if (guess) {
+            if (!result.GlobalArray[guess]) {
+                result.GlobalArray[guess] = [];
+            }
+            result.GlobalArray[guess].push([GlobalValues[item].value(), GlobalValues[item].desc()]);
+            if (!result.GlobalMap[guess]) {
+                result.GlobalMap[guess] = {};
+            }
+            result.GlobalMap[guess][GlobalValues[item].value()] = GlobalValues[item].desc();
+        }
+    });
+    configData = result;
+    return result;
+};
+exports.getEnums = getEnums;

package/cjs/fn.js

@@ -92,55 +92,65 @@ function excuteSplit(sync, datas, fn, { everyLength = 0, groupCount = 0, settled
     const list = (0, object_1.arraySplit)(datas, ps);
     if (sync === ExcuteSplitMode.AsyncTrust) {
         return new Promise(async (resolve, reject) => {
-            const reasons = [];
-            if (settled) {
-                const result = await Promise.allSettled(list.map((list, i) => fn(list, i, list.length, extendParams[i])));
-                for (const item of result) {
-                    if (item.status === 'rejected') {
-                        reject(item.reason);
+            try {
+                const reasons = [];
+                if (settled) {
+                    const result = await Promise.allSettled(list.map((list, i) => fn(list, i, list.length, extendParams[i])));
+                    for (const item of result) {
+                        if (item.status === 'rejected') {
+                            reject(item.reason);
+                        }
+                        else {
+                            reasons.push(item.value);
+                        }
                     }
-                    else {
-                        reasons.push(item.value);
+                }
+                else {
+                    for (let i = 0; i < list.length; i++) {
+                        const startIndex = (i - 1) * ps.everyLength;
+                        const endIndex = startIndex + list[i].length - 1;
+                        reasons.push(await fn(list[i], i, list.length, extendParams[i], startIndex, endIndex));
                     }
                 }
+                resolve(reasons);
             }
-            else {
-                for (let i = 0; i < list.length; i++) {
-                    const startIndex = (i - 1) * ps.everyLength;
-                    const endIndex = startIndex + list[i].length - 1;
-                    reasons.push(await fn(list[i], i, list.length, extendParams[i], startIndex, endIndex));
-                }
+            catch (error) {
+                reject(error);
             }
-            resolve(reasons);
         });
     }
     else if (sync === ExcuteSplitMode.AsyncNoTrust) {
         return new Promise(async (resolve, reject) => {
-            const reasons = { result: [], error: [] };
-            if (settled) {
-                const result = await Promise.allSettled(list.map((list, i) => fn(list, i, list.length, extendParams[i])));
-                for (const item of result) {
-                    if (item.status === 'rejected') {
-                        reasons.error.push(item.reason);
-                    }
-                    else {
-                        reasons.result.push(item.value);
+            try {
+                const reasons = { result: [], error: [] };
+                if (settled) {
+                    const result = await Promise.allSettled(list.map((list, i) => fn(list, i, list.length, extendParams[i])));
+                    for (const item of result) {
+                        if (item.status === 'rejected') {
+                            reasons.error.push(item.reason);
+                        }
+                        else {
+                            reasons.result.push(item.value);
+                        }
                     }
                 }
-            }
-            else {
-                for (let i = 0; i < list.length; i++) {
-                    const startIndex = (i - 1) * ps.everyLength;
-                    const endIndex = startIndex + list[i].length - 1;
-                    try {
-                        reasons.result.push(await fn(list[i], i, list.length, extendParams[i], startIndex, endIndex));
-                    }
-                    catch (error) {
-                        reasons.error.push(error);
+                else {
+                    for (let i = 0; i < list.length; i++) {
+                        const startIndex = (i - 1) * ps.everyLength;
+                        const endIndex = startIndex + list[i].length - 1;
+                        try {
+                            reasons.result.push(await fn(list[i], i, list.length, extendParams[i], startIndex, endIndex));
+                        }
+                        catch (error) {
+                            reasons.error.push(error);
+                        }
                     }
                 }
+                resolve(reasons);
+            }
+            catch (error) {
+                reject(error);
             }
-            resolve(reasons);
         });
     }
     else if (sync === ExcuteSplitMode.SyncTrust) {

package/cjs/list.js

@@ -34,3 +34,27 @@ class ArrayList extends Array {
     }
 }
 exports.ArrayList = ArrayList;
+// export class ArrayMap<T> extends Array<T> {
+//     private _map: Map<string, T> = new Map();
+//     private key: keyof T;
+//     constructor(key: keyof T, array?: Array<T> | T | undefined) {
+//         super();
+//         this.key = key;
+//         if (array instanceof Array) {
+//             super.push(...array);
+//         } else if (typeof array !== 'undefined') {
+//             super.push(array);
+//         }
+//     }
+//     override push(...items: T[]): number {
+//         for (const item of items) {
+//             const key = item[this.key] as string;
+//             if (!this._map.has(key)) {
+//                 super.push(item);
+//                 this._map.set(key, item);
+//             }
+//         }
+//         return this.length;
+//     }
+//     override
+// }

package/cjs/math.d.ts

@@ -67,3 +67,17 @@ export declare class Bus {
 }
 export declare const calc: (result: any) => Bus;
 export declare const getGeo: (p1: Point, p2: Point) => number;
+/**
+ * 十进制转换自定义进制
+ * @param from 数字
+ * @param to 自定义进制的字符
+ * @returns
+ */
+export declare function ten2Any(from: number, to?: string): string;
+/**
+ * 自定义进制转换十进制
+ * @param from
+ * @param to
+ * @returns
+ */
+export declare function any2Ten(from: string, to?: string): number;

package/cjs/math.js

@@ -13,6 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGeo = exports.calc = exports.Bus = exports.money = exports.merge = exports.round = exports.sub = exports.mul = exports.add = exports.divDef = exports.div = exports.min = exports.max = exports.num = exports.MoneyOption = void 0;
+exports.ten2Any = ten2Any;
+exports.any2Ten = any2Ten;
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 const decimal_js_1 = __importDefault(require("decimal.js"));
 /** 金钱格式化可用样式 */
@@ -433,3 +435,40 @@ const getGeo = (p1, p2) => {
     return (0, exports.calc)(Math.round((0, exports.mul)(Math.asin(Math.sqrt((0, exports.add)(Math.pow(Math.sin((0, exports.div)((0, exports.sub)(p1.lat, p2.lat), 2)), 2), (0, exports.mul)(Math.cos(p1.lat), Math.cos(p2.lat), Math.pow(Math.sin((0, exports.div)((0, exports.sub)(p1.long, p2.long), 2)), 2))))), 2, 6378.137, 10000))).div(10000).round(2).over();
 };
 exports.getGeo = getGeo;
+const ZM = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+/**
+ * 十进制转换自定义进制
+ * @param from 数字
+ * @param to 自定义进制的字符
+ * @returns
+ */
+function ten2Any(from, to = ZM) {
+    let result = '';
+    const length = to.length;
+    while (from > 0) {
+        from--;
+        let remainder = from % length;
+        result = to.charAt(remainder) + result;
+        from = Math.floor(from / length);
+    }
+    return result;
+}
+/**
+ * 自定义进制转换十进制
+ * @param from
+ * @param to
+ * @returns
+ */
+function any2Ten(from, to = ZM) {
+    let decimal = 0;
+    from = from.toUpperCase();
+    for (let i = 0; i < from.length; i++) {
+        const char = from[from.length - 1 - i].toUpperCase();
+        const index = to.indexOf(char);
+        if (index > -1) {
+            const value = to.indexOf(char) + 1;
+            decimal += value * Math.pow(26, i);
+        }
+    }
+    return decimal;
+}

package/cjs/set-ex.d.ts

@@ -6,6 +6,7 @@ export declare class SetEx<T> extends Set {
     private _onExist2?;
     private _onNotExist2?;
     private _replaceIfExits2;
+    private _map;
     /**
      * @param key 识别是否存在的对象的属性名
      * @param onExist 当存在时作何操作? oldData/newData 哪个将添加到set,由replaceItemWhenExits决定,默认是oldData生效
@@ -58,16 +59,16 @@ export declare class SetEx<T> extends Set {
     addAll2(values: T[]): T[];
     /**
      * 用key找到匹配的第一个对象
-     * @param {*} value 这是对象的关键属性,而非对象
+     * @param {*} key 这是对象的关键属性,而非对象
      * @returns {(T | null)}
      */
-    find(value: T[keyof T]): T | null;
+    find(key: T[keyof T]): T | null;
     /**
      * 用key找到匹配的所有对象
-     * @param {*} value 这是对象的关键属性,而非对象
+     * @param {*} key 这是对象的关键属性,而非对象
      * @returns {T[]}
      */
-    findAll(value: T[keyof T]): T[];
+    findAll(key: T[keyof T]): T[];
     /**
      *
      * 用函数回调找到匹配的第一个对象
@@ -88,7 +89,7 @@ export declare class SetEx<T> extends Set {
      * @param {*} value 这是对象的关键属性,而非对象
      * @returns {boolean}
      */
-    has(value: T[keyof T]): boolean;
+    has(key: T[keyof T]): boolean;
     /**
      * 转为数组
      * @param param0
@@ -118,10 +119,10 @@ export declare class SetEx<T> extends Set {
     /**
      *
      * 删除key对应的对象
-     * @param {*} value 这是对象的关键属性,而非对象
+     * @param {*} _key 这是对象的关键属性,而非对象
      * @returns {boolean}
      */
-    delete(value: T[keyof T]): boolean;
+    delete(_key: T[keyof T]): boolean;
     /**
      *
      * 重置

package/cjs/set-ex.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SetEx = void 0;
+const iterare_1 = __importDefault(require("iterare"));
 class SetEx extends Set {
     /**
      * @param key 识别是否存在的对象的属性名
@@ -11,6 +15,7 @@ class SetEx extends Set {
      */
     constructor(option) {
         super();
+        this._map = new Map();
         this._key = option.key;
         this._onExist1 = option.onExist1;
         this._onNotExist1 = option.onNotExist1;
@@ -30,21 +35,22 @@ class SetEx extends Set {
      */
     add(value) {
         let flag = false;
-        this.forEach((item) => {
-            if (item[this._key] === value[this._key]) {
-                flag = true;
-                if (this._onExist1) {
-                    this._onExist1(item, value);
-                }
-                if (this._replaceIfExits1 === true) {
-                    super.delete(item);
-                    flag = false;
-                }
-                return false;
+        const key = value[this._key];
+        const item = this._map.get(key);
+        if (item) {
+            flag = true;
+            if (this._onExist1) {
+                this._onExist1(item, value);
             }
-        });
+            if (this._replaceIfExits1 === true) {
+                super.delete(item);
+                this._map.delete(key);
+                flag = false;
+            }
+        }
         if (flag === false) {
             super.add(value);
+            this._map.set(key, value);
             if (this._onNotExist1) {
                 this._onNotExist1(value);
             }
@@ -70,25 +76,26 @@ class SetEx extends Set {
      */
     add2(value) {
         let flag = false;
+        const key = value[this._key];
+        const item = this._map.get(key);
         let tmp = value;
-        this.forEach((item) => {
-            if (item[this._key] === value[this._key]) {
-                flag = true;
-                if (this._onExist2) {
-                    this._onExist2(item, value);
-                }
-                if (this._replaceIfExits2 === true) {
-                    super.delete(value);
-                    flag = false;
-                }
-                else {
-                    tmp = item;
-                }
-                return false;
+        if (item) {
+            flag = true;
+            if (this._onExist2) {
+                this._onExist2(item, value);
             }
-        });
+            if (this._replaceIfExits2 === true) {
+                super.delete(value);
+                this._map.delete(key);
+                flag = false;
+            }
+            else {
+                tmp = item;
+            }
+        }
         if (flag === false) {
             super.add(value);
+            this._map.set(key, value);
             if (this._onNotExist2) {
                 this._onNotExist2(value);
             }
@@ -110,30 +117,19 @@ class SetEx extends Set {
     }
     /**
      * 用key找到匹配的第一个对象
-     * @param {*} value 这是对象的关键属性,而非对象
+     * @param {*} key 这是对象的关键属性,而非对象
      * @returns {(T | null)}
      */
-    find(value) {
-        for (const item of this) {
-            if (item[this._key] === value) {
-                return item;
-            }
-        }
-        return null;
+    find(key) {
+        return this._map.get(key) ?? null;
     }
     /**
      * 用key找到匹配的所有对象
-     * @param {*} value 这是对象的关键属性,而非对象
+     * @param {*} key 这是对象的关键属性,而非对象
      * @returns {T[]}
      */
-    findAll(value) {
-        const res = new Array();
-        this.forEach((item) => {
-            if (item[this._key] === value) {
-                res.push(item);
-            }
-        });
-        return res;
+    findAll(key) {
+        return (0, iterare_1.default)(key).map(k => this._map.get(k)).filter(v => v !== undefined).toArray();
     }
     /**
      *
@@ -170,13 +166,8 @@ class SetEx extends Set {
      * @param {*} value 这是对象的关键属性,而非对象
      * @returns {boolean}
      */
-    has(value) {
-        for (const item of this) {
-            if (item[this._key] === value) {
-                return true;
-            }
-        }
-        return false;
+    has(key) {
+        return this._map.has(key);
     }
     /**
      * 转为数组
@@ -212,15 +203,16 @@ class SetEx extends Set {
     /**
      *
      * 删除key对应的对象
-     * @param {*} value 这是对象的关键属性,而非对象
+     * @param {*} _key 这是对象的关键属性,而非对象
      * @returns {boolean}
      */
-    delete(value) {
-        for (const item of this) {
-            if (item[this._key] === value) {
-                super.delete(item);
-                return true;
-            }
+    delete(_key) {
+        const key = _key;
+        const item = this._map.get(key);
+        if (item) {
+            super.delete(item);
+            this._map.delete(key);
+            return true;
         }
         return false;
     }
@@ -233,6 +225,7 @@ class SetEx extends Set {
      */
     reset(option) {
         this.clear();
+        this._map.clear();
         if (option.key) {
             this._key = option.key;
         }