Fix broken forc command docs

docs/book/spell-check-custom-words.txt

@@ -4,6 +4,7 @@ ASM
 IDE
 IDEs
 LSP
+lsp
 namespace
 ALU
 APIs
@@ -216,4 +217,14 @@ underflows
 Codec
 bool
 str
-multisig
+multisig
+addr
+addr2line
+contract-id
+init
+parse-bytecode
+predicate-root
+forc-client
+crypto
+doc
+fmt

docs/book/src/SUMMARY.md

@@ -80,28 +80,28 @@
   - [Workspaces](./forc/workspaces.md)
   - [Dependencies](./forc/dependencies.md)
   - [Commands](./forc/commands/index.md)
-    - [`forc addr2line`](./forc/commands/forc_addr2line.md)
-    - [`forc build`](./forc/commands/forc_build.md)
-    - [`forc check`](./forc/commands/forc_check.md)
-    - [`forc clean`](./forc/commands/forc_clean.md)
-    - [`forc completions`](./forc/commands/forc_completions.md)
-    - [`forc contract-id`](./forc/commands/forc_contract-id.md)
-    - [`forc init`](./forc/commands/forc_init.md)
-    - [`forc new`](./forc/commands/forc_new.md)
-    - [`forc parse-bytecode`](./forc/commands/forc_parse-bytecode.md)
-    - [`forc plugins`](./forc/commands/forc_plugins.md)
-    - [`forc predicate-root`](./forc/commands/forc_predicate-root.md)
-    - [`forc test`](./forc/commands/forc_test.md)
-    - [`forc update`](./forc/commands/forc_update.md)
-    - [`forc template`](./forc/commands/forc_template.md)
+    - [forc addr2line](./forc/commands/forc_addr2line.md)
+    - [forc build](./forc/commands/forc_build.md)
+    - [forc check](./forc/commands/forc_check.md)
+    - [forc clean](./forc/commands/forc_clean.md)
+    - [forc completions](./forc/commands/forc_completions.md)
+    - [forc contract-id](./forc/commands/forc_contract-id.md)
+    - [forc init](./forc/commands/forc_init.md)
+    - [forc new](./forc/commands/forc_new.md)
+    - [forc parse-bytecode](./forc/commands/forc_parse-bytecode.md)
+    - [forc plugins](./forc/commands/forc_plugins.md)
+    - [forc predicate-root](./forc/commands/forc_predicate-root.md)
+    - [forc test](./forc/commands/forc_test.md)
+    - [forc update](./forc/commands/forc_update.md)
+    - [forc template](./forc/commands/forc_template.md)
   - [Plugins](./forc/plugins/index.md)
-    - [`forc client`](./forc/plugins/forc_client/index.md)
-      - [`forc deploy`](./forc/plugins/forc_client/forc_deploy.md)
-      - [`forc run`](./forc/plugins/forc_client/forc_run.md)
-      - [`forc submit`](./forc/plugins/forc_client/forc_submit.md)
-    - [`forc crypto`](./forc/plugins/forc_crypto.md)
-    - [`forc debug`](./forc/plugins/forc_debug.md)
-    - [`forc doc`](./forc/plugins/forc_doc.md)
-    - [`forc explore`](./forc/plugins/forc_explore.md)
-    - [`forc fmt`](./forc/plugins/forc_fmt.md)
-    - [`forc lsp`](./forc/plugins/forc_lsp.md)
+    - [forc client](./forc/plugins/forc_client/index.md)
+      - [forc deploy](./forc/plugins/forc_client/forc_deploy.md)
+      - [forc run](./forc/plugins/forc_client/forc_run.md)
+      - [forc submit](./forc/plugins/forc_client/forc_submit.md)
+    - [forc crypto](./forc/plugins/forc_crypto.md)
+    - [forc debug](./forc/plugins/forc_debug.md)
+    - [forc doc](./forc/plugins/forc_doc.md)
+    - [forc explore](./forc/plugins/forc_explore.md)
+    - [forc fmt](./forc/plugins/forc_fmt.md)
+    - [forc lsp](./forc/plugins/forc_lsp.md)

docs/book/src/forc/commands/forc_addr2line.md

@@ -1 +1 @@
-# `forc addr2line`
+# forc addr2line

docs/book/src/forc/commands/forc_build.md

@@ -1 +1 @@
-# `forc build`
+# forc build

docs/book/src/forc/commands/forc_check.md

@@ -1 +1 @@
-# `forc check`
+# forc check

docs/book/src/forc/commands/forc_clean.md

@@ -1 +1 @@
-# `forc clean`
+# forc clean

docs/book/src/forc/commands/forc_completions.md

@@ -1 +1 @@
-# `forc completions`
+# forc completions

docs/book/src/forc/commands/forc_contract-id.md

@@ -1 +1 @@
-# `forc contract-id`
+# forc contract-id

docs/book/src/forc/commands/forc_init.md

@@ -1 +1 @@
-# `forc init`
+# forc init

docs/book/src/forc/commands/forc_new.md

@@ -1 +1 @@
-# `forc new`
+# forc new

docs/book/src/forc/commands/forc_parse-bytecode.md

