react-query-lightbase-codegen 1.3.0 → 1.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (20) hide show
  1. package/dist/convertSwaggerFile.js.map +1 -1
  2. package/dist/generateHooks.d.ts +2 -10
  3. package/dist/generateHooks.js +40 -101
  4. package/dist/generateHooks.js.map +1 -1
  5. package/dist/generateImports.d.ts +1 -2
  6. package/dist/generateImports.js +3 -10
  7. package/dist/generateImports.js.map +1 -1
  8. package/dist/generateSchemas.js +3 -0
  9. package/dist/generateSchemas.js.map +1 -1
  10. package/dist/importSpecs.d.ts +1 -10
  11. package/dist/importSpecs.js +1 -11
  12. package/dist/importSpecs.js.map +1 -1
  13. package/dist/utils.js +1 -1
  14. package/dist/utils.js.map +1 -1
  15. package/package.json +25 -24
  16. package/src/generateHooks.ts +45 -121
  17. package/src/generateImports.ts +2 -11
  18. package/src/generateSchemas.ts +3 -0
  19. package/src/importSpecs.ts +1 -16
  20. package/src/utils.ts +1 -1
package/dist/convertSwaggerFile.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"convertSwaggerFile.js","sourceRoot":"","sources":["../src/convertSwaggerFile.ts"],"names":[],"mappings":"AACA,OAAO,eAAe,MAAM,iBAAiB,CAAC;AAC9C,OAAO,IAAI,MAAM,SAAS,CAAC;AAE3B;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,SAA0B,EAA0B,EAAE;IACrG,MAAM,MAAM,GAAG,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACzE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACvD,eAAe,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE;gBAC3D,IAAI,GAAG,EAAE;oBACP,MAAM,CAAC,GAAG,CAAC,CAAC;iBACb;qBAAM;oBACL,aAAa;oBACb,YAAY,CAAC,OAAO,CAAC,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBAC/D,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;iBAC/B;YACH,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,OAAO,CAAC,MAAM,CAAC,CAAC;SACjB;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}
1
+ {"version":3,"file":"convertSwaggerFile.js","sourceRoot":"","sources":["../src/convertSwaggerFile.ts"],"names":[],"mappings":"AACA,OAAO,eAAe,MAAM,iBAAiB,CAAC;AAC9C,OAAO,IAAI,MAAM,SAAS,CAAC;AAE3B;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,SAA0B,EAA0B,EAAE;IACrG,MAAM,MAAM,GAAG,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACzE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACxD,eAAe,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE;gBAC3D,IAAI,GAAG,EAAE,CAAC;oBACR,MAAM,CAAC,GAAG,CAAC,CAAC;gBACd,CAAC;qBAAM,CAAC;oBACN,aAAa;oBACb,YAAY,CAAC,OAAO,CAAC,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBAC/D,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAChC,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}
package/dist/generateHooks.d.ts CHANGED
@@ -2,7 +2,7 @@ import { ComponentsObject, OperationObject, ParameterObject, ReferenceObject } f
2
2
  /**
3
3
  * Generate a react-query component from openapi operation specs
4
4
  */
5
- export declare const createHook: ({ operation, verb, route, operationIds, parameters, schemasComponents, headerFilters, overrides, }: {
5
+ export declare const createHook: ({ operation, verb, route, operationIds, parameters, schemasComponents, headerFilters, }: {
6
6
  operation: OperationObject;
7
7
  verb: string;
8
8
  route: string;
@@ -10,16 +10,8 @@ export declare const createHook: ({ operation, verb, route, operationIds, parame
10
10
  parameters: (ReferenceObject | ParameterObject)[] | undefined;
11
11
  schemasComponents?: ComponentsObject | undefined;
12
12
  headerFilters?: string[] | undefined;
13
- overrides?: Record<string, {
14
- type: 'query';
15
- } | {
16
- type: 'mutation';
17
- } | {
18
- type: 'infiniteQuery';
19
- infiniteQueryParm: string;
20
- }> | undefined;
21
13
  }) => {
22
14
  implementation: string;
23
15
  imports: string[];
24
- queryImports: ("query" | "mutation" | "infiniteQuery")[];
16
+ queryImports: ("mutation" | "query" | "infiniteQuery")[];
25
17
  };
package/dist/generateHooks.js CHANGED
@@ -2,7 +2,6 @@ import lodash from 'lodash';
2
2
  const { get, groupBy } = lodash;
3
3
  import { formatDescription, getResReqTypes, isReference, resolveValue } from './utils.js';
4
4
  import pasCase from 'case';
5
- import chalk from 'chalk';
6
5
  const { pascal, camel } = pasCase;
7
6
  const IdentifierRegexp = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
8
7
  /**
@@ -20,7 +19,7 @@ const getParamsInPath = (path) => {
20
19
  /**
21
20
  * Generate a react-query component from openapi operation specs
22
21
  */
23
- export const createHook = ({ operation, verb, route, operationIds, parameters, schemasComponents, headerFilters, overrides, }) => {
22
+ export const createHook = ({ operation, verb, route, operationIds, parameters, schemasComponents, headerFilters, }) => {
24
23
  const { operationId = route.replace('/', '') } = operation;
25
24
  if (operationId === '*') {
26
25
  throw new Error(`Invalid operationId/Route set for ${verb} ${route}`);
@@ -35,7 +34,7 @@ export const createHook = ({ operation, verb, route, operationIds, parameters, s
35
34
  const componentName = pascal(operationId);
36
35
  const isOk = ([statusCode]) => statusCode.toString().startsWith('2');
37
36
  const responseTypes = getResReqTypes(Object.entries(operation.responses).filter(isOk)) || 'void';
38
- const requestBodyTypes = getResReqTypes([['body', operation.requestBody]]);
37
+ const requestBodyTypes = operation.requestBody ? getResReqTypes([['body', operation.requestBody]]) : null;
39
38
  let imports = [responseTypes];
40
39
  let queryImports = [];
41
40
  const paramsInPath = getParamsInPath(route).filter((param) => !(verb === 'delete' && param === lastParamInTheRoute));
@@ -118,98 +117,22 @@ export const createHook = ({ operation, verb, route, operationIds, parameters, s
118
117
  const isUpdateRequest = ['post', 'patch', 'put'].includes(verb);
119
118
  const fetchName = camel(componentName);
120
119
  const createQueryHooks = (emptyParams) => {
121
- const params = emptyParams ? '' : `params: ${componentName}Params,`;
122
120
  const key = emptyParams ? '' : `params`;
123
- const mutationParams = emptyParams ? 'void' : `${componentName}Params`;
124
- const queryParamType = emptyParams ? '' : `${componentName}Params &`;
125
- const filterProps = emptyParams
126
- ? 'props?: { filters?: QueryFilters }'
127
- : `{ params, filters }: { params: ${componentName}Params, filters?: QueryFilters }`;
128
- const filterParams = emptyParams ? 'props?.filters' : `filters`;
129
- const cacheParams = emptyParams
130
- ? `{updater, options}: {updater: Updater<${responseTypes} | undefined, ${responseTypes} | undefined>, options?: SetDataOptions | undefined}`
131
- : `{params, updater, options}: {params: ${componentName}Params, updater: Updater<${responseTypes} | undefined, ${responseTypes} | undefined>, options?: SetDataOptions | undefined}`;
121
+ const queryParamType = emptyParams ? '' : `${componentName}Params`;
132
122
  const queryKey = emptyParams
133
- ? `use${componentName}Query.baseKey()`
134
- : `[...use${componentName}Query.baseKey(), params]`;
135
- const props = emptyParams ? `props?` : `{ options = {}, ...params }`;
136
- const options = emptyParams ? `...props?.options` : `enabled: ${enabledParam}, ...options`;
123
+ ? `["${componentName.toLowerCase()}"]`
124
+ : `["${componentName.toLowerCase()}", params]`;
125
+ const props = emptyParams ? `props?` : `params`;
126
+ const propTest = emptyParams ? '' : `${props}: ${queryParamType}`;
137
127
  const createQuery = () => `
138
- type ${componentName}QueryProps<T = ${responseTypes}> = ${queryParamType} {
139
- options?: UseQueryOptions<${responseTypes}, AxiosError, T, any>
140
- }
141
- export function use${componentName}Query<T = ${responseTypes}>(${props}: ${componentName}QueryProps<T>) {
142
- return useQuery({
143
- queryKey: use${componentName}Query.queryKey(${key}),
128
+ export function get${componentName}QueryOptions(${propTest}) {
129
+ return queryOptions({
130
+ queryKey: ${queryKey},
144
131
  queryFn: () => ${fetchName}(${key}),
145
- ${options}
146
132
  });
147
- }
148
-
149
- use${componentName}Query.baseKey = (): QueryKey => ["${componentName.toLowerCase()}"];
150
-
151
- use${componentName}Query.queryKey = (${params}): QueryKey => ${queryKey};
152
-
153
- use${componentName}Query.updateCache = (${cacheParams}) => queryClient.setQueryData<${responseTypes}>(use${componentName}Query.queryKey(${key}), updater, options);
154
-
155
- use${componentName}Query.getQueryState = (${filterProps})=> queryClient.getQueryState<${responseTypes}>(use${componentName}Query.queryKey(${key}), ${filterParams});
156
-
157
- use${componentName}Query.getQueryData = (${filterProps})=> queryClient.getQueryData<${responseTypes}>(use${componentName}Query.queryKey(${key}), ${filterParams});
158
-
159
- use${componentName}Query.prefetch = (${params}) => queryClient.prefetchQuery<${responseTypes}>(use${componentName}Query.queryKey(${key}), ()=> ${fetchName}(${key}));
160
-
161
- use${componentName}Query.cancelQueries = (${params}) => queryClient.cancelQueries(use${componentName}Query.queryKey(${key}))
162
-
163
- use${componentName}Query.invalidate = (${params}) => queryClient.invalidateQueries<${responseTypes}>(use${componentName}Query.queryKey(${key}));
164
-
165
- use${componentName}Query.refetchStale = (${params}) => queryClient.refetchQueries<${responseTypes}>(use${componentName}Query.queryKey(${key}), { stale: true });
166
- `;
167
- const getInfiniteQuery = ({ pageParam }) => `
168
- type ${componentName}QueryProps<T = ${responseTypes}> = ${queryParamType} {
169
- options: UseInfiniteQueryOptions<${responseTypes}, AxiosError, T, any>
170
- }
171
- export function use${componentName}Query<T = ${responseTypes}>({ options = {}, ...params }: ${componentName}QueryProps<T>) {
172
- return useInfiniteQuery(use${componentName}Query.queryKey(${key}), async ({ pageParam = 0 }) => ${fetchName}({${pageParam}: pageParam, ...params}), { enabled: ${enabledParam}, ...options });
173
- }
174
-
175
- use${componentName}Query.baseKey = (): QueryKey => ["${componentName.toLowerCase()}"];
176
-
177
- use${componentName}Query.queryKey = (${params}): QueryKey => ${queryKey};
178
-
179
- `;
180
- const createMutation = () => `
181
- type ${componentName}MutationProps<T> = {
182
- options?: UseMutationOptions<${responseTypes}, AxiosError, ${mutationParams}, T>
183
- }
184
- export function use${componentName}Mutation<T = ${responseTypes}>(props?: ${componentName}MutationProps<T>) {
185
- return useMutation({
186
- mutationFn: ${fetchName},
187
- ...props?.options
188
- })
189
- };
190
- `;
191
- const override = overrides?.[operationId];
192
- if (override?.type === 'query') {
193
- console.log(chalk.blue(`⚙️ [${operationId}] has been changed to a useQuery hook`));
194
- queryImports.push('query');
195
- return createQuery();
196
- }
197
- if (override?.type === 'mutation') {
198
- queryImports.push('mutation');
199
- console.log(chalk.blue(`⚙️ [${operationId}] has been changed to a useMutation hook`));
200
- return createMutation();
201
- }
202
- if (override?.type === 'infiniteQuery') {
203
- console.log(chalk.blue(`⚙️ [${operationId}] has been changed to a useInfiniteQuery hook`));
204
- queryImports.push('infiniteQuery');
205
- return getInfiniteQuery({ pageParam: override.infiniteQueryParm });
206
- }
207
- if (verb === 'get') {
208
- queryImports.push('query');
209
- return createQuery();
210
- }
211
- queryImports.push('mutation');
212
- return createMutation();
133
+ }`;
134
+ queryImports.push('query');
135
+ return createQuery();
213
136
  };
214
137
  output += createQueryHooks(!requestBodyComponent && !paramsInPath.length && !queryParam && !headerParam);
215
138
  const hasRequestBodyArrray = requestBodyComponent && requestBodyComponent.includes('[]');
@@ -227,12 +150,26 @@ export const createHook = ({ operation, verb, route, operationIds, parameters, s
227
150
  .join(',');
228
151
  return `const body = {${generatedBodyProps}}`;
229
152
  }
230
- return '';
153
+ if (operation.requestBody && 'content' in operation.requestBody) {
154
+ let generatedBodyProps = [];
155
+ for (let contentType of Object.keys(operation.requestBody.content)) {
156
+ if (contentType.startsWith('application/json') ||
157
+ contentType.startsWith('application/octet-stream')) {
158
+ const schema = operation.requestBody.content[contentType].schema;
159
+ if ('properties' in schema) {
160
+ // @ts-ignore
161
+ generatedBodyProps.push(...Object.keys(schema.properties));
162
+ }
163
+ }
164
+ }
165
+ return `const body = {${generatedBodyProps.map((item) => `${item}: props.${item}`).join(',')}}`;
166
+ }
167
+ return `hehe`;
231
168
  };
232
169
  if (!requestBodyComponent && !paramsInPath.length && !queryParam && !headerParam) {
233
170
  output += `
234
171
  export const ${fetchName} = async () => {
235
- const result = await api.${verb}<${responseTypes}>(\`${route}\`);
172
+ const result = await api.${verb}<${responseTypes}>("${route}");
236
173
  return result.data;
237
174
  }
238
175
  `;
@@ -247,7 +184,7 @@ export const createHook = ({ operation, verb, route, operationIds, parameters, s
247
184
 
248
185
  export const ${fetchName} = async (props:${componentName}Params) => {
249
186
  const {${paramsInPath.join(', ')}, ...params} = props
250
- const result = await api.${verb}<${responseTypes}>(\`${route}\`, ${config})
187
+ const result = await api.${verb}<${responseTypes}>("${route}", ${config})
251
188
  return result.data;
252
189
  }`;
253
190
  }
@@ -271,7 +208,7 @@ export const createHook = ({ operation, verb, route, operationIds, parameters, s
271
208
  }
272
209
 
273
210
  export const ${fetchName} = async (params: ${componentName}Params) => {
274
- const result = await api.${verb}<${responseTypes}>(\`${route}\`, ${config})
211
+ const result = await api.${verb}<${responseTypes}>("${route}", ${config})
275
212
  return result.data;
276
213
  }
277
214
  `;
@@ -286,29 +223,30 @@ export const createHook = ({ operation, verb, route, operationIds, parameters, s
286
223
  export const ${fetchName} = async (props: ${componentName}Params) => {
287
224
  const headers = {${generateProps(header)}}
288
225
  const queryParams = {${generateProps(queryParams)}}
289
- const result = await api.${verb}<${responseTypes}>(\`${route}\`, ${config})
226
+ const result = await api.${verb}<${responseTypes}>("${route}", ${config})
290
227
  return result.data
291
228
  }`;
292
229
  }
293
230
  if (!requestBodyComponent && !paramsInPath.length && !queryParam && headerParam) {
294
231
  const config = isUpdateRequest ? 'null,{headers}' : '{headers}';
295
232
  output += `
296
- export type ${componentName}Params = {
233
+ export type ${componentName}Params = {
297
234
  ${headerParam}
298
235
  };
299
236
 
300
237
  export const ${fetchName} = async (headers: ${componentName}Params) => {
301
- const result = await api.${verb}<${responseTypes}>(\`${route}\`, ${config});
238
+ const result = await api.${verb}<${responseTypes}>("${route}", ${config});
302
239
  return result.data;
303
240
  }
304
241
  `;
305
242
  }
306
243
  if (requestBodyComponent && !paramsInPath.length && !queryParam && !headerParam) {
307
244
  output += `
245
+
308
246
  export type ${componentName}Params = ${requestBodyComponent}
309
247
 
310
248
  export const ${fetchName} = async (body: ${componentName}Params) => {
311
- const result = await api.${verb}<${responseTypes}>(\`${route}\`, body)
249
+ const result = await api.${verb}<${responseTypes}>("${route}", body)
312
250
  return result.data
313
251
  }
314
252
  `;
@@ -322,7 +260,7 @@ export const createHook = ({ operation, verb, route, operationIds, parameters, s
322
260
  export const ${fetchName} = async (${bodyProps}: ${componentName}Params) => {
323
261
  ${generateBodyProps()}
324
262
  const params = {${generateProps(queryParams)}}
325
- const result = await api.${verb}<${responseTypes}>(\`${route}\`, body, {params})
263
+ const result = await api.${verb}<${responseTypes}>("${route}", body, {params})
326
264
  return result.data
327
265
  }
328
266
  `;
@@ -336,7 +274,7 @@ export const createHook = ({ operation, verb, route, operationIds, parameters, s
336
274
  export const ${fetchName} = async (${bodyProps}: ${componentName}Params) => {
337
275
  ${generateBodyProps()}
338
276
  const headers = {${generateProps(header)}}
339
- const result = await api.${verb}<${responseTypes}>(\`${route}\`, body, {headers})
277
+ const result = await api.${verb}<${responseTypes}>("${route}", body, {headers})
340
278
  return result.data
341
279
  }
342
280
  `;
@@ -351,7 +289,7 @@ export const createHook = ({ operation, verb, route, operationIds, parameters, s
351
289
  ${generateBodyProps()}
352
290
  const headers = {${generateProps(header)}}
353
291
  const params = {${generateProps(queryParams)}}
354
- const result = await api.${verb}<${responseTypes}>(\`${route}\`, body, {headers, params})
292
+ const result = await api.${verb}<${responseTypes}>("${route}", body, {headers, params})
355
293
  return result.data
356
294
  }
357
295
  `;
@@ -363,6 +301,7 @@ export const createHook = ({ operation, verb, route, operationIds, parameters, s
363
301
  ${paramsTypes}
364
302
  };
365
303
  // TEST1
304
+
366
305
  export const ${fetchName} = async (${bodyProps}: ${componentName}Params) => {
367
306
  ${generateBodyProps()}
368
307
  const result = await api.${verb}<${responseTypes}>(\`${route.replace(/\{/g, '{props.')}\`, body)
package/dist/generateHooks.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generateHooks.js","sourceRoot":"","sources":["../src/generateHooks.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generateHooks.js","sourceRoot":"","sources":["../src/generateHooks.ts"],"names":[],"mappings":"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"}
package/dist/generateImports.d.ts CHANGED
@@ -1,6 +1,5 @@
1
- export declare const generateImports: ({ schemaName, apiDirectory, queryClientDir, schemaImports, queryImports, }: {
1
+ export declare const generateImports: ({ schemaName, apiDirectory, schemaImports, queryImports, }: {
2
2
  apiDirectory: string;
3
- queryClientDir: string;
4
3
  schemaName: string;
5
4
  schemaImports: string[];
6
5
  queryImports: ('query' | 'mutation' | 'infiniteQuery')[];
package/dist/generateImports.js CHANGED
@@ -1,14 +1,11 @@
1
- export const generateImports = ({ schemaName, apiDirectory, queryClientDir, schemaImports, queryImports, }) => {
1
+ export const generateImports = ({ schemaName, apiDirectory, schemaImports, queryImports, }) => {
2
2
  const importTypes = schemaImports.join(',');
3
3
  let imports = [];
4
4
  if (queryImports.includes('query')) {
5
- imports = [...imports, 'useQuery', 'UseQueryOptions', 'QueryKey', 'SetDataOptions', 'QueryFilters'];
5
+ imports = [...imports, 'queryOptions'];
6
6
  }
7
7
  if (queryImports.includes('infiniteQuery')) {
8
- imports = [...imports, 'useInfiniteQuery', 'UseInfiniteQueryOptions', 'QueryKey'];
9
- }
10
- if (queryImports.includes('mutation')) {
11
- imports = [...imports, 'UseMutationOptions', 'useMutation'];
8
+ imports = [...imports, 'infiniteQueryOptions'];
12
9
  }
13
10
  const importString = [...new Set(imports)].join(',');
14
11
  return `
@@ -16,13 +13,9 @@ export const generateImports = ({ schemaName, apiDirectory, queryClientDir, sche
16
13
  ${importString}
17
14
  } from '@tanstack/react-query';
18
15
 
19
- import { AxiosError } from 'axios';
20
16
  import { api } from '${apiDirectory}';
21
- import { queryClient } from '${queryClientDir}';
22
-
23
17
  import {${importTypes}} from './${schemaName}'
24
18
 
25
- type Updater<TInput, TOutput> = TOutput | ((input: TInput) => TOutput);
26
19
  `;
27
20
  };
28
21
  //# sourceMappingURL=generateImports.js.map
package/dist/generateImports.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generateImports.js","sourceRoot":"","sources":["../src/generateImports.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAC9B,UAAU,EACV,YAAY,EACZ,cAAc,EACd,aAAa,EACb,YAAY,GAOb,EAAE,EAAE;IACH,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5C,IAAI,OAAO,GAAG,EAAc,CAAC;IAC7B,IAAI,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAClC,OAAO,GAAG,CAAC,GAAG,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;KACrG;IACD,IAAI,YAAY,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE;QAC1C,OAAO,GAAG,CAAC,GAAG,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,UAAU,CAAC,CAAC;KACnF;IACD,IAAI,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QACrC,OAAO,GAAG,CAAC,GAAG,OAAO,EAAE,oBAAoB,EAAE,aAAa,CAAC,CAAC;KAC7D;IAED,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAErD,OAAO;;MAEH,YAAY;;;;yBAIO,YAAY;iCACJ,cAAc;;YAEnC,WAAW,aAAa,UAAU;;;GAG3C,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"generateImports.js","sourceRoot":"","sources":["../src/generateImports.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAC9B,UAAU,EACV,YAAY,EACZ,aAAa,EACb,YAAY,GAMb,EAAE,EAAE;IACH,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5C,IAAI,OAAO,GAAG,EAAc,CAAC;IAC7B,IAAI,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACnC,OAAO,GAAG,CAAC,GAAG,OAAO,EAAE,cAAc,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,YAAY,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;QAC3C,OAAO,GAAG,CAAC,GAAG,OAAO,EAAE,sBAAsB,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAErD,OAAO;;MAEH,YAAY;;;yBAGO,YAAY;YACzB,WAAW,aAAa,UAAU;;GAE3C,CAAC;AACJ,CAAC,CAAC"}
package/dist/generateSchemas.js CHANGED
@@ -72,6 +72,9 @@ const generateResponsesDefinition = (responses = {}) => {
72
72
  const doc = getDocs(response);
73
73
  const type = getResReqTypes([['', response]]);
74
74
  const isEmptyInterface = type === '{}';
75
+ if (!type) {
76
+ return;
77
+ }
75
78
  if (isEmptyInterface) {
76
79
  return `export type RQ${pascal(name)}Response = ${type}`;
77
80
  }
package/dist/generateSchemas.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generateSchemas.js","sourceRoot":"","sources":["../src/generateSchemas.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generateSchemas.js","sourceRoot":"","sources":["../src/generateSchemas.ts"],"names":[],"mappings":"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"}
package/dist/importSpecs.d.ts CHANGED
@@ -1,15 +1,6 @@
1
- export declare function importSpecs({ sourceDirectory, exportDirectory, apiDirectory, queryClientDir, headerFilters, overrides, }: {
1
+ export declare function importSpecs({ sourceDirectory, exportDirectory, apiDirectory, headerFilters, }: {
2
2
  sourceDirectory: string;
3
3
  exportDirectory: string;
4
4
  apiDirectory: string;
5
- queryClientDir: string;
6
5
  headerFilters?: string[];
7
- overrides?: Record<string, {
8
- type: 'query';
9
- } | {
10
- type: 'mutation';
11
- } | {
12
- type: 'infiniteQuery';
13
- infiniteQueryParm: string;
14
- }>;
15
6
  }): void;
package/dist/importSpecs.js CHANGED
@@ -6,8 +6,7 @@ import { convertSwaggerFile } from './convertSwaggerFile.js';
6
6
  import { createHook } from './generateHooks.js';
7
7
  import { generateImports } from './generateImports.js';
8
8
  import { generateSchemas } from './generateSchemas.js';
9
- import execa from 'execa';
10
- export function importSpecs({ sourceDirectory, exportDirectory, apiDirectory, queryClientDir, headerFilters, overrides, }) {
9
+ export function importSpecs({ sourceDirectory, exportDirectory, apiDirectory, headerFilters, }) {
11
10
  readdir(sourceDirectory, async (err, filenames) => {
12
11
  if (err) {
13
12
  console.log(err);
@@ -39,7 +38,6 @@ export function importSpecs({ sourceDirectory, exportDirectory, apiDirectory, qu
39
38
  parameters: verbs.parameters,
40
39
  schemasComponents: spec.components,
41
40
  headerFilters,
42
- overrides,
43
41
  });
44
42
  hooks += implementation;
45
43
  imports.forEach((element) => {
@@ -61,7 +59,6 @@ export function importSpecs({ sourceDirectory, exportDirectory, apiDirectory, qu
61
59
  });
62
60
  const imports = generateImports({
63
61
  apiDirectory,
64
- queryClientDir,
65
62
  schemaName,
66
63
  schemaImports: schemaImportsArray,
67
64
  queryImports: collectedQueryImports,
@@ -69,13 +66,6 @@ export function importSpecs({ sourceDirectory, exportDirectory, apiDirectory, qu
69
66
  writeFileSync(join(process.cwd(), `${exportDirectory}/${name}/${hooksName}.tsx`), imports + hooks);
70
67
  writeFileSync(join(process.cwd(), `${exportDirectory}/${name}/${schemaName}.tsx`), generateSchemas({ spec }));
71
68
  console.log(chalk.green(`🎉 [${filename}] Your OpenAPI spec has been converted into react query hooks`));
72
- try {
73
- execa.sync('prettier', ['--write', `./${exportDirectory}/${name}/*.tsx`]);
74
- console.log(chalk.blue(`⚙️ Running prettier`));
75
- }
76
- catch (e) {
77
- console.log(chalk.yellow(`⚠️ Prettier not found`));
78
- }
79
69
  }
80
70
  catch (error) {
81
71
  if (error.code === 'EISDIR') {
package/dist/importSpecs.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"importSpecs.js","sourceRoot":"","sources":["../src/importSpecs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"importSpecs.js","sourceRoot":"","sources":["../src/importSpecs.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAErE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,UAAU,WAAW,CAAC,EAC1B,eAAe,EACf,eAAe,EACf,YAAY,EACZ,aAAa,GAMd;IACC,OAAO,CAAC,eAAe,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE;QAChD,IAAI,GAAG,EAAE,CAAC;YACR,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACjB,MAAM,GAAG,CAAC;QACZ,CAAC;QACD,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YACnC,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,eAAe,GAAG,GAAG,GAAG,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;gBAC1F,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,eAAe,GAAG,GAAG,GAAG,QAAQ,CAAC,CAAC;gBACxD,MAAM,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;gBAC/E,IAAI,IAAI,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBAElD,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC9E,MAAM,UAAU,GAAG,GAAG,iBAAiB,SAAS,CAAC;gBACjD,MAAM,SAAS,GAAG,GAAG,iBAAiB,EAAE,CAAC;gBACzC,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBACpC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,GAAG,eAAe,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAElF,MAAM,YAAY,GAAa,EAAE,CAAC;gBAElC,IAAI,KAAK,GAAG,EAAE,CAAC;gBACf,IAAI,kBAAkB,GAAG,EAAc,CAAC;gBACxC,IAAI,qBAAqB,GAAG,EAAgD,CAAC;gBAC7E,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAA2B,EAAE,EAAE;oBAC9E,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,SAAS,CAA4B,EAAE,EAAE;wBAC7E,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;4BACtF,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC;gCAC3D,SAAS;gCACT,IAAI;gCACJ,KAAK,EAAE,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,GAAG,KAAK;gCACpC,YAAY;gCACZ,UAAU,EAAE,KAAK,CAAC,UAAU;gCAC5B,iBAAiB,EAAE,IAAI,CAAC,UAAU;gCAClC,aAAa;6BACd,CAAC,CAAC;4BAEH,KAAK,IAAI,cAAc,CAAC;4BACxB,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gCAC1B,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gCAElD,IACE,CAAC,kBAAkB,CAAC,QAAQ,CAAC,eAAe,CAAC;oCAC7C,OAAO,KAAK,MAAM;oCAClB,OAAO,KAAK,QAAQ;oCACpB,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EACtB,CAAC;oCACD,kBAAkB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;gCAC3C,CAAC;4BACH,CAAC,CAAC,CAAC;4BACH,YAAY,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gCAC/B,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;oCAC1C,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gCACtC,CAAC;4BACH,CAAC,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBAEH,MAAM,OAAO,GAAG,eAAe,CAAC;oBAC9B,YAAY;oBACZ,UAAU;oBACV,aAAa,EAAE,kBAAkB;oBACjC,YAAY,EAAE,qBAAqB;iBACpC,CAAC,CAAC;gBAEH,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,GAAG,eAAe,IAAI,IAAI,IAAI,SAAS,MAAM,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC,CAAC;gBAEnG,aAAa,CACX,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,GAAG,eAAe,IAAI,IAAI,IAAI,UAAU,MAAM,CAAC,EACnE,eAAe,CAAC,EAAE,IAAI,EAAE,CAAC,CAC1B,CAAC;gBACF,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,KAAK,CAAC,OAAO,QAAQ,+DAA+D,CAAC,CAC5F,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAK,KAAa,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACrC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC,CAAC;oBAChE,OAAO;gBACT,CAAC;gBACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,QAAQ,IAAI,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
package/dist/utils.js CHANGED
@@ -89,7 +89,7 @@ const getObject = (item) => {
89
89
  }
90
90
  const IdentifierRegexp = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
91
91
  // Consolidation of item.properties & item.additionalProperties
92
- let output = '{\n';
92
+ let output = '{';
93
93
  if (item.properties) {
94
94
  output += Object.entries(item.properties)
95
95
  .map(([key, prop]) => {
package/dist/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "react-query-lightbase-codegen",
3
3
  "description": "Fully typed react query code generation tool based on openApi specifications",
4
- "version": "1.3.0",
4
+ "version": "1.3.2",
5
5
  "license": "MIT",
6
6
  "type": "module",
7
7
  "exports": "./dist/index.js",
@@ -42,38 +42,39 @@
42
42
  "prepare": "husky install"
43
43
  },
44
44
  "dependencies": {
45
- "axios": "0.27.2",
45
+ "axios": "1.6.8",
46
46
  "case": "1.6.3",
47
- "chalk": "5.0.1",
47
+ "chalk": "5.3.0",
48
48
  "js-yaml": "4.1.0",
49
49
  "lodash": "4.17.21",
50
+ "miragejs": "^0.1.47",
50
51
  "openapi3-ts": "2.0.2",
51
52
  "swagger2openapi": "7.0.8",
52
53
  "yamljs": "0.3.0"
53
54
  },
54
55
  "devDependencies": {
55
- "@babel/core": "7.18.10",
56
- "@babel/eslint-parser": "7.17.0",
57
- "@commitlint/cli": "^17.0.3",
58
- "@commitlint/config-conventional": "^17.0.3",
59
- "@react-native-community/eslint-config": "3.1.0",
60
- "@semantic-release/changelog": "^6.0.1",
56
+ "@babel/core": "7.24.3",
57
+ "@babel/eslint-parser": "7.24.1",
58
+ "@commitlint/cli": "^19.2.1",
59
+ "@commitlint/config-conventional": "^19.1.0",
60
+ "@react-native-community/eslint-config": "3.2.0",
61
+ "@semantic-release/changelog": "^6.0.3",
61
62
  "@semantic-release/git": "^10.0.1",
62
- "@semantic-release/github": "^8.0.5",
63
- "@semantic-release/npm": "^9.0.1",
64
- "@tanstack/react-query": "4.0.10",
65
- "@types/js-yaml": "4.0.5",
66
- "@types/lodash": "4.14.182",
67
- "@types/node": "18.6.3",
68
- "@types/qs": "6.9.7",
63
+ "@semantic-release/github": "^10.0.2",
64
+ "@semantic-release/npm": "^12.0.0",
65
+ "@tanstack/react-query": "5.28.6",
66
+ "@types/js-yaml": "4.0.9",
67
+ "@types/lodash": "4.17.0",
68
+ "@types/node": "20.11.30",
69
+ "@types/qs": "6.9.14",
69
70
  "@types/query-string": "6.3.0",
70
- "@types/yamljs": "0.2.31",
71
- "eslint": "8.21.0",
72
- "eslint-plugin-prettier": "4.2.1",
73
- "husky": "^8.0.1",
74
- "prettier": "2.7.1",
75
- "react": "17.0.2",
76
- "semantic-release": "^19.0.3",
77
- "typescript": "4.7.4"
71
+ "@types/yamljs": "0.2.34",
72
+ "eslint": "8.57.0",
73
+ "eslint-plugin-prettier": "5.1.3",
74
+ "husky": "^9.0.11",
75
+ "prettier": "3.2.5",
76
+ "react": "18.2.0",
77
+ "semantic-release": "^23.0.6",
78
+ "typescript": "5.4.3"
78
79
  }
79
80
  }
package/src/generateHooks.ts CHANGED
@@ -10,7 +10,6 @@ import {
10
10
  } from 'openapi3-ts';
11
11
  import { formatDescription, getResReqTypes, isReference, resolveValue } from './utils.js';
12
12
  import pasCase from 'case';
13
- import chalk from 'chalk';
14
13
 
15
14
  const { pascal, camel } = pasCase;
16
15
 
@@ -41,7 +40,6 @@ export const createHook = ({
41
40
  parameters,
42
41
  schemasComponents,
43
42
  headerFilters,
44
- overrides,
45
43
  }: {
46
44
  operation: OperationObject;
47
45
  verb: string;
@@ -50,10 +48,6 @@ export const createHook = ({
50
48
  parameters: (ReferenceObject | ParameterObject)[] | undefined;
51
49
  schemasComponents?: ComponentsObject;
52
50
  headerFilters?: string[];
53
- overrides?: Record<
54
- string,
55
- { type: 'query' } | { type: 'mutation' } | { type: 'infiniteQuery'; infiniteQueryParm: string }
56
- >;
57
51
  }) => {
58
52
  const { operationId = route.replace('/', '') } = operation;
59
53
  if (operationId === '*') {
@@ -75,7 +69,7 @@ export const createHook = ({
75
69
  statusCode.toString().startsWith('2');
76
70
 
77
71
  const responseTypes = getResReqTypes(Object.entries(operation.responses).filter(isOk)) || 'void';
78
- const requestBodyTypes = getResReqTypes([['body', operation.requestBody!]]);
72
+ const requestBodyTypes = operation.requestBody ? getResReqTypes([['body', operation.requestBody]]) : null;
79
73
 
80
74
  let imports = [responseTypes];
81
75
  let queryImports = [] as Array<'mutation' | 'query' | 'infiniteQuery'>;
@@ -186,107 +180,23 @@ export const createHook = ({
186
180
  const fetchName = camel(componentName);
187
181
 
188
182
  const createQueryHooks = (emptyParams?: boolean) => {
189
- const params = emptyParams ? '' : `params: ${componentName}Params,`;
190
183
  const key = emptyParams ? '' : `params`;
191
- const mutationParams = emptyParams ? 'void' : `${componentName}Params`;
192
- const queryParamType = emptyParams ? '' : `${componentName}Params &`;
193
- const filterProps = emptyParams
194
- ? 'props?: { filters?: QueryFilters }'
195
- : `{ params, filters }: { params: ${componentName}Params, filters?: QueryFilters }`;
196
- const filterParams = emptyParams ? 'props?.filters' : `filters`;
197
- const cacheParams = emptyParams
198
- ? `{updater, options}: {updater: Updater<${responseTypes} | undefined, ${responseTypes} | undefined>, options?: SetDataOptions | undefined}`
199
- : `{params, updater, options}: {params: ${componentName}Params, updater: Updater<${responseTypes} | undefined, ${responseTypes} | undefined>, options?: SetDataOptions | undefined}`;
184
+ const queryParamType = emptyParams ? '' : `${componentName}Params`;
200
185
  const queryKey = emptyParams
201
- ? `use${componentName}Query.baseKey()`
202
- : `[...use${componentName}Query.baseKey(), params]`;
203
-
204
- const props = emptyParams ? `props?` : `{ options = {}, ...params }`;
205
- const options = emptyParams ? `...props?.options` : `enabled: ${enabledParam}, ...options`;
206
-
186
+ ? `["${componentName.toLowerCase()}"]`
187
+ : `["${componentName.toLowerCase()}", params]`;
188
+ const props = emptyParams ? `props?` : `params`;
189
+ const propTest = emptyParams ? '' : `${props}: ${queryParamType}`;
207
190
  const createQuery = () => `
208
- type ${componentName}QueryProps<T = ${responseTypes}> = ${queryParamType} {
209
- options?: UseQueryOptions<${responseTypes}, AxiosError, T, any>
210
- }
211
- export function use${componentName}Query<T = ${responseTypes}>(${props}: ${componentName}QueryProps<T>) {
212
- return useQuery({
213
- queryKey: use${componentName}Query.queryKey(${key}),
191
+ export function get${componentName}QueryOptions(${propTest}) {
192
+ return queryOptions({
193
+ queryKey: ${queryKey},
214
194
  queryFn: () => ${fetchName}(${key}),
215
- ${options}
216
195
  });
217
- }
218
-
219
- use${componentName}Query.baseKey = (): QueryKey => ["${componentName.toLowerCase()}"];
220
-
221
- use${componentName}Query.queryKey = (${params}): QueryKey => ${queryKey};
222
-
223
- use${componentName}Query.updateCache = (${cacheParams}) => queryClient.setQueryData<${responseTypes}>(use${componentName}Query.queryKey(${key}), updater, options);
224
-
225
- use${componentName}Query.getQueryState = (${filterProps})=> queryClient.getQueryState<${responseTypes}>(use${componentName}Query.queryKey(${key}), ${filterParams});
226
-
227
- use${componentName}Query.getQueryData = (${filterProps})=> queryClient.getQueryData<${responseTypes}>(use${componentName}Query.queryKey(${key}), ${filterParams});
228
-
229
- use${componentName}Query.prefetch = (${params}) => queryClient.prefetchQuery<${responseTypes}>(use${componentName}Query.queryKey(${key}), ()=> ${fetchName}(${key}));
230
-
231
- use${componentName}Query.cancelQueries = (${params}) => queryClient.cancelQueries(use${componentName}Query.queryKey(${key}))
232
-
233
- use${componentName}Query.invalidate = (${params}) => queryClient.invalidateQueries<${responseTypes}>(use${componentName}Query.queryKey(${key}));
234
-
235
- use${componentName}Query.refetchStale = (${params}) => queryClient.refetchQueries<${responseTypes}>(use${componentName}Query.queryKey(${key}), { stale: true });
236
- `;
237
-
238
- const getInfiniteQuery = ({ pageParam }: { pageParam: string }) => `
239
- type ${componentName}QueryProps<T = ${responseTypes}> = ${queryParamType} {
240
- options: UseInfiniteQueryOptions<${responseTypes}, AxiosError, T, any>
241
- }
242
- export function use${componentName}Query<T = ${responseTypes}>({ options = {}, ...params }: ${componentName}QueryProps<T>) {
243
- return useInfiniteQuery(use${componentName}Query.queryKey(${key}), async ({ pageParam = 0 }) => ${fetchName}({${pageParam}: pageParam, ...params}), { enabled: ${enabledParam}, ...options });
244
- }
245
-
246
- use${componentName}Query.baseKey = (): QueryKey => ["${componentName.toLowerCase()}"];
247
-
248
- use${componentName}Query.queryKey = (${params}): QueryKey => ${queryKey};
249
-
250
- `;
251
-
252
- const createMutation = () => `
253
- type ${componentName}MutationProps<T> = {
254
- options?: UseMutationOptions<${responseTypes}, AxiosError, ${mutationParams}, T>
255
- }
256
- export function use${componentName}Mutation<T = ${responseTypes}>(props?: ${componentName}MutationProps<T>) {
257
- return useMutation({
258
- mutationFn: ${fetchName},
259
- ...props?.options
260
- })
261
- };
262
- `;
263
-
264
- const override = overrides?.[operationId];
265
- if (override?.type === 'query') {
266
- console.log(chalk.blue(`⚙️ [${operationId}] has been changed to a useQuery hook`));
267
- queryImports.push('query');
268
- return createQuery();
269
- }
270
-
271
- if (override?.type === 'mutation') {
272
- queryImports.push('mutation');
273
- console.log(chalk.blue(`⚙️ [${operationId}] has been changed to a useMutation hook`));
274
- return createMutation();
275
- }
276
-
277
- if (override?.type === 'infiniteQuery') {
278
- console.log(chalk.blue(`⚙️ [${operationId}] has been changed to a useInfiniteQuery hook`));
279
- queryImports.push('infiniteQuery');
280
- return getInfiniteQuery({ pageParam: override.infiniteQueryParm });
281
- }
282
-
283
- if (verb === 'get') {
284
- queryImports.push('query');
285
- return createQuery();
286
- }
196
+ }`;
287
197
 
288
- queryImports.push('mutation');
289
- return createMutation();
198
+ queryImports.push('query');
199
+ return createQuery();
290
200
  };
291
201
 
292
202
  output += createQueryHooks(!requestBodyComponent && !paramsInPath.length && !queryParam && !headerParam);
@@ -303,6 +213,7 @@ export const createHook = ({
303
213
  const definitionKey = Object.keys(schemasComponents?.schemas || {}).find(
304
214
  (key) => pascal(key) === requestBodyComponent
305
215
  );
216
+
306
217
  if (definitionKey && !hasRequestBodyArrray) {
307
218
  const scheme = schemasComponents?.schemas?.[definitionKey] as SchemaObject;
308
219
  const generatedBodyProps = Object.keys(scheme.properties as SchemaObject)
@@ -310,18 +221,36 @@ export const createHook = ({
310
221
  .join(',');
311
222
  return `const body = {${generatedBodyProps}}`;
312
223
  }
313
- return '';
224
+
225
+ if (operation.requestBody && 'content' in operation.requestBody) {
226
+ let generatedBodyProps = [];
227
+ for (let contentType of Object.keys(operation.requestBody.content)) {
228
+ if (
229
+ contentType.startsWith('application/json') ||
230
+ contentType.startsWith('application/octet-stream')
231
+ ) {
232
+ const schema = operation.requestBody.content[contentType].schema!;
233
+
234
+ if ('properties' in schema) {
235
+ // @ts-ignore
236
+ generatedBodyProps.push(...Object.keys(schema.properties));
237
+ }
238
+ }
239
+ }
240
+ return `const body = {${generatedBodyProps.map((item) => `${item}: props.${item}`).join(',')}}`;
241
+ }
242
+
243
+ return `hehe`;
314
244
  };
315
245
 
316
246
  if (!requestBodyComponent && !paramsInPath.length && !queryParam && !headerParam) {
317
247
  output += `
318
248
  export const ${fetchName} = async () => {
319
- const result = await api.${verb}<${responseTypes}>(\`${route}\`);
249
+ const result = await api.${verb}<${responseTypes}>("${route}");
320
250
  return result.data;
321
251
  }
322
252
  `;
323
253
  }
324
-
325
254
  if (!requestBodyComponent && paramsInPath.length && queryParam && !headerParam) {
326
255
  const config = isUpdateRequest ? 'undefined,{params}' : '{params}';
327
256
  output += `
@@ -332,11 +261,10 @@ export const createHook = ({
332
261
 
333
262
  export const ${fetchName} = async (props:${componentName}Params) => {
334
263
  const {${paramsInPath.join(', ')}, ...params} = props
335
- const result = await api.${verb}<${responseTypes}>(\`${route}\`, ${config})
264
+ const result = await api.${verb}<${responseTypes}>("${route}", ${config})
336
265
  return result.data;
337
266
  }`;
338
267
  }
339
-
340
268
  if (!requestBodyComponent && paramsInPath.length && !queryParam && !headerParam) {
341
269
  output += `
342
270
  export type ${componentName}Params = {
@@ -349,7 +277,6 @@ export const createHook = ({
349
277
  }
350
278
  `;
351
279
  }
352
-
353
280
  if (!requestBodyComponent && !paramsInPath.length && queryParam && !headerParam) {
354
281
  const config = isUpdateRequest ? 'null,{params}' : '{params}';
355
282
  output += `
@@ -358,7 +285,7 @@ export const createHook = ({
358
285
  }
359
286
 
360
287
  export const ${fetchName} = async (params: ${componentName}Params) => {
361
- const result = await api.${verb}<${responseTypes}>(\`${route}\`, ${config})
288
+ const result = await api.${verb}<${responseTypes}>("${route}", ${config})
362
289
  return result.data;
363
290
  }
364
291
  `;
@@ -373,35 +300,34 @@ export const createHook = ({
373
300
  export const ${fetchName} = async (props: ${componentName}Params) => {
374
301
  const headers = {${generateProps(header)}}
375
302
  const queryParams = {${generateProps(queryParams)}}
376
- const result = await api.${verb}<${responseTypes}>(\`${route}\`, ${config})
303
+ const result = await api.${verb}<${responseTypes}>("${route}", ${config})
377
304
  return result.data
378
305
  }`;
379
306
  }
380
307
  if (!requestBodyComponent && !paramsInPath.length && !queryParam && headerParam) {
381
308
  const config = isUpdateRequest ? 'null,{headers}' : '{headers}';
382
309
  output += `
383
- export type ${componentName}Params = {
310
+ export type ${componentName}Params = {
384
311
  ${headerParam}
385
312
  };
386
313
 
387
314
  export const ${fetchName} = async (headers: ${componentName}Params) => {
388
- const result = await api.${verb}<${responseTypes}>(\`${route}\`, ${config});
315
+ const result = await api.${verb}<${responseTypes}>("${route}", ${config});
389
316
  return result.data;
390
317
  }
391
318
  `;
392
319
  }
393
-
394
320
  if (requestBodyComponent && !paramsInPath.length && !queryParam && !headerParam) {
395
321
  output += `
322
+
396
323
  export type ${componentName}Params = ${requestBodyComponent}
397
324
 
398
325
  export const ${fetchName} = async (body: ${componentName}Params) => {
399
- const result = await api.${verb}<${responseTypes}>(\`${route}\`, body)
326
+ const result = await api.${verb}<${responseTypes}>("${route}", body)
400
327
  return result.data
401
328
  }
402
329
  `;
403
330
  }
404
-
405
331
  if (requestBodyComponent && !paramsInPath.length && queryParam && !headerParam) {
406
332
  output += `
407
333
  export type ${componentName}Params = ${body} & {
@@ -411,12 +337,11 @@ export const createHook = ({
411
337
  export const ${fetchName} = async (${bodyProps}: ${componentName}Params) => {
412
338
  ${generateBodyProps()}
413
339
  const params = {${generateProps(queryParams)}}
414
- const result = await api.${verb}<${responseTypes}>(\`${route}\`, body, {params})
340
+ const result = await api.${verb}<${responseTypes}>("${route}", body, {params})
415
341
  return result.data
416
342
  }
417
343
  `;
418
344
  }
419
-
420
345
  if (requestBodyComponent && !paramsInPath.length && !queryParam && headerParam) {
421
346
  output += `
422
347
  export type ${componentName}Params = ${body} & {
@@ -426,12 +351,11 @@ export const createHook = ({
426
351
  export const ${fetchName} = async (${bodyProps}: ${componentName}Params) => {
427
352
  ${generateBodyProps()}
428
353
  const headers = {${generateProps(header)}}
429
- const result = await api.${verb}<${responseTypes}>(\`${route}\`, body, {headers})
354
+ const result = await api.${verb}<${responseTypes}>("${route}", body, {headers})
430
355
  return result.data
431
356
  }
432
357
  `;
433
358
  }
434
-
435
359
  if (requestBodyComponent && !paramsInPath.length && queryParam && headerParam) {
436
360
  output += `
437
361
  export type ${componentName}Params = ${body} & {
@@ -442,12 +366,11 @@ export const createHook = ({
442
366
  ${generateBodyProps()}
443
367
  const headers = {${generateProps(header)}}
444
368
  const params = {${generateProps(queryParams)}}
445
- const result = await api.${verb}<${responseTypes}>(\`${route}\`, body, {headers, params})
369
+ const result = await api.${verb}<${responseTypes}>("${route}", body, {headers, params})
446
370
  return result.data
447
371
  }
448
372
  `;
449
373
  }
450
-
451
374
  if (requestBodyComponent && paramsInPath.length && !queryParam && !headerParam) {
452
375
  output += `
453
376
  export type ${componentName}Params = ${body} & {
@@ -455,6 +378,7 @@ export const createHook = ({
455
378
  ${paramsTypes}
456
379
  };
457
380
  // TEST1
381
+
458
382
  export const ${fetchName} = async (${bodyProps}: ${componentName}Params) => {
459
383
  ${generateBodyProps()}
460
384
  const result = await api.${verb}<${responseTypes}>(\`${route.replace(/\{/g, '{props.')}\`, body)
package/src/generateImports.ts CHANGED
@@ -1,12 +1,10 @@
1
1
  export const generateImports = ({
2
2
  schemaName,
3
3
  apiDirectory,
4
- queryClientDir,
5
4
  schemaImports,
6
5
  queryImports,
7
6
  }: {
8
7
  apiDirectory: string;
9
- queryClientDir: string;
10
8
  schemaName: string;
11
9
  schemaImports: string[];
12
10
  queryImports: ('query' | 'mutation' | 'infiniteQuery')[];
@@ -14,13 +12,10 @@ export const generateImports = ({
14
12
  const importTypes = schemaImports.join(',');
15
13
  let imports = [] as string[];
16
14
  if (queryImports.includes('query')) {
17
- imports = [...imports, 'useQuery', 'UseQueryOptions', 'QueryKey', 'SetDataOptions', 'QueryFilters'];
15
+ imports = [...imports, 'queryOptions'];
18
16
  }
19
17
  if (queryImports.includes('infiniteQuery')) {
20
- imports = [...imports, 'useInfiniteQuery', 'UseInfiniteQueryOptions', 'QueryKey'];
21
- }
22
- if (queryImports.includes('mutation')) {
23
- imports = [...imports, 'UseMutationOptions', 'useMutation'];
18
+ imports = [...imports, 'infiniteQueryOptions'];
24
19
  }
25
20
 
26
21
  const importString = [...new Set(imports)].join(',');
@@ -30,12 +25,8 @@ export const generateImports = ({
30
25
  ${importString}
31
26
  } from '@tanstack/react-query';
32
27
 
33
- import { AxiosError } from 'axios';
34
28
  import { api } from '${apiDirectory}';
35
- import { queryClient } from '${queryClientDir}';
36
-
37
29
  import {${importTypes}} from './${schemaName}'
38
30
 
39
- type Updater<TInput, TOutput> = TOutput | ((input: TInput) => TOutput);
40
31
  `;
41
32
  };
package/src/generateSchemas.ts CHANGED
@@ -88,6 +88,9 @@ const generateResponsesDefinition = (responses: ComponentsObject['responses'] =
88
88
  const doc = getDocs(response);
89
89
  const type = getResReqTypes([['', response]]);
90
90
  const isEmptyInterface = type === '{}';
91
+ if (!type) {
92
+ return;
93
+ }
91
94
  if (isEmptyInterface) {
92
95
  return `export type RQ${pascal(name)}Response = ${type}`;
93
96
  } else if (type.includes('{') && !type.includes('|') && !type.includes('&')) {
package/src/importSpecs.ts CHANGED
@@ -7,25 +7,17 @@ import { convertSwaggerFile } from './convertSwaggerFile.js';
7
7
  import { createHook } from './generateHooks.js';
8
8
  import { generateImports } from './generateImports.js';
9
9
  import { generateSchemas } from './generateSchemas.js';
10
- import execa from 'execa';
11
10
 
12
11
  export function importSpecs({
13
12
  sourceDirectory,
14
13
  exportDirectory,
15
14
  apiDirectory,
16
- queryClientDir,
17
15
  headerFilters,
18
- overrides,
19
16
  }: {
20
17
  sourceDirectory: string;
21
18
  exportDirectory: string;
22
19
  apiDirectory: string;
23
- queryClientDir: string;
24
20
  headerFilters?: string[];
25
- overrides?: Record<
26
- string,
27
- { type: 'query' } | { type: 'mutation' } | { type: 'infiniteQuery'; infiniteQueryParm: string }
28
- >;
29
21
  }) {
30
22
  readdir(sourceDirectory, async (err, filenames) => {
31
23
  if (err) {
@@ -61,12 +53,12 @@ export function importSpecs({
61
53
  parameters: verbs.parameters,
62
54
  schemasComponents: spec.components,
63
55
  headerFilters,
64
- overrides,
65
56
  });
66
57
 
67
58
  hooks += implementation;
68
59
  imports.forEach((element) => {
69
60
  const formattedImport = element.replace('[]', '');
61
+
70
62
  if (
71
63
  !schemaImportsArray.includes(formattedImport) &&
72
64
  element !== 'void' &&
@@ -87,7 +79,6 @@ export function importSpecs({
87
79
 
88
80
  const imports = generateImports({
89
81
  apiDirectory,
90
- queryClientDir,
91
82
  schemaName,
92
83
  schemaImports: schemaImportsArray,
93
84
  queryImports: collectedQueryImports,
@@ -102,12 +93,6 @@ export function importSpecs({
102
93
  console.log(
103
94
  chalk.green(`🎉 [${filename}] Your OpenAPI spec has been converted into react query hooks`)
104
95
  );
105
- try {
106
- execa.sync('prettier', ['--write', `./${exportDirectory}/${name}/*.tsx`]);
107
- console.log(chalk.blue(`⚙️ Running prettier`));
108
- } catch (e) {
109
- console.log(chalk.yellow(`⚠️ Prettier not found`));
110
- }
111
96
  } catch (error) {
112
97
  if ((error as any).code === 'EISDIR') {
113
98
  console.log(chalk.red('nested folder structure not supported'));
package/src/utils.ts CHANGED
@@ -104,7 +104,7 @@ const getObject = (item: SchemaObject): string => {
104
104
 
105
105
  const IdentifierRegexp = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
106
106
  // Consolidation of item.properties & item.additionalProperties
107
- let output = '{\n';
107
+ let output = '{';
108
108
  if (item.properties) {
109
109
  output += Object.entries(item.properties)
110
110
  .map(([key, prop]: [string, ReferenceObject | SchemaObject]) => {