@openapi-qraft/react 1.0.9 → 1.1.0

package/dist/callbacks/useMutation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMutation.d.ts","sourceRoot":"","sources":["../../src/callbacks/useMutation.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAI/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EACL,wBAAwB,EAEzB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,WAAW,EAAE,CACxB,KAAK,GAAG,OAAO,EACf,MAAM,GAAG,YAAY,EACrB,UAAU,GAAG,IAAI,EACjB,QAAQ,GAAG,OAAO,EAElB,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,wBAAwB,CACtB,mBAAmB,EACnB,MAAM,GAAG,SAAS,EAClB,UAAU,EACV,KAAK,CACN,CAAC,aAAa,CAAC,CACjB,KACE,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CAwDzD,CAAC"}
+{"version":3,"file":"useMutation.d.ts","sourceRoot":"","sources":["../../src/callbacks/useMutation.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAEL,iBAAiB,EAElB,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,wBAAwB,EAEzB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,WAAW,EAAE,CACxB,KAAK,GAAG,OAAO,EACf,MAAM,GAAG,YAAY,EACrB,UAAU,GAAG,IAAI,EACjB,QAAQ,GAAG,OAAO,EAElB,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,wBAAwB,CACtB,mBAAmB,EACnB,MAAM,GAAG,SAAS,EAClB,UAAU,EACV,KAAK,CACN,CAAC,aAAa,CAAC,CACjB,KACE,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CAwDzD,CAAC"}

package/dist/callbacks/useMutation.js

@@ -1,17 +1,16 @@
 'use client';
 import { useContext } from 'react';
-import { useMutation as useMutationBase } from '@tanstack/react-query';
+import { useMutation as useMutationBase, useQueryClient, } from '@tanstack/react-query';
 import { composeMutationKey } from '../lib/composeMutationKey.js';
 import { QraftContext } from '../QraftContext.js';
 export const useMutation = (qraftOptions, schema, args) => {
-    const [parameters, options, ...restArgs] = args;
+    const [parameters, options, queryClientByArg] = args;
     if (parameters &&
         typeof parameters === 'object' &&
         options &&
         'mutationKey' in options)
         throw new Error(`'useMutation': parameters and 'options.mutationKey' cannot be used together`);
-    const requestClient = useContext(qraftOptions?.context ?? QraftContext)
-        ?.requestClient;
+    const { requestClient, queryClient: queryClientByContext } = useContext(qraftOptions?.context ?? QraftContext) ?? {};
     if (!requestClient)
         throw new Error(`QraftContext.requestClient not found`);
     const mutationKey = options && 'mutationKey' in options
@@ -35,6 +34,6 @@ export const useMutation = (qraftOptions, schema, args) => {
                         parameters,
                     });
                 }),
-    }, ...restArgs);
+    }, useQueryClient(queryClientByArg ?? queryClientByContext));
 };
 //# sourceMappingURL=useMutation.js.map

