@quenty/datastore 13.20.3 → 13.20.4-canary.11a5dcf.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [13.20.4-canary.11a5dcf.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/datastore@13.20.3...@quenty/datastore@13.20.4-canary.11a5dcf.0) (2025-05-10)
+
+
+### Bug Fixes
+
+* Additional type checking updates ([05ba29a](https://github.com/Quenty/NevermoreEngine/commit/05ba29a03efc9f3feed74b34f1d9dfb237496214))
+
+
+### Features
+
+* Add even more types ([b31717d](https://github.com/Quenty/NevermoreEngine/commit/b31717d8c9f7620c457f5018a2affa760a65334a))
+
+
+
+
+
 ## [13.20.3](https://github.com/Quenty/NevermoreEngine/compare/@quenty/datastore@13.20.2...@quenty/datastore@13.20.3) (2025-04-10)
 
 **Note:** Version bump only for package @quenty/datastore

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/datastore",
-  "version": "13.20.3",
+  "version": "13.20.4-canary.11a5dcf.0",
   "description": "Quenty's Datastore implementation for Roblox",
   "keywords": [
     "Roblox",
@@ -26,22 +26,22 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/baseobject": "^10.8.3",
-    "@quenty/bindtocloseservice": "^8.17.3",
-    "@quenty/loader": "^10.8.3",
-    "@quenty/maid": "^3.4.3",
-    "@quenty/math": "^2.7.3",
-    "@quenty/pagesutils": "^5.11.4",
-    "@quenty/promise": "^10.10.4",
-    "@quenty/rx": "^13.17.3",
-    "@quenty/servicebag": "^11.11.4",
-    "@quenty/signal": "^7.10.3",
-    "@quenty/symbol": "^3.4.2",
-    "@quenty/table": "^3.7.4",
-    "@quenty/valueobject": "^13.17.3"
+    "@quenty/baseobject": "10.8.4-canary.11a5dcf.0",
+    "@quenty/bindtocloseservice": "8.17.4-canary.11a5dcf.0",
+    "@quenty/loader": "10.8.4-canary.11a5dcf.0",
+    "@quenty/maid": "3.4.4-canary.11a5dcf.0",
+    "@quenty/math": "2.7.3",
+    "@quenty/pagesutils": "5.11.5-canary.11a5dcf.0",
+    "@quenty/promise": "10.10.5-canary.11a5dcf.0",
+    "@quenty/rx": "13.17.4-canary.11a5dcf.0",
+    "@quenty/servicebag": "11.11.5-canary.11a5dcf.0",
+    "@quenty/signal": "7.10.4-canary.11a5dcf.0",
+    "@quenty/symbol": "3.4.3-canary.11a5dcf.0",
+    "@quenty/table": "3.7.5-canary.11a5dcf.0",
+    "@quenty/valueobject": "13.17.4-canary.11a5dcf.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b06c070ae91d5dab7bd8de6e290ad2caabb15d8f"
+  "gitHead": "11a5dcf7d4c7a0bfbf3337e97d30e8346ea09d3f"
 }

package/src/Server/DataStore.lua

@@ -113,7 +113,7 @@ export type DataStore = typeof(setmetatable(
 	@param key string
 	@return DataStore
 ]=]
-function DataStore.new(robloxDataStore: DataStorePromises.RobloxDataStore, key: string)
+function DataStore.new(robloxDataStore: DataStorePromises.RobloxDataStore, key: string): DataStore
 	local self: DataStore = setmetatable(DataStoreStage.new(key) :: any, DataStore)
 
 	self._key = key or error("No key")
@@ -455,9 +455,16 @@ function DataStore._doDataSync(self: DataStore, writer, doMergeNewData: boolean)
 end
 
 function DataStore._promiseGetAsyncNoCache(self: DataStore): Promise.Promise<()>
-	return self._maid:GivePromise(DataStorePromises.getAsync(self._robloxDataStore, self._key))
+	return self._maid
+		:GivePromise(DataStorePromises.getAsync(self._robloxDataStore, self._key))
 		:Catch(function(err)
-			warn(string.format("DataStorePromises.getAsync(%q) -> warning - %s", tostring(self._key), tostring(err or "empty error")))
+			warn(
+				string.format(
+					"DataStorePromises.getAsync(%q) -> warning - %s",
+					tostring(self._key),
+					tostring(err or "empty error")
+				)
+			)
 			return Promise.rejected(err)
 		end)
 		:Then(function(data)
@@ -467,10 +474,17 @@ function DataStore._promiseGetAsyncNoCache(self: DataStore): Promise.Promise<()>
 			self:MergeDiffSnapshot(diffSnapshot)
 
 			if self._debugWriting then
-				print(string.format("DataStorePromises.getAsync(%q) -> Got ", tostring(self._key)), data, "with diff snapshot", diffSnapshot, "to view", self._viewSnapshot)
+				print(
+					string.format("DataStorePromises.getAsync(%q) -> Got ", tostring(self._key)),
+					data,
+					"with diff snapshot",
+					diffSnapshot,
+					"to view",
+					self._viewSnapshot
+				)
 				-- print(string.format("DataStorePromises.getAsync(%q) -> Got ", self._key), data)
 			end
 		end)
 end
 
-return DataStore
+return DataStore

package/src/Server/GameDataStoreService.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Service which manages central access to datastore. This datastore will refresh pretty frequently and
 	can be used for configuration and other components, such as Twitter codes or global settings.
@@ -12,12 +13,12 @@ local DataStore = require("DataStore")
 local DataStorePromises = require("DataStorePromises")
 local Maid = require("Maid")
 local Promise = require("Promise")
-local _ServiceBag = require("ServiceBag")
+local ServiceBag = require("ServiceBag")
 
 local GameDataStoreService = {}
 GameDataStoreService.ServiceName = "GameDataStoreService"
 
-function GameDataStoreService:Init(serviceBag: _ServiceBag.ServiceBag)
+function GameDataStoreService:Init(serviceBag: ServiceBag.ServiceBag)
 	assert(not self._serviceBag, "Already initialized")
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 
@@ -26,44 +27,43 @@ function GameDataStoreService:Init(serviceBag: _ServiceBag.ServiceBag)
 	self._maid = Maid.new()
 end
 
-function GameDataStoreService:PromiseDataStore()
+function GameDataStoreService:PromiseDataStore(): Promise.Promise<DataStore>
 	if self._dataStorePromise then
 		return self._dataStorePromise
 	end
 
-	self._dataStorePromise = self:_promiseRobloxDataStore()
-		:Then(function(robloxDataStore)
-			-- Live sync this stuff pretty frequently
-			local dataStore = DataStore.new(robloxDataStore, self:_getKey())
-			dataStore:SetSyncOnSave(true)
-			dataStore:SetAutoSaveTimeSeconds(5)
-
-			self._maid:GiveTask(self._bindToCloseService:RegisterPromiseOnCloseCallback(function()
-				return Promise.defer(function(resolve)
-					return resolve(dataStore:Save())
-				end)
-				:Finally(function()
-					dataStore:Destroy()
-				end)
-			end))
-
-			return dataStore
-		end)
+	self._dataStorePromise = self:_promiseRobloxDataStore():Then(function(robloxDataStore)
+		-- Live sync this stuff pretty frequently
+		local dataStore: DataStore.DataStore = DataStore.new(robloxDataStore, self:_getKey())
+		dataStore:SetSyncOnSave(true)
+		dataStore:SetAutoSaveTimeSeconds(5)
+
+		self._maid:GiveTask(self._bindToCloseService:RegisterPromiseOnCloseCallback(function()
+			return Promise.defer(function(resolve)
+				return resolve(dataStore:Save())
+			end):Finally(function()
+				dataStore:Destroy()
+			end)
+		end))
+
+		return dataStore
+	end)
 
 	return self._dataStorePromise
 end
 
-function GameDataStoreService:_promiseRobloxDataStore()
+function GameDataStoreService:_promiseRobloxDataStore(): Promise.Promise<any>
 	if self._robloxDataStorePromise then
 		return self._robloxDataStorePromise
 	end
 
-	self._robloxDataStorePromise = self._maid:GivePromise(DataStorePromises.promiseDataStore("GameDataStore", "Version1"))
+	self._robloxDataStorePromise =
+		self._maid:GivePromise(DataStorePromises.promiseDataStore("GameDataStore", "Version1"))
 
 	return self._robloxDataStorePromise
 end
 
-function GameDataStoreService:_getKey()
+function GameDataStoreService:_getKey(): string
 	return "version1"
 end
 
@@ -71,4 +71,4 @@ function GameDataStoreService:Destroy()
 	self._maid:DoCleaning()
 end
 
-return GameDataStoreService
+return GameDataStoreService

package/src/Server/Modules/DataStoreDeleteToken.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Token to use for deleting.
 	@server
@@ -8,4 +9,4 @@ local require = require(script.Parent.loader).load(script)
 
 local Symbol = require("Symbol")
 
-return Symbol.named("dataStoreDeleteToken")
+return Symbol.named("dataStoreDeleteToken")

package/src/Server/Modules/DataStoreSnapshotUtils.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	@class DataStoreSnapshotUtils
 ]=]
@@ -12,4 +13,4 @@ function DataStoreSnapshotUtils.isEmptySnapshot(snapshot: any): boolean
 	return not Symbol.isSymbol(snapshot) and type(snapshot) == "table" and next(snapshot) == nil
 end
 
-return DataStoreSnapshotUtils
+return DataStoreSnapshotUtils

package/src/Server/Modules/DataStoreStage.lua

@@ -21,13 +21,13 @@ local BaseObject = require("BaseObject")
 local DataStoreDeleteToken = require("DataStoreDeleteToken")
 local DataStoreSnapshotUtils = require("DataStoreSnapshotUtils")
 local DataStoreWriter = require("DataStoreWriter")
-local Signal = require("Signal")
 local Maid = require("Maid")
 local Observable = require("Observable")
 local ObservableSubscriptionTable = require("ObservableSubscriptionTable")
 local Promise = require("Promise")
 local PromiseUtils = require("PromiseUtils")
 local Set = require("Set")
+local Signal = require("Signal")
 local Symbol = require("Symbol")
 local Table = require("Table")
 
@@ -1082,4 +1082,4 @@ function DataStoreStage._checkIntegrity(self: DataStoreStage)
 	end
 end
 
-return DataStoreStage
+return DataStoreStage

package/src/Server/Modules/DataStoreWriter.lua

@@ -7,11 +7,11 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local Table = require("Table")
 local DataStoreDeleteToken = require("DataStoreDeleteToken")
-local Symbol = require("Symbol")
-local Set = require("Set")
 local DataStoreSnapshotUtils = require("DataStoreSnapshotUtils")
+local Set = require("Set")
+local Symbol = require("Symbol")
+local Table = require("Table")
 
 local UNSET_TOKEN = Symbol.named("unsetValue")
 
@@ -328,4 +328,4 @@ function DataStoreWriter.IsCompleteWipe(self: DataStoreWriter): boolean
 	return false
 end
 
-return DataStoreWriter
+return DataStoreWriter

package/src/Server/PlayerDataStoreManager.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	DataStore manager for player that automatically saves on player leave and game close.
 
@@ -55,20 +56,21 @@ local RunService = game:GetService("RunService")
 
 local BaseObject = require("BaseObject")
 local DataStore = require("DataStore")
-local PromiseUtils = require("PromiseUtils")
-local PendingPromiseTracker = require("PendingPromiseTracker")
 local Maid = require("Maid")
+local PendingPromiseTracker = require("PendingPromiseTracker")
 local Promise = require("Promise")
+local PromiseUtils = require("PromiseUtils")
 
 local PlayerDataStoreManager = setmetatable({}, BaseObject)
 PlayerDataStoreManager.ClassName = "PlayerDataStoreManager"
 PlayerDataStoreManager.__index = PlayerDataStoreManager
 
+export type KeyGenerator = (Player) -> string
 export type PlayerDataStoreManager = typeof(setmetatable(
 	{} :: {
 		_robloxDataStore: any,
-		_keyGenerator: (Player) -> string,
-		_datastores: { [Player]: DataStore },
+		_keyGenerator: KeyGenerator,
+		_datastores: { [Player]: DataStore.DataStore },
 		_removing: { [Player]: boolean },
 		_pendingSaves: PendingPromiseTracker.PendingPromiseTracker<any>,
 		_removingCallbacks: { (Player) -> any },
@@ -85,8 +87,12 @@ export type PlayerDataStoreManager = typeof(setmetatable(
 	@param skipBindingToClose boolean?
 	@return PlayerDataStoreManager
 ]=]
-function PlayerDataStoreManager.new(robloxDataStore: DataStore, keyGenerator, skipBindingToClose)
-	local self = setmetatable(BaseObject.new(), PlayerDataStoreManager)
+function PlayerDataStoreManager.new(
+	robloxDataStore: DataStore,
+	keyGenerator: KeyGenerator,
+	skipBindingToClose: boolean?
+): PlayerDataStoreManager
+	local self: PlayerDataStoreManager = setmetatable(BaseObject.new() :: any, PlayerDataStoreManager)
 
 	assert(type(skipBindingToClose) == "boolean" or skipBindingToClose == nil, "Bad skipBindingToClose")
 
@@ -124,7 +130,7 @@ end
 --[=[
 	For if you want to disable saving in studio for faster close time!
 ]=]
-function PlayerDataStoreManager:DisableSaveOnCloseStudio()
+function PlayerDataStoreManager.DisableSaveOnCloseStudio(self: PlayerDataStoreManager): ()
 	assert(RunService:IsStudio())
 
 	self._disableSavingInStudio = true
@@ -134,7 +140,7 @@ end
 	Adds a callback to be called before save on removal
 	@param callback function -- May return a promise
 ]=]
-function PlayerDataStoreManager:AddRemovingCallback(callback)
+function PlayerDataStoreManager.AddRemovingCallback(self: PlayerDataStoreManager, callback)
 	table.insert(self._removingCallbacks, callback)
 end
 
@@ -144,15 +150,21 @@ end
 
 	@param player Player
 ]=]
-function PlayerDataStoreManager:RemovePlayerDataStore(player: Player)
+function PlayerDataStoreManager.RemovePlayerDataStore(self: PlayerDataStoreManager, player: Player): ()
 	self:_removePlayerDataStore(player)
 end
 
 --[=[
+	Gets the datastore for a player. If it does not exist, it will create one.
+
+	:::tip
+	Returns nil if the player is in the process of being removed.
+	:::
+
 	@param player Player
-	@return DataStore
+	@return DataStore?
 ]=]
-function PlayerDataStoreManager:GetDataStore(player: Player)
+function PlayerDataStoreManager.GetDataStore(self: PlayerDataStoreManager, player: Player): DataStore.DataStore?
 	assert(typeof(player) == "Instance", "Bad player")
 	assert(player:IsA("Player"), "Bad player")
 
@@ -173,14 +185,14 @@ end
 	resolves when all pending saves are saved.
 	@return Promise
 ]=]
