fix: 修正 axiosImportFile 导入路径

Author: cloudcome

src/generators/Generator.ts

@@ -57,7 +57,7 @@ export class Generator extends Emitter<GeneratorEmits> {
         const { cwd, dest, ...globalPrinter } = generatorOptions;
         const { document, ...scopePrinter } = openAPIOptions;
         const fileName = `${module}.ts`;
-        const filePath = path.join(cwd, dest, fileName);
+        const file = path.join(cwd, dest, fileName);
 
         // 1. 参数合并
         const printerOptions = Object.assign({}, globalPrinter, scopePrinter);
@@ -73,7 +73,7 @@ export class Generator extends Emitter<GeneratorEmits> {
             module,
             stage: step,
             options,
-            filePath,
+            file,
         });
 
         // 2. 读取
@@ -85,12 +85,12 @@ export class Generator extends Emitter<GeneratorEmits> {
         // 3. 输出
         this.emit('process', makePayload('printing'));
         const printer = new Printer(openAPIV3Document, printerOptions);
-        const code = printer.print({ module });
+        const code = printer.print({ module, file: file });
 
         // 4. 写入
         this.emit('process', makePayload('writing'));
-        fs.mkdirSync(path.dirname(filePath), { recursive: true });
-        fs.writeFileSync(filePath, await formatTsCode(code), 'utf8');
+        fs.mkdirSync(path.dirname(file), { recursive: true });
+        fs.writeFileSync(file, await formatTsCode(code), 'utf8');
 
         this.emit('process', makePayload('generated'));
     }

src/generators/Logger.ts

@@ -16,7 +16,7 @@ export class Logger {
             chalk.yellowBright(`${step}/${payload.count}`),
             payload.module,
             payload.stage,
-            payload.stage === 'generated' ? path.relative(payload.options.cwd, payload.filePath) : '',
+            payload.stage === 'generated' ? path.relative(payload.options.cwd, payload.file) : '',
         );
     }
 

src/generators/types.ts

@@ -46,7 +46,7 @@ export interface GeneratingPayload {
     module: string;
     stage: GeneratingStage;
     options: GeneratingOptions;
-    filePath: string;
+    file: string;
 }
 
 export type GeneratorEmits = {

src/printer/index.ts

@@ -1,3 +1,4 @@
+import path from 'node:path';
 import { pkgName } from '../const';
 import type { OpenApi3 } from '../types/openapi';
 import { never } from '../utils/func';
@@ -24,6 +25,7 @@ import { JsDoc } from './JsDoc';
 import { Named } from './Named';
 import { Schemata } from './Schemata';
 import type { PrinterOptions, PrinterConfigs, RequestStatusCodeMatch } from './types';
+import { toRelative } from '../utils/path';
 
 const allowMethods = ['get', 'put', 'post', 'delete', 'options', 'head', 'patch', 'trace'];
 
@@ -95,7 +97,7 @@ export class Printer {
     private _printImports() {
         const {
             axiosImportName = AXIOS_IMPORT_NAME,
-            axiosNamedImport: axiosNamedImport,
+            axiosNamedImport,
             axiosImportFile = AXIOS_IMPORT_FILE,
             axiosRequestConfigTypeName = AXIOS_QUEST_CONFIG_TYPE_NAME,
             axiosResponseTypeName = AXIOS_PROMISE_TYPE_NAME,
@@ -104,15 +106,17 @@ export class Printer {
         const firstServer = this.document.servers?.[0];
         const defaultBaseURL = firstServer?.url || '/';
         const BASE_URL = isString(baseURL) ? baseURL : baseURL?.(this.document) || defaultBaseURL;
+        const { file } = this.configs;
+        const importPath = toRelative(axiosImportFile, file);
 
         return [
             //
             axiosNamedImport
                 ? // 具名导入
-                  `import {${axiosImportName}} from "${axiosImportFile}";`
+                  `import {${axiosImportName}} from "${importPath}";`
                 : // 默认导入
-                  `import ${axiosImportName} from "${axiosImportFile}";`,
-            `import type {${axiosRequestConfigTypeName}, ${axiosResponseTypeName}} from "${axiosImportFile}";`,
+                  `import ${axiosImportName} from "${importPath}";`,
+            `import type {${axiosRequestConfigTypeName}, ${axiosResponseTypeName}} from "${importPath}";`,
             `import {resolveURL} from "${pkgName}/client";`,
             `import type {OneOf} from "${pkgName}/client";`,
             '',

src/printer/types.ts

@@ -114,6 +114,11 @@ export type PrinterConfigs = {
      */
     module?: string;
 
+    /**
+     * file path
+     */
+    file?: string;
+
     hideInfo?: boolean;
     hideImports?: boolean;
     hideComponents?: boolean;

src/utils/path.ts

@@ -0,0 +1,9 @@
+import path from 'node:path';
+
+export function toRelative(to: string, from?: string) {
+    if (!from) return to;
+    if (!path.isAbsolute(to)) return to;
+
+    const relative = path.relative(from, to);
+    return relative.startsWith('.') ? relative : `./${relative}`;
+}

test/generators/Logger.test.ts

@@ -14,7 +14,7 @@ test('Logger', async () => {
         count: 99,
         module: 'test',
         stage: 'generated',
-        filePath: '/a/b/c/d/e/f',
+        file: '/a/b/c/d/e/f',
         options: {
             cwd: '/a/b/c',
             dest: '',

test/utils/path.test.ts

@@ -0,0 +1,11 @@
+import { toRelative } from '../../src/utils/path';
+
+test('toRelative', () => {
+    expect(toRelative('./a/b/c')).toBe('./a/b/c');
+    expect(toRelative('/a/b/c')).toBe('/a/b/c');
+    expect(toRelative('./a/b/c', '/a')).toBe('./a/b/c');
+    expect(toRelative('/a/b/c', '/a')).toBe('./b/c');
+    expect(toRelative('/a/b/c', '/a/b')).toBe('./c');
+    expect(toRelative('/a/b/c', '/a/b/e')).toBe('../c');
+    expect(toRelative('/a/b/c', '/a/d/e')).toBe('../../b/c');
+});