doc: patch

Merge pull request 'doc: first' (#4 ) from doc into main
Reviewed-on: #4
2025-12-14 19:43:10 -05:00 · 2025-12-14 19:41:43 -05:00 · 2025-12-14 19:40:55 -05:00 · 2025-12-14 11:55:27 -05:00 · 2025-12-14 11:54:50 -05:00 · 2025-12-14 10:19:25 -05:00
40 changed files with 1713 additions and 607 deletions
--- a/9
+++ b/9
@@ -0,0 +1,9 @@
+FROM alpine:3.20
+
+ARG SITE
+
+RUN echo "https://git.vxserver.dev/api/packages/fSD/alpine/main/fports" >> /etc/apk/repositories
+    && apk update \
+    && apk add --no-cache fes
+
+ENTRYPOINT ["fes", "run", ${SITE}]
--- a/2
+++ b/2
@@ -1,2 +0,0 @@
-Add an interval element
-Add favicon support
--- a/core/builtin.lua
+++ b/core/builtin.lua
@@ -3,13 +3,8 @@ local std = require("core.std")
 local 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)
-    local config = {}
-    local site_config = {}
+    local config = {} local site_config = {}
    local fes_mod = package.loaded.fes
    if fes_mod and fes_mod.config then
        config = fes_mod.config
