baja-lite 1.3.25 → 1.3.27

package/.eslintignore

@@ -0,0 +1,7 @@
+/dist
+/src-capacitor
+/src-cordova
+/.quasar
+/node_modules
+.eslintrc.cjs
+/quasar.config.*.temporary.compiled*

package/.eslintrc.cjs

@@ -0,0 +1,89 @@
+module.exports = {
+  // https://eslint.org/docs/user-guide/configuring#configuration-cascading-and-hierarchy
+  // This option interrupts the configuration hierarchy at this file
+  // Remove this if you have an higher level ESLint config file (it usually happens into a monorepos)
+  root: true,
+
+  // https://eslint.vuejs.org/user-guide/#how-to-use-a-custom-parser
+  // Must use parserOptions instead of "parser" to allow vue-eslint-parser to keep working
+  // `parser: 'vue-eslint-parser'` is already included with any 'plugin:vue/**' config and should be omitted
+  parserOptions: {
+    parser: require.resolve('@typescript-eslint/parser'),
+    extraFileExtensions: [ '.vue' ]
+  },
+
+  env: {
+    browser: true,
+    es2021: true,
+    node: true
+  },
+
+  // Rules order is important, please avoid shuffling them
+  extends: [
+    // Base ESLint recommended rules
+    // 'eslint:recommended',
+
+    // https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin#usage
+    // ESLint typescript rules
+    'plugin:@typescript-eslint/recommended',
+
+    // Uncomment any of the lines below to choose desired strictness,
+    // but leave only one uncommented!
+    // See https://eslint.vuejs.org/rules/#available-rules
+    'plugin:vue/vue3-essential', // Priority A: Essential (Error Prevention)
+    // 'plugin:vue/vue3-strongly-recommended', // Priority B: Strongly Recommended (Improving Readability)
+    // 'plugin:vue/vue3-recommended', // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead)
+
+    // https://github.com/prettier/eslint-config-prettier#installation
+    // usage with Prettier, provided by 'eslint-config-prettier'.
+    'prettier'
+  ],
+
+  plugins: [
+    // required to apply rules which need type information
+    '@typescript-eslint',
+
+    // https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-files
+    // required to lint *.vue files
+    'vue'
+    
+    // https://github.com/typescript-eslint/typescript-eslint/issues/389#issuecomment-509292674
+    // Prettier has not been included as plugin to avoid performance impact
+    // add it as an extension for your IDE
+    
+  ],
+
+  globals: {
+    ga: 'readonly', // Google Analytics
+    cordova: 'readonly',
+    __statics: 'readonly',
+    __QUASAR_SSR__: 'readonly',
+    __QUASAR_SSR_SERVER__: 'readonly',
+    __QUASAR_SSR_CLIENT__: 'readonly',
+    __QUASAR_SSR_PWA__: 'readonly',
+    process: 'readonly',
+    Capacitor: 'readonly',
+    chrome: 'readonly'
+  },
+
+  // add your custom rules here
+  rules: {
+    
+    'prefer-promise-reject-errors': 'off',
+
+    quotes: ['warn', 'single', { avoidEscape: true }],
+
+    // this rule, if on, would require explicit return type on the `render` function
+    '@typescript-eslint/explicit-function-return-type': 'off',
+
+    // in plain CommonJS modules, you can't use `import foo = require('foo')` to pass this rule, so it has to be disabled
+    '@typescript-eslint/no-var-requires': 'off',
+
+    // The core 'no-unused-vars' rules (in the eslint:recommended ruleset)
+    // does not work with type definitions
+    'no-unused-vars': 'off',
+
+    // allow debugger during development only
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
+  }
+}

package/.prettierrc

@@ -0,0 +1,4 @@
+{
+  "singleQuote": true,
+  "semi": true
+}

package/.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+  // 控制相关文件嵌套展示
+  "explorer.fileNesting.enabled": true,
+  "explorer.fileNesting.expand": false,
+  "explorer.fileNesting.patterns": {
+    "package.json": "nest-cli.json,.eslintrc.cjs,.eslintignore,eslint.config.js,package-cjs.json,bun.lockb,baja.code.json,.prettierrc,.eslintrc.js,$(capture).env.*,,pnpm-lock.yaml,pnpm-workspace.yaml,LICENSE,.gitattributes,.gitignore,.gitpod.yml,CNAME,README*,.npmrc,.browserslistrc,yarn.lock,verify-commit.mjs,tsconfig.json,nuxt.config.ts,uno.config.ts",
+  }
+}

