roport 1.3.1 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "roport",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "A sync server for Roblox development. Works with the Roport Roblox Plugin. Features AI integration and full project sync.",
   "main": "src/server.js",
   "bin": {

package/src/server/RojoSyncPlugin.server.luau

@@ -602,7 +602,7 @@ local function pullChanges()
 		if data.changes and #data.changes > 0 then
 			print("Roport: Pulling " .. #data.changes .. " files...")
 			for _, change in ipairs(data.changes) do
-				applyUpdate(change.filePath, change.content)
+				applyUpdate(change.filePath, change.content, change.absolutePath)
 			end
 			showToast("Updated " .. #data.changes .. " files", "success")
 		else
@@ -746,7 +746,7 @@ end
 -- Two-Way Sync Logic
 local function findInstanceByPath(path)
 	-- Remove extension
-	local cleanPath = path:gsub("%.server%.luau$", ""):gsub("%.client%.luau$", ""):gsub("%.luau$", ""):gsub("/init%.meta%.json$", "")
+	local cleanPath = path:gsub("%.server%.luau$", ""):gsub("%.client%.luau$", ""):gsub("%.luau$", ""):gsub("%.server%.lua$", ""):gsub("%.client%.lua$", ""):gsub("%.lua$", ""):gsub("/init%.meta%.json$", "")
 	
 	local parts = cleanPath:split("/")
 	if parts[1] ~= "src" then return nil end
@@ -779,7 +779,7 @@ local function findInstanceByPath(path)
 end
 
 local function createInstanceByPath(path, content)
-	local cleanPath = path:gsub("%.server%.luau$", ""):gsub("%.client%.luau$", ""):gsub("%.luau$", ""):gsub("/init%.meta%.json$", "")
+	local cleanPath = path:gsub("%.server%.luau$", ""):gsub("%.client%.luau$", ""):gsub("%.luau$", ""):gsub("%.server%.lua$", ""):gsub("%.client%.lua$", ""):gsub("%.lua$", ""):gsub("/init%.meta%.json$", "")
 	local parts = cleanPath:split("/")
 	if parts[1] ~= "src" then return nil end
 	
@@ -807,9 +807,9 @@ local function createInstanceByPath(path, content)
 			local className = "Folder"
 			
 			if isLast then
-				if path:match("%.server%.luau$") then className = "Script"
-				elseif path:match("%.client%.luau$") then className = "LocalScript"
-				elseif path:match("%.luau$") then className = "ModuleScript"
+				if path:match("%.server%.luau$") or path:match("%.server%.lua$") then className = "Script"
+				elseif path:match("%.client%.luau$") or path:match("%.client%.lua$") then className = "LocalScript"
+				elseif path:match("%.luau$") or path:match("%.lua$") then className = "ModuleScript"
 				elseif path:match("%.json$") then
 					-- Try to peek className from content
 					local success, data = pcall(function() return HttpService:JSONDecode(content) end)
@@ -834,7 +834,47 @@ local function createInstanceByPath(path, content)
 	return current
 end
 
-local function applyUpdate(filePath, content)
+local function applyUpdate(filePath, content, absolutePath)
+	-- Handle RBXMX
+	if filePath:match("%.rbxmx$") and absolutePath then
+		local success, model = pcall(function()
+			return game:GetService("InsertService"):LoadLocalAsset(absolutePath)
+		end)
+		
+		if success and model then
+			local parentPath = filePath:match("(.+)/[^/]+$")
+			local parentInst = findInstanceByPath(parentPath or "")
+			
+			if not parentInst and parentPath then
+				parentInst = createInstanceByPath(parentPath, "")
+			end
+			
+			if parentInst then
+				local children = model:GetChildren()
+				if #children > 0 then
+					local newObj = children[1]
+					local name = filePath:match("([^/]+)%.rbxmx$")
+					local existing = parentInst:FindFirstChild(name)
+					
+					if existing then
+						newObj.Name = existing.Name
+						newObj.Parent = existing.Parent
+						existing:Destroy()
+					else
+						newObj.Name = name
+						newObj.Parent = parentInst
+					end
+					print("Roport: Imported " .. newObj.Name .. " from " .. filePath)
+				end
+			else
+				warn("Roport: Could not find parent for " .. filePath)
+			end
+		else
+			warn("Roport: Failed to load RBXMX: " .. tostring(model))
+		end
+		return
+	end
+
 	local inst = findInstanceByPath(filePath)
 	if not inst then 
 		inst = createInstanceByPath(filePath, content)
@@ -894,7 +934,7 @@ task.spawn(function()
 				if data.changes and #data.changes > 0 then
 					print("Roport: Received " .. #data.changes .. " updates from VS Code")
 					for _, change in ipairs(data.changes) do
-						applyUpdate(change.filePath, change.content)
+						applyUpdate(change.filePath, change.content, change.absolutePath)
 					end
 				end
 			else

package/src/server.js

@@ -195,9 +195,9 @@ function startServer(port) {
                         const stat = await fs.stat(fullPath);
                         if (stat.isFile()) {
                             const content = await fs.readFile(fullPath, 'utf8');
-                            response.changes.push({ filePath, content });
+                            response.changes.push({ filePath, absolutePath: fullPath, content });
                         } else if (stat.isDirectory()) {
-                            response.changes.push({ filePath, isDirectory: true });
+                            response.changes.push({ filePath, absolutePath: fullPath, isDirectory: true });
                         }
                     } else {
                         // File Does Not Exist -> Deletion

package/templates/default/RoportSyncPlugin.rbxmx

@@ -12,7 +12,7 @@ local RunService = game:GetService("RunService")
 local TweenService = game:GetService("TweenService")
 local ScriptEditorService = game:GetService("ScriptEditorService")
 
-print("Roport Plugin v1.3.1 Loaded (Project Config Support)")
+print("Roport Plugin v1.3.2 Loaded (Project Config Support)")
 
 -- Prevent running as a normal script
 if not plugin then return end
@@ -685,7 +685,7 @@ local function pullChanges()
 		if data.changes and #data.changes > 0 then
 			print("Roport: Pulling " .. #data.changes .. " files...")
 			for _, change in ipairs(data.changes) do
-				applyUpdate(change.filePath, change.content)
+				applyUpdate(change.filePath, change.content, change.absolutePath)
 			end
 			showToast("Updated " .. #data.changes .. " files", "success")
 		else
@@ -960,97 +960,8 @@ local function findInstanceByPath(path)
 	return nil
 end
 
--- XML Parser for .rbxmx support
-local function parseRbxmx(content)
-	local roots = {}
-	local stack = {}
-	local current = nil
-	
-	-- Helper to decode entities
-	local function decode(s)
-		return s:gsub("&lt;", "<"):gsub("&gt;", ">"):gsub("&quot;", '"'):gsub("&apos;", "'"):gsub("&amp;", "&")
-	end
-	
-	-- 1. Extract Items
-	-- We iterate through the string finding <Item ...> and </Item>
-	-- This is a simplified parser that assumes well-formed Roblox XML
-	
-	local pos = 1
-	while true do
-		local s, e, tag, attrs = content:find("<Item%s+([^>]+)>", pos)
-		local sEnd, eEnd = content:find("</Item>", pos)
-		
-		if not s and not sEnd then break end
-		
-		if s and (not sEnd or s < sEnd) then
-			-- Found start tag
-			local class = attrs:match('class="([^"]+)"')
-			local inst = Instance.new(class or "Folder")
-			
-			-- Parse Properties immediately following
-			local propStart, propEnd = content:find("<Properties>", e)
-			if propStart then
-				local propContentEnd = content:find("</Properties>", propEnd)
-				if propContentEnd then
-					local propBlock = content:sub(propEnd + 1, propContentEnd - 1)
-					
-					-- Parse properties
-					for pType, pName, pVal in propBlock:gmatch("<(%w+)%s+name=\"([^\"]+)\">([^<]*)</%1>") do
-						pcall(function()
-							if pType == "string" then inst[pName] = decode(pVal)
-							elseif pType == "bool" then inst[pName] = (pVal == "true")
-							elseif pType == "float" or pType == "double" or pType == "int" or pType == "int64" then inst[pName] = tonumber(pVal)
-							elseif pType == "Color3" or pType == "Color3uint8" then
-								-- Complex types usually have nested tags in newer format, or text in older
-								-- This simple parser handles basic types. Complex types need more logic.
-							end
-						end)
-					end
-					
-					-- Handle nested tags for complex properties (Vector3, Color3, etc)
-					-- <Vector3 name="Position"><X>0</X><Y>10</Y><Z>0</Z></Vector3>
-					for pType, pName, pInner in propBlock:gmatch("<(%w+)%s+name=\"([^\"]+)\">([%s%S]-)</%1>") do
-						pcall(function()
-							if pType == "Vector3" then
-								local x = tonumber(pInner:match("<X>(.-)</X>"))
-								local y = tonumber(pInner:match("<Y>(.-)</Y>"))
-								local z = tonumber(pInner:match("<Z>(.-)</Z>"))
-								inst[pName] = Vector3.new(x, y, z)
-							elseif pType == "Color3" then
-								local r = tonumber(pInner:match("<R>(.-)</R>"))
-								local g = tonumber(pInner:match("<G>(.-)</G>"))
-								local b = tonumber(pInner:match("<B>(.-)</B>"))
-								inst[pName] = Color3.new(r, g, b)
-							elseif pType == "UDim2" then
-								local xs = tonumber(pInner:match("<XS>(.-)</XS>"))
-								local xo = tonumber(pInner:match("<XO>(.-)</XO>"))
-								local ys = tonumber(pInner:match("<YS>(.-)</YS>"))
-								local yo = tonumber(pInner:match("<YO>(.-)</YO>"))
-								inst[pName] = UDim2.new(xs, xo, ys, yo)
-							end
-						end)
-					end
-				end
-			end
-			
-			if current then
-				inst.Parent = current
-			else
-				table.insert(roots, inst)
-			end
-			
-			table.insert(stack, current)
-			current = inst
-			pos = e + 1
-		else
-			-- Found end tag
-			current = table.remove(stack)
-			pos = eEnd + 1
-		end
-	end
-	
-	return roots
-end
+-- XML Parser for .rbxmx support (Deprecated/Unused - using InsertService instead)
+-- local function parseRbxmx(content) ... end
 
 local function createInstanceByPath(path, content)
 	local isInit = path:match("/init%.luau$") or path:match("/init%.server%.luau$") or path:match("/init%.client%.luau$") or path:match("/init%.lua$") or path:match("/init%.server%.lua$") or path:match("/init%.client%.lua$")
@@ -1135,7 +1046,7 @@ local function createInstanceByPath(path, content)
 	return nil
 end
 
-local function applyUpdate(filePath, content)
+local function applyUpdate(filePath, content, absolutePath)
 	local inst = findInstanceByPath(filePath)
 	if not inst then 
 		inst = createInstanceByPath(filePath, content)
@@ -1146,21 +1057,24 @@ local function applyUpdate(filePath, content)
 		inst.Value = content
 	elseif filePath:match("%.json$") and not filePath:match("%.meta%.json$") and not filePath:match("%.model%.json$") and inst:IsA("ModuleScript") then
 		inst.Source = "return " .. content
-	elseif filePath:match("%.rbxmx$") then
-		-- Handle Model Update
-		local roots = parseRbxmx(content)
-		if #roots > 0 then
-			local newInst = roots[1]
-			newInst.Name = inst.Name -- Keep name from path
-			newInst.Parent = inst.Parent
-			
-			-- Move children that are NOT part of the model content but exist in the tree?
-			-- Actually, if we replace the model, we replace its children too usually.
-			-- But if the user has scripts inside the model in the file system, they should be preserved?
-			-- Rojo usually treats the model file as the source of truth for that instance and its children.
-			
-			inst:Destroy()
-			inst = newInst
+	elseif filePath:match("%.rbxmx$") and absolutePath then
+		-- Handle Model Update via InsertService
+		local success, model = pcall(function()
+			return game:GetService("InsertService"):LoadLocalAsset(absolutePath)
+		end)
+		
+		if success and model then
+			local children = model:GetChildren()
+			if #children > 0 then
+				local newObj = children[1]
+				newObj.Name = inst.Name
+				newObj.Parent = inst.Parent
+				inst:Destroy()
+				inst = newObj
+				print("Roport: Imported " .. newObj.Name .. " from " .. filePath)
+			end
+		else
+			warn("Roport: Failed to load RBXMX: " .. tostring(model))
 		end
 	elseif filePath:match("%.model%.json$") or filePath:match("%.meta%.json$") then
 		local success, data = pcall(function() return HttpService:JSONDecode(content) end)
@@ -1290,7 +1204,7 @@ task.spawn(function()
 				if data.changes and #data.changes > 0 then
 					print("Roport: Received " .. #data.changes .. " updates from VS Code")
 					for _, change in ipairs(data.changes) do
-						applyUpdate(change.filePath, change.content)
+						applyUpdate(change.filePath, change.content, change.absolutePath)
 					end
 				end
 			else