GitHub/Basalt
1
0
Fork 0
Code Issues 28 Pull Requests 3 Actions Packages Projects Releases 9 Wiki Activity

Refactor reactive framework #85

Merged
thesabinelim merged 5 commits from reactive-refactors into master 2023-05-18 02:02:29 +08:00
Conversation 0 Commits 5 Files Changed 3 +110 -151
3 changed files with 110 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Basalt/libraries/xmlParser.lua
View File

@@ -70,7 +70,7 @@ local XMLParser = {
if #stack > 1 then
error("XMLParser: unclosed " .. stack[#stack].tag)
end
return top
return top.children
end
}

14
Basalt/objects/Container.lua
View File

@@ -73,11 +73,15 @@ return function(name, basalt)
for event, _ in pairs(element:getRegisteredEvents()) do
self:addEvent(event, element)
end
if(element.init~=nil)then element:init() end
if(element.load~=nil)then element:load() end
if(element.draw~=nil)then element:draw() end
if (element.init~=nil) then
element:init()
end
if (element.load~=nil) then
element:load()
end
if (element.draw~=nil) then
element:draw()
end
return element
end

245
Basalt/plugins/reactive.lua
View File

@@ -1,35 +1,36 @@
local XMLParser = require("xmlParser")
local utils = require("utils")
local uuid = utils.uuid
local function maybeExecuteScript(nodeTree, renderContext)
for _, node in ipairs(nodeTree.children) do
if (node.tag == "script") then
return load(node.value, nil, "t", renderContext.env)()
local Layout = {
fromXML = function(text)
local nodes = XMLParser.parseText(text)
local script = nil
for index, node in ipairs(nodes) do
if (node.tag == "script") then
script = node.value
table.remove(nodes, index)
break
end
end
return {
nodes = nodes,
script = script
}
end
}
local executeScript = function(script, env)
return load(script, nil, "t", env)()
end
local function registerFunctionEvent(self, event, script, renderContext)
local eventEnv = renderContext.env
event(self, function(...)
eventEnv.event = {...}
local success, msg = pcall(load(script, nil, "t", eventEnv))
local registerFunctionEvent = function(object, event, script, env)
event(object, function(...)
local success, msg = pcall(load(script, nil, "t", env))
if not success then
error("XML Error: "..msg)
end
end)
end
local function registerFunctionEvents(self, node, events, renderContext)
for _, event in pairs(events) do
local expression = node.attributes[event]
if (expression ~= nil) then
registerFunctionEvent(self, self[event], expression .. "()", renderContext)
end
end
end
local currentEffect = nil
local clearEffectDependencies = function(effect)
@@ -45,13 +46,39 @@ end
return {
basalt = function(basalt)
local object = {
layout = function(path)
return {
path = path,
}
end,
local createObjectsFromXMLNode = function(node, env)
local layout = env[node.tag]
if (layout ~= nil) then
local props = {}
for prop, expression in pairs(node.attributes) do
props[prop] = load("return " .. expression, nil, "t", env)
end
return basalt.createObjectsFromLayout(layout, props)
end
local objectName = node.tag:gsub("^%l", string.upper)
local object = basalt:createObject(objectName, node.attributes["id"])
for attribute, expression in pairs(node.attributes) do
if (attribute:sub(1, 2) == "on") then
registerFunctionEvent(object, object[attribute], expression .. "()", env)
else
local update = function()
local value = load("return " .. expression, nil, "t", env)()
object:setProperty(attribute, value)
end
basalt.effect(update)
end
end
for _, child in ipairs(node.children) do
local childObjects = basalt.createObjectsFromXMLNode(child, env)
for _, childObject in ipairs(childObjects) do
object:addChild(childObject)
end
end
return {object}
end
local object = {
reactive = function(initialValue)
local value = initialValue
local observerEffects = {}
@@ -102,139 +129,67 @@ return {
setValue(computeFn())
end)
return getValue;
end
}
return object
end,
end,
VisualObject = function(base, basalt)
local object = {
setValuesByXMLData = function(self, node, renderContext)
renderContext.env[self:getName()] = self
for attribute, expression in pairs(node.attributes) do
local update = function()
local value = load("return " .. expression, nil, "t", renderContext.env)()
self:setProperty(attribute, value)
end
basalt.effect(update)
layout = function(path)
if (not fs.exists(path)) then
error("Can't open file " .. path)
end
registerFunctionEvents(self, node, {
"onClick",
"onClickUp",
"onHover",
"onScroll",
"onDrag",
"onKey",
"onKeyUp",
"onRelease",
"onChar",
"onGetFocus",
"onLoseFocus",
"onResize",
"onReposition",
"onEvent",
"onLeave"
}, renderContext)
return self
local f = fs.open(path, "r")
local text = f.readAll()
f.close()
return Layout.fromXML(text)
end,
}
return object
end,
ChangeableObject = function(base, basalt)
local object = {
setValuesByXMLData = function(self, node, renderContext)
base.setValuesByXMLData(self, node, renderContext)
registerFunctionEvent(self, node, {
"onChange"
}, renderContext)
return self
end,
createObjectsFromLayout = function(layout, props)
local env = _ENV
env.props = {}
local updateFns = {}
for prop, getFn in pairs(props) do
updateFns[prop] = basalt.derived(function()
return getFn()
end)
end
setmetatable(env.props, {
__index = function(_, k)
return updateFns[k]()
end
})
if (layout.script ~= nil) then
executeScript(layout.script, env)
end
local objects = {}
for _, node in ipairs(layout.nodes) do
local _objects = createObjectsFromXMLNode(node, env)
for _, object in ipairs(_objects) do
table.insert(objects, object)
end
end
return objects
end
}
return object
end,
Container = function(base, basalt)
local lastXMLReferences = {}
local function xmlDefaultValues(node, obj, renderContext)
if (obj~=nil) then
obj:setValuesByXMLData(node, renderContext)
end
end
local function addXMLObjectType(node, addFn, self, renderContext)
if (node ~= nil) then
if (node.attributes ~= nil) then
node = {node}
end
for _, v in pairs(node) do
local obj = addFn(self, v["@id"] or uuid())
lastXMLReferences[obj:getName()] = obj
xmlDefaultValues(v, obj, renderContext)
end
end
end
local function insertChildLayout(self, layout, node, renderContext)
local updateFns = {}
for prop, expression in pairs(node.attributes) do
updateFns[prop] = basalt.derived(function()
return load("return " .. expression, nil, "t", renderContext.env)()
end)
end
local props = {}
setmetatable(props, {
__index = function(_, k)
return updateFns[k]()
end
})
self:loadLayout(layout.path, props)
end
local object = {
setValuesByXMLData = function(self, node, renderContext)
lastXMLReferences = {}
base.setValuesByXMLData(self, node, renderContext)
local _OBJECTS = basalt.getObjects()
for _, child in pairs(node.children) do
local tagName = child.tag
if (tagName == "animation") then
addXMLObjectType(child, self.addAnimation, self, renderContext)
else
local layout = renderContext.env[tagName]
local objectKey = tagName:gsub("^%l", string.upper)
if (layout ~= nil) then
insertChildLayout(self, layout, child, renderContext)
elseif (_OBJECTS[objectKey] ~= nil) then
local addFn = self["add" .. objectKey]
addXMLObjectType(child, addFn, self, renderContext)
end
loadLayout = function(self, path, props)
local wrappedProps = {}
if (props == nil) then
props = {}
end
for prop, value in pairs(props) do
wrappedProps[prop] = function()
return value
end
end
end,
loadLayout = function(self, path, props)
if(fs.exists(path))then
local renderContext = {}
renderContext.env = _ENV
renderContext.env.props = props
local f = fs.open(path, "r")
local nodeTree = XMLParser.parseText(f.readAll())
f.close()
lastXMLReferences = {}
maybeExecuteScript(nodeTree, renderContext)
self:setValuesByXMLData(nodeTree, renderContext)
local layout = basalt.layout(path)
local objects = basalt.createObjectsFromLayout(layout, wrappedProps)
for _, object in ipairs(objects) do
self:addChild(object)
end
return self
end,
getXMLElements = function(self)
return lastXMLReferences
end,
end
}
return object
end