yapi-apifox-to-typescript 4.1.0 → 4.1.2

package/lib/cjs/ApifoxToYApiData.js

@@ -142,7 +142,7 @@ var ApifoxToYApiData = /*#__PURE__*/function () {
   ;
 
   _proto.getCats = function getCats(cats) {
-    var categoryIds = (0, _utils.getFilteredCat)(cats, []); // 对cat进行有效性过滤
+    var categoryIds = (0, _utils.getFilteredCat)(cats, [], true); // 对cat进行有效性过滤
 
     return this.getValidCat(categoryIds);
   }
@@ -212,7 +212,7 @@ var ApifoxToYApiData = /*#__PURE__*/function () {
                 return child.type === 'apiDetail';
               }).map( /*#__PURE__*/function () {
                 var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(child) {
-                  var _resultData$responses, _resultData$responses2, _resultData$responses3, _resultData$responses4, _resultData$responses5, _resultData$responses6, _resultData$responses7, _resultData$requestBo, _resultData$requestBo2, _resultData$parameter, _resultData$parameter2;
+                  var _resultData$responses, _resultData$responses2, _resultData$responses3, _resultData$responses4, _resultData$responses5, _resultData$responses6, _resultData$responses7, _resultData$requestBo, _resultData$requestBo2, _resultData$parameter, _resultData$parameter2, _resultData$requestBo3;
 
                   var result, resultData, resbodyIndex, respref, dataProperties, item, _dataProperties$item$, dataPropRef, reqref;
 
@@ -318,9 +318,17 @@ var ApifoxToYApiData = /*#__PURE__*/function () {
                                 type: item.type === 'string' ? _types.RequestQueryType.string : _types.RequestQueryType.number
                               };
                             })) || [],
-                            req_body_type: resultData.requestBody.jsonSchema ? _types.RequestBodyType.json : _types.RequestBodyType.raw,
+                            req_body_type: resultData.requestBody.type === 'multipart/form-data' ? _types.RequestBodyType.form : resultData.requestBody.jsonSchema ? _types.RequestBodyType.json : _types.RequestBodyType.raw,
                             req_body_is_json_schema: !!resultData.requestBody.jsonSchema,
-                            req_body_form: [],
+                            req_body_form: ((_resultData$requestBo3 = resultData.requestBody.parameters) == null ? void 0 : _resultData$requestBo3.map(function (item) {
+                              return {
+                                name: item.name,
+                                desc: item.description,
+                                example: item.example,
+                                required: item.required ? _types.Required.true : _types.Required.false,
+                                type: item.type === 'string' ? _types.RequestFormItemType.text : _types.RequestFormItemType.file
+                              };
+                            })) || [],
                             req_body_other: resultData.requestBody.jsonSchema ? JSON.stringify(resultData.requestBody.jsonSchema) : '',
                             res_body_type: _types.ResponseBodyType.json,
                             res_body_is_json_schema: true,

package/lib/cjs/Generator.js

