1 Commits

Author SHA1 Message Date
f8cddaf340 --emptyOutDir for silenting a build warning 2025-02-23 20:31:45 -05:00
18 changed files with 132 additions and 257 deletions

View File

@ -9,9 +9,9 @@
"preview": "vite preview" "preview": "vite preview"
}, },
"devDependencies": { "devDependencies": {
"sass": "^1.85.1", "sass": "^1.85.0",
"typescript": "^5.7.3", "typescript": "^5.7.3",
"vite": "^6.2.0", "vite": "^6.1.1",
"vite-plugin-html": "^3.2.2" "vite-plugin-html": "^3.2.2"
} }
} }

View File

@ -1,5 +1,5 @@
<!doctype html> <!doctype html>
<html> <html lang="en">
<head> <head>
<meta charset="UTF-8"/> <meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width"/> <meta name="viewport" content="width=device-width"/>
@ -56,6 +56,6 @@
</style> </style>
</noscript> </noscript>
</footer> </footer>
<script type="module" src="./rt/emulator/terminal.ts"></script> <script type="module" src="./rt/terminal.ts"></script>
</body> </body>
</html> </html>

View File

@ -1,5 +1,5 @@
import { cyan, green } from "../shell/color" import { cyan, green } from "../shell/color"
import { get_working_dir_name } from "../rfwfs/library" import { get_working_dir_name } from "../shell/fs/fn"
import create from "./create" import create from "./create"

View File

