finchie/new_manual - Change G54GZBS464DFT2224SUTRWPRRSLUQKWDXY2YA7USW7UZ7VPXIHEAC

Remove dependency on clap patches

A much cleaner way of doing things, uses clap::Arg::get_value_parser() instead of accessing private fields that had been patched to make public. For the argument handling to become more sophisticated it will need to be refactored into its own Xilem View.

Created by finchie on November 16, 2023

G54GZBS464DFT2224SUTRWPRRSLUQKWDXY2YA7USW7UZ7VPXIHEAC

Dependencies

In channels

main

Change contents

Replacement in src/main.rs at line 1 [3.49]

B:BD[3.49] → [4.0:81]

use xilem_html::{document_body, elements as el, App, View, ViewExt, ViewMarker};

[3.49]

[5.69]

pub mod cli;

Replacement in src/main.rs at line 3 [3.49]

B:BD[5.70] → [5.70:83]

B:BD[5.83] → [6.0:118]

pub mod cli;
use clap::{parser::ValueSource, CommandFactory};
use clap_builder::{parser::MatchedArg, util::any_value::AnyValueId};

[5.70]

[5.123]

use clap::parser::ValueSource;
use clap::{value_parser, ArgMatches, CommandFactory};

Insertion in src/main.rs at line 6 [3.49]

[5.141]

[7.0]

use xilem_html::{document_body, elements as el, App, View, ViewExt, ViewMarker};

Deletion in src/main.rs at line 10 [3.49]
B:BD[3.190] → [3.190:209]
```
#[derive(Default)]
```
Replacement in src/main.rs at line 12 [3.49]
B:BD[3.248] → [6.119:144]
```
    args: Vec<ArgState>,
```
[3.248]
[6.144]
```
    arg_matches: Result<ArgMatches, clap::Error>,
```

Replacement in src/main.rs at line 15 [3.49]

B:BD[6.147] → [6.147:335]

struct ArgState {
    name: String,
    source: ValueSource,
    raw_values: Vec<String>,
    // Keep the value as a string, but store its corresponding type info
    type_id: AnyValueId,

[6.147]

[3.248]

impl Default for AppState {
    fn default() -> Self {
        Self {
            command: String::new(),
            arg_matches: Err(clap::Error::new(clap::error::ErrorKind::TooFewValues)),
        }
    }

Deletion in src/main.rs at line 30 [3.49]

B:BD[5.292] → [5.292:359]

B:BD[5.359] → [6.336:388]

        let matches = cli_command.try_get_matches_from(args_iter);
        tracing::debug!("Matches: {:#?}", matches);

Replacement in src/main.rs at line 32 [3.49]

B:BD[6.455] → [6.455:570]

∅:D[6.570] → [4.229:280]

B:BD[4.229] → [4.229:280]

        self.args = if let Ok(matches) = matches {
            matches.args.iter().map(matched_to_state).collect()
        } else {
            Vec::new()
        };

[6.455]

[6.571]

