the prompt now displays and works with unknown command

src/components/react/commands.ts

@@ -1,21 +0,0 @@
-import { working_dir } from "./fs"
-
-function ls() {
-
-}
-
-function pwd() {
-
-}
-
-function cat() {
-
-}
-
-const commands = {
-	["ls"]: ls,
-	["pwd"]: pwd,
-	["cat"]: cat,
-}
-
-export { commands }

src/components/react/fs.ts

@@ -1,33 +0,0 @@
-let working_dir = "user"
-
-const enum EntryType {
-	Directory,
-	File
-}
-
-type File = string
-type Entry<T> = {
-	readonly inner: T,
-	readonly type: EntryType
-}
-function Entry<T = File>(inner: T): Entry<T> {
-	const type = typeof inner == "object" ? EntryType.Directory : EntryType.File
-	return { inner: inner, type: type }
-}
-
-const user = {
-	["about_me.txt"]: Entry(""),
-	["services.txt"]: Entry("")
-}
-const home = {
-	["user"]: Entry(user)
-}
-const root = {
-	["bin"]: Entry({}),
-	["home"]: Entry(home)
-}
-const fs = {
-	["/"]: Entry(root)
-}
-
-export { fs, working_dir }

src/components/react/shell/command/list.ts

@@ -0,0 +1,26 @@
+import { working_dir } from "../fs"
+
+type args = string[]
+
+function ls(args: args) {
+	console.log(args)
+}
+
+function pwd(args: args) {
+
+}
+
+function cat(args: args) {
+
+}
+
+interface commands_list {
+	[index: string]: (args: args) => void
+}
+const commands: commands_list = {
+	["ls"]: ls,
+	["pwd"]: pwd,
+	["cat"]: cat,
+}
+
+export default commands

src/components/react/shell/command/run.tsx

@@ -0,0 +1,41 @@
+import type { JSX } from "react";
+import type { Root } from "react-dom/client";
+import { type newElement } from "../../terminal/exec";
+
+import commands from "./list";
+
+type Renderer<T> = React.Dispatch<React.SetStateAction<T>>
+
+function trim(stdin: string): string {
+	const trimmed_str: string[] = []
+	stdin.split(" ").forEach(s => { if (s != "") { trimmed_str.push(s) } })
+	return trimmed_str.join(" ")
+}
+
+function to_args(trimmed_str: string): string[] {
+	return trimmed_str.split(" ")
+}
+
+function valid_command(args: string[]): boolean {
+	for (const command_in_list in commands) {
+		const command = args[0]
+		if (command === command_in_list) {
+			commands[command_in_list](args)
+			return true
+		}
+	}
+	return false
+}
+
+function unknown_command(name: string) {
+	return <p>{`sh: Unknown command: ${name}`}</p>
+}
+
+export default function run(stdin: string) {
+	const args = to_args(trim(stdin))
+
+	if (args[0] !== "" && !valid_command(args)) {
+		return unknown_command(args[0])
+	}
+	return <></>
+}

src/components/react/shell/events.tsx

@@ -1,9 +1,9 @@
-import { useState } from "react"
-import type { JSX } from "react/jsx-dev-runtime"
-
 import Display from "./prompt"
+import run from "./command/run"
+
+import { type newElement } from "../terminal/exec";
+import type { JSX } from "react";
 
