@openapi-qraft/react 1.0.10 → 1.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 (89) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/dist/ServiceOperation.d.ts +98 -22
  3. package/dist/ServiceOperation.d.ts.map +1 -1
  4. package/dist/callbacks/getInfiniteQueryData.d.ts.map +1 -1
  5. package/dist/callbacks/getInfiniteQueryData.js +4 -4
  6. package/dist/callbacks/getInfiniteQueryData.js.map +1 -1
  7. package/dist/callbacks/getInfiniteQueryKey.d.ts +1 -5
  8. package/dist/callbacks/getInfiniteQueryKey.d.ts.map +1 -1
  9. package/dist/callbacks/getInfiniteQueryKey.js +2 -4
  10. package/dist/callbacks/getInfiniteQueryKey.js.map +1 -1
  11. package/dist/callbacks/getQueryData.d.ts.map +1 -1
  12. package/dist/callbacks/getQueryData.js +2 -4
  13. package/dist/callbacks/getQueryData.js.map +1 -1
  14. package/dist/callbacks/getQueryKey.d.ts +1 -4
  15. package/dist/callbacks/getQueryKey.d.ts.map +1 -1
  16. package/dist/callbacks/getQueryKey.js +2 -4
  17. package/dist/callbacks/getQueryKey.js.map +1 -1
  18. package/dist/callbacks/invalidateQueries.d.ts +5 -0
  19. package/dist/callbacks/invalidateQueries.d.ts.map +1 -0
  20. package/dist/callbacks/invalidateQueries.js +36 -0
  21. package/dist/callbacks/invalidateQueries.js.map +1 -0
  22. package/dist/callbacks/setInfiniteQueryData.d.ts.map +1 -1
  23. package/dist/callbacks/setInfiniteQueryData.js +4 -1
  24. package/dist/callbacks/setInfiniteQueryData.js.map +1 -1
  25. package/dist/callbacks/setQueryData.d.ts.map +1 -1
  26. package/dist/callbacks/setQueryData.js +4 -4
  27. package/dist/callbacks/setQueryData.js.map +1 -1
  28. package/dist/callbacks/useInfiniteQuery.d.ts.map +1 -1
  29. package/dist/callbacks/useInfiniteQuery.js +5 -4
  30. package/dist/callbacks/useInfiniteQuery.js.map +1 -1
  31. package/dist/callbacks/useQueries.d.ts.map +1 -1
  32. package/dist/callbacks/useQueries.js +23 -15
  33. package/dist/callbacks/useQueries.js.map +1 -1
  34. package/dist/callbacks/useQuery.d.ts +1 -1
  35. package/dist/callbacks/useQuery.d.ts.map +1 -1
  36. package/dist/callbacks/useQuery.js +4 -4
  37. package/dist/callbacks/useQuery.js.map +1 -1
  38. package/dist/callbacks/useSuspenseInfiniteQuery.d.ts.map +1 -1
  39. package/dist/callbacks/useSuspenseInfiniteQuery.js +5 -4
  40. package/dist/callbacks/useSuspenseInfiniteQuery.js.map +1 -1
  41. package/dist/callbacks/useSuspenseQueries.d.ts.map +1 -1
  42. package/dist/callbacks/useSuspenseQueries.js +23 -15
  43. package/dist/callbacks/useSuspenseQueries.js.map +1 -1
  44. package/dist/callbacks/useSuspenseQuery.d.ts.map +1 -1
  45. package/dist/callbacks/useSuspenseQuery.js +4 -4
  46. package/dist/callbacks/useSuspenseQuery.js.map +1 -1
  47. package/dist/lib/composeInfiniteQueryKey.d.ts +4 -0
  48. package/dist/lib/composeInfiniteQueryKey.d.ts.map +1 -0
  49. package/dist/lib/composeInfiniteQueryKey.js +4 -0
  50. package/dist/lib/composeInfiniteQueryKey.js.map +1 -0
  51. package/dist/lib/composeQueryKey.d.ts +4 -0
  52. package/dist/lib/composeQueryKey.d.ts.map +1 -0
  53. package/dist/lib/composeQueryKey.js +4 -0
  54. package/dist/lib/composeQueryKey.js.map +1 -0
  55. package/dist/lib/createRecursiveProxy.d.ts +7 -5
  56. package/dist/lib/createRecursiveProxy.d.ts.map +1 -1
  57. package/dist/lib/createRecursiveProxy.js +14 -9
  58. package/dist/lib/createRecursiveProxy.js.map +1 -1
  59. package/dist/lib/request.d.ts.map +1 -1
  60. package/dist/lib/request.js +15 -3
  61. package/dist/lib/request.js.map +1 -1
  62. package/dist/qraftAPIClient.d.ts.map +1 -1
  63. package/dist/qraftAPIClient.js +16 -7
  64. package/dist/qraftAPIClient.js.map +1 -1
  65. package/package.json +3 -2
  66. package/src/ServiceOperation.ts +152 -25
  67. package/src/callbacks/getInfiniteQueryData.ts +6 -4
  68. package/src/callbacks/getInfiniteQueryKey.ts +3 -8
  69. package/src/callbacks/getQueryData.ts +5 -8
  70. package/src/callbacks/getQueryKey.ts +3 -8
  71. package/src/callbacks/invalidateQueries.ts +70 -0
  72. package/src/callbacks/setInfiniteQueryData.ts +4 -1
  73. package/src/callbacks/setQueryData.ts +5 -4
  74. package/src/callbacks/useInfiniteQuery.ts +13 -5
  75. package/src/callbacks/useQueries.ts +30 -20
  76. package/src/callbacks/useQuery.ts +6 -9
  77. package/src/callbacks/useSuspenseInfiniteQuery.ts +13 -5
  78. package/src/callbacks/useSuspenseQueries.ts +30 -20
  79. package/src/callbacks/useSuspenseQuery.ts +5 -4
  80. package/src/lib/composeInfiniteQueryKey.ts +12 -0
  81. package/src/lib/composeQueryKey.ts +9 -0
  82. package/src/lib/createRecursiveProxy.ts +32 -11
  83. package/src/lib/request.ts +20 -2
  84. package/src/qraftAPIClient.ts +25 -13
  85. package/dist/lib/createCallbackProxyDecoration.d.ts +0 -5
  86. package/dist/lib/createCallbackProxyDecoration.d.ts.map +0 -1
  87. package/dist/lib/createCallbackProxyDecoration.js +0 -21
  88. package/dist/lib/createCallbackProxyDecoration.js.map +0 -1
  89. package/src/lib/createCallbackProxyDecoration.ts +0 -34
@@ -1,6 +1,7 @@
1
1
  'use client';
2
2
  import { useContext } from 'react';
3
3
  import { useQueries as useQueriesTanstack, useQueryClient, } from '@tanstack/react-query';
4
+ import { composeQueryKey } from '../lib/composeQueryKey.js';
4
5
  import { QraftContext } from '../QraftContext.js';