-function PlayerDataStoreManager:PromiseAllSaves()
+function PlayerDataStoreManager.PromiseAllSaves(self: PlayerDataStoreManager): Promise.Promise<()>
 	for player, _ in self._datastores do
 		self:_removePlayerDataStore(player)
 	end
 	return self._maid:GivePromise(PromiseUtils.all(self._pendingSaves:GetAll()))
 end
 
-function PlayerDataStoreManager:_createDataStore(player: Player)
+function PlayerDataStoreManager._createDataStore(self: PlayerDataStoreManager, player: Player): DataStore.DataStore
 	assert(not self._datastores[player], "Bad player")
 
 	local datastore = DataStore.new(self._robloxDataStore, self:_getKey(player))
@@ -195,7 +207,7 @@ function PlayerDataStoreManager:_createDataStore(player: Player)
 	return datastore
 end
 
-function PlayerDataStoreManager:_removePlayerDataStore(player: Player)
+function PlayerDataStoreManager._removePlayerDataStore(self: PlayerDataStoreManager, player: Player)
 	assert(typeof(player) == "Instance", "Bad player")
 	assert(player:IsA("Player"), "Bad player")
 
@@ -228,8 +240,8 @@ function PlayerDataStoreManager:_removePlayerDataStore(player: Player)
 	self._maid._savingConns[player] = nil
 end
 