-type SetStateAction<T> = React.Dispatch<React.SetStateAction<T>>
 const enum Key {
 	Enter     = "Enter",
 	ArrowUp   = "ArrowUp",
@@ -12,32 +12,36 @@ const enum Key {
 }
 
 function display_prompt() {
-	return <>
+	return <div className="shell-prompt">
 		<Display/>
 		<input className="shell-ps1" type="text" spellCheck={false}/>
-	</>
+	</div>
 }
 
 function get_current_prompt(): HTMLInputElement | undefined {
 	const shell_input = document.getElementsByClassName("shell-ps1")
+
 	return shell_input[shell_input.length-1] as HTMLInputElement
 }
 
-function new_prompt([existingPrompts, setPrompt]: [JSX.Element[], SetStateAction<JSX.Element[]>]) {
+function new_prompt(): JSX.Element {
 	const shell_prompts = document.getElementsByClassName("shell-ps1")
+
 	Array.from(shell_prompts).forEach(shellps1 => {
 		(shellps1 as HTMLInputElement).disabled = true
 	})
-	setPrompt([...existingPrompts, display_prompt()])
+	return display_prompt()
 }
 
-function keyboard_event(terminal: HTMLElement, existingPrompts: JSX.Element[], setPrompt: SetStateAction<JSX.Element[]>) {
+function keyboard_events(terminal_window: HTMLElement, new_element_f: newElement) {
 	const terminal_event = (keyboard_event: KeyboardEvent) => {
 		if (keyboard_event.key === Key.Enter) {
 			const current_prompt = get_current_prompt()
 			if (current_prompt) {
-				new_prompt([existingPrompts, setPrompt])
-				terminal.removeEventListener("keydown", terminal_event)
+				const prompt = new_prompt()
+				const output = run(current_prompt.value)
+				new_element_f([output, prompt])
+				terminal_window.removeEventListener("keydown", terminal_event)
 			}
 		} else if (keyboard_event.key === Key.ArrowUp) {
 
@@ -47,10 +51,10 @@ function keyboard_event(terminal: HTMLElement, existingPrompts: JSX.Element[], s
 
 		}
 	}
-	terminal.addEventListener("keydown", terminal_event)
+	terminal_window.addEventListener("keydown", terminal_event)
 }
 
 export {
-	keyboard_event,
+	keyboard_events,
 	display_prompt
 }

src/components/react/shell/fs.ts

@@ -0,0 +1,46 @@
+let working_dir = "user"
+
+const enum EntryType {
+	Directory,
+	File
+}
+const enum Permissions {
+	r,
+	w,
+	rw
+}
+
+type File = string
+type Entry<T> = {
+	readonly inner: T,
+	readonly type: EntryType,
+	readonly permissions: Permissions
+}
+function Entry<T = File>(inner: T, permissions: Permissions): Entry<T> {
+	const type = typeof inner == "object" ? EntryType.Directory : EntryType.File
+	return {
+		inner: inner,
+		type: type,
+		permissions: permissions
+	}
+}
+
+const user = {
+	["about_me.txt"]: Entry("", Permissions.rw),
+	["services.txt"]: Entry("", Permissions.rw)
+}
+const home = {
+	["user"]: Entry(user, Permissions.rw)
+}
+const root = {
+	["bin"]: Entry({}, Permissions.r),
+	["home"]: Entry(home, Permissions.r)
+}
+const fs = {
+	["/"]: Entry(root, Permissions.r)
+}
+
+export {
+	fs,
+	working_dir
+}

src/components/react/shell/prompt.tsx

@@ -1,4 +1,4 @@
-import { working_dir } from "../fs"
+import { working_dir } from "./fs"
 import { cyan, green } from "./color"
 
 const userAgent = navigator.userAgent

src/components/react/terminal/exec.tsx

@@ -1,7 +1,8 @@
-import { useState } from "react"
+import { useState, type JSX } from "react"
 import { red } from "../shell/color"
+import { display_prompt, keyboard_events } from "../shell/events"
 
-import { display_prompt, keyboard_event } from "../shell/events"
+import React from "react"
 
 const terminal_window = document.querySelector("main")
 
@@ -14,14 +15,21 @@ function panic(message: string) {
 	</>
 }
 
+type newElement = (elements: JSX.Element[]) => void
+
 export default function Shell() {
 	if (terminal_window) {
-		const [existingPrompts, setPrompt] = useState([display_prompt()])
-		keyboard_event(terminal_window, existingPrompts, setPrompt)
+		const [renderedElements, renderElement] = useState([display_prompt()])
+		const new_element_f = (elements: JSX.Element[]) => renderElement([...renderedElements, ...elements])
 
-		return existingPrompts.map((ps1, k) => <div className="shell-prompt" key={k}>{ps1}</div>)
+		keyboard_events(terminal_window, new_element_f)
+
+		return renderedElements.map((element, k) => <React.Fragment key={k}>{element}</React.Fragment>)
 	}
 	return panic("The <main> element is missing")
 }
 
-export { panic }
+export {
+	panic,
+	type newElement,
+}

src/pages/index.astro

@@ -7,7 +7,7 @@ import Terminal from '../components/react/terminal/exec';
 <Webpage>
 	<main>
 		<Motd/>
-		<Terminal client:only/>
+		<Terminal client:only="react"/>
 	</main>
 </Webpage>