Merge pull request #6 from scality/fix-mutationsWithRetry

hervedombya · web-flow · commit 09ae5fd97116 · 2024-07-17T17:44:19.000+02:00
chore: Update package.json version to 1.0.4
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scality/react-chained-query",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "A wrapper of react-query useQuery hook allowing chained queries.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/src/useChainedMutations.ts b/src/useChainedMutations.ts
@@ -51,6 +51,27 @@ type ChainedMutationsResults<T extends unknown[]> = T extends []
   ? T
   : never;
 
+type ChainedMutationsWithRetryResults<T extends unknown[]> = T extends []
+  ? []
+  : T extends [infer Head, ...infer Tail]
+  ? [
+      InferChainedMutation<Head> & {
+        status: 'loading' | 'success' | 'error';
+        retry: () => void;
+      },
+      ...ChainedMutationsWithRetryResults<Tail>,
+    ]
+  : T extends [infer Head]
+  ? [
+      InferChainedMutation<Head> & {
+        status: 'loading' | 'success' | 'error';
+        retry: () => void;
+      },
+    ]
+  : T extends unknown[]
+  ? T
+  : never;
+
 /**
  * Extracts the variable type from a ChainedMutation type.
  * @template T - The ChainedMutation type.
@@ -149,16 +170,10 @@ export const useChainedMutations = <T extends any[]>({
 }): {
   mutate: () => void;
   computeVariablesForNext: ComputeVariablesForNext<T>;
-  mutationsWithRetry: (ChainedMutation & {
-    status: 'loading' | 'success' | 'error';
-    retry: () => void;
-  })[];
+  mutationsWithRetry: [...ChainedMutationsWithRetryResults<T>];
 } => {
   const mutationsWithRetry = useRef<
-    (ChainedMutation & {
-      status: 'loading' | 'success' | 'error';
-      retry: () => void;
-    })[]
+    [...ChainedMutationsWithRetryResults<T>]
     //@ts-expect-error initial value
   >(mutations);
   const go = (results: unknown[] = []) => {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@scality/react-chained-query",`
`3`		`- "version": "1.0.3",`
	`3`	`+ "version": "1.0.4",`
`4`	`4`	`"description": "A wrapper of react-query useQuery hook allowing chained queries.",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"types": "dist/index.d.ts",`