update examples

Dockerfile

@@ -0,0 +1,27 @@
+FROM golang:1.25-alpine AS builder
+
+WORKDIR /src
+
+RUN apk add --no-cache git build-base
+
+COPY go.mod go.sum ./
+RUN go mod download
+
+COPY . .
+
+ENV CGO_ENABLED=0
+ENV GOOS=linux
+ENV GOARCH=amd64
+
+RUN go build -ldflags="-X fes/modules/version.gitCommit=$(git rev-parse --short HEAD) -s -w" -o fes
+
+FROM scratch
+
+COPY --from=builder /src/fes /fes
+
+WORKDIR /app
+
+EXPOSE 8080
+
+ENTRYPOINT ["/fes"]
+CMD ["run", "/app"]

README.md

@@ -34,7 +34,7 @@ go install fes
 
 ## Documentation
 
-Run `fes run doc` for the documentation website or goto [docs.vxserver.dev](https://docs.vxserver.dev)
+Run `fes doc` for the documentation website or goto [docs.vxserver.dev](https://docs.vxserver.dev)
 
 ## License
 

examples/advanced/include/foo.lua

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

examples/archive/README.md

@@ -0,0 +1,4 @@
+# archive
+
+This example demonstrates the archive feature of Fes it is useful for file
+sharing purposes.

examples/archive/www/index.lua

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

examples/best/Fes.toml

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

examples/best/README.md

@@ -0,0 +1,23 @@
+# best
+
+This is an example of best practices for the Fes framework.
+
+## Parts
+
+With best practice we can break our sites into a few parts.
+
+## Index
+
+The main page of the site loads in the header and the footer, as well as shows
+some core information
+
+## Include
+
+Within include the header and footer are defined.
+
+* **Header:** Site navigation and name display
+* **Footer:** Extra and external information.
+
+## Static
+
+This is where we store our favicon.

examples/best/include/footer.lua

@@ -0,0 +1,13 @@
+local footer = {}
+
+footer.render = function(std)
+    return table.concat({
+	std.h2("Other resources"),
+	std.tl({
+		std.external("https://git.vxserver.dev/fSD/fes", "Fes source"),
+		std.external("https://docs.vxserver.dev/static/fes.html", "Documentation"),
+	}),
+})
+end
+
+return footer

examples/best/include/header.lua

@@ -0,0 +1,7 @@
+local header = {}
+
+header.render = function(std)
+    return std.center(std.ha("/", std.h1("Best Practices")))
+end
+
+return header

examples/best/www/index.lua

@@ -0,0 +1,20 @@
+local fes = require("fes")
+local std = fes.std
+local u = fes.util
+
+local site = fes.fes()
+
+site.copyright = fes.util.copyright("https://fsd.vxserver.dev", "fSD")
+site.title = "Best practices"
+site.favicon = "/static/favicon.ico"
+
+site:banner(fes.app.header.render(std))
+
+site:note(u.cc {
+	std.h2("Hello, World!"),
+	std.p("This is an example of the best practices/canonical Fes site.")
+})
+
+site:note(fes.app.footer.render(std))
+
+return site

examples/default/Fes.toml

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

examples/default/README.md

@@ -0,0 +1,33 @@
+# default
+
+```
+fes new default
+```
+
+> **Know what you are doing?** Delete this file. Have fun!
+
+## Project Structure
+
+Inside your Fes project, you'll see the following directories and files:
+
+```
+.
+├── Fes.toml
+├── README.md
+└── www
+    └── index.lua
+```
+
+Fes looks for `.lua` files in the `www/` directory. Each file is exposed as a route based on its file name.
+
+## Commands
+
+All commands are run from the root of the project, from a terminal:
+
+| Command                   | Action                                           |
+| :------------------------ | :----------------------------------------------- |
+| `fes run .`               | Runs the project at `.`                          |
+
+## What to learn more?
+
+Check out [Fes's docs](https://docs.vxserver.dev/static/fes.html).

examples/default/www/index.lua

@@ -1,15 +1,8 @@
 local fes = require("fes")
-local std = fes.std
-
-
 local site = fes.fes()
 
 site.copyright = fes.util.copyright("https://fsd.vxserver.dev", "fSD")
 
 site:h1("Hello, World!")
 
-site:note(
-	fes.app.foo.render()
-)
-
 return site

examples/error/README.md

@@ -0,0 +1,6 @@
+# error
+
+This shows what a Lua error looks like to the user. Lua errors are the most
+common and the most critical so that is why they are shown to the user. Other,
+lesser errors, are only shown to the developer because of their different
+nature.

examples/error/www/index.lua

@@ -1,6 +1,10 @@
 local fes = require("fes")
 local site = fes.fes()
 
+site.copyright = fes.util.copyright("https://fsd.vxserver.dev", "fSD")
+
 This is what an error looks like
 
+site:h1("Hello, World!")
+
 return site

examples/hello/README.md

@@ -0,0 +1,4 @@
+# hello
+
+This is a very simple hello world program, the only difference between this and
+default is this README.

examples/markdown/README.md

@@ -0,0 +1,3 @@
+# markdown
+
+This example demonstrate Fes's ability to handle markdown routes.

examples/markdown/www/index.md

@@ -1 +1,3 @@
-# Hello, World!
+# Markdown!
+
+**Fes** also supports markdown routes!

examples/simple/README.md

@@ -0,0 +1,5 @@
+# simple
+
+This simple example shows the extensibility of the Fes framework. It shows the
+you do not necessarily need to use the site object (although it is recommended)
+you can define your own site, similar to how Lisps do things.

go.mod

@@ -3,13 +3,15 @@ module fes
 go 1.25.4
 
 require (
-	github.com/fatih/color v1.18.0 // indirect
-	github.com/gomarkdown/markdown v0.0.0-20250810172220-2e2c11897d1a // indirect
-	github.com/gomarkdown/mdtohtml v0.0.0-20240124153210-d773061d1585 // indirect
+	github.com/fatih/color v1.18.0
+	github.com/gomarkdown/markdown v0.0.0-20250810172220-2e2c11897d1a
+	github.com/pelletier/go-toml/v2 v2.2.4
+	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
+	github.com/yuin/gopher-lua v1.1.1
+)
+
+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

@@ -1,9 +1,7 @@
 github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
-github.com/gomarkdown/markdown v0.0.0-20230922112808-5421fefb8386/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=
 github.com/gomarkdown/markdown v0.0.0-20250810172220-2e2c11897d1a h1:l7A0loSszR5zHd/qK53ZIHMO8b3bBSmENnQ6eKnUT0A=
 github.com/gomarkdown/markdown v0.0.0-20250810172220-2e2c11897d1a/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=
-github.com/gomarkdown/mdtohtml v0.0.0-20240124153210-d773061d1585/go.mod h1:6grYm5/uY15CwgBBqwA3+o/cAzaxssckznJ0B35ouBY=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=

index.html

@@ -183,6 +183,7 @@ footer {
 				<li><a href="#introduction">Introduction</a></li>
 				<li><a href="#installation">Installation</a></li>
 				<li><a href="#usage">Usage</a></li>
+				<li><a href="#quick">Quick Start</a></li>
 				<li><a href="#cli-reference">Cli Reference</a></li>
 				<li><a href="#reference">Reference</a></li>
 			</ul>
@@ -210,6 +211,34 @@ footer {
 			</ul>
 		</section>
 
+		<section id="quick">
+			<h2>Quick Start</h2>
+			<pre><code>fes new hello</code></pre>
+			<p>This creates a new project under the name <code>hello</code>.</p>
+			<pre><code>fes run hello</code></pre>
+			<p>This runs your project <code>hello</code>, by default at <a href="localhost:3000" target="_blank">localhost:3000</a>.</p>
+			<h3>Extensions</h3>
+			<p>Let's add a paragraph to this simple site. Right now you have the following page:</p>
+			<pre><code>local fes = require("fes")
+local site = fes.fes()
+
+-- site.copyright = fes.util.copyright("https://fsd.vxserver.dev", "vx-clutch")
+
+site:h1("Hello, World!")
+
+return site</code></pre>
+			<p>To add a simple paragraph modify like so:</p>
+			<pre><code>local fes = require("fes")
+local site = fes.fes()
+
+-- site.copyright = fes.util.copyright("https://fsd.vxserver.dev", "vx-clutch")
+
+site:h1("Hello, World!")
+site:p("This is a paragraph")
+
+return site</code></pre>
+		</section>
+
 		<section id="cli-reference">
 			<h2>Cli Reference</h2>
 			<table> <thead>
@@ -219,18 +248,6 @@ footer {
 					</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>
@@ -243,6 +260,30 @@ footer {
 						<td><code>run &lt;project&gt;</code></td>
 						<td>Run the projet called &lt;project&gt;</td>
 					</tr>
+					<tr>
+						<td><code>-help</code></td>
+						<td>Display help information.</td>
+					</tr>
+					<tr>
+						<td><code>-V1</code></td>
+						<td>Print extended version information, this is very helpful when it comes to bug reporting.</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>-static</code></td>
+						<td>Render and save all pages. (this feature is yet to be implemented)</td>
+					</tr>
+					<tr>
+						<td><code>-version</code></td>
+						<td>Print the version.</td>
+					</tr>
 				</tbody>
 			</table>
 		</section>
@@ -586,7 +627,7 @@ return hello</pre></code> This can be called from another with,
 		</section>
 
 		<footer>
-			<p>Last updated: 2025-12-16</p>
+			<p>Last updated: 2025-12-27</p>
 		</footer>
 	</main>
 </body>

lib/dkjson.lua

@@ -1,7 +1,7 @@
 -- Module options:
 local always_use_lpeg = false
 local register_global_module_table = false
-local global_module_name = 'json'
+local global_module_name = "json"
 
 --[==[
 
@@ -47,8 +47,7 @@ local 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
+	string.rep, string.gsub, string.sub, string.byte, string.char, string.find, string.len, string.format
 local strmatch = string.match
 local concat = table.concat
 
@@ -66,27 +65,31 @@ end
 
 local _ENV = nil -- blocking globals in Lua 5.2 and later
 
-pcall (function()
+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
+	local debmeta = require("debug").getmetatable
+	if debmeta then
+		getmetatable = debmeta
+	end
 end)
 
-json.null = setmetatable ({}, {
-  __tojson = function () return "null" end
+json.null = setmetatable({}, {
+	__tojson = function()
+		return "null"
+	end,
 })
 
-local function isarray (tbl)
+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
+	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
+			if type(k) ~= "number" or k < 1 or floor(k) ~= k then
 				return false
 			end
 			if k > max then
@@ -102,16 +105,21 @@ local function isarray (tbl)
 end
 
 local escapecodes = {
-  ["\""] = "\\\"", ["\\"] = "\\\\", ["\b"] = "\\b", ["\f"] = "\\f",
-  ["\n"] = "\\n",  ["\r"] = "\\r",  ["\t"] = "\\t"
+	['"'] = '\\"',
+	["\\"] = "\\\\",
+	["\b"] = "\\b",
+	["\f"] = "\\f",
+	["\n"] = "\\n",
+	["\r"] = "\\r",
+	["\t"] = "\\t",
 }
 
-local function escapeutf8 (uchar)
+local function escapeutf8(uchar)
 	local value = escapecodes[uchar]
 	if value then
 		return value
 	end
-  local a, b, c, d = strbyte (uchar, 1, 4)
+	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
@@ -125,49 +133,49 @@ local function escapeutf8 (uchar)
 		return ""
 	end
 	if value <= 0xffff then
-    return strformat ("\\u%.4x", value)
+		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)
+		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)
+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)
+	if strfind(str, pattern) then
+		return gsub(str, pattern, repl)
 	else
 		return str
 	end
 end
 
-local function quotestring (value)
+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)
+	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 .. "\""
+	return '"' .. value .. '"'
 end
 json.quotestring = quotestring
 
 local function replace(str, o, n)
-  local i, j = strfind (str, o, 1, true)
+	local i, j = strfind(str, o, 1, true)
 	if i then
-    return strsub(str, 1, i-1) .. n .. strsub(str, j+1, -1)
+		return strsub(str, 1, i - 1) .. n .. strsub(str, j + 1, -1)
 	else
 		return str
 	end
@@ -176,7 +184,7 @@ end
 -- locale independent num2str and str2num functions
 local decpoint, numfilter
 
-local function updatedecpoint ()
+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") .. "]+"
@@ -184,11 +192,11 @@ end
 
 updatedecpoint()
 
-local function num2str (num)
+local function num2str(num)
 	return replace(fsub(tostring(num), numfilter, ""), decpoint, ".")
 end
 
-local function str2num (str)
+local function str2num(str)
 	local num = tonumber(replace(str, ".", decpoint))
 	if not num then
 		updatedecpoint()
@@ -197,25 +205,24 @@ local function str2num (str)
 	return num
 end
 
-local function addnewline2 (level, buffer, buflen)
-  buffer[buflen+1] = "\n"
-  buffer[buflen+2] = strrep ("  ", level)
+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)
+function json.addnewline(state)
 	if state.indent then
-    state.bufferlen = addnewline2 (state.level or 0,
-                           state.buffer, state.bufferlen or #(state.buffer))
+		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
+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
@@ -223,20 +230,20 @@ local function addpair (key, value, prev, indent, level, buffer, buflen, tables,
 		buffer[buflen] = ","
 	end
 	if indent then
-    buflen = addnewline2 (level, buffer, buflen)
+		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)
+	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
+	if type(res) == "string" then
 		buflen = buflen + 1
 		buffer[buflen] = res
 	end
@@ -250,8 +257,10 @@ local function exception(reason, value, state, buffer, buflen, defaultmessage)
 		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
+		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
@@ -260,48 +269,50 @@ 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
+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)
+			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
+		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
+	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)
+			s = num2str(value)
 		end
 		buflen = buflen + 1
 		buffer[buflen] = s
-  elseif valtype == 'boolean' then
+	elseif valtype == "boolean" then
 		buflen = buflen + 1
 		buffer[buflen] = value and "true" or "false"
-  elseif valtype == 'string' then
+	elseif valtype == "string" then
 		buflen = buflen + 1
-    buffer[buflen] = quotestring (value)
-  elseif valtype == 'table' then
+		buffer[buflen] = quotestring(value)
+	elseif valtype == "table" then
 		if tables[value] then
-      return exception('reference cycle', value, state, buffer, buflen)
+			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
+		local isa, n = isarray(value)
+		if n == 0 and valmeta and valmeta.__jsontype == "object" then
 			isa = false
 		end
 		local msg
@@ -309,8 +320,10 @@ encode2 = function (value, indent, level, buffer, buflen, tables, globalorder, s
 			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
+				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] = ","
@@ -331,63 +344,83 @@ encode2 = function (value, indent, level, buffer, buflen, tables, globalorder, s
 					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
+						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
+				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
+						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
+				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)
+				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.")
+		return exception(
+			"unsupported type",
+			value,
+			state,
+			buffer,
+			buflen,
+			"type '" .. valtype .. "' is not supported by JSON."
+		)
 	end
 	return buflen
 end
 
-function json.encode (value, state)
+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)
+	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)
+		error(msg, 2)
 	elseif oldbuffer == buffer then
 		state.bufferlen = ret
 		return true
 	else
 		state.bufferlen = nil
 		state.buffer = nil
-    return concat (buffer)
+		return concat(buffer)
 	end
 end
 
-local function loc (str, where)
+local function loc(str, where)
 	local line, pos, linepos = 1, 1, 0
 	while true do
-    pos = strfind (str, "\n", pos, true)
+		pos = strfind(str, "\n", pos, true)
 		if pos and pos < where then
 			line = line + 1
 			linepos = pos
@@ -396,27 +429,33 @@ local function loc (str, where)
 			break
 		end
 	end
-  return strformat ("line %d, column %d", line, where - linepos)
+	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)
+local function unterminated(str, what, where)
+	return nil, strlen(str) + 1, "unterminated " .. what .. " at " .. loc(str, where)
 end
 
-local function scanwhite (str, pos)
+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
+		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
+			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 = strfind(str, "*/", pos + 2)
+			if not pos then
+				return nil
+			end
 			pos = pos + 2
 		else
 			return pos
@@ -425,59 +464,64 @@ local function scanwhite (str, pos)
 end
 
 local escapechars = {
-  ["\""] = "\"", ["\\"] = "\\", ["/"] = "/", ["b"] = "\b", ["f"] = "\f",
-  ["n"] = "\n", ["r"] = "\r", ["t"] = "\t"
+	['"'] = '"',
+	["\\"] = "\\",
+	["/"] = "/",
+	["b"] = "\b",
+	["f"] = "\f",
+	["n"] = "\n",
+	["r"] = "\r",
+	["t"] = "\t",
 }
 
-local function unichar (value)
+local function unichar(value)
 	if value < 0 then
 		return nil
 	elseif value <= 0x007f then
-    return strchar (value)
+		return strchar(value)
 	elseif value <= 0x07ff then
-    return strchar (0xc0 + floor(value/0x40),
-                    0x80 + (floor(value) % 0x40))
+		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))
+		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))
+		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 function scanstring(str, pos)
 	local lastpos = pos + 1
 	local buffer, n = {}, 0
 	while true do
