chore: clean code

Author: rookie-luochao

README-en_US.md

@@ -139,10 +139,10 @@ $ openapi --help
     --requestLibPath <string>          custom request lib path, for example: "@/request", "node-fetch" (default: "axios")
     --enableLogging <boolean>          open the log (default: false)
     --priorityRule <string>            priority rule, include/exclude/both (default: "include")
-    --includeTags <<string|RegExp>[]>  generate code from include tags
-    --includePaths <<string|RegExp>[]> generate code from include paths
-    --excludeTags <<string|RegExp>[]>  generate code from exclude tags
-    --excludePaths <<string|RegExp>[]> generate code from exclude paths
+    --includeTags <(string|RegExp)[]>  generate code from include tags
+    --includePaths <(string|RegExp)[]> generate code from include paths
+    --excludeTags <(string|RegExp)[]>  generate code from exclude tags
+    --excludePaths <(string|RegExp)[]> generate code from exclude paths
     --requestOptionsType <string>      custom request method options parameter type (default: "{ [key:
                                       string]: unknown }")
     --requestImportStatement <string>  custom request import statement, for example: "const request =
@@ -185,7 +185,7 @@ openapi -i ./spec.json -o ./apis
 | isDisplayTypeLabel | no | boolean | false | generate label matching type field |
 | isGenJsonSchemas | no | boolean | false | generate JSON Schemas |
 | mockFolder | no | string | - | mock file path, for example: './mocks' |
-| authorization | 否 | string | - | docs authorization |
+| authorization | no | string | - | docs authorization |
 | nullable | no | boolean | false | null instead of optional |
 | isTranslateToEnglishTag | no | boolean | false | translate chinese tag name to english tag name |
 | isOnlyGenTypeScriptType | no | boolean | false | only generate typescript type |

src/generator/serviceGenarator.ts

@@ -112,8 +112,6 @@ export default class ServiceGenerator {
 
     const priorityRule: PriorityRule =
       PriorityRule[config.priorityRule as keyof typeof PriorityRule];
-    const hookCustomFileNames =
-      this.config.hook?.customFileNames || getDefaultFileTag;
 
     if (this.config.hook?.afterOpenApiDataInited) {
       this.openAPIData =
@@ -127,7 +125,7 @@ export default class ServiceGenerator {
       // 这里判断paths
       switch (priorityRule) {
         case PriorityRule.include: {
-          // includePaths and includeTags is empty,直接跳过
+          // includePaths and includeTags is empty, 直接跳过
           if (isEmpty(includeTags) && isEmpty(includePaths)) {
             this.log('priorityRule include need includeTags or includePaths');
             break outerLoop;
@@ -181,14 +179,16 @@ export default class ServiceGenerator {
           return;
         }
 
+        const hookCustomFileNames =
+          this.config.hook?.customFileNames || getDefaultFileTag;
         const tags = hookCustomFileNames(operationObject, pathKey, method);
 
         // 这里判断tags
         tags.forEach((tag) => {
           const tagLowerCase = tag.toLowerCase();
 
           if (priorityRule === PriorityRule.include) {
-            // includeTags 为空，不会匹配任何path，故跳过;
+            // includeTags 为空，不会匹配任何path，故跳过
             if (isEmpty(includeTags)) {
               this.log('priorityRule include need includeTags or includePaths');
               return;
@@ -206,7 +206,7 @@ export default class ServiceGenerator {
           }
 
           if (priorityRule === PriorityRule.both) {
-            // includeTags is empty 没有配置,直接跳过
+            // includeTags is empty 没有配置, 直接跳过
             if (isEmpty(includeTags)) {
               this.log('priorityRule both need includeTags or includePaths');
               return;

src/index.ts

@@ -41,7 +41,7 @@ export type GenerateServiceProps = {
   enableLogging?: boolean;
   /**
   /**
-   * 优先规则, include(只允许include列表) | exclude(只排除exclude列表) | include(允许include列表，排除exclude列表)
+   * 优先规则, include(只允许include列表) | exclude(只排除exclude列表) | both(允许include列表，排除exclude列表)
    */
   priorityRule?: string;
   /**

test/README.md

@@ -67,7 +67,7 @@ if(include(includeList)){
 
 Exclude 模式只接收 excludeTags,excludePaths 参数，不接收 includeTags,includePaths 参数
 
-如果 excludeTags 和 excludePaths excludeTags 是对 excludePaths 的筛选结果再进行筛选
+如果 excludeTags 和 excludePaths 同时存在，excludeTags 是对 excludePaths 的筛选结果再进行筛选
 
 ```
 // 不在黑名单则生成