@quenty/rx 8.1.1 → 8.2.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [8.2.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/rx@8.1.1...@quenty/rx@8.2.0) (2023-12-14)
+
+
+### Bug Fixes
+
+* Rx.switchAll() and Rx.flatMap() could previously leak subscriptions if subscriptions were swapped during the emission of the signal itself ([a58da12](https://github.com/Quenty/NevermoreEngine/commit/a58da122eb4a710c932d9bd4b44231566e7f0b11))
+
+
+
+
+
 ## [8.1.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/rx@8.1.0...@quenty/rx@8.1.1) (2023-10-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/rx",
-  "version": "8.1.1",
+  "version": "8.2.0",
   "description": "Quenty's reactive library for Roblox",
   "keywords": [
     "Roblox",
@@ -28,17 +28,17 @@
   ],
   "dependencies": {
     "@quenty/cancellabledelay": "^3.4.0",
-    "@quenty/canceltoken": "^7.0.0",
-    "@quenty/loader": "^7.0.0",
+    "@quenty/canceltoken": "^7.1.0",
+    "@quenty/loader": "^7.1.0",
     "@quenty/maid": "^2.6.0",
-    "@quenty/promise": "^7.0.0",
-    "@quenty/signal": "^3.0.0",
+    "@quenty/promise": "^7.1.0",
+    "@quenty/signal": "^3.1.0",
     "@quenty/symbol": "^2.2.0",
-    "@quenty/table": "^3.3.0",
-    "@quenty/throttle": "^7.0.0"
+    "@quenty/table": "^3.4.0",
+    "@quenty/throttle": "^7.1.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "440aca7ce2b50b74317ee05fdc0b8d1e58001af3"
+  "gitHead": "2c2dbbc0cb2fbb46b4f3270c559c63890fe18b26"
 }

package/src/Shared/Rx.lua

@@ -182,15 +182,29 @@ end
 function Rx.merge(observables)
 	assert(type(observables) == "table", "Bad observables")
 
+	local totalCount = 0
 	for _, item in pairs(observables) do
 		assert(Observable.isObservable(item), "Not an observable")
+		totalCount = totalCount + 1
 	end
 
 	return Observable.new(function(sub)
 		local maid = Maid.new()
+		local pendingCount = totalCount
 
 		for _, observable in pairs(observables) do
-			maid:GiveTask(observable:Subscribe(sub:GetFireFailComplete()))
+			maid:GiveTask(observable:Subscribe(function(...)
+				sub:Fire(...)
+			end, function(...)
+				pendingCount = pendingCount - 1
+				sub:Fail(...)
+			end, function()
+				-- Only complete once all are complete
+				pendingCount = pendingCount - 1
+				if pendingCount == 0 then
+					sub:Complete()
+				end
+			end))
 		end
 
 		return maid
@@ -966,9 +980,13 @@ function Rx.switchAll()
 					currentInside = observable
 					outerMaid._innerSub = nil
 
-					outerMaid._innerSub = observable:Subscribe(
+					local subscription = observable:Subscribe(
 						function(...)
-							sub:Fire(...)
+							if currentInside == observable then
+								sub:Fire(...)
+							else
+								warn(string.format("[Rx.switchAll] - Observable is still firing despite disconnect (%q)", observable._source))
+							end
 						end, -- Merge each inner observable
 						function(...)
 							if currentInside == observable then
@@ -984,6 +1002,13 @@ function Rx.switchAll()
 								end
 							end
 						end)
+
+					if currentInside == observable then
+						outerMaid._innerSub = subscription
+					else
+						-- We cleaned up while connecting
+						subscription:Destroy()
+					end
 				end,
 				function(...)
 					sub:Fail(...) -- Also reflect failures up to the top!
@@ -1034,7 +1059,7 @@ function Rx.flatMap(project, resultSelector)
 
 					local innerMaid = Maid.new()
 
-					innerMaid:GiveTask(observable:Subscribe(
+					local subscription = innerMaid:Add(observable:Subscribe(
 						function(...)
 							-- Merge each inner observable
 							if resultSelector then
@@ -1055,12 +1080,16 @@ function Rx.flatMap(project, resultSelector)
 							end
 						end))
 
-					local key = maid:GiveTask(innerMaid)
+					if subscription:IsPending() then
+						local key = maid:GiveTask(innerMaid)
 
-					-- Cleanup
-					innerMaid:GiveTask(function()
-						maid[key] = nil
-					end)
+						-- Cleanup
+						innerMaid:GiveTask(function()
+							maid[key] = nil
+						end)
+					else
+						subscription:Destroy()
+					end
 				end,
 				function(...)
 					sub:Fail(...) -- Also reflect failures up to the top!
@@ -1794,6 +1823,12 @@ end
 
 --[=[
 	Throttles emission of observables on the defer stack to the last emission.
+
+	:::tip
+	There's a limited re-entrance amount for this. However, this can prevent computation being done repeatedly if
+	stuff is being added all at once. Use with care.
+	:::
+
 	@return (source: Observable) -> Observable
 ]=]
 function Rx.throttleDefer()