Update ci.yml

.github/workflows/ci.yml

@@ -0,0 +1,55 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches: [ master, feature-compile-ci ]
+  pull_request:
+    branches: [ master, feature-compile-ci ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v3
+
+      - name: start-message
+        run: echo Starting compilation
+
+      # Runs a set of commands using the runners shell
+      - name: setup-lua
+        uses: leafo/gh-actions-lua@v9
+        with:
+          luaVersion: "5.1"
+
+      - name: setup-luarocks
+        uses: leafo/gh-actions-luarocks@v4
+        with:
+          luarocksVersion: "3.9.0"
+
+      - name: install-lfs  
+        run: luarocks install luafilesystem
+
+      - name: compile-basalt
+        run: lua scripts/compiler.lua
+
+      - name: dir-check
+        run: "pwd && ls -la && find -L . basalt.lua | grep basalt.lua"
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: Basalt-Artifact
+          path: ${{ github.workspace }}/build/basalt.lua

.gitignore

@@ -0,0 +1 @@
+/build/

docs/objects/Object.md

@@ -7,8 +7,8 @@ local mainFrame = basalt.createFrame("myFirstFrame"):show()
 local button = mainFrame:addButton("myFirstButton")
 button:show()
 ````
-**parameters:** -<br>
-**returns:** self<br>
+#### Parameters: -<br>
+#### Returns: self<br>
 
 ## hide
 hides the object 
@@ -17,16 +17,16 @@ local mainFrame = basalt.createFrame("myFirstFrame"):show()
 local button = mainFrame:addButton("myFirstButton"):setText("Close"):onClick(function() mainFrame:hide() end)
 button:show()
 ````
-**parameters:** -<br>
-**returns:** self<br>
+#### Parameters: -<br>
+#### Returns: self<br>
 
 ## setPosition
 Changes the position relative to its parent frame
 ````lua
 local mainFrame = basalt.createFrame("myFirstFrame"):setPosition(2,3)
 ````
-**parameters:** number x, number y[, boolean relative], if relative is set to true it will add/remove instead of set x, y<br>
-**returns:** self<br>
+#### Parameters: number x, number y[, boolean relative], if relative is set to true it will add/remove instead of set x, y<br>
+#### Returns: self<br>
 
 
 
@@ -35,24 +35,24 @@ Changes the object background color
 ````lua
 local mainFrame = basalt.createFrame("myFirstFrame"):setBackground(colors.lightGray)
 ````
-**parameters:** number color<br>
-**returns:** self<br>
+#### Parameters: number color<br>
+#### Returns: self<br>
 
 ## setForeground
 Changes the object text color
 ````lua
 local mainFrame = basalt.createFrame("myFirstFrame"):setForeground(colors.black)
 ````
-**parameters:** number color<br>
-**returns:** self<br>
+#### Parameters: number color<br>
+#### Returns: self<br>
 
 ## setSize
 Changes the object size
 ````lua
 local mainFrame = basalt.createFrame("myFirstFrame"):setSize(15,5)
 ````
-**parameters:** number width, number length<br>
-**returns:** self<br>
+#### Parameters: number width, number length<br>
+#### Returns: self<br>
 
 ## setFocus    
 sets the object to be the focused object.
@@ -62,8 +62,8 @@ the foreground, you have to use :setFocus()
 local mainFrame = basalt.createFrame("myFirstFrame"):show()
 local aButton = mainFrame:addButton("myFirstButton"):setFocus():show()
 ````
-**parameters:** -<br>
-**returns:** self<br>
+#### Parameters: -<br>
+#### Returns: self<br>
 
 ## setZIndex
 changes the z index (higher z index do have higher draw/event priority) 10 is more important than 5 or 1. You are also able to add multiple objects to the same z index, which means if you create a couple of buttons, you set their z index to 10, everything below 10 is less important, everything above 10 is more important. On the same z index: the last object which gets created is the most important one.
@@ -71,8 +71,8 @@ changes the z index (higher z index do have higher draw/event priority) 10 is mo
 local mainFrame = basalt.createFrame("myFirstFrame"):show()
 local aButton = mainFrame:addButton("myFirstButton"):setZIndex(1):show()
 ````
-**parameters:** number index<br>
-**returns:** self<br>
+#### Parameters: number index<br>
+#### Returns: self<br>
 
 ## setParent
 changes the frame parent of that object
@@ -81,8 +81,8 @@ local mainFrame = basalt.createFrame("myFirstFrame"):show()
 local aRandomFrame = basalt.createFrame("aRandomFrame"):show()
 local aButton = mainFrame:addButton("myFirstButton"):onClick(function() aRandomFrame:setParent(mainFrame) end):show()
 ````
-**parameters:** frame object<br>
-**returns:** self<br>
+#### Parameters: frame object<br>
+#### Returns: self<br>
 
 ## isFocused
 returns if the object is currently the focused object of the parent frame
@@ -92,8 +92,8 @@ local mainFrame = basalt.createFrame("myFirstFrame"):show()
 local aButton = mainFrame:addButton("myFirstButton"):show()
 basalt.debug(aButton:isFocused()) -- shows true or false as a debug message
 ````
-**parameters:** -<br>
-**returns:** boolean<br>
+#### Parameters: -<br>
+#### Returns: boolean<br>
 
 ## getAnchorPosition
 converts the x,y coordinates into the anchor coordinates of that object
@@ -103,8 +103,8 @@ local mainFrame = basalt.createFrame("myFirstFrame"):setSize(15,15):show()
 local aButton = mainFrame:addButton("myFirstButton"):setAnchor("right","bottom"):setSize(8,1):setPosition(1,1):show()
 basalt.debug(aButton:getAnchorPosition()) -- returns 7,14 (framesize - own size) instead of 1,1
 ````
-**parameters:** number x, number y - or nothing (if nothing it uses the object's x, y)<br>
-**returns:** number x, number y (converted)<br>
+#### Parameters: number x, number y - or nothing (if nothing it uses the object's x, y)<br>
+#### Returns: number x, number y (converted)<br>
 
 ## setAnchor
 sets the anchor of that object
@@ -113,8 +113,8 @@ sets the anchor of that object
 local mainFrame = basalt.createFrame("myFirstFrame"):setAnchor("right"):show()
 local aButton = mainFrame:addButton("myFirstButton"):setAnchor("bottom","right"):setSize(8,1):setPosition(1,1):show()
 ````
-**parameters:** string sides - ("left", "right", "top", "bottom") you can stack positions like so ..:setAnchor("right", "bottom")<br>
-**returns:** self<br>
+#### Parameters: string sides - ("left", "right", "top", "bottom") you can stack positions like so ..:setAnchor("right", "bottom")<br>
+#### Returns: self<br>
 
 ## getAbsolutePosition
 converts the relative coordinates into absolute coordinates
@@ -123,8 +123,8 @@ local mainFrame = basalt.createFrame("myFirstFrame"):setPosition(3,3):show()
 local aButton = mainFrame:addButton("myFirstButton"):setSize(8,1):setPosition(4,2):show()
 basalt.debug(aButton:getAbsolutePosition()) -- returns 7,5 (frame coords + own coords) instead of 4,2
 ````
-**parameters:** number x, number y - or nothing (if nothing it uses the object's x, y)<br>
-**returns:** self<br>
+#### Parameters: number x, number y - or nothing (if nothing it uses the object's x, y)<br>
+#### Returns: self<br>
 
 ## setTextAlign
 sets the text align of the object (for example buttons)
@@ -132,8 +132,8 @@ sets the text align of the object (for example buttons)
 local mainFrame = basalt.createFrame("myFirstFrame"):show()
 local aButton = mainFrame:addButton("myFirstButton"):setSize(12,3):setTextAlign("right", "center"):setText("Dont't..."):show()
 ````
-**parameters:** string horizontal, string vertical - ("left", "center", "right")<br>
-**returns:** self<br>
+#### Parameters: string horizontal, string vertical - ("left", "center", "right")<br>
+#### Returns: self<br>
 
 ## setValue
 sets the value of that object (input, label, checkbox, textfield, scrollbar,...)
@@ -141,8 +141,8 @@ sets the value of that object (input, label, checkbox, textfield, scrollbar,...)
 local mainFrame = basalt.createFrame("myFirstFrame"):show()
 local aCheckbox = mainFrame:addCheckbox("myFirstCheckbox"):setValue(true):show()
 ````
-**parameters:** any value<br>
-**returns:** self<br>
+#### Parameters: any value<br>
+#### Returns: self<br>
 
 ## getValue
 returns the currently saved value
@@ -151,8 +151,8 @@ local mainFrame = basalt.createFrame("myFirstFrame"):show()
 local aCheckbox = mainFrame:addCheckbox("myFirstCheckbox"):setValue(true):show()
 basalt.debug(aCheckbox:getValue()) -- returns true
 ````
-**parameters:**-<br>
-**returns:** any value<br>
+#### Parameters:-<br>
+#### Returns: any value<br>
 
 ## getHeight/getWidth
 returns the height or width
@@ -161,8 +161,8 @@ local mainFrame = basalt.createFrame("myFirstFrame"):show()
 local aButton = mainFrame:addButton("myFirstButton"):setSize(5,8):show()
 basalt.debug(aButton:getHeight()) -- returns 8
 ````
-**parameters:**-<br>
-**returns:** number height/width<br>
+#### Parameters:-<br>
+#### Returns: number height/width<br>
 
 ## isVisible
 returns if the object is currently visible
@@ -171,8 +171,8 @@ local mainFrame = basalt.createFrame("myFirstFrame"):show()
 local aButton = mainFrame:addButton("myFirstButton"):setSize(5,8):show()
 basalt.debug(aButton:isVisible()) -- returns true
 ````
-**parameters:**-<br>
-**returns:** boolean<br>
+#### Parameters:-<br>
+#### Returns: boolean<br>
 
 ## getName
 returns the given name of that object
@@ -180,8 +180,8 @@ returns the given name of that object
 local mainFrame = basalt.createFrame("myFirstFrame"):show()
 basalt.debug(mainFrame:getName()) -- returns myFirstFrame
 ````
-**parameters:**-<br>
-**returns:** string name<br>
+#### Parameters:-<br>
+#### Returns: string name<br>
 
 # Object Events
 These object events are available for all objects, if a object got some unique events, you can see them in their own category
@@ -192,8 +192,8 @@ creates a mouse_click event
 local mainFrame = basalt.createFrame("myFirstFrame"):show()
 local aButton = mainFrame:addButton("myFirstButton"):setSize(10,3):onClick(function(self,event,button,x,y) basalt.debug("Hellooww UwU") end):show()
 ````
-**parameters:** function func<br>
-**returns:** self<br>
+#### Parameters: function func<br>
+#### Returns: self<br>
 
 ## onClickUp
 creates a click_up event
@@ -201,8 +201,8 @@ creates a click_up event
 local mainFrame = basalt.createFrame("myFirstFrame"):show()
 local aButton = mainFrame:addButton("myFirstButton"):setSize(10,3):onClickUp(function(self,event,button,x,y) basalt.debug("Byeeeee UwU") end):show()
 ````
-**parameters:** function func<br>
-**returns:** self<br>
+#### Parameters: function func<br>
+#### Returns: self<br>
 
 ## onMouseDrag
 creates a mouse_drag event
@@ -210,8 +210,8 @@ creates a mouse_drag event
 local mainFrame = basalt.createFrame("myFirstFrame"):show()
 local aButton = mainFrame:addButton("myFirstButton"):setSize(10,3):onClickUp(function(self,event,button,x,y) basalt.debug("Byeeeee UwU") end):show()
 ````
-**parameters:** function func<br>
-**returns:** self<br>
+#### Parameters: function func<br>
+#### Returns: self<br>
 
 ## onChange
 creates a change event (fires as soon as the value gets changed)
@@ -219,29 +219,29 @@ creates a change event (fires as soon as the value gets changed)
 local mainFrame = basalt.createFrame("myFirstFrame"):show()
 local aCheckbox = mainFrame:addCheckbox("myFirstCheckbox"):onChange(function(self) basalt.debug("i got changed into "..self:getValue()) end):show()
 ````
-**parameters:** function func<br>
-**returns:** self<br>
+#### Parameters: function func<br>
+#### Returns: self<br>
 
 ## onKey
 creates a key(board) - event can be key or char
 ````lua
 local mainFrame = basalt.createFrame("myFirstFrame"):onKey(function(self,event,key) basalt.debug("you clicked "..key) end):show()
 ````
-**parameters:** function func<br>
-**returns:** self<br>
+#### Parameters: function func<br>
+#### Returns: self<br>
 
 ## onLoseFocus
 creates a lose focus event
 ````lua
 local mainFrame = basalt.createFrame("myFirstFrame"):onLoseFocus(function(self) basalt.debug("please come back..") end):show()
 ````
-**parameters:** function func<br>
-**returns:** self<br>
+#### Parameters: function func<br>
+#### Returns: self<br>
 
 ## onGetFocus
 creates a get focus event
 ````lua
 local mainFrame = basalt.createFrame("myFirstFrame"):onGetFocus(function(self) basalt.debug("thanks!") end):show()
 ````
-**parameters:** function func<br>
-**returns:** self<br>
+#### Parameters: function func<br>
+#### Returns: self<br>

scripts/compiler.lua

@@ -0,0 +1,44 @@
+lfs = require "lfs"
+sourcesPath = "source/"
+scriptsPath = "scripts/"
+buildPath = "build/"
+sourceFileName = "basalt.lua"
+
+fetchFiles = function(...)
+    local tbl = {}
+    for _, directory in pairs{...} do
+        for file in lfs.dir(directory) do
+            if file ~= "." and file ~= ".." then
+                table.insert(tbl, file)
+            end
+        end
+    end
+
+    return tbl
+end
+
+dirExists = function(path)
+    local _, endIndex = string.find(path, "/")
+    if(endIndex == #path) then
+        path = string.sub(path, 1, #path - 1)
+    end
+    if(lfs.attributes(path, "mode") == "directory") then
+        return true
+    end
+    return false
+end
+
+local compiledSource = dofile(scriptsPath .. "packager.lua") -- path to packager
+
+if not dirExists(buildPath) then
+    lfs.mkdir(buildPath)
+    assert(dirExists(buildPath), "Failed to make build directory, exiting...")
+    return
+end
+
+print(string.format("Writing to %s/%s%s", lfs.currentdir(), buildPath, sourceFileName))
+os.execute("echo ".. string.format("Writing to %s/%s%s", lfs.currentdir(), buildPath, sourceFileName))
+local sourceFile = io.open(buildPath .. sourceFileName, "w")
+
+sourceFile:write(compiledSource)
+sourceFile:close()

scripts/loader.lua

@@ -0,0 +1,3 @@
+local basalt = dofile(scriptsPath .. "packager.lua")
+
+return (load(basalt, "t")())

scripts/packager.lua

@@ -0,0 +1,47 @@
+local requiredFiles = {
+    "mainTop.lua",
+    "mainBottom.lua",
+    "Frame.lua",
+    "Object.lua",
+    "defaultTheme.lua",
+    "lib/drawHelper.lua",
+    "lib/eventSystem.lua",
+    "lib/process.lua",
+    "lib/utils.lua",
+}
+for _, value in pairs(requiredFiles)do
+    assert(io.open(sourcesPath .. value), "File ".. value .." not found!")
+end
+
+local lib = fetchFiles(sourcesPath .. "lib")
+local objects = fetchFiles(sourcesPath .. "objects")
+
+local filesOrdered = {}
+
+table.insert(filesOrdered, "mainTop.lua")
+table.insert(filesOrdered, "defaultTheme.lua")
+
+for _, libFile in pairs(lib) do
+    table.insert(filesOrdered, "lib/" .. libFile)
+end
+
+table.insert(filesOrdered,  "Object.lua")
+
+for _, objectFile in pairs(objects) do
+    table.insert(filesOrdered,  "objects/" .. objectFile)
+end
+
+table.insert(filesOrdered, "Frame.lua")
+table.insert(filesOrdered, "mainBottom.lua")
+
+--local basalt = io.open(sourcesPath .. sourceFileName, "w")
+local compiledSource = ""
+
+for _, file in ipairs(filesOrdered) do
+    local currentSource = io.open(sourcesPath .. file, "r")
+    compiledSource = compiledSource .. currentSource:read("*a") .. "\n"
+end
+
+--basalt:write(compiledSource)
+--basalt:close()
+return compiledSource

scripts/test.lua

@@ -0,0 +1,19 @@
+lfs = require "lfs"
+sourcesPath = "source/"
+
+fetchFiles = function(...)
+    local tbl = {}
+    for _, directory in pairs{...} do
+        for file in lfs.dir(directory) do
+            if file ~= "." and file ~= ".." then
+                table.insert(tbl, file)
+            end
+        end
+    end
+
+    return tbl
+end
+
+for _, file in pairs(fetchFiles(sourcesPath, sourcesPath .. "lib", sourcesPath .. "objects")) do
+    print(file)
+end

source/compiler.lua

@@ -1,7 +0,0 @@
-local basaltFileName = "basalt-source.lua"
-local absolutePath = "source"
-local basalt = dofile(fs.combine(absolutePath, "packager.lua")) -- path to packager
-
-local b = fs.open(fs.combine(absolutePath, basaltFileName), "w")
-b.write(basalt)
-b.close()

source/loader.lua

@@ -1,4 +0,0 @@
-local absolutePath = "source"
-local basalt = dofile(fs.combine(absolutePath, "packager.lua"))
-
-return (load(basalt, "t")())

source/packager.lua

@@ -1,68 +0,0 @@
-local basaltFileName = "basalt.lua"
-local absoluteFilePath = "source/project"
-
-local requiredFiles = {
-    "mainTop.lua",
-    "mainBottom.lua",
-    "Frame.lua",
-    "Object.lua",
-    "defaultTheme.lua",
-    "lib/drawHelper.lua",
-    "lib/eventSystem.lua",
-    "lib/process.lua",
-    "lib/utils.lua",
-}
-
-local basalt = ""
-
-for k,v in pairs(requiredFiles)do
-    assert(fs.exists(fs.combine(absoluteFilePath, v)), "File "..v.." doesn't exists!")
-end
-
-local lib = fs.list(fs.combine(absoluteFilePath, "lib"))
-local objects = fs.list(fs.combine(absoluteFilePath, "objects"))
-
-local file = fs.open(fs.combine(absoluteFilePath, "mainTop.lua"), "r")
-basalt = basalt..file.readAll().."\n"
-file.close()
-
-local file = fs.open(fs.combine(absoluteFilePath, "defaultTheme.lua"), "r")
-basalt = basalt..file.readAll().."\n"
-file.close()
-
-for _,v in pairs(lib)do
-    local path = fs.combine(fs.combine(absoluteFilePath, "lib"), v)
-    if not(fs.isDir(path))then
-        local file = fs.open(path, "r")
-        basalt = basalt..file.readAll().."\n"
-        file.close()
-    end
-end
-
-local file = fs.open(fs.combine(absoluteFilePath, "Object.lua"), "r")
-basalt = basalt..file.readAll().."\n"
-file.close()
-
-for _,v in pairs(objects)do
-    if(v~="example.lua")then
-        local path = fs.combine(fs.combine(absoluteFilePath, "objects"), v)
-        if not(fs.isDir(path))then
-            local file = fs.open(path, "r")
-            basalt = basalt..file.readAll().."\n"
-            file.close()
-        end
-    end
-end
-
-local file = fs.open(fs.combine(absoluteFilePath, "Frame.lua"), "r")
-basalt = basalt..file.readAll().."\n"
-file.close()
-
-local file = fs.open(fs.combine(absoluteFilePath, "mainBottom.lua"), "r")
-basalt = basalt..file.readAll().."\n"
-file.close()
-
---local b = fs.open(fs.combine(absoluteFilePath, "basalt.lua"), "w")
---b.write(basalt)
---b.close()
-return basalt