Merge pull request #46 from ynqa/v0.6.1/dev

v0.6.1

README.md

@@ -11,7 +11,7 @@ Put the package in your `Cargo.toml`.
 
 ```toml
 [dependencies]
-promkit = "0.6.0"
+promkit = "0.6.1"
 ```
 
 ## Features

promkit/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "promkit"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["ynqa <[email protected]>"]
 edition = "2021"
 description = "A toolkit for building your own interactive command-line tools"

promkit/src/core/listbox.rs

@@ -33,6 +33,14 @@ impl Listbox {
         ))
     }
 
+    pub fn len(&self) -> usize {
+        self.0.contents().len()
+    }
+
+    pub fn push_string(&mut self, item: String) {
+        self.0.contents_mut().push(StyledGraphemes::from(item));
+    }
+
     /// Creates a new `Listbox` from a vector of `StyledGraphemes`.
     pub fn from_styled_graphemes(items: Vec<StyledGraphemes>) -> Self {
         Self(Cursor::new(items, 0, false))
@@ -79,4 +87,8 @@ impl Listbox {
     pub fn move_to_tail(&mut self) {
         self.0.move_to_tail()
     }
+
+    pub fn is_tail(&self) -> bool {
+        self.0.is_tail()
+    }
 }

promkit/src/jsonz.rs

@@ -1,5 +1,3 @@
-use std::collections::HashSet;
-
 use rayon::prelude::*;
 
 pub mod format;
@@ -392,36 +390,49 @@ pub fn create_rows<'a, T: IntoIterator<Item = &'a serde_json::Value>>(iter: T) -
     rows
 }
 
-fn collect_paths(value: &serde_json::Value, current_path: &str, paths: &mut HashSet<String>) {
-    paths.insert(current_path.to_string());
+#[derive(Debug)]
+pub struct PathIterator<'a> {
+    stack: Vec<(String, &'a serde_json::Value)>,
+}
 
-    match value {
-        serde_json::Value::Object(obj) => {
-            for (key, val) in obj {
-                let new_path = if current_path == "." {
-                    format!(".{}", key)
-                } else {
-                    format!("{}.{}", current_path, key)
-                };
-                collect_paths(val, &new_path, paths);
-            }
-        }
-        serde_json::Value::Array(arr) => {
-            for (i, val) in arr.iter().enumerate() {
-                let new_path = format!("{}[{}]", current_path, i);
-                collect_paths(val, &new_path, paths);
+impl<'a> Iterator for PathIterator<'a> {
+    type Item = String;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if let Some((current_path, value)) = self.stack.pop() {
+            match value {
+                serde_json::Value::Object(obj) => {
+                    for (key, val) in obj.iter() {
+                        let new_path = if current_path == "." {
+                            format!(".{}", key)
+                        } else {
+                            format!("{}.{}", current_path, key)
+                        };
+                        self.stack.push((new_path, val));
+                    }
+                }
+                serde_json::Value::Array(arr) => {
+                    for (i, val) in arr.iter().enumerate() {
+                        let new_path = format!("{}[{}]", current_path, i);
+                        self.stack.push((new_path, val));
+                    }
+                }
+                _ => {}
             }
+
+            Some(current_path)
+        } else {
+            None
         }
-        _ => {}
     }
 }
 
 pub fn get_all_paths<'a, T: IntoIterator<Item = &'a serde_json::Value>>(
     iter: T,
-) -> HashSet<String> {
-    let mut paths = HashSet::new();
+) -> impl Iterator<Item = String> + 'a {
+    let mut stack = Vec::new();
     for value in iter {
-        collect_paths(value, ".", &mut paths);
+        stack.push((".".to_string(), value));
     }
-    paths
+    PathIterator { stack }
 }

promkit/src/lib.rs

@@ -11,21 +11,21 @@
 //!
 //! ```toml
 //! [dependencies]
-//! promkit = "0.6.0"
+//! promkit = "0.6.1"
 //! ```
 //!
 //! ## Features
 //!
 //! - Support cross-platform both UNIX and Windows owing to [crossterm](https://github.com/crossterm-rs/crossterm)
 //! - Various building methods
 //!   - Preset; Support for quickly setting up a UI by providing simple parameters.
-//!     - [Readline](https://github.com/ynqa/promkit/tree/v0.6.0#readline)
-//!     - [Confirm](https://github.com/ynqa/promkit/tree/v0.6.0#confirm)
-//!     - [Password](https://github.com/ynqa/promkit/tree/v0.6.0#password)
-//!     - [Select](https://github.com/ynqa/promkit/tree/v0.6.0#select)
-//!     - [QuerySelect](https://github.com/ynqa/promkit/tree/v0.6.0#queryselect)
-//!     - [Checkbox](https://github.com/ynqa/promkit/tree/v0.6.0#checkbox)
-//!     - [Tree](https://github.com/ynqa/promkit/tree/v0.6.0#tree)
+//!     - [Readline](https://github.com/ynqa/promkit/tree/v0.6.1#readline)
+//!     - [Confirm](https://github.com/ynqa/promkit/tree/v0.6.1#confirm)
+//!     - [Password](https://github.com/ynqa/promkit/tree/v0.6.1#password)
+//!     - [Select](https://github.com/ynqa/promkit/tree/v0.6.1#select)
+//!     - [QuerySelect](https://github.com/ynqa/promkit/tree/v0.6.1#queryselect)
+//!     - [Checkbox](https://github.com/ynqa/promkit/tree/v0.6.1#checkbox)
+//!     - [Tree](https://github.com/ynqa/promkit/tree/v0.6.1#tree)
 //!   - Combining various UI components.
 //!     - They are provided with the same interface, allowing users to choose and
 //!       assemble them according to their preferences.
@@ -39,7 +39,7 @@
 //!
 //! ## Examples/Demos
 //!
-//! See [here](https://github.com/ynqa/promkit/tree/v0.6.0#examplesdemos)
+//! See [here](https://github.com/ynqa/promkit/tree/v0.6.1#examplesdemos)
 //!
 //! ## Why *promkit*?
 //!

promkit/tests/jsonz_get_all_paths_test.rs

@@ -53,7 +53,7 @@ mod get_all_paths {
         )
         .unwrap();
 
-        let actual = jsonz::get_all_paths([&v]);
+        let actual = jsonz::get_all_paths([&v]).collect::<HashSet<_>>();
         let expected = HashSet::from_iter(
             [
                 ".",
@@ -114,7 +114,7 @@ mod get_all_paths {
         .filter_map(serde_json::Result::ok)
         .collect::<Vec<_>>();
 
-        let actual = jsonz::get_all_paths(binding.iter());
+        let actual = jsonz::get_all_paths(binding.iter()).collect::<HashSet<_>>();
         let expected = HashSet::from_iter(
             [
                 ".",