@toktokhan-dev/cli-plugin-gen-api-react-query 0.1.2 → 0.1.4

package/dist/index.d.ts

@@ -56,4 +56,5 @@ interface GenerateSwaggerApiConfig {
  */
 declare const genApi: _toktokhan_dev_cli.MyCommand<GenerateSwaggerApiConfig, "gen:api">;
 
-export { type GenerateFn, type GenerateSwaggerApiConfig, type PaginationConfig, genApi };
+export { genApi };
+export type { GenerateFn, GenerateSwaggerApiConfig, PaginationConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toktokhan-dev/cli-plugin-gen-api-react-query",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "A CLI plugin for generating API hooks with React Query built by TOKTOKHAN.DEV",
   "author": "TOKTOKHAN.DEV <fe-system@toktokhan.dev>",
   "license": "ISC",

package/templates/custom-axios/data-contracts.eta

@@ -40,7 +40,16 @@
 
     },
     interface: (contract) => {
-      return `interface ${contract.name} {\r\n${contract.content}}`;
+      let content = contract.content;
+
+      const nullalbeEnums = contract.rawContent.filter((c) => !!c.enum?.length && c.isNullable )
+
+      nullalbeEnums.forEach((c) => {
+        const { field } = c
+        content = content.replace(field, `${field} | null`)
+      })
+
+      return `interface ${contract.name} {\r\n${content}}`;
     },
     type: (contract) => {
       return `type ${contract.name} = ${contract.content}`;

package/templates/custom-fetch/api.eta

@@ -131,7 +131,7 @@ const dataForReactHookTemplate = {
 import { useQuery, useMutation, useInfiniteQuery, useSuspenseQuery, useSuspenseInfiniteQuery, InfiniteData } from '@tanstack/react-query';
 import { QueryHookParams, InfiniteQueryHookParams, MutationHookParams, Parameter, RequestFnReturn, SuspenseInfiniteQueryHookParams, SuspenseQueryHookParams } from "../@types/react-query-type";
 import { paramsSerializerBy } from "../@utils/param-serializer-by";
-import fetchExtended from "<%= instancePath %>";
+import { fetchExtended } from "<%= instancePath %>";
 
 import { HttpClient, RequestParams, ContentType, HttpResponse } from "../@<%~ config.fileNames.httpClient %>";
 import { DeepOmitReadOnly } from '../@types/util-types';

package/templates/custom-fetch/data-contracts.eta

@@ -40,7 +40,16 @@
 
     },
     interface: (contract) => {
-      return `interface ${contract.name} {\r\n${contract.content}}`;
+       let content = contract.content;
+
+      const nullalbeEnums = contract.rawContent.filter((c) => !!c.enum?.length && c.isNullable )
+
+      nullalbeEnums.forEach((c) => {
+        const { field } = c
+        content = content.replace(field, `${field} | null`)
+      })
+
+      return `interface ${contract.name} {\r\n${content}}`;
     },
     type: (contract) => {
       return `type ${contract.name} = ${contract.content}`;

package/templates/custom-fetch/http-client.eta

@@ -184,7 +184,11 @@ export class HttpClient<SecurityDataType = unknown> {
 <% } %>
         const secureParams = ((typeof secure === 'boolean' ? secure : this.baseApiParams.secure) && this.securityWorker && await this.securityWorker(this.securityData)) || {};
         const requestParams = this.mergeRequestParams(params, secureParams);
-        const queryString = query && this.toQueryString(query);
+        const queryString =
+            query &&
+            (params.paramsSerializer ?
+                params.paramsSerializer(query)
+            : this.toQueryString(query))
         const payloadFormatter = this.contentFormatters[type || ContentType.Json];
         const responseFormat = format || requestParams.format;
 

package/templates/custom-fetch/procedure-call.eta

@@ -108,21 +108,6 @@ const describeReturnType = () => {
     }
 }
 
-const generatePathSegments = (path) => {
-  const segments = [];
-  const parts = path.split('/').filter(part => part.length > 0);
-
-  let currentPath = '';
-  for (const part of parts) {
-    currentPath += `/${part}`;
-    segments.push(`${currentPath}`);
-  }
-
-  return segments;
-}
-
-const pathSegments = generatePathSegments(pathWithVariables).map(segment => `\`${segment}\``).join(', ');
-
 %>
 /**
 <%~ routeDocs.description %>
@@ -144,8 +129,4 @@ const pathSegments = generatePathSegments(pathWithVariables).map(segment => `\`$
         <%~ responseFormatTmpl ? `format: ${responseFormatTmpl},` : '' %>
         <%~ paramsSerializerTmpl ? `paramsSerializer: ${paramsSerializerTmpl},` : '' %>
         ...<%~ `${conditionalVriablesText}`%>.<%~ _.get(requestConfigParam, "name") %>,
-        next: {
-            ...<%~ `${conditionalVriablesText}`%>.<%~ _.get(requestConfigParam, "name") %>?.next,
-            tags: [<%= pathSegments %>],
-        },
     })