Improved commands locals handling

Fixed IntelliSense for commands

commands/cat.js

@@ -1,3 +1,4 @@
+export {};
 /// <reference types="./lib.d.ts" />
 // @ts-check
 if (!args[1]) {

commands/cd.js

@@ -1,3 +1,4 @@
+export {};
 /// <reference types="./lib.d.ts" />
 // @ts-check
 __open(args[1] || path.resolve('.'), true);

commands/chmod.js

@@ -1,3 +1,4 @@
+export {};
 /// <reference types="./lib.d.ts" />
 // @ts-check
 

commands/cp.js

@@ -1,3 +1,4 @@
+export {};
 /// <reference types="./lib.d.ts" />
 // @ts-check
 if (args.length != 3) {

commands/echo.js

@@ -1,3 +1,4 @@
+export {};
 /// <reference types="./lib.d.ts" />
 // @ts-check
 terminal.writeln(args.slice(1).join(' '));

commands/help.js

@@ -1,3 +1,4 @@
+export {};
 /// <reference types="./lib.d.ts" />
 // @ts-check
 terminal.writeln('Some unix commands available, ls /bin to see them.');

commands/ln.js

@@ -1,3 +1,4 @@
+export {};
 /// <reference types="./lib.d.ts" />
 // @ts-check
 

commands/ls.js

@@ -1,3 +1,4 @@
+export {};
 /// <reference types="./lib.d.ts" />
 /// <reference lib="esnext" />
 // @ts-check

commands/mkdir.js

@@ -1,3 +1,4 @@
+export {};
 /// <reference types="./lib.d.ts" />
 // @ts-check
 if (!args[1]) {

commands/mv.js

@@ -1,3 +1,4 @@
+export {};
 /// <reference types="./lib.d.ts" />
 // @ts-check
 if (args.length != 3) {

commands/open-editor.js

@@ -1,3 +1,4 @@
+export {};
 /// <reference types="./lib.d.ts" />
 // @ts-check
 __editor_open(args[1]);

commands/pwd.js

@@ -1,3 +1,4 @@
+export {};
 /// <reference types="./lib.d.ts" />
 // @ts-check
 terminal.writeln(path.cwd);

commands/rm.js

@@ -1,3 +1,4 @@
+export {};
 /// <reference types="./lib.d.ts" />
 // @ts-check
 if (!args[1]) {

commands/stat.js

@@ -1,3 +1,4 @@
+export {};
 const { S_IFREG, S_IFDIR, S_IFCHR, S_IFBLK, S_IFIFO, S_IFLNK, S_IFSOCK } = fs.constants;
 
 const dateFormatter = new Intl.DateTimeFormat('en-US', {

commands/touch.js

@@ -1,3 +1,4 @@
+export {};
 /// <reference types="./lib.d.ts" />
 // @ts-check
 if (!args[1]) {

src/shell.ts

@@ -26,45 +26,37 @@ fitAddon.fit();
 
 const AsyncFunction = async function () {}.constructor as (...args: string[]) => (...args: unknown[]) => Promise<void>;
 
-async function wait(n: number): Promise<void> {
-	const { promise, resolve } = Promise.withResolvers<void>();
-	setTimeout(resolve, n);
-	return promise;
+/**
+ * Handles removing TS-specific stuff
+ */
+function parse_source(source: string): string {
+	return source.replaceAll(/^\s*export {};\s*\n/g, '');
 }
 
-export async function exec(__cmdLine: string): Promise<void> {
-	const args = __cmdLine.trim().split(' ');
+export async function exec(line: string): Promise<void> {
+	const args = line.trim().split(' ');
 
 	if (!args[0]) {
 		return;
 	}
 
-	const __filename = '/bin/' + args[0] + '.js';
+	const filename = '/bin/' + args[0] + '.js';
 
-	if (!fs.existsSync(__filename)) {
+	if (!fs.existsSync(filename)) {
 		terminal.writeln('Unknown command: ' + args[0]);
 		return;
 	}
 
-	if (!fs.statSync(__filename).hasAccess(X_OK)) {
+	if (!fs.statSync(filename).hasAccess(X_OK)) {
 		terminal.writeln('Missing permission: ' + args[0]);
 		return;
 	}
 
-	await AsyncFunction(
-		'{ fs, path, utilium, terminal, __open, __editor_open, args, wait }',
-		fs.readFileSync(__filename, 'utf8')
-	)({
-		fs,
-		path,
-		chalk,
-		utilium,
-		terminal,
-		__open,
-		__editor_open,
-		args,
-		wait,
-	} satisfies ExecutionLocals | object);
+	const source = parse_source(fs.readFileSync(filename, 'utf8'));
+
+	const locals = { fs, path, chalk, utilium, terminal, __open, __editor_open, args } satisfies ExecutionLocals;
+
+	await AsyncFunction(`{${Object.keys(locals).join(',')}}`, source)(locals);
 }
 
 const shell = createShell({