@zenstackhq/tanstack-query 3.0.0-beta.21 → 3.0.0-beta.22

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 (18) hide show
  1. package/.turbo/turbo-build.log +21 -21
  2. package/dist/react.cjs.map +1 -1
  3. package/dist/react.d.cts +26 -26
  4. package/dist/react.d.ts +26 -26
  5. package/dist/react.js.map +1 -1
  6. package/dist/svelte.cjs.map +1 -1
  7. package/dist/svelte.d.cts +19 -19
  8. package/dist/svelte.d.ts +19 -19
  9. package/dist/svelte.js.map +1 -1
  10. package/dist/vue.cjs.map +1 -1
  11. package/dist/vue.d.cts +19 -19
  12. package/dist/vue.d.ts +19 -19
  13. package/dist/vue.js.map +1 -1
  14. package/package.json +9 -9
  15. package/src/react.ts +65 -65
  16. package/src/svelte.ts +47 -44
  17. package/src/vue.ts +44 -44
  18. package/test/react-query.test.tsx +1 -1
package/src/react.ts CHANGED
@@ -31,13 +31,13 @@ import type {
31
31
  CreateManyArgs,
32
32
  DeleteArgs,
33
33
  DeleteManyArgs,
34
- FindArgs,
34
+ FindFirstArgs,
35
+ FindManyArgs,
35
36
  FindUniqueArgs,
36
37
  GroupByArgs,
37
38
  GroupByResult,
38
- ModelResult,
39
- SelectIncludeOmit,
40
39
  SelectSubset,
40
+ SimplifiedModelResult,
41
41
  Subset,
42
42
  UpdateArgs,
43
43
  UpdateManyAndReturnArgs,
@@ -126,13 +126,13 @@ export type ModelMutationResult<T, TArgs> = UseMutationResult<T, DefaultError, T
126
126
  export type ModelMutationModelResult<
127
127
  Schema extends SchemaDef,
128
128
  Model extends GetModels<Schema>,
129
- TArgs extends SelectIncludeOmit<Schema, Model, boolean>,
129
+ TArgs,
130
130
  Array extends boolean = false,
131
- > = Omit<ModelMutationResult<ModelResult<Schema, Model, TArgs>, TArgs>, 'mutateAsync'> & {
131
+ > = Omit<ModelMutationResult<SimplifiedModelResult<Schema, Model, TArgs, false, Array>, TArgs>, 'mutateAsync'> & {
132
132
  mutateAsync<T extends TArgs>(
133
133
  args: T,
134
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>,
135
- ): Promise<Array extends true ? ModelResult<Schema, Model, T>[] : ModelResult<Schema, Model, T>>;
134
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T, false, Array>, T>,
135
+ ): Promise<SimplifiedModelResult<Schema, Model, T, false, Array>>;
136
136
  };
137
137
 
138
138
  export type ClientHooks<Schema extends SchemaDef> = {
@@ -145,108 +145,108 @@ export type ModelQueryHooks<Schema extends SchemaDef, Model extends GetModels<Sc
145
145
  Schema,
146
146
  Model,
147
147
  {
148
- useFindUnique<T extends FindUniqueArgs<Schema, Model>>(
148
+ useFindUnique<T extends FindUniqueArgs<Schema, Model, true>>(
149
149
  args: SelectSubset<T, FindUniqueArgs<Schema, Model>>,
150
- options?: ModelQueryOptions<ModelResult<Schema, Model, T> | null>,
151
- ): ModelQueryResult<ModelResult<Schema, Model, T> | null>;
150
+ options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, T> | null>,
151
+ ): ModelQueryResult<SimplifiedModelResult<Schema, Model, T> | null>;
152
152
 
153
- useSuspenseFindUnique<T extends FindUniqueArgs<Schema, Model>>(
153
+ useSuspenseFindUnique<T extends FindUniqueArgs<Schema, Model, true>>(
154
154
  args: SelectSubset<T, FindUniqueArgs<Schema, Model>>,
155
- options?: ModelSuspenseQueryOptions<ModelResult<Schema, Model, T> | null>,
156
- ): ModelSuspenseQueryResult<ModelResult<Schema, Model, T> | null>;
157
-
158
- useFindFirst<T extends FindArgs<Schema, Model, false>>(
159
- args?: SelectSubset<T, FindArgs<Schema, Model, false>>,
160
- options?: ModelQueryOptions<ModelResult<Schema, Model, T> | null>,
161
- ): ModelQueryResult<ModelResult<Schema, Model, T> | null>;
162
-
163
- useSuspenseFindFirst<T extends FindArgs<Schema, Model, false>>(
164
- args?: SelectSubset<T, FindArgs<Schema, Model, false>>,
165
- options?: ModelSuspenseQueryOptions<ModelResult<Schema, Model, T> | null>,
166
- ): ModelSuspenseQueryResult<ModelResult<Schema, Model, T> | null>;
167
-
168
- useFindMany<T extends FindArgs<Schema, Model, true>>(
169
- args?: SelectSubset<T, FindArgs<Schema, Model, true>>,
170
- options?: ModelQueryOptions<ModelResult<Schema, Model, T>[]>,
171
- ): ModelQueryResult<ModelResult<Schema, Model, T>[]>;
172
-
173
- useSuspenseFindMany<T extends FindArgs<Schema, Model, true>>(
174
- args?: SelectSubset<T, FindArgs<Schema, Model, true>>,
175
- options?: ModelSuspenseQueryOptions<ModelResult<Schema, Model, T>[]>,
176
- ): ModelSuspenseQueryResult<ModelResult<Schema, Model, T>[]>;
177
-
178
- useInfiniteFindMany<T extends FindArgs<Schema, Model, true>>(
179
- args?: SelectSubset<T, FindArgs<Schema, Model, true>>,
180
- options?: ModelInfiniteQueryOptions<ModelResult<Schema, Model, T>[]>,
181
- ): ModelInfiniteQueryResult<InfiniteData<ModelResult<Schema, Model, T>[]>>;
182
-
183
- useSuspenseInfiniteFindMany<T extends FindArgs<Schema, Model, true>>(
184
- args?: SelectSubset<T, FindArgs<Schema, Model, true>>,
185
- options?: ModelSuspenseInfiniteQueryOptions<ModelResult<Schema, Model, T>[]>,
186
- ): ModelSuspenseInfiniteQueryResult<InfiniteData<ModelResult<Schema, Model, T>[]>>;
187
-
188
- useCreate<T extends CreateArgs<Schema, Model>>(
189
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>,
155
+ options?: ModelSuspenseQueryOptions<SimplifiedModelResult<Schema, Model, T> | null>,
156
+ ): ModelSuspenseQueryResult<SimplifiedModelResult<Schema, Model, T> | null>;
157
+
158
+ useFindFirst<T extends FindFirstArgs<Schema, Model, true>>(
159
+ args?: SelectSubset<T, FindFirstArgs<Schema, Model>>,
160
+ options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, T> | null>,
161
+ ): ModelQueryResult<SimplifiedModelResult<Schema, Model, T> | null>;
162
+
163
+ useSuspenseFindFirst<T extends FindFirstArgs<Schema, Model, true>>(
164
+ args?: SelectSubset<T, FindFirstArgs<Schema, Model>>,
165
+ options?: ModelSuspenseQueryOptions<SimplifiedModelResult<Schema, Model, T> | null>,
166
+ ): ModelSuspenseQueryResult<SimplifiedModelResult<Schema, Model, T> | null>;
167
+
168
+ useFindMany<T extends FindManyArgs<Schema, Model, true>>(
169
+ args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
170
+ options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, T>[]>,
171
+ ): ModelQueryResult<SimplifiedModelResult<Schema, Model, T>[]>;
172
+
173
+ useSuspenseFindMany<T extends FindManyArgs<Schema, Model, true>>(
174
+ args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
175
+ options?: ModelSuspenseQueryOptions<SimplifiedModelResult<Schema, Model, T>[]>,
176
+ ): ModelSuspenseQueryResult<SimplifiedModelResult<Schema, Model, T>[]>;
177
+
178
+ useInfiniteFindMany<T extends FindManyArgs<Schema, Model, true>>(
179
+ args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
180
+ options?: ModelInfiniteQueryOptions<SimplifiedModelResult<Schema, Model, T>[]>,
181
+ ): ModelInfiniteQueryResult<InfiniteData<SimplifiedModelResult<Schema, Model, T>[]>>;
182
+
183
+ useSuspenseInfiniteFindMany<T extends FindManyArgs<Schema, Model, true>>(
184
+ args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
185
+ options?: ModelSuspenseInfiniteQueryOptions<SimplifiedModelResult<Schema, Model, T>[]>,
186
+ ): ModelSuspenseInfiniteQueryResult<InfiniteData<SimplifiedModelResult<Schema, Model, T>[]>>;
187
+
188
+ useCreate<T extends CreateArgs<Schema, Model, true>>(
189
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
190
190
  ): ModelMutationModelResult<Schema, Model, T>;
191
191
 
192
- useCreateMany<T extends CreateManyArgs<Schema, Model>>(
192
+ useCreateMany<T extends CreateManyArgs<Schema, Model, true>>(
193
193
  options?: ModelMutationOptions<BatchResult, T>,
194
194
  ): ModelMutationResult<BatchResult, T>;
195
195
 
196
- useCreateManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(
197
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>[], T>,
196
+ useCreateManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model, true>>(
197
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>[], T>,
198
198
  ): ModelMutationModelResult<Schema, Model, T, true>;
199
199
 
200
- useUpdate<T extends UpdateArgs<Schema, Model>>(
201
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>,
200
+ useUpdate<T extends UpdateArgs<Schema, Model, true>>(
201
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
202
202
  ): ModelMutationModelResult<Schema, Model, T>;
203
203
 
204
- useUpdateMany<T extends UpdateManyArgs<Schema, Model>>(
204
+ useUpdateMany<T extends UpdateManyArgs<Schema, Model, true>>(
205
205
  options?: ModelMutationOptions<BatchResult, T>,
206
206
  ): ModelMutationResult<BatchResult, T>;
207
207
 
208
- useUpdateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(
209
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>[], T>,
208
+ useUpdateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model, true>>(
209
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>[], T>,
210
210
  ): ModelMutationModelResult<Schema, Model, T, true>;
211
211
 
212
- useUpsert<T extends UpsertArgs<Schema, Model>>(
213
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>,
212
+ useUpsert<T extends UpsertArgs<Schema, Model, true>>(
213
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
214
214
  ): ModelMutationModelResult<Schema, Model, T>;
215
215
 
216
- useDelete<T extends DeleteArgs<Schema, Model>>(
217
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>,
216
+ useDelete<T extends DeleteArgs<Schema, Model, true>>(
217
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
218
218
  ): ModelMutationModelResult<Schema, Model, T>;
219
219
 
220
- useDeleteMany<T extends DeleteManyArgs<Schema, Model>>(
220
+ useDeleteMany<T extends DeleteManyArgs<Schema, Model, true>>(
221
221
  options?: ModelMutationOptions<BatchResult, T>,
222
222
  ): ModelMutationResult<BatchResult, T>;
223
223
 
224
- useCount<T extends CountArgs<Schema, Model>>(
224
+ useCount<T extends CountArgs<Schema, Model, true>>(
225
225
  args?: Subset<T, CountArgs<Schema, Model>>,
226
226
  options?: ModelQueryOptions<CountResult<Schema, Model, T>>,
227
227
  ): ModelQueryResult<CountResult<Schema, Model, T>>;
228
228
 
229
- useSuspenseCount<T extends CountArgs<Schema, Model>>(
229
+ useSuspenseCount<T extends CountArgs<Schema, Model, true>>(
230
230
  args?: Subset<T, CountArgs<Schema, Model>>,
231
231
  options?: ModelSuspenseQueryOptions<CountResult<Schema, Model, T>>,
232
232
  ): ModelSuspenseQueryResult<CountResult<Schema, Model, T>>;
233
233
 
234
- useAggregate<T extends AggregateArgs<Schema, Model>>(
234
+ useAggregate<T extends AggregateArgs<Schema, Model, true>>(
235
235
  args: Subset<T, AggregateArgs<Schema, Model>>,
236
236
  options?: ModelQueryOptions<AggregateResult<Schema, Model, T>>,
237
237
  ): ModelQueryResult<AggregateResult<Schema, Model, T>>;
238
238
 
239
- useSuspenseAggregate<T extends AggregateArgs<Schema, Model>>(
239
+ useSuspenseAggregate<T extends AggregateArgs<Schema, Model, true>>(
240
240
  args: Subset<T, AggregateArgs<Schema, Model>>,
241
241
  options?: ModelSuspenseQueryOptions<AggregateResult<Schema, Model, T>>,
242
242
  ): ModelSuspenseQueryResult<AggregateResult<Schema, Model, T>>;
243
243
 
244
- useGroupBy<T extends GroupByArgs<Schema, Model>>(
244
+ useGroupBy<T extends GroupByArgs<Schema, Model, true>>(
245
245
  args: Subset<T, GroupByArgs<Schema, Model>>,
246
246
  options?: ModelQueryOptions<GroupByResult<Schema, Model, T>>,
247
247
  ): ModelQueryResult<GroupByResult<Schema, Model, T>>;
248
248
 
249
- useSuspenseGroupBy<T extends GroupByArgs<Schema, Model>>(
249
+ useSuspenseGroupBy<T extends GroupByArgs<Schema, Model, true>>(
250
250
  args: Subset<T, GroupByArgs<Schema, Model>>,
251
251
  options?: ModelSuspenseQueryOptions<GroupByResult<Schema, Model, T>>,
252
252
  ): ModelSuspenseQueryResult<GroupByResult<Schema, Model, T>>;
package/src/svelte.ts CHANGED
@@ -27,13 +27,13 @@ import type {
27
27
  CreateManyArgs,
28
28
  DeleteArgs,
29
29
  DeleteManyArgs,
30
- FindArgs,
30
+ FindFirstArgs,
31
+ FindManyArgs,
31
32
  FindUniqueArgs,
32
33
  GroupByArgs,
33
34
  GroupByResult,
34
- ModelResult,
35
- SelectIncludeOmit,
36
35
  SelectSubset,
36
+ SimplifiedModelResult,
37
37
  Subset,
38
38
  UpdateArgs,
39
39
  UpdateManyAndReturnArgs,
@@ -114,14 +114,17 @@ export type ModelMutationResult<T, TArgs> = CreateMutationResult<T, DefaultError
114
114
  export type ModelMutationModelResult<
115
115
  Schema extends SchemaDef,
116
116
  Model extends GetModels<Schema>,
117
- TArgs extends SelectIncludeOmit<Schema, Model, boolean>,
117
+ TArgs,
118
118
  Array extends boolean = false,
119
119
  > = Readable<
120
- Omit<UnwrapStore<ModelMutationResult<ModelResult<Schema, Model, TArgs>, TArgs>>, 'mutateAsync'> & {
120
+ Omit<
121
+ UnwrapStore<ModelMutationResult<SimplifiedModelResult<Schema, Model, TArgs, false, Array>, TArgs>>,
122
+ 'mutateAsync'
123
+ > & {
121
124
  mutateAsync<T extends TArgs>(
122
125
  args: T,
123
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>,
124
- ): Promise<Array extends true ? ModelResult<Schema, Model, T>[] : ModelResult<Schema, Model, T>>;
126
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T, false, Array>, T>,
127
+ ): Promise<SimplifiedModelResult<Schema, Model, T, false, Array>>;
125
128
  }
126
129
  >;
127
130
 
@@ -135,73 +138,73 @@ export type ModelQueryHooks<Schema extends SchemaDef, Model extends GetModels<Sc
135
138
  Schema,
136
139
  Model,
137
140
  {
138
- useFindUnique<T extends FindUniqueArgs<Schema, Model>>(
141
+ useFindUnique<T extends FindUniqueArgs<Schema, Model, true>>(
139
142
  args: SelectSubset<T, FindUniqueArgs<Schema, Model>>,
140
- options?: ModelQueryOptions<ModelResult<Schema, Model, T> | null>,
141
- ): ModelQueryResult<ModelResult<Schema, Model, T> | null>;
142
-
143
- useFindFirst<T extends FindArgs<Schema, Model, false>>(
144
- args?: SelectSubset<T, FindArgs<Schema, Model, false>>,
145
- options?: ModelQueryOptions<ModelResult<Schema, Model, T> | null>,
146
- ): ModelQueryResult<ModelResult<Schema, Model, T> | null>;
147
-
148
- useFindMany<T extends FindArgs<Schema, Model, true>>(
149
- args?: SelectSubset<T, FindArgs<Schema, Model, true>>,
150
- options?: ModelQueryOptions<ModelResult<Schema, Model, T>[]>,
151
- ): ModelQueryResult<ModelResult<Schema, Model, T>[]>;
152
-
153
- useInfiniteFindMany<T extends FindArgs<Schema, Model, true>>(
154
- args?: SelectSubset<T, FindArgs<Schema, Model, true>>,
155
- options?: ModelInfiniteQueryOptions<ModelResult<Schema, Model, T>[]>,
156
- ): ModelInfiniteQueryResult<InfiniteData<ModelResult<Schema, Model, T>[]>>;
157
-
158
- useCreate<T extends CreateArgs<Schema, Model>>(
159
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>,
143
+ options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, T> | null>,
144
+ ): ModelQueryResult<SimplifiedModelResult<Schema, Model, T> | null>;
145
+
146
+ useFindFirst<T extends FindFirstArgs<Schema, Model, true>>(
147
+ args?: SelectSubset<T, FindFirstArgs<Schema, Model>>,
148
+ options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, T> | null>,
149
+ ): ModelQueryResult<SimplifiedModelResult<Schema, Model, T> | null>;
150
+
151
+ useFindMany<T extends FindManyArgs<Schema, Model, true>>(
152
+ args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
153
+ options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, T>[]>,
154
+ ): ModelQueryResult<SimplifiedModelResult<Schema, Model, T>[]>;
155
+
156
+ useInfiniteFindMany<T extends FindManyArgs<Schema, Model, true>>(
157
+ args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
158
+ options?: ModelInfiniteQueryOptions<SimplifiedModelResult<Schema, Model, T>[]>,
159
+ ): ModelInfiniteQueryResult<InfiniteData<SimplifiedModelResult<Schema, Model, T>[]>>;
160
+
161
+ useCreate<T extends CreateArgs<Schema, Model, true>>(
162
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
160
163
  ): ModelMutationModelResult<Schema, Model, T>;
161
164
 
162
- useCreateMany<T extends CreateManyArgs<Schema, Model>>(
165
+ useCreateMany<T extends CreateManyArgs<Schema, Model, true>>(
163
166
  options?: ModelMutationOptions<BatchResult, T>,
164
167
  ): ModelMutationResult<BatchResult, T>;
165
168
 
166
- useCreateManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(
167
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>[], T>,
169
+ useCreateManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model, true>>(
170
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>[], T>,
168
171
  ): ModelMutationModelResult<Schema, Model, T, true>;
169
172
 
170
- useUpdate<T extends UpdateArgs<Schema, Model>>(
171
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>,
173
+ useUpdate<T extends UpdateArgs<Schema, Model, true>>(
174
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
172
175
  ): ModelMutationModelResult<Schema, Model, T>;
173
176
 
174
- useUpdateMany<T extends UpdateManyArgs<Schema, Model>>(
177
+ useUpdateMany<T extends UpdateManyArgs<Schema, Model, true>>(
175
178
  options?: ModelMutationOptions<BatchResult, T>,
176
179
  ): ModelMutationResult<BatchResult, T>;
177
180
 
178
- useUpdateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(
179
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>[], T>,
181
+ useUpdateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model, true>>(
182
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>[], T>,
180
183
  ): ModelMutationModelResult<Schema, Model, T, true>;
181
184
 
182
- useUpsert<T extends UpsertArgs<Schema, Model>>(
183
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>,
185
+ useUpsert<T extends UpsertArgs<Schema, Model, true>>(
186
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
184
187
  ): ModelMutationModelResult<Schema, Model, T>;
185
188
 
186
- useDelete<T extends DeleteArgs<Schema, Model>>(
187
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>,
189
+ useDelete<T extends DeleteArgs<Schema, Model, true>>(
190
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
188
191
  ): ModelMutationModelResult<Schema, Model, T>;
189
192
 
190
- useDeleteMany<T extends DeleteManyArgs<Schema, Model>>(
193
+ useDeleteMany<T extends DeleteManyArgs<Schema, Model, true>>(
191
194
  options?: ModelMutationOptions<BatchResult, T>,
192
195
  ): ModelMutationResult<BatchResult, T>;
193
196
 
194
- useCount<T extends CountArgs<Schema, Model>>(
197
+ useCount<T extends CountArgs<Schema, Model, true>>(
195
198
  args?: Subset<T, CountArgs<Schema, Model>>,
196
199
  options?: ModelQueryOptions<CountResult<Schema, Model, T>>,
197
200
  ): ModelQueryResult<CountResult<Schema, Model, T>>;
198
201
 
199
- useAggregate<T extends AggregateArgs<Schema, Model>>(
202
+ useAggregate<T extends AggregateArgs<Schema, Model, true>>(
200
203
  args: Subset<T, AggregateArgs<Schema, Model>>,
201
204
  options?: ModelQueryOptions<AggregateResult<Schema, Model, T>>,
202
205
  ): ModelQueryResult<AggregateResult<Schema, Model, T>>;
203
206
 
204
- useGroupBy<T extends GroupByArgs<Schema, Model>>(
207
+ useGroupBy<T extends GroupByArgs<Schema, Model, true>>(
205
208
  args: Subset<T, GroupByArgs<Schema, Model>>,
206
209
  options?: ModelQueryOptions<GroupByResult<Schema, Model, T>>,
207
210
  ): ModelQueryResult<GroupByResult<Schema, Model, T>>;
package/src/vue.ts CHANGED
@@ -25,13 +25,13 @@ import type {
25
25
  CreateManyArgs,
26
26
  DeleteArgs,
27
27
  DeleteManyArgs,
28
- FindArgs,
28
+ FindFirstArgs,
29
+ FindManyArgs,
29
30
  FindUniqueArgs,
30
31
  GroupByArgs,
31
32
  GroupByResult,
32
- ModelResult,
33
- SelectIncludeOmit,
34
33
  SelectSubset,
34
+ SimplifiedModelResult,
35
35
  Subset,
36
36
  UpdateArgs,
37
37
  UpdateManyAndReturnArgs,
@@ -103,13 +103,13 @@ export type ModelMutationResult<T, TArgs> = UseMutationReturnType<T, DefaultErro
103
103
  export type ModelMutationModelResult<
104
104
  Schema extends SchemaDef,
105
105
  Model extends GetModels<Schema>,
106
- TArgs extends SelectIncludeOmit<Schema, Model, boolean>,
106
+ TArgs,
107
107
  Array extends boolean = false,
108
- > = Omit<ModelMutationResult<ModelResult<Schema, Model, TArgs>, TArgs>, 'mutateAsync'> & {
108
+ > = Omit<ModelMutationResult<SimplifiedModelResult<Schema, Model, TArgs, false, Array>, TArgs>, 'mutateAsync'> & {
109
109
  mutateAsync<T extends TArgs>(
110
110
  args: T,
111
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>,
112
- ): Promise<Array extends true ? ModelResult<Schema, Model, T>[] : ModelResult<Schema, Model, T>>;
111
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T, false, Array>, T>,
112
+ ): Promise<SimplifiedModelResult<Schema, Model, T, false, Array>>;
113
113
  };
114
114
 
115
115
  export type ClientHooks<Schema extends SchemaDef> = {
@@ -122,73 +122,73 @@ export type ModelQueryHooks<Schema extends SchemaDef, Model extends GetModels<Sc
122
122
  Schema,
123
123
  Model,
124
124
  {
125
- useFindUnique<T extends FindUniqueArgs<Schema, Model>>(
125
+ useFindUnique<T extends FindUniqueArgs<Schema, Model, true>>(
126
126
  args: SelectSubset<T, FindUniqueArgs<Schema, Model>>,
127
- options?: ModelQueryOptions<ModelResult<Schema, Model, T> | null>,
128
- ): ModelQueryResult<ModelResult<Schema, Model, T> | null>;
129
-
130
- useFindFirst<T extends FindArgs<Schema, Model, false>>(
131
- args?: SelectSubset<T, FindArgs<Schema, Model, false>>,
132
- options?: ModelQueryOptions<ModelResult<Schema, Model, T> | null>,
133
- ): ModelQueryResult<ModelResult<Schema, Model, T> | null>;
134
-
135
- useFindMany<T extends FindArgs<Schema, Model, true>>(
136
- args?: SelectSubset<T, FindArgs<Schema, Model, true>>,
137
- options?: ModelQueryOptions<ModelResult<Schema, Model, T>[]>,
138
- ): ModelQueryResult<ModelResult<Schema, Model, T>[]>;
139
-
140
- useInfiniteFindMany<T extends FindArgs<Schema, Model, true>>(
141
- args?: SelectSubset<T, FindArgs<Schema, Model, true>>,
142
- options?: ModelInfiniteQueryOptions<ModelResult<Schema, Model, T>[]>,
143
- ): ModelInfiniteQueryResult<InfiniteData<ModelResult<Schema, Model, T>[]>>;
144
-
145
- useCreate<T extends CreateArgs<Schema, Model>>(
146
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>,
127
+ options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, T> | null>,
128
+ ): ModelQueryResult<SimplifiedModelResult<Schema, Model, T> | null>;
129
+
130
+ useFindFirst<T extends FindFirstArgs<Schema, Model, true>>(
131
+ args?: SelectSubset<T, FindFirstArgs<Schema, Model>>,
132
+ options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, T> | null>,
133
+ ): ModelQueryResult<SimplifiedModelResult<Schema, Model, T> | null>;
134
+
135
+ useFindMany<T extends FindManyArgs<Schema, Model, true>>(
136
+ args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
137
+ options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, T>[]>,
138
+ ): ModelQueryResult<SimplifiedModelResult<Schema, Model, T>[]>;
139
+
140
+ useInfiniteFindMany<T extends FindManyArgs<Schema, Model, true>>(
141
+ args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
142
+ options?: ModelInfiniteQueryOptions<SimplifiedModelResult<Schema, Model, T>[]>,
143
+ ): ModelInfiniteQueryResult<InfiniteData<SimplifiedModelResult<Schema, Model, T>[]>>;
144
+
145
+ useCreate<T extends CreateArgs<Schema, Model, true>>(
146
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
147
147
  ): ModelMutationModelResult<Schema, Model, T>;
148
148
 
149
- useCreateMany<T extends CreateManyArgs<Schema, Model>>(
149
+ useCreateMany<T extends CreateManyArgs<Schema, Model, true>>(
150
150
  options?: ModelMutationOptions<BatchResult, T>,
151
151
  ): ModelMutationResult<BatchResult, T>;
152
152
 
153
- useCreateManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(
154
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>[], T>,
153
+ useCreateManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model, true>>(
154
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>[], T>,
155
155
  ): ModelMutationModelResult<Schema, Model, T, true>;
156
156
 
157
- useUpdate<T extends UpdateArgs<Schema, Model>>(
158
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>,
157
+ useUpdate<T extends UpdateArgs<Schema, Model, true>>(
158
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
159
159
  ): ModelMutationModelResult<Schema, Model, T>;
160
160
 
161
- useUpdateMany<T extends UpdateManyArgs<Schema, Model>>(
161
+ useUpdateMany<T extends UpdateManyArgs<Schema, Model, true>>(
162
162
  options?: ModelMutationOptions<BatchResult, T>,
163
163
  ): ModelMutationResult<BatchResult, T>;
164
164
 
165
- useUpdateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(
166
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>[], T>,
165
+ useUpdateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model, true>>(
166
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>[], T>,
167
167
  ): ModelMutationModelResult<Schema, Model, T, true>;
168
168
 
169
- useUpsert<T extends UpsertArgs<Schema, Model>>(
170
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>,
169
+ useUpsert<T extends UpsertArgs<Schema, Model, true>>(
170
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
171
171
  ): ModelMutationModelResult<Schema, Model, T>;
172
172
 
173
- useDelete<T extends DeleteArgs<Schema, Model>>(
174
- options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>,
173
+ useDelete<T extends DeleteArgs<Schema, Model, true>>(
174
+ options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, T>, T>,
175
175
  ): ModelMutationModelResult<Schema, Model, T>;
176
176
 
177
- useDeleteMany<T extends DeleteManyArgs<Schema, Model>>(
177
+ useDeleteMany<T extends DeleteManyArgs<Schema, Model, true>>(
178
178
  options?: ModelMutationOptions<BatchResult, T>,
179
179
  ): ModelMutationResult<BatchResult, T>;
180
180
 
181
- useCount<T extends CountArgs<Schema, Model>>(
181
+ useCount<T extends CountArgs<Schema, Model, true>>(
182
182
  args?: Subset<T, CountArgs<Schema, Model>>,
183
183
  options?: ModelQueryOptions<CountResult<Schema, Model, T>>,
184
184
  ): ModelQueryResult<CountResult<Schema, Model, T>>;
185
185
 
186
- useAggregate<T extends AggregateArgs<Schema, Model>>(
186
+ useAggregate<T extends AggregateArgs<Schema, Model, true>>(
187
187
  args: Subset<T, AggregateArgs<Schema, Model>>,
188
188
  options?: ModelQueryOptions<AggregateResult<Schema, Model, T>>,
189
189
  ): ModelQueryResult<AggregateResult<Schema, Model, T>>;
190
190
 
191
- useGroupBy<T extends GroupByArgs<Schema, Model>>(
191
+ useGroupBy<T extends GroupByArgs<Schema, Model, true>>(
192
192
  args: Subset<T, GroupByArgs<Schema, Model>>,
193
193
  options?: ModelQueryOptions<GroupByResult<Schema, Model, T>>,
194
194
  ): ModelQueryResult<GroupByResult<Schema, Model, T>>;
package/test/react-query.test.tsx CHANGED
@@ -25,7 +25,7 @@ describe('React Query Test', () => {
25
25
  const Provider = QuerySettingsProvider;
26
26
  const wrapper = ({ children }: { children: React.ReactNode }) => (
27
27
  <QueryClientProvider client={queryClient}>
28
- <Provider value={{ endpoint: `${BASE_URL}/api/model`, logging: true }}>{children}</Provider>
28
+ <Provider value={{ endpoint: `${BASE_URL}/api/model` }}>{children}</Provider>
29
29
  </QueryClientProvider>
30
30
  );
31
31
  return { queryClient, wrapper };