@rbxts/covenant 1.5.13 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rbxts/covenant",
-    "version": "1.5.13",
+    "version": "2.0.0",
     "main": "src/init.luau",
     "scripts": {
         "build": "rbxtsc",

package/src/covenant.d.ts

@@ -23,8 +23,6 @@ export declare class Covenant {
     private undefinedStringifiedComponents;
     private replicatedStringifiedComponents;
     private predictedStringifiedComponents;
-    private internalStringifiedComponents;
-    private prioritizedStringifiedComponents;
     private started;
     private stringifiedComponentSubscribers;
     private stringifiedComponentValidators;
@@ -55,28 +53,22 @@ export declare class Covenant {
     private worldDelete;
     worldComponent<T extends defined>(): Entity<T>;
     worldTag(): Entity<undefined>;
-    private worldInternalComponent;
     private checkComponentDefined;
     private defineComponentNetworkBehavior;
-    defineComputedComponent<T extends defined>({ component, queriedComponents, recipe, replicated, predictionValidator, }: {
+    defineComponent<T extends defined>({ component, queriedComponents, recipe, replicated, predictionValidator, }: {
         replicated: boolean;
         predictionValidator: ComponentPredictionValidator | false;
         component: Entity<T>;
         queriedComponents: Entity[][];
         recipe: (entity: Entity, lastState: T | undefined, updateId: number, hooks: CovenantHooks) => T | undefined;
     }): void;
-    defineManagedChildren<T extends defined>({ childIdentityComponent, getIdentifier, queriedComponents, recipe, replicated, predictionValidator, }: {
-        replicated: boolean;
-        predictionValidator: ComponentPredictionValidator | false;
-        childIdentityComponent: Entity<T>;
-        getIdentifier: (state: T) => Discriminator;
-        queriedComponents: Entity[][];
-        recipe: (entity: Entity, lastChildrenStates: ReadonlySet<T>, updateId: number, hooks: CovenantHooks) => ReadonlySet<T>;
-    }): void;
-    defineStaticEntity<T extends defined>({ identityComponent, recipe, replicated, }: {
+    defineIdentity<T extends Discriminator>({ identityComponent, recipe, replicated, }: {
         replicated: boolean;
         identityComponent: Entity<T>;
-        recipe: () => T[];
+        recipe: (entities: ReadonlyMap<T, Entity>, updateId: number, hooks: CovenantHooks) => {
+            statesToCreate?: T[];
+            statesToDelete?: T[];
+        };
     }): void;
     private worldEntity;
     worldQuery<T extends Id[]>(...components: T): import("@rbxts/jecs").Query<import("@rbxts/jecs").InferComponents<T>>;

package/src/covenant.luau

@@ -12,9 +12,6 @@ local createHooks = TS.import(script, script.Parent, "hooks").createHooks
 local _stringEnums = TS.import(script, script.Parent, "stringEnums")
 local Remove = _stringEnums.Remove
 local Delete = _stringEnums.Delete
-local _helpers = TS.import(script, script.Parent, "helpers")
-local compareMaps = _helpers.compareMaps
-local turnSetWithIdentifierToMap = _helpers.turnSetWithIdentifierToMap
 local EventMap = TS.import(script, script.Parent, "dataStructureWithEvents").EventMap
 local BIG_PRIORITY = 10000000
 for _k, _v in TS.import(script, TS.getModule(script, "@rbxts", "jecs").jecs) or {} do
@@ -60,8 +57,6 @@ do
 		self.undefinedStringifiedComponents = {}
 		self.replicatedStringifiedComponents = {}
 		self.predictedStringifiedComponents = {}
-		self.internalStringifiedComponents = {}
-		self.prioritizedStringifiedComponents = {}
 		self.started = false
 		self.stringifiedComponentSubscribers = {}
 		self.stringifiedComponentValidators = {}
@@ -155,49 +150,12 @@ do
 				local worldReconciliation = {}
 				-- ▼ ReadonlyMap.forEach ▼
 				local _callback_1 = function(componentChanges, stringifiedComponent)
-					local _prioritizedStringifiedComponents = self.prioritizedStringifiedComponents
-					local _stringifiedComponent = stringifiedComponent
-					if not (_prioritizedStringifiedComponents[_stringifiedComponent] ~= nil) then
-						return nil
-					end
 					self:forEachComponentChanges(player, worldReconciliation, componentChanges, stringifiedComponent)
 				end
 				for _k, _v in worldChanges do
 					_callback_1(_v, _k, worldChanges)
 				end
 				-- ▲ ReadonlyMap.forEach ▲
-				-- ▼ ReadonlyMap.forEach ▼
-				local _callback_2 = function(componentChanges, stringifiedComponent)
-					local _internalStringifiedComponents = self.internalStringifiedComponents
-					local _stringifiedComponent = stringifiedComponent
-					local _condition = not (_internalStringifiedComponents[_stringifiedComponent] ~= nil)
-					if _condition then
-						local _prioritizedStringifiedComponents = self.prioritizedStringifiedComponents
-						local _stringifiedComponent_1 = stringifiedComponent
-						_condition = _prioritizedStringifiedComponents[_stringifiedComponent_1] ~= nil
-					end
-					if _condition then
-						return nil
-					end
-					self:forEachComponentChanges(player, worldReconciliation, componentChanges, stringifiedComponent)
-				end
-				for _k, _v in worldChanges do
-					_callback_2(_v, _k, worldChanges)
-				end
-				-- ▲ ReadonlyMap.forEach ▲
-				-- ▼ ReadonlyMap.forEach ▼
-				local _callback_3 = function(componentChanges, stringifiedComponent)
-					local _internalStringifiedComponents = self.internalStringifiedComponents
-					local _stringifiedComponent = stringifiedComponent
-					if _internalStringifiedComponents[_stringifiedComponent] ~= nil then
-						return nil
-					end
-					self:forEachComponentChanges(player, worldReconciliation, componentChanges, stringifiedComponent)
-				end
-				for _k, _v in worldChanges do
-					_callback_3(_v, _k, worldChanges)
-				end
-				-- ▲ ReadonlyMap.forEach ▲
 				if not (next(worldReconciliation) == nil) then
 					self.replicationSend(player, worldReconciliation)
 				end
@@ -295,11 +253,6 @@ do
 					end
 					-- ▼ ReadonlyMap.forEach ▼
 					local _callback_2 = function(state, stringifiedComponent)
-						local _prioritizedStringifiedComponents = self.prioritizedStringifiedComponents
-						local _stringifiedComponent = stringifiedComponent
-						if not (_prioritizedStringifiedComponents[_stringifiedComponent] ~= nil) then
-							return nil
-						end
 						local component = tonumber(stringifiedComponent)
 						if state == Remove then
 							self:worldSet(entity, component, nil, true)
@@ -311,48 +264,6 @@ do
 						_callback_2(_v, _k, entityData)
 					end
 					-- ▲ ReadonlyMap.forEach ▲
-					-- ▼ ReadonlyMap.forEach ▼
-					local _callback_3 = function(state, stringifiedComponent)
-						local _internalStringifiedComponents = self.internalStringifiedComponents
-						local _stringifiedComponent = stringifiedComponent
-						local _condition = not (_internalStringifiedComponents[_stringifiedComponent] ~= nil)
-						if _condition then
-							local _prioritizedStringifiedComponents = self.prioritizedStringifiedComponents
-							local _stringifiedComponent_1 = stringifiedComponent
-							_condition = _prioritizedStringifiedComponents[_stringifiedComponent_1] ~= nil
-						end
-						if _condition then
-							return nil
-						end
-						local component = tonumber(stringifiedComponent)
-						if state == Remove then
-							self:worldSet(entity, component, nil, true)
-						else
-							self:worldSet(entity, component, state, true)
-						end
-					end
-					for _k, _v in entityData do
-						_callback_3(_v, _k, entityData)
-					end
-					-- ▲ ReadonlyMap.forEach ▲
-					-- ▼ ReadonlyMap.forEach ▼
-					local _callback_4 = function(state, stringifiedComponent)
-						local _internalStringifiedComponents = self.internalStringifiedComponents
-						local _stringifiedComponent = stringifiedComponent
-						if _internalStringifiedComponents[_stringifiedComponent] ~= nil then
-							return nil
-						end
-						local component = tonumber(stringifiedComponent)
-						if state == Remove then
-							self:worldSet(entity, component, nil, true)
-						else
-							self:worldSet(entity, component, state, true)
-						end
-					end
-					for _k, _v in entityData do
-						_callback_4(_v, _k, entityData)
-					end
-					-- ▲ ReadonlyMap.forEach ▲
 				end
 				for _k, _v in worldChanges do
 					_callback_1(_v, _k, worldChanges)
@@ -450,13 +361,7 @@ do
 		else
 			self._world:set(entity, component, newState)
 		end
-		local _condition = self.logging and RunService:IsStudio()
-		if _condition then
-			local _internalStringifiedComponents = self.internalStringifiedComponents
-			local _arg0 = tostring(component)
-			_condition = not (_internalStringifiedComponents[_arg0] ~= nil)
-		end
-		if _condition then
+		if self.logging and RunService:IsStudio() then
 			print(`{entity}.{component}:{lastState}->{newState}`)
 		end
 		local _stringifiedComponentSubscribers = self.stringifiedComponentSubscribers
@@ -491,20 +396,20 @@ do
 			if entityChanges ~= Delete then
 				local _entityChanges = entityChanges
 				local _exp = tostring(component)
-				local _condition_1 = newState
-				if _condition_1 == nil then
-					_condition_1 = Remove
+				local _condition = newState
+				if _condition == nil then
+					_condition = Remove
 				end
-				_entityChanges[_exp] = _condition_1
+				_entityChanges[_exp] = _condition
 			end
 		end
-		local _condition_1 = RunService:IsClient()
-		if _condition_1 then
+		local _condition = RunService:IsClient()
+		if _condition then
 			local _predictedStringifiedComponents = self.predictedStringifiedComponents
 			local _arg0_2 = tostring(component)
-			_condition_1 = _predictedStringifiedComponents[_arg0_2] ~= nil
+			_condition = _predictedStringifiedComponents[_arg0_2] ~= nil
 		end
-		if _condition_1 then
+		if _condition then
 			local _worldChangesForPrediction = self.worldChangesForPrediction
 			local _arg0_2 = tostring(component)
 			local componentChanges = _worldChangesForPrediction[_arg0_2]
@@ -517,11 +422,11 @@ do
 			end
 			local _componentChanges = componentChanges
 			local _exp = tostring(entity)
-			local _condition_2 = newState
-			if _condition_2 == nil then
-				_condition_2 = Remove
+			local _condition_1 = newState
+			if _condition_1 == nil then
+				_condition_1 = Remove
 			end
-			_componentChanges[_exp] = _condition_2
+			_componentChanges[_exp] = _condition_1
 		end
 	end
 	function Covenant:subscribeComponent(component, subscriber)
@@ -593,19 +498,6 @@ do
 		_undefinedStringifiedComponents[_arg0] = true
 		return c
 	end
-	function Covenant:worldInternalComponent(prioritized)
-		self:preventPostStartCall()
-		local c = self._world:component()
-		if prioritized then
-			local _prioritizedStringifiedComponents = self.prioritizedStringifiedComponents
-			local _arg0 = tostring(c)
-			_prioritizedStringifiedComponents[_arg0] = true
-		end
-		local _internalStringifiedComponents = self.internalStringifiedComponents
-		local _arg0 = tostring(c)
-		_internalStringifiedComponents[_arg0] = true
-		return c
-	end
 	function Covenant:checkComponentDefined(component)
 		local _undefinedStringifiedComponents = self.undefinedStringifiedComponents
 		local _arg0 = tostring(component)
@@ -632,7 +524,7 @@ do
 			_stringifiedComponentValidators[_arg0_1] = _predictionValidator
 		end
 	end
-	function Covenant:defineComputedComponent(_param)
+	function Covenant:defineComponent(_param)
 		local component = _param.component
 		local queriedComponents = _param.queriedComponents
 		local recipe = _param.recipe
@@ -748,19 +640,12 @@ do
 			updater()
 		end)
 	end
-	function Covenant:defineManagedChildren(_param)
-		local childIdentityComponent = _param.childIdentityComponent
-		local getIdentifier = _param.getIdentifier
-		local queriedComponents = _param.queriedComponents
+	function Covenant:defineIdentity(_param)
+		local identityComponent = _param.identityComponent
 		local recipe = _param.recipe
 		local replicated = _param.replicated
-		local predictionValidator = _param.predictionValidator
-		self:checkComponentDefined(childIdentityComponent)
-		local parentEntityTrackerComponent = self:worldInternalComponent(true)
-		local parentComponent = self:worldInternalComponent()
-		self:defineComponentNetworkBehavior(parentComponent, replicated, predictionValidator)
-		self:defineComponentNetworkBehavior(parentEntityTrackerComponent, replicated, false)
-		local queryParentComponent = self:worldQuery(parentComponent):cached()
+		self:checkComponentDefined(identityComponent)
+		self:defineComponentNetworkBehavior(identityComponent, replicated, false)
 		local willUpdate = true
 		local function indicateUpdate()
 			willUpdate = true
@@ -771,166 +656,53 @@ do
 				self:subscribeComponent(component, subscriber)
 			end,
 		})
-		-- ▼ ReadonlyArray.map ▼
-		local _newValue = table.create(#queriedComponents)
-		local _callback = function(components)
-			return self:worldQuery(unpack(components)):cached()
-		end
-		for _k, _v in queriedComponents do
-			_newValue[_k] = _callback(_v, _k - 1, queriedComponents)
-		end
-		-- ▲ ReadonlyArray.map ▲
-		local queries = _newValue
-		local _array = {}
-		local _length = #_array
-		-- ▼ ReadonlyArray.reduce ▼
-		local _result = {}
-		local _callback_1 = function(accum, components)
-			-- ▼ ReadonlyArray.forEach ▼
-			local _callback_2 = function(component)
-				local stringifiedComponent = tostring(component)
-				accum[stringifiedComponent] = true
+		local entities = {}
+		self:subscribeComponent(identityComponent, function(entity, state, prevState)
+			if prevState ~= nil then
+				local _prevState = prevState
+				entities[_prevState] = nil
 			end
-			for _k, _v in components do
-				_callback_2(_v, _k - 1, components)
+			if state ~= nil then
+				local _state = state
+				local _entity = entity
+				entities[_state] = _entity
 			end
-			-- ▲ ReadonlyArray.forEach ▲
-			return accum
-		end
-		for _i = 1, #queriedComponents do
-			_result = _callback_1(_result, queriedComponents[_i], _i - 1, queriedComponents)
-		end
-		-- ▲ ReadonlyArray.reduce ▲
-		for _v in _result do
-			_length += 1
-			_array[_length] = _v
-		end
-		-- ▼ ReadonlyArray.map ▼
-		local _newValue_1 = table.create(#_array)
-		local _callback_2 = function(stringifiedComponent)
-			return tonumber(stringifiedComponent)
-		end
-		for _k, _v in _array do
-			_newValue_1[_k] = _callback_2(_v, _k - 1, _array)
-		end
-		-- ▲ ReadonlyArray.map ▲
-		-- ▼ ReadonlyArray.forEach ▼
-		local _callback_3 = function(component)
-			self:subscribeComponent(component, indicateUpdate)
-		end
-		for _k, _v in _newValue_1 do
-			_callback_3(_v, _k - 1, _newValue_1)
-		end
-		-- ▲ ReadonlyArray.forEach ▲
-		local lastUpdateId = 0
-		self:subscribeComponent(parentComponent, function(entity, newState, lastState)
-			local lastStateMap = turnSetWithIdentifierToMap(lastState or {}, getIdentifier)
-			local newStateMap = turnSetWithIdentifierToMap(newState or {}, getIdentifier)
-			local entityTracker = self:worldGet(entity, parentEntityTrackerComponent)
-			if entityTracker == nil then
-				entityTracker = {}
-				self:worldSet(entity, parentEntityTrackerComponent, entityTracker)
-			end
-			local _binding = compareMaps(lastStateMap, newStateMap)
-			local entriesChanged = _binding.entriesChanged
-			local entriesAdded = _binding.entriesAdded
-			local keysRemoved = _binding.keysRemoved
-			-- ▼ ReadonlyArray.forEach ▼
-			local _callback_4 = function(_param_1)
-				local key = _param_1.key
-				local value = _param_1.value
-				local childEntity = entityTracker[key]
-				if childEntity == nil then
-					childEntity = self._world:entity()
-					local _entityTracker = entityTracker
-					local _childEntity = childEntity
-					_entityTracker[key] = _childEntity
-				end
-				self:worldSet(childEntity, childIdentityComponent, value)
-				self._world:add(childEntity, pair(ChildOf, entity))
-			end
-			for _k, _v in entriesAdded do
-				_callback_4(_v, _k - 1, entriesAdded)
-			end
-			-- ▲ ReadonlyArray.forEach ▲
-			-- ▼ ReadonlyArray.forEach ▼
-			local _callback_5 = function(_param_1)
-				local key = _param_1.key
-				local value = _param_1.value
-				local childEntity = entityTracker[key]
-				local _arg0 = childEntity ~= nil
-				assert(_arg0)
-				self:worldSet(childEntity, childIdentityComponent, value)
-			end
-			for _k, _v in entriesChanged do
-				_callback_5(_v, _k - 1, entriesChanged)
-			end
-			-- ▲ ReadonlyArray.forEach ▲
-			-- ▼ ReadonlyArray.forEach ▼
-			local _callback_6 = function(key)
-				local _entityTracker = entityTracker
-				local _key = key
-				local childEntity = _entityTracker[_key]
-				local _arg0 = childEntity ~= nil
-				assert(_arg0)
-				self:worldDelete(childEntity)
-				local _entityTracker_1 = entityTracker
-				local _key_1 = key
-				_entityTracker_1[_key_1] = nil
-			end
-			for _k, _v in keysRemoved do
-				_callback_6(_v, _k - 1, keysRemoved)
-			end
-			-- ▲ ReadonlyArray.forEach ▲
 		end)
+		local lastUpdateId = 0
 		local updater = function()
 			lastUpdateId += 1
 			local updateId = lastUpdateId
-			local unhandledStringifiedEntities = {}
-			local handledStringifiedEntities = {}
-			for entity in queryParentComponent do
-				local _arg0 = tostring(entity)
-				unhandledStringifiedEntities[_arg0] = true
-			end
-			-- ▼ ReadonlyArray.forEach ▼
-			local _callback_4 = function(query)
-				for entity in query do
-					local stringifiedEntity = tostring(entity)
-					if handledStringifiedEntities[stringifiedEntity] ~= nil then
-						continue
-					end
-					handledStringifiedEntities[stringifiedEntity] = true
-					unhandledStringifiedEntities[stringifiedEntity] = nil
-					local lastState = self:worldGet(entity, parentComponent) or {}
-					local newState = recipe(entity, lastState, updateId, hooks)
-					self:worldSet(entity, parentComponent, newState)
+			local _binding = recipe(entities, updateId, hooks)
+			local statesToCreate = _binding.statesToCreate
+			local statesToDelete = _binding.statesToDelete
+			local _result = statesToCreate
+			if _result ~= nil then
+				-- ▼ ReadonlyArray.forEach ▼
+				local _callback = function(state)
+					local entity = self:worldEntity()
+					self:worldSet(entity, identityComponent, state)
 				end
+				for _k, _v in _result do
+					_callback(_v, _k - 1, _result)
+				end
+				-- ▲ ReadonlyArray.forEach ▲
 			end
-			for _k, _v in queries do
-				_callback_4(_v, _k - 1, queries)
-			end
-			-- ▲ ReadonlyArray.forEach ▲
-			-- ▼ ReadonlySet.forEach ▼
-			local _callback_5 = function(stringifiedEntity)
-				local entity = tonumber(stringifiedEntity)
-				local children = self:worldGet(entity, parentEntityTrackerComponent)
-				if children ~= nil then
-					-- ▼ ReadonlyMap.forEach ▼
-					local _callback_6 = function(childEntity)
-						self:worldDelete(childEntity)
-					end
-					for _k, _v in children do
-						_callback_6(_v, _k, children)
+			local _result_1 = statesToDelete
+			if _result_1 ~= nil then
+				-- ▼ ReadonlyArray.forEach ▼
+				local _callback = function(state)
+					local _state = state
+					local entity = entities[_state]
+					if entity == nil then
+						return nil
 					end
-					-- ▲ ReadonlyMap.forEach ▲
+					self:worldDelete(entity)
 				end
-				self:worldSet(entity, parentComponent, nil)
-				self:worldSet(entity, parentEntityTrackerComponent, nil)
-			end
-			for _v in unhandledStringifiedEntities do
-				_callback_5(_v, _v, unhandledStringifiedEntities)
+				for _k, _v in _result_1 do
+					_callback(_v, _k - 1, _result_1)
+				end
+				-- ▲ ReadonlyArray.forEach ▲
 			end
-			-- ▲ ReadonlySet.forEach ▲
 		end
 		self:schedule(RunService.Heartbeat, function()
 			if not willUpdate then
@@ -940,23 +712,6 @@ do
 			updater()
 		end)
 	end
-	function Covenant:defineStaticEntity(_param)
-		local identityComponent = _param.identityComponent
-		local recipe = _param.recipe
-		local replicated = _param.replicated
-		self:checkComponentDefined(identityComponent)
-		self:defineComponentNetworkBehavior(identityComponent, replicated, false)
-		local states = recipe()
-		-- ▼ ReadonlyArray.forEach ▼
-		local _callback = function(state)
-			local entity = self:worldEntity()
-			self:worldSet(entity, identityComponent, state)
-		end
-		for _k, _v in states do
-			_callback(_v, _k - 1, states)
-		end
-		-- ▲ ReadonlyArray.forEach ▲
-	end
 	function Covenant:worldEntity()
 		return self._world:entity()
 	end

package/src/helpers.d.ts

@@ -1,13 +1,10 @@
 import { Discriminator } from "./hooks";
 
-export declare function turnSetWithIdentifierToMap<T extends defined>(
-    set: ReadonlySet<T>,
+export declare function turnArrayWithIdentifierToMap<T extends defined>(
+    array: ReadonlyArray<T>,
     getIdentifier: (state: T) => Discriminator,
 ): Map<defined, T>;
-export declare function compareMaps<
-    TKey extends Discriminator,
-    TValue extends defined,
->(
+export declare function compareMaps<TKey extends Discriminator, TValue extends defined>(
     previousMap: ReadonlyMap<TKey, TValue>,
     newMap: ReadonlyMap<TKey, TValue>,
 ): {

package/src/helpers.luau

@@ -1,6 +1,6 @@
 -- Compiled with roblox-ts v3.0.0
 -- Manually modified
-local function turnSetWithIdentifierToMap(set, getIdentifier)
+local function turnArrayWithIdentifierToMap(array, getIdentifier)
 	local newMap = {}
 	-- ▼ ReadonlyArray.forEach ▼
 	local _callback = function(value)
@@ -8,7 +8,7 @@ local function turnSetWithIdentifierToMap(set, getIdentifier)
 		local _value = value
 		newMap[identifier] = _value
 	end
-	for _v, _ in set do
+	for _k, _v in array do
 		_callback(_v)
 	end
 	-- ▲ ReadonlyArray.forEach ▲
@@ -66,6 +66,6 @@ local function compareMaps(previousMap, newMap)
 	}
 end
 return {
-	turnSetWithIdentifierToMap = turnSetWithIdentifierToMap,
+	turnArrayWithIdentifierToMap = turnArrayWithIdentifierToMap,
 	compareMaps = compareMaps,
 }