package/dist/callbacks/useMutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"useMutation.js","sourceRoot":"","sources":["../../src/callbacks/useMutation.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAInC,OAAO,EAAE,WAAW,IAAI,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAEvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOlD,MAAM,CAAC,MAAM,WAAW,GAgBsC,CAC5D,YAAY,EACZ,MAAM,EACN,IAAI,EACJ,EAAE;IACF,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC;IAEhD,IACE,UAAU;QACV,OAAO,UAAU,KAAK,QAAQ;QAC9B,OAAO;QACP,aAAa,IAAI,OAAO;QAExB,MAAM,IAAI,KAAK,CACb,6EAA6E,CAC9E,CAAC;IAEJ,MAAM,aAAa,GAAG,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC;QACrE,EAAE,aAAa,CAAC;IAElB,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAE5E,MAAM,WAAW,GACf,OAAO,IAAI,aAAa,IAAI,OAAO;QACjC,CAAC,CAAE,OAAO,CAAC,WAGP;QACJ,CAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE7C,OAAO,eAAe,CACpB;QACE,GAAG,OAAO;QACV,WAAW;QACX,UAAU,EACR,OAAO,EAAE,UAAU;YACnB,CAAC,UAAU;gBACT,CAAC,CAAC,UAAU,WAAW;oBACnB,OAAO,aAAa,CAAC,MAAM,EAAE;wBAC3B,UAAU;wBACV,IAAI,EAAE,WAAoB;qBAC3B,CAAC,CAAC;gBACL,CAAC;gBACH,CAAC,CAAC,UAAU,wBAAwB;oBAChC,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,EAAE,GAAG,wBAE/B,CAAC;oBAEF,OAAO,aAAa,CAAC,MAAM,EAAE;wBAC3B,IAAI;wBACJ,UAAU;qBACF,CAAC,CAAC;gBACd,CAAC,CAAC;KACT,EACD,GAAG,QAAQ,CACH,CAAC;AACb,CAAC,CAAC"}
+{"version":3,"file":"useMutation.js","sourceRoot":"","sources":["../../src/callbacks/useMutation.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAGnC,OAAO,EACL,WAAW,IAAI,eAAe,EAE9B,cAAc,GACf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOlD,MAAM,CAAC,MAAM,WAAW,GAgBsC,CAC5D,YAAY,EACZ,MAAM,EACN,IAAI,EACJ,EAAE;IACF,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAErD,IACE,UAAU;QACV,OAAO,UAAU,KAAK,QAAQ;QAC9B,OAAO;QACP,aAAa,IAAI,OAAO;QAExB,MAAM,IAAI,KAAK,CACb,6EAA6E,CAC9E,CAAC;IAEJ,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,WAAW,GACf,OAAO,IAAI,aAAa,IAAI,OAAO;QACjC,CAAC,CAAE,OAAO,CAAC,WAGP;QACJ,CAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE7C,OAAO,eAAe,CACpB;QACE,GAAG,OAAO;QACV,WAAW;QACX,UAAU,EACR,OAAO,EAAE,UAAU;YACnB,CAAC,UAAU;gBACT,CAAC,CAAC,UAAU,WAAW;oBACnB,OAAO,aAAa,CAAC,MAAM,EAAE;wBAC3B,UAAU;wBACV,IAAI,EAAE,WAAoB;qBAC3B,CAAC,CAAC;gBACL,CAAC;gBACH,CAAC,CAAC,UAAU,wBAAwB;oBAChC,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,EAAE,GAAG,wBAE/B,CAAC;oBAEF,OAAO,aAAa,CAAC,MAAM,EAAE;wBAC3B,IAAI;wBACJ,UAAU;qBACF,CAAC,CAAC;gBACd,CAAC,CAAC;KACT,EACD,cAAc,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAChD,CAAC;AACb,CAAC,CAAC"}

package/dist/callbacks/useMutationState.d.ts

@@ -1,5 +1,5 @@
 import type { DefaultError } from '@tanstack/query-core';
-import type { UseMutationResult } from '@tanstack/react-query';
+import { UseMutationResult } from '@tanstack/react-query';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import type { RequestClientSchema } from '../RequestClient.js';
 import { ServiceOperationMutation } from '../ServiceOperation.js';

package/dist/callbacks/useMutationState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMutationState.d.ts","sourceRoot":"","sources":["../../src/callbacks/useMutationState.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAI/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAElE,eAAO,MAAM,gBAAgB,EAAE,CAC7B,KAAK,GAAG,OAAO,EACf,MAAM,GAAG,YAAY,EACrB,UAAU,GAAG,OAAO,EACpB,QAAQ,GAAG,OAAO,EAElB,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,wBAAwB,CACtB,mBAAmB,EACnB,MAAM,GAAG,SAAS,EAClB,UAAU,EACV,KAAK,CACN,CAAC,kBAAkB,CAAC,CACtB,KACE,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CA0CzD,CAAC"}
+{"version":3,"file":"useMutationState.d.ts","sourceRoot":"","sources":["../../src/callbacks/useMutationState.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EACL,iBAAiB,EAGlB,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,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAElE,eAAO,MAAM,gBAAgB,EAAE,CAC7B,KAAK,GAAG,OAAO,EACf,MAAM,GAAG,YAAY,EACrB,UAAU,GAAG,OAAO,EACpB,QAAQ,GAAG,OAAO,EAElB,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,wBAAwB,CACtB,mBAAmB,EACnB,MAAM,GAAG,SAAS,EAClB,UAAU,EACV,KAAK,CACN,CAAC,kBAAkB,CAAC,CACtB,KACE,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CA0CzD,CAAC"}

package/dist/callbacks/useMutationState.js

@@ -1,17 +1,16 @@
 'use client';
 import { useContext } from 'react';
-import { useMutationState as useMutationStateTanstack } from '@tanstack/react-query';
+import { useMutationState as useMutationStateTanstack, useQueryClient, } from '@tanstack/react-query';
 import { composeMutationKey } from '../lib/composeMutationKey.js';
 import { QraftContext } from '../QraftContext.js';
 export const useMutationState = (qraftOptions, schema, args) => {
-    const [options, ...restArgs] = args;
+    const [options, queryClientByArg] = args;
     if (options?.filters &&
         'parameters' in options.filters &&
         'mutationKey' in options.filters) {
         throw new Error(`'useMutationState': 'parameters' and 'mutationKey' cannot be used together`);
     }
-    const requestClient = useContext(qraftOptions?.context ?? QraftContext)
-        ?.requestClient;
+    const { requestClient, queryClient: queryClientByContext } = useContext(qraftOptions?.context ?? QraftContext) ?? {};
     if (!requestClient)
         throw new Error(`QraftContext.requestClient not found`);
     const filters = options?.filters;
@@ -25,6 +24,6 @@ export const useMutationState = (qraftOptions, schema, args) => {
                     ? filters.parameters
                     : undefined),
             },
-    }, ...restArgs);
+    }, useQueryClient(queryClientByArg ?? queryClientByContext));
 };
 //# sourceMappingURL=useMutationState.js.map

