@quenty/rogue-properties 11.25.2-canary.ff3c47a.0 → 11.26.0

package/CHANGELOG.md

@@ -3,12 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [11.25.2-canary.ff3c47a.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/rogue-properties@11.25.1...@quenty/rogue-properties@11.25.2-canary.ff3c47a.0) (2025-09-26)
+# [11.26.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/rogue-properties@11.25.1...@quenty/rogue-properties@11.26.0) (2025-09-26)
 
 
 ### Bug Fixes
 
 * Fix caching performance of the rogue system when multiple things want to observe state ([1a067f7](https://github.com/Quenty/NevermoreEngine/commit/1a067f7dec837a2eb4db399e46bf06566824c9a3))
+* Fix parenting and application on client ([ff2f125](https://github.com/Quenty/NevermoreEngine/commit/ff2f1254f45289537444190bc0596f9f519c592e))
+* Fix stuff ([63ba0e0](https://github.com/Quenty/NevermoreEngine/commit/63ba0e0c4b5c8bdaeb452f0b3d742b7b8bc8a7ab))
 * Style stuff ([ff3c47a](https://github.com/Quenty/NevermoreEngine/commit/ff3c47af4e5b23f912aa09a0784849751d5736e1))
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/rogue-properties",
-  "version": "11.25.2-canary.ff3c47a.0",
+  "version": "11.26.0",
   "description": "Roguelike properties which can be modified by external provides",
   "keywords": [
     "Roblox",
@@ -24,35 +24,35 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/adorneedata": "7.20.1-canary.ff3c47a.0",
-    "@quenty/attributeutils": "14.19.1-canary.ff3c47a.0",
-    "@quenty/baseobject": "10.9.0",
-    "@quenty/binder": "14.22.1-canary.ff3c47a.0",
-    "@quenty/brio": "14.19.1-canary.ff3c47a.0",
-    "@quenty/defaultvalueutils": "1.2.2",
-    "@quenty/ducktype": "5.9.0",
-    "@quenty/instanceutils": "13.19.1-canary.ff3c47a.0",
-    "@quenty/jsonutils": "10.12.0",
-    "@quenty/linkutils": "13.19.1-canary.ff3c47a.0",
-    "@quenty/loader": "10.9.0",
-    "@quenty/maid": "3.5.0",
-    "@quenty/observablecollection": "12.22.2-canary.ff3c47a.0",
-    "@quenty/remoting": "12.20.1-canary.ff3c47a.0",
-    "@quenty/rx": "13.19.1-canary.ff3c47a.0",
-    "@quenty/rxbinderutils": "14.22.1-canary.ff3c47a.0",
-    "@quenty/rxsignal": "7.19.1-canary.ff3c47a.0",
-    "@quenty/servicebag": "11.13.1",
-    "@quenty/signal": "7.11.1",
-    "@quenty/spring": "10.9.0",
-    "@quenty/string": "3.3.3",
-    "@quenty/table": "3.8.0",
-    "@quenty/tie": "10.22.1-canary.ff3c47a.0",
-    "@quenty/valuebaseutils": "13.19.1-canary.ff3c47a.0",
-    "@quenty/valueobject": "13.19.1-canary.ff3c47a.0",
+    "@quenty/adorneedata": "^7.21.0",
+    "@quenty/attributeutils": "^14.20.0",
+    "@quenty/baseobject": "^10.9.0",
+    "@quenty/binder": "^14.23.0",
+    "@quenty/brio": "^14.20.0",
+    "@quenty/defaultvalueutils": "^1.2.2",
+    "@quenty/ducktype": "^5.9.0",
+    "@quenty/instanceutils": "^13.20.0",
+    "@quenty/jsonutils": "^10.12.0",
+    "@quenty/linkutils": "^13.20.0",
+    "@quenty/loader": "^10.9.0",
+    "@quenty/maid": "^3.5.0",
+    "@quenty/observablecollection": "^12.23.0",
+    "@quenty/remoting": "^12.21.0",
+    "@quenty/rx": "^13.20.0",
+    "@quenty/rxbinderutils": "^14.23.0",
+    "@quenty/rxsignal": "^7.20.0",
+    "@quenty/servicebag": "^11.13.1",
+    "@quenty/signal": "^7.11.1",
+    "@quenty/spring": "^10.9.0",
+    "@quenty/string": "^3.3.3",
+    "@quenty/table": "^3.8.0",
+    "@quenty/tie": "^10.23.0",
+    "@quenty/valuebaseutils": "^13.20.0",
+    "@quenty/valueobject": "^13.20.0",
     "@quentystudios/t": "^3.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ff3c47af4e5b23f912aa09a0784849751d5736e1"
+  "gitHead": "0ecdc6807f4ad638ffd49b056bceec4353895b82"
 }

package/src/Shared/Definition/RoguePropertyTableDefinition.lua

@@ -232,41 +232,37 @@ RoguePropertyTableDefinition.GetPropertyTable = RoguePropertyTableDefinition.Get
 
 	@return Observable<Brio<Folder>>
 ]=]
-function RoguePropertyTableDefinition:ObserveContainerBrio(
-	serviceBag: ServiceBag.ServiceBag,
-	adornee: Instance,
-	canInitialize: boolean
-)
+function RoguePropertyTableDefinition:ObserveContainerBrio(serviceBag: ServiceBag.ServiceBag, adornee: Instance)
+	assert(serviceBag, "No serviceBag")
 	assert(typeof(adornee) == "Instance", "Bad adornee")
-	assert(type(canInitialize) == "boolean", "Bad canInitialize")
 
 	local found = self:Get(serviceBag, adornee)
 
 	-- TODO: caninitialize is broken
 
-	return found:ObserveContainerBrio(canInitialize)
+	return found:ObserveContainerBrio()
 end
 
 --[=[
 	Gets the current container for the given adornee.
-	@param adornee Instance
-	@param canInitialize boolean
 	@return Folder?
 ]=]
-function RoguePropertyTableDefinition:GetContainer(
-	serviceBag: ServiceBag.ServiceBag,
-	adornee: Instance,
-	canInitialize: boolean
-): Folder?
+function RoguePropertyTableDefinition:GetContainer(serviceBag: ServiceBag.ServiceBag, adornee: Instance): Folder?
+	assert(serviceBag, "No serviceBag")
 	assert(typeof(adornee) == "Instance", "Bad adornee")
-	assert(type(canInitialize) == "boolean", "Bad canInitialize")
 
 	local found = self:Get(serviceBag, adornee)
 
 	return found:GetContainer()
 end
 
-function RoguePropertyTableDefinition:GetOrCreateInstance(parent)
+function RoguePropertyTableDefinition:FindInstance(parent): Instance?
+	assert(typeof(parent) == "Instance", "Bad parent")
+
+	return parent:FindFirstChild(self:GetName())
+end
+
+function RoguePropertyTableDefinition:GetOrCreateInstance(parent): Folder
 	assert(typeof(parent) == "Instance", "Bad parent")
 
 	local existing = parent:FindFirstChild(self:GetName())

package/src/Shared/Implementation/RogueProperty.lua

@@ -261,6 +261,15 @@ function RogueProperty:_getModifierParentContainerList()
 	return containerList
 end
 
+function RogueProperty:PromiseBaseValue()
+	return Rx.toPromise(self:_observeBaseValueBrio():Pipe({
+		RxBrioUtils.flattenToValueAndNil,
+		Rx.where(function(value)
+			return value ~= nil
+		end),
+	}))
+end
+
 function RogueProperty:_observeModifierContainersBrio()
 	local name = self:_getLocalModifierParentName()
 
@@ -290,13 +299,30 @@ function RogueProperty:SetValue(value)
 
 	local baseValue = self:GetBaseValueObject(RoguePropertyBaseValueTypes.ANY)
 	if not baseValue then
-		warn(
+		local warningText = debug.traceback(
 			string.format(
 				"[RogueProperty.SetValue] - Failed to get the baseValue for %q on %q",
 				self._definition:GetFullName(),
 				self._adornee:GetFullName()
 			)
 		)
+
+		local warnTask = task.delay(5, function()
+			warn(warningText)
+		end)
+
+		self:PromiseBaseValue():Then(function(thisBaseValue)
+			local current = value
+
+			local modifiers = self:GetRogueModifiers()
+			for i = #modifiers, 1, -1 do
+				current = modifiers[i]:GetInvertedVersion(current, value)
+			end
+
+			thisBaseValue.Value = self:_encodeValue(current)
+			task.cancel(warnTask)
+		end)
+
 		return
 	end
 
@@ -457,17 +483,6 @@ end
 function RogueProperty:CreateMultiplier(amount: number, source)
 	assert(type(amount) == "number", "Bad amount")
 
-	local modifierParent = self:_getModifierParentContainerForNewModifier()
-	if not modifierParent then
-		warn(
-			string.format(
-				"[RogueProperty.CreateMultiplier] - Failed to get the modifierParent for %q on %q",
-				self._definition:GetFullName(),
-				self._adornee:GetFullName()
-			)
-		)
-	end
-
 	local className = ValueBaseUtils.getClassNameFromType(typeof(amount))
 	if not className then
 		error(string.format("[RogueProperty.CreateMultiplier] - Can't set to type %q", typeof(amount)))
@@ -484,7 +499,7 @@ function RogueProperty:CreateMultiplier(amount: number, source)
 
 	RogueMultiplier:Tag(multiplier)
 
-	multiplier.Parent = modifierParent
+	self:_parentModifier(multiplier)
 
 	return multiplier
 end
@@ -492,18 +507,6 @@ end
 function RogueProperty:CreateAdditive(amount: number, source)
 	assert(type(amount) == "number", "Bad amount")
 
-	local modifierParent = self:_getModifierParentContainerForNewModifier()
-	if not modifierParent then
-		warn(
-			string.format(
-				"[RogueProperty.CreateAdditive] - Failed to get the modifierParent for %q on %q",
-				self._definition:GetFullName(),
-				self._adornee:GetFullName()
-			)
-		)
-		return nil
-	end
-
 	local className = ValueBaseUtils.getClassNameFromType(typeof(amount))
 	if not className then
 		error(string.format("[RogueProperty.CreateAdditive] - Can't set to type %q", typeof(amount)))
@@ -520,7 +523,7 @@ function RogueProperty:CreateAdditive(amount: number, source)
 
 	RogueAdditive:Tag(additive)
 
-	additive.Parent = modifierParent
+	self:_parentModifier(additive)
 
 	return additive
 end
@@ -528,11 +531,14 @@ end
 function RogueProperty:GetNamedAdditive(name, source)
 	local modifierParent = self:_getModifierParentContainerForNewModifier()
 	if not modifierParent then
+		-- TODO: Handle this parenting scenario appropriately
 		warn(
-			string.format(
-				"[RogueProperty.GetNamedAdditive] - Failed to get the modifierParent for %q on %q",
-				self._definition:GetFullName(),
-				self._adornee:GetFullName()
+			debug.traceback(
+				string.format(
+					"[RogueProperty.GetNamedAdditive] - Failed to get the modifierParent for %q on %q",
+					self._definition:GetFullName(),
+					self._adornee:GetFullName()
+				)
 			)
 		)
 		return nil
@@ -551,18 +557,6 @@ function RogueProperty:GetNamedAdditive(name, source)
 end
 
 function RogueProperty:CreateSetter(value, source)
-	local modifierParent = self:_getModifierParentContainerForNewModifier()
-	if not modifierParent then
-		warn(
-			string.format(
-				"[RogueProperty.CreateSetter] - Failed to get the modifierParent for %q on %q",
-				self._definition:GetFullName(),
-				self._adornee:GetFullName()
-			)
-		)
-		return nil
-	end
-
 	local className = ValueBaseUtils.getClassNameFromType(typeof(value))
 	if not className then
 		error(string.format("[RogueProperty.CreateSetter] - Can't set to type %q", typeof(value)))
@@ -579,11 +573,54 @@ function RogueProperty:CreateSetter(value, source)
 
 	RogueSetter:Tag(setter)
 
-	setter.Parent = modifierParent
+	self:_parentModifier(setter)
 
 	return setter
 end
 
+function RogueProperty:_parentModifier(modifier: Instance)
+	local modifierParent = self:_getModifierParentContainerForNewModifier()
+	if modifierParent then
+		modifier.Parent = modifierParent
+
+		return
+	end
+
+	local maid = Maid.new()
+
+	local warningText = debug.traceback(
+		string.format(
+			"[RogueProperty._parentModifier] - Failed to get the modifierParent for %q on %q",
+			self._definition:GetFullName(),
+			self._adornee:GetFullName()
+		)
+	)
+
+	maid._warning = task.delay(5, function()
+		warn(warningText)
+	end)
+
+	maid:GivePromise(self:PromiseBaseValue()):Then(function()
+		local newParent = self:_getModifierParentContainerForNewModifier()
+		if not newParent then
+			warn(
+				"[RogueProperty:_parentModifier] - Failed to retrieve modifier parent after load, will never modify value"
+			)
+
+			return
+		end
+
+		maid._warning = nil
+		modifier.Parent = newParent
+	end)
+
+	maid:GiveTask(modifier.Destroying:Connect(function()
+		maid:DoCleaning()
+	end))
+
+	return
+end
+
 function RogueProperty:__index(index)
 	if RogueProperty[index] then
 		return RogueProperty[index]

package/src/Shared/Implementation/RoguePropertyArrayHelper.lua

@@ -149,7 +149,10 @@ function RoguePropertyArrayHelper:SetArrayData(arrayData)
 
 	for index, definition in definitions do
 		if available[index] and available[index]:GetDefinition():GetValueType() == definition:GetValueType() then
+			-- TODO: Replication is cursed here, and won't be consistent between client vs. server
+			available[index]:SetCanInitialize(true)
 			available[index]:SetValue(definition:GetDefaultValue())
+			available[index]:SetCanInitialize(false)
 		else
 			-- Cleanup this old one and setup a new one
 			if available[index] then

package/src/Shared/Implementation/RoguePropertyTable.lua

@@ -54,7 +54,10 @@ function RoguePropertyTable:ObserveContainerBrio()
 	local parentDefinition = self._definition:GetParentPropertyDefinition()
 	if parentDefinition then
 		local parentTable = parentDefinition:Get(self._serviceBag, self._adornee)
-		parentTable:GetContainer()
+
+		if self:CanInitialize() then
+			parentTable:GetContainer()
+		end
 
 		cache = parentTable:ObserveContainerBrio():Pipe({
 			RxBrioUtils.switchMapBrio(function(parent)
@@ -73,7 +76,7 @@ function RoguePropertyTable:ObserveContainerBrio()
 	return cache
 end
 
-function RoguePropertyTable:GetContainer(): Instance
+function RoguePropertyTable:GetContainer(): Instance?
 	local cached = rawget(self, "_containerCache")
 	if cached then
 		if cached:IsDescendantOf(self._adornee) then
@@ -92,8 +95,16 @@ function RoguePropertyTable:GetContainer(): Instance
 		parent = self._adornee
 	end
 
-	local container = self._definition:GetOrCreateInstance(parent, self:CanInitialize())
-	container:AddTag("RoguePropertyTable")
+	if not parent then
+		return nil
+	end
+
+	local container
+	if self:CanInitialize() then
+		container = self._definition:GetOrCreateInstance(parent)
+	else
+		container = self._definition:FindInstance(parent)
+	end
 
 	rawset(self, "_containerCache", container)
 	return container