@wx-sab/renkei 1.2.4 → 1.3.0

package/README.md

@@ -157,8 +157,174 @@ export default defineConfig([
 ]);
 ```
 
+### CLI 命令
+
+```bash
+# 生成所有服务的所有接口
+renkei api
+
+# 只生成指定服务的接口
+renkei api -s dp-service
+
+# 只生成指定文件夹的接口（命令行方式）
+renkei api -f "用户管理,订单管理"
+
+# 交互式选择要生成的文件夹
+renkei api -i
+
+# 组合使用：交互式选择指定服务的文件夹
+renkei api -s dp-service -i
+```
+
+### 交互式选择文件夹
+
+当运行 `renkei api -i` 时，工具会：
+
+1. 分析每个服务的 swagger/apifox 文档
+2. 提取所有文件夹信息（基于 `x-apifox-folder` 字段）
+3. 显示交互式多选界面，默认选中"全部"选项
+4. 用户可以选择：
+   - 保持选中"全部"：生成所有接口
+   - 取消"全部"，选择具体文件夹：只生成选中的接口
+
+示例输出：
+```
+正在分析服务: dp-service
+
+发现以下文件夹:
+  1. 用户管理 (15 个接口)
+  2. 订单管理 (23 个接口)
+  3. 商品管理 (18 个接口)
+  4. 支付管理 (12 个接口)
+
+? 请选择要生成的文件夹 (空格选择，回车确认) (Press <space> to select, <a> to toggle all, <i> to invert selection)
+❯◉ 全部 (共 68 个接口)
+ ── 具体文件夹 ──
+ ◯ 用户管理 (15 个接口)
+ ◯ 订单管理 (23 个接口)
+ ◯ 商品管理 (18 个接口)
+ ◯ 支付管理 (12 个接口)
+```
+
+**操作说明：**
+- 默认选中"全部"，生成所有接口
+- 按 `空格` 取消"全部"，然后选择具体文件夹
+- 按 `a` 切换全选/全不选
+- 按 `i` 反选
+- 按 `回车` 确认选择
+
+### 文件夹过滤功能
+
+支持三种方式指定要生成的文件夹：
+
+#### 1. 配置文件方式
+
+在配置文件中通过 `folders` 字段指定：
+
+```typescript
+import { defineConfig } from "@wx-sab/renkei";
+
+export default defineConfig([
+  {
+    serviceName: "dp-service",
+    apifoxProjectId: "2954843",
+    // 只生成这两个文件夹的接口
+    folders: ["用户管理", "订单管理"],
+    customRequestUrl: (routeData) => {
+      return "/" + routeData["x-apifox-folder"].split("/")[0] + routeData.route;
+    },
+  }
+]);
+```
+
+#### 2. 命令行参数方式
+
+使用 `-f` 或 `--folder` 参数：
+
+```bash
+# 只生成指定文件夹的接口
+renkei api -f "用户管理,订单管理"
+
+# 指定服务和文件夹
+renkei api -s dp-service -f "用户管理,订单管理"
+```
+
+#### 3. 交互式选择方式（推荐）
+
+使用 `-i` 或 `--interactive` 参数：
+
+```bash
+# 交互式选择所有服务的文件夹
+renkei api -i
+
+# 交互式选择指定服务的文件夹
+renkei api -s dp-service -i
+```
+
+#### 注意事项
+
+1. **文件夹名称匹配**：文件夹名称基于 swagger/apifox 文档中的 `x-apifox-folder` 字段，取第一级目录名称
+2. **优先级**：交互式选择 > 命令行参数 > 配置文件
+3. **空数组**：如果 `folders` 为空数组或不设置，则生成所有接口
+4. **多服务**：每个服务可以独立配置不同的文件夹列表
+
 ## Examples
 
+### 文件夹过滤示例
+
+#### 场景1：只生成特定模块的接口
+
+```typescript
+import { defineConfig } from "@wx-sab/renkei";
+
+export default defineConfig([
+  {
+    serviceName: "dp-service",
+    apifoxProjectId: "2954843",
+    // 只生成用户管理和订单管理模块的接口
+    folders: ["用户管理", "订单管理"],
+    customRequestUrl: (routeData) => {
+      return "/" + routeData["x-apifox-folder"].split("/")[0] + routeData.route;
+    },
+  }
+]);
+```
+
+#### 场景2：多服务配置，每个服务过滤不同文件夹
+
+```typescript
+import { defineConfig } from "@wx-sab/renkei";
+
+export default defineConfig([
+  {
+    serviceName: "dp-service",
+    apifoxProjectId: "2954843",
+    folders: ["用户管理", "订单管理"],
+    customRequestUrl: (routeData) => {
+      return "/" + routeData["x-apifox-folder"].split("/")[0] + routeData.route;
+    },
+  },
+  {
+    serviceName: "cop-profile",
+    apifoxProjectId: "1234567",
+    folders: ["个人中心", "权限管理"],
+    customRequestUrl: (routeData) => {
+      return "/cop-profile" + routeData.route;
+    },
+  }
+]);
+```
+
+#### 场景3：命令行快速过滤
+
+```bash
+# 快速生成特定文件夹的接口，无需修改配置文件
+renkei api -s dp-service -f "用户管理,订单管理,商品管理"
+
+# 交互式选择，适合不确定有哪些文件夹时使用
+renkei api -i
+```
+
 ### 自定义接口的 mock 服务
 ```ts
 import { request } from '@/utils/request'