package/dist/callbacks/useMutationState.js.map

@@ -1 +1 @@
-{"version":3,"file":"useMutationState.js","sourceRoot":"","sources":["../../src/callbacks/useMutationState.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAInC,OAAO,EAAE,gBAAgB,IAAI,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAErF,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIlD,MAAM,CAAC,MAAM,gBAAgB,GAgBiC,CAC5D,YAAY,EACZ,MAAM,EACN,IAAI,EACJ,EAAE;IACF,MAAM,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC;IAEpC,IACE,OAAO,EAAE,OAAO;QAChB,YAAY,IAAI,OAAO,CAAC,OAAO;QAC/B,aAAa,IAAI,OAAO,CAAC,OAAO,EAChC,CAAC;QACD,MAAM,IAAI,KAAK,CACb,4EAA4E,CAC7E,CAAC;IACJ,CAAC;IAED,MAAM,aAAa,GAAG,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC;QACrE,EAAE,aAAa,CAAC;IAElB,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAE5E,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,CAAC;IAEjC,OAAO,wBAAwB,CAC7B;QACE,GAAG,OAAO;QACV,OAAO,EACL,OAAO,IAAI,aAAa,IAAI,OAAO;YACjC,CAAC,CAAC,OAAO;YACT,CAAC,CAAC;gBACE,GAAG,OAAO;gBACV,WAAW,EAAE,kBAAkB,CAC7B,MAAM,EACN,OAAO,IAAI,YAAY,IAAI,OAAO;oBAChC,CAAC,CAAC,OAAO,CAAC,UAAU;oBACpB,CAAC,CAAC,SAAS,CACd;aACF;KACC,EACV,GAAG,QAAQ,CACH,CAAC;AACb,CAAC,CAAC"}
+{"version":3,"file":"useMutationState.js","sourceRoot":"","sources":["../../src/callbacks/useMutationState.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAGnC,OAAO,EAEL,gBAAgB,IAAI,wBAAwB,EAC5C,cAAc,GACf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIlD,MAAM,CAAC,MAAM,gBAAgB,GAgBiC,CAC5D,YAAY,EACZ,MAAM,EACN,IAAI,EACJ,EAAE;IACF,MAAM,CAAC,OAAO,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAEzC,IACE,OAAO,EAAE,OAAO;QAChB,YAAY,IAAI,OAAO,CAAC,OAAO;QAC/B,aAAa,IAAI,OAAO,CAAC,OAAO,EAChC,CAAC;QACD,MAAM,IAAI,KAAK,CACb,4EAA4E,CAC7E,CAAC;IACJ,CAAC;IAED,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,OAAO,GAAG,OAAO,EAAE,OAAO,CAAC;IAEjC,OAAO,wBAAwB,CAC7B;QACE,GAAG,OAAO;QACV,OAAO,EACL,OAAO,IAAI,aAAa,IAAI,OAAO;YACjC,CAAC,CAAC,OAAO;YACT,CAAC,CAAC;gBACE,GAAG,OAAO;gBACV,WAAW,EAAE,kBAAkB,CAC7B,MAAM,EACN,OAAO,IAAI,YAAY,IAAI,OAAO;oBAChC,CAAC,CAAC,OAAO,CAAC,UAAU;oBACpB,CAAC,CAAC,SAAS,CACd;aACF;KACC,EACV,cAAc,CAAC,gBAAgB,IAAI,oBAAoB,CAAC,CAChD,CAAC;AACb,CAAC,CAAC"}

package/dist/callbacks/useQueries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useQueries.d.ts","sourceRoot":"","sources":["../../src/callbacks/useQueries.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,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,UAAU,EAAE,CACvB,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,qBAAqB,CAAC,mBAAmB,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,YAAY,CAAC,CAC3E,KACE,cAAc,CAAC,KAAK,CA8BxB,CAAC"}
+{"version":3,"file":"useQueries.d.ts","sourceRoot":"","sources":["../../src/callbacks/useQueries.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,cAAc,EAGf,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,UAAU,EAAE,CACvB,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,UAAU,CACd,qBAAqB,CAAC,mBAAmB,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,YAAY,CAAC,CAC3E,KACE,cAAc,CAAC,KAAK,CA0CxB,CAAC"}

package/dist/callbacks/useQueries.js

@@ -1,30 +1,37 @@
 'use client';
 import { useContext } from 'react';
-import { useQueries as useQueriesTanstack, } from '@tanstack/react-query';
+import { useQueries as useQueriesTanstack, useQueryClient, } from '@tanstack/react-query';
+import { composeQueryKey } from '../lib/composeQueryKey.js';
 import { QraftContext } from '../QraftContext.js';
 export const useQueries = (qraftOptions, schema, args) => {
-    const [options, ...restArgs] = args;
-    const requestClient = useContext(qraftOptions?.context ?? QraftContext)
-        ?.requestClient;
+    const [options, queryClientByArg] = args;
+    const { requestClient, queryClient: queryClientByContext } = useContext(qraftOptions?.context ?? QraftContext) ?? {};
     if (!requestClient)
         throw new Error(`QraftContext.requestClient not found`);
     return useQueriesTanstack({
         ...options,
-        queries: options.queries.map(({ parameters, ...queryOptions }) => ({
-            ...queryOptions,
-            queryKey: [
-                { url: schema.url, method: schema.method },
-                parameters,
-            ],
-            queryFn: queryOptions.queryFn ??
-                function ({ queryKey: [, queryParams], signal, meta }) {
-                    return requestClient(schema, {
-                        parameters: queryParams,
-                        signal,
-                        meta,
-                    });
-                },
-        })),
-    }, ...restArgs);
+        queries: options.queries.map((queryOptions) => {
+            const optionsWithQueryKey = 'parameters' in queryOptions
+                ? (() => {
+                    const queryOptionsCopy = Object.assign({
+                        queryKey: composeQueryKey(schema, queryOptions.parameters),
+                    }, queryOptions);
+                    delete queryOptionsCopy.parameters;
+                    return queryOptionsCopy;
+                })()
+                : queryOptions;
+            return {
+                ...optionsWithQueryKey,
+                queryFn: optionsWithQueryKey.queryFn ??
+                    function ({ queryKey: [, queryParams], signal, meta }) {
+                        return requestClient(schema, {
+                            parameters: queryParams,
+                            signal,
+                            meta,
+                        });
+                    },
+            };
+        }),
+    }, useQueryClient(queryClientByArg ?? queryClientByContext));
 };
 //# sourceMappingURL=useQueries.js.map

package/dist/callbacks/useQueries.js.map

@@ -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,GACjC,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,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC;IAEpC,MAAM,aAAa,GAAG,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC;QACrE,EAAE,aAAa,CAAC;IAElB,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,GAAG,QAAQ,CACH,CAAC;AACb,CAAC,CAAC"}
+{"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"}

package/dist/callbacks/useQuery.d.ts

@@ -1,7 +1,7 @@
 import type { DefaultError } from '@tanstack/query-core';
-import type { UseQueryResult } from '@tanstack/react-query';
+import { UseQueryResult } from '@tanstack/react-query';
 import type { QraftClientOptions } from '../qraftAPIClient.js';
 import type { RequestClientSchema } from '../RequestClient.js';
 import { ServiceOperationQuery } from '../ServiceOperation.js';
-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>;
+export declare const useQuery: <TData = unknown, TError = DefaultError>(qraftOptions: QraftClientOptions | undefined, schema: RequestClientSchema, args: Parameters<ServiceOperationQuery<RequestClientSchema, unknown, unknown>['useQuery']>) => UseQueryResult<TData, TError>;
 //# sourceMappingURL=useQuery.d.ts.map

package/dist/callbacks/useQuery.d.ts.map

@@ -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,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG5D,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"}
+{"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"}

package/dist/callbacks/useQuery.js

@@ -1,18 +1,17 @@
 'use client';
 import { useContext } from 'react';
-import { useQuery as useQueryBase } from '@tanstack/react-query';
+import { useQuery as useQueryTanstack, useQueryClient, } from '@tanstack/react-query';
+import { composeQueryKey } from '../lib/composeQueryKey.js';
 import { QraftContext } from '../QraftContext.js';
 export const useQuery = (qraftOptions, schema, args) => {
-    const [parameters, options, ...restArgs] = args;
-    const requestClient = useContext(qraftOptions?.context ?? QraftContext)
-        ?.requestClient;
+    const [parameters, options, queryClientByArg] = args;
+    const { requestClient, queryClient: queryClientByContext } = useContext(qraftOptions?.context ?? QraftContext) ?? {};
     if (!requestClient)
         throw new Error(`QraftContext.requestClient not found`);
-    const queryKey = [
-        { url: schema.url, method: schema.method },
-        parameters,
-    ];
-    return useQueryBase({
+    const queryKey = Array.isArray(parameters)
+        ? parameters
+        : composeQueryKey(schema, parameters);
+    return useQueryTanstack({
         ...options,
         queryKey,
         queryFn: options?.queryFn ??
@@ -23,6 +22,6 @@ export const useQuery = (qraftOptions, schema, args) => {
                     meta,
                 });
             },
-    }, ...restArgs);
+    }, useQueryClient(queryClientByArg ?? queryClientByContext));
 };
 //# sourceMappingURL=useQuery.js.map

