fix: 修复指定导入文件后未正确输出

Author: cloudcome

src/generator/Generator.ts

@@ -86,7 +86,7 @@ export class Generator extends Emitter<GeneratorEmits> {
     // 3. 输出
     this.emit('process', makePayload('printing'));
     const printer = new Printer(openAPIV3Document, printerOptions);
-    const code = printer.print({ module, file });
+    const code = printer.print({ module, cwd, file });
 
     // 4. 写入
     this.emit('process', makePayload('writing'));

src/printer/index.ts

@@ -1,6 +1,6 @@
 import type { PrinterConfigs, PrinterOptions } from './types';
 import { type OpenAPILatest, OpenAPIVersion } from '../types/openapi';
-import { toRelative } from '../utils/path';
+import { toImportPath } from '../utils/path';
 import { isString, isUndefined } from '../utils/type-is';
 import { Arg } from './Arg';
 import { Args } from './Args';
@@ -188,14 +188,16 @@ export class Printer {
   private _printImports() {
     const {
       axiosImportName = '',
-      axiosImportFile = AXIOS_IMPORT_FILE,
-      axiosTypeImportFile = AXIOS_TYPE_IMPORT_FILE,
+      axiosImportFile,
+      axiosTypeImportFile,
       axiosRequestConfigTypeName = AXIOS_QUEST_CONFIG_TYPE_NAME,
       axiosResponseTypeName = AXIOS_PROMISE_TYPE_NAME,
     } = this.options || {};
-    const { file } = this.configs;
-    const importPath = toRelative(axiosImportFile, file);
-    const importTypePath = toRelative(axiosTypeImportFile, file);
+    const { cwd = '/', file } = this.configs;
+    const axiosImportFile2 = axiosImportFile || AXIOS_IMPORT_FILE;
+    const importPath = toImportPath(axiosImportFile2, cwd, file);
+    const axiosTypeImportFile2 = axiosTypeImportFile || axiosImportFile || AXIOS_TYPE_IMPORT_FILE;
+    const importTypePath = toImportPath(axiosTypeImportFile2, cwd, file);
 
     return [
       toImportString(AXIOS_IMPORT_NAME, axiosImportName, importPath),

src/printer/types.ts

@@ -118,6 +118,11 @@ export interface PrinterConfigs {
    */
   module?: string;
 
+  /**
+   * file cwd
+   */
+  cwd?: string;
+
   /**
    * file path
    */

src/utils/path.ts

@@ -1,5 +1,9 @@
 import path from 'node:path';
 
+export function isRelative(toFile: string) {
+  return /^\.{1,2}[/\\]/.test(toFile);
+}
+
 export function toRelative(toFile: string, fromFile?: string) {
   if (!fromFile)
     return toFile;
@@ -10,3 +14,18 @@ export function toRelative(toFile: string, fromFile?: string) {
   const relative = path.relative(path.dirname(fromFile), toFile);
   return relative.startsWith('.') ? relative : `./${relative}`;
 }
+
+export function toImportPath(toFile: string, cwd: string, fromFile?: string) {
+  // /a/b/c, /cwd
+  if (path.isAbsolute(toFile)) {
+    return fromFile ? toRelative(toFile, fromFile) : toFile;
+  }
+
+  // ./a/b/c, /cwd
+  if (isRelative(toFile)) {
+    return toImportPath(path.join(cwd, toFile), cwd, fromFile);
+  }
+
+  // a/b/c, /cwd
+  return toFile;
+}

test/example-dest/2.0/pet-store.ts

@@ -5,7 +5,7 @@
  * @description This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
  */
 
-import {axios as axios} from "axios";
+import axios from "axios";
 import {type AxiosRequestConfig as AxiosRequestConfig} from "axios";
 import {type AxiosPromise as AxiosPromise} from "axios";
 

test/example-dest/3.0/pet-store.ts

@@ -12,7 +12,7 @@
  * - [The source API definition for the Pet Store](https://github.com/swagger-api/swagger-petstore/blob/master/src/main/resources/openapi.yaml)
  */
 
-import {axios as axios} from "axios";
+import axios from "axios";
 import {type AxiosRequestConfig as AxiosRequestConfig} from "axios";
 import {type AxiosPromise as AxiosPromise} from "axios";
 

test/example-dest/3.1/pet-store.ts

@@ -9,7 +9,7 @@
  * @see {@link http://swagger.io Find out more about Swagger}
  */
 
-import {axios as axios} from "axios";
+import axios from "axios";
 import {type AxiosRequestConfig as AxiosRequestConfig} from "axios";
 import {type AxiosPromise as AxiosPromise} from "axios";
 

test/printer/options.test.ts

@@ -18,7 +18,7 @@ it('axios 模块导入名称默认', () => {
     hideInfo: true,
     hideHelpers: true,
   })).toMatchInlineSnapshot(`
-    "import {axios as axios} from "axios";
+    "import axios from "axios";
     import {type AxiosRequestConfig as AxiosRequestConfig} from "axios";
     import {type AxiosPromise as AxiosPromise} from "axios";
 

test/utils/path.test.ts

@@ -1,4 +1,10 @@
-import { toRelative } from '../../src/utils/path';
+import { isRelative, toImportPath, toRelative } from '../../src/utils/path';
+
+it('isRelative', () => {
+  expect(isRelative('./a/b/c')).toBe(true);
+  expect(isRelative('/a/b/c')).toBe(false);
+  expect(isRelative('a/b/c')).toBe(false);
+});
 
 it('toRelative', () => {
   expect(toRelative('./a/b/c')).toBe('./a/b/c');
@@ -9,3 +15,12 @@ it('toRelative', () => {
   expect(toRelative('/a/b/c', '/a/b/e')).toBe('./c');
   expect(toRelative('/a/b/c', '/a/d/e')).toBe('../b/c');
 });
+
+it('toImportPath', () => {
+  expect(toImportPath('./a/b/c', '/cwd')).toBe('/cwd/a/b/c');
+  expect(toImportPath('a/b/c', '/cwd')).toBe('a/b/c');
+  expect(toImportPath('/a/b/c', '/cwd')).toBe('/a/b/c');
+  expect(toImportPath('./a/b/c', '/cwd', '/cwd/d/e/f')).toBe('../../a/b/c');
+  expect(toImportPath('a/b/c', '/cwd', '/cwd/d/e/f')).toBe('a/b/c');
+  expect(toImportPath('/a/b/c', '/cwd', '/cwd/d/e/f')).toBe('../../../a/b/c');
+});