@quenty/rx 3.1.2 → 3.3.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.3.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/rx@3.2.0...@quenty/rx@3.3.0) (2021-11-20)
+
+
+### Bug Fixes
+
+* Support MacOS syncing ([#225](https://github.com/Quenty/NevermoreEngine/issues/225)) ([03f9183](https://github.com/Quenty/NevermoreEngine/commit/03f918392c6a5bdd33f8a17c38de371d1e06c67a))
+
+
+
+
+
+# [3.2.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/rx@3.1.2...@quenty/rx@3.2.0) (2021-10-30)
+
+
+### Features
+
+* combineLatest may also combine none-observables which are treated as raw values (for now). ([9daebde](https://github.com/Quenty/NevermoreEngine/commit/9daebde70584cee5c0e71d1faa92b2d6249cf644))
+
+
+
+
+
 ## [3.1.2](https://github.com/Quenty/NevermoreEngine/compare/@quenty/rx@3.1.1...@quenty/rx@3.1.2) (2021-10-30)
 
 **Note:** Version bump only for package @quenty/rx

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/rx",
-  "version": "3.1.2",
+  "version": "3.3.0",
   "description": "Quenty's reactive library for Roblox",
   "keywords": [
     "Roblox",
@@ -29,14 +29,14 @@
   "dependencies": {
     "@quenty/loader": "^3.1.1",
     "@quenty/maid": "^2.0.1",
-    "@quenty/promise": "^3.1.2",
+    "@quenty/promise": "^3.2.0",
     "@quenty/signal": "^2.0.0",
     "@quenty/symbol": "^2.0.0",
     "@quenty/table": "^2.1.0",
-    "@quenty/throttle": "^3.1.1"
+    "@quenty/throttle": "^3.2.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e9cd4223c7fda7c852db9743ef844baa19cacb13"
+  "gitHead": "87ab1435a59a05e7dd745db1dfcec26116d1d71d"
 }

package/src/Shared/Rx.lua

@@ -96,13 +96,10 @@ end
 -- https://rxjs-dev.firebaseapp.com/api/index/function/fromEvent
 function Rx.fromSignal(event)
 	return Observable.new(function(sub)
-		local maid = Maid.new()
 		-- This stream never completes or fails!
-		maid:GiveTask(event:Connect(function(...)
+		return event:Connect(function(...)
 			sub:Fire(...)
-		end))
-
-		return maid
+		end)
 	end)
 end
 
@@ -593,8 +590,8 @@ function Rx.finalize(finalizerCallback)
 	end
 end
 
--- https://rxjs.dev/api/operators/combineAll
-function Rx.combineAll()
+-- https://rxjs.dev/api/operators/combineLatestAll
+function Rx.combineLatestAll()
 	return function(source)
 		return Observable.new(function(sub)
 			local observables = {}
@@ -628,6 +625,9 @@ function Rx.combineAll()
 	end
 end
 
+-- This is for backwards compatability, and is deprecated
+Rx.combineAll = Rx.combineLatestAll
+
 -- NOTE: Untested
 function Rx.catchError(callback)
 	assert(type(callback) == "function", "Bad callback")
@@ -672,24 +672,26 @@ end
 function Rx.combineLatest(observables)
 	assert(type(observables) == "table", "Bad observables")
 
-	for _, observable in pairs(observables) do
-		assert(Observable.isObservable(observable), "Not an observable")
-	end
-
 	return Observable.new(function(sub)
-		if not next(observables) then
+		local pending = 0
+
+		local latest = {}
+		for key, value in pairs(observables) do
+			if Observable.isObservable(value) then
+				pending = pending + 1
+				latest[key] = UNSET_VALUE
+			else
+				latest[key] = value
+			end
+		end
+
+		if pending == 0 then
+			sub:Fire(latest)
 			sub:Complete()
 			return
 		end
 
 		local maid = Maid.new()
-		local pending = 0
-
-		local latest = {}
-		for key, _ in pairs(observables) do
-			pending = pending + 1
-			latest[key] = UNSET_VALUE
-		end
 
 		local function fireIfAllSet()
 			for _, value in pairs(latest) do
@@ -702,21 +704,23 @@ function Rx.combineLatest(observables)
 		end
 
 		for key, observer in pairs(observables) do
-			maid:GiveTask(observer:Subscribe(
-				function(value)
-					latest[key] = value
-					fireIfAllSet()
-				end,
-				function(...)
-					pending = pending - 1
-					sub:Fail(...)
-				end,
-				function()
-					pending = pending - 1
-					if pending == 0 then
-						sub:Complete()
-					end
-				end))
+			if Observable.isObservable(observer) then
+				maid:GiveTask(observer:Subscribe(
+					function(value)
+						latest[key] = value
+						fireIfAllSet()
+					end,
+					function(...)
+						pending = pending - 1
+						sub:Fail(...)
+					end,
+					function()
+						pending = pending - 1
+						if pending == 0 then
+							sub:Complete()
+						end
+					end))
+			end
 		end
 
 		return maid
@@ -779,8 +783,20 @@ end
 -- https://netbasal.com/getting-to-know-the-defer-observable-in-rxjs-a16f092d8c09
 function Rx.defer(observableFactory)
 	return Observable.new(function(sub)
-		local observable = observableFactory()
-		assert(Observable.isObservable(observable))
+		local observable
+		local ok, err = pcall(function()
+			observable = observableFactory()
+		end)
+
+		if not ok then
+			sub:Fail(err)
+			return
+		end
+
+		if not Observable.isObservable(observable) then
+			sub:Fail("Not an observable")
+			return
+		end
 
 		return observable:Subscribe(sub:GetFireFailComplete())
 	end)

package/src/Shared/Rx.spec.lua

@@ -0,0 +1,49 @@
+---
+-- @module Rx.spec.lua
+
+local require = require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).load(script)
+
+local Rx = require("Rx")
+
+return function()
+	describe("Rx.combineLatest({})", function()
+		local observe = Rx.combineLatest({})
+		local externalResult
+
+		it("should execute immediately", function()
+			observe:Subscribe(function(result)
+				externalResult = result
+			end)
+
+			expect(externalResult).to.be.a("table")
+		end)
+	end)
+
+	describe("Rx.combineLatest({ value = 5 })", function()
+		local observe = Rx.combineLatest({ value = 5 })
+		local externalResult
+
+		it("should execute immediately", function()
+			observe:Subscribe(function(result)
+				externalResult = result
+			end)
+
+			expect(externalResult).to.be.a("table")
+			expect(externalResult.value).to.equal(5)
+		end)
+	end)
+
+	describe("Rx.combineLatest({ value = Rx.of(5) })", function()
+		local observe = Rx.combineLatest({ value = Rx.of(5) })
+		local externalResult
+
+		it("should execute immediately", function()
+			observe:Subscribe(function(result)
+				externalResult = result
+			end)
+
+			expect(externalResult).to.be.a("table")
+			expect(externalResult.value).to.equal(5)
+		end)
+	end)
+end

package/src/node_modules.project.json

@@ -2,6 +2,6 @@
   "name": "node_modules",
   "globIgnorePaths": [ "**/.package-lock.json" ],
   "tree": {
-    "$path": { "optional": "..\\node_modules" }
+    "$path": { "optional": "../node_modules" }
   }
 }