Minor refactor

Author: IzKuipers

src/ts/basic/config/commandset.ts

@@ -0,0 +1,24 @@
+import { GostartCommand } from "../commands/gostart";
+import { GosubCommand } from "../commands/gosub";
+import { IfCommand } from "../commands/if";
+import { KillCommand } from "../commands/kill";
+import { PrintCommand } from "../commands/print";
+import { SoundbusCommand } from "../commands/soundbus";
+import { StopCommand } from "../commands/stop";
+import { SubCommand } from "../commands/sub";
+import { VarCommand } from "../commands/var";
+import { WhileCommand } from "../commands/while";
+import type { BasicCommand } from "../engine/command";
+
+export const BasicCommandSet: (typeof BasicCommand)[] = [
+  PrintCommand,
+  IfCommand,
+  VarCommand,
+  GosubCommand,
+  SubCommand,
+  StopCommand,
+  KillCommand,
+  GostartCommand,
+  WhileCommand,
+  SoundbusCommand,
+];

src/ts/basic/config/functions/terminal.ts

@@ -0,0 +1,16 @@
+import type { IArcTerminal } from "$interfaces/IArcTerminal";
+import { EnvFn } from "$ts/basic/functions/env";
+import { FsreadFn } from "$ts/basic/functions/fsread";
+import { InputFn } from "$ts/basic/functions/input";
+import { MathFn } from "$ts/basic/functions/math";
+import { UuidFn } from "$ts/basic/functions/uuid";
+
+export function BasicTerminalFunctions(term: IArcTerminal) {
+  return {
+    env: EnvFn(),
+    input: InputFn(),
+    math: MathFn(),
+    fsread: FsreadFn(term),
+    uuid: UuidFn(),
+  }
+}

src/ts/basic/config/term.ts

@@ -1,28 +1,18 @@
 import type { IArcTerminal } from "$interfaces/IArcTerminal";
-import { ArcOSVersion, Env } from "$ts/env";
-import { ArcBuild } from "$ts/metadata/build";
-import { ArcMode } from "$ts/metadata/mode";
+import { ArcOSVersion } from "$ts/env";
 import { BRRED, RESET } from "$ts/terminal/colors";
 import { unescapeEscapeChars } from "$ts/util";
 import { arrayBufferToText } from "$ts/util/convert";
-import { UUID } from "$ts/util/uuid";
 import type { BasicLang } from "$types/system/basic";