@@ -18,20 +13,22 @@ function M.fes(header, footer)
        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 = {
-        version = site_config.version or "",
-        title = site_config.title or "Document",
-        copyright = site_config.copyright or "&#169; The Copyright Holder",
-        favicon = "data:image/svg+xml," .. encode(raw_favicon),
+        version = site_config.version,
+        title = site_config.title,
+        copyright = site_config.copyright,
+        favicon = site_config.favicon,
        header = header or [[
 <!DOCTYPE html>
 <html lang="en">
 <head>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width,initial-scale=1.0">
-<link rel="icon" href="{{FAVICON}}">
+{{FAVICON}}
 <title>{{TITLE}}</title>
 <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; }
@@ -132,10 +129,9 @@ end

 function M:build()
    local header = self.header
-    local safe_title = self.title or "Document"
-    local safe_favicon = self.favicon:gsub("%%", "%%%%")
-    header = header:gsub("{{TITLE}}", safe_title)
-    header = header:gsub("{{FAVICON}}", safe_favicon)
+    header = header:gsub("{{TITLE}}", self.title or "Document")
+    local favicon_html = self.favicon and ('<link rel="icon" type="image/x-icon" href="' .. self.favicon .. '">')
+    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>">]])
    local footer = self.footer:gsub("{{COPYRIGHT}}", self.copyright or "&#169; The Copyright Holder")
    return header .. table.concat(self.parts, "\n") .. footer
 end
--- a/core/dkjson.lua
+++ b/core/dkjson.lua
@@ -0,0 +1,752 @@
+-- Module options:
+local always_use_lpeg = false
+local register_global_module_table = false
+local global_module_name = 'json'
+
+--[==[
+
+David Kolf's JSON module for Lua 5.1 - 5.4
+
+Version 2.8
+
+
+For the documentation see the corresponding readme.txt or visit
+<http://dkolf.de/dkjson-lua/>.
+
+You can contact the author by sending an e-mail to 'david' at the
+domain 'dkolf.de'.
+
+
+Copyright (C) 2010-2024 David Heiko Kolf
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--]==]
+
+-- global dependencies:
+local pairs, type, tostring, tonumber, getmetatable, setmetatable =
+      pairs, type, tostring, tonumber, getmetatable, setmetatable
+local error, require, pcall, select = error, require, pcall, select
+local floor, huge = math.floor, math.huge
+local strrep, gsub, strsub, strbyte, strchar, strfind, strlen, strformat =
+      string.rep, string.gsub, string.sub, string.byte, string.char,
+      string.find, string.len, string.format
+local strmatch = string.match
+local concat = table.concat
+
+local json = { version = "dkjson 2.8" }
+
+local jsonlpeg = {}
+
+if register_global_module_table then
+  if always_use_lpeg then
+    _G[global_module_name] = jsonlpeg
+  else
+    _G[global_module_name] = json
+  end
+end
+
+local _ENV = nil -- blocking globals in Lua 5.2 and later
+
+pcall (function()
+  -- Enable access to blocked metatables.
+  -- Don't worry, this module doesn't change anything in them.
+  local debmeta = require "debug".getmetatable
+  if debmeta then getmetatable = debmeta end
+end)
+
+json.null = setmetatable ({}, {
+  __tojson = function () return "null" end
+})
+
+local function isarray (tbl)
+  local max, n, arraylen = 0, 0, 0
+  for k,v in pairs (tbl) do
+    if k == 'n' and type(v) == 'number' then
+      arraylen = v
+      if v > max then
+        max = v
+      end
+    else
+      if type(k) ~= 'number' or k < 1 or floor(k) ~= k then
+        return false
+      end
+      if k > max then
+        max = k
+      end
+      n = n + 1
+    end
+  end
+  if max > 10 and max > arraylen and max > n * 2 then
+    return false -- don't create an array with too many holes
+  end
+  return true, max
+end
+
+local escapecodes = {
+  ["\""] = "\\\"", ["\\"] = "\\\\", ["\b"] = "\\b", ["\f"] = "\\f",
+  ["\n"] = "\\n",  ["\r"] = "\\r",  ["\t"] = "\\t"
+}
+
+local function escapeutf8 (uchar)
+  local value = escapecodes[uchar]
+  if value then
+    return value
+  end
+  local a, b, c, d = strbyte (uchar, 1, 4)
+  a, b, c, d = a or 0, b or 0, c or 0, d or 0
+  if a <= 0x7f then
+    value = a
+  elseif 0xc0 <= a and a <= 0xdf and b >= 0x80 then
+    value = (a - 0xc0) * 0x40 + b - 0x80
+  elseif 0xe0 <= a and a <= 0xef and b >= 0x80 and c >= 0x80 then
+    value = ((a - 0xe0) * 0x40 + b - 0x80) * 0x40 + c - 0x80
+  elseif 0xf0 <= a and a <= 0xf7 and b >= 0x80 and c >= 0x80 and d >= 0x80 then
+    value = (((a - 0xf0) * 0x40 + b - 0x80) * 0x40 + c - 0x80) * 0x40 + d - 0x80
+  else
+    return ""
+  end
+  if value <= 0xffff then
+    return strformat ("\\u%.4x", value)
+  elseif value <= 0x10ffff then
+    -- encode as UTF-16 surrogate pair
+    value = value - 0x10000
+    local highsur, lowsur = 0xD800 + floor (value/0x400), 0xDC00 + (value % 0x400)
+    return strformat ("\\u%.4x\\u%.4x", highsur, lowsur)
+  else
+    return ""
+  end
+end
+
+local function fsub (str, pattern, repl)
+  -- gsub always builds a new string in a buffer, even when no match
+  -- exists. First using find should be more efficient when most strings
+  -- don't contain the pattern.
+  if strfind (str, pattern) then
+    return gsub (str, pattern, repl)
+  else
+    return str
+  end
+end
+
+local function quotestring (value)
+  -- based on the regexp "escapable" in https://github.com/douglascrockford/JSON-js
+  value = fsub (value, "[%z\1-\31\"\\\127]", escapeutf8)
+  if strfind (value, "[\194\216\220\225\226\239]") then
+    value = fsub (value, "\194[\128-\159\173]", escapeutf8)
+    value = fsub (value, "\216[\128-\132]", escapeutf8)
+    value = fsub (value, "\220\143", escapeutf8)
+    value = fsub (value, "\225\158[\180\181]", escapeutf8)
+    value = fsub (value, "\226\128[\140-\143\168-\175]", escapeutf8)
+    value = fsub (value, "\226\129[\160-\175]", escapeutf8)
+    value = fsub (value, "\239\187\191", escapeutf8)
+    value = fsub (value, "\239\191[\176-\191]", escapeutf8)
+  end
+  return "\"" .. value .. "\""
+end
+json.quotestring = quotestring
+
+local function replace(str, o, n)
+  local i, j = strfind (str, o, 1, true)
+  if i then
+    return strsub(str, 1, i-1) .. n .. strsub(str, j+1, -1)
+  else
+    return str
+  end
+end
+
+-- locale independent num2str and str2num functions
+local decpoint, numfilter
+
+local function updatedecpoint ()
+  decpoint = strmatch(tostring(0.5), "([^05+])")
+  -- build a filter that can be used to remove group separators
+  numfilter = "[^0-9%-%+eE" .. gsub(decpoint, "[%^%$%(%)%%%.%[%]%*%+%-%?]", "%%%0") .. "]+"
+end
+
+updatedecpoint()
+
+local function num2str (num)
+  return replace(fsub(tostring(num), numfilter, ""), decpoint, ".")
+end
+
+local function str2num (str)
+  local num = tonumber(replace(str, ".", decpoint))
+  if not num then
+    updatedecpoint()
+    num = tonumber(replace(str, ".", decpoint))
+  end
+  return num
+end
+
+local function addnewline2 (level, buffer, buflen)
+  buffer[buflen+1] = "\n"
+  buffer[buflen+2] = strrep ("  ", level)
+  buflen = buflen + 2
+  return buflen
+end
+
+function json.addnewline (state)
+  if state.indent then
+    state.bufferlen = addnewline2 (state.level or 0,
+                           state.buffer, state.bufferlen or #(state.buffer))
+  end
+end
+
+local encode2 -- forward declaration
+
+local function addpair (key, value, prev, indent, level, buffer, buflen, tables, globalorder, state)
+  local kt = type (key)
+  if kt ~= 'string' and kt ~= 'number' then
+    return nil, "type '" .. kt .. "' is not supported as a key by JSON."
+  end
+  if prev then
+    buflen = buflen + 1
+    buffer[buflen] = ","
+  end
+  if indent then
+    buflen = addnewline2 (level, buffer, buflen)
+  end
+  -- When Lua is compiled with LUA_NOCVTN2S this will fail when
+  -- numbers are mixed into the keys of the table. JSON keys are always
+  -- strings, so this would be an implicit conversion too and the failure
+  -- is intentional.
+  buffer[buflen+1] = quotestring (key)
+  buffer[buflen+2] = ":"
+  return encode2 (value, indent, level, buffer, buflen + 2, tables, globalorder, state)
+end
+
+local function appendcustom(res, buffer, state)
+  local buflen = state.bufferlen
+  if type (res) == 'string' then
+    buflen = buflen + 1
+    buffer[buflen] = res
+  end
+  return buflen
+end
+
+local function exception(reason, value, state, buffer, buflen, defaultmessage)
+  defaultmessage = defaultmessage or reason
+  local handler = state.exception
+  if not handler then
+    return nil, defaultmessage
+  else
+    state.bufferlen = buflen
+    local ret, msg = handler (reason, value, state, defaultmessage)
+    if not ret then return nil, msg or defaultmessage end
+    return appendcustom(ret, buffer, state)
+  end
+end
+
+function json.encodeexception(reason, value, state, defaultmessage)
+  return quotestring("<" .. defaultmessage .. ">")
+end
+
+encode2 = function (value, indent, level, buffer, buflen, tables, globalorder, state)
+  local valtype = type (value)
+  local valmeta = getmetatable (value)
+  valmeta = type (valmeta) == 'table' and valmeta -- only tables
+  local valtojson = valmeta and valmeta.__tojson
+  if valtojson then
+    if tables[value] then
+      return exception('reference cycle', value, state, buffer, buflen)
+    end
+    tables[value] = true
+    state.bufferlen = buflen
+    local ret, msg = valtojson (value, state)
+    if not ret then return exception('custom encoder failed', value, state, buffer, buflen, msg) end
+    tables[value] = nil
+    buflen = appendcustom(ret, buffer, state)
+  elseif value == nil then
+    buflen = buflen + 1
+    buffer[buflen] = "null"
+  elseif valtype == 'number' then
+    local s
+    if value ~= value or value >= huge or -value >= huge then
+      -- This is the behaviour of the original JSON implementation.
+      s = "null"
+    else
+      s = num2str (value)
+    end
+    buflen = buflen + 1
+    buffer[buflen] = s
+  elseif valtype == 'boolean' then
+    buflen = buflen + 1
+    buffer[buflen] = value and "true" or "false"
+  elseif valtype == 'string' then
+    buflen = buflen + 1
+    buffer[buflen] = quotestring (value)
+  elseif valtype == 'table' then
+    if tables[value] then
+      return exception('reference cycle', value, state, buffer, buflen)
+    end
+    tables[value] = true
+    level = level + 1
+    local isa, n = isarray (value)
+    if n == 0 and valmeta and valmeta.__jsontype == 'object' then
+      isa = false
+    end
+    local msg
+    if isa then -- JSON array
+      buflen = buflen + 1
+      buffer[buflen] = "["
+      for i = 1, n do
+        buflen, msg = encode2 (value[i], indent, level, buffer, buflen, tables, globalorder, state)
+        if not buflen then return nil, msg end
+        if i < n then
+          buflen = buflen + 1
+          buffer[buflen] = ","
+        end
+      end
+      buflen = buflen + 1
+      buffer[buflen] = "]"
+    else -- JSON object
+      local prev = false
+      buflen = buflen + 1
+      buffer[buflen] = "{"
+      local order = valmeta and valmeta.__jsonorder or globalorder
+      if order then
+        local used = {}
+        n = #order
+        for i = 1, n do
+          local k = order[i]
+          local v = value[k]
+          if v ~= nil then
+            used[k] = true
+            buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state)
+            if not buflen then return nil, msg end
+            prev = true -- add a seperator before the next element
+          end
+        end
+        for k,v in pairs (value) do
+          if not used[k] then
+            buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state)
+            if not buflen then return nil, msg end
+            prev = true -- add a seperator before the next element
+          end
+        end
+      else -- unordered
+        for k,v in pairs (value) do
+          buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state)
+          if not buflen then return nil, msg end
+          prev = true -- add a seperator before the next element
+        end
+      end
+      if indent then
+        buflen = addnewline2 (level - 1, buffer, buflen)
+      end
+      buflen = buflen + 1
+      buffer[buflen] = "}"
+    end
+    tables[value] = nil
+  else
+    return exception ('unsupported type', value, state, buffer, buflen,
+      "type '" .. valtype .. "' is not supported by JSON.")
+  end
+  return buflen
+end
+
+function json.encode (value, state)
+  state = state or {}
+  local oldbuffer = state.buffer
+  local buffer = oldbuffer or {}
+  state.buffer = buffer
+  updatedecpoint()
+  local ret, msg = encode2 (value, state.indent, state.level or 0,
+                   buffer, state.bufferlen or 0, state.tables or {}, state.keyorder, state)
+  if not ret then
+    error (msg, 2)
+  elseif oldbuffer == buffer then
+    state.bufferlen = ret
+    return true
+  else
+    state.bufferlen = nil
+    state.buffer = nil
+    return concat (buffer)
+  end
+end
+
+local function loc (str, where)
+  local line, pos, linepos = 1, 1, 0
+  while true do
+    pos = strfind (str, "\n", pos, true)
+    if pos and pos < where then
+      line = line + 1
+      linepos = pos
+      pos = pos + 1
+    else
+      break
+    end
+  end
+  return strformat ("line %d, column %d", line, where - linepos)
+end
+
+local function unterminated (str, what, where)
+  return nil, strlen (str) + 1, "unterminated " .. what .. " at " .. loc (str, where)
+end
+
+local function scanwhite (str, pos)
+  while true do
+    pos = strfind (str, "%S", pos)
+    if not pos then return nil end
+    local sub2 = strsub (str, pos, pos + 1)
+    if sub2 == "\239\187" and strsub (str, pos + 2, pos + 2) == "\191" then
+      -- UTF-8 Byte Order Mark
+      pos = pos + 3
+    elseif sub2 == "//" then
+      pos = strfind (str, "[\n\r]", pos + 2)
+      if not pos then return nil end
+    elseif sub2 == "/*" then
+      pos = strfind (str, "*/", pos + 2)
+      if not pos then return nil end
+      pos = pos + 2
+    else
+      return pos
+    end
+  end
+end
+
+local escapechars = {
+  ["\""] = "\"", ["\\"] = "\\", ["/"] = "/", ["b"] = "\b", ["f"] = "\f",
+  ["n"] = "\n", ["r"] = "\r", ["t"] = "\t"
+}
+
+local function unichar (value)
+  if value < 0 then
+    return nil
+  elseif value <= 0x007f then
+    return strchar (value)
+  elseif value <= 0x07ff then
+    return strchar (0xc0 + floor(value/0x40),
+                    0x80 + (floor(value) % 0x40))
+  elseif value <= 0xffff then
+    return strchar (0xe0 + floor(value/0x1000),
+                    0x80 + (floor(value/0x40) % 0x40),
+                    0x80 + (floor(value) % 0x40))
+  elseif value <= 0x10ffff then
+    return strchar (0xf0 + floor(value/0x40000),
+                    0x80 + (floor(value/0x1000) % 0x40),
+                    0x80 + (floor(value/0x40) % 0x40),
+                    0x80 + (floor(value) % 0x40))
+  else
+    return nil
+  end
+end
+
+local function scanstring (str, pos)
+  local lastpos = pos + 1
+  local buffer, n = {}, 0
+  while true do
+    local nextpos = strfind (str, "[\"\\]", lastpos)
+    if not nextpos then
+      return unterminated (str, "string", pos)
+    end
+    if nextpos > lastpos then
+      n = n + 1
+      buffer[n] = strsub (str, lastpos, nextpos - 1)
+    end
+    if strsub (str, nextpos, nextpos) == "\"" then
+      lastpos = nextpos + 1
+      break
+    else
+      local escchar = strsub (str, nextpos + 1, nextpos + 1)
+      local value
+      if escchar == "u" then
+        value = tonumber (strsub (str, nextpos + 2, nextpos + 5), 16)
+        if value then
+          local value2
+          if 0xD800 <= value and value <= 0xDBff then
+            -- we have the high surrogate of UTF-16. Check if there is a
+            -- low surrogate escaped nearby to combine them.
+            if strsub (str, nextpos + 6, nextpos + 7) == "\\u" then
+              value2 = tonumber (strsub (str, nextpos + 8, nextpos + 11), 16)
+              if value2 and 0xDC00 <= value2 and value2 <= 0xDFFF then
+                value = (value - 0xD800)  * 0x400 + (value2 - 0xDC00) + 0x10000
+              else
+                value2 = nil -- in case it was out of range for a low surrogate
+              end
+            end
+          end
+          value = value and unichar (value)
+          if value then
+            if value2 then
+              lastpos = nextpos + 12
+            else
+              lastpos = nextpos + 6
+            end
+          end
+        end
+      end
+      if not value then
+        value = escapechars[escchar] or escchar
+        lastpos = nextpos + 2
+      end
+      n = n + 1
+      buffer[n] = value
+    end
+  end
+  if n == 1 then
+    return buffer[1], lastpos
+  elseif n > 1 then
+    return concat (buffer), lastpos
+  else
+    return "", lastpos
+  end
+end
+
+local scanvalue -- forward declaration
+
+local function scantable (what, closechar, str, startpos, nullval, objectmeta, arraymeta)
+  local tbl, n = {}, 0
+  local pos = startpos + 1
+  if what == 'object' then
+    setmetatable (tbl, objectmeta)
+  else
+    setmetatable (tbl, arraymeta)
+  end
+  while true do
+    pos = scanwhite (str, pos)
+    if not pos then return unterminated (str, what, startpos) end
+    local char = strsub (str, pos, pos)
+    if char == closechar then
+      return tbl, pos + 1
+    end
+    local val1, err
+    val1, pos, err = scanvalue (str, pos, nullval, objectmeta, arraymeta)
+    if err then return nil, pos, err end
+    pos = scanwhite (str, pos)
+    if not pos then return unterminated (str, what, startpos) end
+    char = strsub (str, pos, pos)
+    if char == ":" then
+      if val1 == nil then
+        return nil, pos, "cannot use nil as table index (at " .. loc (str, pos) .. ")"
+      end
+      pos = scanwhite (str, pos + 1)
+      if not pos then return unterminated (str, what, startpos) end
+      local val2
+      val2, pos, err = scanvalue (str, pos, nullval, objectmeta, arraymeta)
+      if err then return nil, pos, err end
+      tbl[val1] = val2
+      pos = scanwhite (str, pos)
+      if not pos then return unterminated (str, what, startpos) end
+      char = strsub (str, pos, pos)
+    else
+      n = n + 1
+      tbl[n] = val1
+    end
+    if char == "," then
+      pos = pos + 1
+    end
+  end
+end
+
+scanvalue = function (str, pos, nullval, objectmeta, arraymeta)
+  pos = pos or 1
+  pos = scanwhite (str, pos)
+  if not pos then
+    return nil, strlen (str) + 1, "no valid JSON value (reached the end)"
+  end
+  local char = strsub (str, pos, pos)
+  if char == "{" then
+    return scantable ('object', "}", str, pos, nullval, objectmeta, arraymeta)
+  elseif char == "[" then
+    return scantable ('array', "]", str, pos, nullval, objectmeta, arraymeta)
+  elseif char == "\"" then
+    return scanstring (str, pos)
+  else
+    local pstart, pend = strfind (str, "^%-?[%d%.]+[eE]?[%+%-]?%d*", pos)
+    if pstart then
+      local number = str2num (strsub (str, pstart, pend))
+      if number then
+        return number, pend + 1
+      end
+    end
+    pstart, pend = strfind (str, "^%a%w*", pos)
+    if pstart then
+      local name = strsub (str, pstart, pend)
+      if name == "true" then
+        return true, pend + 1
+      elseif name == "false" then
+        return false, pend + 1
+      elseif name == "null" then
+        return nullval, pend + 1
+      end
+    end
+    return nil, pos, "no valid JSON value at " .. loc (str, pos)
+  end
+end
+
+local function optionalmetatables(...)
+  if select("#", ...) > 0 then
+    return ...
+  else
+    return {__jsontype = 'object'}, {__jsontype = 'array'}
+  end
+end
+
+function json.decode (str, pos, nullval, ...)
+  local objectmeta, arraymeta = optionalmetatables(...)
+  return scanvalue (str, pos, nullval, objectmeta, arraymeta)
+end
+
+function json.use_lpeg ()
+  local g = require ("lpeg")
+
+  if type(g.version) == 'function' and g.version() == "0.11" then
+    error "due to a bug in LPeg 0.11, it cannot be used for JSON matching"
+  end
+
+  local pegmatch = g.match
+  local P, S, R = g.P, g.S, g.R
+
+  local function ErrorCall (str, pos, msg, state)
+    if not state.msg then
+      state.msg = msg .. " at " .. loc (str, pos)
+      state.pos = pos
+    end
+    return false
+  end
+
+  local function Err (msg)
+    return g.Cmt (g.Cc (msg) * g.Carg (2), ErrorCall)
+  end
+
+  local function ErrorUnterminatedCall (str, pos, what, state)
+    return ErrorCall (str, pos - 1, "unterminated " .. what, state)
+  end
+
+  local SingleLineComment = P"//" * (1 - S"\n\r")^0
+  local MultiLineComment = P"/*" * (1 - P"*/")^0 * P"*/"
+  local Space = (S" \n\r\t" + P"\239\187\191" + SingleLineComment + MultiLineComment)^0
+
+  local function ErrUnterminated (what)
+    return g.Cmt (g.Cc (what) * g.Carg (2), ErrorUnterminatedCall)
+  end
+
+  local PlainChar = 1 - S"\"\\\n\r"
+  local EscapeSequence = (P"\\" * g.C (S"\"\\/bfnrt" + Err "unsupported escape sequence")) / escapechars
+  local HexDigit = R("09", "af", "AF")
+  local function UTF16Surrogate (match, pos, high, low)
+    high, low = tonumber (high, 16), tonumber (low, 16)
+    if 0xD800 <= high and high <= 0xDBff and 0xDC00 <= low and low <= 0xDFFF then
+      return true, unichar ((high - 0xD800)  * 0x400 + (low - 0xDC00) + 0x10000)
+    else
+      return false
+    end
+  end
+  local function UTF16BMP (hex)
+    return unichar (tonumber (hex, 16))
+  end
+  local U16Sequence = (P"\\u" * g.C (HexDigit * HexDigit * HexDigit * HexDigit))
+  local UnicodeEscape = g.Cmt (U16Sequence * U16Sequence, UTF16Surrogate) + U16Sequence/UTF16BMP
+  local Char = UnicodeEscape + EscapeSequence + PlainChar
+  local String = P"\"" * (g.Cs (Char ^ 0) * P"\"" + ErrUnterminated "string")
+  local Integer = P"-"^(-1) * (P"0" + (R"19" * R"09"^0))
+  local Fractal = P"." * R"09"^0
+  local Exponent = (S"eE") * (S"+-")^(-1) * R"09"^1
+  local Number = (Integer * Fractal^(-1) * Exponent^(-1))/str2num
+  local Constant = P"true" * g.Cc (true) + P"false" * g.Cc (false) + P"null" * g.Carg (1)
+  local SimpleValue = Number + String + Constant
+  local ArrayContent, ObjectContent
+
+  -- The functions parsearray and parseobject parse only a single value/pair
+  -- at a time and store them directly to avoid hitting the LPeg limits.
+  local function parsearray (str, pos, nullval, state)
+    local obj, cont
+    local start = pos
+    local npos
+    local t, nt = {}, 0
+    repeat
+      obj, cont, npos = pegmatch (ArrayContent, str, pos, nullval, state)
+      if cont == 'end' then
+        return ErrorUnterminatedCall (str, start, "array", state)
+      end
+      pos = npos
+      if cont == 'cont' or cont == 'last' then
+        nt = nt + 1
+        t[nt] = obj
+      end
+    until cont ~= 'cont'
+    return pos, setmetatable (t, state.arraymeta)
+  end
+
+  local function parseobject (str, pos, nullval, state)
+    local obj, key, cont
+    local start = pos
+    local npos
+    local t = {}
+    repeat
+      key, obj, cont, npos = pegmatch (ObjectContent, str, pos, nullval, state)
+      if cont == 'end' then
+        return ErrorUnterminatedCall (str, start, "object", state)
+      end
+      pos = npos
+      if cont == 'cont' or cont == 'last' then
+        t[key] = obj
+      end
+    until cont ~= 'cont'
+    return pos, setmetatable (t, state.objectmeta)
+  end
+
+  local Array = P"[" * g.Cmt (g.Carg(1) * g.Carg(2), parsearray)
+  local Object = P"{" * g.Cmt (g.Carg(1) * g.Carg(2), parseobject)
+  local Value = Space * (Array + Object + SimpleValue)
+  local ExpectedValue = Value + Space * Err "value expected"
+  local ExpectedKey = String + Err "key expected"
+  local End = P(-1) * g.Cc'end'
+  local ErrInvalid = Err "invalid JSON"
+  ArrayContent = (Value * Space * (P"," * g.Cc'cont' + P"]" * g.Cc'last'+ End + ErrInvalid)  + g.Cc(nil) * (P"]" * g.Cc'empty' + End  + ErrInvalid)) * g.Cp()
+  local Pair = g.Cg (Space * ExpectedKey * Space * (P":" + Err "colon expected") * ExpectedValue)
+  ObjectContent = (g.Cc(nil) * g.Cc(nil) * P"}" * g.Cc'empty' + End + (Pair * Space * (P"," * g.Cc'cont' + P"}" * g.Cc'last' + End + ErrInvalid) + ErrInvalid)) * g.Cp()
+  local DecodeValue = ExpectedValue * g.Cp ()
+
+  jsonlpeg.version = json.version
+  jsonlpeg.encode = json.encode
+  jsonlpeg.null = json.null
+  jsonlpeg.quotestring = json.quotestring
+  jsonlpeg.addnewline = json.addnewline
+  jsonlpeg.encodeexception = json.encodeexception
+  jsonlpeg.using_lpeg = true
+
+  function jsonlpeg.decode (str, pos, nullval, ...)
+    local state = {}
+    state.objectmeta, state.arraymeta = optionalmetatables(...)
+    local obj, retpos = pegmatch (DecodeValue, str, pos, nullval, state)
+    if state.msg then
+      return nil, state.pos, state.msg
+    else
+      return obj, retpos
+    end
+  end
+
+  -- cache result of this function:
+  json.use_lpeg = function () return jsonlpeg end
+  jsonlpeg.use_lpeg = json.use_lpeg
+
+  return jsonlpeg
+end
+
+if always_use_lpeg then
+  return json.use_lpeg()
+end
+
+return json
+
--- a/core/middleware.lua
+++ b/core/middleware.lua
@@ -1,169 +0,0 @@
-local M = {}
-
-function M.json_decode(json)
-    if type(json) ~= "string" then
-        return nil, "input must be a string"
-    end
-
-    local pos = 1
-    local len = #json
-
-    local function skip_ws()
-        while pos <= len and json:sub(pos,pos):match("%s") do
-            pos = pos + 1
-        end
-    end
-
-    local function parse_value()
-        skip_ws()
-        local c = json:sub(pos,pos)
-        if c == "{" then return parse_object()
-        elseif c == "[" then return parse_array()
-        elseif c == '"' then return parse_string()
-        elseif c:match("[%d%-]") then return parse_number()
-        elseif json:sub(pos,pos+3) == "true" then pos=pos+4; return true
-        elseif json:sub(pos,pos+4) == "false" then pos=pos+5; return false
-        elseif json:sub(pos,pos+3) == "null" then pos=pos+4; return nil
-        else return nil, "invalid value at position "..pos
-        end
-    end
-
-    function parse_string()
-        pos = pos + 1
-        local start_pos = pos
-        local str = ""
-        while pos <= len do
-            local c = json:sub(pos,pos)
-            if c == '"' then
-                str = str .. json:sub(start_pos,pos-1)
-                pos = pos + 1
-                return str
-            elseif c == "\\" then
-                str = str .. json:sub(start_pos,pos-1)
-                pos = pos + 1
-                local esc = json:sub(pos,pos)
-                local map = {b="\b", f="\f", n="\n", r="\r", t="\t", ['"']='"', ["\\"]="\\", ["/"]="/"}
-                str = str .. (map[esc] or esc)
-                pos = pos + 1
-                start_pos = pos
-            else
-                pos = pos + 1
-            end
-        end
-        return nil, "unterminated string"
-    end
-
-    function parse_number()
-        local start_pos = pos
-        while pos <= len and json:sub(pos,pos):match("[%d%+%-eE%.]") do
-            pos = pos + 1
-        end
-        local n = tonumber(json:sub(start_pos,pos-1))
-        if not n then return nil, "invalid number at position "..start_pos end
-        return n
-    end
-
-    function parse_array()
-        pos = pos + 1
-        local arr = {}
-        skip_ws()
-        if json:sub(pos,pos) == "]" then pos=pos+1; return arr end
-        while true do
-            local val, err = parse_value()
-            if err then return nil, err end
-            table.insert(arr,val)
-            skip_ws()
-            local c = json:sub(pos,pos)
-            if c == "]" then pos=pos+1; break
-            elseif c == "," then pos=pos+1
-            else return nil, "expected ',' or ']' at position "..pos
-            end
-        end
-        return arr
-    end
-
-    function parse_object()
-        pos = pos + 1
-        local obj = {}
-        skip_ws()
-        if json:sub(pos,pos) == "}" then pos=pos+1; return obj end
-        while true do
-            skip_ws()
-            if json:sub(pos,pos) ~= '"' then return nil, "expected string key at "..pos end
-            local key, err = parse_string()
-            if err then return nil, err end
-            skip_ws()
-            if json:sub(pos,pos) ~= ":" then return nil, "expected ':' at "..pos end
-            pos = pos + 1
-            local val, err = parse_value()
-            if err then return nil, err end
-            obj[key] = val
-            skip_ws()
-            local c = json:sub(pos,pos)
-            if c == "}" then pos=pos+1; break
-            elseif c == "," then pos=pos+1
-            else return nil, "expected ',' or '}' at "..pos
-            end
-        end
-        return obj
-    end
-
-    local result, err = parse_value()
-    if err then return nil, err end
-    skip_ws()
-    if pos <= len then return nil, "trailing characters at "..pos end
-    return result
-end
-
-function M.json_encode(value)
-    local t = type(value)
-    if t == "nil" then
-        return "null"
-    elseif t == "boolean" then
-        return tostring(value)
-    elseif t == "number" then
-        return tostring(value)
-    elseif t == "string" then
-        return '"' .. value:gsub('[%z\1-\31\\"]', {
-            ['\\'] = '\\\\',
-            ['"'] = '\\"',
-            ['\b'] = '\\b',
-            ['\f'] = '\\f',
-            ['\n'] = '\\n',
-            ['\r'] = '\\r',
-            ['\t'] = '\\t'
-        }):gsub("[%z\1-\31]", function(c)
-            return string.format("\\u%04x", c:byte())
-        end) .. '"'
-    elseif t == "table" then
-        local is_array = true
-        local max_index = 0
-        for k,v in pairs(value) do
-            if type(k) ~= "number" then
-                is_array = false
-            else
-                if k > max_index then max_index = k end
-            end
-        end
-
-        local items = {}
-        if is_array then
-            for i = 1, max_index do
-                table.insert(items, M.json_encode(value[i]))
-            end
-            return "[" .. table.concat(items,",") .. "]"
-        else
-            for k,v in pairs(value) do
-                if type(k) ~= "string" then
-                    return nil, "object keys must be strings"
-                end
-                table.insert(items, M.json_encode(k) .. ":" .. M.json_encode(v))
-            end
-            return "{" .. table.concat(items,",") .. "}"
-        end
-    else
-        return nil, "unsupported type: " .. t
-    end
-end
-
-return M
--- a/core/std.lua
+++ b/core/std.lua
@@ -186,46 +186,6 @@ function M.site_authors()
 	return {}
 end

