Add very basic support for positional Vecs

Author: fasterthanlime

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: [fasterthanlime]
+patreon: fasterthanlime

Cargo.lock

@@ -11,8 +11,8 @@ keywords = ["cli", "args", "parser", "facet"]
 categories = ["command-line-interface"]
 
 [dependencies]
-facet-reflect = { version = "0.28.0" }
-facet-core = { version = "0.28.0" }
+facet-reflect = { version = "0.28.3" }
+facet-core = { version = "0.28.3" }
 log = "0.4.27"
 owo-colors = "4.2.2"
 ariadne = { version = "0.5.1", optional = true }
@@ -22,7 +22,7 @@ cargo-husky = { version = "1.5.0", default-features = false, features = [
     "user-hooks",
 ] }
 eyre = "0.6.12"
-facet = { version = "0.28.0" }
+facet = { version = "0.28.3" }
 facet-pretty = { version = "0.28.0" }
 facet-testhelpers = { version = "0.28" }
 insta = "1.43.1"

Cargo.toml

@@ -1,49 +1,11 @@
-<h1>
-<picture>
-    <source type="image/webp" media="(prefers-color-scheme: dark)" srcset="https://github.com/facet-rs/facet/raw/main/static/logo-v2/facet-b-dark.webp">
-    <source type="image/png" media="(prefers-color-scheme: dark)" srcset="https://github.com/facet-rs/facet/raw/main/static/logo-v2/facet-b-dark.png">
-    <source type="image/webp" srcset="https://github.com/facet-rs/facet/raw/main/static/logo-v2/facet-b-light.webp">
-    <img src="https://github.com/facet-rs/facet/raw/main/static/logo-v2/facet-b-light.png" height="35" alt="Facet logo - a reflection library for Rust">
-</picture>
-</h1>
+# facet-args
 
