@bitstack/ng-query-codegen-openapi 0.0.31-alpha.4 → 0.0.31-alpha.5

package/lib/index.js

@@ -499,7 +499,7 @@ export interface IRequestConfig extends RequestOptions {
 }
 
 export type IRestFulEndpointsQueryReturn<TVariables> = TVariables extends void ? 
-  (undefined | {fetchOptions?: IRequestConfig;}): 
+  (undefined | {fetchOptions?: IRequestConfig;config?: QueryConfig;}): 
   {
       variables: TVariables;
       fetchOptions?: IRequestConfig;
@@ -927,15 +927,15 @@ function generateRtkQueryFile(endpointInfos, options) {
   /**
    * ${info.summary}
    */
-  ${info.operationName}Query(${info.argTypeName !== "VoidApiArg" ? `args: IRestFulEndpointsQueryReturn<${info.argTypeName}>` : ""}): Observable<QueryState<${info.responseTypeName}>> {
-    return this.ntkQuery.query<${info.responseTypeName}, ${info.argTypeName !== "VoidApiArg" ? `IRestFulEndpointsQueryReturn<${info.argTypeName}>` : "void"}>({
-      queryKey: [ECacheTagTypes.${info.queryKeyName}${info.argTypeName !== "VoidApiArg" ? ", args.variables" : ""}],
+  ${info.operationName}Query(args: IRestFulEndpointsQueryReturn<${info.argTypeName}>): Observable<QueryState<${info.responseTypeName}>> {
+    return this.ntkQuery.query<${info.responseTypeName}, ${!info.isVoidArg ? `IRestFulEndpointsQueryReturn<${info.argTypeName}>` : "void"}>({
+      queryKey: [ECacheTagTypes.${info.queryKeyName}${!info.isVoidArg ? ", args.variables" : ""}],
       queryFn: () => {
-        return this.apiService.${info.operationName}(${info.argTypeName !== "VoidApiArg" ? "args" : ""});
+        return this.apiService.${info.operationName}(args);
       },
       fetchOptions: args?.fetchOptions,
       config: args?.config,
-    })${info.argTypeName !== "VoidApiArg" ? "(args)" : "()"};
+    })(args);
   }`
   ).join("");
   const mutationMethods = endpointInfos.filter((info) => !info.isQuery).map(
@@ -944,13 +944,13 @@ function generateRtkQueryFile(endpointInfos, options) {
    * ${info.summary}
    */
   ${info.operationName}Mutation(): MutationResponse<${info.responseTypeName}, {
-    variables: ${info.argTypeName !== "VoidApiArg" ? info.argTypeName : "void"};
+    variables: ${!info.isVoidArg ? info.argTypeName : "void"};
     fetchOptions?: RequestOptions;
   }, HttpErrorResponse> {
-    return this.ntkQuery.mutation<${info.responseTypeName}, ${info.argTypeName !== "VoidApiArg" ? `IRestFulEndpointsQueryReturn<${info.argTypeName}>` : "void"}, HttpErrorResponse>({
+    return this.ntkQuery.mutation<${info.responseTypeName}, ${!info.isVoidArg ? `IRestFulEndpointsQueryReturn<${info.argTypeName}>` : "void"}, HttpErrorResponse>({
       endpointName: '${info.operationName}',
-      mutationFn: (${info.argTypeName !== "VoidApiArg" ? "args" : ""}) => {
-        return this.apiService.${info.operationName}(${info.argTypeName !== "VoidApiArg" ? "args" : ""});
+      mutationFn: (args) => {
+        return this.apiService.${info.operationName}(args);
       },
     });
   }`
@@ -961,18 +961,18 @@ function generateRtkQueryFile(endpointInfos, options) {
    * ${info.summary}
    */
   ${info.operationName}LazyQuery(): {
-    trigger: (${info.argTypeName !== "VoidApiArg" ? `args: IRestFulEndpointsQueryReturn<${info.argTypeName}>, ` : ""}options?: { skipCache?: boolean }) => Observable<${info.responseTypeName}>
+    trigger: (${!info.isVoidArg ? `args: IRestFulEndpointsQueryReturn<${info.argTypeName}>, ` : ""}options?: { skipCache?: boolean }) => Observable<${info.responseTypeName}>
   } {
     return {
-      trigger: (${info.argTypeName !== "VoidApiArg" ? "args, " : ""}options = {}) => {
+      trigger: (${!info.isVoidArg ? "args, " : ""}options = {}) => {
         const { skipCache = true } = options;
         if (!skipCache) {
-          const cachedResult = this.ntkQuery.getQueryCache<${info.responseTypeName}>([ECacheTagTypes.${info.queryKeyName}${info.argTypeName !== "VoidApiArg" ? ", args.variables" : ""}]);
+          const cachedResult = this.ntkQuery.getQueryCache<${info.responseTypeName}>([ECacheTagTypes.${info.queryKeyName}${!info.isVoidArg ? ", args.variables" : ""}]);
           if (cachedResult) {
             return cachedResult;
           }
         }
-        return this.apiService.${info.operationName}(${info.argTypeName !== "VoidApiArg" ? "args" : ""});
+        return this.apiService.${info.operationName}('args');
       }
     };
   }`
@@ -1025,7 +1025,7 @@ export class ${apiServiceClassName} {
 
 ${endpointInfos.map((info) => {
     const isGet = info.verb.toUpperCase() === "GET";
-    const hasArgs = info.argTypeName !== "VoidApiArg";
+    const hasArgs = !info.isVoidArg;
     const hasRequestBody = info.hasRequestBody;
     const generateUrlTemplate = (path5) => {
       const hasPathParams = path5.includes("{");
@@ -1045,8 +1045,8 @@ ${endpointInfos.map((info) => {
         paramsSection = `params: {${paramsLines}},`;
       }
       return `{
-        ...args.fetchOptions,
-        headers: { 'Content-Type': '${info.contentType}', ...args.fetchOptions?.headers },
+        ...args?.fetchOptions,
+        headers: { 'Content-Type': '${info.contentType}', ...args?.fetchOptions?.headers },
         ${paramsSection}${info.hasRequestBody ? `body: args.variables.body,` : ""}
       }`;
     };
@@ -1055,7 +1055,7 @@ ${endpointInfos.map((info) => {
    * ${info.summary}
    */
   ${info.operationName}(
-    ${hasArgs ? `args: IRestFulEndpointsQueryReturn<${info.argTypeName}>, ` : ""}
+    args: IRestFulEndpointsQueryReturn<${info.argTypeName}>,
   ): Observable<${info.responseTypeName}> {
     const url = ${generateUrlTemplate(info.path)};
     return this.http.request('${info.verb.toLowerCase()}', url, ${generateRequestOptions()});