@@ -597,7 +597,7 @@ var Generator = /*#__PURE__*/function () {
 
                         case 20:
                           // 始终写入主文件
-                          rawOutputContent = (0, _vtils.dedent)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteralLoose2.default)(["\n          /* tslint:disable */\n          /* eslint-disable */\n\n          /* \u8BE5\u6587\u4EF6\u7531 yapi-apifox-to-typescript \u81EA\u52A8\u751F\u6210\uFF0C\u8BF7\u52FF\u76F4\u63A5\u4FEE\u6539\uFF01\uFF01\uFF01 */\n\n          ", "\n        "])), syntheticalConfig.typesOnly ? (0, _vtils.dedent)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteralLoose2.default)(["\n                // @ts-ignore\n                type FileData = File\n\n                ", "\n              "])), content.join('\n\n').trim()) : (0, _vtils.dedent)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteralLoose2.default)(["\n                // @ts-ignore\n                // prettier-ignore\n                import { QueryStringArrayFormat, Method, ", "FileData, prepare } from 'yapi-apifox-to-typescript'\n                // @ts-ignore\n                // prettier-ignore\n                import type { RequestConfig, RequestFunctionRestArgs } from 'yapi-apifox-to-typescript'\n                // @ts-ignore\n                import request from ", "\n                ", "\n\n                type UserRequestRestArgs = RequestFunctionRestArgs<typeof request>\n\n                // Request: \u76EE\u524D React Hooks \u529F\u80FD\u6709\u7528\u5230\n                export type Request<TRequestData, TRequestConfig extends RequestConfig, TRequestResult> = (\n                  TRequestConfig['requestDataOptional'] extends true\n                    ? (requestData?: TRequestData, ...args: RequestFunctionRestArgs<typeof request>) => TRequestResult\n                    : (requestData: TRequestData, ...args: RequestFunctionRestArgs<typeof request>) => TRequestResult\n                ) & {\n                  requestConfig: TRequestConfig\n                }\n\n                ", "\n              "])), syntheticalConfig.ignoreUselessConfigVar ? "" : "RequestBodyType, ResponseBodyType, ", JSON.stringify((0, _utils.getNormalizedRelativePath)(outputFilePath, requestFunctionFilePath)), !syntheticalConfig.reactHooks || !syntheticalConfig.reactHooks.enabled ? '' : (0, _vtils.dedent)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteralLoose2.default)(["\n                      // @ts-ignore\n                      import makeRequestHook from ", "\n                    "])), JSON.stringify((0, _utils.getNormalizedRelativePath)(outputFilePath, requestHookMakerFilePath))), content.join('\n\n').trim())); // ref: https://prettier.io/docs/en/options.html
+                          rawOutputContent = (0, _vtils.dedent)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteralLoose2.default)(["\n          /* tslint:disable */\n          /* eslint-disable */\n\n          /* \u8BE5\u6587\u4EF6\u7531 yapi-apifox-to-typescript \u81EA\u52A8\u751F\u6210\uFF0C\u8BF7\u52FF\u76F4\u63A5\u4FEE\u6539\uFF01\uFF01\uFF01 */\n\n          ", "\n        "])), syntheticalConfig.typesOnly ? (0, _vtils.dedent)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteralLoose2.default)(["\n                // @ts-ignore\n                type FileData = File\n\n                ", "\n              "])), content.join('\n\n').trim()) : (0, _vtils.dedent)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteralLoose2.default)(["\n                // @ts-ignore\n                // prettier-ignore\n                import { QueryStringArrayFormat, Method, RequestBodyType, ", "FileData, prepare } from 'yapi-apifox-to-typescript'\n                // @ts-ignore\n                // prettier-ignore\n                import type { RequestConfig, RequestFunctionRestArgs } from 'yapi-apifox-to-typescript'\n                // @ts-ignore\n                import request from ", "\n                ", "\n\n                type UserRequestRestArgs = RequestFunctionRestArgs<typeof request>\n\n                // Request: \u76EE\u524D React Hooks \u529F\u80FD\u6709\u7528\u5230\n                export type Request<TRequestData, TRequestConfig extends RequestConfig, TRequestResult> = (\n                  TRequestConfig['requestDataOptional'] extends true\n                    ? (requestData?: TRequestData, ...args: RequestFunctionRestArgs<typeof request>) => TRequestResult\n                    : (requestData: TRequestData, ...args: RequestFunctionRestArgs<typeof request>) => TRequestResult\n                ) & {\n                  requestConfig: TRequestConfig\n                }\n\n                ", "\n              "])), syntheticalConfig.ignoreUselessConfigVar ? "" : "ResponseBodyType, ", JSON.stringify((0, _utils.getNormalizedRelativePath)(outputFilePath, requestFunctionFilePath)), !syntheticalConfig.reactHooks || !syntheticalConfig.reactHooks.enabled ? '' : (0, _vtils.dedent)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteralLoose2.default)(["\n                      // @ts-ignore\n                      import makeRequestHook from ", "\n                    "])), JSON.stringify((0, _utils.getNormalizedRelativePath)(outputFilePath, requestHookMakerFilePath))), content.join('\n\n').trim())); // ref: https://prettier.io/docs/en/options.html
 
                           _context11.next = 23;
                           return (0, _utils.getPrettier)(_this4.options.cwd);
