mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.promise: all()/all_settled() pass through non-promise values

Browse source
This commit is contained in:
Matthew Wild 2021-03-25 14:32:32 +00:00
parent 2141d9d94a
commit fec0d44e89
2 changed files with 63 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

33
spec/util_promise_spec.lua
View file

@ -369,6 +369,21 @@ describe("util.promise", function ()
assert.spy(cb).was_called(1);
assert.same({ [true] = "nope", [false] = "yep" }, result);
end);
it("passes through non-promise values", function ()
local r1;
local p1 = promise.new(function (resolve) r1 = resolve end);
local p = promise.all({ [true] = p1, [false] = "yep" });
local result;
local cb = spy.new(function (v)
result = v;
end);
p:next(cb);
assert.spy(cb).was_called(0);
r1("nope");
assert.spy(cb).was_called(1);
assert.same({ [true] = "nope", [false] = "yep" }, result);
end);
end);
describe("all_settled()", function ()
it("works with fulfilled promises", function ()
@ -443,6 +458,24 @@ describe("util.promise", function ()
bar = { status = "fulfilled", value = "yep" };
}, result);
end);
it("passes through non-promise values", function ()
local r1;
local p1 = promise.new(function (resolve) r1 = resolve end);
local p = promise.all_settled({ foo = p1, bar = "yep" });
local result;
local cb = spy.new(function (v)
result = v;
end);
p:next(cb);
assert.spy(cb).was_called(0);
r1("nope");
assert.spy(cb).was_called(1);
assert.same({
foo = { status = "fulfilled", value = "nope" };
bar = "yep";
}, result);
end);
end);
describe("catch()", function ()
it("works", function ()

52
util/promise.lua
View file

@ -95,14 +95,18 @@ local function all(promises)
local settled, results, loop_finished = 0, {}, false;
local total = 0;
for k, v in pairs(promises) do
total = total + 1;
v:next(function (value)
results[k] = value;
settled = settled + 1;
if settled == total and loop_finished then
resolve(results);
end
end, reject);
if is_promise(v) then
total = total + 1;
v:next(function (value)
results[k] = value;
settled = settled + 1;
if settled == total and loop_finished then
resolve(results);
end
end, reject);
else
results[k] = v;
end
end
loop_finished = true;
if settled == total then
@ -116,20 +120,24 @@ local function all_settled(promises)
local settled, results, loop_finished = 0, {}, false;
local total = 0;
for k, v in pairs(promises) do
total = total + 1;
v:next(function (value)
results[k] = { status = "fulfilled", value = value };
settled = settled + 1;
if settled == total and loop_finished then
resolve(results);
end
end, function (e)
results[k] = { status = "rejected", reason = e };
settled = settled + 1;
if settled == total and loop_finished then
resolve(results);
end
end);
if is_promise(v) then
total = total + 1;
v:next(function (value)
results[k] = { status = "fulfilled", value = value };
settled = settled + 1;
if settled == total and loop_finished then
resolve(results);
end
end, function (e)
results[k] = { status = "rejected", reason = e };
settled = settled + 1;
if settled == total and loop_finished then
resolve(results);
end
end);
else
results[k] = v;
end
end
loop_finished = true;
if settled == total then