Merge pull request #1 from Barsik-sus/conflicts

Conflicts

Author: SRetip

Cargo.toml

@@ -492,7 +492,7 @@ version = "~0.2.0"
 path = "module/move/sqlx_query"
 
 [workspace.dependencies.deterministic_rand]
-version = "~0.5.0"
+version = "~0.6.0"
 path = "module/move/deterministic_rand"
 
 [workspace.dependencies.crates_tools]

module/core/diagnostics_tools/src/diag/rta.rs

@@ -289,4 +289,3 @@ pub mod prelude
   };
 
 }
-

module/core/diagnostics_tools/src/lib.rs

@@ -31,7 +31,6 @@ pub mod own
   #[ doc( inline ) ]
   pub use orphan::*;
   #[ doc( inline ) ]
-  #[ allow( unused_imports ) ]
   pub use super::diag::orphan::*;
 }
 
@@ -54,7 +53,6 @@ pub mod exposed
   #[ doc( inline ) ]
   pub use prelude::*;
   #[ doc( inline ) ]
-  #[ allow( unused_imports ) ]
   pub use super::diag::exposed::*;
 }
 
@@ -65,6 +63,5 @@ pub mod prelude
 {
   use super::*;
   #[ doc( inline ) ]
-  #[ allow( unused_imports ) ]
   pub use super::diag::prelude::*;
 }

module/core/format_tools/src/format.rs

@@ -289,6 +289,7 @@ pub mod string;
 pub mod table;
 pub mod to_string;
 pub mod to_string_with_fallback;
+pub mod text_wrap;
 
 /// A strucutre for diagnostic and demonstration purpose.
 #[ doc( hidden ) ]
@@ -317,6 +318,7 @@ pub mod own
     table::orphan::*,
     to_string::orphan::*,
     to_string_with_fallback::orphan::*,
+    text_wrap::orphan::*,
   };
 
 }
@@ -369,6 +371,7 @@ pub mod exposed
     table::exposed::*,
     to_string::exposed::*,
     to_string_with_fallback::exposed::*,
+    text_wrap::exposed::*,
   };
 
 }
@@ -391,6 +394,7 @@ pub mod prelude
     table::prelude::*,
     to_string::prelude::*,
     to_string_with_fallback::prelude::*,
+    text_wrap::prelude::*,
   };
 
 }

module/core/format_tools/src/format/as_table.rs

@@ -32,7 +32,7 @@ mod private
   )
   where
     RowKey : table::RowKey,
-    Row : Cells< CellKey>,
+    Row : Cells< CellKey >,
     CellKey : table::CellKey + ?Sized,
     // CellRepr : table::CellRepr
   ;
@@ -41,7 +41,7 @@ mod private
   AsTable< 'table, Table, RowKey, Row, CellKey>
   where
     RowKey : table::RowKey,