package/dist/callbacks/useQuery.js.map

@@ -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;AAInC,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAGjE,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,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC;IAEhD,MAAM,aAAa,GAAG,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC;QACrE,EAAE,aAAa,CAAC;IAElB,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,YAAY,CACjB;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,GAAG,QAAQ,CACH,CAAC;AACb,CAAC,CAAC"}
+{"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"}

package/dist/callbacks/useSuspenseInfiniteQuery.d.ts.map

@@ -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,EAEL,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,EACL,qBAAqB,EAEtB,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,CA+BhD,CAAC"}
+{"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"}

package/dist/callbacks/useSuspenseInfiniteQuery.js

@@ -1,20 +1,20 @@
 'use client';
 import { useContext } from 'react';
-import { useSuspenseInfiniteQuery as useSuspenseInfiniteQueryTanstack, } from '@tanstack/react-query';
+import { useQueryClient, useSuspenseInfiniteQuery as useSuspenseInfiniteQueryTanstack, } from '@tanstack/react-query';
+import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
 import { shelfMerge } from '../lib/shelfMerge.js';
 import { QraftContext } from '../QraftContext.js';
 export const useSuspenseInfiniteQuery = (qraftOptions, schema, args) => {
-    const [parameters, options, ...restArgs] = args;
-    const requestClient = useContext(qraftOptions?.context ?? QraftContext)
-        ?.requestClient;
+    const [parameters, options, queryClientByArg] = args;
+    const { requestClient, queryClient: queryClientByContext } = useContext(qraftOptions?.context ?? QraftContext) ?? {};
     if (!requestClient)
         throw new Error(`QraftContext.requestClient not found`);
+    const queryKey = Array.isArray(parameters)
+        ? parameters
+        : composeInfiniteQueryKey(schema, parameters);
     return useSuspenseInfiniteQueryTanstack({
         ...options,
-        queryKey: [
-            { url: schema.url, method: schema.method, infinite: true },
-            parameters,
-        ],
+        queryKey,
         queryFn: options?.queryFn ??
             function ({ queryKey: [, queryParams], signal, meta, pageParam }) {
                 return requestClient(schema, {
@@ -23,6 +23,6 @@ export const useSuspenseInfiniteQuery = (qraftOptions, schema, args) => {
                     meta,
                 });
             },
-    }, ...restArgs);
+    }, useQueryClient(queryClientByArg ?? queryClientByContext));
 };
 //# sourceMappingURL=useSuspenseInfiniteQuery.js.map