-function PlayerDataStoreManager:_getKey(player: Player)
+function PlayerDataStoreManager._getKey(self: PlayerDataStoreManager, player: Player)
 	return self._keyGenerator(player)
 end
 
-return PlayerDataStoreManager
+return PlayerDataStoreManager

package/src/Server/PlayerDataStoreService.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Centralized service using serviceBag. This will let other packages work with a single player datastore service.
 
@@ -7,18 +8,19 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local PlayerDataStoreManager = require("PlayerDataStoreManager")
+local DataStore = require("DataStore")
 local DataStorePromises = require("DataStorePromises")
-local Promise = require("Promise")
 local Maid = require("Maid")
-local _ServiceBag = require("ServiceBag")
+local PlayerDataStoreManager = require("PlayerDataStoreManager")
+local Promise = require("Promise")
+local ServiceBag = require("ServiceBag")
 
 local PlayerDataStoreService = {}
 PlayerDataStoreService.ServiceName = "PlayerDataStoreService"
 
 export type PlayerDataStoreService = typeof(setmetatable(
 	{} :: {
-		_serviceBag: _ServiceBag.ServiceBag,
+		_serviceBag: ServiceBag.ServiceBag,
 		_maid: Maid.Maid,
 		_dataStoreName: string,
 		_dataStoreScope: string,
@@ -31,7 +33,7 @@ export type PlayerDataStoreService = typeof(setmetatable(
 	Initializes the PlayerDataStoreService. Should be done via [ServiceBag.Init].
 	@param serviceBag ServiceBag
 ]=]
-function PlayerDataStoreService:Init(serviceBag: _ServiceBag.ServiceBag)
+function PlayerDataStoreService:Init(serviceBag: ServiceBag.ServiceBag)
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 	self._maid = Maid.new()
 
@@ -61,7 +63,7 @@ end
 
 	@param dataStoreName string
 ]=]
-function PlayerDataStoreService:SetDataStoreName(dataStoreName: string)
+function PlayerDataStoreService:SetDataStoreName(dataStoreName: string): ()
 	assert(type(dataStoreName) == "string", "Bad dataStoreName")
 	assert(self._promiseStarted, "Not initialized")
 	assert(self._promiseStarted:IsPending(), "Already started, cannot configure")
@@ -78,7 +80,7 @@ end
 
 	@param dataStoreScope string
 ]=]
