@rbxts/covenant 2.0.1 → 2.1.0

package/package.json

@@ -1,48 +1,48 @@
-{
-    "name": "@rbxts/covenant",
-    "version": "2.0.1",
-    "main": "src/init.luau",
-    "scripts": {
-        "build": "rbxtsc",
-        "watch": "rbxtsc -w",
-        "prepublishOnly": "npm run build"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/cuberootmctoasted/covenant.git"
-    },
-    "keywords": [],
-    "author": "",
-    "license": "ISC",
-    "bugs": {
-        "url": "https://github.com/cuberootmctoasted/covenant/issues"
-    },
-    "homepage": "https://github.com/cuberootmctoasted/covenant#readme",
-    "description": "",
-    "types": "src/covenant.d.ts",
-    "files": [
-        "src",
-        "!**/*.tsbuildinfo"
-    ],
-    "publishConfig": {
-        "access": "public"
-    },
-    "devDependencies": {
-        "@rbxts/compiler-types": "^3.0.0-types.0",
-        "@rbxts/covenant": "^1.4.1",
-        "@rbxts/types": "^1.0.860",
-        "@typescript-eslint/eslint-plugin": "^8.35.0",
-        "@typescript-eslint/parser": "^8.35.0",
-        "eslint": "^8.57.1",
-        "eslint-config-prettier": "^10.1.5",
-        "eslint-plugin-prettier": "^5.5.1",
-        "eslint-plugin-roblox-ts": "^0.0.36",
-        "prettier": "^3.6.1",
-        "roblox-ts": "^3.0.0",
-        "typescript": "^5.8.3"
-    },
-    "dependencies": {
-        "@rbxts/jecs": "^0.6.1",
-        "@rbxts/services": "^1.5.5"
-    }
-}
+{
+    "name": "@rbxts/covenant",
+    "version": "2.1.0",
+    "main": "src/init.luau",
+    "scripts": {
+        "build": "rbxtsc",
+        "watch": "rbxtsc -w",
+        "prepublishOnly": "npm run build"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/cuberootmctoasted/covenant.git"
+    },
+    "keywords": [],
+    "author": "",
+    "license": "ISC",
+    "bugs": {
+        "url": "https://github.com/cuberootmctoasted/covenant/issues"
+    },
+    "homepage": "https://github.com/cuberootmctoasted/covenant#readme",
+    "description": "",
+    "types": "src/covenant.d.ts",
+    "files": [
+        "src",
+        "!**/*.tsbuildinfo"
+    ],
+    "publishConfig": {
+        "access": "public"
+    },
+    "devDependencies": {
+        "@rbxts/compiler-types": "^3.0.0-types.0",
+        "@rbxts/covenant": "^2.1.0",
+        "@rbxts/types": "^1.0.890",
+        "@typescript-eslint/eslint-plugin": "^8.46.4",
+        "@typescript-eslint/parser": "^8.46.4",
+        "eslint": "^9.39.1",
+        "eslint-config-prettier": "^10.1.8",
+        "eslint-plugin-prettier": "^5.5.4",
+        "eslint-plugin-roblox-ts": "^1.2.1",
+        "prettier": "^3.6.2",
+        "roblox-ts": "^3.0.0",
+        "typescript": "^5.9.3"
+    },
+    "dependencies": {
+        "@rbxts/jecs": "^0.9.0",
+        "@rbxts/services": "^1.6.0"
+    }
+}

package/src/covenant.d.ts

@@ -26,6 +26,8 @@ export declare class Covenant {
     private started;
     private stringifiedComponentSubscribers;
     private stringifiedComponentValidators;
+    private clientToServerEntityMap;
+    private serverToClientEntityMap;
     private requestPayloadSend;
     private requestPayloadConnect;
     private replicationSend;
@@ -71,7 +73,7 @@ export declare class Covenant {
         } | undefined;
     }): void;
     private worldEntity;
