Make Js.Promise2 self contained.

Author: cristianoc

jscomp/main/builtin_cmi_datasets.ml

@@ -1,4 +1,4 @@
-(* fe9141272036e1415f92ab1b938172f9 *) 
+(* c7c15ed508cb10fea44c8bb270dcc9b3 *) 
 let module_names : string array = Obj.magic (
 "Js" (* 23 *),
 "Arg" (* 217 *),
@@ -210,7 +210,7 @@ let module_data : string array = Obj.magic (
 (* Belt_Float *)"\132\149\166\190\000\000\000\022\000\000\000\007\000\000\000\021\000\000\000\020\160\144\176*fromString\144\160\160A@@@A",
 (* Belt_Range *)"\132\149\166\190\000\000\000\160\000\000\0004\000\000\000\166\000\000\000\156\160\b\000\000(\000\176$some\144\160\160C@@@\176%every\144\160\160C@@@\176%someU\144\160\160C@@@\176&everyU\144\160\160C@@@\176&someBy\144\160\160D@@@\176'everyBy\144\160\160D@@@\176'forEach\144\160\160C@@@\176'someByU\144\160\160D@@@\176(everyByU\144\160\160D@@@\176(forEachU\144\160\160C@@@A",
 (* Js_console *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",
-(* Js_promise *)"\132\149\166\190\000\000\000\252\000\000\000J\000\000\000\243\000\000\000\232\160\160\176%catch\144\160\160B@@\144\148\192B\160\176\001\003\253$arg1@\160\176\001\003\254#obj@@\151\176\180%catch\160\160AA\160\160AA@\181%catch@@\160\144\004\014\160\151\176\b\000\000\004\016A\160\144\004\023@\176\1924others/js_promise.ml\000Q\001\011\241\001\011\241\192\004\002\000R\001\012?\001\012]@@\004\004\208B@@@@\176%then_\144\160\160B@@\144\148\192B\160\176\001\003\248$arg1@\160\176\001\003\249\004%@@\151\176\180$then\160\160AA\160\160AA@\181$then@@\160\144\004\r\160\151\176\b\000\000\004\016A\160\144\004\022@\176\192\004$\000N\001\011\135\001\011\135\192\004%\000O\001\011\209\001\011\239@@\004\003\208B@@@@A",
+(* Js_promise *)"\132\149\166\190\000\000\000\252\000\000\000J\000\000\000\243\000\000\000\232\160\160\176%catch\144\160\160B@@\144\148\192B\160\176\001\004\014$arg1@\160\176\001\004\015#obj@@\151\176\180%catch\160\160AA\160\160AA@\181%catch@@\160\144\004\014\160\151\176\b\000\000\004\016A\160\144\004\023@\176\1924others/js_promise.ml\000Q\001\012\005\001\012\005\192\004\002\000R\001\012S\001\012q@@\004\004\208B@@@@\176%then_\144\160\160B@@\144\148\192B\160\176\001\004\t$arg1@\160\176\001\004\n\004%@@\151\176\180$then\160\160AA\160\160AA@\181$then@@\160\144\004\r\160\151\176\b\000\000\004\016A\160\144\004\022@\176\192\004$\000N\001\011\155\001\011\155\192\004%\000O\001\011\229\001\012\003@@\004\003\208B@@@@A",
 (* Js_string2 *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",
 (* Js_weakmap *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",
 (* Js_weakset *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",

jscomp/main/builtin_cmj_datasets.ml

@@ -32,7 +32,7 @@
 [@@@warning "-103"]
 
 type +'a t = 'a promise
-type error
+type error = Js_promise2.error
 
 (*
 ```res prelude

jscomp/others/js_promise.ml

@@ -1,4 +1,5 @@
-include Js_promise
+type t<+'a> = promise<'a>
+type error
 
 /** Type-safe t-first then */
 let then: (promise<'a>, 'a => promise<'b>) => promise<'b> = %raw(`
@@ -16,3 +17,45 @@ let catch: (promise<'a>, error => promise<'a>) => promise<'a> = %raw(`
 
 @deprecated("Use then instead")
 let then_ = then
+
+@new
+external make: ((@uncurry ~resolve: (. 'a) => unit, ~reject: (. exn) => unit) => unit) => promise<
+  'a,
+> = "Promise"
+
+@val @scope("Promise") external resolve: 'a => promise<'a> = "resolve"
+@val @scope("Promise") external reject: exn => promise<'a> = "reject"
+
+@val @scope("Promise") external all: array<promise<'a>> => promise<array<'a>> = "all"
+
+@val @scope("Promise") external all2: ((promise<'a0>, promise<'a1>)) => promise<('a0, 'a1)> = "all"
+
+@val @scope("Promise")
+external all3: ((promise<'a0>, promise<'a1>, promise<'a2>)) => promise<('a0, 'a1, 'a2)> = "all"
+
+@val @scope("Promise")
+external all4: ((promise<'a0>, promise<'a1>, promise<'a2>, promise<'a3>)) => promise<(
+  'a0,
+  'a1,
+  'a2,
+  'a3,
+)> = "all"
+
+@val @scope("Promise")
+external all5: ((promise<'a0>, promise<'a1>, promise<'a2>, promise<'a3>, promise<'a4>)) => promise<(
+  'a0,
+  'a1,
+  'a2,
+  'a3,
+  'a4,
+)> = "all"
+
+@val @scope("Promise")
+external all6: (
+  (promise<'a0>, promise<'a1>, promise<'a2>, promise<'a3>, promise<'a4>, promise<'a5>)
+) => promise<('a0, 'a1, 'a2, 'a3, 'a4, 'a5)> = "all"
+
+@val @scope("Promise") external race: array<promise<'a>> => promise<'a> = "race"
+
+external unsafe_async: 'a => promise<'a> = "%identity"
+external unsafe_await: promise<'a> => 'a = "?await"

jscomp/others/js_promise2.res

@@ -46,8 +46,8 @@ o others/js_null_undefined.cmi : cc others/js_null_undefined.mli | others/belt_i
 o others/js_obj.cmi others/js_obj.cmj : cc others/js_obj.ml | others/belt_internals.cmi others/js.cmi $bsc
 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.res | others/belt_internals.cmi others/js.cmi others/js_promise.cmj $bsc
+o others/js_promise.cmi others/js_promise.cmj : cc others/js_promise.ml | others/belt_internals.cmi others/js.cmi others/js_promise2.cmj $bsc
+o others/js_promise2.cmi others/js_promise2.cmj : cc others/js_promise2.res | others/belt_internals.cmi others/js.cmi others/js.cmj $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