-function PlayerDataStoreService:SetDataStoreScope(dataStoreScope: string)
+function PlayerDataStoreService:SetDataStoreScope(dataStoreScope: string): ()
 	assert(type(dataStoreScope) == "string", "Bad dataStoreScope")
 	assert(self._promiseStarted, "Not initialized")
 	assert(self._promiseStarted:IsPending(), "Already started, cannot configure")
@@ -91,7 +93,7 @@ end
 	@param player Player
 	@return Promise<DataStore>
 ]=]
-function PlayerDataStoreService:PromiseDataStore(player: Player)
+function PlayerDataStoreService:PromiseDataStore(player: Player): Promise.Promise<DataStore.DataStore>
 	return self:PromiseManager():Then(function(manager)
 		return manager:GetDataStore(player)
 	end)
@@ -110,9 +112,9 @@ end
 
 --[=[
 	Retrieves the manager
-	@return PlayerDataStoreManager
+	@return Promise<PlayerDataStoreManager>
 ]=]
-function PlayerDataStoreService:PromiseManager()
+function PlayerDataStoreService:PromiseManager(): Promise.Promise<PlayerDataStoreManager.PlayerDataStoreManager>
 	if self._dataStoreManagerPromise then
 		return self._dataStoreManagerPromise
 	end