        self.arg_matches = cli_command.try_get_matches_from(args_iter);
        tracing::debug!("Matches: {:#?}", self.arg_matches);

Deletion in src/main.rs at line 36 [3.49]

B:BD[6.579] → [6.579:685]


fn matched_to_state(key_value: (&clap::Id, &MatchedArg)) -> ArgState {
    let (key, value) = key_value;

Replacement in src/main.rs at line 37 [3.49]

B:BD[4.281] → [6.686:1077]

∅:D[6.1077] → [5.397:403]

B:BD[5.397] → [5.397:403]

∅:D[5.403] → [3.629:631]

B:BD[3.629] → [3.629:631]

    ArgState {
        name: key.to_string(),
        source: value.source().unwrap_or(ValueSource::DefaultValue),
        raw_values: value
            .raw_vals()
            .flatten()
            .map(|raw_value| raw_value.to_string_lossy().to_string())
            .collect(),
        type_id: value
            .type_id()
            .unwrap_or(AnyValueId::of::<dyn std::any::Any>()),
    }
}

[4.281]

[3.631]

fn arg_item(matches: &ArgMatches, arg: &clap::Arg) -> impl View<AppState> + ViewMarker {
    tracing::debug!("`{:?}`", matches.contains_id("name"));
    let source = if let Some(source) = matches.value_source(arg.get_id().as_str()) {
        match source {
            ValueSource::DefaultValue => "default",
            ValueSource::EnvVariable => "environment",
            ValueSource::CommandLine => "cmdline",
            _ => "todo",
        }
    } else {
        "none"
    };

Replacement in src/main.rs at line 50 [3.49]

B:BD[3.632] → [6.1078:1347]

fn arg_item(arg: &ArgState) -> impl View<AppState> + ViewMarker {
    let source = match arg.source {
        ValueSource::DefaultValue => "default",
        ValueSource::EnvVariable => "environment",
        ValueSource::CommandLine => "cmdline",
        _ => "todo",

[3.632]

[6.1347]

    let type_id = arg.get_value_parser().type_id();
    let type_name = if type_id == value_parser!(String).type_id() {
        "string".to_string()
    } else {
        format!("{:?}", type_id)

Insertion in src/main.rs at line 56 [3.49]
[6.1354]
[6.1354]

Replacement in src/main.rs at line 58 [3.49]

B:BD[6.1368] → [6.1368:1570]

        el::h2(arg.name.clone()),
        el::div((
            format!("{:?}", arg.type_id),
            el::div("test").attr("class", "hover_content"),
        ))
        .attr("class", "hoverable"),

[6.1368]

[6.1570]

        el::div((type_name, el::div("test").attr("class", "hover_content")))
            .attr("class", "hoverable"),

Replacement in src/main.rs at line 62 [3.49]

B:BD[6.1611] → [6.1611:1710]

            arg.raw_values
                .iter()
                .map(|arg| el::li(arg.clone()))

[6.1611]

[6.1710]

            matches
                .get_raw_occurrences(&arg.get_id().as_str())
                .unwrap_or_default()
                .map(|os_strings| {
                    el::li({
                        os_strings
                            .map(|s| s.to_string_lossy().to_string())
                            .collect::<Vec<String>>()
                            .join(" ")
                    })
                })

Insertion in src/main.rs at line 84 [3.49]

[5.405]

[3.807]

    let default_matches = ArgMatches::default();
    let arg_matches = state.arg_matches.as_ref().unwrap_or(&default_matches);
    tracing::debug!("{:?}", arg_matches);

Replacement in src/main.rs at line 89 [3.49]

B:BD[3.921] → [8.0:114]

B:BD[8.114] → [9.6982:7039]

∅:D[7.101] → [8.161:172]

∅:D[10.190] → [8.161:172]

∅:D[9.7039] → [8.161:172]

B:BD[8.161] → [8.161:172]

        el::div((
            el::div(state.args.iter().map(arg_item).collect::<Vec<_>>()).attr("id", "sidebar"),
            el::div(docs::test()).attr("id", "content"),
        ))

[3.921]

[8.172]

        el::div((el::div(
            MockApp::command()
                .get_opts()
                .filter(|arg| arg_matches.try_contains_id(arg.get_id().as_str()).is_ok())
                .map(|arg| arg_item(&arg_matches, arg))
                .collect::<Vec<_>>(),
        )
        .attr("id", "sidebar"),))

Deletion in docs/test.typ at line 1 [10.242]
B:BD[10.242] → [2.13749:13771]
```
#let add(x, y) = x + y
```

Replacement in Cargo.toml at line 10 [3.1280]

B:BD[3.1345] → [6.1976:2076]

clap = { path = "../clap", features = ["derive"] }
clap_builder = { path = "../clap/clap_builder" }

[3.1345]

clap = { version = "4.4.8", features = ["derive"] }
# clap_builder = "4.4.8"

Replacement in Cargo.lock at line 306 [3.1510]

B:BD[5.2160] → [5.2160:2178]

version = "4.4.6"

[5.2160]

[5.2321]

version = "4.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64"

Replacement in Cargo.lock at line 316 [3.1510]

B:BD[5.2408] → [5.2408:2426]

version = "4.4.6"

[5.2408]

[5.2569]

version = "4.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc"

Replacement in Cargo.lock at line 328 [3.1510]

B:BD[5.2671] → [5.2671:2689]

version = "4.4.2"

[5.2671]

[5.2832]

version = "4.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"

Replacement in Cargo.lock at line 340 [3.1510]

B:BD[5.2925] → [5.2925:2943]

version = "0.5.1"

[5.2925]

[11.7803]

version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"

Deletion in Cargo.lock at line 1026 [3.1510]
B:BD[5.3493] → [6.2316:2333]
```
 "clap_builder",
```

Deletion in Cargo.lock at line 1984 [3.1510]

B:BD[12.22874] → [11.24101:24188]

source = "git+https://github.com/typst/typst#3a1e47913d874647e5d8d013a7e21beca96453d6"

Deletion in Cargo.lock at line 2034 [3.1510]

B:BD[11.24230] → [11.24230:24317]

source = "git+https://github.com/typst/typst#3a1e47913d874647e5d8d013a7e21beca96453d6"

Deletion in Cargo.lock at line 2074 [3.1510]

B:BD[12.23619] → [11.24838:24925]

source = "git+https://github.com/typst/typst#3a1e47913d874647e5d8d013a7e21beca96453d6"

Deletion in Cargo.lock at line 2084 [3.1510]

B:BD[12.23828] → [11.24926:25013]

source = "git+https://github.com/typst/typst#3a1e47913d874647e5d8d013a7e21beca96453d6"