chore: clean code

Author: rookie-luochao

README-en_US.md

@@ -51,14 +51,6 @@ export default defineConfig({
   schemaPath: 'http://petstore.swagger.io/v2/swagger.json',
   serversPath: './src/apis',
 });
-
-// 或
-
-// import type { GenerateServiceProps } from 'openapi-ts-request';
-
-// export default {
-//   schemaPath: 'http://petstore.swagger.io/v2/swagger.json',
-// } as GenerateServiceProps;
 ```
 
 support passing in array config for generate
@@ -76,21 +68,6 @@ export default defineConfig([
     serversPath: './src/apis/auth',
   },
 ]);
-
-// or
-
-// import type { GenerateServiceProps } from 'openapi-ts-request';
-
-// export default [
-//   {
-//     schemaPath: 'http://app.swagger.io/v2/swagger.json',
-//     serversPath: './src/apis/app',
-//   },
-//   {
-//     schemaPath: 'http://auth.swagger.io/v2/swagger.json',
-//     serversPath: './src/apis/auth',
-//   },
-// ] as GenerateServiceProps[];
 ```
 
 add the command in `script` of `package.json`: `"openapi": "openapi-ts",`

README.md

@@ -51,14 +51,6 @@ export default defineConfig({
   schemaPath: 'http://petstore.swagger.io/v2/swagger.json',
   serversPath: './src/apis',
 });
-
-// 或
-
-// import type { GenerateServiceProps } from 'openapi-ts-request';
-
-// export default {
-//   schemaPath: 'http://petstore.swagger.io/v2/swagger.json',
-// } as GenerateServiceProps;
 ```
 
 支持传入数组配置进行生成
@@ -76,21 +68,6 @@ export default defineConfig([
     serversPath: './src/apis/auth',
   },
 ]);
-
-// 或
-
-// import type { GenerateServiceProps } from 'openapi-ts-request';
-
-// export default [
-//   {
-//     schemaPath: 'http://app.swagger.io/v2/swagger.json',
-//     serversPath: './src/apis/app',
-//   },
-//   {
-//     schemaPath: 'http://auth.swagger.io/v2/swagger.json',
-//     serversPath: './src/apis/auth',
-//   },
-// ] as GenerateServiceProps[];
 ```
 
 在 `package.json` 的 `script` 中添加命令: `"openapi": "openapi-ts",`

src/bin/cli.ts

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import { cancel, intro, isCancel, multiselect, outro } from '@clack/prompts';
-import chalk from 'chalk';
 import { program } from 'commander';
 
 import type { GenerateServiceProps } from '../index';
 import { generateService } from '../index';
+import { logError } from '../log';
 import { readConfig } from '../readConfig';
 
 program
@@ -15,6 +15,11 @@ program
 program.parse();
 const options = program.opts();
 
+/**
+ * 1. 执行 cli 命令读取配置文件，已经使用 openapi.ts 替代了 cli.ts，后期会废弃 cli.ts
+ * 2. 如果配置文件中有 uniqueKey，则根据 uniqueKey 生成 service
+ * 3. 如果配置文件中没有 uniqueKey，且有多个 service，则交互式选择要生成的 service
+ */
 async function run() {
   const config = await readConfig<
     GenerateServiceProps | GenerateServiceProps[]
@@ -65,29 +70,29 @@ async function run() {
       }
 
       const results = await Promise.allSettled(tasks);
-      const errors: PromiseRejectedResult[] = results.filter(
-        (result) => result.status === 'rejected'
-      );
       let errorMsg = '';
 
-      for (let i = 0; i < errors.length; i++) {
-        const error = errors[i];
-        const cnf = configs[i];
-        errorMsg += `${cnf.uniqueKey}${cnf.uniqueKey && ':'}${error.reason}\n`;
+      for (let i = 0; i < results.length; i++) {
+        const result = results[i];
+        if (result.status === 'rejected') {
+          const cnf = configs[i];
+          errorMsg += `${cnf.uniqueKey}${cnf.uniqueKey && ':'}${result.reason}\n`;
+        }
       }
 
       if (errorMsg) {
         throw new Error(errorMsg);
       }
 
-      if (isInteractive && !errors.length) {
+      if (isInteractive && !errorMsg) {
         outro('🎉 All done!');
       }
     } else {
       throw new Error('config is not found');
     }
   } catch (error) {
-    console.log(chalk.red(error));
+    logError(error);
+    process.exit(1);
   }
 }
 

