@zenstackhq/tanstack-query 3.0.0 → 3.1.0

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 (56) hide show
  1. package/dist/common/client.d.ts +4 -0
  2. package/dist/common/client.js +38 -0
  3. package/dist/common/client.js.map +1 -0
  4. package/dist/common/query-key.d.ts +39 -0
  5. package/dist/common/query-key.js +38 -0
  6. package/dist/common/query-key.js.map +1 -0
  7. package/dist/common/types.d.ts +60 -0
  8. package/dist/common/types.js +2 -0
  9. package/dist/common/types.js.map +1 -0
  10. package/dist/react.d.ts +99 -150
  11. package/dist/react.js +248 -1178
  12. package/dist/react.js.map +1 -1
  13. package/dist/svelte/index.svelte.d.ts +79 -0
  14. package/dist/svelte/index.svelte.js +245 -0
  15. package/dist/vue.d.ts +313 -342
  16. package/dist/vue.js +224 -1138
  17. package/dist/vue.js.map +1 -1
  18. package/package.json +36 -48
  19. package/.turbo/turbo-build.log +0 -47
  20. package/dist/react.cjs +0 -1240
  21. package/dist/react.cjs.map +0 -1
  22. package/dist/react.d.cts +0 -616
  23. package/dist/svelte.cjs +0 -1224
  24. package/dist/svelte.cjs.map +0 -1
  25. package/dist/svelte.d.cts +0 -381
  26. package/dist/svelte.d.ts +0 -381
  27. package/dist/svelte.js +0 -1183
  28. package/dist/svelte.js.map +0 -1
  29. package/dist/types-C8iIZD-7.d.cts +0 -99
  30. package/dist/types-C8iIZD-7.d.ts +0 -99
  31. package/dist/vue.cjs +0 -1192
  32. package/dist/vue.cjs.map +0 -1
  33. package/dist/vue.d.cts +0 -382
  34. package/eslint.config.js +0 -4
  35. package/src/react.ts +0 -562
  36. package/src/svelte.ts +0 -502
  37. package/src/utils/common.ts +0 -448
  38. package/src/utils/mutator.ts +0 -441
  39. package/src/utils/nested-read-visitor.ts +0 -61
  40. package/src/utils/nested-write-visitor.ts +0 -359
  41. package/src/utils/query-analysis.ts +0 -116
  42. package/src/utils/serialization.ts +0 -39
  43. package/src/utils/types.ts +0 -43
  44. package/src/vue.ts +0 -448
  45. package/test/react-query.test.tsx +0 -1787
  46. package/test/react-typing-test.ts +0 -113
  47. package/test/schemas/basic/input.ts +0 -110
  48. package/test/schemas/basic/models.ts +0 -14
  49. package/test/schemas/basic/schema-lite.ts +0 -172
  50. package/test/schemas/basic/schema.zmodel +0 -35
  51. package/test/svelte-typing-test.ts +0 -111
  52. package/test/vue-typing-test.ts +0 -111
  53. package/tsconfig.json +0 -7
  54. package/tsconfig.test.json +0 -8
  55. package/tsup.config.ts +0 -15
  56. package/vitest.config.ts +0 -11
