Rowlike: Allow spacer rows to be represented

[tablify] / src / lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index cbe9ae9a328deb4629b9bef0a57749c1425049c7..73e517b14016e2a2681f422c4c173e4f20eb7fd5 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -109,6 +109,12 @@ struct Row {
     entries: HashMap<String, Vec<Option<String>>>,
 }
 
     entries: HashMap<String, Vec<Option<String>>>,
 }
 

+#[derive(Debug, PartialEq, Eq)]
+enum Rowlike {
+    Row(Row),
+    Spacer,
+}
+

 struct Reader<Input: Iterator<Item = Result<String, std::io::Error>>> {
     input: std::iter::Enumerate<Input>,
     row: Option<Row>,
 struct Reader<Input: Iterator<Item = Result<String, std::io::Error>>> {
     input: std::iter::Enumerate<Input>,
     row: Option<Row>,


@@ -122,15 +128,15 @@ impl<Input: Iterator<Item = Result<String, std::io::Error>>> Reader<Input> {
     }
 }
 impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader<Input> {
     }
 }
 impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader<Input> {

-    type Item = Result<Row, std::io::Error>;
+    type Item = Result<Rowlike, std::io::Error>;

     fn next(&mut self) -> Option<Self::Item> {
         loop {
             match self.input.next() {
     fn next(&mut self) -> Option<Self::Item> {
         loop {
             match self.input.next() {

-                None => return Ok(std::mem::take(&mut self.row)).transpose(),
+                None => return Ok(std::mem::take(&mut self.row).map(Rowlike::Row)).transpose(),

                 Some((_, Err(e))) => return Some(Err(e)),
                 Some((n, Ok(line))) => match InputLine::from(line.as_ref()) {
                     InputLine::Blank if self.row.is_some() => {
                 Some((_, Err(e))) => return Some(Err(e)),
                 Some((n, Ok(line))) => match InputLine::from(line.as_ref()) {
                     InputLine::Blank if self.row.is_some() => {

-                        return Ok(std::mem::take(&mut self.row)).transpose()
+                        return Ok(std::mem::take(&mut self.row).map(Rowlike::Row)).transpose()

                     }
                     InputLine::Blank => {}
                     InputLine::Entry(col, instance) => match &mut self.row {
                     }
                     InputLine::Blank => {}
                     InputLine::Entry(col, instance) => match &mut self.row {


@@ -154,7 +160,7 @@ impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader
                             entries: HashMap::new(),
                         });
                         if prev.is_some() {
                             entries: HashMap::new(),
                         });
                         if prev.is_some() {

-                            return Ok(prev).transpose();
+                            return Ok(prev.map(Rowlike::Row)).transpose();

                         }
                     }
                 },
                         }
                     }
                 },


@@ -163,14 +169,18 @@ impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader
     }
 }
 
     }
 }
 

-fn read_rows(input: impl std::io::Read) -> impl Iterator<Item = Result<Row, std::io::Error>> {
+fn read_rows(input: impl std::io::Read) -> impl Iterator<Item = Result<Rowlike, std::io::Error>> {

     Reader::new(std::io::BufReader::new(input).lines())
 }
 
     Reader::new(std::io::BufReader::new(input).lines())
 }
 

