@quenty/datastore 7.23.1-canary.402.5852ffd.0 → 7.23.1-canary.402.a911cda.0

package/CHANGELOG.md

@@ -3,21 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [7.23.1-canary.402.5852ffd.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/datastore@7.23.0...@quenty/datastore@7.23.1-canary.402.5852ffd.0) (2023-08-16)
+## [7.23.1-canary.402.a911cda.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/datastore@7.23.0...@quenty/datastore@7.23.1-canary.402.a911cda.0) (2023-08-23)
 
 
 ### Bug Fixes
 
-* Fix additional components but data store writing ping-pings back and forth ([16d024d](https://github.com/Quenty/NevermoreEngine/commit/16d024d226057f75249e326be6941db2d519dae7))
-* More data store improvements ([42ab23d](https://github.com/Quenty/NevermoreEngine/commit/42ab23d66a40aa81d034974e57234ee5337a208d))
+* Changed events weren't firing for the datastore stage ([04f2cf9](https://github.com/Quenty/NevermoreEngine/commit/04f2cf921fcc5e5c7db8ed16b8c76a0bc06c5688))
+* Fix additional components but data store writing ping-pings back and forth ([667015d](https://github.com/Quenty/NevermoreEngine/commit/667015d65fe44856076346394c4b218bead012b5))
+* More data store improvements ([b4c5918](https://github.com/Quenty/NevermoreEngine/commit/b4c5918055ffde9e3c5041e98432a13f4e8c913a))
 
 
 ### Features
 
-* DataStores appear to be working, but require more testing ([d93a6b9](https://github.com/Quenty/NevermoreEngine/commit/d93a6b96da1c3a1ad411cedfcf6c9df571fd9a1f))
-* More untested datastore syncing code ([8dd4cbe](https://github.com/Quenty/NevermoreEngine/commit/8dd4cbe00500933ef6d9fc98ed34c94a5eb34943))
-* Semi-broken datastore changes ([351c44d](https://github.com/Quenty/NevermoreEngine/commit/351c44d48d1f7d7e26b8fbb30a14c7bb4cbac0f1))
-* Unfinished datastore changes ([0bbd600](https://github.com/Quenty/NevermoreEngine/commit/0bbd6005148787f0d06e22650f67e9886318f2f8))
+* DataStores appear to be working, but require more testing ([ef03495](https://github.com/Quenty/NevermoreEngine/commit/ef0349554ea29f1812e39bb4bc833adc09c92968))
+* More untested datastore syncing code ([276909d](https://github.com/Quenty/NevermoreEngine/commit/276909dadc819e07b78727d56c95b597760fcf6e))
+* Semi-broken datastore changes ([7e9a32b](https://github.com/Quenty/NevermoreEngine/commit/7e9a32bbadebd729305f36bba965d2c47b14d6d9))
+* Unfinished datastore changes ([d627fa0](https://github.com/Quenty/NevermoreEngine/commit/d627fa0a36f2a733deead8b63b1b72be4e1c3a9f))
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/datastore",
-  "version": "7.23.1-canary.402.5852ffd.0",
+  "version": "7.23.1-canary.402.a911cda.0",
   "description": "Quenty's Datastore implementation for Roblox",
   "keywords": [
     "Roblox",
@@ -26,21 +26,21 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/baseobject": "6.2.2-canary.402.5852ffd.0",
-    "@quenty/bindtocloseservice": "2.18.1-canary.402.5852ffd.0",
-    "@quenty/loader": "6.2.2-canary.402.5852ffd.0",
-    "@quenty/maid": "2.5.0",
-    "@quenty/math": "2.4.1-canary.402.5852ffd.0",
-    "@quenty/promise": "6.7.1-canary.402.5852ffd.0",
-    "@quenty/rx": "7.14.1-canary.402.5852ffd.0",
-    "@quenty/servicebag": "6.8.1-canary.402.5852ffd.0",
+    "@quenty/baseobject": "6.2.2-canary.402.a911cda.0",
+    "@quenty/bindtocloseservice": "2.18.1-canary.402.a911cda.0",
+    "@quenty/loader": "6.2.2-canary.402.a911cda.0",
+    "@quenty/maid": "2.5.1-canary.402.a911cda.0",
+    "@quenty/math": "2.4.1-canary.402.a911cda.0",
+    "@quenty/promise": "6.7.1-canary.402.a911cda.0",
+    "@quenty/rx": "7.14.1-canary.402.a911cda.0",
+    "@quenty/servicebag": "6.8.1-canary.402.a911cda.0",
     "@quenty/signal": "2.4.0",
     "@quenty/symbol": "2.2.0",
-    "@quenty/table": "3.2.1-canary.402.5852ffd.0",
-    "@quenty/valueobject": "7.21.1-canary.402.5852ffd.0"
+    "@quenty/table": "3.2.1-canary.402.a911cda.0",
+    "@quenty/valueobject": "7.21.1-canary.402.a911cda.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5852ffdd4ee4f857a5b7086330d59d852de49b86"
+  "gitHead": "a911cdaf4f1039b599528cec17b027f4660e4fd8"
 }

package/src/Server/DataStore.lua

@@ -11,7 +11,7 @@
 	local playerMoneyValue = Instance.new("IntValue")
 	playerMoneyValue.Value = 0
 
-	local dataStore = DataStore.new(DataStoreService:GetDataStore("test"), test-store")
+	local dataStore = DataStore.new(DataStoreService:GetDataStore("test"), "test-store")
 	dataStore:Load("money", 0):Then(function(money)
 		playerMoneyValue.Value = money
 		dataStore:StoreOnValueChange("money", playerMoneyValue)
@@ -363,7 +363,7 @@ function DataStore:_doDataSync(writer, doMergeNewData)
 		end))
 	else
 		if self._debugWriting then
-			print(string.format("[DataStore] - DataStorePromises.updateAsync(%q)", self._key))
+			print(string.format("[DataStore] - DataStorePromises.updateAsync(%q) with doMergeNewData = %s", self._key, tostring(doMergeNewData)))
 		end
 
 		promise:Resolve(maid:GivePromise(DataStorePromises.updateAsync(self._robloxDataStore, self._key, function(original, datastoreKeyInfo)

package/src/Server/Modules/DataStoreStage.lua

@@ -29,6 +29,8 @@ local Set = require("Set")
 local Table = require("Table")
 local DataStoreSnapshotUtils = require("DataStoreSnapshotUtils")
 
+local SLOW_INTEGRITY_CHECK_ENABLED = true
+
 local DataStoreStage = setmetatable({}, BaseObject)
 DataStoreStage.ClassName = "DataStoreStage"
 DataStoreStage.__index = DataStoreStage
@@ -373,7 +375,9 @@ end
 ]=]
 function DataStoreStage:MergeDiffSnapshot(diffSnapshot)
 	self:_checkIntegrity()
+
 	self._baseDataSnapshot = self:_updateStoresAndComputeBaseDataSnapshotFromDiffSnapshot(diffSnapshot)
+
 	self:_updateViewSnapshot()
 	self:_checkIntegrity()
 end
@@ -414,7 +418,8 @@ function DataStoreStage:MarkDataAsSaved(parentWriter)
 			end
 
 			for key, value in pairs(dataToSave) do
-				if self._saveDataSnapshot[key] == value then
+				local ourSnapshotValue = self._saveDataSnapshot[key]
+				if Table.deepEquivalent(ourSnapshotValue, value) or ourSnapshotValue == nil then
 					-- This shouldn't fire any event because our save data is matching
 					newBaseDataSnapshot[key] = self:_updateStoresAndComputeBaseDataSnapshotValueFromDiffSnapshot(key, value)
 					newSaveSnapshot[key] = nil
@@ -704,6 +709,8 @@ function DataStoreStage:_updateStoresAndComputeBaseDataSnapshotFromDiffSnapshot(
 		end
 
 		return table.freeze(newBaseDataSnapshot)
+	elseif diffSnapshot == nil then
+		return self._baseDataSnapshot
 	else
 		return diffSnapshot
 	end
@@ -747,50 +754,52 @@ function DataStoreStage:_updateViewSnapshot()
 
 	local newViewSnapshot = self:_computeNewViewSnapshot()
 
-	-- This will only filter out a few items
-	if self._viewSnapshot == newViewSnapshot then
-		return
+	if not Table.deepEquivalent(self._viewSnapshot, newViewSnapshot) then
+		local previousViewSnapshot = self._viewSnapshot
+		self._viewSnapshot = newViewSnapshot
+
+		-- Fire off changed keys
+		local changedKeys = self:_computeChangedKeys(previousViewSnapshot, newViewSnapshot)
+		if next(changedKeys) ~= nil then
+			if type(newViewSnapshot) == "table" then
+				for key, _ in pairs(changedKeys) do
+					self._keySubscriptions:Fire(key, newViewSnapshot[key])
+				end
+			else
+				for key, _ in pairs(changedKeys) do
+					self._keySubscriptions:Fire(key, nil)
+				end
+			end
+		end
+
+		self.Changed:Fire(self._viewSnapshot)
 	end
 
-	local previousView = self._viewSnapshot
+	self:_checkIntegrity()
+end
 
+function DataStoreStage:_computeChangedKeys(previousViewSnapshot, newViewSnapshot)
 	-- Detect keys that changed
-	local changedKeys
-	if type(previousView) == "table" and type(newViewSnapshot) == "table" then
-		changedKeys = {}
-		local keys = Set.union(Set.fromKeys(previousView), Set.fromKeys(newViewSnapshot))
+	if type(previousViewSnapshot) == "table" and type(newViewSnapshot) == "table" then
+		local changedKeys = {}
+
+		local keys = Set.union(Set.fromKeys(previousViewSnapshot), Set.fromKeys(newViewSnapshot))
 		for key, _ in pairs(keys) do
-			if previousView[key] ~= newViewSnapshot[key] then
+			if not Table.deepEquivalent(previousViewSnapshot[key], newViewSnapshot[key]) then
 				changedKeys[key] = true
 			end
 		end
+
+		return changedKeys
 	elseif type(newViewSnapshot) == "table" then
 		-- Swap to table, all keys change
-		changedKeys = Set.fromKeys(newViewSnapshot)
-	elseif type(previousView) == "table" then
+		return Set.fromKeys(newViewSnapshot)
+	elseif type(previousViewSnapshot) == "table" then
 		-- Swap from table, all keys change
-		changedKeys = Set.fromKeys(previousView)
+		return Set.fromKeys(previousViewSnapshot)
 	else
-		changedKeys = {}
+		return {}
 	end
-
-	if next(changedKeys) ~= nil then
-		self._viewSnapshot = newViewSnapshot
-
-		if type(newViewSnapshot) == "table" then
-			for key, value in pairs(changedKeys) do
-				self._keySubscriptions:Fire(key, newViewSnapshot[value])
-			end
-		else
-			for key, _ in pairs(changedKeys) do
-				self._keySubscriptions:Fire(key, nil)
-			end
-		end
-
-		self.Changed:Fire(self._viewSnapshot)
-	end
-
-	self:_checkIntegrity()
 end
 
 function DataStoreStage:_updateViewSnapshotAtKey(key)
@@ -856,6 +865,9 @@ function DataStoreStage:_computeNewViewSnapshot()
 
 		return table.freeze(newView)
 	else
+		assert(self._saveDataSnapshot ~= nil, "Bad _saveDataSnapshot")
+		assert(type(self._saveDataSnapshot) ~= "table", "Bad self._saveDataSnapshot")
+
 		-- If save data isn't nil or a table then we are to return the save table
 		return self._saveDataSnapshot
 	end
@@ -942,6 +954,10 @@ function DataStoreStage:_storeAtKey(key, value)
 end
 
 function DataStoreStage:_checkIntegrity()
+	if not SLOW_INTEGRITY_CHECK_ENABLED then
+		return
+	end
+
 	assert(self._baseDataSnapshot ~= DataStoreDeleteToken, "BaseDataSnapshot should not be DataStoreDeleteToken")
 	assert(self._viewSnapshot ~= DataStoreDeleteToken, "ViewSnapshot should not be DataStoreDeleteToken")