ari-party/rojo
1
0
Fork 0
forked from rojo-rbx/rojo
Code Pull Requests Activity

Plugin half of configMap

Browse Source
This commit is contained in:
Lucien Greathouse
2018-12-30 22:58:12 -08:00
parent b6a2b7dded
commit 474d877290
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/src/ApiContext.lua
View File

@@ -28,6 +28,7 @@ function ApiContext.new(baseUrl)
onMessageCallback = nil,
serverId = nil,
rootInstanceId = nil,
configMap = nil,
connected = false,
messageCursor = -1,
partitionRoutes = nil,
@@ -69,6 +70,7 @@ function ApiContext:connect()
self.connected = true
self.partitionRoutes = body.partitions
self.rootInstanceId = body.rootInstanceId
self.configMap = body.configMap
end)
end
@@ -126,7 +128,7 @@ function ApiContext:retrieveMessages()
for _, message in ipairs(body.messages) do
promise = promise:andThen(function()
return self.onMessageCalllback(message)
return self.onMessageCallback(message)
end)
end

27
plugin/src/Session.lua
View File

@@ -46,12 +46,15 @@ local function setProperty(instance, key, value)
end
end
-- TODO: Pull this from project configuration instead
local function shouldClearUnknown(instance)
return instance.ClassName ~= "DataModel" and instance.ClassName ~= "ReplicatedStorage"
local function shouldClearUnknown(id, configMap)
if configMap[id] then
return not configMap[id].ignoreUnknown
else
return true
end
end
local function reify(instanceData, instanceMap, id, parent)
local function reify(instanceData, instanceMap, configMap, id, parent)
local data = instanceData[id]
local instance = Instance.new(data.ClassName)
@@ -64,7 +67,7 @@ local function reify(instanceData, instanceMap, id, parent)
instance.Name = data.Name
for _, childId in ipairs(data.Children) do
reify(instanceData, instanceMap, childId, instance)
reify(instanceData, instanceMap, configMap, childId, instance)
end
setProperty(instance, "Parent", parent)
@@ -73,7 +76,7 @@ local function reify(instanceData, instanceMap, id, parent)
return instance
end
local function reconcile(instanceData, instanceMap, id, existingInstance)
local function reconcile(instanceData, instanceMap, configMap, id, existingInstance)
local data = instanceData[id]
assert(data.ClassName == existingInstance.ClassName)
@@ -108,13 +111,13 @@ local function reconcile(instanceData, instanceMap, id, existingInstance)
if existingChildInstance ~= nil then
unvisitedExistingChildren[existingChildInstance] = nil
reconcile(instanceData, instanceMap, childId, existingChildInstance)
reconcile(instanceData, instanceMap, configMap, childId, existingChildInstance)
else
reify(instanceData, instanceMap, childId, existingInstance)
reify(instanceData, instanceMap, configMap, childId, existingInstance)
end
end
if shouldClearUnknown(existingInstance) then
if shouldClearUnknown(id, configMap) then
for existingChildInstance in pairs(unvisitedExistingChildren) do
instanceMap:removeInstance(existingChildInstance)
existingChildInstance:Destroy()
@@ -165,7 +168,7 @@ function Session.new()
end
else
if instance ~= nil then
reconcile(response.instances, instanceMap, id, instance)
reconcile(response.instances, instanceMap, api.configMap, id, instance)
else
error("TODO: Crawl up to nearest parent, use that?")
end
@@ -179,8 +182,8 @@ function Session.new()
return api:read({api.rootInstanceId})
end)
:andThen(function(response)
reconcile(response.instances, instanceMap, api.rootInstanceId, game)
-- reify(response.instances, instanceMap, api.rootInstanceId, game.ReplicatedStorage)
reconcile(response.instances, instanceMap, api.configMap, api.rootInstanceId, game)
-- reify(response.instances, instanceMap, configMap, api.rootInstanceId, game.ReplicatedStorage)
return api:retrieveMessages()
end)
:catch(function(message)