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

package/lib/index.d.mts

@@ -127,6 +127,11 @@ 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;
 }
 type TextMatcher = string | RegExp | (string | RegExp)[];
 type EndpointMatcherFunction = (operationName: string, operationDefinition: OperationDefinition) => boolean;

package/lib/index.d.ts

@@ -127,6 +127,11 @@ 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;
 }
 type TextMatcher = string | RegExp | (string | RegExp)[];
 type EndpointMatcherFunction = (operationName: string, operationDefinition: OperationDefinition) => boolean;

package/lib/index.js

@@ -491,12 +491,12 @@ export interface QueryConfig {
     keepUnusedDataFor?: number,
 }
 
-export interface IRequestConfig extends RequestOptions { {
+export interface IRequestConfig extends RequestOptions {
   timeout?: number;
 }
 
 export type IRestFulEndpointsQueryReturn<TVariables> = TVariables extends void ? 
-  void | {fetchOptions?: IRequestConfig;}: 
+  (void | {fetchOptions?: IRequestConfig;}): 
   {
       variables: TVariables;
       fetchOptions?: IRequestConfig;
@@ -1005,7 +1005,7 @@ function generateRtkEnhanceEndpointsFile(endpointInfos, options) {
   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}';
@@ -1018,7 +1018,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) => {
     const isGet = info.verb.toUpperCase() === "GET";
@@ -1036,17 +1036,16 @@ ${endpointInfos.map((info) => {
     const hasQueryParams = info.queryParams.length > 0;
     const hasBody = !isGet && hasArgs;
     const generateRequestOptions = () => {
-      const options2 = ["...args.fetchOptions"];
-      if (hasRequestBody || !isGet) {
-        options2.push(`headers: { 'Content-Type': 'application/json', ...args.fetchOptions?.headers }`);
+      let paramsSection = "";
+      if (info.queryParams && info.queryParams.length > 0) {
+        const paramsLines = info.queryParams.map((param) => `${param.name}: args.variables.${param.name},`).join("\n");
+        paramsSection = `params: {${paramsLines}},`;
       }
-      if (hasQueryParams && hasArgs) {
-        options2.push(generateQueryParams(info.queryParams));
-      }
-      if (hasRequestBody) {
-        options2.push("body: args.variables.body");
-      }
-      return options2.length > 0 ? `{ ${options2.join(", ")} }` : "{}";
+      return `{
+        ...args.fetchOptions,
+        headers: { 'Content-Type': '${info.contentType}', ...args.fetchOptions?.headers },
+        ${paramsSection}${info.hasRequestBody ? `body: args.variables.body,` : ""}
+      }`;
     };
     return `
   /**
@@ -1062,12 +1061,6 @@ ${endpointInfos.map((info) => {
 }
 `;
 }
-function generateQueryParams(queryParams) {
-  const paramEntries = queryParams.map(
-    (param) => `${param.name}: args.variables.${param.name}`
-  ).join(", ");
-  return `params: withoutUndefined({ ${paramEntries} })`;
-}
 
 // src/services/api-code-generator.ts
 var ApiCodeGenerator = class {