-    local nextpos = strfind (str, "[\"\\]", lastpos)
+		local nextpos = strfind(str, '["\\]', lastpos)
 		if not nextpos then
-      return unterminated (str, "string", pos)
+			return unterminated(str, "string", pos)
 		end
 		if nextpos > lastpos then
 			n = n + 1
-      buffer[n] = strsub (str, lastpos, nextpos - 1)
+			buffer[n] = strsub(str, lastpos, nextpos - 1)
 		end
-    if strsub (str, nextpos, nextpos) == "\"" then
+		if strsub(str, nextpos, nextpos) == '"' then
 			lastpos = nextpos + 1
 			break
 		else
-      local escchar = strsub (str, nextpos + 1, nextpos + 1)
+			local escchar = strsub(str, nextpos + 1, nextpos + 1)
 			local value
 			if escchar == "u" then
-        value = tonumber (strsub (str, nextpos + 2, nextpos + 5), 16)
+				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 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
@@ -485,7 +529,7 @@ local function scanstring (str, pos)
 							end
 						end
 					end
-          value = value and unichar (value)
+					value = value and unichar(value)
 					if value then
 						if value2 then
 							lastpos = nextpos + 12
@@ -506,7 +550,7 @@ local function scanstring (str, pos)
 	if n == 1 then
 		return buffer[1], lastpos
 	elseif n > 1 then
