@karry.sun/yapi-gen 0.2.7 → 0.2.9

package/dist/cjs/config/index.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeConfig = mergeConfig;
+exports.defineYapiGenConfig = defineYapiGenConfig;
+const path_1 = require("path");
+const schema_js_1 = require("./schema.js");
+/** 默认 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
+ * 当 YAPI_GEN_PROJECT_ROOT 存在时使用绝对路径（临时目录模式），否则使用 '../' 相对路径
+ */
+function getDefaultOutputFilePath(outputDir) {
+    const projectRoot = process.env.YAPI_GEN_PROJECT_ROOT;
+    const base = projectRoot ? (0, path_1.join)(projectRoot, outputDir) : `../${outputDir}`;
+    return (interfaceInfo) => {
+        const ids = process.env.YTT_INTERFACE_IDS;
+        if (ids)
+            return projectRoot ? (0, path_1.join)(base, '.temp', `api_${interfaceInfo._id}.ts`) : `${base}/.temp/api_${interfaceInfo._id}.ts`;
+        const catId = interfaceInfo.catid ?? 0;
+        let dirName = `cat_${catId}`;
+        try {
+            const mapping = process.env.YTT_CAT_MAPPING
+                ? JSON.parse(process.env.YTT_CAT_MAPPING)
+                : {};
+            if (mapping[String(catId)])
+                dirName = mapping[String(catId)];
+        }
+        catch (_) { }
+        return projectRoot ? (0, path_1.join)(base, dirName, 'index.ts') : `${base}/${dirName}/index.ts`;
+    };
+}
+/**
+ * 合并用户配置与默认配置，返回可直接用于 defineConfig([...]) 的配置对象
+ */
+function mergeConfig(user) {
+    const defaults = (0, schema_js_1.getDefaultConfig)();
+    const merged = {
+        ...defaults,
+        ...user,
+        reactHooks: user.reactHooks ?? defaults.reactHooks,
+    };
+    if (merged.outputFilePath == null) {
+        const outputDir = merged.outputDir ?? 'src/yapi';
+        merged.outputFilePath = getDefaultOutputFilePath(outputDir);
+    }
+    if (merged.preproccessInterface == null) {
+        merged.preproccessInterface = getDefaultPreproccessInterface;
+    }
+    return merged;
+}
+/**
+ * 定义 yapi-gen 配置的辅助函数，带类型提示与默认值
+ * 在项目根目录的 yapi-gen.config.ts 中使用：
+ *   import { defineYapiGenConfig } from 'yapi-gen';
+ *   export default defineYapiGenConfig({ serverUrl: '...', ... });
+ */
+function defineYapiGenConfig(config) {
+    return mergeConfig(config);
+}

package/dist/cjs/config/merge-config.test.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const index_js_1 = require("./index.js");
+(0, vitest_1.describe)('mergeConfig', () => {
+    (0, vitest_1.it)('应填充默认 outputFilePath', () => {
+        const config = (0, index_js_1.mergeConfig)({
+            serverUrl: 'https://yapi.example.com',
+            projects: [{ token: 'x', categories: [{ id: 0 }] }],
+        });
+        (0, vitest_1.expect)(config.outputFilePath).toBeDefined();
+        (0, vitest_1.expect)(typeof config.outputFilePath).toBe('function');
+        const path = config.outputFilePath({ _id: 1, catid: 401 }, {});
+        (0, vitest_1.expect)(path).toContain('src/yapi');
+        (0, vitest_1.expect)(path).toContain('cat_401');
+    });
+    (0, vitest_1.it)('应填充默认 preproccessInterface', () => {
+        const config = (0, index_js_1.mergeConfig)({
+            serverUrl: 'https://yapi.example.com',
+            projects: [{ token: 'x', categories: [{ id: 0 }] }],
+        });
+        (0, vitest_1.expect)(config.preproccessInterface).toBeDefined();
+        const result = config.preproccessInterface({ _id: 1, catid: 401 }, {});
+        (0, vitest_1.expect)(result).toEqual({ _id: 1, catid: 401 });
+    });
+    (0, vitest_1.it)('用户 outputFilePath 应覆盖默认', () => {
+        const customPath = 'custom/api.ts';
+        const config = (0, index_js_1.mergeConfig)({
+            serverUrl: 'https://yapi.example.com',
+            outputFilePath: customPath,
+            projects: [{ token: 'x', categories: [{ id: 0 }] }],
+        });
+        (0, vitest_1.expect)(config.outputFilePath).toBe(customPath);
+    });
+});
+(0, vitest_1.describe)('defineYapiGenConfig', () => {
+    (0, vitest_1.it)('应返回合并后的配置', () => {
+        const config = (0, index_js_1.defineYapiGenConfig)({
+            serverUrl: 'https://yapi.example.com',
+            projects: [{ token: 'x', categories: [{ id: 0 }] }],
+        });
+        (0, vitest_1.expect)(config.serverUrl).toBe('https://yapi.example.com');
+        (0, vitest_1.expect)(config.serverType).toBe('yapi');
+        (0, vitest_1.expect)(config.outputFilePath).toBeDefined();
+    });
+});