package/src/svelte.ts DELETED
@@ -1,502 +0,0 @@
1
- import {
2
- createInfiniteQuery,
3
- createMutation,
4
- createQuery,
5
- useQueryClient,
6
- type CreateInfiniteQueryOptions,
7
- type CreateInfiniteQueryResult,
8
- type CreateMutationOptions,
9
- type CreateMutationResult,
10
- type CreateQueryOptions,
11
- type CreateQueryResult,
12
- type DefaultError,
13
- type InfiniteData,
14
- type QueryFunction,
15
- type QueryKey,
16
- type StoreOrVal,
17
- } from '@tanstack/svelte-query';
18
- import { lowerCaseFirst } from '@zenstackhq/common-helpers';
19
- import type {
20
- AggregateArgs,
21
- AggregateResult,
22
- BatchResult,
23
- CountArgs,
24
- CountResult,
25
- CreateArgs,
26
- CreateManyAndReturnArgs,
27
- CreateManyArgs,
28
- DeleteArgs,
29
- DeleteManyArgs,
30
- FindFirstArgs,
31
- FindManyArgs,
32
- FindUniqueArgs,
33
- GroupByArgs,
34
- GroupByResult,
35
- QueryOptions,
36
- SelectSubset,
37
- SimplifiedPlainResult,
38
- SimplifiedResult,
39
- Subset,
40
- UpdateArgs,
41
- UpdateManyAndReturnArgs,
42
- UpdateManyArgs,
43
- UpsertArgs,
44
- } from '@zenstackhq/orm';
45
- import type { GetModels, SchemaDef } from '@zenstackhq/schema';
46
- import { getContext, setContext } from 'svelte';
47
- import { derived, get, type Readable } from 'svelte/store';
48
- import {
49
- fetcher,
50
- getQueryKey,
51
- makeUrl,
52
- marshal,
53
- setupInvalidation,
54
- setupOptimisticUpdate,
55
- type APIContext,
56
- type ExtraMutationOptions,
57
- type ExtraQueryOptions,
58
- } from './utils/common';
59
- import type { TrimDelegateModelOperations, WithOptimistic } from './utils/types';
60
-
61
- export type { FetchFn } from './utils/common';
62
-
63
- /**
64
- * The default query endpoint.
65
- */
66
- export const DEFAULT_QUERY_ENDPOINT = '/api/model';
67
-
68
- /**
69
- * Key for setting and getting the global query context.
70
- */
71
- export const SvelteQueryContextKey = 'zenstack-svelte-query-context';
72
-
73
- /**
74
- * Set context for query settings.
75
- *
76
- * @deprecated use {@link setQuerySettingsContext} instead.
77
- */
78
- export function setHooksContext(context: APIContext) {
79
- setContext(SvelteQueryContextKey, context);
80
- }
81
-
82
- /**
83
- * Set context for query settings.
84
- */
85
- export function setQuerySettingsContext(context: APIContext) {
86
- setContext(SvelteQueryContextKey, context);
87
- }
88
-
89
- function getQuerySettings() {
90
- const { endpoint, ...rest } = getContext<APIContext>(SvelteQueryContextKey) ?? {};
91
- return { endpoint: endpoint ?? DEFAULT_QUERY_ENDPOINT, ...rest };
92
- }
93
-
94
- export type ModelQueryOptions<T> = Omit<CreateQueryOptions<T, DefaultError>, 'queryKey'> & ExtraQueryOptions;
95
-
96
- export type ModelQueryResult<T> = Readable<
97
- UnwrapStore<CreateQueryResult<WithOptimistic<T>, DefaultError>> & { queryKey: QueryKey }
98
- >;
99
-
100
- export type ModelInfiniteQueryOptions<T> = Omit<
101
- CreateInfiniteQueryOptions<T, DefaultError, InfiniteData<T>>,
102
- 'queryKey' | 'initialPageParam'
103
- >;
104
-
105
- export type ModelInfiniteQueryResult<T> = Readable<
106
- UnwrapStore<CreateInfiniteQueryResult<T, DefaultError>> & {
107
- queryKey: QueryKey;
108
- }
109
- >;
110
-
111
- export type ModelMutationOptions<T, TArgs> = Omit<CreateMutationOptions<T, DefaultError, TArgs>, 'mutationFn'> &
112
- ExtraMutationOptions;
113
-
114
- export type ModelMutationResult<T, TArgs> = CreateMutationResult<T, DefaultError, TArgs>;
115
-
116
- export type ModelMutationModelResult<
117
- Schema extends SchemaDef,
118
- Model extends GetModels<Schema>,
119
- TArgs,
120
- Array extends boolean = false,
121
- Options extends QueryOptions<Schema> = QueryOptions<Schema>,
122
- > = Readable<
123
- Omit<
124
- UnwrapStore<ModelMutationResult<SimplifiedResult<Schema, Model, TArgs, Options, false, Array>, TArgs>>,
125
- 'mutateAsync'
126
- > & {
127
- mutateAsync<T extends TArgs>(
128
- args: T,
129
- options?: ModelMutationOptions<SimplifiedResult<Schema, Model, T, Options, false, Array>, T>,
130
- ): Promise<SimplifiedResult<Schema, Model, T, Options, false, Array>>;
131
- }
132
- >;
133
-
134
- export type ClientHooks<Schema extends SchemaDef, Options extends QueryOptions<Schema> = QueryOptions<Schema>> = {
135
- [Model in GetModels<Schema> as `${Uncapitalize<Model>}`]: ModelQueryHooks<Schema, Model, Options>;
136
- };
137
-
138
- // Note that we can potentially use TypeScript's mapped type to directly map from ORM contract, but that seems
139
- // to significantly slow down tsc performance ...
140
- export type ModelQueryHooks<
141
- Schema extends SchemaDef,
142
- Model extends GetModels<Schema>,
143
- Options extends QueryOptions<Schema> = QueryOptions<Schema>,
144
- > = TrimDelegateModelOperations<
145
- Schema,
146
- Model,
147
- {
148
- useFindUnique<T extends FindUniqueArgs<Schema, Model>>(
149
- args: SelectSubset<T, FindUniqueArgs<Schema, Model>>,
150
- options?: ModelQueryOptions<SimplifiedPlainResult<Schema, Model, T, Options> | null>,
151
- ): ModelQueryResult<SimplifiedPlainResult<Schema, Model, T, Options> | null>;
152
-
153
- useFindFirst<T extends FindFirstArgs<Schema, Model>>(
154
- args?: SelectSubset<T, FindFirstArgs<Schema, Model>>,
155
- options?: ModelQueryOptions<SimplifiedPlainResult<Schema, Model, T, Options> | null>,
156
- ): ModelQueryResult<SimplifiedPlainResult<Schema, Model, T, Options> | null>;
157
-
158
- useFindMany<T extends FindManyArgs<Schema, Model>>(
159
- args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
160
- options?: ModelQueryOptions<SimplifiedPlainResult<Schema, Model, T, Options>[]>,
161
- ): ModelQueryResult<SimplifiedPlainResult<Schema, Model, T, Options>[]>;
162
-
163
- useInfiniteFindMany<T extends FindManyArgs<Schema, Model>>(
164
- args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
165
- options?: ModelInfiniteQueryOptions<SimplifiedPlainResult<Schema, Model, T, Options>[]>,
166
- ): ModelInfiniteQueryResult<InfiniteData<SimplifiedPlainResult<Schema, Model, T, Options>[]>>;
167
-
168
- useCreate<T extends CreateArgs<Schema, Model>>(
169
- options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>, T>,
170
- ): ModelMutationModelResult<Schema, Model, T, false, Options>;
171
-
172
- useCreateMany<T extends CreateManyArgs<Schema, Model>>(
173
- options?: ModelMutationOptions<BatchResult, T>,
174
- ): ModelMutationResult<BatchResult, T>;
175
-
176
- useCreateManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(
177
- options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>[], T>,
178
- ): ModelMutationModelResult<Schema, Model, T, true, Options>;
179
-
180
- useUpdate<T extends UpdateArgs<Schema, Model>>(
181
- options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>, T>,
182
- ): ModelMutationModelResult<Schema, Model, T, false, Options>;
183
- useUpdateMany<T extends UpdateManyArgs<Schema, Model>>(
184
- options?: ModelMutationOptions<BatchResult, T>,
185
- ): ModelMutationResult<BatchResult, T>;
186
-
187
- useUpdateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(
188
- options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>[], T>,
189
- ): ModelMutationModelResult<Schema, Model, T, true, Options>;
190
-
191
- useUpsert<T extends UpsertArgs<Schema, Model>>(
192
- options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>, T>,
193
- ): ModelMutationModelResult<Schema, Model, T, false, Options>;
194
- useDelete<T extends DeleteArgs<Schema, Model>>(
195
- options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>, T>,
196
- ): ModelMutationModelResult<Schema, Model, T, false, Options>;
197
-
198
- useDeleteMany<T extends DeleteManyArgs<Schema, Model>>(
199
- options?: ModelMutationOptions<BatchResult, T>,
200
- ): ModelMutationResult<BatchResult, T>;
201
-
202
- useCount<T extends CountArgs<Schema, Model>>(
203
- args?: Subset<T, CountArgs<Schema, Model>>,
204
- options?: ModelQueryOptions<CountResult<Schema, Model, T>>,
205
- ): ModelQueryResult<CountResult<Schema, Model, T>>;
206
-
207
- useAggregate<T extends AggregateArgs<Schema, Model>>(
208
- args: Subset<T, AggregateArgs<Schema, Model>>,
209
- options?: ModelQueryOptions<AggregateResult<Schema, Model, T>>,
210
- ): ModelQueryResult<AggregateResult<Schema, Model, T>>;
211
-
212
- useGroupBy<T extends GroupByArgs<Schema, Model>>(
213
- args: Subset<T, GroupByArgs<Schema, Model>>,
214
- options?: ModelQueryOptions<GroupByResult<Schema, Model, T>>,
215
- ): ModelQueryResult<GroupByResult<Schema, Model, T>>;
216
- }
217
- >;
218
-
219
- /**
220
- * Gets data query hooks for all models in the schema.
221
- */
222
- export function useClientQueries<Schema extends SchemaDef, Options extends QueryOptions<Schema> = QueryOptions<Schema>>(
223
- schema: Schema,
224
- ): ClientHooks<Schema, Options> {
225
- return Object.keys(schema.models).reduce(
226
- (acc, model) => {
227
- (acc as any)[lowerCaseFirst(model)] = useModelQueries<Schema, GetModels<Schema>, Options>(
228
- schema,
229
- model as GetModels<Schema>,
230
- );
231
- return acc;
232
- },
233
- {} as ClientHooks<Schema, Options>,
234
- );
235
- }
236
-
237
- /**
238
- * Gets data query hooks for a specific model in the schema.
239
- */
240
- export function useModelQueries<
241
- Schema extends SchemaDef,
242
- Model extends GetModels<Schema>,
243
- Options extends QueryOptions<Schema>,
244
- >(schema: Schema, model: Model): ModelQueryHooks<Schema, Model, Options> {
245
- const modelDef = Object.values(schema.models).find((m) => m.name.toLowerCase() === model.toLowerCase());
246
- if (!modelDef) {
247
- throw new Error(`Model "${model}" not found in schema`);
248
- }
249
-
250
- const modelName = modelDef.name;
251
-
252
- return {
253
- useFindUnique: (args: any, options?: any) => {
254
- return useInternalQuery(schema, modelName, 'findUnique', args, options);
255
- },
256
-
257
- useFindFirst: (args: any, options?: any) => {
258
- return useInternalQuery(schema, modelName, 'findFirst', args, options);
259
- },
260
-
261
- useFindMany: (args: any, options?: any) => {
262
- return useInternalQuery(schema, modelName, 'findMany', args, options);
263
- },
264
-
265
- useInfiniteFindMany: (args: any, options?: any) => {
266
- return useInternalInfiniteQuery(schema, modelName, 'findMany', args, options);
267
- },
268
-
269
- useCreate: (options?: any) => {
270
- return useInternalMutation(schema, modelName, 'POST', 'create', options);
271
- },
272
-
273
- useCreateMany: (options?: any) => {
274
- return useInternalMutation(schema, modelName, 'POST', 'createMany', options);
275
- },
276
-
277
- useCreateManyAndReturn: (options?: any) => {
278
- return useInternalMutation(schema, modelName, 'POST', 'createManyAndReturn', options);
279
- },
280
-
281
- useUpdate: (options?: any) => {
282
- return useInternalMutation(schema, modelName, 'PUT', 'update', options);
283
- },
284
-
285
- useUpdateMany: (options?: any) => {
286
- return useInternalMutation(schema, modelName, 'PUT', 'updateMany', options);
287
- },
288
-
289
- useUpdateManyAndReturn: (options?: any) => {
290
- return useInternalMutation(schema, modelName, 'PUT', 'updateManyAndReturn', options);
291
- },
292
-
293
- useUpsert: (options?: any) => {
294
- return useInternalMutation(schema, modelName, 'POST', 'upsert', options);
295
- },
296
-
297
- useDelete: (options?: any) => {
298
- return useInternalMutation(schema, modelName, 'DELETE', 'delete', options);
299
- },
300
-
301
- useDeleteMany: (options?: any) => {
302
- return useInternalMutation(schema, modelName, 'DELETE', 'deleteMany', options);
303
- },
304
-
305
- useCount: (args: any, options?: any) => {
306
- return useInternalQuery(schema, modelName, 'count', args, options);
307
- },
308
-
309
- useAggregate: (args: any, options?: any) => {
310
- return useInternalQuery(schema, modelName, 'aggregate', args, options);
311
- },
312
-
313
- useGroupBy: (args: any, options?: any) => {
314
- return useInternalQuery(schema, modelName, 'groupBy', args, options);
315
- },
316
- } as ModelQueryHooks<Schema, Model, Options>;
317
- }
318
-
319
- export function useInternalQuery<TQueryFnData, TData>(
320
- _schema: SchemaDef,
321
- model: string,
322
- operation: string,
323
- args?: StoreOrVal<unknown>,
324
- options?: StoreOrVal<Omit<CreateQueryOptions<TQueryFnData, DefaultError, TData>, 'queryKey'> & ExtraQueryOptions>,
325
- ) {
326
- const { endpoint, fetch } = getQuerySettings();
327
- const argsValue = unwrapStore(args);
328
- const reqUrl = makeUrl(endpoint, model, operation, argsValue);
329
- const optionsValue = unwrapStore(options);
330
- const queryKey = getQueryKey(model, operation, argsValue, {
331
- infinite: false,
332
- optimisticUpdate: optionsValue?.optimisticUpdate !== false,
333
- });
334
- const queryFn: QueryFunction<TQueryFnData, QueryKey, unknown> = ({ signal }) =>
335
- fetcher<TQueryFnData>(reqUrl, { signal }, fetch);
336
-
337
- let mergedOpt: any;
338
- if (isStore(options)) {
339
- // options is store
340
- mergedOpt = derived([options], ([$opt]) => {
341
- return {
342
- queryKey,
343
- queryFn,
344
- ...($opt as object),
345
- };
346
- });
347
- } else {
348
- // options is value
349
- mergedOpt = {
350
- queryKey,
351
- queryFn,
352
- ...options,
353
- };
354
- }
355
-
356
- const result = createQuery<TQueryFnData, DefaultError, TData>(mergedOpt);
357
- return derived(result, (r) => ({
358
- queryKey,
359
- ...r,
360
- }));
361
- }
362
-
363
- export function useInternalInfiniteQuery<TQueryFnData, TData>(
364
- _schema: SchemaDef,
365
- model: string,
366
- operation: string,
367
- args: StoreOrVal<unknown>,
368
- options:
369
- | StoreOrVal<
370
- Omit<
371
- CreateInfiniteQueryOptions<TQueryFnData, DefaultError, InfiniteData<TData>>,
372
- 'queryKey' | 'initialPageParam'
373
- >
374
- >
375
- | undefined,
376
- ) {
377
- options = options ?? { getNextPageParam: () => undefined };
378
- const { endpoint, fetch } = getQuerySettings();
379
- const argsValue = unwrapStore(args);
380
- const queryKey = getQueryKey(model, operation, argsValue, { infinite: true, optimisticUpdate: false });
381
- const queryFn: QueryFunction<TQueryFnData, QueryKey, unknown> = ({ pageParam, signal }) =>
382
- fetcher<TQueryFnData>(makeUrl(endpoint, model, operation, pageParam ?? argsValue), { signal }, fetch);
383
-
384
- let mergedOpt: StoreOrVal<CreateInfiniteQueryOptions<TQueryFnData, DefaultError, InfiniteData<TData>>>;
385
- if (isStore(options)) {
386
- // options is store
387
- mergedOpt = derived([options], ([$opt]) => {
388
- return {
389
- queryKey,
390
- queryFn,
391
- initialPageParam: argsValue,
392
- ...$opt,
393
- };
394
- });
395
- } else {
396
- // options is value
397
- mergedOpt = {
398
- queryKey,
399
- queryFn,
400
- initialPageParam: argsValue,
401
- ...options,
402
- };
403
- }
404
-
405
- const result = createInfiniteQuery<TQueryFnData, DefaultError, InfiniteData<TData>>(mergedOpt);
406
- return derived(result, (r) => ({
407
- queryKey,
408
- ...r,
409
- }));
410
- }
411
-
412
- /**
413
- * Creates a svelte-query mutation
414
- *
415
- * @private
416
- *
417
- * @param model The name of the model under mutation.
418
- * @param method The HTTP method.
419
- * @param operation The mutation operation (e.g. `create`).
420
- * @param options The svelte-query options.
421
- * @param checkReadBack Whether to check for read back errors and return undefined if found.
422
- */
423
- export function useInternalMutation<TArgs, R = any>(
424
- schema: SchemaDef,
425
- model: string,
426
- method: 'POST' | 'PUT' | 'DELETE',
427
- operation: string,
428
- options?: StoreOrVal<Omit<CreateMutationOptions<R, DefaultError, TArgs>, 'mutationFn'> & ExtraMutationOptions>,
429
- ) {
430
- const { endpoint, fetch, logging } = getQuerySettings();
431
- const queryClient = useQueryClient();
432
- const optionsValue = unwrapStore(options);
433
- const mutationFn = (data: any) => {
434
- const reqUrl =
435
- method === 'DELETE' ? makeUrl(endpoint, model, operation, data) : makeUrl(endpoint, model, operation);
436
- const fetchInit: RequestInit = {
437
- method,
438
- ...(method !== 'DELETE' && {
439
- headers: {
440
- 'content-type': 'application/json',
441
- },
442
- body: marshal(data),
443
- }),
444
- };
445
- return fetcher<R>(reqUrl, fetchInit, fetch) as Promise<R>;
446
- };
447
-
448
- let mergedOpt: StoreOrVal<CreateMutationOptions<R, DefaultError, TArgs>>;
449
-
450
- if (isStore(options)) {
451
- mergedOpt = derived([options], ([$opt]) => ({
452
- ...$opt,
453
- mutationFn,
454
- }));
455
- } else {
456
- mergedOpt = {
457
- ...options,
458
- mutationFn,
459
- };
460
- }
461
-
462
- const invalidateQueries = optionsValue?.invalidateQueries !== false;
463
- const optimisticUpdate = !!optionsValue?.optimisticUpdate;
464
-
465
- if (operation) {
466
- if (invalidateQueries) {
467
- setupInvalidation(
468
- model,
469
- operation,
470
- schema,
471
- unwrapStore(mergedOpt),
472
- (predicate) => queryClient.invalidateQueries({ predicate }),
473
- logging,
474
- );
475
- }
476
-
477
- if (optimisticUpdate) {
478
- setupOptimisticUpdate(
479
- model,
480
- operation,
481
- schema,
482
- unwrapStore(mergedOpt),
483
- queryClient.getQueryCache().getAll(),
484
- (queryKey, data) => queryClient.setQueryData<unknown>(queryKey, data),
485
- invalidateQueries ? (predicate) => queryClient.invalidateQueries({ predicate }) : undefined,
486
- logging,
487
- );
488
- }
489
- }
490
-
491
- return createMutation(mergedOpt);
492
- }
493
-
494
- function isStore<T>(opt: unknown): opt is Readable<T> {
495
- return typeof (opt as any)?.subscribe === 'function';
496
- }
497
-
498
- function unwrapStore<T>(storeOrValue: StoreOrVal<T>): T {
499
- return isStore(storeOrValue) ? get(storeOrValue) : storeOrValue;
500
- }
501
-
502
- type UnwrapStore<T> = T extends Readable<infer U> ? U : T;