openapi-ts-request 1.2.0 → 1.3.0

package/README.md

@@ -1,3 +1,5 @@
+<!-- TODO:需要修改文档, 添加参数, 添加apifox的配置支持 -->
+
 ## 介绍
 
 [![GitHub Repo stars](https://img.shields.io/github/stars/openapi-ui/openapi-ts-request?style=social)](https://github.com/openapi-ui/openapi-ts-request) [![npm (scoped)](https://img.shields.io/npm/v/openapi-ts-request)](https://www.npmjs.com/package/openapi-ts-request) ![GitHub tag](https://img.shields.io/github/v/tag/openapi-ui/openapi-ts-request?include_prereleases)
@@ -13,6 +15,7 @@
 - react-query/vue-query
 - 类型字段翻译
 - JSON Schemas
+- Apifox Config
 
 文档：[使用手册](https://github.com/openapi-ui/openapi-ts-request/issues/100)
 
@@ -25,6 +28,7 @@
 - 支持通过 tags 过滤生成结果
 - 支持 JSON/YAML 定义文件
 - 支持将中文 tag 名称翻译为英文 tag 名称
+- 支持直接配置`apifox`的`token`和`projectId`直接生成
 
 ## 使用
 
@@ -181,9 +185,13 @@ $ openapi --help
 
   Options:
     -V, --version                       output the version number
-    -i, --input <string>                OpenAPI specification, can be a path, url (required)
-    -o, --output <string>               output directory (required)
+    -i, --input <string>                OpenAPI specification, can be a path, url
+    -o, --output <string>               output directory
+    -cfn, --configFileName <string>     config file name
+    -cfp, --configFilePath <string>     config file path
+    -u, --uniqueKey <string>            unique key
     --requestLibPath <string>           custom request lib path, for example: "@/request", "node-fetch" (default: "axios")
+    -f, --full <boolean>                full replacement (default: true)
     --enableLogging <boolean>           open the log (default: false)
     --priorityRule <string>             priority rule, include/exclude/both (default: "include")
     --includeTags <(string|RegExp)[]>   generate code from include tags
@@ -221,6 +229,7 @@ openapi --i ./spec.json --o ./apis
 | schemaPath | 是 | string | - | Swagger2/OpenAPI3 地址 |
 | serversPath | 否 | string | './src/apis' | 运行结果文件夹路径 |
 | requestLibPath | 否 | string | 'axios' | 自定义请求方法路径，例如：'@/request'、'node-fetch' |
+| full | 否 | boolean | true | 是否全量替换 |
 | enableLogging | 否 | boolean | false | 是否开启日志 |
 | priorityRule | 否 | string | 'include' | 模式规则，可选include/exclude/both |
 | includeTags | 否 | (string\|RegExp)[] | - | 根据指定的 tags 生成代码, priorityRule=include则必填 |
@@ -237,6 +246,7 @@ openapi --i ./spec.json --o ./apis
 | isGenJsonSchemas | 否 | boolean | false | 是否生成 JSON Schemas |
 | mockFolder | 否 | string | - | mock文件路径，例如：'./mocks' |
 | authorization | 否 | string | - | 文档权限凭证 |
+| apifoxConfig | 否 | [Apifox Config](#Apifox-Config) | - | apifox 配置 |
 | nullable | 否 | boolean | false | 使用 null 代替可选 |
 | isTranslateToEnglishTag | 否 | boolean | false | 将中文 tag 名称翻译成英文 tag 名称 |
 | isOnlyGenTypeScriptType | 否 | boolean | false | 仅生成 typescript 类型 |
@@ -255,6 +265,17 @@ openapi --i ./spec.json --o ./apis
 | customType | ({<br>schemaObject: SchemaObject \| ReferenceObject,<br>namespace: string,<br>originGetType:(schemaObject: SchemaObject \| ReferenceObject, namespace: string, schemas?: ComponentsObject['schemas']) => string,<br>schemas?: ComponentsObject['schemas'],<br>}) => string | 自定义类型 <br> _返回非字符串将使用默认方法获取type_ |
 | customFileNames | (<br>operationObject: OperationObject,<br>apiPath: string,<br>apiMethod: string,<br>) => string[] | 自定义生成的请求客户端文件名称，可以返回多个文件名称的数组(表示生成多个文件). <br> _返回为空，则使用默认的方法获取_ |
 
+## Apifox-Config
+
+| 属性 | 类型 | 说明 | 必填 |
+| --- | --- | --- | --- |
+| projectId | string | 项目id | true |
+| local | string | 语言(默认:zh-CN) | false |
+| apifoxVersion | string | 默认: 2024-03-28, [获取当前版本](https://api.apifox.com/v1/versions) | false |
+| includeTags | \* 或 string[] | 默认: \* | false |
+| excludeTags | string[] | 默认: [] | false |
+| apifoxToken | string | [获取](https://docs.apifox.com/doc-5723694) | true |
+
 ## JSON Schemas
 
 - 默认生成 [components.schemas](https://spec.openapis.org/oas/latest.html#components-object) 下面的 JSON Schemas，[paths](https://spec.openapis.org/oas/latest.html#paths-object) 对应的 JSON Schemas 目前需自行解析
@@ -275,6 +296,33 @@ export declare function patchSchema<T extends object>(
 
 适配 uniapp 推荐采用自定义 request 函数的方式，你也可以使用 `@uni-helper/axios-adapter` 适配器，详情见 [【使用手册 2.2】](https://github.com/openapi-ui/openapi-ts-request/issues/100)
 
+## 旧版本升级注意事项
+
+- 当前命名规范修改
+- 当前版本已完成增量修改, 不会影响以前
+- 可以弃用`openapi-ts`命令, 直接使用`openapi`
+
+### 沿用旧版本命名规范配置如下
+
+```typescript
+import type { APIDataType } from 'openapi-ts-request/dist/generator/type';
+import {
+  genDefaultFunctionName,
+  resolveFunctionName,
+  stripDot,
+} from 'openapi-ts-request/dist/generator/util';
+
+export default {
+  hook: {
+    customFunctionName(data: APIDataType, prefix: string) {
+      if (data.operationId)
+        return resolveFunctionName(stripDot(data.operationId), data.method);
+      return data.method + genDefaultFunctionName(data.path, prefix);
+    },
+  },
+};
+```
+
 ## 贡献
 
 ### 环境要求

package/dist/bin/cli.js

@@ -1,27 +1,46 @@
 #!/usr/bin/env node
 "use strict";
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const cosmiconfig_1 = require("cosmiconfig");
-const cosmiconfig_typescript_loader_1 = require("cosmiconfig-typescript-loader");
+const commander_1 = require("commander");
 const index_1 = require("../index");
-const explorerSync = (0, cosmiconfig_1.cosmiconfigSync)('openapi-ts-request', {
-    loaders: {
-        '.ts': (0, cosmiconfig_typescript_loader_1.TypeScriptLoaderSync)(),
-    },
-});
-const config = (_a = explorerSync.search()) === null || _a === void 0 ? void 0 : _a.config;
+const readConfig_1 = require("../readConfig");
+commander_1.program
+    .option('-cfn, --configFileName <string>', 'config file name')
+    .option('-cfp, --configFilePath <string>', 'config file path')
+    .option('-u, --uniqueKey <string>', 'unique key');
+commander_1.program.parse();
+const options = commander_1.program.opts();
 function run() {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const config = yield (0, readConfig_1.readConfig)({
+            fallbackName: 'openapi-ts-request',
+            filePath: options.filePath,
+            fileName: options.fileName,
+        });
         try {
+            const tasks = [];
             if (config) {
-                const configs = Array.isArray(config)
+                let configs = Array.isArray(config)
                     ? config
                     : [config];
+                if (options.uniqueKey) {
+                    configs = configs.filter((config) => config.uniqueKey === options.uniqueKey);
+                }
                 for (const config of configs) {
-                    yield (0, index_1.generateService)(config);
+                    tasks.push((0, index_1.generateService)(config));
+                }
+                const results = yield Promise.allSettled(tasks);
+                const errors = results.filter((result) => result.status === 'rejected');
+                let errorMsg = '';
+                for (let i = 0; i < errors.length; i++) {
+                    const error = errors[i];
+                    const cnf = configs[i];
+                    errorMsg += `${cnf.uniqueKey}${cnf.uniqueKey && ':'}${error.reason}\n`;
+                }
+                if (errorMsg) {
+                    throw new Error(errorMsg);
                 }
             }
             else {

package/dist/bin/openapi.js

@@ -7,13 +7,19 @@ const lodash_1 = require("lodash");
 const path_1 = require("path");
 const pkg = tslib_1.__importStar(require("../../package.json"));
 const index_1 = require("../index");
+const log_1 = require("../log");
+const readConfig_1 = require("../readConfig");
 const params = commander_1.program
     .name('openapi')
     .usage('[options]')
     .version(pkg.version)
-    .requiredOption('-i, --input <string>', 'OpenAPI specification, can be a path, url (required)')
-    .requiredOption('-o, --output <string>', 'output directory (required)')
+    .option('-i, --input <string>', 'OpenAPI specification, can be a path, url')
+    .option('-o, --output <string>', 'output directory')
+    .option('-cfn, --configFileName <string>', 'config file name')
+    .option('-cfp, --configFilePath <string>', 'config file path')
+    .option('-u, --uniqueKey <string>', 'unique key')
     .option('--requestLibPath <string>', 'custom request lib path, for example: "@/request", "node-fetch" (default: "axios")')
+    .option('-f, --full <boolean>', 'full replacement', true)
     .option('--enableLogging <boolean>', 'open the log', false)
     .option('--priorityRule <string>', 'priority rule, include/exclude/both (default: "include")')
     .option('--includeTags <(string|RegExp)[]>', 'generate code from include tags')
@@ -44,41 +50,84 @@ function getPath(path) {
     }
     return (0, path_1.join)(process.cwd(), path);
 }
+const baseGenerate = (_params_) => {
+    const input = getPath(_params_.input);
+    const output = getPath(_params_.output);
+    const options = {
+        schemaPath: input,
+        serversPath: output,
+        requestLibPath: _params_.requestLibPath,
+        full: JSON.parse(_params_.full) === true,
+        enableLogging: JSON.parse(_params_.enableLogging) === true,
+        priorityRule: _params_.priorityRule,
+        includeTags: _params_.includeTags,
+        includePaths: _params_.includePaths,
+        excludeTags: _params_.excludeTags,
+        excludePaths: _params_.excludePaths,
+        requestOptionsType: _params_.requestOptionsType,
+        apiPrefix: _params_.apiPrefix,
+        isGenReactQuery: JSON.parse(_params_.isGenReactQuery) === true,
+        reactQueryMode: _params_.reactQueryMode,
+        isGenJavaScript: JSON.parse(_params_.isGenJavaScript) === true,
+        isDisplayTypeLabel: JSON.parse(_params_.isDisplayTypeLabel) === true,
+        isGenJsonSchemas: JSON.parse(_params_.isGenJsonSchemas) === true,
+        mockFolder: _params_.mockFolder,
+        authorization: _params_.authorization,
+        nullable: JSON.parse(_params_.nullable) === true,
+        isTranslateToEnglishTag: JSON.parse(_params_.isTranslateToEnglishTag) === true,
+        isOnlyGenTypeScriptType: JSON.parse(_params_.isOnlyGenTypeScriptType) === true,
+        isCamelCase: JSON.parse(_params_.isCamelCase) === true,
+        isSupportParseEnumDesc: JSON.parse(_params_.isSupportParseEnumDesc) === true,
+    };
+    return options;
+};
 function run() {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        try {
-            const input = getPath(params.input);
-            const output = getPath(params.output);
-            const options = {
-                schemaPath: input,
-                serversPath: output,
-                requestLibPath: params.requestLibPath,
-                enableLogging: JSON.parse(params.enableLogging) === true,
-                priorityRule: params.priorityRule,
-                includeTags: params.includeTags,
-                includePaths: params.includePaths,
-                excludeTags: params.excludeTags,
-                excludePaths: params.excludePaths,
-                requestOptionsType: params.requestOptionsType,
-                apiPrefix: params.apiPrefix,
-                isGenReactQuery: JSON.parse(params.isGenReactQuery) === true,
-                reactQueryMode: params.reactQueryMode,
-                isGenJavaScript: JSON.parse(params.isGenJavaScript) === true,
-                isDisplayTypeLabel: JSON.parse(params.isDisplayTypeLabel) === true,
-                isGenJsonSchemas: JSON.parse(params.isGenJsonSchemas) === true,
-                mockFolder: params.mockFolder,
-                authorization: params.authorization,
-                nullable: JSON.parse(params.nullable) === true,
-                isTranslateToEnglishTag: JSON.parse(params.isTranslateToEnglishTag) === true,
-                isOnlyGenTypeScriptType: JSON.parse(params.isOnlyGenTypeScriptType) === true,
-                isCamelCase: JSON.parse(params.isCamelCase) === true,
-                isSupportParseEnumDesc: JSON.parse(params.isSupportParseEnumDesc) === true,
-            };
+        if (params.input && params.output) {
+            const options = baseGenerate(params);
             yield (0, index_1.generateService)((0, lodash_1.pickBy)(options, (value) => value !== null && value !== undefined && value !== ''));
             process.exit(0);
         }
+        const cnf = yield (0, readConfig_1.readConfig)({
+            fallbackName: 'openapi-ts-request',
+            filePath: params.configFilePath,
+            fileName: params.configFileName,
+        });
+        try {
+            if (cnf) {
+                const tasks = [];
+                let configs = Array.isArray(cnf) ? cnf : [cnf];
+                if (params.uniqueKey) {
+                    configs = configs.filter((config) => config.uniqueKey === params.uniqueKey);
+                }
+                for (const config of configs) {
+                    tasks.push((0, index_1.generateService)(config));
+                }
+                const results = yield Promise.allSettled(tasks);
+                const errors = results.filter((result) => result.status === 'rejected');
+                let errorMsg = '';
+                for (let i = 0; i < errors.length; i++) {
+                    const error = errors[i];
+                    const cnf = configs[i];
+                    errorMsg += `${cnf.uniqueKey}${cnf.uniqueKey && ':'}${error.reason}\n`;
+                }
+                if (errorMsg) {
+                    (0, log_1.logError)(errorMsg);
+                    process.exit(1);
+                }
+            }
+            else {
+                if (!params.input || !params.output) {
+                    (0, log_1.logError)('Please provide either input/output options or a configuration file path and name.');
+                    process.exit(1);
+                }
+                const options = baseGenerate(params);
+                yield (0, index_1.generateService)((0, lodash_1.pickBy)(options, (value) => value !== null && value !== undefined && value !== ''));
+                process.exit(0);
+            }
+        }
         catch (error) {
-            console.error('this is error: ', error);
+            (0, log_1.logError)(error);
             process.exit(1);
         }
     });

package/dist/generator/merge.d.ts

@@ -0,0 +1,6 @@
+import { type MergeOption, type MergerOptions } from './type';
+export declare class Merger {
+    #private;
+    constructor({ srcPath, source, mergeRule, projectOptions, }: MergerOptions);
+    merge({ srcPath, source }: MergeOption): string;
+}

package/dist/generator/merge.js

@@ -0,0 +1,267 @@
+"use strict";
+var _Merger_instances, _Merger_project, _Merger_sourceFile, _Merger_mergeRule, _Merger_mergedFile, _Merger_sourceCode, _Merger_leadingCommentRanges, _Merger_mergeExport, _Merger_mergeClass, _Merger_mergeType, _Merger_mergeEnums, _Merger_mergeInterfaces, _Merger_mergeFunctions, _Merger_mergeVariables, _Merger_mergeImports;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Merger = void 0;
+const tslib_1 = require("tslib");
+const ts_morph_1 = require("ts-morph");
+const ts = tslib_1.__importStar(require("typescript"));
+const type_1 = require("./type");
+const sortMapByKey = (map) => {
+    return Array.from(map.entries())
+        .sort((a, b) => a[0].localeCompare(b[0]))
+        .map(([k, v]) => ({ k, v }));
+};
+class Merger {
+    constructor({ srcPath, source, mergeRule = type_1.MergeRule.RIGHT, projectOptions = {}, }) {
+        _Merger_instances.add(this);
+        _Merger_project.set(this, void 0);
+        _Merger_sourceFile.set(this, void 0);
+        _Merger_mergeRule.set(this, void 0);
+        _Merger_mergedFile.set(this, void 0);
+        _Merger_sourceCode.set(this, void 0);
+        _Merger_leadingCommentRanges.set(this, []);
+        tslib_1.__classPrivateFieldSet(this, _Merger_project, new ts_morph_1.Project(projectOptions), "f");
+        if (srcPath) {
+            tslib_1.__classPrivateFieldSet(this, _Merger_sourceFile, tslib_1.__classPrivateFieldGet(this, _Merger_project, "f").addSourceFileAtPath(srcPath), "f");
+            tslib_1.__classPrivateFieldSet(this, _Merger_sourceCode, tslib_1.__classPrivateFieldGet(this, _Merger_sourceFile, "f").getFullText().trim(), "f");
+        }
+        else if (source) {
+            tslib_1.__classPrivateFieldSet(this, _Merger_sourceCode, source.trim(), "f");
+            tslib_1.__classPrivateFieldSet(this, _Merger_sourceFile, tslib_1.__classPrivateFieldGet(this, _Merger_project, "f").createSourceFile('_source_.ts', source), "f");
+        }
+        try {
+            if (tslib_1.__classPrivateFieldGet(this, _Merger_sourceCode, "f")) {
+                tslib_1.__classPrivateFieldSet(this, _Merger_leadingCommentRanges, ts
+                    .getLeadingCommentRanges(tslib_1.__classPrivateFieldGet(this, _Merger_sourceCode, "f"), 0)
+                    .map((range) => {
+                    return tslib_1.__classPrivateFieldGet(this, _Merger_sourceCode, "f").slice(range.pos, range.end);
+                }), "f");
+            }
+        }
+        catch (error) {
+            // console.log(error, '>>>');
+        }
+        tslib_1.__classPrivateFieldSet(this, _Merger_mergeRule, mergeRule, "f");
+        tslib_1.__classPrivateFieldSet(this, _Merger_mergedFile, tslib_1.__classPrivateFieldGet(this, _Merger_project, "f").createSourceFile('_merged_.ts'), "f");
+    }
+    merge({ srcPath, source }) {
+        let destFile;
+        if (srcPath) {
+            destFile = tslib_1.__classPrivateFieldGet(this, _Merger_project, "f").addSourceFileAtPath(srcPath);
+        }
+        else if (source) {
+            if (!source.trim()) {
+                return tslib_1.__classPrivateFieldGet(this, _Merger_sourceCode, "f");
+            }
+            destFile = tslib_1.__classPrivateFieldGet(this, _Merger_project, "f").createSourceFile('_dest_.ts', source);
+        }
+        if (!tslib_1.__classPrivateFieldGet(this, _Merger_sourceCode, "f")) {
+            return destFile.getFullText();
+        }
+        const destCode = destFile.getFullText().trim();
+        if (tslib_1.__classPrivateFieldGet(this, _Merger_sourceCode, "f") === destCode) {
+            return tslib_1.__classPrivateFieldGet(this, _Merger_sourceCode, "f");
+        }
+        tslib_1.__classPrivateFieldGet(this, _Merger_instances, "m", _Merger_mergeImports).call(this, destFile);
+        tslib_1.__classPrivateFieldGet(this, _Merger_instances, "m", _Merger_mergeVariables).call(this, destFile);
+        tslib_1.__classPrivateFieldGet(this, _Merger_instances, "m", _Merger_mergeClass).call(this, destFile);
+        tslib_1.__classPrivateFieldGet(this, _Merger_instances, "m", _Merger_mergeType).call(this, destFile);
+        tslib_1.__classPrivateFieldGet(this, _Merger_instances, "m", _Merger_mergeEnums).call(this, destFile);
+        tslib_1.__classPrivateFieldGet(this, _Merger_instances, "m", _Merger_mergeInterfaces).call(this, destFile);
+        tslib_1.__classPrivateFieldGet(this, _Merger_instances, "m", _Merger_mergeFunctions).call(this, destFile);
+        tslib_1.__classPrivateFieldGet(this, _Merger_instances, "m", _Merger_mergeExport).call(this, destFile);
+        // console.log(source, '>>>>');
+        // if (srcPath?.includes('index.ts')) {
+        //   console.log(source, '>>>>');
+        // }
+        const leadingComment = tslib_1.__classPrivateFieldGet(this, _Merger_leadingCommentRanges, "f").join('\n');
+        if (leadingComment) {
+            return `${leadingComment}\n${tslib_1.__classPrivateFieldGet(this, _Merger_mergedFile, "f").getFullText()}`;
+        }
+        return tslib_1.__classPrivateFieldGet(this, _Merger_mergedFile, "f").getFullText();
+    }
+}
+exports.Merger = Merger;
+_Merger_project = new WeakMap(), _Merger_sourceFile = new WeakMap(), _Merger_mergeRule = new WeakMap(), _Merger_mergedFile = new WeakMap(), _Merger_sourceCode = new WeakMap(), _Merger_leadingCommentRanges = new WeakMap(), _Merger_instances = new WeakSet(), _Merger_mergeExport = function _Merger_mergeExport(destFile) {
+    var _a, _b;
+    const exportMap = new Map();
+    // const exportArray: ExportDeclarationStructure[] = [];
+    (_a = tslib_1.__classPrivateFieldGet(this, _Merger_sourceFile, "f").getExportDeclarations()) === null || _a === void 0 ? void 0 : _a.forEach((e) => {
+        const eStructure = e.getStructure();
+        const path = e.getModuleSpecifierValue();
+        if (path) {
+            exportMap.set(path, eStructure);
+        }
+    });
+    (_b = destFile.getExportDeclarations()) === null || _b === void 0 ? void 0 : _b.forEach((e) => {
+        const eStructure = e.getStructure();
+        const path = e.getModuleSpecifierValue();
+        if (path) {
+            exportMap.set(path, eStructure);
+        }
+    });
+    sortMapByKey(exportMap).forEach(({ v }) => {
+        tslib_1.__classPrivateFieldGet(this, _Merger_mergedFile, "f").addExportDeclaration(v);
+    });
+}, _Merger_mergeClass = function _Merger_mergeClass(destFile) {
+    const classMap = new Map();
+    tslib_1.__classPrivateFieldGet(this, _Merger_sourceFile, "f").getClasses().forEach((c) => {
+        const cName = c.getName();
+        const cStructure = c.getStructure();
+        classMap.set(cName, cStructure);
+    });
+    destFile.getClasses().forEach((c) => {
+        const cName = c.getName();
+        if (classMap.has(cName)) {
+            if (tslib_1.__classPrivateFieldGet(this, _Merger_mergeRule, "f") === type_1.MergeRule.RIGHT) {
+                const cStructure = c.getStructure();
+                classMap.set(cName, cStructure);
+            }
+        }
+        else {
+            const cStructure = c.getStructure();
+            classMap.set(cName, cStructure);
+        }
+    });
+    sortMapByKey(classMap).forEach(({ v }) => {
+        tslib_1.__classPrivateFieldGet(this, _Merger_mergedFile, "f").addClass(v);
+    });
+}, _Merger_mergeType = function _Merger_mergeType(destFile) {
+    const typeMap = new Map();
+    tslib_1.__classPrivateFieldGet(this, _Merger_sourceFile, "f").getTypeAliases().forEach((t) => {
+        const tName = t.getName();
+        const tStructure = t.getStructure();
+        typeMap.set(tName, tStructure);
+    });
+    destFile.getTypeAliases().forEach((t) => {
+        const tName = t.getName();
+        if (typeMap.has(tName)) {
+            if (tslib_1.__classPrivateFieldGet(this, _Merger_mergeRule, "f") === type_1.MergeRule.RIGHT) {
+                const tStructure = t.getStructure();
+                typeMap.set(tName, tStructure);
+            }
+        }
+        else {
+            const tStructure = t.getStructure();
+            typeMap.set(tName, tStructure);
+        }
+    });
+    sortMapByKey(typeMap).forEach(({ v }) => {
+        tslib_1.__classPrivateFieldGet(this, _Merger_mergedFile, "f").addTypeAlias(v);
+    });
+}, _Merger_mergeEnums = function _Merger_mergeEnums(destFile) {
+    const enumMap = new Map();
+    tslib_1.__classPrivateFieldGet(this, _Merger_sourceFile, "f").getEnums().forEach((e) => {
+        const eName = e.getName();
+        const eStructure = e.getStructure();
+        enumMap.set(eName, eStructure);
+    });
+    destFile.getEnums().forEach((e) => {
+        const eName = e.getName();
+        if (enumMap.has(eName)) {
+            if (tslib_1.__classPrivateFieldGet(this, _Merger_mergeRule, "f") === type_1.MergeRule.RIGHT) {
+                const eStructure = e.getStructure();
+                enumMap.set(eName, eStructure);
+            }
+        }
+        else {
+            const eStructure = e.getStructure();
+            enumMap.set(eName, eStructure);
+        }
+    });
+    sortMapByKey(enumMap).forEach(({ v }) => {
+        tslib_1.__classPrivateFieldGet(this, _Merger_mergedFile, "f").addEnum(v);
+    });
+}, _Merger_mergeInterfaces = function _Merger_mergeInterfaces(destFile) {
+    const interfaceMap = new Map();
+    tslib_1.__classPrivateFieldGet(this, _Merger_sourceFile, "f").getInterfaces().forEach((i) => {
+        const iName = i.getName();
+        const iStructure = i.getStructure();
+        interfaceMap.set(iName, iStructure);
+    });
+    destFile.getInterfaces().forEach((i) => {
+        const iName = i.getName();
+        if (interfaceMap.has(iName)) {
+            if (tslib_1.__classPrivateFieldGet(this, _Merger_mergeRule, "f") === type_1.MergeRule.RIGHT) {
+                const iStructure = i.getStructure();
+                interfaceMap.set(iName, iStructure);
+            }
+        }
+        else {
+            const iStructure = i.getStructure();
+            interfaceMap.set(iName, iStructure);
+        }
+    });
+    sortMapByKey(interfaceMap).forEach(({ v }) => {
+        tslib_1.__classPrivateFieldGet(this, _Merger_mergedFile, "f").addInterface(v);
+    });
+}, _Merger_mergeFunctions = function _Merger_mergeFunctions(destFile) {
+    const functionMap = new Map();
+    tslib_1.__classPrivateFieldGet(this, _Merger_sourceFile, "f").getFunctions().forEach((f) => {
+        const fName = f.getName();
+        const fStructure = f.getStructure();
+        functionMap.set(fName, fStructure);
+    });
+    destFile.getFunctions().forEach((f) => {
+        const fName = f.getName();
+        if (functionMap.has(fName)) {
+            if (tslib_1.__classPrivateFieldGet(this, _Merger_mergeRule, "f") === type_1.MergeRule.RIGHT) {
+                const fStructure = f.getStructure();
+                functionMap.set(fName, fStructure);
+            }
+        }
+        else {
+            const fStructure = f.getStructure();
+            functionMap.set(fName, fStructure);
+        }
+    });
+    sortMapByKey(functionMap).forEach(({ v }) => {
+        tslib_1.__classPrivateFieldGet(this, _Merger_mergedFile, "f").addFunction(v);
+    });
+}, _Merger_mergeVariables = function _Merger_mergeVariables(destFile) {
+    const variableSet = new Map();
+    tslib_1.__classPrivateFieldGet(this, _Merger_sourceFile, "f").getVariableStatements().forEach((v) => {
+        var _a;
+        const vStructure = v.getStructure();
+        const vName = (_a = vStructure.declarations[0]) === null || _a === void 0 ? void 0 : _a.name;
+        variableSet.set(vName, vStructure);
+    });
+    destFile.getVariableStatements().forEach((v) => {
+        var _a;
+        const vStructure = v.getStructure();
+        const vName = (_a = vStructure.declarations[0]) === null || _a === void 0 ? void 0 : _a.name;
+        if (variableSet.has(vName)) {
+            if (tslib_1.__classPrivateFieldGet(this, _Merger_mergeRule, "f") === type_1.MergeRule.RIGHT) {
+                variableSet.set(vName, vStructure);
+            }
+        }
+        else {
+            const vStructure = v.getStructure();
+            variableSet.set(vName, vStructure);
+        }
+    });
+    sortMapByKey(variableSet).forEach(({ v }) => {
+        tslib_1.__classPrivateFieldGet(this, _Merger_mergedFile, "f").addVariableStatement(v);
+    });
+}, _Merger_mergeImports = function _Merger_mergeImports(destFile) {
+    const importMap = new Map();
+    tslib_1.__classPrivateFieldGet(this, _Merger_sourceFile, "f").getImportDeclarations().forEach((i) => {
+        const iStructure = i.getStructure();
+        importMap.set(iStructure.moduleSpecifier, iStructure);
+    });
+    destFile.getImportDeclarations().forEach((i) => {
+        const iStructure = i.getStructure();
+        const iModuleSpecifier = iStructure.moduleSpecifier;
+        if (importMap.has(iModuleSpecifier)) {
+            if (tslib_1.__classPrivateFieldGet(this, _Merger_mergeRule, "f") === type_1.MergeRule.RIGHT) {
+                importMap.set(iModuleSpecifier, iStructure);
+            }
+        }
+        else {
+            importMap.set(iModuleSpecifier, iStructure);
+        }
+    });
+    sortMapByKey(importMap).forEach(({ v }) => {
+        tslib_1.__classPrivateFieldGet(this, _Merger_mergedFile, "f").addImportDeclaration(v);
+    });
+};

package/dist/generator/mockGenarator.js

@@ -137,7 +137,7 @@ const genByTemp = ({ method, path, parameters, status, data, }) => {
   }`;
 };
 const genMockFiles = (mockFunction) => {
-    return (0, file_1.prettierFile)(` 
+    return (0, file_1.prettierFile)(`
 /* eslint-disable */
 // @ts-ignore
 import { Request, Response } from 'express';