Skip to content

Commit d22d725

Browse files
xban1xxban1x
committed
Fixes
1 parent a6ff235 commit d22d725

94 files changed

Lines changed: 24 additions & 666 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@povio/openapi-codegen-cli",
3-
"version": "2.0.8-rc.11",
3+
"version": "2.0.8-rc.12",
44
"keywords": [
55
"codegen",
66
"openapi",

‎src/generators/generate/generateQueries.ts‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ export function generateQueries(params: GenerateTypeParams) {
230230
);
231231
lines.push("");
232232

233-
lines.push(renderQueryKeys({ resolver, queryEndpoints }));
233+
lines.push(renderQueryKeys({ resolver, queryEndpoints, tag }));
234234
lines.push("");
235235

236236
for (const endpoint of endpoints) {
@@ -496,7 +496,15 @@ function renderQueryJsDocs({
496496
return lines.join("\n");
497497
}
498498

499-
function renderQueryKeys({ resolver, queryEndpoints }: { resolver: SchemaResolver; queryEndpoints: Endpoint[] }) {
499+
function renderQueryKeys({
500+
resolver,
501+
queryEndpoints,
502+
tag,
503+
}: {
504+
resolver: SchemaResolver;
505+
queryEndpoints: Endpoint[];
506+
tag: string;
507+
}) {
500508
if (queryEndpoints.length === 0) {
501509
return "";
502510
}
@@ -506,7 +514,10 @@ function renderQueryKeys({ resolver, queryEndpoints }: { resolver: SchemaResolve
506514
lines.push(` all: [${QUERIES_MODULE_NAME}] as const,`);
507515
for (const endpoint of queryEndpoints) {
508516
lines.push(
509-
` ${getEndpointName(endpoint)}: (${renderEndpointParams(resolver, endpoint, { pathParamsRequiredOnly: true })}) => [...keys.all, "${endpoint.path}", ${renderEndpointArgs(
517+
` ${getEndpointName(endpoint)}: (${renderEndpointParams(resolver, endpoint, {
518+
pathParamsRequiredOnly: true,
519+
modelNamespaceTag: tag,
520+
})}) => [...keys.all, "${endpoint.path}", ${renderEndpointArgs(
510521
resolver,
511522
endpoint,
512523
{},
@@ -517,6 +528,7 @@ function renderQueryKeys({ resolver, queryEndpoints }: { resolver: SchemaResolve
517528
` ${getEndpointName(endpoint)}Infinite: (${renderEndpointParams(resolver, endpoint, {
518529
excludePageParam: true,
519530
pathParamsRequiredOnly: true,
531+
modelNamespaceTag: tag,
520532
})}) => [...keys.all, "${endpoint.path}", "infinite", ${renderEndpointArgs(resolver, endpoint, {
521533
excludePageParam: true,
522534
})}] as const,`,

‎test/generated/tmp-localhost-models-inline-fresh/aWBStocks/aWBStocks.queries.ts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ export const usePaginate = <TData>({ officeId, limit, order, filter, page, curso
111111
checkAcl(AWBStocksAcl.canUsePaginate({ officeId } ));
112112
return paginate(officeId, limit, order, filter, page, cursor) },
113113
...options,
114-
onError: options?.onError ?? queryConfig.onError,
115114
});
116115
};
117116

@@ -144,7 +143,6 @@ export const usePaginateInfinite = <TData>({ officeId, limit, order, filter, cur
144143
return pageParam * limitParam < totalItems ? pageParam + 1 : null;
145144
},
146145
...options,
147-
onError: options?.onError ?? queryConfig.onError,
148146
});
149147
};
150148

@@ -169,7 +167,6 @@ export const useCreate = (options?: AppMutationOptions<typeof create, { officeId
169167
return create(officeId, data)
170168
},
171169
...options,
172-
onError: options?.onError ?? queryConfig.onError,
173170
onSuccess: async (resData, variables, onMutateResult, context) => {
174171
await runMutationEffects(resData, variables, options);
175172
options?.onSuccess?.(resData, variables, onMutateResult, context);
@@ -197,7 +194,6 @@ export const useFindById = <TData>({ stockId, officeId }: { stockId: string, off
197194
checkAcl(AWBStocksAcl.canUseFindById({ officeId } ));
198195
return findById(stockId, officeId) },
199196
...options,
200-
onError: options?.onError ?? queryConfig.onError,
201197
});
202198
};
203199

@@ -223,7 +219,6 @@ export const useUpdate = (options?: AppMutationOptions<typeof update, { stockId:
223219
return update(stockId, officeId, data)
224220
},
225221
...options,
226-
onError: options?.onError ?? queryConfig.onError,
227222
onSuccess: async (resData, variables, onMutateResult, context) => {
228223
const { stockId, officeId } = variables;
229224
const updateKeys = [keys.findById(stockId, officeId)];
@@ -254,7 +249,6 @@ export const useArchive = (options?: AppMutationOptions<typeof archive, { stockI
254249
return archive(stockId, officeId)
255250
},
256251
...options,
257-
onError: options?.onError ?? queryConfig.onError,
258252
onSuccess: async (resData, variables, onMutateResult, context) => {
259253
const { stockId, officeId } = variables;
260254
const updateKeys = [keys.findById(stockId, officeId)];
@@ -285,7 +279,6 @@ export const useUnarchive = (options?: AppMutationOptions<typeof unarchive, { st
285279
return unarchive(stockId, officeId)
286280
},
287281
...options,
288-
onError: options?.onError ?? queryConfig.onError,
289282
onSuccess: async (resData, variables, onMutateResult, context) => {
290283
const { stockId, officeId } = variables;
291284
const updateKeys = [keys.findById(stockId, officeId)];
@@ -316,7 +309,6 @@ export const useGenerateNextNumber = (options?: AppMutationOptions<typeof genera
316309
return generateNextNumber(officeId, data)
317310
},
318311
...options,
319-
onError: options?.onError ?? queryConfig.onError,
320312
onSuccess: async (resData, variables, onMutateResult, context) => {
321313
await runMutationEffects(resData, variables, options);
322314
options?.onSuccess?.(resData, variables, onMutateResult, context);

‎test/generated/tmp-localhost-models-inline-fresh/airports/airports.queries.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ export const usePaginate = <TData>({ limit, order, filter, page, cursor }: { lim
103103
checkAcl(AirportsAcl.canUsePaginate());
104104
return paginate(limit, order, filter, page, cursor) },
105105
...options,
106-
onError: options?.onError ?? queryConfig.onError,
107106
});
108107
};
109108

@@ -135,7 +134,6 @@ export const usePaginateInfinite = <TData>({ limit, order, filter, cursor }: { l
135134
return pageParam * limitParam < totalItems ? pageParam + 1 : null;
136135
},
137136
...options,
138-
onError: options?.onError ?? queryConfig.onError,
139137
});
140138
};
141139

@@ -159,7 +157,6 @@ export const useCreate = (options?: AppMutationOptions<typeof create, { data: Ai
159157
return create(data)
160158
},
161159
...options,
162-
onError: options?.onError ?? queryConfig.onError,
163160
onSuccess: async (resData, variables, onMutateResult, context) => {
164161
await runMutationEffects(resData, variables, options);
165162
options?.onSuccess?.(resData, variables, onMutateResult, context);
@@ -190,7 +187,6 @@ export const usePaginateLabels = <TData>({ limit, order, filter, page, cursor }:
190187
checkAcl(AirportsAcl.canUsePaginateLabels());
191188
return paginateLabels(limit, order, filter, page, cursor) },
192189
...options,
193-
onError: options?.onError ?? queryConfig.onError,
194190
});
195191
};
196192

@@ -222,7 +218,6 @@ export const usePaginateLabelsInfinite = <TData>({ limit, order, filter, cursor
222218
return pageParam * limitParam < totalItems ? pageParam + 1 : null;
223219
},
224220
...options,
225-
onError: options?.onError ?? queryConfig.onError,
226221
});
227222
};
228223

@@ -247,7 +242,6 @@ export const useUpdate = (options?: AppMutationOptions<typeof update, { id: stri
247242
return update(id, data)
248243
},
249244
...options,
250-
onError: options?.onError ?? queryConfig.onError,
251245
onSuccess: async (resData, variables, onMutateResult, context) => {
252246
const { id } = variables;
253247
const updateKeys = [keys.findById(id)];
@@ -276,7 +270,6 @@ export const useFindById = <TData>({ id }: { id: string }, options?: AppQueryOpt
276270
checkAcl(AirportsAcl.canUseFindById());
277271
return findById(id) },
278272
...options,
279-
onError: options?.onError ?? queryConfig.onError,
280273
});
281274
};
282275

‎test/generated/tmp-localhost-models-inline-fresh/bankAccounts/bankAccounts.queries.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ export const useFindAll = <TData>({ search, officeId }: { search?: string, offic
6868
checkAcl(BankAccountsAcl.canUseFindAll());
6969
return findAll(search, officeId) },
7070
...options,
71-
onError: options?.onError ?? queryConfig.onError,
7271
});
7372
};
7473

@@ -95,7 +94,6 @@ export const usePaginateLabels = <TData>({ limit, order, filter, page, cursor }:
9594
checkAcl(BankAccountsAcl.canUsePaginateLabels());
9695
return paginateLabels(limit, order, filter, page, cursor) },
9796
...options,
98-
onError: options?.onError ?? queryConfig.onError,
9997
});
10098
};
10199

@@ -127,7 +125,6 @@ export const usePaginateLabelsInfinite = <TData>({ limit, order, filter, cursor
127125
return pageParam * limitParam < totalItems ? pageParam + 1 : null;
128126
},
129127
...options,
130-
onError: options?.onError ?? queryConfig.onError,
131128
});
132129
};
133130

‎test/generated/tmp-localhost-models-inline-fresh/bookkeepingExport/bookkeepingExport.queries.ts‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ export const useCreateBatch = (options?: AppMutationOptions<typeof createBatch,
147147
return createBatch(officeId, data)
148148
},
149149
...options,
150-
onError: options?.onError ?? queryConfig.onError,
151150
onSuccess: async (resData, variables, onMutateResult, context) => {
152151
await runMutationEffects(resData, variables, options);
153152
options?.onSuccess?.(resData, variables, onMutateResult, context);
@@ -179,7 +178,6 @@ export const usePaginateBatches = <TData>({ officeId, limit, order, filter, page
179178
checkAcl(BookkeepingExportAcl.canUsePaginateBatches({ officeId } ));
180179
return paginateBatches(officeId, limit, order, filter, page, cursor) },
181180
...options,
182-
onError: options?.onError ?? queryConfig.onError,
183181
});
184182
};
185183

@@ -212,7 +210,6 @@ export const usePaginateBatchesInfinite = <TData>({ officeId, limit, order, filt
212210
return pageParam * limitParam < totalItems ? pageParam + 1 : null;
213211
},
214212
...options,
215-
onError: options?.onError ?? queryConfig.onError,
216213
});
217214
};
218215