package/dist/cjs/config/schema.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDefaultConfig = getDefaultConfig;
+const DEFAULT_REACT_HOOKS = {
+    enabled: false,
+};
+/**
+ * 默认配置（与 ytt 常用默认一致）
+ */
+function getDefaultConfig() {
+    return {
+        serverType: 'yapi',
+        typesOnly: false,
+        target: 'typescript',
+        reactHooks: DEFAULT_REACT_HOOKS,
+        prodEnvName: 'production',
+    };
+}

package/dist/cjs/index.cjs.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveConfig = exports.mergeConfig = exports.defineYapiGenConfig = void 0;
+/**
+ * CJS 入口：供 require() 加载
+ */
+var index_js_1 = require("./config/index.js");
+Object.defineProperty(exports, "defineYapiGenConfig", { enumerable: true, get: function () { return index_js_1.defineYapiGenConfig; } });
+Object.defineProperty(exports, "mergeConfig", { enumerable: true, get: function () { return index_js_1.mergeConfig; } });
+var resolve_config_cjs_js_1 = require("./resolve-config.cjs.js");
+Object.defineProperty(exports, "resolveConfig", { enumerable: true, get: function () { return resolve_config_cjs_js_1.resolveConfig; } });

package/dist/cjs/package.json

@@ -0,0 +1 @@
+{"type":"commonjs"}

package/dist/cjs/resolve-config.cjs.js

@@ -0,0 +1,124 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveConfig = resolveConfig;
+/**
+ * CJS 版本：供 require() 加载，无 import.meta
+ * YAPI_GEN_PROJECT_ROOT 存在时用绝对路径，否则用 '../' 相对路径
+ */
+function forYttCwd(p) {
+    if (p.startsWith('/') || p.startsWith('@'))
+        return p;
+    const root = process.env.YAPI_GEN_PROJECT_ROOT;
+    return root ? (0, path_1.join)(root, p) : `../${p}`;
+}
+const fs_1 = require("fs");
+const path_1 = require("path");
+function getPackageName(cwd) {
+    try {
+        const { createRequire } = require('module');
+        const req = createRequire((0, path_1.join)(cwd, 'package.json'));
+        for (const id of ['@karry.sun/yapi-gen/package.json', 'yapi-gen/package.json']) {
+            try {
+                const pkgPath = req.resolve(id);
+                const pkg = JSON.parse((0, fs_1.readFileSync)(pkgPath, 'utf-8'));
+                return (pkg && pkg.name) || 'yapi-gen';
+            }
+            catch {
+                continue;
+            }
+        }
+    }
+    catch {
+        /* fallthrough */
+    }
+    return 'yapi-gen';
+}
+const DEFAULT_REQUEST_FILE_PATH = 'src/yapi/request.ts';
+const DEFAULT_AXIOS_INSTANCE_PATH = "/@/utils/http/axios";
+const DEFAULT_NUXT_REQUEST_IMPORT_PATH = '#imports';
+function normalizeRequestAdapter(adapter) {
+    if (adapter == null)
+        return { type: 'custom' };
+    if (adapter === 'axios') {
+        return { type: 'axios', axiosInstancePath: DEFAULT_AXIOS_INSTANCE_PATH, axiosExportName: 'defHttp' };
+    }
+    if (adapter === 'nuxt-bbm')
+        return { type: 'nuxt-bbm', requestImportPath: DEFAULT_NUXT_REQUEST_IMPORT_PATH };
+    if (adapter === 'custom')
+        return { type: 'custom' };
+    if (typeof adapter === 'object') {
+        if (adapter.type === 'axios') {
+            return {
+                type: 'axios',
+                axiosInstancePath: adapter.axiosInstancePath ?? DEFAULT_AXIOS_INSTANCE_PATH,
+                axiosExportName: adapter.axiosExportName ?? 'defHttp',
+            };
+        }
+        if (adapter.type === 'nuxt-bbm') {
+            return { type: 'nuxt-bbm', requestImportPath: adapter.requestImportPath ?? DEFAULT_NUXT_REQUEST_IMPORT_PATH };
+        }
+        if (adapter.type === 'custom') {
+            return { type: 'custom', requestFunctionFilePath: adapter.requestFunctionFilePath };
+        }
+    }
+    return { type: 'custom' };
+}
+function getAxiosAdapterFileContent(packageName, axiosInstancePath, exportName) {
+    const importLine = exportName === 'default'
+        ? `import defHttp from '${axiosInstancePath}';`
+        : `import { defHttp } from '${axiosInstancePath}';`;
+    return `/**
+ * 由 yapi-gen 预设 "axios" 自动生成，请勿直接修改。
+ */
+import { createAxiosAdapter } from '${packageName}/adapters/axios';
+${importLine}
+
+export default createAxiosAdapter(defHttp);
+`;
+}
+function getNuxtBbmAdapterFileContent(packageName, requestImportPath) {
+    return `/**
+ * 由 yapi-gen 预设 "nuxt-bbm" 自动生成，请勿直接修改。
+ */
+import { createNuxtAdapter } from '${packageName}/adapters/nuxt-bbm';
+import { request } from '${requestImportPath}';
+
+export default createNuxtAdapter(request);
+`;
+}
+function resolveConfig(config, cwd) {
+    const resolved = { ...config };
+    const adapter = normalizeRequestAdapter(resolved.requestAdapter);
+    const requestFilePath = resolved.requestFunctionFilePath ?? adapter.requestFunctionFilePath ?? DEFAULT_REQUEST_FILE_PATH;
+    const packageName = getPackageName(cwd);
+    if (adapter.type === 'axios') {
+        const content = getAxiosAdapterFileContent(packageName, adapter.axiosInstancePath, adapter.axiosExportName ?? 'defHttp');
+        const absolutePath = (0, path_1.resolve)(cwd, requestFilePath);
+        const dir = (0, path_1.dirname)(absolutePath);
+        if (!(0, fs_1.existsSync)(dir))
+            (0, fs_1.mkdirSync)(dir, { recursive: true });
+        (0, fs_1.writeFileSync)(absolutePath, content, 'utf-8');
+        resolved.requestFunctionFilePath = forYttCwd(requestFilePath);
+        delete resolved.requestAdapter;
+        return resolved;
+    }
+    if (adapter.type === 'nuxt-bbm') {
+        const content = getNuxtBbmAdapterFileContent(packageName, adapter.requestImportPath);
+        const absolutePath = (0, path_1.resolve)(cwd, requestFilePath);
+        const dir = (0, path_1.dirname)(absolutePath);
+        if (!(0, fs_1.existsSync)(dir))
+            (0, fs_1.mkdirSync)(dir, { recursive: true });
+        (0, fs_1.writeFileSync)(absolutePath, content, 'utf-8');
+        resolved.requestFunctionFilePath = forYttCwd(requestFilePath);
+        delete resolved.requestAdapter;
+        return resolved;
+    }
+    if (!resolved.requestFunctionFilePath && !adapter.requestFunctionFilePath) {
+        throw new Error('[yapi-gen] requestAdapter 为 custom 或未指定时，必须配置 requestFunctionFilePath');
+    }
+    if (adapter.requestFunctionFilePath) {
+        resolved.requestFunctionFilePath = forYttCwd(adapter.requestFunctionFilePath);
+    }
+    delete resolved.requestAdapter;
+    return resolved;
+}

