feat(repl-logic): change output of list-commands + tests

Author: topheman

crates/pluginlab/tests/e2e_test.rs

@@ -410,12 +410,15 @@ mod e2e_test {
     }
 
     #[test]
-    fn test_man_command() {
+    fn test_list_commands() {
         let project_root = find_project_root();
         println!("Setting current directory to: {:?}", project_root);
         std::env::set_current_dir(&project_root).unwrap();
         let mut session = spawn(
-            &build_command(&["plugin_greet.wasm"], "repl_logic_guest.wasm"),
+            &build_command(
+                &["plugin_echo.wasm", "plugin_greet.wasm", "plugin_cat.wasm"],
+                "repl_logic_guest.wasm",
+            ),
             Some(TEST_TIMEOUT),
         )
         .expect("Can't launch pluginlab with plugin greet");
@@ -426,15 +429,14 @@ mod e2e_test {
         session
             .exp_string("[Host] Loading plugin:")
             .expect("Didn't see plugin loading message");
-        session.send_line("man").expect("Failed to send command");
         session
-            .exp_string(" man - Show the manual for a command")
-            .expect("Didn't see man command name");
+            .exp_string("repl(0)>")
+            .expect("Didn't see REPL prompt");
         session
-            .send_line("man man")
+            .send_line("list-commands")
             .expect("Failed to send command");
         session
-            .exp_string(" man - Show the manual for a command")
-            .expect("Didn't see man command name");
+            .exp_string("cat\tplugin\r\necho\tplugin\r\nexport\treserved\r\ngreet\tplugin\r\nhelp\treserved\r\nlist-commands\treserved\r\nman\treserved\r\n")
+            .expect("Didn't get expected list of commands");
     }
 }

crates/repl-logic-guest/src/reserved.rs

@@ -114,13 +114,21 @@ EXAMPLES
         run: Some(|_payload| {
             let plugins = host_state::get_plugins_names();
             let reserved_commands = get_reserved_commands();
+            let mut commands: Vec<(String, String)> = Vec::new();
+            for plugin in plugins {
+                commands.push(("plugin".to_string(), plugin.to_string()));
+            }
+            for reserved_command in reserved_commands {
+                commands.push(("reserved".to_string(), reserved_command.to_string()));
+            }
+            commands.sort_by(|a, b| a.1.cmp(&b.1));
+            let mut output = String::new();
+            for (category, command) in commands {
+                output.push_str(&format!("{}\t{}\n", command, category));
+            }
             transport::PluginResponse {
                 status: transport::ReplStatus::Success,
-                stdout: Some(format!(
-                    "Plugins: {} - Reserved commands: {}",
-                    plugins.join(", "),
-                    reserved_commands.join(", ")
-                )),
+                stdout: Some(output),
                 stderr: None,
             }
         }),

packages/web-host/tests/repl-logic.spec.ts

@@ -56,6 +56,7 @@ test("man for reserved commands", async ({ page }) => {
       "list-commands",
       "list-commands - List the plugins loaded in the host and the reserved commands (not overridable by plugins) included in the REPL logic.",
     ],
+    ["man", "man - Show the manual for a command"],
   ];
   await page.goto("/#repl");
   for (const [command, partialManpage] of reservedCommands) {
@@ -64,3 +65,20 @@ test("man for reserved commands", async ({ page }) => {
     await expect(stdout).toContainText(partialManpage);
   }
 });
+
+test("list-commands", async ({ page }) => {
+  await page.goto("/#repl");
+  await fillAndSubmitCommand(page, "list-commands");
+  const stdout = await getLastStd(page, "stdout");
+  await expect(stdout).toContainText(
+    `cat	plugin
+echo	plugin
+export	reserved
+greet	plugin
+help	reserved
+list-commands	reserved
+ls	plugin
+man	reserved
+weather	plugin`,
+  );
+});