@@ -236,7 +233,6 @@ export const useGetBatch = <TData>({ officeId, batchId }: { officeId: string, ba
236233
checkAcl(BookkeepingExportAcl.canUseGetBatch({ officeId } ));
237234
return getBatch(officeId, batchId) },
238235
...options,
239-
onError: options?.onError ?? queryConfig.onError,
240236
});
241237
};
242238

@@ -262,7 +258,6 @@ export const useUpdateBatchFormat = (options?: AppMutationOptions<typeof updateB
262258
return updateBatchFormat(officeId, batchId, data)
263259
},
264260
...options,
265-
onError: options?.onError ?? queryConfig.onError,
266261
onSuccess: async (resData, variables, onMutateResult, context) => {
267262
const { officeId, batchId } = variables;
268263
const updateKeys = [keys.getBatch(officeId, batchId)];
@@ -294,7 +289,6 @@ export const useUpdateBatchItem = (options?: AppMutationOptions<typeof updateBat
294289
return updateBatchItem(officeId, batchId, data)
295290
},
296291
...options,
297-
onError: options?.onError ?? queryConfig.onError,
298292
onSuccess: async (resData, variables, onMutateResult, context) => {
299293
await runMutationEffects(resData, variables, options);
300294
options?.onSuccess?.(resData, variables, onMutateResult, context);
@@ -327,7 +321,6 @@ export const usePaginateBatchItems = <TData>({ officeId, batchId, limit, order,
327321
checkAcl(BookkeepingExportAcl.canUsePaginateBatchItems({ officeId } ));
328322
return paginateBatchItems(officeId, batchId, limit, order, filter, page, cursor) },
329323
...options,
330-
onError: options?.onError ?? queryConfig.onError,
331324
});
332325
};
333326