package/dist/config/index.d.ts

@@ -1,4 +1,4 @@
-import type { YapiGenUserConfig } from './schema';
+import type { YapiGenUserConfig } from './schema.js';
 /**
  * 合并用户配置与默认配置，返回可直接用于 defineConfig([...]) 的配置对象
  */
@@ -10,5 +10,5 @@ export declare function mergeConfig(user: YapiGenUserConfig): YapiGenUserConfig;
  *   export default defineYapiGenConfig({ serverUrl: '...', ... });
  */
 export declare function defineYapiGenConfig(config: YapiGenUserConfig): YapiGenUserConfig;
-export type { YapiGenUserConfig, YapiGenProjectConfig, YapiGenCategoryConfig, YapiGenReactHooksConfig, YapiGenRequestAdapter, } from './schema';
+export type { YapiGenUserConfig, YapiGenProjectConfig, YapiGenCategoryConfig, YapiGenReactHooksConfig, YapiGenRequestAdapter, } from './schema.js';
 //# sourceMappingURL=index.d.ts.map

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;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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAuCrD;;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,aAAa,CAAC"}

package/dist/config/index.js

@@ -1,4 +1,5 @@
-import { getDefaultConfig } from './schema';
+import { join } from 'path';
+import { getDefaultConfig } from './schema.js';
 /** 默认 preproccessInterface：按 YTT_INTERFACE_IDS / YTT_CATEGORY_IDS 过滤，支持按接口/分类生成 */
 function getDefaultPreproccessInterface(interfaceInfo) {
     const ids = process.env.YTT_INTERFACE_IDS;
@@ -15,12 +16,17 @@ function getDefaultPreproccessInterface(interfaceInfo) {
     }
     return interfaceInfo;
 }