-    return concat (buffer), lastpos
+		return concat(buffer), lastpos
 	else
 		return "", lastpos
 	end
@@ -514,40 +558,52 @@ end
 
 local scanvalue -- forward declaration
 
-local function scantable (what, closechar, str, startpos, nullval, objectmeta, arraymeta)
+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)
+	if what == "object" then
+		setmetatable(tbl, objectmeta)
 	else
-    setmetatable (tbl, arraymeta)
+		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)
+		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)
+		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) .. ")"
+				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
-      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
+			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)
+			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
@@ -558,30 +614,30 @@ local function scantable (what, closechar, str, startpos, nullval, objectmeta, a
 	end
 end
 
-scanvalue = function (str, pos, nullval, objectmeta, arraymeta)
+scanvalue = function(str, pos, nullval, objectmeta, arraymeta)
 	pos = pos or 1
-  pos = scanwhite (str, pos)
+	pos = scanwhite(str, pos)
 	if not pos then
-    return nil, strlen (str) + 1, "no valid JSON value (reached the end)"
+		return nil, strlen(str) + 1, "no valid JSON value (reached the end)"
 	end
-  local char = strsub (str, pos, pos)
+	local char = strsub(str, pos, pos)
 	if char == "{" then
-    return scantable ('object', "}", str, pos, nullval, objectmeta, arraymeta)
+		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)
+		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)
+		local pstart, pend = strfind(str, "^%-?[%d%.]+[eE]?[%+%-]?%d*", pos)
 		if pstart then