@@ -1094,11 +1094,11 @@ var Generator = /*#__PURE__*/function () {
                 return "\u63A5\u53E3 " + title + " \u7684 **\u8BF7\u6C42\u7C7B\u578B**";
               }), requestDataType.trim(), genComment(function (title) {
                 return "\u63A5\u53E3 " + title + " \u7684 **\u8FD4\u56DE\u7C7B\u578B**";
-              }), responseDataType.trim(), syntheticalConfig.typesOnly ? '' : (0, _vtils.dedent)(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteralLoose2.default)(["\n            ", "\n            ", "\n                path: ", ",\n                method: Method.", ",\n                ", "", "", "", "", "\n            }\n\n            ", "\n            export const ", " = ", " (\n              requestData", ": ", ",\n              ...args: UserRequestRestArgs\n            ) => {\n              return request<", ">(\n                prepare(", ", requestData),\n                ...args,\n              )\n            }\n\n            ", ".requestConfig = ", "\n\n            ", "\n          "])), genComment(function (title) {
+              }), responseDataType.trim(), syntheticalConfig.typesOnly ? '' : (0, _vtils.dedent)(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteralLoose2.default)(["\n            ", "\n            ", "\n                path: ", ",\n                method: Method.", ",\n                ", "", "", "", "requestBodyType: RequestBodyType.", ",\n          ", "\n            }\n\n            ", "\n            export const ", " = ", " (\n              requestData", ": ", ",\n              ...args: UserRequestRestArgs\n            ) => {\n              return request<", ">(\n                prepare(", ", requestData),\n                ...args,\n              )\n            }\n\n            ", ".requestConfig = ", "\n\n            ", "\n          "])), genComment(function (title) {
                 return "\u63A5\u53E3 " + title + " \u7684 **\u8BF7\u6C42\u914D\u7F6E**";
-              }), syntheticalConfig.withoutUrl !== true ? "const " + requestConfigName + ": " + requestConfigTypeName + " = " + COMPRESSOR_TREE_SHAKING_ANNOTATION + " {\n                  mockUrl: mockUrl" + categoryUID + ",\n                  devUrl: devUrl" + categoryUID + ",\n                  prodUrl: prodUrl" + categoryUID + "," : "const " + requestConfigName + ": " + requestConfigTypeName + " = " + COMPRESSOR_TREE_SHAKING_ANNOTATION + " {", JSON.stringify(extendedInterfaceInfo.path), extendedInterfaceInfo.method, paramNames.length === 0 ? '' : "paramNames: " + paramNamesLiteral + ",", queryNames.length === 0 ? '' : "queryNames: " + queryNamesLiteral + ",", syntheticalConfig.queryStringArrayFormat ? "queryStringArrayFormat: QueryStringArrayFormat." + syntheticalConfig.queryStringArrayFormat + "," : '', requestHeaders === '{}' ? '' : "requestHeaders: " + requestHeaders + ",", syntheticalConfig.ignoreUselessConfigVar ? "" : "requestBodyType: RequestBodyType." + (extendedInterfaceInfo.method === _types.Method.GET ? _types.RequestBodyType.query : extendedInterfaceInfo.req_body_type
+              }), syntheticalConfig.withoutUrl !== true ? "const " + requestConfigName + ": " + requestConfigTypeName + " = " + COMPRESSOR_TREE_SHAKING_ANNOTATION + " {\n                  mockUrl: mockUrl" + categoryUID + ",\n                  devUrl: devUrl" + categoryUID + ",\n                  prodUrl: prodUrl" + categoryUID + "," : "const " + requestConfigName + ": " + requestConfigTypeName + " = " + COMPRESSOR_TREE_SHAKING_ANNOTATION + " {", JSON.stringify(extendedInterfaceInfo.path), extendedInterfaceInfo.method, paramNames.length === 0 ? '' : "paramNames: " + paramNamesLiteral + ",", queryNames.length === 0 ? '' : "queryNames: " + queryNamesLiteral + ",", syntheticalConfig.queryStringArrayFormat ? "queryStringArrayFormat: QueryStringArrayFormat." + syntheticalConfig.queryStringArrayFormat + "," : '', requestHeaders === '{}' ? '' : "requestHeaders: " + requestHeaders + ",", extendedInterfaceInfo.method === _types.Method.GET ? _types.RequestBodyType.query : extendedInterfaceInfo.req_body_type
               /* istanbul ignore next */