@ -26,12 +26,6 @@ function stdout_grid<T extends HTMLElement>(left: string[], right: string[], hea
return wrap_indicator return wrap_indicator
} }
function stdout_horizontal_elements<T extends HTMLElement>(elements: T[]) {
const h_elements_out = horizontal()
h_elements_out.append(...elements)
return h_elements_out
}
function stdout_horizontal(strs: string[]) { function stdout_horizontal(strs: string[]) {
const p = create("p") const p = create("p")
strs.forEach((str, i) => { strs.forEach((str, i) => {
@ -54,8 +48,7 @@ export default function stdout(str: string) {
} }
export { export {
stdout_horizontal_elements,
stdout_horizontal,
stdout_grid, stdout_grid,
stdout_horizontal,
stdout_bold stdout_bold
} }

View File

@ -1,5 +1,5 @@
import run from "../shell/command/command" import run from "./shell/command/command"
import history from "../shell/history" import history from "./shell/history"
type InputClosure = (key_event: KeyboardEvent) => void type InputClosure = (key_event: KeyboardEvent) => void
interface EnterArgs { interface EnterArgs {

View File

@ -1,78 +0,0 @@
import { type FsList, type FsEntry } from "./core"
interface SearchResult<T> {
item: T,
binary_index: number
}
interface Search {
binary_fs: (cloned_list: FsList, file_name: string) => SearchResult<FsEntry> | undefined,
binary_nsort: <T>(list: T[], find: T, start: number, end: number) => SearchResult<T> | undefined,
binary: <T>(list: T[], find: T) => SearchResult<T> | undefined,
linear: <T>(list: T[], find: T) => SearchResult<T> | undefined,
}
function wrap_result<T>(item: T, binary_index: number): SearchResult<T> {
return { item: item, binary_index: binary_index }
}
const search = {} as Search
search.binary = function(list, find) {
list.sort()
let start = 0
let end = list.length-1
while (start<=end) {
const median = (start+end)>>1
if (list[median] === find) {
return wrap_result(list[median], median)
} else if (list[median]<find) {
start = median+1
} else {
end = median-1
}
}
return
}
search.binary_nsort = function(list, find, start = 0, end = list.length-1) {
if (start>end) { return }
const median = (start+end)>>1
if (list[median] === find) {
return wrap_result(list[median], median)
}
if (list[median]>find) {
return this.binary_nsort(list, find, start, median-1)
} else {
return this.binary_nsort(list, find, median+1, end)
}
}
search.binary_fs = function(cloned_list, file_name) {
cloned_list.sort((a,z) => a.name.localeCompare(z.name))
let start = 0
let end = cloned_list.length-1
while (start<=end) {
const median = (start+end)>>1
const median_name = cloned_list[median].name
if (median_name === file_name) {
return wrap_result(cloned_list[median], median)
} else if (median_name<file_name) {
start = median+1
} else {
end = median-1
}
}
return
}
search.linear = function(list, find) {
for (let ind = 0; ind<list.length; ind++) {
if (list[ind] === find) {
return wrap_result(list[ind], ind)
}
}
return
}
export default search

View File

@ -1,85 +0,0 @@
import { type FsDirectory, type FsEntry } from "./core"
import fstree from "./tree"
import index from "./index"
let cached_dir = fstree[0] //start at root
let working_path = ["/", "home", "user"]
const clone_working_path = () => [...working_path]
function get_working_dir_name() {
return working_path[working_path.length-1]
}
function get_working_dir_name_full(): string {
const w_dir_clone = clone_working_path()
const root = w_dir_clone.shift()
if (root) {
return root+w_dir_clone.join("/")
}
return "shift-error"
}
const enum SetDirStatus {
Valid,
NotFound,
NotADirectory,
Invalid
}
interface FsIterEntry {
readonly entry: FsDirectory | null,
readonly status: SetDirStatus
}
function find_fs_dir(working_dir_path_clone: string[], find_dir_name: string): FsIterEntry {
let cached_dir_clone = cached_dir.inner
for (let path_i = 0; path_i<working_dir_path_clone.length; path_i++) {
if (cached_dir_clone) {
let cached_dir_file_names: string[] = []
cached_dir_clone.forEach((file, file_i) => cached_dir_file_names.push(file.name))
const search_result = index.binary(cached_dir_clone, fstree[0])
if (working_dir_path_clone[path_i] === find_dir_name) {
cached_dir_clone = cached_dir_clone
if (path_i === working_dir_path_clone.length) {
const search_result = index.binary(cached_dir_file_names, find_dir_name)
if (search_result) {
}
} else {
continue
}
}
}
return { entry: null, status: SetDirStatus.Invalid }
}
return { entry: null, status: SetDirStatus.NotFound }
}
function set_working_dir(name: string): SetDirStatus {
if (name === ".") { return SetDirStatus.Valid }
const w_dir_clone = clone_working_path()
if (name === "..") {
w_dir_clone.pop()
} else {
w_dir_clone.push(name)
}
}
function get_working_dir_entries(): FsEntry[] {
}
export {
get_working_dir_name,
get_working_dir_name_full,
get_working_dir_entries,
set_working_dir,
SetDirStatus
}

View File

@ -1,19 +0,0 @@
import { Entry, Permissions } from "./core"
const user = [
Entry("about_me.txt", "about me inside", Permissions.rw),
Entry("services.txt", "services inside", Permissions.rw),
Entry("hi", [], Permissions.rw)
]
const home = [
Entry("user", user, Permissions.rw)
]
const root = [
Entry("home", home, Permissions.r),
Entry("bin", {}, Permissions.r),
]
const fstree = [
Entry("/", root, Permissions.r)
]
export default fstree

View File

@ -7,23 +7,20 @@ const enum Colors {
cyan = "cyan", cyan = "cyan",
bold = "bold" bold = "bold"
} }
function newcolor(inner: string, color?: Colors, bold?: boolean) { function newcolor(inner: string, color?: Colors) {
const span = create("span", color) const span = create("span", color)
span.innerText = inner span.innerText = inner
if (bold) {
span.className = color ? color+" bold" : "bold"
}
return span return span
} }
const red = (s: string, bold?: boolean) => newcolor(s, Colors.red, bold) const red = (s: string) => newcolor(s, Colors.red )
const green = (s: string, bold?: boolean) => newcolor(s, Colors.green, bold) const green = (s: string) => newcolor(s, Colors.green)
const blue = (s: string, bold?: boolean) => newcolor(s, Colors.blue, bold) const blue = (s: string) => newcolor(s, Colors.blue)
const cyan = (s: string, bold?: boolean) => newcolor(s, Colors.cyan, bold) const cyan = (s: string) => newcolor(s, Colors.cyan)
const bold = (s: string) => newcolor(s, Colors.bold) const bold = (s: string) => newcolor(s, Colors.bold)
export default function rgb(s: string, Ru8: number, Gu8: number, Bu8: number, bold?: boolean) { export default function rgb(s: string, Ru8: number, Gu8: number, Bu8: number) {
const rgb_span = newcolor(s, undefined, bold) const rgb_span = newcolor(s)
rgb_span.style.color = `rgb(${Ru8},${Gu8},${Bu8})` rgb_span.style.color = `rgb(${Ru8},${Gu8},${Bu8})`
return rgb_span return rgb_span
} }

View File

@ -1,15 +1,13 @@
import { set_working_dir, SetDirStatus } from "../../../rfwfs/library" import { set_working_dir, SetDirStatus } from "../../fs/fn"
import type { Args, Term } from "../list" import type { Args, Term } from "../list"
import stdout from "../../../elements/stdout"
export default function cd(term: Term, args: Args): boolean { export default function cd(term: Term, args: Args): boolean {
const new_dir_status = set_working_dir(args[1]) const new_dir_status = set_working_dir(args[1])
if (new_dir_status === SetDirStatus.NotADirectory) { if (new_dir_status === SetDirStatus.NotADirectory) {
term.appendChild(stdout(`cd: "${args[1]}" is not a directory`)) // return <p>{"cd: \""}{bold(args[1])}{"\" is not a directory"}</p>
} else if (new_dir_status === SetDirStatus.NotFound) { } else if (new_dir_status === SetDirStatus.NotFound) {
term.appendChild(stdout(`cd: The directory "${args[1]}" does not exist`)) // return <p>{"cd: The directory \""}{bold(args[1])}{"\" does not exist"}</p>
} }
return true return true
} }

View File

@ -7,7 +7,7 @@ import history from "../../history";
const history_command = new SubCommand("Show and manipulate command history") const history_command = new SubCommand("Show and manipulate command history")
history_command.add("show", "Show the history", function(term: Term, _args: Args) { history_command.add("show", "Show the history", function(term: Term, _args: Args) {
history.file.inner.forEach((entry, ind) => term.appendChild(stdout(`${ind+1} ${entry}`))) history.file.inner.forEach((entry, ind) => term.appendChild(stdout(`${ind} ${entry}`)))
}) })
history_command.add("clear", "Delete the entire command history", function(term: Term, _args: Args) { history_command.add("clear", "Delete the entire command history", function(term: Term, _args: Args) {

View File

@ -1,30 +1,11 @@
import type { Args, Term } from "../list"; import type { Args, Term } from "../list";
import { blue } from "../../color";
import { get_working_dir_entries } from "../../../rfwfs/library";
import { EntryType, FsEntry } from "../../../rfwfs/core";
import stdout, { stdout_horizontal_elements } from "../../../elements/stdout";
import create from "../../../elements/create";
const element_collection = <T extends HTMLElement>(): T[] => []
function show_directory(entry: FsEntry) {
const p = create("p")
p.append(blue(entry.name, true), "/")
return p
}
export default function ls(term: Term, args: Args): boolean { export default function ls(term: Term, args: Args): boolean {
const ls_elements = element_collection() // if (args[1] === undefined) {
if (args[1] === undefined) { // for (const dir_name in working_dir) {
get_working_dir_entries().forEach(entry => {
if (entry.type === EntryType.Directory) { // }
ls_elements.push(show_directory(entry)) // return <p>{`${working_dir}`}</p>
} else if (entry.type === EntryType.File) { // }
ls_elements.push(stdout(entry.name))
}
})
}
term.appendChild(stdout_horizontal_elements(ls_elements))
return true return true
} }

View File

@ -1,4 +1,4 @@
import { get_working_dir_name_full } from "../../../rfwfs/library"; import { get_working_dir_name_full } from "../../fs/fn";
import type { Args, Term } from "../list"; import type { Args, Term } from "../list";
import stdout from "../../../elements/stdout"; import stdout from "../../../elements/stdout";

75
src/rt/shell/fs/fn.ts Normal file
View File

@ -0,0 +1,75 @@
import { EntryType, fs, type FsEntrySignature } from "./fs"
let working_dir = ["/", "home", "user"]
function get_working_dir_name() {
return working_dir[working_dir.length-1]
}
function get_working_dir_name_full(): string {
const w_dir_clone = [...working_dir]
const root = w_dir_clone.shift()
if (root) {
return root+w_dir_clone.join("/")
}
return "shift-error"
}
const enum SetDirStatus {
Valid,
NotFound,
NotADirectory
}
interface FsIterEntry {
readonly entry: FsEntrySignature | null,
readonly status: SetDirStatus
}
function iter_fs_to_goal(w_dir_clone: string[]): FsIterEntry {
let next_iter = fs[0]
for (const w_dir of w_dir_clone) {
if (w_dir === "/") { continue }
if (next_iter && next_iter.inner) {
const found = next_iter.inner.find(entry => entry.name === w_dir)
if (!found) {
return { entry: null, status: SetDirStatus.NotFound }
}
if (found.type !== EntryType.Directory) {
return { entry: null, status: SetDirStatus.NotADirectory }
}
if (found.name === w_dir_clone[w_dir_clone.length-1]) {
return { entry: next_iter, status: SetDirStatus.Valid }
} else {
next_iter = found.inner as FsEntrySignature
}
}
}
return { entry: null, status: SetDirStatus.NotFound }
}
function set_working_dir(name: string): SetDirStatus {
if (name === ".") { return SetDirStatus.Valid }
const w_dir_clone = [...working_dir]
if (name === "..") { w_dir_clone.pop() } else { w_dir_clone.push(name) }
const iter_status = iter_fs_to_goal(w_dir_clone)
if (iter_status.status === SetDirStatus.Valid) {
working_dir = w_dir_clone
}
return iter_status.status
}
function working_dir_entries() {
const w_dir_clone = [...working_dir]
const iter_status = iter_fs_to_goal(w_dir_clone)
}
export {
get_working_dir_name,
get_working_dir_name_full,
set_working_dir,
SetDirStatus
}

View File

@ -8,9 +8,23 @@ const enum Permissions {
rw rw
} }
type FsList = FsEntry[] type FsEntrySignature = Entry<Entry<{}>[]> //I did this!
type FsEntry = Entry<{}>
type FsDirectory = Entry<FsList> const user = [
Entry("about_me.txt", "about me inside", Permissions.rw),
Entry("services.txt", "services inside", Permissions.rw),
Entry("hi", [], Permissions.rw)
]
const home = [
Entry("user", user, Permissions.rw)
]
const root = [
Entry("home", home, Permissions.r),
Entry("bin", {}, Permissions.r),
]
const fs = [
Entry("/", root, Permissions.r)
]
type File = string type File = string
interface Entry<T = File> { interface Entry<T = File> {
@ -29,9 +43,8 @@ function Entry<T = File>(name: string, inner: T, permissions: Permissions): Entr
} }
export { export {
type FsDirectory, fs,
type FsEntry, type FsEntrySignature,
type FsList,
EntryType, EntryType,
Permissions, Permissions,
Entry Entry

View File

@ -1,5 +1,5 @@
import history from "../shell/history" import history from "./shell/history"
import prompt from "../elements/prompt" import prompt from "./elements/prompt"
import keys from "./keys" import keys from "./keys"
const term_win_unsafe = document.querySelector("main") const term_win_unsafe = document.querySelector("main")

View File

@ -1,5 +1,3 @@
@use "../variables.scss";
@mixin text-styles { @mixin text-styles {
.red { color: rgb(var(--color-red)) } .red { color: rgb(var(--color-red)) }
.green { color: rgb(var(--color-green)) } .green { color: rgb(var(--color-green)) }
@ -32,13 +30,17 @@
@mixin formatting { @mixin formatting {
@include stdout-layouts; @include stdout-layouts;
@include term-elements; @include term-elements;
@include text-styles;
p, a, span {
font-size: variables.$default-font-size
}
p { p {
@include text-styles;
font-size: 1.2rem;
margin: 5px; margin: 5px;
a:hover { text-decoration: underline; }
span { font-size: inherit; }
a {
font-size: inherit;
&:hover { text-decoration: underline; }
}
} }
} }

View File

@ -1,5 +1,3 @@
$default-font-size: 1.2rem;
$header-Y: 30px; $header-Y: 30px;
$footer-Y: 30px; $footer-Y: 30px;
$component-padding: 20px; $component-padding: 20px;