fix: 修复 Oas 类型联合错误

FrontEndDev-org · Mar 16, 2023 · 7bac37c · 7bac37c
1 parent 5e14f48
commit 7bac37c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/generator.ts b/src/generator.ts
@@ -5,17 +5,17 @@ import path from 'path';
 import { generateApi } from 'swagger-typescript-api';
 import { defineConfig } from './configure';
 import { axiosImportDefault, helpersImport, templatesDir } from './const';
-import { StrictConfig, Oas, UserConfig } from './types';
+import { StrictConfig, Oas, UserConfig, OasAsUrl, OasAsSpec } from './types';
 import { exitError, normalizeError, tryCatch } from './utils';
 
 export async function generateItem(oas: Oas, config: StrictConfig) {
-  const { name, url, spec, axiosImport: axiosImportScope } = oas;
+  const { name, axiosImport: axiosImportScope } = oas;
   const { cwd, dest, axiosImport: axiosImportGlobal, unwrapResponseData } = config;
   const axiosImport = axiosImportScope || axiosImportGlobal || axiosImportDefault;
   const { files } = await generateApi({
     name,
-    url,
-    spec,
+    url: (oas as OasAsUrl).url,
+    spec: (oas as OasAsSpec).spec,
     output: false,
     httpClientType: 'axios',
     templates: templatesDir,

diff --git a/src/index.ts b/src/index.ts
@@ -1,2 +1,3 @@
 export * from './generator';
 export * from './configure';
+export * from './types';
diff --git a/src/types.ts b/src/types.ts
@@ -10,15 +10,15 @@ interface OasBase {
   axiosImport?: string;
 }
 
-interface OasAsUrl extends OasBase {
+export interface OasAsUrl extends OasBase {
   url: string;
 }
 
-interface OasAsSpec extends OasBase {
+export interface OasAsSpec extends OasBase {
   spec: import('swagger-schema-official').Spec;
 }
 
-export interface Oas extends OasAsUrl, OasAsSpec {}
+export type Oas = OasAsUrl | OasAsSpec;
 
 export interface UserConfig {
   /**