.gitignore

@@ -6,4 +6,3 @@ docgen
 
 .vim
 petals/
-.hugo_build.lock

CHANGELOG.md

@@ -1,13 +1,5 @@
 # 🎀 Changelog
 
-## Unreleased
-### Added
-- Documented custom userdata types (Job and Timer Objects)
-  - Coming with fix is also adding the return types for some functions that were missing it
-
-### Fixed
-- `hilbish.which` not working correctly with aliases
-
 ## [2.0.1] - 2022-12-28
 ### Fixed
 - Corrected documentation for hooks, removing outdated `command.no-perm`

api.go

@@ -231,9 +231,8 @@ func hlrun(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 	return c.PushingNext(t.Runtime, rt.IntValue(int64(exitcode)), rt.StringValue(stdoutStr), rt.StringValue(stderrStr)), nil
 }
 
-// cwd() -> string
+// cwd()
 // Returns the current directory of the shell
-// --- @returns string
 func hlcwd(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 	cwd, _ := os.Getwd()
 
@@ -445,12 +444,12 @@ func hlgoro(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 	return c.Next(), nil
 }
 
-// timeout(cb, time) -> @Timer
+// timeout(cb, time)
-// Runs the `cb` function after `time` in milliseconds.
+// Runs the `cb` function after `time` in milliseconds
-// This creates a timer that starts immediately.
+// Returns a `timer` object (see `doc timers`).
 // --- @param cb function
 // --- @param time number
-// --- @returns Timer
+// --- @returns table
 func hltimeout(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 	if err := c.CheckNArgs(2); err != nil {
 		return nil, err
@@ -471,12 +470,12 @@ func hltimeout(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 	return c.PushingNext1(t.Runtime, rt.UserDataValue(timer.ud)), nil
 }
 
-// interval(cb, time) -> @Timer
+// interval(cb, time)
 // Runs the `cb` function every `time` milliseconds.
-// This creates a timer that starts immediately.
+// Returns a `timer` object (see `doc timers`).
 // --- @param cb function
 // --- @param time number
-// --- @return Timer
+// --- @return table
 func hlinterval(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 	if err := c.CheckNArgs(2); err != nil {
 		return nil, err
@@ -537,11 +536,9 @@ func hlprependPath(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 	return c.Next(), nil
 }
 
-// which(name) -> string
+// which(name)
-// Checks if `name` is a valid command.
+// Checks if `name` is a valid command
-// Will return the path of the binary, or a basename if it's a commander.
 // --- @param name string
-// --- @returns string
 func hlwhich(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 	if err := c.Check1Arg(); err != nil {
 		return nil, err
@@ -551,10 +548,7 @@ func hlwhich(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 		return nil, err
 	}
 
-	// itll return either the original command or what was passed
+	cmd := aliases.Resolve(name)
-	// if name isnt empty its not an issue
-	alias := aliases.Resolve(name)
-	cmd := strings.Split(alias, " ")[0]
 
 	// check for commander
 	if commands[cmd] != nil {

cmd/docgen/docgen.go

@@ -7,7 +7,6 @@ import (
 	"go/doc"
 	"go/parser"
 	"go/token"
-	"regexp"
 	"strings"
 	"os"
 	"sync"
@@ -32,7 +31,6 @@ type emmyPiece struct {
 }
 
 type module struct {
-	Types []docPiece
 	Docs []docPiece
 	Fields []docPiece
 	Properties []docPiece
@@ -40,7 +38,6 @@ type module struct {
 	Description string
 	ParentModule string
 	HasInterfaces bool
-	HasTypes bool
 }
 
 type docPiece struct {
@@ -52,7 +49,6 @@ type docPiece struct {
 	GoFuncName string
 	IsInterface bool
 	IsMember bool
-	IsType bool
 	Fields []docPiece
 	Properties []docPiece
 }
@@ -65,7 +61,6 @@ type tag struct {
 var docs = make(map[string]module)
 var interfaceDocs = make(map[string]module)
 var emmyDocs = make(map[string][]emmyPiece)
-var typeTable = make(map[string][]string) // [0] = parentMod, [1] = interfaces
 var prefix = map[string]string{
 	"main": "hl",
 	"hilbish": "hl",
@@ -124,71 +119,6 @@ func docPieceTag(tagName string, tags map[string][]tag) []docPiece {
 	return dps
 }
 
-func setupDocType(mod string, typ *doc.Type) *docPiece {
-	docs := strings.TrimSpace(typ.Doc)
-	inInterface := strings.HasPrefix(docs, "#interface")
-	if !inInterface {
-		return nil
-	}
-
-	tags, doc := getTagsAndDocs(docs)
-
-	var interfaces string
-	typeName := strings.ToUpper(string(typ.Name[0])) + typ.Name[1:]
-	typeDoc := []string{}
-
-	if inInterface {
-		interfaces = tags["interface"][0].id
-	}
-
-	fields := docPieceTag("field", tags)
-	properties := docPieceTag("property", tags)
-
-	for _, d := range doc {
-		if strings.HasPrefix(d, "---") {
-			// TODO: document types in lua
-			/*
-			emmyLine := strings.TrimSpace(strings.TrimPrefix(d, "---"))
-			emmyLinePieces := strings.Split(emmyLine, " ")
-			emmyType := emmyLinePieces[0]
-			if emmyType == "@param" {
-				em.Params = append(em.Params, emmyLinePieces[1])
-			}
-			if emmyType == "@vararg" {
-				em.Params = append(em.Params, "...") // add vararg
-			}
-			em.Annotations = append(em.Annotations, d)
-			*/
-		} else {
-			typeDoc = append(typeDoc, d)
-		}
-	}
-
-	var isMember bool
-	if tags["member"] != nil {
-		isMember = true
-	}
-	var parentMod string
-	if inInterface {
-		parentMod = mod
-	}
-	dps := &docPiece{
-		Doc: typeDoc,
-		FuncName: typeName,
-		Interfacing: interfaces,
-		IsInterface: inInterface,
-		IsMember: isMember,
-		IsType: true,
-		ParentModule: parentMod,
-		Fields: fields,
-		Properties: properties,
-	}
-
-	typeTable[strings.ToLower(typeName)] = []string{parentMod, interfaces}
-
-	return dps
-}
-
 func setupDoc(mod string, fun *doc.Func) *docPiece {
 	docs := strings.TrimSpace(fun.Doc)
 	inInterface := strings.HasPrefix(docs, "#interface")
@@ -290,7 +220,6 @@ func main() {
 	for l, f := range pkgs {
 		p := doc.New(f, "./", doc.AllDecls)
 		pieces := []docPiece{}
-		typePieces := []docPiece{}
 		mod := l
 		if mod == "main" {
 			mod = "hilbish"
@@ -308,14 +237,6 @@ func main() {
 			}
 		}
 		for _, t := range p.Types {
-			typePiece := setupDocType(mod, t)
-			if typePiece != nil {
-				typePieces = append(typePieces, *typePiece)
-				if typePiece.IsInterface {
-					hasInterfaces = true
-				}
-			}
-
 			for _, m := range t.Methods {
 				piece := setupDoc(mod, m)
 				if piece == nil {
@@ -333,7 +254,6 @@ func main() {
 		shortDesc := descParts[0]
 		desc := descParts[1:]
 		filteredPieces := []docPiece{}
-		filteredTypePieces := []docPiece{}
 		for _, piece := range pieces {
 			if !piece.IsInterface {
 				filteredPieces = append(filteredPieces, piece)
@@ -356,28 +276,10 @@ func main() {
 				interfaceModules[modname].Properties = piece.Properties
 				continue
 			}
-
 			interfaceModules[modname].Docs = append(interfaceModules[modname].Docs, piece)
 		}
 
-		for _, piece := range typePieces {
-			if !piece.IsInterface {
-				filteredTypePieces = append(filteredTypePieces, piece)
-				continue
-			}
-
-			modname := piece.ParentModule + "." + piece.Interfacing
-			if interfaceModules[modname] == nil {
-				interfaceModules[modname] = &module{
-					ParentModule: piece.ParentModule,
-				}
-			}
-
-			interfaceModules[modname].Types = append(interfaceModules[modname].Types, piece)
-		}
-
 		docs[mod] = module{
-			Types: filteredTypePieces,
 			Docs: filteredPieces,
 			ShortDescription: shortDesc,
 			Description: strings.Join(desc, "\n"),
@@ -433,71 +335,17 @@ func main() {
 				}
 				f.WriteString("\n")
 			}
-
 			if len(modu.Docs) != 0 {
-				typeTag, _ := regexp.Compile(`@\w+`)
 				f.WriteString("## Functions\n")
-				for _, dps := range modu.Docs {
-					if dps.IsMember {
-						continue
-					}
-					htmlSig := typeTag.ReplaceAllStringFunc(strings.Replace(dps.FuncSig, "<", `\<`, -1), func(typ string) string {
-						typName := typ[1:]
-						typLookup := typeTable[strings.ToLower(typName)]
-						linkedTyp := fmt.Sprintf("/Hilbish/docs/api/%s/%s/#%s", typLookup[0], typLookup[0] + "." + typLookup[1], strings.ToLower(typName))
-						return fmt.Sprintf(`<a href="%s" style="text-decoration: none;">%s</a>`, linkedTyp, typName)
-					})
-					f.WriteString(fmt.Sprintf("### %s\n", htmlSig))
-					for _, doc := range dps.Doc {
-						if !strings.HasPrefix(doc, "---") {
-							f.WriteString(doc + "\n")
-						}
-					}
-					f.WriteString("\n")
-				}
 			}
-
+			for _, dps := range modu.Docs {
-			if len(modu.Types) != 0 {
+				f.WriteString(fmt.Sprintf("### %s\n", dps.FuncSig))
-				f.WriteString("## Types\n")
+				for _, doc := range dps.Doc {
-				for _, dps := range modu.Types {
+					if !strings.HasPrefix(doc, "---") {
-					f.WriteString(fmt.Sprintf("## %s\n", dps.FuncName))
+						f.WriteString(doc + "\n")
-					for _, doc := range dps.Doc {
-						if !strings.HasPrefix(doc, "---") {
-							f.WriteString(doc + "\n")
-						}
-					}
-					if len(dps.Properties) != 0 {
-						f.WriteString("### Properties\n")
-						for _, dps := range dps.Properties {
-							f.WriteString(fmt.Sprintf("- `%s`: ", dps.FuncName))
-							f.WriteString(strings.Join(dps.Doc, " "))
-							f.WriteString("\n")
-						}
-					}
-					f.WriteString("\n")
-					typeTag, _ := regexp.Compile(`@\w+`)
-
-					f.WriteString("### Methods\n")
-					for _, dps := range modu.Docs {
-						if !dps.IsMember {
-							continue
-						}
-						htmlSig := typeTag.ReplaceAllStringFunc(strings.Replace(dps.FuncSig, "<", `\<`, -1), func(typ string) string {
-							// todo: get type from global table to link to
-							// other pages (hilbish page can link to hilbish.jobs#Job)
-							typName := typ[1:]
-							linkedTyp := strings.ToLower(typName) // TODO: link
-							return fmt.Sprintf(`<a href="#%s" style="text-decoration: none;">%s</a>`, linkedTyp, typName)
-						})
-						f.WriteString(fmt.Sprintf("#### %s\n", htmlSig))
-						for _, doc := range dps.Doc {
-							if !strings.HasPrefix(doc, "---") {
-								f.WriteString(doc + "\n")
-							}
-						}
-						f.WriteString("\n")
 					}
 				}
+				f.WriteString("\n")
 			}
 		}(mod, docPath, v)
 

docs/api/hilbish/_index.md

@@ -35,7 +35,7 @@ replacing <cmd> with the name of the command (for example `command.git`).
 `cb` must be a function that returns a table of "completion groups."
 Check `doc completions` for more information.
 
-### cwd() -> string
+### cwd()
 Returns the current directory of the shell
 
 ### exec(cmd)
@@ -60,9 +60,9 @@ override this function with your custom handler.
 ### inputMode(mode)
 Sets the input mode for Hilbish's line reader. Accepts either emacs or vim
 
-### interval(cb, time) -> <a href="/Hilbish/docs/api/hilbish/hilbish.timers/#timer" style="text-decoration: none;">Timer</a>
+### interval(cb, time)
 Runs the `cb` function every `time` milliseconds.
-This creates a timer that starts immediately.
+Returns a `timer` object (see `doc timers`).
 
 ### multiprompt(str)
 Changes the continued line prompt to `str`
@@ -95,11 +95,10 @@ Accepted values for mode are hybrid (the default), hybridRev (sh first then Lua)
 sh, and lua. It also accepts a function, to which if it is passed one
 will call it to execute user input instead.
 
-### timeout(cb, time) -> <a href="/Hilbish/docs/api/hilbish/hilbish.timers/#timer" style="text-decoration: none;">Timer</a>
+### timeout(cb, time)
-Runs the `cb` function after `time` in milliseconds.
+Runs the `cb` function after `time` in milliseconds
-This creates a timer that starts immediately.
+Returns a `timer` object (see `doc timers`).
 
-### which(name) -> string
+### which(name)
-Checks if `name` is a valid command.
+Checks if `name` is a valid command
-Will return the path of the binary, or a basename if it's a commander.
 

docs/api/hilbish/hilbish.aliases.md

@@ -17,7 +17,7 @@ This is an alias (ha) for the `hilbish.alias` function.
 ### delete(name)
 Removes an alias.
 
-### list() -> table\<string, string>
+### list() -> table<string, string>
 Get a table of all aliases, with string keys as the alias and the value as the command.
 
 ### resolve(alias) -> command (string)

docs/api/hilbish/hilbish.jobs.md

@@ -14,26 +14,7 @@ Manage interactive jobs in Hilbish via Lua.
 Jobs are the name of background tasks/commands. A job can be started via
 interactive usage or with the functions defined below for use in external runners.
 
-## Functions
+## Object properties
-### add(cmdstr, args, execPath)
-Adds a new job to the job table. Note that this does not immediately run it.
-
-### all() -> table\<<a href="/Hilbish/docs/api/hilbish/hilbish.jobs/#job" style="text-decoration: none;">Job</a>>
-Returns a table of all job objects.
-
-### disown(id)
-Disowns a job. This deletes it from the job table.
-
-### get(id) -> <a href="/Hilbish/docs/api/hilbish/hilbish.jobs/#job" style="text-decoration: none;">Job</a>
-Get a job object via its ID.
-
-### last() -> <a href="/Hilbish/docs/api/hilbish/hilbish.jobs/#job" style="text-decoration: none;">Job</a>
-Returns the last added job from the table.
-
-## Types
-## Job
-The Job type describes a Hilbish job.
-### Properties
 - `cmd`: The user entered command string for the job.
 - `running`: Whether the job is running or not.
 - `id`: The ID of the job in the job table
@@ -42,17 +23,32 @@ The Job type describes a Hilbish job.
 - `stdout`: The standard output of the job. This just means the normal logs of the process.
 - `stderr`: The standard error stream of the process. This (usually) includes error messages of the job.
 
-### Methods
+## Functions
-#### background()
+### background()
 Puts a job in the background. This acts the same as initially running a job.
 
-#### foreground()
+### foreground()
 Puts a job in the foreground. This will cause it to run like it was
 executed normally and wait for it to complete.
 
-#### start()
+### start()
 Starts running the job.
 
-#### stop()
+### stop()
 Stops the job from running.
 
+### add(cmdstr, args, execPath)
+Adds a new job to the job table. Note that this does not immediately run it.
+
+### all() -> jobs (table<Job/Table>)
+Returns a table of all job objects.
+
+### disown(id)
+Disowns a job. This deletes it from the job table.
+
+### get(id) -> job (Job/Table)
+Get a job object via its ID.
+
+### last() -> job (Job/Table)
+Returns the last added job from the table.
+

docs/api/hilbish/hilbish.timers.md

@@ -22,38 +22,35 @@ All functions documented with the `Timer` type refer to a Timer object.
 
 An example of usage:
 ```
-local t = hilbish.timers.create(hilbish.timers.TIMEOUT, 5000, function()
+local t = hilbish.timers.create(1, 5000, function()
 	print 'hello!'
 end)
 
+t:stop()
+print(t.running, t.duration, t.type)
 t:start()
-print(t.running) // true
 ```
 
 ## Interface fields
 - `INTERVAL`: Constant for an interval timer type
 - `TIMEOUT`: Constant for a timeout timer type
 
-## Functions
+## Object properties
-### create(type, time, callback) -> <a href="/Hilbish/docs/api/hilbish/hilbish.timers/#timer" style="text-decoration: none;">Timer</a>
-Creates a timer that runs based on the specified `time` in milliseconds.
-The `type` can either be `hilbish.timers.INTERVAL` or `hilbish.timers.TIMEOUT`
-
-### get(id) -> <a href="/Hilbish/docs/api/hilbish/hilbish.timers/#timer" style="text-decoration: none;">Timer</a>
-Retrieves a timer via its ID.
-
-## Types
-## Timer
-The Job type describes a Hilbish timer.
-### Properties
 - `type`: What type of timer it is
 - `running`: If the timer is running
 - `duration`: The duration in milliseconds that the timer will run
 
-### Methods
+## Functions
-#### start()
+### start()
 Starts a timer.
 
-#### stop()
+### stop()
 Stops a timer.
 
+### create(type, time, callback)
+Creates a timer that runs based on the specified `time` in milliseconds.
+The `type` can either be `hilbish.timers.INTERVAL` or `hilbish.timers.TIMEOUT`
+
+### get(id) -> timer (Timer/Table)
+Retrieves a timer via its ID.
+

emmyLuaDocs/hilbish.lua

@@ -63,7 +63,6 @@ function hilbish.appendPath(dir) end
 function hilbish.complete(scope, cb) end
 
 --- Returns the current directory of the shell
---- @returns string
 function hilbish.cwd() end
 
 --- Replaces running hilbish with `cmd`
@@ -95,10 +94,10 @@ function hilbish.hinter(line, pos) end
 function hilbish.inputMode(mode) end
 
 --- Runs the `cb` function every `time` milliseconds.
---- This creates a timer that starts immediately.
+--- Returns a `timer` object (see `doc timers`).
 --- @param cb function
 --- @param time number
---- @return Timer
+--- @return table
 function hilbish.interval(cb, time) end
 
 --- Changes the continued line prompt to `str`
@@ -142,17 +141,15 @@ function hilbish.run(cmd, returnOut) end
 --- @param mode string|function
 function hilbish.runnerMode(mode) end
 
---- Runs the `cb` function after `time` in milliseconds.
+--- Runs the `cb` function after `time` in milliseconds
---- This creates a timer that starts immediately.
+--- Returns a `timer` object (see `doc timers`).
 --- @param cb function
 --- @param time number
---- @returns Timer
+--- @returns table
 function hilbish.timeout(cb, time) end
 
---- Checks if `name` is a valid command.
+--- Checks if `name` is a valid command
---- Will return the path of the binary, or a basename if it's a commander.
 --- @param name string
---- @returns string
 function hilbish.which(name) end
 
 --- Puts a job in the background. This acts the same as initially running a job.
@@ -183,7 +180,7 @@ function hilbish.runner.lua(cmd) end
 function hilbish.jobs:start() end
 
 --- Stops the job from running.
-function hilbish.jobs:stop() end
+function hilbish.jobs.stop() end
 
 --- Runs a command in Hilbish's shell script interpreter.
 --- This is the equivalent of using `source`.

job.go

@@ -18,15 +18,6 @@ import (
 var jobs *jobHandler
 var jobMetaKey = rt.StringValue("hshjob")
 
-// #interface jobs
-// #property cmd The user entered command string for the job.
-// #property running Whether the job is running or not.
-// #property id The ID of the job in the job table
-// #property pid The Process ID
-// #property exitCode The last exit code of the job.
-// #property stdout The standard output of the job. This just means the normal logs of the process.
-// #property stderr The standard error stream of the process. This (usually) includes error messages of the job.
-// The Job type describes a Hilbish job.
 type job struct {
 	cmd string
 	running bool
@@ -144,7 +135,6 @@ func luaStartJob(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 }
 
 // #interface jobs
-// #member
 // stop()
 // Stops the job from running.
 func luaStopJob(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
@@ -303,6 +293,13 @@ func (j *jobHandler) stopAll() {
 }
 
 // #interface jobs
+// #property cmd The user entered command string for the job.
+// #property running Whether the job is running or not.
+// #property id The ID of the job in the job table
+// #property pid The Process ID
+// #property exitCode The last exit code of the job.
+// #property stdout The standard output of the job. This just means the normal logs of the process.
+// #property stderr The standard error stream of the process. This (usually) includes error messages of the job.
 // background job management
 /*
 Manage interactive jobs in Hilbish via Lua.
@@ -387,7 +384,7 @@ func jobUserData(j *job) *rt.UserData {
 }
 
 // #interface jobs
-// get(id) -> @Job
+// get(id) -> job (Job/Table)
 // Get a job object via its ID.
 // --- @param id number
 // --- @returns Job
@@ -447,7 +444,7 @@ func (j *jobHandler) luaAddJob(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 }
 
 // #interface jobs
-// all() -> table<@Job>
+// all() -> jobs (table<Job/Table>)
 // Returns a table of all job objects.
 // --- @returns table<Job>
 func (j *jobHandler) luaAllJobs(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
@@ -484,7 +481,7 @@ func (j *jobHandler) luaDisownJob(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 }
 
 // #interface jobs
-// last() -> @Job
+// last() -> job (Job/Table)
 // Returns the last added job from the table.
 // --- @returns Job
 func (j *jobHandler) luaLastJob(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {

nature/commands/doc.lua

@@ -15,16 +15,6 @@ commander.register('doc', function(args)
 
 ]]
 
-	local modules = table.map(fs.readdir(moddocPath), function(f)
-		return lunacolors.underline(lunacolors.blue(string.gsub(f, '.md', '')))
-	end)
-	local doc = [[
-Welcome to Hilbish's documentation viewer! Here you can find
-documentation for builtin functions and other things related
-to Hilbish.
-
-Usage: doc <section> [subdoc]
-Available sections: ]] .. table.concat(modules, ', ')
 	if #args > 0 then
 		local mod = args[1]
 
@@ -53,7 +43,7 @@ Available sections: ]] .. table.concat(modules, ', ')
 			end
 		end
 		funcdocs = f:read '*a':gsub('-([%d]+)', '%1')
-		local moddocs = table.filter(fs.readdir(moddocPath), function(f) return f ~= '_index.md' or f ~= 'index.md' end)
+		local moddocs = table.filter(fs.readdir(moddocPath), function(f) return f ~= '_index.md' end)
 		local subdocs = table.map(moddocs, function(fname)
 			return lunacolors.underline(lunacolors.blue(string.gsub(fname, '.md', '')))
 		end)
@@ -81,20 +71,35 @@ Available sections: ]] .. table.concat(modules, ', ')
 		if mod == 'api' then
 			funcdocs = string.format(apidocHeader, vals.title, vals.description or 'no description.') .. funcdocs
 		end
-		doc = funcdocs:sub(1, #funcdocs - 1)
+		local backtickOccurence = 0
+		local formattedFuncs = lunacolors.format(funcdocs:sub(1, #funcdocs - 1):gsub('`', function()
+			backtickOccurence = backtickOccurence + 1
+			if backtickOccurence % 2 == 0 then
+				return '{reset}'
+			else
+				return '{underline}{green}'
+			end
+		end):gsub('#+.-\n', function(t)
+			return '{bold}{magenta}' .. t .. '{reset}'
+		end))
+		print(formattedFuncs)
 		f:close()
-	end
 
-	local backtickOccurence = 0
+		return
-	print(lunacolors.format(doc:gsub('`', function()
+	end
-		backtickOccurence = backtickOccurence + 1
+	local modules = table.map(fs.readdir(moddocPath), function(f)
-		if backtickOccurence % 2 == 0 then
+		return lunacolors.underline(lunacolors.blue(string.gsub(f, '.md', '')))
-			return '{reset}'
+	end)
-		else
+
-			return '{underline}{green}'
+	io.write [[
-		end
+Welcome to Hilbish's doc tool! Here you can find documentation for builtin
-	end):gsub('#+.-\n', function(t)
+functions and other things.
-		local signature = t:gsub('<.->(.-)</.->', '{underline}%1'):gsub('\\', '<')
+
-		return '{bold}{yellow}' .. signature .. '{reset}'
+Usage: doc <section> [subdoc]
-	end)))
+A section is a module or a literal section and a subdoc is a subsection for it.
+
+Available sections: ]]
+	io.flush()
+
+	print(table.concat(modules, ', '))
 end)

timer.go

@@ -15,11 +15,6 @@ const (
 	timerTimeout
 )
 
-// #interface timers
-// #property type What type of timer it is
-// #property running If the timer is running
-// #property duration The duration in milliseconds that the timer will run
-// The Job type describes a Hilbish timer.
 type timer struct{
 	id int
 	typ timerType

timerhandler.go

@@ -62,7 +62,7 @@ func (th *timersModule) get(id int) *timer {
 }
 
 // #interface timers
-// create(type, time, callback) -> @Timer
+// create(type, time, callback)
 // Creates a timer that runs based on the specified `time` in milliseconds.
 // The `type` can either be `hilbish.timers.INTERVAL` or `hilbish.timers.TIMEOUT`
 // --- @param type number
@@ -91,7 +91,7 @@ func (th *timersModule) luaCreate(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 }
 
 // #interface timers
-// get(id) -> @Timer
+// get(id) -> timer (Timer/Table)
 // Retrieves a timer via its ID.
 // --- @param id number
 // --- @returns Timer
@@ -115,6 +115,9 @@ func (th *timersModule) luaGet(thr *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 // #interface timers
 // #field INTERVAL Constant for an interval timer type
 // #field TIMEOUT Constant for a timeout timer type
+// #property type What type of timer it is
+// #property running If the timer is running
+// #property duration The duration in milliseconds that the timer will run
 // timeout and interval API
 /*
 If you ever want to run a piece of code on a timed interval, or want to wait
@@ -131,12 +134,13 @@ All functions documented with the `Timer` type refer to a Timer object.
 
 An example of usage:
 ```
-local t = hilbish.timers.create(hilbish.timers.TIMEOUT, 5000, function()
+local t = hilbish.timers.create(1, 5000, function()
 	print 'hello!'
 end)
 
+t:stop()
+print(t.running, t.duration, t.type)
 t:start()
-print(t.running) // true
 ```
 */
 func (th *timersModule) loader(rtm *rt.Runtime) *rt.Table {

website/themes/hsh/layouts/_default/_markup/render-heading.html

@@ -1,11 +1,6 @@
-
+<h{{ (add .Level 1) }} id="{{ .Anchor | safeURL }}">
-<h{{ (add .Level 1) }} id="{{ .Anchor | safeURL }}" class="heading">
 	{{ .Text | safeHTML }}
-	<a href="#{{ .Anchor | safeURL }}" class='heading-link'>
-		<i class="fas fa-paperclip"></i>
-	</a>
 </h{{ (add .Level 1) }}>
-
 {{ if eq .Text ""}}
-	<hr>
+<hr>
 {{ end }}

website/themes/hsh/layouts/partials/head.html

@@ -1,7 +1,7 @@
 <head>
 	{{ $title := print .Title " — " .Site.Title }}
-	{{ if .IsHome }}{{ $title = .Site.Title }}{{ end }}
+    {{ if .IsHome }}{{ $title = .Site.Title }}{{ end }}
-	<title>{{ $title }}</title>
+    <title>{{ $title }}</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no"/>
 	
@@ -23,16 +23,4 @@
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0-beta1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-0evHe/X+R7YkIZDRvuzKMRqM+OrBnVFBL6DOitfPri4tjfHxaWutUpFmBp4vmVor" crossorigin="anonymous">
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0-beta1/dist/js/bootstrap.bundle.min.js" integrity="sha384-pprn3073KE6tl6bjs2QrFaJGz5/SUsLqktiwsUTF55Jfv3qYSDhgCecCxMW52nD2" crossorigin="anonymous"></script>
 	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css" integrity="sha512-KfkfwYDsLkIlwQp6LFnl8zNdLGxu9YAA1QvwINks4PhcElQSvqcyVLLD9aMhXd13uQjoXtEKNosOWaZqXgel0g==" crossorigin="anonymous" referrerpolicy="no-referrer" />
-
-	<style>
-	.heading > .heading-link {
-		opacity: 0
-	}
-
-	.heading:hover > .heading-link {
-		visibility: visible;
-		opacity: 1;
-		transition: all .1s ease-in;
-	}
-	</style>
 </head>