-- Join array with separator
-function M.join(arr, sep)
-	arr = arr or {}
-	sep = sep or ", "
-	local result = {}
-	for _, v in ipairs(arr) do
-		table.insert(result, tostring(v))
-	end
-	return table.concat(result, sep)
-end
-
-- Trim whitespace
-function M.trim(str)
-	str = tostring(str or "")
-	return str:match("^%s*(.-)%s*$")
-end
-
-- Table HTML generator
-function M.table(headers, rows)
-	headers = headers or {}
-	rows = rows or {}
-
-	local html = "<table><thead><tr>"
-	for _, header in ipairs(headers) do
-		html = html .. "<th>" .. tostring(header) .. "</th>"
-	end
-	html = html .. "</tr></thead><tbody>"
-
-	for _, row in ipairs(rows) do
-		html = html .. "<tr>"
-		for _, cell in ipairs(row) do
-			html = html .. "<td>" .. tostring(cell) .. "</td>"
-		end
-		html = html .. "</tr>"
-	end
-
-	html = html .. "</tbody></table>"
-	return html
-end
-
 function M.highlight(str)
 	return '<span class="highlight">' .. (str or "") .. "</span>"
 end
--- a/doc/Fes.toml
+++ b/doc/Fes.toml
@@ -1,9 +0,0 @@
-[site]
-
-name = "doc"
-version = "0.0.1"
-authors = ["vx-clutch"]
-
-[fes]
-version = "1.0.0"
-CUSTOM_CSS =
--- a/doc/www/index.lua
+++ b/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
--- a/examples/advanced/Fes.toml
+++ b/examples/advanced/Fes.toml
@@ -0,0 +1,5 @@
+[app]
+
+name = "advanced"
+version = "0.0.1"
+authors = ["vx-clutch"]
--- a/examples/advanced/include/foo.lua
+++ b/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
--- a/examples/multi-page/www/sub/subpage.lua
+++ b/examples/multi-page/www/sub/subpage.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.std.a("/", "Home"),
-	})
+	fes.app.foo.render()
 )

 return site