5
6
  export const useQueries = (qraftOptions, schema, args) => {
6
7
  const [options, queryClientByArg] = args;
@@ -9,21 +10,28 @@ export const useQueries = (qraftOptions, schema, args) => {
9
10
  throw new Error(`QraftContext.requestClient not found`);
10
11
  return useQueriesTanstack({
11
12
  ...options,
12
- queries: options.queries.map(({ parameters, ...queryOptions }) => ({
13
- ...queryOptions,
14
- queryKey: [
15
- { url: schema.url, method: schema.method },
16
- parameters,
17
- ],
18
- queryFn: queryOptions.queryFn ??
19
- function ({ queryKey: [, queryParams], signal, meta }) {
20
- return requestClient(schema, {
21
- parameters: queryParams,
22
- signal,
23
- meta,
24
- });
25
- },
26
- })),
13
+ queries: options.queries.map((queryOptions) => {
14
+ const optionsWithQueryKey = 'parameters' in queryOptions
15
+ ? (() => {
16
+ const queryOptionsCopy = Object.assign({
17
+ queryKey: composeQueryKey(schema, queryOptions.parameters),
18
+ }, queryOptions);
19
+ delete queryOptionsCopy.parameters;
20
+ return queryOptionsCopy;
21
+ })()
22
+ : queryOptions;
23
+ return {
24
+ ...optionsWithQueryKey,
25
+ queryFn: optionsWithQueryKey.queryFn ??
26
+ function ({ queryKey: [, queryParams], signal, meta }) {
27
+ return requestClient(schema, {
28
+ parameters: queryParams,
29
+ signal,
30
+ meta,
31
+ });
32
+ },
33
+ };
34
+ }),
27
35
  }, useQueryClient(queryClientByArg ?? queryClientByContext));
28
36
  };
29
37
  //# sourceMappingURL=useQueries.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useQueries.js","sourceRoot":"","sources":["../../src/callbacks/useQueries.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,EAEL,UAAU,IAAI,kBAAkB,EAChC,cAAc,GACf,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOlD,MAAM,CAAC,MAAM,UAAU,GAMM,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAC1D,MAAM,CAAC,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAEzC,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,oBAAoB,EAAE,GACxD,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;IAE1D,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAE5E,OAAO,kBAAkB,CACvB;QACE,GAAG,OAAO;QACV,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,GAAG,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;YACjE,GAAG,YAAY;YACf,QAAQ,EAAE;gBACR,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;gBAC1C,UAAU;aACsD;YAClE,OAAO,EACL,YAAY,CAAC,OAAO;gBACpB,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;oBACnD,OAAO,aAAa,CAAC,MAAM,EAAE;wBAC3B,UAAU,EAAE,WAAoB;wBAChC,MAAM;wBACN,IAAI;qBACL,CAAC,CAAC;gBACL,CAAC;SACJ,CAAC,CAAC;KACJ,EACD,cAAc,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAChD,CAAC;AACb,CAAC,CAAC"}
1
+ {"version":3,"file":"useQueries.js","sourceRoot":"","sources":["../../src/callbacks/useQueries.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,EAEL,UAAU,IAAI,kBAAkB,EAChC,cAAc,GACf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIlD,MAAM,CAAC,MAAM,UAAU,GAMM,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAC1D,MAAM,CAAC,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAEzC,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,oBAAoB,EAAE,GACxD,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;IAE1D,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAE5E,OAAO,kBAAkB,CACvB;QACE,GAAG,OAAO;QACV,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE;YAC5C,MAAM,mBAAmB,GACvB,YAAY,IAAI,YAAY;gBAC1B,CAAC,CAAC,CAAC,GAAG,EAAE;oBACJ,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CACpC;wBACE,QAAQ,EAAE,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,UAAU,CAAC;qBAC3D,EACD,YAAY,CACb,CAAC;oBACF,OAAO,gBAAgB,CAAC,UAAU,CAAC;oBACnC,OAAO,gBAAgB,CAAC;gBAC1B,CAAC,CAAC,EAAE;gBACN,CAAC,CAAC,YAAY,CAAC;YAEnB,OAAO;gBACL,GAAG,mBAAmB;gBACtB,OAAO,EACL,mBAAmB,CAAC,OAAO;oBAC3B,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;wBACnD,OAAO,aAAa,CAAC,MAAM,EAAE;4BAC3B,UAAU,EAAE,WAAoB;4BAChC,MAAM;4BACN,IAAI;yBACL,CAAC,CAAC;oBACL,CAAC;aACJ,CAAC;QACJ,CAAC,CAAC;KACH,EACD,cAAc,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAChD,CAAC;AACb,CAAC,CAAC"}
@@ -3,5 +3,5 @@ import { UseQueryResult } from '@tanstack/react-query';
3
3
  import type { QraftClientOptions } from '../qraftAPIClient.js';
4
4
  import type { RequestClientSchema } from '../RequestClient.js';
5
5
  import { ServiceOperationQuery } from '../ServiceOperation.js';
6
- export declare const useQuery: <TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData>(qraftOptions: QraftClientOptions | undefined, schema: RequestClientSchema, args: Parameters<ServiceOperationQuery<RequestClientSchema, unknown, unknown>['useQuery']>) => UseQueryResult<TData, TError>;
6
+ export declare const useQuery: <TData = unknown, TError = DefaultError>(qraftOptions: QraftClientOptions | undefined, schema: RequestClientSchema, args: Parameters<ServiceOperationQuery<RequestClientSchema, unknown, unknown>['useQuery']>) => UseQueryResult<TData, TError>;
7
7
  //# sourceMappingURL=useQuery.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"useQuery.d.ts","sourceRoot":"","sources":["../../src/callbacks/useQuery.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAGL,cAAc,EACf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EACL,qBAAqB,EAEtB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,QAAQ,EAAE,CACrB,YAAY,GAAG,OAAO,EACtB,MAAM,GAAG,YAAY,EACrB,KAAK,GAAG,YAAY,EAEpB,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,qBAAqB,CAAC,mBAAmB,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,UAAU,CAAC,CACzE,KACE,cAAc,CAAC,KAAK,EAAE,MAAM,CA6BhC,CAAC"}
1
+ {"version":3,"file":"useQuery.d.ts","sourceRoot":"","sources":["../../src/callbacks/useQuery.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAGL,cAAc,EACf,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EACL,qBAAqB,EAEtB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,QAAQ,EAAE,CAAC,KAAK,GAAG,OAAO,EAAE,MAAM,GAAG,YAAY,EAC5D,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,qBAAqB,CAAC,mBAAmB,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,UAAU,CAAC,CACzE,KACE,cAAc,CAAC,KAAK,EAAE,MAAM,CA6BhC,CAAC"}
@@ -1,16 +1,16 @@
1
1
  'use client';
2
2
  import { useContext } from 'react';
3
3
  import { useQuery as useQueryTanstack, useQueryClient, } from '@tanstack/react-query';
4
+ import { composeQueryKey } from '../lib/composeQueryKey.js';
4
5
  import { QraftContext } from '../QraftContext.js';
5
6
  export const useQuery = (qraftOptions, schema, args) => {
6
7
  const [parameters, options, queryClientByArg] = args;
7
8
  const { requestClient, queryClient: queryClientByContext } = useContext(qraftOptions?.context ?? QraftContext) ?? {};
8
9
  if (!requestClient)
9
10
  throw new Error(`QraftContext.requestClient not found`);
10
- const queryKey = [
11
- { url: schema.url, method: schema.method },
12
- parameters,
13
- ];
11
+ const queryKey = Array.isArray(parameters)
12
+ ? parameters
13
+ : composeQueryKey(schema, parameters);
14
14
  return useQueryTanstack({
15
15
  ...options,
16
16
  queryKey,
@@ -1 +1 @@
1
- {"version":3,"file":"useQuery.js","sourceRoot":"","sources":["../../src/callbacks/useQuery.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAGnC,OAAO,EACL,QAAQ,IAAI,gBAAgB,EAC5B,cAAc,GAEf,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOlD,MAAM,CAAC,MAAM,QAAQ,GAUgB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAClE,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAErD,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,oBAAoB,EAAE,GACxD,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;IAE1D,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAE5E,MAAM,QAAQ,GAA2D;QACvE,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;QAC1C,UAAU;KACX,CAAC;IAEF,OAAO,gBAAgB,CACrB;QACE,GAAG,OAAO;QACV,QAAQ;QACR,OAAO,EACL,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;gBACnD,OAAO,aAAa,CAAC,MAAM,EAAE;oBAC3B,UAAU,EAAE,WAAoB;oBAChC,MAAM;oBACN,IAAI;iBACL,CAAC,CAAC;YACL,CAAC;KACJ,EACD,cAAc,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAChD,CAAC;AACb,CAAC,CAAC"}
1
+ {"version":3,"file":"useQuery.js","sourceRoot":"","sources":["../../src/callbacks/useQuery.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAGnC,OAAO,EACL,QAAQ,IAAI,gBAAgB,EAC5B,cAAc,GAEf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOlD,MAAM,CAAC,MAAM,QAAQ,GAMgB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAClE,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAErD,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,oBAAoB,EAAE,GACxD,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;IAE1D,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAE5E,MAAM,QAAQ,GACZ,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;QACvB,CAAC,CAAE,UAAqE;QACxE,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE1C,OAAO,gBAAgB,CACrB;QACE,GAAG,OAAO;QACV,QAAQ;QACR,OAAO,EACL,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;gBACnD,OAAO,aAAa,CAAC,MAAM,EAAE;oBAC3B,UAAU,EAAE,WAAoB;oBAChC,MAAM;oBACN,IAAI;iBACL,CAAC,CAAC;YACL,CAAC;KACJ,EACD,cAAc,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAChD,CAAC;AACb,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"useSuspenseInfiniteQuery.d.ts","sourceRoot":"","sources":["../../src/callbacks/useSuspenseInfiniteQuery.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAGL,8BAA8B,EAC/B,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,eAAO,MAAM,wBAAwB,EAAE,CACrC,YAAY,EACZ,MAAM,GAAG,YAAY,EACrB,KAAK,GAAG,YAAY,CAAC,YAAY,CAAC,EAElC,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,qBAAqB,CACnB,mBAAmB,EACnB,OAAO,EACP,OAAO,CACR,CAAC,0BAA0B,CAAC,CAC9B,KACE,8BAA8B,CAAC,KAAK,EAAE,MAAM,CA+BhD,CAAC"}
1
+ {"version":3,"file":"useSuspenseInfiniteQuery.d.ts","sourceRoot":"","sources":["../../src/callbacks/useSuspenseInfiniteQuery.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAGL,8BAA8B,EAC/B,MAAM,uBAAuB,CAAC;AAI/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAEL,qBAAqB,EACtB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,wBAAwB,EAAE,CACrC,YAAY,EACZ,MAAM,GAAG,YAAY,EACrB,KAAK,GAAG,YAAY,CAAC,YAAY,CAAC,EAElC,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,qBAAqB,CACnB,mBAAmB,EACnB,OAAO,EACP,OAAO,CACR,CAAC,0BAA0B,CAAC,CAC9B,KACE,8BAA8B,CAAC,KAAK,EAAE,MAAM,CAmChD,CAAC"}
@@ -1,6 +1,7 @@
1
1
  'use client';
2
2
  import { useContext } from 'react';
3
3
  import { useQueryClient, useSuspenseInfiniteQuery as useSuspenseInfiniteQueryTanstack, } from '@tanstack/react-query';
4
+ import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
4
5
  import { shelfMerge } from '../lib/shelfMerge.js';
5
6
  import { QraftContext } from '../QraftContext.js';
6
7
  export const useSuspenseInfiniteQuery = (qraftOptions, schema, args) => {
@@ -8,12 +9,12 @@ export const useSuspenseInfiniteQuery = (qraftOptions, schema, args) => {
8
9
  const { requestClient, queryClient: queryClientByContext } = useContext(qraftOptions?.context ?? QraftContext) ?? {};
9
10
  if (!requestClient)
10
11
  throw new Error(`QraftContext.requestClient not found`);
12
+ const queryKey = Array.isArray(parameters)
13
+ ? parameters
14
+ : composeInfiniteQueryKey(schema, parameters);
11
15
  return useSuspenseInfiniteQueryTanstack({
12
16
  ...options,
13
- queryKey: [
14
- { url: schema.url, method: schema.method, infinite: true },
15
- parameters,
16
- ],
17
+ queryKey,
17
18
  queryFn: options?.queryFn ??
18
19
  function ({ queryKey: [, queryParams], signal, meta, pageParam }) {
19
20
  return requestClient(schema, {
@@ -1 +1 @@
1
- {"version":3,"file":"useSuspenseInfiniteQuery.js","sourceRoot":"","sources":["../../src/callbacks/useSuspenseInfiniteQuery.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAGnC,OAAO,EACL,cAAc,EACd,wBAAwB,IAAI,gCAAgC,GAE7D,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIlD,MAAM,CAAC,MAAM,wBAAwB,GAcgB,CACnD,YAAY,EACZ,MAAM,EACN,IAAI,EACJ,EAAE;IACF,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAErD,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,oBAAoB,EAAE,GACxD,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;IAE1D,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAE5E,OAAO,gCAAgC,CACrC;QACE,GAAG,OAAO;QACV,QAAQ,EAAE;YACR,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;YAC1D,UAAmB;SACX;QACV,OAAO,EACL,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC9D,OAAO,aAAa,CAAC,MAAM,EAAE;oBAC3B,UAAU,EAAE,UAAU,CAAC,CAAC,EAAE,WAAW,EAAE,SAAS,CAAU;oBAC1D,MAAM;oBACN,IAAI;iBACL,CAAC,CAAC;YACL,CAAC;KACJ,EACD,cAAc,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAChD,CAAC;AACb,CAAC,CAAC"}
1
+ {"version":3,"file":"useSuspenseInfiniteQuery.js","sourceRoot":"","sources":["../../src/callbacks/useSuspenseInfiniteQuery.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAGnC,OAAO,EACL,cAAc,EACd,wBAAwB,IAAI,gCAAgC,GAE7D,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOlD,MAAM,CAAC,MAAM,wBAAwB,GAcgB,CACnD,YAAY,EACZ,MAAM,EACN,IAAI,EACJ,EAAE;IACF,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAErD,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,oBAAoB,EAAE,GACxD,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;IAE1D,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAE5E,MAAM,QAAQ,GAGV,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;QAC3B,CAAC,CAAE,UAAoB;QACvB,CAAC,CAAC,uBAAuB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAEhD,OAAO,gCAAgC,CACrC;QACE,GAAG,OAAO;QACV,QAAQ;QACR,OAAO,EACL,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC9D,OAAO,aAAa,CAAC,MAAM,EAAE;oBAC3B,UAAU,EAAE,UAAU,CAAC,CAAC,EAAE,WAAW,EAAE,SAAS,CAAU;oBAC1D,MAAM;oBACN,IAAI;iBACL,CAAC,CAAC;YACL,CAAC;KACJ,EACD,cAAc,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAChD,CAAC;AACb,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"useSuspenseQueries.d.ts","sourceRoot":"","sources":["../../src/callbacks/useSuspenseQueries.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,sBAAsB,EAGvB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EACL,qBAAqB,EAEtB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,kBAAkB,EAAE,CAC/B,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,qBAAqB,CACnB,mBAAmB,EACnB,OAAO,EACP,OAAO,CACR,CAAC,oBAAoB,CAAC,CACxB,KACE,sBAAsB,CAAC,KAAK,CA8BhC,CAAC"}
1
+ {"version":3,"file":"useSuspenseQueries.d.ts","sourceRoot":"","sources":["../../src/callbacks/useSuspenseQueries.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,sBAAsB,EAGvB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,eAAO,MAAM,kBAAkB,EAAE,CAC/B,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,qBAAqB,CACnB,mBAAmB,EACnB,OAAO,EACP,OAAO,CACR,CAAC,oBAAoB,CAAC,CACxB,KACE,sBAAsB,CAAC,KAAK,CA0ChC,CAAC"}
@@ -1,6 +1,7 @@
1
1
  'use client';
2
2
  import { useContext } from 'react';
3
3
  import { useQueryClient, useSuspenseQueries as useSuspenseQueriesTanstack, } from '@tanstack/react-query';
4
+ import { composeQueryKey } from '../lib/composeQueryKey.js';
4
5
  import { QraftContext } from '../QraftContext.js';
5
6
  export const useSuspenseQueries = (qraftOptions, schema, args) => {
6
7
  const [options, queryClientByArg] = args;
@@ -9,21 +10,28 @@ export const useSuspenseQueries = (qraftOptions, schema, args) => {
9
10
  throw new Error(`QraftContext.requestClient not found`);
10
11
  return useSuspenseQueriesTanstack({
11
12
  ...options,
12
- queries: options.queries.map(({ parameters, ...queryOptions }) => ({
13
- ...queryOptions,
14
- queryKey: [
15
- { url: schema.url, method: schema.method },
16
- parameters,
17
- ],
18
- queryFn: queryOptions.queryFn ??
19
- function ({ queryKey: [, queryParams], signal, meta }) {
20
- return requestClient(schema, {
21
- parameters: queryParams,
22
- signal,
23
- meta,
24
- });
25
- },
26
- })),
13
+ queries: options.queries.map((queryOptions) => {
14
+ const optionsWithQueryKey = 'parameters' in queryOptions
15
+ ? (() => {
16
+ const queryOptionsCopy = Object.assign({
17
+ queryKey: composeQueryKey(schema, queryOptions.parameters),
18
+ }, queryOptions);
19
+ delete queryOptionsCopy.parameters;
20
+ return queryOptionsCopy;
21
+ })()
22
+ : queryOptions;
23
+ return {
24
+ ...optionsWithQueryKey,
25
+ queryFn: optionsWithQueryKey.queryFn ??
26
+ function ({ queryKey: [, queryParams], signal, meta }) {
27
+ return requestClient(schema, {
28
+ parameters: queryParams,
29
+ signal,
30
+ meta,
31
+ });
32
+ },
33
+ };
34
+ }),
27
35
  }, useQueryClient(queryClientByArg ?? queryClientByContext));
28
36
  };
29
37
  //# sourceMappingURL=useSuspenseQueries.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useSuspenseQueries.js","sourceRoot":"","sources":["../../src/callbacks/useSuspenseQueries.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,EAEL,cAAc,EACd,kBAAkB,IAAI,0BAA0B,GACjD,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOlD,MAAM,CAAC,MAAM,kBAAkB,GAUM,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAClE,MAAM,CAAC,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAEzC,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,oBAAoB,EAAE,GACxD,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;IAE1D,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAE5E,OAAO,0BAA0B,CAC/B;QACE,GAAG,OAAO;QACV,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,GAAG,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;YACjE,GAAG,YAAY;YACf,QAAQ,EAAE;gBACR,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;gBAC1C,UAAU;aACsD;YAClE,OAAO,EACL,YAAY,CAAC,OAAO;gBACpB,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;oBACnD,OAAO,aAAa,CAAC,MAAM,EAAE;wBAC3B,UAAU,EAAE,WAAoB;wBAChC,MAAM;wBACN,IAAI;qBACL,CAAC,CAAC;gBACL,CAAC;SACJ,CAAC,CAAC;KACJ,EACD,cAAc,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAChD,CAAC;AACb,CAAC,CAAC"}
1
+ {"version":3,"file":"useSuspenseQueries.js","sourceRoot":"","sources":["../../src/callbacks/useSuspenseQueries.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,EAEL,cAAc,EACd,kBAAkB,IAAI,0BAA0B,GACjD,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIlD,MAAM,CAAC,MAAM,kBAAkB,GAUM,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAClE,MAAM,CAAC,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAEzC,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,oBAAoB,EAAE,GACxD,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;IAE1D,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAE5E,OAAO,0BAA0B,CAC/B;QACE,GAAG,OAAO;QACV,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE;YAC5C,MAAM,mBAAmB,GACvB,YAAY,IAAI,YAAY;gBAC1B,CAAC,CAAC,CAAC,GAAG,EAAE;oBACJ,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CACpC;wBACE,QAAQ,EAAE,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,UAAU,CAAC;qBAC3D,EACD,YAAY,CACb,CAAC;oBACF,OAAO,gBAAgB,CAAC,UAAU,CAAC;oBACnC,OAAO,gBAAgB,CAAC;gBAC1B,CAAC,CAAC,EAAE;gBACN,CAAC,CAAC,YAAY,CAAC;YAEnB,OAAO;gBACL,GAAG,mBAAmB;gBACtB,OAAO,EACL,mBAAmB,CAAC,OAAO;oBAC3B,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;wBACnD,OAAO,aAAa,CAAC,MAAM,EAAE;4BAC3B,UAAU,EAAE,WAAoB;4BAChC,MAAM;4BACN,IAAI;yBACL,CAAC,CAAC;oBACL,CAAC;aACJ,CAAC;QACJ,CAAC,CAAC;KACH,EACD,cAAc,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAChD,CAAC;AACb,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"useSuspenseQuery.d.ts","sourceRoot":"","sources":["../../src/callbacks/useSuspenseQuery.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAEL,cAAc,EAEf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EACL,qBAAqB,EAEtB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,gBAAgB,EAAE,CAC7B,YAAY,GAAG,OAAO,EACtB,MAAM,GAAG,YAAY,EACrB,KAAK,GAAG,YAAY,EAEpB,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,qBAAqB,CACnB,mBAAmB,EACnB,OAAO,EACP,OAAO,CACR,CAAC,kBAAkB,CAAC,CACtB,KACE,cAAc,CAAC,KAAK,EAAE,MAAM,CA6BhC,CAAC"}
1
+ {"version":3,"file":"useSuspenseQuery.d.ts","sourceRoot":"","sources":["../../src/callbacks/useSuspenseQuery.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAEL,cAAc,EAEf,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EACL,qBAAqB,EAEtB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,gBAAgB,EAAE,CAC7B,YAAY,GAAG,OAAO,EACtB,MAAM,GAAG,YAAY,EACrB,KAAK,GAAG,YAAY,EAEpB,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,qBAAqB,CACnB,mBAAmB,EACnB,OAAO,EACP,OAAO,CACR,CAAC,kBAAkB,CAAC,CACtB,KACE,cAAc,CAAC,KAAK,EAAE,MAAM,CA6BhC,CAAC"}
@@ -1,16 +1,16 @@
1
1
  'use client';
2
2
  import { useContext } from 'react';
3
3
  import { useQueryClient, useSuspenseQuery as useSuspenseQueryTanstack, } from '@tanstack/react-query';
4
+ import { composeQueryKey } from '../lib/composeQueryKey.js';
4
5
  import { QraftContext } from '../QraftContext.js';
5
6
  export const useSuspenseQuery = (qraftOptions, schema, args) => {
6
7
  const [parameters, options, queryClientByArg] = args;
7
8
  const { requestClient, queryClient: queryClientByContext } = useContext(qraftOptions?.context ?? QraftContext) ?? {};
8
9
  if (!requestClient)
9
10
  throw new Error(`QraftContext.requestClient not found`);
10
- const queryKey = [
11
- { url: schema.url, method: schema.method },
12
- parameters,
13
- ];
11
+ const queryKey = Array.isArray(parameters)
12
+ ? parameters
13
+ : composeQueryKey(schema, parameters);
14
14
  return useSuspenseQueryTanstack({
15
15
  ...options,
16
16
  queryKey,
@@ -1 +1 @@
1
- {"version":3,"file":"useSuspenseQuery.js","sourceRoot":"","sources":["../../src/callbacks/useSuspenseQuery.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAGnC,OAAO,EACL,cAAc,EAEd,gBAAgB,IAAI,wBAAwB,GAC7C,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOlD,MAAM,CAAC,MAAM,gBAAgB,GAcQ,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAClE,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAErD,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,oBAAoB,EAAE,GACxD,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;IAE1D,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAE5E,MAAM,QAAQ,GAA2D;QACvE,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;QAC1C,UAAU;KACX,CAAC;IAEF,OAAO,wBAAwB,CAC7B;QACE,GAAG,OAAO;QACV,QAAQ;QACR,OAAO,EACL,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;gBACnD,OAAO,aAAa,CAAC,MAAM,EAAE;oBAC3B,UAAU,EAAE,WAAoB;oBAChC,MAAM;oBACN,IAAI;iBACL,CAAC,CAAC;YACL,CAAC;KACJ,EACD,cAAc,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAChD,CAAC;AACb,CAAC,CAAC"}
1
+ {"version":3,"file":"useSuspenseQuery.js","sourceRoot":"","sources":["../../src/callbacks/useSuspenseQuery.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAGnC,OAAO,EACL,cAAc,EAEd,gBAAgB,IAAI,wBAAwB,GAC7C,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOlD,MAAM,CAAC,MAAM,gBAAgB,GAcQ,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAClE,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAErD,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,oBAAoB,EAAE,GACxD,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;IAE1D,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAE5E,MAAM,QAAQ,GACZ,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;QACvB,CAAC,CAAE,UAAoB;QACvB,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE1C,OAAO,wBAAwB,CAC7B;QACE,GAAG,OAAO;QACV,QAAQ;QACR,OAAO,EACL,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;gBACnD,OAAO,aAAa,CAAC,MAAM,EAAE;oBAC3B,UAAU,EAAE,WAAoB;oBAChC,MAAM;oBACN,IAAI;iBACL,CAAC,CAAC;YACL,CAAC;KACJ,EACD,cAAc,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAChD,CAAC;AACb,CAAC,CAAC"}
@@ -0,0 +1,4 @@
1
+ import type { RequestClientSchema } from '../RequestClient.js';
2
+ import { ServiceOperationInfiniteQueryKey } from '../ServiceOperation.js';
3
+ export declare function composeInfiniteQueryKey<TSchema extends RequestClientSchema, TParams>(schema: TSchema, parameters: TParams | undefined): ServiceOperationInfiniteQueryKey<TSchema, TParams>;
4
+ //# sourceMappingURL=composeInfiniteQueryKey.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"composeInfiniteQueryKey.d.ts","sourceRoot":"","sources":["../../src/lib/composeInfiniteQueryKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAE1E,wBAAgB,uBAAuB,CACrC,OAAO,SAAS,mBAAmB,EACnC,OAAO,EAEP,MAAM,EAAE,OAAO,EACf,UAAU,EAAE,OAAO,GAAG,SAAS,GAC9B,gCAAgC,CAAC,OAAO,EAAE,OAAO,CAAC,CAEpD"}
@@ -0,0 +1,4 @@
1
+ export function composeInfiniteQueryKey(schema, parameters) {
2
+ return [{ ...schema, infinite: true }, parameters ?? {}];
3
+ }
4
+ //# sourceMappingURL=composeInfiniteQueryKey.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"composeInfiniteQueryKey.js","sourceRoot":"","sources":["../../src/lib/composeInfiniteQueryKey.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,uBAAuB,CAIrC,MAAe,EACf,UAA+B;IAE/B,OAAO,CAAC,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,UAAU,IAAK,EAAc,CAAC,CAAC;AACxE,CAAC"}
@@ -0,0 +1,4 @@
1
+ import type { RequestClientSchema } from '../RequestClient.js';
2
+ import { ServiceOperationQueryKey } from '../ServiceOperation.js';
3
+ export declare function composeQueryKey<TSchema extends RequestClientSchema, TParams>(schema: TSchema, parameters: TParams | undefined): ServiceOperationQueryKey<TSchema, TParams>;
4
+ //# sourceMappingURL=composeQueryKey.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"composeQueryKey.d.ts","sourceRoot":"","sources":["../../src/lib/composeQueryKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAElE,wBAAgB,eAAe,CAAC,OAAO,SAAS,mBAAmB,EAAE,OAAO,EAC1E,MAAM,EAAE,OAAO,EACf,UAAU,EAAE,OAAO,GAAG,SAAS,GAC9B,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAE5C"}
@@ -0,0 +1,4 @@
1
+ export function composeQueryKey(schema, parameters) {
2
+ return [schema, parameters ?? {}];
3
+ }
4
+ //# sourceMappingURL=composeQueryKey.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"composeQueryKey.js","sourceRoot":"","sources":["../../src/lib/composeQueryKey.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,eAAe,CAC7B,MAAe,EACf,UAA+B;IAE/B,OAAO,CAAC,MAAM,EAAE,UAAU,IAAK,EAAc,CAAC,CAAC;AACjD,CAAC"}
@@ -1,7 +1,9 @@
1
- type ProxyCallback = (opts: {
2
- path: string[];
3
- args: unknown[];
4
- }) => unknown;
5
- export declare function createRecursiveProxy(callback: ProxyCallback, path: string[]): unknown;
1
+ type ProxyApplyCallback = (path: string[], args: unknown[]) => unknown;
2
+ /**
3
+ * @internal
4
+ * If returns `undefined | null`, the proxy will continue to create a new proxy for the next key.
5
+ */
6
+ type ProxyGetCallback = (path: string[], key: string) => unknown | undefined;
7
+ export declare function createRecursiveProxy(getCallback: ProxyGetCallback, applyCallback: ProxyApplyCallback, path: string[]): unknown;
6
8
  export {};
7
9
  //# sourceMappingURL=createRecursiveProxy.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"createRecursiveProxy.d.ts","sourceRoot":"","sources":["../../src/lib/createRecursiveProxy.ts"],"names":[],"mappings":"AAAA,KAAK,aAAa,GAAG,CAAC,IAAI,EAAE;IAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAAC,IAAI,EAAE,OAAO,EAAE,CAAA;CAAE,KAAK,OAAO,CAAC;AAE5E,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,WAoB3E"}
1
+ {"version":3,"file":"createRecursiveProxy.d.ts","sourceRoot":"","sources":["../../src/lib/createRecursiveProxy.ts"],"names":[],"mappings":"AAAA,KAAK,kBAAkB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC;AACvE;;;GAGG;AACH,KAAK,gBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,GAAG,SAAS,CAAC;AAE7E,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,gBAAgB,EAC7B,aAAa,EAAE,kBAAkB,EACjC,IAAI,EAAE,MAAM,EAAE,GACb,OAAO,CAgCT"}
@@ -1,22 +1,27 @@
1
- export function createRecursiveProxy(callback, path) {
2
- const proxy = new Proxy(noop, {
1
+ export function createRecursiveProxy(getCallback, applyCallback, path) {
2
+ return new Proxy(noop, {
3
3
  get(_obj, key) {
4
4
  if (typeof key !== 'string' || key === 'then') {
5
5
  // special case for if the proxy is accidentally treated
6
6
  // like a PromiseLike (like in `Promise.resolve(proxy)`)
7
7
  return undefined;
8
8
  }
9
- return createRecursiveProxy(callback, [...path, key]);
9
+ return (getCallback(path, key) ??
10
+ createRecursiveProxy(getCallback, applyCallback, [...path, key]));
10
11
  },
11
12
  apply(_1, _2, args) {
12
- const isApply = path[path.length - 1] === 'apply';
13
- return callback({
14
- args: isApply ? (args.length >= 2 ? args[1] : []) : args,
15
- path: isApply ? path.slice(0, -1) : path,
16
- });
13
+ const functionName = path[path.length - 1];
14
+ const isCall = functionName === 'call';
15
+ const isApply = isCall ? false : functionName === 'apply';
16
+ return applyCallback(isApply || isCall ? path.slice(0, -1) : path, isApply
17
+ ? args.length >= 2
18
+ ? args[1]
19
+ : []
20
+ : isCall
21
+ ? args.slice(1)
22
+ : args);
17
23
  },
18
24
  });
19
- return proxy;
20
25
  }
21
26
  function noop() {
22
27
  // noop
@@ -1 +1 @@
1
- {"version":3,"file":"createRecursiveProxy.js","sourceRoot":"","sources":["../../src/lib/createRecursiveProxy.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,oBAAoB,CAAC,QAAuB,EAAE,IAAc;IAC1E,MAAM,KAAK,GAAY,IAAI,KAAK,CAAC,IAAI,EAAE;QACrC,GAAG,CAAC,IAAI,EAAE,GAAG;YACX,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;gBAC9C,wDAAwD;gBACxD,wDAAwD;gBACxD,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,OAAO,oBAAoB,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;QACxD,CAAC;QACD,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI;YAChB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,OAAO,CAAC;YAClD,OAAO,QAAQ,CAAC;gBACd,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI;gBACxD,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;aACzC,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,IAAI;IACX,OAAO;AACT,CAAC"}
1
+ {"version":3,"file":"createRecursiveProxy.js","sourceRoot":"","sources":["../../src/lib/createRecursiveProxy.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,oBAAoB,CAClC,WAA6B,EAC7B,aAAiC,EACjC,IAAc;IAEd,OAAO,IAAI,KAAK,CAAC,IAAI,EAAE;QACrB,GAAG,CAAC,IAAI,EAAE,GAAG;YACX,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;gBAC9C,wDAAwD;gBACxD,wDAAwD;gBACxD,OAAO,SAAS,CAAC;YACnB,CAAC;YAED,OAAO,CACL,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC;gBACtB,oBAAoB,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC,CACjE,CAAC;QACJ,CAAC;QACD,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI;YAChB,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAE3C,MAAM,MAAM,GAAG,YAAY,KAAK,MAAM,CAAC;YACvC,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,KAAK,OAAO,CAAC;YAE1D,OAAO,aAAa,CAClB,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAC5C,OAAO;gBACL,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC;oBAChB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;oBACT,CAAC,CAAC,EAAE;gBACN,CAAC,CAAC,MAAM;oBACN,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;oBACf,CAAC,CAAC,IAAI,CACX,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,IAAI;IACX,OAAO;AACT,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/lib/request.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,wBAAsB,OAAO,CAAC,CAAC,EAC7B,MAAM,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EAC3B,WAAW,EAAE,cAAc,EAC3B,EACE,aAAa,EAAE,iBAAiB,EAChC,cAAc,EAAE,kBAAkB,GACnC,EAAE;IACD,aAAa,EAAE,OAAO,aAAa,CAAC;IACpC,cAAc,EAAE,OAAO,cAAc,CAAC;CACvC,GACA,OAAO,CAAC,CAAC,CAAC,CA2CZ;AAED,wBAAgB,aAAa,CAC3B,MAAM,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EAC3B,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,IAAI,CAAC,cAAc,EAAE,KAAK,GAAG,YAAY,CAAC,GAC9D,MAAM,CAaR;AA6DD,wBAAgB,cAAc,CAAC,OAAO,EAAE;IACtC,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IACjC,SAAS,EAAE,cAAc,CAAC,WAAW,CAAC,CAAC;IACvC,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;CAC9B,wCAuBA;AAiED,MAAM,MAAM,cAAc,GACtB,WAAW,GACX,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;AAEjE,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,MAAM,EACX,KAAK,GACL,KAAK,GACL,MAAM,GACN,OAAO,GACP,QAAQ,GACR,SAAS,GACT,MAAM,GACN,OAAO,CAAC;IACZ,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,UAAU,CAAC,EAAE;QACpB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACpC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACtC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACtC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACtC,CAAC;IACF,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAC1D,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC;CACnC,GAAG,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,MAAM,CAAC,CAAC"}
1
+ {"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/lib/request.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,wBAAsB,OAAO,CAAC,CAAC,EAC7B,MAAM,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EAC3B,WAAW,EAAE,cAAc,EAC3B,EACE,aAAa,EAAE,iBAAiB,EAChC,cAAc,EAAE,kBAAkB,GACnC,EAAE;IACD,aAAa,EAAE,OAAO,aAAa,CAAC;IACpC,cAAc,EAAE,OAAO,cAAc,CAAC;CACvC,GACA,OAAO,CAAC,CAAC,CAAC,CA2CZ;AAED,wBAAgB,aAAa,CAC3B,MAAM,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EAC3B,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,IAAI,CAAC,cAAc,EAAE,KAAK,GAAG,YAAY,CAAC,GAC9D,MAAM,CAaR;AA6DD,wBAAgB,cAAc,CAAC,OAAO,EAAE;IACtC,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IACjC,SAAS,EAAE,cAAc,CAAC,WAAW,CAAC,CAAC;IACvC,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;CAC9B,wCAuBA;AAmFD,MAAM,MAAM,cAAc,GACtB,WAAW,GACX,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;AAEjE,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,MAAM,EACX,KAAK,GACL,KAAK,GACL,MAAM,GACN,OAAO,GACP,QAAQ,GACR,SAAS,GACT,MAAM,GACN,OAAO,CAAC;IACZ,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,UAAU,CAAC,EAAE;QACpB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACpC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACtC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACtC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACtC,CAAC;IACF,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAC1D,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC;CACnC,GAAG,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,MAAM,CAAC,CAAC"}
@@ -159,9 +159,21 @@ async function getResponseBody(response) {
159
159
  return undefined;
160
160
  const contentType = response.headers.get('Content-Type')?.toLowerCase();
161
161
  const isJSON = contentType?.includes('/json') || contentType?.includes('+json');
162
- // parse response (falling back to .text() when necessary)
163
- if (isJSON)
164
- return response.json();
162
+ if (isJSON) {
163
+ // attempt to parse JSON for successful responses, otherwise fail
164
+ if (response.ok)
165
+ return response.json();
166
+ const errorFallbackResponse = response.clone(); // clone to allow multiple reads
167
+ return response.json().catch(() => {
168
+ if (typeof process !== 'undefined' &&
169
+ typeof process.env !== 'undefined' &&
170
+ process.env.NODE_ENV === 'development') {
171
+ console.warn('Failed to parse response body as JSON. Falling back to .text()');
172
+ }
173
+ // falling back to .text() when necessary for error messages
174
+ return errorFallbackResponse.text();
175
+ });
176
+ }
165
177
  return response.text();
166
178
  }
167
179
  //# sourceMappingURL=request.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/lib/request.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,MAA2B,EAC3B,WAA2B,EAC3B,EACE,aAAa,EAAE,iBAAiB,EAChC,cAAc,EAAE,kBAAkB,GAInC;IAED,MAAM,EACJ,MAAM,EACN,GAAG,EACH,UAAU,EACV,SAAS,EACT,OAAO,EACP,IAAI,EACJ,GAAG,eAAe,EACnB,GAAG,WAAW,CAAC;IAEhB,MAAM,WAAW,GAAG,kBAAkB,CAAC;QACrC,MAAM;QACN,SAAS;QACT,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,EAAE;QAC3E,MAAM,EAAE,MAAM,CAAC,WAAW,EAAE;QAC5B,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,YAAY,CACnB;YACE,MAAM,EAAE,kBAAkB;YAC1B,cAAc,EAAE,SAAS,IAAI,kBAAkB,CAAC,IAAI,CAAC;SACtD,EACD,OAAO,EACP,UAAU,EAAE,MAAM,EAClB,WAAW,YAAY,QAAQ;YAC7B,CAAC,CAAC,sHAAsH;gBACtH,EAAE,cAAc,EAAE,IAAI,EAAE;YAC1B,CAAC,CAAC,SAAS,CACd;QACD,GAAG,eAAe;KACnB,CAAC,CAAC;IAEH,yCAAyC;IACzC,MAAM,cAAc,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC;IAExC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,MAAM,eAAe,CAAC,cAAc,CAAC,CAAC;IAC9C,CAAC;IAED,OAAO,CAAC,MAAM,eAAe,CAAC,cAAc,CAAC,CAAM,CAAC;AACtD,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,MAA2B,EAC3B,EAAE,GAAG,EAAE,UAAU,EAA8C;IAE/D,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,SAAiB,EAAE,KAAa,EAAE,EAAE;QACxE,IAAI,UAAU,EAAE,IAAI,EAAE,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5C,OAAO,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,CAAC;IAEH,IAAI,UAAU,EAAE,KAAK,EAAE,CAAC;QACtB,OAAO,GAAG,MAAM,CAAC,OAAO,GAAG,IAAI,GAAG,cAAc,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;IACvE,CAAC;IAED,OAAO,GAAG,MAAM,CAAC,OAAO,GAAG,IAAI,EAAE,CAAC;AACpC,CAAC;AAED,SAAS,cAAc,CAAC,MAA2B;IACjD,MAAM,EAAE,GAAa,EAAE,CAAC;IAExB,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,KAAU,EAAE,EAAE;QACzC,EAAE,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;IAC7E,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,CAAC,GAAW,EAAE,KAAU,EAAE,EAAE;QAC1C,IAAI,OAAO,KAAK,KAAK,WAAW,IAAI,KAAK,KAAK,IAAI;YAAE,OAAO;QAE3D,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBAClB,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACrC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;gBACvC,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YAC7B,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACrB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC9C,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClB,OAAO,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IAC5B,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,YAAY,CAAC,GAAG,UAA0C;IACjE,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAE9B,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;YAChD,SAAS;QACX,CAAC;QAED,MAAM,eAAe,GACnB,SAAS,YAAY,OAAO;YAC1B,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE;YACrB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAEhC,KAAK,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,eAAe,EAAE,CAAC;YACvD,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;gBACzB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC5B,CAAC;iBAAM,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;gBACrC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;YACtC,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAI9B;IACC,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO;IAEvC,IACE,OAAO,CAAC,MAAM,KAAK,KAAK;QACxB,OAAO,CAAC,MAAM,KAAK,MAAM;QACzB,OAAO,CAAC,MAAM,KAAK,SAAS;QAE5B,OAAO;IAET,IAAI,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,YAAY,CAAC;QAC3C,OAAO,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAEzC,IACE,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC;QACrC,CAAC,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ;YAC/B,OAAO,CAAC,IAAI,YAAY,IAAI;YAC5B,OAAO,CAAC,IAAI,YAAY,QAAQ,CAAC,EACnC,CAAC;QACD,OAAO,OAAO,CAAC,IAAI,CAAC;IACtB,CAAC;IAED,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC;AAED,SAAS,sBAAsB,CAAC,EAC9B,IAAI,GACyB;IAC7B,IAAI,IAAI,YAAY,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC1C,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO;IAE1B,IAAI,IAAI,YAAY,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IAC7E,IAAI,IAAI,YAAY,WAAW;QAC7B,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC5D,IAAI,IAAI,YAAY,eAAe;QACjC,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAChE,IAAI,IAAI,YAAY,cAAc;QAChC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,IAAI,OAAO,IAAI,KAAK,QAAQ;QAC1B,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvD,IAAI,OAAO,IAAI,KAAK,QAAQ;QAC1B,MAAM,IAAI,KAAK,CAAC,yBAAyB,OAAO,IAAI,gBAAgB,CAAC,CAAC;IAExE,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;IAEhC,MAAM,OAAO,GAAG,CAAC,GAAW,EAAE,KAAU,EAAE,EAAE;QAC1C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;YACvD,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;SACjB,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,WAAW,IAAI,KAAK,KAAK,IAAI,CAAC;SACtE,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACxB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;QACxC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACtB,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,kBAAkB,CAAC,IAA4B;IACtD,IAAI,CAAC,IAAI;QAAE,OAAO;IAClB,IAAI,IAAI,YAAY,IAAI;QAAE,OAAO,IAAI,CAAC,IAAI,IAAI,0BAA0B,CAAC;IACzE,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,YAAY,CAAC;IAClD,IAAI,CAAC,CAAC,IAAI,YAAY,QAAQ,CAAC;QAAE,OAAO,kBAAkB,CAAC;AAC7D,CAAC;AAED,KAAK,UAAU,eAAe,CAAI,QAAkB;IAClD,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,KAAK,GAAG;QAC3E,OAAO,SAAS,CAAC;IAEnB,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,WAAW,EAAE,CAAC;IACxE,MAAM,MAAM,GACV,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IAEnE,0DAA0D;IAC1D,IAAI,MAAM;QAAE,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;IAEnC,OAAO,QAAQ,CAAC,IAAI,EAAgB,CAAC;AACvC,CAAC"}
1
+ {"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/lib/request.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"qraftAPIClient.d.ts","sourceRoot":"","sources":["../src/qraftAPIClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAGhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,cAAc,4JAMf,kBAAkB,uDAoB7B,CAAC;AAeF,KAAK,cAAc,CAAC,QAAQ,IAAI;KAC7B,OAAO,IAAI,MAAM,QAAQ,GAAG;SAC1B,MAAM,IAAI,MAAM,QAAQ,CAAC,OAAO,CAAC,GAAG;YAAE,MAAM,EAAE,mBAAmB,CAAA;SAAE;KACrE;CACF,CAAC;AAEF,KAAK,mBAAmB,CAAC,QAAQ,SAAS,cAAc,CAAC,QAAQ,CAAC,IAAI;KACnE,OAAO,IAAI,MAAM,QAAQ,GAAG;SAC1B,MAAM,IAAI,MAAM,QAAQ,CAAC,OAAO,CAAC,GAAG;YACnC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC;SAC7C;KACF;CACF,CAAC;AAEF,KAAK,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC;AAEjE,KAAK,uBAAuB,CAC1B,QAAQ,SAAS,cAAc,CAAC,QAAQ,CAAC,EACzC,SAAS,IACP,QAAQ,SAAS;KAClB,WAAW,IAAI,MAAM,QAAQ,GAAG;SAC9B,MAAM,IAAI,MAAM,QAAQ,CAAC,WAAW,CAAC,GAAG;YAAE,MAAM,EAAE,mBAAmB,CAAA;SAAE;KACzE;CACF,GACG;KACG,WAAW,IAAI,MAAM,QAAQ,GAAG;SAC9B,MAAM,IAAI,MAAM,QAAQ,CAAC,WAAW,CAAC,GAAG,IAAI,CAC3C,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,EAC7B,UAAU,CACR,MAAM,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,EACnC,SAAS,GAAG,QAAQ,GAAG,OAAO,CAC/B,CACF;KACF;CACF,GACD,KAAK,CAAC;AAEV,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC"}
1
+ {"version":3,"file":"qraftAPIClient.d.ts","sourceRoot":"","sources":["../src/qraftAPIClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAGhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,cAAc,4JAMf,kBAAkB,uDAgC7B,CAAC;AAeF,KAAK,cAAc,CAAC,QAAQ,IAAI;KAC7B,OAAO,IAAI,MAAM,QAAQ,GAAG;SAC1B,MAAM,IAAI,MAAM,QAAQ,CAAC,OAAO,CAAC,GAAG;YAAE,MAAM,EAAE,mBAAmB,CAAA;SAAE;KACrE;CACF,CAAC;AAEF,KAAK,mBAAmB,CAAC,QAAQ,SAAS,cAAc,CAAC,QAAQ,CAAC,IAAI;KACnE,OAAO,IAAI,MAAM,QAAQ,GAAG;SAC1B,MAAM,IAAI,MAAM,QAAQ,CAAC,OAAO,CAAC,GAAG;YACnC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC;SAC7C;KACF;CACF,CAAC;AAEF,KAAK,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC;AAEjE,KAAK,uBAAuB,CAC1B,QAAQ,SAAS,cAAc,CAAC,QAAQ,CAAC,EACzC,SAAS,IACP,QAAQ,SAAS;KAClB,WAAW,IAAI,MAAM,QAAQ,GAAG;SAC9B,MAAM,IAAI,MAAM,QAAQ,CAAC,WAAW,CAAC,GAAG;YAAE,MAAM,EAAE,mBAAmB,CAAA;SAAE;KACzE;CACF,GACG;KACG,WAAW,IAAI,MAAM,QAAQ,GAAG;SAC9B,MAAM,IAAI,MAAM,QAAQ,CAAC,WAAW,CAAC,GAAG,IAAI,CAC3C,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,EAC7B,UAAU,CACR,MAAM,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,EACnC,SAAS,GAAG,QAAQ,GAAG,OAAO,CAC/B,CACF;KACF;CACF,GACD,KAAK,CAAC;AAEV,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC"}
@@ -1,14 +1,23 @@
1
- import { createCallbackProxyDecoration } from './lib/createCallbackProxyDecoration.js';
1
+ import { createRecursiveProxy } from './lib/createRecursiveProxy.js';
2
2
  export const qraftAPIClient = (services, callbacks, options) => {
3
- return createCallbackProxyDecoration(Object.keys(callbacks), (path, functionName, args) => {
3
+ return createRecursiveProxy((getPath, key) => {
4
+ if (getPath.length !== 2 || key !== 'schema')
5
+ return;
6
+ const serviceOperation = getByPath(services, getPath);
7
+ if (!isServiceOperation(serviceOperation))
8
+ throw new Error(`Service operation not found: ${getPath.join('.')}`);
9
+ return serviceOperation.schema;
10
+ }, (applyPath, args) => {
11
+ const path = applyPath.slice(0, -1);
4
12
  const serviceOperation = getByPath(services, path);
5
13
  if (!isServiceOperation(serviceOperation))
6
14
  throw new Error(`Service operation not found: ${path.join('.')}`);
7
- if (functionName in callbacks) {
8
- return callbacks[functionName](options, serviceOperation.schema, args);
9
- }
10
- throw new Error(`Not supported API method: ${String(functionName)}`);
11
- });
15
+ // The last arg is for instance `.useMutation` or `.useQuery()`
16
+ const functionName = applyPath[applyPath.length - 1];
17
+ if (!(functionName in callbacks))
18
+ throw new Error(`Function ${functionName} is not supported`);
19
+ return callbacks[functionName](options, serviceOperation.schema, args);
20
+ }, []);
12
21
  };
13
22
  function isServiceOperation(input) {
14
23
  return input !== null && typeof input === 'object' && 'schema' in input;
@@ -1 +1 @@
1
- {"version":3,"file":"qraftAPIClient.js","sourceRoot":"","sources":["../src/qraftAPIClient.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AAQvF,MAAM,CAAC,MAAM,cAAc,GAAG,CAI5B,QAAuC,EACvC,SAAoB,EACpB,OAA4B,EACwB,EAAE;IACtD,OAAO,6BAA6B,CAClC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EACtB,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE;QAC3B,MAAM,gBAAgB,GAAG,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEpE,IAAI,YAAY,IAAI,SAAS,EAAE,CAAC;YAC9B,OAAO,SAAS,CAAC,YAA+B,CAAC,CAC/C,OAAO,EACP,gBAAgB,CAAC,MAAM,EACvB,IAAI,CACL,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,6BAA6B,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC,CACO,CAAC;AACb,CAAC,CAAC;AAEF,SAAS,kBAAkB,CACzB,KAAc;IAEd,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,QAAQ,IAAI,KAAK,CAAC;AAC1E,CAAC;AAED,SAAS,SAAS,CAAC,GAA4B,EAAE,IAAc;IAC7D,OAAO,IAAI,CAAC,MAAM,CAAU,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACvC,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,IAAI,GAAG;YAC9C,OAAO,GAAG,CAAC,GAAuB,CAAC,CAAC;IACxC,CAAC,EAAE,GAAG,CAAC,CAAC;AACV,CAAC"}
1
+ {"version":3,"file":"qraftAPIClient.js","sourceRoot":"","sources":["../src/qraftAPIClient.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAQrE,MAAM,CAAC,MAAM,cAAc,GAAG,CAI5B,QAAuC,EACvC,SAAoB,EACpB,OAA4B,EACwB,EAAE;IACtD,OAAO,oBAAoB,CACzB,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE;QACf,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,GAAG,KAAK,QAAQ;YAAE,OAAO;QAErD,MAAM,gBAAgB,GAAG,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,gCAAgC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvE,OAAO,gBAAgB,CAAC,MAAM,CAAC;IACjC,CAAC,EACD,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE;QAClB,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACpC,MAAM,gBAAgB,GAAG,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAEnD,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEpE,+DAA+D;QAC/D,MAAM,YAAY,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAErD,IAAI,CAAC,CAAC,YAAY,IAAI,SAAS,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,YAAY,YAAY,mBAAmB,CAAC,CAAC;QAE/D,OAAO,SAAS,CAAC,YAA+B,CAAC,CAC/C,OAAO,EACP,gBAAgB,CAAC,MAAM,EACvB,IAAI,CACL,CAAC;IACJ,CAAC,EACD,EAAE,CACM,CAAC;AACb,CAAC,CAAC;AAEF,SAAS,kBAAkB,CACzB,KAAc;IAEd,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,QAAQ,IAAI,KAAK,CAAC;AAC1E,CAAC;AAED,SAAS,SAAS,CAAC,GAA4B,EAAE,IAAc;IAC7D,OAAO,IAAI,CAAC,MAAM,CAAU,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACvC,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,IAAI,GAAG;YAC9C,OAAO,GAAG,CAAC,GAAuB,CAAC,CAAC;IACxC,CAAC,EAAE,GAAG,CAAC,CAAC;AACV,CAAC"}
package/package.json CHANGED
@@ -1,11 +1,12 @@
1
1
  {
2
2
  "name": "@openapi-qraft/react",
3
- "version": "1.0.10",
3
+ "version": "1.1.0",
4
4
  "description": "API client for React, providing type-safe requests and dynamic Tanstack Query React Hooks via a modular, Proxy-based architecture.",
5
5
  "scripts": {
6
6
  "build": "rimraf dist/ && tsc --project tsconfig.build.json",
7
7
  "dev": "rimraf dist/ && tsc --project tsconfig.build.json --watch",
8
8
  "test": "vitest run",
9
+ "test:coverage": "vitest run --coverage",
9
10
  "typecheck": "tsc --noEmit",
10
11
  "generate-qraft": "openapi-qraft src/tests/fixtures/openapi.json --clean -o src/tests/fixtures/api --openapi-types-import-path '../../openapi.js' --explicit-import-extensions && prettier --write src/tests/fixtures/api/**/*.ts",
11
12
  "generate-types": "openapi-qraft-typescript src/tests/fixtures/openapi.json -o src/tests/fixtures/openapi.ts"
@@ -13,7 +14,7 @@
13
14
  "type": "module",
14
15
  "sideEffects": false,
15
16
  "devDependencies": {
16
- "@openapi-qraft/cli": "~1.0.4",
17
+ "@openapi-qraft/cli": "~1.1.0",
17
18
  "@openapi-qraft/openapi-typescript": "^1.0.0",
18
19
  "@tanstack/react-query": "^5.17.3",
19
20
  "@testing-library/jest-dom": "^5.17.0",