@meadmin/cli 1.2.3 → 1.3.0

package/dist/commanders/addon.js

@@ -36,7 +36,7 @@ const rmAddon = async (file, dbConfig, name) => {
     const entityFilePath = resolve(process.cwd(), 'src/entities/');
     const entityFiles = readdirSync(entityFilePath);
     entityFiles.forEach((file) => {
-        if (!new RegExp(`^(?!aon${upFirstCase(file)}[A-Z\.])`).test(file)) {
+        if (!new RegExp(`^(?!aon${upFirstCase(file)}[A-Z.])`).test(file)) {
             rmSync(resolve(entityFilePath, file), { force: true, recursive: true });
         }
     });
@@ -88,10 +88,10 @@ export const addoonInit = (program) => {
             cpSync(resolve(import.meta.dirname, '../../template/addons'), resolve(process.cwd(), `addons/${file}/`), {
                 recursive: true,
             });
-            let packageContent = readFileSync(resolve(toPath, 'packageTemplate.json'), 'utf-8');
+            const packageContent = readFileSync(resolve(toPath, 'packageTemplate.json'), 'utf-8');
             rmSync(resolve(toPath, 'packageTemplate.json'));
             writeFileSync(resolve(toPath, 'package.json'), packageContent.replace('{addonsName}', file), 'utf-8');
-            let addonsContent = readFileSync(resolve(toPath, 'addons.json'), 'utf-8');
+            const addonsContent = readFileSync(resolve(toPath, 'addons.json'), 'utf-8');
             writeFileSync(resolve(toPath, 'addons.json'), addonsContent.replace('{addonsName}', file), 'utf-8');
             Log.success(file + '插件创建成功');
         }
@@ -117,7 +117,7 @@ export const addoonInit = (program) => {
                     await copyFile(resolve(fromPath, key), resolve(toPath, key), typeof copyFiles[k] === 'function' ? copyFiles[k] : undefined, true);
                 }
             }));
