@bitstack/ng-query-codegen-openapi 0.0.31-alpha.0 → 0.0.31-alpha.1

package/src/generators/rtk-enhance-endpoints-generator.ts

@@ -12,8 +12,10 @@ export function generateRtkEnhanceEndpointsFile(
     queryParams: any[];
     pathParams: any[];
     isVoidArg: boolean;
-    hasRequestBody: boolean;
     summary: string;
+    contentType: string;
+    hasRequestBody: boolean;
+    tags: string[];
   }>,
   options: GenerationOptions
 ) {
@@ -27,7 +29,7 @@ export function generateRtkEnhanceEndpointsFile(
   return `/* eslint-disable */
 // [Warning] Generated automatically - do not edit manually 
   
-import { ${httpClient!.importName} } from '${httpClient!.file}';
+import { ${httpClient!.importReturnTypeName} } from '${httpClient!.file}';
 import { Injectable, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { ${apiConfiguration!.importName} } from '${apiConfiguration!.file}';
@@ -40,7 +42,7 @@ import {${endpointInfos.map((info) => ` ${info.argTypeName}, ${info.responseType
 })
 export class ${apiServiceClassName} {
   private config = inject(${apiConfiguration!.importName});
-  private http = inject(${httpClient!.importName});
+  private http = inject(${httpClient!.importReturnTypeName});
 
 ${endpointInfos
   .map((info) => {
@@ -65,22 +67,20 @@ ${endpointInfos
 
     // 生成 HTTP 請求選項
     const generateRequestOptions = () => {
-      const options = ['...args.fetchOptions'];
-
-      // 添加 Content-Type header，特別是對於有 body 的請求
-      if (hasRequestBody || !isGet) {
-        options.push(`headers: { 'Content-Type': 'application/json', ...args.fetchOptions?.headers }`);
-      }
-
-      if (hasQueryParams && hasArgs) {
-        options.push(generateQueryParams(info.queryParams));
-      }
-
-      if (hasRequestBody) {
-        options.push('body: args.variables.body');
+      // 處理 query parameters
+      let paramsSection = '';
+      if (info.queryParams && info.queryParams.length > 0) {
+        const paramsLines = info.queryParams
+          .map((param: any) => `${param.name}: args.variables.${param.name},`)
+          .join('\n');
+        paramsSection = `params: {${paramsLines}},`;
       }
 
-      return options.length > 0 ? `{ ${options.join(', ')} }` : '{}';
+      return `{
+        ...args.fetchOptions,
+        headers: { 'Content-Type': '${info.contentType}', ...args.fetchOptions?.headers },
+        ${paramsSection}${info.hasRequestBody ? `body: args.variables.body,` : ''}
+      }`;
     };
 
     return `

package/src/types.ts

@@ -142,6 +142,11 @@ export interface CommonOptions {
    * File path for importing IRestFulEndpointsQueryReturn type
    */
   endpointsQueryReturnTypeFile?: string;
+  /**
+   * defaults to 60 (seconds)
+   * Number of seconds to wait before refetching data when component mounts or args change
+   */
+  refetchOnMountOrArgChange?: number;
 }
 
 export type TextMatcher = string | RegExp | (string | RegExp)[];