@@ -361,7 +354,6 @@ export const usePaginateBatchItemsInfinite = <TData>({ officeId, batchId, limit,
361354
return pageParam * limitParam < totalItems ? pageParam + 1 : null;
362355
},
363356
...options,
364-
onError: options?.onError ?? queryConfig.onError,
365357
});
366358
};
367359

@@ -386,7 +378,6 @@ export const useValidateBookkeepingBatch = (options?: AppMutationOptions<typeof
386378
return validateBookkeepingBatch(officeId, batchId)
387379
},
388380
...options,
389-
onError: options?.onError ?? queryConfig.onError,
390381
onSuccess: async (resData, variables, onMutateResult, context) => {
391382
await runMutationEffects(resData, variables, options);
392383
options?.onSuccess?.(resData, variables, onMutateResult, context);
@@ -415,7 +406,6 @@ export const useExportBookkeepingBatch = (options?: AppMutationOptions<typeof ex
415406
return exportBookkeepingBatch(officeId, batchId)
416407
},
417408
...options,
418-
onError: options?.onError ?? queryConfig.onError,
419409
onSuccess: async (resData, variables, onMutateResult, context) => {
420410
await runMutationEffects(resData, variables, options);
421411
options?.onSuccess?.(resData, variables, onMutateResult, context);
@@ -444,7 +434,6 @@ export const useRevertBookkeepingBatch = (options?: AppMutationOptions<typeof re
444434
return revertBookkeepingBatch(officeId, batchId)
445435
},
446436
...options,
447-
onError: options?.onError ?? queryConfig.onError,
448437
onSuccess: async (resData, variables, onMutateResult, context) => {
449438
await runMutationEffects(resData, variables, options);
450439
options?.onSuccess?.(resData, variables, onMutateResult, context);
@@ -473,7 +462,6 @@ export const useGetVatLineItems = <TData>({ officeId, batchId, order }: { office
473462
checkAcl(BookkeepingExportAcl.canUseGetVatLineItems({ officeId } ));
474463
return getVatLineItems(officeId, batchId, order) },
475464
...options,
476-
onError: options?.onError ?? queryConfig.onError,
477465
});
478466
};
479467

‎test/generated/tmp-localhost-models-inline-fresh/businessPartnerBookkeepingMappings/businessPartnerBookkeepingMappings.queries.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ export const useGetBookkeepingMappings = <TData>({ officeId, businessPartnerId }
8181
checkAcl(BusinessPartnerBookkeepingMappingsAcl.canUseGetBookkeepingMappings({ officeId } ));
8282
return getBookkeepingMappings(officeId, businessPartnerId) },
8383
...options,
84-
onError: options?.onError ?? queryConfig.onError,
8584
});
8685
};
8786

