@acrool/rtk-query-codegen-openapi 1.0.6-alpha.0 → 1.1.0-alpha.3

package/src/generators/rtk-query-generator.ts

@@ -13,6 +13,7 @@ export function generateRtkQueryFile(endpointInfos: Array<{
   isVoidArg: boolean;
   summary: string;
   contentType: string;
+  hasRequestBody: boolean;
 }>, options: GenerationOptions) {
 
   const { groupKey } = options;
@@ -25,15 +26,40 @@ export function generateRtkQueryFile(endpointInfos: Array<{
     const methodType = info.isQuery ? 'query' : 'mutation';
     const argType = info.isVoidArg ? 'void' : `${httpClientTypeName}<${info.argTypeName}>`;
 
+    // 處理 path parameters - 替換 {id} 為 ${queryArg.variables.id}
+    let urlPath = info.path;
+    if (info.pathParams && info.pathParams.length > 0) {
+      info.pathParams.forEach((param: any) => {
+        urlPath = urlPath.replace(`{${param.name}}`, `\${queryArg.variables.${param.name}}`);
+      });
+      // 使用模板字符串
+      urlPath = '`' + urlPath + '`';
+    } else {
+      // 使用普通字符串
+      urlPath = `"${urlPath}"`;
+    }
+
+    // 處理 query parameters
+    let paramsSection = '';
+    if (info.queryParams && info.queryParams.length > 0) {
+      const paramsLines = info.queryParams.map((param: any) =>
+        `          ${param.name}: queryArg.variables.${param.name},`
+      ).join('\n');
+      paramsSection = `
+        params: {
+${paramsLines}
+        },`;
+    }
+
     return `    ${info.operationName}: build.${methodType}<
       ${info.responseTypeName},
       ${argType}
     >({
       query: (queryArg) => ({
-        url: "${info.path}",
+        url: ${urlPath},
         method: "${info.verb.toUpperCase()}",
-        contentType: "${info.contentType}",${info.isVoidArg ? '' : `
-        body: queryArg.variables.body,`}${info.isVoidArg ? '' : `
+        contentType: "${info.contentType}",${paramsSection}${info.hasRequestBody ? `
+        body: queryArg.variables.body,` : ''}${info.isVoidArg ? '' : `
         fetchOptions: queryArg?.fetchOptions,`}
       }),
     }),`;
@@ -79,22 +105,22 @@ ${endpoints}
 
 export const {
 ${endpointInfos.map(info => {
-  const capitalizedOperationName = info.operationName.charAt(0).toUpperCase() + info.operationName.slice(1);
-  if (info.isQuery) {
-    // For queries, generate both regular and lazy hooks if useLazyQueries is enabled
-    const regularHook = `use${capitalizedOperationName}Query`;
-    if (options.useLazyQueries) {
-      const lazyHook = `useLazy${capitalizedOperationName}Query`;
-      return `  ${regularHook},\n  ${lazyHook},`;
+    const capitalizedOperationName = info.operationName.charAt(0).toUpperCase() + info.operationName.slice(1);
+    if (info.isQuery) {
+      // For queries, generate both regular and lazy hooks if useLazyQueries is enabled
+      const regularHook = `use${capitalizedOperationName}Query`;
+      if (options.useLazyQueries) {
+        const lazyHook = `useLazy${capitalizedOperationName}Query`;
+        return `  ${regularHook},\n  ${lazyHook},`;
+      } else {
+        return `  ${regularHook},`;
+      }
     } else {
-      return `  ${regularHook},`;
+      // For mutations, only generate regular hook
+      const mutationHook = `use${capitalizedOperationName}Mutation`;
+      return `  ${mutationHook},`;
     }
-  } else {
-    // For mutations, only generate regular hook
-    const mutationHook = `use${capitalizedOperationName}Mutation`;
-    return `  ${mutationHook},`;
-  }
-}).join('\n')}
+  }).join('\n')}
 } = injectedRtkApi;
 
 export default injectedRtkApi;

package/src/services/endpoint-info-extractor.ts

@@ -19,6 +19,7 @@ export interface EndpointInfo {
   isVoidArg: boolean;
   summary: string;
   contentType: string;
+  hasRequestBody: boolean;
 }
 
 /**
@@ -65,7 +66,7 @@ export class EndpointInfoExtractor {
     const summary = operation.summary || `${verb.toUpperCase()} ${path}`;
 
     // 解析參數
-    const { queryParams, pathParams, isVoidArg } = this.extractParameters(operationDefinition);
+    const { queryParams, pathParams, isVoidArg, hasRequestBody } = this.extractParameters(operationDefinition);
 
     // 提取 content type
     const contentType = this.extractContentType(operation);
@@ -82,7 +83,8 @@ export class EndpointInfoExtractor {
       pathParams,
       isVoidArg,
       summary,
-      contentType
+      contentType,
+      hasRequestBody
     };
   }
 
@@ -97,20 +99,24 @@ export class EndpointInfoExtractor {
     const operationParameters = this.resolveArray(operation.parameters);
     const pathItemParameters = this.resolveArray(pathItem.parameters)
       .filter((pp) => !operationParameters.some((op) => op.name === pp.name && op.in === pp.in));
-    
+
     const allParameters = supportDeepObjects([...pathItemParameters, ...operationParameters])
       .filter((param) => param.in !== 'header');
 
     const queryParams = allParameters.filter(param => param.in === 'query');
     const pathParams = allParameters.filter(param => param.in === 'path');
 
+    // 檢查是否有 request body
+    const hasRequestBody = !!operation.requestBody;
+
     // 檢查是否為 void 類型參數
     const isVoidArg = queryParams.length === 0 && pathParams.length === 0 && !operation.requestBody;
 
     return {
       queryParams,
       pathParams,
-      isVoidArg
+      isVoidArg,
+      hasRequestBody
     };
   }
 

package/src/services/openapi-parser-service.ts

@@ -24,8 +24,17 @@ export class OpenApiParserService {
    */
   initialize(): void {
     if (this.apiGen.spec.components?.schemas) {
+      // 原因：oazapfts 會優先使用 schema.title 作為類型名稱，但應該使用 schema key
+      // 這只在記憶體中修改，不影響原始 OpenAPI 文件
+      Object.keys(this.apiGen.spec.components.schemas).forEach(schemaName => {
+        const schema = this.apiGen.spec.components!.schemas![schemaName];
+        if (schema && typeof schema === 'object' && 'title' in schema) {
+          delete schema.title;
+        }
+      });
+
       this.apiGen.preprocessComponents(this.apiGen.spec.components.schemas);
-      
+
       // 手動為每個 schema 生成 type alias
       Object.keys(this.apiGen.spec.components.schemas).forEach(schemaName => {
         try {