-      local number = str2num (strsub (str, pstart, pend))
+			local number = str2num(strsub(str, pstart, pend))
 			if number then
 				return number, pend + 1
 			end
 		end
-    pstart, pend = strfind (str, "^%a%w*", pos)
+		pstart, pend = strfind(str, "^%a%w*", pos)
 		if pstart then
-      local name = strsub (str, pstart, pend)
+			local name = strsub(str, pstart, pend)
 			if name == "true" then
 				return true, pend + 1
 			elseif name == "false" then
@@ -590,7 +646,7 @@ scanvalue = function (str, pos, nullval, objectmeta, arraymeta)
 				return nullval, pend + 1
 			end
 		end
-    return nil, pos, "no valid JSON value at " .. loc (str, pos)
+		return nil, pos, "no valid JSON value at " .. loc(str, pos)
 	end
 end
 
@@ -598,125 +654,132 @@ local function optionalmetatables(...)
 	if select("#", ...) > 0 then
 		return ...
 	else
-    return {__jsontype = 'object'}, {__jsontype = 'array'}
+		return { __jsontype = "object" }, { __jsontype = "array" }
 	end
 end
 
-function json.decode (str, pos, nullval, ...)
+function json.decode(str, pos, nullval, ...)
 	local objectmeta, arraymeta = optionalmetatables(...)
