From 2bdd7131207c1fc9de14f18d8eecb46ceb115b2f Mon Sep 17 00:00:00 2001
From: Laure Retru-Chavastel <laure.retruchavastel@gmail.com>
Date: Wed, 12 Jun 2024 03:10:29 +0200
Subject: [PATCH] Make `Option.liftPredicate` dual (#2957)

---
 .changeset/fair-turkeys-float.md    |  5 +++++
 packages/effect/dtslint/Option.ts   | 26 ++++++++++++++++++++++++++
 packages/effect/src/Option.ts       | 13 ++++++++++++-
 packages/effect/test/Option.test.ts | 15 +++++++++------
 4 files changed, 52 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/fair-turkeys-float.md

diff --git a/.changeset/fair-turkeys-float.md b/.changeset/fair-turkeys-float.md
new file mode 100644
index 00000000000..4ae79575d87
--- /dev/null
+++ b/.changeset/fair-turkeys-float.md
@@ -0,0 +1,5 @@
+---
+"effect": minor
+---
+
+Make Option.liftPredicate dual
diff --git a/packages/effect/dtslint/Option.ts b/packages/effect/dtslint/Option.ts
index a0e9863d046..ce2b032704b 100644
--- a/packages/effect/dtslint/Option.ts
+++ b/packages/effect/dtslint/Option.ts
@@ -16,6 +16,7 @@ declare const predicateNumbersOrStrings: Predicate.Predicate<number | string>
 // $ExpectType Option<string>
 pipe(pimitiveNumerOrString, Option.liftPredicate(Predicate.isString))
 
+// $ExpectType Option<number>
 pipe(
   pimitiveNumerOrString,
   Option.liftPredicate(
@@ -41,6 +42,31 @@ pipe(
   )
 )
 
+// $ExpectType Option<string>
+Option.liftPredicate(pimitiveNumerOrString, Predicate.isString)
+
+// $ExpectType Option<number>
+Option.liftPredicate(
+  pimitiveNumerOrString,
+  (
+    n // $ExpectType string | number
+  ): n is number => typeof n === "number"
+)
+
+// $ExpectType Option<string | number>
+Option.liftPredicate(pimitiveNumerOrString, predicateNumbersOrStrings)
+
+// $ExpectType Option<number>
+Option.liftPredicate(pimitiveNumber, predicateNumbersOrStrings)
+
+// $ExpectType Option<number>
+Option.liftPredicate(
+  pimitiveNumber,
+  (
+    _n // $ExpectType number
+  ) => true
+)
+
 // -------------------------------------------------------------------------------------
 // getOrElse
 // -------------------------------------------------------------------------------------
diff --git a/packages/effect/src/Option.ts b/packages/effect/src/Option.ts
index 3d77e447310..01de0073f0a 100644
--- a/packages/effect/src/Option.ts
+++ b/packages/effect/src/Option.ts
@@ -1115,7 +1115,18 @@ export const lift2 = <A, B, C>(f: (a: A, b: B) => C): {
 export const liftPredicate: { // Note: I intentionally avoid using the NoInfer pattern here.
   <A, B extends A>(refinement: Refinement<A, B>): (a: A) => Option<B>
   <B extends A, A = B>(predicate: Predicate<A>): (b: B) => Option<B>
-} = <B extends A, A = B>(predicate: Predicate<A>) => (b: B): Option<B> => predicate(b) ? some(b) : none()
+  <A, B extends A>(
+    self: A,
+    refinement: Refinement<A, B>
+  ): Option<B>
+  <B extends A, A = B>(
+    self: B,
+    predicate: Predicate<A>
+  ): Option<B>
+} = dual(
+  2,
+  <B extends A, A = B>(b: B, predicate: Predicate<A>): Option<B> => predicate(b) ? some(b) : none()
+)
 
 /**
  * Returns a function that checks if a `Option` contains a given value using a provided `isEquivalent` function.
diff --git a/packages/effect/test/Option.test.ts b/packages/effect/test/Option.test.ts
index 4ecb0088af0..23f1f6acd7a 100644
--- a/packages/effect/test/Option.test.ts
+++ b/packages/effect/test/Option.test.ts
@@ -350,14 +350,17 @@ describe("Option", () => {
   })
 
   it("liftPredicate", () => {
-    const f = Option.liftPredicate(p)
-    Util.deepStrictEqual(f(1), Option.none())
-    Util.deepStrictEqual(f(3), Option.some(3))
+    Util.deepStrictEqual(pipe(1, Option.liftPredicate(p)), Option.none())
+    Util.deepStrictEqual(pipe(3, Option.liftPredicate(p)), Option.some(3))
+    Util.deepStrictEqual(Option.liftPredicate(1, p), Option.none())
+    Util.deepStrictEqual(Option.liftPredicate(3, p), Option.some(3))
 
     type Direction = "asc" | "desc"
-    const parseDirection = Option.liftPredicate((s: string): s is Direction => s === "asc" || s === "desc")
-    Util.deepStrictEqual(parseDirection("asc"), Option.some("asc"))
-    Util.deepStrictEqual(parseDirection("foo"), Option.none())
+    const isDirection = (s: string): s is Direction => s === "asc" || s === "desc"
+    Util.deepStrictEqual(pipe("asc", Option.liftPredicate(isDirection)), Option.some("asc"))
+    Util.deepStrictEqual(pipe("foo", Option.liftPredicate(isDirection)), Option.none())
+    Util.deepStrictEqual(Option.liftPredicate("asc", isDirection), Option.some("asc"))
+    Util.deepStrictEqual(Option.liftPredicate("foo", isDirection), Option.none())
   })
 
   it("containsWith", () => {