@@ -107,7 +106,6 @@ export const useCreateBookkeepingMapping = (options?: AppMutationOptions<typeof
107106
return createBookkeepingMapping(officeId, businessPartnerId, data)
108107
},
109108
...options,
110-
onError: options?.onError ?? queryConfig.onError,
111109
onSuccess: async (resData, variables, onMutateResult, context) => {
112110
await runMutationEffects(resData, variables, options);
113111
options?.onSuccess?.(resData, variables, onMutateResult, context);
@@ -137,7 +135,6 @@ export const useUpdateBookkeepingMapping = (options?: AppMutationOptions<typeof
137135
return updateBookkeepingMapping(officeId, businessPartnerId, data)
138136
},
139137
...options,
140-
onError: options?.onError ?? queryConfig.onError,
141138
onSuccess: async (resData, variables, onMutateResult, context) => {
142139
await runMutationEffects(resData, variables, options);
143140
options?.onSuccess?.(resData, variables, onMutateResult, context);
@@ -168,7 +165,6 @@ export const useUpdateBookkeepingMappingById = (options?: AppMutationOptions<typ
168165
return updateBookkeepingMappingById(officeId, businessPartnerId, id, data)
169166
},
170167
...options,
171-
onError: options?.onError ?? queryConfig.onError,
172168
onSuccess: async (resData, variables, onMutateResult, context) => {
173169
await runMutationEffects(resData, variables, options);
174170
options?.onSuccess?.(resData, variables, onMutateResult, context);
@@ -198,7 +194,6 @@ export const useDeleteBookkeepingMapping = (options?: AppMutationOptions<typeof
198194
return deleteBookkeepingMapping(officeId, businessPartnerId, id)
199195
},
200196
...options,
201-
onError: options?.onError ?? queryConfig.onError,
202197
onSuccess: async (resData, variables, onMutateResult, context) => {
203198
await runMutationEffects(resData, variables, options);
204199
options?.onSuccess?.(resData, variables, onMutateResult, context);

‎test/generated/tmp-localhost-models-inline-fresh/businessPartnerContacts/businessPartnerContacts.queries.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ export const useGetContacts = <TData>({ officeId, businessPartnerId }: { officeI
9090
checkAcl(BusinessPartnerContactsAcl.canUseGetContacts({ officeId } ));
9191
return getContacts(officeId, businessPartnerId) },
9292
...options,
93-
onError: options?.onError ?? queryConfig.onError,
9493
});
9594
};
9695

@@ -116,7 +115,6 @@ export const useCreateContact = (options?: AppMutationOptions<typeof createConta
116115
return createContact(officeId, businessPartnerId, data)
117116
},
118117
...options,
119-
onError: options?.onError ?? queryConfig.onError,
120118
onSuccess: async (resData, variables, onMutateResult, context) => {
121119
await runMutationEffects(resData, variables, options);
122120
options?.onSuccess?.(resData, variables, onMutateResult, context);
@@ -149,7 +147,6 @@ export const usePaginateContactLabels = <TData>({ officeId, businessPartnerId, l
149147
checkAcl(BusinessPartnerContactsAcl.canUsePaginateContactLabels({ officeId } ));
150148
return paginateContactLabels(officeId, businessPartnerId, limit, order, filter, page, cursor) },
151149
...options,
152-
onError: options?.onError ?? queryConfig.onError,
153150
});
154151
};
155152

@@ -183,7 +180,6 @@ export const usePaginateContactLabelsInfinite = <TData>({ officeId, businessPart
183180
return pageParam * limitParam < totalItems ? pageParam + 1 : null;
184181
},
185182
...options,
186-
onError: options?.onError ?? queryConfig.onError,
187183
});
188184
};
189185

@@ -210,7 +206,6 @@ export const useUpdateContact = (options?: AppMutationOptions<typeof updateConta
210206
return updateContact(contactId, officeId, businessPartnerId, data)
211207
},
212208
...options,
213-
onError: options?.onError ?? queryConfig.onError,
214209
onSuccess: async (resData, variables, onMutateResult, context) => {
215210
await runMutationEffects(resData, variables, options);
216211
options?.onSuccess?.(resData, variables, onMutateResult, context);
@@ -239,7 +234,6 @@ export const useDeleteContact = (options?: AppMutationOptions<typeof deleteConta
239234
return deleteContact(contactId, officeId, businessPartnerId)
240235
},
241236
...options,
242-
onError: options?.onError ?? queryConfig.onError,
243237
onSuccess: async (resData, variables, onMutateResult, context) => {
244238
await runMutationEffects(resData, variables, options);
245239
options?.onSuccess?.(resData, variables, onMutateResult, context);

0 commit comments

Comments
 (0)