aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLouis Pilfold <louis@lpil.uk>2022-12-10 12:30:38 +0000
committerLouis Pilfold <louis@lpil.uk>2022-12-10 12:30:38 +0000
commitda935587d1d7279d1487339bd0c740c26094e2a8 (patch)
tree575defa347e0463bc246612c8f05535ddcd7918c
parentc3ec7aea019711145f7954149b34dbbf7abd4c62 (diff)
downloadjavascript-da935587d1d7279d1487339bd0c740c26094e2a8.tar.gz
javascript-da935587d1d7279d1487339bd0c740c26094e2a8.zip
Rename try to await
-rw-r--r--src/gleam/javascript/promise.gleam6
-rw-r--r--test/gleam/javascript/promise_test.gleam20
2 files changed, 13 insertions, 13 deletions
diff --git a/src/gleam/javascript/promise.gleam b/src/gleam/javascript/promise.gleam
index 45f9a0f..94559ac 100644
--- a/src/gleam/javascript/promise.gleam
+++ b/src/gleam/javascript/promise.gleam
@@ -11,7 +11,7 @@ pub external fn resolve(value) -> Promise(value) =
pub external fn rescue(Promise(value), fn(Dynamic) -> value) -> Promise(value) =
"../../ffi.mjs" "rescue"
-pub external fn then(Promise(a), fn(a) -> Promise(b)) -> Promise(b) =
+pub external fn await(Promise(a), fn(a) -> Promise(b)) -> Promise(b) =
"../../ffi.mjs" "then"
pub external fn map(Promise(a), fn(a) -> b) -> Promise(b) =
@@ -38,12 +38,12 @@ pub fn map_try(
})
}
-pub fn then_try(
+pub fn try_await(
promise: Promise(Result(a, e)),
callback: fn(a) -> Promise(Result(b, e)),
) -> Promise(Result(b, e)) {
promise
- |> then(fn(result) {
+ |> await(fn(result) {
case result {
Ok(a) -> callback(a)
Error(e) -> resolve(Error(e))
diff --git a/test/gleam/javascript/promise_test.gleam b/test/gleam/javascript/promise_test.gleam
index dc70977..77c80df 100644
--- a/test/gleam/javascript/promise_test.gleam
+++ b/test/gleam/javascript/promise_test.gleam
@@ -13,15 +13,15 @@ pub fn map_does_not_collapse_nested_promise_test() -> Promise(Promise(Int)) {
})
}
-pub fn then_test() -> Promise(Int) {
+pub fn await_test() -> Promise(Int) {
promise.resolve(1)
- |> promise.then(fn(a) { promise.resolve(a + 1) })
+ |> promise.await(fn(a) { promise.resolve(a + 1) })
|> promise.tap(fn(a) { assert 2 = a })
}
-pub fn then_does_collapse_nested_promise_test() -> Promise(Int) {
+pub fn await_does_not_collapse_nested_promise_test() -> Promise(Int) {
promise.resolve(1)
- |> promise.then(promise.resolve)
+ |> promise.await(promise.resolve)
|> promise.tap(fn(value) { assert 1 = value })
}
@@ -55,21 +55,21 @@ pub fn map_try_error_test() -> Promise(Result(Int, Int)) {
|> promise.tap(fn(a) { assert Error(1) = a })
}
-pub fn then_try_ok_ok_test() -> Promise(Result(Int, Int)) {
+pub fn try_await_ok_ok_test() -> Promise(Result(Int, Int)) {
promise.resolve(Ok(1))
- |> promise.then_try(fn(a) { promise.resolve(Ok(a + 1)) })
+ |> promise.try_await(fn(a) { promise.resolve(Ok(a + 1)) })
|> promise.tap(fn(a) { assert Ok(2) = a })
}
-pub fn then_try_ok_error_test() -> Promise(Result(Int, Int)) {
+pub fn try_await_ok_error_test() -> Promise(Result(Int, Int)) {
promise.resolve(Ok(1))
- |> promise.then_try(fn(a) { promise.resolve(Error(a + 1)) })
+ |> promise.try_await(fn(a) { promise.resolve(Error(a + 1)) })
|> promise.tap(fn(a) { assert Error(2) = a })
}
-pub fn then_try_error_test() -> Promise(Result(Int, Int)) {
+pub fn try_await_error_test() -> Promise(Result(Int, Int)) {
promise.resolve(Error(1))
- |> promise.then_try(fn(a) { promise.resolve(Ok(a + 1)) })
+ |> promise.try_await(fn(a) { promise.resolve(Ok(a + 1)) })
|> promise.tap(fn(a) { assert Error(1) = a })
}