-import { evaluate } from "mathjs";
-import { GostartCommand } from "../commands/gostart";
-import { GosubCommand } from "../commands/gosub";
-import { IfCommand } from "../commands/if";
-import { KillCommand } from "../commands/kill";
-import { PrintCommand } from "../commands/print";
-import { StopCommand } from "../commands/stop";
-import { SubCommand } from "../commands/sub";
-import { VarCommand } from "../commands/var";
-import { WhileCommand } from "../commands/while";
-import { SoundbusCommand } from "../commands/soundbus";
+import { BasicCommandSet } from "./commandset";
+import { BasicTerminalFunctions } from "./functions/terminal";
+import { BasicBuiltinVariables } from "./variables";
 
 export function ArcTermBasicConfig(term: IArcTerminal): BasicLang.Config {
   return {
     version: ArcOSVersion,
     stdin: async () => {
+      // TODO: FIND SOMETHING BETTER
       return new Promise((resolve) => {
         let val = "";
         const disposer = term.term.onKey((e) => {
@@ -45,46 +35,10 @@ export function ArcTermBasicConfig(term: IArcTerminal): BasicLang.Config {
     stderr: (msg: string) => {
       term.rl?.write(`${BRRED}${msg}${RESET}`);
     },
-    functions: {
-      env: (val) => {
-        return Env.get(val) ?? "";
-      },
-      input: async (val, interpreter) => {
-        interpreter.sendToStdout(`\n${val}`);
-        return await interpreter.getFromStdin();
-      },
-      math: (val) => {
-        return `${evaluate(val)}`;
-      },
-      fsread: async (path, interpreter) => {
-        const content = await term.readFile(path);
-        if (!content) {
-          interpreter.error("FILE NOT FOUND", true);
-          return "";
-        }
-
-        return arrayBufferToText(content) ?? "";
-      },
-      uuid: () => UUID(),
-      len: (s) => s?.length ?? 0,
-    },
+    functions: BasicTerminalFunctions(term),
     slowdown: 10,
-    commands: [
-      PrintCommand,
-      IfCommand,
-      VarCommand,
-      GosubCommand,
-      SubCommand,
-      StopCommand,
-      KillCommand,
-      GostartCommand,
-      WhileCommand,
-      SoundbusCommand,
-    ],
-    builtinVariables: {
-      mode: () => ArcMode(),
-      build: () => ArcBuild(),
-    },
+    commands: BasicCommandSet,
+    builtinVariables: BasicBuiltinVariables,
     readScriptFile: async (path) => {
       const content = await term.readFile(path);
       return content ? arrayBufferToText(content) : undefined;

src/ts/basic/config/variables.ts

@@ -0,0 +1,8 @@
+import { ArcBuild } from "$ts/metadata/build";
+import { ArcMode } from "$ts/metadata/mode";
+import type { BasicLang } from "$types/system/basic";
+
+export const BasicBuiltinVariables: Record<string, BasicLang.VariableCallback> = {
+  mode: () => ArcMode(),
+  build: () => ArcBuild(),
+};

src/ts/basic/functions/env.ts

@@ -0,0 +1,6 @@
+import { Env } from "$ts/env";
+import type { BasicLang } from "$types/system/basic";
+
+export const EnvFn = (() => (val) => {
+  return Env.get(val) ?? "";
+}) satisfies BasicLang.TerminalBuiltinFn;

src/ts/basic/functions/fsread.ts

@@ -0,0 +1,12 @@
+import { arrayBufferToText } from "$ts/util/convert";
+import type { BasicLang } from "$types/system/basic";
+
+export const FsreadFn = ((term) => async (val, interpreter) => {
+  const content = await term.readFile(val);
+  if (!content) {
+    interpreter.error("File not found", true);
+    return "";
+  }
+
+  return arrayBufferToText(content) ?? "";
+}) satisfies BasicLang.TerminalBuiltinFn;

src/ts/basic/functions/input.ts

@@ -0,0 +1,7 @@
+import type { BasicLang } from "$types/system/basic";
+
+export const InputFn = (() => async (val, interpreter) => {
+  interpreter.sendToStdout(`\n${val}`);
+
+  return await interpreter.getFromStdin();
+}) satisfies BasicLang.TerminalBuiltinFn;

src/ts/basic/functions/math.ts

@@ -0,0 +1,6 @@
+import type { BasicLang } from "$types/system/basic";
+import { evaluate } from "mathjs";
+
+export const MathFn = (() => (val) => {
+  return `${evaluate(val)}`;
+}) satisfies BasicLang.TerminalBuiltinFn;

src/ts/basic/functions/uuid.ts

@@ -0,0 +1,4 @@
+import { UUID } from "$ts/util/uuid";
+import type { BasicLang } from "$types/system/basic";
+
+export const UuidFn = (() => () => UUID()) satisfies BasicLang.TerminalBuiltinFn;

src/types/system/basic.ts

@@ -1,13 +1,15 @@
 import { BasicCommand } from "../../ts/basic/engine/command";
 import { ArcBasicEngine } from "../../ts/basic/engine";
 import type { MaybePromise } from "$types/shared/common";
+import type { IArcTerminal } from "$interfaces/IArcTerminal";
 
 export namespace BasicLang {
   export type Fn = (val: string, interpreter: ArcBasicEngine) => MaybePromise<any>;
 
   export type StdinCallback = () => Promise<string> | string;
   export type StdoutCallback = (msg: string) => void;
   export type VariableCallback = () => Promise<any> | any;
+  export type TerminalBuiltinFn = (term: IArcTerminal) => Fn;
 
   export interface Config {
     version: string;