@@ -1 +1 @@
-# `forc parse-bytecode`
+# forc parse-bytecode

docs/book/src/forc/commands/forc_plugins.md

@@ -1 +1 @@
-# `forc plugins`
+# forc plugins

docs/book/src/forc/commands/forc_predicate-root.md

@@ -1 +1 @@
-# `forc predicate-root`
+# forc predicate-root

docs/book/src/forc/commands/forc_template.md

@@ -1 +1 @@
-# `forc template`
+# forc template

docs/book/src/forc/commands/forc_test.md

@@ -1 +1 @@
-# `forc test`
+# forc test

docs/book/src/forc/commands/forc_update.md

@@ -1 +1 @@
-# `forc update`
+# forc update

docs/book/src/forc/plugins/forc_client/forc_deploy.md

@@ -1 +1 @@
-# `forc deploy`
+# forc deploy

docs/book/src/forc/plugins/forc_client/forc_run.md

@@ -1 +1 @@
-# `forc run`
+# forc run

docs/book/src/forc/plugins/forc_client/forc_submit.md

@@ -1 +1 @@
-# `forc submit`
+# forc submit

docs/book/src/forc/plugins/forc_client/index.md

@@ -1,4 +1,4 @@
-# `forc-client`
+# forc-client
 
 The forc plugin for interacting with a Fuel node.
 

docs/book/src/forc/plugins/forc_crypto.md

@@ -1 +1 @@
-# `forc crypto`
+# forc crypto

docs/book/src/forc/plugins/forc_doc.md

@@ -1 +1 @@
-# `forc doc`
+# forc doc

docs/book/src/forc/plugins/forc_explore.md

@@ -1 +1 @@
-# `forc explore`
+# forc explore

docs/book/src/forc/plugins/forc_fmt.md

@@ -1 +1 @@
-# `forc fmt`
+# forc fmt

docs/book/src/forc/plugins/forc_lsp.md

@@ -1 +1 @@
-# `forc lsp`
+# forc lsp

scripts/mdbook-forc-documenter/src/bin/mdbook-forc-documenter.rs

@@ -1,18 +1,21 @@
 use clap::{Arg, ArgMatches, Command};
 use mdbook::errors::Error;
 use mdbook::preprocess::{CmdPreprocessor, Preprocessor};
+use mdbook_forc_documenter::ForcDocumenter;
 use semver::{Version, VersionReq};
 use std::io;
 use std::process;
 
-use mdbook_forc_documenter::ForcDocumenter;
-
 pub fn make_app() -> Command {
     Command::new("forc-documenter")
         .about("A mdbook preprocessor which documents Forc commands")
         .subcommand(
             Command::new("supports")
-                .arg(Arg::new("renderer").required(true))
+                .arg(
+                    Arg::new("renderer")
+                        .required(true)
+                        .value_parser(clap::value_parser!(String)),
+                )
                 .about("Check whether a renderer is supported by this preprocessor"),
         )
 }
@@ -53,7 +56,7 @@ fn handle_preprocessing(pre: &dyn Preprocessor) -> Result<(), Error> {
 }
 
 fn handle_supports(pre: &dyn Preprocessor, sub_args: &ArgMatches) -> ! {
-    let renderer: &Option<&str> = sub_args.get_one("renderer").expect("Required argument");
+    let renderer = sub_args.get_one::<String>("renderer").map(String::as_str);
     let supported = renderer.map(|r| pre.supports_renderer(r)).unwrap_or(false);
 
     // Signal whether the renderer is supported by exiting with 1 or 0.

scripts/mdbook-forc-documenter/src/commands.rs

@@ -1,11 +1,8 @@
 use crate::formatter::{format_header_line, format_line};
 use anyhow::{anyhow, Result};
-use std::collections::HashMap;
-use std::ffi::OsString;
-use std::process;
+use std::{collections::HashMap, ffi::OsString, process};
 
 pub fn possible_forc_commands() -> Vec<String> {
-    let mut possible_commands = Vec::new();
     let output = process::Command::new("forc")
         .arg("--help")
         .output()
@@ -14,18 +11,27 @@ pub fn possible_forc_commands() -> Vec<String> {
     let output_str = String::from_utf8_lossy(&output.stdout);
     let lines = output_str.lines();
 
-    let mut has_parsed_subcommand_header = false;
+    let mut possible_commands = Vec::new();
+    let mut in_commands_section = false;
 
     for line in lines {
-        if has_parsed_subcommand_header {
-            let (command, _) = line.trim().split_once(' ').unwrap_or(("", ""));
-            possible_commands.push(command.to_string());
+        if line.trim() == "Commands:" {
+            // Start of commands section
+            in_commands_section = true;
+            continue;
         }
-        if line == "SUBCOMMANDS:" {
-            has_parsed_subcommand_header = true;
+
+        if in_commands_section {
+            if line.trim().is_empty() || line.trim().starts_with("Options:") {
+                // End of commands section
+                break;
+            }
+            // Extract command name (first word of the line)
+            if let Some(command) = line.split_whitespace().next() {
+                possible_commands.push(command.to_string());
+            }
         }
     }
-
     possible_commands
 }