-    worldQuery<T extends Id[]>(...components: T): import("@rbxts/jecs").Query<import("@rbxts/jecs").InferComponents<T>>;
+    worldQuery<T extends Id[]>(...components: T): import("@rbxts/jecs").Query<T>;
     worldHas(entity: Entity, ...components: Id[]): boolean;
     worldGet<T extends [Id] | [Id, Id] | [Id, Id, Id] | [Id, Id, Id, Id]>(entity: Entity, ...components: T): import("@rbxts/jecs").FlattenTuple<[...import("@rbxts/jecs").Nullable<import("@rbxts/jecs").InferComponents<T>>]>;
     worldContains(entity: Entity): boolean;

package/src/covenant.luau

@@ -4,7 +4,7 @@ local exports = {}
 local _jecs = TS.import(script, TS.getModule(script, "@rbxts", "jecs").jecs)
 local ChildOf = _jecs.ChildOf
 local pair = _jecs.pair
-local World = _jecs.World
+local world = _jecs.world
 local _services = TS.import(script, TS.getModule(script, "@rbxts", "services"))
 local Players = _services.Players
 local RunService = _services.RunService
@@ -19,16 +19,6 @@ for _k, _v in TS.import(script, TS.getModule(script, "@rbxts", "jecs").jecs) or
 end
 -- Map<Entity, Delete | Map<Component, state | Remove>>
 -- Map<Component, Map<Entity, state | Remove>>