-  return scanvalue (str, pos, nullval, objectmeta, arraymeta)
+	return scanvalue(str, pos, nullval, objectmeta, arraymeta)
 end
 
-function json.use_lpeg ()
-  local g = require ("lpeg")
+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"
+	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)
+	local function ErrorCall(str, pos, msg, state)
 		if not state.msg then
-      state.msg = msg .. " at " .. loc (str, pos)
+			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)
+	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)
+	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 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)
+	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 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)
+	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)
+			return true, unichar((high - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000)
 		else
 			return false
 		end
 	end
-  local function UTF16BMP (hex)
-    return unichar (tonumber (hex, 16))
+	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 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 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 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)
+			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
+			if cont == "cont" or cont == "last" then
 				nt = nt + 1
 				t[nt] = obj
 			end
-    until cont ~= 'cont'
-    return pos, setmetatable (t, state.arraymeta)
+		until cont ~= "cont"
+		return pos, setmetatable(t, state.arraymeta)
 	end
 
-  local function parseobject (str, pos, nullval, state)
+	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)
+			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
+			if cont == "cont" or cont == "last" then
 				t[key] = obj
 			end
-    until cont ~= 'cont'
-    return pos, setmetatable (t, state.objectmeta)
+		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 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 ()
+	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
@@ -726,10 +789,10 @@ function json.use_lpeg ()
 	jsonlpeg.encodeexception = json.encodeexception
 	jsonlpeg.using_lpeg = true
 
