@meadmin/cli 1.0.2 → 1.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.prettierrc.cjs +7 -0
- package/dist/commanders/crud.js +20 -16
- package/dist/commanders/index.js +3 -4
- package/dist/commanders/sync.js +7 -14
- package/dist/index.js +2 -5
- package/dist/utils/app.d.ts +2 -2
- package/dist/utils/app.js +3 -3
- package/dist/utils/db.js +1 -1
- package/dist/utils/env.js +1 -1
- package/dist/utils/file.js +2 -2
- package/dist/utils/formatting.js +2 -2
- package/dist/utils/log.js +1 -1
- package/package.json +11 -10
package/.prettierrc.cjs
ADDED
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
const configs = require(process.cwd() + '/.prettierrc.cjs') ?? {};
|
|
2
|
+
if (!configs.plugins) {
|
|
3
|
+
configs.plugins = ['prettier-plugin-organize-imports']; //让 Prettier 可以整理你的导入语句(例如排序、合并和移除未使用的导入语句)organizeImports。这与在 VS Code 中使用“Organize Imports”操作的效果相同。
|
|
4
|
+
} else if (!configs.plugins.includes('prettier-plugin-organize-imports')) {
|
|
5
|
+
configs.plugins.push('prettier-plugin-organize-imports');
|
|
6
|
+
}
|
|
7
|
+
module.exports = configs;
|
package/dist/commanders/crud.js
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
|
+
import { getClassMetadata } from '@midwayjs/core';
|
|
2
|
+
import { DECORATORS, DECORATORS_CLASS_METADATA, SwaggerExplorer } from '@midwayjs/swagger';
|
|
1
3
|
import { Sequelize } from '@sequelize/core';
|
|
2
|
-
import
|
|
4
|
+
import template from 'art-template';
|
|
5
|
+
import { omit } from 'lodash-es';
|
|
3
6
|
import { existsSync } from 'node:fs';
|
|
4
7
|
import { join, resolve } from 'node:path';
|
|
5
|
-
import { getConfig } from '../utils/db.js';
|
|
6
|
-
import { delFileSync, recursionWriteFileSync } from '../utils/file.js';
|
|
7
|
-
import { Log } from '../utils/log.js';
|
|
8
|
-
import template from 'art-template';
|
|
9
|
-
import { getClassMetadata } from '@midwayjs/core';
|
|
10
|
-
import { DECORATORS, DECORATORS_CLASS_METADATA, SwaggerExplorer } from '@midwayjs/swagger';
|
|
11
8
|
import { pathToFileURL } from 'node:url';
|
|
12
9
|
import * as prettier from 'prettier';
|
|
13
10
|
import prettierrc from '../../.prettierrc.cjs';
|
|
14
|
-
import {
|
|
11
|
+
import { getConfig } from '../utils/db.js';
|
|
12
|
+
import { delFileSync, recursionWriteFileSync } from '../utils/file.js';
|
|
13
|
+
import { getKeyInfo, lowerFirstCase, normalizeToKebabOrSnakeCase, relativePath, resovePath, toHump, upFirstCase } from '../utils/formatting.js';
|
|
14
|
+
import { Log } from '../utils/log.js';
|
|
15
15
|
let swaggerSchemas = {};
|
|
16
16
|
let sequelize; //数据库配置
|
|
17
17
|
const tableInfos = {};
|
|
@@ -153,12 +153,13 @@ function tableInfo(entityName, noBelongs = false) {
|
|
|
153
153
|
const belongsToMany = [];
|
|
154
154
|
const belongsToManyEntity = {};
|
|
155
155
|
if (!noBelongs) {
|
|
156
|
-
Object.keys(modelDefinition.associations).forEach(key => {
|
|
156
|
+
Object.keys(modelDefinition.associations).forEach((key) => {
|
|
157
157
|
if (['createdAdmin', 'updatedAdmin', 'createdUser', 'updatedUser'].includes(key)) {
|
|
158
158
|
belongs.push(key);
|
|
159
159
|
return;
|
|
160
160
|
}
|
|
161
|
-
if (modelDefinition.associations[key].isSelfAssociation) {
|
|
161
|
+
if (modelDefinition.associations[key].isSelfAssociation) {
|
|
162
|
+
//TODO::自关联暂不支持
|
|
162
163
|
return;
|
|
163
164
|
}
|
|
164
165
|
if ('BelongsTo' === modelDefinition.associations[key].associationType) {
|
|
@@ -175,7 +176,7 @@ function tableInfo(entityName, noBelongs = false) {
|
|
|
175
176
|
}
|
|
176
177
|
const nameKeys = []; //可快捷查询的name
|
|
177
178
|
for (const key of modelDefinition.attributes.keys()) {
|
|
178
|
-
if ((key.endsWith('name') || key.endsWith('Name')) && ['VARCHAR', 'CHAR', 'STRING'].some(v => modelDefinition.attributes.get(key).type.toString().includes(v))) {
|
|
179
|
+
if ((key.endsWith('name') || key.endsWith('Name')) && ['VARCHAR', 'CHAR', 'STRING'].some((v) => modelDefinition.attributes.get(key).type.toString().includes(v))) {
|
|
179
180
|
nameKeys.push(key);
|
|
180
181
|
}
|
|
181
182
|
}
|
|
@@ -329,7 +330,7 @@ async function setMenu(model, namePath, sequelize) {
|
|
|
329
330
|
const langFilePath = resovePath(`view/${model}/src/locales/lang/en/menu`, ['.json']);
|
|
330
331
|
const lang = await import(pathToFileURL(langFilePath).href, { with: { type: 'json' } });
|
|
331
332
|
const comments = tableInfo(replaceNames.Name).tableComment.split('_');
|
|
332
|
-
const menuNames = namePath.split('/').filter(v => v);
|
|
333
|
+
const menuNames = namePath.split('/').filter((v) => v);
|
|
333
334
|
for (let i = 0; i < menuNames.length; i++) {
|
|
334
335
|
const menu = menuNames[i];
|
|
335
336
|
paths.push(menu);
|
|
@@ -339,7 +340,7 @@ async function setMenu(model, namePath, sequelize) {
|
|
|
339
340
|
menuTitle = comments[i];
|
|
340
341
|
}
|
|
341
342
|
else {
|
|
342
|
-
if (i ===
|
|
343
|
+
if (i === menuNames.length - 1) {
|
|
343
344
|
lang.default[tableInfo(replaceNames.Name).tableComment] = menuTitle;
|
|
344
345
|
menuTitle = tableInfo(replaceNames.Name).tableComment;
|
|
345
346
|
}
|
|
@@ -347,7 +348,7 @@ async function setMenu(model, namePath, sequelize) {
|
|
|
347
348
|
lang.default[menuTitle] = menuTitle;
|
|
348
349
|
}
|
|
349
350
|
}
|
|
350
|
-
if (i <
|
|
351
|
+
if (i < menuNames.length - 1) {
|
|
351
352
|
const [menuEntity] = await sequelize.models.get('SystemMenu').findOrCreate({
|
|
352
353
|
where: { rule: paths.join('_') },
|
|
353
354
|
defaults: {
|
|
@@ -453,7 +454,10 @@ export const crudInit = async (program) => {
|
|
|
453
454
|
if (replaceNames.namePath.startsWith('/')) {
|
|
454
455
|
replaceNames.namePath = replaceNames.namePath.slice(1);
|
|
455
456
|
}
|
|
456
|
-
replaceNames.roleName = replaceNames.namePath
|
|
457
|
+
replaceNames.roleName = replaceNames.namePath
|
|
458
|
+
.split('/')
|
|
459
|
+
.filter((v) => v)
|
|
460
|
+
.join('_');
|
|
457
461
|
replaceNames.controllerPath = options.controllerPath ? options.controllerPath : replaceNames.namePath;
|
|
458
462
|
//初始化需要创建的文件路径
|
|
459
463
|
writeServerFiles.entityPath = resovePath(noSuffixEntityPath + '.entity.js', [], process.cwd() + '/src/entities');
|
|
@@ -540,4 +544,4 @@ export const crudInit = async (program) => {
|
|
|
540
544
|
Log.success(entityFileName + ' crud创建完成');
|
|
541
545
|
});
|
|
542
546
|
};
|
|
543
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"crud.js","sourceRoot":"","sources":["../../src/commanders/crud.ts"],"names":[],"mappings":"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"}
|
|
547
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"crud.js","sourceRoot":"","sources":["../../src/commanders/crud.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,yBAAyB,EAAuD,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEhJ,OAAO,EAAqC,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE/E,OAAO,QAAQ,MAAM,cAAc,CAAC;AAEpC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AACrC,OAAO,UAAU,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,2BAA2B,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAChJ,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEtC,IAAI,cAAc,GAAG,EAAkC,CAAC;AACxD,IAAI,SAAoB,CAAC,CAAC,OAAO;AACjC,MAAM,UAAU,GAAG,EAKlB,CAAC;AACF,QAAQ;AACR,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,KAAK,CAAC;AACjC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,GAAG,KAAK,CAAC;AACnC,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC;AAC1C,QAAQ,CAAC,QAAQ,CAAC,OAAO,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;AACxE,MAAM,iBAAkB,SAAQ,eAAe;IAC7C;;;OAGG;IACI,kBAAkB,CAAC,IAAS;QACjC,MAAM,YAAY,GAAG,gBAAgB,CAAyB,yBAAyB,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;QACrG,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,UAAU,CAAC,eAAe,CAAC,CAAC;QAC3F,KAAK,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC;YAC5B,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC9B,KAAK,MAAM,IAAI,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;oBAC9B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBACvB,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC;IACH,CAAC;IACD;;;OAGG;IACI,SAAS,CAAC,IAAS;QACxB,OAAO,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;CACF;AAED;;;;;GAKG;AACH,MAAM,UAAU,GAAG,CAAC,eAAgC,EAAE,gBAAwB,EAAE,EAAE;IAChF,MAAM,cAAc,GAAG,EAAkC,CAAC;IAC1D,MAAM,UAAU,GAAG,CAAC,UAAmC,EAAE,EAAE;QACzD,MAAM,IAAI,GAAG,CAAC,OAAO,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;QACjH,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QACD,cAAc,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,CAAC,IAAoC,EAAE,EAAE;YACvD,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBACjB,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;gBACvB,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,UAAU,EAAE,CAAC;oBACvC,GAAG,GAAG,GAAG,EAAE,CAAC;gBACd,CAAC;gBACD,IAAI,CAAC,CAAC,kCAAkC,EAAE,2BAA2B,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBACrF,UAAU,CAAC,GAAG,CAAC,CAAC;gBAClB,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;gBACpG,CAAC;YACH,CAAC;YACD,IAAK,IAAqB,CAAC,KAAK,EAAE,CAAC;gBACjC,OAAO,CAAE,IAAqB,CAAC,KAAK,CAAC,CAAC;YACxC,CAAC;YACD,IAAK,IAAqB,CAAC,UAAU,EAAE,CAAC;gBACtC,aAAa,CAAE,IAAqB,CAAC,UAAU,CAAC,CAAC;YACnD,CAAC;QACH,CAAC,CAAC;QACF,MAAM,aAAa,GAAG,CAAC,UAA0D,EAAE,EAAE;YACnF,cAAc;YACd,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACzC,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBACpB,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;oBAC7B,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC;oBACvB,UAAU,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;gBACzB,CAAC;YACH,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACtC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;YAC3B,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QACF,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;YACpC,aAAa,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;YAC/B,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;IACH,CAAC,CAAC;IACF,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAC7B,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAEF;;;;;GAKG;AACH,SAAS,SAAS,CAAC,UAAU,EAAE,SAAS,GAAG,KAAK;IAC9C,IAAI,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3B,OAAO,UAAU,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC;IACD,MAAM,eAAe,GAAG,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC;IAC1E,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,UAAU,CAAC,UAAU,CAAC,GAAG;YACvB,YAAY,EAAE,EAAE;YAChB,EAAE,EAAE,EAAE;YACN,SAAS,EAAE,IAAI;YACf,UAAU,EAAE,EAAE;YACd,cAAc,EAAE,EAAE;SACnB,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,IAAI,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC;QACnD,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/B,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3C,CAAC;QACD,MAAM,cAAc,GAAG,CAAC,GAAG,eAAe,CAAC,yBAAyB,EAAE,GAAG,eAAe,CAAC,sBAAsB,CAAC,CAAC;QACjH,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAC7G,IAAI,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC9C,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACjC,CAAC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,cAAc,CAAC,UAAU,CAAC,EAAE,UAAU,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC;YAC7D,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACtC,CAAC;QACD,IAAI,cAAc,CAAC,UAAU,CAAC,EAAE,UAAU,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC;YAC7D,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACtC,CAAC;QACD,IAAI,cAAc,CAAC,UAAU,CAAC,EAAE,UAAU,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC;YAC5D,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,cAAc,CAAC,UAAU,CAAC,EAAE,UAAU,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC;YAC5D,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACrC,CAAC;QACD,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,MAAM,SAAS,GAAG,EAAE,CAAC;QACrB,MAAM,eAAe,GAAG,EAAE,CAAC;QAC3B,MAAM,aAAa,GAAG,EAAE,CAAC;QACzB,MAAM,mBAAmB,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACxD,IAAI,CAAC,cAAc,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBACjF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAClB,OAAO;gBACT,CAAC;gBACD,IAAI,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,iBAAiB,EAAE,CAAC;oBACxD,eAAe;oBACf,OAAO;gBACT,CAAC;gBACD,IAAI,WAAW,KAAK,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,eAAe,EAAE,CAAC;oBACtE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAClB,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACpB,eAAe,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACxF,CAAC;gBACD,IAAI,eAAe,KAAK,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,eAAe,EAAE,CAAC;oBAC1E,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAClB,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACxB,mBAAmB,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC5F,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QACD,MAAM,QAAQ,GAAG,EAAE,CAAC,CAAC,YAAY;QACjC,KAAK,MAAM,GAAG,IAAI,eAAe,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC;YACpD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjK,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;QACH,CAAC;QACD,UAAU,CAAC,UAAU,CAAC,GAAG;YACvB,UAAU;YACV,cAAc,EAAE,cAAc,CAAC,UAAU,CAAC;YAC1C,YAAY;YACZ,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAa;YACrE,SAAS,EAAE,eAAe,CAAC,OAAO,CAAC,SAAS;YAC5C,UAAU,EAAE,eAAe,CAAC,UAAU;YACtC,cAAc;YACd,SAAS;YACT,eAAe;YACf,aAAa;YACb,mBAAmB;YACnB,OAAO,EAAE,OAAO;YAChB,QAAQ;SACT,CAAC;IACJ,CAAC;IACD,OAAO,UAAU,CAAC,UAAU,CAAC,CAAC;AAChC,CAAC;AAED,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;AAChD,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;AACpD,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;AAC1D,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;AACnD,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC;AACvD,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC;AAC/C,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC;AAChD,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,GAAG,UAAU,CAAC;AAClD,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,WAAW,CAAC,2BAA2B,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU;AAC9I,wDAAwD;AACxD,oBAAoB;AACpB,MAAM,gBAAgB,GAAG;IACvB,UAAU,EAAE,EAAE;IACd,aAAa,EAAE,EAAE;IACjB,aAAa,EAAE,EAAE;IACjB,YAAY,EAAE,EAAE;IAChB,WAAW,EAAE,EAAE;IACf,cAAc,EAAE,EAAE;IAClB,kBAAkB,EAAE,EAAE;CACvB,CAAC;AACF,MAAM,UAAU,GAAG,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;AACxD,cAAc;AACd,MAAM,cAAc,GAAG;IACrB,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,EAAE;IACZ,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE,EAAE;IACd,IAAI,EAAE,EAAE;IACR,OAAO,EAAE,EAAE;CACZ,CAAC;AACF,MAAM,YAAY,GAAG;IACnB,IAAI,EAAE,EAAE;IACR,IAAI,EAAE,EAAE;IACR,SAAS,EAAE,EAAE;IACb,SAAS,EAAE,EAAE;IACb,SAAS,EAAE,EAAE;IACb,SAAS,EAAE,EAAE;IACb,QAAQ,EAAE,EAAE;IACZ,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,EAAE;IACX,UAAU,EAAE,EAAE;IACd,UAAU,EAAE,EAAE;IACd,cAAc,EAAE,EAAE;IAClB,QAAQ,EAAE,EAAE;IACZ,QAAQ,EAAE,EAAE;CACb,CAAC;AACF,UAAU;AACV,IAAI,eAAe,GAAG,KAAK,CAAC;AAC5B;;;GAGG;AACH,SAAS,UAAU;IACjB,MAAM,WAAW,GAAG,EAAE,CAAC;IACvB,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC5C,MAAM,IAAI,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QACzH,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAClD,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;IACH,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC1C,MAAM,IAAI,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QACnH,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAClD,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;AACvD,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,YAAY,CAAC,YAAY,EAAE,MAAM,EAAE,SAAyB;IACzE,MAAM,KAAK,GAAG,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,cAAc,EAAE,CAAC;IACpF,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACjC,KAAK,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE;QAC/D,eAAe;QACf,YAAY;QACZ,KAAK;QACL,cAAc;QACd,YAAY,EAAE,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC;QAC/C,MAAM,EAAE,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC;KACrC,CAAC,CAAC;IACH,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;QACf,sBAAsB,CACpB,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAC9D,MAAM,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE;YACzB,GAAG,UAAU;YACb,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM;SACzE,CAAC,EACF,EAAE,IAAI,EAAE,GAAG,EAAE,CACd,CAAC;QACF,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC;IAC1F,CAAC;AACH,CAAC;AAED,QAAQ;AACR,SAAS,WAAW;IAClB,QAAQ;IACR,OAAO,OAAO,CAAC,GAAG,CAAC;QACjB,YAAY,CAAC,kDAAkD,EAAE,gBAAgB,CAAC,aAAa,EAAE,KAAK,CAAC;QACvG,YAAY,CAAC,kDAAkD,EAAE,gBAAgB,CAAC,aAAa,EAAE,KAAK,CAAC;QACvG,YAAY,CAAC,iDAAiD,EAAE,gBAAgB,CAAC,YAAY,EAAE,KAAK,CAAC;QACrG,YAAY,CAAC,mDAAmD,EAAE,gBAAgB,CAAC,WAAW,EAAE,KAAK,CAAC;QACtG,YAAY,CAAC,yDAAyD,EAAE,gBAAgB,CAAC,cAAc,EAAE,KAAK,CAAC;KAChH,CAAC,CAAC;AACL,CAAC;AAED,UAAU;AACV,SAAS,YAAY;IACnB,OAAO,YAAY,CAAC,yCAAyC,EAAE,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AACjG,CAAC;AACD,YAAY;AACZ,SAAS,UAAU;IACjB,OAAO,OAAO,CAAC,GAAG,CAAC;QACjB,YAAY,CAAC,iDAAiD,EAAE,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC;QAClG,YAAY,CAAC,4CAA4C,EAAE,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC3F,YAAY,CAAC,8CAA8C,EAAE,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC7F,YAAY,CAAC,wDAAwD,EAAE,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;QACnG,YAAY,CAAC,2DAA2D,EAAE,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC;KAC1G,CAAC,CAAC;AACL,CAAC;AACD;;;;GAIG;AACH,KAAK,UAAU,OAAO,CAAC,KAAa,EAAE,QAAgB,EAAE,SAAoB;IAC1E,IAAI,QAAQ,GAAkB,IAAI,CAAC;IACnC,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,MAAM,YAAY,GAAG,UAAU,CAAC,QAAQ,KAAK,2BAA2B,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACrF,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACxF,MAAM,QAAQ,GAAG,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtE,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IACvD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC1C,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QAC1B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjB,IAAI,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1C,IAAI,QAAQ,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;YACzC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;YACtC,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC1B,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,KAAK,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,GAAG,SAAS,CAAC;gBACpE,SAAS,GAAG,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC;YACxD,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;YACtC,CAAC;QACH,CAAC;QACD,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC;gBACzE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBAChC,QAAQ,EAAE;oBACR,KAAK,EAAE,SAAS;oBAChB,QAAQ,EAAE,CAAC,EAAE,IAAI;oBACjB,QAAQ,EAAE,GAAG;oBACb,IAAI,EAAE,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;oBAC3B,QAAQ;oBACR,UAAU,EAAE,CAAC;iBACd;aACF,CAAC,CAAC;YACH,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAW,CAAC;QAC5C,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC;gBACzE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBAChC,QAAQ,EAAE;oBACR,KAAK,EAAE,SAAS;oBAChB,QAAQ,EAAE,CAAC,EAAE,IAAI;oBACjB,QAAQ,EAAE,GAAG;oBACb,IAAI,EAAE,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;oBAC3B,SAAS,EAAE,QAAQ,GAAG,QAAQ;oBAC9B,QAAQ;iBACT;aACF,CAAC,CAAC;YACH,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAW,CAAC;QAC5C,CAAC;IACH,CAAC;IACD,MAAM,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC;QACpD,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,EAAE;QAC1C,QAAQ,EAAE;YACR,QAAQ;YACR,KAAK,EAAE,IAAI;YACX,QAAQ,EAAE,CAAC,EAAE,IAAI;YACjB,QAAQ,EAAE,EAAE;SACb;KACF,CAAC,CAAC;IACH,MAAM,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC;QACpD,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,EAAE;QAC1C,QAAQ,EAAE;YACR,QAAQ;YACR,KAAK,EAAE,IAAI;YACX,QAAQ,EAAE,CAAC,EAAE,IAAI;YACjB,QAAQ,EAAE,EAAE;SACb;KACF,CAAC,CAAC;IACH,MAAM,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC;QACpD,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,EAAE;QACzC,QAAQ,EAAE;YACR,QAAQ;YACR,KAAK,EAAE,IAAI;YACX,QAAQ,EAAE,CAAC,EAAE,IAAI;YACjB,QAAQ,EAAE,EAAE;SACb;KACF,CAAC,CAAC;IACH,MAAM,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC;QACpD,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,EAAE;QAC1C,QAAQ,EAAE;YACR,QAAQ;YACR,KAAK,EAAE,IAAI;YACX,QAAQ,EAAE,CAAC,EAAE,IAAI;YACjB,QAAQ,EAAE,EAAE;SACb;KACF,CAAC,CAAC;IACH,MAAM,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC;QACpD,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,EAAE;QACzC,QAAQ,EAAE;YACR,QAAQ;YACR,KAAK,EAAE,IAAI;YACX,QAAQ,EAAE,CAAC,EAAE,IAAI;YACjB,QAAQ,EAAE,EAAE;SACb;KACF,CAAC,CAAC;IACH,sBAAsB,CACpB,YAAY,EACZ,MAAM,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QAClD,GAAG,UAAU;QACb,QAAQ,EAAE,YAAY;KACvB,CAAC,CACH,CAAC;IACF,OAAO;AACT,CAAC;AACD,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,OAAgB,EAAE,EAAE;IACjD,OAAO;SACJ,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,QAAQ,CAAC;SACrB,QAAQ,CAAC,QAAQ,EAAE,wCAAwC,CAAC;SAC5D,cAAc,CAAC,gBAAgB,EAAE,8BAA8B,EAAE,OAAO,CAAC;SACzE,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC;SAC7B,MAAM,CAAC,mBAAmB,EAAE,+BAA+B,CAAC;SAC5D,MAAM,CAAC,uBAAuB,EAAE,0CAA0C,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,yBAAyB,CAAC,CAAC;SAC3H,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC;SAC9B,MAAM,CAAC,eAAe,EAAE,mBAAmB,CAAC;SAC5C,MAAM,CAAC,yBAAyB,EAAE,0BAA0B,CAAC;SAC7D,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC;SACxB,MAAM,CAAC,0BAA0B,EAAE,uDAAuD,EAAE,MAAM,CAAC;SACnG,MAAM,CAAC,KAAK,EAAE,IAAY,EAAE,OAAO,EAAE,EAAE;QACtC,SAAS,GAAG,IAAI,SAAS,CAAC,MAAM,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3E,MAAM,kBAAkB,GAAG,YAAY,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QACtE,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,EAAE,kBAAkB,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAG,CAAC,CAAC,CAAC;QAC1G,YAAY,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,2BAA2B,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;QACvG,YAAY,CAAC,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACpE,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACxC,YAAY,CAAC,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7D,CAAC;QACD,IAAI,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1C,YAAY,CAAC,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACzD,CAAC;QACD,YAAY,CAAC,QAAQ,GAAG,YAAY,CAAC,QAAQ;aAC1C,KAAK,CAAC,GAAG,CAAC;aACV,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;aAChB,IAAI,CAAC,GAAG,CAAC,CAAC;QACb,YAAY,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC;QACtG,cAAc;QACd,gBAAgB,CAAC,UAAU,GAAG,UAAU,CAAC,kBAAkB,GAAG,YAAY,EAAE,EAAE,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,eAAe,CAAC,CAAC;QACjH,gBAAgB,CAAC,kBAAkB,GAAG,UAAU,CAAC,WAAW,OAAO,CAAC,KAAK,kBAAkB,EAAE,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC;QACrH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACxG,gBAAgB,CAAC,aAAa,GAAG,UAAU,CAAC,WAAW,OAAO,CAAC,KAAK,QAAQ,YAAY,CAAC,QAAQ,QAAQ,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;QAC5H,gBAAgB,CAAC,aAAa,GAAG,UAAU,CAAC,WAAW,OAAO,CAAC,KAAK,QAAQ,YAAY,CAAC,QAAQ,QAAQ,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;QAC5H,gBAAgB,CAAC,YAAY,GAAG,UAAU,CAAC,WAAW,OAAO,CAAC,KAAK,QAAQ,YAAY,CAAC,QAAQ,OAAO,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;QAC1H,gBAAgB,CAAC,WAAW,GAAG,UAAU,CAAC,WAAW,OAAO,CAAC,KAAK,YAAY,YAAY,CAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;QAC5H,gBAAgB,CAAC,cAAc,GAAG,UAAU,CAAC,WAAW,OAAO,CAAC,KAAK,eAAe,YAAY,CAAC,QAAQ,EAAE,EAAE,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC;QACrI,cAAc,CAAC,OAAO,GAAG,UAAU,CAAC,QAAQ,OAAO,CAAC,KAAK,YAAY,YAAY,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;QACvG,cAAc,CAAC,UAAU,GAAG,UAAU,CAAC,QAAQ,OAAO,CAAC,KAAK,cAAc,YAAY,CAAC,QAAQ,UAAU,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;QACtH,cAAc,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,OAAO,CAAC,KAAK,cAAc,YAAY,CAAC,QAAQ,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;QAC/G,cAAc,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,OAAO,CAAC,KAAK,cAAc,YAAY,CAAC,QAAQ,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QACjH,cAAc,CAAC,IAAI,GAAG,UAAU,CAAC,QAAQ,OAAO,CAAC,KAAK,cAAc,YAAY,CAAC,QAAQ,kBAAkB,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QACvH,cAAc,CAAC,OAAO,GAAG,UAAU,CAAC,QAAQ,OAAO,CAAC,KAAK,cAAc,YAAY,CAAC,QAAQ,qBAAqB,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAC7H,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YAChB,MAAM,OAAO,GAAG,EAAc,CAAC;YAC/B,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACnC,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;YACrE,CAAC;YACD,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBACtE,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YACvC,CAAC;YACD,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACnC,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,SAAS,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YACnF,CAAC;YACD,OAAO,CAAC,OAAO,CAAC,CAAC,MAAc,EAAE,EAAE;gBACjC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBAC5E,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC;YACtF,CAAC,CAAC,CAAC;YACH,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACnC,WAAW,CAAC,QAAQ,OAAO,CAAC,KAAK,cAAc,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACxE,GAAG,CAAC,IAAI,CAAC,QAAQ,OAAO,CAAC,KAAK,cAAc,YAAY,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,CAAC;YAChF,CAAC;YACD,GAAG,CAAC,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,CAAC;YACtC,OAAO;QACT,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YACnB,IAAI,GAAG,GAAG,UAAU,EAAE,CAAC;YACvB,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;gBACjB,GAAG,CAAC,KAAK,CAAC,yBAAyB,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBACtD,OAAO;YACT,CAAC;QACH,CAAC;QACD,SAAS;QACT,YAAY,CAAC,IAAI,GAAG,cAAc,CAAC;QACnC,YAAY,CAAC,IAAI,GAAG,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACnD,YAAY,CAAC,SAAS,GAAG,GAAG,cAAc,WAAW,CAAC;QACtD,YAAY,CAAC,SAAS,GAAG,WAAW,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC7D,YAAY,CAAC,SAAS,GAAG,GAAG,cAAc,WAAW,CAAC;QACtD,YAAY,CAAC,SAAS,GAAG,WAAW,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC7D,YAAY,CAAC,QAAQ,GAAG,GAAG,cAAc,UAAU,CAAC;QACpD,YAAY,CAAC,QAAQ,GAAG,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC3D,YAAY,CAAC,OAAO,GAAG,GAAG,cAAc,SAAS,CAAC;QAClD,YAAY,CAAC,OAAO,GAAG,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACzD,YAAY,CAAC,UAAU,GAAG,GAAG,cAAc,YAAY,CAAC;QACxD,YAAY,CAAC,UAAU,GAAG,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAC/D,MAAM,eAAe,GAAG,IAAI,iBAAiB,EAAE,CAAC;QAChD,eAAe,CAAC,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QACxE,eAAe,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QAC/D,KAAK,IAAI,SAAS,IAAI,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;YAClD,eAAe,CAAC,kBAAkB,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;YACpE,eAAe,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;QAC7D,CAAC;QACD,cAAc,GAAG,UAAU,CAAC,eAAe,CAAC,kBAAkB,EAAE,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;QACrF,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACnC,eAAe,GAAG,IAAI,CAAC;QACzB,CAAC;QACD,MAAM;QACN,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACnC,MAAM,WAAW,EAAE,CAAC;QACtB,CAAC;QACD,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACnC,MAAM,YAAY,EAAE,CAAC;QACvB,CAAC;QACD,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACnC,MAAM,UAAU,EAAE,CAAC;QACrB,CAAC;QACD,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QACjE,CAAC;QACD,SAAS,CAAC,KAAK,EAAE,CAAC;QAClB,GAAG,CAAC,OAAO,CAAC,cAAc,GAAG,WAAW,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;AACP,CAAC,CAAC"}
|
package/dist/commanders/index.js
CHANGED
|
@@ -1,12 +1,11 @@
|
|
|
1
|
+
import { setEnv } from '../utils/env.js';
|
|
1
2
|
import { crudInit } from './crud.js';
|
|
2
3
|
import { syncInit } from './sync.js';
|
|
3
|
-
import { setEnv } from '../utils/env.js';
|
|
4
4
|
export const init = (program) => {
|
|
5
|
-
program.option('-m <char>', 'env环境变量')
|
|
6
|
-
.hook('preAction', (thisCommand) => {
|
|
5
|
+
program.option('-m <char>', 'env环境变量').hook('preAction', (thisCommand) => {
|
|
7
6
|
setEnv(thisCommand.opts().m);
|
|
8
7
|
});
|
|
9
8
|
syncInit(program);
|
|
10
9
|
crudInit(program);
|
|
11
10
|
};
|
|
12
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29tbWFuZGVycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDekMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNyQyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ3JDLE1BQU0sQ0FBQyxNQUFNLElBQUksR0FBRyxDQUFDLE9BQWdCLEVBQUUsRUFBRTtJQUN2QyxPQUFPLENBQUMsTUFBTSxDQUFDLFdBQVcsRUFBRSxTQUFTLENBQUMsQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUMsV0FBVyxFQUFFLEVBQUU7UUFDdkUsTUFBTSxDQUFDLFdBQVcsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUMvQixDQUFDLENBQUMsQ0FBQztJQUNILFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNsQixRQUFRLENBQUMsT0FBTyxDQUFDLENBQUM7QUFDcEIsQ0FBQyxDQUFDIn0=
|
package/dist/commanders/sync.js
CHANGED
|
@@ -1,27 +1,20 @@
|
|
|
1
|
-
import { join, resolve } from 'node:path';
|
|
2
1
|
import { importModels, Sequelize } from '@sequelize/core';
|
|
3
|
-
import {
|
|
2
|
+
import { join, resolve } from 'node:path';
|
|
4
3
|
import { getConfig } from '../utils/db.js';
|
|
4
|
+
import { Log } from '../utils/log.js';
|
|
5
5
|
export const syncInit = (program) => {
|
|
6
6
|
program
|
|
7
7
|
.command('sync')
|
|
8
8
|
.description('同步数据库结构')
|
|
9
|
-
.argument('<file>', '需要同步的entity
|
|
9
|
+
.argument('<file>', '需要同步的entity文件地址支持,隔开的多文件或glob,文件地址相对于项目dist/entities')
|
|
10
10
|
.option('-d, --dbConfig <char>', '数据库配置文件地址默认为当前目录下dist/config/database.js', join(process.cwd(), 'dist/config/database.js'))
|
|
11
11
|
.option('-n, --name <char>', '使用的数据库配置defaultDataSourceName')
|
|
12
12
|
.action(async (file, options) => {
|
|
13
|
-
const files = file.split('
|
|
13
|
+
const files = file.split(',');
|
|
14
14
|
files.push('./abstract/*');
|
|
15
15
|
const config = Object.assign(await getConfig(options.dbConfig, options.name), {
|
|
16
|
-
logging: message => Log.log(message),
|
|
17
|
-
models: await importModels(files.map(item => resolve(process.cwd(), 'dist/entities/', item.endsWith('.js') ||
|
|
18
|
-
item.endsWith('.mjs') ||
|
|
19
|
-
item.endsWith('.cjs') ||
|
|
20
|
-
item.endsWith('.ts') ||
|
|
21
|
-
item.endsWith('.mts') ||
|
|
22
|
-
item.endsWith('.cts')
|
|
23
|
-
? item
|
|
24
|
-
: item + '.entity.js').replace(/\\/g, '/'))),
|
|
16
|
+
logging: (message) => Log.log(message),
|
|
17
|
+
models: await importModels(files.map((item) => resolve(process.cwd(), 'dist/entities/', item.endsWith('.js') || item.endsWith('.mjs') || item.endsWith('.cjs') || item.endsWith('.ts') || item.endsWith('.mts') || item.endsWith('.cts') ? item : item + '.entity.js').replace(/\\/g, '/'))),
|
|
25
18
|
});
|
|
26
19
|
const sequelize = new Sequelize(config);
|
|
27
20
|
await sequelize.sync({ alter: true });
|
|
@@ -29,4 +22,4 @@ export const syncInit = (program) => {
|
|
|
29
22
|
Log.success('同步数据表结构成功');
|
|
30
23
|
});
|
|
31
24
|
};
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luYy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb21tYW5kZXJzL3N5bmMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUUxRCxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUMxQyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDM0MsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXRDLE1BQU0sQ0FBQyxNQUFNLFFBQVEsR0FBRyxDQUFDLE9BQWdCLEVBQUUsRUFBRTtJQUMzQyxPQUFPO1NBQ0osT0FBTyxDQUFDLE1BQU0sQ0FBQztTQUNmLFdBQVcsQ0FBQyxTQUFTLENBQUM7U0FDdEIsUUFBUSxDQUFDLFFBQVEsRUFBRSxzREFBc0QsQ0FBQztTQUMxRSxNQUFNLENBQUMsdUJBQXVCLEVBQUUsMENBQTBDLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSx5QkFBeUIsQ0FBQyxDQUFDO1NBQzNILE1BQU0sQ0FBQyxtQkFBbUIsRUFBRSwrQkFBK0IsQ0FBQztTQUM1RCxNQUFNLENBQUMsS0FBSyxFQUFFLElBQVksRUFBRSxPQUFPLEVBQUUsRUFBRTtRQUN0QyxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzlCLEtBQUssQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDM0IsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLFNBQVMsQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUM1RSxPQUFPLEVBQUUsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDO1lBQ3RDLE1BQU0sRUFBRSxNQUFNLFlBQVksQ0FDeEIsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQ2pCLE9BQU8sQ0FDTCxPQUFPLENBQUMsR0FBRyxFQUFFLEVBQ2IsZ0JBQWdCLEVBQ2hCLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxZQUFZLENBQzlLLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FDdEIsQ0FDRjtTQUNGLENBQUMsQ0FBQztRQUNILE1BQU0sU0FBUyxHQUFHLElBQUksU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3hDLE1BQU0sU0FBUyxDQUFDLElBQUksQ0FBQyxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQ3RDLFNBQVMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNsQixHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQzNCLENBQUMsQ0FBQyxDQUFDO0FBQ1AsQ0FBQyxDQUFDIn0=
|
package/dist/index.js
CHANGED
|
@@ -3,10 +3,7 @@ import { readFileSync } from 'node:fs';
|
|
|
3
3
|
import { init } from './commanders/index.js';
|
|
4
4
|
const program = new Command();
|
|
5
5
|
const { version } = JSON.parse(readFileSync(import.meta.dirname + '/../package.json').toString());
|
|
6
|
-
program
|
|
7
|
-
.name('meadmin')
|
|
8
|
-
.description('CLI of MEADMIN')
|
|
9
|
-
.version(version);
|
|
6
|
+
program.name('meadmin').description('CLI of MEADMIN').version(version);
|
|
10
7
|
init(program);
|
|
11
8
|
program.parse();
|
|
12
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNwQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQ3ZDLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUU3QyxNQUFNLE9BQU8sR0FBRyxJQUFJLE9BQU8sRUFBRSxDQUFDO0FBQzlCLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sR0FBRyxrQkFBa0IsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7QUFDbEcsT0FBTyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxXQUFXLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7QUFDdkUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0FBQ2QsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDIn0=
|
package/dist/utils/app.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { createApp } from '@midwayjs/mock';
|
|
2
|
-
import { Framework } from '@midwayjs/koa';
|
|
3
1
|
import { IMidwayFramework } from '@midwayjs/core';
|
|
2
|
+
import { Framework } from '@midwayjs/koa';
|
|
3
|
+
import { createApp } from '@midwayjs/mock';
|
|
4
4
|
export declare function getApp<T extends IMidwayFramework<any, any, any, any, any> = Framework>(args?: Parameters<typeof createApp<T>>): Promise<ReturnType<T["getApplication"]>>;
|
|
5
5
|
export declare function closeApp(): void;
|
package/dist/utils/app.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { close, createApp } from '@midwayjs/mock';
|
|
2
2
|
let app;
|
|
3
3
|
export async function getApp(args) {
|
|
4
4
|
// create app
|
|
5
|
-
return app = await createApp(...args ?? []);
|
|
5
|
+
return (app = await createApp(...(args ?? [])));
|
|
6
6
|
}
|
|
7
7
|
export function closeApp() {
|
|
8
8
|
if (app) {
|
|
9
9
|
close(app);
|
|
10
10
|
}
|
|
11
11
|
}
|
|
12
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2FwcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRWxELElBQUksR0FBZ0IsQ0FBQztBQUNyQixNQUFNLENBQUMsS0FBSyxVQUFVLE1BQU0sQ0FBa0UsSUFBc0M7SUFDbEksYUFBYTtJQUNiLE9BQU8sQ0FBQyxHQUFHLEdBQUcsTUFBTSxTQUFTLENBQUksR0FBRyxDQUFDLElBQUksSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDckQsQ0FBQztBQUVELE1BQU0sVUFBVSxRQUFRO0lBQ3RCLElBQUksR0FBRyxFQUFFLENBQUM7UUFDUixLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDYixDQUFDO0FBQ0gsQ0FBQyJ9
|
package/dist/utils/db.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { pathToFileURL } from
|
|
1
|
+
import { pathToFileURL } from 'node:url';
|
|
2
2
|
export async function getConfig(dbConfig, name) {
|
|
3
3
|
const infos = await import(pathToFileURL(dbConfig).href);
|
|
4
4
|
const config = await (infos.__esModule ? infos.default : infos).default();
|
package/dist/utils/env.js
CHANGED
|
@@ -17,4 +17,4 @@ export const setEnv = (node_env) => {
|
|
|
17
17
|
});
|
|
18
18
|
}
|
|
19
19
|
};
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW52LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2Vudi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLE1BQU0sTUFBTSxRQUFRLENBQUM7QUFDNUIsTUFBTSxDQUFDLE1BQU0sTUFBTSxHQUFHLENBQUMsUUFBaUIsRUFBRSxFQUFFO0lBQzFDLElBQUksUUFBUSxFQUFFLENBQUM7UUFDYixPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsR0FBRyxRQUFRLENBQUM7SUFDbEMsQ0FBQztJQUNELHNCQUFzQjtJQUN0QixJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDekIsTUFBTSxDQUFDLE1BQU0sQ0FBQztZQUNaLElBQUksRUFBRSxDQUFDLE1BQU0sRUFBRSxRQUFRLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDOUMsUUFBUSxFQUFFLElBQUk7U0FDZixDQUFDLENBQUM7SUFDTCxDQUFDO1NBQU0sQ0FBQztRQUNOLE1BQU0sQ0FBQyxNQUFNLENBQUM7WUFDWixJQUFJLEVBQUUsQ0FBQyxNQUFNLENBQUM7WUFDZCxRQUFRLEVBQUUsSUFBSTtTQUNmLENBQUMsQ0FBQztJQUNMLENBQUM7QUFDSCxDQUFDLENBQUMifQ==
|
package/dist/utils/file.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { existsSync, mkdirSync, rmSync, writeFileSync } from 'node:fs';
|
|
2
2
|
import { dirname } from 'node:path';
|
|
3
3
|
/**
|
|
4
4
|
* 写入文件【当文件所在文件夹不存在时会递归创建】
|
|
@@ -21,4 +21,4 @@ export function delFileSync(filePath) {
|
|
|
21
21
|
rmSync(filePath, { recursive: true, force: true });
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9maWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBb0IsYUFBYSxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQ3pGLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDcEM7Ozs7O0dBS0c7QUFDSCxNQUFNLFVBQVUsc0JBQXNCLENBQUMsUUFBZ0IsRUFBRSxPQUFlLEVBQUUsT0FBMEI7SUFDbEcsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQy9CLFNBQVMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUNyQyxhQUFhLENBQUMsUUFBUSxFQUFFLE9BQU8sRUFBRSxPQUFPLENBQUMsQ0FBQztJQUMxQyxPQUFPLElBQUksQ0FBQztBQUNkLENBQUM7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLFVBQVUsV0FBVyxDQUFDLFFBQWdCO0lBQzFDLElBQUksVUFBVSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUM7UUFDekIsTUFBTSxDQUFDLFFBQVEsRUFBRSxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7SUFDckQsQ0FBQztBQUNILENBQUMifQ==
|
package/dist/utils/formatting.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { dirname, extname, relative, resolve } from 'node:path';
|
|
2
2
|
/**
|
|
3
3
|
* 将camelCase字符串更改为kebab-case,用破折号替换空格并保留下划线。
|
|
4
4
|
*
|
|
@@ -100,4 +100,4 @@ export function getKeyInfo(description) {
|
|
|
100
100
|
return { name: nameArr[0] };
|
|
101
101
|
}
|
|
102
102
|
}
|
|
103
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
103
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybWF0dGluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9mb3JtYXR0aW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDaEU7Ozs7OztHQU1HO0FBQ0gsTUFBTSxVQUFVLDJCQUEyQixDQUFDLEdBQVcsRUFBRSxVQUFVLEdBQUcsR0FBRztJQUN2RSxNQUFNLHVCQUF1QixHQUFHLEtBQUssQ0FBQztJQUN0QyxNQUFNLHdCQUF3QixHQUFHLG1CQUFtQixDQUFDO0lBQ3JELE9BQU8sR0FBRyxDQUFDLE9BQU8sQ0FBQyx3QkFBd0IsRUFBRSxLQUFLLFVBQVUsSUFBSSxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUMsT0FBTyxDQUFDLHVCQUF1QixFQUFFLFVBQVUsQ0FBQyxDQUFDO0FBQy9ILENBQUM7QUFFRDs7Ozs7O0dBTUc7QUFDSCxNQUFNLFVBQVUsTUFBTSxDQUFDLEdBQVc7SUFDaEMsT0FBTyxHQUFHLENBQUMsT0FBTyxDQUFDLGtCQUFrQixFQUFFLFVBQVUsR0FBRyxFQUFFLE1BQU07UUFDMUQsT0FBTyxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDOUIsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsTUFBTSxVQUFVLGNBQWMsQ0FBQyxHQUFXO0lBQ3hDLE9BQU8sR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLFdBQVcsRUFBRSxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDN0MsQ0FBQztBQUVEOzs7Ozs7R0FNRztBQUNILE1BQU0sVUFBVSxXQUFXLENBQUMsR0FBVztJQUNyQyxPQUFPLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxD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
|
package/dist/utils/log.js
CHANGED
|
@@ -56,4 +56,4 @@ export class Log {
|
|
|
56
56
|
return new Log('meadmin').error(message, data);
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2xvZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLFdBQVcsR0FBRztJQUNsQixLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU07SUFDeEIsTUFBTSxFQUFFLFNBQVMsRUFBRSxLQUFLO0lBQ3hCLElBQUksRUFBRSxTQUFTLEVBQUUsS0FBSztJQUN0QixNQUFNLEVBQUUsU0FBUyxFQUFFLEtBQUs7SUFDeEIsU0FBUyxFQUFFLFNBQVMsRUFBRSxNQUFNO0lBQzVCLE9BQU8sRUFBRSxTQUFTLEVBQUUsS0FBSztJQUN6QixNQUFNLEVBQUUsU0FBUyxFQUFFLEtBQUs7SUFDeEIsS0FBSyxFQUFFLFVBQVUsRUFBRSxLQUFLO0lBQ3hCLEdBQUcsRUFBRSxVQUFVLEVBQUUsS0FBSztJQUN0QixLQUFLLEVBQUUsVUFBVSxFQUFFLEtBQUs7SUFDeEIsTUFBTSxFQUFFLFVBQVUsRUFBRSxLQUFLO0lBQ3pCLElBQUksRUFBRSxVQUFVLEVBQUUsS0FBSztJQUN2QixPQUFPLEVBQUUsVUFBVSxFQUFFLEtBQUs7SUFDMUIsSUFBSSxFQUFFLFVBQVUsRUFBRSxLQUFLO0lBQ3ZCLEtBQUssRUFBRSxVQUFVLEVBQUUsS0FBSztJQUN4QixPQUFPLEVBQUUsVUFBVSxFQUFFLFNBQVM7SUFDOUIsS0FBSyxFQUFFLFVBQVUsRUFBRSxTQUFTO0lBQzVCLE9BQU8sRUFBRSxVQUFVLEVBQUUsU0FBUztJQUM5QixRQUFRLEVBQUUsVUFBVSxFQUFFLFNBQVM7SUFDL0IsTUFBTSxFQUFFLFVBQVUsRUFBRSxTQUFTO0lBQzdCLFNBQVMsRUFBRSxVQUFVLEVBQUUsU0FBUztJQUNoQyxNQUFNLEVBQUUsVUFBVSxFQUFFLFNBQVM7SUFDN0IsT0FBTyxFQUFFLFVBQVUsRUFBRSxTQUFTO0NBQy9CLENBQUM7QUFFRixNQUFNLE9BQU8sR0FBRztJQUNZO0lBQTFCLFlBQTBCLFVBQVUsRUFBRTtRQUFaLFlBQU8sR0FBUCxPQUFPLENBQUs7UUFDcEMsSUFBSSxPQUFPLEVBQUUsQ0FBQztZQUNaLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxPQUFPLElBQUksQ0FBQztRQUNqQyxDQUFDO0lBQ0gsQ0FBQztJQUNNLEdBQUcsQ0FBQyxPQUFlLEVBQUUsSUFBVTtRQUNwQyxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDLE9BQU8sSUFBSSxJQUFJLElBQUksRUFBRSxDQUFDLGNBQWMsRUFBRSxLQUFLLE9BQU8sRUFBRSxFQUFFLElBQUksSUFBSSxFQUFFLENBQUMsQ0FBQztJQUN6RixDQUFDO0lBQ00sT0FBTyxDQUFDLE9BQWUsRUFBRSxJQUFVO1FBQ3hDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxJQUFJLENBQUMsT0FBTyxHQUFHLFdBQVcsQ0FBQyxLQUFLLEtBQUssSUFBSSxJQUFJLEVBQUUsQ0FBQyxjQUFjLEVBQUUsS0FBSyxPQUFPLFNBQVMsRUFBRSxJQUFJLElBQUksRUFBRSxDQUFDLENBQUM7SUFDckgsQ0FBQztJQUNNLElBQUksQ0FBQyxPQUFlLEVBQUUsSUFBVTtRQUNyQyxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDLE9BQU8sR0FBRyxXQUFXLENBQUMsTUFBTSxLQUFLLElBQUksSUFBSSxFQUFFLENBQUMsY0FBYyxFQUFFLEtBQUssT0FBTyxTQUFTLEVBQUUsSUFBSSxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQ3RILENBQUM7SUFDTSxLQUFLLENBQUMsT0FBZSxFQUFFLElBQVU7UUFDdEMsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLElBQUksQ0FBQyxPQUFPLEdBQUcsV0FBVyxDQUFDLEdBQUcsS0FBSyxJQUFJLElBQUksRUFBRSxDQUFDLGNBQWMsRUFBRSxLQUFLLE9BQU8sU0FBUyxFQUFFLElBQUksSUFBSSxFQUFFLENBQUMsQ0FBQztJQUNwSCxDQUFDO0lBQ00sTUFBTSxDQUFDLEdBQUcsQ0FBQyxPQUFlLEVBQUUsSUFBVTtRQUMzQyxPQUFPLElBQUksR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDL0MsQ0FBQztJQUNNLE1BQU0sQ0FBQyxPQUFPLENBQUMsT0FBZSxFQUFFLElBQVU7UUFDL0MsT0FBTyxJQUFJLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQ25ELENBQUM7SUFDTSxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQWUsRUFBRSxJQUFVO1FBQzVDLE9BQU8sSUFBSSxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsQ0FBQztJQUNoRCxDQUFDO0lBQ00sTUFBTSxDQUFDLEtBQUssQ0FBQyxPQUFlLEVBQUUsSUFBVTtRQUM3QyxPQUFPLElBQUksR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDakQsQ0FBQztDQUNGIn0=
|
package/package.json
CHANGED
|
@@ -1,20 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@meadmin/cli",
|
|
3
|
-
"version": "1.0
|
|
3
|
+
"version": "1.1.0",
|
|
4
4
|
"description": "meadmin cli",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
7
7
|
"bin": {
|
|
8
8
|
"meadmin": "dist/index.js"
|
|
9
9
|
},
|
|
10
|
-
"scripts": {
|
|
11
|
-
"test": "echo \"Error: no test specified\" && exit 1",
|
|
12
|
-
"build": "rimraf dist && tsc --build"
|
|
13
|
-
},
|
|
14
10
|
"files": [
|
|
15
11
|
"dist/**/*.js",
|
|
16
12
|
"dist/**/*.d.ts",
|
|
17
|
-
"template"
|
|
13
|
+
"template",
|
|
14
|
+
".prettierrc.cjs"
|
|
18
15
|
],
|
|
19
16
|
"bugs": {
|
|
20
17
|
"url": "https://github.com/meadmin-cn/meadmin"
|
|
@@ -33,8 +30,6 @@
|
|
|
33
30
|
"devDependencies": {
|
|
34
31
|
"@types/mocha": "^10.0.10",
|
|
35
32
|
"mocha": "^10.8.2",
|
|
36
|
-
"prettier": "2.8.8",
|
|
37
|
-
"prettier-plugin-organize-imports": "^4.3.0",
|
|
38
33
|
"rimraf": "^6.0.1",
|
|
39
34
|
"typescript": "^5.9.2"
|
|
40
35
|
},
|
|
@@ -42,7 +37,9 @@
|
|
|
42
37
|
"art-template": "4.13.2",
|
|
43
38
|
"commander": "^14.0.0",
|
|
44
39
|
"dotenv": "^16.6.1",
|
|
45
|
-
"swagger-client": "^3.35.6"
|
|
40
|
+
"swagger-client": "^3.35.6",
|
|
41
|
+
"prettier": "2.8.8",
|
|
42
|
+
"prettier-plugin-organize-imports": "^4.3.0"
|
|
46
43
|
},
|
|
47
44
|
"peerDependencies": {
|
|
48
45
|
"@sequelize/cli": "7.x || >=7.0.0-alpha.46",
|
|
@@ -51,5 +48,9 @@
|
|
|
51
48
|
},
|
|
52
49
|
"engines": {
|
|
53
50
|
"node": ">=20.13.1"
|
|
51
|
+
},
|
|
52
|
+
"scripts": {
|
|
53
|
+
"test": "echo \"Error: no test specified\" && exit 1",
|
|
54
|
+
"build": "rimraf dist && tsc --build"
|
|
54
55
|
}
|
|
55
|
-
}
|
|
56
|
+
}
|