--- a/examples/archive/Fes.toml
+++ b/examples/archive/Fes.toml
@@ -1,5 +1,5 @@
 [app]

-name = "json"
+name = "archive"
 version = "0.0.1"
 authors = ["vx-clutch"]
--- a/examples/archive/archive/2025.12.07/seal.png
+++ b/examples/archive/archive/2025.12.07/seal.png
--- a/examples/archive/www/index.lua
+++ b/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
--- a/examples/bus/www/index.lua
+++ b/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
--- a/examples/canonical/Fes.toml
+++ b/examples/canonical/Fes.toml
@@ -1,5 +0,0 @@
-[app]
-
-name = "canonical"
-version = "0.0.1"
-authors = ["vx-clutch"]
--- a/examples/canonical/include/header.lua
+++ b/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
--- a/examples/canonical/www/404.lua
+++ b/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
--- a/examples/canonical/www/index.lua
+++ b/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
--- a/examples/error/www/index.lua
+++ b/examples/error/www/index.lua
@@ -1,9 +1,6 @@
 local fes = require("fes")
 local site = fes.fes()

-site.title = "error"
-
-UNIX is very simple
-GNU's Not UNIX
+This is what an error looks like

 return site
--- a/examples/hello-world/Fes.toml
+++ b/examples/hello-world/Fes.toml
@@ -1,5 +0,0 @@
-[app]
-
-name = "hello-world"
-version = "0.0.1"
-authors = ["vx-clutch"]
--- a/examples/hello/Fes.toml
+++ b/examples/hello/Fes.toml
@@ -1,5 +1,5 @@
 [app]