-  function jsonlpeg.decode (str, pos, nullval, ...)
+	function jsonlpeg.decode(str, pos, nullval, ...)
 		local state = {}
 		state.objectmeta, state.arraymeta = optionalmetatables(...)
-    local obj, retpos = pegmatch (DecodeValue, str, pos, nullval, state)
+		local obj, retpos = pegmatch(DecodeValue, str, pos, nullval, state)
 		if state.msg then
 			return nil, state.pos, state.msg
 		else
@@ -738,7 +801,9 @@ function json.use_lpeg ()
 	end
 
 	-- cache result of this function:
-  json.use_lpeg = function () return jsonlpeg end
+	json.use_lpeg = function()
+		return jsonlpeg
+	end
 	jsonlpeg.use_lpeg = json.use_lpeg
 
 	return jsonlpeg
@@ -749,4 +814,3 @@ if always_use_lpeg then
 end
 
 return json
-

lib/fes.lua

@@ -4,7 +4,8 @@ local M = {}
 M.__index = M
 
 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
@@ -311,7 +312,7 @@ em, i { font-style: italic; }
 </body>
 </html>
 ]],
-        parts = {}
+		parts = {},
 	}
 
 	return setmetatable(self, M)
@@ -336,7 +337,11 @@ function M:build()
 	local header = self.header
 	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>">]])
+	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

lib/std.lua

@@ -19,29 +19,29 @@ end
 function M.a(link, str)
 	link = link or "https://example.com"
 	str = str or link
-	return "<a href=\"" .. link .. "\">" .. str .. "</a>"
+	return '<a href="' .. link .. '">' .. str .. "</a>"
 end
 
 function M.ha(link, str)
 	link = link or "https://example.com"
 	str = str or link
-	return "<a class=\"hidden\" href=\"" .. link .. "\">" .. str .. "</a>"
+	return '<a class="hidden" href="' .. link .. '">' .. str .. "</a>"
 end
 
 function M.external(link, str)
-	return "<a target=\"_blank\" href=\"" .. link .. "\">" .. str .. "</a>"
+	return '<a target="_blank" href="' .. link .. '">' .. str .. "</a>"
 end
 
 function M.note(str)
-	return '<div class="note">' .. str .. '</div>'
+	return '<div class="note">' .. str .. "</div>"
 end
 
 function M.muted(str)
-	return '<div class="muted">' .. str .. '</div>'
+	return '<div class="muted">' .. str .. "</div>"
 end
 
 function M.callout(str)
-	return '<div class="callout">' .. str .. '</div>'
+	return '<div class="callout">' .. str .. "</div>"
 end
 
 function M.h1(str)
@@ -55,7 +55,8 @@ end
 function M.h3(str)
 	return "<h3>" .. (str or "") .. "</h3>"
 end
-function M.h4(str) return "<h4>" .. (str or "") .. "</h4>"
+function M.h4(str)
+	return "<h4>" .. (str or "") .. "</h4>"
 end
 
 function M.h5(str)

main.go

@@ -25,7 +25,8 @@ 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.Static = flag.Bool("static", false, "Render and save all pages.")
+	config.Static = flag.Bool("static", false, "Render and save all pages")
+	config.Docker = flag.Bool("docker", false, "Create a docker project")
 	config.Lib = lib
 	config.Doc = documentation
 }