package/lib/commands/api.js

@@ -1,37 +1,92 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
+const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 const commander_1 = __importDefault(require("commander"));
 const generate_1 = require("../core/generate");
 const constants_1 = require("../core/constants");
-/**
- * 读取项目中的配置文件
- */
-const readProjectConfigFile = () => {
+const folder_selector_1 = require("../core/folder-selector");
+const config_utils_1 = require("../core/config-utils");
+const readProjectConfigFile = () => __awaiter(void 0, void 0, void 0, function* () {
     for (const file of constants_1.CONFIG_FILE_NAMES) {
         const fullFilePath = path_1.default.resolve(process.cwd(), file);
-        if (fs_1.default.existsSync(fullFilePath)) {
+        try {
+            yield promises_1.default.access(fullFilePath);
             if (fullFilePath.endsWith('.ts')) {
                 return require(fullFilePath).default;
             }
             return require(fullFilePath);
         }
+        catch (_a) {
+            continue;
+        }
     }
     return null;
-};
-const parse = new commander_1.default.Command('api').option('-s, --service <service>', '只获取指定的服务，多个服务用","分隔', ',').action((param, options) => {
-    var _a;
-    // 只生成指定服务
+});
+const parseCommandOptions = (param) => {
+    var _a, _b;
     const services = (((_a = param.service) === null || _a === void 0 ? void 0 : _a.split(',')) || []).filter(Boolean);
-    const config = readProjectConfigFile();
+    const folders = (((_b = param.folder) === null || _b === void 0 ? void 0 : _b.split(',')) || []).filter(Boolean);
+    return { services, folders };
+};
+const handleInteractiveSelection = (config, services) => __awaiter(void 0, void 0, void 0, function* () {
+    const _configs = (0, config_utils_1.collectConfig)(config).filter((conf) => {
+        if (services.length > 0) {
+            return services.includes(conf.serviceName);
+        }
+        return true;
+    });
+    try {
+        const folderSelections = yield (0, folder_selector_1.selectFoldersForServices)(_configs);
+        (0, config_utils_1.applyFoldersToConfig)(config, folderSelections, services);
+        return true;
+    }
+    catch (error) {
+        console.error('交互式选择失败:', error.message);
+        return false;
+    }
+});
+const handleCommandLineFolders = (config, services, folders) => {
+    const folderMap = new Map();
+    (0, config_utils_1.collectConfig)(config).forEach((conf) => {
+        if (services.length === 0 || services.includes(conf.serviceName)) {
+            folderMap.set(conf.serviceName, folders);
+        }
+    });
+    (0, config_utils_1.applyFoldersToConfig)(config, folderMap, services);
+};
+const parse = new commander_1.default.Command('api')
+    .option('-s, --service <service>', '只获取指定的服务，多个服务用","分隔', ',')
+    .option('-f, --folder <folder>', '只获取指定的文件夹，多个文件夹用","分隔', ',')
+    .option('-i, --interactive', '启用交互式选择文件夹', false)
+    .action((param) => __awaiter(void 0, void 0, void 0, function* () {
+    const { services, folders } = parseCommandOptions(param);
+    const config = yield readProjectConfigFile();
     if (!config) {
         console.warn('未找到配置文件');
         return;
     }
+    if (param.interactive) {
+        const success = yield handleInteractiveSelection(config, services);
+        if (!success) {
+            return;
+        }
+    }
+    else if (folders.length > 0) {
+        handleCommandLineFolders(config, services, folders);
+    }
     (0, generate_1.generateApis)(config, services);
-});
+}));
 exports.default = parse;

package/lib/core/config-utils.d.ts

@@ -0,0 +1,8 @@
+import { GenerateConfig, ServiceConfig } from './interface';
+export declare const SKIP_ROUTE_MARKER: "__SKIP__";
+export declare const collectConfig: (conf: GenerateConfig | GenerateConfig[], collects?: GenerateConfig[]) => GenerateConfig[];
+export interface FolderSelectionResult {
+    serviceName: string;
+    folders: string[];
+}
+export declare const applyFoldersToConfig: (conf: ServiceConfig | ServiceConfig[], folderSelections: Map<string, string[]>, services?: string[]) => void;

package/lib/core/config-utils.js

@@ -0,0 +1,45 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyFoldersToConfig = exports.collectConfig = exports.SKIP_ROUTE_MARKER = void 0;
+const lodash_1 = __importDefault(require("lodash"));
+exports.SKIP_ROUTE_MARKER = '__SKIP__';
+const collectConfig = (conf, collects = []) => {
+    if (!conf)
+        return collects;
+    if (Array.isArray(conf)) {
+        conf.forEach((con) => (0, exports.collectConfig)(con, collects));
+    }
+    else {
+        collects.push(lodash_1.default.omit(conf, 'projects'));
+        if (Array.isArray(conf.projects)) {
+            conf.projects.forEach((project) => (0, exports.collectConfig)(Object.assign(Object.assign({}, lodash_1.default.omit(conf, 'projects')), project), collects));
+        }
+    }
+    return collects;
+};
+exports.collectConfig = collectConfig;
+const applyFoldersToConfig = (conf, folderSelections, services = []) => {
+    if (Array.isArray(conf)) {
+        conf.forEach((c) => (0, exports.applyFoldersToConfig)(c, folderSelections, services));
+    }
+    else {
+        const serviceName = conf.serviceName;
+        const selectedFolders = folderSelections.get(serviceName);
+        if (selectedFolders && selectedFolders.length > 0) {
+            conf.folders = selectedFolders;
+        }
+        if (Array.isArray(conf.projects)) {
+            conf.projects.forEach((p) => {
+                const projectServiceName = p.serviceName || serviceName;
+                const projectFolders = folderSelections.get(projectServiceName);
+                if (projectFolders && projectFolders.length > 0) {
+                    p.folders = projectFolders;
+                }
+            });
+        }
+    }
+};
+exports.applyFoldersToConfig = applyFoldersToConfig;

package/lib/core/folder-selector.d.ts

@@ -0,0 +1,10 @@
+import { GenerateConfig } from './interface';
+export interface FolderInfo {
+    name: string;
+    path: string;
+    count: number;
+}
+export declare const fetchSwaggerDocument: (config: GenerateConfig) => Promise<any>;
+export declare const extractFoldersFromSwagger: (swaggerDoc: any) => FolderInfo[];
+export declare const selectFolders: (folders: FolderInfo[]) => Promise<string[]>;
+export declare const selectFoldersForServices: (configs: GenerateConfig[]) => Promise<Map<string, string[]>>;

package/lib/core/folder-selector.js

@@ -0,0 +1,147 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.selectFoldersForServices = exports.selectFolders = exports.extractFoldersFromSwagger = exports.fetchSwaggerDocument = void 0;
+const axios_1 = __importDefault(require("axios"));
+const inquirer_1 = __importDefault(require("inquirer"));
+const lodash_1 = __importDefault(require("lodash"));
+const utils_1 = require("./utils");
+const fetchSwaggerDocument = (config) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
+    const finalConfig = (0, utils_1.generateConfig)(config);
+    if (!finalConfig.source) {
+        throw new Error('未配置文档源');
+    }
+    try {
+        const response = yield axios_1.default.get(finalConfig.source, {
+            timeout: 30000,
+            validateStatus: (status) => status < 400
+        });
+        return response.data;
+    }
+    catch (error) {
+        const message = ((_b = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.message) || error.message;
+        throw new Error(`获取文档失败: ${message}`, { cause: error });
+    }
+});
+exports.fetchSwaggerDocument = fetchSwaggerDocument;
+const extractFoldersFromSwagger = (swaggerDoc) => {
+    const folderMap = new Map();
+    if (swaggerDoc.paths) {
+        Object.entries(swaggerDoc.paths).forEach(([path, methods]) => {
+            if (methods && typeof methods === 'object') {
+                Object.values(methods).forEach((methodInfo) => {
+                    if (methodInfo && methodInfo['x-apifox-folder']) {
+                        const folder = methodInfo['x-apifox-folder'];
+                        const folderPath = folder.split('/')[0];
+                        if (folderMap.has(folderPath)) {
+                            const info = folderMap.get(folderPath);
+                            info.count++;
+                            info.paths.add(path);
+                        }
+                        else {
+                            folderMap.set(folderPath, {
+                                count: 1,
+                                paths: new Set([path])
+                            });
+                        }
+                    }
+                });
+            }
+        });
+    }
+    const folders = [];
+    folderMap.forEach((info, name) => {
+        folders.push({
+            name,
+            path: name,
+            count: info.count
+        });
+    });
+    return lodash_1.default.sortBy(folders, ['name']);
+};
+exports.extractFoldersFromSwagger = extractFoldersFromSwagger;
+const selectFolders = (folders) => __awaiter(void 0, void 0, void 0, function* () {
+    if (folders.length === 0) {
+        console.log('未找到任何文件夹，将生成所有接口');
+        return [];
+    }
+    const totalCount = folders.reduce((sum, f) => sum + f.count, 0);
+    console.log('\n发现以下文件夹:');
+    folders.forEach((folder, index) => {
+        console.log(`  ${index + 1}. ${folder.name} (${folder.count} 个接口)`);
+    });
+    const { selectedFolders } = yield inquirer_1.default.prompt([
+        {
+            type: 'checkbox',
+            name: 'selectedFolders',
+            message: '请选择要生成的文件夹 (空格选择，回车确认)',
+            choices: [
+                {
+                    name: `全部 (共 ${totalCount} 个接口)`,
+                    value: '__ALL__',
+                    checked: true
+                },
+                new inquirer_1.default.Separator('── 具体文件夹 ──'),
+                ...folders.map(f => ({
+                    name: `${f.name} (${f.count} 个接口)`,
+                    value: f.name,
+                    checked: false
+                }))
+            ],
+            pageSize: 15,
+            loop: false
+        }
+    ]);
+    // 如果选择了"全部"选项，返回空数组（表示生成所有接口）
+    if (selectedFolders.includes('__ALL__')) {
+        return [];
+    }
+    return selectedFolders;
+});
+exports.selectFolders = selectFolders;
+const selectFoldersForServices = (configs) => __awaiter(void 0, void 0, void 0, function* () {
+    const folderSelections = new Map();
+    const failedServices = [];
+    for (const config of configs) {
+        console.log(`\n正在分析服务: ${config.serviceName}`);
+        try {
+            const swaggerDoc = yield (0, exports.fetchSwaggerDocument)(config);
+            const folders = (0, exports.extractFoldersFromSwagger)(swaggerDoc);
+            if (folders.length > 0) {
+                const selectedFolders = yield (0, exports.selectFolders)(folders);
+                folderSelections.set(config.serviceName, selectedFolders);
+            }
+            else {
+                console.log(`  服务 ${config.serviceName} 未找到文件夹信息，将生成所有接口`);
+                folderSelections.set(config.serviceName, []);
+            }
+        }
+        catch (error) {
+            const errorMessage = error.message || '未知错误';
+            console.error(`  获取服务 ${config.serviceName} 的文档失败: ${errorMessage}`);
+            failedServices.push({ serviceName: config.serviceName, error: errorMessage });
+            folderSelections.set(config.serviceName, []);
+        }
+    }
+    if (failedServices.length > 0) {
+        console.log('\n⚠️  部分服务获取失败:');
+        failedServices.forEach(({ serviceName, error }) => {
+            console.log(`  - ${serviceName}: ${error}`);
+        });
+        console.log('这些服务将生成所有接口\n');
+    }
+    return folderSelections;
+});
+exports.selectFoldersForServices = selectFoldersForServices;