-name = "bus"
+name = "hello"
 version = "0.0.1"
 authors = ["vx-clutch"]
--- a/examples/hello-world/www/index.lua
+++ b/examples/hello-world/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!")
--- a/examples/json/www/index.lua
+++ b/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
--- a/examples/markdown/Fes.toml
+++ b/examples/markdown/Fes.toml
@@ -0,0 +1,5 @@
+[app]
+
+name = "markdown"
+version = "0.0.1"
+authors = ["vx-clutch"]
--- a/examples/markdown/www/index.md
+++ b/examples/markdown/www/index.md
@@ -0,0 +1 @@
+# Hello, World!
--- a/examples/multi-page/Fes.toml
+++ b/examples/multi-page/Fes.toml
@@ -1,5 +0,0 @@
-[app]
-
-name = "multi-page"
-version = "0.0.1"
-authors = ["vx-clutch"]
--- a/examples/multi-page/www/index.lua
+++ b/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
--- a/examples/multi-page/www/page1.lua
+++ b/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
--- a/examples/multi-page/www/page2.lua
+++ b/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
--- a/examples/simple/Fes.toml
+++ b/examples/simple/Fes.toml
@@ -2,4 +2,4 @@

 name = "simple"
 version = "0.0.1"
-authors = ["vx-clutch"]
+authors = ["vx-clutch"]
--- a/go.mod
+++ b/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
 )