package/dist/callbacks/useSuspenseInfiniteQuery.js.map

@@ -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,wBAAwB,IAAI,gCAAgC,GAE7D,MAAM,uBAAuB,CAAC;AAE/B,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,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC;IAEhD,MAAM,aAAa,GAAG,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC;QACrE,EAAE,aAAa,CAAC;IAElB,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,GAAG,QAAQ,CACH,CAAC;AACb,CAAC,CAAC"}
+{"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"}

package/dist/callbacks/useSuspenseQueries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSuspenseQueries.d.ts","sourceRoot":"","sources":["../../src/callbacks/useSuspenseQueries.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,sBAAsB,EAEvB,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"}
+{"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"}

package/dist/callbacks/useSuspenseQueries.js

@@ -1,30 +1,37 @@
 'use client';
 import { useContext } from 'react';
-import { useSuspenseQueries as useSuspenseQueriesTanstack, } from '@tanstack/react-query';
+import { useQueryClient, useSuspenseQueries as useSuspenseQueriesTanstack, } from '@tanstack/react-query';
+import { composeQueryKey } from '../lib/composeQueryKey.js';
 import { QraftContext } from '../QraftContext.js';
 export const useSuspenseQueries = (qraftOptions, schema, args) => {
-    const [options, ...restArgs] = args;
-    const requestClient = useContext(qraftOptions?.context ?? QraftContext)
-        ?.requestClient;
+    const [options, queryClientByArg] = args;
+    const { requestClient, queryClient: queryClientByContext } = useContext(qraftOptions?.context ?? QraftContext) ?? {};
     if (!requestClient)
         throw new Error(`QraftContext.requestClient not found`);
     return useSuspenseQueriesTanstack({
         ...options,
-        queries: options.queries.map(({ parameters, ...queryOptions }) => ({
-            ...queryOptions,
-            queryKey: [
-                { url: schema.url, method: schema.method },
-                parameters,
-            ],
-            queryFn: queryOptions.queryFn ??
-                function ({ queryKey: [, queryParams], signal, meta }) {
-                    return requestClient(schema, {
-                        parameters: queryParams,
-                        signal,
-                        meta,
-                    });
-                },
-        })),
-    }, ...restArgs);
+        queries: options.queries.map((queryOptions) => {
+            const optionsWithQueryKey = 'parameters' in queryOptions
+                ? (() => {
+                    const queryOptionsCopy = Object.assign({
+                        queryKey: composeQueryKey(schema, queryOptions.parameters),
+                    }, queryOptions);
+                    delete queryOptionsCopy.parameters;
+                    return queryOptionsCopy;
+                })()
+                : queryOptions;
+            return {
+                ...optionsWithQueryKey,
+                queryFn: optionsWithQueryKey.queryFn ??
+                    function ({ queryKey: [, queryParams], signal, meta }) {
+                        return requestClient(schema, {
+                            parameters: queryParams,
+                            signal,
+                            meta,
+                        });
+                    },
+            };
+        }),
+    }, useQueryClient(queryClientByArg ?? queryClientByContext));
 };
 //# sourceMappingURL=useSuspenseQueries.js.map