package/lib/core/generate.js

@@ -28,36 +28,26 @@ const lodash_1 = __importDefault(require("lodash"));
 const swagger_typescript_api_1 = require("swagger-typescript-api");
 const cli_progress_1 = __importDefault(require("cli-progress"));
 const utils_1 = require("./utils");
+const config_utils_1 = require("./config-utils");
 /**
  * 单个配置生成
  */
 const generate = (conf) => {
-    // 最终使用的配置项
     const config = (0, utils_1.generateConfig)(conf);
-    // 模型命名空间
     const modelNamespace = lodash_1.default.upperFirst(lodash_1.default.camelCase(config.modelNamespace));
-    // 服务名
     const serviceName = lodash_1.default.upperFirst(lodash_1.default.camelCase(config.serviceName));
-    // 存放已生成的方法名
     const methodNameSet = new Set();
+    const skippedRoutes = new Set();
     return (0, swagger_typescript_api_1.generateApi)({
         url: config.source,
-        // 文件名
         name: config.name,
-        // 输出目录
         output: path_1.default.resolve(config.output, config.serviceName),
-        // 模块化？
         modular: false,
-        // 静默
         silent: true,
         extractRequestParams: true,
-        // 清空输出目录？
         cleanOutput: false,
-        // 生成请求客户端
         generateClient: false,
-        // 模板文件
         templates: path_1.default.resolve(__dirname, "../../templates"),
-        // 额外的，此处为了生成接口
         extraTemplates: [
             {
                 name: "index.ts",
@@ -67,7 +57,19 @@ const generate = (conf) => {
         hooks: {
             onCreateRouteName(routeNameInfo, rawRouteInfo) {
                 var _a, _b, _c;
-                // 自定义请求路由
+                if (config.folders && config.folders.length > 0) {
+                    const extendedRouteInfo = rawRouteInfo;
+                    const folder = extendedRouteInfo['x-apifox-folder'] || '';
+                    const folderPath = folder.split('/')[0];
+                    if (!config.folders.includes(folderPath)) {
+                        skippedRoutes.add(routeNameInfo.original);
+                        return {
+                            duplicate: false,
+                            original: config_utils_1.SKIP_ROUTE_MARKER,
+                            usage: config_utils_1.SKIP_ROUTE_MARKER
+                        };
+                    }
+                }
                 const newRoute = (_a = config.customRequestUrl) === null || _a === void 0 ? void 0 : _a.call(config, rawRouteInfo, config);
                 if (typeof newRoute === "string") {
                     rawRouteInfo.route = newRoute;
@@ -77,12 +79,10 @@ const generate = (conf) => {
                     // @ts-ignore
                     rawRouteInfo.mockUrl = newRoute.mockUrl;
                 }
-                // 检测路径中的常见错误
                 if (/ /.test(rawRouteInfo.route)) {
                     throw Error(`语法错误，路径中存在空格，请核对，可以尝试通过配置 customRequestUrl 进行处理，当前处理节点为：${rawRouteInfo.route}`);
                 }
                 else if (/([\u4e00-\u9fa5])/.test(rawRouteInfo.route)) {
-                    // 如果路径里面包含中文，警告用户，因为通常不会写带中文的api，但是直接抄配置文件很有可能由于大小项目的apifox目录组织结构不同，导致这个问题。
                     console.warn(`警告：检测到请求路径中存在中文，这通常是因为错误配置了 customRequestUrl，请进行核对，当前处理路径为：${rawRouteInfo.route} `);
                 }
                 const methodName = (_c = (_b = config === null || config === void 0 ? void 0 : config.customRouteName) === null || _b === void 0 ? void 0 : _b.call(config, routeNameInfo, rawRouteInfo)) !== null && _c !== void 0 ? _c : (0, utils_1.generateRouteName)(rawRouteInfo.method, rawRouteInfo.route);
@@ -96,10 +96,10 @@ const generate = (conf) => {
             },
             onPrepareConfig(currentConfiguration) {
                 return Object.assign(Object.assign({}, currentConfiguration), { modelNamespace,
-                    serviceName, requestTempalte: config.requestTempalte });
+                    serviceName, requestTempalte: config.requestTempalte, skippedRoutes,
+                    SKIP_ROUTE_MARKER: config_utils_1.SKIP_ROUTE_MARKER });
             },
             onParseSchema(originalSchema, parsedSchema) {
-                // 针对解析出的 any 做转换，主要是 swagger 3.0
                 if (parsedSchema.name === "any" &&
                     typeof parsedSchema.content === "string" &&
                     parsedSchema.$ref) {
@@ -109,8 +109,6 @@ const generate = (conf) => {
             },
             onCreateRoute(routeData) {
                 var _a;
-                // 将 /api/v1/order-mains/{orderId} 转成 /api/v1/order-mains/${orderId}
-                // routeData.raw.route 是进过 customRequestUrl 转换过的
                 // @ts-ignore
                 routeData.request.path = (_a = routeData.raw.route) === null || _a === void 0 ? void 0 : _a.replace(/\{([^}]+)\}/g, "${$1}");
                 return routeData;
@@ -122,36 +120,17 @@ const generate = (conf) => {
     });
 };
 exports.generate = generate;
-// 批量生成接口
-const generateApis = (config, services // 指定服务
-) => __awaiter(void 0, void 0, void 0, function* () {
+const generateApis = (config, services) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, e_1, _b, _c;
-    // 递归收集config下可能有的 projects ，也当做新的config
-    const collectConfig = (conf, collects = []) => {
-        if (!conf)
-            return collects;
-        if (Array.isArray(conf)) {
-            conf.forEach((con) => collectConfig(con, collects));
-        }
-        else {
-            collects.push(lodash_1.default.omit(conf, "projects"));
-            if (Array.isArray(conf.projects)) {
-                conf.projects.forEach((project) => collectConfig(Object.assign(Object.assign({}, lodash_1.default.omit(conf, "projects")), project), collects));
-            }
-        }
-        return collects;
-    };
-    const _configs = collectConfig(config).filter((conf) => {
-        // 只筛选指定的服务
+    const _configs = (0, config_utils_1.collectConfig)(config).filter((conf) => {
         if (services.length > 0) {
             return services.includes(conf.serviceName);
         }
         return true;
     });
-    // 进度条控制
     const progress = new cli_progress_1.default.SingleBar({});
     progress.start(_configs.length, 0);
-    let failedServices = []; // 统计失败服务
+    const failedServices = [];
     try {
         for (var _d = true, _configs_1 = __asyncValues(_configs), _configs_1_1; _configs_1_1 = yield _configs_1.next(), _a = _configs_1_1.done, !_a; _d = true) {
             _c = _configs_1_1.value;
@@ -162,7 +141,10 @@ const generateApis = (config, services // 指定服务
             }
             catch (e) {
                 console.error(e.message);
-                failedServices.push(conf.serviceName);
+                failedServices.push({
+                    serviceName: conf.serviceName,
+                    error: e.message || '未知错误'
+                });
             }
             finally {
                 progress.increment(1);
@@ -177,8 +159,14 @@ const generateApis = (config, services // 指定服务
         finally { if (e_1) throw e_1.error; }
     }
     progress.stop();
-    console.info(`✅ 执行完毕${failedServices.length
-        ? `，以下服务生成失败: ${failedServices.join("、")}`
-        : ""}`);
+    if (failedServices.length > 0) {
+        console.info('✅ 执行完毕，以下服务生成失败:');
+        failedServices.forEach(({ serviceName, error }) => {
+            console.info(`  - ${serviceName}: ${error}`);
+        });
+    }
+    else {
+        console.info('✅ 执行完毕');
+    }
 });
 exports.generateApis = generateApis;

package/lib/core/interface.d.ts

@@ -1,4 +1,15 @@
 import { GenerateApiParams, RawRouteInfo, RouteNameInfo } from "swagger-typescript-api";
+export interface ExtendedRawRouteInfo extends RawRouteInfo {
+    'x-apifox-folder'?: string;
+}
+export interface ConfigWithProjects extends BasicConfig {
+    projects?: ConfigWithProjects[];
+}
+export interface ServiceConfig {
+    serviceName: string;
+    folders?: string[];
+    projects?: ServiceConfig[];
+}
 /**
  * 基础配置
  */
@@ -60,6 +71,11 @@ export type BasicConfig = {
      * 自定义生成的接口名
      */
     customRouteName?(routeNameInfo: RouteNameInfo, rawRouteInfo: RawRouteInfo): string;
+    /**
+     * 要生成的文件夹列表（文件夹名称）
+     * 如果为空数组，则生成所有接口
+     */
+    folders?: string[];
 };
 /**
  * 如果 sourceType 是 apifox，则适用该配置项

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wx-sab/renkei",
-  "version": "1.2.4",
+  "version": "1.3.0",
   "description": "解析swagger转为ts代码，日本动漫《游戏王》中的‘Renkei’，意为连携或协作。",
   "main": "./lib/index.js",
   "bin": {
@@ -21,6 +21,7 @@
   "license": "ISC",
   "devDependencies": {
     "@types/cli-progress": "^3.11.5",
+    "@types/inquirer": "9.0.7",
     "@types/lodash": "^4.14.196",
     "@types/node": "^20.4.7",
     "typescript": "^5.1.6"
@@ -33,6 +34,7 @@
     "axios": "^1.4.0",
     "cli-progress": "^3.12.0",
     "commander": "^11.0.0",
+    "inquirer": "8.2.6",
     "lodash": "^4.17.21",
     "swagger-typescript-api": "13.0.3",
     "ts-node": "^10.9.1"

package/templates/api.ejs

@@ -1,5 +1,5 @@
 <%
-const { apiConfig, routes, utils, config, requestTemplate, modelNamespace, serviceName, namespace, requestTempalte, modelTypes } = it;
+const { apiConfig, routes, utils, config, requestTemplate, modelNamespace, serviceName, namespace, requestTempalte, modelTypes, SKIP_ROUTE_MARKER } = it;
 const { info, servers, externalDocs } = apiConfig;
 const { _, require, formatDescription } = utils;
 
@@ -92,9 +92,9 @@ export class <%~ serviceName %> {
 
   <% routes.combined && routes.combined.forEach(({ routes = [], moduleName }) => { %>
     <% routes.forEach((route) => { %>
-
+      <% if (route.routeName.usage !== SKIP_ROUTE_MARKER) { %>
         <%~ includeFile('./procedure-call.ejs', { ...it, route }) %>
-
+      <% } %>
     <% }) %>
   <% }) %>
 }

package/templates/procedure-call.ejs

@@ -24,6 +24,11 @@ const getListItemType = (type) => type.replace(/\((\w+)\)\[\]/g, (match, key) =>
 const getFullType = (type) => {
     const originType = type;
 
+    const trimmedType = typeof type === "string" ? type.trim() : "";
+    if (trimmedType.startsWith("{") && trimmedType.endsWith("}")) {
+        return type;
+    }
+
     // 处理列表list
     const matchList = type.match(/\((\w+)\)\[\]/)
     if (matchList) {