Use then in a .res file.

Author: cristianoc

jscomp/main/builtin_cmj_datasets.ml

@@ -1,4 +1,4 @@
-(* af520558d40cfd07880d752cd665a60b *) 
+(* fe9141272036e1415f92ab1b938172f9 *) 
 let module_names : string array = Obj.magic (
 "Js" (* 23 *),
 "Arg" (* 217 *),
@@ -89,7 +89,7 @@ let module_names : string array = Obj.magic (
 "BytesLabels" (* 878 *),
 "Dom_storage" (* 386 *),
 "Js_mapperRt" (* 87 *),
-"Js_promise2" (* 51 *),
+"Js_promise2" (* 61 *),
 "JsxDOMStyle" (* 23 *),
 "Node_buffer" (* 23 *),
 "Node_module" (* 23 *),
@@ -225,7 +225,7 @@ let module_data : string array = Obj.magic (
 (* BytesLabels *)"\132\149\166\190\000\000\003Z\000\000\000\231\000\000\003\012\000\000\002\216\160\b\000\000\152\000\176#cat\144\160\160B@@@\176#map\144\160\160B@@@\176#sub\144\160\160C@@@\176$blit\144\160\160E@@@\176$copy\144\160\160A@@@\176$fill\144\160\160D@@@\176$init\144\160\160B@@@\176$iter\144\160\160B@@@\176$make\144\160\160B@@@\176$mapi\144\160\160B@@@\176$trim\144\160\160A@@@\176%equal\144\160\160B@@\144\148\192B\160\176\001\005z!x@\160\176\001\005{!y@@\151\176\1470caml_bytes_equal\160\144\004\011\160\144\004\n@\176\1929stdlib-406/bytesLabels.ml\001\001\171\0011\127\0011\155\192\004\002\001\001\171\0011\127\0011\160@\208B@@@@\176%index\144\160\160B@@@\176%iteri\144\160\160B@@@\176&concat\144\160\160B@@@\176&extend\144\160\160C@@@\176&rindex\144\160\160B@@@\176'compare\144\160\160B@@\144\148\192B\160\176\001\005w!x@\160\176\001\005x!y@@\151\176\1472caml_bytes_compare\160\144\004\011\160\144\004\n@\176\192\0044\001\001\170\0011L\0011h\192\0045\001\001\170\0011L\0011~@\208B@@@@\176'escaped\144\160\160A@@@\176(contains\144\160\160B@@@\176)index_opt\144\160\160B@@@\176)of_string\144\160\160A@@@\176)to_string\144\160\160A@@@\176*index_from\144\160\160C@@@\176*rindex_opt\144\160\160B@@@\176*sub_string\144\160\160C@@@\176+blit_string\144\160\160E@@@\176+rindex_from\144\160\160C@@@\176-contains_from\144\160\160C@@@\176.index_from_opt\144\160\160C@@@\176.rcontains_from\144\160\160C@@@\176/lowercase_ascii\144\160\160A@@@\176/rindex_from_opt\144\160\160C@@@\176/uppercase_ascii\144\160\160A@@@\1760capitalize_ascii\144\160\160A@@@\1760unsafe_of_string\144\004F@\1760unsafe_to_string\144\004D@\1762uncapitalize_ascii\144\160\160A@@@A",
 (* Dom_storage *)"\132\149\166\190\000\000\001n\000\000\000k\000\000\001^\000\000\001T\160\192\176#key\144\160\160B@@\144\148\192B\160\176\001\004\004!i@\160\176\001\004\005#obj@@\151\176\000B\160\151\176\180#key\160\160AA\160\004\002@\181#key@@\160\144\004\016\160\144\004\021@\176\1925others/dom_storage.mlR\001\003\022\001\0036\192\004\002R\001\003\022\001\003B@@\004\004\208B@@@@\176'getItem\144\160\160B@@\144\148\192B\160\176\001\003\246!s@\160\176\001\003\247#obj@@\151\176\000B\160\151\176\180'getItem\160\004#\160\004$@\181'getItem@@\160\144\004\015\160\144\004\020@\176\192\004\"D\000x\001\000\140\192\004#D\000x\001\000\156@@\004\003\208B@@@@\176'setItem\144\160\160C@@@\176*removeItem\144\160\160B@@\144\148\192B\160\176\001\003\255!s@\160\176\001\004\000#obj@@\174\151\176\180*removeItem\160\004G\160\004H@\181*removeItem@@\160\144\004\r\160\144\004\018@\176\192\004FL\001\001\208\001\001\238\192\004GL\001\001\208\001\002\001@\146A\208B@@A@A",
 (* Js_mapperRt *)"\132\149\166\190\000\000\000C\000\000\000\017\000\000\0009\000\000\0004\160\176\176'fromInt\144\160\160C@@@\176-fromIntAssert\144\160\160C@@@\1761raiseWhenNotFound\144\160\160A@@@A",
-(* Js_promise2 *)"\132\149\166\190\000\000\000\031\000\000\000\012\000\000\000$\000\000\000\"\160\160\176%catch\144\160\160B@@@\176%then_\144\160\160B@@@A",
+(* Js_promise2 *)"\132\149\166\190\000\000\000)\000\000\000\015\000\000\000.\000\000\000+\160\176\176$then\144\160\160B@@@\176%catch\144\160\160B@@@\176%then_\144\004\n@A",
 (* JsxDOMStyle *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",
 (* Node_buffer *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",
 (* Node_module *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",

jscomp/others/js_promise2.ml

@@ -0,0 +1,18 @@
+include Js_promise
+
+/** Type-safe t-first then */
+let then: (promise<'a>, 'a => promise<'b>) => promise<'b> = %raw(`
+  function(p, cont) {
+    Promise.resolve(p).then(cont)
+  }
+  `)
+
+/** Type-safe t-first catch */
+let catch: (promise<'a>, error => promise<'a>) => promise<'a> = %raw(`
+    function(p, cont) {
+      Promise.resolve(p).catch(cont)
+    }
+    `)
+
+/** Old syntax, can use then instead */
+let then_ = then

jscomp/others/js_promise2.res

@@ -47,7 +47,7 @@ o others/js_obj.cmi others/js_obj.cmj : cc others/js_obj.ml | others/belt_intern
 o others/js_option.cmj : cc_cmi others/js_option.ml | others/belt_internals.cmi others/js.cmi others/js_exn.cmj others/js_option.cmi $bsc
 o others/js_option.cmi : cc others/js_option.mli | others/belt_internals.cmi others/js.cmi $bsc
 o others/js_promise.cmi others/js_promise.cmj : cc others/js_promise.ml | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_promise2.cmi others/js_promise2.cmj : cc others/js_promise2.ml | others/belt_internals.cmi others/js.cmi others/js_promise.cmj $bsc
+o others/js_promise2.cmi others/js_promise2.cmj : cc others/js_promise2.res | others/belt_internals.cmi others/js.cmi $bsc
 o others/js_re.cmi others/js_re.cmj : cc others/js_re.ml | others/belt_internals.cmi others/js.cmi others/js.cmj $bsc
 o others/js_result.cmj : cc_cmi others/js_result.ml | others/belt_internals.cmi others/js.cmi others/js_result.cmi $bsc
 o others/js_result.cmi : cc others/js_result.mli | others/belt_internals.cmi others/js.cmi $bsc

jscomp/others/release.ninja

@@ -1,16 +1,19 @@
 
 
 
-var then_ = (function(p, cont) {
+var then = (function(p, cont) {
     Promise.resolve(p).then(cont)
   });
 
 var $$catch = (function(p, cont) {
       Promise.resolve(p).catch(cont)
     });
 
+var then_ = then;
+
 export {
-  then_ ,
+  then ,
   $$catch ,
+  then_ ,
 }
 /* No side effect */

lib/es6/js_promise2.js

@@ -1,14 +1,17 @@
 'use strict';
 
 
-var then_ = (function(p, cont) {
+var then = (function(p, cont) {
     Promise.resolve(p).then(cont)
   });
 
 var $$catch = (function(p, cont) {
       Promise.resolve(p).catch(cont)
     });
 
-exports.then_ = then_;
+var then_ = then;
+
+exports.then = then;
 exports.$$catch = $$catch;
+exports.then_ = then_;
 /* No side effect */