package/dist/callbacks/useSuspenseQueries.js.map

@@ -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,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,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC;IAEpC,MAAM,aAAa,GAAG,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC;QACrE,EAAE,aAAa,CAAC;IAElB,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,GAAG,QAAQ,CACH,CAAC;AACb,CAAC,CAAC"}
+{"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"}

package/dist/callbacks/useSuspenseQuery.d.ts.map

@@ -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,EACL,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"}
+{"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"}

package/dist/callbacks/useSuspenseQuery.js

@@ -1,17 +1,16 @@
 'use client';
 import { useContext } from 'react';
-import { useSuspenseQuery as useSuspenseQueryTanstack, } from '@tanstack/react-query';
+import { useQueryClient, useSuspenseQuery as useSuspenseQueryTanstack, } from '@tanstack/react-query';
+import { composeQueryKey } from '../lib/composeQueryKey.js';
 import { QraftContext } from '../QraftContext.js';
 export const useSuspenseQuery = (qraftOptions, schema, args) => {
-    const [parameters, options, ...restArgs] = args;
-    const requestClient = useContext(qraftOptions?.context ?? QraftContext)
-        ?.requestClient;
+    const [parameters, options, queryClientByArg] = args;
+    const { requestClient, queryClient: queryClientByContext } = useContext(qraftOptions?.context ?? QraftContext) ?? {};
     if (!requestClient)
         throw new Error(`QraftContext.requestClient not found`);
-    const queryKey = [
-        { url: schema.url, method: schema.method },
-        parameters,
-    ];
+    const queryKey = Array.isArray(parameters)
+        ? parameters
+        : composeQueryKey(schema, parameters);
     return useSuspenseQueryTanstack({
         ...options,
         queryKey,
@@ -23,6 +22,6 @@ export const useSuspenseQuery = (qraftOptions, schema, args) => {
                     meta,
                 });
             },
-    }, ...restArgs);
+    }, useQueryClient(queryClientByArg ?? queryClientByContext));
 };
 //# sourceMappingURL=useSuspenseQuery.js.map

