From fec0d44e89f58dae50063be87a6d9360e012f205 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 25 Mar 2021 14:32:32 +0000
Subject: util.promise: all()/all_settled() pass through non-promise values

---
 spec/util_promise_spec.lua | 33 +++++++++++++++++++++++++++++
 util/promise.lua           | 52 ++++++++++++++++++++++++++--------------------
 2 files changed, 63 insertions(+), 22 deletions(-)

diff --git a/spec/util_promise_spec.lua b/spec/util_promise_spec.lua
index 79eec5e2..f64702bf 100644
--- a/spec/util_promise_spec.lua
+++ b/spec/util_promise_spec.lua
@@ -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 ()
diff --git a/util/promise.lua b/util/promise.lua
index 5996176f..89bd1f26 100644
--- a/util/promise.lua
+++ b/util/promise.lua
@@ -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
-- 
cgit v1.2.3