react-query-lightbase-codegen 0.1.8 → 0.2.0

package/lib/cjs/import-open-api.js

@@ -345,12 +345,20 @@ const generateRestfulComponent = ({ operation, verb, route, operationIds, parame
     }), 'in');
     const headerParams = header.filter((p) => !headerFilters?.includes(p.name));
     let enabled = [];
+    // TODO: extract all requestBody or remove useQuery variants
+    let enabledParam = '!!props';
     [...queryParams, ...pathParams, ...headerParams].forEach((item) => {
         if (item.required) {
             enabled.push(`["${item.name}"]`);
+            if (enabledParam && enabledParam !== '!!props') {
+                enabledParam += `&& props['${item.name}'] != null`;
+            }
+            else {
+                enabledParam = `props['${item.name}'] != null`;
+            }
         }
     });
-    const enabledParam = `!!props${enabled.join(' && !!props')}`;
+    // `!props${enabled.join('== null && !props')}`;
     const paramsTypes = paramsInPath
         .map((p) => {
         try {
@@ -904,8 +912,8 @@ const generateRestfulComponent = ({ operation, verb, route, operationIds, parame
     type ${componentName}QueryProps<T = ${componentName}Return> = ${componentName}Variables & {
       options?: UseQueryOptions<${componentName}Return, AxiosError, T, any> 
     }
-    export function use${componentName}Query<T = ${componentName}Return>({ options = {}, ...body }: ${componentName}QueryProps<T>) { 
-      return useQuery(use${componentName}Query.queryKey(body), async () => use${componentName}Query.fetch(body), 
+    export function use${componentName}Query<T = ${componentName}Return>({ options = {}, ...props }: ${componentName}QueryProps<T>) { 
+      return useQuery(use${componentName}Query.queryKey(props), async () => use${componentName}Query.fetch(props), 
       { enabled: ${enabledParam}, ...options }
       );}
 
@@ -960,14 +968,16 @@ const importOpenApi = async ({ data, format, apiDirectory, queryClientDir, heade
     UseMutationOptions,
     QueryKey,
     SetDataOptions,
-  } from 'react-query';
-  import { Updater, QueryFilters } from 'react-query/types/core/utils';
-
+    QueryFilters
+  } from '@tanstack/react-query';
+  
   import queryString from 'query-string';
   import { AxiosError } from 'axios';
   import { api } from '${apiDirectory}';
   import { queryClient } from '${queryClientDir}';
 
+  type Updater<TInput, TOutput> = TOutput | ((input: TInput) => TOutput);
+
   // SCEHMAS
   ${(0, exports.generateSchemasDefinition)(specs.components?.schemas)}
 

package/lib/esm/import-open-api.js

@@ -325,12 +325,20 @@ export const generateRestfulComponent = ({ operation, verb, route, operationIds,
     }), 'in');
     const headerParams = header.filter((p) => !headerFilters?.includes(p.name));
     let enabled = [];
+    // TODO: extract all requestBody or remove useQuery variants
+    let enabledParam = '!!props';
     [...queryParams, ...pathParams, ...headerParams].forEach((item) => {
         if (item.required) {
             enabled.push(`["${item.name}"]`);
+            if (enabledParam && enabledParam !== '!!props') {
+                enabledParam += `&& props['${item.name}'] != null`;
+            }
+            else {
+                enabledParam = `props['${item.name}'] != null`;
+            }
         }
     });
-    const enabledParam = `!!props${enabled.join(' && !!props')}`;
+    // `!props${enabled.join('== null && !props')}`;
     const paramsTypes = paramsInPath
         .map((p) => {
         try {
@@ -884,8 +892,8 @@ export const generateRestfulComponent = ({ operation, verb, route, operationIds,
     type ${componentName}QueryProps<T = ${componentName}Return> = ${componentName}Variables & {
       options?: UseQueryOptions<${componentName}Return, AxiosError, T, any> 
     }
-    export function use${componentName}Query<T = ${componentName}Return>({ options = {}, ...body }: ${componentName}QueryProps<T>) { 
-      return useQuery(use${componentName}Query.queryKey(body), async () => use${componentName}Query.fetch(body), 
+    export function use${componentName}Query<T = ${componentName}Return>({ options = {}, ...props }: ${componentName}QueryProps<T>) { 
+      return useQuery(use${componentName}Query.queryKey(props), async () => use${componentName}Query.fetch(props), 
       { enabled: ${enabledParam}, ...options }
       );}
 
@@ -939,14 +947,16 @@ export const importOpenApi = async ({ data, format, apiDirectory, queryClientDir
     UseMutationOptions,
     QueryKey,
     SetDataOptions,
-  } from 'react-query';
-  import { Updater, QueryFilters } from 'react-query/types/core/utils';
-
+    QueryFilters
+  } from '@tanstack/react-query';
+  
   import queryString from 'query-string';
   import { AxiosError } from 'axios';
   import { api } from '${apiDirectory}';
   import { queryClient } from '${queryClientDir}';
 
+  type Updater<TInput, TOutput> = TOutput | ((input: TInput) => TOutput);
+
   // SCEHMAS
   ${generateSchemasDefinition(specs.components?.schemas)}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-query-lightbase-codegen",
-  "version": "0.1.8",
+  "version": "0.2.0",
   "license": "MIT",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
@@ -13,6 +13,7 @@
     "test": "yarn tsc && node test/script.mjs && eslint . --ext .js,.jsx,.ts,.tsx --fix"
   },
   "dependencies": {
+    "@tanstack/react-query": "^4.0.9",
     "axios": "0.27.2",
     "case": "1.6.3",
     "chalk": "4.1.0",
@@ -21,7 +22,6 @@
     "openapi3-ts": "2.0.2",
     "qs": "6.10.3",
     "query-string": "7.1.1",
-    "react-query": "3.39.0",
     "swagger2openapi": "7.0.8",
     "yamljs": "0.3.0"
   },