fix: make cd only throw command.exit hooks

.hilbishrc.lua

@@ -3,23 +3,19 @@ ansikit = require 'ansikit'
 bait = require 'bait'
 
 function doPrompt(fail)
-	prompt(ansikit.text(
+	prompt(ansikit.format(
 		'{blue}%u {cyan}%d ' .. (fail and '{red}' or '{green}') .. '∆{reset} '
 	))
 end
 
-print(ansikit.text('Welcome {cyan}'.. os.getenv 'USER' ..
+print(ansikit.format('Welcome {cyan}'.. os.getenv 'USER' ..
 '{reset} to {magenta}Hilbish{reset},\n' .. 
 'the nice lil shell for {blue}Lua{reset} fanatics!\n'))
 
 doPrompt()
 
-bait.catch('command.fail', function()
+bait.catch('command.exit', function(code)
-	doPrompt(true)
+	doPrompt(code ~= 0)
-end)
-
-bait.catch('command.success', function()
-	doPrompt()
 end)
 
 --hook("tab complete", function ())

libs/ansikit/init.lua

@@ -4,13 +4,78 @@
 
 local ansikit = {}
 
-ansikit.getCSI = function (code, endc)
+ansikit.clear = function(scrollback)
+	typ = (scrollback and 3 or 2)
+	return ansikit.printCSI(typ, 'J')
+end
+
+ansikit.clearFromPos = function(scrollback)
+	return ansikit.printCSI(0, 'J')
+end
+
+ansikit.clearLine = function()
+	return ansikit.printCSI(2, 'K')
+end
+
+ansikit.clearToPos = function()
+	return ansikit.printCSI(1, 'J')
+end
+
+ansikit.color256 = function(color)
+	color = (color and color or 0)
+	return ansikit.printCSI('38;5;' .. color)
+end
+
+ansikit.cursorDown = function(y)
+	y = (y and y or 1)
+	return ansikit.printCSI(y, 'B')
+end
+
+ansikit.cursorLeft = function(x)
+	x = (x and x or 1)
+	return ansikit.printCSI(x, 'D')
+end
+
+-- TODO: cursorPos
+-- https://github.com/Luvella/AnsiKit/blob/master/lib/index.js#L90
+
+ansikit.cursorRight = function(x)
+	x = (x and x or 1)
+	return ansikit.printCSI(x, 'C')
+end
+
+ansikit.cursorStyle = function(style)
+	style = (style and style or ansikit.underlineCursor)
+	if style > 6 or style < 1 then style = ansikit.underlineCursor end
+	
+	return ansikit.printCSI(style, ' q')
+end
+
+ansikit.cursorTo = function(x, y)
+	x, y = (x and x or 1), (y and y or 1)
+	return ansikit.printCSI(x .. ';' .. y, 'H')
+end
+
+ansikit.cursorUp = function(y)
+	y = (y and y or 1)
+	return ansikit.printCSI(y, 'A')
+end
+
+ansikit.getCode = function(code, terminate)
+	endc = (endc and endc or 'm')
+	return string.char(0x001b) .. code ..
+	(terminate and string.char(0x001b) .. '\\' or '')
+end
+
+ansikit.getCSI = function(code, endc)
 	endc = (endc and endc or 'm')
 	return string.char(0x001b) .. '[' .. code .. endc
 end
 
-ansikit.text = function (text)
+ansikit.format = function(text)
 	local colors = {
+		-- TODO: write codes manually instead of using functions
+		-- less function calls = faster ????????
 		reset = {'{reset}', ansikit.getCSI(0)},
 		bold = {'{bold}', ansikit.getCSI(1)},
 		dim = {'{dim}', ansikit.getCSI(2)},
@@ -25,8 +90,22 @@ ansikit.text = function (text)
 		yellow = {'{yellow}', ansikit.getCSI(33)},
 		blue = {'{blue}', ansikit.getCSI(34)},
 		magenta = {'{magenta}', ansikit.getCSI(35)},
-		cyan = {'{cyan}', ansikit.getCSI(36)}
+		cyan = {'{cyan}', ansikit.getCSI(36)},
-		-- TODO: Background, bright colors
+		white = {'{white}', ansikit.getCSI(37)},
+		red_bg = {'{red-bg}', ansikit.getCSI(41)},
+		green_bg = {'{green-bg}', ansikit.getCSI(42)},
+		yellow_bg = {'{green-bg}', ansikit.getCSI(43)},
+		blue_bg = {'{blue-bg}', ansikit.getCSI(44)},
+		magenta_bg = {'{magenta-bg}', ansikit.getCSI(45)},
+		cyan_bg = {'{cyan-bg}', ansikit.getCSI(46)},
+		white_bg = {'{white-bg}', ansikit.getCSI(47)},
+		gray = {'{gray}', ansikit.getCSI(90)},
+		bright_red = {'{bright-red}', ansikit.getCSI(91)},
+		bright_green = {'{bright-green}', ansikit.getCSI(92)},
+		bright_yellow = {'{bright-yellow}', ansikit.getCSI(93)},
+		bright_blue = {'{bright-blue}', ansikit.getCSI(94)},
+		bright_magenta = {'{bright-magenta}', ansikit.getCSI(95)},
+		bright_cyan = {'{bright-cyan}', ansikit.getCSI(96)}
 	}
 
 	for k, v in pairs(colors) do
@@ -36,5 +115,25 @@ ansikit.text = function (text)
 	return text
 end
 
+ansikit.print = function(text)
+	io.write(ansikit.format(text))
+	return ansikit
+end
+
+ansikit.printCode = function(code, terminate)
+	io.write(ansikit.getCode(code, terminate))
+	return ansikit
+end
+
+ansikit.printCSI = function(code, endc)
+	io.write(ansikit.getCSI(code, endc))
+	return ansikit
+end
+
+ansikit.println = function(text)
+	print(ansikit.print(text))
+	return ansikit
+end
+
 return ansikit
 

lua.go

@@ -12,7 +12,7 @@ import (
 
 var minimalconf = `
 ansikit = require 'ansikit'
-prompt(ansikit.text(
+prompt(ansikit.format(
 		'{blue}%u {cyan}%d {green}∆{reset} '
 ))
 `
@@ -25,6 +25,7 @@ func LuaInit() {
 	l.SetGlobal("_ver", lua.LString(version))
 
 	l.SetGlobal("prompt", l.NewFunction(hshprompt))
+	l.SetGlobal("multiprompt", l.NewFunction(hshmlprompt))
 	l.SetGlobal("alias", l.NewFunction(hshalias))
 
 	// Add fs module to Lua
@@ -64,7 +65,7 @@ func LuaInit() {
 	err = l.DoFile(homedir + "/.hilbishrc.lua")
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err,
-		"An error has occured while loading your config! Falling back to minimal default config.\n")
+		"\nAn error has occured while loading your config! Falling back to minimal default config.\n")
 
 		l.DoString(minimalconf)
 	}
@@ -76,6 +77,12 @@ func hshprompt(L *lua.LState) int {
 	return 0
 }
 
+func hshmlprompt(L *lua.LState) int {
+	multilinePrompt = L.ToString(1)
+
+	return 0
+}
+
 func hshalias(L *lua.LState) int {
 	alias := L.ToString(1)
 	source := L.ToString(2)

main.go

@@ -17,10 +17,12 @@ import (
 
 )
 
-const version = "0.3.0-dev"
+const version = "0.3.0"
 var l *lua.LState
 // User's prompt, this will get set when lua side is initialized
 var prompt string
+var multilinePrompt = "> "
+
 // Map of builtin/custom commands defined in the commander lua module
 var commands = map[string]bool{}
 // Command aliases
@@ -113,7 +115,7 @@ func main() {
 }
 
 func ContinuePrompt(prev string) (string, error) {
-	fmt.Printf("> ")
+	fmt.Print(multilinePrompt)
 
 	reader := bufio.NewReader(os.Stdin)
 

preload.lua

@@ -18,12 +18,16 @@ commander.register('cd', function (args)
 			if err == 1 then
 				print('directory does not exist')
 			end
-			bait.throw('command.fail', nil)
+			bait.throw('command.exit', err)
-		else bait.throw('command.success', nil) end
+		else bait.throw('command.exit', 0) end
 		return
 	end
 	fs.cd(os.getenv 'HOME')
-	bait.throw('command.success', nil)
+	bait.throw('command.exit', 0)
+end)
+
+commander.register('exit', function()
+	os.exit(0)
 end)
 
 do

shell.go

@@ -47,47 +47,41 @@ func RunInput(input string) {
 			Protect: true,
 		}, luar.New(l, cmdArgs[1:]))
 		if err != nil {
-			// TODO: dont panic
+			fmt.Fprintln(os.Stderr,
-			panic(err)
+			"Error in command:\n\n" + err.Error())
 		}
-		HandleHistory(cmdString)
+		if cmdArgs[0] != "exit" { HandleHistory(cmdString) }
 		return
 	}
 
 	// Last option: use sh interpreter
-	switch cmdArgs[0] {
+	err = execCommand(cmdString)
-	case "exit":
+	if err != nil {
-		os.Exit(0)
+		// If input is incomplete, start multiline prompting
-	default:
+		if syntax.IsIncomplete(err) {
-		err := execCommand(cmdString)
+			for {
-		if err != nil {
+				cmdString, err = ContinuePrompt(strings.TrimSuffix(cmdString, "\\"))
-			// If input is incomplete, start multiline prompting
+				if err != nil { break }
-			if syntax.IsIncomplete(err) {
+				err = execCommand(cmdString)
-				for {
-					cmdString, err = ContinuePrompt(strings.TrimSuffix(cmdString, "\\"))
-					if err != nil { break }
-					err = execCommand(cmdString)
-
 					if syntax.IsIncomplete(err) || strings.HasSuffix(input, "\\") {
-						continue
+					continue
-					} else if code, ok := interp.IsExitStatus(err); ok {
+				} else if code, ok := interp.IsExitStatus(err); ok {
-						bait.Em.Emit("command.exit", code)
-					} else if err != nil {
-						fmt.Fprintln(os.Stderr, err)
-						bait.Em.Emit("command.exit", 1)
-					}
-					break
-				}
-			} else {
-				if code, ok := interp.IsExitStatus(err); ok {
 					bait.Em.Emit("command.exit", code)
-				} else { fmt.Fprintln(os.Stderr, err) }
+				} else if err != nil {
+					fmt.Fprintln(os.Stderr, err)
+					bait.Em.Emit("command.exit", 1)
+				}
+				break
 			}
 		} else {
-			bait.Em.Emit("command.exit", 0)
+			if code, ok := interp.IsExitStatus(err); ok {
+				bait.Em.Emit("command.exit", code)
+			} else { fmt.Fprintln(os.Stderr, err) }
 		}
-		HandleHistory(cmdString)
+	} else {
+		bait.Em.Emit("command.exit", 0)
 	}
+	HandleHistory(cmdString)
 }
 
 // Run command in sh interpreter
@@ -168,7 +162,7 @@ func StartMultiline(prev string, sb *strings.Builder) bool {
 	// save input from previous prompts
 	if sb.String() == "" { sb.WriteString(prev + "\n") }
 
-	fmt.Printf("sh> ")
+	fmt.Print(multilinePrompt)
 
 	reader := bufio.NewReader(os.Stdin)