@karry.sun/yapi-gen 0.2.4 → 0.2.6

package/README.md

@@ -110,7 +110,7 @@ pnpm yapi-gen --output-dir src/yapi --mapping-file src/yapi/gen-api-mapping.json
 | `outputDir` | 生成根目录，默认 `src/yapi` | 否 |
 | `projects` | 项目列表（token、categories） | 是 |
 | `dataKey` | 业务数据字段（如 `'result'` / `'data'`），axios/nuxt-bbm 适配器会据此从响应中解包业务数据 | 否 |
-| `preproccessInterface` | 预处理接口：可过滤（返回 `false` 不生成）或改写接口信息。常用于按环境变量过滤 | 否 |
+| `preproccessInterface` | 预处理接口：可过滤或改写。不填时已内置按 YTT_INTERFACE_IDS / YTT_CATEGORY_IDS 过滤（支持按接口/分类生成） | 否 |
 
 ---
 

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAoBlD;;GAEG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,iBAAiB,GAAG,iBAAiB,CAYtE;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,iBAAiB,GAAG,iBAAiB,CAEhF;AAED,YAAY,EACV,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAkClD;;GAEG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,iBAAiB,GAAG,iBAAiB,CAetE;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,iBAAiB,GAAG,iBAAiB,CAEhF;AAED,YAAY,EACV,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,UAAU,CAAC"}

package/dist/config/index.js

@@ -1,4 +1,20 @@
 import { getDefaultConfig } from './schema';
+/** 默认 preproccessInterface：按 YTT_INTERFACE_IDS / YTT_CATEGORY_IDS 过滤，支持按接口/分类生成 */
+function getDefaultPreproccessInterface(interfaceInfo) {
+    const ids = process.env.YTT_INTERFACE_IDS;
+    const catIds = process.env.YTT_CATEGORY_IDS;
+    if (ids) {
+        const allowList = ids.split(',').map((s) => parseInt(s.trim(), 10));
+        if (!allowList.includes(interfaceInfo._id))
+            return false;
+    }
+    else if (catIds) {
+        const allowList = catIds.split(',').map((s) => s.trim());
+        if (!allowList.includes(String(interfaceInfo.catid)))
+            return false;
+    }
+    return interfaceInfo;
+}
 /** 默认 outputFilePath：按 outputDir + 分类映射生成，支持 YTT_INTERFACE_IDS / YTT_CAT_MAPPING */
 function getDefaultOutputFilePath(outputDir) {
     return (interfaceInfo) => {
@@ -32,6 +48,9 @@ export function mergeConfig(user) {
         const outputDir = merged.outputDir ?? 'src/yapi';
         merged.outputFilePath = getDefaultOutputFilePath(outputDir);
     }
+    if (merged.preproccessInterface == null) {
+        merged.preproccessInterface = getDefaultPreproccessInterface;
+    }
     return merged;
 }
 /**

package/dist/run.d.ts.map

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

@@ -5,7 +5,7 @@
  */
 import { spawnSync } from 'child_process';
 import { existsSync, mkdirSync, writeFileSync } from 'fs';
-import { resolve, dirname, basename, relative, join } from 'path';
+import { resolve, dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 import { createRequire } from 'module';
 import { readFileSync } from 'fs';
@@ -51,21 +51,19 @@ function findConfig(cwd) {
 function getWrapperContent(cwd, configPath) {
     const packageName = getPackageName();
     const absoluteConfig = resolve(cwd, configPath);
-    const configDir = dirname(absoluteConfig);
-    const configBase = basename(absoluteConfig).replace(/\.[^.]+$/, '') || 'yapi-gen.config';
-    const wrapperDir = resolve(cwd, WRAPPER_DIR);
-    const rel = relative(wrapperDir, configDir).replace(/\\/g, '/');
-    const relativeImport = (rel ? rel + '/' : '') + configBase;
+    const configPathEscaped = JSON.stringify(absoluteConfig);
     return `/* 由 yapi-gen 自动生成，请勿修改 */
-import { defineConfig } from 'yapi-to-typescript';
-import { resolveConfig } from '${packageName}';
+const { defineConfig } = require('yapi-to-typescript');
+const { resolveConfig } = require('${packageName}');
+const { createRequire } = require('module');
 
-const userConfig = await import('${relativeImport}');
+const require = createRequire(__filename);
+const userConfig = require(${configPathEscaped});
 const raw = userConfig.default ?? userConfig;
 const configList = Array.isArray(raw) ? raw : [raw];
 const resolvedList = configList.map((c) => resolveConfig(c, process.cwd()));
 
-export default defineConfig(resolvedList);
+module.exports = { default: defineConfig(resolvedList) };
 `;
 }
 function runInit(cwd) {
@@ -92,21 +90,8 @@ export default defineYapiGenConfig({
   // axios 时可选指定实例路径，默认 '/@/utils/http/axios'
   // requestAdapter: { type: 'axios', axiosInstancePath: '/@/utils/http/axios' },
   requestAdapter: 'axios',
-  // outputFilePath 可不填，默认按 outputDir + 分类映射生成；需要自定义时再配置
+  // outputFilePath、preproccessInterface 可不填，已内置按 outputDir + 分类映射及按接口/分类过滤
   dataKey: 'result',
-  preproccessInterface(interfaceInfo) {
-    // 可选：按环境变量过滤接口。YTT_INTERFACE_IDS=1,2,3 或 YTT_CATEGORY_IDS=401,413
-    const ids = process.env.YTT_INTERFACE_IDS;
-    const catIds = process.env.YTT_CATEGORY_IDS;
-    if (ids) {
-      const allowList = ids.split(',').map((s) => parseInt(s.trim(), 10));
-      if (!allowList.includes(interfaceInfo._id)) return false;
-    } else if (catIds) {
-      const allowList = catIds.split(',').map((s) => s.trim());
-      if (!allowList.includes(String(interfaceInfo.catid))) return false;
-    }
-    return interfaceInfo;
-  },
   projects: [
     {
       token: process.env.YAPI_TOKEN || 'your-project-token',

package/package.json

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