-fn column_counts(rows: &[Row]) -> Vec<(usize, String)> {
+fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> {
+    let empty = HashMap::new();

     let mut counts: Vec<_> = rows
         .iter()
     let mut counts: Vec<_> = rows
         .iter()

-        .flat_map(|r| r.entries.keys())
+        .flat_map(|rl| match rl {
+            Rowlike::Row(r) => r.entries.keys(),
+            Rowlike::Spacer => empty.keys(),
+        })

         .fold(HashMap::new(), |mut cs, col| {
             cs.entry(col.to_owned())
                 .and_modify(|n| *n += 1)
         .fold(HashMap::new(), |mut cs, col| {
             cs.entry(col.to_owned())
                 .and_modify(|n| *n += 1)


@@ -183,7 +193,7 @@ fn column_counts(rows: &[Row]) -> Vec<(usize, String)> {
     counts.sort_unstable_by(|(an, acol), (bn, bcol)| bn.cmp(an).then(acol.cmp(bcol)));
     counts
 }
     counts.sort_unstable_by(|(an, acol), (bn, bcol)| bn.cmp(an).then(acol.cmp(bcol)));
     counts
 }

-fn column_order(config: &Config, rows: &[Row]) -> Vec<String> {
+fn column_order(config: &Config, rows: &[Rowlike]) -> Vec<String> {

     column_counts(rows)
         .into_iter()
         .filter_map(|(n, col)| (n >= config.column_threshold).then_some(col))
     column_counts(rows)
         .into_iter()
         .filter_map(|(n, col)| (n >= config.column_threshold).then_some(col))


@@ -253,16 +263,21 @@ fn render_all_leftovers(row: &Row) -> HTML {
     )
 }
 
     )
 }
 

-fn render_row(columns: &[String], row: &mut Row) -> HTML {
-    let row_label = HTML::escape(row.label.as_ref());
-    let cells = columns
-        .iter()
-        .map(|col| render_cell(col, row))
-        .collect::<HTML>();
-    let leftovers = render_all_leftovers(row);
-    HTML(format!(
-        "<tr><th id=\"{row_label}\">{row_label}</th>{cells}<td class=\"leftover\" onmouseover=\"highlight('{row_label}')\" onmouseout=\"clear_highlight('{row_label}')\">{leftovers}</td></tr>\n"
-    ))
+fn render_row(columns: &[String], rowlike: &mut Rowlike) -> HTML {
+    match rowlike {
+        Rowlike::Spacer => HTML::from("<tr><td>&nbsp;</td></tr>"),
+        Rowlike::Row(row) => {
+            let row_label = HTML::escape(row.label.as_ref());
+            let cells = columns
+                .iter()
+                .map(|col| render_cell(col, row))
+                .collect::<HTML>();
+            let leftovers = render_all_leftovers(row);
+            HTML(format!(
+                "<tr><th id=\"{row_label}\">{row_label}</th>{cells}<td class=\"leftover\" onmouseover=\"highlight('{row_label}')\" onmouseout=\"clear_highlight('{row_label}')\">{leftovers}</td></tr>\n"
+            ))
+        }
+    }

 }
 
 fn render_column_headers(columns: &[String]) -> HTML {
 }
 
 fn render_column_headers(columns: &[String]) -> HTML {


@@ -336,63 +351,63 @@ mod tests {
     fn test_read_rows() {
         assert_eq!(
             read_rows(&b"foo"[..]).flatten().collect::<Vec<_>>(),
     fn test_read_rows() {
         assert_eq!(
             read_rows(&b"foo"[..]).flatten().collect::<Vec<_>>(),

-            vec![Row {
+            vec![Rowlike::Row(Row {

                 label: "foo".to_owned(),
                 entries: HashMap::new(),
                 label: "foo".to_owned(),
                 entries: HashMap::new(),

-            }]
+            })]

         );
         assert_eq!(
             read_rows(&b"bar"[..]).flatten().collect::<Vec<_>>(),
         );
         assert_eq!(
             read_rows(&b"bar"[..]).flatten().collect::<Vec<_>>(),

-            vec![Row {
+            vec![Rowlike::Row(Row {

                 label: "bar".to_owned(),
                 entries: HashMap::new(),
                 label: "bar".to_owned(),
                 entries: HashMap::new(),

-            }]
+            })]

         );
         assert_eq!(
             read_rows(&b"foo\nbar\n"[..]).flatten().collect::<Vec<_>>(),
             vec![
         );
         assert_eq!(
             read_rows(&b"foo\nbar\n"[..]).flatten().collect::<Vec<_>>(),
             vec![

-                Row {
+                Rowlike::Row(Row {

                     label: "foo".to_owned(),
                     entries: HashMap::new(),
                     label: "foo".to_owned(),
                     entries: HashMap::new(),

-                },
-                Row {
+                }),
+                Rowlike::Row(Row {

                     label: "bar".to_owned(),
                     entries: HashMap::new(),
                     label: "bar".to_owned(),
                     entries: HashMap::new(),

-                }
+                })

             ]
         );
         assert_eq!(
             read_rows(&b"foo\n bar\n"[..]).flatten().collect::<Vec<_>>(),
             ]
         );
         assert_eq!(
             read_rows(&b"foo\n bar\n"[..]).flatten().collect::<Vec<_>>(),

-            vec![Row {
+            vec![Rowlike::Row(Row {

                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),

-            }]
+            })]

         );
         assert_eq!(
             read_rows(&b"foo\n bar\n baz\n"[..])
                 .flatten()
                 .collect::<Vec<_>>(),
         );
         assert_eq!(
             read_rows(&b"foo\n bar\n baz\n"[..])
                 .flatten()
                 .collect::<Vec<_>>(),

-            vec![Row {
+            vec![Rowlike::Row(Row {

                 label: "foo".to_owned(),
                 entries: HashMap::from([
                     ("bar".to_owned(), vec![None]),
                     ("baz".to_owned(), vec![None])
                 ]),
                 label: "foo".to_owned(),
                 entries: HashMap::from([
                     ("bar".to_owned(), vec![None]),
                     ("baz".to_owned(), vec![None])
                 ]),

-            }]
+            })]

         );
         assert_eq!(
             read_rows(&b"foo\n\nbar\n"[..])
                 .flatten()
                 .collect::<Vec<_>>(),
             vec![
         );
         assert_eq!(
             read_rows(&b"foo\n\nbar\n"[..])
                 .flatten()
                 .collect::<Vec<_>>(),
             vec![

-                Row {
+                Rowlike::Row(Row {

                     label: "foo".to_owned(),
                     entries: HashMap::new(),
                     label: "foo".to_owned(),
                     entries: HashMap::new(),

-                },
-                Row {
+                }),
+                Rowlike::Row(Row {

                     label: "bar".to_owned(),
                     entries: HashMap::new(),
                     label: "bar".to_owned(),
                     entries: HashMap::new(),

-                }
+                })

             ]
         );
         assert_eq!(
             ]
         );
         assert_eq!(


@@ -400,24 +415,24 @@ mod tests {
                 .flatten()
                 .collect::<Vec<_>>(),
             vec![
                 .flatten()
                 .collect::<Vec<_>>(),
             vec![

-                Row {
+                Rowlike::Row(Row {

                     label: "foo".to_owned(),
                     entries: HashMap::new(),
                     label: "foo".to_owned(),
                     entries: HashMap::new(),

-                },
-                Row {
+                }),
+                Rowlike::Row(Row {

                     label: "bar".to_owned(),
                     entries: HashMap::new(),
                     label: "bar".to_owned(),
                     entries: HashMap::new(),

-                }
+                })

             ]
         );
         assert_eq!(
             read_rows(&b"foo  \n bar  \n"[..])
                 .flatten()
                 .collect::<Vec<_>>(),
             ]
         );
         assert_eq!(
             read_rows(&b"foo  \n bar  \n"[..])
                 .flatten()
                 .collect::<Vec<_>>(),

-            vec![Row {
+            vec![Rowlike::Row(Row {

                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),
                 label: "foo".to_owned(),
                 entries: HashMap::from([("bar".to_owned(), vec![None])]),

-            }]
+            })]

         );
 
         let bad = read_rows(&b" foo"[..]).next().unwrap();
         );
 
         let bad = read_rows(&b" foo"[..]).next().unwrap();


@@ -618,10 +633,10 @@ mod tests {
         assert_eq!(
             render_row(
                 &["foo".to_owned()],
         assert_eq!(
             render_row(
                 &["foo".to_owned()],

-                &mut Row {
+                &mut Rowlike::Row(Row {

                     label: "nope".to_owned(),
                     entries: HashMap::from([("bar".to_owned(), vec![None])]),
                     label: "nope".to_owned(),
                     entries: HashMap::from([("bar".to_owned(), vec![None])]),

-                }
+                })

             ),
             HTML::from(
                 r#"<tr><th id="nope">nope</th><td class="" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')">bar</td></tr>
             ),
             HTML::from(
                 r#"<tr><th id="nope">nope</th><td class="" onmouseover="h2('nope','foo')" onmouseout="ch2('nope','foo')"></td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')">bar</td></tr>