react-query-lightbase-codegen 0.1.1 → 0.1.4

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

@@ -326,7 +326,8 @@ const generateRestfulComponent = ({ operation, verb, route, operationIds, parame
         throw new Error(`"${operationId}" is duplicated in your schema definition!`);
     }
     operationIds.push(operationId);
-    route = route.replace(/\{/g, '${'); // `/pet/{id}` => `/pet/${id}`
+    route = route.replace(/\{/g, '${').replace('//', '/'); // `/pet/{id}` => `/pet/${id}`
+    console.log(route);
     // Remove the last param of the route if we are in the DELETE case
     let lastParamInTheRoute = null;
     const componentName = (0, case_1.pascal)(operationId);
@@ -409,7 +410,6 @@ const generateRestfulComponent = ({ operation, verb, route, operationIds, parame
     // QUERIES
     if (!requestBodyComponent && paramsInPath.length && !queryParam && !headerParam) {
         output += `
-    // type1
     type ${componentName}Return = ${genericsTypes}
     type ${componentName}Variables = {
       ${paramsTypes}
@@ -453,9 +453,6 @@ const generateRestfulComponent = ({ operation, verb, route, operationIds, parame
     }
     if (!requestBodyComponent && paramsInPath.length && queryParam && !headerParam) {
         output += `
-    import queryString from 'query-string';
-
-    // type2
     type ${componentName}Return = ${genericsTypes}
     type ${componentName}Variables = {
       ${paramsTypes}
@@ -503,7 +500,6 @@ const generateRestfulComponent = ({ operation, verb, route, operationIds, parame
     }
     if (!requestBodyComponent && !paramsInPath.length && !queryParam && !headerParam) {
         output += `
-    // type3
     type ${componentName}Return = ${genericsTypes}
     use${componentName}Query.fetch = async () => {
       const result = await api.${verb}<${componentName}Return>(\`${route}\`);
@@ -513,7 +509,7 @@ const generateRestfulComponent = ({ operation, verb, route, operationIds, parame
     use${componentName}Query.queryKey = (): QueryKey => use${componentName}Query.baseKey()
 
     use${componentName}Query.updateCache = (
-      params: undefined,
+      _params: undefined,
       updater: Updater<${componentName}Return | undefined, ${componentName}Return>,
       options?: SetDataOptions | undefined
     ) => queryClient.setQueryData<${componentName}Return>(use${componentName}Query.queryKey(), updater, options);
@@ -543,9 +539,6 @@ const generateRestfulComponent = ({ operation, verb, route, operationIds, parame
     }
     if (!requestBodyComponent && !paramsInPath.length && queryParam && !headerParam) {
         output += `
-    // type4
-    import queryString from 'query-string';
-
 
     type ${componentName}Return = ${genericsTypes}
     type ${componentName}Variables = { 
@@ -589,7 +582,6 @@ const generateRestfulComponent = ({ operation, verb, route, operationIds, parame
     }
     if (requestBodyComponent && !paramsInPath.length && !queryParam && !headerParam) {
         output += `
-    // type5
     type ${componentName}Return = ${genericsTypes}
     type ${componentName}Variables = ${requestBodyComponent};
 
@@ -632,9 +624,6 @@ const generateRestfulComponent = ({ operation, verb, route, operationIds, parame
     }
     if (requestBodyComponent && paramsInPath.length && !queryParam && !headerParam) {
         output += `
-    import queryString from 'query-string';
-
-    // type6
     type ${componentName}Return = ${genericsTypes}
     type ${componentName}Variables = {
       body: ${requestBodyComponent}
@@ -682,9 +671,6 @@ const generateRestfulComponent = ({ operation, verb, route, operationIds, parame
     }
     if (requestBodyComponent && !paramsInPath.length && queryParam && !headerParam) {
         output += `
-    import queryString from 'query-string';
-
-    // type7
     type ${componentName}Return = ${genericsTypes}
     type ${componentName}Variables = {
       body: ${requestBodyComponent} 
@@ -795,8 +781,6 @@ const generateRestfulComponent = ({ operation, verb, route, operationIds, parame
     }
     if (!requestBodyComponent && !paramsInPath.length && queryParam && headerParam) {
         output += `
-    import queryString from 'query-string';
-
     type ${componentName}Return = ${genericsTypes}
 
     type ${componentName}Variables = {
@@ -942,6 +926,7 @@ const importOpenApi = async ({ data, format, apiDirectory, queryClientDir, heade
   } from 'react-query';
   import { Updater } from 'react-query/types/core/utils';
 
+  import queryString from 'query-string';
   import { AxiosError } from 'axios';
   import { api } from '${apiDirectory}';
   import { queryClient } from '${queryClientDir}';

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

@@ -306,7 +306,8 @@ export const generateRestfulComponent = ({ operation, verb, route, operationIds,
         throw new Error(`"${operationId}" is duplicated in your schema definition!`);
     }
     operationIds.push(operationId);
-    route = route.replace(/\{/g, '${'); // `/pet/{id}` => `/pet/${id}`
+    route = route.replace(/\{/g, '${').replace('//', '/'); // `/pet/{id}` => `/pet/${id}`
+    console.log(route);
     // Remove the last param of the route if we are in the DELETE case
     let lastParamInTheRoute = null;
     const componentName = pascal(operationId);
@@ -389,7 +390,6 @@ export const generateRestfulComponent = ({ operation, verb, route, operationIds,
     // QUERIES
     if (!requestBodyComponent && paramsInPath.length && !queryParam && !headerParam) {
         output += `
-    // type1
     type ${componentName}Return = ${genericsTypes}
     type ${componentName}Variables = {
       ${paramsTypes}
@@ -433,9 +433,6 @@ export const generateRestfulComponent = ({ operation, verb, route, operationIds,
     }
     if (!requestBodyComponent && paramsInPath.length && queryParam && !headerParam) {
         output += `
-    import queryString from 'query-string';
-
-    // type2
     type ${componentName}Return = ${genericsTypes}
     type ${componentName}Variables = {
       ${paramsTypes}
@@ -483,7 +480,6 @@ export const generateRestfulComponent = ({ operation, verb, route, operationIds,
     }
     if (!requestBodyComponent && !paramsInPath.length && !queryParam && !headerParam) {
         output += `
-    // type3
     type ${componentName}Return = ${genericsTypes}
     use${componentName}Query.fetch = async () => {
       const result = await api.${verb}<${componentName}Return>(\`${route}\`);
@@ -493,7 +489,7 @@ export const generateRestfulComponent = ({ operation, verb, route, operationIds,
     use${componentName}Query.queryKey = (): QueryKey => use${componentName}Query.baseKey()
 
     use${componentName}Query.updateCache = (
-      params: undefined,
+      _params: undefined,
       updater: Updater<${componentName}Return | undefined, ${componentName}Return>,
       options?: SetDataOptions | undefined
     ) => queryClient.setQueryData<${componentName}Return>(use${componentName}Query.queryKey(), updater, options);
@@ -523,9 +519,6 @@ export const generateRestfulComponent = ({ operation, verb, route, operationIds,
     }
     if (!requestBodyComponent && !paramsInPath.length && queryParam && !headerParam) {
         output += `
-    // type4
-    import queryString from 'query-string';
-
 
     type ${componentName}Return = ${genericsTypes}
     type ${componentName}Variables = { 
@@ -569,7 +562,6 @@ export const generateRestfulComponent = ({ operation, verb, route, operationIds,
     }
     if (requestBodyComponent && !paramsInPath.length && !queryParam && !headerParam) {
         output += `
-    // type5
     type ${componentName}Return = ${genericsTypes}
     type ${componentName}Variables = ${requestBodyComponent};
 
@@ -612,9 +604,6 @@ export const generateRestfulComponent = ({ operation, verb, route, operationIds,
     }
     if (requestBodyComponent && paramsInPath.length && !queryParam && !headerParam) {
         output += `
-    import queryString from 'query-string';
-
-    // type6
     type ${componentName}Return = ${genericsTypes}
     type ${componentName}Variables = {
       body: ${requestBodyComponent}
@@ -662,9 +651,6 @@ export const generateRestfulComponent = ({ operation, verb, route, operationIds,
     }
     if (requestBodyComponent && !paramsInPath.length && queryParam && !headerParam) {
         output += `
-    import queryString from 'query-string';
-
-    // type7
     type ${componentName}Return = ${genericsTypes}
     type ${componentName}Variables = {
       body: ${requestBodyComponent} 
@@ -775,8 +761,6 @@ export const generateRestfulComponent = ({ operation, verb, route, operationIds,
     }
     if (!requestBodyComponent && !paramsInPath.length && queryParam && headerParam) {
         output += `
-    import queryString from 'query-string';
-
     type ${componentName}Return = ${genericsTypes}
 
     type ${componentName}Variables = {
@@ -921,6 +905,7 @@ export const importOpenApi = async ({ data, format, apiDirectory, queryClientDir
   } from 'react-query';
   import { Updater } from 'react-query/types/core/utils';
 
+  import queryString from 'query-string';
   import { AxiosError } from 'axios';
   import { api } from '${apiDirectory}';
   import { queryClient } from '${queryClientDir}';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-query-lightbase-codegen",
-  "version": "0.1.1",
+  "version": "0.1.4",
   "license": "MIT",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",