package/src/Server/PrivateServerDataStoreService.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Service which manages central access to datastore. This datastore is per a private server
 	or reserved server. The main server will also get one, with an empty key.
@@ -10,12 +11,13 @@ local require = require(script.Parent.loader).load(script)
 local DataStore = require("DataStore")
 local DataStorePromises = require("DataStorePromises")
 local Maid = require("Maid")
-local _ServiceBag = require("ServiceBag")
+local Promise = require("Promise")
+local ServiceBag = require("ServiceBag")
 
 local PrivateServerDataStoreService = {}
 PrivateServerDataStoreService.ServiceName = "PrivateServerDataStoreService"
 
-function PrivateServerDataStoreService:Init(serviceBag: _ServiceBag.ServiceBag)
+function PrivateServerDataStoreService:Init(serviceBag: ServiceBag.ServiceBag)
 	assert(not self._serviceBag, "Already initialized")
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 
@@ -24,48 +26,51 @@ function PrivateServerDataStoreService:Init(serviceBag: _ServiceBag.ServiceBag)
 	self._maid = Maid.new()
 end
 
-function PrivateServerDataStoreService:PromiseDataStore()
+function PrivateServerDataStoreService:PromiseDataStore(): Promise.Promise<DataStore.DataStore>
 	if self._dataStorePromise then
 		return self._dataStorePromise
 	end
 