--- a/go.sum
+++ b/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=
--- a/index.html
+++ b/index.html
@@ -0,0 +1,500 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<title>Documentation</title>
+	<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;
+}
+
+main {
+	max-width: 830px;
+	margin: 0 auto;
+	padding: 36px;
+}
+
+header {
+	margin-bottom: 36px;
+}
+
+h1 {
+	font-size: 40px;
+	font-weight: 700;
+	margin: 0 0 20px 0;
+}
+
+h2 {
+	font-size: 32px;
+	margin: 26px 0 14px;
+	border-bottom: 1px solid rgba(255,255,255,.1);
+	padding-bottom: 6px;
+}
+
+h3 {
+	font-size: 26px;
+	margin: 22px 0 12px;
+}
+
+p {
+	margin: 14px 0;
+}
+
+header p {
+	color: #9aa6b1;
+}
+
+nav {
+	margin: 28px 0;
+	padding: 20px;
+	background: #1a1c20;
+	border: 1px solid rgba(255,255,255,.06);
+	border-radius: 4px;
+}
+
+nav h2 {
+	font-size: 20px;
+	margin: 0 0 12px 0;
+	border: none;
+	padding: 0;
+}
+
+nav ul {
+	list-style: none;
+	padding: 0;
+	margin: 0;
+}
+
+nav li {
+	margin: 6px 0;
+}
+
+a {
+	color: #68a6ff;
+	text-decoration: none;
+	transition: color .15s ease;
+}
+
+a:hover {
+	text-decoration: underline;
+}
+
+section {
+	margin-top: 36px;
+}
+
+ul, ol {
+	margin: 14px 0;
+	padding-left: 26px;
+}
+
+li {
+	margin: 6px 0;
+}
+
+code {
+	padding: 3px 7px;
+	border-radius: 3px;
+	font-family: "SF Mono", Monaco, "Cascadia Code", "Roboto Mono", Consolas, "Courier New", monospace;
+	font-size: .9em;
+	color: #cde7ff;
+	background: #1a1c20;
+	border: 1px solid rgba(255,255,255,.06);
+}
+
+pre {
+	padding: 20px;
+	border-radius: 4px;
+	margin: 14px 0;
+	overflow-x: auto;
+	background: #1a1c20;
+	border: 1px solid rgba(255,255,255,.06);
+	font-family: "SF Mono", Monaco, "Cascadia Code", "Roboto Mono", Consolas, "Courier New", monospace;
+	font-size: 14px;
+	line-height: 1.6;
+}
+
+pre code {
+	background: none;
+	border: none;
+	padding: 0;
+	font-size: inherit;
+	color: inherit;
+}
+
+blockquote {
+	border-left: 3px solid #68a6ff;
+	padding-left: 18px;
+	margin: 14px 0;
+	color: #dfe9ee;
+	font-style: italic;
+}
+
+table {
+	width: 100%;
+	border-collapse: collapse;
+	margin: 14px 0;
+}
+
+th, td {
+	padding: 12px 16px;
+	text-align: left;
+	border-bottom: 1px solid rgba(255,255,255,.06);
+}
+
+th {
+	background: #1a1c20;
+	font-weight: 600;
+	color: #f0f6f8;
+}
+
+tr:hover {
+	background: rgba(255,255,255,.02);
+}
+
+footer {
+	margin-top: 48px;
+	padding-top: 20px;
+	border-top: 1px solid rgba(255,255,255,.1);
+	color: #9aa6b1;
+	font-size: 14px;
+}
+	</style>
+</head>
+<body>
+	<main>
+		<header>
+			<h1>Documentation</h1>
+			<p>Fes: A lightweight, static, and opinionated microframework.</p>
+		</header>
+
+		<nav>
+			<h2>Contents</h2>
+			<ul>
+				<li><a href="#introduction">Introduction</a></li>
+				<li><a href="#installation">Installation</a></li>
+				<li><a href="#usage">Usage</a></li>
+				<li><a href="#cli-reference">Cli Reference</a></li>
+				<li><a href="#reference">Reference</a></li>
+			</ul>
+		</nav>
+
+		<section id="introduction">
+			<h2>Introduction</h2>
+			<p>Fes, or Free Easy Site, is a microframework used for small static sites. It is not designed for complex web applications and that is why it is good. Yes, I hate modern web and that is the reason this exists.</p>
+		</section>
+
+		<section id="installation">
+			<h2>Installation</h2>
+			<pre><code>git clone https://git.vxserver.dev/fSD/fes</code></pre>
+			<pre><code>cd fes</code></pre>
+			<pre><code>go install fes</code></pre>
+		</section>
+
+		<section id="usage">
+			<h2>Usage</h2>
+			<p>Typical workflows and examples.</p>
+			<ul>
+				<li>Creating project</li>
+				<li>Hosting websites</li>
+				<li>Generating websites</li>
+			</ul>
+		</section>
+
+		<section id="cli-reference">
+			<h2>Cli Reference</h2>
+			<table> <thead>
+					<tr>
+						<th>Name</th>
+						<th>Description</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td><code>--help</code></td>
+						<td>Display help information</td>
+					</tr>
+					<tr>
+						<td><code>--no-color</code></td>
+						<td>Disable color output</td>
+					</tr>
+					<tr>
+						<td><code>-p &lt;port&gt;</code></td>
+						<td>Set the server port</td>
+					</tr>
+					<tr>
+						<td><code>new &lt;project&gt;</code></td>
+						<td>Create a new projet called &lt;project&gt;</td>
+					</tr>
+					<tr>
+						<td><code>doc</code></td>
+						<td>Open this documention page</td>
+					</tr>
+					<tr>
+						<td><code>run &lt;project&gt;</code></td>
+						<td>Run the projet called &lt;project&gt;</td>
+					</tr>
+				</tbody>
+			</table>
+		</section>
+
+		<section id="reference">
+			<h2>Reference</h2>
+			All <code>std</code> functions have binding for the site and can be used like so: <code>site:h1("Hello, World!")</code>, where site is the site object.
+			<h3>Builtin</h3>
+			<table>
+				<thead>
+					<tr>
+						<th>Name</th>
+						<th>Description</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td><code>fes()</code></td>
+						<td>Generate a site object</td>
+					</tr>
+					<tr>
+						<td><code>:custom()</code></td>
+						<td>Add a custom string to the site body</td>
+					</tr>
+				</tbody>
+			</table>
+			<h3>Std</h3>
+			<table>
+				<thead>
+					<tr>
+						<th>Name</th>
+						<th>Description</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td><code>std.fes_version()</code></td>
+						<td>Get the current version of fes.</td>
+					</tr>
+					<tr>
+						<td><code>std.site_version()</code></td>
+						<td>Get the current version of the site, defined in <code>Fes.toml</code>.</td>
+					</tr>
+					<tr>
+						<td><code>std.site_name()</code></td>
+						<td>Get the current name of the site, defined in <code>Fes.toml</code>.</td>
+					</tr>
+					<tr>
+						<td><code>std.site_title()</code></td>
+						<td>Get the current name of the site, defined in <code>Fes.toml</code>.</td>
+					</tr>
+					<tr>
+						<td><code>std.site_authors()</code></td>
+						<td>Get a table of the authors of the site, defined in <code>Fes.toml</code>.</td>
+					</tr>
+					<tr>
+						<td><code>std.join</code></td>
+						<td>Get a table of the authors of the site, defined in <code>Fes.toml</code>.</td>
+					</tr>
+					<tr>
+						<td><code>std.a(link: string, str: string)</code></td>
+						<td>Returns an anchor tag.</td>
+					</tr>
+					<tr>
+						<td><code>std.ha(link: string, str: string)</code></td>
+						<td>Returns an anchor tag with sytiling to make it hidden.</td>
+					</tr>
+					<tr>
+						<td><code>std.external(link: string, str: string)</code></td>
+						<td>Returns an anchor tag that opens up in a new tab.</td>
+					</tr>
+					<tr>
+						<td><code>std.note(str: string)</code></td>
+						<td>Returns a note object.</td>
+					</tr>
+					<tr>
+						<td><code>std.muted(str: string)</code></td>
+						<td>Returns a muted object.</td>
+					</tr>
+					<tr>
+						<td><code>std.callout(str: string)</code></td>
+						<td>Returns a callout object.</td>
+					</tr>
+					<tr>
+						<td><code>std.h1(str: string)</code></td>
+						<td>Returns a header level 1 object.</td>
+					</tr>
+					<tr>
+						<td><code>std.h2(str: string)</code></td>
+						<td>Returns a header level 2 object.</td>
+					</tr>
+					<tr>
+						<td><code>std.h3(str: string)</code></td>
+						<td>Returns a header level 3 object.</td>
+					</tr>
+					<tr>
+						<td><code>std.h4(str: string)</code></td>
+						<td>Returns a header level 4 object.</td>
+					</tr>
+					<tr>
+						<td><code>std.h5(str: string)</code></td>
+						<td>Returns a header level 5 object.</td>
+					</tr>
+					<tr>
+						<td><code>std.h6(str: string)</code></td>
+						<td>Returns a header level 6 object.</td>
+					</tr>
+					<tr>
+						<td><code>std.p(str: string)</code></td>
+						<td>Returns a paragraph object.</td>
+					</tr>
+					<tr>
+						<td><code>std.pre(str: string)</code></td>
+						<td>Returns preformated text.</td>
+					</tr>
+					<tr>
+						<td><code>std.code(str: string)</code></td>
+						<td>Returns a codeblock.</td>
+					</tr>
+					<tr>
+						<td><code>std.ul(items: {...strings})</code></td>
+						<td>Generates an unordered list from a table of strings.</td>
+					</tr>
+					<tr>
+						<td><code>std.ol(items: {...strings})</code></td>
+						<td>Generates an ordered list from a table of strings.</td>
+					</tr>
+					<tr>
+						<td><code>std.tl(items: {...strings})</code></td>
+						<td>Generates a table from a table of strings.</td>
+					</tr>
+					<tr>
+						<td><code>std.blockquote(str: string)</code></td>
+						<td>Returns a blockquote.</td>
+					</tr>
+					<tr>
+						<td><code>std.hr()</code></td>
+						<td>Returns a horizonal rule.</td>
+					</tr>
+					<tr>
+						<td><code>std.img(src: string, alt: string)</code></td>
+						<td>Returns an image at location source with given alternative text.</td>
+					</tr>
+					<tr>
+						<td><code>std.strong(str: string)</code></td>
+						<td>Returns bolded text.</td>
+					</tr>
+					<tr>
+						<td><code>std.em(str: string)</code></td>
+						<td>Returns italicized text.</td>
+					</tr>
+					<tr>
+						<td><code>std.br()</code></td>
+						<td>Returns a break.</td>
+					</tr>
+					<tr>
+						<td><code>std.div(content: string, class: string)</code></td>
+						<td>Returns a div of class <code>class</code> with content of <code>content</code>.</td>
+					</tr>
+					<tr>
+						<td><code>std.spa(content: string, class: string)</code></td>
+						<td>Returns a span of class <code>class</code> with content of <code>content</code>.</td>
+					</tr>
+					<tr>
+						<td><code>std.escape(str: string)</code></td>
+						<td>Returns an html escaped string.</td>
+					</tr>
+					<tr>
+						<td><code>std.highlight(str: string)</code></td>
+						<td>Returns highlighted text.</td>
+					</tr>
+					<tr>
+						<td><code>std.banner(str: string)</code></td>
+						<td>Returns a banner that is attached to the top of the site.</td>
+					</tr>
+					<tr>
+						<td><code>std.center(str: string)</code></td>
+						<td>Returns centered text.</td>
+					</tr>
+					<tr>
+						<td><code>std.nav(link: string, str: string)</code></td>
+						<td>Returns a speical navigation link, used for in-site traversal.</td>
+					</tr>
+					<tr>
+						<td><code>std.rl(r: string, l: string)</code></td>
+						<td>Right and light alight content.</td>
+					</tr>
+				</tbody>
+			</table>
+			<h3>Symbol</h3>
+			<table> <thead>
+					<tr>
+						<th>Name</th>
+						<th>Symbol</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td><code>symbol.copyright</code></td>
+						<td>&#169;</td> </tr>
+					<tr>
+						<td><code>Registered Trademark</code></td>
+						<td>&#174;</td>
+					</tr>
+					<tr>
+						<td><code>Trademark</code></td>
+						<td>&#8482;</td>
+					</tr>
+				</tbody>
+			</table>
+			<h3>Util</h3>
+			<table> <thead>
+					<tr>
+						<th>Name</th>
+						<th>Description</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td><code>util.cc(tbl: {...strings})</code></td>
+						<td>Concatenate a table of strings into a single string.</td>
+					</tr>
+					<tr>
+						<td><code>util.copyright(link: string, holder: string)</code></td>
+						<td>Used when setting the website copyright holder.</td>
+					</tr>
+				</tbody>
+			</table>
+			<h3>Dkjson</h3>
+			This is a third party object and is best documented <a href="https://dkolf.de/dkjson-lua/documentation" target="_blank">here</a>
+			<table> <thead>
+					<tr>
+						<th>Name</th>
+						<th>Description</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td><code>dkjson.encode(obj: {...any})</code></td>
+						<td>Serilize a Lua table into JSON.</td>
+					</tr>
+					<tr>
+						<td><code>dkjson.decode(obj: {...any})</code></td>
+						<td>Deserilize JSON into a Lua table.</td>
+					</tr>
+				</tbody>
+			</table>
+		</section>
+
+		<footer>
+			<p>Last updated: 2025-12-14</p>
+		</footer>
+	</main>
+</body>
+</html>
--- a/main.go
+++ b/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"
 )
