awaitvalue -> expect

This commit is contained in:
Eryn Lynn 2019-11-12 23:14:18 -05:00
parent 85240d83b7
commit 4ecdd156a5
2 changed files with 14 additions and 3 deletions

View file

@ -543,6 +543,7 @@ docs:
Promises will only be cancelled if all of their consumers are also cancelled. This is to say that if you call `andThen` twice on the same promise, and you cancel only one of the child promises, it will not cancel the parent promise until the other child promise is also cancelled. Promises will only be cancelled if all of their consumers are also cancelled. This is to say that if you call `andThen` twice on the same promise, and you cancel only one of the child promises, it will not cancel the parent promise until the other child promise is also cancelled.
- name: await - name: await
tags: [ 'yields' ]
desc: | desc: |
Yields the current thread until the given Promise completes. Returns true if the Promise resolved, followed by the values that the promise resolved or rejected with. Yields the current thread until the given Promise completes. Returns true if the Promise resolved, followed by the values that the promise resolved or rejected with.
@ -556,17 +557,25 @@ docs:
type: ...any? type: ...any?
- name: awaitStatus - name: awaitStatus
tags: [ 'yields' ]
desc: Yields the current thread until the given Promise completes. Returns the Promise's status, followed by the values that the promise resolved or rejected with. desc: Yields the current thread until the given Promise completes. Returns the Promise's status, followed by the values that the promise resolved or rejected with.
returns: returns:
- type: PromiseStatus - type: PromiseStatus
desc: The Promise's status. desc: The Promise's status.
- type: ...any? - type: ...any?
desc: The values that the Promise resolved or rejected with. desc: The values that the Promise resolved or rejected with.
- name: awaitValue - name: expect
tags: [ 'yields' ]
desc: | desc: |
Yields the current thread until the given Promise completes. Returns the the values that the promise resolved with. Yields the current thread until the given Promise completes. Returns the the values that the promise resolved with.
Errors if the Promise rejects or gets cancelled. This is essentially sugar for:
```lua
select(2, assert(promise:await()))
```
**Errors** if the Promise rejects or gets cancelled.
returns: returns:
- type: ...any? - type: ...any?
desc: The values that the Promise resolved with. desc: The values that the Promise resolved with.

View file

@ -875,7 +875,7 @@ end
Calls await and only returns if the Promise resolves. Calls await and only returns if the Promise resolves.
Throws if the Promise rejects or gets cancelled. Throws if the Promise rejects or gets cancelled.
]] ]]
function Promise.prototype:awaitValue(...) function Promise.prototype:expect(...)
local length, result = pack(self:awaitStatus(...)) local length, result = pack(self:awaitStatus(...))
local status = table.remove(result, 1) local status = table.remove(result, 1)
@ -887,6 +887,8 @@ function Promise.prototype:awaitValue(...)
return unpack(result, 1, length - 1) return unpack(result, 1, length - 1)
end end
Promise.prototype.awaitValue = Promise.prototype.expect
--[[ --[[
Intended for use in tests. Intended for use in tests.