package/ci.js

@@ -0,0 +1,29 @@
+// import { rm, exec, cp } from 'shelljs';
+import fs from 'fs';
+import pkg from 'shelljs';
+import cjs from './package-cjs.json' with { type: "json" };
+import def from './package.json' with { type: "json" };
+const { rm, exec, cp } = pkg;
+
+rm('-rf', './dist/');
+rm('-rf', './tsconfig.tsbuildinfo');
+exec('yarn tsc');
+rm('-rf', './tsconfig.tsbuildinfo');
+cp('./package.json', './dist/package.json');
+cp('./README.md', './dist/README.md');
+cp('./LICENSE', './dist/LICENSE');
+rm('-rf', './dist/tsconfig.tsbuildinfo');
+
+rm('-rf', './dist-cjs/');
+rm('-rf', './tsconfig.cjs.tsbuildinfo');
+exec('yarn tsc -p tsconfig.cjs.json');
+rm('-rf', './tsconfig.cjs.tsbuildinfo');
+fs.writeFileSync('./dist-cjs/package.json', JSON.stringify(Object.assign(def, cjs), null, 2));
+cp('./README.md', './dist-cjs/README.md');
+cp('./LICENSE', './dist-cjs/LICENSE');
+
+
+cp('-R', './dist/*', 'E:\\pro\\v\\apps-services\\fast-start\\node_modules\\baja-lite');
+cp('-R', './dist/*', 'E:\\pro\\v\\apps-services\\attack-service\\node_modules\\baja-lite');
+cp('-R', './dist/*', 'E:\\pro\\v\\apps-services\\attack-front\\node_modules\\baja-lite');
+console.log('cp over');

package/package-cjs.json

@@ -0,0 +1,17 @@
+{
+  "name": "baja-lite-cjs",
+  "type": "commonjs",
+  "exports": {
+    ".": {
+      "require": "./index.js"
+    },
+    "./boot.js":"./boot.js",
+    "./boot-remote.js":"./boot-remote.js",
+    "./wx.js": "./wx.js"
+  },
+  "types": "./index.d.ts",
+  "bin": {
+    "baja": "./code.js"
+  },
+  "main": "./index.js"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.3.25",
+  "version": "1.3.27",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/util-man",
   "repository": {
@@ -38,7 +38,7 @@
     "@msgpack/msgpack": "3.1.1",
     "@types/request-promise": "4.1.51",
     "axios": "1.8.4",
-    "baja-lite-field": "1.3.20",
+    "baja-lite-field": "1.3.27",
     "decimal.js": "10.5.0",
     "html-parse-stringify": "3.0.1",
     "iterare": "1.2.1",

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

@@ -1,7 +1,8 @@
 import { DBType, _Hump } from 'baja-lite-field';
 import { getEnums } from './enum.js';
-import { ColumnMode, SqlCache, SqliteRemote, _GlobalSqlOption, _dao, _defOption, _enums, _primaryDB, _sqlCache, logger } from './sql.js';
-export const BootRomote = async function (options) {
+import { ColumnMode, GlobalSqlOptionForWeb, SqlCache, SqliteRemote, _GlobalSqlOption, _dao, _defOption, _enums, _primaryDB, _sqlCache, logger } from './sql.js';
+
+export const BootRomote = async function (options: GlobalSqlOptionForWeb) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption, options);
     globalThis[_Hump] = globalThis[_GlobalSqlOption].columnMode === ColumnMode.HUMP;
     logger.level = options.log ?? 'info';
@@ -19,8 +20,7 @@ export const BootRomote = async function (options) {
         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);
@@ -33,7 +33,8 @@ export const BootRomote = async function (options) {
             }
         }
     }
-};
+}
+
 // export const AppendRomote = async function (dbName: string) {
 //     if (!globalThis[_dao][DBType.SqliteRemote][dbName]) {
 //         globalThis[_GlobalSqlOption].SqliteRemote.service.initDB(dbName);
