Merge pull request #539 from openapi-ui/main

chore: merge main to release

Author: rookie-luochao

.changeset/evil-houses-chew.md

@@ -0,0 +1,5 @@
+---
+'openapi-ts-request': patch
+---
+
+fix: fix bug #536

.changeset/poor-spoons-begin.md

@@ -0,0 +1,5 @@
+---
+'openapi-ts-request': patch
+---
+
+fix: fix cli comannd repeat

README.md

@@ -190,7 +190,7 @@ $ openapi --help
     -f, --full <boolean>                full replacement (default: true)
     --enableLogging <boolean>           open the log (default: false)
     --priorityRule <string>             priority rule, include/exclude/both (default: "include")
-    --filterCaseInsensitive <boolean>   whether to perform a case-insensitive match with includeTags, includePaths, excludeTags, excludePaths filters
+    --filterCaseInsensitive <boolean>   whether to perform a case-insensitive match with includeTags, includePaths, excludeTags, excludePaths filters (default: false)
     --includeTags <(string|RegExp)[]>   generate code from include tags
     --includePaths <(string|RegExp)[]>  generate code from include paths
     --excludeTags <(string|RegExp)[]>   generate code from exclude tags

openapi-ts-request.config.ts

@@ -1,6 +1,8 @@
+import { type GenerateServiceProps } from './src/index';
+
 export default [
   {
     schemaPath: 'http://petstore.swagger.io/v2/swagger.json',
     serversPath: './apis/app',
   },
-];
+] as GenerateServiceProps[];

src/bin/openapi.ts

@@ -26,13 +26,8 @@ const params = program
   .option('-f, --full <boolean>', 'full replacement', true)
   .option('--enableLogging <boolean>', 'open the log', false)
   .option(
-    '--filterCaseInsensitive <boolean>',
-    'whether to perform a case-insensitive match with includeTags, includePaths, excludeTags, excludePaths filters',
-    false
-  )
-  .option(
-    '--includeTags <(string|RegExp)[]>',
-    'generate code from include tags'
+    '--priorityRule <string>',
+    'priority rule, include/exclude/both (default: "include")'
   )
   .option(
     '--filterCaseInsensitive <boolean>',

src/generator/serviceGenarator.ts

@@ -688,12 +688,22 @@ export default class ServiceGenerator {
 
               if (response?.isAnonymous) {
                 const responseName = upperFirst(`${functionName}Response`);
+                // 使用正则表达式移除 response?.type 中包含 this.config.namespace 的部分，isAnonymous模式不需要 this.config.namespace 前缀
+                const cleanType = response?.type?.includes(
+                  `${this.config.namespace}.`
+                )
+                  ? response?.type?.replace(
+                      new RegExp(`${this.config.namespace}\\.`, 'g'),
+                      ''
+                    )
+                  : response?.type || '';
                 this.interfaceTPConfigs.push({
                   typeName: responseName,
-                  type: response?.type,
+                  type: cleanType,
                   isEnum: false,
                   props: [],
                 });
+
                 response.type = `${this.config.namespace}.${responseName}`;
               }