feat(option): add or as replacement for orElse, deprecate orElse

Author: glennsl

src/Core__Option.mjs

@@ -80,7 +80,7 @@ function getWithDefault(opt, $$default) {
   }
 }
 
-function orElse(opt, other) {
+function or(opt, other) {
   if (opt !== undefined) {
     return opt;
   } else {
@@ -124,6 +124,8 @@ function cmp(a, b, f) {
   }
 }
 
+var orElse = or;
+
 export {
   flat ,
   filter ,
@@ -134,6 +136,7 @@ export {
   map ,
   flatMap ,
   getWithDefault ,
+  or ,
   orElse ,
   isSome ,
   isNone ,

src/Core__Option.res

@@ -88,9 +88,9 @@ let getWithDefault = (opt, default) =>
   | None => default
   }
 
-let orElse = (opt, other) =>
+let or = (opt, other) =>
   switch opt {
-  | Some(_) as some => some
+  | Some(_) => opt
   | None => other
   }
 
@@ -99,6 +99,7 @@ let isSome = opt =>
   | Some(_) => true
   | None => false
   }
+let orElse = or
 
 let isNone = value => value == None
 

src/Core__Option.resi

@@ -190,6 +190,19 @@ None->greet // "Greetings Anonymous"
 */
 let getWithDefault: (option<'a>, 'a) => 'a
 
+/**
+`or(opt1, opt2)` returns `opt2` if `opt1` is `None`, otherwise `opt1`.
+
+## Examples
+
+```rescript
+Option.or(Some(1812), Some(1066)) == Some(1812)
+Option.or(None, Some(1066) == Some(1066)
+Option.or(None, None) == None
+```
+*/
+let or: (option<'a>, option<'a>) => option<'a>
+
 /**
 `orElse(opt1, opt2)` returns `opt2` if `opt1` is `None`, otherwise `opt1`.
 
@@ -201,6 +214,7 @@ Option.orElse(None, Some(1066) == Some(1066)
 Option.orElse(None, None) == None
 ```
 */
+@deprecated
 let orElse: (option<'a>, option<'a>) => option<'a>
 
 /**