package/dist/callbacks/useSuspenseQuery.js.map

@@ -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,EAEL,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,GAAG,QAAQ,CAAC,GAAG,IAAI,CAAC;IAEhD,MAAM,aAAa,GAAG,UAAU,CAAC,YAAY,EAAE,OAAO,IAAI,YAAY,CAAC;QACrE,EAAE,aAAa,CAAC;IAElB,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,GAAG,QAAQ,CACH,CAAC;AACb,CAAC,CAAC"}
+{"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"}

package/dist/lib/composeInfiniteQueryKey.d.ts

@@ -0,0 +1,4 @@
+import type { RequestClientSchema } from '../RequestClient.js';
+import { ServiceOperationInfiniteQueryKey } from '../ServiceOperation.js';
+export declare function composeInfiniteQueryKey<TSchema extends RequestClientSchema, TParams>(schema: TSchema, parameters: TParams | undefined): ServiceOperationInfiniteQueryKey<TSchema, TParams>;
+//# sourceMappingURL=composeInfiniteQueryKey.d.ts.map

package/dist/lib/composeInfiniteQueryKey.d.ts.map

@@ -0,0 +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"}

package/dist/lib/composeInfiniteQueryKey.js

@@ -0,0 +1,4 @@
+export function composeInfiniteQueryKey(schema, parameters) {
+    return [{ ...schema, infinite: true }, parameters ?? {}];
+}
+//# sourceMappingURL=composeInfiniteQueryKey.js.map

package/dist/lib/composeInfiniteQueryKey.js.map

@@ -0,0 +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"}

package/dist/lib/composeQueryKey.d.ts

@@ -0,0 +1,4 @@
+import type { RequestClientSchema } from '../RequestClient.js';
+import { ServiceOperationQueryKey } from '../ServiceOperation.js';
+export declare function composeQueryKey<TSchema extends RequestClientSchema, TParams>(schema: TSchema, parameters: TParams | undefined): ServiceOperationQueryKey<TSchema, TParams>;
+//# sourceMappingURL=composeQueryKey.d.ts.map