-            await copyPath(resolve(fromPath, 'src/entities/'), resolve(toPath, 'src/entities/'), '', [new RegExp(`^(?!aon${upFirstCase(file)}[A-Z\.])`)]);
+            await copyPath(resolve(fromPath, 'src/entities/'), resolve(toPath, 'src/entities/'), '', [new RegExp(`^(?!aon${upFirstCase(file)}[A-Z.])`)]);
             Log.success(file + '插件模板复制完成');
         }
         else if (options.rm) {
@@ -167,4 +167,4 @@ export const addoonInit = (program) => {
         }
     });
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"addon.js","sourceRoot":"","sources":["../../src/commanders/addon.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"addon.js","sourceRoot":"","sources":["../../src/commanders/addon.ts"],"names":[],"mappings":"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"}

package/dist/commanders/crud.d.ts

@@ -1,2 +1,2 @@
 import { Command } from 'commander';
-export declare const crudInit: (program: Command) => Promise<void>;
+export declare const crudInit: (program: Command) => void;

package/dist/commanders/crud.js

@@ -1,6 +1,7 @@
 import { getClassMetadata } from '@midwayjs/core';
 import { DECORATORS, DECORATORS_CLASS_METADATA, SwaggerExplorer } from '@midwayjs/swagger';
 import { Sequelize } from '@sequelize/core';
+import { MapView } from '@sequelize/utils';
 import template from 'art-template';
 import { omit } from 'lodash-es';
 import { existsSync } from 'node:fs';
@@ -84,14 +85,14 @@ const getSchemas = (documentBuilder, entitySchemaName) => {
         const setItem = (item) => {
             if (item['$ref']) {
                 let ref = item['$ref'];
-                if (typeof item['$ref'] === 'function') {
+                if (typeof ref === 'function') {
                     ref = ref();
                 }
                 if (!['#/components/schemas/SystemAdmin', '#/components/schemas/File'].includes(ref)) {
                     setSchemas(ref);
                 }
                 else {
-                    item['$ref'] = item['$ref'].replace('SystemAdmin', 'SystemAdminInfo').replace('File', 'FileInfo');
+                    item['$ref'] = ref.replace('SystemAdmin', 'SystemAdminInfo').replace('File', 'FileInfo');
                 }
             }
             if (item.items) {
@@ -140,13 +141,22 @@ function tableInfo(entityName, noBelongs = false) {
             tableComment: '',
             pk: [],
             deletedAt: null,
-            attributes: {},
+            attributes: new MapView(new Map()),
             autoAttributes: [],
+            noSearchAttributes: [],
+            entityName: entityName,
+            entityFileName: lowerFirstCase(entityName),
+            belongsTo: [],
+            belongsToEntity: {},
+            belongsToMany: [],
+            belongsToManyEntity: {},
+            belongs: [],
+            nameKeys: [],
         };
     }
     else {
-        let tableComment = modelDefinition.options.comment;
-        if (tableComment.endsWith('表')) {
+        let tableComment = modelDefinition.options.comment || '';
+        if (tableComment?.endsWith('表')) {
             tableComment = tableComment.slice(0, -1);
         }
         const autoAttributes = [...modelDefinition.primaryKeysAttributeNames, ...modelDefinition.readOnlyAttributeNames];
@@ -196,16 +206,21 @@ function tableInfo(entityName, noBelongs = false) {
         }
         const nameKeys = []; //可快捷查询的name
         for (const key of modelDefinition.attributes.keys()) {
-            if ((key.endsWith('name') || key.endsWith('Name')) && ['VARCHAR', 'CHAR', 'STRING'].some((v) => modelDefinition.attributes.get(key).type.toString().includes(v))) {
+            if ((key.endsWith('name') || key.endsWith('Name')) && ['VARCHAR', 'CHAR', 'STRING'].some((v) => modelDefinition.attributes.get(key)?.type.toString().includes(v))) {
                 nameKeys.push(key);
             }
         }
+        const noSearchAttributes = [
+            ...Object.keys(modelDefinition.associations), //关联key
+            ...modelDefinition.virtualAttributeNames, //虚拟属性 
+            ...modelDefinition.readOnlyAttributeNames, //只读属性
+        ]; //不需要搜索的字段
         tableInfos[entityName] = {
             entityName,
             entityFileName: lowerFirstCase(entityName),
             tableComment,
             pk: Array.from(modelDefinition.primaryKeysAttributeNames),
-            deletedAt: modelDefinition.options.deletedAt,
+            deletedAt: modelDefinition.options.deletedAt + '',
             attributes: modelDefinition.attributes,
             autoAttributes,
             belongsTo,
@@ -214,6 +229,7 @@ function tableInfo(entityName, noBelongs = false) {
             belongsToManyEntity,
             belongs: belongs,
             nameKeys,
+            noSearchAttributes,
         };
     }
     return tableInfos[entityName];
@@ -347,7 +363,7 @@ function writeViews() {
  */
 async function setMenu(model, namePath, sequelize) {
     let parentId = null;
-    let paths = [];
+    const paths = [];
     const langFilePath = resovePath(`view/${model}/src/${replaceNames.addonsPath}locales/lang/en/menu`, ['.json']);
     let lang = { default: {} };
     if (existsSync(langFilePath)) {
@@ -421,7 +437,7 @@ async function setMenu(model, namePath, sequelize) {
             parentId = menuEntity.get('id');
         }
     }
-    await sequelize.models.get('SystemMenu').findOrCreate({
+    await sequelize.models.get('SystemMenu')?.findOrCreate({
         where: { rule: replaceNames.roleName + '_list' },
         defaults: {
             parentId,
@@ -430,7 +446,7 @@ async function setMenu(model, namePath, sequelize) {
             orderNum: 99,
         },
     });
-    await sequelize.models.get('SystemMenu').findOrCreate({
+    await sequelize.models.get('SystemMenu')?.findOrCreate({
         where: { rule: replaceNames.roleName + '_info' },
         defaults: {
             parentId,
@@ -439,7 +455,7 @@ async function setMenu(model, namePath, sequelize) {
             orderNum: 98,
         },
     });
-    await sequelize.models.get('SystemMenu').findOrCreate({
+    await sequelize.models.get('SystemMenu')?.findOrCreate({
         where: { rule: replaceNames.roleName + '_add' },
         defaults: {
             parentId,
@@ -448,7 +464,7 @@ async function setMenu(model, namePath, sequelize) {
             orderNum: 97,
         },
     });
-    await sequelize.models.get('SystemMenu').findOrCreate({
+    await sequelize.models.get('SystemMenu')?.findOrCreate({
         where: { rule: replaceNames.roleName + '_edit' },
         defaults: {
             parentId,
@@ -457,7 +473,7 @@ async function setMenu(model, namePath, sequelize) {
             orderNum: 96,
         },
     });
-    await sequelize.models.get('SystemMenu').findOrCreate({
+    await sequelize.models.get('SystemMenu')?.findOrCreate({
         where: { rule: replaceNames.roleName + '_del' },
         defaults: {
             parentId,
@@ -472,7 +488,7 @@ async function setMenu(model, namePath, sequelize) {
     }));
     return;
 }
-export const crudInit = async (program) => {
+export const crudInit = (program) => {
     program
         .command('crud')
         .description('创建crud')
@@ -553,7 +569,7 @@ export const crudInit = async (program) => {
             return;
         }
         if (!options.force) {
-            let res = checkPaths();
+            const res = checkPaths();
             if (res !== true) {
                 Log.error('文件已存在,如果想要强制覆盖请使用-f参数\n' + res.join('\n'));
                 return;
@@ -576,7 +592,7 @@ export const crudInit = async (program) => {
         const swaggerExplorer = new MeSwaggerExplorer();
         swaggerExplorer.parseApiExtraModel(entity[upFirstCase(entityFileName)]);
         swaggerExplorer.parseClzz(entity[upFirstCase(entityFileName)]);
-        for (let modelName of sequelize.models.getNames()) {
+        for (const modelName of sequelize.models.getNames()) {
             swaggerExplorer.parseApiExtraModel(sequelize.models.get(modelName));
             swaggerExplorer.parseClzz(sequelize.models.get(modelName));
         }
@@ -597,8 +613,8 @@ export const crudInit = async (program) => {
         if (options.menu) {
             await setMenu(options.model, replaceNames.namePath, sequelize);
         }
-        sequelize.close();
+        await sequelize.close();
         Log.success(entityFileName + ' crud创建完成');
     });
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"crud.js","sourceRoot":"","sources":["../../src/commanders/crud.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"crud.js","sourceRoot":"","sources":["../../src/commanders/crud.ts"],"names":[],"mappings":"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"}

package/dist/commanders/sync.js

@@ -23,12 +23,12 @@ export const syncInit = (program) => {
             for (let i = 0; i < files.length; i++) {
                 let model = files[i];
                 if (sequelize.models.hasByName(model)) {
-                    await sequelize.models.get(model).sync({ alter: true });
+                    await sequelize.models.get(model)?.sync({ alter: true });
                 }
                 else {
                     model = upperFirst(model);
                     if (sequelize.models.hasByName(model)) {
-                        await sequelize.models.get(model).sync({ alter: true });
+                        await sequelize.models.get(model)?.sync({ alter: true });
                     }
                     else {
                         Log.warn(model + '不存在，已自动跳过');
@@ -36,8 +36,8 @@ export const syncInit = (program) => {
                 }
             }
         }
-        sequelize.close();
+        await sequelize.close();
         Log.success('同步数据表结构成功');
     });
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luYy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb21tYW5kZXJzL3N5bmMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTVDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDdkMsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNqQyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDM0MsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXRDLE1BQU0sQ0FBQyxNQUFNLFFBQVEsR0FBRyxDQUFDLE9BQWdCLEVBQUUsRUFBRTtJQUMzQyxPQUFPO1NBQ0osT0FBTyxDQUFDLE1BQU0sQ0FBQztTQUNmLFdBQVcsQ0FBQyxTQUFTLENBQUM7U0FDdEIsUUFBUSxDQUFDLFFBQVEsRUFBRSwwQ0FBMEMsQ0FBQztTQUM5RCxNQUFNLENBQUMsdUJBQXVCLEVBQUUsMENBQTBDLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSx5QkFBeUIsQ0FBQyxDQUFDO1NBQzNILE1BQU0sQ0FBQyxtQkFBbUIsRUFBRSwrQkFBK0IsQ0FBQztTQUM1RCxNQUFNLENBQUMsS0FBSyxFQUFFLElBQVksRUFBRSxPQUFPLEVBQUUsRUFBRTtRQUN0QyxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLE1BQU0sU0FBUyxDQUFDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFO1lBQzVFLE9BQU8sRUFBRSxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUM7U0FDdkMsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxTQUFTLEdBQUcsSUFBSSxTQUFTLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDeEMsSUFBSSxJQUFJLEtBQUssR0FBRyxFQUFFLENBQUM7WUFDakIsTUFBTSxTQUFTLENBQUMsSUFBSSxDQUFDLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFDeEMsQ0FBQzthQUFNLENBQUM7WUFDTixNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsY0FBYztZQUM3QyxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsS0FBSyxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO2dCQUN0QyxJQUFJLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ3JCLElBQUksU0FBUyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztvQkFDdEMsTUFBTSxTQUFTLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztnQkFDMUQsQ0FBQztxQkFBTSxDQUFDO29CQUNOLEtBQUssR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUM7b0JBQzFCLElBQUksU0FBUyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQzt3QkFDdEMsTUFBTSxTQUFTLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztvQkFDMUQsQ0FBQzt5QkFBTSxDQUFDO3dCQUNOLEdBQUcsQ0FBQyxJQUFJLENBQUMsS0FBSyxHQUFHLFdBQVcsQ0FBQyxDQUFDO29CQUNoQyxDQUFDO2dCQUNILENBQUM7WUFDSCxDQUFDO1FBQ0gsQ0FBQztRQUNELFNBQVMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNsQixHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQzNCLENBQUMsQ0FBQyxDQUFDO0FBQ1AsQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luYy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb21tYW5kZXJzL3N5bmMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTVDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDdkMsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNqQyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDM0MsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXRDLE1BQU0sQ0FBQyxNQUFNLFFBQVEsR0FBRyxDQUFDLE9BQWdCLEVBQUUsRUFBRTtJQUMzQyxPQUFPO1NBQ0osT0FBTyxDQUFDLE1BQU0sQ0FBQztTQUNmLFdBQVcsQ0FBQyxTQUFTLENBQUM7U0FDdEIsUUFBUSxDQUFDLFFBQVEsRUFBRSwwQ0FBMEMsQ0FBQztTQUM5RCxNQUFNLENBQUMsdUJBQXVCLEVBQUUsMENBQTBDLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSx5QkFBeUIsQ0FBQyxDQUFDO1NBQzNILE1BQU0sQ0FBQyxtQkFBbUIsRUFBRSwrQkFBK0IsQ0FBQztTQUM1RCxNQUFNLENBQUMsS0FBSyxFQUFFLElBQVksRUFBRSxPQUFPLEVBQUUsRUFBRTtRQUN0QyxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLE1BQU0sU0FBUyxDQUFDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFO1lBQzVFLE9BQU8sRUFBRSxDQUFDLE9BQWMsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUM7U0FDOUMsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxTQUFTLEdBQUcsSUFBSSxTQUFTLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDeEMsSUFBSSxJQUFJLEtBQUssR0FBRyxFQUFFLENBQUM7WUFDakIsTUFBTSxTQUFTLENBQUMsSUFBSSxDQUFDLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFDeEMsQ0FBQzthQUFNLENBQUM7WUFDTixNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsY0FBYztZQUM3QyxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsS0FBSyxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO2dCQUN0QyxJQUFJLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ3JCLElBQUksU0FBUyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztvQkFDdEMsTUFBTSxTQUFTLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxJQUFJLENBQUMsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztnQkFDM0QsQ0FBQztxQkFBTSxDQUFDO29CQUNOLEtBQUssR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUM7b0JBQzFCLElBQUksU0FBUyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQzt3QkFDdEMsTUFBTSxTQUFTLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxJQUFJLENBQUMsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztvQkFDM0QsQ0FBQzt5QkFBTSxDQUFDO3dCQUNOLEdBQUcsQ0FBQyxJQUFJLENBQUMsS0FBSyxHQUFHLFdBQVcsQ0FBQyxDQUFDO29CQUNoQyxDQUFDO2dCQUNILENBQUM7WUFDSCxDQUFDO1FBQ0gsQ0FBQztRQUNELE1BQU0sU0FBUyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ3hCLEdBQUcsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDM0IsQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMifQ==

package/dist/utils/app.d.ts

@@ -2,4 +2,4 @@ import { IMidwayFramework } from '@midwayjs/core';
 import { Framework } from '@midwayjs/koa';
 import { createApp } from '@midwayjs/mock';
 export declare function getApp<T extends IMidwayFramework<any, any, any, any, any> = Framework>(args?: Parameters<typeof createApp<T>>): Promise<ReturnType<T["getApplication"]>>;
-export declare function closeApp(): void;
+export declare function closeApp(): Promise<void> | undefined;

package/dist/utils/app.js

@@ -6,7 +6,7 @@ export async function getApp(args) {
 }
 export function closeApp() {
     if (app) {
-        close(app);
+        return close(app);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2FwcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRWxELElBQUksR0FBZ0IsQ0FBQztBQUNyQixNQUFNLENBQUMsS0FBSyxVQUFVLE1BQU0sQ0FBa0UsSUFBc0M7SUFDbEksYUFBYTtJQUNiLE9BQU8sQ0FBQyxHQUFHLEdBQUcsTUFBTSxTQUFTLENBQUksR0FBRyxDQUFDLElBQUksSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDckQsQ0FBQztBQUVELE1BQU0sVUFBVSxRQUFRO0lBQ3RCLElBQUksR0FBRyxFQUFFLENBQUM7UUFDUixLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDYixDQUFDO0FBQ0gsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2FwcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRWxELElBQUksR0FBZ0IsQ0FBQztBQUNyQixNQUFNLENBQUMsS0FBSyxVQUFVLE1BQU0sQ0FBa0UsSUFBc0M7SUFDbEksYUFBYTtJQUNiLE9BQU8sQ0FBQyxHQUFHLEdBQUcsTUFBTSxTQUFTLENBQUksR0FBRyxDQUFDLElBQUksSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDckQsQ0FBQztBQUVELE1BQU0sVUFBVSxRQUFRO0lBQ3RCLElBQUksR0FBRyxFQUFFLENBQUM7UUFDUixPQUFPLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNwQixDQUFDO0FBQ0gsQ0FBQyJ9

package/dist/utils/db.d.ts

@@ -1 +1 @@
-export declare function getConfig(dbConfig: any, name: any): Promise<any>;
+export declare function getConfig(dbConfig: string, name: string): Promise<any>;

package/dist/utils/db.js

@@ -5,4 +5,4 @@ export async function getConfig(dbConfig, name) {
     const configName = name ?? config.defaultDataSourceName ?? 'default';
     return config.dataSource[configName];
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvZGIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUV6QyxNQUFNLENBQUMsS0FBSyxVQUFVLFNBQVMsQ0FBQyxRQUFRLEVBQUUsSUFBSTtJQUM1QyxNQUFNLEtBQUssR0FBRyxNQUFNLE1BQU0sQ0FBQyxhQUFhLENBQUMsUUFBUSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDekQsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQzFFLE1BQU0sVUFBVSxHQUFHLElBQUksSUFBSSxNQUFNLENBQUMscUJBQXFCLElBQUksU0FBUyxDQUFDO0lBQ3JFLE9BQU8sTUFBTSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQztBQUN2QyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvZGIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUV6QyxNQUFNLENBQUMsS0FBSyxVQUFVLFNBQVMsQ0FBQyxRQUFlLEVBQUUsSUFBVztJQUMxRCxNQUFNLEtBQUssR0FBRyxNQUFNLE1BQU0sQ0FBQyxhQUFhLENBQUMsUUFBUSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDekQsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQzFFLE1BQU0sVUFBVSxHQUFHLElBQUksSUFBSSxNQUFNLENBQUMscUJBQXFCLElBQUksU0FBUyxDQUFDO0lBQ3JFLE9BQU8sTUFBTSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQztBQUN2QyxDQUFDIn0=

package/dist/utils/file.d.ts

@@ -37,7 +37,7 @@ export declare function copyFile(fromFile: string, toFile: string, fileSetFuncti
  * @param isEncodeFileName
  * @returns
  */
-export declare function copyPath(pathFile: any, toPath: any, relativePath?: string, ignoreFile?: Array<string | RegExp>, fileSetFunctions?: Record<string, (content: string) => string>, isEncodePackage?: boolean): Promise<(boolean | void)[]>;
+export declare function copyPath(pathFile: string, toPath: string, relativePath?: string, ignoreFile?: Array<string | RegExp>, fileSetFunctions?: Record<string, (content: string) => string>, isEncodePackage?: boolean): Promise<(boolean | void)[] | undefined>;
 /**
  * 检测文件夹文件是否存在
  * @param pathFile
@@ -46,4 +46,4 @@ export declare function copyPath(pathFile: any, toPath: any, relativePath?: stri
  * @param hasFiles
  * @returns
  */
-export declare function checkPathFile(pathFile: any, toPath: any, relativePath?: string, hasFiles?: string[]): string[];
+export declare function checkPathFile(pathFile: string, toPath: string, relativePath?: string, hasFiles?: string[]): string[];

package/dist/utils/file.js

@@ -93,7 +93,7 @@ export async function copyPath(pathFile, toPath, relativePath = '', ignoreFile =
         if (stats.isDirectory()) {
             mkdirSync(toSetPath, { recursive: true });
             //文件夹递归处理
-            copyPath(path, toSetPath, relativeFilePath, ignoreFile, fileSetFunctions, isEncodePackage);
+            await copyPath(path, toSetPath, relativeFilePath, ignoreFile, fileSetFunctions, isEncodePackage);
         }
         else {
             if (fileSetFunctions) {
@@ -132,7 +132,7 @@ export function checkPathFile(pathFile, toPath, relativePath = '', hasFiles = []
         const stats = statSync(path);
         if (stats.isDirectory()) {
             //文件夹递归处理
-            copyPath(path, toSetPath, relativeFilePath, hasFiles);
+            checkPathFile(path, toSetPath, relativeFilePath, hasFiles);
         }
         else {
             hasFiles.push(toSetPath);
@@ -141,4 +141,4 @@ export function checkPathFile(pathFile, toPath, relativePath = '', hasFiles = []
     });
     return hasFiles;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9maWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLFNBQVMsRUFBRSxXQUFXLEVBQUUsWUFBWSxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQW9CLGFBQWEsRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUN0SSxPQUFPLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDbkQ7Ozs7O0dBS0c7QUFDSCxNQUFNLFVBQVUsc0JBQXNCLENBQUMsUUFBZ0IsRUFBRSxPQUFlLEVBQUUsT0FBMEI7SUFDbEcsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQy9CLFNBQVMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUNyQyxhQUFhLENBQUMsUUFBUSxFQUFFLE9BQU8sRUFBRSxPQUFPLENBQUMsQ0FBQztJQUMxQyxPQUFPLElBQUksQ0FBQztBQUNkLENBQUM7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLFVBQVUsV0FBVyxDQUFDLFFBQWdCO0lBQzFDLElBQUksVUFBVSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUM7UUFDekIsTUFBTSxDQUFDLFFBQVEsRUFBRSxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7SUFDckQsQ0FBQztBQUNILENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSxxQkFBcUIsQ0FBQyxJQUFZLEVBQUUsZUFBd0I7SUFDMUUsSUFBSSxlQUFlLEVBQUUsQ0FBQztRQUNwQixJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFDLEVBQUUsQ0FBQztZQUNsQyxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsY0FBYyxFQUFFLHNC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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9maWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLFNBQVMsRUFBRSxXQUFXLEVBQUUsWUFBWSxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsYUFBYSxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQ3BILE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNuRDs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSxzQkFBc0IsQ0FBQyxRQUFnQixFQUFFLE9BQWUsRUFBRSxPQUEwQjtJQUNsRyxNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDL0IsU0FBUyxDQUFDLElBQUksRUFBRSxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQ3JDLGFBQWEsQ0FBQyxRQUFRLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQzFDLE9BQU8sSUFBSSxDQUFDO0FBQ2QsQ0FBQztBQUVEOzs7R0FHRztBQUNILE1BQU0sVUFBVSxXQUFXLENBQUMsUUFBZ0I7SUFDMUMsSUFBSSxVQUFVLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQztRQUN6QixNQUFNLENBQUMsUUFBUSxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUNyRCxDQUFDO0FBQ0gsQ0FBQztBQUVEOzs7OztHQUtHO0FBQ0gsTUFBTSxVQUFVLHFCQUFxQixDQUFDLElBQVksRUFBRSxlQUF3QjtJQUMxRSxJQUFJLGVBQWUsRUFBRSxDQUFDO1FBQ3BCLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQUMsRUFBRSxDQUFDO1lBQ2xDLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxjQUFjLEVBQUUsc0JB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

package/dist/utils/formatting.js

@@ -19,7 +19,7 @@ export function normalizeToKebabOrSnakeCase(str, replaceStr = '-') {
  * @return  {[string]}       [return description]
  */
 export function toHump(str) {
-    return str.replace(/[\-_]([A-Za-z])/g, function (all, letter) {
+    return str.replace(/[-_]([A-Za-z])/g, (_all, letter) => {
         return letter.toUpperCase();
     });
 }
@@ -100,4 +100,4 @@ export function getKeyInfo(description) {
         return { name: nameArr[0] };
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybWF0dGluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9mb3JtYXR0aW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDaEU7Ozs7OztHQU1HO0FBQ0gsTUFBTSxVQUFVLDJCQUEyQixDQUFDLEdBQVcsRUFBRSxVQUFVLEdBQUcsR0FBRztJQUN2RSxNQUFNLHVCQUF1QixHQUFHLEtBQUssQ0FBQztJQUN0QyxNQUFNLHdCQUF3QixHQUFHLG1CQUFtQixDQUFDO0lBQ3JELE9BQU8sR0FBRyxDQUFDLE9BQU8sQ0FBQyx3QkFBd0IsRUFBRSxLQUFLLFVBQVUsSUFBSSxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUMsT0FBTyxDQUFDLHVCQUF1QixFQUFFLFVBQVUsQ0FBQyxDQUFDO0FBQy9ILENBQUM7QUFFRDs7Ozs7O0dBTUc7QUFDSCxNQUFNLFVBQVUsTUFBTSxDQUFDLEdBQVc7SUFDaEMsT0FBTyxHQUFHLENBQUMsT0FBTyxDQUFDLGtCQUFrQixFQUFFLFVBQVUsR0FBRyxFQUFFLE1BQU07UUFDMUQsT0FBTyxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDOUIsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsTUFBTSxVQUFVLGNBQWMsQ0FBQyxHQUFXO0lBQ3hDLE9BQU8sR0FBRyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxFQUFFLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDO0FBQ3pELENBQUM7QUFFRDs7Ozs7O0dBTUc7QUFDSCxNQUFNLFVBQVUsV0FBVyxDQUFDLEdBQVc7SUFDckMsT0FBTyxHQUFHLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUM7QUFDekQsQ0FBQztBQUVEOzs7Ozs7O0dBT0c7QUFDSCxNQUFNLFVBQVUsVUFBVSxDQUFDLEdBQVcsRUFBRSxNQUFNLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxJQUFJLEdBQUcsT0FBTyxDQUFDLEdBQUcsRUFBRTtJQUM1RSxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUU7UUFDdEIsSUFBSSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztZQUN4QixHQUFHLElBQUksSUFBSSxDQUFDO1FBQ2QsQ0FBQztJQUNILENBQUMsQ0FBQyxDQUFDO0lBQ0gsT0FBTyxPQUFPLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsR0FBRyxDQUFDLENBQUM7QUFDaEQsQ0FBQztBQUVEOzs7Ozs7OztHQVFHO0FBQ0gsTUFBTSxVQUFVLFlBQVksQ0FBQyxJQUFZLEVBQUUsRUFBVSxFQUFFLE1BQU0sR0FBRyxDQUFDLEtBQUssQ0FBQztJQUNyRSxJQUFJLElBQUksR0FBRyxRQUFRLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQztJQUM5RCxNQUFNLENBQUMsT0FBTyxFQUFFLENBQUMsT0FBTyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUU7UUFDaEMsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDeEIsSUFBSSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDeEMsQ0FBQztJQUNILENBQUMsQ0FBQyxDQUFDO0lBQ0gsSUFBSSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQ2hDLE9BQU8sSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO0FBQ25ELENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLFVBQVUsQ0FBQyxXQUFtQjtJQUM1QywrQkFBK0I7SUFDL0IsTUFBTSxPQUFPLEdBQUcsV0FBVyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUN2QyxNQUFNLElBQUksR0FBRyxFQUE0QixDQUFDO0lBQzFDLE1BQU0sT0FBTyxHQUFHLEVBQTZDLENBQUM7SUFDOUQsSUFBSSxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUNmLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUU7WUFDdEMsTUFBTSxRQUFRLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNsQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ2hDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxLQUFLLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQzNELENBQUMsQ0FBQyxDQUFDO1FBQ0gsT0FBTyxFQUFFLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLENBQUM7SUFDNUQsQ0FBQztTQUFNLENBQUM7UUFDTixPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO0lBQzlCLENBQUM7QUFDSCxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybWF0dGluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9mb3JtYXR0aW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDaEU7Ozs7OztHQU1HO0FBQ0gsTUFBTSxVQUFVLDJCQUEyQixDQUFDLEdBQVcsRUFBRSxVQUFVLEdBQUcsR0FBRztJQUN2RSxNQUFNLHVCQUF1QixHQUFHLEtBQUssQ0FBQztJQUN0QyxNQUFNLHdCQUF3QixHQUFHLG1CQUFtQixDQUFDO0lBQ3JELE9BQU8sR0FBRyxDQUFDLE9BQU8sQ0FBQyx3QkFBd0IsRUFBRSxLQUFLLFVBQVUsSUFBSSxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUMsT0FBTyxDQUFDLHVCQUF1QixFQUFFLFVBQVUsQ0FBQyxDQUFDO0FBQy9ILENBQUM7QUFFRDs7Ozs7O0dBTUc7QUFDSCxNQUFNLFVBQVUsTUFBTSxDQUFDLEdBQVc7SUFDaEMsT0FBTyxHQUFHLENBQUMsT0FBTyxDQUFDLGlCQUFpQixFQUFFLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxFQUFFO1FBQ3JELE9BQU8sTUFBTSxDQUFDLFdBQVcsRUFBRSxDQUFDO0lBQzlCLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQztBQUVEOzs7Ozs7R0FNRztBQUNILE1BQU0sVUFBVSxjQUFjLENBQUMsR0FBVztJQUN4QyxPQUFPLEdBQUcsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLFdBQVcsRUFBRSxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQztBQUN6RCxDQUFDO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsTUFBTSxVQUFVLFdBQVcsQ0FBQyxHQUFXO0lBQ3JDLE9BQU8sR0FBRyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxFQUFFLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDO0FBQ3pELENBQUM7QUFFRDs7Ozs7OztHQU9HO0FBQ0gsTUFBTSxVQUFVLFVBQVUsQ0FBQyxHQUFXLEVBQUUsTUFBTSxHQUFHLENBQUMsS0FBSyxDQUFDLEVBQUUsSUFBSSxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUU7SUFDNUUsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO1FBQ3RCLElBQUksQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDeEIsR0FBRyxJQUFJLElBQUksQ0FBQztRQUNkLENBQUM7SUFDSCxDQUFDLENBQUMsQ0FBQztJQUNILE9BQU8sT0FBTyxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0FBQ2hELENBQUM7QUFFRDs7Ozs7Ozs7R0FRRztBQUNILE1BQU0sVUFBVSxZQUFZLENBQUMsSUFBWSxFQUFFLEVBQVUsRUFBRSxNQUFNLEdBQUcsQ0FBQyxLQUFLLENBQUM7SUFDckUsSUFBSSxJQUFJLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDOUQsTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO1FBQ2hDLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO1lBQ3hCLElBQUksR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3hDLENBQUM7SUFDSCxDQUFDLENBQUMsQ0FBQztJQUNILElBQUksR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQztJQUNoQyxPQUFPLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztBQUNuRCxDQUFDO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSxVQUFVLENBQUMsV0FBbUI7SUFDNUMsK0JBQStCO0lBQy9CLE1BQU0sT0FBTyxHQUFHLFdBQVcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDdkMsTUFBTSxJQUFJLEdBQUcsRUFBNEIsQ0FBQztJQUMxQyxNQUFNLE9BQU8sR0FBRyxFQUE2QyxDQUFDO0lBQzlELElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFDZixPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ3RDLE1BQU0sUUFBUSxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDbEMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUNoQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUsS0FBSyxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUMsRUFBRSxLQUFLLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUMzRCxDQUFDLENBQUMsQ0FBQztRQUNILE9BQU8sRUFBRSxJQUFJLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxDQUFDO0lBQzVELENBQUM7U0FBTSxDQUFDO1FBQ04sT0FBTyxFQUFFLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUM5QixDQUFDO0FBQ0gsQ0FBQyJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meadmin/cli",
-  "version": "1.2.3",
+  "version": "1.3.0",
   "description": "meadmin cli",
   "type": "module",
   "main": "dist/index.js",

package/template/addons/eslint.config.js

@@ -0,0 +1,17 @@
+import { defineConfig } from 'eslint/config';
+import config from '../../eslint.config.base.js';
+
+export default defineConfig(
+  config,
+  {
+    ignores: ['node_modules/**', 'dist/**', 'test/**', 'jest.*', 'template/**', '.prettierrc.js', 'eslint.config.js', 'tsdown.config.js'],
+  },
+  {
+    languageOptions: {
+      parserOptions: {
+        tsconfigRootDir: import.meta.dirname,
+        // or, in CommonJS, __dirname
+      },
+    },
+  },
+);

package/template/crud/server/dto/query.dto.ts.art

@@ -1,4 +1,4 @@
-import { IntersectionType, PartialType } from '@/helper/dto.js';
+import { IntersectionType, PartialType, OmitDtoType } from '@/helper/dto.js';
 import { {{@ replaceNames.Name}} } from '{{@ paths.entityPath}}';
 import { InferAttributesLoose } from '@/types/entity.js';
 import { PageDto } from '@/dto/page.dto.js';
@@ -8,7 +8,12 @@ import { RuleType } from '@/ruleType/index.js';{{/if}}
 //dto参数校验继承 entity必须使用 PickDtoType|OmitDtoType|PartialType|RequiredType|IntersectionType 之一 否则不会生效
 export class {{@ replaceNames.QueryDto}} extends IntersectionType(
   PageDto,
-  PartialType({{@ replaceNames.Name}} as new () => InferAttributesLoose<{{@ replaceNames.Name}}>)
+  PartialType(
+    OmitDtoType(
+      {{@ replaceNames.Name}} as new () => InferAttributesLoose<{{@ replaceNames.Name}}>,
+      ['{{@ entity.noSearchAttributes.join("','")}}'], //排除关联字段、虚拟属性、自动生成的属性(如果想更加简洁可以省略OmitDtoType，用InferAttributes替换InferAttributesLoose，不过需注意对应字段不创建rule，否则会行为不一致)
+    )
+  )
 ) {
   {{each entitySchema.properties}}{{if $index.endsWith('At')}}@ApiPropertyRule({ description: '{{@ $value.description}}(起)', rule: RuleType.date() })
   start{{@ $imports.upFirstCase($index)}}?:Date;

package/template/crud/server/service/service.ts.art

@@ -7,7 +7,8 @@ import { {{@ replaceNames.UpdateDto}} } from '{{@ paths.updateDtoPath}}';
 import { {{@ replaceNames.Name}} } from '{{@ paths.entityPath}}';
 import { MidwayI18nService } from '@midwayjs/i18n';
 import { Transaction } from '@/decorators/index.js';
-import { Op } from '@sequelize/core';{{each $imports.objectKeys(entity.belongsToEntity)}}<% const valueEntity = entity.belongsToEntity[$value]; %>{{if ['File'].includes(valueEntity.entityName)}}<% return; %>{{/if}}
+import { WhereAttributeHash } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/where-sql-builder-types.js';
+import { InferAttributes, Op, WhereOperators } from '@sequelize/core';{{each $imports.objectKeys(entity.belongsToEntity)}}<% const valueEntity = entity.belongsToEntity[$value]; %>{{if ['File'].includes(valueEntity.entityName)}}<% return; %>{{/if}}
 import { {{@ valueEntity.entityName}} } from '{{@ paths.entityPath.replace(replaceNames.name,valueEntity.entityFileName)}}';{{/each}}{{each $imports.objectKeys(entity.belongsToManyEntity)}}<% const valueEntity = entity.belongsToManyEntity[$value]; %>{{if ['File'].includes(valueEntity.entityName)}}<% return; %>{{/if}}
 import { {{@ valueEntity.entityName}} } from '{{@ paths.entityPath.replace(replaceNames.name,valueEntity.entityFileName)}}';{{/each}}
 
@@ -117,25 +118,25 @@ export class {{@ replaceNames.Service}} {
    */
   @Transaction()
   async list(queryDto: {{@ replaceNames.QueryDto}}) {
-    const where = {};
-    Object.keys(queryDto).forEach((key) => {
-      if(['page', 'pageSize'].includes(key)){
+    const where = {} as WhereAttributeHash<InferAttributes<{{@ replaceNames.Name}}, { omit: never }>>;
+    (Object.keys(queryDto) as Array<keyof {{@ replaceNames.QueryDto}}>).forEach((key) => {
+      if ('page' === key || 'pageSize' === key) {
         return;
       }
-      if([null, undefined, ''].includes(queryDto[key])){
+      if (null === queryDto[key] || undefined === queryDto[key] || '' === queryDto[key]) {
         return;
       }{{each entitySchema.properties}}{{if $index.endsWith('At')}}
       if (key === 'start{{@ $imports.upFirstCase($index)}}') {
-        where['{{@ $index}}'] = where['{{@ $index}}'] ?? {};
+        where['{{@ $index}}'] = (where['{{@ $index}}'] ?? {}) as WhereOperators<NonNullable<{{@ replaceNames.Name}}['{{@ $index}}']>>
         where['{{@ $index}}'][Op.gte] = queryDto[key];
         return;
       }
       if (key === 'end{{@ $imports.upFirstCase($index)}}') {
-        where['{{@ $index}}'] = where['{{@ $index}}'] ?? {};
+        where['{{@ $index}}'] = (where['{{@ $index}}'] ?? {}) as WhereOperators<NonNullable<{{@ replaceNames.Name}}['{{@ $index}}']>>
         where['{{@ $index}}'][Op.lte] = queryDto[key];
         return;
       }{{/if}}{{/each}}
-      where[key] = queryDto[key];
+      (where as Record<keyof typeof where, any>)[key] = queryDto[key]; //因为 where[key as Exclude<typeof key,'page'|'pageSize'>] = queryDto[key]; 赋值会触发 TS2590: Expression produces a union type that is too complex to represent.
     });    
     const { count, rows } = await this.{{@ replaceNames.name}}Repository.findAndCountAll({
       where,

package/template/crud/view/api/api.ts.art

@@ -1,7 +1,9 @@
-import request, { RequestOptions } from '@/utils/request.js';
-import { PageParam, PageResult } from '@/api/api.model.js';
-import { FileInfo } from '@/api/file.js';
-import { SystemAdminInfo } from '@/api/system/admin.js';
+import request from '@/utils/request.js';
+import type { PageResult } from '@/api/api.model.js';
+import { PageParam } from '@/api/api.model.js';
+import type { FileInfo } from '@/api/file.js';
+import type { SystemAdminInfo } from '@/api/system/admin.js';
+import type { RequestOptions } from '@/utils/request.js';
 
 {{each swaggerSchemas}}
 {{if $index === replaceNames.Name}}

package/template/crud/view/views/components/addOrUp.vue.art

@@ -15,7 +15,7 @@
 import { {{@ replaceNames.Name}}, {{@ replaceNames.Name}}Info, add{{@ replaceNames.Name}}Api, update{{@ replaceNames.Name}}Api, {{@ replaceNames.name}}InfoApi } from '@/{{@ replaceNames.addonsPath}}api/{{@ replaceNames.namePath}}';
 import { useLocalesI18n } from '@/locales/i18n';
 import { resetObj<% if($imports.objectValues(entitySchema.properties).some(v=>v.enum || v.description.includes(':'))){%>, formatterStr<%}%> } from '@/utils/helper';
-import { FormInstance, FormRules } from 'element-plus';
+import type { FormInstance, FormRules } from 'element-plus';
 {{if $imports.objectValues(entitySchema.properties).some(value=>value.rule?._rules.some(v=>v.name==='mobile'))}}import { isMobile } from '@/utils/validate.js';{{/if}}
 //接口需要现在setup顶层初始化（如果是异步setup需要在异步调用之前初始化），否则会有unMounted，非法调用警告，因为vueRequest使用了unMounted
 const { runAsync:updateRunAsync } = update{{@ replaceNames.Name}}Api();

package/template/crud/view/views/index.vue.art

@@ -45,7 +45,8 @@
 </template>
 
 <script setup lang="ts" name="{{@ replaceNames.Name}}">
-import { {{@ replaceNames.name}}ListApi, {{@ replaceNames.Name}}ListParam, del{{@ replaceNames.Name}}Api, {{@ replaceNames.Name}}Info } from '@/{{@ replaceNames.addonsPath}}api/{{replaceNames.namePath}}';
+import type { {{@ replaceNames.Name}}Info} from '@/{{@ replaceNames.addonsPath}}api/{{replaceNames.namePath}};
+import { {{@ replaceNames.name}}ListApi, {{@ replaceNames.Name}}ListParam, del{{@ replaceNames.Name}}Api } from '@/{{@ replaceNames.addonsPath}}api/{{replaceNames.namePath}}';
 import { useLocalesI18n } from '@/locales/i18n';
 import Info from './components/info.vue';
 import AddOrUp from './components/addOrUp.vue';

package/template/crud/view/views/searchItem.vue.art

@@ -1,4 +1,4 @@
-{{each properties}}<% const keyInfo = $imports.getKeyInfo($value.description); %>{{if $index.endsWith('At')}}
+{{each properties}}<% const keyInfo = $imports.getKeyInfo($value.description); %>{{if !entity.noSearchAttributes.includes($index)}}{{if $index.endsWith('At')}}
 <el-form-item :label="t('{{@ keyInfo.name}}')" prop="{{@ $index}}">
   <el-date-picker v-model="params.start{{@ $imports.upFirstCase($index)}}" type="{{if $value.format === 'date-time'}}datetime{{else}}date{{/if}}" value-format="{{if $value.format === 'date-time'}}YYYY-MM-DD HH:mm:ss{{else}}YYYY-MM-DD{{/if}}" clearable />&nbsp; - &nbsp;
   <el-form-item prop="priceEnd">
@@ -14,4 +14,4 @@
   {{else if $value.type === 'string'}}
     <el-input v-model="params.{{@ $index}}" clearable ></el-input>  
   {{/if}}
-</el-form-item>{{/if}}{{/each}}
+</el-form-item>{{/if}}{{/if}}{{/each}}