-	self._dataStorePromise = self:_promiseRobloxDataStore()
-		:Then(function(robloxDataStore)
-			local dataStore = DataStore.new(robloxDataStore, self:_getKey())
-			self._maid:GiveTask(dataStore)
+	self._dataStorePromise = self:_promiseRobloxDataStore():Then(function(robloxDataStore)
+		local dataStore = DataStore.new(robloxDataStore, self:_getKey())
+		self._maid:GiveTask(dataStore)
 
-			if game.PrivateServerOwnerId ~= 0 then
-				dataStore:Store("LastPrivateServerOwnerId", game.PrivateServerOwnerId)
-			end
+		if game.PrivateServerOwnerId ~= 0 then
+			dataStore:Store("LastPrivateServerOwnerId", game.PrivateServerOwnerId)
+		end
 
-			self._maid:GiveTask(self._bindToCloseService:RegisterPromiseOnCloseCallback(function()
-				return dataStore:Save()
-			end))
+		self._maid:GiveTask(self._bindToCloseService:RegisterPromiseOnCloseCallback(function()
+			return dataStore:Save()
+		end))
 
-			return dataStore
-		end)
+		return dataStore
+	end)
 
 	return self._dataStorePromise
 end
 
-function PrivateServerDataStoreService:SetCustomKey(customKey)
-	assert(self._dataStorePromise == nil, "[PrivateServerDataStoreService] - Already got datastore, cannot set custom key")
+function PrivateServerDataStoreService:SetCustomKey(customKey: string)
+	assert(
+		self._dataStorePromise == nil,
+		"[PrivateServerDataStoreService] - Already got datastore, cannot set custom key"
+	)
 
 	self._customKey = customKey
 end
 
-function PrivateServerDataStoreService:_promiseRobloxDataStore()
+function PrivateServerDataStoreService:_promiseRobloxDataStore(): Promise.Promise<any>
 	if self._robloxDataStorePromise then
 		return self._robloxDataStorePromise
 	end
 
 	-- This could potentially
-	self._robloxDataStorePromise = self._maid:GivePromise(DataStorePromises.promiseDataStore("PrivateServerDataStores", "Version1"))
+	self._robloxDataStorePromise =
+		self._maid:GivePromise(DataStorePromises.promiseDataStore("PrivateServerDataStores", "Version1"))
 
 	return self._robloxDataStorePromise
 end
 
-function PrivateServerDataStoreService:_getKey()
+function PrivateServerDataStoreService:_getKey(): string
 	if self._customKey then
 		return self._customKey
 	end
@@ -76,8 +81,8 @@ function PrivateServerDataStoreService:_getKey()
 	end
 end
 
-function PrivateServerDataStoreService:Destroy()
+function PrivateServerDataStoreService:Destroy(): ()
 	self._maid:DoCleaning()
 end
 
-return PrivateServerDataStoreService
+return PrivateServerDataStoreService

package/src/Server/Utility/DataStorePromises.lua

@@ -9,8 +9,8 @@ local require = require(script.Parent.loader).load(script)
 
 local DataStoreService = game:GetService("DataStoreService")
 