package/dist/lib/composeQueryKey.d.ts.map

@@ -0,0 +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"}

package/dist/lib/composeQueryKey.js

@@ -0,0 +1,4 @@
+export function composeQueryKey(schema, parameters) {
+    return [schema, parameters ?? {}];
+}
+//# sourceMappingURL=composeQueryKey.js.map

package/dist/lib/composeQueryKey.js.map

@@ -0,0 +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"}

package/dist/lib/createRecursiveProxy.d.ts

@@ -1,7 +1,9 @@
-type ProxyCallback = (opts: {
-    path: string[];
-    args: unknown[];
-}) => unknown;
-export declare function createRecursiveProxy(callback: ProxyCallback, path: string[]): unknown;
+type ProxyApplyCallback = (path: string[], args: unknown[]) => unknown;
+/**
+ * @internal
+ * If returns `undefined | null`, the proxy will continue to create a new proxy for the next key.
+ */
+type ProxyGetCallback = (path: string[], key: string) => unknown | undefined;
+export declare function createRecursiveProxy(getCallback: ProxyGetCallback, applyCallback: ProxyApplyCallback, path: string[]): unknown;
 export {};
 //# sourceMappingURL=createRecursiveProxy.d.ts.map

package/dist/lib/createRecursiveProxy.d.ts.map

@@ -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"}
+{"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"}

package/dist/lib/createRecursiveProxy.js

@@ -1,22 +1,27 @@
-export function createRecursiveProxy(callback, path) {
-    const proxy = new Proxy(noop, {
+export function createRecursiveProxy(getCallback, applyCallback, path) {
+    return new Proxy(noop, {
         get(_obj, key) {
             if (typeof key !== 'string' || key === 'then') {
                 // special case for if the proxy is accidentally treated
                 // like a PromiseLike (like in `Promise.resolve(proxy)`)
                 return undefined;
             }
-            return createRecursiveProxy(callback, [...path, key]);
+            return (getCallback(path, key) ??
+                createRecursiveProxy(getCallback, applyCallback, [...path, key]));
         },
         apply(_1, _2, args) {
-            const isApply = path[path.length - 1] === 'apply';
-            return callback({
-                args: isApply ? (args.length >= 2 ? args[1] : []) : args,
-                path: isApply ? path.slice(0, -1) : path,
-            });
+            const functionName = path[path.length - 1];
+            const isCall = functionName === 'call';
+            const isApply = isCall ? false : functionName === 'apply';
+            return applyCallback(isApply || isCall ? path.slice(0, -1) : path, isApply
+                ? args.length >= 2
+                    ? args[1]
+                    : []
+                : isCall
+                    ? args.slice(1)
+                    : args);
         },
     });
-    return proxy;
 }
 function noop() {
     // noop

package/dist/lib/createRecursiveProxy.js.map

@@ -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"}
+{"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"}

package/dist/lib/request.d.ts.map

@@ -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"}
+{"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"}

package/dist/lib/request.js

@@ -159,9 +159,21 @@ async function getResponseBody(response) {
         return undefined;
     const contentType = response.headers.get('Content-Type')?.toLowerCase();
     const isJSON = contentType?.includes('/json') || contentType?.includes('+json');
-    // parse response (falling back to .text() when necessary)
-    if (isJSON)
-        return response.json();
+    if (isJSON) {
+        // attempt to parse JSON for successful responses, otherwise fail
+        if (response.ok)
+            return response.json();
+        const errorFallbackResponse = response.clone(); // clone to allow multiple reads
+        return response.json().catch(() => {
+            if (typeof process !== 'undefined' &&
+                typeof process.env !== 'undefined' &&
+                process.env.NODE_ENV === 'development') {
+                console.warn('Failed to parse response body as JSON. Falling back to .text()');
+            }
+            // falling back to .text() when necessary for error messages
+            return errorFallbackResponse.text();
+        });
+    }
     return response.text();
 }
 //# sourceMappingURL=request.js.map