fix: 兼容 JSON 配置文件

Closes: #48
FrontEndDev-org · Mar 16, 2023 · 1a380fa · 1a380fa
1 parent 6a36926
commit 1a380fa
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/src/configure.ts b/src/configure.ts
@@ -1,7 +1,7 @@
 import { axiosImportDefault } from './const';
-import { Config, UserConfig } from './types';
+import { StrictConfig, UserConfig } from './types';
 
-export const defaults: Config = {
+export const defaults: StrictConfig = {
   cwd: process.cwd(),
   dest: 'src/apis',
   axiosImport: axiosImportDefault,
@@ -10,5 +10,5 @@ export const defaults: Config = {
 };
 
 export function defineConfig(config: UserConfig) {
-  return Object.assign({}, defaults, config);
+  return Object.assign({}, defaults, config) as StrictConfig;
 }
diff --git a/src/generator.ts b/src/generator.ts
@@ -3,11 +3,12 @@ import { cosmiconfig } from 'cosmiconfig';
 import fs from 'fs/promises';
 import path from 'path';
 import { generateApi } from 'swagger-typescript-api';
+import { defineConfig } from './configure';
 import { axiosImportDefault, helpersImport, templatesDir } from './const';
-import { Config, Oas } from './types';
+import { StrictConfig, Oas, UserConfig } from './types';
 import { exitError, normalizeError, tryCatch } from './utils';
 
-export async function generateItem(oas: Oas, config: Config) {
+export async function generateItem(oas: Oas, config: StrictConfig) {
   const { name, url, spec, axiosImport: axiosImportScope } = oas;
   const { cwd, dest, axiosImport: axiosImportGlobal, unwrapResponseData } = config;
   const axiosImport = axiosImportScope || axiosImportGlobal || axiosImportDefault;
@@ -32,7 +33,7 @@ export async function generateItem(oas: Oas, config: Config) {
   }
 }
 
-export async function generate(config: Config) {
+export async function generate(config: StrictConfig) {
   const { list } = config;
   let step = 0;
   const length = list.length;
@@ -60,7 +61,11 @@ export async function start() {
     return exitError('配置文件未找到');
   }
 
-  const config = result.config as Config;
+  const config = result.filepath.endsWith('js')
+    ? // js 文件使用 defineConfig，返回的是 StrictConfig
+      (result.config as StrictConfig)
+    : // json 文件是纯文本，返回的 UserConfig
+      defineConfig(result.config as UserConfig);
 
   try {
     await generate(config);

diff --git a/src/types.ts b/src/types.ts
@@ -53,7 +53,7 @@ export interface UserConfig {
   list: Oas[];
 }
 
-export type Config = Required<UserConfig>;
+export type StrictConfig = Required<UserConfig>;
 
 export enum ContentKind {
   JSON = 'JSON',