@emeryld/rrroutes-client 2.1.8 → 2.1.9

package/dist/routesV3.client.types.d.ts

@@ -124,13 +124,21 @@ export type ArgsTuple<L extends AnyLeaf> = keyof ArgsFor<L> extends never ? [] :
 /** Cache data shape for setData(...) */
 export type DataShape<L extends AnyLeaf> = L['method'] extends 'get' ? L['cfg']['feed'] extends true ? InfiniteData<OutputOf<L>> : OutputOf<L> : OutputOf<L>;
 type ArgsFromTuple<L extends AnyLeaf, T extends ArgsTuple<L>> = T extends [infer A] ? A : undefined;
+type ParamsFromArgs<L extends AnyLeaf, T extends ArgsTuple<L>> = ArgsFromTuple<L, T> extends {
+    params: infer P;
+} ? P : undefined;
 type QueryFromArgs<L extends AnyLeaf, T extends ArgsTuple<L>> = ArgsFromTuple<L, T> extends {
     query: infer Q;
 } ? Q : undefined;
 /** Typed query key array derived from the leaf plus the specific args passed in. */
+type SplitUrl<L extends string> = L extends `/${infer A}` ? SplitUrl<A> : L extends `${infer A}/${infer B}` ? [A, ...SplitUrl<B>] : [L];
+type MapParams<P extends any[], Params> = P extends [infer A, ...infer Rest] ? A extends `:${infer Key}` ? [Params extends Record<Key, infer V> ? string extends V ? A : V : A, ...MapParams<Rest, Params>] : [
+    A,
+    ...MapParams<Rest, Params>
+] : [];
 export type QueryKeysFor<L extends AnyLeaf, T extends ArgsTuple<L>> = Prettify<readonly [
     L['method'],
-    ...string[],
+    ...MapParams<SplitUrl<L['path']>, ParamsFromArgs<L, T>>,
     QueryFromArgs<L, T> extends undefined ? {} : QueryFromArgs<L, T>
 ]>;
 /** React Query build options specialized for a plain GET leaf. */
@@ -148,7 +156,7 @@ export type BuiltCommon<L extends AnyLeaf> = {
      * @param args Optional params/query tuple for the leaf.
      * @returns Query key tuple.
      */
-    getQueryKeys: <A extends ArgsTuple<L> = ArgsTuple<L>>(...args: A) => QueryKeysFor<L, A>;
+    getQueryKeys: <const A extends ArgsTuple<L> = ArgsTuple<L>>(...args: A) => QueryKeysFor<L, A>;
     /**
      * Invalidate exactly this endpoint instance.
      * @param args Optional params/query tuple for the leaf.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emeryld/rrroutes-client",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "private": false,
   "type": "module",
   "main": "dist/index.cjs",