Skip to content

Commit 4cd64f7

Browse files
committed
fix: pass error type generic to defineQueryOptions in @pinia/colada plugin
Closes #3482
1 parent 5f7c22e commit 4cd64f7

7 files changed

Lines changed: 70 additions & 63 deletions

File tree

packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { type _JSONValue, defineQueryOptions, type UseMutationOptions } from '@p
55
import { serializeQueryKeyValue } from '../client';
66
import { client } from '../client.gen';
77
import { BarBazService, BarService, FooBazService, FooService, type Options } from '../sdk.gen';
8-
import type { FooBarPostData, FooBarPostResponse, FooBarPutData, FooBarPutResponse, FooPostData, FooPostResponse, FooPutData, FooPutResponse, GetFooBarData, GetFooData } from '../types.gen';
8+
import type { FooBarPostData, FooBarPostResponse, FooBarPutData, FooBarPutResponse, FooPostData, FooPostResponse, FooPutData, FooPutResponse, GetFooBarData, GetFooBarResponse, GetFooData, GetFooResponse } from '../types.gen';
99

1010
export type QueryKey<TOptions extends Options> = [
1111
Pick<TOptions, 'path'> & {
@@ -44,7 +44,7 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
4444

4545
export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
4646

47-
export const getFooQuery = defineQueryOptions((options?: Options<GetFooData>) => ({
47+
export const getFooQuery = defineQueryOptions<Options<GetFooData>, GetFooResponse, Error>((options?: Options<GetFooData>) => ({
4848
key: getFooQueryKey(options),
4949
query: async (context) => {
5050
const { data } = await FooBazService.getFoo({
@@ -80,7 +80,7 @@ export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutat
8080

8181
export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
8282

83-
export const getFooBarQuery = defineQueryOptions((options?: Options<GetFooBarData>) => ({
83+
export const getFooBarQuery = defineQueryOptions<Options<GetFooBarData>, GetFooBarResponse, Error>((options?: Options<GetFooBarData>) => ({
8484
key: getFooBarQueryKey(options),
8585
query: async (context) => {
8686
const { data } = await BarBazService.getFooBar({

packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { type _JSONValue, defineQueryOptions, type UseMutationOptions } from '@p
55
import { serializeQueryKeyValue } from '../client';
66
import { client } from '../client.gen';
77
import { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen';
8-
import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseData, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, GetCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TypesData } from '../types.gen';
8+
import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, GetCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TypesData, TypesResponse } from '../types.gen';
99

1010
export type QueryKey<TOptions extends Options> = [
1111
Pick<TOptions, 'path'> & {
@@ -44,7 +44,7 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
4444

4545
export const serviceWithEmptyTagQueryKey = (options?: Options<ServiceWithEmptyTagData>) => createQueryKey('serviceWithEmptyTag', options);
4646

47-
export const serviceWithEmptyTagQuery = defineQueryOptions((options?: Options<ServiceWithEmptyTagData>) => ({
47+
export const serviceWithEmptyTagQuery = defineQueryOptions<Options<ServiceWithEmptyTagData>, unknown, Error>((options?: Options<ServiceWithEmptyTagData>) => ({
4848
key: serviceWithEmptyTagQueryKey(options),
4949
query: async (context) => {
5050
const { data } = await serviceWithEmptyTag({
@@ -91,7 +91,7 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
9191

9292
export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
9393

94-
export const getCallWithoutParametersAndResponseQuery = defineQueryOptions((options?: Options<GetCallWithoutParametersAndResponseData>) => ({
94+
export const getCallWithoutParametersAndResponseQuery = defineQueryOptions<Options<GetCallWithoutParametersAndResponseData>, unknown, Error>((options?: Options<GetCallWithoutParametersAndResponseData>) => ({
9595
key: getCallWithoutParametersAndResponseQueryKey(options),
9696
query: async (context) => {
9797
const { data } = await getCallWithoutParametersAndResponse({
@@ -171,7 +171,7 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
171171

172172
export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
173173

174-
export const callWithDefaultParametersQuery = defineQueryOptions((options: Options<CallWithDefaultParametersData>) => ({
174+
export const callWithDefaultParametersQuery = defineQueryOptions<Options<CallWithDefaultParametersData>, unknown, Error>((options: Options<CallWithDefaultParametersData>) => ({
175175
key: callWithDefaultParametersQueryKey(options),
176176
query: async (context) => {
177177
const { data } = await callWithDefaultParameters({
@@ -218,7 +218,7 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
218218

219219
export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
220220

221-
export const duplicateName2Query = defineQueryOptions((options?: Options<DuplicateName2Data>) => ({
221+
export const duplicateName2Query = defineQueryOptions<Options<DuplicateName2Data>, unknown, Error>((options?: Options<DuplicateName2Data>) => ({
222222
key: duplicateName2QueryKey(options),
223223
query: async (context) => {
224224
const { data } = await duplicateName2({
@@ -254,7 +254,7 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
254254

255255
export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
256256

257-
export const callWithNoContentResponseQuery = defineQueryOptions((options?: Options<CallWithNoContentResponseData>) => ({
257+
export const callWithNoContentResponseQuery = defineQueryOptions<Options<CallWithNoContentResponseData>, unknown, Error>((options?: Options<CallWithNoContentResponseData>) => ({
258258
key: callWithNoContentResponseQueryKey(options),
259259
query: async (context) => {
260260
const { data } = await callWithNoContentResponse({
@@ -268,7 +268,7 @@ export const callWithNoContentResponseQuery = defineQueryOptions((options?: Opti
268268

269269
export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
270270

271-
export const callWithResponseAndNoContentResponseQuery = defineQueryOptions((options?: Options<CallWithResponseAndNoContentResponseData>) => ({
271+
export const callWithResponseAndNoContentResponseQuery = defineQueryOptions<Options<CallWithResponseAndNoContentResponseData>, CallWithResponseAndNoContentResponseResponse, Error>((options?: Options<CallWithResponseAndNoContentResponseData>) => ({
272272
key: callWithResponseAndNoContentResponseQueryKey(options),
273273
query: async (context) => {
274274
const { data } = await callWithResponseAndNoContentResponse({
@@ -282,7 +282,7 @@ export const callWithResponseAndNoContentResponseQuery = defineQueryOptions((opt
282282

283283
export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
284284

285-
export const dummyAQuery = defineQueryOptions((options?: Options<DummyAData>) => ({
285+
export const dummyAQuery = defineQueryOptions<Options<DummyAData>, unknown, Error>((options?: Options<DummyAData>) => ({
286286
key: dummyAQueryKey(options),
287287
query: async (context) => {
288288
const { data } = await dummyA({
@@ -296,7 +296,7 @@ export const dummyAQuery = defineQueryOptions((options?: Options<DummyAData>) =>
296296

297297
export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
298298

299-
export const dummyBQuery = defineQueryOptions((options?: Options<DummyBData>) => ({
299+
export const dummyBQuery = defineQueryOptions<Options<DummyBData>, unknown, Error>((options?: Options<DummyBData>) => ({
300300
key: dummyBQueryKey(options),
301301
query: async (context) => {
302302
const { data } = await dummyB({
@@ -310,7 +310,7 @@ export const dummyBQuery = defineQueryOptions((options?: Options<DummyBData>) =>
310310

311311
export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
312312

313-
export const callWithResponseQuery = defineQueryOptions((options?: Options<CallWithResponseData>) => ({
313+
export const callWithResponseQuery = defineQueryOptions<Options<CallWithResponseData>, CallWithResponseResponse, Error>((options?: Options<CallWithResponseData>) => ({
314314
key: callWithResponseQueryKey(options),
315315
query: async (context) => {
316316
const { data } = await callWithResponse({
@@ -346,7 +346,7 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
346346

347347
export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
348348

349-
export const collectionFormatQuery = defineQueryOptions((options: Options<CollectionFormatData>) => ({
349+
export const collectionFormatQuery = defineQueryOptions<Options<CollectionFormatData>, unknown, Error>((options: Options<CollectionFormatData>) => ({
350350
key: collectionFormatQueryKey(options),
351351
query: async (context) => {
352352
const { data } = await collectionFormat({
@@ -360,7 +360,7 @@ export const collectionFormatQuery = defineQueryOptions((options: Options<Collec
360360

361361
export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
362362

363-
export const typesQuery = defineQueryOptions((options: Options<TypesData>) => ({
363+
export const typesQuery = defineQueryOptions<Options<TypesData>, TypesResponse, Error>((options: Options<TypesData>) => ({
364364
key: typesQueryKey(options),
365365
query: async (context) => {
366366
const { data } = await types({
@@ -374,7 +374,7 @@ export const typesQuery = defineQueryOptions((options: Options<TypesData>) => ({
374374

375375
export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
376376

377-
export const complexTypesQuery = defineQueryOptions((options: Options<ComplexTypesData>) => ({
377+
export const complexTypesQuery = defineQueryOptions<Options<ComplexTypesData>, ComplexTypesResponse, Error>((options: Options<ComplexTypesData>) => ({
378378
key: complexTypesQueryKey(options),
379379
query: async (context) => {
380380
const { data } = await complexTypes({

packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { type _JSONValue, defineQueryOptions, type UseMutationOptions } from '@p
55
import { serializeQueryKeyValue } from '../client';
66
import { client } from '../client.gen';
77
import { BarBazService, BarService, FooBazService, FooService, type Options } from '../sdk.gen';
8-
import type { FooBarPostData, FooBarPostResponse, FooBarPutData, FooBarPutResponse, FooPostData, FooPostResponse, FooPutData, FooPutResponse, GetFooBarData, GetFooData } from '../types.gen';
8+
import type { FooBarPostData, FooBarPostResponse, FooBarPutData, FooBarPutResponse, FooPostData, FooPostResponse, FooPutData, FooPutResponse, GetFooBarData, GetFooBarResponse, GetFooData, GetFooResponse } from '../types.gen';
99

1010
export type QueryKey<TOptions extends Options> = [
1111
Pick<TOptions, 'path'> & {
@@ -44,7 +44,7 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
4444

4545
export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
4646

47-
export const getFooQuery = defineQueryOptions((options?: Options<GetFooData>) => ({
47+
export const getFooQuery = defineQueryOptions<Options<GetFooData>, GetFooResponse, Error>((options?: Options<GetFooData>) => ({
4848
key: getFooQueryKey(options),
4949
query: async (context) => {
5050
const { data } = await FooBazService.getFoo({
@@ -80,7 +80,7 @@ export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutat
8080

8181
export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
8282

83-
export const getFooBarQuery = defineQueryOptions((options?: Options<GetFooBarData>) => ({
83+
export const getFooBarQuery = defineQueryOptions<Options<GetFooBarData>, GetFooBarResponse, Error>((options?: Options<GetFooBarData>) => ({
8484
key: getFooBarQueryKey(options),
8585
query: async (context) => {
8686
const { data } = await BarBazService.getFooBar({

0 commit comments

Comments
 (0)