@quenty/rx 13.14.0 → 13.15.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.
 
+# [13.15.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/rx@13.14.0...@quenty/rx@13.15.0) (2024-12-15)
+
+
+### Features
+
+* Add fail and complete state to Rx ([4bb843b](https://github.com/Quenty/NevermoreEngine/commit/4bb843bfb89c18579a80ba2f11b1d48faa86b48f))
+
+
+
+
+
 # [13.14.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/rx@13.13.0...@quenty/rx@13.14.0) (2024-12-03)
 
 **Note:** Version bump only for package @quenty/rx

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/rx",
-  "version": "13.14.0",
+  "version": "13.15.0",
   "description": "Quenty's reactive library for Roblox",
   "keywords": [
     "Roblox",
@@ -28,11 +28,11 @@
   ],
   "dependencies": {
     "@quenty/cancellabledelay": "^3.5.0",
-    "@quenty/canceltoken": "^11.9.0",
+    "@quenty/canceltoken": "^11.10.0",
     "@quenty/ducktype": "^5.7.1",
     "@quenty/loader": "^10.7.1",
     "@quenty/maid": "^3.4.0",
-    "@quenty/promise": "^10.8.0",
+    "@quenty/promise": "^10.9.0",
     "@quenty/signal": "^7.9.0",
     "@quenty/symbol": "^3.4.0",
     "@quenty/table": "^3.7.0",
@@ -41,5 +41,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "66190e48c1ca93b07040326e9cfcf97e8eb4b0e1"
+  "gitHead": "0a20ace4dc7d38f8c889bf73b716b33e8a767c54"
 }

package/src/Shared/Rx.lua

@@ -242,34 +242,28 @@ function Rx.fromPromise(promise)
 	assert(Promise.isPromise(promise), "Bad promise")
 
 	return Observable.new(function(sub)
-		if promise:IsFulfilled() then
-			sub:Fire(promise:Wait())
-			sub:Complete()
-			return nil
+		-- Save a task.spawn call
+		if not promise:IsPending() then
+			local results = table.pack(promise:GetResults())
+
+			if results[1] then
+				sub:Fire(table.unpack(results, 2, results.n))
+				sub:Complete()
+			else
+				sub:Fail(table.unpack(results, 2, results.n))
+			end
 		end
 
-		local maid = Maid.new()
+		return task.spawn(function()
+			local results = table.pack(promise:Yield())
 
-		local pending = true
-		maid:GiveTask(function()
-			pending = false
+			if results[1] then
+				sub:Fire(table.unpack(results, 2, results.n))
+				sub:Complete()
+			else
+				sub:Fail(table.unpack(results, 2, results.n))
+			end
 		end)
-
-		promise:Then(
-			function(...)
-				if pending then
-					sub:Fire(...)
-					sub:Complete()
-				end
-			end,
-			function(...)
-				if pending then
-					sub:Fail(...)
-					sub:Complete()
-				end
-			end)
-
-		return maid
 	end)
 end
 

package/src/Shared/Subscription.lua

@@ -85,8 +85,9 @@ end
 
 --[=[
 	Fails the subscription, preventing anything else from emitting.
+	@param ... any
 ]=]
-function Subscription:Fail()
+function Subscription:Fail(...)
 	if self._state ~= SubscriptionStateTypes.PENDING then
 		return
 	end
@@ -94,7 +95,7 @@ function Subscription:Fail()
 	self._state = SubscriptionStateTypes.FAILED
 
 	if self._failCallback then
-		self._failCallback()
+		self._failCallback(...)
 	end
 
 	self:_doCleanup()
@@ -157,15 +158,17 @@ end
 --[=[
 	Completes the subscription, preventing anything else from being
 	emitted.
+
+	@param ... any
 ]=]
-function Subscription:Complete()
+function Subscription:Complete(...)
 	if self._state ~= SubscriptionStateTypes.PENDING then
 		return
 	end
 
 	self._state = SubscriptionStateTypes.COMPLETE
 	if self._completeCallback then
-		self._completeCallback()
+		self._completeCallback(...)
 	end
 
 	self:_doCleanup()