belt_Option add uncurried versions of map/fold/flatMap

Author: arnarthor

Diff for: jscomp/others/belt_Option.ml

@@ -2,18 +2,24 @@ let getExn = function
   | Some x -> x
   | None -> [%assert "getExn"]
 
-let fold opt default f = match opt with
-  | Some x -> f x
+let foldU opt default f = match opt with
+  | Some x -> (f x [@bs])
   | None -> default
 
-let map opt f = match opt with
-  | Some x -> Some (f x)
+let fold opt default f = foldU opt default (fun[@bs] x -> f x)
+
+let mapU opt f = match opt with
+  | Some x -> Some (f x [@bs])
   | None -> None
 
-let flatMap opt f = match opt with
-  | Some x -> f x
+let map opt f = mapU opt (fun[@bs] x -> f x)
+
+let flatMapU opt f = match opt with
+  | Some x -> (f x [@bs])
   | None -> None
 
+let flatMap opt f = flatMapU opt (fun[@bs] x -> f x)
+
 let getOrElse opt default = match opt with
   | Some x -> x
   | None -> default

Diff for: jscomp/others/belt_Option.mli

@@ -1,6 +1,9 @@
 val getExn : 'a option -> 'a
+val foldU : 'a option -> 'b -> ('a -> 'b [@bs]) -> 'b
 val fold : 'a option -> 'b -> ('a -> 'b) -> 'b
+val mapU : 'a option -> ('a -> 'b [@bs]) -> 'b option
 val map : 'a option -> ('a -> 'b) -> 'b option
+val flatMapU : 'a option -> ('a -> 'b option [@bs]) -> 'b option
 val flatMap : 'a option -> ('a -> 'b option) -> 'b option
 val getOrElse : 'a option -> 'a -> 'a
 val has : 'a option -> bool

Diff for: lib/js/belt_Option.js

@@ -6,34 +6,46 @@ function getExn(param) {
   if (param) {
     return param[0];
   } else {
-    return /* assert false */0;
+    throw new Error("getExn");
   }
 }
 
-function fold(opt, $$default, f) {
+function foldU(opt, $$default, f) {
   if (opt) {
-    return Curry._1(f, opt[0]);
+    return f(opt[0]);
   } else {
     return $$default;
   }
 }
 
-function map(opt, f) {
+function fold(opt, $$default, f) {
+  return foldU(opt, $$default, Curry.__1(f));
+}
+
+function mapU(opt, f) {
   if (opt) {
-    return /* Some */[Curry._1(f, opt[0])];
+    return /* Some */[f(opt[0])];
   } else {
     return /* None */0;
   }
 }
 
-function flatMap(opt, f) {
+function map(opt, f) {
+  return mapU(opt, Curry.__1(f));
+}
+
+function flatMapU(opt, f) {
   if (opt) {
-    return Curry._1(f, opt[0]);
+    return f(opt[0]);
   } else {
     return /* None */0;
   }
 }
 
+function flatMap(opt, f) {
+  return flatMapU(opt, Curry.__1(f));
+}
+
 function getOrElse(opt, $$default) {
   if (opt) {
     return opt[0];
@@ -42,15 +54,15 @@ function getOrElse(opt, $$default) {
   }
 }
 
-function exists(param) {
+function has(param) {
   if (param) {
     return /* true */1;
   } else {
     return /* false */0;
   }
 }
 
-function empty(param) {
+function isEmpty(param) {
   if (param) {
     return /* false */0;
   } else {
@@ -59,10 +71,13 @@ function empty(param) {
 }
 
 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.exists = exists;
-exports.empty = empty;
+exports.has = has;
+exports.isEmpty = isEmpty;
 /* No side effect */