-local Promise = require("Promise")
 local PagesUtils = require("PagesUtils")
+local Promise = require("Promise")
 local Table = require("Table")
 
 local DataStorePromises = {}
@@ -260,7 +260,6 @@ local function areEquivalentPageData(data: { OrderedDataStoreEntry }, otherData:
 	return Table.deepEquivalent(map, otherMap)
 end
 
-
 --[=[
 	Returns a DataStorePages object. The sort order is determined by ascending,
 	the length of each page by pageSize, and minValue/maxValue are
@@ -274,7 +273,14 @@ end
 	@param maxValue number?
 	@return Promise<OrderedDataStoreEntry>
 ]=]
-function DataStorePromises.promiseOrderedEntries(orderedDataStore: OrderedDataStore, ascending: boolean, pagesize: number, entries: number, minValue: number?, maxValue: number?): Promise.Promise<OrderedDataStoreEntry>
+function DataStorePromises.promiseOrderedEntries(
+	orderedDataStore: OrderedDataStore,
+	ascending: boolean,
+	pagesize: number,
+	entries: number,
+	minValue: number?,
+	maxValue: number?
+): Promise.Promise<OrderedDataStoreEntry>
 	assert(typeof(orderedDataStore) == "Instance" and orderedDataStore:IsA("OrderedDataStore"), "Bad orderedDataStore")
 	assert(type(ascending) == "boolean", "Bad ascending")
 	assert(type(entries) == "number", "Bad entries")
@@ -322,4 +328,4 @@ function DataStorePromises.promiseOrderedEntries(orderedDataStore: OrderedDataSt
 		end)
 end
 
-return DataStorePromises
+return DataStorePromises

package/src/Shared/Utility/DataStoreStringUtils.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Utility methods to validate strings which can be used to attack datastores in a string saving attack otherwise.
 
@@ -12,7 +13,7 @@ local DataStoreStringUtils = {}
 	@param str string
 	@return boolean
 ]=]
-function DataStoreStringUtils.isValidUTF8(str)
+function DataStoreStringUtils.isValidUTF8(str: string): (boolean, string?)
 	if type(str) ~= "string" then
 		return false, "Not a string"
 	end

package/test/scripts/Client/ClientMain.client.lua

@@ -8,4 +8,4 @@ local require = require(loader).bootstrapGame(loader.Parent)
 local serviceBag = require("ServiceBag").new()
 
 serviceBag:Init()
-serviceBag:Start()
+serviceBag:Start()

package/test/scripts/Server/ServerMain.server.lua

@@ -2,8 +2,8 @@
 	@class ServerMain
 ]]
 
-local ServerScriptService = game:GetService("ServerScriptService")
 local HttpService = game:GetService("HttpService")
+local ServerScriptService = game:GetService("ServerScriptService")
 
 local loader = ServerScriptService:FindFirstChild("LoaderUtils", true).Parent
 local require = require(loader).bootstrapGame(ServerScriptService.datastore)
@@ -48,7 +48,7 @@ local function spinUpGameCopy(prefix: string)
 			-- 	print(string.format("(%s) dataStore:Observe()", prefix), viewSnapshot)
 			-- end))
 
-			task.delay(4*TURN_TIME, function()
+			task.delay(4 * TURN_TIME, function()
 				warn("Blue server is restoring data")
 
 				substore:Store(guid, true)
@@ -71,8 +71,8 @@ local function spinUpGameCopy(prefix: string)
 					warn(string.format("%s server is adding substore data", prefix))
 
 					substore:Store(guid, {
-						playerCount = 5;
-						startTime = DateTime.now().UnixTimestamp
+						playerCount = 5,
+						startTime = DateTime.now().UnixTimestamp,
 					})
 					-- dataStore:Save()
 
@@ -109,7 +109,6 @@ local function spinUpGameCopy(prefix: string)
 			substore:Delete(guid)
 			return Promise.resolved()
 		end))
-
 	end)
 
 	return maid
@@ -117,4 +116,4 @@ end
 
 spinUpGameCopy("red")
 spinUpGameCopy("blue")
-spinUpGameCopy("green")
+spinUpGameCopy("green")