-local function createWorldWithRange(minClientEntity, maxClientEntity)
-	local world = World.new()
-	if RunService:IsClient() then
-		world:range(minClientEntity, maxClientEntity)
-	end
-	if RunService:IsServer() then
-		world:range(maxClientEntity)
-	end
-	return world
-end
 local Covenant
 do
 	Covenant = setmetatable({}, {
@@ -50,7 +40,7 @@ do
 		local replicationSendAll = _param.replicationSendAll
 		local predictionSend = _param.predictionSend
 		local predictionConnect = _param.predictionConnect
-		self._world = createWorldWithRange(1000, 20000)
+		self._world = world()
 		self.systems = EventMap.new()
 		self.worldChangesForReplication = {}
 		self.worldChangesForPrediction = {}
@@ -60,6 +50,8 @@ do
 		self.started = false
 		self.stringifiedComponentSubscribers = {}
 		self.stringifiedComponentValidators = {}
+		self.clientToServerEntityMap = {}
+		self.serverToClientEntityMap = {}
 		self.logging = logging
 		self.requestPayloadSend = requestPayloadSend
 		self.requestPayloadConnect = requestPayloadConnect
@@ -245,10 +237,29 @@ do
 			-- ▼ ReadonlyArray.forEach ▼
 			local _callback = function(worldChanges)
 				-- ▼ ReadonlyMap.forEach ▼
-				local _callback_1 = function(entityData, stringifiedEntity)
-					local entity = tonumber(stringifiedEntity)
+				local _callback_1 = function(entityData, stringifiedServerEntity)
+					local _serverToClientEntityMap = self.serverToClientEntityMap
+					local _stringifiedServerEntity = stringifiedServerEntity
+					local entity = _serverToClientEntityMap[_stringifiedServerEntity]
+					if entity == nil then
+						entity = self._world:entity()
+						local _serverToClientEntityMap_1 = self.serverToClientEntityMap
+						local _stringifiedServerEntity_1 = stringifiedServerEntity
+						local _entity = entity
+						_serverToClientEntityMap_1[_stringifiedServerEntity_1] = _entity
+						local _clientToServerEntityMap = self.clientToServerEntityMap
+						local _arg0 = tostring(entity)
+						local _arg1 = tonumber(stringifiedServerEntity)
+						_clientToServerEntityMap[_arg0] = _arg1
+					end
 					if entityData == Delete then
 						self:worldDelete(entity)
+						local _serverToClientEntityMap_1 = self.serverToClientEntityMap
+						local _stringifiedServerEntity_1 = stringifiedServerEntity
+						_serverToClientEntityMap_1[_stringifiedServerEntity_1] = nil
+						local _clientToServerEntityMap = self.clientToServerEntityMap
+						local _arg0 = tostring(entity)
+						_clientToServerEntityMap[_arg0] = nil
 						return nil
 					end
 					-- ▼ ReadonlyMap.forEach ▼
@@ -349,9 +360,6 @@ do
 		if doNotReconcile == nil then
 			doNotReconcile = false
 		end
-		if not self:worldContains(entity) then
-			self._world:entity(entity)
-		end
 		local lastState = self:worldGet(entity, component)
 		if newState == lastState then
 			return nil
@@ -380,53 +388,61 @@ do
 		if doNotReconcile then
 			return nil
 		end
-		local _replicatedStringifiedComponents = self.replicatedStringifiedComponents
-		local _arg0_1 = tostring(component)
-		if _replicatedStringifiedComponents[_arg0_1] ~= nil then
+		local _condition = RunService:IsServer()
+		if _condition then
+			local _replicatedStringifiedComponents = self.replicatedStringifiedComponents
+			local _arg0_1 = tostring(component)
+			_condition = _replicatedStringifiedComponents[_arg0_1] ~= nil
+		end
+		if _condition then
 			local _worldChangesForReplication = self.worldChangesForReplication
-			local _arg0_2 = tostring(entity)
-			local entityChanges = _worldChangesForReplication[_arg0_2]
+			local _arg0_1 = tostring(entity)
+			local entityChanges = _worldChangesForReplication[_arg0_1]
 			if entityChanges == nil then
 				entityChanges = {}
 				local _worldChangesForReplication_1 = self.worldChangesForReplication
-				local _arg0_3 = tostring(entity)
+				local _arg0_2 = tostring(entity)
 				local _entityChanges = entityChanges
-				_worldChangesForReplication_1[_arg0_3] = _entityChanges
+				_worldChangesForReplication_1[_arg0_2] = _entityChanges
 			end
 			if entityChanges ~= Delete then
 				local _entityChanges = entityChanges
 				local _exp = tostring(component)
-				local _condition = newState
-				if _condition == nil then
-					_condition = Remove
+				local _condition_1 = newState
+				if _condition_1 == nil then
+					_condition_1 = Remove
 				end
-				_entityChanges[_exp] = _condition
+				_entityChanges[_exp] = _condition_1
 			end
 		end
-		local _condition = RunService:IsClient()
-		if _condition then
+		local _condition_1 = RunService:IsClient()
+		if _condition_1 then
 			local _predictedStringifiedComponents = self.predictedStringifiedComponents
-			local _arg0_2 = tostring(component)
-			_condition = _predictedStringifiedComponents[_arg0_2] ~= nil
+			local _arg0_1 = tostring(component)
+			_condition_1 = _predictedStringifiedComponents[_arg0_1] ~= nil
 		end
-		if _condition then
+		if _condition_1 then
 			local _worldChangesForPrediction = self.worldChangesForPrediction
-			local _arg0_2 = tostring(component)
-			local componentChanges = _worldChangesForPrediction[_arg0_2]
+			local _arg0_1 = tostring(component)
+			local componentChanges = _worldChangesForPrediction[_arg0_1]
 			if componentChanges == nil then
 				componentChanges = {}
 				local _worldChangesForPrediction_1 = self.worldChangesForPrediction
-				local _arg0_3 = tostring(component)
+				local _arg0_2 = tostring(component)
 				local _componentChanges = componentChanges
-				_worldChangesForPrediction_1[_arg0_3] = _componentChanges
+				_worldChangesForPrediction_1[_arg0_2] = _componentChanges
 			end
+			local _clientToServerEntityMap = self.clientToServerEntityMap
+			local _arg0_2 = tostring(entity)
+			local serverEntity = _clientToServerEntityMap[_arg0_2]
+			assert(serverEntity ~= 0 and serverEntity == serverEntity and serverEntity, "This entity should exist.")
 			local _componentChanges = componentChanges
-			local _exp = tostring(entity)
-			local _condition_1 = newState
-			if _condition_1 == nil then
-				_condition_1 = Remove
+			local _exp = tostring(serverEntity)
+			local _condition_2 = newState
+			if _condition_2 == nil then
+				_condition_2 = Remove
 			end
-			_componentChanges[_exp] = _condition_1
+			_componentChanges[_exp] = _condition_2
 		end
 	end
 	function Covenant:subscribeComponent(component, subscriber)
@@ -470,9 +486,11 @@ do
 		-- ▼ ReadonlySet.forEach ▼
 		local _callback = function(entityToDelete)
 			self._world:delete(entityToDelete)
-			local _worldChangesForReplication = self.worldChangesForReplication
-			local _arg0 = tostring(entityToDelete)
-			_worldChangesForReplication[_arg0] = Delete
+			if RunService:IsServer() then
+				local _worldChangesForReplication = self.worldChangesForReplication
+				local _arg0 = tostring(entityToDelete)
+				_worldChangesForReplication[_arg0] = Delete
+			end
 		end
 		for _v in processed do
 			_callback(_v, _v, processed)

package/src/helpers.d.ts

@@ -1,21 +0,0 @@
-import { Discriminator } from "./hooks";
-
-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>(
-    previousMap: ReadonlyMap<TKey, TValue>,
-    newMap: ReadonlyMap<TKey, TValue>,
-): {
-    entriesAdded: {
-        key: TKey;
-        value: TValue;
-    }[];
-    entriesChanged: {
-        key: TKey;
-        value: TValue;
-        previousValue: TValue;
-    }[];
-    keysRemoved: TKey[];
-};

package/src/helpers.luau

@@ -1,71 +0,0 @@
--- Compiled with roblox-ts v3.0.0
--- Manually modified
-local function turnArrayWithIdentifierToMap(array, getIdentifier)
-	local newMap = {}
-	-- ▼ ReadonlyArray.forEach ▼
-	local _callback = function(value)
-		local identifier = getIdentifier(value)
-		local _value = value
-		newMap[identifier] = _value
-	end
-	for _k, _v in array do
-		_callback(_v)
-	end
-	-- ▲ ReadonlyArray.forEach ▲
-	return newMap
-end
-local function compareMaps(previousMap, newMap)
-	local entriesAdded = {}
-	local entriesChanged = {}
-	local keysRemoved = {}
-	-- ▼ ReadonlyMap.forEach ▼
-	local _callback = function(value, key)
-		local _previousMap = previousMap
-		local _key = key
-		if not (_previousMap[_key] ~= nil) then
-			local _arg0 = {
-				key = key,
-				value = value,
-			}
-			table.insert(entriesAdded, _arg0)
-		else
-			local _previousMap_1 = previousMap
-			local _key_1 = key
-			local previousValue = _previousMap_1[_key_1]
-			if previousValue ~= value then
-				local _arg0 = {
-					key = key,
-					value = value,
-					previousValue = previousValue,
-				}
-				table.insert(entriesChanged, _arg0)
-			end
-		end
-	end
-	for _k, _v in newMap do
-		_callback(_v, _k, newMap)
-	end
-	-- ▲ ReadonlyMap.forEach ▲
-	-- ▼ ReadonlyMap.forEach ▼
-	local _callback_1 = function(_, key)
-		local _newMap = newMap
-		local _key = key
-		if not (_newMap[_key] ~= nil) then
-			local _key_1 = key
-			table.insert(keysRemoved, _key_1)
-		end
-	end
-	for _k, _v in previousMap do
-		_callback_1(_v, _k, previousMap)
-	end
-	-- ▲ ReadonlyMap.forEach ▲
-	return {
-		entriesAdded = entriesAdded,
-		entriesChanged = entriesChanged,
-		keysRemoved = keysRemoved,
-	}
-end
-return {
-	turnArrayWithIdentifierToMap = turnArrayWithIdentifierToMap,
-	compareMaps = compareMaps,
-}