baja-lite 1.1.4 → 1.1.8

package/boot-remote.d.ts

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

package/{src/boot-remote.ts → boot-remote.js}

@@ -1,7 +1,6 @@
 import { getEnums } from './enum.js';
-import { _primaryDB, _dao, logger, DBType, _sqlCache, _GlobalSqlOption, GlobalSqlOptionForWeb, _defOption, SqlCache, SqliteRemote, _Hump, ColumnMode, _enums } from './sql.js';
-
-export const BootRomote = async function (options: GlobalSqlOptionForWeb) {
+import { _primaryDB, _dao, logger, DBType, _sqlCache, _GlobalSqlOption, _defOption, SqlCache, SqliteRemote, _Hump, ColumnMode, _enums } from './sql.js';
+export const BootRomote = async function (options) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption, options);
     globalThis[_Hump] = globalThis[_GlobalSqlOption].columnMode === ColumnMode.HUMP;
     logger.level = options.log ?? 'info';
@@ -19,7 +18,8 @@ export const BootRomote = async function (options: GlobalSqlOptionForWeb) {
         if (typeof options.SqliteRemote.db === 'string') {
             options.SqliteRemote.service.initDB(options.SqliteRemote.db);
             globalThis[_dao][DBType.SqliteRemote][_primaryDB] = new SqliteRemote(options.SqliteRemote.service, options.SqliteRemote.db);
-        } else {
+        }
+        else {
             let flag = false;
             for (const [key, fileName] of Object.entries(options.SqliteRemote.db)) {
                 await options.SqliteRemote.service.initDB(fileName);
@@ -32,8 +32,7 @@ export const BootRomote = async function (options: GlobalSqlOptionForWeb) {
             }
         }
     }
-}
-
+};
 // export const AppendRomote = async function (dbName: string) {
 //     if (!globalThis[_dao][DBType.SqliteRemote][dbName]) {
 //         globalThis[_GlobalSqlOption].SqliteRemote.service.initDB(dbName);
@@ -43,4 +42,4 @@ export const BootRomote = async function (options: GlobalSqlOptionForWeb) {
 //         }
 //         globalThis[_dao][DBType.SqliteRemote][dbName] = db;
 //     }
-// }
+// }

package/boot.d.ts

@@ -0,0 +1,2 @@
+import { GlobalSqlOption } from './sql.js';
+export declare const Boot: (options: GlobalSqlOption) => Promise<void>;

package/{src/boot.ts → boot.js}

@@ -1,7 +1,6 @@
 import { getEnums } from './enum.js';
-import { _GlobalSqlOption, GlobalSqlOption, _enums, _EventBus, _defOption, logger, _sqlCache, SqlCache, _dao, DBType, _primaryDB, SqliteRemote, _fs, _path, Mysql, Sqlite, _Hump, ColumnMode, Postgresql } from './sql.js';
-
-export const Boot = async function (options: GlobalSqlOption) {
+import { _GlobalSqlOption, _enums, _EventBus, _defOption, logger, _sqlCache, SqlCache, _dao, DBType, _primaryDB, SqliteRemote, _fs, _path, Mysql, Sqlite, _Hump, ColumnMode, Postgresql } from './sql.js';
+export const Boot = async function (options) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption, options);
     globalThis[_Hump] = globalThis[_GlobalSqlOption].columnMode === ColumnMode.HUMP;
     if (options.sqlDir) {
@@ -33,8 +32,8 @@ export const Boot = async function (options: GlobalSqlOption) {
                 decimalNumbers: true,
                 supportBigNumbers: true
             }));