-/** 默认 outputFilePath：按 outputDir + 分类映射生成，支持 YTT_INTERFACE_IDS / YTT_CAT_MAPPING */
+/**
+ * 默认 outputFilePath：按 outputDir + 分类映射生成，支持 YTT_INTERFACE_IDS / YTT_CAT_MAPPING
+ * 当 YAPI_GEN_PROJECT_ROOT 存在时使用绝对路径（临时目录模式），否则使用 '../' 相对路径
+ */
 function getDefaultOutputFilePath(outputDir) {
+    const projectRoot = process.env.YAPI_GEN_PROJECT_ROOT;
+    const base = projectRoot ? join(projectRoot, outputDir) : `../${outputDir}`;
     return (interfaceInfo) => {
         const ids = process.env.YTT_INTERFACE_IDS;
         if (ids)
-            return `${outputDir}/.temp/api_${interfaceInfo._id}.ts`;
+            return projectRoot ? join(base, '.temp', `api_${interfaceInfo._id}.ts`) : `${base}/.temp/api_${interfaceInfo._id}.ts`;
         const catId = interfaceInfo.catid ?? 0;
         let dirName = `cat_${catId}`;
         try {
@@ -31,7 +37,7 @@ function getDefaultOutputFilePath(outputDir) {
                 dirName = mapping[String(catId)];
         }
         catch (_) { }
-        return `${outputDir}/${dirName}/index.ts`;
+        return projectRoot ? join(base, dirName, 'index.ts') : `${base}/${dirName}/index.ts`;
     };
 }
 /**

package/dist/config/merge-config.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=merge-config.test.d.ts.map

package/dist/config/merge-config.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-config.test.d.ts","sourceRoot":"","sources":["../../src/config/merge-config.test.ts"],"names":[],"mappings":""}

package/dist/config/merge-config.test.js

@@ -0,0 +1,44 @@
+import { describe, it, expect } from 'vitest';
+import { mergeConfig, defineYapiGenConfig } from './index.js';
+describe('mergeConfig', () => {
+    it('应填充默认 outputFilePath', () => {
+        const config = mergeConfig({
+            serverUrl: 'https://yapi.example.com',
+            projects: [{ token: 'x', categories: [{ id: 0 }] }],
+        });
+        expect(config.outputFilePath).toBeDefined();
+        expect(typeof config.outputFilePath).toBe('function');
+        const path = config.outputFilePath({ _id: 1, catid: 401 }, {});
+        expect(path).toContain('src/yapi');
+        expect(path).toContain('cat_401');
+    });
+    it('应填充默认 preproccessInterface', () => {
+        const config = mergeConfig({
+            serverUrl: 'https://yapi.example.com',
+            projects: [{ token: 'x', categories: [{ id: 0 }] }],
+        });
+        expect(config.preproccessInterface).toBeDefined();
+        const result = config.preproccessInterface({ _id: 1, catid: 401 }, {});
+        expect(result).toEqual({ _id: 1, catid: 401 });
+    });
+    it('用户 outputFilePath 应覆盖默认', () => {
+        const customPath = 'custom/api.ts';
+        const config = mergeConfig({
+            serverUrl: 'https://yapi.example.com',
+            outputFilePath: customPath,
+            projects: [{ token: 'x', categories: [{ id: 0 }] }],
+        });
+        expect(config.outputFilePath).toBe(customPath);
+    });
+});
+describe('defineYapiGenConfig', () => {
+    it('应返回合并后的配置', () => {
+        const config = defineYapiGenConfig({
+            serverUrl: 'https://yapi.example.com',
+            projects: [{ token: 'x', categories: [{ id: 0 }] }],
+        });
+        expect(config.serverUrl).toBe('https://yapi.example.com');
+        expect(config.serverType).toBe('yapi');
+        expect(config.outputFilePath).toBeDefined();
+    });
+});

package/dist/index.cjs.d.ts

@@ -0,0 +1,8 @@
+/**
+ * CJS 入口：供 require() 加载
+ */
+export { defineYapiGenConfig, mergeConfig } from './config/index.js';
+export { resolveConfig } from './resolve-config.cjs.js';
+export type { YapiGenUserConfig, YapiGenProjectConfig, YapiGenCategoryConfig, YapiGenReactHooksConfig, YapiGenRequestAdapter, } from './config/schema.js';
+export type { RequestFunctionParams } from 'yapi-to-typescript';
+//# sourceMappingURL=index.cjs.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.cjs.d.ts","sourceRoot":"","sources":["../src/index.cjs.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,YAAY,EACV,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC"}

package/dist/index.cjs.js

@@ -0,0 +1,5 @@
+/**
+ * CJS 入口：供 require() 加载
+ */
+export { defineYapiGenConfig, mergeConfig } from './config/index.js';
+export { resolveConfig } from './resolve-config.cjs.js';

package/dist/index.d.ts

@@ -2,8 +2,8 @@
  * yapi-gen
  * 基于 yapi-to-typescript 的 YApi 前端代码生成 CLI，支持可配置的请求适配器与多项目复用
  */
-export { defineYapiGenConfig, mergeConfig } from './config';
-export { resolveConfig } from './resolve-config';
-export type { YapiGenUserConfig, YapiGenProjectConfig, YapiGenCategoryConfig, YapiGenReactHooksConfig, YapiGenRequestAdapter, } from './config/schema';
+export { defineYapiGenConfig, mergeConfig } from './config/index.js';
+export { resolveConfig } from './resolve-config.js';
+export type { YapiGenUserConfig, YapiGenProjectConfig, YapiGenCategoryConfig, YapiGenReactHooksConfig, YapiGenRequestAdapter, } from './config/schema.js';
 export type { RequestFunctionParams } from 'yapi-to-typescript';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,YAAY,EACV,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AAGzB,YAAY,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,YAAY,EACV,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAG5B,YAAY,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC"}

package/dist/index.js

@@ -2,5 +2,5 @@
  * yapi-gen
  * 基于 yapi-to-typescript 的 YApi 前端代码生成 CLI，支持可配置的请求适配器与多项目复用
  */
-export { defineYapiGenConfig, mergeConfig } from './config';
-export { resolveConfig } from './resolve-config';
+export { defineYapiGenConfig, mergeConfig } from './config/index.js';
+export { resolveConfig } from './resolve-config.js';

package/dist/resolve-config.cjs.d.ts

@@ -0,0 +1,3 @@
+import type { YapiGenUserConfig } from './config/schema.js';
+export declare function resolveConfig(config: YapiGenUserConfig, cwd: string): YapiGenUserConfig;
+//# sourceMappingURL=resolve-config.cjs.d.ts.map

package/dist/resolve-config.cjs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-config.cjs.d.ts","sourceRoot":"","sources":["../src/resolve-config.cjs.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,iBAAiB,EAAyB,MAAM,oBAAoB,CAAC;AAiFnF,wBAAgB,aAAa,CAAC,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAoCvF"}

package/dist/resolve-config.cjs.js

@@ -0,0 +1,121 @@
+/**
+ * CJS 版本：供 require() 加载，无 import.meta
+ * YAPI_GEN_PROJECT_ROOT 存在时用绝对路径，否则用 '../' 相对路径
+ */
+function forYttCwd(p) {
+    if (p.startsWith('/') || p.startsWith('@'))
+        return p;
+    const root = process.env.YAPI_GEN_PROJECT_ROOT;
+    return root ? join(root, p) : `../${p}`;
+}
+import { existsSync, mkdirSync, writeFileSync, readFileSync } from 'fs';
+import { resolve, dirname, join } from 'path';
+function getPackageName(cwd) {
+    try {
+        const { createRequire } = require('module');
+        const req = createRequire(join(cwd, 'package.json'));
+        for (const id of ['@karry.sun/yapi-gen/package.json', 'yapi-gen/package.json']) {
+            try {
+                const pkgPath = req.resolve(id);
+                const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+                return (pkg && pkg.name) || 'yapi-gen';
+            }
+            catch {
+                continue;
+            }
+        }
+    }
+    catch {
+        /* fallthrough */
+    }
+    return 'yapi-gen';
+}
+const DEFAULT_REQUEST_FILE_PATH = 'src/yapi/request.ts';
+const DEFAULT_AXIOS_INSTANCE_PATH = "/@/utils/http/axios";
+const DEFAULT_NUXT_REQUEST_IMPORT_PATH = '#imports';
+function normalizeRequestAdapter(adapter) {
+    if (adapter == null)
+        return { type: 'custom' };
+    if (adapter === 'axios') {
+        return { type: 'axios', axiosInstancePath: DEFAULT_AXIOS_INSTANCE_PATH, axiosExportName: 'defHttp' };
+    }
+    if (adapter === 'nuxt-bbm')
+        return { type: 'nuxt-bbm', requestImportPath: DEFAULT_NUXT_REQUEST_IMPORT_PATH };
+    if (adapter === 'custom')
+        return { type: 'custom' };
+    if (typeof adapter === 'object') {
+        if (adapter.type === 'axios') {
+            return {
+                type: 'axios',
+                axiosInstancePath: adapter.axiosInstancePath ?? DEFAULT_AXIOS_INSTANCE_PATH,
+                axiosExportName: adapter.axiosExportName ?? 'defHttp',
+            };
+        }
+        if (adapter.type === 'nuxt-bbm') {
+            return { type: 'nuxt-bbm', requestImportPath: adapter.requestImportPath ?? DEFAULT_NUXT_REQUEST_IMPORT_PATH };
+        }
+        if (adapter.type === 'custom') {
+            return { type: 'custom', requestFunctionFilePath: adapter.requestFunctionFilePath };
+        }
+    }
+    return { type: 'custom' };
+}
+function getAxiosAdapterFileContent(packageName, axiosInstancePath, exportName) {
+    const importLine = exportName === 'default'
+        ? `import defHttp from '${axiosInstancePath}';`
+        : `import { defHttp } from '${axiosInstancePath}';`;
+    return `/**
+ * 由 yapi-gen 预设 "axios" 自动生成，请勿直接修改。
+ */
+import { createAxiosAdapter } from '${packageName}/adapters/axios';
+${importLine}
+
+export default createAxiosAdapter(defHttp);
+`;
+}
+function getNuxtBbmAdapterFileContent(packageName, requestImportPath) {
+    return `/**
+ * 由 yapi-gen 预设 "nuxt-bbm" 自动生成，请勿直接修改。
+ */
+import { createNuxtAdapter } from '${packageName}/adapters/nuxt-bbm';
+import { request } from '${requestImportPath}';
+
+export default createNuxtAdapter(request);
+`;
+}
+export function resolveConfig(config, cwd) {
+    const resolved = { ...config };
+    const adapter = normalizeRequestAdapter(resolved.requestAdapter);
+    const requestFilePath = resolved.requestFunctionFilePath ?? adapter.requestFunctionFilePath ?? DEFAULT_REQUEST_FILE_PATH;
+    const packageName = getPackageName(cwd);
+    if (adapter.type === 'axios') {
+        const content = getAxiosAdapterFileContent(packageName, adapter.axiosInstancePath, adapter.axiosExportName ?? 'defHttp');
+        const absolutePath = resolve(cwd, requestFilePath);
+        const dir = dirname(absolutePath);
+        if (!existsSync(dir))
+            mkdirSync(dir, { recursive: true });
+        writeFileSync(absolutePath, content, 'utf-8');
+        resolved.requestFunctionFilePath = forYttCwd(requestFilePath);
+        delete resolved.requestAdapter;
+        return resolved;
+    }
+    if (adapter.type === 'nuxt-bbm') {
+        const content = getNuxtBbmAdapterFileContent(packageName, adapter.requestImportPath);
+        const absolutePath = resolve(cwd, requestFilePath);
+        const dir = dirname(absolutePath);
+        if (!existsSync(dir))
+            mkdirSync(dir, { recursive: true });
+        writeFileSync(absolutePath, content, 'utf-8');
+        resolved.requestFunctionFilePath = forYttCwd(requestFilePath);
+        delete resolved.requestAdapter;
+        return resolved;
+    }
+    if (!resolved.requestFunctionFilePath && !adapter.requestFunctionFilePath) {
+        throw new Error('[yapi-gen] requestAdapter 为 custom 或未指定时，必须配置 requestFunctionFilePath');
+    }
+    if (adapter.requestFunctionFilePath) {
+        resolved.requestFunctionFilePath = forYttCwd(adapter.requestFunctionFilePath);
+    }
+    delete resolved.requestAdapter;
+    return resolved;
+}

package/dist/resolve-config.d.ts

@@ -1,4 +1,4 @@
-import type { YapiGenUserConfig } from './config/schema';
+import type { YapiGenUserConfig } from './config/schema.js';
 /**
  * 解析配置：若为预设（axios / nuxt-bbm），则生成并写入 request 文件，并补全 requestFunctionFilePath；
  * 返回去掉 requestAdapter 等字段、可供 ytt defineConfig 使用的配置。

package/dist/resolve-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-config.d.ts","sourceRoot":"","sources":["../src/resolve-config.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,iBAAiB,EAAyB,MAAM,iBAAiB,CAAC;AA4FhF;;;GAGG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,GAAG,iBAAiB,CA2CvF"}
+{"version":3,"file":"resolve-config.d.ts","sourceRoot":"","sources":["../src/resolve-config.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,iBAAiB,EAAyB,MAAM,oBAAoB,CAAC;AA4GnF;;;GAGG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,GAAG,iBAAiB,CA2CvF"}

package/dist/resolve-config.js

@@ -3,17 +3,25 @@
  */
 import { existsSync, mkdirSync, writeFileSync, readFileSync } from 'fs';
 import { resolve, dirname, join } from 'path';
-import { fileURLToPath } from 'url';
-function getPackageName() {
+import { createRequire } from 'module';
+function getPackageName(cwd) {
     try {
-        const __dirname = dirname(fileURLToPath(import.meta.url));
-        const pkgPath = join(__dirname, '..', 'package.json');
-        const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
-        return (pkg && pkg.name) || 'yapi-gen';
+        const req = createRequire(join(cwd, 'package.json'));
+        for (const id of ['@karry.sun/yapi-gen/package.json', 'yapi-gen/package.json']) {
+            try {
+                const pkgPath = req.resolve(id);
+                const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+                return (pkg && pkg.name) || 'yapi-gen';
+            }
+            catch {
+                continue;
+            }
+        }
     }
     catch {
-        return 'yapi-gen';
+        /* fallthrough */
     }
+    return 'yapi-gen';
 }
 const DEFAULT_REQUEST_FILE_PATH = 'src/yapi/request.ts';
 const DEFAULT_AXIOS_INSTANCE_PATH = "/@/utils/http/axios";
@@ -83,6 +91,15 @@ import { request } from '${requestImportPath}';
 export default createNuxtAdapter(request);
 `;
 }
+/**
+ * ytt 使用 -c 时 cwd 为配置所在目录；YAPI_GEN_PROJECT_ROOT 存在时用绝对路径，否则用 '../' 相对路径
+ */
+function forYttCwd(p) {
+    if (p.startsWith('/') || p.startsWith('@'))
+        return p;
+    const root = process.env.YAPI_GEN_PROJECT_ROOT;
+    return root ? join(root, p) : `../${p}`;
+}
 /**
  * 解析配置：若为预设（axios / nuxt-bbm），则生成并写入 request 文件，并补全 requestFunctionFilePath；
  * 返回去掉 requestAdapter 等字段、可供 ytt defineConfig 使用的配置。
@@ -91,7 +108,7 @@ export function resolveConfig(config, cwd) {
     const resolved = { ...config };
     const adapter = normalizeRequestAdapter(resolved.requestAdapter);
     const requestFilePath = resolved.requestFunctionFilePath ?? adapter.requestFunctionFilePath ?? DEFAULT_REQUEST_FILE_PATH;
-    const packageName = getPackageName();
+    const packageName = getPackageName(cwd);
     if (adapter.type === 'axios') {
         const content = getAxiosAdapterFileContent(packageName, adapter.axiosInstancePath, adapter.axiosExportName ?? 'defHttp');
         const absolutePath = resolve(cwd, requestFilePath);
@@ -100,7 +117,7 @@ export function resolveConfig(config, cwd) {
             mkdirSync(dir, { recursive: true });
         }
         writeFileSync(absolutePath, content, 'utf-8');
-        resolved.requestFunctionFilePath = requestFilePath;
+        resolved.requestFunctionFilePath = forYttCwd(requestFilePath);
         delete resolved.requestAdapter;
         return resolved;
     }
@@ -112,7 +129,7 @@ export function resolveConfig(config, cwd) {
             mkdirSync(dir, { recursive: true });
         }
         writeFileSync(absolutePath, content, 'utf-8');
-        resolved.requestFunctionFilePath = requestFilePath;
+        resolved.requestFunctionFilePath = forYttCwd(requestFilePath);
         delete resolved.requestAdapter;
         return resolved;
     }
@@ -121,7 +138,7 @@ export function resolveConfig(config, cwd) {
         throw new Error('[yapi-gen] requestAdapter 为 custom 或未指定时，必须配置 requestFunctionFilePath');
     }
     if (adapter.requestFunctionFilePath) {
-        resolved.requestFunctionFilePath = adapter.requestFunctionFilePath;
+        resolved.requestFunctionFilePath = forYttCwd(adapter.requestFunctionFilePath);
     }
     delete resolved.requestAdapter;
     return resolved;

package/dist/run.d.ts.map

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

package/dist/run.js

@@ -4,8 +4,9 @@
  * 支持目录映射、按接口/分类生成、合并模式（对应 web-finance-admin gen-api.mjs）
  */
 import { spawnSync } from 'child_process';
-import { existsSync, mkdirSync, writeFileSync } from 'fs';
+import { existsSync, mkdirSync, mkdtempSync, writeFileSync, rmSync } from 'fs';
 import { resolve, dirname, join } from 'path';
+import { tmpdir } from 'os';
 import { fileURLToPath } from 'url';
 import { createRequire } from 'module';
 import { readFileSync } from 'fs';
@@ -34,7 +35,6 @@ const CONFIG_NAMES = [
     '.yapi-genrc.js',
     '.yapi-genrc.mjs',
 ];
-const WRAPPER_DIR = '.yapi-gen';
 const WRAPPER_FILENAME = 'ytt.config.ts';
 function findConfig(cwd) {
     for (const name of CONFIG_NAMES) {
@@ -52,16 +52,38 @@ function getWrapperContent(cwd, configPath) {
     const packageName = getPackageName();
     const absoluteConfig = resolve(cwd, configPath);
     const configPathEscaped = JSON.stringify(absoluteConfig);
+    const projectPkgPath = resolve(cwd, 'package.json');
+    const projectPkgEscaped = JSON.stringify(projectPkgPath);
     return `/* 由 yapi-gen 自动生成，请勿修改 */
-const { defineConfig } = require('yapi-to-typescript');
-const { resolveConfig } = require('${packageName}');
 const { createRequire } = require('module');
 
-const req = createRequire(__filename);
+const req = createRequire(${projectPkgEscaped});
+const { defineConfig } = req('yapi-to-typescript');
+const { resolveConfig } = req('${packageName}');
+
 const userConfig = req(${configPathEscaped});
 const raw = userConfig.default ?? userConfig;
 const configList = Array.isArray(raw) ? raw : [raw];
-const resolvedList = configList.map((c) => resolveConfig(c, process.cwd()));
+let resolvedList = configList.map((c) => resolveConfig(c, process.cwd()));
+
+// 分类模式：注入 YTT_CATEGORY_IDS 到 categories，确保 ytt 拉取指定分类
+const catIdsEnv = process.env.YTT_CATEGORY_IDS;
+if (catIdsEnv && catIdsEnv.trim()) {
+  const catIds = catIdsEnv.split(',').map((s) => parseInt(s.trim(), 10)).filter((n) => !isNaN(n));
+  if (catIds.length > 0) {
+    resolvedList = resolvedList.map((cfg) => {
+      const out = { ...cfg };
+      if (out.projects) {
+        out.projects = out.projects.map((proj) => {
+          const base = proj.categories?.[0] || { id: 0 };
+          const categories = catIds.map((id) => ({ ...base, id }));
+          return { ...proj, categories };
+        });
+      }
+      return out;
+    });
+  }
+}
 
 module.exports = { default: defineConfig(resolvedList) };
 `;
@@ -133,8 +155,9 @@ export function run(options = {}) {
         console.error('[yapi-gen] 或使用 init 子命令：pnpm yapi-gen init');
         return 1;
     }
-    // 解析 gen-api CLI 参数（目录映射、按接口/分类生成）
-    const args = parseArgs(argv, cwd);
+    // 以配置文件所在目录为项目根，确保映射文件路径正确（支持 monorepo 等场景）
+    const projectRoot = dirname(configPath);
+    const args = parseArgs(argv, projectRoot);
     const { interfaceIds, categoryIds, manualMapping, outputDir, mappingFilePath } = args;
     const isInterfaceMode = interfaceIds.length > 0;
     const isCategoryMode = categoryIds.length > 0;
@@ -142,7 +165,7 @@ export function run(options = {}) {
         console.error('[yapi-gen] 接口模式与分类模式不能同时使用');
         return 1;
     }
-    const yapiDir = resolve(cwd, outputDir);
+    const yapiDir = resolve(projectRoot, outputDir);
     const tempDir = join(yapiDir, '.temp');
     const fileMapping = loadMapping(mappingFilePath);
     const mergedMapping = { ...fileMapping, ...manualMapping };
@@ -163,29 +186,35 @@ export function run(options = {}) {
     else {
         console.log('[yapi-gen] 全量生成');
     }
-    const wrapperDir = resolve(cwd, WRAPPER_DIR);
-    if (!existsSync(wrapperDir)) {
-        mkdirSync(wrapperDir, { recursive: true });
-    }
-    const wrapperPath = resolve(wrapperDir, WRAPPER_FILENAME);
-    const content = getWrapperContent(cwd, configPath);
+    const wrapperDir = mkdtempSync(join(tmpdir(), 'yapi-gen-'));
+    const wrapperPath = join(wrapperDir, WRAPPER_FILENAME);
+    const content = getWrapperContent(projectRoot, configPath);
     writeFileSync(wrapperPath, content, 'utf-8');
-    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,
-        },
-    });
-    if (result.status !== 0) {
-        return result.status ?? 1;
-    }
-    if (isInterfaceMode) {
-        mergeTempToTarget(yapiDir, tempDir, interfaceIds, fileMapping, manualMapping);
+    try {
+        const yttCliPath = require.resolve('yapi-to-typescript/lib/cjs/cli.js');
+        const result = spawnSync(process.execPath, [yttCliPath, '-c', wrapperPath], {
+            cwd: projectRoot,
+            stdio: 'inherit',
+            env: {
+                ...process.env,
+                YAPI_GEN_PROJECT_ROOT: projectRoot,
+                YTT_INTERFACE_IDS: process.env.YTT_INTERFACE_IDS,
+                YTT_CATEGORY_IDS: process.env.YTT_CATEGORY_IDS,
+                YTT_CAT_MAPPING: process.env.YTT_CAT_MAPPING,
+            },
+        });
+        if (result.status !== 0) {
+            return result.status ?? 1;
+        }
+        if (isInterfaceMode) {
+            mergeTempToTarget(yapiDir, tempDir, interfaceIds, fileMapping, manualMapping);
+        }
+        return 0;
+    }
+    finally {
+        try {
+            rmSync(wrapperDir, { recursive: true });
+        }
+        catch (_) { }
     }
-    return 0;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karry.sun/yapi-gen",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "基于 yapi-to-typescript 的 YApi 前端代码生成 CLI，支持可配置的请求适配器与多项目复用",
   "type": "module",
   "main": "dist/index.js",
@@ -9,6 +9,7 @@
     ".": {
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
+      "require": "./dist/cjs/index.cjs.js",
       "default": "./dist/index.js"
     },
     "./adapters/axios": {
@@ -35,7 +36,8 @@
     "yapi-to-typescript": "^3.38.0"
   },
   "devDependencies": {
-    "typescript": "^5.0.0"
+    "typescript": "^5.0.0",
+    "vitest": "^4.0.18"
   },
   "keywords": [
     "yapi",
@@ -46,6 +48,7 @@
   ],
   "license": "MIT",
   "scripts": {
-    "build": "tsc"
+    "build": "tsc && tsc -p tsconfig.cjs.json && node -e \"require('fs').writeFileSync('dist/cjs/package.json', '{\\\"type\\\":\\\"commonjs\\\"}\\n')\"",
+    "test": "vitest run"
   }
 }