baja-lite 1.1.2 → 1.1.4

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

@@ -5,6 +5,7 @@ import { start } from 'repl';
 import { createPool } from 'mysql2/promise';
 import mustache from 'mustache';
 import { mkdir } from 'shelljs';
+
 const lxMap = {
     tinyint: "number",
     smallint: "number",
@@ -128,10 +129,26 @@ console.log(`
     -----
     force: 切换是否覆盖
 `);
+
+
 try {
-    const outputs = new Set();
+    const outputs = new Set<string>();
     const _configData = fs.readFileSync(config, { encoding: 'utf-8' }).toString();
-    const configData = JSON.parse(_configData);
+    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 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,
@@ -140,9 +157,9 @@ try {
         password: configData.password,
         database: configData.database
     });
-    async function getTables(tableName) {
+    async function getTables(tableName: string) {
         const conn = await pool.getConnection();
-        const params = [configData.database];
+        const params: (string | string[])[] = [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'`;
@@ -150,13 +167,13 @@ try {
             sql += ` AND TABLE_NAME IN (?)`;
             params.push(tableName.split(/,|\s/).map(r => r.trim()));
         }
-        const [result] = await conn.query(sql, params);
+        const [result] = await conn.query<any[]>(sql, params);
         conn.release();
         return result;
     }
-    async function getColumns(tableName) {
+    async function getColumns(tableName: string) {
         const conn = await pool.getConnection();
-        const [result] = await conn.query(`
+        const [result] = await conn.query<any[]>(`
             SELECT
                 DATA_TYPE type,
                 COLUMN_NAME \`name\`,
@@ -170,38 +187,27 @@ 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(`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<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.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);
             }
@@ -209,62 +215,66 @@ 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, b) => b.toUpperCase());
-            r.NAME = r.Name.replace(/\w/, (v) => v.toUpperCase());
+            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();
         return { columns, logicDelete };
     }
-    async function excute(command, input, modelName) {
+    async function excute(command: string, input: string, modelName: string) {
         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, b) => b.toUpperCase());
-            const ClassName = className.replace(/\w/, (v) => v.toUpperCase());
+            const className = tableName.replace(/_(\w)/g, (a: string, b: string) => b.toUpperCase());
+            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, b) => b.toUpperCase());
+            const SplitName = tableName.replace(/_/, '/').replace(/_(\w)/g, (a: string, b: string) => 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(','),
+
                 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];
@@ -273,9 +283,9 @@ try {
                 return;
             }
             const txt = mustache.render(template, data, {}, ['<%', '%>']);
-            const _fileName = configData.command[command].replace(/{([a-zA-Z]+)}/g, (a, b) => data[b]);
+            const _fileName = configData.command[command]!.replace(/{([a-zA-Z]+)}/g, (a: string, b: string) => 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);
@@ -290,31 +300,28 @@ 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, b) => data[b]));
+                    outputs.add(configData.output.replace(/{([a-zA-Z]+)}/g, (a: string, b: string) => data[b]));
                 }
                 fs.writeFileSync(path.join(basepath, fileName), txt);
             }
         }
     }
     const replServer = start();
-    function defineCommand(command, comands) {
+    function defineCommand(command: string, comands?: string[]) {
         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) {
@@ -322,21 +329,20 @@ 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(','));
             });
@@ -350,25 +356,22 @@ 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;
+            const keys = commands as string[];
             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);
 }