-    Row : Cells< CellKey>,
+    Row : Cells< CellKey >,
     CellKey : table::CellKey + ?Sized,
     // CellRepr : table::CellRepr,
   {
@@ -56,7 +56,7 @@ mod private
   for AsTable< 'table, Table, RowKey, Row, CellKey>
   where
     RowKey : table::RowKey,
-    Row : Cells< CellKey>,
+    Row : Cells< CellKey >,
     CellKey : table::CellKey + ?Sized,
     // CellRepr : table::CellRepr,
   {
@@ -70,7 +70,7 @@ mod private
   for AsTable< 'table, Table, RowKey, Row, CellKey>
   where
     RowKey : table::RowKey,
-    Row : Cells< CellKey>,
+    Row : Cells< CellKey >,
     CellKey : table::CellKey + ?Sized,
     // CellRepr : table::CellRepr,
   {
@@ -86,7 +86,7 @@ mod private
   for AsTable< 'table, Table, RowKey, Row, CellKey>
   where
     RowKey : table::RowKey,
-    Row : Cells< CellKey>,
+    Row : Cells< CellKey >,
     CellKey : table::CellKey + ?Sized,
     // CellRepr : table::CellRepr,
   {
@@ -101,7 +101,7 @@ mod private
   where
     Table : fmt::Debug,
     RowKey : table::RowKey,
-    Row : Cells< CellKey>,
+    Row : Cells< CellKey >,
     CellKey : table::CellKey + ?Sized,
     // CellRepr : table::CellRepr,
   {
@@ -146,7 +146,7 @@ mod private
   for AsTable< 'table, Table, RowKey, Row, CellKey>
   where
     RowKey : table::RowKey,
-    Row : Cells< CellKey>,
+    Row : Cells< CellKey >,
     CellKey : table::CellKey + ?Sized,
     // CellRepr : table::CellRepr,
     Self : Copy,

module/core/format_tools/src/format/output_format.rs

@@ -32,6 +32,8 @@
 mod private
 {
 
+  use std::borrow::Cow;
+
   use crate::*;
   use print::
   {
@@ -78,6 +80,36 @@ mod private
     }
   }
 
+  /// Print table, which is constructed with vectors and `Cow`s, with the
+  /// specified output formatter.
+  ///
+  /// This function is useful when you do not want to use `AsTable`, or implement `Fields`, and
+  /// other traits, but you just have string slices in vectors.
+  ///
+  /// `rows` should not contain header of the table, it will be automatically added if `has_header`
+  /// is true.
+  pub fn vector_table_write< 'data, 'context >
+  (
+    column_names : Vec< Cow< 'data, str > >,
+    has_header : bool,
+    rows : Vec< Vec< Cow< 'data, str > > >,
+    c : &mut Context< 'context >,
+  ) -> fmt::Result
+  {
+    InputExtract::extract_from_raw_table
+    ( 
+      column_names,
+      has_header,
+      rows,
+      c.printer.filter_col,
+      c.printer.filter_row,
+      | x |
+      {
+        c.printer.output_format.extract_write( x, c )
+      }
+    )
+  }
+
 }
 
 mod table;
@@ -106,6 +138,7 @@ pub mod own
   #[ doc( inline ) ]
   pub use private::
   {
+    vector_table_write,
   };
 
 }

module/core/format_tools/src/format/output_format/records.rs

@@ -22,12 +22,12 @@
 //!
 
 use crate::*;
-use md_math::MdOffset;
 use print::
 {
   InputExtract,
   Context,
 };
+use std::borrow::Cow;
 use core::
 {
   fmt,
@@ -59,6 +59,8 @@ pub struct Records
   pub cell_postfix : String,
   /// Separator used between table columns.
   pub cell_separator : String,
+  /// Limit table width. If the value is zero, then no limitation.
+  pub max_width: usize,
   // /// Horizontal line character.
   // pub h : char,
   // /// Vertical line character.
@@ -91,6 +93,25 @@ impl Records
     static INSTANCE : OnceLock< Records > = OnceLock::new();
     INSTANCE.get_or_init( || Records::default() )
   }
+
+  /// Calculate how much space is minimally needed in order to generate an output with this output formatter.
+  /// It will be impossible to render tables smaller than the result of `min_width()`.
+  ///
+  /// This function is similar to `output_format::Table::min_width`, but it does not contain a
+  /// `column_count` as it always equal to 2, and it aslo uses the `output_format::Records` 
+  /// style parameters.
+  pub fn min_width
+  (
+    &self,
+  ) -> usize
+  {
+    // 2 is used here, because `Records` displays 2 columns: keys and values.
+    self.row_prefix.chars().count()
+    + self.row_postfix.chars().count()
+    + 2 * ( self.cell_postfix.chars().count() + self.cell_prefix.chars().count() )
+    + self.cell_separator.chars().count()
+    + 2
+  }
 }
 
 impl Default for Records
@@ -108,6 +129,8 @@ impl Default for Records
     let table_postfix = "".to_string();
     let table_separator = "\n".to_string();
 
+    let max_width = 0;
+
     // let h = '─';
     // let v = '|';
     // let t_l = '├';
@@ -131,6 +154,7 @@ impl Default for Records
       cell_prefix,
       cell_postfix,
       cell_separator,
+      max_width,
       // h,
       // v,
       // t_l,
@@ -155,70 +179,88 @@ impl TableOutputFormat for Records
     c : & mut Context< 'buf >,
   ) -> fmt::Result
   {
+    use format::text_wrap::{ text_wrap, width_calculate };
+
+    if self.max_width != 0 && self.max_width < self.min_width()
+    {
+      return Err( fmt::Error );
+    }
+
+    // 2 because there are only 2 columns: key and value.
+    let columns_max_width = if self.max_width == 0 { 0 } else { self.max_width - self.min_width() + 2 };
 
-    let label_width = x.header().fold( 0, | acc, cell | acc.max( cell.1[ 0 ] ) );
+    let keys : Vec< ( Cow< 'data, str >, [ usize; 2 ] ) > = x.header().collect();
+    let keys_width = width_calculate( &keys );
 
     write!( c.buf, "{}", self.table_prefix )?;
 
-    let mut first = true;
-    // Write each record
-    for ( irow, row ) in x.rows()
-    {
+    let mut printed_tables_count = 0;
 
-      if !row.vis
+    for ( itable_descriptor, table_descriptor ) in x.row_descriptors.iter().enumerate()
+    {
+      if !table_descriptor.vis || ( x.has_header && itable_descriptor == 0 )
       {
         continue;
       }
 
-      if first
-      {
-        first = false;
-      }
-      else
+      if printed_tables_count > 0
       {
         write!( c.buf, "{}", self.table_separator )?;
       }
 
-      let slice_width = x.data[ irow ].iter().fold( 0, | acc, cell | acc.max( cell.1[ 0 ] ) );
+      printed_tables_count += 1;
+
+      writeln!( c.buf, " = {}", table_descriptor.irow )?;
 
-      writeln!( c.buf, " = {}", irow )?;
+      let values = &x.data[ itable_descriptor ];
+      let values_width = width_calculate( &values );
 
-      for ( icol, _col ) in x.col_descriptors.iter().enumerate()
+      let table_for_wrapping : Vec< Vec< ( Cow< 'data, str >, [ usize; 2] ) > > =
+      keys.iter().enumerate().map( | ( ikey, key ) |
       {
-        let cell = &x.data[ irow ][ icol ];
-        let height = cell.1[ 1 ];
+        vec![ key.clone(), values[ ikey ].clone() ]
+      }).collect();
 
-        for islice in 0..height
+      let wrapped_text = text_wrap
+      (
+        table_for_wrapping.iter(),
+        &[ keys_width, values_width ],
+        columns_max_width,
+        keys_width + values_width,
+      );
+
+      for ( irow, cols ) in wrapped_text.data.into_iter().enumerate()
+      {
+        if irow != 0
         {
-          let label = x.header_slice( islice, icol );
-          let md_index = [ islice, icol, irow ];
-          let slice = x.slices[ x.slices_dim.md_offset( md_index ) ];
-
-          if icol > 0 || islice > 0
-          {
-            write!( c.buf, "{}", self.row_separator )?;
-          }
-
-          write!( c.buf, "{}", self.row_prefix )?;
-
-          write!( c.buf, "{}", self.cell_prefix )?;
-          write!( c.buf, "{:<label_width$}", label )?;
-          write!( c.buf, "{}", self.cell_postfix )?;
-          write!( c.buf, "{}", self.cell_separator )?;
-          write!( c.buf, "{}", self.cell_prefix )?;
-          write!( c.buf, "{:<slice_width$}", slice )?;
-          write!( c.buf, "{}", self.cell_postfix )?;
-
-          write!( c.buf, "{}", self.row_postfix )?;
+          write!( c.buf, "{}", self.row_separator )?;
         }
 
-      }
+        let key = &cols[ 0 ];
+        let value = &cols[ 1 ];
+
+        let key_width = wrapped_text.column_widthes[ 0 ];
+        let value_width = wrapped_text.column_widthes[ 1 ];
+
+        write!( c.buf, "{}", self.row_prefix )?;
 
+        write!( c.buf, "{}", self.cell_prefix )?;
+        write!( c.buf, "{:<key_width$}", key.content )?;
+        write!( c.buf, "{}", self.cell_postfix )?;
+        write!( c.buf, "{}", self.cell_separator )?;
+        write!( c.buf, "{}", self.cell_prefix )?;
+        // No need to use `wrap_width` of `WrappedCell`, as `output_format::Records`
+        // does not center values in cells (they are always left aligned).
+        write!( c.buf, "{:<value_width$}", value.content )?;
+        write!( c.buf, "{}", self.cell_postfix )?;
+
+        write!( c.buf, "{}", self.row_postfix )?;
+      }
     }
 
     write!( c.buf, "{}", self.table_postfix )?;
 
-    Ok(())
+    Ok( () )
   }
 
 }