@karry.sun/yapi-gen 0.2.0 → 0.2.1

package/README.md

@@ -1,6 +1,8 @@
 # yapi-gen
 
-基于 [yapi-to-typescript](https://github.com/fjc0k/yapi-to-typescript) 的 YApi 前端代码生成 CLI，支持可配置的请求适配器与多项目复用。适用于 Vite、Nuxt、Vue 等不同请求封装（axios、defHttp、Nuxt request 等）。
+基于 [yapi-to-typescript](https://github.com/fjc0k/yapi-to-typescript) 的 YApi 接口代码生成 CLI，支持可配置的请求适配器、目录映射与按需生成。适用于 Vite、Nuxt、Vue 等不同请求封装。
+
+---
 
 ## 安装
 
@@ -10,70 +12,112 @@ pnpm add -D @karry.sun/yapi-gen
 
 本包已内置 yapi-to-typescript，无需单独安装。
 
+---
+
 ## 快速开始
 
-1. **安装依赖**（在要生成接口的项目根目录）  
-   ```bash
-   pnpm add -D @karry.sun/yapi-gen
-   ```
-
-2. **生成配置文件**（若还没有 `yapi-gen.config.ts`）  
-   ```bash
-   pnpm yapi-gen init
-   ```  
-   会生成 `yapi-gen.config.ts`，用编辑器打开，按需修改：
-   - `serverUrl`：YApi 服务器地址  
-   - `projects[0].token`：YApi 项目 token（建议用 `process.env.YAPI_TOKEN`）  
-   - `requestAdapter`：`'axios'`（Vue/defHttp）或 `'nuxt-bbm'`（Nuxt），或 `'custom'` 并填写 `requestFunctionFilePath`  
-   - `outputFilePath`：生成文件的目录规则（默认按分类生成到 `src/yapi/cat_xxx/index.ts`）
-
-3. **生成接口代码**  
-   ```bash
-   pnpm yapi-gen
-   ```  
-   或在 `package.json` 的 `scripts` 里加 `"gen:api": "yapi-gen"`，然后执行：  
-   ```bash
-   pnpm gen:api
-   ```
-
-4. **在业务代码中引用**  
-   生成的文件在 `outputFilePath` 配置的路径下，按分类或单文件导出请求函数与类型，直接从对应路径 import 使用即可。
-
-
-5. 选择请求适配方式
-
-- **内置预设（推荐）**：在配置中设置 `requestAdapter: 'axios'` 或 `requestAdapter: 'nuxt-bbm'`，无需在各仓库维护 `request.ts`，运行 `yapi-gen` 时会自动生成并写入 `src/yapi/request.ts`（路径可配）。
-  - **axios**：适用于封装了 axios 的项目（如 defHttp）。可选 `requestAdapter: { type: 'axios', axiosInstancePath: '/@/utils/http/axios' }` 指定实例路径，默认 `'/@/utils/http/axios'`（defHttp 常见路径）。
-  - **nuxt-bbm**：适用于 Nuxt 项目，使用 Layer 的 `#imports` 或 `@bitunix/bbm` 的 request。可选 `requestAdapter: { type: 'nuxt-bbm', requestImportPath: '#imports' }`，默认 `'#imports'`。
-- **自定义**：设置 `requestAdapter: 'custom'` 并配置 `requestFunctionFilePath`，在对应文件中自行实现适配逻辑；或参考包内 `templates/request-*.ts` 复制后修改。
+### 1. 初始化
 
-## 配置说明
+```bash
+pnpm yapi-gen init
+```
+
+会生成：
+
+- `yapi-gen.config.ts`：主配置（serverUrl、token、requestAdapter 等）
+- `src/yapi/gen-api-mapping.json`：分类→目录名映射（可手动维护）
+
+### 2. 修改配置
+
+编辑 `yapi-gen.config.ts`，至少修改：
+
+- `serverUrl`：YApi 服务器地址
+- `projects[0].token`：项目 token（建议用 `process.env.YAPI_TOKEN`）
+
+### 3. 生成接口
+
+```bash
+pnpm yapi-gen
+```
+
+或在 `package.json` 中配置 `"gen:api": "yapi-gen"`，然后执行 `pnpm gen:api`。
+
+---
+
+## 请求适配方式
+
+| 方式 | 说明 |
+|------|------|
+| `'axios'` | 封装 axios/defHttp 的项目，自动生成 `src/yapi/request.ts` |
+| `'nuxt-bbm'` | Nuxt 项目，使用 `#imports` 或 `@bitunix/bbm` |
+| `'custom'` | 自定义，需配置 `requestFunctionFilePath` 指向项目内 request 文件 |
 
-`yapi-gen.config.ts` 使用 `defineYapiGenConfig` 导出单条配置（或数组，多条会合并为 `defineConfig([...])`）。主要字段与 [yapi-to-typescript 配置](https://fjc0k.github.io/yapi-to-typescript/handbook/config.html) 对齐：
+**axios 示例**：`requestAdapter: { type: 'axios', axiosInstancePath: '/@/utils/http/axios' }`
+
+**nuxt-bbm 示例**：`requestAdapter: { type: 'nuxt-bbm', requestImportPath: '#imports' }`
+
+---
+
+## 目录映射与按需生成
+
+### 命令用法
+
+```bash
+# 全量生成
+pnpm yapi-gen
+
+# 按分类生成
+pnpm yapi-gen cat_401
+pnpm yapi-gen cat_401=financialReconciliation   # 指定目录名并写入映射
+
+# 批量映射
+pnpm yapi-gen --map cat_401=financialReconciliation,cat_413=specialAccount
+
+# 按接口生成（合并模式）
+pnpm yapi-gen 2116
+pnpm yapi-gen 2116 --map cat_413=specialAccount
+
+# 自定义路径
+pnpm yapi-gen --output-dir src/yapi --mapping-file src/yapi/gen-api-mapping.json
+```
+
+### 映射文件
+
+- **路径**：`src/yapi/gen-api-mapping.json`（默认）
+- **格式**：`{ "cat_401": "financialReconciliation", "cat_413": "specialAccount" }`
+- **优先级**：命令行 > 配置文件 > 默认 `cat_xxx`
+- **映射变更时**：旧目录会自动重命名为新目录名
+
+```json
+// src/yapi/gen-api-mapping.json（由业务维护）
+{
+  "cat_401": "publicCategory",
+  "cat_413": "specialAccountAsset"
+}
+```
+
+---
+
+## 配置说明
 
 | 字段 | 说明 | 必填 |
 |------|------|------|
 | `serverUrl` | YApi 服务器地址 | 是 |
-| `serverType` | `'yapi'` \| `'swagger'` | 否，默认 `'yapi'` |
-| `requestAdapter` | 请求适配方式：`'axios'` / `'nuxt-bbm'` / `'custom'`，或对象形式带可选参数 | 否，与 `requestFunctionFilePath` 二选一 |
-| `requestFunctionFilePath` | 请求适配器文件路径；使用预设时可选（默认 `src/yapi/request.ts`），custom 时必填 | custom 时必填 |
-| `outputFilePath` | 生成文件路径或函数 `(interfaceInfo, changeCase) => string` | 是 |
-| `projects` | 项目列表，每项含 `token`、`categories` | 是 |
-| `dataKey` | 业务数据字段，如 `'result'`，适配器需据此解包 | 否 |
-| `prodEnvName` / `devEnvName` | 生产/测试环境名称（用于域名） | 否 |
-| `typesOnly` | 是否只生成类型 | 否，默认 `false` |
-| `target` | `'typescript'` \| `'javascript'` | 否，默认 `'typescript'` |
-| `reactHooks` | React Hooks 生成配置 | 否 |
+| `serverType` | `'yapi'` \| `'swagger'` | 否 |
+| `requestAdapter` | `'axios'` / `'nuxt-bbm'` / `'custom'` | 否 |
+| `requestFunctionFilePath` | 自定义 request 文件路径 | custom 时必填 |
+| `outputFilePath` | 生成文件路径或函数 | 是 |
+| `projects` | 项目列表（token、categories） | 是 |
+| `dataKey` | 业务数据字段，如 `'result'` | 否 |
 | `preproccessInterface` | 预处理/过滤接口 | 否 |
-| `getRequestFunctionName` | 请求函数命名 | 否 |
 
-YApi 的 **token** 建议通过环境变量注入，例如在 `projects[].token` 中写 `process.env.YAPI_TOKEN || 'fallback'`。
+---
 
 ## 配置文件查找顺序
 
-CLI 会按以下顺序查找配置（找到即用）：
+`yapi-gen.config.ts`、`yapi-gen.config.mts`、`yapi-gen.config.cts`、`yapi-gen.config.js`、`yapi-gen.config.mjs`、`yapi-gen.config.cjs`、`.yapi-genrc.ts`、`.yapi-genrc.mts`、`.yapi-genrc.js`、`.yapi-genrc.mjs`
 
-`yapi-gen.config.ts`、`yapi-gen.config.mts`、`yapi-gen.config.cts`、`yapi-gen.config.js`、`yapi-gen.config.mjs`、`yapi-gen.config.cjs`、`.yapi-genrc.ts`、`.yapi-genrc.mts`、`.yapi-genrc.js`、`.yapi-genrc.mjs`。
+---
 
 ## License
 

package/bin/yapi-gen.js

@@ -9,6 +9,7 @@ const runPath = join(__dirname, '..', 'dist', 'run.js');
 const runUrl = pathToFileURL(runPath).href;
 
 const { run } = await import(runUrl);
-const init = process.argv.includes('init');
-const code = run({ cwd: process.cwd(), init });
+const argv = process.argv.slice(2);
+const init = argv.includes('init');
+const code = run({ cwd: process.cwd(), init, argv });
 process.exit(code);

package/dist/config/schema.d.ts

@@ -50,6 +50,10 @@ export interface YapiGenUserConfig {
     devEnvName?: string;
     /** 业务数据字段，如 'result' / 'data'，请求函数需据此解包 */
     dataKey?: string | string[];
+    /** 生成文件输出根目录，用于目录映射与合并模式，默认 'src/yapi' */
+    outputDir?: string;
+    /** 分类->目录名映射文件路径，默认 '{outputDir}/gen-api-mapping.json'，可被业务维护 */
+    categoryMappingPath?: string;
     /**
      * 请求适配方式（与 requestFunctionFilePath 二选一）：
      * - 'axios'：封装 axios/defHttp，可选 axiosInstancePath

package/dist/config/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"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"}

package/dist/gen-api-cli.d.ts

@@ -0,0 +1,32 @@
+/**
+ * gen-api CLI 参数解析与目录映射逻辑
+ * 对应 web-finance-admin scripts/gen-api.mjs 的能力
+ */
+export interface GenApiArgs {
+    interfaceIds: string[];
+    categoryIds: string[];
+    manualMapping: Record<string, string>;
+    outputDir: string;
+    mappingFilePath: string;
+}
+/**
+ * 解析命令行参数
+ * 用法:
+ *   yapi-gen                     # 全量
+ *   yapi-gen 2116                # 仅接口 2116（合并模式）
+ *   yapi-gen cat_401             # 仅分类 401
+ *   yapi-gen cat_401=financialReconciliation
+ *   yapi-gen --map cat_401=financialReconciliation,cat_413=specialAccount
+ *   yapi-gen --output-dir src/yapi --mapping-file src/yapi/gen-api-mapping.json
+ */
+export declare function parseArgs(argv: string[] | undefined, cwd: string): GenApiArgs;
+export declare function loadMapping(mappingPath: string): Record<string, string>;
+export declare function saveMapping(mappingPath: string, mapping: Record<string, string>): void;
+export declare function getDirName(catId: string, fileMapping: Record<string, string>, manualMapping: Record<string, string>): string;
+/** 映射变更时重命名目录 */
+export declare function renameDirsOnMappingChange(yapiDir: string, fileMapping: Record<string, string>, mergedMapping: Record<string, string>): void;
+/** 转为 ytt 需要的格式：数字 key */
+export declare function mappingForYtt(m: Record<string, string>): Record<string, string>;
+/** 接口模式：将 .temp 下的单接口文件合并到分类文件中 */
+export declare function mergeTempToTarget(yapiDir: string, tempDir: string, interfaceIds: string[], fileMapping: Record<string, string>, manualMapping: Record<string, string>, tempFilePattern?: RegExp): void;
+//# sourceMappingURL=gen-api-cli.d.ts.map

package/dist/gen-api-cli.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gen-api-cli.d.ts","sourceRoot":"","sources":["../src/gen-api-cli.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAaH,MAAM,WAAW,UAAU;IACzB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;CACzB;AAKD;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,YAAwB,EAAE,GAAG,EAAE,MAAM,GAAG,UAAU,CA2CzF;AAED,wBAAgB,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAevE;AAED,wBAAgB,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAItF;AAMD,wBAAgB,UAAU,CACxB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACnC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,MAAM,CAKR;AAED,iBAAiB;AACjB,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACnC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,IAAI,CAoBN;AAED,0BAA0B;AAC1B,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAO/E;AA4ED,mCAAmC;AACnC,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EAAE,EACtB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACnC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,eAAe,GAAE,MAA0B,GAC1C,IAAI,CAuDN"}

package/dist/gen-api-cli.js

@@ -0,0 +1,245 @@
+/**
+ * gen-api CLI 参数解析与目录映射逻辑
+ * 对应 web-finance-admin scripts/gen-api.mjs 的能力
+ */
+import { readdirSync, readFileSync, writeFileSync, rmSync, existsSync, mkdirSync, renameSync, } from 'fs';
+import { join } from 'path';
+const DEFAULT_OUTPUT_DIR = 'src/yapi';
+const DEFAULT_MAPPING_FILENAME = 'gen-api-mapping.json';
+/**
+ * 解析命令行参数
+ * 用法:
+ *   yapi-gen                     # 全量
+ *   yapi-gen 2116                # 仅接口 2116（合并模式）
+ *   yapi-gen cat_401             # 仅分类 401
+ *   yapi-gen cat_401=financialReconciliation
+ *   yapi-gen --map cat_401=financialReconciliation,cat_413=specialAccount
+ *   yapi-gen --output-dir src/yapi --mapping-file src/yapi/gen-api-mapping.json
+ */
+export function parseArgs(argv = process.argv.slice(2), cwd) {
+    const interfaceIds = [];
+    const categoryIds = [];
+    const manualMapping = {};
+    let outputDir = DEFAULT_OUTPUT_DIR;
+    let mappingFilePath = '';
+    for (let i = 0; i < argv.length; i++) {
+        const arg = argv[i];
+        if (arg === '--ids' && argv[i + 1]) {
+            interfaceIds.push(...argv[i + 1].split(',').map((s) => s.trim()));
+            i++;
+        }
+        else if (arg === '--map' && argv[i + 1]) {
+            for (const pair of argv[i + 1].split(',')) {
+                const [key, val] = pair.split('=').map((s) => s.trim());
+                if (key && val) {
+                    const catKey = /^\d+$/.test(key) ? `cat_${key}` : key;
+                    manualMapping[catKey] = val;
+                }
+            }
+            i++;
+        }
+        else if (arg === '--output-dir' && argv[i + 1]) {
+            outputDir = argv[i + 1].trim();
+            i++;
+        }
+        else if (arg === '--mapping-file' && argv[i + 1]) {
+            mappingFilePath = argv[i + 1].trim();
+            i++;
+        }
+        else if (arg?.startsWith('cat_')) {
+            const parts = arg.split('=');
+            const catPart = parts[0].replace(/^cat_/, '');
+            categoryIds.push(catPart);
+            if (parts[1])
+                manualMapping[parts[0].trim()] = parts[1].trim();
+        }
+        else if (/^\d+$/.test(arg)) {
+            interfaceIds.push(arg);
+        }
+    }
+    if (!mappingFilePath) {
+        mappingFilePath = join(outputDir, DEFAULT_MAPPING_FILENAME);
+    }
+    mappingFilePath = join(cwd, mappingFilePath);
+    return { interfaceIds, categoryIds, manualMapping, outputDir, mappingFilePath };
+}
+export function loadMapping(mappingPath) {
+    try {
+        const content = readFileSync(mappingPath, 'utf-8');
+        const raw = JSON.parse(content);
+        const normalized = {};
+        for (const [k, v] of Object.entries(raw)) {
+            if (k && v) {
+                const key = /^\d+$/.test(k) ? `cat_${k}` : k;
+                normalized[key] = String(v);
+            }
+        }
+        return normalized;
+    }
+    catch {
+        return {};
+    }
+}
+export function saveMapping(mappingPath, mapping) {
+    const dir = join(mappingPath, '..');
+    mkdirSync(dir, { recursive: true });
+    writeFileSync(mappingPath, JSON.stringify(mapping, null, 2) + '\n', 'utf-8');
+}
+function toCatKey(catId) {
+    return catId.startsWith('cat_') ? catId : `cat_${catId}`;
+}
+export function getDirName(catId, fileMapping, manualMapping) {
+    const key = toCatKey(catId);
+    if (manualMapping[key])
+        return manualMapping[key];
+    if (fileMapping[key])
+        return fileMapping[key];
+    return `cat_${catId}`;
+}
+/** 映射变更时重命名目录 */
+export function renameDirsOnMappingChange(yapiDir, fileMapping, mergedMapping) {
+    for (const catKey of Object.keys(mergedMapping)) {
+        const oldDirName = fileMapping[catKey];
+        const newDirName = mergedMapping[catKey];
+        if (!oldDirName || !newDirName || oldDirName === newDirName)
+            continue;
+        const oldPath = join(yapiDir, oldDirName);
+        const newPath = join(yapiDir, newDirName);
+        if (!existsSync(oldPath))
+            continue;
+        try {
+            if (existsSync(newPath)) {
+                rmSync(newPath, { recursive: true });
+            }
+            renameSync(oldPath, newPath);
+            console.log(`[yapi-gen] 已重命名目录: ${oldDirName} -> ${newDirName}`);
+        }
+        catch (err) {
+            console.warn(`[yapi-gen] 重命名 ${oldDirName} -> ${newDirName} 失败:`, err?.message);
+        }
+    }
+}
+/** 转为 ytt 需要的格式：数字 key */
+export function mappingForYtt(m) {
+    const out = {};
+    for (const [k, v] of Object.entries(m)) {
+        const num = k.replace(/^cat_/, '');
+        if (/^\d+$/.test(num))
+            out[num] = v;
+    }
+    return out;
+}
+function extractCatId(content) {
+    const m = content.match(/interface\/api\/cat_(\d+)/);
+    return m ? m[1] : null;
+}
+function extractInterfaceBlock(content, interfaceId) {
+    const idStr = String(interfaceId);
+    const idRegex = new RegExp(`interface/api/${idStr}\\b`);
+    const nextInterfaceRegex = new RegExp(`interface/api/(?!${idStr}\\b)\\d+`);
+    const lines = content.split('\n');
+    let startIdx = -1;
+    let endIdx = -1;
+    for (let i = 0; i < lines.length; i++) {
+        if (idRegex.test(lines[i]) && startIdx === -1)
+            startIdx = i;
+        if (startIdx >= 0 && endIdx === -1 && i > startIdx && nextInterfaceRegex.test(lines[i])) {
+            endIdx = i;
+            break;
+        }
+    }
+    if (startIdx === -1)
+        return null;
+    if (endIdx === -1)
+        endIdx = lines.length;
+    return lines.slice(startIdx, endIdx).join('\n').trim();
+}
+function replaceInterfaceBlock(targetContent, interfaceId, newBlock) {
+    const idStr = String(interfaceId);
+    const idRegex = new RegExp(`interface/api/${idStr}\\b`);
+    const nextInterfaceRegex = new RegExp(`interface/api/(?!${idStr}\\b)\\d+`);
+    const lines = targetContent.split('\n');
+    let startIdx = -1;
+    let endIdx = -1;
+    for (let i = 0; i < lines.length; i++) {
+        if (idRegex.test(lines[i]) && startIdx === -1)
+            startIdx = i;
+        if (startIdx >= 0 && endIdx === -1 && i > startIdx && nextInterfaceRegex.test(lines[i])) {
+            endIdx = i;
+            break;
+        }
+    }
+    if (startIdx === -1)
+        return null;
+    if (endIdx === -1)
+        endIdx = lines.length;
+    const before = lines.slice(0, startIdx).join('\n');
+    const after = lines.slice(endIdx).join('\n');
+    return before + '\n\n' + newBlock + '\n\n' + after;
+}
+function replaceConstantRefs(block, targetContent) {
+    const targetMatch = targetContent && targetContent.match(/(mockUrl|devUrl|prodUrl|dataKey)_([a-zA-Z0-9_]+)/);
+    if (!targetMatch)
+        return block;
+    const targetSuffix = targetMatch[2];
+    return block.replace(/(mockUrl|devUrl|prodUrl|dataKey)_[a-zA-Z0-9_]+/g, (m) => m.replace(/_[a-zA-Z0-9_]+$/, '_' + targetSuffix));
+}
+function appendInterfaceBlock(targetContent, newBlock) {
+    const insertMarker = '/* prettier-ignore-end */';
+    const idx = targetContent.lastIndexOf(insertMarker);
+    if (idx >= 0) {
+        return (targetContent.slice(0, idx).trimEnd() + '\n\n' + newBlock + '\n\n' + targetContent.slice(idx));
+    }
+    return targetContent.trimEnd() + '\n\n' + newBlock + '\n';
+}
+/** 接口模式：将 .temp 下的单接口文件合并到分类文件中 */
+export function mergeTempToTarget(yapiDir, tempDir, interfaceIds, fileMapping, manualMapping, tempFilePattern = /^api_(\d+)\.ts$/) {
+    if (!existsSync(tempDir))
+        return;
+    const tempFiles = readdirSync(tempDir).filter((f) => tempFilePattern.test(f));
+    for (const file of tempFiles) {
+        const match = file.match(tempFilePattern);
+        if (!match || !interfaceIds.includes(match[1]))
+            continue;
+        const interfaceId = match[1];
+        const tempPath = join(tempDir, file);
+        const tempContent = readFileSync(tempPath, 'utf-8');
+        const catId = extractCatId(tempContent);
+        if (!catId) {
+            console.warn(`[yapi-gen] 无法从 ${file} 提取分类 ID，跳过`);
+            continue;
+        }
+        const dirName = getDirName(catId, fileMapping, manualMapping);
+        const targetDir = join(yapiDir, dirName);
+        const targetPath = join(targetDir, 'index.ts');
+        let targetContent = existsSync(targetPath) ? readFileSync(targetPath, 'utf-8') : '';
+        let newContent;
+        if (!targetContent || targetContent.trim() === '') {
+            mkdirSync(targetDir, { recursive: true });
+            newContent = tempContent;
+            console.log(`[yapi-gen] 已新增接口 ${interfaceId} -> ${dirName}/index.ts（新建分类）`);
+        }
+        else {
+            let newBlock = extractInterfaceBlock(tempContent, interfaceId);
+            if (!newBlock) {
+                console.warn(`[yapi-gen] 无法从 ${file} 提取接口块，跳过`);
+                continue;
+            }
+            newBlock = replaceConstantRefs(newBlock, targetContent);
+            const replaced = replaceInterfaceBlock(targetContent, interfaceId, newBlock);
+            if (!replaced) {
+                newContent = appendInterfaceBlock(targetContent, newBlock);
+                console.log(`[yapi-gen] 已新增接口 ${interfaceId} -> ${dirName}/index.ts`);
+            }
+            else {
+                newContent = replaced;
+                console.log(`[yapi-gen] 已更新接口 ${interfaceId} -> ${dirName}/index.ts`);
+            }
+        }
+        writeFileSync(targetPath, newContent, 'utf-8');
+    }
+    try {
+        rmSync(tempDir, { recursive: true });
+    }
+    catch (_) { }
+}

package/dist/run.d.ts

@@ -2,5 +2,6 @@ export declare function run(options?: {
     cwd?: string;
     configPath?: string;
     init?: boolean;
+    argv?: string[];
 }): number;
 //# sourceMappingURL=run.d.ts.map

package/dist/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"AAmIA,wBAAgB,GAAG,CAAC,OAAO,GAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,MAAM,CAmC/F"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"AAqKA,wBAAgB,GAAG,CAAC,OAAO,GAAE;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACZ,GAAG,MAAM,CAqFd"}

package/dist/run.js

@@ -1,6 +1,7 @@
 /**
  * CLI 执行逻辑：解析用户配置、生成 ytt 包装配置并执行 ytt
  * 从本包依赖的 yapi-to-typescript 调用 ytt，无需使用方单独安装
+ * 支持目录映射、按接口/分类生成、合并模式（对应 web-finance-admin gen-api.mjs）
  */
 import { spawnSync } from 'child_process';
 import { existsSync, mkdirSync, writeFileSync } from 'fs';
@@ -8,6 +9,7 @@ import { resolve, dirname, basename, relative, join } from 'path';
 import { fileURLToPath } from 'url';
 import { createRequire } from 'module';
 import { readFileSync } from 'fs';
+import { parseArgs, loadMapping, saveMapping, renameDirsOnMappingChange, mappingForYtt, mergeTempToTarget, } from './gen-api-cli';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const require = createRequire(import.meta.url);
 function getPackageName() {
@@ -68,6 +70,9 @@ export default defineConfig(resolvedList);
 }
 function runInit(cwd) {
     const configPath = resolve(cwd, 'yapi-gen.config.ts');
+    const outputDir = 'src/yapi';
+    const mappingPath = resolve(cwd, outputDir, 'gen-api-mapping.json');
+    let createdConfig = false;
     if (existsSync(configPath)) {
         console.log('[yapi-gen] 已存在 yapi-gen.config.ts，跳过创建');
     }
@@ -80,15 +85,25 @@ function runInit(cwd) {
 import { defineYapiGenConfig } from '${packageName}';
 
 export default defineYapiGenConfig({
+  // 替换为 Yapi 服务器地址
   serverUrl: 'https://yapi.example.com',
   serverType: 'yapi',
   // 请求适配：'axios' | 'nuxt-bbm' | 'custom'
-  requestAdapter: 'axios',
   // axios 时可选指定实例路径，默认 '/@/utils/http/axios'
   // requestAdapter: { type: 'axios', axiosInstancePath: '/@/utils/http/axios' },
+  requestAdapter: 'axios',
   outputFilePath: (interfaceInfo, changeCase) => {
+    const ids = process.env.YTT_INTERFACE_IDS;
+    if (ids) return \`src/yapi/.temp/api_\${interfaceInfo._id}.ts\`;
     const catId = interfaceInfo.catid ?? 0;
-    return \`src/yapi/cat_\${catId}/index.ts\`;
+    let dirName = \`cat_\${catId}\`;
+    try {
+      const mapping = process.env.YTT_CAT_MAPPING
+        ? (JSON.parse(process.env.YTT_CAT_MAPPING) as Record<string, string>)
+        : {};
+      if (mapping[String(catId)]) dirName = mapping[String(catId)];
+    } catch (_) {}
+    return \`src/yapi/\${dirName}/index.ts\`;
   },
   dataKey: 'result',
   preproccessInterface(interfaceInfo) {
@@ -120,13 +135,23 @@ export default defineYapiGenConfig({
 });
 `;
         writeFileSync(configPath, tpl, 'utf-8');
-        console.log('[yapi-gen] 已创建 yapi-gen.config.ts，请修改 serverUrl、token 后执行 pnpm yapi-gen 生成接口');
+        console.log('[yapi-gen] 已创建 yapi-gen.config.ts');
+        createdConfig = true;
+    }
+    if (!existsSync(mappingPath)) {
+        mkdirSync(resolve(cwd, outputDir), { recursive: true });
+        writeFileSync(mappingPath, JSON.stringify({}, null, 2) + '\n', 'utf-8');
+        console.log('[yapi-gen] 已创建 src/yapi/gen-api-mapping.json（分类→目录名映射，可手动维护）');
+    }
+    if (createdConfig) {
+        console.log('[yapi-gen] 请修改 serverUrl、token 后执行 pnpm yapi-gen 生成接口');
     }
     return 0;
 }
 export function run(options = {}) {
     const cwd = options.cwd ?? process.cwd();
-    if (options.init) {
+    const argv = options.argv ?? process.argv.slice(2);
+    if (options.init || argv.includes('init')) {
         return runInit(cwd);
     }
     const configPath = options.configPath ?? findConfig(cwd);
@@ -135,6 +160,36 @@ export function run(options = {}) {
         console.error('[yapi-gen] 或使用 init 子命令：pnpm yapi-gen init');
         return 1;
     }
+    // 解析 gen-api CLI 参数（目录映射、按接口/分类生成）
+    const args = parseArgs(argv, cwd);
+    const { interfaceIds, categoryIds, manualMapping, outputDir, mappingFilePath } = args;
+    const isInterfaceMode = interfaceIds.length > 0;
+    const isCategoryMode = categoryIds.length > 0;
+    if (isInterfaceMode && isCategoryMode) {
+        console.error('[yapi-gen] 接口模式与分类模式不能同时使用');
+        return 1;
+    }
+    const yapiDir = resolve(cwd, outputDir);
+    const tempDir = join(yapiDir, '.temp');
+    const fileMapping = loadMapping(mappingFilePath);
+    const mergedMapping = { ...fileMapping, ...manualMapping };
+    if (Object.keys(manualMapping).length > 0) {
+        renameDirsOnMappingChange(yapiDir, fileMapping, mergedMapping);
+        saveMapping(mappingFilePath, mergedMapping);
+        console.log('[yapi-gen] 已更新映射配置:', Object.keys(manualMapping).join(', '));
+    }
+    process.env.YTT_CAT_MAPPING = JSON.stringify(mappingForYtt(mergedMapping));
+    if (isInterfaceMode) {
+        process.env.YTT_INTERFACE_IDS = interfaceIds.join(',');
+        console.log(`[yapi-gen] 仅更新接口: ${interfaceIds.join(', ')}（合并模式，同分类其他接口保持不变）`);
+    }
+    else if (isCategoryMode) {
+        process.env.YTT_CATEGORY_IDS = categoryIds.join(',');
+        console.log(`[yapi-gen] 仅生成分类: cat_${categoryIds.join(', cat_')}`);
+    }
+    else {
+        console.log('[yapi-gen] 全量生成');
+    }
     const wrapperDir = resolve(cwd, WRAPPER_DIR);
     if (!existsSync(wrapperDir)) {
         mkdirSync(wrapperDir, { recursive: true });
@@ -142,11 +197,22 @@ export function run(options = {}) {
     const wrapperPath = resolve(wrapperDir, WRAPPER_FILENAME);
     const content = getWrapperContent(cwd, configPath);
     writeFileSync(wrapperPath, content, 'utf-8');
-    // 使用本包依赖的 yapi-to-typescript 的 CLI，不依赖使用方安装
     const yttCliPath = require.resolve('yapi-to-typescript/lib/cjs/cli.js');
     const result = spawnSync(process.execPath, [yttCliPath, '-c', wrapperPath], {
         cwd,
         stdio: 'inherit',
+        env: {
+            ...process.env,
+            YTT_INTERFACE_IDS: process.env.YTT_INTERFACE_IDS,
+            YTT_CATEGORY_IDS: process.env.YTT_CATEGORY_IDS,
+            YTT_CAT_MAPPING: process.env.YTT_CAT_MAPPING,
+        },
     });
-    return result.status ?? 1;
+    if (result.status !== 0) {
+        return result.status ?? 1;
+    }
+    if (isInterfaceMode) {
+        mergeTempToTarget(yapiDir, tempDir, interfaceIds, fileMapping, manualMapping);
+    }
+    return 0;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karry.sun/yapi-gen",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "基于 yapi-to-typescript 的 YApi 前端代码生成 CLI，支持可配置的请求适配器与多项目复用",
   "type": "module",
   "main": "dist/index.js",