Merge pull request #412 from openapi-ui/fix/fix-translate-tag

fix: fix translateChineseModuleNodeToEnglish not support includeTags

Author: rookie-luochao

.changeset/old-suits-itch.md

@@ -0,0 +1,5 @@
+---
+'openapi-ts-request': patch
+---
+
+fix: fix translateChineseModuleNodeToEnglish not support includeTags

src/index.ts

@@ -1,4 +1,4 @@
-import { isEmpty, map } from 'lodash';
+import { isEmpty, isObject, isString, map } from 'lodash';
 
 import { PriorityRule, ReactQueryMode } from './config';
 import type { TypescriptFileType } from './generator/config';
@@ -301,7 +301,13 @@ export async function generateService({
   }
 
   if (isTranslateToEnglishTag) {
-    await translateChineseModuleNodeToEnglish(openAPI);
+    const res = await translateChineseModuleNodeToEnglish(openAPI);
+
+    if (isObject(res) && !isEmpty(includeTags)) {
+      includeTags = map(includeTags, (item) => {
+        return isString(item) ? res[item] || item : item;
+      });
+    }
   }
 
   const requestImportStatement = getImportStatement(requestLibPath);
@@ -314,28 +320,28 @@ export async function generateService({
       priorityRule,
       includeTags: includeTags
         ? map(includeTags, (item) =>
-            typeof item === 'string' ? item.toLowerCase() : item
+            isString(item) ? item.toLowerCase() : item
           )
         : priorityRule === PriorityRule.include ||
             priorityRule === PriorityRule.both
           ? [/.*/g]
           : null,
       includePaths: includePaths
         ? map(includePaths, (item) =>
-            typeof item === 'string' ? item.toLowerCase() : item
+            isString(item) ? item.toLowerCase() : item
           )
         : priorityRule === PriorityRule.include ||
             priorityRule === PriorityRule.both
           ? [/.*/g]
           : null,
       excludeTags: excludeTags
         ? map(excludeTags, (item) =>
-            typeof item === 'string' ? item.toLowerCase() : item
+            isString(item) ? item.toLowerCase() : item
           )
         : null,
       excludePaths: excludePaths
         ? map(excludePaths, (item) =>
-            typeof item === 'string' ? item.toLowerCase() : item
+            isString(item) ? item.toLowerCase() : item
           )
         : null,
       requestOptionsType: '{[key: string]: unknown}',

src/util.ts

@@ -261,7 +261,7 @@ function isJSONString(str: string) {
 export async function translateChineseModuleNodeToEnglish(
   openAPI: OpenAPIObject
 ) {
-  return new Promise((resolve, reject) => {
+  return new Promise<Record<string, string> | boolean>((resolve, reject) => {
     const translateMap: Record<string, string> = {};
     const operations = [] as OperationObject[];
     let tags: string[] = [];
@@ -308,7 +308,7 @@ export async function translateChineseModuleNodeToEnglish(
             }
           });
         });
-        resolve(true);
+        resolve(translateMap);
       })
       .catch(() => {
         reject(false);