fSD/fes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: fSD:2f877b63b8b09272567f8b00164426d844e9cfe7
Branches Tags
fSD:main fSD:doc fSD:rich-ui fSD:markdown
...
compare: fSD:markdown
Branches Tags
fSD:doc fSD:main fSD:rich-ui fSD:markdown

7 Commits
2f877b63b8 ... markdown

Author SHA1 Message Date
vx-clutch
253c96c534 add markdown support plus example 2025-12-12 21:37:46 -05:00
vx-clutch
8dca9ab5da alpha p10 2025-12-07 12:24:47 -05:00
vx-clutch
4ff689e299 alpha p9 2025-12-07 10:15:32 -05:00
vx-clutch
b89dc65e1f alpha p8 2025-12-07 10:06:10 -05:00
vx-clutch
1de4ae1a24 alpha p7 2025-12-07 09:24:48 -05:00
vx-clutch
f5d928ebb9 Merge pull request 'alpha p6' (#1) from master into main 
Reviewed-on: #1
 2025-12-03 21:52:00 -05:00
vx-clutch
7747d415cc alpha p6 2025-12-03 21:50:51 -05:00
33 changed files with 387 additions and 388 deletions
Expand all files Collapse all files

2
TODO
View File

@@ -1,2 +0,0 @@
Add an interval element
Add favicon support

28
core/builtin.lua
View File

@@ -3,13 +3,8 @@ local std = require("core.std")
local M = {} local M = {}
M.__index = M M.__index = M
local function encode(str)
return str:gsub("([^%w%-%_%.%~])", function(c)
return string.format("%%%02X", string.byte(c)) end) end
function M.fes(header, footer) function M.fes(header, footer)
local config = {} local config = {} local site_config = {}
local site_config = {}
local fes_mod = package.loaded.fes local fes_mod = package.loaded.fes
if fes_mod and fes_mod.config then if fes_mod and fes_mod.config then
config = fes_mod.config config = fes_mod.config
@@ -18,20 +13,22 @@ function M.fes(header, footer)
end end
end end
local raw_favicon = site_config.favicon or [[<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><text y=".9em" font-size="90">🔥</text></svg>]] if site_config.favicon then
site_config.favicon = '<link rel="icon" type="image/x-icon" href="' .. site_config.favicon .. '">'
end
local self = { local self = {
version = site_config.version or "", version = site_config.version,
title = site_config.title or "Document", title = site_config.title,
copyright = site_config.copyright or "&#169; The Copyright Holder", copyright = site_config.copyright,
favicon = "data:image/svg+xml," .. encode(raw_favicon), favicon = site_config.favicon,
header = header or [[ header = header or [[
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="{{FAVICON}}"> {{FAVICON}}
<title>{{TITLE}}</title> <title>{{TITLE}}</title>
<style> <style>
html, body { min-height: 100%; margin: 0; padding: 0; background: #0f1113; color: #e6eef3; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; line-height: 1.5; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } html, body { min-height: 100%; margin: 0; padding: 0; background: #0f1113; color: #e6eef3; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; line-height: 1.5; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; }
@@ -132,10 +129,9 @@ end
function M:build() function M:build()
local header = self.header local header = self.header
local safe_title = self.title or "Document" header = header:gsub("{{TITLE}}", self.title or "Document")
local safe_favicon = self.favicon:gsub("%%", "%%%%") local favicon_html = self.favicon and ('<link rel="icon" type="image/x-icon" href="' .. self.favicon .. '">')
header = header:gsub("{{TITLE}}", safe_title) header = header:gsub("{{FAVICON}}", favicon_html or [[<link rel="icon" href="data:image/svg+xml,<svg xmlns=%%22http://www.w3.org/2000/svg%%22 viewBox=%%220 0 100 100%%22><text y=%%22.9em%%22 font-size=%%2290%%22>🔥</text></svg>">]])
header = header:gsub("{{FAVICON}}", safe_favicon)
local footer = self.footer:gsub("{{COPYRIGHT}}", self.copyright or "&#169; The Copyright Holder") local footer = self.footer:gsub("{{COPYRIGHT}}", self.copyright or "&#169; The Copyright Holder")
return header .. table.concat(self.parts, "\n") .. footer return header .. table.concat(self.parts, "\n") .. footer
end end

9
doc/Fes.toml
View File

@@ -1,9 +0,0 @@
[site]
name = "doc"
version = "0.0.1"
authors = ["vx-clutch"]
[fes]
version = "1.0.0"
CUSTOM_CSS =

70
doc/www/index.lua
View File

@@ -1,70 +0,0 @@
local fes = require("fes")
local site = fes.site_builder()
site.title = "Fes Documentation"
site.copyright = fes.std.copyright() .. " " .. fes.std.external("https://git.vxserver.dev/fSD", "fSD")
site:h1("Fes Documentation")
site:note([[
This is the documentation for the Fes
Microframework. This documentation serves as
a starting point and in its current state is
not comprehensive. Furthermore, you should
note that Fes is not production grade or
stable, use at your own caution.
]])
site:muted("Before reading this you should consult the " ..
fes.std.external("https://git.vxserver.dev/fSD/fes", "README"))
local docs = {}
local template = [[
<span class="highlight">%s</span>
<details>
<summary></summary>
<span class="highlight">%s</span>
<br>
%s
</details>
]]
function docs:func(fn, signature, desc)
table.insert(self, string.format(template, fn, signature, desc))
return self
end
docs:func("site_builder", "fes.site_builder() -> site", "returns a site object, a required element for this framework.")
docs:func("custom", "site:custom(content)", "adds a raw string into the site object")
docs:func("h1", "site:h1(content)", "adds a h1 tag to the site object.")
docs:func("h2", "site:h2(content)", "adds a h2 tag to the site object.")
docs:func("h3", "site:h3(content)", "adds a h3 tag to the site object.")
docs:func("h4", "site:h4(content)", "adds a h4 tag to the site object.")
docs:func("h5", "site:h5(content)", "adds a h5 tag to the site object.")
docs:func("h6", "site:h6(content)", "adds a h6 tag to the site object.")
docs:func("p", "site:p(content)", "adds a paragraph tag to the site object.")
docs:func("note", "site:note(content)", "adds a fes note to the site object. A note is a box used for important information or emphasis.")
docs:func("muted", "site:muted(content)", "adds a fes muted block to the site object. A muted block makes text smaller and less noticable, it is useful for small usage notes.")
docs:func("a", "site:a(link, content)", "adds an anchor tag to the site object. By default, if no 'content' is passed is just displays the link")
docs:func("external", "site:external(link, content)", "similarly to 'site:a', it adds an anchor tag to the site object but opens it in a new tab. By default, if no 'content' is passed is just displays the link")
docs:func("ul", "site:ul(items)", "creates an unordered list from passed table, usally 'std.li()'.")
docs:func("ol", "site:ol(items)", "creates an ordered list from passed table, usally 'std.li()'.")
docs:func("li", "site:li(content)", "adds a list entry to the site object")
docs:func("code", "site:code(content)", "adds a code block to the site object.")
docs:func("blockquote", "site:blockquote(content)", "adds a block quote to the site object.")
docs:func("hr", "site:hr()", "adds a horizontal line to the site object.")
docs:func("divider", "site:divider()", "adds a divider to the site object.")
docs:func("img", "site:img(src, alt)", "adds an image to the site object.")
docs:func("table", "site:table(headers, rows)", "adds a table to the site object.")
docs:func("div", "site:div(content, classs)", "adds a custom div to the site object. Custom classes are to be defined in the .css file pointed to by the CUSTOM_CSS variable in Fes.toml")
docs:func("span", "site:span(content, classs)", "adds a custom span to the site object. Custom classes are to be defined in the .css file pointed to by the CUSTOM_CSS variable in Fes.toml")
docs:func("strong", "site:strong(content)", "adds bold text to the site object.")
docs:func("em", "site:em(content)", "adds italicized text to the site object.")
docs:func("br", "site:br()", "adds a break into the document")
docs:func("links", "site:links(link_list)", "adds a formated list of links into the site object.")
docs:func("lead", "site:lead(content)", "adds an instance of the lead class into the site object. This is used in combonation with 'site:note' to create a heading within it.")
docs:func("small", "site:small(content)", "adds a div with class 'small'. The small class changed the size of text within.")
docs:func("highlight", "site:highlight(content)", "adds an instance of the 'highlight' class into the site object. Text with the 'highlight' class will be emphasized")
site:note(table.concat(docs, ""))
return site

5
examples/advanced/Fes.toml Normal file
View File

@@ -0,0 +1,5 @@
[app]
name = "advanced"
version = "0.0.1"
authors = ["vx-clutch"]

7
examples/advanced/include/foo.lua Normal file
View File

@@ -0,0 +1,7 @@
local foo = {}
foo.render = function()
return "This was called from a foo function"
end
return foo

11
examples/multi-page/www/sub/subpage.lua → examples/advanced/www/index.lua
View File

@@ -1,14 +1,15 @@
local fes = require("fes") local fes = require("fes")
local std = fes.std
local site = fes.fes() local site = fes.fes()
site.title = "Subpage"
site.copyright = fes.util.copyright("https://git.vxserver.dev/fSD", "fSD") site.copyright = fes.util.copyright("https://git.vxserver.dev/fSD", "fSD")
site:h1("Subpage") site:h1("Hello, World!")
site:note( site:note(
fes.std.ul({ fes.app.foo.render()
fes.std.a("/", "Home"),
})
) )
return site return site

2
examples/bus/Fes.toml → examples/archive/Fes.toml
View File

@@ -1,5 +1,5 @@
[app] [app]
name = "bus" name = "archive"
version = "0.0.1" version = "0.0.1"
authors = ["vx-clutch"] authors = ["vx-clutch"]

BIN
examples/archive/archive/2025.12.07/seal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 MiB

17
examples/archive/www/index.lua Normal file
View File

@@ -0,0 +1,17 @@
local fes = require("fes")
local std = fes.std
local site = fes.fes()
site.copyright = fes.util.copyright("https://git.vxserver.dev/fSD", "fSD")
site:h1("Hello, World!")
site:note(fes.util.cc {
std.h2("Files"),
std.ul {
std.a("/archive", "to the file room!"),
}
})
return site

15
examples/bus/www/index.lua
View File

@@ -1,15 +0,0 @@
local fes = require("fes")
local site = fes.fes()
site.title = "bus"
site.copyright = fes.util.copyright("https://git.vxserver.dev/fSD/", "fSD")
site:h1("URL: " .. fes.bus.url)
local params = fes.bus.params
for key, val in pairs(params) do
site:h2(key .. ": " .. val)
end
return site

5
examples/canonical/Fes.toml
View File

@@ -1,5 +0,0 @@
[app]
name = "canonical"
version = "0.0.1"
authors = ["vx-clutch"]

16
examples/canonical/include/header.lua
View File

@@ -1,16 +0,0 @@
local header = {}
header.render = function(std)
return table.concat({
std.center(std.h1("Canonical")),
std.center(table.concat({
std.nav("example"),
std.nav("example"),
std.nav("example"),
std.nav("example"),
std.nav("example"),
}))
})
end
return header

17
examples/canonical/www/404.lua
View File

@@ -1,17 +0,0 @@
local fes = require("fes")
local std = fes.std
local u = fes.util
local site = fes.fes()
site.title = "404 Page Not Found"
site.copyright = u.copyright("https://git.vxserver.dev/fSD/", "fSD")
site:banner(std.h1(std.center("Canonical")))
site:note(table.concat({
std.center(std.h1("404 Page Not Found")),
std.center(std.p("The page you are looking for is not here. " .. std.a("/", "Go home?"))),
}))
return site

17
examples/canonical/www/index.lua
View File

@@ -1,17 +0,0 @@
local fes = require("fes")
local std = fes.std
local site = fes.fes()
site.title = "Canonical"
site.copyright = fes.util.copyright("https://git.vxserver.dev/fSD", "fSD")
site:banner(fes.app.header.render(std))
site:note(table.concat({
std.h1("Canonical"),
std.p("This is the example for the canonical 'fes' site, by canonical is meant a format and " .. std.external("https://git.vxserver.dev/fSD/fes/src/branch/master/examples/canonical/www/index.lua", "code") .. " that resembles the typical use case of the Microframework"),
std.p("This page also serves as a test for the integrity of a 'fes' build, given that it uses plenty crucial features to show everything from the HTML to CSS as well as the interactivity of certain elements."),
}))
return site

5
examples/error/www/index.lua
View File

@@ -1,9 +1,6 @@
local fes = require("fes") local fes = require("fes")
local site = fes.fes() local site = fes.fes()
site.title = "error" This is what an error looks like
UNIX is very simple
GNU's Not UNIX
return site return site

5
examples/hello-world/Fes.toml
View File

@@ -1,5 +0,0 @@
[app]
name = "hello-world"
version = "0.0.1"
authors = ["vx-clutch"]

2
examples/json/Fes.toml → examples/hello/Fes.toml
View File

@@ -1,5 +1,5 @@
[app] [app]
name = "json" name = "hello"
version = "0.0.1" version = "0.0.1"
authors = ["vx-clutch"] authors = ["vx-clutch"]

1
examples/hello-world/www/index.lua → examples/hello/www/index.lua
View File

@@ -1,7 +1,6 @@
local fes = require("fes") local fes = require("fes")
local site = fes.fes() local site = fes.fes()
site.title = "Hello, World!"
site.copyright = fes.util.copyright("https://git.vxserver.dev/fSD", "fSD") site.copyright = fes.util.copyright("https://git.vxserver.dev/fSD", "fSD")
site:h1("Hello, World!") site:h1("Hello, World!")

34
examples/json/www/index.lua
View File

@@ -1,34 +0,0 @@
local fes = require("fes")
local site = fes.fes()
site.title = "JSON"
site.copyright = fes.util.copyright("https://git.vxserver.dev/fSD", "fSD")
local json_pre = [[
{
"userId": 1,
"id": 1,
"title": "delectus aut autem",
"completed": false
}
]]
local json = fes.middleware.json_decode(json_pre)
site:h1("JSON")
site:note(fes.util.cc({
fes.std.h2("Before"),
fes.std.code(json_pre),
}))
site:note(fes.util.cc({
fes.std.h2("After"),
fes.std.ul({
json["userId"],
json["id"],
json["title"],
json["completed"],
})
}))
return site

5
examples/markdown/Fes.toml Normal file
View File

@@ -0,0 +1,5 @@
[app]
name = "markdown"
version = "0.0.1"
authors = ["vx-clutch"]

1
examples/markdown/www/index.md Normal file
View File

@@ -0,0 +1 @@
# Hello, World!

5
examples/multi-page/Fes.toml
View File

@@ -1,5 +0,0 @@
[app]
name = "multi-page"
version = "0.0.1"
authors = ["vx-clutch"]

16
examples/multi-page/www/index.lua
View File

@@ -1,16 +0,0 @@
local fes = require("fes")
local site = fes.fes()
site.title = "Home"
site.copyright = fes.util.copyright("https://git.vxserver.dev/fSD", "fSD")
site:h1("Home")
site:note(
fes.std.ul({
fes.std.a("page1"),
fes.std.a("page2"),
fes.std.a("sub/subpage"),
})
)
return site

15
examples/multi-page/www/page1.lua
View File

@@ -1,15 +0,0 @@
local fes = require("fes")
local site = fes.fes()
site.title = "Page 1"
site.copyright = fes.util.copyright("https://git.vxserver.dev/fSD", "fSD")
site:h1("Page 1")
site:note(
fes.std.ul({
fes.std.a("/", "home"),
fes.std.a("page2"),
})
)
return site

15
examples/multi-page/www/page2.lua
View File

@@ -1,15 +0,0 @@
local fes = require("fes")
local site = fes.fes()
site.title = "Page 2"
site.copyright = fes.util.copyright("https://git.vxserver.dev/fSD", "fSD")
site:h1("Page 2")
site:note(
fes.std.ul({
fes.std.a("/", "home"),
fes.std.a("page1"),
})
)
return site

2
examples/simple/Fes.toml
View File

@@ -2,4 +2,4 @@
name = "simple" name = "simple"
version = "0.0.1" version = "0.0.1"
authors = ["vx-clutch"] authors = ["vx-clutch"]

1
go.mod
View File

@@ -9,6 +9,7 @@ require (
github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-isatty v0.0.20 // indirect
github.com/pelletier/go-toml/v2 v2.2.4 // indirect github.com/pelletier/go-toml/v2 v2.2.4 // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/yuin/gopher-lua v1.1.1 // indirect github.com/yuin/gopher-lua v1.1.1 // indirect
golang.org/x/sys v0.25.0 // indirect golang.org/x/sys v0.25.0 // indirect
) )

3
go.sum
View File

@@ -11,9 +11,12 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M= github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

54
main.go
View File

@@ -2,7 +2,7 @@ package main
import ( import (
"embed" "embed"
_ "embed" "errors"
"flag" "flag"
"fmt" "fmt"
"os" "os"
@@ -10,6 +10,7 @@ import (
"github.com/fatih/color" "github.com/fatih/color"
"fes/src/config" "fes/src/config"
"fes/src/doc"
"fes/src/new" "fes/src/new"
"fes/src/server" "fes/src/server"
) )
@@ -24,30 +25,63 @@ func init() {
} }
func main() { func main() {
flag.Parse() flag.Usage = func() {
if len(os.Args) < 3 { fmt.Fprintf(flag.CommandLine.Output(), "Usage: %s [options] <command> <project_dir>\n", os.Args[0])
fmt.Println("Usage: fes <command> <project_dir>") fmt.Println("Commands:")
os.Exit(1) fmt.Println(" new <project_dir> Create a new project")
fmt.Println(" doc Open documentation")
fmt.Println(" run <project_dir> Start the server")
fmt.Println("Options:")
flag.PrintDefaults()
} }
flag.Parse()
if *config.Color { if *config.Color {
color.NoColor = true color.NoColor = true
} }
cmd := os.Args[1] args := flag.Args()
dir := os.Args[2] if len(args) < 1 {
flag.Usage()
os.Exit(1)
}
cmd := args[0]
var dir string
if cmd == "new" || cmd == "run" {
if len(args) < 2 {
fmt.Fprintf(os.Stderr, "Error: %s requires <project_dir>\n", cmd)
flag.Usage()
os.Exit(1)
}
dir = args[1]
}
switch cmd { switch cmd {
case "new": case "new":
if err := new.Project(dir); err != nil { if err := new.Project(dir); err != nil {
panic(err) fmt.Fprintln(os.Stderr, "Error:", err)
os.Exit(1)
}
case "doc":
if err := doc.Open(); err != nil {
fmt.Fprintln(os.Stderr, "Error:", err)
os.Exit(1)
} }
case "run": case "run":
if err := server.Start(dir); err != nil { if err := server.Start(dir); err != nil {
panic(err) if errors.Is(err, os.ErrNotExist) {
fmt.Fprintf(os.Stderr, "%s does not exist\n", dir)
fmt.Fprintf(os.Stderr, "Try: fes new %s\n", dir)
os.Exit(1)
} else {
fmt.Fprintln(os.Stderr, "Error:", err)
os.Exit(1)
}
} }
default: default:
fmt.Println("Unknown command:", cmd) fmt.Fprintf(os.Stderr, "Unknown command: %s\n", cmd)
flag.Usage()
os.Exit(1) os.Exit(1)
} }
} }

25
src/doc/doc.go Normal file
View File

@@ -0,0 +1,25 @@
package doc
import (
"fmt"
"os"
"path/filepath"
"github.com/pkg/browser"
)
func Open() error {
fmt.Println("Opening documentation in browser")
tmpFile := filepath.Join(os.TempDir(), "doc.html")
content := `<html><body><pre>
This feature is not implemented yet. It will be once the doc site
is up and running, for now read through the core/ files and examples.
</pre></body></html>`
if err := os.WriteFile(tmpFile, []byte(content), 0644); err != nil {
return err
}
return browser.OpenFile(tmpFile)
}

51
src/new/new.go
View File

@@ -9,6 +9,7 @@ import (
"strings" "strings"
) )
/* try to get git user, if not system user */
func getName() string { func getName() string {
out, err := exec.Command("git", "config", "user.name").Output() out, err := exec.Command("git", "config", "user.name").Output()
if err == nil { if err == nil {
@@ -21,39 +22,47 @@ func getName() string {
if err == nil && u.Username != "" { if err == nil && u.Username != "" {
return u.Username return u.Username
} }
return "" return "unknown"
} }
/* helper function for writing files */
func write(path string, format string, args ...interface{}) error {
dir := filepath.Dir(path)
if err := os.MkdirAll(dir, 0755); err != nil {
panic(err)
}
f, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
if err != nil {
panic(err)
}
defer f.Close()
_, err = fmt.Fprintf(f, format, args...)
return err
}
/* creates a hello world project */
func Project(dir string) error { func Project(dir string) error {
if err := os.MkdirAll(filepath.Join(dir, "www"), 0755); err != nil { if err := os.Mkdir(dir, 0755); err != nil {
return err return err
} }
indexLua := filepath.Join(dir, "www", "index.lua") if err := os.Chdir(dir); err != nil {
if _, err := os.Stat(indexLua); os.IsNotExist(err) { return err
content := fmt.Sprintf(`local fes = require("fes") }
name := getName()
write("www/index.lua", `local fes = require("fes")
local site = fes.fes() local site = fes.fes()
site.title = "%s" -- site.copyright = fes.util.copyright("https://example.com", "%s")
site:h1("Hello, World!") site:h1("Hello, World!")
return site return site`, name)
`, dir) write("Fes.toml", `[app]
if err := os.WriteFile(indexLua, []byte(content), 0644); err != nil {
return err
}
}
indexFes := filepath.Join(dir, "Fes.toml")
if _, err := os.Stat(indexFes); os.IsNotExist(err) {
content := fmt.Sprintf(`[app]
name = "%s" name = "%s"
version = "0.0.1" version = "0.0.1"
authors = ["%s"]`, dir, getName()) authors = ["%s"]`, dir, name)
if err := os.WriteFile(indexFes, []byte(content), 0644); err != nil {
return err
}
}
fmt.Println("Created new project at", dir)
return nil return nil
} }

314
src/server/server.go
View File

@@ -5,67 +5,79 @@ import (
"io/fs" "io/fs"
"net/http" "net/http"
"os" "os"
"path"
"path/filepath" "path/filepath"
"regexp" "regexp"
"sort"
"strings" "strings"
"time"
"fes/src/config"
"github.com/fatih/color"
"github.com/gomarkdown/markdown" "github.com/gomarkdown/markdown"
"github.com/gomarkdown/markdown/html" "github.com/gomarkdown/markdown/html"
"github.com/gomarkdown/markdown/parser" "github.com/gomarkdown/markdown/parser"
"github.com/pelletier/go-toml/v2" "github.com/pelletier/go-toml/v2"
lua "github.com/yuin/gopher-lua" lua "github.com/yuin/gopher-lua"
"github.com/fatih/color" "html/template"
"fes/src/config"
) )
type reqData struct { type reqData struct {
path string path string
params map[string]string params map[string]string
} }
func handleDir(entries []os.DirEntry, wwwDir string, routes map[string]string, base string) error { func handleDir(entries []os.DirEntry, dir string, routes map[string]string, base string, isStatic bool) error {
for _, entry := range entries { for _, entry := range entries {
path := filepath.Join(dir, entry.Name())
if entry.IsDir() { if entry.IsDir() {
sub := filepath.Join("www", entry.Name()) nextBase := joinBase(base, entry.Name())
subs, err := os.ReadDir(sub) subEntries, err := os.ReadDir(path)
if err != nil { if err != nil {
return fmt.Errorf("failed to read %s: %w", sub, err) return fmt.Errorf("failed to read directory %s: %w", path, err)
} }
var next string if err := handleDir(subEntries, path, routes, nextBase, isStatic); err != nil {
if base == "" {
next = "/" + entry.Name()
} else {
next = base + "/" + entry.Name()
}
if err := handleDir(subs, sub, routes, next); err != nil {
return err return err
} }
continue continue
} }
if strings.HasSuffix(entry.Name(), ".lua") { route := joinBase(base, entry.Name())
if !isStatic && strings.HasSuffix(entry.Name(), ".lua") {
name := strings.TrimSuffix(entry.Name(), ".lua") name := strings.TrimSuffix(entry.Name(), ".lua")
path := filepath.Join("www", entry.Name())
if name == "index" { if name == "index" {
if base == "" { routes[basePath(base)] = path
routes["/"] = path routes[route] = path
routes["/index"] = path continue
} else {
routes[base] = path
routes[base+"/index"] = path
}
} else {
if base == "" {
routes["/"+name] = path
} else {
routes[base+"/"+name] = path
}
} }
route = joinBase(base, name)
} else if !isStatic && strings.HasSuffix(entry.Name(), ".md") {
name := strings.TrimSuffix(entry.Name(), ".md")
if name == "index" {
routes[basePath(base)] = path
routes[route] = path
continue
}
route = joinBase(base, name)
} }
routes[route] = path
} }
return nil return nil
} }
func joinBase(base, name string) string {
if base == "" {
return "/" + name
}
return base + "/" + name
}
func basePath(base string) string {
if base == "" || base == "." {
return "/"
}
return base
}
func fixMalformedToml(content string) string { func fixMalformedToml(content string) string {
re := regexp.MustCompile(`(?m)^(\s*\w+\s*=\s*)$`) re := regexp.MustCompile(`(?m)^(\s*\w+\s*=\s*)$`)
return re.ReplaceAllStringFunc(content, func(match string) string { return re.ReplaceAllStringFunc(content, func(match string) string {
@@ -95,23 +107,27 @@ func loadIncludeModules(L *lua.LState, includeDir string) *lua.LTable {
return app return app
} }
for _, e := range ents { for _, e := range ents {
if e.IsDir() { if e.IsDir() || !strings.HasSuffix(e.Name(), ".lua") {
continue continue
} }
name := e.Name() base := strings.TrimSuffix(e.Name(), ".lua")
if !strings.HasSuffix(name, ".lua") { path := filepath.Join(includeDir, e.Name())
if _, err := os.Stat(path); err != nil {
tbl := L.NewTable()
tbl.RawSetString("error", lua.LString(fmt.Sprintf("file not found: %s", path)))
app.RawSetString(base, tbl)
continue continue
} }
base := strings.TrimSuffix(name, ".lua")
path := filepath.Join(includeDir, name)
if err := L.DoFile(path); err != nil { if err := L.DoFile(path); err != nil {
fmt.Printf("Failed to load %s: %v\n", path, err) tbl := L.NewTable()
tbl.RawSetString("error", lua.LString(err.Error()))
app.RawSetString(base, tbl)
continue continue
} }
val := L.Get(-1) val := L.Get(-1)
L.Pop(1) L.Pop(1)
tbl, ok := val.(*lua.LTable) tbl, ok := val.(*lua.LTable)
if !ok { if !ok || tbl == nil {
tbl = L.NewTable() tbl = L.NewTable()
} }
app.RawSetString(base, tbl) app.RawSetString(base, tbl)
@@ -158,7 +174,6 @@ func loadLua(luaDir string, entry string, cfg *config.MyConfig, requestData reqD
L.PreloadModule("fes", func(L *lua.LState) int { L.PreloadModule("fes", func(L *lua.LState) int {
mod := L.NewTable() mod := L.NewTable()
coreModules := []string{} coreModules := []string{}
if ents, err := fs.ReadDir(config.Core, "core"); err == nil { if ents, err := fs.ReadDir(config.Core, "core"); err == nil {
for _, e := range ents { for _, e := range ents {
@@ -168,7 +183,6 @@ func loadLua(luaDir string, entry string, cfg *config.MyConfig, requestData reqD
coreModules = append(coreModules, strings.TrimSuffix(e.Name(), ".lua")) coreModules = append(coreModules, strings.TrimSuffix(e.Name(), ".lua"))
} }
} }
for _, modName := range coreModules { for _, modName := range coreModules {
path := filepath.Join("core", modName+".lua") path := filepath.Join("core", modName+".lua")
fileData, err := config.Core.ReadFile(path) fileData, err := config.Core.ReadFile(path)
@@ -191,8 +205,7 @@ func loadLua(luaDir string, entry string, cfg *config.MyConfig, requestData reqD
} }
} }
includeDir := filepath.Join(luaDir, "include") mod.RawSetString("app", loadIncludeModules(L, filepath.Join(".", "include")))
mod.RawSetString("app", loadIncludeModules(L, includeDir))
if cfg != nil { if cfg != nil {
site := L.NewTable() site := L.NewTable()
@@ -247,24 +260,113 @@ func loadLua(luaDir string, entry string, cfg *config.MyConfig, requestData reqD
return "", nil return "", nil
} }
func generateArchiveIndex(fsPath string, urlPath string) (string, error) {
info, err := os.Stat(fsPath)
if err != nil {
return "", err
}
if !info.IsDir() {
return "", fmt.Errorf("not a directory")
}
ents, err := os.ReadDir(fsPath)
if err != nil {
return "", err
}
type entryInfo struct {
name string
isDir bool
href string
size int64
mod time.Time
}
var list []entryInfo
for _, e := range ents {
n := e.Name()
full := filepath.Join(fsPath, n)
st, err := os.Stat(full)
if err != nil {
continue
}
isd := st.IsDir()
displayName := n
if isd {
displayName = n + "/"
}
href := path.Join(urlPath, n)
if isd && !strings.HasSuffix(href, "/") {
href = href + "/"
}
size := int64(-1)
if !isd {
size = st.Size()
}
list = append(list, entryInfo{name: displayName, isDir: isd, href: href, size: size, mod: st.ModTime()})
}
sort.Slice(list, func(i, j int) bool {
if list[i].isDir != list[j].isDir {
return list[i].isDir
}
return strings.ToLower(list[i].name) < strings.ToLower(list[j].name)
})
urlPath = basePath(strings.TrimPrefix(urlPath, "/archive"))
var b strings.Builder
b.WriteString("<html>\n<head><title>Index of ")
b.WriteString(template.HTMLEscapeString(urlPath))
b.WriteString("</title></head>\n<body>\n<h1>Index of ")
b.WriteString(template.HTMLEscapeString(urlPath))
b.WriteString("</h1><hr><pre>")
if urlPath != "/archive" && urlPath != "/archive/" {
up := path.Dir(urlPath)
if up == "." {
up = "/archive"
}
if !strings.HasSuffix(up, "/") {
up = up + "/"
}
b.WriteString(`<a href="` + template.HTMLEscapeString(up) + `">../</a>` + "\n")
} else {
b.WriteString(`<a href="../">../</a>` + "\n")
}
nameCol := 50
for _, ei := range list {
escapedName := template.HTMLEscapeString(ei.name)
dateStr := ei.mod.Local().Format("02-Jan-2006 15:04")
var sizeStr string
if ei.isDir {
sizeStr = "-"
} else {
sizeStr = fmt.Sprintf("%d", ei.size)
}
spaces := 1
if len(escapedName) < nameCol {
spaces = nameCol - len(escapedName)
}
line := `<a href="` + template.HTMLEscapeString(ei.href) + `">` + escapedName + `</a>` + strings.Repeat(" ", spaces) + dateStr + strings.Repeat(" ", 19-len(sizeStr)) + sizeStr + "\n"
b.WriteString(line)
}
b.WriteString("</pre><hr></body>\n</html>")
return b.String(), nil
}
func Start(dir string) error { func Start(dir string) error {
os.Chdir(dir) if err := os.Chdir(dir); err != nil {
return fmt.Errorf("failed to change directory to %s: %w", dir, err)
}
dir = "." dir = "."
tomlDocument, err := os.ReadFile("Fes.toml") tomlDocument, err := os.ReadFile("Fes.toml")
if err != nil { if err != nil {
return err return fmt.Errorf("failed to read Fes.toml: %w", err)
} }
docStr := fixMalformedToml(string(tomlDocument)) docStr := fixMalformedToml(string(tomlDocument))
var cfg config.MyConfig var cfg config.MyConfig
err = toml.Unmarshal([]byte(docStr), &cfg) if err := toml.Unmarshal([]byte(docStr), &cfg); err != nil {
if err != nil { fmt.Printf("Warning: failed to parse Fes.toml: %v\n", err)
return fmt.Errorf("failed to parse Fes.toml: %w", err) cfg.App.Authors = []string{"unknown"}
} cfg.App.Name = "unknown"
cfg.App.Version = "unknown"
entries, err := os.ReadDir("www")
if err != nil {
return fmt.Errorf("failed to read www directory: %w", err)
} }
notFoundData := ` notFoundData := `
@@ -277,54 +379,92 @@ func Start(dir string) error {
</html> </html>
` `
if _, err := os.Stat(filepath.Join("www", "404.lua")); err == nil { if _, err := os.Stat(filepath.Join("www", "404.lua")); err == nil {
notFoundData, err = loadLua(dir, "www/404.lua", &cfg, reqData{}) if nf, err := loadLua(dir, "www/404.lua", &cfg, reqData{}); err == nil {
if err != nil { notFoundData = nf
panic(err)
} }
} else if _, err := os.Stat("www/404.html"); err == nil { } else if _, err := os.Stat("www/404.html"); err == nil {
buf, err := os.ReadFile("www/404.html") if buf, err := os.ReadFile("www/404.html"); err == nil {
if err != nil { notFoundData = string(buf)
panic(err)
} }
notFoundData = string(buf)
} }
routes := make(map[string]string) routes := make(map[string]string)
handleDir(entries, "www", routes, "") if entries, err := os.ReadDir("www"); err == nil {
if err := handleDir(entries, "www", routes, "", false); err != nil {
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { fmt.Printf("Warning: failed to handle www directory: %v\n", err)
path := r.URL.Path
lp, ok := routes[path]
if !ok {
w.WriteHeader(http.StatusNotFound)
w.Write([]byte(notFoundData))
fmt.Printf("> %s.lua ", filepath.Base(path))
color.Yellow("not found")
return
}
params := make(map[string]string)
for key, val := range r.URL.Query() {
if len(val) > 0 {
params[key] = val[0]
} }
} }
req := reqData{ if entries, err := os.ReadDir("static"); err == nil {
path: r.URL.Path, if err := handleDir(entries, "static", routes, "/static", true); err != nil {
params: params, fmt.Printf("Warning: failed to handle static directory: %v\n", err)
}
} }
fmt.Printf("> %s ", filepath.Base(lp)) if entries, err := os.ReadDir("archive"); err == nil {
data, err := loadLua(dir, lp, &cfg, req) if err := handleDir(entries, "archive", routes, "/archive", true); err != nil {
if err != nil { fmt.Printf("Warning: failed to handle archive directory: %v\n", err)
http.Error(w, fmt.Sprintf("Error loading page: %v", err), http.StatusInternalServerError) }
color.Red("bad")
return
} }
color.Green("ok")
w.Write([]byte(data)) http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
}) path := r.URL.Path
p, ok := routes[path]
fmt.Printf("> %s ", basePath(filepath.Base(p)))
if !ok && strings.HasPrefix(path, "/archive") {
fsPath := "." + path
info, err := os.Stat(fsPath)
if err == nil && info.IsDir() {
if htmlStr, err := generateArchiveIndex(fsPath, path); err == nil {
w.Write([]byte(htmlStr))
return
}
}
}
if !ok {
w.WriteHeader(http.StatusNotFound)
w.Write([]byte(notFoundData))
color.Yellow("not found")
return
}
params := make(map[string]string)
for k, val := range r.URL.Query() {
if len(val) > 0 {
params[k] = val[0]
}
}
req := reqData{
path: path,
params: params,
}
var data []byte
var err error
if strings.HasSuffix(p, ".lua") {
var b string
b, err = loadLua(dir, p, &cfg, req)
data = []byte(b)
} else if strings.HasSuffix(p, ".md") {
data, err = os.ReadFile(p)
data = []byte(markdownToHTML(string(data)))
} else {
data, err = os.ReadFile(p)
}
if err != nil {
http.Error(w, fmt.Sprintf("Error loading page: %v", err), http.StatusInternalServerError)
color.Red("bad")
return
}
w.Write(data)
color.Green("ok")
})
fmt.Printf("Server is running on http://localhost:%d\n", *config.Port) fmt.Printf("Server is running on http://localhost:%d\n", *config.Port)
return http.ListenAndServe(fmt.Sprintf(":%d", *config.Port), nil) return http.ListenAndServe(fmt.Sprintf(":%d", *config.Port), nil)