src/bin/openapi.ts

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { cancel, intro, isCancel, multiselect, outro } from '@clack/prompts';
 import { type OptionValues, program } from 'commander';
 import { pickBy } from 'lodash';
 import { join } from 'path';
@@ -171,49 +172,61 @@ async function run() {
     if (cnf) {
       const tasks = [];
       let configs: GenerateServiceProps[] = Array.isArray(cnf) ? cnf : [cnf];
+      /** 是否交互式 */
+      let isInteractive = false;
 
       if (params.uniqueKey) {
         configs = configs.filter(
           (config) => config.uniqueKey === params.uniqueKey
         );
+      } else if (configs.length > 1) {
+        // 如果没有指定 uniqueKey，并且有多个配置，则交互式选择
+        isInteractive = true;
+
+        console.log(''); // 添加一个空行
+        intro('🎉 欢迎使用 openapi-ts-request 生成器');
+        const selected = await multiselect({
+          message: '请选择要生成的 service',
+          options: configs.map((config) => ({
+            value: config,
+            label: config.describe || config.schemaPath,
+          })),
+        });
+
+        if (isCancel(selected)) {
+          cancel('👋 Has cancelled');
+          process.exit(0);
+        }
+
+        configs = selected;
       }
 
       for (const config of configs) {
         tasks.push(generateService(config));
       }
 
       const results = await Promise.allSettled(tasks);
-      const errors: PromiseRejectedResult[] = results.filter(
-        (result) => result.status === 'rejected'
-      );
       let errorMsg = '';
 
-      for (let i = 0; i < errors.length; i++) {
-        const error = errors[i];
-        const cnf = configs[i];
-        errorMsg += `${cnf.uniqueKey}${cnf.uniqueKey && ':'}${error.reason}\n`;
+      for (let i = 0; i < results.length; i++) {
+        const result = results[i];
+        if (result.status === 'rejected') {
+          const cnf = configs[i];
+          errorMsg += `${cnf.uniqueKey}${cnf.uniqueKey && ':'}${result.reason}\n`;
+        }
       }
 
       if (errorMsg) {
-        logError(errorMsg);
-        process.exit(1);
-      }
-    } else {
-      if (!params.input || !params.output) {
-        logError(
-          'Please provide either input/output options or a configuration file path and name.'
-        );
-        process.exit(1);
+        throw new Error(errorMsg);
       }
 
-      const options = baseGenerate(params);
-      await generateService(
-        pickBy(
-          options,
-          (value) => value !== null && value !== undefined && value !== ''
-        ) as GenerateServiceProps
+      if (isInteractive && !errorMsg) {
+        outro('🎉 All done!');
+      }
+    } else {
+      throw new Error(
+        'Please provide either input/output options or a configuration file path and name.'
       );
-      process.exit(0);
     }
   } catch (error) {
     logError(error);

src/index.ts

@@ -34,10 +34,6 @@ export type GenerateServiceProps = {
    * Swagger2/OpenAPI3 地址
    */
   schemaPath: string;
-  /**
-   * 描述信息，在用 cli 可交互运行方式时会用到
-   */
-  describe?: string;
   /**
    * 生成的文件夹的路径
    */
@@ -53,6 +49,10 @@ export type GenerateServiceProps = {
    * 是否全量替换, 默认: true, 如果为false, 则进行增量替换
    */
   full?: boolean;
+  /**
+   * 描述信息，在用 cli 可交互运行方式时会用到
+   */
+  describe?: string;
   /**
    * 开启日志
    */