Skip to content

Commit 949b8d2

Browse files
Bram-dcBram-dc
authored
Changed Query functions to use react-query object config (#262)
* Changed Query functions to use react-query object config * Fixed output types
1 parent d28e93b commit 949b8d2

File tree

2 files changed

+193
-178
lines changed

2 files changed

+193
-178
lines changed

‎plugins/typescript/src/core/createOperationQueryFnNodes.ts‎

Lines changed: 137 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -66,116 +66,24 @@ export const createOperationQueryFnNodes = ({
6666
undefined
6767
),
6868
],
69-
f.createTupleTypeNode([
70-
f.createTypeReferenceNode(
71-
f.createQualifiedName(
72-
f.createIdentifier("reactQuery"),
73-
f.createIdentifier("QueryKey")
74-
),
75-
undefined
76-
),
77-
f.createFunctionTypeNode(
69+
f.createTypeLiteralNode([
70+
f.createPropertySignature(
7871
undefined,
79-
verb === "get"
80-
? [
81-
f.createParameterDeclaration(
82-
undefined,
83-
undefined,
84-
f.createObjectBindingPattern([
85-
f.createBindingElement(
86-
undefined,
87-
undefined,
88-
f.createIdentifier("signal"),
89-
undefined
90-
),
91-
]),
92-
undefined,
93-
f.createTypeLiteralNode([
94-
f.createPropertySignature(
95-
undefined,
96-
f.createIdentifier("signal"),
97-
f.createToken(ts.SyntaxKind.QuestionToken),
98-
f.createTypeReferenceNode(
99-
f.createIdentifier("AbortSignal"),
100-
undefined
101-
)
102-
),
103-
]),
104-
undefined
105-
),
106-
]
107-
: [
108-
f.createParameterDeclaration(
109-
undefined,
110-
undefined,
111-
f.createObjectBindingPattern([
112-
f.createBindingElement(
113-
undefined,
114-
undefined,
115-
f.createIdentifier("variables"),
116-
undefined
117-
),
118-
f.createBindingElement(
119-
undefined,
120-
undefined,
121-
f.createIdentifier("signal"),
122-
undefined
123-
),
124-
]),
125-
undefined,
126-
f.createTypeLiteralNode([
127-
f.createPropertySignature(
128-
undefined,
129-
f.createIdentifier("variables"),
130-
undefined,
131-
variablesType
132-
),
133-
f.createPropertySignature(
134-
undefined,
135-
f.createIdentifier("signal"),
136-
f.createToken(ts.SyntaxKind.QuestionToken),
137-
f.createTypeReferenceNode(
138-
f.createIdentifier("AbortSignal"),
139-
undefined
140-
)
141-
),
142-
]),
143-
undefined
144-
),
145-
],
146-
f.createTypeReferenceNode(f.createIdentifier("Promise"), [
147-
dataType,
148-
])
72+
f.createIdentifier("queryKey"),
73+
undefined,
74+
f.createTypeReferenceNode(
75+
f.createQualifiedName(
76+
f.createIdentifier("reactQuery"),
77+
f.createIdentifier("QueryKey")
78+
),
79+
undefined
80+
)
14981
),
150-
]),
151-
f.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
152-
f.createArrayLiteralExpression(
153-
[
154-
f.createCallExpression(
155-
f.createIdentifier("queryKeyFn"),
156-
undefined,
157-
[
158-
f.createObjectLiteralExpression(
159-
[
160-
f.createPropertyAssignment(
161-
f.createIdentifier("path"),
162-
f.createStringLiteral(camelizedPathParams(url))
163-
),
164-
f.createPropertyAssignment(
165-
f.createIdentifier("operationId"),
166-
f.createStringLiteral(operationId)
167-
),
168-
f.createShorthandPropertyAssignment(
169-
f.createIdentifier("variables"),
170-
undefined
171-
),
172-
],
173-
true
174-
),
175-
]
176-
),
177-
f.createArrowFunction(
178-
[f.createModifier(ts.SyntaxKind.AsyncKeyword)],
82+
f.createPropertySignature(
83+
undefined,
84+
f.createIdentifier("queryFn"),
85+
undefined,
86+
f.createFunctionTypeNode(
17987
undefined,
18088
verb === "get"
18189
? [
@@ -244,23 +152,130 @@ export const createOperationQueryFnNodes = ({
244152
undefined
245153
),
246154
],
247-
undefined,
248-
f.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
155+
f.createTypeReferenceNode(f.createIdentifier("Promise"), [dataType])
156+
)
157+
),
158+
]),
159+
160+
f.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
161+
f.createObjectLiteralExpression(
162+
[
163+
f.createPropertyAssignment(
164+
f.createIdentifier("queryKey"),
249165
f.createCallExpression(
250-
f.createIdentifier(operationFetcherFnName),
251-
undefined,
252-
[
253-
f.createObjectLiteralExpression(
166+
f.createIdentifier("queryKeyFn"),
167+
undefined,
168+
[
169+
f.createObjectLiteralExpression(
170+
[
171+
f.createPropertyAssignment(
172+
f.createIdentifier("path"),
173+
f.createStringLiteral(camelizedPathParams(url))
174+
),
175+
f.createPropertyAssignment(
176+
f.createIdentifier("operationId"),
177+
f.createStringLiteral(operationId)
178+
),
179+
f.createShorthandPropertyAssignment(
180+
f.createIdentifier("variables"),
181+
undefined
182+
),
183+
],
184+
true
185+
),
186+
]
187+
)
188+
),
189+
f.createPropertyAssignment(
190+
f.createIdentifier("queryFn"),
191+
f.createArrowFunction(
192+
[f.createModifier(ts.SyntaxKind.AsyncKeyword)],
193+
undefined,
194+
verb === "get"
195+
? [
196+
f.createParameterDeclaration(
197+
undefined,
198+
undefined,
199+
f.createObjectBindingPattern([
200+
f.createBindingElement(
201+
undefined,
202+
undefined,
203+
f.createIdentifier("signal"),
204+
undefined
205+
),
206+
]),
207+
undefined,
208+
f.createTypeLiteralNode([
209+
f.createPropertySignature(
210+
undefined,
211+
f.createIdentifier("signal"),
212+
f.createToken(ts.SyntaxKind.QuestionToken),
213+
f.createTypeReferenceNode(
214+
f.createIdentifier("AbortSignal"),
215+
undefined
216+
)
217+
),
218+
]),
219+
undefined
220+
),
221+
]
222+
: [
223+
f.createParameterDeclaration(
224+
undefined,
225+
undefined,
226+
f.createObjectBindingPattern([
227+
f.createBindingElement(
228+
undefined,
229+
undefined,
230+
f.createIdentifier("variables"),
231+
undefined
232+
),
233+
f.createBindingElement(
234+
undefined,
235+
undefined,
236+
f.createIdentifier("signal"),
237+
undefined
238+
),
239+
]),
240+
undefined,
241+
f.createTypeLiteralNode([
242+
f.createPropertySignature(
243+
undefined,
244+
f.createIdentifier("variables"),
245+
undefined,
246+
variablesType
247+
),
248+
f.createPropertySignature(
249+
undefined,
250+
f.createIdentifier("signal"),
251+
f.createToken(ts.SyntaxKind.QuestionToken),
252+
f.createTypeReferenceNode(
253+
f.createIdentifier("AbortSignal"),
254+
undefined
255+
)
256+
),
257+
]),
258+
undefined
259+
),
260+
],
261+
undefined,
262+
f.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
263+
f.createCallExpression(
264+
f.createIdentifier(operationFetcherFnName),
265+
undefined,
254266
[
255-
f.createSpreadAssignment(
256-
f.createIdentifier("variables")
267+
f.createObjectLiteralExpression(
268+
[
269+
f.createSpreadAssignment(
270+
f.createIdentifier("variables")
271+
),
272+
],
273+
false
257274
),
258-
],
259-
false
260-
),
261-
f.createIdentifier("signal"),
262-
]
263-
)
275+
f.createIdentifier("signal"),
276+
]
277+
)
278+
)
264279
),
265280
],
266281
true

0 commit comments

Comments
 (0)