@@ -33,13 +34,13 @@ func init() {
 func main() {
 	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:")
+		fmt.Fprintf(os.Stderr, "Commands:")
+		fmt.Fprintf(os.Stderr, "  new <project_dir>   Create a new project")
+		fmt.Fprintf(os.Stderr, "  doc                 Open documentation")
+		fmt.Fprintf(os.Stderr, "  run <project_dir>   Start the server")
+		fmt.Fprintf(os.Stderr, "Options:")
 		flag.PrintDefaults()
-		fmt.Println("For bug reports, contact a developer and describe the issue. Provide the output of the `-V1` flag.")
+		fmt.Fprintf(os.Stderr, "For bug reports, contact a developer and describe the issue. Provide the output of the `-V1` flag.")
 	}
 
 	showVersion := flag.Bool("version", false, "Show version and exit")

modules/config/config.go

@@ -10,6 +10,7 @@ var Doc string
 var Port *int
 var Color *bool
 var Static *bool
+var Docker *bool
 
 type AppConfig struct {
 	App struct {

modules/doc/doc.go

@@ -9,6 +9,7 @@ import (
 	"github.com/pkg/browser"
 )
 
+/* open documentation in browser */
 func Open() error {
 	fmt.Println("Opening documentation in browser")
 

modules/new/new.go

@@ -1,6 +1,7 @@
 package new
 
 import (
+	"fes/modules/config"
 	"fmt"
 	"os"
 	"os/exec"
@@ -26,7 +27,7 @@ func getName() string {
 }
 
 /* helper function for writing files */
-func write(path string, format string, args ...interface{}) error {
+func write(path string, format string, args ...any) error {
 	dir := filepath.Dir(path)
 	if err := os.MkdirAll(dir, 0755); err != nil {
 		panic(err)
@@ -49,6 +50,22 @@ func Project(dir string) error {
 		return err
 	}
 
+	if *config.Docker {
+		write("docker-compose.yml", `services:
+  %s:
+    image: git.vxserver.dev/fsd/fes:latest
+    ports:
+      - "3000:3000"
+    volumes:
+      - ./app:/app`, dir)
+		if err := os.Mkdir("app", 0755); err != nil {
+			return err
+		}
+		if err := os.Chdir("app"); err != nil {
+			return err
+		}
+	}
+
 	name := getName()
 
 	write("www/index.lua", `local fes = require("fes")
@@ -64,5 +81,38 @@ return site`, name)
 name = "%s"
 version = "0.0.1"
 authors = ["%s"]`, dir, name)
+	write("README.md", strings.ReplaceAll(`# %s
+
+$$$$$$
+fes new %s
+$$$$$$
+
+> **Know what you are doing?** Delete this file. Have fun!
+
+## Project Structure
+
+Inside your Fes project, you'll see the following directories and files:
+
+$$$$$$
+.
+├── Fes.toml
+├── README.md
+└── www
+    └── index.lua
+$$$$$$
+
+Fes looks for $$.lua$$ files in the $$www/$$ directory. Each file is exposed as a route based on its file name.
+
+## Commands
+
+All commands are run from the root of the project, from a terminal:
+
+| Command                   | Action                                           |
+| :------------------------ | :----------------------------------------------- |
+| $$fes run .$$               | Runs the project at $$.$$                          |
+
+## What to learn more?
+
+Check out [Fes's docs](https://docs.vxserver.dev/static/fes.html).`, "$$", "`"), dir, dir)
 	return nil
 }

modules/server/server.go

@@ -17,11 +17,21 @@ import (
 	"time"
 )
 
+/* this is the request data we pass over the bus to the application, via the fes.bus interface */
 type reqData struct {
 	path   string
 	params map[string]string
 }
 
+/* performs relavent handling based on the directory passaed
+ *
+ * Special directories
+ *  - www/     <= contains lua routes.
+ *  - static/  <= static content accessable at /static/path or /static/dir/path.
+ *  - include/ <= globally accessable lua functions, cannot directly access "fes" right now.
+ *  - archive/ <= contains user facing files such as archives or dists.
+ *
+ */
 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())
@@ -59,6 +69,7 @@ func handleDir(entries []os.DirEntry, dir string, routes map[string]string, base
 	return nil
 }
 
+// TODO(vx-clutch): this should not be a function
 func loadIncludeModules(L *lua.LState, includeDir string) *lua.LTable {
 	app := L.NewTable()
 	ents, err := os.ReadDir(includeDir)
@@ -94,7 +105,8 @@ func loadIncludeModules(L *lua.LState, includeDir string) *lua.LTable {
 	return app
 }
 
-func loadLua(entry string, cfg *config.AppConfig, requestData reqData) ([]byte, error) {
+/* renders the given lua route */
+func renderRoute(entry string, cfg *config.AppConfig, requestData reqData) ([]byte, error) {
 	L := lua.NewState()
 	defer L.Close()
 
@@ -219,6 +231,7 @@ func loadLua(entry string, cfg *config.AppConfig, requestData reqData) ([]byte,
 	return []byte(""), nil
 }
 
+/* this indexes and generate the page for viewing the archive directory */
 func generateArchiveIndex(fsPath string, urlPath string) (string, error) {
 	info, err := os.Stat(fsPath)
 	if err != nil {
@@ -309,6 +322,9 @@ func generateArchiveIndex(fsPath string, urlPath string) (string, error) {
 	return b.String(), nil
 }
 
+/* generates the data for the not found page. Checks for user-defined source in this order
+ * 404.lua => 404.md => 404.html => default.
+ */
 func generateNotFoundData(cfg *config.AppConfig) []byte {
 	notFoundData := []byte(`
 <html>
@@ -320,9 +336,13 @@ func generateNotFoundData(cfg *config.AppConfig) []byte {
 </html>
 `)
 	if _, err := os.Stat(filepath.Join("www", "404.lua")); err == nil {
-		if nf, err := loadLua("www/404.lua", cfg, reqData{}); err == nil {
+		if nf, err := renderRoute("www/404.lua", cfg, reqData{}); err == nil {
 			notFoundData = nf
 		}
+	} else if _, err := os.Stat("www/404.md"); err == nil {
+		if buf, err := os.ReadFile("www/404.html"); err == nil {
+			notFoundData = []byte(markdownToHTML(string(buf)))
+		}
 	} else if _, err := os.Stat("www/404.html"); err == nil {
 		if buf, err := os.ReadFile("www/404.html"); err == nil {
 			notFoundData = buf
@@ -331,6 +351,7 @@ func generateNotFoundData(cfg *config.AppConfig) []byte {
 	return notFoundData
 }
 
+/* helper to load all special directories */
 func loadDirs() map[string]string {
 	routes := make(map[string]string)
 
@@ -355,6 +376,7 @@ func loadDirs() map[string]string {
 	return routes
 }
 
+/* helper to parse the Fes.toml and generate config */
 func parseConfig() config.AppConfig {
 	tomlDocument, err := os.ReadFile("Fes.toml")
 	if err != nil {
@@ -372,15 +394,21 @@ func parseConfig() config.AppConfig {
 	return cfg
 }
 
-func readArchive(w http.ResponseWriter, route string) {
+/* helper to read the archive files */
+func readArchive(w http.ResponseWriter, route string) error {
 	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 nil
+		} else {
+			return err
 		}
 	}
+	return nil
 }
 
+/* start the Fes server */
 func Start(dir string) error {
 	if err := os.Chdir(dir); err != nil {
 		return ui.Error(fmt.Sprintf("failed to change directory to %s", dir), err)
@@ -405,7 +433,7 @@ func Start(dir string) error {
 			route = r.URL.Path
 
 			if strings.HasPrefix(route, "/archive") {
-				readArchive(w, route)
+				err = readArchive(w, route)
 			} else {
 				w.WriteHeader(http.StatusNotFound)
 				w.Write([]byte(notFoundData))
@@ -422,10 +450,11 @@ func Start(dir string) error {
 
 		var data []byte
 		if strings.HasSuffix(route, ".lua") {
-			data, err = loadLua(route, &cfg, reqData{path: r.URL.Path, params: params})
+			data, err = renderRoute(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)))
+			data = []byte("<style>body {max-width: 80ch;}</style>\n" + string(data))
 		} else {
 			data, err = os.ReadFile(route)
 		}
@@ -438,5 +467,5 @@ func Start(dir string) error {
 	})
 
 	fmt.Printf("Server is running on http://localhost:%d\n", *config.Port)
-	return http.ListenAndServe(fmt.Sprintf(":%d", *config.Port), nil)
+	return http.ListenAndServe(fmt.Sprintf("0.0.0.0:%d", *config.Port), nil)
 }

modules/ui/ui.go

@@ -11,6 +11,7 @@ import (
 	"github.com/fatih/color"
 )
 
+/* print out the current path (route) and relevant error */
 func Path(path string, err error) {
 	path = strings.TrimPrefix(path, "/")
 
@@ -29,29 +30,35 @@ func Path(path string, err error) {
 	}
 }
 
+/* print general system warning */
 func Warning(msg string, err error) error {
 	fmt.Printf("%s: %s: %v\n", version.PROGRAM_NAME, color.MagentaString("warning"), err)
 	return err
 }
 
+/* print general system error */
 func Error(msg string, err error) error {
 	fmt.Printf("%s: %s: %v\n", version.PROGRAM_NAME, color.RedString("error"), err)
 	return err
 }
 
+/* print fatality and panic */
 func Fatal(msg string, err error) error {
 	fmt.Printf("%s: %s: %v\n", version.PROGRAM_NAME, color.RedString("fatal"), err)
 	panic(err)
 }
 
+/* print message using the ok status color */
 func OK(msg string) {
 	color.Green(msg)
 }
 
+/* print message using the warning status color */
 func WARN(msg string) {
 	color.Magenta(msg)
 }
 
+/* print message using the error status color */
 func ERROR(msg string) {
 	color.Red(msg)
 }