feat: Allow showing wide field even without wide mode (#1077)

Current logic outputs requested wide field only in the wide mode. This hurts
in UX and views configuration requiring wide mode by default. Change the logic
to return the wide field in wide more or when it is explicitly requested.

Author: gtema

structable_derive/src/structable.rs

@@ -151,7 +151,7 @@ impl ToTokens for TableStructInputReceiver {
                 },
 
                 true => quote!(
-                    if (options.fields.is_empty() || options.fields.contains(#field_title)) && options.wide  {
+                    if options.fields.contains(#field_title) || (options.fields.is_empty() && options.wide) {
                         res.push(Vec::from([
                             #field_title.to_string(),
                             #field_value
@@ -167,7 +167,7 @@ impl ToTokens for TableStructInputReceiver {
                     }
                 ),
                 true => quote!(
-                    if (options.fields.is_empty() || options.fields.contains(#field_title)) && options.wide  {
+                    if options.fields.contains(#field_title) || (options.fields.is_empty() && options.wide)  {
                         row.push(#field_vec_value);
                     }
                 ),
@@ -180,7 +180,7 @@ impl ToTokens for TableStructInputReceiver {
                     }
                 ),
                 true => quote!(
-                    if (options.fields.is_empty() || options.fields.contains(#field_title)) && options.wide  {
+                    if options.fields.contains(#field_title) || (options.fields.is_empty() && options.wide)  {
                         headers.push(#field_title .to_string());
                     }
                 ),

structable_derive/tests/main.rs

@@ -109,6 +109,56 @@ fn test_single_wide() {
     );
 }
 
+#[test]
+fn test_single_wide_column() {
+    let config = OutputConfig {
+        fields: BTreeSet::from(["Long".into()]),
+        wide: false,
+        pretty: false,
+    };
+    let user = User {
+        id: 1,
+        first_name: "Scooby".into(),
+        last_name: "Doo".into(),
+        extra: "XYZ".into(),
+        complex_data: Some(json!({"a": "b", "c": "d"})),
+        dummy: None,
+    };
+    let data = user.build(&config);
+    assert_eq!(
+        data,
+        (
+            vec!["Attribute".into(), "Value".into()],
+            vec![vec!["Long".into(), "XYZ".into()],]
+        )
+    );
+}
+
+#[test]
+fn test_single_wide_column_wide_mode() {
+    let config = OutputConfig {
+        fields: BTreeSet::from(["Long".into()]),
+        wide: true,
+        pretty: false,
+    };
+    let user = User {
+        id: 1,
+        first_name: "Scooby".into(),
+        last_name: "Doo".into(),
+        extra: "XYZ".into(),
+        complex_data: Some(json!({"a": "b", "c": "d"})),
+        dummy: None,
+    };
+    let data = user.build(&config);
+    assert_eq!(
+        data,
+        (
+            vec!["Attribute".into(), "Value".into()],
+            vec![vec!["Long".into(), "XYZ".into()],]
+        )
+    );
+}
+
 #[test]
 fn test_single_wide_pretty() {
     let config = OutputConfig {
@@ -187,6 +237,78 @@ fn test_list() {
     );
 }
 
+#[test]
+fn test_list_wide_column() {
+    let config = OutputConfig {
+        fields: BTreeSet::from(["Long".into()]),
+        wide: false,
+        pretty: false,
+    };
+    let users = vec![
+        User {
+            id: 1,
+            first_name: "Scooby".into(),
+            last_name: "Doo".into(),
+            extra: "Foo".into(),
+            complex_data: Some(json!({"a": "b", "c": "d"})),
+            dummy: None,
+        },
+        User {
+            id: 2,
+            first_name: "John".into(),
+            last_name: "Cena".into(),
+            extra: "Bar".into(),
+            complex_data: None,
+            dummy: Some("foo".into()),
+        },
+    ];
+
+    let data = users.build(&config);
+    assert_eq!(
+        data,
+        (
+            vec!["Long".into(),],
+            vec![vec!["Foo".into(),], vec!["Bar".into(),],]
+        )
+    );
+}
+
+#[test]
+fn test_list_wide_column_wide_mode() {
+    let config = OutputConfig {
+        fields: BTreeSet::from(["Long".into()]),
+        wide: true,
+        pretty: false,
+    };
+    let users = vec![
+        User {
+            id: 1,
+            first_name: "Scooby".into(),
+            last_name: "Doo".into(),
+            extra: "Foo".into(),
+            complex_data: Some(json!({"a": "b", "c": "d"})),
+            dummy: None,
+        },
+        User {
+            id: 2,
+            first_name: "John".into(),
+            last_name: "Cena".into(),
+            extra: "Bar".into(),
+            complex_data: None,
+            dummy: Some("foo".into()),
+        },
+    ];
+
+    let data = users.build(&config);
+    assert_eq!(
+        data,
+        (
+            vec!["Long".into(),],
+            vec![vec!["Foo".into(),], vec!["Bar".into(),],]
+        )
+    );
+}
+
 #[test]
 fn test_list_wide() {
     let config = OutputConfig {