Add eq and cmp functions

Author: arnarthor

jscomp/others/belt_Option.ml

@@ -56,3 +56,19 @@ let isSome = function
 let isNone = function
   | Some _ -> false
   | None -> true
+
+let eqU a b f = match (a, b) with
+  | (Some a, Some b) -> f a b [@bs]
+  | (None, Some _)
+  | (Some _, None) -> false
+  | (None, None) -> true
+
+let eq a b f = eqU a b (fun[@bs] x y -> f x y)
+
+let cmpU a b f = match (a, b) with
+  | (Some a, Some b) -> f a b [@bs]
+  | (None, Some _) -> -1
+  | (Some _, None) -> 1
+  | (None, None) -> 0
+
+let cmp a b f = cmpU a b (fun[@bs] x y -> f x y)

jscomp/others/belt_Option.mli

@@ -37,3 +37,7 @@ val flatMap : 'a option -> ('a -> 'b option) -> 'b option
 val getWithDefault : 'a option -> 'a -> 'a
 val isSome : 'a option -> bool
 val isNone : 'a option -> bool
+val eqU : 'a option -> 'b option -> ('a -> 'b -> bool [@bs]) -> bool
+val eq : 'a option -> 'b option -> ('a -> 'b -> bool) -> bool
+val cmpU : 'a option -> 'b option -> ('a -> 'b -> int [@bs]) -> int
+val cmp : 'a option -> 'b option -> ('a -> 'b -> int) -> int

lib/js/belt_Option.js

@@ -70,14 +70,54 @@ function isNone(param) {
   }
 }
 
+function eqU(a, b, f) {
+  if (a) {
+    if (b) {
+      return f(a[0], b[0]);
+    } else {
+      return /* false */0;
+    }
+  } else if (b) {
+    return /* false */0;
+  } else {
+    return /* true */1;
+  }
+}
+
+function eq(a, b, f) {
+  return eqU(a, b, Curry.__2(f));
+}
+
+function cmpU(a, b, f) {
+  if (a) {
+    if (b) {
+      return f(a[0], b[0]);
+    } else {
+      return 1;
+    }
+  } else if (b) {
+    return -1;
+  } else {
+    return 0;
+  }
+}
+
+function cmp(a, b, f) {
+  return cmpU(a, b, Curry.__2(f));
+}
+
 exports.getExn = getExn;
 exports.foldU = foldU;
 exports.fold = fold;
 exports.mapU = mapU;
 exports.map = map;
 exports.flatMapU = flatMapU;
 exports.flatMap = flatMap;
-exports.getOrElse = getOrElse;
-exports.has = has;
-exports.isEmpty = isEmpty;
+exports.getWithDefault = getWithDefault;
+exports.isSome = isSome;
+exports.isNone = isNone;
+exports.eqU = eqU;
+exports.eq = eq;
+exports.cmpU = cmpU;
+exports.cmp = cmp;
 /* No side effect */