-              || _types.RequestBodyType.none) + ",\n                responseBodyType: ResponseBodyType." + extendedInterfaceInfo.res_body_type + ",\n                dataKey: dataKey" + categoryUID + ",\n                requestDataOptional: " + JSON.stringify(isRequestDataOptional) + ",\n                requestDataJsonSchema: " + JSON.stringify((_syntheticalConfig$js = syntheticalConfig.jsonSchema) != null && _syntheticalConfig$js.enabled && ((_syntheticalConfig$js2 = syntheticalConfig.jsonSchema) == null ? void 0 : _syntheticalConfig$js2.requestData) !== false ? requestDataJsonSchema : {}) + ",\n                responseDataJsonSchema: " + JSON.stringify((_syntheticalConfig$js3 = syntheticalConfig.jsonSchema) != null && _syntheticalConfig$js3.enabled && ((_syntheticalConfig$js4 = syntheticalConfig.jsonSchema) == null ? void 0 : _syntheticalConfig$js4.responseData) !== false ? responseDataJsonSchema : {}) + ",\n                requestFunctionName: " + JSON.stringify(requestFunctionName) + ",\n                extraInfo: " + JSON.stringify(requestFunctionExtraInfo), genComment(function (title) {
+              || _types.RequestBodyType.none, syntheticalConfig.ignoreUselessConfigVar ? "" : "responseBodyType: ResponseBodyType." + extendedInterfaceInfo.res_body_type + ",\n            dataKey: dataKey" + categoryUID + ",\n                requestDataOptional: " + JSON.stringify(isRequestDataOptional) + ",\n                requestDataJsonSchema: " + JSON.stringify((_syntheticalConfig$js = syntheticalConfig.jsonSchema) != null && _syntheticalConfig$js.enabled && ((_syntheticalConfig$js2 = syntheticalConfig.jsonSchema) == null ? void 0 : _syntheticalConfig$js2.requestData) !== false ? requestDataJsonSchema : {}) + ",\n                responseDataJsonSchema: " + JSON.stringify((_syntheticalConfig$js3 = syntheticalConfig.jsonSchema) != null && _syntheticalConfig$js3.enabled && ((_syntheticalConfig$js4 = syntheticalConfig.jsonSchema) == null ? void 0 : _syntheticalConfig$js4.responseData) !== false ? responseDataJsonSchema : {}) + ",\n                requestFunctionName: " + JSON.stringify(requestFunctionName) + ",\n                extraInfo: " + JSON.stringify(requestFunctionExtraInfo), genComment(function (title) {
                 return "\u63A5\u53E3 " + title + " \u7684 **\u8BF7\u6C42\u51FD\u6570**";
               }), requestFunctionName, COMPRESSOR_TREE_SHAKING_ANNOTATION, isRequestDataOptional ? '?' : '', requestDataTypeName, responseDataTypeName, requestConfigName, requestFunctionName, requestConfigName, !syntheticalConfig.reactHooks || !syntheticalConfig.reactHooks.enabled ? '' : (0, _vtils.dedent)(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteralLoose2.default)(["\n                  ", "\n                  export const ", " = ", " makeRequestHook<", ", ", ", ReturnType<typeof ", ">>(", ")\n                "])), genComment(function (title) {
                 return "\u63A5\u53E3 " + title + " \u7684 **React Hook**";

package/lib/cjs/utils.js

@@ -769,7 +769,11 @@ function _httpGet() {
   return _httpGet.apply(this, arguments);
 }
 
-var getFilteredCat = function getFilteredCat(cat, cats) {
+var getFilteredCat = function getFilteredCat(cat, cats, isApifox) {
+  if (isApifox === void 0) {
+    isApifox = false;
+  }
+
   // 分类处理
   // 数组化
   var categoryIds = (0, _vtils.castArray)(cat.id); // 全部分类
@@ -792,11 +796,14 @@ var getFilteredCat = function getFilteredCat(cat, cats) {
     return !excludedCategoryIds.includes(Math.abs(id));
   }); // 删除不存在的分类
 
-  categoryIds = categoryIds.filter(function (id) {
-    return !!cats.find(function (c) {
-      return c._id === id;
+  if (!isApifox) {
+    categoryIds = categoryIds.filter(function (id) {
+      return !!cats.find(function (c) {
+        return c._id === id;
+      });
     });
-  }); // 顺序化
+  } // 顺序化
+
 
   categoryIds = categoryIds.sort();
   return categoryIds;

package/lib/esm/ApifoxToYApiData.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import axios from 'axios';
-import { RequestBodyType, RequestParamType, RequestQueryType, Required, ResponseBodyType } from './types';
+import { RequestBodyType, RequestFormItemType, RequestParamType, RequestQueryType, Required, ResponseBodyType } from './types';
 import { getFilteredCat } from './utils';
 export var ApifoxToYApiData = /*#__PURE__*/function () {
   function ApifoxToYApiData(options) {
@@ -129,7 +129,7 @@ export var ApifoxToYApiData = /*#__PURE__*/function () {
   ;
 
   _proto.getCats = function getCats(cats) {
-    var categoryIds = getFilteredCat(cats, []); // 对cat进行有效性过滤
+    var categoryIds = getFilteredCat(cats, [], true); // 对cat进行有效性过滤
 
     return this.getValidCat(categoryIds);
   }
@@ -199,7 +199,7 @@ export var ApifoxToYApiData = /*#__PURE__*/function () {
                 return child.type === 'apiDetail';
               }).map( /*#__PURE__*/function () {
                 var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(child) {
-                  var _resultData$responses, _resultData$responses2, _resultData$responses3, _resultData$responses4, _resultData$responses5, _resultData$responses6, _resultData$responses7, _resultData$requestBo, _resultData$requestBo2, _resultData$parameter, _resultData$parameter2;
+                  var _resultData$responses, _resultData$responses2, _resultData$responses3, _resultData$responses4, _resultData$responses5, _resultData$responses6, _resultData$responses7, _resultData$requestBo, _resultData$requestBo2, _resultData$parameter, _resultData$parameter2, _resultData$requestBo3;
 
                   var result, resultData, resbodyIndex, respref, dataProperties, item, _dataProperties$item$, dataPropRef, reqref;
 
@@ -305,9 +305,17 @@ export var ApifoxToYApiData = /*#__PURE__*/function () {
                                 type: item.type === 'string' ? RequestQueryType.string : RequestQueryType.number
                               };
                             })) || [],
-                            req_body_type: resultData.requestBody.jsonSchema ? RequestBodyType.json : RequestBodyType.raw,
+                            req_body_type: resultData.requestBody.type === 'multipart/form-data' ? RequestBodyType.form : resultData.requestBody.jsonSchema ? RequestBodyType.json : RequestBodyType.raw,
                             req_body_is_json_schema: !!resultData.requestBody.jsonSchema,
-                            req_body_form: [],
+                            req_body_form: ((_resultData$requestBo3 = resultData.requestBody.parameters) == null ? void 0 : _resultData$requestBo3.map(function (item) {
+                              return {
+                                name: item.name,
+                                desc: item.description,
+                                example: item.example,
+                                required: item.required ? Required.true : Required.false,
+                                type: item.type === 'string' ? RequestFormItemType.text : RequestFormItemType.file
+                              };
+                            })) || [],
                             req_body_other: resultData.requestBody.jsonSchema ? JSON.stringify(resultData.requestBody.jsonSchema) : '',
                             res_body_type: ResponseBodyType.json,
                             res_body_is_json_schema: true,

package/lib/esm/Generator.js

@@ -574,7 +574,7 @@ export var Generator = /*#__PURE__*/function () {
 
                         case 20:
                           // 始终写入主文件
-                          rawOutputContent = dedent(_templateObject3 || (_templateObject3 = _taggedTemplateLiteralLoose(["\n          /* tslint:disable */\n          /* eslint-disable */\n\n          /* \u8BE5\u6587\u4EF6\u7531 yapi-apifox-to-typescript \u81EA\u52A8\u751F\u6210\uFF0C\u8BF7\u52FF\u76F4\u63A5\u4FEE\u6539\uFF01\uFF01\uFF01 */\n\n          ", "\n        "])), syntheticalConfig.typesOnly ? dedent(_templateObject4 || (_templateObject4 = _taggedTemplateLiteralLoose(["\n                // @ts-ignore\n                type FileData = File\n\n                ", "\n              "])), content.join('\n\n').trim()) : dedent(_templateObject5 || (_templateObject5 = _taggedTemplateLiteralLoose(["\n                // @ts-ignore\n                // prettier-ignore\n                import { QueryStringArrayFormat, Method, ", "FileData, prepare } from 'yapi-apifox-to-typescript'\n                // @ts-ignore\n                // prettier-ignore\n                import type { RequestConfig, RequestFunctionRestArgs } from 'yapi-apifox-to-typescript'\n                // @ts-ignore\n                import request from ", "\n                ", "\n\n                type UserRequestRestArgs = RequestFunctionRestArgs<typeof request>\n\n                // Request: \u76EE\u524D React Hooks \u529F\u80FD\u6709\u7528\u5230\n                export type Request<TRequestData, TRequestConfig extends RequestConfig, TRequestResult> = (\n                  TRequestConfig['requestDataOptional'] extends true\n                    ? (requestData?: TRequestData, ...args: RequestFunctionRestArgs<typeof request>) => TRequestResult\n                    : (requestData: TRequestData, ...args: RequestFunctionRestArgs<typeof request>) => TRequestResult\n                ) & {\n                  requestConfig: TRequestConfig\n                }\n\n                ", "\n              "])), syntheticalConfig.ignoreUselessConfigVar ? "" : "RequestBodyType, ResponseBodyType, ", JSON.stringify(getNormalizedRelativePath(outputFilePath, requestFunctionFilePath)), !syntheticalConfig.reactHooks || !syntheticalConfig.reactHooks.enabled ? '' : dedent(_templateObject6 || (_templateObject6 = _taggedTemplateLiteralLoose(["\n                      // @ts-ignore\n                      import makeRequestHook from ", "\n                    "])), JSON.stringify(getNormalizedRelativePath(outputFilePath, requestHookMakerFilePath))), content.join('\n\n').trim())); // ref: https://prettier.io/docs/en/options.html
+                          rawOutputContent = dedent(_templateObject3 || (_templateObject3 = _taggedTemplateLiteralLoose(["\n          /* tslint:disable */\n          /* eslint-disable */\n\n          /* \u8BE5\u6587\u4EF6\u7531 yapi-apifox-to-typescript \u81EA\u52A8\u751F\u6210\uFF0C\u8BF7\u52FF\u76F4\u63A5\u4FEE\u6539\uFF01\uFF01\uFF01 */\n\n          ", "\n        "])), syntheticalConfig.typesOnly ? dedent(_templateObject4 || (_templateObject4 = _taggedTemplateLiteralLoose(["\n                // @ts-ignore\n                type FileData = File\n\n                ", "\n              "])), content.join('\n\n').trim()) : dedent(_templateObject5 || (_templateObject5 = _taggedTemplateLiteralLoose(["\n                // @ts-ignore\n                // prettier-ignore\n                import { QueryStringArrayFormat, Method, RequestBodyType, ", "FileData, prepare } from 'yapi-apifox-to-typescript'\n                // @ts-ignore\n                // prettier-ignore\n                import type { RequestConfig, RequestFunctionRestArgs } from 'yapi-apifox-to-typescript'\n                // @ts-ignore\n                import request from ", "\n                ", "\n\n                type UserRequestRestArgs = RequestFunctionRestArgs<typeof request>\n\n                // Request: \u76EE\u524D React Hooks \u529F\u80FD\u6709\u7528\u5230\n                export type Request<TRequestData, TRequestConfig extends RequestConfig, TRequestResult> = (\n                  TRequestConfig['requestDataOptional'] extends true\n                    ? (requestData?: TRequestData, ...args: RequestFunctionRestArgs<typeof request>) => TRequestResult\n                    : (requestData: TRequestData, ...args: RequestFunctionRestArgs<typeof request>) => TRequestResult\n                ) & {\n                  requestConfig: TRequestConfig\n                }\n\n                ", "\n              "])), syntheticalConfig.ignoreUselessConfigVar ? "" : "ResponseBodyType, ", JSON.stringify(getNormalizedRelativePath(outputFilePath, requestFunctionFilePath)), !syntheticalConfig.reactHooks || !syntheticalConfig.reactHooks.enabled ? '' : dedent(_templateObject6 || (_templateObject6 = _taggedTemplateLiteralLoose(["\n                      // @ts-ignore\n                      import makeRequestHook from ", "\n                    "])), JSON.stringify(getNormalizedRelativePath(outputFilePath, requestHookMakerFilePath))), content.join('\n\n').trim())); // ref: https://prettier.io/docs/en/options.html
 
                           _context11.next = 23;
                           return getPrettier(_this4.options.cwd);
@@ -1071,11 +1071,11 @@ export var Generator = /*#__PURE__*/function () {
                 return "\u63A5\u53E3 " + title + " \u7684 **\u8BF7\u6C42\u7C7B\u578B**";
               }), requestDataType.trim(), genComment(function (title) {
                 return "\u63A5\u53E3 " + title + " \u7684 **\u8FD4\u56DE\u7C7B\u578B**";
-              }), responseDataType.trim(), syntheticalConfig.typesOnly ? '' : dedent(_templateObject11 || (_templateObject11 = _taggedTemplateLiteralLoose(["\n            ", "\n            ", "\n                path: ", ",\n                method: Method.", ",\n                ", "", "", "", "", "\n            }\n\n            ", "\n            export const ", " = ", " (\n              requestData", ": ", ",\n              ...args: UserRequestRestArgs\n            ) => {\n              return request<", ">(\n                prepare(", ", requestData),\n                ...args,\n              )\n            }\n\n            ", ".requestConfig = ", "\n\n            ", "\n          "])), genComment(function (title) {
+              }), responseDataType.trim(), syntheticalConfig.typesOnly ? '' : dedent(_templateObject11 || (_templateObject11 = _taggedTemplateLiteralLoose(["\n            ", "\n            ", "\n                path: ", ",\n                method: Method.", ",\n                ", "", "", "", "requestBodyType: RequestBodyType.", ",\n          ", "\n            }\n\n            ", "\n            export const ", " = ", " (\n              requestData", ": ", ",\n              ...args: UserRequestRestArgs\n            ) => {\n              return request<", ">(\n                prepare(", ", requestData),\n                ...args,\n              )\n            }\n\n            ", ".requestConfig = ", "\n\n            ", "\n          "])), genComment(function (title) {
                 return "\u63A5\u53E3 " + title + " \u7684 **\u8BF7\u6C42\u914D\u7F6E**";
-              }), syntheticalConfig.withoutUrl !== true ? "const " + requestConfigName + ": " + requestConfigTypeName + " = " + COMPRESSOR_TREE_SHAKING_ANNOTATION + " {\n                  mockUrl: mockUrl" + categoryUID + ",\n                  devUrl: devUrl" + categoryUID + ",\n                  prodUrl: prodUrl" + categoryUID + "," : "const " + requestConfigName + ": " + requestConfigTypeName + " = " + COMPRESSOR_TREE_SHAKING_ANNOTATION + " {", JSON.stringify(extendedInterfaceInfo.path), extendedInterfaceInfo.method, paramNames.length === 0 ? '' : "paramNames: " + paramNamesLiteral + ",", queryNames.length === 0 ? '' : "queryNames: " + queryNamesLiteral + ",", syntheticalConfig.queryStringArrayFormat ? "queryStringArrayFormat: QueryStringArrayFormat." + syntheticalConfig.queryStringArrayFormat + "," : '', requestHeaders === '{}' ? '' : "requestHeaders: " + requestHeaders + ",", syntheticalConfig.ignoreUselessConfigVar ? "" : "requestBodyType: RequestBodyType." + (extendedInterfaceInfo.method === Method.GET ? RequestBodyType.query : extendedInterfaceInfo.req_body_type
+              }), syntheticalConfig.withoutUrl !== true ? "const " + requestConfigName + ": " + requestConfigTypeName + " = " + COMPRESSOR_TREE_SHAKING_ANNOTATION + " {\n                  mockUrl: mockUrl" + categoryUID + ",\n                  devUrl: devUrl" + categoryUID + ",\n                  prodUrl: prodUrl" + categoryUID + "," : "const " + requestConfigName + ": " + requestConfigTypeName + " = " + COMPRESSOR_TREE_SHAKING_ANNOTATION + " {", JSON.stringify(extendedInterfaceInfo.path), extendedInterfaceInfo.method, paramNames.length === 0 ? '' : "paramNames: " + paramNamesLiteral + ",", queryNames.length === 0 ? '' : "queryNames: " + queryNamesLiteral + ",", syntheticalConfig.queryStringArrayFormat ? "queryStringArrayFormat: QueryStringArrayFormat." + syntheticalConfig.queryStringArrayFormat + "," : '', requestHeaders === '{}' ? '' : "requestHeaders: " + requestHeaders + ",", extendedInterfaceInfo.method === Method.GET ? RequestBodyType.query : extendedInterfaceInfo.req_body_type
               /* istanbul ignore next */
-              || RequestBodyType.none) + ",\n                responseBodyType: ResponseBodyType." + extendedInterfaceInfo.res_body_type + ",\n                dataKey: dataKey" + categoryUID + ",\n                requestDataOptional: " + JSON.stringify(isRequestDataOptional) + ",\n                requestDataJsonSchema: " + JSON.stringify((_syntheticalConfig$js = syntheticalConfig.jsonSchema) != null && _syntheticalConfig$js.enabled && ((_syntheticalConfig$js2 = syntheticalConfig.jsonSchema) == null ? void 0 : _syntheticalConfig$js2.requestData) !== false ? requestDataJsonSchema : {}) + ",\n                responseDataJsonSchema: " + JSON.stringify((_syntheticalConfig$js3 = syntheticalConfig.jsonSchema) != null && _syntheticalConfig$js3.enabled && ((_syntheticalConfig$js4 = syntheticalConfig.jsonSchema) == null ? void 0 : _syntheticalConfig$js4.responseData) !== false ? responseDataJsonSchema : {}) + ",\n                requestFunctionName: " + JSON.stringify(requestFunctionName) + ",\n                extraInfo: " + JSON.stringify(requestFunctionExtraInfo), genComment(function (title) {
+              || RequestBodyType.none, syntheticalConfig.ignoreUselessConfigVar ? "" : "responseBodyType: ResponseBodyType." + extendedInterfaceInfo.res_body_type + ",\n            dataKey: dataKey" + categoryUID + ",\n                requestDataOptional: " + JSON.stringify(isRequestDataOptional) + ",\n                requestDataJsonSchema: " + JSON.stringify((_syntheticalConfig$js = syntheticalConfig.jsonSchema) != null && _syntheticalConfig$js.enabled && ((_syntheticalConfig$js2 = syntheticalConfig.jsonSchema) == null ? void 0 : _syntheticalConfig$js2.requestData) !== false ? requestDataJsonSchema : {}) + ",\n                responseDataJsonSchema: " + JSON.stringify((_syntheticalConfig$js3 = syntheticalConfig.jsonSchema) != null && _syntheticalConfig$js3.enabled && ((_syntheticalConfig$js4 = syntheticalConfig.jsonSchema) == null ? void 0 : _syntheticalConfig$js4.responseData) !== false ? responseDataJsonSchema : {}) + ",\n                requestFunctionName: " + JSON.stringify(requestFunctionName) + ",\n                extraInfo: " + JSON.stringify(requestFunctionExtraInfo), genComment(function (title) {
                 return "\u63A5\u53E3 " + title + " \u7684 **\u8BF7\u6C42\u51FD\u6570**";
               }), requestFunctionName, COMPRESSOR_TREE_SHAKING_ANNOTATION, isRequestDataOptional ? '?' : '', requestDataTypeName, responseDataTypeName, requestConfigName, requestFunctionName, requestConfigName, !syntheticalConfig.reactHooks || !syntheticalConfig.reactHooks.enabled ? '' : dedent(_templateObject12 || (_templateObject12 = _taggedTemplateLiteralLoose(["\n                  ", "\n                  export const ", " = ", " makeRequestHook<", ", ", ", ReturnType<typeof ", ">>(", ")\n                "])), genComment(function (title) {
                 return "\u63A5\u53E3 " + title + " \u7684 **React Hook**";

package/lib/esm/utils.js

@@ -709,7 +709,11 @@ function _httpGet() {
   return _httpGet.apply(this, arguments);
 }
 
-export var getFilteredCat = function getFilteredCat(cat, cats) {
+export var getFilteredCat = function getFilteredCat(cat, cats, isApifox) {
+  if (isApifox === void 0) {
+    isApifox = false;
+  }
+
   // 分类处理
   // 数组化
   var categoryIds = castArray(cat.id); // 全部分类
@@ -732,11 +736,14 @@ export var getFilteredCat = function getFilteredCat(cat, cats) {
     return !excludedCategoryIds.includes(Math.abs(id));
   }); // 删除不存在的分类
 
-  categoryIds = categoryIds.filter(function (id) {
-    return !!cats.find(function (c) {
-      return c._id === id;
+  if (!isApifox) {
+    categoryIds = categoryIds.filter(function (id) {
+      return !!cats.find(function (c) {
+        return c._id === id;
+      });
     });
-  }); // 顺序化
+  } // 顺序化
+
 
   categoryIds = categoryIds.sort();
   return categoryIds;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yapi-apifox-to-typescript",
-  "version": "4.1.0",
+  "version": "4.1.2",
   "description": "根据 YApi 或 Apifox 的接口定义生成 TypeScript/JavaScript 的接口类型及其请求函数代码。",
   "keywords": [
     "yapi",