-[![Coverage Status](https://coveralls.io/repos/github/facet-rs/facet/badge.svg?branch=main)](https://coveralls.io/github/facet-rs/facet?branch=main)
+[![Coverage Status](https://coveralls.io/repos/github/facet-rs/facet-args/badge.svg?branch=main)](https://coveralls.io/github/facet-rs/facet?branch=main)
 [![crates.io](https://img.shields.io/crates/v/facet-args.svg)](https://crates.io/crates/facet-args)
 [![documentation](https://docs.rs/facet-args/badge.svg)](https://docs.rs/facet-args)
 [![MIT/Apache-2.0 licensed](https://img.shields.io/crates/l/facet-args.svg)](./LICENSE)
 [![Discord](https://img.shields.io/discord/1379550208551026748?logo=discord&label=discord)](https://discord.gg/JhD7CwCJ8F)
 
-_Logo by [Misiasart](https://misiasart.com/)_
-
-Thanks to all individual and corporate sponsors, without whom this work could not exist:
-
-<p> <a href="https://ko-fi.com/fasterthanlime">
-<picture>
-<source media="(prefers-color-scheme: dark)" srcset="https://github.com/facet-rs/facet/raw/main/static/sponsors-v3/kofi-dark.svg">
-<img src="https://github.com/facet-rs/facet/raw/main/static/sponsors-v3/kofi-light.svg" height="40" alt="Ko-fi">
-</picture>
-</a> <a href="https://github.com/sponsors/fasterthanlime">
-<picture>
-<source media="(prefers-color-scheme: dark)" srcset="https://github.com/facet-rs/facet/raw/main/static/sponsors-v3/github-dark.svg">
-<img src="https://github.com/facet-rs/facet/raw/main/static/sponsors-v3/github-light.svg" height="40" alt="GitHub Sponsors">
-</picture>
-</a> <a href="https://patreon.com/fasterthanlime">
-<picture>
-<source media="(prefers-color-scheme: dark)" srcset="https://github.com/facet-rs/facet/raw/main/static/sponsors-v3/patreon-dark.svg">
-<img src="https://github.com/facet-rs/facet/raw/main/static/sponsors-v3/patreon-light.svg" height="40" alt="Patreon">
-</picture>
-</a> <a href="https://zed.dev">
-<picture>
-<source media="(prefers-color-scheme: dark)" srcset="https://github.com/facet-rs/facet/raw/main/static/sponsors-v3/zed-dark.svg">
-<img src="https://github.com/facet-rs/facet/raw/main/static/sponsors-v3/zed-light.svg" height="40" alt="Zed">
-</picture>
-</a> <a href="https://depot.dev?utm_source=facet">
-<picture>
-<source media="(prefers-color-scheme: dark)" srcset="https://github.com/facet-rs/facet/raw/main/static/sponsors-v3/depot-dark.svg">
-<img src="https://github.com/facet-rs/facet/raw/main/static/sponsors-v3/depot-light.svg" height="40" alt="Depot">
-</picture>
-</a> </p>
-
 Provides CLI argument parsing (WIP).
 
 ```rust
@@ -69,6 +31,47 @@ Ok(())
 # }
 ```
 
+## Sponsors
+
+Thanks to all individual sponsors:
+
+<p> <a href="https://github.com/sponsors/fasterthanlime">
+<picture>
+<source media="(prefers-color-scheme: dark)" srcset="https://github.com/facet-rs/facet/raw/main/static/sponsors-v3/github-dark.svg">
+<img src="https://github.com/facet-rs/facet/raw/main/static/sponsors-v3/github-light.svg" height="40" alt="GitHub Sponsors">
+</picture>
+</a> <a href="https://patreon.com/fasterthanlime">
+    <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://github.com/facet-rs/facet/raw/main/static/sponsors-v3/patreon-dark.svg">
+    <img src="https://github.com/facet-rs/facet/raw/main/static/sponsors-v3/patreon-light.svg" height="40" alt="Patreon">
+    </picture>
+</a> </p>
+
+...along with corporate sponsors:
+
+<p> <a href="https://aws.amazon.com">
+<picture>
+<source media="(prefers-color-scheme: dark)" srcset="https://github.com/facet-rs/facet/raw/main/static/sponsors-v3/aws-dark.svg">
+<img src="https://github.com/facet-rs/facet/raw/main/static/sponsors-v3/aws-light.svg" height="40" alt="AWS">
+</picture>
+</a> <a href="https://zed.dev">
+<picture>
+<source media="(prefers-color-scheme: dark)" srcset="https://github.com/facet-rs/facet/raw/main/static/sponsors-v3/zed-dark.svg">
+<img src="https://github.com/facet-rs/facet/raw/main/static/sponsors-v3/zed-light.svg" height="40" alt="Zed">
+</picture>
+</a> <a href="https://depot.dev?utm_source=facet">
+<picture>
+<source media="(prefers-color-scheme: dark)" srcset="https://github.com/facet-rs/facet/raw/main/static/sponsors-v3/depot-dark.svg">
+<img src="https://github.com/facet-rs/facet/raw/main/static/sponsors-v3/depot-light.svg" height="40" alt="Depot">
+</picture>
+</a> </p>
+
+...without whom this work could not exist.
+
+## Special thanks
+
+The facet logo was drawn by [Misiasart](https://misiasart.com/).
+
 ## License
 
 Licensed under either of:

README.md

@@ -1348,12 +1348,15 @@ where
     {
         match scalar {
             Scalar::String(cow) => {
+                trace!("parsed string, probing innermost type");
                 match wip.innermost_shape().ty {
                     Type::User(UserType::Enum(_)) => {
                         if wip.selected_variant().is_some() {
+                            trace!("has enum with variant selected, setting");
                             // If we already have a variant selected, just put the string
                             wip.set(cow).map_err(|e| self.reflect_err(e))?;
                         } else {
+                            trace!("has enum without selected variant");
                             // Try to select the variant
                             match wip.find_variant(&cow) {
                                 Some((variant_index, _)) => {
@@ -1372,6 +1375,8 @@ where
                     Type::Pointer(PointerType::Reference(_))
                         if wip.innermost_shape().is_type::<&str>() =>
                     {
+                        trace!("handling &str");
+
                         // This is for handling the &str type
                         // The Cow may be Borrowed (we may have an owned string but need a &str)
                         match cow {
@@ -1382,7 +1387,10 @@ where
                     _ => {
                         // Check if this is a scalar type that can be parsed from a string
                         let shape = wip.innermost_shape();
+
                         if matches!(shape.def, Def::Scalar) {
+                            trace!("is scalar, trying parse");
+
                             // Try parse_from_str for scalar types that might parse from strings
                             // (like IpAddr, UUID, Path, etc.)
                             match wip.parse_from_str(cow.as_ref()) {
@@ -1413,7 +1421,18 @@ where
                                     }
                                 }
                             }
+                        } else if matches!(shape.def, Def::List(_)) {
+                            trace!("is list, trying push");
+
+                            wip.begin_list()
+                                .map_err(|e| self.reflect_err(e))?
+                                .push(cow.to_string())
+                                .map_err(|e| self.reflect_err(e))?;
                         } else {
+                            trace!(
+                                "def was not a scalar, try to set as string (will probably fail)"
+                            );
+
                             // Not a scalar, just set as String
                             wip.set(cow.to_string()).map_err(|e| self.reflect_err(e))?;
                         }

src/deserialize.rs

@@ -1,6 +1,7 @@
 use alloc::borrow::Cow;
 use alloc::string::ToString;
-use facet_core::{FieldAttribute, Shape, Type, UserType};
+use facet_core::{Def, FieldAttribute, Shape, Type, UserType};
+use log::trace;
 
 use crate::deserialize::{
     DeserErrorKind, Outcome, Raw, Scalar, Span, Spanned, Subspan, SubspanMeta,
@@ -28,16 +29,21 @@ pub(crate) fn find_positional_field<'facet>(
     shape: &'static Shape,
     wip: &Partial<'facet>,
 ) -> Result<&'static str, DeserErrorKind> {
+    trace!("attempting to find positional field for shape {shape:?}");
+
     if let Type::User(UserType::Struct(st)) = &shape.ty {
         for (idx, field) in st.fields.iter().enumerate() {
             for attr in field.attributes.iter() {
                 let FieldAttribute::Arbitrary(a) = attr;
                 if a.contains("positional") {
-                    // Check if this field is already set
                     let is_set = wip.is_field_set(idx).unwrap_or(false);
-                    if !is_set {
-                        return Ok(field.name);
+                    if matches!(field.shape.def, Def::List(_)) {
+                        // we can always append to a list
+                    } else if is_set {
+                        trace!("got field at {idx} but it's set");
+                        continue;
                     }
+                    return Ok(field.name);
                 }
             }
         }

src/fields.rs

@@ -1,6 +1,35 @@
 use facet::Facet;
 use facet_testhelpers::test;
 
+#[test]
+fn test_simplest_value_singleton_list_named() {
+    #[derive(Facet, Debug, PartialEq)]
+    struct Args {
+        #[facet(named, short = "s")]
+        strings: Vec<String>,
+    }
+
+    // Test with multiple values (no delimiters)
+    let args_single: Args =
+        facet_args::from_slice(&["-s", "joe", "-s", "le", "-s", "rigolo"]).unwrap();
+
+    assert_eq!(args_single.strings, vec!["joe", "le", "rigolo"]);
+}
+
+#[test]
+fn test_simplest_value_singleton_list_positional() {
+    #[derive(Facet, Debug, PartialEq)]
+    struct Args {
+        #[facet(positional)]
+        strings: Vec<String>,
+    }
+
+    // Test with multiple values (no delimiters)
+    let args_single: Args = facet_args::from_slice(&["joe", "le", "rigolo"]).unwrap();
+
+    assert_eq!(args_single.strings, vec!["joe", "le", "rigolo"]);
+}
+
 #[test]
 #[ignore]
 fn test_value_singleton_list() {

tests/sequence.rs

@@ -1,11 +1,11 @@
 ---
-source: facet-args/tests/err.rs
+source: tests/err.rs
 expression: err
 ---
 Error: 
    ╭─[ <unknown>:1:10 ]
    │
  1 │ --letter abc
    │          ─┬─  
- [38;5;240m  │[0m           [31m╰[0m[31m─[0m[31m─[0m[31m─[0m Operation failed on shape [34mchar[39m: Failed to parse string value
+ [38;5;240m  │[0m           [31m╰[0m[31m─[0m[31m─[0m[31m─[0m Operation failed on shape char: Failed to parse string value
 ───╯

tests/snapshots/err__error_char_with_multiple_chars.snap

@@ -1,11 +1,11 @@
 ---
-source: facet-args/tests/err.rs
+source: tests/err.rs
 expression: err
 ---
 Error: 
    ╭─[ <unknown>:1:10 ]
    │
  1 │ --config {server={port=8080,host=localhost},database={url=postgresql://,pool_size=10}}
    │          ──────────────────────────────────────┬──────────────────────────────────────  
-   │                                                ╰──────────────────────────────────────── Wrong shape: expected AppConfig, but got String
+   │                                                ╰──────────────────────────────────────── Wrong shape: expected AppConfig, but got String
 ───╯

tests/snapshots/err__error_complex_nested_structure.snap

@@ -1,11 +1,11 @@
 ---
-source: facet-args/tests/err.rs
+source: tests/err.rs
 expression: err
 ---
 Error: 
    ╭─[ <unknown>:1:11 ]
    │
  1 │ --address not-an-ip
    │           ────┬────  
- [38;5;240m  │[0m               [31m╰[0m[31m─[0m[31m─[0m[31m─[0m[31m─[0m[31m─[0m[31m─[0m Operation failed on shape [34mIpAddr[39m: Failed to parse string value
+ [38;5;240m  │[0m               [31m╰[0m[31m─[0m[31m─[0m[31m─[0m[31m─[0m[31m─[0m[31m─[0m Operation failed on shape IpAddr: Failed to parse string value
 ───╯