@@ -17,37 +18,74 @@ import (
 //go:embed core/*
 var core embed.FS

+//go:embed index.html
+var documentation string
+
 func init() {
 	config.Port = flag.Int("p", 3000, "Set the server port")
 	config.Color = flag.Bool("no-color", false, "Disable color output")
 	config.Core = core
+	config.Doc = documentation
 }

 func main() {
-	flag.Parse()
-	if len(os.Args) < 3 {
-		fmt.Println("Usage: fes <command> <project_dir>")
-		os.Exit(1)
+	flag.Usage = func() {
+		fmt.Fprintf(flag.CommandLine.Output(), "Usage: %s [options] <command> <project_dir>\n", os.Args[0])
+		fmt.Println("Commands:")
+		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]
-	dir := os.Args[2]
+	args := flag.Args()
+	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)
 	}
 }
--- a/src/config/config.go
+++ b/src/config/config.go
@@ -1,8 +1,12 @@
 package config

-import "embed"
+import (
+	"embed"
+	"errors"
+)

 var Core embed.FS
+var Doc string
 var Port *int
 var Color *bool

@@ -13,3 +17,5 @@ type MyConfig struct {
 		Authors []string `toml:"authors"`
 	} `toml:"app"`
 }
+
+var ErrRouteMiss = errors.New("not found")
--- a/src/doc/doc.go
+++ b/src/doc/doc.go
@@ -0,0 +1,22 @@
+package doc
+
+import (
+	"fes/src/config"
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/pkg/browser"
+)
+
+func Open() error {
+	fmt.Println("Opening documentation in browser")
+
+	tmpFile := filepath.Join(os.TempDir(), "doc.html")
+
+	if err := os.WriteFile(tmpFile, []byte(config.Doc), 0644); err != nil {
+		return err
+	}
+
+	return browser.OpenFile(tmpFile)
+}
--- a/src/new/new.go
+++ b/src/new/new.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 )

