Merge pull request #63 from janglad/bug/distributive-action-types

make types non distributive
janglad · Sep 26, 2024 · 3db9ef6 · 3db9ef6
2 parents d23051e + 51dd313
commit 3db9ef6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/.changeset/ten-beds-exercise.md b/.changeset/ten-beds-exercise.md
@@ -0,0 +1,6 @@
+---
+"safe-fn": patch
+"safe-fn-react": patch
+---
+
+Fix type issues with the hook (related to distribution)
diff --git a/packages/safe-fn/src/result.ts b/packages/safe-fn/src/result.ts
@@ -60,14 +60,23 @@ export type InferActionErrError<T> =
 /**
  * Converts a `ResultAsync<T,E>` to a `<ActionResult<T,E>`.
  */
-export type ResultAsyncToActionResult<T> =
-  T extends ResultAsync<infer D, infer E> ? ActionResult<D, E> : never;
+export type ResultAsyncToActionResult<T> = [T] extends [
+  ResultAsync<infer D, infer E>,
+]
+  ? ActionResult<D, E>
+  : never;
 
-export type ActionResultToResultAsync<T> =
-  T extends ActionResult<infer D, infer E> ? ResultAsync<D, E> : never;
+export type ActionResultToResultAsync<T> = [T] extends [
+  ActionResult<infer D, infer E>,
+]
+  ? ResultAsync<D, E>
+  : never;
 
-export type ActionResultToResult<T> =
-  T extends ActionResult<infer D, infer E> ? Result<D, E> : never;
+export type ActionResultToResult<T> = [T] extends [
+  ActionResult<infer D, infer E>,
+]
+  ? Result<D, E>
+  : never;
 
 /**
  * Converts an `ActionResult<T,E>` to a `Result<T,E>`.