fix completion data and implement pkg autocomplete

Author: obfuscatedgenerated

src/programs/help.ts

@@ -35,7 +35,7 @@ export default {
     completion: async (data) => {
         // TODO smarter completion to handle number of args and flags
         const programs = data.term.get_program_registry().listProgramNames();
-        return programs.filter((program) => program.startsWith(data.current_arg_partial));
+        return programs.filter((program) => program.startsWith(data.current_partial));
     },
     main: async (data) => {
         // extract from data to make code less verbose

src/programs/pkg/index.ts

@@ -7,6 +7,7 @@ import type {AbstractFileSystem} from "../../filesystem";
 import {list_subcommand} from "./list";
 import {info_subcommand} from "./info";
 import {browse_subcommand} from "./browse";
+import {helper_completion_options} from "../../tab_completion";
 
 
 const REPO_URL = "https://ollieg.codes/pkg_repo";
@@ -18,6 +19,8 @@ const GRAPH_PATH = GRAPH_DIR + "/graph.json";
 
 const BIN_DIR = "/usr/bin";
 
+// TODO: subcommand template / helper
+
 const append_url_pathnames = (url: URL, pathnames: string[]) => {
     const new_url = new URL(url.toString());
     let urlpath = new_url.pathname;
@@ -451,6 +454,33 @@ export default {
             }
         }
     },
+    completion: async (data) => {
+        const arg_index = data.raw_parts.length - 1;
+
+        switch (arg_index) {
+            case 1:
+                return helper_completion_options(["add", "remove", "list", "info", "read", "browse", "clean"])(data);
+            case 2:
+                if (["info", "read", "remove"].includes(data.args[0])) {
+                    // complete with installed package names
+                    const fs = data.term.get_fs();
+
+                    // load graph
+                    let local_graph: { [pkg_name: string]: PkgGraphEntry } = {};
+                    try {
+                        local_graph = JSON.parse(fs.read_file("/var/lib/pkg/graph.json") as string, json_convert_dep_arrs_to_sets);
+                    } catch (e) {
+                        return [];
+                    }
+
+                    const pkgs = Object.keys(local_graph);
+                    return pkgs.filter((pkg) => pkg.startsWith(data.current_partial));
+                }
+                break;
+        }
+
+        return [];
+    },
     main: async (data) => {
         // TODO: safety prompt on first use
 

src/tab_completion.ts

@@ -62,14 +62,13 @@ const get_completeable_arguments = async (term: WrappedTerminal) => {
         return null;
     }
 
-    // get the current argument partial
-    const current_arg_partial = args.length > 0 ? args[args.length - 1] : "";
     const completion_data = {
         term,
-        args_so_far: args.slice(0, -1),
-        unsubbed_args_so_far: unsubbed_args.slice(0, -1),
-        raw_parts_so_far: raw_parts.slice(0, -1),
-        current_arg_partial,
+        command,
+        args,
+        raw_parts: raw_parts,
+        unsubbed_args,
+        current_partial: raw_parts[raw_parts.length - 1] || "",
     };
 
     const completion_result = await program.completion(completion_data);
@@ -189,9 +188,9 @@ export const tab_complete = async (term: WrappedTerminal, discard_cached_matches
 
 export const helper_completion_options = (options: string[]) => {
     return async function* (data: CompletionData): AsyncGenerator<string> {
-        const {current_arg_partial} = data;
+        const {current_partial} = data;
         for (const option of options) {
-            if (option.startsWith(current_arg_partial)) {
+            if (option.startsWith(current_partial)) {
                 yield option;
             }
         }
@@ -200,11 +199,11 @@ export const helper_completion_options = (options: string[]) => {
 
 export const helper_completion_options_ordered = (options: string[][]) => {
     return async function* (data: CompletionData): AsyncGenerator<string> {
-        const {current_arg_partial, args_so_far} = data;
-        const index = args_so_far.length;
+        const {current_partial, raw_parts} = data;
+        const index = raw_parts.length - 1;
         const options_at_index = options[index] || [];
         for (const option of options_at_index) {
-            if (option.startsWith(current_arg_partial)) {
+            if (option.startsWith(current_partial)) {
                 yield option;
             }
         }

src/term_ctl.ts

@@ -273,8 +273,8 @@ export class WrappedTerminal extends Terminal {
 
         // remove leading and trailing whitespace and split by spaces, unless contained in single or double quotes
         // TODO: use a proper stack based parser for readability and maintainability
+        const raw_parts = line.split(/ +(?=(?:(?:[^"']*["'][^"']*["'])*[^"']*$))/);
         const sub = line.trim().split(/ +(?=(?:(?:[^"']*["'][^"']*["'])*[^"']*$))/);
-        const raw_parts = sub.slice();
 
         // handle aliases
         // for each part, check if it's an alias, and if so, replace it with the value
@@ -601,6 +601,11 @@ export class WrappedTerminal extends Terminal {
 
         // if the key is a printable character, write it to the terminal
         if (e.key.match(NON_PRINTABLE_REGEX) === null) {
+            // call any registered printable key handlers
+            for (const handler of this._on_printable_handlers) {
+                await handler(e, this);
+            }
+
             // if at the end of the line, just append the character
             if (this._current_index === this._current_line.length) {
                 this._current_line += e.key;

src/types.ts

@@ -22,10 +22,10 @@ export interface Program {
 
 export interface CompletionData {
     term: WrappedTerminal,
-    args_so_far: string[],
-    unsubbed_args_so_far: string[],
-    raw_parts_so_far: string[],
-    current_arg_partial: string,
+    args: string[],
+    unsubbed_args: string[],
+    raw_parts: string[],
+    current_partial: string,
 }
 
 // return null to fall back to default completion behavior (file paths)