@quenty/servicebag 7.0.0 → 7.1.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.
 
+# [7.1.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/servicebag@7.0.0...@quenty/servicebag@7.1.0) (2023-12-14)
+
+
+### Features
+
+* Add service bag destruction errors that are more clear ([0d3087e](https://github.com/Quenty/NevermoreEngine/commit/0d3087efbf67c047839aa062496ed7d09fa8da69))
+
+
+
+
+
 # [7.0.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/servicebag@6.9.0...@quenty/servicebag@7.0.0) (2023-10-11)
 
 **Note:** Version bump only for package @quenty/servicebag

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/servicebag",
-  "version": "7.0.0",
+  "version": "7.1.0",
   "description": "Service providing mechanisms for Nevermore",
   "keywords": [
     "Roblox",
@@ -26,12 +26,12 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/baseobject": "^7.0.0",
-    "@quenty/loader": "^7.0.0",
-    "@quenty/signal": "^3.0.0"
+    "@quenty/baseobject": "^7.1.0",
+    "@quenty/loader": "^7.1.0",
+    "@quenty/signal": "^3.1.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fdeae46099587019ec5fc15317dc673aed379400"
+  "gitHead": "2c2dbbc0cb2fbb46b4f3270c559c63890fe18b26"
 }

package/src/Shared/ServiceBag.lua

@@ -59,11 +59,11 @@ function ServiceBag.new(parentProvider)
 	self._serviceTypesToInitializeSet = {}
 	self._initializedServiceTypeSet = {}
 	self._initializing = false
+	self._destructing = false
 
 	self._serviceTypesToStart = {}
 
-	self._destroying = Signal.new()
-	self._maid:GiveTask(self._destroying)
+	self._destroyingSignal = Signal.new()
 
 	return self
 end
@@ -168,7 +168,7 @@ function ServiceBag:Start()
 
 			local isDead = coroutine.status(current) == "dead"
 			if not isDead then
-				error(("Starting service %q yielded"):format(serviceName))
+				error(string.format("Starting service %q yielded", serviceName))
 			end
 		end
 	end
@@ -208,7 +208,7 @@ function ServiceBag:CreateScope()
 	self:_addServiceType(provider)
 
 	-- Remove from parent provider
-	self._maid[provider] = provider._destroying:Connect(function()
+	self._maid[provider] = provider._destroyingSignal:Connect(function()
 		self._maid[provider] = nil
 		self._services[provider] = nil
 	end)
@@ -218,8 +218,14 @@ end
 
 -- Adds a service to this provider only
 function ServiceBag:_addServiceType(serviceType)
+	if self._destructing then
+		local serviceName = self:_getServiceName(serviceType)
+		error(string.format("Cannot query service %q after ServiceBag is cleaned up", serviceName))
+		return
+	end
+
 	if not self._serviceTypesToInitializeSet then
-		error(("Already finished initializing, cannot add %q"):format(self:_getServiceName(serviceType)))
+		error(string.format("Already finished initializing, cannot add %q", self:_getServiceName(serviceType)))
 		return
 	end
 
@@ -240,6 +246,12 @@ function ServiceBag:_ensureInitialization(serviceType)
 		return
 	end
 
+	if self._destructing then
+		local serviceName = self:_getServiceName(serviceType)
+		error(string.format("Cannot initialize service %q after ServiceBag is cleaned up", serviceName))
+		return
+	end
+
 	if self._initializing then
 		self._serviceTypesToInitializeSet[serviceType] = nil
 		self._initializedServiceTypeSet[serviceType] = true
@@ -266,7 +278,7 @@ function ServiceBag:_initService(serviceType)
 
 		local isDead = coroutine.status(current) == "dead"
 		if not isDead then
-			error(("Initializing service %q yielded"):format(serviceName))
+			error(string.format("Initializing service %q yielded", serviceName))
 		end
 	end
 
@@ -278,9 +290,16 @@ end
 	initialized in the service bag.
 ]=]
 function ServiceBag:Destroy()
+	if self._destructing then
+		return
+	end
+
 	local super = getmetatable(ServiceBag)
 
-	self._destroying:Fire()
+	self._destructing = true
+
+	self._destroyingSignal:Fire()
+	self._destroyingSignal:Destroy()
 
 	local services = self._services
 	local key, service = next(services)