@tellahq/rescript 10.1.0-alpha.1 → 10.1.4-republish-1

package/lib/ocaml/js.ml

@@ -249,6 +249,9 @@ module Re = Js_re
 module Promise = Js_promise
 (** Provide bindings to JS Promise *)
 
+module Promise2 = Js_promise2
+(** Provide bindings to JS Promise *)
+
 module Date = Js_date
 (** Provide bindings for JS Date *)
 

package/lib/ocaml/js_math.ml

@@ -496,7 +496,7 @@ external minMany_float : float array -> float = "min" [@@bs.val] [@@bs.splice] [
   ```
 *)
 external pow_int : base:int -> exp:int -> int = "pow" [@@bs.val] [@@bs.scope "Math"]
-[@@deprecated "use `power_float` instead, the return type may be not int"]
+[@@deprecated "use `pow_float` instead, the return type may be not int"]
 
 (**
   Raises the given base to the given exponent. (Arguments and result are

package/lib/ocaml/js_promise.ml

@@ -31,8 +31,8 @@
 
 [@@@warning "-103"]
 
-type +'a t
-type error
+type +'a t = 'a promise
+type error = Js_promise2.error
 
 (*
 ```res prelude
@@ -43,43 +43,43 @@ type error
 external make :
   ((resolve:(('a -> unit)[@bs]) -> reject:((exn -> unit)[@bs]) -> unit)
   [@bs.uncurry]) ->
-  'a t = "Promise"
+  'a promise = "Promise"
   [@@bs.new]
 
 (* `make (fun resolve reject -> .. )` *)
-external resolve : 'a -> 'a t = "resolve" [@@bs.val] [@@bs.scope "Promise"]
-external reject : exn -> 'a t = "reject" [@@bs.val] [@@bs.scope "Promise"]
+external resolve : 'a -> 'a promise = "resolve" [@@bs.val] [@@bs.scope "Promise"]
+external reject : exn -> 'a promise = "reject" [@@bs.val] [@@bs.scope "Promise"]
 
-external all : 'a t array -> 'a array t = "all"
+external all : 'a promise array -> 'a array promise = "all"
   [@@bs.val] [@@bs.scope "Promise"]
 
-external all2 : 'a0 t * 'a1 t -> ('a0 * 'a1) t = "all"
+external all2 : 'a0 promise * 'a1 promise -> ('a0 * 'a1) promise = "all"
   [@@bs.val] [@@bs.scope "Promise"]
 
-external all3 : 'a0 t * 'a1 t * 'a2 t -> ('a0 * 'a1 * 'a2) t = "all"
+external all3 : 'a0 promise * 'a1 promise * 'a2 promise -> ('a0 * 'a1 * 'a2) promise = "all"
   [@@bs.val] [@@bs.scope "Promise"]
 
-external all4 : 'a0 t * 'a1 t * 'a2 t * 'a3 t -> ('a0 * 'a1 * 'a2 * 'a3) t
+external all4 : 'a0 promise * 'a1 promise * 'a2 promise * 'a3 promise -> ('a0 * 'a1 * 'a2 * 'a3) promise
   = "all"
   [@@bs.val] [@@bs.scope "Promise"]
 
 external all5 :
-  'a0 t * 'a1 t * 'a2 t * 'a3 t * 'a4 t -> ('a0 * 'a1 * 'a2 * 'a3 * 'a4) t
+  'a0 promise * 'a1 promise * 'a2 promise * 'a3 promise * 'a4 promise -> ('a0 * 'a1 * 'a2 * 'a3 * 'a4) promise
   = "all"
   [@@bs.val] [@@bs.scope "Promise"]
 
 external all6 :
-  'a0 t * 'a1 t * 'a2 t * 'a3 t * 'a4 t * 'a5 t ->
-  ('a0 * 'a1 * 'a2 * 'a3 * 'a4 * 'a5) t = "all"
+  'a0 promise * 'a1 promise * 'a2 promise * 'a3 promise * 'a4 promise * 'a5 promise ->
+  ('a0 * 'a1 * 'a2 * 'a3 * 'a4 * 'a5) promise = "all"
   [@@bs.val] [@@bs.scope "Promise"]
 
-external race : 'a t array -> 'a t = "race" [@@bs.val] [@@bs.scope "Promise"]
+external race : 'a promise array -> 'a promise = "race" [@@bs.val] [@@bs.scope "Promise"]
 
-external then_ : (('a -> 'b t)[@bs.uncurry]) -> 'b t = "then"
-  [@@bs.send.pipe: 'a t]
+external then_ : (('a -> 'b promise)[@bs.uncurry]) -> 'b promise = "then"
+  [@@bs.send.pipe: 'a promise]
 
-external catch : ((error -> 'a t)[@bs.uncurry]) -> 'a t = "catch"
-  [@@bs.send.pipe: 'a t]
+external catch : ((error -> 'a promise)[@bs.uncurry]) -> 'a promise = "catch"
+  [@@bs.send.pipe: 'a promise]
 (* ` p|> catch handler`
     Note in JS the returned promise type is actually runtime dependent,
     if promise is rejected, it will pick the `handler` otherwise the original promise,
@@ -87,8 +87,8 @@ external catch : ((error -> 'a t)[@bs.uncurry]) -> 'a t = "catch"
     https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/catch
 *)
 
-external unsafe_async : 'a -> 'a t = "%identity"
-external unsafe_await : 'a t -> 'a = "?await"
+external unsafe_async : 'a -> 'a promise = "%identity"
+external unsafe_await : 'a promise -> 'a = "?await"
 
 
 (*

package/lib/ocaml/js_promise2.res

@@ -0,0 +1,58 @@
+type t<+'a> = promise<'a>
+type error
+
+/** Type-safe t-first then */
+let then: (promise<'a>, 'a => promise<'b>) => promise<'b> = %raw(`
+  function(p, cont) {
+    return Promise.resolve(p).then(cont)
+  }
+  `)
+
+/** Type-safe t-first catch */
+let catch: (promise<'a>, error => promise<'a>) => promise<'a> = %raw(`
+    function(p, cont) {
+      return Promise.resolve(p).catch(cont)
+    }
+    `)
+
+@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"