openapi-ts-request 1.1.2 → 1.3.0

package/dist/generator/serviceGenarator.js

@@ -10,10 +10,12 @@ const path_1 = require("path");
 const rimraf_1 = require("rimraf");
 const config_1 = require("../config");
 const log_1 = tslib_1.__importDefault(require("../log"));
+const util_1 = require("../util");
 const config_2 = require("./config");
 const file_1 = require("./file");
+const merge_1 = require("./merge");
 const patchSchema_1 = require("./patchSchema");
-const util_1 = require("./util");
+const util_2 = require("./util");
 class ServiceGenerator {
     constructor(config, openAPIData) {
         var _a, _b, _c, _d, _e;
@@ -81,7 +83,7 @@ class ServiceGenerator {
                 if (!operationObject) {
                     return;
                 }
-                const hookCustomFileNames = ((_a = this.config.hook) === null || _a === void 0 ? void 0 : _a.customFileNames) || util_1.getDefaultFileTag;
+                const hookCustomFileNames = ((_a = this.config.hook) === null || _a === void 0 ? void 0 : _a.customFileNames) || util_2.getDefaultFileTag;
                 const tags = hookCustomFileNames(operationObject, pathKey, method);
                 // 这里判断tags
                 tags.forEach((tag) => {
@@ -119,8 +121,8 @@ class ServiceGenerator {
                         }
                     }
                     const tagKey = this.config.isCamelCase
-                        ? (0, lodash_1.camelCase)((0, util_1.resolveTypeName)(tag))
-                        : (0, util_1.resolveTypeName)(tag);
+                        ? (0, util_1.camelCase)((0, util_2.resolveTypeName)(tag))
+                        : (0, util_2.resolveTypeName)(tag);
                     if (!this.apiData[tagKey]) {
                         this.apiData[tagKey] = [];
                     }
@@ -130,15 +132,17 @@ class ServiceGenerator {
         }
     }
     genFile() {
-        try {
-            (0, glob_1.globSync)(`${this.config.serversPath}/**/*`)
-                .filter((item) => !item.includes('_deperated'))
-                .forEach((item) => {
-                (0, rimraf_1.sync)(item);
-            });
-        }
-        catch (error) {
-            (0, log_1.default)(`🚥 api 生成失败: ${error}`);
+        if (this.config.full) {
+            try {
+                (0, glob_1.globSync)(`${this.config.serversPath}/**/*`)
+                    .filter((item) => !item.includes('_deperated'))
+                    .forEach((item) => {
+                    (0, rimraf_1.rimrafSync)(item);
+                });
+            }
+            catch (error) {
+                (0, log_1.default)(`🚥 api 生成失败: ${error}`);
+            }
         }
         const isOnlyGenTypeScriptType = this.config.isOnlyGenTypeScriptType;
         const isGenJavaScript = this.config.isGenJavaScript;
@@ -146,7 +150,7 @@ class ServiceGenerator {
         const reactQueryFileName = (0, config_2.displayReactQueryFileName)(reactQueryMode);
         // 处理重复的 typeName
         const interfaceTPConfigs = this.getInterfaceTPConfigs();
-        (0, util_1.handleDuplicateTypeNames)(interfaceTPConfigs);
+        (0, util_2.handleDuplicateTypeNames)(interfaceTPConfigs);
         // 生成 ts 类型声明
         if (!isGenJavaScript) {
             this.genFileFromTemplate(`${config_2.interfaceFileName}.ts`, config_2.TypescriptFileType.interface, {
@@ -180,13 +184,13 @@ class ServiceGenerator {
             // 生成 service controller 文件
             this.getServiceTPConfigs().forEach((tp) => {
                 const hasError = this.genFileFromTemplate(isGenJavaScript
-                    ? (0, util_1.getFinalFileName)(`${tp.className}.js`)
-                    : (0, util_1.getFinalFileName)(`${tp.className}.ts`), config_2.TypescriptFileType.serviceController, Object.assign({ namespace: this.config.namespace, requestOptionsType: this.config.requestOptionsType, requestImportStatement: this.config.requestImportStatement, interfaceFileName: config_2.interfaceFileName }, tp));
+                    ? (0, util_2.getFinalFileName)(`${tp.className}.js`)
+                    : (0, util_2.getFinalFileName)(`${tp.className}.ts`), config_2.TypescriptFileType.serviceController, Object.assign({ namespace: this.config.namespace, requestOptionsType: this.config.requestOptionsType, requestImportStatement: this.config.requestImportStatement, interfaceFileName: config_2.interfaceFileName }, tp));
                 prettierError.push(hasError);
                 if (this.config.isGenReactQuery) {
                     this.genFileFromTemplate(isGenJavaScript
-                        ? (0, util_1.getFinalFileName)(`${tp.className}.${reactQueryFileName}.js`)
-                        : (0, util_1.getFinalFileName)(`${tp.className}.${reactQueryFileName}.ts`), config_2.TypescriptFileType.reactQuery, Object.assign({ namespace: this.config.namespace, requestOptionsType: this.config.requestOptionsType, requestImportStatement: this.config.requestImportStatement, interfaceFileName: config_2.interfaceFileName, reactQueryModePackageName: (0, config_1.displayReactQueryMode)(reactQueryMode) }, tp));
+                        ? (0, util_2.getFinalFileName)(`${tp.className}.${reactQueryFileName}.js`)
+                        : (0, util_2.getFinalFileName)(`${tp.className}.${reactQueryFileName}.ts`), config_2.TypescriptFileType.reactQuery, Object.assign({ namespace: this.config.namespace, requestOptionsType: this.config.requestOptionsType, requestImportStatement: this.config.requestImportStatement, interfaceFileName: config_2.interfaceFileName, reactQueryModePackageName: (0, config_1.displayReactQueryMode)(reactQueryMode) }, tp));
                 }
             });
             if (prettierError.includes(true)) {
@@ -197,7 +201,7 @@ class ServiceGenerator {
             this.config.isGenJsonSchemas &&
             !(0, lodash_1.isEmpty)(this.schemaList)) {
             // 处理重复的 schemaName
-            (0, util_1.handleDuplicateTypeNames)(this.schemaList);
+            (0, util_2.handleDuplicateTypeNames)(this.schemaList);
             // 生成 schema 文件
             this.genFileFromTemplate(isGenJavaScript ? `${config_2.schemaFileName}.js` : `${config_2.schemaFileName}.ts`, config_2.TypescriptFileType.schema, {
                 list: this.schemaList,
@@ -225,7 +229,7 @@ class ServiceGenerator {
             displayTypeLabelFileName: config_2.displayTypeLabelFileName,
         });
         // 打印日志
-        (0, log_1.default)('✅ 成功生成 api 文件');
+        (0, log_1.default)('✅ 成功生成 api 文件目录-> ', this.config.serversPath);
     }
     getInterfaceTPConfigs() {
         var _a, _b;
@@ -238,7 +242,7 @@ class ServiceGenerator {
             (0, lodash_1.forEach)(config_2.methods, (method) => {
                 var _a, _b, _c, _d;
                 const operationObject = pathItem[method];
-                const hookCustomFileNames = ((_a = this.config.hook) === null || _a === void 0 ? void 0 : _a.customFileNames) || util_1.getDefaultFileTag;
+                const hookCustomFileNames = ((_a = this.config.hook) === null || _a === void 0 ? void 0 : _a.customFileNames) || util_2.getDefaultFileTag;
                 if (!operationObject) {
                     return;
                 }
@@ -251,7 +255,7 @@ class ServiceGenerator {
                     return;
                 }
                 // 筛选出 pathItem 包含的 $ref 对应的schema
-                (0, util_1.markAllowedSchema)(JSON.stringify(pathItem), this.openAPIData);
+                (0, util_2.markAllowedSchema)(JSON.stringify(pathItem), this.openAPIData);
                 operationObject.parameters = (_b = operationObject.parameters) === null || _b === void 0 ? void 0 : _b.filter((item) => (item === null || item === void 0 ? void 0 : item.in) !== `${config_2.parametersInsEnum.header}`);
                 const props = [];
                 (_c = operationObject.parameters) === null || _c === void 0 ? void 0 : _c.forEach((parameter) => {
@@ -312,14 +316,14 @@ class ServiceGenerator {
                             type: enumObj.type,
                             props: [],
                             isEnum: enumObj.isEnum,
-                            displayLabelFuncName: (0, lodash_1.camelCase)(`display-${item.name}-Enum`),
+                            displayLabelFuncName: (0, util_1.camelCase)(`display-${item.name}-Enum`),
                             enumLabelType: enumObj.enumLabelType,
                         });
                     }
                 });
             }
             const isEnum = result.isEnum;
-            const typeName = (0, util_1.resolveTypeName)(schemaKey);
+            const typeName = (0, util_2.resolveTypeName)(schemaKey);
             if (typeName) {
                 lastTypes.push({
                     typeName,
@@ -327,14 +331,14 @@ class ServiceGenerator {
                     props: (result.props || []),
                     isEnum,
                     displayLabelFuncName: isEnum
-                        ? (0, lodash_1.camelCase)(`display-${typeName}-Enum`)
+                        ? (0, util_1.camelCase)(`display-${typeName}-Enum`)
                         : '',
                     enumLabelType: isEnum ? result.enumLabelType : '',
                 });
             }
             if (this.config.isGenJsonSchemas) {
                 this.schemaList.push({
-                    typeName: `$${(0, util_1.resolveTypeName)(schemaKey)}`,
+                    typeName: `$${(0, util_2.resolveTypeName)(schemaKey)}`,
                     type: JSON.stringify((0, patchSchema_1.patchSchema)(schema, (_a = this.openAPIData.components) === null || _a === void 0 ? void 0 : _a.schemas)),
                 });
             }
@@ -416,7 +420,7 @@ class ServiceGenerator {
                         return `$\{${prefix}}${formattedPath}`;
                     };
                     return Object.assign(Object.assign({}, newApi), { functionName: this.config.isCamelCase
-                            ? (0, lodash_1.camelCase)(functionName)
+                            ? (0, util_1.camelCase)(functionName)
                             : functionName, typeName: this.getFunctionParamsTypeName(newApi), path: getPrefixPath(), pathInComment: formattedPath.replace(/\*/g, '*'), apifoxRunLink: newApi === null || newApi === void 0 ? void 0 : newApi['x-run-in-apifox'], hasPathVariables: formattedPath.includes('{'), hasApiPrefix: !!this.config.apiPrefix, method: newApi.method, 
                         // 如果 functionName 和 summary 相同，则不显示 summary
                         desc: functionName === newApi.summary
@@ -440,7 +444,7 @@ class ServiceGenerator {
             })
                 // 排序下，防止git乱
                 .sort((a, b) => a.path.localeCompare(b.path));
-            const fileName = (0, util_1.replaceDot)(tag) || `api${index}`;
+            const fileName = (0, util_2.replaceDot)(tag) || `api${index}`;
             let className = fileName;
             if ((_a = this.config.hook) === null || _a === void 0 ? void 0 : _a.customClassName) {
                 className = this.config.hook.customClassName(tag);
@@ -467,8 +471,27 @@ class ServiceGenerator {
             const env = nunjucks_1.default.configure({
                 autoescape: false,
             });
-            env.addFilter('capitalizeFirst', util_1.capitalizeFirstLetter);
-            return (0, file_1.writeFile)(this.config.serversPath, fileName, nunjucks_1.default.renderString(template, Object.assign({ disableTypeCheck: false }, params)));
+            env.addFilter('capitalizeFirst', util_2.capitalizeFirstLetter);
+            const destPath = (0, path_1.join)(this.config.serversPath, fileName);
+            const destCode = nunjucks_1.default.renderString(template, Object.assign({ disableTypeCheck: false }, params));
+            let mergerProps = {};
+            if ((0, fs_1.existsSync)(destPath)) {
+                mergerProps = {
+                    srcPath: destPath,
+                };
+            }
+            else {
+                mergerProps = {
+                    source: '',
+                };
+            }
+            if (this.config.full) {
+                return (0, file_1.writeFile)(this.config.serversPath, fileName, destCode);
+            }
+            const merger = new merge_1.Merger(mergerProps);
+            return (0, file_1.writeFile)(this.config.serversPath, fileName, merger.merge({
+                source: destCode,
+            }));
         }
         catch (error) {
             console.error('[GenSDK] file gen fail:', fileName, 'type:', type);
@@ -478,14 +501,18 @@ class ServiceGenerator {
     getTemplate(type) {
         return (0, fs_1.readFileSync)((0, path_1.join)(this.config.templatesFolder, `${type}.njk`), 'utf8');
     }
+    // 生成方法名 functionName
     getFunctionName(data) {
         // 获取路径相同部分
-        const pathBasePrefix = (0, util_1.getBasePrefix)((0, lodash_1.keys)(this.openAPIData.paths));
+        const pathBasePrefix = (0, util_2.getBasePrefix)((0, lodash_1.keys)(this.openAPIData.paths));
         return this.config.hook && this.config.hook.customFunctionName
-            ? this.config.hook.customFunctionName(data)
-            : data.operationId
-                ? (0, util_1.resolveFunctionName)((0, util_1.stripDot)(data.operationId), data.method)
-                : data.method + (0, util_1.genDefaultFunctionName)(data.path, pathBasePrefix);
+            ? this.config.hook.customFunctionName(data, pathBasePrefix)
+            : (0, util_1.camelCase)(`${(0, util_2.genDefaultFunctionName)(data.path, pathBasePrefix)}-using-${data.method}`);
+        // return this.config.hook && this.config.hook.customFunctionName
+        //   ? this.config.hook.customFunctionName(data)
+        //   : data.operationId
+        //     ? resolveFunctionName(stripDot(data.operationId), data.method)
+        //     : data.method + genDefaultFunctionName(data.path, pathBasePrefix);
     }
     getType(schemaObject, namespace) {
         var _a, _b;
@@ -496,19 +523,19 @@ class ServiceGenerator {
                 schemaObject,
                 namespace,
                 schemas,
-                originGetType: util_1.getDefaultType,
+                originGetType: util_2.getDefaultType,
             });
             if (typeof type === 'string') {
                 return type;
             }
         }
-        return (0, util_1.getDefaultType)(schemaObject, namespace, schemas);
+        return (0, util_2.getDefaultType)(schemaObject, namespace, schemas);
     }
     getFunctionParamsTypeName(data) {
         var _a, _b, _c;
         const namespace = this.config.namespace ? `${this.config.namespace}.` : '';
         const typeName = ((_c = (_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.hook) === null || _b === void 0 ? void 0 : _b.customTypeName) === null || _c === void 0 ? void 0 : _c.call(_b, data)) || this.getFunctionName(data);
-        return (0, util_1.resolveTypeName)(`${namespace}${typeName !== null && typeName !== void 0 ? typeName : data.operationId}Params`);
+        return (0, util_2.resolveTypeName)(`${namespace}${typeName !== null && typeName !== void 0 ? typeName : data.operationId}Params`);
     }
     getBodyTP(requestBody) {
         var _a;
@@ -534,7 +561,7 @@ class ServiceGenerator {
                 const propertyObj = schema.properties[propertyKey];
                 if (propertyObj &&
                     ![config_1.SchemaObjectFormat.binary, config_1.SchemaObjectFormat.base64].includes(propertyObj.format) &&
-                    !(0, util_1.isBinaryArraySchemaObject)(propertyObj)) {
+                    !(0, util_2.isBinaryArraySchemaObject)(propertyObj)) {
                     // 测试了很多用例，很少有用例走到这里
                     return {
                         key: propertyKey,
@@ -569,7 +596,7 @@ class ServiceGenerator {
         const props = (((_a = resolved.props) === null || _a === void 0 ? void 0 : _a.length) > 0 &&
             resolved.props[0].filter((p) => p.format === 'binary' ||
                 p.format === 'base64' ||
-                (0, util_1.isBinaryArraySchemaObject)(p))) ||
+                (0, util_2.isBinaryArraySchemaObject)(p))) ||
             [];
         if (props.length > 0) {
             ret = props.map((p) => {
@@ -607,10 +634,10 @@ class ServiceGenerator {
         }
         let schema = (resContent[mediaType].schema ||
             config_2.DEFAULT_SCHEMA);
-        if ((0, util_1.isReferenceObject)(schema)) {
-            const refName = (0, util_1.getLastRefName)(schema.$ref);
+        if ((0, util_2.isReferenceObject)(schema)) {
+            const refName = (0, util_2.getLastRefName)(schema.$ref);
             const childrenSchema = components.schemas[refName];
-            if ((0, util_1.isNonArraySchemaObject)(childrenSchema) && this.config.dataFields) {
+            if ((0, util_2.isNonArraySchemaObject)(childrenSchema) && this.config.dataFields) {
                 schema = (((_a = this.config.dataFields
                     .map((field) => childrenSchema.properties[field])
                     .filter(Boolean)) === null || _a === void 0 ? void 0 : _a[0]) ||
@@ -618,7 +645,7 @@ class ServiceGenerator {
                     config_2.DEFAULT_SCHEMA);
             }
         }
-        if ((0, util_1.isSchemaObject)(schema)) {
+        if ((0, util_2.isSchemaObject)(schema)) {
             (0, lodash_1.keys)(schema.properties).map((fieldName) => {
                 var _a, _b;
                 schema.properties[fieldName]['required'] =
@@ -641,7 +668,7 @@ class ServiceGenerator {
                     var _a, _b, _c, _d, _e;
                     const isDirectObject = (((_a = p.schema) === null || _a === void 0 ? void 0 : _a.type) === 'object' ||
                         p.type) === 'object';
-                    const refName = (0, util_1.getLastRefName)(((_b = p.schema) === null || _b === void 0 ? void 0 : _b.$ref) ||
+                    const refName = (0, util_2.getLastRefName)(((_b = p.schema) === null || _b === void 0 ? void 0 : _b.$ref) ||
                         p.$ref);
                     const deRefObj = (0, lodash_1.entries)((_c = this.openAPIData.components) === null || _c === void 0 ? void 0 : _c.schemas).find(([k]) => k === refName) || [];
                     const isRefObject = ((_d = deRefObj[1]) === null || _d === void 0 ? void 0 : _d.type) === 'object' &&
@@ -672,7 +699,7 @@ class ServiceGenerator {
         // 不使用 schemaObject: ISchemaObject = {}
         schemaObject = schemaObject !== null && schemaObject !== void 0 ? schemaObject : {};
         // 引用类型
-        if ((0, util_1.isReferenceObject)(schemaObject)) {
+        if ((0, util_2.isReferenceObject)(schemaObject)) {
             return this.resolveRefObject(schemaObject);
         }
         // 枚举类型
@@ -688,15 +715,15 @@ class ServiceGenerator {
             return this.resolveProperties(schemaObject);
         }
         // 数组类型
-        if ((0, util_1.isArraySchemaObject)(schemaObject)) {
+        if ((0, util_2.isArraySchemaObject)(schemaObject)) {
             return this.resolveArray(schemaObject);
         }
         return schemaObject;
     }
     resolveArray(schemaObject) {
         var _a;
-        if ((0, util_1.isReferenceObject)(schemaObject.items)) {
-            const refName = (0, util_1.getRefName)(schemaObject.items);
+        if ((0, util_2.isReferenceObject)(schemaObject.items)) {
+            const refName = (0, util_2.getRefName)(schemaObject.items);
             return {
                 type: `${refName}[]`,
             };
@@ -719,10 +746,19 @@ class ServiceGenerator {
         const enumArray = schemaObject.enum;
         let enumStr = '';
         let enumLabelTypeStr = '';
-        if (config_2.numberEnum.includes(schemaObject.type) || (0, util_1.isAllNumber)(enumArray)) {
-            enumStr = `{${(0, lodash_1.map)(enumArray, (value) => `"NUMBER_${value}"=${Number(value)}`).join(',')}}`;
+        if (config_2.numberEnum.includes(schemaObject.type) || (0, util_2.isAllNumber)(enumArray)) {
+            if (this.config.isSupportParseEnumDesc && schemaObject.description) {
+                const enumMap = (0, util_2.parseDescriptionEnum)(schemaObject.description);
+                enumStr = `{${(0, lodash_1.map)(enumArray, (value) => {
+                    const enumLabel = enumMap.get(Number(value));
+                    return `${enumLabel}=${Number(value)}`;
+                }).join(',')}}`;
+            }
+            else {
+                enumStr = `{${(0, lodash_1.map)(enumArray, (value) => `"NUMBER_${value}"=${Number(value)}`).join(',')}}`;
+            }
         }
-        else if ((0, util_1.isAllNumeric)(enumArray)) {
+        else if ((0, util_2.isAllNumeric)(enumArray)) {
             enumStr = `{${(0, lodash_1.map)(enumArray, (value) => `"STRING_NUMBER_${value}"="${value}"`).join(',')}}`;
         }
         else {
@@ -749,11 +785,20 @@ class ServiceGenerator {
             }).join(',')}}`;
         }
         else {
-            if (config_2.numberEnum.includes(schemaObject.type) || (0, util_1.isAllNumber)(enumArray)) {
-                enumLabelTypeStr = `{${(0, lodash_1.map)(enumArray, (value) => `"NUMBER_${value}":${Number(value)}`).join(',')}}`;
+            if (config_2.numberEnum.includes(schemaObject.type) || (0, util_2.isAllNumber)(enumArray)) {
+                if (this.config.isSupportParseEnumDesc && schemaObject.description) {
+                    const enumMap = (0, util_2.parseDescriptionEnum)(schemaObject.description);
+                    enumLabelTypeStr = `{${(0, lodash_1.map)(enumArray, (value) => {
+                        const enumLabel = enumMap.get(Number(value));
+                        return `${Number(value)}:"${enumLabel}"`;
+                    }).join(',')}}`;
+                }
+                else {
+                    enumLabelTypeStr = `{${(0, lodash_1.map)(enumArray, (value) => `${Number(value)}:"NUMBER_${value}"`).join(',')}}`;
+                }
             }
-            else if ((0, util_1.isAllNumeric)(enumArray)) {
-                enumLabelTypeStr = `{${(0, lodash_1.map)(enumArray, (value) => `"STRING_NUMBER_${value}":"${value}"`).join(',')}}`;
+            else if ((0, util_2.isAllNumeric)(enumArray)) {
+                enumLabelTypeStr = `{${(0, lodash_1.map)(enumArray, (value) => `"${value}":"STRING_NUMBER_${value}"`).join(',')}}`;
             }
             else {
                 enumLabelTypeStr = `{${(0, lodash_1.map)(enumArray, (value) => `${value}:"${value}"`).join(',')}}`;
@@ -767,7 +812,7 @@ class ServiceGenerator {
     }
     resolveAllOfObject(schemaObject) {
         const props = (0, lodash_1.map)(schemaObject.allOf, (item) => {
-            return (0, util_1.isReferenceObject)(item)
+            return (0, util_2.isReferenceObject)(item)
                 ? [Object.assign(Object.assign({}, item), { type: this.getType(item) })]
                 : this.getProps(item);
         });
@@ -799,16 +844,16 @@ class ServiceGenerator {
         });
     }
     resolveRefObject(refObject) {
-        if (!(0, util_1.isReferenceObject)(refObject)) {
+        if (!(0, util_2.isReferenceObject)(refObject)) {
             return refObject;
         }
         const refPaths = refObject.$ref.split('/');
         if (refPaths[0] === '#') {
-            const schema = (0, util_1.resolveRefs)(this.openAPIData, refPaths.slice(1));
+            const schema = (0, util_2.resolveRefs)(this.openAPIData, refPaths.slice(1));
             if (!schema) {
                 throw new Error(`[GenSDK] Data Error! Notfoud: ${refObject.$ref}`);
             }
-            return Object.assign(Object.assign({}, (this.resolveRefObject(schema) || {})), { type: (0, util_1.isReferenceObject)(schema)
+            return Object.assign(Object.assign({}, (this.resolveRefObject(schema) || {})), { type: (0, util_2.isReferenceObject)(schema)
                     ? this.resolveRefObject(schema).type
                     : schema.type });
         }

package/dist/generator/type.d.ts

@@ -1,4 +1,5 @@
-import { OperationObject, ParameterObject, SchemaObject } from '../type';
+import type { ProjectOptions } from 'ts-morph';
+import { type MutuallyExclusive, OperationObject, ParameterObject, SchemaObject } from '../type';
 import { TypescriptFileType } from './config';
 export type ITypescriptFileType = keyof typeof TypescriptFileType;
 export interface APIDataType extends OperationObject {
@@ -36,3 +37,17 @@ export interface ISchemaItem {
     typeName: string;
     type: string;
 }
+export declare enum MergeRule {
+    LEFT = "left",
+    RIGHT = "right"
+}
+export type MergeOption = MutuallyExclusive<{
+    source: string;
+    srcPath: string;
+}>;
+type MergerOptionProps = {
+    mergeRule: MergeRule;
+    projectOptions: ProjectOptions;
+};
+export type MergerOptions = MergeOption & Partial<MergerOptionProps>;
+export {};

package/dist/generator/type.js

@@ -1,2 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.MergeRule = void 0;
+var MergeRule;
+(function (MergeRule) {
+    MergeRule["LEFT"] = "left";
+    MergeRule["RIGHT"] = "right";
+})(MergeRule || (exports.MergeRule = MergeRule = {}));

package/dist/generator/util.d.ts

@@ -22,3 +22,4 @@ export declare function resolveRefs(obj: OpenAPIObject, fields: string[]): unkno
 export declare function isAllNumeric(arr: any): boolean;
 export declare function isAllNumber(arr: any): boolean;
 export declare function capitalizeFirstLetter(str: string): string;
+export declare const parseDescriptionEnum: (description: string) => Map<number, string>;

package/dist/generator/util.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseDescriptionEnum = void 0;
 exports.stripDot = stripDot;
 exports.resolveTypeName = resolveTypeName;
 exports.getRefName = getRefName;
@@ -343,3 +344,49 @@ function isAllNumber(arr) {
 function capitalizeFirstLetter(str) {
     return str.replace(/^[a-z]/, (match) => match.toUpperCase());
 }
+// 解析 description 中的枚举翻译
+const parseDescriptionEnum = (description) => {
+    const enumMap = new Map();
+    if (!description)
+        return enumMap;
+    // 首先处理可能的总体描述，例如 "系统用户角色:User=0,..."
+    let descToProcess = description;
+    const mainDescriptionMatch = description.match(/^([^:]+):(.*)/);
+    if (mainDescriptionMatch) {
+        // 如果有总体描述（如 "系统用户角色:"），只处理冒号后面的部分
+        descToProcess = mainDescriptionMatch[2];
+    }
+    // 匹配形如 "User(普通用户)=0" 或 "User=0" 的模式
+    const enumPattern = /([^():,=]+)(?:\(([^)]+)\))?=(\d+)/g;
+    let match;
+    while ((match = enumPattern.exec(descToProcess)) !== null) {
+        const name = match[1] ? match[1].trim() : '';
+        const valueStr = match[3] ? match[3].trim() : '';
+        if (valueStr && !isNaN(Number(valueStr))) {
+            // 统一使用英文key（如User）
+            enumMap.set(Number(valueStr), name);
+        }
+    }
+    // 如果没有匹配到任何枚举，尝试使用简单的分割方法作为后备
+    if (enumMap.size === 0) {
+        const pairs = descToProcess.split(',');
+        pairs.forEach((pair) => {
+            const parts = pair.split('=');
+            if (parts.length === 2) {
+                let label = parts[0].trim();
+                const value = parts[1].trim();
+                // 处理可能带有括号的情况
+                const bracketMatch = label.match(/([^(]+)\(([^)]+)\)/);
+                if (bracketMatch) {
+                    // 只使用括号前的英文key
+                    label = bracketMatch[1].trim();
+                }
+                if (label && value && !isNaN(Number(value))) {
+                    enumMap.set(Number(value), label);
+                }
+            }
+        });
+    }
+    return enumMap;
+};
+exports.parseDescriptionEnum = parseDescriptionEnum;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { APIDataType } from './generator/type';
-import { ComponentsObject, IPriorityRule, IReactQueryMode, OpenAPIObject, OperationObject, ReferenceObject, SchemaObject } from './type';
+import { ComponentsObject, type GetSchemaByApifoxProps, IPriorityRule, IReactQueryMode, OpenAPIObject, OperationObject, ReferenceObject, SchemaObject } from './type';
 export * from './generator/patchSchema';
 export type GenerateServiceProps = {
     /**
@@ -17,6 +17,10 @@ export type GenerateServiceProps = {
      * 方式二: import request from '@/request';
      */
     requestLibPath?: string;
+    /**
+     * 是否全量替换, 默认: true, 如果为false, 则进行增量替换
+     */
+    full?: boolean;
     /**
      * 开启日志
      */
@@ -93,6 +97,10 @@ export type GenerateServiceProps = {
      * 文档权限凭证
      */
     authorization?: string;
+    /**
+     * apifox 配置
+     */
+    apifoxConfig?: GetSchemaByApifoxProps;
     /**
      * 默认为false，true时使用null代替可选值
      */
@@ -109,6 +117,10 @@ export type GenerateServiceProps = {
      * 模板文件、请求函数采用小驼峰命名
      */
     isCamelCase?: boolean;
+    /**
+     * 是否使用 description 中的枚举定义
+     */
+    isSupportParseEnumDesc?: boolean;
     /**
      * 命名空间名称，默认为API，不需要关注
      */
@@ -117,6 +129,14 @@ export type GenerateServiceProps = {
      * 模板文件的文件路径，不需要关注
      */
     templatesFolder?: string;
+    /**
+     * 请求超时时间
+     */
+    timeout?: number;
+    /**
+     * 多网关唯一标识
+     */
+    uniqueKey?: string;
     /**
      * 自定义 hook
      */
@@ -124,7 +144,7 @@ export type GenerateServiceProps = {
         /** change open api data after constructor */
         afterOpenApiDataInited?: (openAPIData: OpenAPIObject) => OpenAPIObject;
         /** 自定义函数名称 */
-        customFunctionName?: (data: APIDataType) => string;
+        customFunctionName?: (data: APIDataType, prefix?: string) => string;
         /** 自定义类型名称 */
         customTypeName?: (data: APIDataType) => string;
         /** 自定义 options 默认值 */
@@ -135,17 +155,17 @@ export type GenerateServiceProps = {
          * 自定义获取type hook
          * 返回非字符串将使用默认方法获取type
          * @example set number to string
-         * function customType(schemaObject,namespace){
+         * function customType({ schemaObject, namespace }){
          *  if(schemaObject.type==='number' && !schemaObject.format){
          *    return 'BigDecimalString';
          *  }
          * }
          */
-        customType?: ({ schemaObject, namespace, schemas, originGetType, }: {
+        customType?: ({ schemaObject, namespace, originGetType, schemas, }: {
             schemaObject: SchemaObject | ReferenceObject;
             namespace: string;
+            originGetType: (schemaObject: SchemaObject, namespace: string, schemas?: ComponentsObject['schemas']) => string;
             schemas?: ComponentsObject['schemas'];
-            originGetType: (schemaObject: SchemaObject, namespace: string) => string;
         }) => string;
         /**
          * 自定义生成文件名，可返回多个，表示生成多个文件;
@@ -176,4 +196,4 @@ export type GenerateServiceProps = {
         customFileNames?: (operationObject: OperationObject, apiPath: string, apiMethod: string) => string[] | null;
     };
 };
-export declare function generateService({ requestLibPath, schemaPath, mockFolder, includeTags, excludeTags, authorization, isTranslateToEnglishTag, priorityRule, reactQueryMode, ...rest }: GenerateServiceProps): Promise<void>;
+export declare function generateService({ requestLibPath, schemaPath, mockFolder, includeTags, excludeTags, authorization, isTranslateToEnglishTag, priorityRule, timeout, reactQueryMode, apifoxConfig, ...rest }: GenerateServiceProps): Promise<void>;

package/dist/index.js

@@ -10,12 +10,18 @@ const util_1 = require("./util");
 tslib_1.__exportStar(require("./generator/patchSchema"), exports);
 function generateService(_a) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var { requestLibPath, schemaPath, mockFolder, includeTags, excludeTags, authorization, isTranslateToEnglishTag, priorityRule = config_1.PriorityRule.include, reactQueryMode = config_1.ReactQueryMode.react } = _a, rest = tslib_1.__rest(_a, ["requestLibPath", "schemaPath", "mockFolder", "includeTags", "excludeTags", "authorization", "isTranslateToEnglishTag", "priorityRule", "reactQueryMode"]);
-        if (!schemaPath) {
+        var { requestLibPath, schemaPath, mockFolder, includeTags, excludeTags, authorization, isTranslateToEnglishTag, priorityRule = config_1.PriorityRule.include, timeout = 60000, reactQueryMode = config_1.ReactQueryMode.react, apifoxConfig } = _a, rest = tslib_1.__rest(_a, ["requestLibPath", "schemaPath", "mockFolder", "includeTags", "excludeTags", "authorization", "isTranslateToEnglishTag", "priorityRule", "timeout", "reactQueryMode", "apifoxConfig"]);
+        if (!schemaPath && !apifoxConfig) {
             return;
         }
-        const openAPI = (yield (0, util_1.getOpenAPIConfig)(schemaPath, authorization));
-        if ((0, lodash_1.isEmpty)(openAPI)) {
+        let openAPI = null;
+        if (apifoxConfig) {
+            openAPI = (yield (0, util_1.getOpenAPIConfigByApifox)(apifoxConfig));
+        }
+        if (schemaPath) {
+            openAPI = (yield (0, util_1.getOpenAPIConfig)(schemaPath, authorization, timeout));
+        }
+        if (!openAPI || (0, lodash_1.isEmpty)(openAPI)) {
             return;
         }
         if (isTranslateToEnglishTag) {
@@ -28,7 +34,7 @@ function generateService(_a) {
                     ? [/.*/g]
                     : null, excludeTags: excludeTags
                 ? (0, lodash_1.map)(excludeTags, (item) => typeof item === 'string' ? item.toLowerCase() : item)
-                : null, requestOptionsType: '{[key: string]: unknown}', namespace: 'API', isGenReactQuery: false, reactQueryMode, isGenJavaScript: false, isDisplayTypeLabel: false, isGenJsonSchemas: false, nullable: false, isOnlyGenTypeScriptType: false, isCamelCase: true }, rest), openAPI);
+                : null, requestOptionsType: '{[key: string]: unknown}', namespace: 'API', isGenReactQuery: false, reactQueryMode, isGenJavaScript: false, isDisplayTypeLabel: false, isGenJsonSchemas: false, nullable: false, isOnlyGenTypeScriptType: false, isCamelCase: true, isSupportParseEnumDesc: false, full: true }, rest), openAPI);
         serviceGenerator.genFile();
         if (mockFolder) {
             (0, mockGenarator_1.mockGenerator)({

package/dist/log.d.ts

@@ -1,2 +1,3 @@
 declare const log: (...rest: any[]) => void;
+export declare const logError: (...rest: any[]) => void;
 export default log;

package/dist/log.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.logError = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const log = (...rest) => console.log(`${chalk_1.default.blue('[openAPI]')}: ${rest.join('\n')}`);
+const logError = (...rest) => console.error(`${chalk_1.default.red('❌ [openAPI]')}: ${rest.join('\n')}`);
+exports.logError = logError;
 exports.default = log;

package/dist/readConfig.d.ts

@@ -0,0 +1,2 @@
+import type { ReadConfigOptions } from './type';
+export declare const readConfig: <T = unknown>({ fileName, filePath, fallbackName, }: ReadConfigOptions) => Promise<T | undefined>;