@@ -43,4 +44,4 @@ export const BootRomote = async function (options) {
 //         }
 //         globalThis[_dao][DBType.SqliteRemote][dbName] = db;
 //     }
-// }
+// }

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

@@ -1,7 +1,8 @@
 import { _Hump, DBType } from 'baja-lite-field';
 import { getEnums } from './enum.js';
-import { _dao, _defOption, _enums, _EventBus, _fs, _GlobalSqlOption, _path, _primaryDB, _sqlCache, ColumnMode, logger, Mysql, Postgresql, SqlCache, Sqlite, SqliteRemote } from './sql.js';
-export const Boot = async function (options) {
+import { _dao, _defOption, _enums, _EventBus, _fs, _GlobalSqlOption, _path, _primaryDB, _sqlCache, ColumnMode, GlobalSqlOption, logger, Mysql, Postgresql, SqlCache, Sqlite, SqliteRemote } from './sql.js';
+
+export const Boot = async function (options: GlobalSqlOption) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption, options);
     globalThis[_Hump] = globalThis[_GlobalSqlOption].columnMode === ColumnMode.HUMP;
     if (options.sqlDir) {
@@ -33,8 +34,8 @@ export const Boot = async function (options) {
                 decimalNumbers: true,
                 supportBigNumbers: true
             }));
-        }
-        else {
+
+        } else {
             let flag = false;
             for (const [key, option] of Object.entries(options.Mysql)) {
                 const db = new Mysql(createPool({
@@ -43,6 +44,7 @@ export const Boot = async function (options) {
                     decimalNumbers: true,
                     supportBigNumbers: true
                 }));
+
                 if (flag === false) {
                     globalThis[_dao][DBType.Mysql][_primaryDB] = db;
                     flag = true;
@@ -54,8 +56,7 @@ export const Boot = async function (options) {
     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,8 +72,7 @@ export const Boot = async function (options) {
         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);
@@ -89,8 +89,7 @@ export const Boot = async function (options) {
         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);
@@ -101,25 +100,32 @@ export const Boot = async function (options) {
                 globalThis[_dao][DBType.Redis][key] = db;
             }
         }
-        const clients = Object.values(globalThis[_dao][DBType.Redis]);
+        const clients = Object.values(globalThis[_dao][DBType.Redis]) as any;
         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 => {
@@ -131,11 +137,12 @@ export const Boot = async function (options) {
         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;
@@ -144,4 +151,4 @@ export const Boot = async function (options) {
             }
         }
     }
-};
+}

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

@@ -132,10 +132,25 @@ 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,
@@ -144,9 +159,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'`;
@@ -154,13 +169,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\`,
@@ -174,31 +189,20 @@ 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.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}`);
             r.Type = lxMap[r.type];
-            if (r.length !== null) {
-                fields.push(`length:${r.length}`);
-            }
-            if (r.scale !== null) {
-                fields.push(`scale:${r.scale}`);
-            }
+            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 (r.def !== '') {
                     if (isNaN(r.def)) {
                         fields.push(`def:'${r.def}'`);
-                    }
-                    else {
+                    } else {
                         fields.push(`def:${r.def}`);
                     }
                 }
@@ -206,26 +210,20 @@ try {
             if (r.Type === 'string') {
                 if (r.def === '' || r.def === null) {
                     r.def = "''";
-                }
-                else {
+                } else {
                     r.def = `'${r.def}'`;
                 }
-            }
-            else if (r.Type === 'number') {
+            } else if (r.Type === 'number') {
                 r.def = 0;
-            }
-            else if (r.Type === 'Date') {
+            } else if (r.Type === 'Date') {
                 r.def = 'new Date()';
-            }
-            else {
+            } else {
                 r.def = 'null';
             }
             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);
             }
@@ -233,40 +231,40 @@ 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.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 splitVueName = tableName.replace(/_/, '/').replace(/_/g, '-');
             const modelName = tableName.substring(0, tableName.indexOf('_'));
             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,
@@ -274,6 +272,7 @@ try {
                 splitVueName,
                 splitName,
                 SplitName,
+
                 columns,
                 columnNames: columns?.map(i => i.name),
                 ColumnNames: columns?.map(i => i.Name),
@@ -286,13 +285,16 @@ try {
                 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];
@@ -301,7 +303,7 @@ 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) {
                 const filePath = path.join(basepath, fileName);
@@ -318,31 +320,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) {
@@ -350,21 +349,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(','));
             });
@@ -378,25 +376,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);
 }