-
-        } else {
+        }
+        else {
             let flag = false;
             for (const [key, option] of Object.entries(options.Mysql)) {
                 const db = new Mysql(createPool({
@@ -43,7 +42,6 @@ export const Boot = async function (options: GlobalSqlOption) {
                     decimalNumbers: true,
                     supportBigNumbers: true
                 }));
-
                 if (flag === false) {
                     globalThis[_dao][DBType.Mysql][_primaryDB] = db;
                     flag = true;
@@ -55,7 +53,8 @@ export const Boot = async function (options: GlobalSqlOption) {
     if (options.Sqlite) {
         if (typeof options.Sqlite === 'string') {
             globalThis[_dao][DBType.Sqlite][_primaryDB] = new Sqlite(new options.BetterSqlite3(options.Sqlite, { fileMustExist: false }));
-        } else {
+        }
+        else {
             let flag = false;
             for (const [key, fileName] of Object.entries(options.Sqlite)) {
                 const db = new Sqlite(new options.BetterSqlite3(fileName, { fileMustExist: false }));
@@ -71,7 +70,8 @@ export const Boot = async function (options: GlobalSqlOption) {
         if (typeof options.SqliteRemote.db === 'string') {
             options.SqliteRemote.service.initDB(options.SqliteRemote.db);
             globalThis[_dao][DBType.SqliteRemote][_primaryDB] = new SqliteRemote(options.SqliteRemote.service, options.SqliteRemote.db);
-        } else {
+        }
+        else {
             let flag = false;
             for (const [key, fileName] of Object.entries(options.SqliteRemote.db)) {
                 options.SqliteRemote.service.initDB(fileName);
@@ -88,7 +88,8 @@ export const Boot = async function (options: GlobalSqlOption) {
         const { Redis } = await import('ioredis');
         if (options.Redis['host']) {
             globalThis[_dao][DBType.Redis][_primaryDB] = new Redis(options.Redis);
-        } else {
+        }
+        else {
             let flag = false;
             for (const [key, option] of Object.entries(options.Redis)) {
                 const db = new Redis(option);
@@ -99,32 +100,25 @@ export const Boot = async function (options: GlobalSqlOption) {
                 globalThis[_dao][DBType.Redis][key] = db;
             }
         }
-        const clients = Object.values(globalThis[_dao][DBType.Redis]) as any;
+        const clients = Object.values(globalThis[_dao][DBType.Redis]);
         const Redlock = await import('redlock');
-        globalThis[_dao][DBType.RedisLock] = new Redlock.default(
-            clients,
-            {
-                // The expected clock drift; for more details see:
-                // http://redis.io/topics/distlock
-                driftFactor: 0.01, // multiplied by lock ttl to determine drift time
-
-                // The max number of times Redlock will attempt to lock a resource
-                // before erroring.
-                retryCount: 10,
-
-                // the time in ms between attempts
-                retryDelay: 200, // time in ms
-
-                // the max time in ms randomly added to retries
-                // to improve performance under high contention
-                // see https://www.awsarchitectureblog.com/2015/03/backoff.html
-                retryJitter: 200, // time in ms
-
-                // The minimum remaining time on a lock before an extension is automatically
-                // attempted with the `using` API.
-                automaticExtensionThreshold: 500, // time in ms
-            }
-        );
+        globalThis[_dao][DBType.RedisLock] = new Redlock.default(clients, {
+            // The expected clock drift; for more details see:
+            // http://redis.io/topics/distlock
+            driftFactor: 0.01, // multiplied by lock ttl to determine drift time
+            // The max number of times Redlock will attempt to lock a resource
+            // before erroring.
+            retryCount: 10,
+            // the time in ms between attempts
+            retryDelay: 200, // time in ms
+            // the max time in ms randomly added to retries
+            // to improve performance under high contention
+            // see https://www.awsarchitectureblog.com/2015/03/backoff.html
+            retryJitter: 200, // time in ms
+            // The minimum remaining time on a lock before an extension is automatically
+            // attempted with the `using` API.
+            automaticExtensionThreshold: 500, // time in ms
+        });
         const { EventEmitter } = await import('events');
         const event = new EventEmitter({ captureRejections: true });
         event.on('error', error => {
@@ -133,15 +127,14 @@ export const Boot = async function (options: GlobalSqlOption) {
         globalThis[_EventBus] = event;
     }
     if (options.Postgresql) {
-        const Pool  = await import('pg-pool');
+        const Pool = await import('pg-pool');
         if (options.Postgresql['host']) {
             globalThis[_dao][DBType.Postgresql][_primaryDB] = new Postgresql(new Pool.default(options.Postgresql));
-
-        } else {
+        }
+        else {
             let flag = false;
             for (const [key, option] of Object.entries(options.Postgresql)) {
                 const db = new Postgresql(new Pool.default(option));
-
                 if (flag === false) {
                     globalThis[_dao][DBType.Postgresql][_primaryDB] = db;
                     flag = true;
@@ -150,4 +143,4 @@ export const Boot = async function (options: GlobalSqlOption) {
             }
         }
     }
-}
+};

package/code.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/{src/code.ts → code.js}

@@ -5,7 +5,6 @@ import { start } from 'repl';
 import { createPool } from 'mysql2/promise';
 import mustache from 'mustache';
 import { mkdir } from 'shelljs';
-
 const lxMap = {
     tinyint: "number",
     smallint: "number",
@@ -48,7 +47,7 @@ const lxMap = {
     geometrycollection: "Object"
 };
 let force = false;
-const basepath = path.join(__dirname, '..', '..', '..');
+const basepath = path.join(__dirname, '..', '..');
 const config = path.join(basepath, 'baja.code.json');
 const templatePath = path.join(basepath, 'code-template');
 console.log(`
@@ -110,7 +109,8 @@ console.log(`
         ], Field(类型string)，表示字段的注解, Type 表示JS类型
         columnNames_join: 'sku_id, sku_name'
         ColumnNames_join: 'sku_id skuId, sku_name skuName'
-
+        columnNames_joinT: 't.sku_id, t.sku_name'
+        ColumnNames_joinT: 't.sku_id skuId, t.sku_name skuName'
         columns_no_id: [], 同columns，没有ID而已
         columnNames_no_id: [],
 
@@ -129,26 +129,10 @@ console.log(`
     -----
     force: 切换是否覆盖
 `);
-
-
 try {
-    const outputs = new Set<string>();
+    const outputs = new Set();
     const _configData = fs.readFileSync(config, { encoding: 'utf-8' }).toString();
-    const configData = JSON.parse(_configData) as {
-        host: string;
-        port: number;
-        user: string;
-        password: string;
-        database: string;
-        command: Record<string, string>;
-        commands: Record<string, string[]>;
-        output: string;
-        id: string;
-        logicDeleteK: string;
-        logicDeleteV: number;
-        NotlogicDeleteV: number;
-        tables: string;
-    };
+    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,
@@ -157,9 +141,9 @@ try {
         password: configData.password,
         database: configData.database
     });
-    async function getTables(tableName: string) {
+    async function getTables(tableName) {
         const conn = await pool.getConnection();
-        const params: (string | string[])[] = [configData.database];
+        const params = [configData.database];
         let sql = `
         SELECT TABLE_NAME tableName, IFNULL(TABLE_COMMENT, TABLE_NAME) title FROM information_schema.TABLES
         WHERE TABLE_SCHEMA= ? AND TABLE_TYPE = 'BASE TABLE'`;
@@ -167,13 +151,13 @@ try {
             sql += ` AND TABLE_NAME IN (?)`;
             params.push(tableName.split(/,|\s/).map(r => r.trim()));
         }
-        const [result] = await conn.query<any[]>(sql, params);
+        const [result] = await conn.query(sql, params);
         conn.release();
         return result;
     }
-    async function getColumns(tableName: string) {
+    async function getColumns(tableName) {
         const conn = await pool.getConnection();
-        const [result] = await conn.query<any[]>(`
+        const [result] = await conn.query(`
             SELECT
                 DATA_TYPE type,
                 COLUMN_NAME \`name\`,
@@ -187,27 +171,38 @@ try {
         `, [configData.database, tableName]);
         let logicDelete = '';
         const columns = result.map(r => {
-            if (r.id === 1) { r.id = true; }
-            else delete r.id;
-            if (r.notNull === 1) { r.notNull = true; }
-            else delete r.notNull;
-
-
-            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}`); }
+            if (r.id === 1) {
+                r.id = true;
+            }
+            else
+                delete r.id;
+            if (r.notNull === 1) {
+                r.notNull = true;
+            }
+            else
+                delete r.notNull;
+            const fields = new Array(`type:SqlType.${r.type}`);
+            if (r.length !== null) {
+                fields.push(`length:${r.length}`);
+            }
+            if (r.scale !== null) {
+                fields.push(`scale:${r.scale}`);
+            }
             if (r.def !== null) {
-                r.def ??= '';
+                r.def ?? (r.def = '');
                 if (isNaN(r.def) || r.def === '') {
                     fields.push(`def:'${r.def}'`);
-                } else {
+                }
+                else {
                     fields.push(`def:${r.def}`);
                 }
             }
             if (r.id === true) {
                 fields.push(`id:true`);
             }
-            if (r.notNull === true) { fields.push(`notNull:true`); }
+            if (r.notNull === true) {
+                fields.push(`notNull:true`);
+            }
             if (r.id === true && configData.id) {
                 fields.push(configData.id);
             }
@@ -215,66 +210,64 @@ try {
                 fields.push(`logicDelete: ${configData.logicDeleteV}`);
                 logicDelete = `AND ${r.name} = ${configData.NotlogicDeleteV}`;
             }
-            if (r.comment) { fields.push(`comment: '${r.comment}'`); }
+            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: string, b: string) => b.toUpperCase());
-            r.NAME = r.Name.replace(/\w/, (v: string) => v.toUpperCase());
+            r.Name = r.name.replace(/_(\w)/g, (a, b) => b.toUpperCase());
+            r.NAME = r.Name.replace(/\w/, (v) => v.toUpperCase());
             return r;
         });
         conn.release();
         return { columns, logicDelete };
     }
-    async function excute(command: string, input: string, modelName: string) {
+    async function excute(command, input, modelName) {
         const tables = await getTables(input);
         if (input !== '.') {
-            const checkTable = input.split(/,|\s/).map(r => r.trim())
+            const checkTable = input.split(/,|\s/).map(r => r.trim());
             if (checkTable.length !== tables.length) {
                 console.error(`[错误] 输入的表与数据库查询返回表不符，数据库返回${tables.length}个:${tables.map(i => i.tableName).join(',')}`);
                 return;
             }
         }
-        modelName ??= '';
+        modelName ?? (modelName = '');
         const modelPath = modelName ? `/${modelName}/` : '';
         for (const { tableName, title } of tables) {
             const { columns, logicDelete } = await getColumns(tableName);
-            const className = tableName.replace(/_(\w)/g, (a: string, b: string) => b.toUpperCase());
-            const ClassName = className.replace(/\w/, (v: string) => v.toUpperCase());
+            const className = tableName.replace(/_(\w)/g, (a, b) => b.toUpperCase());
+            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: string, b: string) => b.toUpperCase());
+            const SplitName = tableName.replace(/_/, '/').replace(/_(\w)/g, (a, b) => b.toUpperCase());
             const data = {
                 title,
-
                 tableName,
                 className,
                 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(','),
-
+                columnNames_joinT: columns?.map(i => `t.${i.name}`).join(','),
+                ColumnNames_joinT: columns?.map(i => `t.${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,
-
                 logicDelete
             };
             const template = templates[command];
@@ -283,9 +276,9 @@ try {
                 return;
             }
             const txt = mustache.render(template, data, {}, ['<%', '%>']);
-            const _fileName = configData.command[command]!.replace(/{([a-zA-Z]+)}/g, (a: string, b: string) => data[b]);
+            const _fileName = configData.command[command].replace(/{([a-zA-Z]+)}/g, (a, b) => data[b]);
             const fileNames = _fileName.split(',');
-            for(const fileName of fileNames){
+            for (const fileName of fileNames) {
                 const filePath = path.join(basepath, fileName);
                 const dirname = path.dirname(filePath);
                 mkdir('-p', dirname);
@@ -300,28 +293,31 @@ try {
                     if (force === false) {
                         console.warn(`[跳过] ${filePath}`);
                         return;
-                    } else {
+                    }
+                    else {
                         console.warn(`[覆盖] ${filePath}`);
                     }
-                } catch (error) {
+                }
+                catch (error) {
                     console.info(`[生成] ${filePath}`);
                 }
                 if (configData.output) {
-                    outputs.add(configData.output.replace(/{([a-zA-Z]+)}/g, (a: string, b: string) => data[b]));
+                    outputs.add(configData.output.replace(/{([a-zA-Z]+)}/g, (a, b) => data[b]));
                 }
                 fs.writeFileSync(path.join(basepath, fileName), txt);
             }
         }
     }
     const replServer = start();
-    function defineCommand(command: string, comands?: string[]) {
+    function defineCommand(command, comands) {
         if (comands) {
             console.log(`[组合]${command}>${comands.join(',')}注册成功`);
-        } else {
+        }
+        else {
             console.log(`[命令]${command}注册成功`);
         }
         if (comands) {
-            replServer.defineCommand(command, async input => {
+            replServer.defineCommand(command, async (input) => {
                 outputs.clear();
                 const inputs = input.match(/([^:]+):{0,1}([a-zA-Z0-9]*)/);
                 if (inputs?.length !== 3) {
@@ -329,20 +325,21 @@ try {
                 }
                 const [_, tables, modelName] = inputs;
                 for (const c of comands) {
-                    await excute(c, tables!, modelName ?? '');
+                    await excute(c, tables, modelName ?? '');
                 }
                 console.info('执行完毕！下面打印生成的输出');
                 console.info(Array.from(outputs).join(','));
             });
-        } else {
-            replServer.defineCommand(command, async input => {
+        }
+        else {
+            replServer.defineCommand(command, async (input) => {
                 outputs.clear();
                 const inputs = input.match(/([^:]+):{0,1}([a-zA-Z0-9]*)/);
                 if (inputs?.length !== 3) {
                     return console.error(`[错误]命令格式应为: table1,table2[:模块名]`);
                 }
                 const [_, tables, modelName] = inputs;
-                await excute(command, tables!, modelName ?? '');
+                await excute(command, tables, modelName ?? '');
                 console.info('执行完毕！下面打印生成的输出');
                 console.info(Array.from(outputs).join(','));
             });
@@ -356,22 +353,25 @@ try {
         for (const command of Object.keys(configData.command)) {
             if (!templates[command]) {
                 console.error(`命令:${command}没有定义模板，该命令不会生效`);
-            } else {
+            }
+            else {
                 defineCommand(command);
             }
         }
     }
     if (configData.commands) {
         for (const [command, commands] of Object.entries(configData.commands)) {
-            const keys = commands as string[];
+            const keys = commands;
             const error = keys.filter(k => !templates[k]).join(',');
             if (error) {
                 console.error(`组合命令:${command}定义了${commands},但是${error}没有定义模板，该命令不会生效`);
-            } else {
+            }
+            else {
                 defineCommand(command, keys);
             }
         }
     }
-} catch (error) {
+}
+catch (error) {
     console.error(error);
 }

package/convert-xml.d.ts

@@ -0,0 +1,10 @@
+export interface XML {
+    type: 'tag' | 'text';
+    name: string;
+    id?: string;
+    voidElement: boolean;
+    attrs: Record<string, string>;
+    children: XML[];
+    content: string;
+}
+export declare const convert: (childrens: XML[], param: Record<string, any>, parentIds: string[], myBatisMapper: Record<string, XML[]>) => string;