alpha p10

bak.examples/archive/www/index.lua

@@ -1,8 +0,0 @@
-local fes = require("fes")
-local site = fes.fes()
-
-site.title = "archive"
-
-site:h1("Hello, World!")
-
-return site

bak.examples/bus/www/index.lua

@@ -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

bak.examples/canonical/Fes.toml

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

bak.examples/canonical/include/header.lua

@@ -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

bak.examples/canonical/www/404.lua

@@ -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

bak.examples/canonical/www/index.lua

@@ -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

bak.examples/error/Fes.toml

@@ -1 +0,0 @@
-dhasjkdhaskjdhaskhdajkshjk

bak.examples/error/www/index.lua

@@ -1,9 +0,0 @@
-local fes = require("fes")
-local site = fes.fes()
-
-site.title = "error"
-
-UNIX is very simple
-GNU's Not UNIX
-
-return site

bak.examples/favicon/www/index.lua

@@ -1,9 +0,0 @@
-local fes = require("fes")
-local site = fes.fes()
-
-site.title = "favicon"
-site.favicon = "static/image/favicon.ico"
-
-site:h1("Hello, World!")
-
-return site

bak.examples/hello-world/Fes.toml

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

bak.examples/json/www/index.lua

@@ -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

bak.examples/multi-page/Fes.toml

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

bak.examples/multi-page/www/index.lua

@@ -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

bak.examples/multi-page/www/page1.lua

@@ -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

bak.examples/multi-page/www/page2.lua

@@ -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

bak.examples/simple/Fes.toml

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

bak.examples/static/static/foo

@@ -1 +0,0 @@
-this is some neat data

doc/Fes.toml

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

doc/www/index.lua

@@ -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

examples/advanced/Fes.toml

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

examples/advanced/include/foo.lua

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

examples/advanced/www/index.lua

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

examples/archive/www/index.lua

@@ -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

examples/error/Fes.toml

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

examples/error/www/index.lua

@@ -1,8 +1,6 @@
 local fes = require("fes")
 local site = fes.fes()
 
-site.title = "static"
+This is what an error looks like
-
-site:h1("Hello, World!")
 
 return site

examples/hello/Fes.toml

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

examples/hello/www/index.lua

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

examples/simple/Fes.toml

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

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // 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
 	golang.org/x/sys v0.25.0 // indirect
 )

go.sum

@@ -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/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/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/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
 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.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
 golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

main.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"embed"
-	_ "embed"
+	"errors"
 	"flag"
 	"fmt"
 	"os"
@@ -10,6 +10,7 @@ import (
 	"github.com/fatih/color"
 
 	"fes/src/config"
+	"fes/src/doc"
 	"fes/src/new"
 	"fes/src/server"
 )
@@ -24,30 +25,63 @@ func init() {
 }
 
 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 {
 		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 {
 	case "new":
 		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":
 		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:
-		fmt.Println("Unknown command:", cmd)
+		fmt.Fprintf(os.Stderr, "Unknown command: %s\n", cmd)
+		flag.Usage()
 		os.Exit(1)
 	}
 }

src/doc/doc.go

@@ -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)
+}

src/new/new.go

@@ -48,16 +48,21 @@ func Project(dir string) error {
 	if err := os.Chdir(dir); err != nil {
 		return err
 	}
+
+	name := getName()
+
 	write("www/index.lua", `local fes = require("fes")
 local site = fes.fes()
 
+-- site.copyright = fes.util.copyright("https://example.com", "%s")
+
 site:h1("Hello, World!")
 
-return site`)
+return site`, name)
 	write("Fes.toml", `[app]
 
 name = "%s"
 version = "0.0.1"
-authors = ["%s"]`, dir, getName())
+authors = ["%s"]`, dir, name)
 	return nil
 }

src/server/server.go

@@ -12,6 +12,7 @@ import (
 	"strings"
 	"time"
 
+	"fes/src/config"
 	"github.com/fatih/color"
 	"github.com/gomarkdown/markdown"
 	"github.com/gomarkdown/markdown/html"
@@ -19,16 +20,13 @@ import (
 	"github.com/pelletier/go-toml/v2"
 	lua "github.com/yuin/gopher-lua"
 	"html/template"
-	"fes/src/config"
 )
 
-/* structure of all data passed to page via fes.bus */
 type reqData struct {
 	path   string
 	params map[string]string
 }
 
-/* loads directories to routes */
 func handleDir(entries []os.DirEntry, dir string, routes map[string]string, base string, isStatic bool) error {
 	for _, entry := range entries {
 		path := filepath.Join(dir, entry.Name())
@@ -72,7 +70,6 @@ func basePath(base string) string {
 	return base
 }
 
-/* fixes empty TOML keys (e.g., key=) */
 func fixMalformedToml(content string) string {
 	re := regexp.MustCompile(`(?m)^(\s*\w+\s*=\s*)$`)
 	return re.ReplaceAllStringFunc(content, func(match string) string {
@@ -85,7 +82,6 @@ func fixMalformedToml(content string) string {
 	})
 }
 
-/* converts markdown to html */
 func markdownToHTML(mdText string) string {
 	extensions := parser.CommonExtensions | parser.AutoHeadingIDs | parser.NoEmptyLineBeforeBlock
 	p := parser.NewWithExtensions(extensions)
@@ -96,7 +92,6 @@ func markdownToHTML(mdText string) string {
 	return string(markdown.Render(doc, renderer))
 }
 
-/* load Lua include modules used in core/ into their table */
 func loadIncludeModules(L *lua.LState, includeDir string) *lua.LTable {
 	app := L.NewTable()
 	ents, err := os.ReadDir(includeDir)
@@ -109,6 +104,12 @@ func loadIncludeModules(L *lua.LState, includeDir string) *lua.LTable {
 		}
 		base := strings.TrimSuffix(e.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
+		}
 		if err := L.DoFile(path); err != nil {
 			tbl := L.NewTable()
 			tbl.RawSetString("error", lua.LString(err.Error()))
@@ -118,7 +119,7 @@ func loadIncludeModules(L *lua.LState, includeDir string) *lua.LTable {
 		val := L.Get(-1)
 		L.Pop(1)
 		tbl, ok := val.(*lua.LTable)
-		if !ok {
+		if !ok || tbl == nil {
 			tbl = L.NewTable()
 		}
 		app.RawSetString(base, tbl)
@@ -126,7 +127,6 @@ func loadIncludeModules(L *lua.LState, includeDir string) *lua.LTable {
 	return app
 }
 
-/* load and execute lua scripts with core and user modules */
 func loadLua(luaDir string, entry string, cfg *config.MyConfig, requestData reqData) (string, error) {
 	L := lua.NewState()
 	defer L.Close()
@@ -197,8 +197,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 {
 			site := L.NewTable()
@@ -253,7 +252,6 @@ func loadLua(luaDir string, entry string, cfg *config.MyConfig, requestData reqD
 	return "", nil
 }
 
-/* generate html index page for archive directories */
 func generateArchiveIndex(fsPath string, urlPath string) (string, error) {
 	info, err := os.Stat(fsPath)
 	if err != nil {
@@ -344,7 +342,6 @@ func generateArchiveIndex(fsPath string, urlPath string) (string, error) {
 	return b.String(), nil
 }
 
-/* start http server with features */
 func Start(dir string) error {
 	if err := os.Chdir(dir); err != nil {
 		return fmt.Errorf("failed to change directory to %s: %w", dir, err)