+/* try to get git user, if not system user */
 func getName() string {
 	out, err := exec.Command("git", "config", "user.name").Output()
 	if err == nil {
@@ -21,39 +22,47 @@ func getName() string {
 	if err == nil && 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 {
-	if err := os.MkdirAll(filepath.Join(dir, "www"), 0755); err != nil {
+	if err := os.Mkdir(dir, 0755); err != nil {
 		return err
 	}
-	indexLua := filepath.Join(dir, "www", "index.lua")
-	if _, err := os.Stat(indexLua); os.IsNotExist(err) {
-		content := fmt.Sprintf(`local fes = require("fes")
+	if err := os.Chdir(dir); err != nil {
+		return err
+	}
+
+	name := getName()
+
+	write("www/index.lua", `local fes = require("fes")
 local site = fes.fes()

-site.title = "%s"
+-- site.copyright = fes.util.copyright("https://example.com", "%s")

 site:h1("Hello, World!")

-return site
-`, dir)
-		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]
+return site`, name)
+	write("Fes.toml", `[app]

 name = "%s"
 version = "0.0.1"
-authors = ["%s"]`, dir, getName())
-		if err := os.WriteFile(indexFes, []byte(content), 0644); err != nil {
-			return err
-		}
-	}
-	fmt.Println("Created new project at", dir)
+authors = ["%s"]`, dir, name)
 	return nil
 }
--- a/src/server/server.go
+++ b/src/server/server.go
@@ -2,70 +2,83 @@ package server

 import (
 	"fmt"
+	"html/template"
 	"io/fs"
 	"net/http"
 	"os"
+	"path"
 	"path/filepath"
 	"regexp"
+	"sort"
 	"strings"
+	"time"
+
+	"fes/src/config"
+	"fes/src/ui"

 	"github.com/gomarkdown/markdown"
 	"github.com/gomarkdown/markdown/html"
 	"github.com/gomarkdown/markdown/parser"
 	"github.com/pelletier/go-toml/v2"
 	lua "github.com/yuin/gopher-lua"
-	"github.com/fatih/color"
-
-	"fes/src/config"
 )

 type reqData struct {
-	path string
+	path   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 {
+		path := filepath.Join(dir, entry.Name())
 		if entry.IsDir() {
-			sub := filepath.Join("www", entry.Name())
-			subs, err := os.ReadDir(sub)
+			nextBase := joinBase(base, entry.Name())
+			subEntries, err := os.ReadDir(path)
 			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 base == "" {
-				next = "/" + entry.Name()
-			} else {
-				next = base + "/" + entry.Name()
-			}
-			if err := handleDir(subs, sub, routes, next); err != nil {
+			if err := handleDir(subEntries, path, routes, nextBase, isStatic); err != nil {
 				return err
 			}
 			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")
-			path := filepath.Join("www", entry.Name())
 			if name == "index" {
-				if base == "" {
-					routes["/"] = path
-					routes["/index"] = path
-				} else {
-					routes[base] = path
-					routes[base+"/index"] = path
-				}
-			} else {
-				if base == "" {
-					routes["/"+name] = path
-				} else {
-					routes[base+"/"+name] = path
-				}
+				routes[basePath(base)] = path
+				routes[route] = path
+				continue
 			}
+			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
 }

+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 {
 	re := regexp.MustCompile(`(?m)^(\s*\w+\s*=\s*)$`)
 	return re.ReplaceAllStringFunc(content, func(match string) string {
@@ -95,23 +108,27 @@ func loadIncludeModules(L *lua.LState, includeDir string) *lua.LTable {
 		return app
 	}
 	for _, e := range ents {
-		if e.IsDir() {
+		if e.IsDir() || !strings.HasSuffix(e.Name(), ".lua") {
 			continue
 		}
-		name := e.Name()
-		if !strings.HasSuffix(name, ".lua") {
+		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
 		}
-		base := strings.TrimSuffix(name, ".lua")
-		path := filepath.Join(includeDir, name)
 		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
 		}
 		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)
@@ -119,7 +136,7 @@ func loadIncludeModules(L *lua.LState, includeDir string) *lua.LTable {
 	return app
 }

-func loadLua(luaDir string, entry string, cfg *config.MyConfig, requestData reqData) (string, error) {
+func loadLua(luaDir string, entry string, cfg *config.MyConfig, requestData reqData) ([]byte, error) {
 	L := lua.NewState()
 	defer L.Close()

@@ -158,7 +175,6 @@ func loadLua(luaDir string, entry string, cfg *config.MyConfig, requestData reqD

 	L.PreloadModule("fes", func(L *lua.LState) int {
 		mod := L.NewTable()
-
 		coreModules := []string{}
 		if ents, err := fs.ReadDir(config.Core, "core"); err == nil {
 			for _, e := range ents {
@@ -168,7 +184,6 @@ func loadLua(luaDir string, entry string, cfg *config.MyConfig, requestData reqD
 				coreModules = append(coreModules, strings.TrimSuffix(e.Name(), ".lua"))
 			}
 		}
-
 		for _, modName := range coreModules {
 			path := filepath.Join("core", modName+".lua")
 			fileData, err := config.Core.ReadFile(path)
@@ -191,8 +206,7 @@ func loadLua(luaDir string, entry string, cfg *config.MyConfig, requestData reqD
 			}
 		}

-		includeDir := filepath.Join(luaDir, "include")
-		mod.RawSetString("app", loadIncludeModules(L, includeDir))
+		mod.RawSetString("app", loadIncludeModules(L, filepath.Join(".", "include")))

 		if cfg != nil {
 			site := L.NewTable()
@@ -225,49 +239,138 @@ func loadLua(luaDir string, entry string, cfg *config.MyConfig, requestData reqD
 	})

 	if err := L.DoFile(entry); err != nil {
-		return "", err
+		return []byte(""), err
 	}

 	if L.GetTop() == 0 {
-		return "", nil
+		return []byte(""), nil
 	}

 	L.SetGlobal("__fes_result", L.Get(-1))
 	if err := L.DoString("return tostring(__fes_result)"); err != nil {
 		L.GetGlobal("__fes_result")
 		if s := L.ToString(-1); s != "" {
-			return s, nil
+			return []byte(s), nil
 		}
-		return "", nil
+		return []byte(""), nil
 	}

 	if s := L.ToString(-1); s != "" {
-		return s, nil
+		return []byte(s), nil
 	}
-	return "", nil
+	return []byte(""), 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 {
-	os.Chdir(dir)
+	if err := os.Chdir(dir); err != nil {
+		return ui.Error(fmt.Sprintf("failed to change directory to %s", dir), err)
+	}
 	dir = "."

 	tomlDocument, err := os.ReadFile("Fes.toml")
 	if err != nil {
-		return err
+		return ui.Error("failed to read Fes.toml", err)
 	}
 	docStr := fixMalformedToml(string(tomlDocument))
 	var cfg config.MyConfig
-	err = toml.Unmarshal([]byte(docStr), &cfg)
-	if err != nil {
-		return fmt.Errorf("failed to parse Fes.toml: %w", err)
+	if err := toml.Unmarshal([]byte(docStr), &cfg); err != nil {
+		ui.Warning("failed to parse Fes.toml", 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 := []byte(`
 <html>
 <head><title>404 Not Found</title></head>
 <body>
@@ -275,56 +378,86 @@ func Start(dir string) error {
 <hr><center>fes</center>
 </body>
 </html>
-`
+`)
 	if _, err := os.Stat(filepath.Join("www", "404.lua")); err == nil {
-		notFoundData, err = loadLua(dir, "www/404.lua", &cfg, reqData{})
-		if err != nil {
-			panic(err)
+		if nf, err := loadLua(dir, "www/404.lua", &cfg, reqData{}); err == nil {
+			notFoundData = nf
 		}
 	} else if _, err := os.Stat("www/404.html"); err == nil {
-		buf, err := os.ReadFile("www/404.html")
-		if err != nil {
-			panic(err)
+		if buf, err := os.ReadFile("www/404.html"); err == nil {
+			notFoundData = buf
 		}
-		notFoundData = string(buf)
 	}

 	routes := make(map[string]string)
-	handleDir(entries, "www", routes, "")
-
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-	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]
+	if entries, err := os.ReadDir("www"); err == nil {
+		if err := handleDir(entries, "www", routes, "", false); err != nil {
+			ui.Warning("failed to handle www directory", err)
 		}
 	}

-	req := reqData{
-		path:   r.URL.Path,
-		params: params,
+	if entries, err := os.ReadDir("static"); err == nil {
+		if err := handleDir(entries, "static", routes, "/static", true); err != nil {
+			ui.Warning("failed to handle static directory", err)
+		}
 	}

-	fmt.Printf("> %s ", filepath.Base(lp))
-	data, err := loadLua(dir, lp, &cfg, req)
-	if err != nil {
-		http.Error(w, fmt.Sprintf("Error loading page: %v", err), http.StatusInternalServerError)
-		color.Red("bad")
-		return
+	if entries, err := os.ReadDir("archive"); err == nil {
+		if err := handleDir(entries, "archive", routes, "/archive", true); err != nil {
+			ui.Warning("failed to handle archive directory", err)
+		}
 	}
-	color.Green("ok")
-	w.Write([]byte(data))
-})
+
+	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		route, ok := routes[r.URL.Path]
+
+		var err error = nil
+		defer func() {
+			ui.Path(route, err)
+		}()
+
+		if !ok {
+			err = config.ErrRouteMiss
+			route = r.URL.Path
+
+			if strings.HasPrefix(route, "/archive") {
+				fsPath := "." + route
+				if info, err := os.Stat(fsPath); err == nil && info.IsDir() {
+					if page, err := generateArchiveIndex(fsPath, route); err == nil {
+						w.Write([]byte(page))
+						return
+					}
+				}
+			} else {
+				w.WriteHeader(http.StatusNotFound)
+				w.Write([]byte(notFoundData))
+				return
+			}
+		}
+
+		params := make(map[string]string)
+		for k, v := range r.URL.Query() {
+			if len(v) > 0 {
+				params[k] = v[0]
+			}
+		}
+
+		var data []byte
+		if strings.HasSuffix(route, ".lua") {
+			data, err = loadLua(dir, route, &cfg, reqData{path: r.URL.Path, params: params})
+		} else if strings.HasSuffix(route, ".md") {
+			data, err = os.ReadFile(route)
+			data = []byte(markdownToHTML(string(data)))
+		} else {
+			data, err = os.ReadFile(route)
+		}
+
+		if err != nil {
+			http.Error(w, fmt.Sprintf("Error loading page: %v", err), http.StatusInternalServerError)
+		}
+
+		w.Write(data)
+	})

 	fmt.Printf("Server is running on http://localhost:%d\n", *config.Port)
 	return http.ListenAndServe(fmt.Sprintf(":%d", *config.Port), nil)
--- a/src/ui/ui.go
+++ b/src/ui/ui.go
@@ -0,0 +1,55 @@
+package ui
+
+import (
+	"errors"
+	"fes/src/config"
+	"fmt"
+	"strings"
+
+	"github.com/fatih/color"
+)
+
+func Path(path string, err error) {
+	path = strings.TrimPrefix(path, "/")
+
+	if path == "" {
+		path = "(null)"
+	}
+
+	fmt.Printf(" > %s ", path)
+	if err == nil {
+		OK("ok")
+		return
+	} else if errors.Is(err, config.ErrRouteMiss) {
+		WARN(config.ErrRouteMiss.Error())
+	} else {
+		ERROR("bad")
+	}
+}
+
+func Warning(msg string, err error) error {
+	fmt.Printf("fes: %s: %v\n", color.MagentaString("warning"), err)
+	return err
+}
+
+func Error(msg string, err error) error {
+	fmt.Printf("fes: %s: %v\n", color.RedString("error"), err)
+	return err
+}
+
+func Fatal(msg string, err error) error {
+	fmt.Printf("fes: %s: %v\n", color.RedString("fatal"), err)
+	panic(err)
+}
+
+func OK(msg string) {
+	color.Green(msg)
+}
+
+func WARN(msg string) {
+	color.Magenta(msg)
+}
+
+func ERROR(msg string) {
+	color.Red(msg)
+}
Author	SHA1	Message	Date
vx-clutch	10da72a1f6	doc: patch	2025-12-14 19:43:10 -05:00
vx-clutch	522cbdece8	Merge pull request 'doc: first' (#4 ) from doc into main Reviewed-on: #4	2025-12-14 19:41:43 -05:00
vx-clutch	1427d0d780	doc: first	2025-12-14 19:40:55 -05:00
vx-clutch	3cfc9b4aed	Merge pull request 'rich-ui' (#3 ) from rich-ui into main Reviewed-on: #3	2025-12-14 11:55:27 -05:00
vx-clutch	2ff43cb8df	restructure Start	2025-12-14 11:54:50 -05:00
vx-clutch	f0e1f52ae2	factor out logging	2025-12-14 10:19:25 -05:00
vx-clutch	422db7490a	add Dockerfile	2025-12-13 22:01:20 -05:00
vx-clutch	84ebf0972d	Merge branch 'main' of https://git.vxserver.dev/fsd/fes	2025-12-13 18:54:48 -05:00
vx-clutch	096c39b25b	replace middleware with thirdparty solution	2025-12-13 18:54:39 -05:00
vx-clutch	5189c1179c	Merge pull request 'add markdown support plus example' (#2 ) from markdown into main Reviewed-on: #2	2025-12-12 21:38:30 -05:00
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