@quenty/observablecollection 5.13.0 → 5.14.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.
 
+# [5.14.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/observablecollection@5.13.0...@quenty/observablecollection@5.14.0) (2023-04-20)
+
+
+### Features
+
+* Ensure removal is a bit more clean ([4b70f6d](https://github.com/Quenty/NevermoreEngine/commit/4b70f6d72cee9393c70b1ce17e78d8e63771ac3c))
+
+
+
+
+
 # [5.13.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/observablecollection@5.12.1...@quenty/observablecollection@5.13.0) (2023-04-10)
 
 **Note:** Version bump only for package @quenty/observablecollection

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/observablecollection",
-  "version": "5.13.0",
+  "version": "5.14.0",
   "description": "A set of observable collections, such as sets, maps, sorted lists, and more.",
   "keywords": [
     "Roblox",
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3306212248c310731931ad45d8b86dc7247f2a5d"
+  "gitHead": "15d1274fffdaef706f849fd5dca2f14364c1264e"
 }

package/src/Shared/ObservableMap.lua

@@ -216,14 +216,17 @@ end
 	Adds the item to the set if it does not exists.
 	@param key TKey
 	@param value TValue?
-	@return callback -- Call to remove the value.
+	@return callback -- Call to remove the value if it was added
 ]=]
 function ObservableMap:Set(key, value)
 	assert(key ~= nil, "Bad key")
 
 	local oldValue = self._map[key]
 	if oldValue == value then
-		return
+		-- no removal since we never added. this is a tad messy.
+		return function()
+
+		end
 	end
 
 	self._map[key] = value
@@ -249,8 +252,16 @@ function ObservableMap:Set(key, value)
 		end
 	end
 
+	return self:_getRemovalCallback(key, value)
+end
+
+function ObservableMap:_getRemovalCallback(key, value)
 	return function()
-		if self.Destroy then
+		if not self.Destroy then
+			return
+		end
+
+		if self._map[key] == value then
 			self:Remove(key)
 		end
 	end