From 815b383b5dada3e74e3815bf1a0c01825a5a8165 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Feb 2025 18:40:59 +0000 Subject: [PATCH] Update config, LuaLS definitions, bundle and changelog --- config.lua | 252 ++++++++++++++++++++++----------------------- release/basalt.lua | 48 ++++++++- 2 files changed, 172 insertions(+), 128 deletions(-) diff --git a/config.lua b/config.lua index 16011b6..2113892 100644 --- a/config.lua +++ b/config.lua @@ -1,160 +1,160 @@ return { ["files"] = { - ["src/libraries/expect.lua"] = { - ["path"] = "libraries/expect.lua", - ["name"] = "expect", - }, - ["src/elements/Table.lua"] = { - ["path"] = "elements/Table.lua", - ["name"] = "Table", - }, ["src/plugins/benchmark.lua"] = { - ["path"] = "plugins/benchmark.lua", ["name"] = "benchmark", - }, - ["src/elements/Container.lua"] = { - ["path"] = "elements/Container.lua", - ["name"] = "Container", - }, - ["src/elements/Program.lua"] = { - ["path"] = "elements/Program.lua", - ["name"] = "Program", - }, - ["src/libraries/utils.lua"] = { - ["path"] = "libraries/utils.lua", - ["name"] = "utils", - }, - ["src/elements/BaseFrame.lua"] = { - ["path"] = "elements/BaseFrame.lua", - ["name"] = "BaseFrame", - }, - ["src/libraries/colorHex.lua"] = { - ["path"] = "libraries/colorHex.lua", - ["name"] = "colorHex", - }, - ["src/elements/ProgressBar.lua"] = { - ["path"] = "elements/ProgressBar.lua", - ["name"] = "ProgressBar", - }, - ["src/elements/Checkbox.lua"] = { - ["path"] = "elements/Checkbox.lua", - ["name"] = "Checkbox", - }, - ["src/elements/Scrollbar.lua"] = { - ["path"] = "elements/Scrollbar.lua", - ["name"] = "Scrollbar", - }, - ["src/elements/Flexbox.lua"] = { - ["path"] = "elements/Flexbox.lua", - ["name"] = "Flexbox", - }, - ["src/elements/Frame.lua"] = { - ["path"] = "elements/Frame.lua", - ["name"] = "Frame", - }, - ["src/elements/Slider.lua"] = { - ["path"] = "elements/Slider.lua", - ["name"] = "Slider", - }, - ["src/elements/Label.lua"] = { - ["path"] = "elements/Label.lua", - ["name"] = "Label", - }, - ["src/render.lua"] = { - ["path"] = "render.lua", - ["name"] = "render", - }, - ["src/plugins/pluginTemplate.lua"] = { - ["path"] = "plugins/pluginTemplate.lua", - ["name"] = "pluginTemplate", - }, - ["src/elementManager.lua"] = { - ["path"] = "elementManager.lua", - ["name"] = "elementManager", - }, - ["src/plugins/reactive.lua"] = { - ["path"] = "plugins/reactive.lua", - ["name"] = "reactive", - }, - ["src/plugins/xml.lua"] = { - ["path"] = "plugins/xml.lua", - ["name"] = "xml", + ["path"] = "plugins/benchmark.lua", }, ["src/elements/Dropdown.lua"] = { - ["path"] = "elements/Dropdown.lua", ["name"] = "Dropdown", + ["path"] = "elements/Dropdown.lua", + }, + ["src/plugins/reactive.lua"] = { + ["name"] = "reactive", + ["path"] = "plugins/reactive.lua", }, ["src/errorManager.lua"] = { - ["path"] = "errorManager.lua", ["name"] = "errorManager", + ["path"] = "errorManager.lua", }, - ["src/elements/List.lua"] = { - ["path"] = "elements/List.lua", - ["name"] = "List", - }, - ["src/propertySystem.lua"] = { - ["path"] = "propertySystem.lua", - ["name"] = "propertySystem", - }, - ["src/elements/Input.lua"] = { - ["path"] = "elements/Input.lua", - ["name"] = "Input", - }, - ["src/log.lua"] = { - ["path"] = "log.lua", - ["name"] = "log", + ["src/elements/Checkbox.lua"] = { + ["name"] = "Checkbox", + ["path"] = "elements/Checkbox.lua", }, ["src/plugins/animation.lua"] = { - ["path"] = "plugins/animation.lua", ["name"] = "animation", - }, - ["src/elements/TextBox.lua"] = { - ["path"] = "elements/TextBox.lua", - ["name"] = "TextBox", - }, - ["src/elements/Button.lua"] = { - ["path"] = "elements/Button.lua", - ["name"] = "Button", + ["path"] = "plugins/animation.lua", }, ["src/main.lua"] = { - ["path"] = "main.lua", ["name"] = "main", - }, - ["src/elements/BaseElement.lua"] = { - ["path"] = "elements/BaseElement.lua", - ["name"] = "BaseElement", + ["path"] = "main.lua", }, ["src/elements/VisualElement.lua"] = { - ["path"] = "elements/VisualElement.lua", ["name"] = "VisualElement", + ["path"] = "elements/VisualElement.lua", }, - ["src/elements/Menu.lua"] = { - ["path"] = "elements/Menu.lua", - ["name"] = "Menu", + ["src/libraries/expect.lua"] = { + ["name"] = "expect", + ["path"] = "libraries/expect.lua", }, - ["src/plugins/debug.lua"] = { - ["path"] = "plugins/debug.lua", - ["name"] = "debug", - }, - ["src/plugins/state.lua"] = { - ["path"] = "plugins/state.lua", - ["name"] = "state", - }, - ["src/LuaLS.lua"] = { - ["path"] = "LuaLS.lua", - ["name"] = "LuaLS", + ["src/elements/ProgressBar.lua"] = { + ["name"] = "ProgressBar", + ["path"] = "elements/ProgressBar.lua", }, ["src/init.lua"] = { - ["path"] = "init.lua", ["name"] = "init", + ["path"] = "init.lua", + }, + ["src/elements/List.lua"] = { + ["name"] = "List", + ["path"] = "elements/List.lua", + }, + ["src/elements/BaseFrame.lua"] = { + ["name"] = "BaseFrame", + ["path"] = "elements/BaseFrame.lua", }, ["src/plugins/theme.lua"] = { - ["path"] = "plugins/theme.lua", ["name"] = "theme", + ["path"] = "plugins/theme.lua", + }, + ["src/elements/Slider.lua"] = { + ["name"] = "Slider", + ["path"] = "elements/Slider.lua", + }, + ["src/elements/Flexbox.lua"] = { + ["name"] = "Flexbox", + ["path"] = "elements/Flexbox.lua", + }, + ["src/elements/BaseElement.lua"] = { + ["name"] = "BaseElement", + ["path"] = "elements/BaseElement.lua", + }, + ["src/elements/Input.lua"] = { + ["name"] = "Input", + ["path"] = "elements/Input.lua", + }, + ["src/elementManager.lua"] = { + ["name"] = "elementManager", + ["path"] = "elementManager.lua", + }, + ["src/libraries/colorHex.lua"] = { + ["name"] = "colorHex", + ["path"] = "libraries/colorHex.lua", + }, + ["src/LuaLS.lua"] = { + ["name"] = "LuaLS", + ["path"] = "LuaLS.lua", + }, + ["src/log.lua"] = { + ["name"] = "log", + ["path"] = "log.lua", + }, + ["src/elements/Button.lua"] = { + ["name"] = "Button", + ["path"] = "elements/Button.lua", + }, + ["src/elements/TextBox.lua"] = { + ["name"] = "TextBox", + ["path"] = "elements/TextBox.lua", }, ["src/elements/Tree.lua"] = { - ["path"] = "elements/Tree.lua", ["name"] = "Tree", + ["path"] = "elements/Tree.lua", + }, + ["src/plugins/debug.lua"] = { + ["name"] = "debug", + ["path"] = "plugins/debug.lua", + }, + ["src/libraries/utils.lua"] = { + ["name"] = "utils", + ["path"] = "libraries/utils.lua", + }, + ["src/propertySystem.lua"] = { + ["name"] = "propertySystem", + ["path"] = "propertySystem.lua", + }, + ["src/plugins/pluginTemplate.lua"] = { + ["name"] = "pluginTemplate", + ["path"] = "plugins/pluginTemplate.lua", + }, + ["src/elements/Scrollbar.lua"] = { + ["name"] = "Scrollbar", + ["path"] = "elements/Scrollbar.lua", + }, + ["src/plugins/xml.lua"] = { + ["name"] = "xml", + ["path"] = "plugins/xml.lua", + }, + ["src/elements/Menu.lua"] = { + ["name"] = "Menu", + ["path"] = "elements/Menu.lua", + }, + ["src/elements/Frame.lua"] = { + ["name"] = "Frame", + ["path"] = "elements/Frame.lua", + }, + ["src/render.lua"] = { + ["name"] = "render", + ["path"] = "render.lua", + }, + ["src/elements/Program.lua"] = { + ["name"] = "Program", + ["path"] = "elements/Program.lua", + }, + ["src/elements/Label.lua"] = { + ["name"] = "Label", + ["path"] = "elements/Label.lua", + }, + ["src/elements/Container.lua"] = { + ["name"] = "Container", + ["path"] = "elements/Container.lua", + }, + ["src/elements/Table.lua"] = { + ["name"] = "Table", + ["path"] = "elements/Table.lua", + }, + ["src/plugins/state.lua"] = { + ["name"] = "state", + ["path"] = "plugins/state.lua", }, }, } \ No newline at end of file diff --git a/release/basalt.lua b/release/basalt.lua index 1eec1f4..b564ee9 100644 --- a/release/basalt.lua +++ b/release/basalt.lua @@ -1,7 +1,37 @@ local minified = true +local minified_elementDirectory = {} +local minified_pluginDirectory = {} local project = {} local baseRequire = require require = function(path) return project[path..".lua"] or baseRequire(path) end +minified_pluginDirectory["debug"] = {} +minified_pluginDirectory["theme"] = {} +minified_pluginDirectory["reactive"] = {} +minified_pluginDirectory["xml"] = {} +minified_pluginDirectory["animation"] = {} +minified_pluginDirectory["state"] = {} +minified_pluginDirectory["benchmark"] = {} +minified_pluginDirectory["pluginTemplate"] = {} +minified_elementDirectory["Table"] = {} +minified_elementDirectory["BaseFrame"] = {} +minified_elementDirectory["ProgressBar"] = {} +minified_elementDirectory["Menu"] = {} +minified_elementDirectory["Frame"] = {} +minified_elementDirectory["Button"] = {} +minified_elementDirectory["Program"] = {} +minified_elementDirectory["Label"] = {} +minified_elementDirectory["Flexbox"] = {} +minified_elementDirectory["Container"] = {} +minified_elementDirectory["Slider"] = {} +minified_elementDirectory["BaseElement"] = {} +minified_elementDirectory["Checkbox"] = {} +minified_elementDirectory["Input"] = {} +minified_elementDirectory["VisualElement"] = {} +minified_elementDirectory["Scrollbar"] = {} +minified_elementDirectory["List"] = {} +minified_elementDirectory["Tree"] = {} +minified_elementDirectory["TextBox"] = {} +minified_elementDirectory["Dropdown"] = {} project["elementManager.lua"] = function(...) local ab=table.pack(...) local bb=fs.getDir(ab[2]or"basalt")local cb=ab[1]if(bb==nil)then error("Unable to find directory ".. @@ -24,6 +54,19 @@ type(dd)=="table"then for __a,a_a in pairs(dd)do if(__a~="API")then if(cc._plugins[__a]==nil)then cc._plugins[__a]={}end;table.insert(cc._plugins[__a],a_a)else cc._APIs[cd]=a_a end end end end end end +if(minified)then if(minified_elementDirectory==nil)then +error("Unable to find minified_elementDirectory please report this bug to our discord.")end;for ad,bd in +pairs(minfied_elementDirectory)do +cc._elements[ad:gsub(".lua","")]={class=nil,plugins={},loaded=false}end;if +(minified_pluginDirectory==nil)then +error("Unable to find minified_pluginDirectory please report this bug to our discord.")end +for ad,bd in +pairs(minified_pluginDirectory)do local cd=require(fs.combine("plugins",ad)) +if +type(cd)=="table"then +for dd,__a in pairs(cd)do if(dd~="API")then +if(cc._plugins[dd]==nil)then cc._plugins[dd]={}end;table.insert(cc._plugins[dd],__a)else +cc._APIs[dd]=__a end end end end end function cc.loadElement(ad) if not cc._elements[ad].loaded then package.path=bc.."rom/?"local bd=require(fs.combine("elements",ad)) @@ -155,8 +198,9 @@ function _b:getPropertyConfig(cb)return self._properties[cb]end;return _b end project["main.lua"] = function(...) local cc=require("elementManager") local dc=require("errorManager")local _d=require("propertySystem") local ad=require("libraries/expect")local bd={}bd.traceback=true;bd._events={}bd._schedule={}bd._plugins={} -bd.LOGGER=require("log")bd.path=fs.getDir(select(2,...))local cd=nil;local dd=false -local __a=type;local a_a={}local b_a=10;local c_a=0;local d_a=false;local function _aa()if(d_a)then return end +bd.LOGGER=require("log") +if(minified)then +bd.path=fs.getDir(shell.getRunningProgram())else bd.path=fs.getDir(select(2,...))end;local cd=nil;local dd=false;local __a=type;local a_a={}local b_a=10;local c_a=0;local d_a=false;local function _aa()if(d_a)then return end c_a=os.startTimer(0.2)d_a=true end;local function aaa(_ba) for _=1,_ba do local aba=a_a[1]if(aba)then aba:create()end;table.remove(a_a,1)end end