From 2713e79215792ce31b8413928f0cf50bf4f103bf Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Tue, 12 Mar 2024 13:46:10 +0200
Subject: [PATCH 01/49] add total iterations

---
 module/move/optimization_tools/Cargo.toml     |   2 +-
 .../src/optimal_params_search/mod.rs          |   2 +-
 .../src/optimal_params_search/nelder_mead.rs  |  42 ++--
 .../move/optimization_tools/sudoku_results.md |  94 +++++----
 .../optimization_tools/tests/opt_params.rs    | 186 ++++++------------
 module/move/optimization_tools/tsp_results.md |  80 ++++----
 6 files changed, 193 insertions(+), 213 deletions(-)

diff --git a/module/move/optimization_tools/Cargo.toml b/module/move/optimization_tools/Cargo.toml
index 79f8029589..745b09706a 100644
--- a/module/move/optimization_tools/Cargo.toml
+++ b/module/move/optimization_tools/Cargo.toml
@@ -37,7 +37,7 @@ dynamic_plot = [ "static_plot", "plotters-backend", "piston_window" ]
 lp_parse = [ "exmex" ]
 
 [dependencies]
-derive_tools = { workspace = true, features = [ "derive_more", "full" ] }
+derive_tools = { workspace = true, features = [ "derive_more", "full", "strum" ] }
 deterministic_rand = { workspace = true, features = [ "default" ] }
 iter_tools = { workspace = true, features = [ "default" ] }
 meta_tools = { workspace = true, features = [ "meta_constructors" ] }
diff --git a/module/move/optimization_tools/src/optimal_params_search/mod.rs b/module/move/optimization_tools/src/optimal_params_search/mod.rs
index 76b84b8492..39390502e0 100644
--- a/module/move/optimization_tools/src/optimal_params_search/mod.rs
+++ b/module/move/optimization_tools/src/optimal_params_search/mod.rs
@@ -31,7 +31,7 @@ impl Default for OptimalParamsConfig
     {
       improvement_threshold : 0.005,
       max_no_improvement_steps : 10,
-      max_iterations : 100,
+      max_iterations : 50,
     }
   }
 } 
diff --git a/module/move/optimization_tools/src/optimal_params_search/nelder_mead.rs b/module/move/optimization_tools/src/optimal_params_search/nelder_mead.rs
index 90c329dba4..a82ebb4926 100644
--- a/module/move/optimization_tools/src/optimal_params_search/nelder_mead.rs
+++ b/module/move/optimization_tools/src/optimal_params_search/nelder_mead.rs
@@ -4,10 +4,7 @@
 
 use std::
 {
-  collections::HashMap,
-  fs::{ File, OpenOptions },
-  ops::{ Bound, RangeBounds },
-  sync::{ Arc, Mutex },
+  collections::HashMap, fs::{ File, OpenOptions }, ops::{ Bound, RangeBounds }, sync::{ Arc, Mutex }
 };
 use deterministic_rand::{ Hrng, Seed, Rng };
 use iter_tools::Itertools;
@@ -65,7 +62,9 @@ impl Constraints
 #[ derive( Debug, Clone ) ] 
 pub struct Stats
 {
-
+  pub number_of_iterations : usize,
+  pub number_of_starting_points : usize,
+  pub resumed_after_stale : usize,
   pub starting_point : Point,
   pub differences : Vec< Vec< f64 > >,
   pub positive_change : Vec< usize >,
@@ -79,6 +78,9 @@ impl Stats
     let dimensions = starting_point.coords.len();
     Self
     {
+      number_of_iterations : 0,
+      number_of_starting_points : 1,
+      resumed_after_stale : 0,
       starting_point,
       differences : vec![ Vec::new(); dimensions ],
       positive_change : vec![ 0; dimensions ],
@@ -488,6 +490,7 @@ where R : RangeBounds< f64 > + Sync,
     let results = points.into_par_iter().map( | point |
     {
       let mut stats = Stats::new( point.clone() );
+      stats.number_of_starting_points = points_number;
       let x0 = point.clone();
       let dimensions = x0.coords.len();
       let mut prev_best = self.evaluate_point( &x0, &mut stats );
@@ -509,6 +512,7 @@ where R : RangeBounds< f64 > + Sync,
   
         if self.max_iterations <= iterations
         {
+          stats.number_of_iterations = iterations;
           return Result::< Solution, Error >::Ok ( Solution 
           {
             point : res[ 0 ].0.clone(),
@@ -518,10 +522,12 @@ where R : RangeBounds< f64 > + Sync,
           } )
         }
   
-        iterations += 1;
-  
         if best.1 < prev_best - self.improvement_threshold
         {
+          if steps_with_no_improv > 0
+          {
+            stats.resumed_after_stale += 1;
+          }
           steps_with_no_improv = 0;
           prev_best = best.1;
         }
@@ -532,6 +538,7 @@ where R : RangeBounds< f64 > + Sync,
   
         if steps_with_no_improv >= self.max_no_improvement_steps
         {
+          stats.number_of_iterations = iterations;
           return Ok ( Solution 
           {
             point : res[ 0 ].0.clone(),
@@ -540,6 +547,8 @@ where R : RangeBounds< f64 > + Sync,
             stats : Some( stats ),
           } )
         }
+
+        iterations += 1;
   
         //centroid
         let mut x0_center = vec![ 0.0; dimensions ];
@@ -569,7 +578,6 @@ where R : RangeBounds< f64 > + Sync,
           let prev_point = res.pop().unwrap().0;
           stats.record_positive_change( &prev_point, &x_ref );
           res.push( ( x_ref, reflection_score ) );
-          // log::info!("reflection");
           continue;
         }
   
@@ -591,7 +599,6 @@ where R : RangeBounds< f64 > + Sync,
             let prev_point = res.pop().unwrap().0;
             stats.record_positive_change( &prev_point, &x_exp );
             res.push( ( x_exp, expansion_score ) );
-            // log::info!("expansion");
             continue;
             
           }
@@ -600,7 +607,6 @@ where R : RangeBounds< f64 > + Sync,
             let prev_point = res.pop().unwrap().0;
             stats.record_positive_change( &prev_point, &x_ref );
             res.push( ( x_ref, reflection_score ) );
-            // log::info!("expansion");
             continue;
           }
         }
@@ -620,7 +626,6 @@ where R : RangeBounds< f64 > + Sync,
           let prev_point = res.pop().unwrap().0;
           stats.record_positive_change( &prev_point, &x_con );
           res.push( ( x_con, contraction_score ) );
-          // log::info!("contraction");
           continue;
         }
   
@@ -639,7 +644,6 @@ where R : RangeBounds< f64 > + Sync,
           let score = self.evaluate_point( &x_shrink, &mut stats );
           new_res.push( ( x_shrink, score ) );
         }
-        // log::info!("shrink");
         res = new_res;
       }
     } ).collect::< Vec<_> >();
@@ -828,7 +832,7 @@ pub struct Solution
 }
 
 /// Reasons for termination of optimization process.
-#[ derive( Debug, Clone ) ] 
+#[ derive( Debug, Clone, derive_tools::Display ) ] 
 pub enum TerminationReason
 {
   /// Reached limit of total iterations.
@@ -837,6 +841,18 @@ pub enum TerminationReason
   NoImprovement,
 }
 
+// impl std::fmt::Display for TerminationReason
+// {
+//   fn fmt( &self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result
+//   {
+//     match self
+//     {
+//       Self::MaxIterations => write!( f, "Exceeded max number of total iterations" ),
+//       Self::NoImprovement => write!( f, "Exceeded max number of iterations without improvement" ),
+//     }
+//   }
+// }
+
 /// Possible error when building NMOptimizer.
 #[ derive( thiserror::Error, Debug ) ]
 pub enum Error {
diff --git a/module/move/optimization_tools/sudoku_results.md b/module/move/optimization_tools/sudoku_results.md
index e346a06069..d6b9c2b786 100644
--- a/module/move/optimization_tools/sudoku_results.md
+++ b/module/move/optimization_tools/sudoku_results.md
@@ -2,19 +2,23 @@
 
 ## For hybrid:
 
- - max number of iterations: 100
+ - max number of iterations: 50
 
  - max no improvement iterations : 10
 
  - improvement threshold : 0.005s
 
- - calculated points: 19 from 48
+ - termination reason: NoImprovement
 
- - points from cache: 29 from 48
+ - iterations number: 48
+
+ - resumed after stale: 8
+
+ - points from cache: 43/133
 
  - level: Easy
 
- - execution time: 0.154s
+ - execution time: 0.117s
 
  - parameters: 
 
@@ -22,32 +26,32 @@
 ┌─────────────┬────────┬────────┬─────────┬─────────────┬──────────┬─────────┬────────┐
 │             │ start  │ min    │ max     │ sum of diff │ expected │ changes │ final  │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ temperature │ 0.8561 │ 0.00   │ 1.00    │ 0.02        │ 0.00     │ 9       │ 0.9995 │
+│ temperature │ 0.4043 │ 0.00   │ 1.00    │ 0.10        │ 0.00     │ 41      │ 1.0000 │
 │ decrease    │        │        │         │             │          │         │        │
 │ coefficient │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ max         │ 106    │ 10.00  │ 200.00  │ 311.97      │ 7.43     │ 9       │ 108    │
+│ max         │ 37     │ 10.00  │ 200.00  │ 8265.03     │ 65.08    │ 41      │ 177    │
 │ mutations   │        │        │         │             │          │         │        │
 │ per         │        │        │         │             │          │         │        │
 │ dynasty     │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ mutation    │ 0.42   │ 0.00   │ 1.00    │ 1.31        │ 0.03     │ 9       │ 0.23   │
+│ mutation    │ 0.16   │ 0.00   │ 1.00    │ 17.64       │ 0.14     │ 41      │ 0.41   │
 │ rate        │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ crossover   │ 0.66   │ 0.00   │ 1.00    │ 1.70        │ 0.04     │ 9       │ 0.54   │
+│ crossover   │ 0.93   │ 0.00   │ 1.00    │ 42.41       │ 0.33     │ 41      │ 0.10   │
 │ rate        │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ elitism     │ -0.09  │ -      │ -       │ -           │ -        │ -       │ 0.23   │
+│ elitism     │ -0.09  │ -      │ -       │ -           │ -        │ -       │ 0.49   │
 │ rate        │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ max         │ 81     │ 1.00   │ 100.00  │ 1404.93     │ 33.45    │ 9       │ 62     │
+│ max         │ 30     │ 1.00   │ 100.00  │ 160.48      │ 1.26     │ 41      │ 31     │
 │ stale       │        │        │         │             │          │         │        │
 │ iterations  │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ population  │ 116    │ 1.00   │ 1000.00 │ 9233.07     │ 219.83   │ 9       │ 3      │
+│ population  │ 549    │ 1.00   │ 1000.00 │ 33602.75    │ 264.59   │ 41      │ 11     │
 │ size        │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ dynasties   │ 249    │ 100.00 │ 2000.00 │ 19863.18    │ 472.93   │ 9       │ 1486   │
+│ dynasties   │ 439    │ 100.00 │ 2000.00 │ 58761.38    │ 462.69   │ 41      │ 1521   │
 │ limit       │        │        │         │             │          │         │        │
 └─────────────┴────────┴────────┴─────────┴─────────────┴──────────┴─────────┴────────┘
 ```
@@ -59,7 +63,9 @@
  - `max number of iterations` : limit of total iterations of optimization process, termination condition
  - `max no improvement iterations` : max amount of steps performed without detected improvement, termination condition
  - `improvement threshold` : minimal value detected as improvement in objective function result
- - `calculated points` : new calculated points that were not found in cache
+ - `termination reason` : the reason why optimization process was stopped
+ - `iterations number` : actual number of iterations performed during optimization
+ - `resumed after stale` : how many times optimization progress was resumed after some iterations without improvement
  - `points from cache` : points calculated during previous optimizations and read from cache
  - `level` : sudoku board difficulty level
  - `execution time` : duration of shortest found hybrid optimization process using final parameters, measured in seconds
@@ -73,19 +79,23 @@
  - `final` : calculated value of parameter for which execution time was the lowest
 ## For SA:
 
- - max number of iterations: 100
+ - max number of iterations: 50
 
  - max no improvement iterations : 10
 
  - improvement threshold : 0.005s
 
- - calculated points: 0 from 22
+ - termination reason: NoImprovement
+
+ - iterations number: 12
 
- - points from cache: 22 from 22
+ - resumed after stale: 1
+
+ - points from cache: 31/32
 
  - level: Easy
 
- - execution time: 0.019s
+ - execution time: 0.026s
 
  - parameters: 
 
@@ -93,11 +103,11 @@
 ┌─────────────┬────────┬────────┬─────────┬─────────────┬──────────┬─────────┬────────┐
 │             │ start  │ min    │ max     │ sum of diff │ expected │ changes │ final  │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ temperature │ 0.8244 │ 0.00   │ 1.00    │ 0.48        │ 0.03     │ 12      │ 0.9554 │
+│ temperature │ 0.8244 │ 0.00   │ 1.00    │ 0.83        │ 0.03     │ 11      │ 0.9554 │
 │ decrease    │        │        │         │             │          │         │        │
 │ coefficient │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ max         │ 157    │ 10.00  │ 200.00  │ 261.00      │ 18.64    │ 12      │ 116    │
+│ max         │ 157    │ 10.00  │ 200.00  │ 423.98      │ 17.67    │ 11      │ 116    │
 │ mutations   │        │        │         │             │          │         │        │
 │ per         │        │        │         │             │          │         │        │
 │ dynasty     │        │        │         │             │          │         │        │
@@ -111,14 +121,14 @@
 │ elitism     │ -0.00  │ -      │ -       │ -           │ -        │ -       │ 0.00   │
 │ rate        │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ max         │ 67     │ 1.00   │ 100.00  │ 214.24      │ 15.30    │ 12      │ 39     │
+│ max         │ 67     │ 1.00   │ 100.00  │ 265.64      │ 11.07    │ 11      │ 39     │
 │ stale       │        │        │         │             │          │         │        │
 │ iterations  │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
 │ population  │ 1      │ 1.00   │ 1.00    │ 0.00        │ 0.00     │ 0       │ 1      │
 │ size        │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ dynasties   │ 3455   │ 100.00 │ 5000.00 │ 13134.94    │ 938.21   │ 12      │ 1646   │
+│ dynasties   │ 3455   │ 100.00 │ 5000.00 │ 17618.46    │ 734.10   │ 11      │ 1646   │
 │ limit       │        │        │         │             │          │         │        │
 └─────────────┴────────┴────────┴─────────┴─────────────┴──────────┴─────────┴────────┘
 ```
@@ -130,7 +140,9 @@
  - `max number of iterations` : limit of total iterations of optimization process, termination condition
  - `max no improvement iterations` : max amount of steps performed without detected improvement, termination condition
  - `improvement threshold` : minimal value detected as improvement in objective function result
- - `calculated points` : new calculated points that were not found in cache
+ - `termination reason` : the reason why optimization process was stopped
+ - `iterations number` : actual number of iterations performed during optimization
+ - `resumed after stale` : how many times optimization progress was resumed after some iterations without improvement
  - `points from cache` : points calculated during previous optimizations and read from cache
  - `level` : sudoku board difficulty level
  - `execution time` : duration of shortest found hybrid optimization process using final parameters, measured in seconds
@@ -144,19 +156,23 @@
  - `final` : calculated value of parameter for which execution time was the lowest
 ## For GA:
 
- - max number of iterations: 100
+ - max number of iterations: 50
 
  - max no improvement iterations : 10
 
  - improvement threshold : 0.005s
 
- - calculated points: 81 from 120
+ - termination reason: NoImprovement
+
+ - iterations number: 30
+
+ - resumed after stale: 4
 
- - points from cache: 39 from 120
+ - points from cache: 87/93
 
  - level: Easy
 
- - execution time: 0.263s
+ - execution time: 0.175s
 
  - parameters: 
 
@@ -164,32 +180,32 @@
 ┌─────────────┬────────┬────────┬─────────┬─────────────┬──────────┬─────────┬────────┐
 │             │ start  │ min    │ max     │ sum of diff │ expected │ changes │ final  │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ temperature │ 0.6847 │ 0.00   │ 1.00    │ 0.45        │ 0.00     │ 36      │ 0.9995 │
+│ temperature │ 0.3698 │ 0.00   │ 1.00    │ 4.51        │ 0.05     │ 25      │ 0.9432 │
 │ decrease    │        │        │         │             │          │         │        │
 │ coefficient │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ max         │ 174    │ 10.00  │ 200.00  │ 514.31      │ 4.40     │ 36      │ 97     │
+│ max         │ 108    │ 10.00  │ 200.00  │ 751.96      │ 8.74     │ 25      │ 109    │
 │ mutations   │        │        │         │             │          │         │        │
 │ per         │        │        │         │             │          │         │        │
 │ dynasty     │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ mutation    │ 0.78   │ 0.10   │ 1.00    │ 5.51        │ 0.05     │ 36      │ 0.22   │
+│ mutation    │ 0.22   │ 0.10   │ 1.00    │ 4.71        │ 0.05     │ 25      │ 0.32   │
 │ rate        │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ crossover   │ 0.73   │ 0.10   │ 1.00    │ 2.09        │ 0.02     │ 36      │ 0.51   │
+│ crossover   │ 0.16   │ 0.10   │ 1.00    │ 3.75        │ 0.04     │ 25      │ 0.54   │
 │ rate        │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ elitism     │ -0.52  │ -      │ -       │ -           │ -        │ -       │ 0.26   │
+│ elitism     │ 0.61   │ -      │ -       │ -           │ -        │ -       │ 0.15   │
 │ rate        │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ max         │ 29     │ 1.00   │ 100.00  │ 134.61      │ 1.15     │ 36      │ 31     │
+│ max         │ 61     │ 1.00   │ 100.00  │ 523.70      │ 6.09     │ 25      │ 35     │
 │ stale       │        │        │         │             │          │         │        │
 │ iterations  │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ population  │ 846    │ 10.00  │ 2000.00 │ 24289.87    │ 207.61   │ 36      │ 84     │
+│ population  │ 1743   │ 10.00  │ 2000.00 │ 29942.40    │ 348.17   │ 25      │ 12     │
 │ size        │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ dynasties   │ 859    │ 100.00 │ 2000.00 │ 8440.12     │ 72.14    │ 36      │ 1075   │
+│ dynasties   │ 1626   │ 100.00 │ 2000.00 │ 10424.65    │ 121.22   │ 25      │ 1092   │
 │ limit       │        │        │         │             │          │         │        │
 └─────────────┴────────┴────────┴─────────┴─────────────┴──────────┴─────────┴────────┘
 ```
@@ -201,7 +217,9 @@
  - `max number of iterations` : limit of total iterations of optimization process, termination condition
  - `max no improvement iterations` : max amount of steps performed without detected improvement, termination condition
  - `improvement threshold` : minimal value detected as improvement in objective function result
- - `calculated points` : new calculated points that were not found in cache
+ - `termination reason` : the reason why optimization process was stopped
+ - `iterations number` : actual number of iterations performed during optimization
+ - `resumed after stale` : how many times optimization progress was resumed after some iterations without improvement
  - `points from cache` : points calculated during previous optimizations and read from cache
  - `level` : sudoku board difficulty level
  - `execution time` : duration of shortest found hybrid optimization process using final parameters, measured in seconds
@@ -221,11 +239,11 @@
 │        │ coefficient │ per       │          │           │         │ iterations │            │           │           │
 │        │             │ dynasty   │          │           │         │            │            │           │           │
 ├────────┼─────────────┼───────────┼──────────┼───────────┼─────────┼────────────┼────────────┼───────────┼───────────┤
-│ hybrid │ 0.9995      │ 108       │ 0.23     │ 0.54      │ 0.23    │ 62         │ 3          │ 1486      │ 0.154s    │
+│ hybrid │ 1.0000      │ 177       │ 0.41     │ 0.10      │ 0.49    │ 31         │ 11         │ 1521      │ 0.117s    │
 ├────────┼─────────────┼───────────┼──────────┼───────────┼─────────┼────────────┼────────────┼───────────┼───────────┤
-│ SA     │ 0.9554      │ 116       │ 1.00     │ 0.00      │ 0.00    │ 39         │ 1          │ 1646      │ 0.019s    │
+│ SA     │ 0.9554      │ 116       │ 1.00     │ 0.00      │ 0.00    │ 39         │ 1          │ 1646      │ 0.026s    │
 ├────────┼─────────────┼───────────┼──────────┼───────────┼─────────┼────────────┼────────────┼───────────┼───────────┤
-│ GA     │ 0.9995      │ 97        │ 0.22     │ 0.51      │ 0.26    │ 31         │ 84         │ 1075      │ 0.263s    │
+│ GA     │ 0.9432      │ 109       │ 0.32     │ 0.54      │ 0.15    │ 35         │ 12         │ 1092      │ 0.175s    │
 └────────┴─────────────┴───────────┴──────────┴───────────┴─────────┴────────────┴────────────┴───────────┴───────────┘
 ```
 
diff --git a/module/move/optimization_tools/tests/opt_params.rs b/module/move/optimization_tools/tests/opt_params.rs
index ad4250ad9e..d50ffdba76 100644
--- a/module/move/optimization_tools/tests/opt_params.rs
+++ b/module/move/optimization_tools/tests/opt_params.rs
@@ -230,7 +230,9 @@ fn write_results
       " - `max number of iterations` : limit of total iterations of optimization process, termination condition\n",
       " - `max no improvement iterations` : max amount of steps performed without detected improvement, termination condition\n",
       " - `improvement threshold` : minimal value detected as improvement in objective function result\n",
-      " - `calculated points` : new calculated points that were not found in cache\n",
+      " - `termination reason` : the reason why optimization process was stopped\n",
+      " - `iterations number` : actual number of iterations performed during optimization\n",
+      " - `resumed after stale` : how many times optimization progress was resumed after some iterations without improvement\n",
       " - `points from cache` : points calculated during previous optimizations and read from cache\n",
     );
 
@@ -337,138 +339,76 @@ fn find_opt_params_sudoku() -> Result< (), Box< dyn std::error::Error > >
   let config = OptimalParamsConfig::default();
   let initial = SudokuInitial::new( Board::from( easy ) );
 
-  let hybrid_problem = Problem::new
-  (
-    initial.clone(),
-    BestRowsColumnsCrossover,
-    RandomPairInBlockMutation,
-  );
-  let starting_params = hybrid_optimizer::starting_params_for_hybrid()?;
-  let res = optimal_params_search::find_hybrid_optimal_params
-  (
-    config.clone(),
-    starting_params.clone(),
-    hybrid_problem,
-    Some( path.clone() ),
-  );
-  assert!( res.is_ok() );
-
   let mut hybrid_res = Statistics::new();
-  if let Ok( solution ) = res
-  {
-    let cached = solution.stats.clone().unwrap().cached_points;
-    hybrid_res = Statistics
-    {
-      table_params : named_results_list
-      (
-        solution.point.coords
-        .into_iter()
-        .map( | val | val )
-        .collect_vec(),
-        solution.stats.unwrap(),
-        starting_params.bounds,
-      ),
-      list_params : vec!
-      [ 
-        ( String::from( "max number of iterations" ), format!( "{}", config.max_iterations ) ),
-        ( String::from( "max no improvement iterations " ), format!( "{}", config.max_no_improvement_steps ) ),
-        ( String::from( "improvement threshold " ), format!( "{}s", config.improvement_threshold ) ),
-        ( String::from( "calculated points" ), format!( "{} from {}", cached.1, cached.1 + cached.0 ) ),
-        ( String::from( "points from cache" ), format!( "{} from {}", cached.0, cached.1 + cached.0 ) ),
-        ( String::from( "level" ), format!( "{:?}", Board::from( easy ).calculate_level() ) ),
-        ( String::from( "execution time" ), format!( "{:.3}s", solution.objective ) ),
-      ]
-    }
-  }
-
-  // SA
-  let hybrid_problem = Problem::new
-  (
-    initial.clone(),
-    BestRowsColumnsCrossover,
-    RandomPairInBlockMutation,
-  );
-  let starting_params = hybrid_optimizer::starting_params_for_sa()?;
-  let res = optimal_params_search::find_hybrid_optimal_params
-  (
-    config.clone(),
-    starting_params.clone(),
-    hybrid_problem,
-    Some( path.clone() ),
-  );
-  assert!( res.is_ok() );
-
   let mut sa_res = Statistics::new();
-  if let Ok( solution ) = res
+  let mut ga_res = Statistics::new();
+  for mode in [ "hybrid", "sa", "ga" ]
   {
-    let cached = solution.stats.clone().unwrap().cached_points;
-    sa_res = Statistics
+    let mut starting_params = hybrid_optimizer::starting_params_for_hybrid()?;
+    match mode
     {
-      table_params : named_results_list
-      (
-        solution.point.coords
-        .into_iter()
-        .map( | val | val )
-        .collect_vec(),
-        solution.stats.unwrap(),
-        starting_params.bounds,
-      ),
-      list_params : vec!
-      [
-        ( String::from( "max number of iterations" ), format!( "{}", config.max_iterations ) ),
-        ( String::from( "max no improvement iterations " ), format!( "{}", config.max_no_improvement_steps ) ),
-        ( String::from( "improvement threshold " ), format!( "{}s", config.improvement_threshold ) ),
-        ( String::from( "calculated points" ), format!( "{} from {}", cached.1, cached.1 + cached.0 ) ),
-        ( String::from( "points from cache" ), format!( "{} from {}", cached.0, cached.1 + cached.0 ) ),
-        ( String::from( "level" ), format!( "{:?}", Board::from( easy ).calculate_level() ) ),
-        ( String::from( "execution time" ), format!( "{:.3}s", solution.objective ) ),
-      ]
+      "hybrid" => {},
+      "sa" => starting_params = hybrid_optimizer::starting_params_for_sa()?,
+      "ga" => starting_params = hybrid_optimizer::starting_params_for_ga()?,
+      _ => unreachable!(),
     }
-  }
 
-  // GA
-  let hybrid_problem = Problem::new(
-    initial.clone(),
-    BestRowsColumnsCrossover,
-    RandomPairInBlockMutation,
-  );
-  let starting_params = hybrid_optimizer::starting_params_for_ga()?;
-  let res = optimal_params_search::find_hybrid_optimal_params
-  (
-    config.clone(),
-    starting_params.clone(),
-    hybrid_problem,
-    Some( path ),
-  );
-  assert!( res.is_ok() );
+    let hybrid_problem = Problem::new
+    (
+      initial.clone(),
+      BestRowsColumnsCrossover,
+      RandomPairInBlockMutation,
+    );
 
-  let mut ga_res = Statistics::new();
-  if let Ok( solution ) = res
-  {
-    let cached = solution.stats.clone().unwrap().cached_points;
-    ga_res = Statistics
+    let res = optimal_params_search::find_hybrid_optimal_params
+    (
+      config.clone(),
+      starting_params.clone(),
+      hybrid_problem,
+      Some( path.clone() ),
+    );
+    assert!( res.is_ok() );
+  
+    if let Ok( solution ) = res
     {
-      table_params : named_results_list
-      (
-        solution.point.coords
-        .into_iter()
-        .map( | val | val )
-        .collect_vec(),
-        solution.stats.unwrap(),
-        starting_params.bounds,
-      ),
-      list_params : vec!
-      [
-        ( String::from( "max number of iterations" ), format!( "{}", config.max_iterations ) ),
-        ( String::from( "max no improvement iterations " ), format!( "{}", config.max_no_improvement_steps ) ),
-        ( String::from( "improvement threshold " ), format!( "{}s", config.improvement_threshold ) ),
-        ( String::from( "calculated points" ), format!( "{} from {}", cached.1, cached.1 + cached.0 ) ),
-        ( String::from( "points from cache" ), format!( "{} from {}", cached.0, cached.1 + cached.0 ) ),
-        ( String::from( "level" ), format!( "{:?}", Board::from( easy ).calculate_level() ) ),
-        ( String::from( "execution time" ), format!( "{:.3}s", solution.objective ) ),
-      ]
+      assert!( solution.stats.is_some() );
+      let stats = solution.stats.clone().unwrap();
+      let cached = stats.cached_points;
+      let final_res = Statistics
+      {
+        table_params : named_results_list
+        (
+          solution.point.coords
+          .into_iter()
+          .map( | val | val )
+          .collect_vec(),
+          solution.stats.unwrap(),
+          starting_params.bounds,
+        ),
+        list_params : vec!
+        [ 
+          ( String::from( "max number of iterations" ), format!( "{}", config.max_iterations ) ),
+          ( String::from( "max no improvement iterations " ), format!( "{}", config.max_no_improvement_steps ) ),
+          ( String::from( "improvement threshold " ), format!( "{}s", config.improvement_threshold ) ),
+          ( String::from( "termination reason" ), format!( "{}", solution.reason ) ),
+          ( String::from( "iterations number" ), format!( "{}", stats.number_of_iterations ) ),
+          ( String::from( "resumed after stale" ), format!( "{}", stats.resumed_after_stale ) ),
+          ( String::from( "points from cache" ), format!( "{}/{}", cached.0, cached.1 + cached.0 ) ),
+          ( String::from( "level" ), format!( "{:?}", Board::from( easy ).calculate_level() ) ),
+          ( String::from( "execution time" ), format!( "{:.3}s", solution.objective ) ),
+        ]
+      };
+
+      match mode
+      {
+        "hybrid" => hybrid_res = final_res,
+        "sa" => sa_res = final_res,
+        "ga" => ga_res = final_res,
+        _ => unreachable!(),
+      }
     }
   }
+
   write_results( String::from( "sudoku_results" ), String::from( "Sudoku Problem" ), hybrid_res, sa_res, ga_res )?;
   Ok( () )
 }
diff --git a/module/move/optimization_tools/tsp_results.md b/module/move/optimization_tools/tsp_results.md
index 78b5195456..22ec13075b 100644
--- a/module/move/optimization_tools/tsp_results.md
+++ b/module/move/optimization_tools/tsp_results.md
@@ -2,19 +2,19 @@
 
 ## For hybrid:
 
- - max number of iterations: 100
+ - max number of iterations: 50
 
  - max no improvement iterations : 10
 
  - improvement threshold : 0.005s
 
- - calculated points: 124 from 133
+ - calculated points: 79 from 79
 
- - points from cache: 9 from 133
+ - points from cache: 0 from 79
 
  - number of nodes: 4
 
- - execution time: 0.008s
+ - execution time: 0.018s
 
  - parameters: 
 
@@ -22,32 +22,32 @@
 ┌─────────────┬────────┬────────┬─────────┬─────────────┬──────────┬─────────┬────────┐
 │             │ start  │ min    │ max     │ sum of diff │ expected │ changes │ final  │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ temperature │ 0.7726 │ 0.00   │ 1.00    │ 28.88       │ 0.21     │ 74      │ 0.7349 │
+│ temperature │ 0.8572 │ 0.00   │ 1.00    │ 0.14        │ 0.00     │ 50      │ 0.9999 │
 │ decrease    │        │        │         │             │          │         │        │
 │ coefficient │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ max         │ 14     │ 10.00  │ 200.00  │ 6917.13     │ 49.76    │ 74      │ 33     │
+│ max         │ 150    │ 10.00  │ 200.00  │ 2920.64     │ 35.19    │ 50      │ 54     │
 │ mutations   │        │        │         │             │          │         │        │
 │ per         │        │        │         │             │          │         │        │
 │ dynasty     │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ mutation    │ 0.00   │ 0.00   │ 1.00    │ 23.18       │ 0.17     │ 74      │ 0.13   │
+│ mutation    │ 0.57   │ 0.00   │ 1.00    │ 21.60       │ 0.26     │ 50      │ 0.02   │
 │ rate        │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ crossover   │ 0.63   │ 0.00   │ 1.00    │ 40.81       │ 0.29     │ 74      │ 0.86   │
+│ crossover   │ 0.56   │ 0.00   │ 1.00    │ 17.49       │ 0.21     │ 50      │ 0.31   │
 │ rate        │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ elitism     │ 0.37   │ -      │ -       │ -           │ -        │ -       │ 0.01   │
+│ elitism     │ -0.13  │ -      │ -       │ -           │ -        │ -       │ 0.66   │
 │ rate        │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ max         │ 58     │ 1.00   │ 100.00  │ 3695.03     │ 26.58    │ 74      │ 62     │
+│ max         │ 35     │ 1.00   │ 100.00  │ 152.19      │ 1.83     │ 50      │ 30     │
 │ stale       │        │        │         │             │          │         │        │
 │ iterations  │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ population  │ 674    │ 1.00   │ 1000.00 │ 46923.94    │ 337.58   │ 74      │ 1      │
+│ population  │ 148    │ 1.00   │ 1000.00 │ 20174.02    │ 243.06   │ 50      │ 10     │
 │ size        │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ dynasties   │ 824    │ 100.00 │ 2000.00 │ 79548.00    │ 572.29   │ 74      │ 138    │
+│ dynasties   │ 1982   │ 100.00 │ 2000.00 │ 63109.09    │ 760.35   │ 50      │ 130    │
 │ limit       │        │        │         │             │          │         │        │
 └─────────────┴────────┴────────┴─────────┴─────────────┴──────────┴─────────┴────────┘
 ```
@@ -59,7 +59,9 @@
  - `max number of iterations` : limit of total iterations of optimization process, termination condition
  - `max no improvement iterations` : max amount of steps performed without detected improvement, termination condition
  - `improvement threshold` : minimal value detected as improvement in objective function result
- - `calculated points` : new calculated points that were not found in cache
+ - `termination reason` : the reason why optimization process was stopped
+ - `iterations number` : actual number of iterations performed during optimization
+ - `resumed after stale` : how many times optimization progress was resumed after some iterations without improvement
  - `points from cache` : points calculated during previous optimizations and read from cache
  - `number of nodes` : number of nodes in graph representing cities from traveling salesman problem
  - `execution time` : duration of shortest found hybrid optimization process using final parameters, measured in seconds
@@ -73,15 +75,15 @@
  - `final` : calculated value of parameter for which execution time was the lowest
 ## For SA:
 
- - max number of iterations: 100
+ - max number of iterations: 50
 
  - max no improvement iterations : 10
 
  - improvement threshold : 0.005s
 
- - calculated points: 16 from 26
+ - calculated points: 33 from 33
 
- - points from cache: 10 from 26
+ - points from cache: 0 from 33
 
  - number of nodes: 4
 
@@ -93,11 +95,11 @@
 ┌─────────────┬────────┬────────┬─────────┬─────────────┬──────────┬─────────┬────────┐
 │             │ start  │ min    │ max     │ sum of diff │ expected │ changes │ final  │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ temperature │ 0.4533 │ 0.00   │ 1.00    │ 0.28        │ 0.01     │ 12      │ 0.9997 │
+│ temperature │ 0.1471 │ 0.00   │ 1.00    │ 8.73        │ 0.35     │ 17      │ 1.0000 │
 │ decrease    │        │        │         │             │          │         │        │
 │ coefficient │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ max         │ 54     │ 10.00  │ 200.00  │ 397.21      │ 20.91    │ 12      │ 120    │
+│ max         │ 112    │ 10.00  │ 200.00  │ 188.84      │ 7.55     │ 17      │ 110    │
 │ mutations   │        │        │         │             │          │         │        │
 │ per         │        │        │         │             │          │         │        │
 │ dynasty     │        │        │         │             │          │         │        │
@@ -111,14 +113,14 @@
 │ elitism     │ -0.00  │ -      │ -       │ -           │ -        │ -       │ 0.00   │
 │ rate        │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ max         │ 91     │ 1.00   │ 100.00  │ 920.69      │ 48.46    │ 12      │ 87     │
+│ max         │ 99     │ 1.00   │ 100.00  │ 1208.63     │ 48.35    │ 17      │ 100    │
 │ stale       │        │        │         │             │          │         │        │
 │ iterations  │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
 │ population  │ 1      │ 1.00   │ 1.00    │ 0.00        │ 0.00     │ 0       │ 1      │
 │ size        │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ dynasties   │ 2849   │ 100.00 │ 5000.00 │ 35258.61    │ 1855.72  │ 12      │ 117    │
+│ dynasties   │ 808    │ 100.00 │ 5000.00 │ 38996.81    │ 1559.87  │ 17      │ 123    │
 │ limit       │        │        │         │             │          │         │        │
 └─────────────┴────────┴────────┴─────────┴─────────────┴──────────┴─────────┴────────┘
 ```
@@ -130,7 +132,9 @@
  - `max number of iterations` : limit of total iterations of optimization process, termination condition
  - `max no improvement iterations` : max amount of steps performed without detected improvement, termination condition
  - `improvement threshold` : minimal value detected as improvement in objective function result
- - `calculated points` : new calculated points that were not found in cache
+ - `termination reason` : the reason why optimization process was stopped
+ - `iterations number` : actual number of iterations performed during optimization
+ - `resumed after stale` : how many times optimization progress was resumed after some iterations without improvement
  - `points from cache` : points calculated during previous optimizations and read from cache
  - `number of nodes` : number of nodes in graph representing cities from traveling salesman problem
  - `execution time` : duration of shortest found hybrid optimization process using final parameters, measured in seconds
@@ -144,19 +148,19 @@
  - `final` : calculated value of parameter for which execution time was the lowest
 ## For GA:
 
- - max number of iterations: 100
+ - max number of iterations: 50
 
  - max no improvement iterations : 10
 
  - improvement threshold : 0.005s
 
- - calculated points: 40 from 67
+ - calculated points: 51 from 58
 
- - points from cache: 27 from 67
+ - points from cache: 7 from 58
 
  - number of nodes: 4
 
- - execution time: 0.033s
+ - execution time: 0.036s
 
  - parameters: 
 
@@ -164,32 +168,32 @@
 ┌─────────────┬────────┬────────┬─────────┬─────────────┬──────────┬─────────┬────────┐
 │             │ start  │ min    │ max     │ sum of diff │ expected │ changes │ final  │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ temperature │ 0.9963 │ 0.00   │ 1.00    │ 0.05        │ 0.00     │ 35      │ 1.0000 │
+│ temperature │ 0.9963 │ 0.00   │ 1.00    │ 0.05        │ 0.00     │ 32      │ 1.0000 │
 │ decrease    │        │        │         │             │          │         │        │
 │ coefficient │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ max         │ 170    │ 10.00  │ 200.00  │ 4452.25     │ 71.81    │ 35      │ 18     │
+│ max         │ 170    │ 10.00  │ 200.00  │ 2888.32     │ 53.49    │ 32      │ 24     │
 │ mutations   │        │        │         │             │          │         │        │
 │ per         │        │        │         │             │          │         │        │
 │ dynasty     │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ mutation    │ 0.39   │ 0.10   │ 1.00    │ 7.29        │ 0.12     │ 35      │ 0.13   │
+│ mutation    │ 0.39   │ 0.10   │ 1.00    │ 7.22        │ 0.13     │ 32      │ 0.10   │
 │ rate        │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ crossover   │ 0.81   │ 0.10   │ 1.00    │ 10.88       │ 0.18     │ 35      │ 0.29   │
+│ crossover   │ 0.81   │ 0.10   │ 1.00    │ 8.82        │ 0.16     │ 32      │ 0.28   │
 │ rate        │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ elitism     │ -0.20  │ -      │ -       │ -           │ -        │ -       │ 0.58   │
+│ elitism     │ -0.20  │ -      │ -       │ -           │ -        │ -       │ 0.61   │
 │ rate        │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ max         │ 58     │ 1.00   │ 100.00  │ 1560.73     │ 25.17    │ 35      │ 28     │
+│ max         │ 58     │ 1.00   │ 100.00  │ 1589.45     │ 29.43    │ 32      │ 100    │
 │ stale       │        │        │         │             │          │         │        │
 │ iterations  │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ population  │ 572    │ 10.00  │ 2000.00 │ 44693.82    │ 720.87   │ 35      │ 19     │
+│ population  │ 572    │ 10.00  │ 2000.00 │ 38470.00    │ 712.41   │ 32      │ 46     │
 │ size        │        │        │         │             │          │         │        │
 ├─────────────┼────────┼────────┼─────────┼─────────────┼──────────┼─────────┼────────┤
-│ dynasties   │ 1824   │ 100.00 │ 2000.00 │ 43273.64    │ 697.96   │ 35      │ 123    │
+│ dynasties   │ 1824   │ 100.00 │ 2000.00 │ 34862.61    │ 645.60   │ 32      │ 115    │
 │ limit       │        │        │         │             │          │         │        │
 └─────────────┴────────┴────────┴─────────┴─────────────┴──────────┴─────────┴────────┘
 ```
@@ -201,7 +205,9 @@
  - `max number of iterations` : limit of total iterations of optimization process, termination condition
  - `max no improvement iterations` : max amount of steps performed without detected improvement, termination condition
  - `improvement threshold` : minimal value detected as improvement in objective function result
- - `calculated points` : new calculated points that were not found in cache
+ - `termination reason` : the reason why optimization process was stopped
+ - `iterations number` : actual number of iterations performed during optimization
+ - `resumed after stale` : how many times optimization progress was resumed after some iterations without improvement
  - `points from cache` : points calculated during previous optimizations and read from cache
  - `number of nodes` : number of nodes in graph representing cities from traveling salesman problem
  - `execution time` : duration of shortest found hybrid optimization process using final parameters, measured in seconds
@@ -221,11 +227,11 @@
 │        │ coefficient │ per       │          │           │         │ iterations │            │           │           │
 │        │             │ dynasty   │          │           │         │            │            │           │           │
 ├────────┼─────────────┼───────────┼──────────┼───────────┼─────────┼────────────┼────────────┼───────────┼───────────┤
-│ hybrid │ 0.7349      │ 33        │ 0.13     │ 0.86      │ 0.01    │ 62         │ 1          │ 138       │ 0.008s    │
+│ hybrid │ 0.9999      │ 54        │ 0.02     │ 0.31      │ 0.66    │ 30         │ 10         │ 130       │ 0.018s    │
 ├────────┼─────────────┼───────────┼──────────┼───────────┼─────────┼────────────┼────────────┼───────────┼───────────┤
-│ SA     │ 0.9997      │ 120       │ 1.00     │ 0.00      │ 0.00    │ 87         │ 1          │ 117       │ 0.007s    │
+│ SA     │ 1.0000      │ 110       │ 1.00     │ 0.00      │ 0.00    │ 100        │ 1          │ 123       │ 0.007s    │
 ├────────┼─────────────┼───────────┼──────────┼───────────┼─────────┼────────────┼────────────┼───────────┼───────────┤
-│ GA     │ 1.0000      │ 18        │ 0.13     │ 0.29      │ 0.58    │ 28         │ 19         │ 123       │ 0.033s    │
+│ GA     │ 1.0000      │ 24        │ 0.10     │ 0.28      │ 0.61    │ 100        │ 46         │ 115       │ 0.036s    │
 └────────┴─────────────┴───────────┴──────────┴───────────┴─────────┴────────────┴────────────┴───────────┴───────────┘
 ```
 

From 0a73f11af8c16d825da6ecc5e6135b64562ba5b3 Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Tue, 19 Mar 2024 17:56:02 +0200
Subject: [PATCH 02/49] +test

---
 .../optimization_tools/src/optimal_params_search/nelder_mead.rs  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/move/optimization_tools/src/optimal_params_search/nelder_mead.rs b/module/move/optimization_tools/src/optimal_params_search/nelder_mead.rs
index c379c7441f..ef7e16e19d 100644
--- a/module/move/optimization_tools/src/optimal_params_search/nelder_mead.rs
+++ b/module/move/optimization_tools/src/optimal_params_search/nelder_mead.rs
@@ -503,6 +503,7 @@ where R : RangeBounds< f64 > + Sync,
         let score = self.evaluate_point( &x, &mut stats );
         res.push( ( x, score ) );
       }
+      
       let mut iterations = 0;
       loop
       {

From 995304d399e5919a04928fb3b3fa465df7961d7b Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Tue, 19 Mar 2024 18:15:29 +0200
Subject: [PATCH 03/49] !test

---
 .../optimization_tools/src/optimal_params_search/nelder_mead.rs  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/module/move/optimization_tools/src/optimal_params_search/nelder_mead.rs b/module/move/optimization_tools/src/optimal_params_search/nelder_mead.rs
index ef7e16e19d..c379c7441f 100644
--- a/module/move/optimization_tools/src/optimal_params_search/nelder_mead.rs
+++ b/module/move/optimization_tools/src/optimal_params_search/nelder_mead.rs
@@ -503,7 +503,6 @@ where R : RangeBounds< f64 > + Sync,
         let score = self.evaluate_point( &x, &mut stats );
         res.push( ( x, score ) );
       }
-      
       let mut iterations = 0;
       loop
       {

From aabac5fb3932046ac04b6c46c6c05ed0f1236c4e Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Wed, 20 Mar 2024 14:00:27 +0200
Subject: [PATCH 04/49] fix derives

---
 module/move/optimization_tools/src/hybrid_optimizer/mod.rs      | 2 +-
 .../move/optimization_tools/src/hybrid_optimizer/sim_anneal.rs  | 2 +-
 module/move/optimization_tools/src/problems/sudoku/cell_val.rs  | 2 +-
 module/move/optimization_tools/src/problems/sudoku/sudoku.rs    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/move/optimization_tools/src/hybrid_optimizer/mod.rs b/module/move/optimization_tools/src/hybrid_optimizer/mod.rs
index ac91811d33..90f381f6b6 100644
--- a/module/move/optimization_tools/src/hybrid_optimizer/mod.rs
+++ b/module/move/optimization_tools/src/hybrid_optimizer/mod.rs
@@ -8,7 +8,7 @@ use iter_tools::Itertools;
 use std::ops::RangeInclusive;
 use rayon::iter::{ ParallelIterator, IndexedParallelIterator};
 use deterministic_rand::{ Seed, seq::{ SliceRandom, IteratorRandom } };
-use derive_tools::Display;
+use derive_tools::exposed::Display;
 use optimal_params_search::OptimalProblem;
 
 mod gen_alg;
diff --git a/module/move/optimization_tools/src/hybrid_optimizer/sim_anneal.rs b/module/move/optimization_tools/src/hybrid_optimizer/sim_anneal.rs
index 112760b289..c176729441 100644
--- a/module/move/optimization_tools/src/hybrid_optimizer/sim_anneal.rs
+++ b/module/move/optimization_tools/src/hybrid_optimizer/sim_anneal.rs
@@ -1,6 +1,6 @@
 //! Implementation of Simulated Annealing for Hybrid Optimizer.
 
-use derive_tools::{ FromInner, InnerFrom, Display };
+use derive_tools::{ FromInner, InnerFrom, exposed::Display };
 /// Represents temperature of SA process.
 #[ derive( Default, Debug, Display, Clone, Copy, PartialEq, PartialOrd, FromInner, InnerFrom ) ]
 pub struct Temperature( f64 );
diff --git a/module/move/optimization_tools/src/problems/sudoku/cell_val.rs b/module/move/optimization_tools/src/problems/sudoku/cell_val.rs
index f5b5394b95..f17b3db378 100644
--- a/module/move/optimization_tools/src/problems/sudoku/cell_val.rs
+++ b/module/move/optimization_tools/src/problems/sudoku/cell_val.rs
@@ -1,7 +1,7 @@
 //! Contains CellVal structure that corresponds to single digit on Sudoku field.
 //! 
 
-use derive_tools::Display;
+use derive_tools::exposed::Display;
 
 /// Represents the value of a cell in Sudoku. It can have a value from 1 to 9 or 0 if the cell is not assigned.
 #[ derive( Default, Debug, Display, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash ) ]
diff --git a/module/move/optimization_tools/src/problems/sudoku/sudoku.rs b/module/move/optimization_tools/src/problems/sudoku/sudoku.rs
index e71e3bb1d6..26b83e8e7b 100644
--- a/module/move/optimization_tools/src/problems/sudoku/sudoku.rs
+++ b/module/move/optimization_tools/src/problems/sudoku/sudoku.rs
@@ -4,7 +4,7 @@ use std::collections::HashSet;
 use crate::hybrid_optimizer::*;
 use crate::problems::sudoku::*;
 
-use derive_tools::{ FromInner, InnerFrom, Display };
+use derive_tools::{ FromInner, InnerFrom, exposed::Display };
 use deterministic_rand::{ Hrng, Rng, seq::SliceRandom };
 use iter_tools::Itertools;
 

From 7f0979dfbd838018ce41edb280d6d08059943a41 Mon Sep 17 00:00:00 2001
From: Anton Parfonov <antonparfonov@gmail.com>
Date: Wed, 27 Mar 2024 16:16:35 +0200
Subject: [PATCH 05/49] Add vec with into under the hood. Explain collection
 origins in Readme.md

---
 module/core/collection_tools/Readme.md        |  11 +-
 .../core/collection_tools/src/constructors.rs | 101 ++++++++++++++++--
 module/core/collection_tools/src/lib.rs       |   3 -
 .../collection_tools/tests/inc/constructor.rs |  14 +--
 .../tests/nostd/constructor.rs                |   8 +-
 5 files changed, 115 insertions(+), 22 deletions(-)

diff --git a/module/core/collection_tools/Readme.md b/module/core/collection_tools/Readme.md
index e1d1ba9706..840a5486ef 100644
--- a/module/core/collection_tools/Readme.md
+++ b/module/core/collection_tools/Readme.md
@@ -21,14 +21,15 @@ Consider the following example, which demonstrates the use of the `hmap!` macro
 use collection_tools::*;
 
 let meta_map = hmap! { 3 => 13 };
+
+// reexport from `hashbrown` if `use_alloc` feature is on, otherwise - reexport from `std`
 let mut std_map = collection_tools::HashMap::new();
+
 std_map.insert( 3, 13 );
 assert_eq!( meta_map, std_map );
 # }
 ```
 
-Note: Do not be afraid of `collection_tools::HashMap`. It is basically a reexport of `std`'s `HashMap`, unless you have enabled `use_alloc` feature.
-
 Another example, this time, `bset!`, providing you a `BTreeSet`:
 
 ```rust
@@ -38,7 +39,10 @@ Another example, this time, `bset!`, providing you a `BTreeSet`:
 use collection_tools::*;
 
 let meta_set = bset! { 3, 13 };
+
+// reexport from `alloc`
 let mut std_set = collection_tools::BTreeSet::new();
+
 std_set.insert( 13 );
 std_set.insert( 3 );
 assert_eq!( meta_set, std_set );
@@ -54,7 +58,10 @@ Another example with `list!`:
 use collection_tools::*;
 
 let meta_list : LinkedList< i32 > = list! { 3, 13 };
+
+// reexport from `alloc`
 let mut meta_list = collection_tools::LinkedList::new();
+
 meta_list.push_front( 13 );
 meta_list.push_front( 3 );
 assert_eq!( meta_list, meta_list );
diff --git a/module/core/collection_tools/src/constructors.rs b/module/core/collection_tools/src/constructors.rs
index 24c12b32d4..bc5e84f566 100644
--- a/module/core/collection_tools/src/constructors.rs
+++ b/module/core/collection_tools/src/constructors.rs
@@ -542,6 +542,94 @@ macro_rules! list
   }};
 }
 
+/// Creates a `Vec` from a list of elements.
+///
+/// The `vec!` macro simplifies the creation of a `Vec` with initial elements.
+/// Elements passed to the macro are automatically converted into the vector's element type
+/// using `.into()`, making it convenient to use literals or values of different, but convertible types.
+///
+/// Note: The `vec!` macro utilizes the `.into()` method to convert each element into the target type
+/// of the `Vec`. Therefore, the elements must be compatible with the `Into<T>` trait for the
+/// type `T` used in the `Vec`.
+///
+/// # Syntax
+///
+/// The macro can be called with a comma-separated list of elements. A trailing comma is optional.
+///
+/// ```rust
+/// # use collection_tools::{Vec, vec};
+/// // Vec of i32
+/// let vec1 : Vec< i32 > = vec!( 1, 2, 3, 4, 5 );
+///
+/// // Vec of String
+/// let vec2 : Vec< String > = vec!{ "hello", "world", "rust" };
+///
+/// // With trailing comma
+/// let vec3 : Vec< f64 > = vec!( 1.1, 2.2, 3.3, );
+/// ```
+///
+/// # Parameters
+///
+/// - `$( $key : expr ),* $( , )?`: A comma-separated list of elements to insert into the `Vec`.
+/// Each element can be of any type that implements the `Into<T>` trait, where `T` is the
+/// type stored in the `Vec`.
+///
+/// # Returns
+///
+/// Returns a `Vec` containing all the specified elements. The capacity of the vector is
+/// automatically determined based on the number of elements provided.
+///
+/// # Example
+///
+/// Basic usage with integers:
+///
+/// ```rust
+/// # use collection_tools::{Vec, vec};
+/// let vec : Vec< i32 > = vec!( 1, 2, 3 );
+/// assert_eq!( vec[ 0 ], 1 );
+/// assert_eq!( vec[ 1 ], 2 );
+/// assert_eq!( vec[ 2 ], 3 );
+/// ```
+///
+/// # Example
+///
+/// Using with different types that implement `Into<T>`:
+///
+/// ```rust
+/// # use collection_tools::{Vec, vec};
+/// let words : Vec< String > = vec!( "alpha", "beta", "gamma" );
+/// assert_eq!( words[ 0 ], "alpha" );
+/// assert_eq!( words[ 1 ], "beta" );
+/// assert_eq!( words[ 2 ], "gamma" );
+/// ```
+///
+/// # Example
+///
+/// Creating a `Vec` of `String` from string literals and String objects:
+///
+/// ```rust
+/// # use collection_tools::{Vec, vec};
+/// let mixed : Vec< String > = vec!{ "value", "another value".to_string() };
+/// assert_eq!( mixed[ 0 ], "value" );
+/// assert_eq!( mixed[ 1 ], "another value" );
+/// ```
+///
+#[ macro_export( local_inner_macros ) ]
+macro_rules! vec
+{
+  (
+    $( $key : expr ),* $( , )?
+  )
+  =>
+  {{
+    let mut _vec = collection_tools::Vec::new();
+    $(
+      _vec.push( $key.into() );
+    )*
+    _vec
+  }};
+}
+
 /// Creates a `VecDeque` from a list of elements.
 ///
 /// The `vecd` macro allows for the convenient creation of a `VecDeque` with initial elements.
@@ -620,10 +708,11 @@ macro_rules! vecd
     $( $key : expr ),* $( , )?
   )
   =>
-  {
-    collection_tools::VecDeque::from
-    (
-      collection_tools::vec![ $( $key.into() ),* ]
-    )
-  }
+  {{
+    let mut _vecd = collection_tools::VecDeque::new();
+    $(
+      _vecd.push_back( $key.into() );
+    )*
+    _vecd
+  }};
 }
diff --git a/module/core/collection_tools/src/lib.rs b/module/core/collection_tools/src/lib.rs
index 834304f7ca..878c03f16f 100644
--- a/module/core/collection_tools/src/lib.rs
+++ b/module/core/collection_tools/src/lib.rs
@@ -31,9 +31,6 @@ pub mod protected
   extern crate alloc;
   #[ doc( inline ) ]
   #[ allow( unused_imports ) ]
-  pub use alloc::vec;
-  #[ doc( inline ) ]
-  #[ allow( unused_imports ) ]
   pub use alloc::vec::Vec;
   #[ doc( inline ) ]
   #[ allow( unused_imports ) ]
diff --git a/module/core/collection_tools/tests/inc/constructor.rs b/module/core/collection_tools/tests/inc/constructor.rs
index b94b1842ae..11b3dffaa8 100644
--- a/module/core/collection_tools/tests/inc/constructor.rs
+++ b/module/core/collection_tools/tests/inc/constructor.rs
@@ -10,7 +10,7 @@ fn b_tree_map()
 
   // test.case( "empty" );
   let got : the_module::BTreeMap< i32, i32 > = the_module::bmap!{};
-  let exp : the_module::BTreeMap< i32, i32 > = the_module::BTreeMap::new();
+  let exp = the_module::BTreeMap::new();
   assert_eq!( got, exp );
 
   // test.case( "single entry" );
@@ -30,7 +30,7 @@ fn b_tree_set()
 
   // test.case( "empty" );
   let got : the_module::BTreeSet< i32 > = the_module::bset!{};
-  let exp : the_module::BTreeSet< i32 > = the_module::BTreeSet::new();
+  let exp = the_module::BTreeSet::new();
   assert_eq!( got, exp );
 
   // test.case( "single entry" );
@@ -51,11 +51,11 @@ fn binary_heap()
 
   // test.case( "empty" );
   let got : the_module::BinaryHeap< i32 > = the_module::heap!{};
-  let exp : the_module::BinaryHeap< i32 > = the_module::BinaryHeap::new();
+  let exp = the_module::BinaryHeap::new();
   assert_eq!( got.into_vec(), exp.into_vec() );
 
   // test.case( "single entry" );
-  let got: the_module::BinaryHeap< i32 > = the_module::heap!{ 3, 13 };
+  let got : the_module::BinaryHeap< i32 > = the_module::heap!{ 3, 13 };
   let mut exp = the_module::BinaryHeap::new();
   exp.push(3);
   exp.push(13);
@@ -134,11 +134,11 @@ fn vec()
 
   // test.case( "empty" );
   let got : the_module::Vec< i32 > = the_module::vec!{};
-  let exp: the_module::Vec< i32 > = the_module::Vec::new();
+  let exp = the_module::Vec::new();
   assert_eq!( got, exp );
 
   // test.case( "single entry" );
-  let got = the_module::vec!{ 3, 13 };
+  let got : the_module::Vec< i32 > = the_module::vec!{ 3, 13 };
   let mut exp = the_module::Vec::new();
   exp.push( 3 );
   exp.push( 13 );
@@ -155,7 +155,7 @@ fn vec_deque()
 
   // test.case( "empty" );
   let got : the_module::VecDeque< i32 > = the_module::vecd!{};
-  let exp: the_module::VecDeque< i32 > = the_module::VecDeque::new();
+  let exp = the_module::VecDeque::new();
   assert_eq!( got, exp );
 
   // test.case( "single entry" );
diff --git a/module/core/collection_tools/tests/nostd/constructor.rs b/module/core/collection_tools/tests/nostd/constructor.rs
index b94b1842ae..0e541fddef 100644
--- a/module/core/collection_tools/tests/nostd/constructor.rs
+++ b/module/core/collection_tools/tests/nostd/constructor.rs
@@ -134,11 +134,11 @@ fn vec()
 
   // test.case( "empty" );
   let got : the_module::Vec< i32 > = the_module::vec!{};
-  let exp: the_module::Vec< i32 > = the_module::Vec::new();
+  let exp : the_module::Vec< i32 > = the_module::Vec::new();
   assert_eq!( got, exp );
 
   // test.case( "single entry" );
-  let got = the_module::vec!{ 3, 13 };
+  let got : the_module::Vec< i32 > = the_module::vec!{ 3, 13 };
   let mut exp = the_module::Vec::new();
   exp.push( 3 );
   exp.push( 13 );
@@ -155,11 +155,11 @@ fn vec_deque()
 
   // test.case( "empty" );
   let got : the_module::VecDeque< i32 > = the_module::vecd!{};
-  let exp: the_module::VecDeque< i32 > = the_module::VecDeque::new();
+  let exp = the_module::VecDeque::new();
   assert_eq!( got, exp );
 
   // test.case( "single entry" );
-  let got = the_module::vecd!{ 3, 13 };
+  let got : the_module::VecDeque< i32 > = the_module::vecd!{ 3, 13 };
   let mut exp = the_module::VecDeque::new();
   exp.push_front( 13 );
   exp.push_front( 3 );

From c6022392cef2907f900cb593677a76203b5124d0 Mon Sep 17 00:00:00 2001
From: Anton Parfonov <antonparfonov@gmail.com>
Date: Fri, 29 Mar 2024 12:00:37 +0200
Subject: [PATCH 06/49] Optimizations, doc extension

---
 module/core/collection_tools/Readme.md        | 12 ++-
 .../core/collection_tools/src/constructors.rs | 94 +++++++++++++------
 2 files changed, 74 insertions(+), 32 deletions(-)

diff --git a/module/core/collection_tools/Readme.md b/module/core/collection_tools/Readme.md
index 840a5486ef..07e1bf0e0f 100644
--- a/module/core/collection_tools/Readme.md
+++ b/module/core/collection_tools/Readme.md
@@ -22,7 +22,7 @@ use collection_tools::*;
 
 let meta_map = hmap! { 3 => 13 };
 
-// reexport from `hashbrown` if `use_alloc` feature is on, otherwise - reexport from `std`
+// it is identical to `hashbrown::HashMap` if `use_alloc` feature is on, otherwise `std::collections::HashMap`
 let mut std_map = collection_tools::HashMap::new();
 
 std_map.insert( 3, 13 );
@@ -40,7 +40,7 @@ use collection_tools::*;
 
 let meta_set = bset! { 3, 13 };
 
-// reexport from `alloc`
+// no black magic, just a regular `alloc::BTreeSet` (same as `std::BTreeSet`)
 let mut std_set = collection_tools::BTreeSet::new();
 
 std_set.insert( 13 );
@@ -59,7 +59,7 @@ use collection_tools::*;
 
 let meta_list : LinkedList< i32 > = list! { 3, 13 };
 
-// reexport from `alloc`
+// no black magic, just a regular `alloc::LinkedList` (same as `std::LinkedList`)
 let mut meta_list = collection_tools::LinkedList::new();
 
 meta_list.push_front( 13 );
@@ -107,9 +107,11 @@ assert_eq!( vec.contains( &1 ), true );
 
 ### Collections being used
 
-To support `no_std` environment as much as possible, we aim at using collections from `alloc` whenever its possible.
+So what's the deal with `collection_tools::<collection>`?
 
-If `use_alloc` feature is on, collections available only in `std` are replaced with their `no_std` counterparts. For now, the only replaced collections are `HashMap` and `HashSet` , taken from `hashbrown`.
+Nothing really fancy. We just reuse collections from `alloc` (same as `std`).
+
+But not all collections are available in `alloc` crate. For now, the exceptions are `HashMap` and `HashSet`. This leads to the fact that we can't use them in `no_std` environment. How did we solve this? By using those collections from `hashbrown` crate whenever `no_std` feature is enabled. You can found more details on origin of a collection on its documentation page.
 
 ### MORE Examples
 
diff --git a/module/core/collection_tools/src/constructors.rs b/module/core/collection_tools/src/constructors.rs
index bc5e84f566..0d59dc287b 100644
--- a/module/core/collection_tools/src/constructors.rs
+++ b/module/core/collection_tools/src/constructors.rs
@@ -1,3 +1,25 @@
+/// Not meant to be called directly.
+#[ doc( hidden ) ]
+#[ macro_export( local_inner_macros ) ]
+macro_rules! empty
+{
+  ( @single $( $x : tt )* ) => ( () );
+}
+
+/// Not meant to be called directly.
+#[ doc( hidden ) ]
+#[ macro_export( local_inner_macros ) ]
+macro_rules! count
+{
+  (
+    @count $( $rest : expr ),*
+  )
+  =>
+  (
+    < [ () ] >::len( &[ $( empty!( @single $rest ) ),* ] )
+  );
+}
+
 /// Creates a `BTreeMap` from a list of key-value pairs.
 ///
 /// The `bmap` macro facilitates the convenient creation of a `BTreeMap` with initial elements.
@@ -8,6 +30,10 @@
 /// of the `BTreeMap`. This means that the keys and values must be compatible with the `Into< K >` and `Into< V >` traits
 /// for the key type `K` and value type `V` used in the `BTreeMap`.
 ///
+/// # Origin
+///
+/// This collection is reexported from `alloc`.
+///
 /// # Syntax
 ///
 /// The macro can be called with a comma-separated list of key-value pairs. A trailing comma is optional.
@@ -96,6 +122,10 @@ macro_rules! bmap
 /// of the `BTreeSet`. This means that the elements must be compatible with the `Into<T>` trait for the
 /// type `T` used in the `BTreeSet`.
 ///
+/// # Origin
+///
+/// This collection is reexported from `alloc`.
+///
 /// # Syntax
 ///
 /// The macro can be called with a comma-separated list of elements. A trailing comma is optional.
@@ -166,7 +196,7 @@ macro_rules! bset
   )
   =>
   {{
-    let mut _set = ::collection_tools::BTreeSet::new();
+    let mut _set = collection_tools::BTreeSet::new();
     $(
       _set.insert( $key.into() );
     )*
@@ -184,6 +214,10 @@ macro_rules! bset
 /// of the `BinaryHeap`. This means that the elements must be compatible with the `Into<T>` trait for the
 /// type `T` used in the `BinaryHeap`.
 ///
+/// # Origin
+///
+/// This collection is reexported from `alloc`.
+///
 /// # Syntax
 ///
 /// The macro can be called with a comma-separated list of elements. A trailing comma is optional.
@@ -249,7 +283,8 @@ macro_rules! heap
   )
   =>
   {{
-    let mut _heap = collection_tools::BinaryHeap::new();
+    let _cap = count!( @count $( $key ),* );
+    let mut _heap = collection_tools::BinaryHeap::with_capacity( _cap );
     $(
       _heap.push( $key.into() );
     )*
@@ -267,6 +302,12 @@ macro_rules! heap
 /// of the `HashMap`. This means that the keys and values must be compatible with the `Into<K>` and `Into<V>` traits
 /// for the key type `K` and value type `V` used in the `HashMap`.
 ///
+/// # Origin
+///
+/// This collection can be reexported from different crates:
+/// - from `std`, if `no_std` flag if off
+/// - from `hashbrown`, if `use_alloc` flag if on
+///
 /// # Syntax
 ///
 /// The macro can be called with a comma-separated list of key-value pairs. A trailing comma is optional.
@@ -328,26 +369,15 @@ macro_rules! heap
 /// assert_eq!( pairs.get( &2 ), Some( &"banana".to_string() ) );
 /// ```
 ///
-
 #[macro_export(local_inner_macros)]
 macro_rules! hmap
 {
-  ( @single $( $x : tt )* ) => ( () );
-
-  (
-    @count $( $rest : expr ),*
-  )
-  =>
-  (
-    < [ () ] >::len( &[ $( hmap!( @single $rest ) ),* ] )
-  );
-
   (
     $( $key : expr => $value : expr ),* $( , )?
   )
   =>
   {{
-    let _cap = hmap!( @count $( $key ),* );
+    let _cap = count!( @count $( $key ),* );
     let mut _map = collection_tools::HashMap::with_capacity( _cap );
     $(
       let _ = _map.insert( $key.into(), $value.into() );
@@ -366,6 +396,10 @@ macro_rules! hmap
 /// of the `HashSet`. This means that the elements must be compatible with the `Into< T >` trait for the
 /// type `T` used in the `HashSet`.
 ///
+/// This collection can be reexported from different crates:
+/// - from `std`, if `no_std` flag if off
+/// - from `hashbrown`, if `use_alloc` flag if on
+///
 /// # Syntax
 ///
 /// The macro can be called with a comma-separated list of elements. A trailing comma is optional.
@@ -431,22 +465,12 @@ macro_rules! hmap
 #[ macro_export( local_inner_macros ) ]
 macro_rules! hset
 {
-  ( @single $( $x : tt )* ) => ( () );
-
-  (
-    @count $( $rest : expr ),*
-  )
-  =>
-  (
-    < [ () ] >::len( &[ $( hset!( @single $rest ) ),* ] )
-  );
-
   (
     $( $key : expr ),* $( , )?
   )
   =>
   {{
-    let _cap = hset!( @count $( $key ),* );
+    let _cap = count!( @count $( $key ),* );
     let mut _set = collection_tools::HashSet::with_capacity( _cap );
     $(
       let _ = _set.insert( $key.into() );
@@ -465,6 +489,10 @@ macro_rules! hset
 /// of the `LinkedList`. Therefore, the elements must be compatible with the `Into<T>` trait for the
 /// type `T` used in the `LinkedList`.
 ///
+/// # Origin
+///
+/// This collection is reexported from `alloc`.
+///
 /// # Syntax
 ///
 /// The macro can be called with a comma-separated list of elements. A trailing comma is optional.
@@ -534,6 +562,8 @@ macro_rules! list
   )
   =>
   {{
+    // "The LinkedList allows pushing and popping elements at either end in constant time."
+    // So no `with_capacity`
     let mut _lst = collection_tools::LinkedList::new();
     $(
       _lst.push_back( $key.into() );
@@ -552,6 +582,10 @@ macro_rules! list
 /// of the `Vec`. Therefore, the elements must be compatible with the `Into<T>` trait for the
 /// type `T` used in the `Vec`.
 ///
+/// # Origin
+///
+/// This collection is reexported from `alloc`.
+///
 /// # Syntax
 ///
 /// The macro can be called with a comma-separated list of elements. A trailing comma is optional.
@@ -622,7 +656,8 @@ macro_rules! vec
   )
   =>
   {{
-    let mut _vec = collection_tools::Vec::new();
+    let _cap = count!( @count $( $key ),* );
+    let mut _vec = collection_tools::Vec::with_capacity( _cap );
     $(
       _vec.push( $key.into() );
     )*
@@ -640,6 +675,10 @@ macro_rules! vec
 /// of the `VecDeque`. This means that the elements must be compatible with the `Into<T>` trait for the
 /// type `T` used in the `VecDeque`.
 ///
+/// # Origin
+///
+/// This collection is reexported from `alloc`.
+///
 /// # Syntax
 ///
 /// The macro can be called with a comma-separated list of elements. A trailing comma is optional.
@@ -709,7 +748,8 @@ macro_rules! vecd
   )
   =>
   {{
-    let mut _vecd = collection_tools::VecDeque::new();
+    let _cap = count!( @count $( $key ),* );
+    let mut _vecd = collection_tools::VecDeque::with_capacity( _cap );
     $(
       _vecd.push_back( $key.into() );
     )*

From bdbb996347dbd14933e88b01d7d8d6478260083a Mon Sep 17 00:00:00 2001
From: Anton Parfonov <antonparfonov@gmail.com>
Date: Fri, 29 Mar 2024 13:12:46 +0200
Subject: [PATCH 07/49] Rename macro to into_

---
 module/core/collection_tools/Cargo.toml       |   3 +
 module/core/collection_tools/Readme.md        |   8 +-
 .../examples/collection_tools_trivial.rs      |   2 +-
 .../{constructors.rs => into_constructors.rs} | 234 +++++++++---------
 module/core/collection_tools/src/lib.rs       |   8 +-
 .../collection_tools/tests/inc/constructor.rs |  32 +--
 .../tests/nostd/constructor.rs                |  32 +--
 7 files changed, 158 insertions(+), 161 deletions(-)
 rename module/core/collection_tools/src/{constructors.rs => into_constructors.rs} (68%)

diff --git a/module/core/collection_tools/Cargo.toml b/module/core/collection_tools/Cargo.toml
index 4331277b94..4cc1addaca 100644
--- a/module/core/collection_tools/Cargo.toml
+++ b/module/core/collection_tools/Cargo.toml
@@ -41,6 +41,7 @@ use_alloc = [
 default = [
   "enabled",
   "collection_constructors",
+  "collection_into_constructors",
   "collection_std",
 ]
 full = [
@@ -52,6 +53,8 @@ enabled = []
 
 # Collection constructors, like `hmap!{ "key" => "val" }`
 collection_constructors = []
+# Collection constructors, using `into()` under the hood, like `into_hmap!( "key" => "val" )`
+collection_into_constructors = []
 # STD collection for no_std.
 collection_std = []
 
diff --git a/module/core/collection_tools/Readme.md b/module/core/collection_tools/Readme.md
index 07e1bf0e0f..fc9218946b 100644
--- a/module/core/collection_tools/Readme.md
+++ b/module/core/collection_tools/Readme.md
@@ -20,7 +20,7 @@ Consider the following example, which demonstrates the use of the `hmap!` macro
 # {
 use collection_tools::*;
 
-let meta_map = hmap! { 3 => 13 };
+let meta_map = into_hmap! { 3 => 13 };
 
 // it is identical to `hashbrown::HashMap` if `use_alloc` feature is on, otherwise `std::collections::HashMap`
 let mut std_map = collection_tools::HashMap::new();
@@ -30,7 +30,7 @@ assert_eq!( meta_map, std_map );
 # }
 ```
 
-Another example, this time, `bset!`, providing you a `BTreeSet`:
+Another example, this time, `into_bset!`, providing you a `BTreeSet`:
 
 ```rust
 # #[ cfg( all( feature = "enabled", feature = "collection_constructors" ) ) ]
@@ -38,7 +38,7 @@ Another example, this time, `bset!`, providing you a `BTreeSet`:
 # {
 use collection_tools::*;
 
-let meta_set = bset! { 3, 13 };
+let meta_set = into_bset! { 3, 13 };
 
 // no black magic, just a regular `alloc::BTreeSet` (same as `std::BTreeSet`)
 let mut std_set = collection_tools::BTreeSet::new();
@@ -57,7 +57,7 @@ Another example with `list!`:
 # {
 use collection_tools::*;
 
-let meta_list : LinkedList< i32 > = list! { 3, 13 };
+let meta_list : LinkedList< i32 > = into_list! { 3, 13 };
 
 // no black magic, just a regular `alloc::LinkedList` (same as `std::LinkedList`)
 let mut meta_list = collection_tools::LinkedList::new();
diff --git a/module/core/collection_tools/examples/collection_tools_trivial.rs b/module/core/collection_tools/examples/collection_tools_trivial.rs
index b817a50c84..adad43e7ab 100644
--- a/module/core/collection_tools/examples/collection_tools_trivial.rs
+++ b/module/core/collection_tools/examples/collection_tools_trivial.rs
@@ -34,7 +34,7 @@ fn main(){}
 fn main()
 {
   use collection_tools::*;
-  let map = hmap! { 3 => 13 };
+  let map = into_hmap! { 3 => 13 };
   let mut expected = collection_tools::HashMap::new();
   expected.insert( 3, 13 );
   assert_eq!( map, expected );
diff --git a/module/core/collection_tools/src/constructors.rs b/module/core/collection_tools/src/into_constructors.rs
similarity index 68%
rename from module/core/collection_tools/src/constructors.rs
rename to module/core/collection_tools/src/into_constructors.rs
index 0d59dc287b..8e9e7a05dc 100644
--- a/module/core/collection_tools/src/constructors.rs
+++ b/module/core/collection_tools/src/into_constructors.rs
@@ -1,34 +1,28 @@
 /// Not meant to be called directly.
 #[ doc( hidden ) ]
 #[ macro_export( local_inner_macros ) ]
-macro_rules! empty
+macro_rules! count
 {
   ( @single $( $x : tt )* ) => ( () );
-}
 
-/// Not meant to be called directly.
-#[ doc( hidden ) ]
-#[ macro_export( local_inner_macros ) ]
-macro_rules! count
-{
   (
     @count $( $rest : expr ),*
   )
   =>
   (
-    < [ () ] >::len( &[ $( empty!( @single $rest ) ),* ] )
+    < [ () ] >::len( &[ $( count!( @single $rest ) ),* ] )
   );
-}
+} 
 
 /// Creates a `BTreeMap` from a list of key-value pairs.
 ///
-/// The `bmap` macro facilitates the convenient creation of a `BTreeMap` with initial elements.
+/// The `into_bmap` macro facilitates the convenient creation of a `BTreeMap` with initial elements.
 /// Keys and values passed to the macro are automatically converted into the map's key and value types
 /// using `.into()`, enabling the use of literals or values of different, but convertible types.
 ///
-/// Note: The `bmap` macro relies on the `.into()` method to convert each key and value into the target types
+/// Note: The `into_bmap` macro relies on the `.into()` method to convert each key and value into the target types
 /// of the `BTreeMap`. This means that the keys and values must be compatible with the `Into< K >` and `Into< V >` traits
-/// for the key type `K` and value type `V` used in the `BTreeMap`.
+/// for the key type `K` and value type `V` used in the `BTreeMap`. Also, this means that sometimes you must specify the type of collection's items.
 ///
 /// # Origin
 ///
@@ -39,15 +33,15 @@ macro_rules! count
 /// The macro can be called with a comma-separated list of key-value pairs. A trailing comma is optional.
 ///
 /// ```rust
-/// # use collection_tools::{ BTreeMap, bmap };
+/// # use collection_tools::{ BTreeMap, into_bmap };
 /// // BTreeMap of &str to i32
-/// let map1 : BTreeMap< &str, i32 > = bmap!( "one" => 1, "two" => 2, "three" => 3 );
+/// let map1 : BTreeMap< &str, i32 > = into_bmap!( "one" => 1, "two" => 2, "three" => 3 );
 ///
 /// // BTreeMap of String to String
-/// let map2 : BTreeMap< String, String > = bmap!{ "name" => "value" };
+/// let map2 : BTreeMap< String, String > = into_bmap!{ "name" => "value" };
 ///
 /// // With trailing comma
-/// let map3 : BTreeMap< i32, &str > = bmap!( 1 => "one", 2 => "two", 3 => "three", );
+/// let map3 : BTreeMap< i32, &str > = into_bmap!( 1 => "one", 2 => "two", 3 => "three", );
 /// ```
 ///
 /// # Parameters
@@ -66,8 +60,8 @@ macro_rules! count
 /// Basic usage with string slices and integer values:
 ///
 /// ```rust
-/// # use collection_tools::{ BTreeMap, bmap };
-/// let map : BTreeMap< &str, i32 > = bmap!( "one" => 1, "two" => 2, "three" => 3 );
+/// # use collection_tools::{ BTreeMap, into_bmap };
+/// let map : BTreeMap< &str, i32 > = into_bmap!( "one" => 1, "two" => 2, "three" => 3 );
 /// assert_eq!( map.get( "one" ), Some( &1 ) );
 /// assert_eq!( map.get( "two" ), Some( &2 ) );
 /// assert_eq!( map.get( "three" ), Some( &3 ) );
@@ -78,8 +72,8 @@ macro_rules! count
 /// Using with different types that implement `Into< K >` and `Into< V >`:
 ///
 /// ```rust
-/// # use collection_tools::{ BTreeMap, bmap };
-/// let months : BTreeMap< String, i32 > = bmap!( "January" => 1, "February" => 2, "March" => 3 );
+/// # use collection_tools::{ BTreeMap, into_bmap };
+/// let months : BTreeMap< String, i32 > = into_bmap!( "January" => 1, "February" => 2, "March" => 3 );
 /// assert_eq!( months.get( &"January".to_string() ), Some( &1 ) );
 /// assert_eq!( months.get( &"February".to_string() ), Some( &2 ) );
 /// ```
@@ -89,15 +83,15 @@ macro_rules! count
 /// Creating a `BTreeMap` of integers to strings from literals:
 ///
 /// ```rust
-/// # use collection_tools::{ BTreeMap, bmap };
-/// let numbers : BTreeMap< i32, String > = bmap!( 1 => "one", 2 => "two", 3 => "three" );
+/// # use collection_tools::{ BTreeMap, into_bmap };
+/// let numbers : BTreeMap< i32, String > = into_bmap!( 1 => "one", 2 => "two", 3 => "three" );
 /// assert_eq!( numbers.get( &1 ), Some( &"one".to_string() ) );
 /// assert_eq!( numbers.get( &2 ), Some( &"two".to_string() ) );
 /// assert_eq!( numbers.get( &3 ), Some( &"three".to_string() ) );
 /// ```
 ///
 #[ macro_export( local_inner_macros ) ]
-macro_rules! bmap
+macro_rules! into_bmap
 {
   (
     $( $key : expr => $value : expr ),* $( , )?
@@ -114,13 +108,13 @@ macro_rules! bmap
 
 /// Creates a `BTreeSet` from a list of elements.
 ///
-/// The `bset` macro allows for convenient creation of a `BTreeSet` with initial elements.
+/// The `into_bset` macro allows for convenient creation of a `BTreeSet` with initial elements.
 /// Elements passed to the macro are automatically converted into the set's element type
 /// using `.into()`, facilitating the use of literals or values of different, but convertible types.
 ///
-/// Note: The `bset` macro relies on the `.into()` method to convert each element into the target type
+/// Note: The `into_bset` macro relies on the `.into()` method to convert each element into the target type
 /// of the `BTreeSet`. This means that the elements must be compatible with the `Into<T>` trait for the
-/// type `T` used in the `BTreeSet`.
+/// type `T` used in the `BTreeSet`. Also, this means that sometimes you must specify the type of collection's items.
 ///
 /// # Origin
 ///
@@ -131,15 +125,15 @@ macro_rules! bmap
 /// The macro can be called with a comma-separated list of elements. A trailing comma is optional.
 ///
 /// ```rust
-/// # use collection_tools::{ BTreeSet, bset };
+/// # use collection_tools::{ BTreeSet, into_bset };
 /// // BTreeSet of &str
-/// let set1 : BTreeSet< &str > = bset!( "a", "b", "c" );
+/// let set1 : BTreeSet< &str > = into_bset!( "a", "b", "c" );
 ///
 /// // BTreeSet of String
-/// let set2 : BTreeSet< String > = bset!{ "a".to_string(), "b", "c" };
+/// let set2 : BTreeSet< String > = into_bset!{ "a".to_string(), "b", "c" };
 ///
 /// // With trailing comma
-/// let set3 : BTreeSet< i32 > = bset!( 1, 2, 3, );
+/// let set3 : BTreeSet< i32 > = into_bset!( 1, 2, 3, );
 /// ```
 ///
 /// # Parameters
@@ -158,8 +152,8 @@ macro_rules! bmap
 /// Basic usage with string slices:
 ///
 /// ```rust
-/// # use collection_tools::{ BTreeSet, bset };
-/// let set  : BTreeSet< &str > = bset!( "one", "two", "three" );
+/// # use collection_tools::{ BTreeSet, into_bset };
+/// let set  : BTreeSet< &str > = into_bset!( "one", "two", "three" );
 /// assert!( set.contains( "one" ) );
 /// assert!( set.contains( "two" ) );
 /// assert!( set.contains( "three" ) );
@@ -171,8 +165,8 @@ macro_rules! bmap
 /// Using with different types that implement `Into<T>`:
 ///
 /// ```rust
-/// # use collection_tools::{ BTreeSet, bset };
-/// let numbers : BTreeSet< i32 > = bset!( 1, 2, 3 );
+/// # use collection_tools::{ BTreeSet, into_bset };
+/// let numbers : BTreeSet< i32 > = into_bset!( 1, 2, 3 );
 /// assert!( numbers.contains( &1 ) );
 /// assert!( numbers.contains( &2 ) );
 /// assert!( numbers.contains( &3 ) );
@@ -183,13 +177,13 @@ macro_rules! bmap
 /// Creating a `BTreeSet` of `String` from string literals:
 ///
 /// ```rust
-/// # use collection_tools::{ BTreeSet, bset };
-/// let s : BTreeSet< String > = bset!{ "value" };
+/// # use collection_tools::{ BTreeSet, into_bset };
+/// let s : BTreeSet< String > = into_bset!{ "value" };
 /// assert!( s.contains( "value" ) );
 /// ```
 ///
 #[ macro_export( local_inner_macros ) ]
-macro_rules! bset
+macro_rules! into_bset
 {
   (
     $( $key : expr ),* $( , )?
@@ -206,13 +200,13 @@ macro_rules! bset
 
 /// Creates a `BinaryHeap` from a list of elements.
 ///
-/// The `heap` macro simplifies the creation of a `BinaryHeap` with initial elements.
+/// The `into_heap` macro simplifies the creation of a `BinaryHeap` with initial elements.
 /// Elements passed to the macro are automatically converted into the heap's element type
 /// using `.into()`, allowing for the use of literals or values of different, but convertible types.
 ///
-/// Note: The `heap` macro utilizes the `.into()` method to convert each element into the target type
+/// Note: The `into_heap` macro utilizes the `.into()` method to convert each element into the target type
 /// of the `BinaryHeap`. This means that the elements must be compatible with the `Into<T>` trait for the
-/// type `T` used in the `BinaryHeap`.
+/// type `T` used in the `BinaryHeap`. Also, this means that sometimes you must specify the type of collection's items.
 ///
 /// # Origin
 ///
@@ -223,15 +217,15 @@ macro_rules! bset
 /// The macro can be called with a comma-separated list of elements. A trailing comma is optional.
 ///
 /// ```rust
-/// # use collection_tools::{ BinaryHeap, heap };
+/// # use collection_tools::{ BinaryHeap, into_heap };
 /// // BinaryHeap of i32
-/// let heap1 : BinaryHeap< i32 > = heap!( 3, 1, 4, 1, 5, 9 );
+/// let heap1 : BinaryHeap< i32 > = into_heap!( 3, 1, 4, 1, 5, 9 );
 ///
 /// // BinaryHeap of String
-/// let heap2 : BinaryHeap< String > = heap!{ "pear".to_string(), "apple", "banana" };
+/// let heap2 : BinaryHeap< String > = into_heap!{ "pear".to_string(), "apple", "banana" };
 ///
 /// // With trailing comma
-/// let heap3 : BinaryHeap< i32 > = heap!( 2, 7, 1, 8, );
+/// let heap3 : BinaryHeap< i32 > = into_heap!( 2, 7, 1, 8, );
 /// ```
 ///
 /// # Parameters
@@ -250,8 +244,8 @@ macro_rules! bset
 /// Basic usage with integers:
 ///
 /// ```rust
-/// # use collection_tools::{ BinaryHeap, heap };
-/// let heap : BinaryHeap< i32 > = heap!( 5, 3, 7, 1 );
+/// # use collection_tools::{ BinaryHeap, into_heap };
+/// let heap : BinaryHeap< i32 > = into_heap!( 5, 3, 7, 1 );
 /// assert_eq!( heap.peek(), Some( &7 ) ); // The largest value is at the top of the heap
 /// ```
 ///
@@ -260,8 +254,8 @@ macro_rules! bset
 /// Using with different types that implement `Into<T>`:
 ///
 /// ```rust
-/// # use collection_tools::{ BinaryHeap, heap };
-/// let chars : BinaryHeap< char > = heap!( 'a', 'b', 'c' );
+/// # use collection_tools::{ BinaryHeap, into_heap };
+/// let chars : BinaryHeap< char > = into_heap!( 'a', 'b', 'c' );
 /// assert_eq!( chars.peek(), Some( &'c' ) ); // Characters are ordered by their ASCII value
 /// ```
 ///
@@ -270,13 +264,13 @@ macro_rules! bset
 /// Creating a `BinaryHeap` of `String` from string literals:
 ///
 /// ```rust
-/// # use collection_tools::{ BinaryHeap, heap };
-/// let fruits : BinaryHeap< String > = heap!{ "cherry", "apple", "banana" };
+/// # use collection_tools::{ BinaryHeap, into_heap };
+/// let fruits : BinaryHeap< String > = into_heap!{ "cherry", "apple", "banana" };
 /// assert_eq!( fruits.peek(), Some( &"cherry".to_string() ) ); // The lexicographically largest value is at the top
 /// ```
 ///
 #[ macro_export( local_inner_macros ) ]
-macro_rules! heap
+macro_rules! into_heap
 {
   (
     $( $key : expr ),* $( , )?
@@ -294,13 +288,13 @@ macro_rules! heap
 
 /// Creates a `HashMap` from a list of key-value pairs.
 ///
-/// The `hmap` macro allows for convenient creation of a `HashMap` with initial elements.
+/// The `into_hmap` macro allows for convenient creation of a `HashMap` with initial elements.
 /// Keys and values passed to the macro are automatically converted into the map's key and value types
 /// using `.into()`, enabling the use of literals or values of different, but convertible types.
 ///
-/// Note: The `hmap` macro relies on the `.into()` method to convert each key and value into the target types
+/// Note: The `into_hmap` macro relies on the `.into()` method to convert each key and value into the target types
 /// of the `HashMap`. This means that the keys and values must be compatible with the `Into<K>` and `Into<V>` traits
-/// for the key type `K` and value type `V` used in the `HashMap`.
+/// for the key type `K` and value type `V` used in the `HashMap`. Also, this means that sometimes you must specify the type of collection's items.
 ///
 /// # Origin
 ///
@@ -313,15 +307,15 @@ macro_rules! heap
 /// The macro can be called with a comma-separated list of key-value pairs. A trailing comma is optional.
 ///
 /// ```rust
-/// # use collection_tools::{ HashMap, hmap };
+/// # use collection_tools::{ HashMap, into_hmap };
 /// // HashMap of &str to i32
-/// let map1 : HashMap< &str, i32 > = hmap!( "one" => 1, "two" => 2, "three" => 3 );
+/// let map1 : HashMap< &str, i32 > = into_hmap!( "one" => 1, "two" => 2, "three" => 3 );
 ///
 /// // HashMap of String to String
-/// let map2 : HashMap< String, String > = hmap!{ "name".to_string() => "value".to_string(), "type" => "example" };
+/// let map2 : HashMap< String, String > = into_hmap!{ "name".to_string() => "value".to_string(), "type" => "example" };
 ///
 /// // With trailing comma
-/// let map3 : HashMap< i32, &str > = hmap!( 1 => "one", 2 => "two", 3 => "three", );
+/// let map3 : HashMap< i32, &str > = into_hmap!( 1 => "one", 2 => "two", 3 => "three", );
 /// ```
 ///
 /// # Parameters
@@ -340,8 +334,8 @@ macro_rules! heap
 /// Basic usage with string slices and integer values:
 ///
 /// ```rust
-/// # use collection_tools::{ HashMap, hmap };
-/// let map : HashMap< &str, i32 > = hmap!( "one" => 1, "two" => 2, "three" => 3 );
+/// # use collection_tools::{ HashMap, into_hmap };
+/// let map : HashMap< &str, i32 > = into_hmap!( "one" => 1, "two" => 2, "three" => 3 );
 /// assert_eq!( map.get( "one" ), Some( &1 ) );
 /// assert_eq!( map.get( "two" ), Some( &2 ) );
 /// assert_eq!( map.get( "three" ), Some( &3 ) );
@@ -352,8 +346,8 @@ macro_rules! heap
 /// Using with different types that implement `Into<K>` and `Into<V>`:
 ///
 /// ```rust
-/// # use collection_tools::{ HashMap, hmap };
-/// let items : HashMap< String, i32 > = hmap!( "pen" => 10, "book" => 45, "eraser" => 5 );
+/// # use collection_tools::{ HashMap, into_hmap };
+/// let items : HashMap< String, i32 > = into_hmap!( "pen" => 10, "book" => 45, "eraser" => 5 );
 /// assert_eq!( items.get( &"pen".to_string() ), Some(&10 ) );
 /// assert_eq!( items.get( &"book".to_string() ), Some(&45 ) );
 /// ```
@@ -363,14 +357,14 @@ macro_rules! heap
 /// Creating a `HashMap` of integers to strings from literals:
 ///
 /// ```rust
-/// # use collection_tools::{ HashMap, hmap };
-/// let pairs : HashMap< i32, String > = hmap!( 1 => "apple", 2 => "banana" );
+/// # use collection_tools::{ HashMap, into_hmap };
+/// let pairs : HashMap< i32, String > = into_hmap!( 1 => "apple", 2 => "banana" );
 /// assert_eq!( pairs.get( &1 ), Some( &"apple".to_string() ) );
 /// assert_eq!( pairs.get( &2 ), Some( &"banana".to_string() ) );
 /// ```
 ///
 #[macro_export(local_inner_macros)]
-macro_rules! hmap
+macro_rules! into_hmap
 {
   (
     $( $key : expr => $value : expr ),* $( , )?
@@ -388,13 +382,13 @@ macro_rules! hmap
 
 /// Creates a `HashSet` from a list of elements.
 ///
-/// The `hset` macro allows for convenient creation of a `HashSet` with initial elements.
+/// The `into_hset` macro allows for convenient creation of a `HashSet` with initial elements.
 /// Elements passed to the macro are automatically converted into the set's element type
 /// using `.into()`, facilitating the use of literals or values of different, but convertible types.
 ///
-/// Note: The `hset` macro relies on the `.into()` method to convert each element into the target type
+/// Note: The `into_hset` macro relies on the `.into()` method to convert each element into the target type
 /// of the `HashSet`. This means that the elements must be compatible with the `Into< T >` trait for the
-/// type `T` used in the `HashSet`.
+/// type `T` used in the `HashSet`. Also, this means that sometimes you must specify the type of collection's items.
 ///
 /// This collection can be reexported from different crates:
 /// - from `std`, if `no_std` flag if off
@@ -405,15 +399,15 @@ macro_rules! hmap
 /// The macro can be called with a comma-separated list of elements. A trailing comma is optional.
 ///
 /// ```rust
-/// # use collection_tools::{ HashSet, hset };
+/// # use collection_tools::{ HashSet, into_hset };
 /// // HashSet of &str
-/// let set1 : HashSet< &str > = hset!( "a", "b", "c" );
+/// let set1 : HashSet< &str > = into_hset!( "a", "b", "c" );
 ///
 /// // HashSet of String
-/// let set2 : HashSet< String > = hset!{ "a".to_string(), "b", "c" };
+/// let set2 : HashSet< String > = into_hset!{ "a".to_string(), "b", "c" };
 ///
 /// // With trailing comma
-/// let set3 : HashSet< i32 > = hset!( 1, 2, 3, );
+/// let set3 : HashSet< i32 > = into_hset!( 1, 2, 3, );
 /// ```
 ///
 /// # Parameters
@@ -432,8 +426,8 @@ macro_rules! hmap
 /// Basic usage with string slices:
 ///
 /// ```rust
-/// # use collection_tools::{ HashSet, hset };
-/// let set : HashSet< &str > = hset!( "one", "two", "three" );
+/// # use collection_tools::{ HashSet, into_hset };
+/// let set : HashSet< &str > = into_hset!( "one", "two", "three" );
 /// assert!( set.contains( "one" ) );
 /// assert!( set.contains( "two" ) );
 /// assert!( set.contains( "three" ) );
@@ -445,8 +439,8 @@ macro_rules! hmap
 /// Using with different types that implement `Into< T >`:
 ///
 /// ```rust
-/// # use collection_tools::{ HashSet, hset };
-/// let numbers : HashSet< i32 > = hset!( 1, 2, 3 );
+/// # use collection_tools::{ HashSet, into_hset };
+/// let numbers : HashSet< i32 > = into_hset!( 1, 2, 3 );
 /// assert!( numbers.contains( &1 ) );
 /// assert!( numbers.contains( &2 ) );
 /// assert!( numbers.contains( &3 ) );
@@ -457,13 +451,13 @@ macro_rules! hmap
 /// Creating a `HashSet` of `String` from string literals:
 ///
 /// ```rust
-/// # use collection_tools::{ HashSet, hset };
-/// let s : HashSet< String > = hset!{ "value" };
+/// # use collection_tools::{ HashSet, into_hset };
+/// let s : HashSet< String > = into_hset!{ "value" };
 /// assert_eq!( s.get( "value" ), Some( &"value".to_string() ) );
 /// ```
 ///
 #[ macro_export( local_inner_macros ) ]
-macro_rules! hset
+macro_rules! into_hset
 {
   (
     $( $key : expr ),* $( , )?
@@ -481,13 +475,13 @@ macro_rules! hset
 
 /// Creates a `LinkedList` from a list of elements.
 ///
-/// The `list` macro facilitates the creation of a `LinkedList` with initial elements.
+/// The `into_list` macro facilitates the creation of a `LinkedList` with initial elements.
 /// Elements passed to the macro are automatically converted into the list's element type
 /// using `.into()`, making it convenient to use literals or values of different, but convertible types.
 ///
-/// Note: The `list` macro leverages the `.into()` method to convert each element into the target type
+/// Note: The `into_list` macro leverages the `.into()` method to convert each element into the target type
 /// of the `LinkedList`. Therefore, the elements must be compatible with the `Into<T>` trait for the
-/// type `T` used in the `LinkedList`.
+/// type `T` used in the `LinkedList`. Also, this means that sometimes you must specify the type of collection's items.
 ///
 /// # Origin
 ///
@@ -498,15 +492,15 @@ macro_rules! hset
 /// The macro can be called with a comma-separated list of elements. A trailing comma is optional.
 ///
 /// ```rust
-/// # use collection_tools::{ LinkedList, list };
+/// # use collection_tools::{ LinkedList, into_list };
 /// // LinkedList of i32
-/// let lst1 : LinkedList< i32 > = list!( 1, 2, 3, 4, 5 );
+/// let lst1 : LinkedList< i32 > = into_list!( 1, 2, 3, 4, 5 );
 ///
 /// // LinkedList of String
-/// let lst2 : LinkedList< String > = list!{ "hello".to_string(), "world", "rust" };
+/// let lst2 : LinkedList< String > = into_list!{ "hello".to_string(), "world", "rust" };
 ///
 /// // With trailing comma
-/// let lst3 : LinkedList< f64 > = list!( 1.1, 2.2, 3.3, );
+/// let lst3 : LinkedList< f64 > = into_list!( 1.1, 2.2, 3.3, );
 /// ```
 ///
 /// # Parameters
@@ -525,8 +519,8 @@ macro_rules! hset
 /// Basic usage with integers:
 ///
 /// ```rust
-/// # use collection_tools::{ LinkedList, list };
-/// let lst: LinkedList< i32 > = list!( 1, 2, 3 );
+/// # use collection_tools::{ LinkedList, into_list };
+/// let lst: LinkedList< i32 > = into_list!( 1, 2, 3 );
 /// assert_eq!( lst.front(), Some( &1 ) ); // The first element is 1
 /// assert_eq!( lst.back(), Some( &3 ) ); // The last element is 3
 /// ```
@@ -536,8 +530,8 @@ macro_rules! hset
 /// Using with different types that implement `Into<T>`:
 ///
 /// ```rust
-/// # use collection_tools::{ LinkedList, list };
-/// let chars : LinkedList< String > = list!( "a", "b", "c" );
+/// # use collection_tools::{ LinkedList, into_list };
+/// let chars : LinkedList< String > = into_list!( "a", "b", "c" );
 /// assert!( chars.contains( &"a".to_string() ) );
 /// assert!( chars.contains( &"b".to_string() ) );
 /// assert!( chars.contains( &"c".to_string() ) );
@@ -548,14 +542,14 @@ macro_rules! hset
 /// Creating a `LinkedList` of `String` from string literals:
 ///
 /// ```rust
-/// # use collection_tools::{ LinkedList, list };
-/// let fruits : LinkedList< String > = list!{ "apple", "banana", "cherry" };
+/// # use collection_tools::{ LinkedList, into_list };
+/// let fruits : LinkedList< String > = into_list!{ "apple", "banana", "cherry" };
 /// assert_eq!( fruits.front(), Some( &"apple".to_string() ) ); // The first element
 /// assert_eq!( fruits.back(), Some( &"cherry".to_string() ) ); // The last element
 /// ```
 ///
 #[ macro_export( local_inner_macros ) ]
-macro_rules! list
+macro_rules! into_list
 {
   (
     $( $key : expr ),* $( , )?
@@ -574,13 +568,13 @@ macro_rules! list
 
 /// Creates a `Vec` from a list of elements.
 ///
-/// The `vec!` macro simplifies the creation of a `Vec` with initial elements.
+/// The `into_vec!` macro simplifies the creation of a `Vec` with initial elements.
 /// Elements passed to the macro are automatically converted into the vector's element type
 /// using `.into()`, making it convenient to use literals or values of different, but convertible types.
 ///
-/// Note: The `vec!` macro utilizes the `.into()` method to convert each element into the target type
+/// Note: The `into_vec!` macro utilizes the `.into()` method to convert each element into the target type
 /// of the `Vec`. Therefore, the elements must be compatible with the `Into<T>` trait for the
-/// type `T` used in the `Vec`.
+/// type `T` used in the `Vec`. Also, this means that sometimes you must specify the type of collection's items.
 ///
 /// # Origin
 ///
@@ -591,15 +585,15 @@ macro_rules! list
 /// The macro can be called with a comma-separated list of elements. A trailing comma is optional.
 ///
 /// ```rust
-/// # use collection_tools::{Vec, vec};
+/// # use collection_tools::{Vec, into_vec};
 /// // Vec of i32
-/// let vec1 : Vec< i32 > = vec!( 1, 2, 3, 4, 5 );
+/// let vec1 : Vec< i32 > = into_vec!( 1, 2, 3, 4, 5 );
 ///
 /// // Vec of String
-/// let vec2 : Vec< String > = vec!{ "hello", "world", "rust" };
+/// let vec2 : Vec< String > = into_vec!{ "hello", "world", "rust" };
 ///
 /// // With trailing comma
-/// let vec3 : Vec< f64 > = vec!( 1.1, 2.2, 3.3, );
+/// let vec3 : Vec< f64 > = into_vec!( 1.1, 2.2, 3.3, );
 /// ```
 ///
 /// # Parameters
@@ -618,8 +612,8 @@ macro_rules! list
 /// Basic usage with integers:
 ///
 /// ```rust
-/// # use collection_tools::{Vec, vec};
-/// let vec : Vec< i32 > = vec!( 1, 2, 3 );
+/// # use collection_tools::{Vec, into_vec};
+/// let vec : Vec< i32 > = into_vec!( 1, 2, 3 );
 /// assert_eq!( vec[ 0 ], 1 );
 /// assert_eq!( vec[ 1 ], 2 );
 /// assert_eq!( vec[ 2 ], 3 );
@@ -630,8 +624,8 @@ macro_rules! list
 /// Using with different types that implement `Into<T>`:
 ///
 /// ```rust
-/// # use collection_tools::{Vec, vec};
-/// let words : Vec< String > = vec!( "alpha", "beta", "gamma" );
+/// # use collection_tools::{Vec, into_vec};
+/// let words : Vec< String > = into_vec!( "alpha", "beta", "gamma" );
 /// assert_eq!( words[ 0 ], "alpha" );
 /// assert_eq!( words[ 1 ], "beta" );
 /// assert_eq!( words[ 2 ], "gamma" );
@@ -642,14 +636,14 @@ macro_rules! list
 /// Creating a `Vec` of `String` from string literals and String objects:
 ///
 /// ```rust
-/// # use collection_tools::{Vec, vec};
-/// let mixed : Vec< String > = vec!{ "value", "another value".to_string() };
+/// # use collection_tools::{Vec, into_vec};
+/// let mixed : Vec< String > = into_vec!{ "value", "another value".to_string() };
 /// assert_eq!( mixed[ 0 ], "value" );
 /// assert_eq!( mixed[ 1 ], "another value" );
 /// ```
 ///
 #[ macro_export( local_inner_macros ) ]
-macro_rules! vec
+macro_rules! into_vec
 {
   (
     $( $key : expr ),* $( , )?
@@ -667,11 +661,11 @@ macro_rules! vec
 
 /// Creates a `VecDeque` from a list of elements.
 ///
-/// The `vecd` macro allows for the convenient creation of a `VecDeque` with initial elements.
+/// The `into_vecd` macro allows for the convenient creation of a `VecDeque` with initial elements.
 /// Elements passed to the macro are automatically converted into the deque's element type
 /// using `.into()`, enabling the use of literals or values of different, but convertible types.
 ///
-/// Note: The `vecd` macro relies on the `.into()` method to convert each element into the target type
+/// Note: The `into_vecd` macro relies on the `.into()` method to convert each element into the target type
 /// of the `VecDeque`. This means that the elements must be compatible with the `Into<T>` trait for the
 /// type `T` used in the `VecDeque`.
 ///
@@ -684,15 +678,15 @@ macro_rules! vec
 /// The macro can be called with a comma-separated list of elements. A trailing comma is optional.
 ///
 /// ```rust
-/// # use collection_tools::{ VecDeque, vecd };
+/// # use collection_tools::{ VecDeque, into_vecd };
 /// // VecDeque of i32
-/// let vd1 : VecDeque< i32 > = vecd!( 1, 2, 3, 4, 5 );
+/// let vd1 : VecDeque< i32 > = into_vecd!( 1, 2, 3, 4, 5 );
 ///
 /// // VecDeque of String
-/// let vd2 : VecDeque< String > = vecd!{ "hello".to_string(), "world", "rust" };
+/// let vd2 : VecDeque< String > = into_vecd!{ "hello".to_string(), "world", "rust" };
 ///
 /// // With trailing comma
-/// let vd3 : VecDeque< f64 > = vecd!( 1.1, 2.2, 3.3, );
+/// let vd3 : VecDeque< f64 > = into_vecd!( 1.1, 2.2, 3.3, );
 /// ```
 ///
 /// # Parameters
@@ -711,8 +705,8 @@ macro_rules! vec
 /// Basic usage with integers:
 ///
 /// ```rust
-/// # use collection_tools::{ VecDeque, vecd };
-/// let vd : VecDeque< i32 > = vecd!( 1, 2, 3 );
+/// # use collection_tools::{ VecDeque, into_vecd };
+/// let vd : VecDeque< i32 > = into_vecd!( 1, 2, 3 );
 /// assert_eq!( vd.front(), Some( &1 ) ); // The first element is 1
 /// assert_eq!( vd.back(), Some( &3 ) ); // The last element is 3
 /// ```
@@ -722,8 +716,8 @@ macro_rules! vec
 /// Using with different types that implement `Into< T >`:
 ///
 /// ```rust
-/// # use collection_tools::{ VecDeque, vecd };
-/// let chars : VecDeque< char > = vecd!( 'a', 'b', 'c' );
+/// # use collection_tools::{ VecDeque, into_vecd };
+/// let chars : VecDeque< char > = into_vecd!( 'a', 'b', 'c' );
 /// assert!( chars.contains( &'a' ) );
 /// assert!( chars.contains( &'b' ) );
 /// assert!( chars.contains( &'c' ) );
@@ -734,14 +728,14 @@ macro_rules! vec
 /// Creating a `VecDeque` of `String` from string literals:
 ///
 /// ```rust
-/// # use collection_tools::{ VecDeque, vecd };
-/// let fruits : VecDeque< String > = vecd!{ "apple", "banana", "cherry" };
+/// # use collection_tools::{ VecDeque, into_vecd };
+/// let fruits : VecDeque< String > = into_vecd!{ "apple", "banana", "cherry" };
 /// assert_eq!( fruits.front(), Some( &"apple".to_string() ) ); // The first element
 /// assert_eq!( fruits.back(), Some( &"cherry".to_string() ) ); // The last element
 /// ```
 ///
 #[ macro_export( local_inner_macros ) ]
-macro_rules! vecd
+macro_rules! into_vecd
 {
   (
     $( $key : expr ),* $( , )?
diff --git a/module/core/collection_tools/src/lib.rs b/module/core/collection_tools/src/lib.rs
index 878c03f16f..2a8b107103 100644
--- a/module/core/collection_tools/src/lib.rs
+++ b/module/core/collection_tools/src/lib.rs
@@ -67,13 +67,13 @@ pub mod exposed
 #[ cfg( feature = "enabled" ) ]
 pub mod prelude
 {
-  #[ cfg( feature = "collection_constructors" ) ]
+  #[ cfg( feature = "collection_into_constructors" ) ]
   #[ doc( inline ) ]
   #[ allow( unused_imports ) ]
-  pub use super::constructors::*;
+  pub use super::into_constructors::*;
 }
 
 /// Macros to construct the collections.
 /// Basically a tweaked version of `literally` crate but using `alloc` / `hashbrown` instead of `std`
-#[ cfg( all( feature = "enabled", feature = "collection_constructors" ) ) ]
-pub mod constructors;
\ No newline at end of file
+#[ cfg( all( feature = "enabled", feature = "collection_into_constructors" ) ) ]
+pub mod into_constructors;
diff --git a/module/core/collection_tools/tests/inc/constructor.rs b/module/core/collection_tools/tests/inc/constructor.rs
index 11b3dffaa8..06305c3e36 100644
--- a/module/core/collection_tools/tests/inc/constructor.rs
+++ b/module/core/collection_tools/tests/inc/constructor.rs
@@ -9,12 +9,12 @@ fn b_tree_map()
 {
 
   // test.case( "empty" );
-  let got : the_module::BTreeMap< i32, i32 > = the_module::bmap!{};
+  let got : the_module::BTreeMap< i32, i32 > = the_module::into_bmap!{};
   let exp = the_module::BTreeMap::new();
   assert_eq!( got, exp );
 
   // test.case( "single entry" );
-  let got = the_module::bmap!{ 3 => 13 };
+  let got = the_module::into_bmap!{ 3 => 13 };
   let mut exp = the_module::BTreeMap::new();
   exp.insert(3, 13);
   assert_eq!( got, exp );
@@ -29,12 +29,12 @@ fn b_tree_set()
 {
 
   // test.case( "empty" );
-  let got : the_module::BTreeSet< i32 > = the_module::bset!{};
+  let got : the_module::BTreeSet< i32 > = the_module::into_bset!{};
   let exp = the_module::BTreeSet::new();
   assert_eq!( got, exp );
 
   // test.case( "single entry" );
-  let got = the_module::bset!{ 3, 13 };
+  let got = the_module::into_bset!{ 3, 13 };
   let mut exp = the_module::BTreeSet::new();
   exp.insert(3);
   exp.insert(13);
@@ -50,12 +50,12 @@ fn binary_heap()
 {
 
   // test.case( "empty" );
-  let got : the_module::BinaryHeap< i32 > = the_module::heap!{};
+  let got : the_module::BinaryHeap< i32 > = the_module::into_heap!{};
   let exp = the_module::BinaryHeap::new();
   assert_eq!( got.into_vec(), exp.into_vec() );
 
   // test.case( "single entry" );
-  let got : the_module::BinaryHeap< i32 > = the_module::heap!{ 3, 13 };
+  let got : the_module::BinaryHeap< i32 > = the_module::into_heap!{ 3, 13 };
   let mut exp = the_module::BinaryHeap::new();
   exp.push(3);
   exp.push(13);
@@ -71,13 +71,13 @@ fn hash_map()
 {
 
   // test.case( "empty" );
-  let got : the_module::HashMap< i32, i32 > = the_module::hmap!{};
+  let got : the_module::HashMap< i32, i32 > = the_module::into_hmap!{};
   let exp = the_module::HashMap::new();
   assert_eq!( got, exp );
 
 
   // test.case( "single entry" );
-  let got = the_module::hmap!{ 3 => 13 };
+  let got = the_module::into_hmap!{ 3 => 13 };
   let mut exp = the_module::HashMap::new();
   exp.insert( 3, 13 );
   assert_eq!( got, exp );
@@ -92,12 +92,12 @@ fn hash_set()
 {
 
   // test.case( "empty" );
-  let got : the_module::HashSet< i32 > = the_module::hset!{};
+  let got : the_module::HashSet< i32 > = the_module::into_hset!{};
   let exp = the_module::HashSet::new();
   assert_eq!( got, exp );
 
   // test.case( "single entry" );
-  let got = the_module::hset!{ 13 };
+  let got = the_module::into_hset!{ 13 };
   let mut exp = the_module::HashSet::new();
   exp.insert( 13 );
   assert_eq!( got, exp );
@@ -112,12 +112,12 @@ fn linked_list()
 {
 
   // test.case( "empty" );
-  let got : the_module::LinkedList< i32 > = the_module::list!{};
+  let got : the_module::LinkedList< i32 > = the_module::into_list!{};
   let exp = the_module::LinkedList::new();
   assert_eq!( got, exp );
 
   // test.case( "single entry" );
-  let got = the_module::list!{ 13, 15 };
+  let got = the_module::into_list!{ 13, 15 };
   let mut exp = the_module::LinkedList::new();
   exp.push_front( 15 );
   exp.push_front( 13 );
@@ -133,12 +133,12 @@ fn vec()
 {
 
   // test.case( "empty" );
-  let got : the_module::Vec< i32 > = the_module::vec!{};
+  let got : the_module::Vec< i32 > = the_module::into_vec!{};
   let exp = the_module::Vec::new();
   assert_eq!( got, exp );
 
   // test.case( "single entry" );
-  let got : the_module::Vec< i32 > = the_module::vec!{ 3, 13 };
+  let got : the_module::Vec< i32 > = the_module::into_vec!{ 3, 13 };
   let mut exp = the_module::Vec::new();
   exp.push( 3 );
   exp.push( 13 );
@@ -154,12 +154,12 @@ fn vec_deque()
 {
 
   // test.case( "empty" );
-  let got : the_module::VecDeque< i32 > = the_module::vecd!{};
+  let got : the_module::VecDeque< i32 > = the_module::into_vecd!{};
   let exp = the_module::VecDeque::new();
   assert_eq!( got, exp );
 
   // test.case( "single entry" );
-  let got = the_module::vecd!{ 3, 13 };
+  let got = the_module::into_vecd!{ 3, 13 };
   let mut exp = the_module::VecDeque::new();
   exp.push_front( 13 );
   exp.push_front( 3 );
diff --git a/module/core/collection_tools/tests/nostd/constructor.rs b/module/core/collection_tools/tests/nostd/constructor.rs
index 0e541fddef..19569ef6e7 100644
--- a/module/core/collection_tools/tests/nostd/constructor.rs
+++ b/module/core/collection_tools/tests/nostd/constructor.rs
@@ -9,12 +9,12 @@ fn b_tree_map()
 {
 
   // test.case( "empty" );
-  let got : the_module::BTreeMap< i32, i32 > = the_module::bmap!{};
+  let got : the_module::BTreeMap< i32, i32 > = the_module::into_bmap!{};
   let exp : the_module::BTreeMap< i32, i32 > = the_module::BTreeMap::new();
   assert_eq!( got, exp );
 
   // test.case( "single entry" );
-  let got = the_module::bmap!{ 3 => 13 };
+  let got = the_module::into_bmap!{ 3 => 13 };
   let mut exp = the_module::BTreeMap::new();
   exp.insert(3, 13);
   assert_eq!( got, exp );
@@ -29,12 +29,12 @@ fn b_tree_set()
 {
 
   // test.case( "empty" );
-  let got : the_module::BTreeSet< i32 > = the_module::bset!{};
+  let got : the_module::BTreeSet< i32 > = the_module::into_bset!{};
   let exp : the_module::BTreeSet< i32 > = the_module::BTreeSet::new();
   assert_eq!( got, exp );
 
   // test.case( "single entry" );
-  let got = the_module::bset!{ 3, 13 };
+  let got = the_module::into_bset!{ 3, 13 };
   let mut exp = the_module::BTreeSet::new();
   exp.insert(3);
   exp.insert(13);
@@ -50,12 +50,12 @@ fn binary_heap()
 {
 
   // test.case( "empty" );
-  let got : the_module::BinaryHeap< i32 > = the_module::heap!{};
+  let got : the_module::BinaryHeap< i32 > = the_module::into_heap!{};
   let exp : the_module::BinaryHeap< i32 > = the_module::BinaryHeap::new();
   assert_eq!( got.into_vec(), exp.into_vec() );
 
   // test.case( "single entry" );
-  let got: the_module::BinaryHeap< i32 > = the_module::heap!{ 3, 13 };
+  let got: the_module::BinaryHeap< i32 > = the_module::into_heap!{ 3, 13 };
   let mut exp = the_module::BinaryHeap::new();
   exp.push(3);
   exp.push(13);
@@ -71,13 +71,13 @@ fn hash_map()
 {
 
   // test.case( "empty" );
-  let got : the_module::HashMap< i32, i32 > = the_module::hmap!{};
+  let got : the_module::HashMap< i32, i32 > = the_module::into_hmap!{};
   let exp = the_module::HashMap::new();
   assert_eq!( got, exp );
 
 
   // test.case( "single entry" );
-  let got = the_module::hmap!{ 3 => 13 };
+  let got = the_module::into_hmap!{ 3 => 13 };
   let mut exp = the_module::HashMap::new();
   exp.insert( 3, 13 );
   assert_eq!( got, exp );
@@ -92,12 +92,12 @@ fn hash_set()
 {
 
   // test.case( "empty" );
-  let got : the_module::HashSet< i32 > = the_module::hset!{};
+  let got : the_module::HashSet< i32 > = the_module::into_hset!{};
   let exp = the_module::HashSet::new();
   assert_eq!( got, exp );
 
   // test.case( "single entry" );
-  let got = the_module::hset!{ 13 };
+  let got = the_module::into_hset!{ 13 };
   let mut exp = the_module::HashSet::new();
   exp.insert( 13 );
   assert_eq!( got, exp );
@@ -112,12 +112,12 @@ fn linked_list()
 {
 
   // test.case( "empty" );
-  let got : the_module::LinkedList< i32 > = the_module::list!{};
+  let got : the_module::LinkedList< i32 > = the_module::into_list!{};
   let exp = the_module::LinkedList::new();
   assert_eq!( got, exp );
 
   // test.case( "single entry" );
-  let got = the_module::list!{ 13, 15 };
+  let got = the_module::into_list!{ 13, 15 };
   let mut exp = the_module::LinkedList::new();
   exp.push_front( 15 );
   exp.push_front( 13 );
@@ -133,12 +133,12 @@ fn vec()
 {
 
   // test.case( "empty" );
-  let got : the_module::Vec< i32 > = the_module::vec!{};
+  let got : the_module::Vec< i32 > = the_module::into_vec!{};
   let exp : the_module::Vec< i32 > = the_module::Vec::new();
   assert_eq!( got, exp );
 
   // test.case( "single entry" );
-  let got : the_module::Vec< i32 > = the_module::vec!{ 3, 13 };
+  let got : the_module::Vec< i32 > = the_module::into_vec!{ 3, 13 };
   let mut exp = the_module::Vec::new();
   exp.push( 3 );
   exp.push( 13 );
@@ -154,12 +154,12 @@ fn vec_deque()
 {
 
   // test.case( "empty" );
-  let got : the_module::VecDeque< i32 > = the_module::vecd!{};
+  let got : the_module::VecDeque< i32 > = the_module::into_vecd!{};
   let exp = the_module::VecDeque::new();
   assert_eq!( got, exp );
 
   // test.case( "single entry" );
-  let got : the_module::VecDeque< i32 > = the_module::vecd!{ 3, 13 };
+  let got : the_module::VecDeque< i32 > = the_module::into_vecd!{ 3, 13 };
   let mut exp = the_module::VecDeque::new();
   exp.push_front( 13 );
   exp.push_front( 3 );

From c2cce30b7ef485b85de8eab9333987fb030ed90d Mon Sep 17 00:00:00 2001
From: Anton Parfonov <antonparfonov@gmail.com>
Date: Mon, 1 Apr 2024 11:08:44 +0300
Subject: [PATCH 08/49] Created macros without into

---
 .../core/collection_tools/src/constructors.rs | 582 ++++++++++++++++++
 .../collection_tools/src/into_constructors.rs |  34 +-
 module/core/collection_tools/src/lib.rs       |  26 +
 3 files changed, 618 insertions(+), 24 deletions(-)
 create mode 100644 module/core/collection_tools/src/constructors.rs

diff --git a/module/core/collection_tools/src/constructors.rs b/module/core/collection_tools/src/constructors.rs
new file mode 100644
index 0000000000..c96770bd06
--- /dev/null
+++ b/module/core/collection_tools/src/constructors.rs
@@ -0,0 +1,582 @@
+/// Creates a `BTreeMap` from a list of key-value pairs.
+///
+/// The `bmap` macro facilitates the convenient creation of a `BTreeMap` with initial elements.
+///
+/// # Origin
+///
+/// This collection is reexported from `alloc`.
+///
+/// # Syntax
+///
+/// The macro can be called with a comma-separated list of key-value pairs. A trailing comma is optional.
+///
+/// ```rust
+/// # use collection_tools::{ BTreeMap, bmap };
+/// // BTreeMap of &str to i32
+/// let map1 = bmap!( "one" => 1, "two" => 2, "three" => 3 );
+///
+/// // BTreeMap of &str to &str
+/// let map2 = bmap!{ "name" => "value" };
+///
+/// // With trailing comma
+/// let map3 = bmap!( 1 => "one", 2 => "two", 3 => "three", );
+/// ```
+///
+/// # Parameters
+///
+/// - `$( $key:expr => $value:expr ),* $( , )?`: A comma-separated list of key-value pairs to insert into the `BTreeMap`.
+/// Each key and value can be of any type that implements the `Into< K >` and `Into< V >` traits, where `K` and `V` are the
+/// types stored in the `BTreeMap` as keys and values, respectively.
+///
+/// # Returns
+///
+/// Returns a `BTreeMap` containing all the specified key-value pairs. The map's capacity is
+/// automatically determined based on the number of elements provided.
+///
+/// # Example
+///
+/// Basic usage with string slices and integer values:
+///
+/// ```rust
+/// # use collection_tools::{ BTreeMap, bmap };
+/// let map = bmap!( "one" => 1, "two" => 2, "three" => 3 );
+/// assert_eq!( map.get( "one" ), Some( &1 ) );
+/// assert_eq!( map.get( "two" ), Some( &2 ) );
+/// assert_eq!( map.get( "three" ), Some( &3 ) );
+/// ```
+///
+/// # Example
+///
+/// Creating a `BTreeMap` of integers to string slices from literals:
+///
+/// ```rust
+/// # use collection_tools::{ BTreeMap, bmap };
+/// let numbers = bmap!( 1 => "one", 2 => "two", 3 => "three" );
+/// assert_eq!( numbers.get( &1 ), Some( &"one" ) );
+/// assert_eq!( numbers.get( &2 ), Some( &"two" ) );
+/// assert_eq!( numbers.get( &3 ), Some( &"three" ) );
+/// ```
+///
+#[ macro_export( local_inner_macros ) ]
+macro_rules! bmap
+{
+  (
+    $( $key : expr => $value : expr ),* $( , )?
+  )
+  =>
+  {{
+    let mut _map = collection_tools::BTreeMap::new();
+    $(
+      let _ = _map.insert( $key , $value );
+    )*
+    _map
+  }};
+}
+
+/// Creates a `BTreeSet` from a list of elements.
+///
+/// The `bset` macro allows for convenient creation of a `BTreeSet` with initial elements.
+///
+/// # Origin
+///
+/// This collection is reexported from `alloc`.
+///
+/// # Syntax
+///
+/// The macro can be called with a comma-separated list of elements. A trailing comma is optional.
+///
+/// ```rust
+/// # use collection_tools::{ BTreeSet, bset };
+/// // BTreeSet of &str
+/// let set1 = bset!( "a", "b", "c" );
+///
+/// // With trailing comma
+/// let set3 = bset!( 1, 2, 3, );
+/// ```
+///
+/// # Parameters
+///
+/// - `$( $key:expr ),* $( , )?`: A comma-separated list of elements to insert into the `BTreeSet`.
+/// Each element can be of any type that implements the `Into<T>` trait, where `T` is the
+/// type stored in the `BTreeSet`.
+///
+/// # Returns
+///
+/// Returns a `BTreeSet` containing all the specified elements. The capacity of the set is
+/// automatically determined based on the number of elements provided.
+///
+/// # Example
+///
+/// Basic usage with string slices:
+///
+/// ```rust
+/// # use collection_tools::{ BTreeSet, bset };
+/// let set = bset!( "one", "two", "three" );
+/// assert!( set.contains( "one" ) );
+/// assert!( set.contains( "two" ) );
+/// assert!( set.contains( "three" ) );
+/// assert_eq!( set.len(), 3 );
+/// ```
+///
+#[ macro_export( local_inner_macros ) ]
+macro_rules! bset
+{
+  (
+    $( $key : expr ),* $( , )?
+  )
+  =>
+  {{
+    let mut _set = collection_tools::BTreeSet::new();
+    $(
+      _set.insert( $key );
+    )*
+    _set
+  }};
+}
+
+/// Creates a `BinaryHeap` from a list of elements.
+///
+/// The `into_heap` macro simplifies the creation of a `BinaryHeap` with initial elements.
+///
+/// # Origin
+///
+/// This collection is reexported from `alloc`.
+///
+/// # Syntax
+///
+/// The macro can be called with a comma-separated list of elements. A trailing comma is optional.
+///
+/// ```rust
+/// # use collection_tools::{ BinaryHeap, heap };
+/// // BinaryHeap of i32
+/// let heap1 = heap!( 3, 1, 4, 1, 5, 9 );
+///
+/// // BinaryHeap of &str
+/// let heap2 = heap!{ "pear", "apple", "banana" };
+///
+/// // With trailing comma
+/// let heap3 = heap!( 2, 7, 1, 8, );
+/// ```
+///
+/// # Parameters
+///
+/// - `$( $key:expr ),* $( , )?`: A comma-separated list of elements to insert into the `BinaryHeap`.
+/// Each element can be of any type that implements the `Into<T>` trait, where `T` is the
+/// type stored in the `BinaryHeap`.
+///
+/// # Returns
+///
+/// Returns a `BinaryHeap` containing all the specified elements. The capacity of the heap is
+/// automatically determined based on the number of elements provided.
+///
+/// # Example
+///
+/// Basic usage with integers:
+///
+/// ```rust
+/// # use collection_tools::{ BinaryHeap, heap };
+/// let heap = heap!( 5, 3, 7, 1 );
+/// assert_eq!( heap.peek(), Some( &7 ) ); // The largest value is at the top of the heap
+/// ```
+///
+#[ macro_export( local_inner_macros ) ]
+macro_rules! heap
+{
+  (
+    $( $key : expr ),* $( , )?
+  )
+  =>
+  {{
+    let _cap = count!( @count $( $key ),* );
+    let mut _heap = collection_tools::BinaryHeap::with_capacity( _cap );
+    $(
+      _heap.push( $key );
+    )*
+    _heap
+  }};
+}
+
+/// Creates a `HashMap` from a list of key-value pairs.
+///
+/// The `hmap` macro allows for convenient creation of a `HashMap` with initial elements.
+/// 
+/// # Origin
+///
+/// This collection can be reexported from different crates:
+/// - from `std`, if `no_std` flag if off
+/// - from `hashbrown`, if `use_alloc` flag if on
+///
+/// # Syntax
+///
+/// The macro can be called with a comma-separated list of key-value pairs. A trailing comma is optional.
+///
+/// ```rust
+/// # use collection_tools::{ HashMap, hmap };
+/// // HashMap of &str to i32
+/// let map1 = hmap!( "one" => 1, "two" => 2, "three" => 3 );
+///
+/// // HashMap of &str to &str
+/// let map2 = hmap!{ "name" => "value", "type" => "example" };
+///
+/// // With trailing comma
+/// let map3 = hmap!( 1 => "one", 2 => "two", 3 => "three", );
+/// ```
+///
+/// # Parameters
+///
+/// - `$( $key:expr => $value:expr ),* $( , )?`: A comma-separated list of key-value pairs to insert into the `HashMap`.
+/// Each key and value can be of any type that implements the `Into<K>` and `Into<V>` traits, where `K` and `V` are the
+/// types stored in the `HashMap` as keys and values, respectively.
+///
+/// # Returns
+///
+/// Returns a `HashMap` containing all the specified key-value pairs. The capacity of the map is
+/// automatically determined based on the number of elements provided.
+///
+/// # Example
+///
+/// Basic usage with string slices and integer values:
+///
+/// ```rust
+/// # use collection_tools::{ HashMap, hmap };
+/// let map : HashMap< &str, i32 > = hmap!( "one" => 1, "two" => 2, "three" => 3 );
+/// assert_eq!( map.get( "one" ), Some( &1 ) );
+/// assert_eq!( map.get( "two" ), Some( &2 ) );
+/// assert_eq!( map.get( "three" ), Some( &3 ) );
+/// ```
+///
+/// # Example
+///
+/// Creating a `HashMap` of integers to strings from literals:
+///
+/// ```rust
+/// # use collection_tools::{ HashMap, hmap };
+/// let pairs = hmap!( 1 => "apple", 2 => "banana" );
+/// assert_eq!( pairs.get( &1 ), Some( &"apple" ) );
+/// assert_eq!( pairs.get( &2 ), Some( &"banana" ) );
+/// ```
+///
+#[macro_export(local_inner_macros)]
+macro_rules! hmap
+{
+  (
+    $( $key : expr => $value : expr ),* $( , )?
+  )
+  =>
+  {{
+    let _cap = count!( @count $( $key ),* );
+    let mut _map = collection_tools::HashMap::with_capacity( _cap );
+    $(
+      let _ = _map.insert( $key, $value );
+    )*
+    _map
+  }};
+}
+
+/// Creates a `HashSet` from a list of elements.
+///
+/// The `hset` macro allows for convenient creation of a `HashSet` with initial elements.
+/// 
+/// # Origin
+/// 
+/// This collection can be reexported from different crates:
+/// - from `std`, if `no_std` flag if off
+/// - from `hashbrown`, if `use_alloc` flag if on
+///
+/// # Syntax
+///
+/// The macro can be called with a comma-separated list of elements. A trailing comma is optional.
+///
+/// ```rust
+/// # use collection_tools::{ HashSet, hset };
+/// // HashSet of &str
+/// let set1 = hset!( "a", "b", "c" );
+///
+/// // HashSet of &str
+/// let set2 = hset!{ "a", "b", "c" };
+///
+/// // With trailing comma
+/// let set3 = hset!( 1, 2, 3, );
+/// ```
+///
+/// # Parameters
+///
+/// - `$( $key:expr ),* $( , )?`: A comma-separated list of elements to insert into the `HashSet`.
+/// Each element can be of any type that implements the `Into< T >` trait, where `T` is the
+/// type stored in the `HashSet`.
+///
+/// # Returns
+///
+/// Returns a `HashSet` containing all the specified elements. The capacity of the set is
+/// automatically determined based on the number of elements provided.
+///
+/// # Example
+///
+/// Basic usage with string slices:
+///
+/// ```rust
+/// # use collection_tools::{ HashSet, hset };
+/// let set = hset!( "one", "two", "three" );
+/// assert!( set.contains( "one" ) );
+/// assert!( set.contains( "two" ) );
+/// assert!( set.contains( "three" ) );
+/// assert_eq!( set.len(), 3 );
+/// ```
+///
+/// # Example
+///
+/// Creating a `HashSet` of `&str` from string literals:
+///
+/// ```rust
+/// # use collection_tools::{ HashSet, hset };
+/// let s = hset!{ "value" };
+/// assert_eq!( s.get( "value" ), Some( &"value" ) );
+/// ```
+///
+#[ macro_export( local_inner_macros ) ]
+macro_rules! hset
+{
+  (
+    $( $key : expr ),* $( , )?
+  )
+  =>
+  {{
+    let _cap = count!( @count $( $key ),* );
+    let mut _set = collection_tools::HashSet::with_capacity( _cap );
+    $(
+      let _ = _set.insert( $key );
+    )*
+    _set
+  }};
+}
+
+/// Creates a `LinkedList` from a list of elements.
+///
+/// The `list` macro facilitates the creation of a `LinkedList` with initial elements.
+///
+/// 
+/// # Origin
+///
+/// This collection is reexported from `alloc`.
+///
+/// # Syntax
+///
+/// The macro can be called with a comma-separated list of elements. A trailing comma is optional.
+///
+/// ```rust
+/// # use collection_tools::{ LinkedList, list };
+/// // LinkedList of i32
+/// let lst1 = list!( 1, 2, 3, 4, 5 );
+///
+/// // LinkedList of &str
+/// let lst2 = list!{ "hello", "world", "rust" };
+///
+/// // With trailing comma
+/// let lst3 = list!( 1.1, 2.2, 3.3, );
+/// ```
+///
+/// # Parameters
+///
+/// - `$( $key:expr ),* $( , )?`: A comma-separated list of elements to insert into the `LinkedList`.
+/// Each element can be of any type that implements the `Into<T>` trait, where `T` is the
+/// type stored in the `LinkedList`.
+///
+/// # Returns
+///
+/// Returns a `LinkedList` containing all the specified elements. The capacity of the list is
+/// dynamically adjusted based on the number of elements provided.
+///
+/// # Example
+///
+/// Basic usage with integers:
+///
+/// ```rust
+/// # use collection_tools::{ LinkedList, list };
+/// let lst = list!( 1, 2, 3 );
+/// assert_eq!( lst.front(), Some( &1 ) ); // The first element is 1
+/// assert_eq!( lst.back(), Some( &3 ) ); // The last element is 3
+/// ```
+///
+/// # Example
+///
+/// Creating a `LinkedList` of `&str` from string literals:
+///
+/// ```rust
+/// # use collection_tools::{ LinkedList, list };
+/// let fruits = list!{ "apple", "banana", "cherry" };
+/// assert_eq!( fruits.front(), Some( &"apple" ) ); // The first element
+/// assert_eq!( fruits.back(), Some( &"cherry" ) ); // The last element
+/// ```
+///
+#[ macro_export( local_inner_macros ) ]
+macro_rules! list
+{
+  (
+    $( $key : expr ),* $( , )?
+  )
+  =>
+  {{
+    // "The LinkedList allows pushing and popping elements at either end in constant time."
+    // So no `with_capacity`
+    let mut _lst = collection_tools::LinkedList::new();
+    $(
+      _lst.push_back( $key );
+    )*
+    _lst
+  }};
+}
+
+/// Creates a `Vec` from a list of elements.
+///
+/// The `vec` macro simplifies the creation of a `Vec` with initial elements.
+///
+/// # Origin
+///
+/// This collection is reexported from `alloc`.
+///
+/// # Syntax
+///
+/// The macro can be called with a comma-separated list of elements. A trailing comma is optional.
+///
+/// ```rust
+/// # use collection_tools::{Vec, vec};
+/// // Vec of i32
+/// let vec1 = vec!( 1, 2, 3, 4, 5 );
+///
+/// // Vec of &str
+/// let vec2 = vec!{ "hello", "world", "rust" };
+///
+/// // With trailing comma
+/// let vec3 = vec!( 1.1, 2.2, 3.3, );
+/// ```
+///
+/// # Parameters
+///
+/// - `$( $key : expr ),* $( , )?`: A comma-separated list of elements to insert into the `Vec`.
+/// Each element can be of any type that implements the `Into<T>` trait, where `T` is the
+/// type stored in the `Vec`.
+///
+/// # Returns
+///
+/// Returns a `Vec` containing all the specified elements. The capacity of the vector is
+/// automatically determined based on the number of elements provided.
+///
+/// # Example
+///
+/// Basic usage with integers:
+///
+/// ```rust
+/// # use collection_tools::{Vec, vec};
+/// let vec = vec!( 1, 2, 3 );
+/// assert_eq!( vec[ 0 ], 1 );
+/// assert_eq!( vec[ 1 ], 2 );
+/// assert_eq!( vec[ 2 ], 3 );
+/// ```
+///
+/// # Example
+///
+/// Creating a `Vec` of `&str` from string literals:
+///
+/// ```rust
+/// # use collection_tools::{Vec, vec};
+/// let mixed = vec!{ "value", "another value" };
+/// assert_eq!( mixed[ 0 ], "value" );
+/// assert_eq!( mixed[ 1 ], "another value" );
+/// ```
+///
+#[ macro_export( local_inner_macros ) ]
+macro_rules! vec
+{
+  (
+    $( $key : expr ),* $( , )?
+  )
+  =>
+  {{
+    let _cap = count!( @count $( $key ),* );
+    let mut _vec = collection_tools::Vec::with_capacity( _cap );
+    $(
+      _vec.push( $key );
+    )*
+    _vec
+  }};
+}
+
+/// Creates a `VecDeque` from a list of elements.
+///
+/// The `vecd` macro allows for the convenient creation of a `VecDeque` with initial elements.
+/// Elements passed to the macro are automatically converted into the deque's element type
+/// using `.into()`, enabling the use of literals or values of different, but convertible types.
+///
+/// Note: The `vecd` macro relies on the `.into()` method to convert each element into the target type
+/// of the `VecDeque`. This means that the elements must be compatible with the `Into<T>` trait for the
+/// type `T` used in the `VecDeque`.
+///
+/// # Origin
+///
+/// This collection is reexported from `alloc`.
+///
+/// # Syntax
+///
+/// The macro can be called with a comma-separated list of elements. A trailing comma is optional.
+///
+/// ```rust
+/// # use collection_tools::{ VecDeque, vecd };
+/// // VecDeque of i32
+/// let vd1 = vecd!( 1, 2, 3, 4, 5 );
+///
+/// // VecDeque of String
+/// let vd2 = vecd!{ "hello", "world", "rust" };
+///
+/// // With trailing comma
+/// let vd3 = vecd!( 1.1, 2.2, 3.3, );
+/// ```
+///
+/// # Parameters
+///
+/// - `$( $key:expr ),* $( , )?`: A comma-separated list of elements to insert into the `VecDeque`.
+/// Each element can be of any type that implements the `Into< T >` trait, where `T` is the
+/// type stored in the `VecDeque`.
+///
+/// # Returns
+///
+/// Returns a `VecDeque` containing all the specified elements. The capacity of the deque is
+/// automatically determined based on the number of elements provided.
+///
+/// # Example
+///
+/// Basic usage with integers:
+///
+/// ```rust
+/// # use collection_tools::{ VecDeque, vecd };
+/// let vd : VecDeque< i32 > = vecd!( 1, 2, 3 );
+/// assert_eq!( vd.front(), Some( &1 ) ); // The first element is 1
+/// assert_eq!( vd.back(), Some( &3 ) ); // The last element is 3
+/// ```
+///
+/// # Example
+///
+/// Creating a `VecDeque` of `&str` from string literals:
+///
+/// ```rust
+/// # use collection_tools::{ VecDeque, vecd };
+/// let fruits = vecd!{ "apple", "banana", "cherry" };
+/// assert_eq!( fruits.front(), Some( &"apple" ) ); // The first element
+/// assert_eq!( fruits.back(), Some( &"cherry" ) ); // The last element
+/// ```
+///
+#[ macro_export( local_inner_macros ) ]
+macro_rules! vecd
+{
+  (
+    $( $key : expr ),* $( , )?
+  )
+  =>
+  {{
+    let _cap = count!( @count $( $key ),* );
+    let mut _vecd = collection_tools::VecDeque::with_capacity( _cap );
+    $(
+      _vecd.push_back( $key );
+    )*
+    _vecd
+  }};
+}
diff --git a/module/core/collection_tools/src/into_constructors.rs b/module/core/collection_tools/src/into_constructors.rs
index 8e9e7a05dc..59af857a21 100644
--- a/module/core/collection_tools/src/into_constructors.rs
+++ b/module/core/collection_tools/src/into_constructors.rs
@@ -1,19 +1,3 @@
-/// Not meant to be called directly.
-#[ doc( hidden ) ]
-#[ macro_export( local_inner_macros ) ]
-macro_rules! count
-{
-  ( @single $( $x : tt )* ) => ( () );
-
-  (
-    @count $( $rest : expr ),*
-  )
-  =>
-  (
-    < [ () ] >::len( &[ $( count!( @single $rest ) ),* ] )
-  );
-} 
-
 /// Creates a `BTreeMap` from a list of key-value pairs.
 ///
 /// The `into_bmap` macro facilitates the convenient creation of a `BTreeMap` with initial elements.
@@ -100,7 +84,7 @@ macro_rules! into_bmap
   {{
     let mut _map = collection_tools::BTreeMap::new();
     $(
-      let _ = _map.insert( $key.into(), $value.into() );
+      let _ = _map.insert( Into::into( $key ), Into::into( $value ) );
     )*
     _map
   }};
@@ -192,7 +176,7 @@ macro_rules! into_bset
   {{
     let mut _set = collection_tools::BTreeSet::new();
     $(
-      _set.insert( $key.into() );
+      _set.insert( Into::into( $key ) );
     )*
     _set
   }};
@@ -280,7 +264,7 @@ macro_rules! into_heap
     let _cap = count!( @count $( $key ),* );
     let mut _heap = collection_tools::BinaryHeap::with_capacity( _cap );
     $(
-      _heap.push( $key.into() );
+      _heap.push( Into::into( $key ) );
     )*
     _heap
   }};
@@ -374,7 +358,7 @@ macro_rules! into_hmap
     let _cap = count!( @count $( $key ),* );
     let mut _map = collection_tools::HashMap::with_capacity( _cap );
     $(
-      let _ = _map.insert( $key.into(), $value.into() );
+      let _ = _map.insert( Into::into( $key ), Into::into( $value ) );
     )*
     _map
   }};
@@ -390,6 +374,8 @@ macro_rules! into_hmap
 /// of the `HashSet`. This means that the elements must be compatible with the `Into< T >` trait for the
 /// type `T` used in the `HashSet`. Also, this means that sometimes you must specify the type of collection's items.
 ///
+/// # Origin
+/// 
 /// This collection can be reexported from different crates:
 /// - from `std`, if `no_std` flag if off
 /// - from `hashbrown`, if `use_alloc` flag if on
@@ -467,7 +453,7 @@ macro_rules! into_hset
     let _cap = count!( @count $( $key ),* );
     let mut _set = collection_tools::HashSet::with_capacity( _cap );
     $(
-      let _ = _set.insert( $key.into() );
+      let _ = _set.insert( Into::into( $key ) );
     )*
     _set
   }};
@@ -560,7 +546,7 @@ macro_rules! into_list
     // So no `with_capacity`
     let mut _lst = collection_tools::LinkedList::new();
     $(
-      _lst.push_back( $key.into() );
+      _lst.push_back( Into::into( $key ) );
     )*
     _lst
   }};
@@ -653,7 +639,7 @@ macro_rules! into_vec
     let _cap = count!( @count $( $key ),* );
     let mut _vec = collection_tools::Vec::with_capacity( _cap );
     $(
-      _vec.push( $key.into() );
+      _vec.push( Into::into( $key ) );
     )*
     _vec
   }};
@@ -745,7 +731,7 @@ macro_rules! into_vecd
     let _cap = count!( @count $( $key ),* );
     let mut _vecd = collection_tools::VecDeque::with_capacity( _cap );
     $(
-      _vecd.push_back( $key.into() );
+      _vecd.push_back( Into::into( $key ) );
     )*
     _vecd
   }};
diff --git a/module/core/collection_tools/src/lib.rs b/module/core/collection_tools/src/lib.rs
index 2a8b107103..c269d3863e 100644
--- a/module/core/collection_tools/src/lib.rs
+++ b/module/core/collection_tools/src/lib.rs
@@ -67,13 +67,39 @@ pub mod exposed
 #[ cfg( feature = "enabled" ) ]
 pub mod prelude
 {
+  #[ cfg( feature = "collection_into_constructors" ) ]
+  #[ doc( inline ) ]
+  #[ allow( unused_imports ) ]
+  pub use super::constructors::*;
   #[ cfg( feature = "collection_into_constructors" ) ]
   #[ doc( inline ) ]
   #[ allow( unused_imports ) ]
   pub use super::into_constructors::*;
 }
 
+/// Not meant to be called directly.
+#[ doc( hidden ) ]
+#[ macro_export( local_inner_macros ) ]
+macro_rules! count
+{
+  ( @single $( $x : tt )* ) => ( () );
+
+  (
+    @count $( $rest : expr ),*
+  )
+  =>
+  (
+    < [ () ] >::len( &[ $( count!( @single $rest ) ),* ] )
+  );
+} 
+
+
 /// Macros to construct the collections.
 /// Basically a tweaked version of `literally` crate but using `alloc` / `hashbrown` instead of `std`
+#[ cfg( all( feature = "enabled", feature = "collection_constructors" ) ) ]
+pub mod constructors;
+
+/// Macros to construct the collections, using `.into()` under the hood.
+/// Often requires explicitly specifying type to cast to.
 #[ cfg( all( feature = "enabled", feature = "collection_into_constructors" ) ) ]
 pub mod into_constructors;

From 974b76c535b32ef9ed52757b47b50cecd2b447c8 Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Mon, 1 Apr 2024 14:31:06 +0300
Subject: [PATCH 09/49] add patch +test

---
 Cargo.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index b1594b7e6a..4ad9b88f5f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -474,6 +474,6 @@ path = "module/test/c"
 default-features = true
 
 
-# [patch.crates-io]
-# pathfinder_geometry = { git = "https://github.com/servo/pathfinder.git" }
-# pathfinder_simd = { git = "https://github.com/servo/pathfinder.git" }
+[patch.crates-io]
+pathfinder_geometry = { git = "https://github.com/servo/pathfinder.git" }
+pathfinder_simd = { git = "https://github.com/servo/pathfinder.git" }

From 8ada86676593d18cd929b6479931a81ac19f550c Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Mon, 1 Apr 2024 15:48:57 +0300
Subject: [PATCH 10/49] fix naming

---
 .../unitore/src/executor/actions/config.rs    |  15 +-
 .../move/unitore/src/executor/actions/feed.rs |   3 +-
 .../unitore/src/executor/actions/frame.rs     |  25 ++-
 .../unitore/src/executor/actions/query.rs     |   5 +-
 .../unitore/src/executor/actions/table.rs     | 153 ++++++++++++++----
 module/move/unitore/src/executor/mod.rs       |  30 ++--
 module/move/unitore/src/main.rs               |   5 +-
 module/move/unitore/src/storage/config.rs     |  38 +----
 module/move/unitore/src/storage/feed.rs       |   8 +-
 module/move/unitore/src/storage/frame.rs      |  41 ++---
 module/move/unitore/src/storage/table.rs      |  10 +-
 .../tests/{add_config.rs => config_add.rs}    |   4 +-
 module/move/unitore/tests/save_feed.rs        |   2 +-
 .../move/unitore/tests/update_newer_feed.rs   |   2 +-
 14 files changed, 204 insertions(+), 137 deletions(-)
 rename module/move/unitore/tests/{add_config.rs => config_add.rs} (86%)

diff --git a/module/move/unitore/src/executor/actions/config.rs b/module/move/unitore/src/executor/actions/config.rs
index 9b01caf173..cea9b3e517 100644
--- a/module/move/unitore/src/executor/actions/config.rs
+++ b/module/move/unitore/src/executor/actions/config.rs
@@ -1,7 +1,6 @@
 //! Endpoint and report for commands for config files.
 
 use crate::*;
-use super::*;
 use error_tools::{ err, for_app::Context, BasicError, Result };
 use executor::FeedManager;
 use storage::
@@ -13,7 +12,7 @@ use storage::
 use gluesql::{ prelude::Payload, sled_storage::SledStorage };
 
 /// Add configuration file with subscriptions to storage.
-pub async fn add_config( storage : FeedStorage< SledStorage >, args : &wca::Args ) -> Result< impl Report >
+pub async fn config_add( storage : FeedStorage< SledStorage >, args : &wca::Args ) -> Result< impl executor::Report >
 {
   let path : std::path::PathBuf = args
   .get_owned::< wca::Value >( 0 )
@@ -43,7 +42,7 @@ pub async fn add_config( storage : FeedStorage< SledStorage >, args : &wca::Args
   let mut manager = FeedManager::new( storage );
 
   let config_report = manager.storage
-  .add_config( &config )
+  .config_add( &config )
   .await
   .context( "Added 0 config files.\n Failed to add config file to storage." )?
   ;
@@ -60,7 +59,7 @@ pub async fn add_config( storage : FeedStorage< SledStorage >, args : &wca::Args
 }
 
 /// Remove configuration file from storage.
-pub async fn delete_config( storage : FeedStorage< SledStorage >, args : &wca::Args ) -> Result< impl Report >
+pub async fn config_delete( storage : FeedStorage< SledStorage >, args : &wca::Args ) -> Result< impl executor::Report >
 {
   let path : std::path::PathBuf = args
   .get_owned::< wca::Value >( 0 )
@@ -74,17 +73,17 @@ pub async fn delete_config( storage : FeedStorage< SledStorage >, args : &wca::A
   let mut manager = FeedManager::new( storage );
   Ok( ConfigReport::new( 
     manager.storage
-    .delete_config( &config )
+    .config_delete( &config )
     .await
     .context( "Failed to remove config from storage." )?
   ) )
 }
 
 /// List all files with subscriptions that are currently in storage.
-pub async fn list_configs( storage : FeedStorage< SledStorage >, _args : &wca::Args ) -> Result< impl Report >
+pub async fn config_list( storage : FeedStorage< SledStorage >, _args : &wca::Args ) -> Result< impl executor::Report >
 {
   let mut manager = FeedManager::new( storage );
-  Ok( ConfigReport::new( manager.storage.list_configs().await? ) )
+  Ok( ConfigReport::new( manager.storage.config_list().await? ) )
 }
 
 /// Information about result of command for subscription config.
@@ -153,4 +152,4 @@ impl std::fmt::Display for ConfigReport
   }
 }
 
-impl Report for ConfigReport {}
+impl executor::Report for ConfigReport {}
diff --git a/module/move/unitore/src/executor/actions/feed.rs b/module/move/unitore/src/executor/actions/feed.rs
index 850384c846..92863c0317 100644
--- a/module/move/unitore/src/executor/actions/feed.rs
+++ b/module/move/unitore/src/executor/actions/feed.rs
@@ -10,7 +10,8 @@ use storage::{ FeedStorage, feed::FeedStore };
 use error_tools::Result;
 
 /// List all feeds.
-pub async fn list_feeds(
+pub async fn feeds_list
+(
   storage : FeedStorage< gluesql::sled_storage::SledStorage >,
   _args : &wca::Args,
 ) -> Result< impl Report >
diff --git a/module/move/unitore/src/executor/actions/frame.rs b/module/move/unitore/src/executor/actions/frame.rs
index 8ce982c1cc..14b8bd9098 100644
--- a/module/move/unitore/src/executor/actions/frame.rs
+++ b/module/move/unitore/src/executor/actions/frame.rs
@@ -1,7 +1,6 @@
 //! Frames commands actions.
 
 use crate::*;
-use super::*;
 use executor::FeedManager;
 use storage::
 {
@@ -15,25 +14,25 @@ use feed_config;
 use error_tools::{ err, Result };
 
 /// List all frames.
-pub async fn list_frames
+pub async fn frames_list
 (
   storage : FeedStorage< SledStorage >,
   _args : &wca::Args,
-) -> Result< impl Report >
+) -> Result< impl executor::Report >
 {
     let mut manager = FeedManager::new( storage );
-    manager.storage.list_frames().await
+    manager.storage.frames_list().await
 }
 
 /// Update all frames from config files saved in storage.
-pub async fn download_frames
+pub async fn frames_download
 (
   storage : FeedStorage< SledStorage >,
   _args : &wca::Args,
-) -> Result< impl Report >
+) -> Result< impl executor::Report >
 {
   let mut manager = FeedManager::new( storage );
-  let payload = manager.storage.list_configs().await?;
+  let payload = manager.storage.config_list().await?;
 
   let configs = match &payload
   {
@@ -69,10 +68,10 @@ pub async fn download_frames
 
   let mut feeds = Vec::new();
   let client = retriever::FeedClient;
-  for i in  0..subscriptions.len()
+  for subscription in  subscriptions
   {
-    let feed = retriever::FeedFetch::fetch(&client, subscriptions[ i ].link.clone()).await?;
-    feeds.push( ( feed, subscriptions[ i ].update_period.clone(), subscriptions[ i ].link.clone() ) );
+    let feed = retriever::FeedFetch::fetch(&client, subscription.link.clone()).await?;
+    feeds.push( ( feed, subscription.update_period.clone(), subscription.link ) );
   }
   manager.storage.process_feeds( feeds ).await
 
@@ -170,7 +169,7 @@ impl std::fmt::Display for FramesReport
   }
 }
 
-impl Report for FramesReport {}
+impl executor::Report for FramesReport {}
 
 /// Items get from select query from storage.
 #[ derive( Debug ) ]
@@ -237,7 +236,7 @@ impl std::fmt::Display for UpdateReport
   }
 }
 
-impl Report for UpdateReport {}
+impl executor::Report for UpdateReport {}
 
 /// Report for listing frames.
 #[ derive( Debug ) ]
@@ -269,4 +268,4 @@ impl std::fmt::Display for ListReport
   }
 }
 
-impl Report for ListReport {}
+impl executor::Report for ListReport {}
diff --git a/module/move/unitore/src/executor/actions/query.rs b/module/move/unitore/src/executor/actions/query.rs
index 4b49bc9c37..d022076554 100644
--- a/module/move/unitore/src/executor/actions/query.rs
+++ b/module/move/unitore/src/executor/actions/query.rs
@@ -1,14 +1,13 @@
 //! Query command endpoint and report.
 
 use crate::*;
-use super::*;
 use gluesql::core::executor::Payload;
 use storage::{ FeedStorage, Store };
-use executor::FeedManager;
+use executor::{ FeedManager, actions::Report };
 use error_tools::{ err, BasicError, Result };
 
 /// Execute query specified in query string.
-pub async fn execute_query
+pub async fn query_execute
 (
   storage : FeedStorage< gluesql::sled_storage::SledStorage >,
   args : &wca::Args,
diff --git a/module/move/unitore/src/executor/actions/table.rs b/module/move/unitore/src/executor/actions/table.rs
index d22ad6eeff..7c88669833 100644
--- a/module/move/unitore/src/executor/actions/table.rs
+++ b/module/move/unitore/src/executor/actions/table.rs
@@ -8,7 +8,7 @@ use storage::{ FeedStorage, table::TableStore };
 use error_tools::{ err, BasicError, Result };
 
 /// Get labels of column for specified table.
-pub async fn list_columns
+pub async fn table_list
 (
   storage : FeedStorage< gluesql::sled_storage::SledStorage >,
   args : &wca::Args,
@@ -21,24 +21,20 @@ pub async fn list_columns
   ;
 
   let mut manager = FeedManager::new( storage );
-  let result = manager.storage.list_columns( table_name.clone() ).await?;
+  let result = manager.storage.table_list( table_name.clone() ).await?;
 
   let mut table_description = String::new();
-  let mut columns = std::collections::HashMap::new();
-  match &result[ 0 ]
+  let mut columns = HashMap::new();
+  if let Payload::Select { labels: _label_vec, rows: rows_vec } = &result[ 0 ]
   {
-    Payload::Select { labels: _label_vec, rows: rows_vec } =>
+    for row in rows_vec
     {
-      for row in rows_vec
-      {
-        let table = String::from( row[ 0 ].clone() );
-        columns.entry( table )
-        .and_modify( | vec : &mut Vec< String > | vec.push( String::from( row[ 1 ].clone() ) ) )
-        .or_insert( vec![ String::from( row[ 1 ].clone() ) ] )
-        ;
-      }
-    },
-    _ => {},
+      let table = String::from( row[ 0 ].clone() );
+      columns.entry( table )
+      .and_modify( | vec : &mut Vec< String > | vec.push( String::from( row[ 1 ].clone() ) ) )
+      .or_insert( vec![ String::from( row[ 1 ].clone() ) ] )
+      ;
+    }
   }
   let mut columns_desc = HashMap::new();
   match table_name.as_str()
@@ -88,20 +84,115 @@ pub async fn list_columns
       {
         match label.as_str()
         {
-          "id" => { columns_desc.insert( label.clone(), String::from( "A unique identifier for this frame in the feed. " ) ); },
-          "title" => { columns_desc.insert( label.clone(), String::from( "Title of the frame" ) ); },
-          "updated" => { columns_desc.insert( label.clone(), String::from( "Time at which this item was fetched from source." ) ); },
-          "authors" => { columns_desc.insert( label.clone(), String::from( "List of authors of the frame, optional." ) ); },
-          "content" => { columns_desc.insert( label.clone(), String::from( "The content of the frame in html or plain text, optional." ) ); },
-          "links" => { columns_desc.insert( label.clone(), String::from( "List of links associated with this item of related Web page and attachments." ) ); },
-          "summary" => { columns_desc.insert( label.clone(), String::from( "Short summary, abstract, or excerpt of the frame item, optional." ) ); },
-          "categories" => { columns_desc.insert( label.clone(), String::from( "Specifies a list of categories that the item belongs to." ) ); },
-          "published" => { columns_desc.insert( label.clone(), String::from( "Time at which this item was first published or updated." ) ); },
-          "source" => { columns_desc.insert( label.clone(), String::from( "Specifies the source feed if the frame was copied from one feed into another feed, optional." ) ); },
-          "rights" => { columns_desc.insert( label.clone(), String::from( "Conveys information about copyrights over the feed, optional." ) ); },
-          "media" => { columns_desc.insert( label.clone(), String::from( "List of media oblects, encountered in the frame, optional." ) ); },
-          "language" => { columns_desc.insert( label.clone(), String::from( "The language specified on the item, optional." ) ); },
-          "feed_link" => { columns_desc.insert( label.clone(), String::from( "Link of feed that contains this frame." ) ); },
+          "id" =>
+          {
+            columns_desc.insert
+            (
+              label.clone(),
+              String::from( "A unique identifier for this frame in the feed. " ),
+            );
+          },
+          "title" =>
+          {
+            columns_desc.insert
+            (
+              label.clone(),
+              String::from( "Title of the frame" ),
+            );
+          },
+          "updated" => 
+          {
+            columns_desc.insert
+            (
+              label.clone(),
+              String::from( "Time at which this item was fetched from source." ),
+            );
+          },
+          "authors" =>
+          {
+            columns_desc.insert(
+              label.clone(),
+              String::from( "List of authors of the frame, optional." )
+            );
+          },
+          "content" =>
+          {
+            columns_desc.insert(
+              label.clone(),
+              String::from( "The content of the frame in html or plain text, optional." ),
+            );
+          },
+          "links" =>
+          {
+            columns_desc.insert(
+              label.clone(),
+              String::from( "List of links associated with this item of related Web page and attachments." ),
+            );
+          },
+          "summary" =>
+          {
+            columns_desc.insert
+            (
+              label.clone(),
+              String::from( "Short summary, abstract, or excerpt of the frame item, optional." ),
+            );
+          },
+          "categories" =>
+          {
+            columns_desc.insert
+            (
+              label.clone(),
+              String::from( "Specifies a list of categories that the item belongs to." ),
+            );
+          },
+          "published" =>
+          {
+            columns_desc.insert
+            (
+              label.clone(),
+              String::from( "Time at which this item was first published or updated." ),
+            );
+          },
+          "source" =>
+          {
+            columns_desc.insert
+            (
+              label.clone(),
+              String::from( "Specifies the source feed if the frame was copied from one feed into another feed, optional." ),
+            );
+          },
+          "rights" =>
+          {
+            columns_desc.insert
+            (
+              label.clone(),
+              String::from( "Conveys information about copyrights over the feed, optional." ),
+            );
+          },
+          "media" =>
+          {
+            columns_desc.insert
+            (
+              label.clone(),
+              String::from( "List of media oblects, encountered in the frame, optional." ),
+            );
+          },
+          "language" =>
+          {
+            columns_desc.insert
+            (
+              label.clone(),
+              String::from( "The language specified on the item, optional." ),
+            );
+          },
+          "feed_link" =>
+          {
+            columns_desc.insert
+            (
+              label.clone(),
+              String::from( "Link of feed that contains this frame." ),
+            );
+          },
           _ => { columns_desc.insert( label.clone(), String::from( "Desciption for this column hasn't been added yet!" ) ); }
         }
       }
@@ -125,14 +216,14 @@ pub async fn list_columns
 }
 
 /// Get names of tables in storage.
-pub async fn list_tables
+pub async fn tables_list
 (
   storage : FeedStorage< gluesql::sled_storage::SledStorage >,
   _args : &wca::Args,
 ) -> Result< impl Report >
 {
   let mut manager = FeedManager::new( storage );
-  manager.storage.list_tables().await
+  manager.storage.tables_list().await
 }
 
 const EMPTY_CELL : &'static str = "";
diff --git a/module/move/unitore/src/executor/mod.rs b/module/move/unitore/src/executor/mod.rs
index e83d8c859e..0b344e337e 100644
--- a/module/move/unitore/src/executor/mod.rs
+++ b/module/move/unitore/src/executor/mod.rs
@@ -1,6 +1,6 @@
 //! Execute plan.
 
-use super::*;
+use crate::*;
 use feed_config::SubscriptionConfig;
 use gluesql::sled_storage::{ sled::Config, SledStorage };
 use retriever::{ FeedClient, FeedFetch };
@@ -12,11 +12,11 @@ use error_tools::Result;
 pub mod actions;
 use actions::
 {
-  frame::{ list_frames, download_frames },
-  feed::list_feeds,
-  config::{ add_config, delete_config, list_configs },
-  query::execute_query,
-  table::{ list_columns, list_tables },
+  frame::{ frames_list, frames_download },
+  feed::feeds_list,
+  config::{ config_add, config_delete, config_list },
+  query::query_execute,
+  table::{ table_list, tables_list },
 };
 
 fn action< 'a, F, Fut, R >( async_endpoint : F, args : &'a Args ) -> Result< R >
@@ -54,7 +54,7 @@ pub fn execute() -> Result< (), Box< dyn std::error::Error + Send + Sync > >
     ))
     .routine( | args |
     {
-      match action( download_frames, &args )
+      match action( frames_download, &args )
       {
         Ok( report ) => report.report(),
         Err( err ) => println!( "{:?}", err ),
@@ -70,7 +70,7 @@ pub fn execute() -> Result< (), Box< dyn std::error::Error + Send + Sync > >
     ))
     .routine( | args |
     {
-      match action( list_feeds, &args )
+      match action( feeds_list, &args )
       {
         Ok( report ) => report.report(),
         Err( err ) => println!( "{:?}", err ),
@@ -86,7 +86,7 @@ pub fn execute() -> Result< (), Box< dyn std::error::Error + Send + Sync > >
     ))
     .routine( | args |
     {
-      match action( list_frames, &args )
+      match action( frames_list, &args )
       {
         Ok( report ) => report.report(),
         Err( err ) => println!( "{:?}", err ),
@@ -110,7 +110,7 @@ pub fn execute() -> Result< (), Box< dyn std::error::Error + Send + Sync > >
     .subject().hint( "Path" ).kind( Type::Path ).optional( false ).end()
     .routine( | args : Args |
     {
-      match action( add_config, &args )
+      match action( config_add, &args )
       {
         Ok( report ) => report.report(),
         Err( err ) => println!( "{:?}", err ),
@@ -127,7 +127,7 @@ pub fn execute() -> Result< (), Box< dyn std::error::Error + Send + Sync > >
     .subject().hint( "Path" ).kind( Type::Path ).optional( false ).end()
     .routine( | args : Args |
     {
-      match action( delete_config, &args )
+      match action( config_delete, &args )
       {
         Ok( report ) => report.report(),
         Err( err ) => println!( "{:?}", err ),
@@ -143,7 +143,7 @@ pub fn execute() -> Result< (), Box< dyn std::error::Error + Send + Sync > >
     ))
     .routine( | args |
     {
-      match action( list_configs, &args )
+      match action( config_list, &args )
       {
         Ok( report ) => report.report(),
         Err( err ) => println!( "{:?}", err ),
@@ -159,7 +159,7 @@ pub fn execute() -> Result< (), Box< dyn std::error::Error + Send + Sync > >
     ))
     .routine( | args |
     {
-      match action( list_tables, &args )
+      match action( tables_list, &args )
       {
         Ok( report ) => report.report(),
         Err( err ) => println!( "{:?}", err ),
@@ -177,7 +177,7 @@ pub fn execute() -> Result< (), Box< dyn std::error::Error + Send + Sync > >
     .subject().hint( "Name" ).kind( wca::Type::String ).optional( false ).end()
     .routine( | args : Args |
     {
-      match action( list_columns, &args )
+      match action( table_list, &args )
       {
         Ok( report ) => report.report(),
         Err( err ) => println!( "{:?}", err ),
@@ -200,7 +200,7 @@ pub fn execute() -> Result< (), Box< dyn std::error::Error + Send + Sync > >
     .subject().hint( "Query" ).kind( Type::List( Type::String.into(), ' ' ) ).optional( false ).end()
     .routine( | args : Args |
     {
-      match action( execute_query, &args )
+      match action( query_execute, &args )
       {
         Ok( report ) => report.report(),
         Err( err ) => println!( "{:?}", err ),
diff --git a/module/move/unitore/src/main.rs b/module/move/unitore/src/main.rs
index 12ce305f31..d9828ef31b 100644
--- a/module/move/unitore/src/main.rs
+++ b/module/move/unitore/src/main.rs
@@ -1,6 +1,5 @@
-//!
-// use unitore::retriever::FeedClient;
-// use unitore::feed_config::read_feed_config;
+//! Runs unitore command executor.
+
 pub use unitore::executor;
 
 fn main() -> Result< (), Box< dyn std::error::Error + Send + Sync > >
diff --git a/module/move/unitore/src/storage/config.rs b/module/move/unitore/src/storage/config.rs
index 39a4d3c1fd..b66bf4c910 100644
--- a/module/move/unitore/src/storage/config.rs
+++ b/module/move/unitore/src/storage/config.rs
@@ -1,6 +1,6 @@
 //! Functionality for storing and retrieving config files.
 
-use super::*;
+use crate::*;
 use error_tools::{ err, Result };
 use gluesql::
 {
@@ -36,19 +36,19 @@ impl Config
 pub trait ConfigStore
 {
   /// Add subscription.
-  async fn add_config( &mut self, config : &Config ) -> Result< Payload >;
+  async fn config_add( &mut self, config : &Config ) -> Result< Payload >;
 
   /// Remove subscription.
-  async fn delete_config( &mut self, config : &Config ) -> Result< Payload >;
+  async fn config_delete( &mut self, config : &Config ) -> Result< Payload >;
 
   /// List subscriptions.
-  async fn list_configs( &mut self ) -> Result< Payload >;
+  async fn config_list( &mut self ) -> Result< Payload >;
 }
 
 #[ async_trait::async_trait( ?Send ) ]
-impl ConfigStore for FeedStorage< SledStorage >
+impl ConfigStore for storage::FeedStorage< SledStorage >
 {
-  async fn add_config( &mut self, config : &Config ) -> Result< Payload >
+  async fn config_add( &mut self, config : &Config ) -> Result< Payload >
   {
     let res = table( "config" )
     .insert()
@@ -60,32 +60,10 @@ impl ConfigStore for FeedStorage< SledStorage >
     .execute( &mut *self.storage.lock().await )
     .await;
 
-    // let res = match &res
-    // {
-    //   Err( err ) =>
-    //   {
-    //     if let gluesql::core::error::Error::Validate( val_err ) = err
-    //     {
-    //       let res = match val_err
-    //       {
-    //         gluesql::core::error::ValidateError::DuplicateEntryOnPrimaryKeyField( _ ) =>
-    //         {
-    //           res.context( "Config with same path already exists." )
-    //         },
-    //         _ => res.into()
-    //       };
-
-    //       res
-    //     }
-    //     res.into()
-    //   },
-    //   Ok( _ ) => res.into(),
-    // };
-
     Ok( res? )
   }
 
-  async fn delete_config( &mut self, config : &Config ) -> Result< Payload >
+  async fn config_delete( &mut self, config : &Config ) -> Result< Payload >
   {
     let res = table( "config" )
     .delete()
@@ -101,7 +79,7 @@ impl ConfigStore for FeedStorage< SledStorage >
     Ok( res )
   }
 
-  async fn list_configs( &mut self ) -> Result< Payload >
+  async fn config_list( &mut self ) -> Result< Payload >
   {
     let res = table( "config" ).select().execute( &mut *self.storage.lock().await ).await?;
     Ok( res )
diff --git a/module/move/unitore/src/storage/feed.rs b/module/move/unitore/src/storage/feed.rs
index 59d612bb6d..36ddec17d7 100644
--- a/module/move/unitore/src/storage/feed.rs
+++ b/module/move/unitore/src/storage/feed.rs
@@ -198,13 +198,13 @@ impl FeedStore for FeedStorage< SledStorage >
       reports.push( frames_report );
     }
 
-    if new_entries.len() > 0
+    if !new_entries.is_empty()
     {
-      let _saved_report = self.save_frames( new_entries ).await?;
+      let _saved_report = self.frames_save( new_entries ).await?;
     }
-    if modified_entries.len() > 0
+    if !modified_entries.is_empty()
     {
-      let _updated_report = self.update_frames( modified_entries ).await?;
+      let _updated_report = self.frames_update( modified_entries ).await?;
     }
 
     Ok( UpdateReport( reports ) )
diff --git a/module/move/unitore/src/storage/frame.rs b/module/move/unitore/src/storage/frame.rs
index cb4d736b35..4ea353f970 100644
--- a/module/move/unitore/src/storage/frame.rs
+++ b/module/move/unitore/src/storage/frame.rs
@@ -71,8 +71,7 @@ impl From< ( feed_rs::model::Entry, String ) > for Frame
 
     let media = entry.media
     .iter()
-    .map( | m | m.content.clone() )
-    .flatten()
+    .flat_map( | m | m.content.clone() )
     .filter_map( | m | m.url.map( | url | url.to_string() ) )
     .collect::< Vec< _ > >()
     ;
@@ -81,13 +80,13 @@ impl From< ( feed_rs::model::Entry, String ) > for Frame
     {
       id : entry.id,
       title : entry.title.map( | title | title.content ).clone(),
-      updated : entry.updated.clone(),
+      updated : entry.updated,
       authors : ( !authors.is_empty() ).then( || authors.join( ", " ) ),
       content,
       links : ( !links.len() == 0 ).then( || links.join( ", " ) ),
       summary : entry.summary.map( | c | c.content ).clone(),
       categories : ( !categories.is_empty() ).then( || categories.join( ", " ) ),
-      published : entry.published.clone(),
+      published : entry.published,
       source : entry.source.clone(),
       rights : entry.rights.map( | r | r.content ).clone(),
       media : ( !media.is_empty() ).then( || media.join( ", " ) ),
@@ -102,35 +101,37 @@ impl From< ( feed_rs::model::Entry, String ) > for Frame
 pub trait FrameStore
 {
   /// Insert items from list into feed table.
-  async fn save_frames( &mut self, feed : Vec< Frame > ) -> Result< Payload >;
+  async fn frames_save( &mut self, feed : Vec< Frame > ) -> Result< Payload >;
 
   /// Update items from list in feed table.
-  async fn update_frames( &mut self, feed : Vec< Frame > ) -> Result< () >;
+  async fn frames_update( &mut self, feed : Vec< Frame > ) -> Result< () >;
 
   /// Get all feed frames from storage.
-  async fn list_frames( &mut self ) -> Result< ListReport >;
+  async fn frames_list( &mut self ) -> Result< ListReport >;
 }
 
 #[ async_trait::async_trait( ?Send ) ]
 impl FrameStore for FeedStorage< SledStorage >
 {
-  async fn list_frames( &mut self ) -> Result< ListReport >
+  async fn frames_list( &mut self ) -> Result< ListReport >
   {
     let res = table( "frame" ).select().execute( &mut *self.storage.lock().await ).await?;
 
     let mut reports = Vec::new();
-    let all_frames = match res
+    let all_frames = 
+    if let Payload::Select { labels: label_vec, rows: rows_vec } = res
     {
-      Payload::Select { labels: label_vec, rows: rows_vec } =>
+      SelectedEntries
       {
-        SelectedEntries
-        {
-          selected_rows : rows_vec,
-          selected_columns : label_vec,
-        }
-      },
-      _ => SelectedEntries::new(),
+        selected_rows : rows_vec,
+        selected_columns : label_vec,
+      }
+    }
+    else
+    {
+      SelectedEntries::new()
     };
+    
 
     let mut feeds_map = HashMap::new();
 
@@ -159,7 +160,7 @@ impl FrameStore for FeedStorage< SledStorage >
     Ok( ListReport( reports ) )
   }
 
-  async fn save_frames( &mut self, frames : Vec< Frame > ) -> Result< Payload >
+  async fn frames_save( &mut self, frames : Vec< Frame > ) -> Result< Payload >
   {
     let entries_rows : Vec< Vec< ExprNode< 'static > > > = frames.into_iter().map( | entry | entry.into() ).collect_vec();
 
@@ -178,7 +179,7 @@ impl FrameStore for FeedStorage< SledStorage >
     Ok( insert )
   }
 
-  async fn update_frames( &mut self, feed : Vec< Frame > ) -> Result< () >
+  async fn frames_update( &mut self, feed : Vec< Frame > ) -> Result< () >
   {
     let entries_rows : Vec< Vec< ExprNode< 'static > > > = feed.into_iter().map( | entry | entry.into() ).collect_vec();
 
@@ -253,7 +254,7 @@ impl From< Frame > for Vec< ExprNode< 'static > >
     .unwrap_or( null() )
     ;
 
-    let language = entry.language.clone().map( | l | text( l ) ).unwrap_or( null() );
+    let language = entry.language.clone().map( text ).unwrap_or( null() );
 
     vec!
     [
diff --git a/module/move/unitore/src/storage/table.rs b/module/move/unitore/src/storage/table.rs
index 08038df8ee..60428ce0ce 100644
--- a/module/move/unitore/src/storage/table.rs
+++ b/module/move/unitore/src/storage/table.rs
@@ -1,4 +1,4 @@
-//! Tables sroring functions.
+//! Functionality for storage tables information.
 
 use crate::*;
 use error_tools::Result;
@@ -16,16 +16,16 @@ use storage::FeedStorage;
 pub trait TableStore
 {
   /// List tables in storage.
-  async fn list_tables( &mut self ) -> Result< TablesReport >;
+  async fn tables_list( &mut self ) -> Result< TablesReport >;
 
   /// List columns of table.
-  async fn list_columns( &mut self, table_name : String ) -> Result< Vec< Payload > >;
+  async fn table_list( &mut self, table_name : String ) -> Result< Vec< Payload > >;
 }
 
 #[ async_trait::async_trait( ?Send ) ]
 impl TableStore for FeedStorage< SledStorage >
 {
-  async fn list_tables( &mut self ) -> Result< TablesReport >
+  async fn tables_list( &mut self ) -> Result< TablesReport >
   {
     let glue = &mut *self.storage.lock().await;
     let payloads = glue.execute( "SELECT * FROM GLUE_TABLE_COLUMNS" ).await?;
@@ -35,7 +35,7 @@ impl TableStore for FeedStorage< SledStorage >
     Ok( report )
   }
 
-  async fn list_columns( &mut self, table_name : String ) -> Result< Vec< Payload > >
+  async fn table_list( &mut self, table_name : String ) -> Result< Vec< Payload > >
   {
     let glue = &mut *self.storage.lock().await;
     let query_str = format!( "SELECT * FROM GLUE_TABLE_COLUMNS WHERE TABLE_NAME='{}'", table_name );
diff --git a/module/move/unitore/tests/add_config.rs b/module/move/unitore/tests/config_add.rs
similarity index 86%
rename from module/move/unitore/tests/add_config.rs
rename to module/move/unitore/tests/config_add.rs
index 24e83d0d8a..502ec144f0 100644
--- a/module/move/unitore/tests/add_config.rs
+++ b/module/move/unitore/tests/config_add.rs
@@ -3,7 +3,7 @@ use std::path::PathBuf;
 use gluesql::sled_storage::sled::Config;
 use unitore::
 {
-  executor::FeedManager,
+  executor::{ FeedManager, actions },
   storage::{ FeedStorage, feed::FeedStore },
 };
 use error_tools::Result;
@@ -20,7 +20,7 @@ async fn add_config_file() -> Result< () >
   ;
 
   let feed_storage = FeedStorage::init_storage( config ).await?;
-  unitore::executor::actions::config::add_config( feed_storage.clone(), &wca::Args( vec![ wca::Value::Path( path ) ] ) ).await?;
+  actions::config::config_add( feed_storage.clone(), &wca::Args( vec![ wca::Value::Path( path ) ] ) ).await?;
 
   let mut manager = FeedManager::new( feed_storage );
   let res = manager.storage.get_all_feeds().await?;
diff --git a/module/move/unitore/tests/save_feed.rs b/module/move/unitore/tests/save_feed.rs
index e6b20c18b6..75dc54b5f7 100644
--- a/module/move/unitore/tests/save_feed.rs
+++ b/module/move/unitore/tests/save_feed.rs
@@ -62,7 +62,7 @@ async fn test_save_feed_plain() -> Result< () >
   feeds.push( ( feed, feed_config.update_period.clone(), feed_config.link.clone() ) );
   feed_storage.process_feeds( feeds ).await?;
 
-  let entries = feed_storage.list_frames().await?;
+  let entries = feed_storage.frames_list().await?;
 
   let number_of_frames = entries.0[ 0 ].selected_frames.selected_rows.len();
 
diff --git a/module/move/unitore/tests/update_newer_feed.rs b/module/move/unitore/tests/update_newer_feed.rs
index 324ed68556..c95d50619b 100644
--- a/module/move/unitore/tests/update_newer_feed.rs
+++ b/module/move/unitore/tests/update_newer_feed.rs
@@ -63,7 +63,7 @@ async fn test_update() -> Result< () >
   feed_storage.process_feeds( feeds ).await?;
 
   // check
-  let payload = feed_storage.list_frames().await?;
+  let payload = feed_storage.frames_list().await?;
 
   let entries = payload.0.iter().map( | val | val.selected_frames.selected_rows.clone() ).flatten().collect::< Vec< _ > >();
 

From e431a0762203d32154ac6737ee8a60ac1e86b659 Mon Sep 17 00:00:00 2001
From: Anton Parfonov <antonparfonov@gmail.com>
Date: Tue, 2 Apr 2024 17:12:25 +0300
Subject: [PATCH 11/49] Tests, extend docs

---
 module/core/collection_tools/Readme.md        |  27 ++-
 .../examples/collection_tools_trivial.rs      |   2 +-
 module/core/collection_tools/src/lib.rs       |   2 +-
 .../tests/inc/constructors.rs                 | 171 ++++++++++++++++++
 .../{constructor.rs => into_constructors.rs}  |  23 ++-
 module/core/collection_tools/tests/inc/mod.rs |   5 +-
 .../tests/nostd/constructors.rs               | 171 ++++++++++++++++++
 .../{constructor.rs => into_constructors.rs}  |   0
 .../core/collection_tools/tests/nostd/mod.rs  |   7 +-
 .../collection_tools/tests/nostd_tests.rs     |   4 +-
 10 files changed, 390 insertions(+), 22 deletions(-)
 create mode 100644 module/core/collection_tools/tests/inc/constructors.rs
 rename module/core/collection_tools/tests/inc/{constructor.rs => into_constructors.rs} (87%)
 create mode 100644 module/core/collection_tools/tests/nostd/constructors.rs
 rename module/core/collection_tools/tests/nostd/{constructor.rs => into_constructors.rs} (100%)

diff --git a/module/core/collection_tools/Readme.md b/module/core/collection_tools/Readme.md
index fc9218946b..0ab8b334a6 100644
--- a/module/core/collection_tools/Readme.md
+++ b/module/core/collection_tools/Readme.md
@@ -20,7 +20,7 @@ Consider the following example, which demonstrates the use of the `hmap!` macro
 # {
 use collection_tools::*;
 
-let meta_map = into_hmap! { 3 => 13 };
+let meta_map = hmap! { 3 => 13 };
 
 // it is identical to `hashbrown::HashMap` if `use_alloc` feature is on, otherwise `std::collections::HashMap`
 let mut std_map = collection_tools::HashMap::new();
@@ -38,9 +38,9 @@ Another example, this time, `into_bset!`, providing you a `BTreeSet`:
 # {
 use collection_tools::*;
 
-let meta_set = into_bset! { 3, 13 };
+let meta_set = bset! { 3, 13 };
 
-// no black magic, just a regular `alloc::BTreeSet` (same as `std::BTreeSet`)
+// this `BTreeSet` is just a reexport from `alloc`, so it can be used in the same places as `alloc/std::BTreeSet`
 let mut std_set = collection_tools::BTreeSet::new();
 
 std_set.insert( 13 );
@@ -57,9 +57,9 @@ Another example with `list!`:
 # {
 use collection_tools::*;
 
-let meta_list : LinkedList< i32 > = into_list! { 3, 13 };
+let meta_list : LinkedList< i32 > = list! { 3, 13 };
 
-// no black magic, just a regular `alloc::LinkedList` (same as `std::LinkedList`)
+// this `LinkedList` is just a reexport from `alloc`, so it can be used in the same places as `alloc/std::LinkedList`
 let mut meta_list = collection_tools::LinkedList::new();
 
 meta_list.push_front( 13 );
@@ -105,6 +105,23 @@ assert_eq!( vec.contains( &1 ), true );
 
 </details>
 
+### Basic Use Case :: `no_std` `HashSet` / `HashMap`
+
+The crate has two classes of macros: strict macros (the one we covered), which require that all collection members are of the same type; and more "relaxed" macros, that use under the hood `Into` trait to cast to a certain type. They can be accessed by prepending `into_` to name of a macro (`into_vec`, `into_bmap`, etc).
+
+While strict macros require you to have all members of the same type, more relaxed macros often require you to specify the desired type. So there's no a clear winner. Choose the right one for each situation separately.
+
+For example:
+```rust
+# #[ cfg( all( feature = "enabled", feature = "collection_into_constructors" ) ) ]
+# {
+use std::borrow::Cow;
+let vec : Vec< String > = collection_tools::into_vec!( "&str", "String".to_string(), Cow::from( "Cow" ) );
+# }
+```
+
+Each strict macro has its relaxed counterpart.
+
 ### Collections being used
 
 So what's the deal with `collection_tools::<collection>`?
diff --git a/module/core/collection_tools/examples/collection_tools_trivial.rs b/module/core/collection_tools/examples/collection_tools_trivial.rs
index adad43e7ab..b817a50c84 100644
--- a/module/core/collection_tools/examples/collection_tools_trivial.rs
+++ b/module/core/collection_tools/examples/collection_tools_trivial.rs
@@ -34,7 +34,7 @@ fn main(){}
 fn main()
 {
   use collection_tools::*;
-  let map = into_hmap! { 3 => 13 };
+  let map = hmap! { 3 => 13 };
   let mut expected = collection_tools::HashMap::new();
   expected.insert( 3, 13 );
   assert_eq!( map, expected );
diff --git a/module/core/collection_tools/src/lib.rs b/module/core/collection_tools/src/lib.rs
index c269d3863e..d87f6782ef 100644
--- a/module/core/collection_tools/src/lib.rs
+++ b/module/core/collection_tools/src/lib.rs
@@ -67,7 +67,7 @@ pub mod exposed
 #[ cfg( feature = "enabled" ) ]
 pub mod prelude
 {
-  #[ cfg( feature = "collection_into_constructors" ) ]
+  #[ cfg( feature = "collection_constructors" ) ]
   #[ doc( inline ) ]
   #[ allow( unused_imports ) ]
   pub use super::constructors::*;
diff --git a/module/core/collection_tools/tests/inc/constructors.rs b/module/core/collection_tools/tests/inc/constructors.rs
new file mode 100644
index 0000000000..f910b900aa
--- /dev/null
+++ b/module/core/collection_tools/tests/inc/constructors.rs
@@ -0,0 +1,171 @@
+#[ allow( unused_imports ) ]
+use super::*;
+
+//
+
+#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
+#[ test ]
+fn b_tree_map()
+{
+
+  // test.case( "empty" );
+  let got : the_module::BTreeMap< i32, i32 > = the_module::bmap!{};
+  let exp = the_module::BTreeMap::new();
+  assert_eq!( got, exp );
+
+  // test.case( "multiple entry" );
+  let got = the_module::bmap!{ 3 => 13, 4 => 1 };
+  let mut exp = the_module::BTreeMap::new();
+  exp.insert(3, 13);
+  exp.insert(4, 1);
+  assert_eq!( got, exp );
+
+}
+
+//
+
+#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
+#[ test ]
+fn b_tree_set()
+{
+
+  // test.case( "empty" );
+  let got : the_module::BTreeSet< i32 > = the_module::bset!{};
+  let exp = the_module::BTreeSet::new();
+  assert_eq!( got, exp );
+
+  // test.case( "multiple entry" );
+  let got = the_module::bset!{ 3, 13 };
+  let mut exp = the_module::BTreeSet::new();
+  exp.insert(3);
+  exp.insert(13);
+  assert_eq!( got, exp );
+
+}
+
+//
+
+#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
+#[ test ]
+fn binary_heap()
+{
+
+  // test.case( "empty" );
+  let got : the_module::BinaryHeap< i32 > = the_module::heap!{};
+  let exp: the_module::BinaryHeap< i32 > = the_module::BinaryHeap::new();
+  assert_eq!( got.into_vec(), exp.into_vec() );
+
+  // test.case( "multiple entry" );
+  let got = the_module::heap!{ 3, 13 };
+  let mut exp = the_module::BinaryHeap::new();
+  exp.push(3);
+  exp.push(13);
+  assert_eq!( got.into_sorted_vec(), exp.into_sorted_vec() );
+
+}
+
+//
+
+#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
+#[ test ]
+fn hash_map()
+{
+
+  // test.case( "empty" );
+  let got : the_module::HashMap< i32, i32 > = the_module::hmap!{};
+  let exp = the_module::HashMap::new();
+  assert_eq!( got, exp );
+
+
+  // test.case( "multiple entry" );
+  let got = the_module::hmap!{ 3 => 13, 4 => 1 };
+  let mut exp = the_module::HashMap::new();
+  exp.insert( 3, 13 );
+  exp.insert( 4, 1 );
+  assert_eq!( got, exp );
+
+}
+
+//
+
+#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
+#[ test ]
+fn hash_set()
+{
+
+  // test.case( "empty" );
+  let got : the_module::HashSet< i32 > = the_module::hset!{};
+  let exp = the_module::HashSet::new();
+  assert_eq!( got, exp );
+
+  // test.case( "multiple entry" );
+  let got = the_module::hset!{ 13, 11 };
+  let mut exp = the_module::HashSet::new();
+  exp.insert( 11 );
+  exp.insert( 13 );
+  assert_eq!( got, exp );
+
+}
+
+//
+
+#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
+#[ test ]
+fn linked_list()
+{
+
+  // test.case( "empty" );
+  let got : the_module::LinkedList< i32 > = the_module::list!{};
+  let exp = the_module::LinkedList::new();
+  assert_eq!( got, exp );
+
+  // test.case( "multiple entry" );
+  let got = the_module::list!{ 13, 15 };
+  let mut exp = the_module::LinkedList::new();
+  exp.push_front( 15 );
+  exp.push_front( 13 );
+  assert_eq!( got, exp );
+
+}
+
+//
+
+#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
+#[ test ]
+fn vec()
+{
+
+  // test.case( "empty" );
+  let got : the_module::Vec< i32 > = the_module::vec!{};
+  let exp = the_module::Vec::new();
+  assert_eq!( got, exp );
+
+  // test.case( "multiple entry" );
+  let got = the_module::vec!{ 3, 13 };
+  let mut exp = the_module::Vec::new();
+  exp.push( 3 );
+  exp.push( 13 );
+  assert_eq!( got, exp );
+
+}
+
+//
+
+#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
+#[ test ]
+fn vec_deque()
+{
+
+  // test.case( "empty" );
+  let got : the_module::VecDeque< i32 > = the_module::vecd!{};
+  let exp = the_module::VecDeque::new();
+  assert_eq!( got, exp );
+
+  // test.case( "multiple entry" );
+  let got = the_module::vecd!{ 3, 13 };
+  let mut exp = the_module::VecDeque::new();
+  exp.push_front( 13 );
+  exp.push_front( 3 );
+  assert_eq!( got, exp );
+
+}
diff --git a/module/core/collection_tools/tests/inc/constructor.rs b/module/core/collection_tools/tests/inc/into_constructors.rs
similarity index 87%
rename from module/core/collection_tools/tests/inc/constructor.rs
rename to module/core/collection_tools/tests/inc/into_constructors.rs
index 06305c3e36..bce1d6fc8b 100644
--- a/module/core/collection_tools/tests/inc/constructor.rs
+++ b/module/core/collection_tools/tests/inc/into_constructors.rs
@@ -13,10 +13,11 @@ fn b_tree_map()
   let exp = the_module::BTreeMap::new();
   assert_eq!( got, exp );
 
-  // test.case( "single entry" );
-  let got = the_module::into_bmap!{ 3 => 13 };
+  // test.case( "multiple entry" );
+  let got = the_module::into_bmap!{ 3 => 13, 4 => 1 };
   let mut exp = the_module::BTreeMap::new();
   exp.insert(3, 13);
+  exp.insert(4, 1);
   assert_eq!( got, exp );
 
 }
@@ -33,7 +34,7 @@ fn b_tree_set()
   let exp = the_module::BTreeSet::new();
   assert_eq!( got, exp );
 
-  // test.case( "single entry" );
+  // test.case( "multiple entry" );
   let got = the_module::into_bset!{ 3, 13 };
   let mut exp = the_module::BTreeSet::new();
   exp.insert(3);
@@ -54,7 +55,7 @@ fn binary_heap()
   let exp = the_module::BinaryHeap::new();
   assert_eq!( got.into_vec(), exp.into_vec() );
 
-  // test.case( "single entry" );
+  // test.case( "multiple entry" );
   let got : the_module::BinaryHeap< i32 > = the_module::into_heap!{ 3, 13 };
   let mut exp = the_module::BinaryHeap::new();
   exp.push(3);
@@ -76,10 +77,11 @@ fn hash_map()
   assert_eq!( got, exp );
 
 
-  // test.case( "single entry" );
-  let got = the_module::into_hmap!{ 3 => 13 };
+  // test.case( "multiple entry" );
+  let got = the_module::into_hmap!{ 3 => 13, 4 => 1 };
   let mut exp = the_module::HashMap::new();
   exp.insert( 3, 13 );
+  exp.insert( 4, 1 );
   assert_eq!( got, exp );
 
 }
@@ -96,9 +98,10 @@ fn hash_set()
   let exp = the_module::HashSet::new();
   assert_eq!( got, exp );
 
-  // test.case( "single entry" );
-  let got = the_module::into_hset!{ 13 };
+  // test.case( "multiple entry" );
+  let got = the_module::into_hset!{ 13, 11 };
   let mut exp = the_module::HashSet::new();
+  exp.insert( 11 );
   exp.insert( 13 );
   assert_eq!( got, exp );
 
@@ -116,7 +119,7 @@ fn linked_list()
   let exp = the_module::LinkedList::new();
   assert_eq!( got, exp );
 
-  // test.case( "single entry" );
+  // test.case( "multiple entry" );
   let got = the_module::into_list!{ 13, 15 };
   let mut exp = the_module::LinkedList::new();
   exp.push_front( 15 );
@@ -137,7 +140,7 @@ fn vec()
   let exp = the_module::Vec::new();
   assert_eq!( got, exp );
 
-  // test.case( "single entry" );
+  // test.case( "multiple entry" );
   let got : the_module::Vec< i32 > = the_module::into_vec!{ 3, 13 };
   let mut exp = the_module::Vec::new();
   exp.push( 3 );
diff --git a/module/core/collection_tools/tests/inc/mod.rs b/module/core/collection_tools/tests/inc/mod.rs
index 1c63c8c58b..843c19925e 100644
--- a/module/core/collection_tools/tests/inc/mod.rs
+++ b/module/core/collection_tools/tests/inc/mod.rs
@@ -1,8 +1,11 @@
 #[ allow( unused_imports ) ]
 use super::*;
 
+#[ cfg( any( feature = "collection_into_constructors") ) ]
+mod into_constructors;
+
 #[ cfg( any( feature = "collection_constructors" ) ) ]
-mod constructor;
+mod constructors;
 
 #[ cfg( any( feature = "collection_std" ) ) ]
 mod reexport;
diff --git a/module/core/collection_tools/tests/nostd/constructors.rs b/module/core/collection_tools/tests/nostd/constructors.rs
new file mode 100644
index 0000000000..be3df1768d
--- /dev/null
+++ b/module/core/collection_tools/tests/nostd/constructors.rs
@@ -0,0 +1,171 @@
+#[ allow( unused_imports ) ]
+use super::*;
+
+//
+
+#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
+#[ test ]
+fn b_tree_map()
+{
+
+  // test.case( "empty" );
+  let got : the_module::BTreeMap< i32, i32 > = the_module::bmap!{};
+  let exp = the_module::BTreeMap::new();
+  assert_eq!( got, exp );
+
+  // test.case( "multiple entry" );
+  let got = the_module::bmap!{ 3 => 13, 4 => 1 };
+  let mut exp = the_module::BTreeMap::new();
+  exp.insert(3, 13);
+  exp.insert(4, 1);
+  assert_eq!( got, exp );
+
+}
+
+//
+
+#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
+#[ test ]
+fn b_tree_set()
+{
+
+  // test.case( "empty" );
+  let got : the_module::BTreeSet< i32 > = the_module::bset!{};
+  let exp = the_module::BTreeSet::new();
+  assert_eq!( got, exp );
+
+  // test.case( "multiple entry" );
+  let got = the_module::bset!{ 3, 13 };
+  let mut exp = the_module::BTreeSet::new();
+  exp.insert(3);
+  exp.insert(13);
+  assert_eq!( got, exp );
+
+}
+
+//
+
+#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
+#[ test ]
+fn binary_heap()
+{
+
+  // test.case( "empty" );
+  let got : the_module::BinaryHeap< i32 > = the_module::heap!{};
+  let exp = the_module::BinaryHeap::new();
+  assert_eq!( got.into_vec(), exp.into_vec() );
+
+  // test.case( "multiple entry" );
+  let got = the_module::heap!{ 3, 13 };
+  let mut exp = the_module::BinaryHeap::new();
+  exp.push(3);
+  exp.push(13);
+  assert_eq!( got.into_sorted_vec(), exp.into_sorted_vec() );
+
+}
+
+//
+
+#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
+#[ test ]
+fn hash_map()
+{
+
+  // test.case( "empty" );
+  let got : the_module::HashMap< i32, i32 > = the_module::hmap!{};
+  let exp = the_module::HashMap::new();
+  assert_eq!( got, exp );
+
+
+  // test.case( "multiple entry" );
+  let got = the_module::hmap!{ 3 => 13, 4 => 1 };
+  let mut exp = the_module::HashMap::new();
+  exp.insert( 3, 13 );
+  exp.insert( 4, 1 );
+  assert_eq!( got, exp );
+
+}
+
+//
+
+#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
+#[ test ]
+fn hash_set()
+{
+
+  // test.case( "empty" );
+  let got : the_module::HashSet< i32 > = the_module::hset!{};
+  let exp = the_module::HashSet::new();
+  assert_eq!( got, exp );
+
+  // test.case( "multiple entry" );
+  let got = the_module::hset!{ 13, 11 };
+  let mut exp = the_module::HashSet::new();
+  exp.insert( 11 );
+  exp.insert( 13 );
+  assert_eq!( got, exp );
+
+}
+
+//
+
+#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
+#[ test ]
+fn linked_list()
+{
+
+  // test.case( "empty" );
+  let got : the_module::LinkedList< i32 > = the_module::list!{};
+  let exp = the_module::LinkedList::new();
+  assert_eq!( got, exp );
+
+  // test.case( "multiple entry" );
+  let got = the_module::list!{ 13, 15 };
+  let mut exp = the_module::LinkedList::new();
+  exp.push_front( 15 );
+  exp.push_front( 13 );
+  assert_eq!( got, exp );
+
+}
+
+//
+
+#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
+#[ test ]
+fn vec()
+{
+
+  // test.case( "empty" );
+  let got : the_module::Vec< i32 > = the_module::vec!{};
+  let exp = the_module::Vec::new();
+  assert_eq!( got, exp );
+
+  // test.case( "multiple entry" );
+  let got = the_module::vec!{ 3, 13 };
+  let mut exp = the_module::Vec::new();
+  exp.push( 3 );
+  exp.push( 13 );
+  assert_eq!( got, exp );
+
+}
+
+//
+
+#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
+#[ test ]
+fn vec_deque()
+{
+
+  // test.case( "empty" );
+  let got : the_module::VecDeque< i32 > = the_module::vecd!{};
+  let exp = the_module::VecDeque::new();
+  assert_eq!( got, exp );
+
+  // test.case( "multiple entry" );
+  let got = the_module::vecd!{ 3, 13 };
+  let mut exp = the_module::VecDeque::new();
+  exp.push_front( 13 );
+  exp.push_front( 3 );
+  assert_eq!( got, exp );
+
+}
diff --git a/module/core/collection_tools/tests/nostd/constructor.rs b/module/core/collection_tools/tests/nostd/into_constructors.rs
similarity index 100%
rename from module/core/collection_tools/tests/nostd/constructor.rs
rename to module/core/collection_tools/tests/nostd/into_constructors.rs
diff --git a/module/core/collection_tools/tests/nostd/mod.rs b/module/core/collection_tools/tests/nostd/mod.rs
index c82bd04190..c83f7f2779 100644
--- a/module/core/collection_tools/tests/nostd/mod.rs
+++ b/module/core/collection_tools/tests/nostd/mod.rs
@@ -1,10 +1,13 @@
 #[ allow( unused_imports ) ]
 use super::*;
 
+#[ cfg( any( feature = "collection_constructors" ) ) ]
+mod constructors;
+
 // aaa : xxx : does not work for `use_alloc`, make it working -- Made by switching from std collections to alloc / hashbrown
 // #[ cfg( not( feature = "use_alloc" ) ) ]
-#[ cfg( any( feature = "collection_constructors" ) ) ]
-mod constructor;
+#[ cfg( any( feature = "collection_into_constructors" ) ) ]
+mod into_constructors;
 
 #[ cfg( any( feature = "collection_std" ) ) ]
 mod reexport;
diff --git a/module/core/collection_tools/tests/nostd_tests.rs b/module/core/collection_tools/tests/nostd_tests.rs
index 01523c2896..d22a19e7b1 100644
--- a/module/core/collection_tools/tests/nostd_tests.rs
+++ b/module/core/collection_tools/tests/nostd_tests.rs
@@ -3,8 +3,8 @@
 
 #[ allow( unused_imports ) ]
 use ::collection_tools as the_module;
-#[ allow( unused_imports ) ]
-use test_tools::exposed::*;
+// #[ allow( unused_imports ) ]
+// use test_tools::exposed::*;
 #[ path="../../../../module/step/meta/src/module/aggregating.rs" ]
 mod aggregating;
 

From d4aa9e5fec16ffb4b09ddbc65ccb4db503ca4225 Mon Sep 17 00:00:00 2001
From: Anton Parfonov <antonparfonov@gmail.com>
Date: Tue, 2 Apr 2024 17:22:26 +0300
Subject: [PATCH 12/49] Minor changes

---
 module/core/collection_tools/Readme.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/core/collection_tools/Readme.md b/module/core/collection_tools/Readme.md
index bc3f72d7ac..113b999cf5 100644
--- a/module/core/collection_tools/Readme.md
+++ b/module/core/collection_tools/Readme.md
@@ -39,7 +39,8 @@ use collection_tools::*;
 
 let meta_set = bset! { 3, 13 };
 
-// this `BTreeSet` is just a reexport from `alloc`, so it can be used in the same places as `alloc/std::BTreeSet`
+// this `BTreeSet` is just a reexport from `alloc`,
+// so it can be used in the same places as `alloc/std::BTreeSet`
 let mut std_set = collection_tools::BTreeSet::new();
 
 std_set.insert( 13 );
@@ -58,7 +59,8 @@ use collection_tools::*;
 
 let meta_list : LinkedList< i32 > = list! { 3, 13 };
 
-// this `LinkedList` is just a reexport from `alloc`, so it can be used in the same places as `alloc/std::LinkedList`
+// this `LinkedList` is just a reexport from `alloc`,
+// so it can be used in the same places as `alloc/std::LinkedList`
 let mut meta_list = collection_tools::LinkedList::new();
 
 meta_list.push_front( 13 );

From 84805b825ac372cd6053b4d7e337f931dd35c6fd Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Thu, 4 Apr 2024 14:56:18 +0300
Subject: [PATCH 13/49] change file structure

---
 .../{executor/actions => action}/config.rs    | 19 ++--
 .../src/{executor/actions => action}/feed.rs  | 16 ++--
 .../src/{executor/actions => action}/frame.rs | 39 ++++----
 .../src/{executor/actions => action}/mod.rs   |  0
 .../src/{executor/actions => action}/query.rs |  6 +-
 .../src/{executor/actions => action}/table.rs | 12 ++-
 module/move/unitore/src/command/mod.rs        |  1 +
 module/move/unitore/src/command/table.rs      | 56 ++++++++++++
 .../unitore/src/{storage => entity}/config.rs |  0
 .../unitore/src/{storage => entity}/feed.rs   | 91 ++++++++++---------
 .../unitore/src/{storage => entity}/frame.rs  | 32 ++++---
 module/move/unitore/src/entity/mod.rs         |  7 ++
 .../unitore/src/{storage => entity}/table.rs  |  3 +-
 .../src/{executor/mod.rs => executor.rs}      | 35 +++----
 module/move/unitore/src/lib.rs                |  5 +-
 module/move/unitore/src/retriever.rs          | 13 +--
 .../src/{storage/mod.rs => storage.rs}        | 15 +--
 module/move/unitore/src/tool/mod.rs           |  1 +
 .../unitore/src/{ => tool}/table_display.rs   | 27 +++++-
 module/move/unitore/tests/config_add.rs       | 12 ++-
 module/move/unitore/tests/frame.rs            |  2 +-
 module/move/unitore/tests/save_feed.rs        | 27 +-----
 .../move/unitore/tests/update_newer_feed.rs   | 32 ++-----
 23 files changed, 253 insertions(+), 198 deletions(-)
 rename module/move/unitore/src/{executor/actions => action}/config.rs (90%)
 rename module/move/unitore/src/{executor/actions => action}/feed.rs (83%)
 rename module/move/unitore/src/{executor/actions => action}/frame.rs (86%)
 rename module/move/unitore/src/{executor/actions => action}/mod.rs (100%)
 rename module/move/unitore/src/{executor/actions => action}/query.rs (95%)
 rename module/move/unitore/src/{executor/actions => action}/table.rs (97%)
 create mode 100644 module/move/unitore/src/command/mod.rs
 create mode 100644 module/move/unitore/src/command/table.rs
 rename module/move/unitore/src/{storage => entity}/config.rs (100%)
 rename module/move/unitore/src/{storage => entity}/feed.rs (74%)
 rename module/move/unitore/src/{storage => entity}/frame.rs (89%)
 create mode 100644 module/move/unitore/src/entity/mod.rs
 rename module/move/unitore/src/{storage => entity}/table.rs (96%)
 rename module/move/unitore/src/{executor/mod.rs => executor.rs} (87%)
 rename module/move/unitore/src/{storage/mod.rs => storage.rs} (92%)
 create mode 100644 module/move/unitore/src/tool/mod.rs
 rename module/move/unitore/src/{ => tool}/table_display.rs (62%)

diff --git a/module/move/unitore/src/executor/actions/config.rs b/module/move/unitore/src/action/config.rs
similarity index 90%
rename from module/move/unitore/src/executor/actions/config.rs
rename to module/move/unitore/src/action/config.rs
index 8d83c01ab8..952d997fbc 100644
--- a/module/move/unitore/src/executor/actions/config.rs
+++ b/module/move/unitore/src/action/config.rs
@@ -3,16 +3,17 @@
 use crate::*;
 use error_tools::{ err, for_app::Context, BasicError, Result };
 use executor::FeedManager;
-use storage::
+use storage::FeedStorage;
+use entity::
 {
-  FeedStorage,
   feed::{ FeedStore, Feed },
   config::{ ConfigStore, Config },
 };
+use action::Report;
 use gluesql::{ prelude::Payload, sled_storage::SledStorage };
 
 /// Add configuration file with subscriptions to storage.
-pub async fn config_add( storage : FeedStorage< SledStorage >, args : &wca::Args ) -> Result< impl executor::Report >
+pub async fn config_add( storage : FeedStorage< SledStorage >, args : &wca::Args ) -> Result< impl Report >
 {
   let path : std::path::PathBuf = args
   .get_owned::< wca::Value >( 0 )
@@ -49,17 +50,17 @@ pub async fn config_add( storage : FeedStorage< SledStorage >, args : &wca::Args
 
   let feeds = feed_config::read( config.path() )?
   .into_iter()
-  .map( | feed | Feed::new( feed.link, feed.update_period ) )
+  .map( | feed | Feed::new( feed.link, feed.update_period, config.path() ) )
   .collect::< Vec< _ > >()
   ;
 
-  let new_feeds = manager.storage.save_feeds( feeds ).await?;
+  let new_feeds = manager.storage.feeds_save( feeds ).await?;
 
   Ok( ConfigReport{ payload : config_report, new_feeds : Some( new_feeds ) } )
 }
 
 /// Remove configuration file from storage.
-pub async fn config_delete( storage : FeedStorage< SledStorage >, args : &wca::Args ) -> Result< impl executor::Report >
+pub async fn config_delete( storage : FeedStorage< SledStorage >, args : &wca::Args ) -> Result< impl Report >
 {
   let path : std::path::PathBuf = args
   .get_owned::< wca::Value >( 0 )
@@ -80,7 +81,7 @@ pub async fn config_delete( storage : FeedStorage< SledStorage >, args : &wca::A
 }
 
 /// List all files with subscriptions that are currently in storage.
-pub async fn config_list( storage : FeedStorage< SledStorage >, _args : &wca::Args ) -> Result< impl executor::Report >
+pub async fn config_list( storage : FeedStorage< SledStorage >, _args : &wca::Args ) -> Result< impl Report >
 {
   let mut manager = FeedManager::new( storage );
   Ok( ConfigReport::new( manager.storage.config_list().await? ) )
@@ -139,7 +140,7 @@ impl std::fmt::Display for ConfigReport
           rows.push( vec![ EMPTY_CELL.to_owned(), String::from( row[ 0 ].clone() ) ] );
         }
 
-        let table = table_display::plain_table( rows );
+        let table = tool::table_display::plain_table( rows );
         if let Some( table ) = table
         {
           write!( f, "{}", table )?;
@@ -152,4 +153,4 @@ impl std::fmt::Display for ConfigReport
   }
 }
 
-impl executor::Report for ConfigReport {}
+impl Report for ConfigReport {}
diff --git a/module/move/unitore/src/executor/actions/feed.rs b/module/move/unitore/src/action/feed.rs
similarity index 83%
rename from module/move/unitore/src/executor/actions/feed.rs
rename to module/move/unitore/src/action/feed.rs
index 92863c0317..6b253ef0a2 100644
--- a/module/move/unitore/src/executor/actions/feed.rs
+++ b/module/move/unitore/src/action/feed.rs
@@ -1,15 +1,13 @@
 //! Endpoints and report for feed commands.
 
 use crate::*;
-use executor::
-{
-  FeedManager,
-  actions::{ Report, frame::SelectedEntries },
-};
-use storage::{ FeedStorage, feed::FeedStore };
+use executor::FeedManager;
+use action::{ Report, frame::SelectedEntries };
+use storage::FeedStorage;
+use entity::feed::FeedStore;
 use error_tools::Result;
 
-/// List all feeds.
+/// List all feeds from storage.
 pub async fn feeds_list
 (
   storage : FeedStorage< gluesql::sled_storage::SledStorage >,
@@ -17,7 +15,7 @@ pub async fn feeds_list
 ) -> Result< impl Report >
 {
   let mut manager = FeedManager::new( storage );
-  manager.storage.get_all_feeds().await
+  manager.storage.feeds_list().await
 }
 
 const EMPTY_CELL : &'static str = "";
@@ -52,7 +50,7 @@ impl std::fmt::Display for FeedsReport
       let mut headers = vec![ EMPTY_CELL.to_owned() ];
       headers.extend( self.0.selected_columns.iter().map( | str | str.to_owned() ) );
 
-      let table = table_display::table_with_headers( headers, rows );
+      let table = tool::table_display::table_with_headers( headers, rows );
       if let Some( table ) = table
       {
         write!( f, "{}", table )?;
diff --git a/module/move/unitore/src/executor/actions/frame.rs b/module/move/unitore/src/action/frame.rs
similarity index 86%
rename from module/move/unitore/src/executor/actions/frame.rs
rename to module/move/unitore/src/action/frame.rs
index f2ddef9471..3356bb1c53 100644
--- a/module/move/unitore/src/executor/actions/frame.rs
+++ b/module/move/unitore/src/action/frame.rs
@@ -2,16 +2,17 @@
 
 use crate::*;
 use executor::FeedManager;
-use storage::
+use storage::FeedStorage;
+use entity::
 {
-  FeedStorage,
   feed::FeedStore,
   config::ConfigStore,
-  frame::{ FrameStore, RowValue }
+  frame::{ FrameStore, CellValue }
 };
 use gluesql::prelude::{ Payload, Value, SledStorage };
 use feed_config;
 use error_tools::{ err, Result };
+use action::Report;
 
 // qqq : review the whole project and make sure all names are consitant: actions, commands, its tests
 
@@ -20,7 +21,7 @@ pub async fn frames_list
 (
   storage : FeedStorage< SledStorage >,
   _args : &wca::Args,
-) -> Result< impl executor::Report >
+) -> Result< impl Report >
 {
     let mut manager = FeedManager::new( storage );
     manager.storage.frames_list().await
@@ -31,7 +32,7 @@ pub async fn frames_download
 (
   storage : FeedStorage< SledStorage >,
   _args : &wca::Args,
-) -> Result< impl executor::Report >
+) -> Result< impl Report >
 {
   let mut manager = FeedManager::new( storage );
   let payload = manager.storage.config_list().await?;
@@ -72,10 +73,10 @@ pub async fn frames_download
   let client = retriever::FeedClient;
   for subscription in  subscriptions
   {
-    let feed = retriever::FeedFetch::fetch(&client, subscription.link.clone()).await?;
+    let feed = client.fetch( subscription.link.clone() ).await?;
     feeds.push( ( feed, subscription.update_period.clone(), subscription.link ) );
   }
-  manager.storage.process_feeds( feeds ).await
+  manager.storage.feeds_process( feeds ).await
 
 }
 
@@ -122,7 +123,7 @@ impl std::fmt::Display for FramesReport
   fn fmt( &self, f : &mut std::fmt::Formatter<'_> ) -> std::fmt::Result
   {
     let initial = vec![ vec![ format!( "Feed title: {}", self.feed_link ) ] ];
-    let table = table_display::table_with_headers( initial[ 0 ].clone(), Vec::new() );
+    let table = tool::table_display::table_with_headers( initial[ 0 ].clone(), Vec::new() );
     if let Some( table ) = table
     {
       write!( f, "{}", table )?;
@@ -140,7 +141,7 @@ impl std::fmt::Display for FramesReport
       rows.push( vec![ EMPTY_CELL.to_owned(), format!( "Selected frames:" ) ] );
     }
 
-    let table = table_display::plain_table( rows );
+    let table = tool::table_display::plain_table( rows );
     if let Some( table ) = table
     {
       write!( f, "{}", table )?;
@@ -148,8 +149,14 @@ impl std::fmt::Display for FramesReport
 
     for frame in &self.selected_frames.selected_rows
     {
+      let first_row = vec!
+      [
+        INDENT_CELL.to_owned(),
+        self.selected_frames.selected_columns[ 0 ].clone(),
+        textwrap::fill( &String::from( frame[ 0 ].clone() ), 120 ),
+      ];
       let mut rows = Vec::new();
-      for i in 0..self.selected_frames.selected_columns.len()
+      for i in 1..self.selected_frames.selected_columns.len()
       {
         let inner_row = vec!
         [
@@ -160,7 +167,7 @@ impl std::fmt::Display for FramesReport
         rows.push( inner_row );
       }
 
-      let table = table_display::plain_table( rows );
+      let table = tool::table_display::table_with_headers( first_row, rows );
       if let Some( table ) = table
       {
         writeln!( f, "{}", table )?;
@@ -171,9 +178,9 @@ impl std::fmt::Display for FramesReport
   }
 }
 
-impl executor::Report for FramesReport {}
+impl Report for FramesReport {}
 
-/// Items get from select query from storage.
+/// Items retrieved by select queries from storage.
 #[ derive( Debug ) ]
 pub struct SelectedEntries
 {
@@ -202,7 +209,7 @@ impl std::fmt::Display for SelectedEntries
       {
         for i in 0..self.selected_columns.len()
         {
-          write!( f, "{} : {}, ", self.selected_columns[ i ], RowValue( &row[ i ] ) )?;
+          write!( f, "{} : {}, ", self.selected_columns[ i ], CellValue( &row[ i ] ) )?;
         }
         writeln!( f, "" )?;
       }
@@ -238,7 +245,7 @@ impl std::fmt::Display for UpdateReport
   }
 }
 
-impl executor::Report for UpdateReport {}
+impl Report for UpdateReport {}
 
 /// Report for listing frames.
 #[ derive( Debug ) ]
@@ -270,4 +277,4 @@ impl std::fmt::Display for ListReport
   }
 }
 
-impl executor::Report for ListReport {}
+impl Report for ListReport {}
diff --git a/module/move/unitore/src/executor/actions/mod.rs b/module/move/unitore/src/action/mod.rs
similarity index 100%
rename from module/move/unitore/src/executor/actions/mod.rs
rename to module/move/unitore/src/action/mod.rs
diff --git a/module/move/unitore/src/executor/actions/query.rs b/module/move/unitore/src/action/query.rs
similarity index 95%
rename from module/move/unitore/src/executor/actions/query.rs
rename to module/move/unitore/src/action/query.rs
index 71ee7ba52c..fb004825cb 100644
--- a/module/move/unitore/src/executor/actions/query.rs
+++ b/module/move/unitore/src/action/query.rs
@@ -1,10 +1,12 @@
 //! Query command endpoint and report.
 
 // qqq : don't use both
+// aaa : fixed
 use crate::*;
 use gluesql::core::executor::Payload;
 use storage::{ FeedStorage, Store };
-use executor::{ FeedManager, actions::Report };
+use executor::FeedManager;
+use action::Report;
 use error_tools::{ err, BasicError, Result };
 
 /// Execute query specified in query string.
@@ -67,7 +69,7 @@ impl std::fmt::Display for QueryReport
               ];
               rows.push( new_row );
             }
-            let table = table_display::plain_table( rows );
+            let table = tool::table_display::plain_table( rows );
             if let Some( table ) = table
             {
               writeln!( f, "{}", table )?;
diff --git a/module/move/unitore/src/executor/actions/table.rs b/module/move/unitore/src/action/table.rs
similarity index 97%
rename from module/move/unitore/src/executor/actions/table.rs
rename to module/move/unitore/src/action/table.rs
index 232ee1c499..088e4adc33 100644
--- a/module/move/unitore/src/executor/actions/table.rs
+++ b/module/move/unitore/src/action/table.rs
@@ -3,8 +3,10 @@
 use crate::*;
 use gluesql::prelude::Payload;
 use std::collections::HashMap;
-use executor::{ FeedManager, Report };
-use storage::{ FeedStorage, table::TableStore };
+use action::Report;
+use executor::FeedManager;
+use storage::FeedStorage;
+use entity::table::TableStore;
 use error_tools::{ err, BasicError, Result };
 
 /// Get labels of column for specified table.
@@ -215,7 +217,7 @@ pub async fn table_list
   Ok( ColumnsReport::new( table_name, table_description, columns_desc ) )
 }
 
-/// Get names of tables in storage.
+/// Get information about tables in storage.
 pub async fn tables_list
 (
   storage : FeedStorage< gluesql::sled_storage::SledStorage >,
@@ -274,7 +276,7 @@ impl std::fmt::Display for ColumnsReport
           ]
         );
       }
-      let table = table_display::table_with_headers
+      let table = tool::table_display::table_with_headers
       (
         vec!
         [
@@ -369,7 +371,7 @@ impl std::fmt::Display for TablesReport
       );
     }
 
-    let table = table_display::table_with_headers
+    let table = tool::table_display::table_with_headers
     (
       vec!
       [
diff --git a/module/move/unitore/src/command/mod.rs b/module/move/unitore/src/command/mod.rs
new file mode 100644
index 0000000000..790b2c4ac0
--- /dev/null
+++ b/module/move/unitore/src/command/mod.rs
@@ -0,0 +1 @@
+pub mod table;
\ No newline at end of file
diff --git a/module/move/unitore/src/command/table.rs b/module/move/unitore/src/command/table.rs
new file mode 100644
index 0000000000..c5d8f5ffab
--- /dev/null
+++ b/module/move/unitore/src/command/table.rs
@@ -0,0 +1,56 @@
+//! 
+
+use crate::*;
+use gluesql::sled_storage::sled::Config;
+use wca::{ Command, Type, VerifiedCommand };
+use storage::FeedStorage;
+use action::{ Report, table::table_list };
+use error_tools::Result;
+
+pub struct TableCommand( Command );
+
+impl TableCommand
+{
+  pub fn new() -> Result< Self >
+  {
+
+    let rt  = tokio::runtime::Runtime::new()?;
+  
+    Ok( Self
+    (
+      Command::former()
+      .long_hint( concat!
+      (
+        "Delete file with feeds configuraiton. Subject: path to config file.\n",
+        "    Example: .config.delete ./config/feeds.toml",
+      ))
+      .subject().hint( "Path" ).kind( Type::Path ).optional( false ).end()
+      .routine( move | o : VerifiedCommand |
+      {
+        let res = rt.block_on( async move
+        {
+          let path_to_storage = std::env::var( "UNITORE_STORAGE_PATH" )
+          .unwrap_or( String::from( "./_data" ) )
+          ;
+          
+          let config = Config::default()
+          .path( path_to_storage )
+          ;
+
+          let feed_storage = FeedStorage::init_storage( &config ).await?;
+          table_list( feed_storage, &o.args ).await
+        } );
+        match res
+        {
+          Ok( report ) => report.report(),
+          Err( err ) => println!( "{:?}", err ),
+        }
+      })
+      .end()
+    ) )
+  }
+  pub fn command()
+  {
+
+  }
+}
\ No newline at end of file
diff --git a/module/move/unitore/src/storage/config.rs b/module/move/unitore/src/entity/config.rs
similarity index 100%
rename from module/move/unitore/src/storage/config.rs
rename to module/move/unitore/src/entity/config.rs
diff --git a/module/move/unitore/src/storage/feed.rs b/module/move/unitore/src/entity/feed.rs
similarity index 74%
rename from module/move/unitore/src/storage/feed.rs
rename to module/move/unitore/src/entity/feed.rs
index 1506e1268e..2d05d317ff 100644
--- a/module/move/unitore/src/storage/feed.rs
+++ b/module/move/unitore/src/entity/feed.rs
@@ -15,12 +15,13 @@ use gluesql::
   sled_storage::SledStorage,
 };
 
-use executor::actions::
+use action::
 {
   feed::FeedsReport,
   frame::{ UpdateReport, SelectedEntries, FramesReport },
 };
-use storage::{ FeedStorage, frame::FrameStore };
+use storage::FeedStorage;
+use entity::frame::FrameStore;
 use wca::wtools::Itertools;
 
 /// Feed item.
@@ -41,12 +42,14 @@ pub struct Feed
   pub published : Option< DateTime< Utc > >,
   /// How often the feed frames must be fetched.
   pub update_period : Duration,
+  /// Path to config file, from which this feed was saved.
+  pub config_file : String,
 }
 
 impl Feed
 {
   /// Create new feed item from source url and update period.
-  pub fn new( link : url::Url, update_period : Duration ) -> Self
+  pub fn new( link : url::Url, update_period : Duration, config: String ) -> Self
   {
     Self
     {
@@ -57,6 +60,7 @@ impl Feed
       description : None,
       published : None,
       update_period,
+      config_file : config,
     }
   }
 }
@@ -66,27 +70,40 @@ impl Feed
 #[ async_trait::async_trait( ?Send ) ]
 pub trait FeedStore
 {
+  /// Save new feeds to storage.
+  /// New feeds from config files that doesn't exist in storage will be inserted into `feed` table.
+  async fn feeds_save( &mut self, feeds : Vec< Feed > ) -> Result< Payload >;
 
-  /// Insert items from list into feed table.
-  async fn update_feed( &mut self, feed : Vec< Feed > ) -> Result< () >;
+  /// Update existing feeds in storage with new information.
+  /// Feed is updated one time during first fetch. 
+  async fn feeds_update( &mut self, feed : Vec< Feed > ) -> Result< () >;
 
-  /// Process fetched feed, new items will be saved, modified items will be updated.
-  async fn process_feeds( &mut self, feeds : Vec< ( feed_rs::model::Feed, Duration, url::Url ) > ) -> Result< UpdateReport >;
+  /// Process new fetched feeds and frames.
+  /// Frames from recent fetch will be sorted into three categories:
+  /// - new items that will be inserted into `frame` table;
+  /// - modified items that will be updated;
+  /// - unchanged frames saved from previous fetches will be ignored.
+  async fn feeds_process( &mut self, feeds : Vec< ( feed_rs::model::Feed, Duration, url::Url ) > ) -> Result< UpdateReport >;
 
-  /// Get all feeds from storage.
-  async fn get_all_feeds( &mut self ) -> Result< FeedsReport >;
-
-  /// Add feeds entries.
-  async fn save_feeds( &mut self, feeds : Vec< Feed > ) -> Result< Payload >;
+  /// Get existing feeds from storage.
+  /// Retrieves all feeds from `feed` table in storage.
+  async fn feeds_list( &mut self ) -> Result< FeedsReport >;
 }
 // qqq : poor description and probably naming. improve, please
+// aaa : updated description
 
 #[ async_trait::async_trait( ?Send ) ]
 impl FeedStore for FeedStorage< SledStorage >
 {
-  async fn get_all_feeds( &mut self ) -> Result< FeedsReport >
+  async fn feeds_list( &mut self ) -> Result< FeedsReport >
   {
-    let res = table( "feed" ).select().project( "title, link, update_period" ).execute( &mut *self.storage.lock().await ).await?;
+    let res = table( "feed" )
+    .select()
+    .project( "title, link, update_period, config_file" )
+    .execute( &mut *self.storage.lock().await )
+    .await?
+    ;
+  
     let mut report = FeedsReport::new();
     match res
     {
@@ -104,17 +121,23 @@ impl FeedStore for FeedStorage< SledStorage >
     Ok( report )
   }
 
-  async fn update_feed( &mut self, feed : Vec< Feed > ) -> Result< () >
+  async fn feeds_update( &mut self, feed : Vec< Feed > ) -> Result< () >
   {
     for feed in feed
     {
       let _update = table( "feed" )
       .update()
       .set( "title", feed.title.map( text ).unwrap_or( null() ) )
-      .set( "updated", feed.updated.map( | d | timestamp( d.to_rfc3339_opts( SecondsFormat::Millis, true ) ) ).unwrap_or( null() ) )
+      .set(
+        "updated",
+        feed.updated.map( | d | timestamp( d.to_rfc3339_opts( SecondsFormat::Millis, true ) ) ).unwrap_or( null() ),
+      )
       .set( "authors", feed.authors.map( text ).unwrap_or( null() ) )
       .set( "description", feed.description.map( text ).unwrap_or( null() ) )
-      .set( "published", feed.published.map( | d | timestamp( d.to_rfc3339_opts( SecondsFormat::Millis, true ) ) ).unwrap_or( null() ) )
+      .set(
+        "published",
+        feed.published.map( | d | timestamp( d.to_rfc3339_opts( SecondsFormat::Millis, true ) ) ).unwrap_or( null() ),
+      )
       .filter( col( "link" ).eq( feed.link.to_string() ) )
       .execute( &mut *self.storage.lock().await )
       .await
@@ -125,7 +148,7 @@ impl FeedStore for FeedStorage< SledStorage >
     Ok( () )
   }
 
-  async fn process_feeds
+  async fn feeds_process
   (
     &mut self,
     feeds : Vec< ( feed_rs::model::Feed, Duration, url::Url ) >,
@@ -211,7 +234,7 @@ impl FeedStore for FeedStorage< SledStorage >
     Ok( UpdateReport( reports ) )
   }
 
-  async fn save_feeds( &mut self, feed : Vec< Feed > ) -> Result< Payload >
+  async fn feeds_save( &mut self, feed : Vec< Feed > ) -> Result< Payload >
   {
     let feeds_rows : Vec< Vec< ExprNode< 'static > > > = feed.into_iter().map( | feed | feed.into() ).collect_vec();
 
@@ -225,7 +248,8 @@ impl FeedStore for FeedStorage< SledStorage >
       authors,
       description,
       published,
-      update_period",
+      update_period,
+      config_file",
     )
     .values( feeds_rows )
     .execute( &mut *self.storage.lock().await )
@@ -237,30 +261,8 @@ impl FeedStore for FeedStorage< SledStorage >
   }
 }
 
-impl From< ( feed_rs::model::Feed, Duration, url::Url ) > for Feed
-{
-  fn from( val : ( feed_rs::model::Feed, Duration, url::Url ) ) -> Self
-  {
-    let duration = val.1;
-    let link = val.2;
-    let value = val.0;
-
-    let authors = value.authors.into_iter().map( | p | p.name ).collect::< Vec< _ > >();
-    let description = value.description.map( | desc | desc.content );
-
-    Self
-    {
-      link,
-      title : value.title.map( | title | title.content ),
-      updated : value.updated,
-      published : value.published,
-      description,
-      authors : ( !authors.is_empty() ).then( || authors.join( ", " ) ),
-      update_period : duration,
-    }
-  }
-}
-
+/// Get convenient format of frame item for using with GlueSQL expression builder.
+/// Converts from Feed struct into vec of GlueSQL expression nodes. 
 impl From< Feed > for Vec< ExprNode< 'static > >
 {
   fn from( value : Feed ) -> Self
@@ -274,6 +276,7 @@ impl From< Feed > for Vec< ExprNode< 'static > >
       value.description.map( text ).unwrap_or( null() ),
       value.published.map( | d | timestamp( d.to_rfc3339_opts( SecondsFormat::Millis, true ) ) ).unwrap_or( null() ),
       text( value.update_period.as_secs().to_string() ),
+      text( value.config_file ),
     ]
   }
 }
diff --git a/module/move/unitore/src/storage/frame.rs b/module/move/unitore/src/entity/frame.rs
similarity index 89%
rename from module/move/unitore/src/storage/frame.rs
rename to module/move/unitore/src/entity/frame.rs
index 416790b977..3d01cc2064 100644
--- a/module/move/unitore/src/storage/frame.rs
+++ b/module/move/unitore/src/entity/frame.rs
@@ -15,7 +15,7 @@ use gluesql::
   sled_storage::SledStorage,
 };
 
-use executor::actions::frame::{ FramesReport, ListReport, SelectedEntries };
+use action::frame::{ FramesReport, ListReport, SelectedEntries };
 use storage::FeedStorage;
 use wca::wtools::Itertools;
 
@@ -27,7 +27,7 @@ pub struct Frame
   pub id : String,
   /// Frame title.
   pub title : Option< String >,
-  updated : Option< DateTime< Utc > >,
+  stored_time : Option< DateTime< Utc > >,
   authors : Option< String >,
   content : Option< String >,
   links : Option< String >,
@@ -42,6 +42,7 @@ pub struct Frame
 }
 
 // qqq : not obvious
+/// Convert from feed_rs feed entry and feed link to Frame struct for convenient use and storage.
 impl From< ( feed_rs::model::Entry, String ) > for Frame
 {
   fn from( ( entry, feed_link ) : ( feed_rs::model::Entry, String ) ) -> Self
@@ -81,7 +82,7 @@ impl From< ( feed_rs::model::Entry, String ) > for Frame
     {
       id : entry.id,
       title : entry.title.map( | title | title.content ).clone(),
-      updated : entry.updated,
+      stored_time : entry.updated,
       authors : ( !authors.is_empty() ).then( || authors.join( ", " ) ),
       // qqq : why join?
       content,
@@ -105,16 +106,19 @@ impl From< ( feed_rs::model::Entry, String ) > for Frame
 #[ async_trait::async_trait( ?Send ) ]
 pub trait FrameStore
 {
-  /// Insert items from list into feed table.
+  /// Save new frames to storage.
+  /// New frames will be inserted into `frame` table. 
   async fn frames_save( &mut self, feed : Vec< Frame > ) -> Result< Payload >;
 
-  /// Update items from list in feed table.
+  /// Update existing frames in storage with new changes.
+  /// If frames in storage were modified in feed source, they will be changed to match new version. 
   async fn frames_update( &mut self, feed : Vec< Frame > ) -> Result< () >;
 
   /// Get all feed frames from storage.
   async fn frames_list( &mut self ) -> Result< ListReport >;
 }
 // qqq : what is update? what update? don't use word update without noun and explanation what deos it mean
+// aaa : fixed comments
 
 #[ async_trait::async_trait( ?Send ) ]
 impl FrameStore for FeedStorage< SledStorage >
@@ -138,7 +142,6 @@ impl FrameStore for FeedStorage< SledStorage >
       SelectedEntries::new()
     };
     
-
     let mut feeds_map = HashMap::new();
 
     for row in all_frames.selected_rows
@@ -210,6 +213,10 @@ impl FrameStore for FeedStorage< SledStorage >
 }
 
 // qqq : what is it for and why?
+// aaa : added explanation
+
+/// Get convenient frame format for using with GlueSQL expression builder.
+/// Converts from Frame struct into vec of GlueSQL expression nodes. 
 impl From< Frame > for Vec< ExprNode< 'static > >
 {
   fn from( entry : Frame ) -> Self
@@ -219,7 +226,7 @@ impl From< Frame > for Vec< ExprNode< 'static > >
     .unwrap_or( null() )
     ;
 
-    let updated = entry.updated
+    let stored_time = entry.stored_time
     .map( | d | timestamp( d.to_rfc3339_opts( SecondsFormat::Millis, true ) ) )
     .unwrap_or( null() )
     ;
@@ -267,7 +274,7 @@ impl From< Frame > for Vec< ExprNode< 'static > >
     [
       text( entry.id ),
       title,
-      updated,
+      stored_time,
       authors,
       content,
       links,
@@ -284,11 +291,12 @@ impl From< Frame > for Vec< ExprNode< 'static > >
 }
 
 // qqq : RowValue or CellValue?
+// aaa : fixed name
 /// GlueSQL Value wrapper for display.
 #[ derive( Debug ) ]
-pub struct RowValue< 'a >( pub &'a gluesql::prelude::Value );
+pub struct CellValue< 'a >( pub &'a gluesql::prelude::Value );
 
-impl std::fmt::Display for RowValue< '_ >
+impl std::fmt::Display for CellValue< '_ >
 {
   fn fmt( &self, f : &mut std::fmt::Formatter<'_> ) -> std::fmt::Result
   {
@@ -318,9 +326,9 @@ impl std::fmt::Display for RowValue< '_ >
   }
 }
 
-impl From< RowValue< '_ > > for String
+impl From< CellValue< '_ > > for String
 {
-  fn from( value : RowValue< '_ > ) -> Self
+  fn from( value : CellValue< '_ > ) -> Self
   {
     use gluesql::core::data::Value::*;
     match &value.0
diff --git a/module/move/unitore/src/entity/mod.rs b/module/move/unitore/src/entity/mod.rs
new file mode 100644
index 0000000000..94a95a552b
--- /dev/null
+++ b/module/move/unitore/src/entity/mod.rs
@@ -0,0 +1,7 @@
+//! Entities of application.
+
+pub mod config;
+pub mod frame;
+pub mod table;
+pub mod feed;
+
diff --git a/module/move/unitore/src/storage/table.rs b/module/move/unitore/src/entity/table.rs
similarity index 96%
rename from module/move/unitore/src/storage/table.rs
rename to module/move/unitore/src/entity/table.rs
index 60428ce0ce..b35ccdcac5 100644
--- a/module/move/unitore/src/storage/table.rs
+++ b/module/move/unitore/src/entity/table.rs
@@ -8,7 +8,7 @@ use gluesql::
   prelude::Payload,
 };
 
-use executor::actions::table::TablesReport;
+use action::table::TablesReport;
 use storage::FeedStorage;
 
 /// Functions for tables informantion.
@@ -43,5 +43,4 @@ impl TableStore for FeedStorage< SledStorage >
 
     Ok( payloads )
   }
-
 }
diff --git a/module/move/unitore/src/executor/mod.rs b/module/move/unitore/src/executor.rs
similarity index 87%
rename from module/move/unitore/src/executor/mod.rs
rename to module/move/unitore/src/executor.rs
index 02f34d72dc..687eef4771 100644
--- a/module/move/unitore/src/executor/mod.rs
+++ b/module/move/unitore/src/executor.rs
@@ -3,15 +3,14 @@
 use crate::*;
 use feed_config::SubscriptionConfig;
 use gluesql::sled_storage::{ sled::Config, SledStorage };
-use retriever::{ FeedClient, FeedFetch };
-use storage::{ Store, FeedStorage, feed::FeedStore, config::ConfigStore, table::TableStore, frame::FrameStore };
+use storage::{ Store, FeedStorage };
+use entity::{ feed::FeedStore, config::ConfigStore, table::TableStore, frame::FrameStore };
 use wca::{ Args, Type, VerifiedCommand };
-use executor::actions::Report;
 use error_tools::Result;
 
-pub mod actions;
-use actions::
+use action::
 {
+  Report,
   frame::{ frames_list, frames_download },
   feed::feeds_list,
   config::{ config_add, config_delete, config_list },
@@ -23,7 +22,7 @@ fn action< 'a, F, Fut, R >( async_endpoint : F, args : &'a Args ) -> Result< R >
 where
   F : FnOnce( FeedStorage< SledStorage >, &'a Args ) -> Fut,
   Fut : std::future::Future< Output = Result< R > >,
-  R : actions::Report,
+  R : action::Report,
 {
   let path_to_storage = std::env::var( "UNITORE_STORAGE_PATH" )
   .unwrap_or( String::from( "./_data" ) )
@@ -36,7 +35,7 @@ where
 
   rt.block_on( async move
   {
-    let feed_storage = FeedStorage::init_storage( config ).await?;
+    let feed_storage = FeedStorage::init_storage( &config ).await?;
     async_endpoint( feed_storage, args ).await
   } )
 }
@@ -44,6 +43,7 @@ where
 /// Run feed updates.
 pub fn execute() -> Result< (), Box< dyn std::error::Error + Send + Sync > >
 {
+  //let ca = wca::CommandsAggregator::new();
   let ca = wca::CommandsAggregator::former()
   .command( "frames.download" )
     .hint( "Download frames from feed sources provided in config files." )
@@ -217,17 +217,15 @@ pub fn execute() -> Result< (), Box< dyn std::error::Error + Send + Sync > >
 }
 
 /// Manages feed subsriptions and updates.
-pub struct FeedManager< C, S : FeedStore + ConfigStore + FrameStore + Store + Send >
+pub struct FeedManager< S : FeedStore + ConfigStore + FrameStore + Store + Send >
 {
   /// Subscription configuration with link and update period.
   pub config : Vec< SubscriptionConfig >,
   /// Storage for saving feed.
   pub storage : S,
-  /// Client for fetching feed from links in FeedConfig.
-  pub client : C,
 }
 
-impl< C, S : FeedStore + ConfigStore + FrameStore + Store + Send > std::fmt::Debug for FeedManager< C, S >
+impl< S : FeedStore + ConfigStore + FrameStore + Store + Send > std::fmt::Debug for FeedManager< S >
 {
   fn fmt( &self, f: &mut std::fmt::Formatter<'_> ) -> std::fmt::Result
   {
@@ -235,21 +233,20 @@ impl< C, S : FeedStore + ConfigStore + FrameStore + Store + Send > std::fmt::Deb
   }
 }
 
-impl< S : FeedStore + ConfigStore + FrameStore + TableStore + Store + Send > FeedManager< FeedClient, S >
+impl< S : FeedStore + ConfigStore + FrameStore + TableStore + Store + Send > FeedManager< S >
 {
   /// Create new instance of FeedManager.
-  pub fn new( storage : S ) -> FeedManager< FeedClient, S >
+  pub fn new( storage : S ) -> FeedManager< S >
   {
     Self
     {
       storage,
       config : Vec::new(),
-      client : FeedClient,
     }
   }
 }
 
-impl< C : FeedFetch, S : FeedStore + ConfigStore + FrameStore + TableStore + Store + Send > FeedManager< C, S >
+impl< S : FeedStore + ConfigStore + FrameStore + TableStore + Store + Send > FeedManager< S >
 {
   /// Set configurations for subscriptions.
   pub fn set_config( &mut self, configs : Vec< SubscriptionConfig > )
@@ -257,14 +254,8 @@ impl< C : FeedFetch, S : FeedStore + ConfigStore + FrameStore + TableStore + Sto
     self.config = configs;
   }
 
-  /// Set client for fetching feed.
-  pub fn set_client( &mut self, client : C )
-  {
-    self.client = client;
-  }
-
   /// Execute custom query, print result.
-  pub async fn execute_custom_query( &mut self, query : String ) -> Result< impl actions::Report >
+  pub async fn execute_custom_query( &mut self, query : String ) -> Result< impl Report >
   {
     self.storage.execute_query( query ).await
   }
diff --git a/module/move/unitore/src/lib.rs b/module/move/unitore/src/lib.rs
index d871675d0c..cc00707681 100644
--- a/module/move/unitore/src/lib.rs
+++ b/module/move/unitore/src/lib.rs
@@ -3,6 +3,9 @@ pub mod retriever;
 pub mod feed_config;
 pub mod executor;
 pub mod storage;
-pub mod table_display;
+pub mod tool;
+pub mod command;
+pub mod action;
+pub mod entity;
 
 // qqq : src/Readmу.md with file structure please
diff --git a/module/move/unitore/src/retriever.rs b/module/move/unitore/src/retriever.rs
index 32a3f4e47a..79eea6b407 100644
--- a/module/move/unitore/src/retriever.rs
+++ b/module/move/unitore/src/retriever.rs
@@ -12,22 +12,15 @@ use feed_rs::parser as feed_parser;
 use error_tools::{ Result, for_app::Context };
 
 // qqq : purpose of trait if any?
-/// Fetch feed from provided source link.
-#[ async_trait::async_trait ]
-pub trait FeedFetch
-{
-  /// Get feed from source specified by its link.
-  async fn fetch( &self, source : url::Url ) -> Result< feed_rs::model::Feed >;
-}
+// aaa : removed unnecessary trait
 
 /// Feed client for fetching feed.
 #[ derive( Debug ) ]
 pub struct FeedClient;
 
-#[ async_trait::async_trait ]
-impl FeedFetch for FeedClient
+impl FeedClient
 {
-  async fn fetch( &self, source : url::Url ) -> Result< feed_rs::model::Feed >
+  pub async fn fetch( &self, source : url::Url ) -> Result< feed_rs::model::Feed >
   {
     let https = HttpsConnector::new();
     let client = Client::builder( TokioExecutor::new() ).build::< _, Empty< Bytes > >( https );
diff --git a/module/move/unitore/src/storage/mod.rs b/module/move/unitore/src/storage.rs
similarity index 92%
rename from module/move/unitore/src/storage/mod.rs
rename to module/move/unitore/src/storage.rs
index 1eedc29afd..86295eb4f0 100644
--- a/module/move/unitore/src/storage/mod.rs
+++ b/module/move/unitore/src/storage.rs
@@ -14,13 +14,7 @@ use gluesql::
   prelude::Glue,
   sled_storage::{ sled::Config, SledStorage },
 };
-
-use executor::actions::query::QueryReport;
-
-pub mod config;
-pub mod frame;
-pub mod table;
-pub mod feed;
+use action::query::QueryReport;
 
 /// Storage for feed frames.
 #[ derive( Clone ) ]
@@ -28,7 +22,7 @@ pub struct FeedStorage< S : GStore + GStoreMut + Send >
 {
   /// GlueSQL storage.
   pub storage : Arc< Mutex< Glue< S > > >,
-  frame_fields : Vec< [ &'static str; 3 ] >,
+  pub frame_fields : Vec< [ &'static str; 3 ] >,
 }
 
 impl< S : GStore + GStoreMut + Send > std::fmt::Debug for FeedStorage< S >
@@ -42,7 +36,7 @@ impl< S : GStore + GStoreMut + Send > std::fmt::Debug for FeedStorage< S >
 impl FeedStorage< SledStorage >
 {
   /// Initialize new storage from configuration, create feed table.
-  pub async fn init_storage( config : Config ) -> Result< Self >
+  pub async fn init_storage( config : &Config ) -> Result< Self >
   {
     let storage = SledStorage::try_from( config.clone() )
     .context( format!( "Failed to initialize storage with config {:?}", config ) )?
@@ -68,6 +62,7 @@ impl FeedStorage< SledStorage >
     .add_column( "description TEXT" )
     .add_column( "published TIMESTAMP" )
     .add_column( "update_period TEXT" )
+    .add_column( "config_file TEXT FOREIGN KEY REFERENCES config(path)" )
     .build()?
     ;
 
@@ -77,7 +72,7 @@ impl FeedStorage< SledStorage >
     [
       [ "id", "TEXT", "A unique identifier for this frame in the feed. " ],
       [ "title", "TEXT", "Title of the frame" ],
-      [ "updated", "TIMESTAMP", "Time at which this item was fetched from source." ],
+      [ "stored_time", "TIMESTAMP", "Time at which this item was fetched from source." ],
       [ "authors", "TEXT", "List of authors of the frame, optional." ],
       [ "content", "TEXT", "The content of the frame in html or plain text, optional." ],
       [ "links", "TEXT", "List of links associated with this item of related Web page and attachments." ],
diff --git a/module/move/unitore/src/tool/mod.rs b/module/move/unitore/src/tool/mod.rs
new file mode 100644
index 0000000000..200a9b43be
--- /dev/null
+++ b/module/move/unitore/src/tool/mod.rs
@@ -0,0 +1 @@
+pub mod table_display;
\ No newline at end of file
diff --git a/module/move/unitore/src/table_display.rs b/module/move/unitore/src/tool/table_display.rs
similarity index 62%
rename from module/move/unitore/src/table_display.rs
rename to module/move/unitore/src/tool/table_display.rs
index 9f334cc8ee..4b5f35475a 100644
--- a/module/move/unitore/src/table_display.rs
+++ b/module/move/unitore/src/tool/table_display.rs
@@ -1,12 +1,16 @@
-//! Helper for command report representation.
+//! Wrapper for command report representation.
+//! Separates usage of cli-table library behind facade for convenient changes in future.
 
 use cli_table::
 {
-  format::{ Border, Separator }, Cell, Style, Table, TableDisplay
+  format::{ Border, HorizontalLine, Separator }, Cell, Style, Table, TableDisplay
 };
 
 // qqq : purpose well defined should be always be in documentation
-/// Wrapper struct for cli-table table with iplementation of Display.
+// aaa : added explanation
+
+/// Wrapper struct for cli-table table with implementation of Display.
+/// Separates usage of cli-table library behind facade for convenient changes in future.
 pub struct ReportTable( TableDisplay );
 
 impl std::fmt::Display for ReportTable
@@ -63,5 +67,22 @@ pub fn table_with_headers( headers : Vec< String >, rows : Vec< Vec< String > >
   .separator( Separator::builder().build() )
   ;
 
+  table_struct.display().map( | table | ReportTable( table ) ).ok()
+}
+
+/// Transform 2-dimensional vec of String data into displayable table with plain rows and bottom border.
+pub fn plain_with_border( rows : Vec< Vec< String > > ) -> Option< ReportTable >
+{
+  let rows = rows
+  .into_iter()
+  .map( | row | row.into_iter().map( | cell_val | cell_val.cell() ).collect::< Vec< _ > >() )
+  .collect::< Vec< _ > >()
+  ;
+
+  let table_struct = rows.table()
+  .border( Border::builder().bottom(HorizontalLine::default()).build() )
+  .separator( Separator::builder().build() )
+  ;
+
   table_struct.display().map( | table | ReportTable( table ) ).ok()
 }
\ No newline at end of file
diff --git a/module/move/unitore/tests/config_add.rs b/module/move/unitore/tests/config_add.rs
index 502ec144f0..c938eb5d99 100644
--- a/module/move/unitore/tests/config_add.rs
+++ b/module/move/unitore/tests/config_add.rs
@@ -3,8 +3,10 @@ use std::path::PathBuf;
 use gluesql::sled_storage::sled::Config;
 use unitore::
 {
-  executor::{ FeedManager, actions },
-  storage::{ FeedStorage, feed::FeedStore },
+  executor::FeedManager,
+  storage::FeedStorage,
+  entity::feed::FeedStore,
+  action::config,
 };
 use error_tools::Result;
 
@@ -19,11 +21,11 @@ async fn add_config_file() -> Result< () >
   .temporary( true )
   ;
 
-  let feed_storage = FeedStorage::init_storage( config ).await?;
-  actions::config::config_add( feed_storage.clone(), &wca::Args( vec![ wca::Value::Path( path ) ] ) ).await?;
+  let feed_storage = FeedStorage::init_storage( &config ).await?;
+  config::config_add( feed_storage.clone(), &wca::Args( vec![ wca::Value::Path( path ) ] ) ).await?;
 
   let mut manager = FeedManager::new( feed_storage );
-  let res = manager.storage.get_all_feeds().await?;
+  let res = manager.storage.feeds_list().await?;
 
   let feeds_links = res.0.selected_rows
   .iter()
diff --git a/module/move/unitore/tests/frame.rs b/module/move/unitore/tests/frame.rs
index 248f40330b..a5d7b510e1 100644
--- a/module/move/unitore/tests/frame.rs
+++ b/module/move/unitore/tests/frame.rs
@@ -6,7 +6,7 @@ async fn frame() -> Result< () >
 {
   let feed = feed_parser::parse( include_str!( "./fixtures/plain_feed.xml" ).as_bytes() )?;
 
-  let frame = unitore::storage::frame::Frame::from( ( feed.entries[ 0 ].clone(), String::new() ) );
+  let frame = unitore::entity::frame::Frame::from( ( feed.entries[ 0 ].clone(), String::new() ) );
 
 
   assert!( frame.id == feed.entries[ 0 ].id );
diff --git a/module/move/unitore/tests/save_feed.rs b/module/move/unitore/tests/save_feed.rs
index 75dc54b5f7..2ac5cbcff3 100644
--- a/module/move/unitore/tests/save_feed.rs
+++ b/module/move/unitore/tests/save_feed.rs
@@ -1,28 +1,12 @@
-use async_trait::async_trait;
 use feed_rs::parser as feed_parser;
 use unitore::
 {
   feed_config::SubscriptionConfig,
-  retriever::FeedFetch,
-  storage::{ FeedStorage, frame::FrameStore, feed::FeedStore },
+  storage::FeedStorage,
+  entity::{ frame::FrameStore, feed::FeedStore },
 };
 use error_tools::Result;
 
-/// Feed client for testing.
-#[derive(Debug)]
-pub struct TestClient;
-
-#[ async_trait ]
-impl FeedFetch for TestClient
-{
-  async fn fetch( &self, _ : url::Url ) -> Result< feed_rs::model::Feed >
-  {
-    let feed = feed_parser::parse( include_str!( "./fixtures/plain_feed.xml" ).as_bytes() )?;
-
-    Ok( feed )
-  }
-}
-
 #[ tokio::test ]
 async fn test_save_feed_plain() -> Result< () >
 {
@@ -47,7 +31,7 @@ async fn test_save_feed_plain() -> Result< () >
   .temporary( true )
   ;
 
-  let mut feed_storage = FeedStorage::init_storage( config ).await?;
+  let mut feed_storage = FeedStorage::init_storage( &config ).await?;
 
   let feed_config = SubscriptionConfig
   {
@@ -56,11 +40,10 @@ async fn test_save_feed_plain() -> Result< () >
   };
 
   let mut feeds = Vec::new();
-  let client = TestClient;
 
-  let feed = FeedFetch::fetch( &client, feed_config.link.clone()).await?;
+  let feed = feed_parser::parse( include_str!("./fixtures/plain_feed.xml").as_bytes() )?;
   feeds.push( ( feed, feed_config.update_period.clone(), feed_config.link.clone() ) );
-  feed_storage.process_feeds( feeds ).await?;
+  feed_storage.feeds_process( feeds ).await?;
 
   let entries = feed_storage.frames_list().await?;
 
diff --git a/module/move/unitore/tests/update_newer_feed.rs b/module/move/unitore/tests/update_newer_feed.rs
index c95d50619b..4702acfcf0 100644
--- a/module/move/unitore/tests/update_newer_feed.rs
+++ b/module/move/unitore/tests/update_newer_feed.rs
@@ -1,4 +1,3 @@
-use async_trait::async_trait;
 use feed_rs::parser as feed_parser;
 use gluesql::
 {
@@ -12,26 +11,12 @@ use gluesql::
 use unitore::
 {
   feed_config::SubscriptionConfig,
-  retriever::FeedFetch,
-  storage::{ feed::FeedStore, frame::FrameStore, FeedStorage },
+  storage::FeedStorage,
+  entity::{ feed::FeedStore, frame::FrameStore },
 };
 use wca::wtools::Itertools;
 use error_tools::Result;
 
-/// Feed client for testing.
-#[derive(Debug)]
-pub struct TestClient ( String );
-
-#[ async_trait ]
-impl FeedFetch for TestClient
-{
-  async fn fetch( &self, _ : url::Url ) -> Result< feed_rs::model::Feed >
-  {
-    let feed = feed_parser::parse( std::fs::read_to_string( &self.0 )?.as_bytes() )?;
-    Ok( feed )
-  }
-}
-
 #[ tokio::test ]
 async fn test_update() -> Result< () >
 {
@@ -40,7 +25,7 @@ async fn test_update() -> Result< () >
   .temporary( true )
   ;
 
-  let mut feed_storage = FeedStorage::init_storage( config ).await?;
+  let mut feed_storage = FeedStorage::init_storage( &config ).await?;
 
   let feed_config = SubscriptionConfig
   {
@@ -49,18 +34,15 @@ async fn test_update() -> Result< () >
   };
 
   // initial fetch
-  let client = TestClient( "./tests/fixtures/plain_feed.xml".to_owned() );
-
-  let feed = FeedFetch::fetch( &client, feed_config.link.clone()).await?;
+  let feed = feed_parser::parse( include_str!("./fixtures/plain_feed.xml").as_bytes() )?;
   let feeds = vec![ ( feed, feed_config.update_period.clone(), feed_config.link.clone() ) ];
-  feed_storage.process_feeds( feeds ).await?;
+  feed_storage.feeds_process( feeds ).await?;
 
   // updated fetch
-  let client = TestClient( "./tests/fixtures/updated_one_frame.xml".to_owned() );
+  let feed = feed_parser::parse( include_str!("./fixtures/updated_one_frame.xml").as_bytes() )?;
 
-  let feed = FeedFetch::fetch( &client, feed_config.link.clone()).await?;
   let feeds = vec![ ( feed, feed_config.update_period.clone(), feed_config.link.clone() ) ];
-  feed_storage.process_feeds( feeds ).await?;
+  feed_storage.feeds_process( feeds ).await?;
 
   // check
   let payload = feed_storage.frames_list().await?;

From 2d186c7d3c34184529ffababa842bdfb6d03da47 Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Mon, 8 Apr 2024 10:12:54 +0300
Subject: [PATCH 14/49] fix commands

---
 module/move/unitore/Cargo.toml                |   1 +
 module/move/unitore/src/Readme.md             |   0
 module/move/unitore/src/action/frame.rs       |   2 +-
 module/move/unitore/src/action/table.rs       | 394 ++++++++++--------
 module/move/unitore/src/entity/config.rs      |  54 +--
 module/move/unitore/src/entity/feed.rs        | 188 +--------
 module/move/unitore/src/entity/frame.rs       | 154 ++-----
 module/move/unitore/src/entity/table.rs       |  30 +-
 module/move/unitore/src/executor.rs           |   3 +-
 module/move/unitore/src/lib.rs                |   1 +
 .../move/unitore/src/sled_adapter/config.rs   |  53 +++
 module/move/unitore/src/sled_adapter/feed.rs  | 195 +++++++++
 module/move/unitore/src/sled_adapter/frame.rs | 168 ++++++++
 module/move/unitore/src/sled_adapter/mod.rs   |   4 +
 module/move/unitore/src/sled_adapter/table.rs |  33 ++
 module/move/unitore/tests/save_feed.rs        |   2 +
 16 files changed, 710 insertions(+), 572 deletions(-)
 create mode 100644 module/move/unitore/src/Readme.md
 create mode 100644 module/move/unitore/src/sled_adapter/config.rs
 create mode 100644 module/move/unitore/src/sled_adapter/feed.rs
 create mode 100644 module/move/unitore/src/sled_adapter/frame.rs
 create mode 100644 module/move/unitore/src/sled_adapter/mod.rs
 create mode 100644 module/move/unitore/src/sled_adapter/table.rs

diff --git a/module/move/unitore/Cargo.toml b/module/move/unitore/Cargo.toml
index 812ea26e02..8f98fba818 100644
--- a/module/move/unitore/Cargo.toml
+++ b/module/move/unitore/Cargo.toml
@@ -32,6 +32,7 @@ enabled = []
 
 [dependencies]
 error_tools = { workspace = true, features = [ "default" ] }
+proper_path_tools = { workspace = true, features = [ "default" ] }
 tokio = { version = "1.36.0", features = [ "rt", "rt-multi-thread", "io-std", "macros" ] }
 hyper = { version = "1.1.0", features = [ "client" ] }
 hyper-tls = "0.6.0"
diff --git a/module/move/unitore/src/Readme.md b/module/move/unitore/src/Readme.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/module/move/unitore/src/action/frame.rs b/module/move/unitore/src/action/frame.rs
index 3356bb1c53..88a445fed7 100644
--- a/module/move/unitore/src/action/frame.rs
+++ b/module/move/unitore/src/action/frame.rs
@@ -133,7 +133,7 @@ impl std::fmt::Display for FramesReport
     [
       vec![ EMPTY_CELL.to_owned(), format!( "Updated frames: {}", self.updated_frames ) ],
       vec![ EMPTY_CELL.to_owned(), format!( "Inserted frames: {}", self.new_frames ) ],
-      vec![ EMPTY_CELL.to_owned(), format!( "Number of frames in storage: {}", self.existing_frames ) ],
+      vec![ EMPTY_CELL.to_owned(), format!( "Number of frames in storage: {}", self.existing_frames + self.new_frames ) ],
     ];
 
     if !self.selected_frames.selected_columns.is_empty()
diff --git a/module/move/unitore/src/action/table.rs b/module/move/unitore/src/action/table.rs
index 088e4adc33..11a34c21f4 100644
--- a/module/move/unitore/src/action/table.rs
+++ b/module/move/unitore/src/action/table.rs
@@ -7,7 +7,7 @@ use action::Report;
 use executor::FeedManager;
 use storage::FeedStorage;
 use entity::table::TableStore;
-use error_tools::{ err, BasicError, Result };
+use error_tools::Result;
 
 /// Get labels of column for specified table.
 pub async fn table_list
@@ -16,205 +16,220 @@ pub async fn table_list
   args : &wca::Args,
 ) -> Result< impl Report >
 {
-  let table_name : String = args
-  .get_owned::< String >( 0 )
-  .ok_or_else::< BasicError, _ >( || err!( "Cannot get 'Name' argument for command .table.list" ) )?
-  .into()
-  ;
+  let table_name = args.get_owned::< String >( 0 );
 
   let mut manager = FeedManager::new( storage );
-  let result = manager.storage.table_list( table_name.clone() ).await?;
+  let mut table_names = Vec::new();
+  if let Some( name ) = table_name
+  {
+    table_names.push( name );
+  }
+  else
+  {
+    let tables = manager.storage.tables_list().await?;
 
-  let mut table_description = String::new();
-  let mut columns = HashMap::new();
-  if let Payload::Select { labels: _label_vec, rows: rows_vec } = &result[ 0 ]
+    let names = tables.tables.keys().map( | k | k.clone() ).collect::< Vec< _ > >();
+    table_names.extend( names.into_iter() );
+  }
+
+  let mut reports = Vec::new();
+  for table_name in table_names
   {
-    for row in rows_vec
+    let result = manager.storage.table_list( table_name.clone() ).await?;
+
+    let mut table_description = String::new();
+    let mut columns = HashMap::new();
+    if let Payload::Select { labels: _label_vec, rows: rows_vec } = &result[ 0 ]
     {
-      let table = String::from( row[ 0 ].clone() );
-      columns.entry( table )
-      .and_modify( | vec : &mut Vec< String > | vec.push( String::from( row[ 1 ].clone() ) ) )
-      .or_insert( vec![ String::from( row[ 1 ].clone() ) ] )
-      ;
+      for row in rows_vec
+      {
+        let table = String::from( row[ 0 ].clone() );
+        columns.entry( table )
+        .and_modify( | vec : &mut Vec< String > | vec.push( String::from( row[ 1 ].clone() ) ) )
+        .or_insert( vec![ String::from( row[ 1 ].clone() ) ] )
+        ;
+      }
     }
-  }
-  let mut columns_desc = HashMap::new();
-  match table_name.as_str()
-  {
-    "feed" =>
+    let mut columns_desc = HashMap::new();
+    match table_name.as_str()
     {
-      table_description = String::from( "Contains feed items." );
-
-      for label in columns.get( "feed" ).unwrap()
+      "feed" =>
       {
-        match label.as_str()
+        table_description = String::from( "Contains feed items." );
+
+        for label in columns.get( "feed" ).unwrap()
         {
-          "link" => { columns_desc.insert
-            (
-              label.clone(),
-              String::from( "Link to feed source, unique identifier for the feed" ),
-            ); }
-          "title" => { columns_desc.insert( label.clone(), String::from( "The title of the feed" ) ); }
-          "updated" =>
+          match label.as_str()
           {
-            columns_desc.insert( label.clone(), String::from
-            (
-              "The time at which the feed was last modified. If not provided in the source, or invalid, is Null."
-            ) );
-          },
-          "type" => { columns_desc.insert( label.clone(), String::from( "Type of this feed (e.g. RSS2, Atom etc)" ) ); }
-          "authors" => { columns_desc.insert
-            (
-              label.clone(),
-              String::from( "Collection of authors defined at the feed level" )
-            ); }
-          "description" => { columns_desc.insert( label.clone(), String::from( "Description of the feed" ) ); }
-          "published" => { columns_desc.insert
-            (
-              label.clone(),
-              String::from( "The publication date for the content in the channel" ),
-            ); }
-          "update_period" => { columns_desc.insert( label.clone(), String::from( "How often this feed must be updated" ) ); }
-          _ => { columns_desc.insert( label.clone(), String::from( "Desciption for this column hasn't been added yet!" ) ); }
+            "link" => { columns_desc.insert
+              (
+                label.clone(),
+                String::from( "Link to feed source, unique identifier for the feed" ),
+              ); }
+            "title" => { columns_desc.insert( label.clone(), String::from( "The title of the feed" ) ); }
+            "updated" =>
+            {
+              columns_desc.insert( label.clone(), String::from
+              (
+                "The time at which the feed was last modified. If not provided in the source, or invalid, is Null."
+              ) );
+            },
+            "type" => { columns_desc.insert( label.clone(), String::from( "Type of this feed (e.g. RSS2, Atom etc)" ) ); }
+            "authors" => { columns_desc.insert
+              (
+                label.clone(),
+                String::from( "Collection of authors defined at the feed level" )
+              ); }
+            "description" => { columns_desc.insert( label.clone(), String::from( "Description of the feed" ) ); }
+            "published" => { columns_desc.insert
+              (
+                label.clone(),
+                String::from( "The publication date for the content in the channel" ),
+              ); }
+            "update_period" => { columns_desc.insert( label.clone(), String::from( "How often this feed must be updated" ) ); }
+            _ => { columns_desc.insert( label.clone(), String::from( "Desciption for this column hasn't been added yet!" ) ); }
+          }
         }
-      }
-    },
-    "frame" =>
-    {
-      table_description = String::from( "Contains frame items." );
-      for label in columns.get( "frame" ).unwrap()
+      },
+      "frame" =>
       {
-        match label.as_str()
+        table_description = String::from( "Contains frame items." );
+        for label in columns.get( "frame" ).unwrap()
         {
-          "id" =>
-          {
-            columns_desc.insert
-            (
-              label.clone(),
-              String::from( "A unique identifier for this frame in the feed. " ),
-            );
-          },
-          "title" =>
-          {
-            columns_desc.insert
-            (
-              label.clone(),
-              String::from( "Title of the frame" ),
-            );
-          },
-          "updated" => 
-          {
-            columns_desc.insert
-            (
-              label.clone(),
-              String::from( "Time at which this item was fetched from source." ),
-            );
-          },
-          "authors" =>
-          {
-            columns_desc.insert(
-              label.clone(),
-              String::from( "List of authors of the frame, optional." )
-            );
-          },
-          "content" =>
-          {
-            columns_desc.insert(
-              label.clone(),
-              String::from( "The content of the frame in html or plain text, optional." ),
-            );
-          },
-          "links" =>
-          {
-            columns_desc.insert(
-              label.clone(),
-              String::from( "List of links associated with this item of related Web page and attachments." ),
-            );
-          },
-          "summary" =>
-          {
-            columns_desc.insert
-            (
-              label.clone(),
-              String::from( "Short summary, abstract, or excerpt of the frame item, optional." ),
-            );
-          },
-          "categories" =>
-          {
-            columns_desc.insert
-            (
-              label.clone(),
-              String::from( "Specifies a list of categories that the item belongs to." ),
-            );
-          },
-          "published" =>
-          {
-            columns_desc.insert
-            (
-              label.clone(),
-              String::from( "Time at which this item was first published or updated." ),
-            );
-          },
-          "source" =>
-          {
-            columns_desc.insert
-            (
-              label.clone(),
-              String::from( "Specifies the source feed if the frame was copied from one feed into another feed, optional." ),
-            );
-          },
-          "rights" =>
+          match label.as_str()
           {
-            columns_desc.insert
-            (
-              label.clone(),
-              String::from( "Conveys information about copyrights over the feed, optional." ),
-            );
-          },
-          "media" =>
-          {
-            columns_desc.insert
-            (
-              label.clone(),
-              String::from( "List of media oblects, encountered in the frame, optional." ),
-            );
-          },
-          "language" =>
-          {
-            columns_desc.insert
-            (
-              label.clone(),
-              String::from( "The language specified on the item, optional." ),
-            );
-          },
-          "feed_link" =>
-          {
-            columns_desc.insert
-            (
-              label.clone(),
-              String::from( "Link of feed that contains this frame." ),
-            );
-          },
-          _ => { columns_desc.insert( label.clone(), String::from( "Desciption for this column hasn't been added yet!" ) ); }
+            "id" =>
+            {
+              columns_desc.insert
+              (
+                label.clone(),
+                String::from( "A unique identifier for this frame in the feed. " ),
+              );
+            },
+            "title" =>
+            {
+              columns_desc.insert
+              (
+                label.clone(),
+                String::from( "Title of the frame" ),
+              );
+            },
+            "updated" => 
+            {
+              columns_desc.insert
+              (
+                label.clone(),
+                String::from( "Time at which this item was fetched from source." ),
+              );
+            },
+            "authors" =>
+            {
+              columns_desc.insert(
+                label.clone(),
+                String::from( "List of authors of the frame, optional." )
+              );
+            },
+            "content" =>
+            {
+              columns_desc.insert(
+                label.clone(),
+                String::from( "The content of the frame in html or plain text, optional." ),
+              );
+            },
+            "links" =>
+            {
+              columns_desc.insert(
+                label.clone(),
+                String::from( "List of links associated with this item of related Web page and attachments." ),
+              );
+            },
+            "summary" =>
+            {
+              columns_desc.insert
+              (
+                label.clone(),
+                String::from( "Short summary, abstract, or excerpt of the frame item, optional." ),
+              );
+            },
+            "categories" =>
+            {
+              columns_desc.insert
+              (
+                label.clone(),
+                String::from( "Specifies a list of categories that the item belongs to." ),
+              );
+            },
+            "published" =>
+            {
+              columns_desc.insert
+              (
+                label.clone(),
+                String::from( "Time at which this item was first published or updated." ),
+              );
+            },
+            "source" =>
+            {
+              columns_desc.insert
+              (
+                label.clone(),
+                String::from( "Specifies the source feed if the frame was copied from one feed into another feed, optional." ),
+              );
+            },
+            "rights" =>
+            {
+              columns_desc.insert
+              (
+                label.clone(),
+                String::from( "Conveys information about copyrights over the feed, optional." ),
+              );
+            },
+            "media" =>
+            {
+              columns_desc.insert
+              (
+                label.clone(),
+                String::from( "List of media oblects, encountered in the frame, optional." ),
+              );
+            },
+            "language" =>
+            {
+              columns_desc.insert
+              (
+                label.clone(),
+                String::from( "The language specified on the item, optional." ),
+              );
+            },
+            "feed_link" =>
+            {
+              columns_desc.insert
+              (
+                label.clone(),
+                String::from( "Link of feed that contains this frame." ),
+              );
+            },
+            _ => { columns_desc.insert( label.clone(), String::from( "Desciption for this column hasn't been added yet!" ) ); }
+          }
         }
       }
-    }
-    "config" =>
-    {
-      table_description = String::from( "Contains paths to feed config files." );
-      for label in columns.get( "config" ).unwrap()
+      "config" =>
       {
-        match label.as_str()
+        table_description = String::from( "Contains paths to feed config files." );
+        for label in columns.get( "config" ).unwrap()
         {
-          "path" => { columns_desc.insert( label.clone(), String::from( "Path to configuration file" ) ); }
-          _ => { columns_desc.insert( label.clone(), String::from( "Desciption for this column hasn't been added yet!" ) ); }
+          match label.as_str()
+          {
+            "path" => { columns_desc.insert( label.clone(), String::from( "Path to configuration file" ) ); }
+            _ => { columns_desc.insert( label.clone(), String::from( "Desciption for this column hasn't been added yet!" ) ); }
+          }
         }
-      }
-    },
-    _ => {},
+      },
+      _ => {},
+    }
+
+    reports.push( ColumnsReport::new( table_name, table_description, columns_desc ) );
   }
 
-  Ok( ColumnsReport::new( table_name, table_description, columns_desc ) )
+  Ok( TablesColumnsReport( reports ) )
 }
 
 /// Get information about tables in storage.
@@ -230,7 +245,26 @@ pub async fn tables_list
 
 const EMPTY_CELL : &'static str = "";
 
-/// Information about execution of tables commands.
+/// Information about execution of table columns commands.
+#[ derive( Debug ) ]
+pub struct TablesColumnsReport( Vec< ColumnsReport > );
+
+impl std::fmt::Display for TablesColumnsReport
+{
+  fn fmt( &self, f : &mut std::fmt::Formatter<'_> ) -> std::fmt::Result
+  {
+    for report in &self.0
+    {
+      writeln!( f, "{}", report )?;
+    }
+    
+    Ok( () )
+  }
+}
+
+impl Report for TablesColumnsReport {}
+
+/// Information about execution of columns commands.
 #[ derive( Debug ) ]
 pub struct ColumnsReport
 {
diff --git a/module/move/unitore/src/entity/config.rs b/module/move/unitore/src/entity/config.rs
index fe140c0ef9..cf3049acbe 100644
--- a/module/move/unitore/src/entity/config.rs
+++ b/module/move/unitore/src/entity/config.rs
@@ -1,16 +1,7 @@
 //! Functionality for storing and retrieving config files.
 
-use crate::*;
-use error_tools::{ err, Result };
-use gluesql::
-{
-  core::
-  {
-    ast_builder::{ col, table, text, Execute },
-    executor::Payload,
-  },
-  sled_storage::SledStorage,
-};
+use error_tools::Result;
+use gluesql::core::executor::Payload;
 
 /// Config file path.
 #[ derive( Debug ) ]
@@ -48,47 +39,8 @@ pub trait ConfigStore
 // qqq : port and adapters should not be in the same file
 // Ideally, they should be in different crates, but you should at least put them in different folders
 // there should be a `sled_adapter`` folder
+// aaa : moved to separate folder
 
-#[ async_trait::async_trait( ?Send ) ]
-impl ConfigStore for storage::FeedStorage< SledStorage >
-{
-  async fn config_add( &mut self, config : &Config ) -> Result< Payload >
-  {
-    let res = table( "config" )
-    .insert()
-    .columns
-    (
-      "path",
-    )
-    .values( vec![ vec![ text( config.path() ) ] ] )
-    .execute( &mut *self.storage.lock().await )
-    .await;
-
-    Ok( res? )
-  }
-
-  async fn config_delete( &mut self, config : &Config ) -> Result< Payload >
-  {
-    let res = table( "config" )
-    .delete()
-    .filter( col( "path" ).eq( format!( "'{}'", config.path() ) ) )
-    .execute( &mut *self.storage.lock().await )
-    .await?;
-
-    if res == Payload::Delete( 0 )
-    {
-      return Err( err!( format!( "Config file with path {} not found in storage", config.path() ) ) )
-    }
-
-    Ok( res )
-  }
-
-  async fn config_list( &mut self ) -> Result< Payload >
-  {
-    let res = table( "config" ).select().execute( &mut *self.storage.lock().await ).await?;
-    Ok( res )
-  }
-}
 
 // qqq : use AbsolutePath newtype from `path_tools`
 // qqq : normalize all paths with `path_tools::path::normalize`
diff --git a/module/move/unitore/src/entity/feed.rs b/module/move/unitore/src/entity/feed.rs
index 2d05d317ff..7084e841dd 100644
--- a/module/move/unitore/src/entity/feed.rs
+++ b/module/move/unitore/src/entity/feed.rs
@@ -2,27 +2,19 @@
 
 use crate::*;
 use std::time::Duration;
-use error_tools::{ for_app::Context, Result };
-use gluesql::
+use error_tools::Result;
+use gluesql::core::
 {
-  core::
-  {
-    ast_builder::{ null, col, table, text, Execute, timestamp, ExprNode },
-    data::Value,
-    executor::Payload,
-    chrono::{ Utc, DateTime, SecondsFormat },
-  },
-  sled_storage::SledStorage,
+  ast_builder::{ null, text, timestamp, ExprNode },
+  executor::Payload,
+  chrono::{ Utc, DateTime, SecondsFormat },
 };
 
 use action::
 {
   feed::FeedsReport,
-  frame::{ UpdateReport, SelectedEntries, FramesReport },
+  frame::UpdateReport,
 };
-use storage::FeedStorage;
-use entity::frame::FrameStore;
-use wca::wtools::Itertools;
 
 /// Feed item.
 #[ derive( Debug ) ]
@@ -92,174 +84,6 @@ pub trait FeedStore
 // qqq : poor description and probably naming. improve, please
 // aaa : updated description
 
-#[ async_trait::async_trait( ?Send ) ]
-impl FeedStore for FeedStorage< SledStorage >
-{
-  async fn feeds_list( &mut self ) -> Result< FeedsReport >
-  {
-    let res = table( "feed" )
-    .select()
-    .project( "title, link, update_period, config_file" )
-    .execute( &mut *self.storage.lock().await )
-    .await?
-    ;
-  
-    let mut report = FeedsReport::new();
-    match res
-    {
-      Payload::Select { labels: label_vec, rows: rows_vec } =>
-      {
-        report.0 = SelectedEntries
-        {
-          selected_rows : rows_vec,
-          selected_columns : label_vec,
-        }
-      },
-      _ => {},
-    }
-
-    Ok( report )
-  }
-
-  async fn feeds_update( &mut self, feed : Vec< Feed > ) -> Result< () >
-  {
-    for feed in feed
-    {
-      let _update = table( "feed" )
-      .update()
-      .set( "title", feed.title.map( text ).unwrap_or( null() ) )
-      .set(
-        "updated",
-        feed.updated.map( | d | timestamp( d.to_rfc3339_opts( SecondsFormat::Millis, true ) ) ).unwrap_or( null() ),
-      )
-      .set( "authors", feed.authors.map( text ).unwrap_or( null() ) )
-      .set( "description", feed.description.map( text ).unwrap_or( null() ) )
-      .set(
-        "published",
-        feed.published.map( | d | timestamp( d.to_rfc3339_opts( SecondsFormat::Millis, true ) ) ).unwrap_or( null() ),
-      )
-      .filter( col( "link" ).eq( feed.link.to_string() ) )
-      .execute( &mut *self.storage.lock().await )
-      .await
-      .context( "Failed to insert feed" )?
-      ;
-    }
-
-    Ok( () )
-  }
-
-  async fn feeds_process
-  (
-    &mut self,
-    feeds : Vec< ( feed_rs::model::Feed, Duration, url::Url ) >,
-  ) -> Result< UpdateReport >
-  {
-    let mut new_entries = Vec::new();
-    let mut modified_entries = Vec::new();
-    let mut reports = Vec::new();
-
-    for feed in &feeds
-    {
-      let mut frames_report = FramesReport::new( feed.0.title.clone().unwrap().content );
-
-      let existing_frames = table( "frame" )
-      .select()
-      .filter( col( "feed_link" ).eq( text( feed.2.to_string() ) ) )
-      .project( "id, published" )
-      .execute( &mut *self.storage.lock().await )
-      .await
-      .context( "Failed to get existing frames while saving new frames" )?
-      ;
-
-      if let Some( rows ) = existing_frames.select()
-      {
-        let rows = rows.collect::< Vec< _ > >();
-        frames_report.existing_frames = rows.len();
-        let existing_entries = rows.iter()
-        .map( | r | ( r.get( "id" ).map( | &val | val.clone() ), r.get( "published" ).map( | &val | val.clone() ) ) )
-        .flat_map( | ( id, published ) |
-          id.map( | id |
-            (
-              id,
-              published.map( | date |
-                {
-                  match date
-                  {
-                    Value::Timestamp( date_time ) => Some( date_time ),
-                    _ => None,
-                  }
-                } )
-              .flatten()
-            )
-          )
-        )
-        .flat_map( | ( id, published ) | match id { Value::Str( id ) => Some( ( id, published ) ), _ => None } )
-        .collect_vec()
-        ;
-
-        let existing_ids = existing_entries.iter().map( | ( id, _ ) | id ).collect_vec();
-        for entry in &feed.0.entries
-        {
-          // if extry with same id is already in db, check if it is updated
-          if let Some( position ) = existing_ids.iter().position( | &id | id == &entry.id )
-          {
-            if let Some( date ) = existing_entries[ position ].1
-            {
-              if date.and_utc() != entry.published.unwrap()
-              {
-                frames_report.updated_frames += 1;
-                modified_entries.push( ( entry.clone(), feed.2.to_string() ).into() );
-              }
-            }
-          }
-          else
-          {
-            frames_report.new_frames += 1;
-            new_entries.push( ( entry.clone(), feed.2.to_string() ).into() );
-          }
-        }
-      }
-      reports.push( frames_report );
-    }
-
-    if !new_entries.is_empty()
-    {
-      let _saved_report = self.frames_save( new_entries ).await?;
-    }
-    if !modified_entries.is_empty()
-    {
-      let _updated_report = self.frames_update( modified_entries ).await?;
-    }
-
-    Ok( UpdateReport( reports ) )
-  }
-
-  async fn feeds_save( &mut self, feed : Vec< Feed > ) -> Result< Payload >
-  {
-    let feeds_rows : Vec< Vec< ExprNode< 'static > > > = feed.into_iter().map( | feed | feed.into() ).collect_vec();
-
-    let insert = table( "feed" )
-    .insert()
-    .columns
-    (
-      "link,
-      title,
-      updated,
-      authors,
-      description,
-      published,
-      update_period,
-      config_file",
-    )
-    .values( feeds_rows )
-    .execute( &mut *self.storage.lock().await )
-    .await
-    .context( "Failed to insert feeds" )?
-    ;
-
-    Ok( insert )
-  }
-}
 
 /// Get convenient format of frame item for using with GlueSQL expression builder.
 /// Converts from Feed struct into vec of GlueSQL expression nodes. 
diff --git a/module/move/unitore/src/entity/frame.rs b/module/move/unitore/src/entity/frame.rs
index 3d01cc2064..32ba98a4ca 100644
--- a/module/move/unitore/src/entity/frame.rs
+++ b/module/move/unitore/src/entity/frame.rs
@@ -1,23 +1,12 @@
 //! Frame storing and retrieving functionality.
 
 use crate::*;
-use std::collections::HashMap;
-use error_tools::{ for_app::Context, Result };
-use gluesql::
+use error_tools::Result;
+use gluesql::core::
 {
-  core::
-  {
-    ast_builder::{ null, col, table, text, Execute, timestamp, ExprNode },
-    data::Value,
-    executor::Payload,
-    chrono::{ Utc, DateTime, SecondsFormat },
-  },
-  sled_storage::SledStorage,
+  ast_builder::{ null, text, timestamp, ExprNode }, chrono::{ DateTime, SecondsFormat, Utc }, executor::Payload
 };
-
-use action::frame::{ FramesReport, ListReport, SelectedEntries };
-use storage::FeedStorage;
-use wca::wtools::Itertools;
+use action::frame::ListReport;
 
 /// Frame entity.
 #[ derive( Debug ) ]
@@ -27,21 +16,22 @@ pub struct Frame
   pub id : String,
   /// Frame title.
   pub title : Option< String >,
-  stored_time : Option< DateTime< Utc > >,
-  authors : Option< String >,
-  content : Option< String >,
-  links : Option< String >,
-  summary : Option< String >,
-  categories : Option< String >,
-  published : Option< DateTime< Utc > >,
-  source : Option< String >,
-  rights : Option< String >,
-  media : Option< String >,
-  language : Option< String >,
-  feed_link : String,
+  pub stored_time : Option< DateTime< Utc > >,
+  pub authors : Option< Vec< String > >,
+  pub content : Option< String >,
+  pub links : Option< Vec< String > >,
+  pub summary : Option< String >,
+  pub categories : Option< Vec< String > >,
+  pub published : Option< DateTime< Utc > >,
+  pub source : Option< String >,
+  pub rights : Option< String >,
+  pub media : Option< Vec< String > >,
+  pub language : Option< String >,
+  pub feed_link : String,
 }
 
 // qqq : not obvious
+// aaa : added explanation
 /// Convert from feed_rs feed entry and feed link to Frame struct for convenient use and storage.
 impl From< ( feed_rs::model::Entry, String ) > for Frame
 {
@@ -59,9 +49,10 @@ impl From< ( feed_rs::model::Entry, String ) > for Frame
     .clone()
     ;
 
-    let mut links = entry.links
+    let links = entry.links
     .iter()
     .map( | link | link.href.clone() )
+    .collect::< Vec< _ > >()
     .clone()
     ;
 
@@ -83,18 +74,18 @@ impl From< ( feed_rs::model::Entry, String ) > for Frame
       id : entry.id,
       title : entry.title.map( | title | title.content ).clone(),
       stored_time : entry.updated,
-      authors : ( !authors.is_empty() ).then( || authors.join( ", " ) ),
+      authors: ( !authors.is_empty() ).then( || authors ),
       // qqq : why join?
       content,
-      links : ( !links.len() == 0 ).then( || links.join( ", " ) ),
+      links: ( !links.is_empty() ).then( || links ),
       // qqq : why join?
       summary : entry.summary.map( | c | c.content ).clone(),
-      categories : ( !categories.is_empty() ).then( || categories.join( ", " ) ),
+      categories: ( !categories.is_empty() ).then( || categories ),
       // qqq : why join?
       published : entry.published.clone(),
       source : entry.source.clone(),
       rights : entry.rights.map( | r | r.content ).clone(),
-      media : ( !media.is_empty() ).then( || media.join( ", " ) ),
+      media: ( !media.is_empty() ).then( || media ),
       // qqq : why join?
       language : entry.language.clone(),
       feed_link,
@@ -120,97 +111,6 @@ pub trait FrameStore
 // qqq : what is update? what update? don't use word update without noun and explanation what deos it mean
 // aaa : fixed comments
 
-#[ async_trait::async_trait( ?Send ) ]
-impl FrameStore for FeedStorage< SledStorage >
-{
-  async fn frames_list( &mut self ) -> Result< ListReport >
-  {
-    let res = table( "frame" ).select().execute( &mut *self.storage.lock().await ).await?;
-
-    let mut reports = Vec::new();
-    let all_frames = 
-    if let Payload::Select { labels: label_vec, rows: rows_vec } = res
-    {
-      SelectedEntries
-      {
-        selected_rows : rows_vec,
-        selected_columns : label_vec,
-      }
-    }
-    else
-    {
-      SelectedEntries::new()
-    };
-    
-    let mut feeds_map = HashMap::new();
-
-    for row in all_frames.selected_rows
-    {
-      let title_val = row.last().unwrap().clone();
-      let title = String::from( title_val );
-      feeds_map.entry( title )
-      .and_modify( | vec : &mut Vec< Vec< Value > > | vec.push( row.clone() ) )
-      .or_insert( vec![ row ] )
-      ;
-    }
-
-    for ( title, frames ) in feeds_map
-    {
-      let mut report = FramesReport::new( title );
-      report.existing_frames = frames.len();
-      report.selected_frames = SelectedEntries
-      {
-        selected_rows : frames,
-        selected_columns : all_frames.selected_columns.clone(),
-      };
-      reports.push( report );
-    }
-
-    Ok( ListReport( reports ) )
-  }
-
-  async fn frames_save( &mut self, frames : Vec< Frame > ) -> Result< Payload >
-  {
-    let entries_rows : Vec< Vec< ExprNode< 'static > > > = frames.into_iter().map( | entry | entry.into() ).collect_vec();
-
-    let insert = table( "frame" )
-    .insert()
-    .columns
-    (
-      self.frame_fields.iter().map( | field | field[ 0 ] ).join( "," ).as_str()
-    )
-    .values( entries_rows )
-    .execute( &mut *self.storage.lock().await )
-    .await
-    .context( "Failed to insert frames" )?
-    ;
-
-    Ok( insert )
-  }
-
-  async fn frames_update( &mut self, feed : Vec< Frame > ) -> Result< () >
-  {
-    let entries_rows : Vec< Vec< ExprNode< 'static > > > = feed.into_iter().map( | entry | entry.into() ).collect_vec();
-
-    for entry in entries_rows
-    {
-      let _update = table( "frame" )
-      .update()
-      .set( "title", entry[ 1 ].to_owned() )
-      .set( "content", entry[ 4 ].to_owned() )
-      .set( "links", entry[ 5 ].to_owned() )
-      .set( "summary", entry[ 6 ].to_owned() )
-      .set( "published", entry[ 8 ].to_owned() )
-      .set( "media", entry[ 9 ].to_owned() )
-      .filter( col( "id" ).eq( entry[ 0 ].to_owned() ) )
-      .execute( &mut *self.storage.lock().await )
-      .await
-      .context( "Failed to update frames" )?
-      ;
-    }
-    Ok( () )
-  }
-}
 
 // qqq : what is it for and why?
 // aaa : added explanation
@@ -232,7 +132,7 @@ impl From< Frame > for Vec< ExprNode< 'static > >
     ;
 
     let authors = entry.authors
-    .map( | authors | text( authors ) )
+    .map( | authors | text(authors[0].clone()))
     .unwrap_or( null() )
     ;
 
@@ -242,7 +142,7 @@ impl From< Frame > for Vec< ExprNode< 'static > >
     ;
 
     let links = entry.links
-    .map( | links | text ( links ) )
+    .map( | links | text ( links.join(", ") ) )
     .unwrap_or( null() )
     ;
 
@@ -252,7 +152,7 @@ impl From< Frame > for Vec< ExprNode< 'static > >
     ;
 
     let categories = entry.categories
-    .map( | categories | text ( categories ) )
+    .map( | categories | text ( categories.join(", ") ) )
     .unwrap_or( null() )
     ;
 
@@ -264,7 +164,7 @@ impl From< Frame > for Vec< ExprNode< 'static > >
     let source = entry.source.map( | s | text( s ) ).unwrap_or( null() );
     let rights = entry.rights.map( | r | text( r ) ).unwrap_or( null() );
     let media = entry.media
-    .map( | media | text ( media ) )
+    .map( | media | text( media.join(", ") ) )
     .unwrap_or( null() )
     ;
 
diff --git a/module/move/unitore/src/entity/table.rs b/module/move/unitore/src/entity/table.rs
index b35ccdcac5..b177c3c934 100644
--- a/module/move/unitore/src/entity/table.rs
+++ b/module/move/unitore/src/entity/table.rs
@@ -2,14 +2,9 @@
 
 use crate::*;
 use error_tools::Result;
-use gluesql::
-{
-  sled_storage::SledStorage,
-  prelude::Payload,
-};
+use gluesql::prelude::Payload;
 
 use action::table::TablesReport;
-use storage::FeedStorage;
 
 /// Functions for tables informantion.
 #[ async_trait::async_trait( ?Send ) ]
@@ -21,26 +16,3 @@ pub trait TableStore
   /// List columns of table.
   async fn table_list( &mut self, table_name : String ) -> Result< Vec< Payload > >;
 }
-
-#[ async_trait::async_trait( ?Send ) ]
-impl TableStore for FeedStorage< SledStorage >
-{
-  async fn tables_list( &mut self ) -> Result< TablesReport >
-  {
-    let glue = &mut *self.storage.lock().await;
-    let payloads = glue.execute( "SELECT * FROM GLUE_TABLE_COLUMNS" ).await?;
-
-    let report = TablesReport::new( payloads );
-
-    Ok( report )
-  }
-
-  async fn table_list( &mut self, table_name : String ) -> Result< Vec< Payload > >
-  {
-    let glue = &mut *self.storage.lock().await;
-    let query_str = format!( "SELECT * FROM GLUE_TABLE_COLUMNS WHERE TABLE_NAME='{}'", table_name );
-    let payloads = glue.execute( &query_str ).await?;
-
-    Ok( payloads )
-  }
-}
diff --git a/module/move/unitore/src/executor.rs b/module/move/unitore/src/executor.rs
index 93e30efee1..88c5a85821 100644
--- a/module/move/unitore/src/executor.rs
+++ b/module/move/unitore/src/executor.rs
@@ -43,7 +43,6 @@ where
 /// Run feed updates.
 pub fn execute() -> Result< (), Box< dyn std::error::Error + Send + Sync > >
 {
-  //let ca = wca::CommandsAggregator::new();
   let ca = wca::CommandsAggregator::former()
   .command( "frames.download" )
     .hint( "Download frames from feed sources provided in config files." )
@@ -174,7 +173,7 @@ pub fn execute() -> Result< (), Box< dyn std::error::Error + Send + Sync > >
       "Subject: table name.\n",
       "    Example: .table.list feed",
     ))
-    .subject().hint( "Name" ).kind( wca::Type::String ).optional( false ).end()
+    .subject().hint( "Name" ).kind( wca::Type::String ).optional( true ).end()
     .routine( | o : VerifiedCommand |
     {
       match action( table_list, &o.args )
diff --git a/module/move/unitore/src/lib.rs b/module/move/unitore/src/lib.rs
index cc00707681..a6b66a5716 100644
--- a/module/move/unitore/src/lib.rs
+++ b/module/move/unitore/src/lib.rs
@@ -7,5 +7,6 @@ pub mod tool;
 pub mod command;
 pub mod action;
 pub mod entity;
+pub mod sled_adapter;
 
 // qqq : src/Readmу.md with file structure please
diff --git a/module/move/unitore/src/sled_adapter/config.rs b/module/move/unitore/src/sled_adapter/config.rs
new file mode 100644
index 0000000000..a304bb47a8
--- /dev/null
+++ b/module/move/unitore/src/sled_adapter/config.rs
@@ -0,0 +1,53 @@
+use crate::*;
+use error_tools::{ err, Result };
+use gluesql::
+{
+  core::
+  {
+    ast_builder::{ col, table, text, Execute, },
+    executor::Payload,
+  },
+  sled_storage::SledStorage,
+};
+use entity::config::{ Config, ConfigStore };
+
+#[ async_trait::async_trait( ?Send ) ]
+impl ConfigStore for storage::FeedStorage< SledStorage >
+{
+  async fn config_add( &mut self, config : &Config ) -> Result< Payload >
+  {
+    let res = table( "config" )
+    .insert()
+    .columns
+    (
+      "path",
+    )
+    .values( vec![ vec![ text( config.path() ) ] ] )
+    .execute( &mut *self.storage.lock().await )
+    .await;
+
+    Ok( res? )
+  }
+
+  async fn config_delete( &mut self, config : &Config ) -> Result< Payload >
+  {
+    let res = table( "config" )
+    .delete()
+    .filter( col( "path" ).eq( format!( "'{}'", config.path() ) ) )
+    .execute( &mut *self.storage.lock().await )
+    .await?;
+
+    if res == Payload::Delete( 0 )
+    {
+      return Err( err!( format!( "Config file with path {} not found in storage", config.path() ) ) )
+    }
+
+    Ok( res )
+  }
+
+  async fn config_list( &mut self ) -> Result< Payload >
+  {
+    let res = table( "config" ).select().execute( &mut *self.storage.lock().await ).await?;
+    Ok( res )
+  }
+}
diff --git a/module/move/unitore/src/sled_adapter/feed.rs b/module/move/unitore/src/sled_adapter/feed.rs
new file mode 100644
index 0000000000..fc31f07af9
--- /dev/null
+++ b/module/move/unitore/src/sled_adapter/feed.rs
@@ -0,0 +1,195 @@
+use crate::*;
+use std::time::Duration;
+use error_tools::{ Result, for_app::Context };
+use gluesql::
+{
+  core::
+  {
+    ast_builder::{ col, null, table, text, Execute, timestamp, ExprNode },
+    executor::Payload,
+    data::Value,
+    chrono::SecondsFormat,
+  },
+  sled_storage::SledStorage,
+};
+use entity::
+{
+  feed::{ Feed, FeedStore },
+  frame::FrameStore,
+};
+use action::
+{
+  feed::FeedsReport,
+  frame::{ UpdateReport, SelectedEntries, FramesReport },
+};
+use storage::FeedStorage;
+use wca::wtools::Itertools;
+
+#[ async_trait::async_trait( ?Send ) ]
+impl FeedStore for FeedStorage< SledStorage >
+{
+  async fn feeds_list( &mut self ) -> Result< FeedsReport >
+  {
+    let res = table( "feed" )
+    .select()
+    .project( "title, link, update_period, config_file" )
+    .execute( &mut *self.storage.lock().await )
+    .await?
+    ;
+  
+    let mut report = FeedsReport::new();
+    match res
+    {
+      Payload::Select { labels: label_vec, rows: rows_vec } =>
+      {
+        report.0 = SelectedEntries
+        {
+          selected_rows : rows_vec,
+          selected_columns : label_vec,
+        }
+      },
+      _ => {},
+    }
+
+    Ok( report )
+  }
+
+  async fn feeds_update( &mut self, feed : Vec< Feed > ) -> Result< () >
+  {
+    for feed in feed
+    {
+      let _update = table( "feed" )
+      .update()
+      .set( "title", feed.title.map( text ).unwrap_or( null() ) )
+      .set(
+        "updated",
+        feed.updated.map( | d | timestamp( d.to_rfc3339_opts( SecondsFormat::Millis, true ) ) ).unwrap_or( null() ),
+      )
+      .set( "authors", feed.authors.map( text ).unwrap_or( null() ) )
+      .set( "description", feed.description.map( text ).unwrap_or( null() ) )
+      .set(
+        "published",
+        feed.published.map( | d | timestamp( d.to_rfc3339_opts( SecondsFormat::Millis, true ) ) ).unwrap_or( null() ),
+      )
+      .filter( col( "link" ).eq( feed.link.to_string() ) )
+      .execute( &mut *self.storage.lock().await )
+      .await
+      .context( "Failed to insert feed" )?
+      ;
+    }
+
+    Ok( () )
+  }
+
+  async fn feeds_process
+  (
+    &mut self,
+    feeds : Vec< ( feed_rs::model::Feed, Duration, url::Url ) >,
+  ) -> Result< UpdateReport >
+  {
+    let mut new_entries = Vec::new();
+    let mut modified_entries = Vec::new();
+    let mut reports = Vec::new();
+
+    for feed in &feeds
+    {
+      let mut frames_report = FramesReport::new( feed.0.title.clone().unwrap().content );
+
+      let existing_frames = table( "frame" )
+      .select()
+      .filter( col( "feed_link" ).eq( text( feed.2.to_string() ) ) )
+      .project( "id, published" )
+      .execute( &mut *self.storage.lock().await )
+      .await
+      .context( "Failed to get existing frames while saving new frames" )?
+      ;
+
+      if let Some( rows ) = existing_frames.select()
+      {
+        let rows = rows.collect::< Vec< _ > >();
+        frames_report.existing_frames = rows.len();
+        let existing_entries = rows.iter()
+        .map( | r | ( r.get( "id" ).map( | &val | val.clone() ), r.get( "published" ).map( | &val | val.clone() ) ) )
+        .flat_map( | ( id, published ) |
+          id.map( | id |
+            (
+              id,
+              published.map( | date |
+                {
+                  match date
+                  {
+                    Value::Timestamp( date_time ) => Some( date_time ),
+                    _ => None,
+                  }
+                } )
+              .flatten()
+            )
+          )
+        )
+        .flat_map( | ( id, published ) | match id { Value::Str( id ) => Some( ( id, published ) ), _ => None } )
+        .collect_vec()
+        ;
+
+        let existing_ids = existing_entries.iter().map( | ( id, _ ) | id ).collect_vec();
+        for entry in &feed.0.entries
+        {
+          // if extry with same id is already in db, check if it is updated
+          if let Some( position ) = existing_ids.iter().position( | &id | id == &entry.id )
+          {
+            if let Some( date ) = existing_entries[ position ].1
+            {
+              if date.and_utc() != entry.published.unwrap()
+              {
+                frames_report.updated_frames += 1;
+                modified_entries.push( ( entry.clone(), feed.2.to_string() ).into() );
+              }
+            }
+          }
+          else
+          {
+            frames_report.new_frames += 1;
+            new_entries.push( ( entry.clone(), feed.2.to_string() ).into() );
+          }
+        }
+      }
+      reports.push( frames_report );
+    }
+
+    if !new_entries.is_empty()
+    {
+      let _saved_report = self.frames_save( new_entries ).await?;
+    }
+    if !modified_entries.is_empty()
+    {
+      let _updated_report = self.frames_update( modified_entries ).await?;
+    }
+
+    Ok( UpdateReport( reports ) )
+  }
+
+  async fn feeds_save( &mut self, feed : Vec< Feed > ) -> Result< Payload >
+  {
+    let feeds_rows : Vec< Vec< ExprNode< 'static > > > = feed.into_iter().map( | feed | feed.into() ).collect_vec();
+
+    let insert = table( "feed" )
+    .insert()
+    .columns
+    (
+      "link,
+      title,
+      updated,
+      authors,
+      description,
+      published,
+      update_period,
+      config_file",
+    )
+    .values( feeds_rows )
+    .execute( &mut *self.storage.lock().await )
+    .await
+    .context( "Failed to insert feeds" )?
+    ;
+
+    Ok( insert )
+  }
+}
diff --git a/module/move/unitore/src/sled_adapter/frame.rs b/module/move/unitore/src/sled_adapter/frame.rs
new file mode 100644
index 0000000000..7ce1f33641
--- /dev/null
+++ b/module/move/unitore/src/sled_adapter/frame.rs
@@ -0,0 +1,168 @@
+use crate::*;
+use std::collections::HashMap;
+use error_tools::{ Result, for_app::Context };
+use gluesql::
+{
+  core::
+  {
+    ast_builder::{ col, table, Execute, ExprNode },
+    executor::Payload,
+    data::Value,
+  },
+  sled_storage::SledStorage,
+};
+use entity::frame::{ FrameStore, Frame };
+use action::frame::{ SelectedEntries, FramesReport, ListReport };
+use storage::FeedStorage;
+use wca::wtools::Itertools;
+
+#[ async_trait::async_trait( ?Send ) ]
+impl FrameStore for FeedStorage< SledStorage >
+{
+  async fn frames_list( &mut self ) -> Result< ListReport >
+  {
+    let res = table( "frame" ).select().execute( &mut *self.storage.lock().await ).await?;
+
+    let mut reports = Vec::new();
+    let all_frames = 
+    if let Payload::Select { labels: label_vec, rows: rows_vec } = res
+    {
+      SelectedEntries
+      {
+        selected_rows : rows_vec,
+        selected_columns : label_vec,
+      }
+    }
+    else
+    {
+      SelectedEntries::new()
+    };
+    
+    let mut feeds_map = HashMap::new();
+
+    for row in all_frames.selected_rows
+    {
+      let title_val = row.last().unwrap().clone();
+      let title = String::from( title_val );
+      feeds_map.entry( title )
+      .and_modify( | vec : &mut Vec< Vec< Value > > | vec.push( row.clone() ) )
+      .or_insert( vec![ row ] )
+      ;
+    }
+
+    for ( title, frames ) in feeds_map
+    {
+      let mut report = FramesReport::new( title );
+      report.existing_frames = frames.len();
+      report.selected_frames = SelectedEntries
+      {
+        selected_rows : frames,
+        selected_columns : all_frames.selected_columns.clone(),
+      };
+      reports.push( report );
+    }
+
+    Ok( ListReport( reports ) )
+  }
+
+  async fn frames_save( &mut self, frames : Vec< Frame > ) -> Result< Payload >
+  {
+    let entries_rows : Vec< Vec< ExprNode< 'static > > > = frames.into_iter().map( | entry | entry.into() ).collect_vec();
+
+    // let glue = &mut *self.storage.lock().await;
+
+  //     /// Frame id.
+  // pub id : String,
+  // /// Frame title.
+  // pub title : Option< String >,
+  // stored_time : Option< DateTime< Utc > >,
+  // authors : Option< Vec< String > >,
+  // content : Option< String >,
+  // links : Option< Vec< String > >,
+  // summary : Option< String >,
+  // categories : Option< Vec< String > >,
+  // published : Option< DateTime< Utc > >,
+  // source : Option< String >,
+  // rights : Option< String >,
+  // media : Option< Vec< String > >,
+  // language : Option< String >,
+  // feed_link : String,
+
+  // use gluesql::core::ast_builder::text;
+  //   let mut values_str = String::new();
+  //   let null = "NULL".to_string();
+  //   let values_str = frames.into_iter().map(|frame| format!(
+  //     "('{}', {}, '{}', {}, {}, {}, '{}', {}, '{}')", 
+  //     frame.id, 
+  //     frame.title.map(|t|format!("'{}'", t)).unwrap_or( "Null".to_string() ), 
+  //     frame.stored_time.map(|d|d.to_string()).unwrap_or("Null".to_string()),
+  //     frame.authors.map(|authors| {let authors = authors.into_iter().map(|a|format!("'[\"{}\"]'", a)).collect::<Vec<_>>(); authors.join(", ")}).unwrap_or("'[]'".to_string()),
+  //     null.clone(),
+  //     frame.links.map(|links| {let links = links.into_iter().map(|a|format!("\"{}\"", a)).collect::<Vec<_>>(); format!("'[{}]'", &links.join(", "))}).unwrap_or("'[]'".to_string()),
+  //     frame.summary.unwrap_or(null.clone()),
+  //     frame.categories.map(|categories| {let categories = categories.into_iter().map(|a|format!("{}", a)).collect::<Vec<_>>(); dbg!(format!("'[\"{}\"]'", &categories.join(", ")))}).unwrap_or(null.clone()),
+  //     frame.published.map(|d|d.to_string()).unwrap_or(null.clone()),
+      // frame.source.unwrap_or(null.clone()),
+      // frame.rights.unwrap_or(null.clone()),
+      // // frame.media.map(|media| {let media = media.into_iter().map(|a|format!("\"{}\"", a)).collect::<Vec<_>>(); media.join(", ")}).unwrap_or(null.clone()),
+      // frame.language.unwrap_or(null.clone()),
+      // frame.feed_link,
+    // )
+    // )
+    //   .collect::<Vec<_>>();
+
+    // for frame in frames
+    // {
+    //   let frame_str = format!(
+    //     "({}, {}, {})", 
+    //     frame.id, frame.title.unwrap_or( "NULL".to_string() ), frame.stored_time.map(|d|d.to_string()).unwrap_or("NULL".to_string()));
+    //   values_str.push_str(&format!("({}),", frame_str ));
+    // }
+    // let query_str = format!( "INSERT INTO frame(id, title, stored_time, authors, content, links, summary, categories, published) VALUES {};", values_str.join(", ") );
+    //println!("{}", query_str);
+    // let mut payloads = glue.execute( &query_str ).await?;
+
+    // INSERT INTO ListType VALUES
+    // (1, '[1, 2, 3]'),
+    // (2, '["hello", "world", 30, true, [9,8]]'),
+    // (3, '[{ "foo": 100, "bar": [true, 0, [10.5, false] ] }, 10, 20]');
+
+    let insert = table( "frame" )
+    .insert()
+    .columns
+    (
+      self.frame_fields.iter().map( | field | field[ 0 ] ).join( "," ).as_str()
+    )
+    .values( entries_rows )
+    .execute( &mut *self.storage.lock().await )
+    .await
+    .context( "Failed to insert frames" )?
+    ;
+
+    Ok( insert )
+  }
+
+  async fn frames_update( &mut self, feed : Vec< Frame > ) -> Result< () >
+  {
+    //let entries_rows : Vec< Vec< ExprNode< 'static > > > = Vec::new();
+    let entries_rows : Vec< Vec< ExprNode< 'static > > > = feed.into_iter().map( | entry | entry.into() ).collect_vec();
+
+    for entry in entries_rows
+    {
+      let _update = table( "frame" )
+      .update()
+      .set( "title", entry[ 1 ].to_owned() )
+      .set( "content", entry[ 4 ].to_owned() )
+      .set( "links", entry[ 5 ].to_owned() )
+      .set( "summary", entry[ 6 ].to_owned() )
+      .set( "published", entry[ 8 ].to_owned() )
+      .set( "media", entry[ 9 ].to_owned() )
+      .filter( col( "id" ).eq( entry[ 0 ].to_owned() ) )
+      .execute( &mut *self.storage.lock().await )
+      .await
+      .context( "Failed to update frames" )?
+      ;
+    }
+    Ok( () )
+  }
+}
diff --git a/module/move/unitore/src/sled_adapter/mod.rs b/module/move/unitore/src/sled_adapter/mod.rs
new file mode 100644
index 0000000000..ea5e050ec3
--- /dev/null
+++ b/module/move/unitore/src/sled_adapter/mod.rs
@@ -0,0 +1,4 @@
+mod frame;
+mod table;
+mod feed;
+mod config;
\ No newline at end of file
diff --git a/module/move/unitore/src/sled_adapter/table.rs b/module/move/unitore/src/sled_adapter/table.rs
new file mode 100644
index 0000000000..3aecdd79c9
--- /dev/null
+++ b/module/move/unitore/src/sled_adapter/table.rs
@@ -0,0 +1,33 @@
+use crate::*;
+use error_tools::Result;
+use gluesql::
+{
+  core::executor::Payload,
+  sled_storage::SledStorage,
+};
+use entity::table::TableStore;
+use action::table::TablesReport;
+use storage::FeedStorage;
+
+#[ async_trait::async_trait( ?Send ) ]
+impl TableStore for FeedStorage< SledStorage >
+{
+  async fn tables_list( &mut self ) -> Result< TablesReport >
+  {
+    let glue = &mut *self.storage.lock().await;
+    let payloads = glue.execute( "SELECT * FROM GLUE_TABLE_COLUMNS" ).await?;
+
+    let report = TablesReport::new( payloads );
+
+    Ok( report )
+  }
+
+  async fn table_list( &mut self, table_name : String ) -> Result< Vec< Payload > >
+  {
+    let glue = &mut *self.storage.lock().await;
+    let query_str = format!( "SELECT * FROM GLUE_TABLE_COLUMNS WHERE TABLE_NAME='{}'", table_name );
+    let payloads = glue.execute( &query_str ).await?;
+
+    Ok( payloads )
+  }
+}
\ No newline at end of file
diff --git a/module/move/unitore/tests/save_feed.rs b/module/move/unitore/tests/save_feed.rs
index 2ac5cbcff3..9749d1e176 100644
--- a/module/move/unitore/tests/save_feed.rs
+++ b/module/move/unitore/tests/save_feed.rs
@@ -49,6 +49,8 @@ async fn test_save_feed_plain() -> Result< () >
 
   let number_of_frames = entries.0[ 0 ].selected_frames.selected_rows.len();
 
+  println!("{:#?}", entries);
+
   assert_eq!( number_of_frames, 10 );
 
   Ok( () )

From df428a99e92fdf9fc6f7d4fbb334848fbb488cf3 Mon Sep 17 00:00:00 2001
From: Barsik <bogdan.balushkin5@gmail.com>
Date: Mon, 8 Apr 2024 13:14:41 +0300
Subject: [PATCH 15/49] Update and refactor publish_need test cases in module
 entity.

This commit removes the existing 'publish_need.rs' file and introduces the 'diff.rs' file into the 'entity' module, containing updated and more accurate test cases. Also, unnecessary import statements were removed from several module files, improving the overall code cleanliness.
---
 .../action/readme_modules_headers_renew.rs    |   2 +-
 module/move/willbe/src/entity/features.rs     |   1 -
 module/move/willbe/src/entity/manifest.rs     |  17 ++-
 module/move/willbe/tests/inc/entity/diff.rs   |  98 +++++++++++++
 module/move/willbe/tests/inc/entity/mod.rs    |   7 +-
 .../willbe/tests/inc/entity/publish_need.rs   | 134 ------------------
 module/move/willbe/tests/inc/package.rs       |  18 +--
 7 files changed, 126 insertions(+), 151 deletions(-)
 create mode 100644 module/move/willbe/tests/inc/entity/diff.rs
 delete mode 100644 module/move/willbe/tests/inc/entity/publish_need.rs

diff --git a/module/move/willbe/src/action/readme_modules_headers_renew.rs b/module/move/willbe/src/action/readme_modules_headers_renew.rs
index 39237fcb12..2be1eab6a8 100644
--- a/module/move/willbe/src/action/readme_modules_headers_renew.rs
+++ b/module/move/willbe/src/action/readme_modules_headers_renew.rs
@@ -12,7 +12,7 @@ mod private
   use std::borrow::Cow;
   use std::fs::{ OpenOptions };
   use std::io::{ Read, Seek, SeekFrom, Write };
-  use std::path::{Path, PathBuf};
+  use std::path::PathBuf;
   use convert_case::{ Case, Casing };
   use regex::Regex;
   use crate::action::readme_health_table_renew::find_example_file;
diff --git a/module/move/willbe/src/entity/features.rs b/module/move/willbe/src/entity/features.rs
index a292b131b1..81c1452180 100644
--- a/module/move/willbe/src/entity/features.rs
+++ b/module/move/willbe/src/entity/features.rs
@@ -2,7 +2,6 @@ mod private
 {
   use crate::*;
   use std::collections::{ BTreeSet, HashSet };
-  use error_tools::err;
   // aaa : for Petro : don't use cargo_metadata and Package directly, use facade
   // aaa : ✅
   use error_tools::for_app::{ bail, Result };
diff --git a/module/move/willbe/src/entity/manifest.rs b/module/move/willbe/src/entity/manifest.rs
index 619a5bab8c..0b5405bf48 100644
--- a/module/move/willbe/src/entity/manifest.rs
+++ b/module/move/willbe/src/entity/manifest.rs
@@ -7,7 +7,7 @@ pub( crate ) mod private
   {
     io::{ self, Read },
     fs,
-    path::Path,
+    path::{ Path, PathBuf },
   };
   use wtools::error::
   {
@@ -53,6 +53,21 @@ pub( crate ) mod private
       Ok( Self( crate_dir_path ) )
     }
   }
+  
+  impl TryFrom< PathBuf > for CrateDir
+  {
+    type Error = CrateDirError;
+
+    fn try_from( crate_dir_path : PathBuf ) -> Result< Self, Self::Error >
+    {
+      if !crate_dir_path.join( "Cargo.toml" ).exists()
+      {
+        return Err( CrateDirError::Validation( "The path is not a crate directory path".into() ) );
+      }
+
+      Ok( Self( AbsolutePath::try_from( crate_dir_path ).unwrap() ) )
+    }
+  }
 
   impl CrateDir
   {
diff --git a/module/move/willbe/tests/inc/entity/diff.rs b/module/move/willbe/tests/inc/entity/diff.rs
new file mode 100644
index 0000000000..b3362ee64d
--- /dev/null
+++ b/module/move/willbe/tests/inc/entity/diff.rs
@@ -0,0 +1,98 @@
+use crate::*;
+
+use std::path::{ Path, PathBuf };
+use assert_fs::{ TempDir, prelude::* };
+use crates_tools::CrateArchive;
+use the_module::*;
+use _path::AbsolutePath;
+use package::Package;
+use diff::crate_diff;
+use the_module::version::{ Version, BumpOptions, version_bump };
+
+const TEST_MODULE_PATH : &str = "../../test/";
+
+#[ test ]
+fn no_changes()
+{
+  let tmp = &TempDir::new().unwrap();
+  let package_path = package_path( "c" );
+  
+  let left = prepare( tmp, "left", &package_path );
+  let left_crate = crate_file_path( &left );
+  let left_archive = CrateArchive::read( &left_crate ).unwrap();
+  
+  let right = prepare( tmp, "right", &package_path );
+  let right_crate = crate_file_path( &right );
+  let right_archive = CrateArchive::read( &right_crate ).unwrap();
+  
+  let has_changes = crate_diff( &left_archive, &right_archive ).exclude( diff::PUBLISH_IGNORE_LIST ).has_changes();
+  
+  assert!( !has_changes );
+}
+
+#[ test ]
+fn with_changes()
+{
+  let tmp = &TempDir::new().unwrap();
+  let package_path = package_path( "c" );
+
+  let left =
+  {
+    let left = prepare( tmp, "left", &package_path );
+    let left_crate = crate_file_path( &left );
+    CrateArchive::read( &left_crate ).unwrap()
+  };
+
+  let right =
+  {
+    let right = prepare( tmp, "right", &package_path );
+
+    let absolute = AbsolutePath::try_from( right.as_path() ).unwrap();
+    let right_package = Package::try_from( absolute ).unwrap();
+    let right_version = Version::try_from( &right_package.version().unwrap() ).unwrap();
+
+    let bump_options = BumpOptions
+    {
+      crate_dir : CrateDir::try_from( right.clone() ).unwrap(),
+      old_version : right_version.clone(),
+      new_version : right_version.bump(),
+      dependencies : vec![],
+      dry : false,
+    };
+    version_bump( bump_options ).unwrap();
+
+    let right_crate = crate_file_path( &right );
+    CrateArchive::read( &right_crate ).unwrap()
+  };
+
+  let has_changes = crate_diff( &left, &right ).exclude( diff::PUBLISH_IGNORE_LIST ).has_changes();
+
+  assert!( has_changes );
+}
+
+fn package_path< P : AsRef< Path > >( path : P ) -> PathBuf
+{
+  let root_path = Path::new( env!( "CARGO_MANIFEST_DIR" ) ).join( TEST_MODULE_PATH );
+  root_path.join( path )
+}
+
+fn prepare( tmp : &TempDir, name : &str, manifest_dir_path : &Path ) -> PathBuf
+{
+  let dir = tmp.child( name );
+  dir.create_dir_all().unwrap();
+  dir.copy_from( manifest_dir_path, &[ "**" ] ).unwrap();
+
+  dir.to_path_buf()
+}
+
+fn crate_file_path( manifest_dir_path : &Path ) -> PathBuf
+{
+  _ = cargo::pack( cargo::PackOptions::former().path( manifest_dir_path ).dry( false ).form() ).expect( "Failed to package a package" );
+
+  let absolute = AbsolutePath::try_from( manifest_dir_path ).unwrap();
+  let package = Package::try_from( absolute ).unwrap();
+  manifest_dir_path
+    .join( "target" )
+    .join( "package" )
+    .join( format!( "{}-{}.crate", package.name().unwrap(), package.version().unwrap() ) )
+}
diff --git a/module/move/willbe/tests/inc/entity/mod.rs b/module/move/willbe/tests/inc/entity/mod.rs
index d86862bb87..58ee035a97 100644
--- a/module/move/willbe/tests/inc/entity/mod.rs
+++ b/module/move/willbe/tests/inc/entity/mod.rs
@@ -1,9 +1,6 @@
 use super::*;
 
+pub mod dependencies;
+pub mod diff;
 pub mod features;
-
 pub mod version;
-
-pub mod publish_need;
-
-pub mod dependencies;
\ No newline at end of file
diff --git a/module/move/willbe/tests/inc/entity/publish_need.rs b/module/move/willbe/tests/inc/entity/publish_need.rs
deleted file mode 100644
index 59f4a97828..0000000000
--- a/module/move/willbe/tests/inc/entity/publish_need.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-use super::*;
-
-use std::
-{
-  io::Write,
-  path::{ Path, PathBuf },
-};
-
-use assert_fs::prelude::*;
-use the_module::
-{
-  package::{ publish_need, Package },
-  _path::AbsolutePath,
-  manifest,
-  version,
-  cargo
-};
-
-const TEST_MODULE_PATH : &str = "../../test/";
-
-fn package_path< P : AsRef< Path > >( path : P ) -> PathBuf
-{
-  let root_path = Path::new( env!( "CARGO_MANIFEST_DIR" ) ).join( TEST_MODULE_PATH );
-  root_path.join( path )
-}
-
-fn package< P : AsRef< Path > >( path : P ) -> Package
-{
-  let path = path.as_ref();
-  _ = cargo::pack( cargo::PackOptions::former().path( path.to_path_buf() ).dry( false ).form() ).expect( "Failed to package a package" );
-  let absolute = AbsolutePath::try_from( path ).unwrap();
-
-  Package::try_from( absolute ).unwrap()
-}
-
-// published the same as local
-#[ test ]
-fn no_changes()
-{
-  // Arrange
-  // aaa : for Bohdan : make helper function returning package_path. reuse it for all relevant tests
-  // aaa : use `package_path` function
-  let package_path = package_path( "c" );
-
-  _ = cargo::pack( cargo::PackOptions::former().path( package_path.clone() ).dry( false ).form() ).expect( "Failed to package a package" );
-  let absolute = AbsolutePath::try_from( package_path ).unwrap();
-  let package = Package::try_from( absolute ).unwrap();
-
-  // Act
-  let publish_needed = publish_need( &package, None ).unwrap();
-
-  // Assert
-  assert!( !publish_needed );
-}
-
-// version bumped => publish required
-#[ test ]
-fn with_changes()
-{
-  // Arrange
-  let package_path = package_path( "c" );
-
-  let temp = assert_fs::TempDir::new().unwrap();
-  temp.copy_from( &package_path, &[ "**" ] ).unwrap();
-
-  let absolute = AbsolutePath::try_from( temp.as_ref() ).unwrap();
-  let mut manifest = manifest::open( absolute ).unwrap();
-  version::bump( &mut manifest, false ).unwrap();
-
-  _ = cargo::pack( cargo::PackOptions::former().path( temp.path().to_path_buf() ).dry( false ).form() ).expect( "Failed to package a package" );
-
-  let absolute = AbsolutePath::try_from( temp.as_ref() ).unwrap();
-  let package = Package::try_from( absolute ).unwrap();
-
-  // Act
-  let publish_needed = publish_need( &package, None ).unwrap();
-
-  // Assert
-  assert!( publish_needed );
-}
-
-// c(update) -> b(re-publish) -> a(re-publish)
-#[ test ]
-fn cascade_with_changes()
-{
-  let abc = [ "a", "b", "c" ].into_iter().map( package_path ).map( package ).collect::< Vec< _ > >();
-  let [ a, b, c ] = abc.as_slice() else { unreachable!() };
-  if ![ c, b, a ].into_iter().inspect( | x | { dbg!( x.name().unwrap() ); } ).map( | a | publish_need( a, None ) ).inspect( | x | { dbg!(x); } ).all( | p | !p.expect( "There was an error verifying whether the package needs publishing or not" ) )
-  {
-    panic!( "The packages must be up-to-dated" );
-  }
-  let temp = assert_fs::TempDir::new().unwrap();
-  let temp_module = temp.child( "module" );
-  std::fs::create_dir( &temp_module ).unwrap();
-  temp_module.child( "a" ).copy_from( a.manifest_path().parent().unwrap(), &[ "**" ] ).unwrap();
-  temp_module.child( "b" ).copy_from( b.manifest_path().parent().unwrap(), &[ "**" ] ).unwrap();
-  temp_module.child( "c" ).copy_from( c.manifest_path().parent().unwrap(), &[ "**" ] ).unwrap();
-  let a_temp_path = temp_module.join( "a" );
-  let b_temp_path = temp_module.join( "b" );
-  let c_temp_path = temp_module.join( "c" );
-
-  let mut cargo_toml = std::fs::File::create( temp.join( "Cargo.toml" ) ).unwrap();
-  write!( cargo_toml, r#"
-[workspace]
-resolver = "2"
-members = [
-    "module/*",
-]
-[workspace.dependencies.test_experimental_a]
-version = "*"
-path = "module/a"
-default-features = true
-[workspace.dependencies.test_experimental_b]
-version = "*"
-path = "module/b"
-default-features = true
-[workspace.dependencies.test_experimental_c]
-version = "*"
-path = "module/c"
-default-features = true
-"# ).unwrap();
-
-  let absolute = AbsolutePath::try_from( c_temp_path.join( "Cargo.toml" ) ).unwrap();
-  let mut manifest = manifest::open( absolute ).unwrap();
-  version::bump( &mut manifest, false ).unwrap();
-
-  let c_temp = package( c_temp_path );
-  let b_temp = package( b_temp_path );
-  let a_temp = package( a_temp_path );
-
-  assert!( publish_need( &c_temp, None ).unwrap() );
-  assert!( publish_need( &b_temp, None ).unwrap() );
-  assert!( publish_need( &a_temp, None ).unwrap() );
-}
diff --git a/module/move/willbe/tests/inc/package.rs b/module/move/willbe/tests/inc/package.rs
index 08b2f36f93..935069b5e6 100644
--- a/module/move/willbe/tests/inc/package.rs
+++ b/module/move/willbe/tests/inc/package.rs
@@ -1,12 +1,12 @@
-use super::*;
-use the_module::
-{
-  Workspace,
-  _path::AbsolutePath,
-  package::PublishPlan,
-};
-use willbe::package::perform_packages_publish;
-
+// use super::*;
+// use the_module::
+// {
+//   Workspace,
+//   _path::AbsolutePath,
+//   package::PublishPlan,
+// };
+// use willbe::package::perform_packages_publish;
+// 
 // #[ test ]
 // fn plan_publish_many_packages()
 // {

From 8f3dc158b80de1482ab0f825478985898088f710 Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Mon, 8 Apr 2024 13:15:07 +0300
Subject: [PATCH 16/49] add tests for query_execute

---
 .../unitore/src/executor/actions/query.rs     |  11 +-
 module/move/unitore/src/executor/mod.rs       |   2 +-
 module/move/unitore/tests/add_config.rs       |   5 +-
 .../unitore/tests/fixtures/test_config.toml   |   6 +-
 module/move/unitore/tests/query_execute.rs    | 181 ++++++++++++++++++
 5 files changed, 189 insertions(+), 16 deletions(-)
 create mode 100644 module/move/unitore/tests/query_execute.rs

diff --git a/module/move/unitore/src/executor/actions/query.rs b/module/move/unitore/src/executor/actions/query.rs
index 84064075a7..6d7a8c845c 100644
--- a/module/move/unitore/src/executor/actions/query.rs
+++ b/module/move/unitore/src/executor/actions/query.rs
@@ -4,25 +4,22 @@
 use crate::*;
 use super::*;
 use gluesql::core::executor::Payload;
-use storage::{ FeedStorage, Store };
-use executor::FeedManager;
+use storage::Store;
 use error_tools::{ err, BasicError, Result };
 
 /// Execute query specified in query string.
 pub async fn execute_query
 (
-  storage : FeedStorage< gluesql::sled_storage::SledStorage >,
+  mut storage : impl Store,
   args : &wca::Args,
 ) -> Result< impl Report >
 {
   let query = args
-  .get_owned::< Vec::< String > >( 0 )
+  .get_owned::< String >( 0 )
   .ok_or_else::< BasicError, _ >( || err!( "Cannot get Query argument for command .query.execute" ) )?
-  .join( " " )
   ;
 
-  let mut manager = FeedManager::new( storage );
-  manager.storage.execute_query( query ).await
+  storage.execute_query( query ).await
 }
 
 const EMPTY_CELL : &'static str = "";
diff --git a/module/move/unitore/src/executor/mod.rs b/module/move/unitore/src/executor/mod.rs
index 97c5601448..c8c1282c1e 100644
--- a/module/move/unitore/src/executor/mod.rs
+++ b/module/move/unitore/src/executor/mod.rs
@@ -19,7 +19,7 @@ use actions::
   table::{ list_columns, list_tables },
 };
 
-fn action< 'a, F, Fut, R >( async_endpoint : F, args : &'a Args ) -> Result< R >
+pub fn action< 'a, F, Fut, R >( async_endpoint : F, args : &'a Args ) -> Result< R >
 where
   F : FnOnce( FeedStorage< SledStorage >, &'a Args ) -> Fut,
   Fut : std::future::Future< Output = Result< R > >,
diff --git a/module/move/unitore/tests/add_config.rs b/module/move/unitore/tests/add_config.rs
index 24e83d0d8a..38d509ff43 100644
--- a/module/move/unitore/tests/add_config.rs
+++ b/module/move/unitore/tests/add_config.rs
@@ -31,9 +31,8 @@ async fn add_config_file() -> Result< () >
   .collect::< Vec< _ > >()
   ;
 
-  assert!( feeds_links.len() == 2 );
-  assert!( feeds_links.contains( &format!( "https://feeds.bbci.co.uk/news/world/rss.xml" ) ) );
-  assert!( feeds_links.contains( &format!( "https://rss.nytimes.com/services/xml/rss/nyt/World.xml" ) ) );
+  assert!( feeds_links.len() == 1 );
+  assert!( feeds_links.contains( &format!( "https://www.nasa.gov/feed/" ) ) );
 
   Ok( () )
 }
diff --git a/module/move/unitore/tests/fixtures/test_config.toml b/module/move/unitore/tests/fixtures/test_config.toml
index ed8606eb53..586e2f3787 100644
--- a/module/move/unitore/tests/fixtures/test_config.toml
+++ b/module/move/unitore/tests/fixtures/test_config.toml
@@ -1,7 +1,3 @@
 [[config]]
 update_period = "1min" 
-link = "https://feeds.bbci.co.uk/news/world/rss.xml"
-
-[[config]]
-update_period = "1min"
-link = "https://rss.nytimes.com/services/xml/rss/nyt/World.xml"
\ No newline at end of file
+link = "https://www.nasa.gov/feed/"
diff --git a/module/move/unitore/tests/query_execute.rs b/module/move/unitore/tests/query_execute.rs
new file mode 100644
index 0000000000..da27d66332
--- /dev/null
+++ b/module/move/unitore/tests/query_execute.rs
@@ -0,0 +1,181 @@
+use async_trait::async_trait;
+use feed_rs::parser as feed_parser;
+use unitore::
+{
+  feed_config::SubscriptionConfig,
+  retriever::FeedFetch,
+  storage::{ FeedStorage, feed::FeedStore, Store, config::ConfigStore, MockStore },
+  executor::actions::{ query::{ self, QueryReport } },
+};
+use gluesql::
+{
+  prelude::{ Payload::{ self, Select }, Value::{ Str, Timestamp } },
+  core::chrono::NaiveDateTime,
+  sled_storage::sled::Config,
+};
+use wca::{ VerifiedCommand, CommandsAggregator, Type };
+use error_tools::Result;
+use mockall::predicate;
+use std::path::PathBuf;
+
+/// Feed client for testing.
+#[derive(Debug)]
+pub struct TestClient;
+
+#[ async_trait ]
+impl FeedFetch for TestClient
+{
+  async fn fetch( &self, _ : url::Url ) -> Result< feed_rs::model::Feed >
+  {
+    let feed = feed_parser::parse( include_str!( "./fixtures/plain_feed.xml" ).as_bytes() )?;
+
+    Ok( feed )
+  }
+}
+
+#[ test ]
+fn query_execute() -> Result< () >
+{
+  let rt  = tokio::runtime::Runtime::new()?;  
+  let ca = CommandsAggregator::former()
+  .command( "query.execute" )
+    .hint( "hint" )
+    .long_hint( "long_hint" )
+    .subject().hint( "SQL query" ).kind( Type::String ).optional( false ).end()
+    .routine( move | o : VerifiedCommand |
+      {  
+        let mut f_store = MockStore::new();
+        f_store
+        .expect_execute_query()
+        .with(predicate::eq("SELECT title FROM frame".to_string()))
+        .times( 1 )
+        .returning( | _ | Ok( QueryReport
+          (
+            vec!
+            [
+              Select { labels : vec![ Str("title".to_string()).into() ], rows : Vec::new() }
+            ]
+          )
+        ) )
+        ;  
+        _ = rt.block_on( async move
+        {
+          query::execute_query( f_store, &o.args ).await
+        } );  
+      } )
+    .end()
+  .perform();  
+  let entries = ca.perform( vec![ ".query.execute".to_string(), "SELECT title FROM frame".into() ] );
+  assert!( entries.is_ok() );
+
+  Ok( () )
+}
+
+#[ tokio::test ]
+async fn query_feeds() -> Result< () >
+{
+  let path = PathBuf::from( "./tests/fixtures/test_config.toml" );
+  let path = path.canonicalize().expect( "Invalid path" );
+
+  let config = Config::default()
+  .path( "./test_feeds".to_owned() )
+  .temporary( true )
+  ;
+
+  let mut feed_storage = FeedStorage::init_storage( config ).await?;
+  unitore::executor::actions::config::add_config( feed_storage.clone(), &wca::Args( vec![ wca::Value::Path( path ) ] ) ).await?;
+
+  let entries = feed_storage.execute_query( "SELECT link FROM feed".to_string() ).await?;
+
+  assert!( !entries.0.is_empty() );
+  if let Select { labels, rows } = &entries.0[ 0 ]
+  {
+    assert_eq!( labels.len(), 1 );
+    assert_eq!( labels[ 0 ], "link" );
+    assert_eq!( rows.len(), 1 );
+  }
+  else
+  {
+    assert!( false )
+  }
+
+  Ok( () )
+}
+
+#[ tokio::test ]
+async fn query_frames() -> Result< () >
+{
+  let config = gluesql::sled_storage::sled::Config::default()
+  .path( "./test_frames".to_owned() )
+  .temporary( true )
+  ;
+
+  let mut feed_storage = FeedStorage::init_storage( config ).await?;
+
+  let feed_config = SubscriptionConfig
+  {
+    update_period : std::time::Duration::from_secs( 1000 ),
+    link : url::Url::parse( "https://www.nasa.gov/feed/" )?,
+  };
+
+  let mut feeds = Vec::new();
+  let client = TestClient;
+
+  let feed = FeedFetch::fetch( &client, feed_config.link.clone()).await?;
+  feeds.push( ( feed, feed_config.update_period.clone(), feed_config.link.clone() ) );
+  feed_storage.process_feeds( feeds ).await?;
+
+  let entries = feed_storage.execute_query( "SELECT title, published FROM frame ORDER BY published".to_string() ).await?;
+
+  assert!( !entries.0.is_empty() );
+
+  if let Select { labels, rows } = &entries.0[ 0 ]
+  {
+    assert_eq!( labels.len(), 2 );
+    assert!( labels.contains( &String::from( "title" ) ) );
+    assert!( labels.contains( &String::from( "published" ) ) );
+    assert_eq!( rows.len(), 10 );
+    assert_eq!( rows[ 0 ][ 0 ], Str( "8 Must-Have NASA Resources for Science Teachers in 2024".to_string() ) );
+    assert_eq!( rows[ 0 ][ 1 ], Timestamp( NaiveDateTime::parse_from_str( "13 Mar 2024 16:31:23", "%d %b %Y %H:%M:%S" )? ) );
+    assert_eq!( rows[ 9 ][ 0 ], Str( "Icing Cloud Characterization Engineer Emily Timko".to_string() ) );
+    assert_eq!( rows[ 9 ][ 1 ], Timestamp( NaiveDateTime::parse_from_str( "14 Mar 2024 14:27:52", "%d %b %Y %H:%M:%S" )? ) );
+  }
+  else
+  {
+    assert!( false )
+  }
+
+  Ok( () )
+}
+
+#[ tokio::test ]
+async fn query_configs() -> Result< () >
+{
+  let path = PathBuf::from( "./tests/fixtures/test_config.toml" );
+  let path = path.canonicalize().expect( "Invalid path" );
+
+  let config = Config::default()
+  .path( "./test_config".to_owned() )
+  .temporary( true )
+  ;
+
+  let mut feed_storage = FeedStorage::init_storage( config ).await?;
+  let _res = feed_storage.execute_query( format!( "INSERT INTO config VALUES ('{}') ", path.to_string_lossy().to_string() ) ).await?;
+
+
+  let res = feed_storage.list_configs().await?;
+
+  if let Payload::Select{ labels, rows } = &res
+  {
+    assert_eq!( labels.len(), 1 );
+    assert!( labels.contains( &String::from( "path" ) ) );
+    assert_eq!( rows.len(), 1 );
+    assert_eq!( rows[ 0 ][ 0 ], Str( path.to_string_lossy().to_string() ) );
+  }
+  else
+  {
+    assert!( false );
+  }
+  
+  Ok( () )
+}

From b801802f579ec8cff8e9ccda140a03a99ee0d98e Mon Sep 17 00:00:00 2001
From: Barsik <bogdan.balushkin5@gmail.com>
Date: Mon, 8 Apr 2024 14:07:43 +0300
Subject: [PATCH 17/49] Update cargo pack options to accommodate dirty crates

Modified the cargo pack options to include two new fields, `allow_dirty` and `no_verify`. These options are now checked while executing the `.publish.diff` command and the `.publish` command when the `dry` option is enabled. This change allows for the packaging of crates even when they are in a "dirty" state, improving functionality by accommodating scenarios where perfection isn't strictly required.
---
 module/move/willbe/src/action/publish_diff.rs               | 2 +-
 .../move/willbe/src/action/readme_modules_headers_renew.rs  | 2 +-
 module/move/willbe/src/entity/features.rs                   | 1 -
 module/move/willbe/src/entity/package.rs                    | 2 ++
 module/move/willbe/src/tool/cargo.rs                        | 6 ++++++
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/module/move/willbe/src/action/publish_diff.rs b/module/move/willbe/src/action/publish_diff.rs
index 010d9c7ead..0aec92732d 100644
--- a/module/move/willbe/src/action/publish_diff.rs
+++ b/module/move/willbe/src/action/publish_diff.rs
@@ -29,7 +29,7 @@ mod private
     let name = &package.name()?;
     let version = &package.version()?;
 
-    _ = cargo::pack( cargo::PackOptions::former().path( dir.as_ref() ).dry( false ).form() )?;
+    _ = cargo::pack( cargo::PackOptions::former().path( dir.as_ref() ).allow_dirty( true ).no_verify( true ).dry( false ).form() )?;
     let l = CrateArchive::read( packed_crate::local_path( name, version, dir )? )?;
     let r = CrateArchive::download_crates_io( name, version ).unwrap();
 
diff --git a/module/move/willbe/src/action/readme_modules_headers_renew.rs b/module/move/willbe/src/action/readme_modules_headers_renew.rs
index 39237fcb12..2be1eab6a8 100644
--- a/module/move/willbe/src/action/readme_modules_headers_renew.rs
+++ b/module/move/willbe/src/action/readme_modules_headers_renew.rs
@@ -12,7 +12,7 @@ mod private
   use std::borrow::Cow;
   use std::fs::{ OpenOptions };
   use std::io::{ Read, Seek, SeekFrom, Write };
-  use std::path::{Path, PathBuf};
+  use std::path::PathBuf;
   use convert_case::{ Case, Casing };
   use regex::Regex;
   use crate::action::readme_health_table_renew::find_example_file;
diff --git a/module/move/willbe/src/entity/features.rs b/module/move/willbe/src/entity/features.rs
index a292b131b1..81c1452180 100644
--- a/module/move/willbe/src/entity/features.rs
+++ b/module/move/willbe/src/entity/features.rs
@@ -2,7 +2,6 @@ mod private
 {
   use crate::*;
   use std::collections::{ BTreeSet, HashSet };
-  use error_tools::err;
   // aaa : for Petro : don't use cargo_metadata and Package directly, use facade
   // aaa : ✅
   use error_tools::for_app::{ bail, Result };
diff --git a/module/move/willbe/src/entity/package.rs b/module/move/willbe/src/entity/package.rs
index 4fb858191e..b58718b0f5 100644
--- a/module/move/willbe/src/entity/package.rs
+++ b/module/move/willbe/src/entity/package.rs
@@ -367,6 +367,8 @@ mod private
       let pack = cargo::PackOptions
       {
         path : crate_dir.as_ref().into(),
+        allow_dirty : self.dry,
+        no_verify : self.dry,
         temp_path : self.base_temp_dir.clone(),
         dry : self.dry,
       };
diff --git a/module/move/willbe/src/tool/cargo.rs b/module/move/willbe/src/tool/cargo.rs
index 83e376f59b..6a078e0eab 100644
--- a/module/move/willbe/src/tool/cargo.rs
+++ b/module/move/willbe/src/tool/cargo.rs
@@ -14,6 +14,10 @@ mod private
   pub struct PackOptions
   {
     pub( crate ) path : PathBuf,
+    #[ default( false ) ]
+    pub( crate ) allow_dirty : bool,
+    #[ default( false ) ]
+    pub( crate ) no_verify : bool,
     pub( crate ) temp_path : Option< PathBuf >,
     pub( crate ) dry : bool,
   }
@@ -33,6 +37,8 @@ mod private
     {
       [ "package".to_string() ]
       .into_iter()
+      .chain( if self.allow_dirty { Some( "--allow-dirty".to_string() ) } else { None } )
+      .chain( if self.no_verify { Some( "--no-verify".to_string() ) } else { None } )
       .chain( self.temp_path.clone().map( | p | vec![ "--target-dir".to_string(), p.to_string_lossy().into() ] ).into_iter().flatten() )
       .collect()
     }

From 0f419b099e6411888ad9be2e047fb62e52a6ee8e Mon Sep 17 00:00:00 2001
From: Barsik <bogdan.balushkin5@gmail.com>
Date: Mon, 8 Apr 2024 15:20:37 +0300
Subject: [PATCH 18/49] Improve error handling and reporting in modules

This commit improves error handling and reporting in 'publish.rs', 'package.rs' and 'graph.rs' modules. Specifically, error fallbacks and more descriptive error messages have been introduced. In addition, the 'perform_package_publish' function now returns a tuple containing both a 'PublishReport' and an 'Error', rather than just a 'PublishReport'.
---
 module/move/willbe/src/action/publish.rs |  2 +-
 module/move/willbe/src/entity/package.rs | 31 +++++++++++++++++-------
 module/move/willbe/src/tool/graph.rs     |  7 +++---
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/module/move/willbe/src/action/publish.rs b/module/move/willbe/src/action/publish.rs
index 94a6e940c6..0c775fb420 100644
--- a/module/move/willbe/src/action/publish.rs
+++ b/module/move/willbe/src/action/publish.rs
@@ -137,7 +137,7 @@ mod private
       None
     };
 
-    let subgraph = graph::remove_not_required_to_publish( &package_map, &tmp, &packages_to_publish, dir.clone() );
+    let subgraph = graph::remove_not_required_to_publish( &package_map, &tmp, &packages_to_publish, dir.clone() ).err_with( || report.clone() )?;
     let subgraph = subgraph.map( | _, n | n, | _, e | e );
 
     let queue = graph::toposort( subgraph ).unwrap().into_iter().map( | n | package_map.get( &n ).unwrap() ).cloned().collect::< Vec< _ > >();
diff --git a/module/move/willbe/src/entity/package.rs b/module/move/willbe/src/entity/package.rs
index 4fb858191e..0d987e5579 100644
--- a/module/move/willbe/src/entity/package.rs
+++ b/module/move/willbe/src/entity/package.rs
@@ -33,6 +33,7 @@ mod private
   use former::Former;
   use workspace::WorkspacePackage;
   use diff::crate_diff;
+  use error_tools::for_app::Error;
 
   ///
   #[ derive( Debug, Clone ) ]
@@ -301,6 +302,18 @@ mod private
     pub commit : Option< process::Report >,
     pub push : Option< process::Report >,
   }
+  
+  impl std::fmt::Display for ExtendedGitReport
+  {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+      let Self { add, commit, push } = &self;
+      if let Some( add ) = add { writeln!( f, "{add}" )? }
+      if let Some( commit ) = commit { writeln!( f, "{commit}" )? }
+      if let Some( push ) = push { writeln!( f, "{push}" )? }
+      
+      Ok( () )
+    }
+  }
 
   #[ derive( Debug, Clone ) ]
   pub struct GitThingsOptions
@@ -324,11 +337,11 @@ mod private
       .with_context( || format!("git_root: {}, item: {}", o.git_root.as_ref().display(), item.as_ref().display() ) )
     )
     .collect::< Result< Vec< _ > > >()?;
-    let res = git::add( &o.git_root, &items, o.dry ).map_err( | e | format_err!( "{report:?}\n{e:#?}" ) )?;
+    let res = git::add( &o.git_root, &items, o.dry ).map_err( | e | format_err!( "{report}\n{e}" ) )?;
     report.add = Some( res );
-    let res = git::commit( &o.git_root, &o.message, o.dry ).map_err( | e | format_err!( "{report:?}\n{e:#?}" ) )?;
+    let res = git::commit( &o.git_root, &o.message, o.dry ).map_err( | e | format_err!( "{report}\n{e}" ) )?;
     report.commit = Some( res );
-    let res = git::push( &o.git_root, o.dry ).map_err( | e | format_err!( "{report:?}\n{e:#?}" ) )?;
+    let res = git::push( &o.git_root, o.dry ).map_err( | e | format_err!( "{report}\n{e}" ) )?;
     report.push = Some( res );
 
     Ok( report )
@@ -417,7 +430,7 @@ mod private
   /// # Returns
   ///
   /// * `Result<PublishReport>` - The result of the publishing operation, including information about the publish, version bump, and git operations.
-  pub fn perform_package_publish( instruction : PackagePublishInstruction ) -> Result< PublishReport >
+  pub fn perform_package_publish( instruction : PackagePublishInstruction ) -> Result< PublishReport, ( PublishReport, Error ) >
   {
     let mut report = PublishReport::default();
     let PackagePublishInstruction
@@ -434,15 +447,15 @@ mod private
     git_things.dry = dry;
     publish.dry = dry;
 
-    report.get_info = Some( cargo::pack( pack ).map_err( | e | format_err!( "{report}\n{e:#?}" ) )? );
+    report.get_info = Some( cargo::pack( pack ).map_err( | e | ( report.clone(), e ) )? );
     // qqq : redundant field?
     report.publish_required = true;
-    report.bump = Some( version::version_bump( version_bump ).map_err( | e | format_err!( "{report}\n{e:#?}" ) )? );
-    let git = perform_git_operations( git_things ).map_err( |e | format_err!( "{report}\n{e:#?}" ) )?;
+    report.bump = Some( version::version_bump( version_bump ).map_err( | e | ( report.clone(), e ) )? );
+    let git = perform_git_operations( git_things ).map_err( | e | ( report.clone(), e ) )?;
     report.add = git.add;
     report.commit = git.commit;
     report.push = git.push;
-    report.publish = Some( cargo::publish( publish ).map_err( | e | format_err!( "{report}\n{e:#?}" ) )? );
+    report.publish = Some( cargo::publish( publish ).map_err( | e | ( report.clone(), e ) )? );
 
     Ok( report )
   }
@@ -620,7 +633,7 @@ mod private
     let mut report = vec![];
     for package in plan.plans
     {
-      let res = perform_package_publish( package ).map_err( | e | format_err!( "{report:#?}\n{e:#?}" ) )?;
+      let res = perform_package_publish( package ).map_err( |( current_rep, e )| format_err!( "{}\n{current_rep}\n{e}", report.iter().map( | r | format!( "{r}" ) ).join( "\n" ) ) )?;
       report.push( res );
     }
 
diff --git a/module/move/willbe/src/tool/graph.rs b/module/move/willbe/src/tool/graph.rs
index 9191e31117..5fedda7688 100644
--- a/module/move/willbe/src/tool/graph.rs
+++ b/module/move/willbe/src/tool/graph.rs
@@ -21,6 +21,7 @@ pub( crate ) mod private
   use petgraph::prelude::*;
 
   use error_tools::for_lib::Error;
+  use error::Result;
   use package::{ Package, publish_need };
 
   #[ derive( Debug, Error ) ]
@@ -242,7 +243,7 @@ pub( crate ) mod private
     roots : &[ String ], 
     temp_path : Option< PathBuf >,
   ) 
-  -> Graph< String, String >
+  -> Result< Graph< String, String > >
   {
     let mut nodes = HashSet::new();
     let mut cleared_graph = Graph::new();
@@ -269,7 +270,7 @@ pub( crate ) mod private
           .option_temp_path( temp_path.clone() )
           .dry( false )
           .form()
-        ).unwrap();
+        )?;
         if publish_need( package, temp_path.clone() ).unwrap()
         {
           nodes.insert( n );
@@ -294,7 +295,7 @@ pub( crate ) mod private
       }
     }
 
-    cleared_graph
+    Ok( cleared_graph )
   }
 }
 

From a3839e8428acbeb4ac208f9d3f2df1b2a617c170 Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Mon, 8 Apr 2024 17:35:54 +0300
Subject: [PATCH 19/49] update file structure

---
 module/move/unitore/src/Readme.md         |   6 +
 module/move/unitore/src/action/config.rs  |   8 +-
 module/move/unitore/src/command/config.rs | 139 ++++++++++++
 module/move/unitore/src/command/feed.rs   |  53 +++++
 module/move/unitore/src/command/frame.rs  |  90 ++++++++
 module/move/unitore/src/command/mod.rs    |   6 +-
 module/move/unitore/src/command/query.rs  |  59 +++++
 module/move/unitore/src/command/table.rs  |  54 ++++-
 module/move/unitore/src/executor.rs       | 253 +++++-----------------
 9 files changed, 460 insertions(+), 208 deletions(-)
 create mode 100644 module/move/unitore/src/command/config.rs
 create mode 100644 module/move/unitore/src/command/feed.rs
 create mode 100644 module/move/unitore/src/command/frame.rs
 create mode 100644 module/move/unitore/src/command/query.rs

diff --git a/module/move/unitore/src/Readme.md b/module/move/unitore/src/Readme.md
index e69de29bb2..be6a15dfc1 100644
--- a/module/move/unitore/src/Readme.md
+++ b/module/move/unitore/src/Readme.md
@@ -0,0 +1,6 @@
+## File structure
+
+- `command` - Contains commands for unitore cli.
+- `action` - Contains functions that are executed when command are performed.
+- `entity` - Contains entities that are used in commands execution.
+- `tool` - Additional functions for convenient use of application.
\ No newline at end of file
diff --git a/module/move/unitore/src/action/config.rs b/module/move/unitore/src/action/config.rs
index 952d997fbc..e9d65d176c 100644
--- a/module/move/unitore/src/action/config.rs
+++ b/module/move/unitore/src/action/config.rs
@@ -21,6 +21,8 @@ pub async fn config_add( storage : FeedStorage< SledStorage >, args : &wca::Args
   .into()
   ;
 
+  let path = proper_path_tools::path::normalize( path );
+
   let mut err_str = format!( "Invalid path for config file {:?}", path );
 
   let start = path.components().next();
@@ -37,7 +39,11 @@ pub async fn config_add( storage : FeedStorage< SledStorage >, args : &wca::Args
       err_str = format!( "Invalid path for config file {:?}", abs_path );
     }
   }
-  let path = path.canonicalize().context( err_str )?;
+
+  if !path.exists()
+  {
+    return Err( error_tools::for_app::Error::msg( err_str ) );
+  }  
 
   let config = Config::new( path.to_string_lossy().to_string() );
   let mut manager = FeedManager::new( storage );
diff --git a/module/move/unitore/src/command/config.rs b/module/move/unitore/src/command/config.rs
new file mode 100644
index 0000000000..3fef800b22
--- /dev/null
+++ b/module/move/unitore/src/command/config.rs
@@ -0,0 +1,139 @@
+//! Feed command.
+
+use crate::*;
+use gluesql::sled_storage::sled::Config;
+use wca::{ Command, Type, VerifiedCommand };
+use storage::FeedStorage;
+use action::{ Report, config::{ config_add, config_delete, config_list } };
+use error_tools::Result;
+
+pub struct ConfigCommand;
+
+impl ConfigCommand
+{
+  pub fn add() -> Result< Command >
+  {
+
+    let rt  = tokio::runtime::Runtime::new()?;
+  
+    Ok
+    (
+      Command::former()
+      .phrase( "config.add" )
+      .long_hint( concat!
+      (
+      "Add file with feeds configurations. Subject: path to config file.\n",
+      "    Example: .config.add ./config/feeds.toml\n",
+      "    The file should contain config entities with fields:\n",
+      "   - `update_period` : update frequency for feed. Example values: `12h`, `1h 20min`, `2days 5h`;\n",
+      "   - `link` : URL for feed source;\n\n",
+      "    Example:\n",
+      "    [[config]]\n",
+      "    update_period = \"1min\"\n",
+      "    link = \"https://feeds.bbci.co.uk/news/world/rss.xml\"\n",
+      ))
+      .subject().hint( "Path" ).kind( Type::Path ).optional( false ).end()
+      .routine( move | o : VerifiedCommand |
+      {
+        let res = rt.block_on( async move
+          {
+            let path_to_storage = std::env::var( "UNITORE_STORAGE_PATH" )
+            .unwrap_or( String::from( "./_data" ) )
+            ;
+            
+            let config = Config::default()
+            .path( path_to_storage )
+            ;
+  
+            let feed_storage = FeedStorage::init_storage( &config ).await?;
+            config_add( feed_storage, &o.args ).await
+          });
+          match res
+          {
+            Ok( report ) => report.report(),
+            Err( err ) => println!( "{:?}", err ),
+          }
+        
+      })
+      .end()
+    )
+  }
+
+  pub fn delete() -> Result< Command >
+  {
+    let rt  = tokio::runtime::Runtime::new()?;
+  
+    Ok(
+      Command::former()
+      .phrase( "config.delete" )
+      .long_hint( concat!
+      (
+      "Delete file with feeds configuraiton. Subject: path to config file.\n",
+      "    Example: .config.delete ./config/feeds.toml",
+      ))
+      .subject().hint( "Path" ).kind( Type::Path ).optional( false ).end()
+      .routine( move | o : VerifiedCommand |
+      {
+        let res = rt.block_on( async move
+          {
+            let path_to_storage = std::env::var( "UNITORE_STORAGE_PATH" )
+            .unwrap_or( String::from( "./_data" ) )
+            ;
+            
+            let config = Config::default()
+            .path( path_to_storage )
+            ;
+  
+            let feed_storage = FeedStorage::init_storage( &config ).await?;
+            config_delete( feed_storage, &o.args ).await
+          });
+          match res
+          {
+            Ok( report ) => report.report(),
+            Err( err ) => println!( "{:?}", err ),
+          }
+        
+      })
+      .end()
+    )
+  }
+
+  pub fn list() -> Result< Command >
+  {
+    let rt  = tokio::runtime::Runtime::new()?;
+  
+    Ok
+    (
+      Command::former()
+      .phrase( "config.list" )
+      .long_hint( concat!
+      (
+      "List all config files saved in storage.\n",
+      "    Example: .config.list",
+      ))
+      .routine( move | o : VerifiedCommand |
+      {
+        let res = rt.block_on( async move
+          {
+            let path_to_storage = std::env::var( "UNITORE_STORAGE_PATH" )
+            .unwrap_or( String::from( "./_data" ) )
+            ;
+            
+            let config = Config::default()
+            .path( path_to_storage )
+            ;
+  
+            let feed_storage = FeedStorage::init_storage( &config ).await?;
+            config_list( feed_storage, &o.args ).await
+          });
+          match res
+          {
+            Ok( report ) => report.report(),
+            Err( err ) => println!( "{:?}", err ),
+          }
+        
+      })
+      .end()
+    )
+  }
+}
diff --git a/module/move/unitore/src/command/feed.rs b/module/move/unitore/src/command/feed.rs
new file mode 100644
index 0000000000..c713e8b559
--- /dev/null
+++ b/module/move/unitore/src/command/feed.rs
@@ -0,0 +1,53 @@
+//! Feed command.
+
+use crate::*;
+use gluesql::sled_storage::sled::Config;
+use wca::{ Command, VerifiedCommand };
+use storage::FeedStorage;
+use action::{ Report, feed::feeds_list };
+use error_tools::Result;
+
+pub struct FeedCommand;
+
+impl FeedCommand
+{
+  pub fn list() -> Result< Command >
+  {
+
+    let rt  = tokio::runtime::Runtime::new()?;
+  
+    Ok
+    (
+      Command::former()
+      .phrase( "feeds.list" )
+      .long_hint( concat!
+      (
+        "List all feeds from storage.\n",
+        "    Example: .feeds.list",
+      ))
+      .routine( move | o : VerifiedCommand |
+      {
+        let res = rt.block_on( async move
+          {
+            let path_to_storage = std::env::var( "UNITORE_STORAGE_PATH" )
+            .unwrap_or( String::from( "./_data" ) )
+            ;
+            
+            let config = Config::default()
+            .path( path_to_storage )
+            ;
+  
+            let feed_storage = FeedStorage::init_storage( &config ).await?;
+            feeds_list( feed_storage, &o.args ).await
+          });
+          match res
+          {
+            Ok( report ) => report.report(),
+            Err( err ) => println!( "{:?}", err ),
+          }
+        
+      })
+      .end()
+    )
+  }
+}
\ No newline at end of file
diff --git a/module/move/unitore/src/command/frame.rs b/module/move/unitore/src/command/frame.rs
new file mode 100644
index 0000000000..75416b1d71
--- /dev/null
+++ b/module/move/unitore/src/command/frame.rs
@@ -0,0 +1,90 @@
+//! Frame commands.
+
+use crate::*;
+use gluesql::sled_storage::sled::Config;
+use wca::{ Command, VerifiedCommand };
+use storage::FeedStorage;
+use action::{ Report, frame::{ frames_list, frames_download } };
+use error_tools::Result;
+
+pub struct FrameCommand;
+
+impl FrameCommand
+{
+  pub fn list() -> Result< Command >
+  {
+    let rt  = tokio::runtime::Runtime::new()?;
+  
+    Ok
+    (
+      Command::former()
+      .phrase( "frames.list" )
+      .long_hint( concat!
+      (
+        "List all frames saved in storage.\n",
+        "    Example: .frames.list",
+      ))
+      .routine( move | o : VerifiedCommand |
+      {
+        let res = rt.block_on( async move
+          {
+            let path_to_storage = std::env::var( "UNITORE_STORAGE_PATH" )
+            .unwrap_or( String::from( "./_data" ) )
+            ;
+            
+            let config = Config::default()
+            .path( path_to_storage )
+            ;
+  
+            let feed_storage = FeedStorage::init_storage( &config ).await?;
+            frames_list( feed_storage, &o.args ).await
+          });
+          match res
+          {
+            Ok( report ) => report.report(),
+            Err( err ) => println!( "{:?}", err ),
+          }
+        
+      })
+      .end()
+    )
+  }
+
+  pub fn download() -> Result< Command >
+  {
+
+    let rt  = tokio::runtime::Runtime::new()?;
+
+    Ok(
+      Command::former()
+      .phrase( "frames.download" )
+      .hint( "Download frames from feed sources provided in config files." )
+      .long_hint(concat!
+      (
+        "Download frames from feed sources provided in config files.\n",
+        "    Example: .frames.download",
+      ))
+      .routine( move | o : VerifiedCommand |
+      {
+        let res = rt.block_on( async move
+          {
+            let path_to_storage = std::env::var( "UNITORE_STORAGE_PATH" )
+            .unwrap_or( String::from( "./_data" ) )
+            ;
+            
+            let config = Config::default()
+            .path( path_to_storage )
+            ;
+
+            let feed_storage = FeedStorage::init_storage( &config ).await?;
+            frames_download( feed_storage, &o.args ).await
+          });
+          match res
+          {
+            Ok( report ) => report.report(),
+            Err( err ) => println!( "{:?}", err ),
+          }
+      })
+    .end() )
+  }
+}
\ No newline at end of file
diff --git a/module/move/unitore/src/command/mod.rs b/module/move/unitore/src/command/mod.rs
index 790b2c4ac0..ea0a44e8a3 100644
--- a/module/move/unitore/src/command/mod.rs
+++ b/module/move/unitore/src/command/mod.rs
@@ -1 +1,5 @@
-pub mod table;
\ No newline at end of file
+pub mod table;
+pub mod frame;
+pub mod feed;
+pub mod query;
+pub mod config;
\ No newline at end of file
diff --git a/module/move/unitore/src/command/query.rs b/module/move/unitore/src/command/query.rs
new file mode 100644
index 0000000000..21931d05af
--- /dev/null
+++ b/module/move/unitore/src/command/query.rs
@@ -0,0 +1,59 @@
+//! Query command.
+
+use crate::*;
+use gluesql::sled_storage::sled::Config;
+use wca::{ Command, Type, VerifiedCommand };
+use storage::FeedStorage;
+use action::{ Report, query::query_execute };
+use error_tools::Result;
+
+pub struct QueryCommand;
+
+impl QueryCommand
+{
+  pub fn list() -> Result< Command >
+  {
+    let rt  = tokio::runtime::Runtime::new()?;
+  
+    Ok
+    (
+      Command::former()
+      .phrase( "query.execute" )
+      .long_hint( concat!
+      (
+        "Execute custom query. Subject: query string, with special characters escaped.\n",
+        "    Example query:\n",
+        "  - select all frames:\n",
+        r#"    .query.execute \'SELECT \* FROM frame\'"#,
+        "\n",
+        "  - select title and link to the most recent frame:\n",
+        r#"    .query.execute \'SELECT title, links, MIN\(published\) FROM frame\'"#,
+        "\n\n",
+      ))
+      .subject().hint( "Query" ).kind( Type::String ).optional( false ).end()
+      .routine( move | o : VerifiedCommand |
+      {
+        let res = rt.block_on( async move
+          {
+            let path_to_storage = std::env::var( "UNITORE_STORAGE_PATH" )
+            .unwrap_or( String::from( "./_data" ) )
+            ;
+            
+            let config = Config::default()
+            .path( path_to_storage )
+            ;
+  
+            let feed_storage = FeedStorage::init_storage( &config ).await?;
+            query_execute( feed_storage, &o.args ).await
+          });
+          match res
+          {
+            Ok( report ) => report.report(),
+            Err( err ) => println!( "{:?}", err ),
+          }
+        
+      })
+      .end()
+    )
+  }
+}
\ No newline at end of file
diff --git a/module/move/unitore/src/command/table.rs b/module/move/unitore/src/command/table.rs
index c5d8f5ffab..f40387b4e0 100644
--- a/module/move/unitore/src/command/table.rs
+++ b/module/move/unitore/src/command/table.rs
@@ -4,21 +4,22 @@ use crate::*;
 use gluesql::sled_storage::sled::Config;
 use wca::{ Command, Type, VerifiedCommand };
 use storage::FeedStorage;
-use action::{ Report, table::table_list };
+use action::{ Report, table::{ table_list, tables_list } };
 use error_tools::Result;
 
-pub struct TableCommand( Command );
+pub struct TableCommand;
 
 impl TableCommand
 {
-  pub fn new() -> Result< Self >
+  pub fn list() -> Result< Command >
   {
 
     let rt  = tokio::runtime::Runtime::new()?;
   
-    Ok( Self
+    Ok
     (
       Command::former()
+      .phrase( "table.list" )
       .long_hint( concat!
       (
         "Delete file with feeds configuraiton. Subject: path to config file.\n",
@@ -47,10 +48,51 @@ impl TableCommand
         }
       })
       .end()
-    ) )
+    )
   }
-  pub fn command()
+}
+
+pub struct TablesCommand;
+
+impl TablesCommand
+{
+  pub fn list() -> Result< Command >
   {
 
+    let rt  = tokio::runtime::Runtime::new()?;
+  
+    Ok
+    (
+      Command::former()
+      .phrase( "tables.list" )
+      .long_hint( concat!
+      (
+        "Delete file with feeds configuraiton. Subject: path to config file.\n",
+        "    Example: .config.delete ./config/feeds.toml",
+      ))
+      .subject().hint( "Path" ).kind( Type::Path ).optional( false ).end()
+      .routine( move | o : VerifiedCommand |
+      {
+        let res = rt.block_on( async move
+        {
+          let path_to_storage = std::env::var( "UNITORE_STORAGE_PATH" )
+          .unwrap_or( String::from( "./_data" ) )
+          ;
+          
+          let config = Config::default()
+          .path( path_to_storage )
+          ;
+
+          let feed_storage = FeedStorage::init_storage( &config ).await?;
+          tables_list( feed_storage, &o.args ).await
+        } );
+        match res
+        {
+          Ok( report ) => report.report(),
+          Err( err ) => println!( "{:?}", err ),
+        }
+      })
+      .end()
+    )
   }
 }
\ No newline at end of file
diff --git a/module/move/unitore/src/executor.rs b/module/move/unitore/src/executor.rs
index 88c5a85821..94cf1093eb 100644
--- a/module/move/unitore/src/executor.rs
+++ b/module/move/unitore/src/executor.rs
@@ -2,215 +2,68 @@
 
 use crate::*;
 use feed_config::SubscriptionConfig;
-use gluesql::sled_storage::{ sled::Config, SledStorage };
-use storage::{ Store, FeedStorage };
+use storage::Store;
 use entity::{ feed::FeedStore, config::ConfigStore, table::TableStore, frame::FrameStore };
-use wca::{ Args, Type, VerifiedCommand };
+use wca::{ Dictionary, Executor, Parser, Verifier };
 use error_tools::Result;
 
-use action::
-{
-  Report,
-  frame::{ frames_list, frames_download },
-  feed::feeds_list,
-  config::{ config_add, config_delete, config_list },
-  query::query_execute,
-  table::{ table_list, tables_list },
-};
-
-fn action< 'a, F, Fut, R >( async_endpoint : F, args : &'a Args ) -> Result< R >
-where
-  F : FnOnce( FeedStorage< SledStorage >, &'a Args ) -> Fut,
-  Fut : std::future::Future< Output = Result< R > >,
-  R : action::Report,
-{
-  let path_to_storage = std::env::var( "UNITORE_STORAGE_PATH" )
-  .unwrap_or( String::from( "./_data" ) )
-  ;
-
-  let config = Config::default()
-  .path( path_to_storage )
-  ;
-  let rt  = tokio::runtime::Runtime::new()?;
-
-  rt.block_on( async move
-  {
-    let feed_storage = FeedStorage::init_storage( &config ).await?;
-    async_endpoint( feed_storage, args ).await
-  } )
-}
+use action::Report;
 
 /// Run feed updates.
 pub fn execute() -> Result< (), Box< dyn std::error::Error + Send + Sync > >
 {
-  let ca = wca::CommandsAggregator::former()
-  .command( "frames.download" )
-    .hint( "Download frames from feed sources provided in config files." )
-    .long_hint(concat!
-    (
-      "Download frames from feed sources provided in config files.\n",
-      "    Example: .frames.download",
-    ))
-    .routine( | o : VerifiedCommand |
-    {
-      match action( frames_download, &o.args )
-      {
-        Ok( report ) => report.report(),
-        Err( err ) => println!( "{:?}", err ),
-      }
-    })
-    .end()
-
-  .command( "feeds.list" )
-    .long_hint( concat!
-    (
-      "List all feeds from storage.\n",
-      "    Example: .feeds.list",
-    ))
-    .routine( | o : VerifiedCommand |
-    {
-      match action( feeds_list, &o.args )
-      {
-        Ok( report ) => report.report(),
-        Err( err ) => println!( "{:?}", err ),
-      }
-    })
-    .end()
-
-  .command( "frames.list" )
-    .long_hint( concat!
-    (
-      "List all frames saved in storage.\n",
-      "    Example: .frames.list",
-    ))
-    .routine( | o : VerifiedCommand |
-    {
-      match action( frames_list, &o.args )
-      {
-        Ok( report ) => report.report(),
-        Err( err ) => println!( "{:?}", err ),
-      }
-    })
-    .end()
-
-  .command( "config.add" )
-    .long_hint( concat!
-    (
-      "Add file with feeds configurations. Subject: path to config file.\n",
-      "    Example: .config.add ./config/feeds.toml\n",
-      "    The file should contain config entities with fields:\n",
-      "   - `update_period` : update frequency for feed. Example values: `12h`, `1h 20min`, `2days 5h`;\n",
-      "   - `link` : URL for feed source;\n\n",
-      "    Example:\n",
-      "    [[config]]\n",
-      "    update_period = \"1min\"\n",
-      "    link = \"https://feeds.bbci.co.uk/news/world/rss.xml\"\n",
-    ))
-    .subject().hint( "Path" ).kind( Type::Path ).optional( false ).end()
-    .routine( | o : VerifiedCommand |
-    {
-      match action( config_add, &o.args )
-      {
-        Ok( report ) => report.report(),
-        Err( err ) => println!( "{:?}", err ),
-      }
-    })
-    .end()
-
-  .command( "config.delete" )
-    .long_hint( concat!
-    (
-      "Delete file with feeds configuraiton. Subject: path to config file.\n",
-      "    Example: .config.delete ./config/feeds.toml",
-    ))
-    .subject().hint( "Path" ).kind( Type::Path ).optional( false ).end()
-    .routine( | o : VerifiedCommand |
-    {
-      match action( config_delete, &o.args )
-      {
-        Ok( report ) => report.report(),
-        Err( err ) => println!( "{:?}", err ),
-      }
-    })
-    .end()
-
-  .command( "config.list" )
-    .long_hint( concat!
-    (
-      "List all config files saved in storage.\n",
-      "    Example: .config.list",
-    ))
-    .routine( | o : VerifiedCommand |
-    {
-      match action( config_list, &o.args )
-      {
-        Ok( report ) => report.report(),
-        Err( err ) => println!( "{:?}", err ),
-      }
-    })
-    .end()
-
-  .command( "tables.list" )
-    .long_hint( concat!
-    (
-      "List all tables saved in storage.\n",
-      "    Example: .tables.list",
-    ))
-    .routine( | o : VerifiedCommand |
-    {
-      match action( tables_list, &o.args )
-      {
-        Ok( report ) => report.report(),
-        Err( err ) => println!( "{:?}", err ),
-      }
-    })
-    .end()
-
-  .command( "table.list" )
-    .long_hint( concat!
-    (
-      "List fields of specified table.\n",
-      "Subject: table name.\n",
-      "    Example: .table.list feed",
-    ))
-    .subject().hint( "Name" ).kind( wca::Type::String ).optional( true ).end()
-    .routine( | o : VerifiedCommand |
-    {
-      match action( table_list, &o.args )
-      {
-        Ok( report ) => report.report(),
-        Err( err ) => println!( "{:?}", err ),
-      }
-    })
-    .end()
-
-  .command( "query.execute" )
-    .long_hint( concat!
-    (
-      "Execute custom query. Subject: query string, with special characters escaped.\n",
-      "    Example query:\n",
-      "  - select all frames:\n",
-      r#"    .query.execute \'SELECT \* FROM frame\'"#,
-      "\n",
-      "  - select title and link to the most recent frame:\n",
-      r#"    .query.execute \'SELECT title, links, MIN\(published\) FROM frame\'"#,
-      "\n\n",
-    ))
-    .subject().hint( "Query" ).kind( Type::String ).optional( false ).end()
-    .routine( | o : VerifiedCommand |
-    {
-      match action( query_execute, &o.args )
-      {
-        Ok( report ) => report.report(),
-        Err( err ) => println!( "{:?}", err ),
-      }
-    })
-    .end()
-  .help_variants( [ wca::HelpVariants::General, wca::HelpVariants::SubjectCommand ] )
-  .perform();
+  // init parser
+  let parser = Parser;
+
+  // init converter
+  let dictionary = &Dictionary::former()
+  .command
+  (
+    command::config::ConfigCommand::add()?
+  )
+  .command
+  (
+    command::config::ConfigCommand::delete()?
+  )
+  .command
+  (
+    command::config::ConfigCommand::list()?
+  )
+  .command
+  (
+    command::frame::FrameCommand::list()?
+  )
+  .command
+  (
+    command::frame::FrameCommand::download()?
+  )
+  .command
+  (
+    command::feed::FeedCommand::list()?
+  )
+  .command
+  (
+    command::table::TablesCommand::list()?
+  )
+  .command
+  (
+    command::table::TableCommand::list()?
+  )
+  .command
+  (
+    command::query::QueryCommand::list()?
+  )
+  .form();
+  let verifier = Verifier;
+
+  // init executor
+  let executor = Executor::former().form();
 
   let args = std::env::args().skip( 1 ).collect::< Vec< String > >();
-  ca.perform( args )?;
+  let raw_program = parser.parse( args ).unwrap();
+  let grammar_program = verifier.to_program( dictionary, raw_program ).unwrap();
+
+  executor.program( dictionary, grammar_program )?;
 
   Ok( () )
 }

From 61b8e672e7f8a2b95abc8010294705c09227de85 Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Mon, 8 Apr 2024 17:49:32 +0300
Subject: [PATCH 20/49] fixed comments

---
 module/move/unitore/src/action/mod.rs         |  5 +-
 module/move/unitore/src/entity/config.rs      |  3 +
 .../move/unitore/src/sled_adapter/config.rs   |  2 +
 module/move/unitore/src/sled_adapter/feed.rs  |  2 +
 module/move/unitore/src/sled_adapter/frame.rs |  2 +
 module/move/unitore/src/sled_adapter/table.rs |  2 +
 .../move/unitore/tests/{frame.rs => basic.rs} |  0
 .../unitore/tests/fixtures/plain_feed.xml     |  4 +-
 ...pdate_newer_feed.rs => frames_download.rs} | 41 +++++++++++--
 module/move/unitore/tests/save_feed.rs        | 57 -------------------
 10 files changed, 54 insertions(+), 64 deletions(-)
 rename module/move/unitore/tests/{frame.rs => basic.rs} (100%)
 rename module/move/unitore/tests/{update_newer_feed.rs => frames_download.rs} (67%)
 delete mode 100644 module/move/unitore/tests/save_feed.rs

diff --git a/module/move/unitore/src/action/mod.rs b/module/move/unitore/src/action/mod.rs
index 80471e3650..5f958526f9 100644
--- a/module/move/unitore/src/action/mod.rs
+++ b/module/move/unitore/src/action/mod.rs
@@ -8,6 +8,8 @@
 // entity - with all entities
 // tool - with something not directly related to the problem, but convenient to have as a separate function/structure
 
+// aaa: added folders
+
 pub mod frame;
 pub mod feed;
 pub mod config;
@@ -15,7 +17,8 @@ pub mod query;
 pub mod table;
 
 // qqq : what is it for? purpose?
-/// General report.
+// aaa : added explanation
+/// General report trait for commands return type.
 pub trait Report : std::fmt::Display + std::fmt::Debug
 {
   /// Print report of executed command.
diff --git a/module/move/unitore/src/entity/config.rs b/module/move/unitore/src/entity/config.rs
index cf3049acbe..b28a90a1dc 100644
--- a/module/move/unitore/src/entity/config.rs
+++ b/module/move/unitore/src/entity/config.rs
@@ -45,9 +45,12 @@ pub trait ConfigStore
 // qqq : use AbsolutePath newtype from `path_tools`
 // qqq : normalize all paths with `path_tools::path::normalize`
 // https://docs.rs/proper_path_tools/latest/proper_path_tools/path/fn.normalize.html
+// added path normalization
 
 // unitore .query.execute \'SELECT \* FROM feed\'
 // qqq : something is broken in this table. also lack of association with config files
+// aaa : added association with config
 
 // unitore .query.execute \'SELECT \* FROM x\'
 // qqq : it is not obvious where one record ends and another begins
+// aaa : added id highlight
diff --git a/module/move/unitore/src/sled_adapter/config.rs b/module/move/unitore/src/sled_adapter/config.rs
index a304bb47a8..0691eb7d7f 100644
--- a/module/move/unitore/src/sled_adapter/config.rs
+++ b/module/move/unitore/src/sled_adapter/config.rs
@@ -1,3 +1,5 @@
+// Config file operation with Sled storage.
+
 use crate::*;
 use error_tools::{ err, Result };
 use gluesql::
diff --git a/module/move/unitore/src/sled_adapter/feed.rs b/module/move/unitore/src/sled_adapter/feed.rs
index fc31f07af9..cabdeddd23 100644
--- a/module/move/unitore/src/sled_adapter/feed.rs
+++ b/module/move/unitore/src/sled_adapter/feed.rs
@@ -1,3 +1,5 @@
+// Feed operation with Sled storage.
+
 use crate::*;
 use std::time::Duration;
 use error_tools::{ Result, for_app::Context };
diff --git a/module/move/unitore/src/sled_adapter/frame.rs b/module/move/unitore/src/sled_adapter/frame.rs
index 7ce1f33641..88f76512f2 100644
--- a/module/move/unitore/src/sled_adapter/frame.rs
+++ b/module/move/unitore/src/sled_adapter/frame.rs
@@ -1,3 +1,5 @@
+// Frames operation with Sled storage.
+
 use crate::*;
 use std::collections::HashMap;
 use error_tools::{ Result, for_app::Context };
diff --git a/module/move/unitore/src/sled_adapter/table.rs b/module/move/unitore/src/sled_adapter/table.rs
index 3aecdd79c9..b19b26a5bd 100644
--- a/module/move/unitore/src/sled_adapter/table.rs
+++ b/module/move/unitore/src/sled_adapter/table.rs
@@ -1,3 +1,5 @@
+// Table and columns info operations from Sled storage.
+
 use crate::*;
 use error_tools::Result;
 use gluesql::
diff --git a/module/move/unitore/tests/frame.rs b/module/move/unitore/tests/basic.rs
similarity index 100%
rename from module/move/unitore/tests/frame.rs
rename to module/move/unitore/tests/basic.rs
diff --git a/module/move/unitore/tests/fixtures/plain_feed.xml b/module/move/unitore/tests/fixtures/plain_feed.xml
index 53c32e9fd1..7048caabd0 100644
--- a/module/move/unitore/tests/fixtures/plain_feed.xml
+++ b/module/move/unitore/tests/fixtures/plain_feed.xml
@@ -69,7 +69,7 @@
 		<category><![CDATA[Hubble Space Telescope]]></category>
 		<category><![CDATA[Jupiter]]></category>
 		<category><![CDATA[Missions]]></category>
-		<category><![CDATA[Planetary Environments & Atmospheres]]></category>
+		<category><![CDATA[Planetary Environments Atmospheres]]></category>
 		<category><![CDATA[Planetary Science]]></category>
 		<category><![CDATA[Planets]]></category>
 		<category><![CDATA[The Solar System]]></category>
@@ -328,7 +328,7 @@
 		
 		<dc:creator><![CDATA[]]></dc:creator>
 		<pubDate>Thu, 14 Mar 2024 13:00:00 +0000</pubDate>
-				<category><![CDATA[Biological & Physical Sciences]]></category>
+				<category><![CDATA[Biological Physical Sciences]]></category>
 		<category><![CDATA[Flight Opportunities Program]]></category>
 		<category><![CDATA[Physical Sciences Program]]></category>
 		<category><![CDATA[Space Biology Program]]></category>
diff --git a/module/move/unitore/tests/update_newer_feed.rs b/module/move/unitore/tests/frames_download.rs
similarity index 67%
rename from module/move/unitore/tests/update_newer_feed.rs
rename to module/move/unitore/tests/frames_download.rs
index 4702acfcf0..e97265210a 100644
--- a/module/move/unitore/tests/update_newer_feed.rs
+++ b/module/move/unitore/tests/frames_download.rs
@@ -8,20 +8,53 @@ use gluesql::
   },
   sled_storage::sled::Config,
 };
+use wca::wtools::Itertools;
 use unitore::
 {
   feed_config::SubscriptionConfig,
   storage::FeedStorage,
-  entity::{ feed::FeedStore, frame::FrameStore },
+  entity::{ frame::FrameStore, feed::FeedStore },
 };
-use wca::wtools::Itertools;
 use error_tools::Result;
 
+#[ tokio::test ]
+async fn test_save() -> Result< () >
+{
+  let config = gluesql::sled_storage::sled::Config::default()
+  .path( "./test_save".to_owned() )
+  .temporary( true )
+  ;
+
+  let mut feed_storage = FeedStorage::init_storage( &config ).await?;
+
+  let feed_config = SubscriptionConfig
+  {
+    update_period : std::time::Duration::from_secs( 1000 ),
+    link : url::Url::parse( "https://www.nasa.gov/feed/" )?,
+  };
+
+  let mut feeds = Vec::new();
+
+  let feed = feed_parser::parse( include_str!("./fixtures/plain_feed.xml").as_bytes() )?;
+  feeds.push( ( feed, feed_config.update_period.clone(), feed_config.link.clone() ) );
+  feed_storage.feeds_process( feeds ).await?;
+
+  let entries = feed_storage.frames_list().await?;
+
+  let number_of_frames = entries.0[ 0 ].selected_frames.selected_rows.len();
+
+  println!("{:#?}", entries);
+
+  assert_eq!( number_of_frames, 10 );
+
+  Ok( () )
+}
+
 #[ tokio::test ]
 async fn test_update() -> Result< () >
 {
   let config = Config::default()
-  .path( "./test".to_owned() )
+  .path( "./test_update".to_owned() )
   .temporary( true )
   ;
 
@@ -77,4 +110,4 @@ async fn test_update() -> Result< () >
   assert!( updated.is_some() );
   let _updated = updated.unwrap();
   Ok( () )
-}
\ No newline at end of file
+}
diff --git a/module/move/unitore/tests/save_feed.rs b/module/move/unitore/tests/save_feed.rs
deleted file mode 100644
index 9749d1e176..0000000000
--- a/module/move/unitore/tests/save_feed.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-use feed_rs::parser as feed_parser;
-use unitore::
-{
-  feed_config::SubscriptionConfig,
-  storage::FeedStorage,
-  entity::{ frame::FrameStore, feed::FeedStore },
-};
-use error_tools::Result;
-
-#[ tokio::test ]
-async fn test_save_feed_plain() -> Result< () >
-{
-  // let mut f_store = MockFeedStore::new();
-  // f_store
-  // .expect_process_feeds()
-  // .times( 1 )
-  // .returning( | _ | Ok( UpdateReport(
-  //   vec! [ FramesReport
-  //   {
-  //     new_frames : 2,
-  //     updated_frames : 0,
-  //     selected_frames : SelectedEntries::new(),
-  //     existing_frames : 0,
-  //     feed_link : String::new(),
-  //     is_new_feed : false,
-  //   } ] ) ) )
-  // ;
-
-  let config = gluesql::sled_storage::sled::Config::default()
-  .path( "./test".to_owned() )
-  .temporary( true )
-  ;
-
-  let mut feed_storage = FeedStorage::init_storage( &config ).await?;
-
-  let feed_config = SubscriptionConfig
-  {
-    update_period : std::time::Duration::from_secs( 1000 ),
-    link : url::Url::parse( "https://www.nasa.gov/feed/" )?,
-  };
-
-  let mut feeds = Vec::new();
-
-  let feed = feed_parser::parse( include_str!("./fixtures/plain_feed.xml").as_bytes() )?;
-  feeds.push( ( feed, feed_config.update_period.clone(), feed_config.link.clone() ) );
-  feed_storage.feeds_process( feeds ).await?;
-
-  let entries = feed_storage.frames_list().await?;
-
-  let number_of_frames = entries.0[ 0 ].selected_frames.selected_rows.len();
-
-  println!("{:#?}", entries);
-
-  assert_eq!( number_of_frames, 10 );
-
-  Ok( () )
-}

From c4e9d99e133cdf2ebc5472b4bef38cd9d8511916 Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Tue, 9 Apr 2024 11:11:44 +0300
Subject: [PATCH 21/49] fixed frames values

---
 module/move/unitore/src/entity/frame.rs | 40 +++++++++++++++++++++----
 module/move/unitore/src/storage.rs      |  8 ++---
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/module/move/unitore/src/entity/frame.rs b/module/move/unitore/src/entity/frame.rs
index 32ba98a4ca..de687ec425 100644
--- a/module/move/unitore/src/entity/frame.rs
+++ b/module/move/unitore/src/entity/frame.rs
@@ -76,17 +76,21 @@ impl From< ( feed_rs::model::Entry, String ) > for Frame
       stored_time : entry.updated,
       authors: ( !authors.is_empty() ).then( || authors ),
       // qqq : why join?
+      // aaa : fixed, saved as list
       content,
       links: ( !links.is_empty() ).then( || links ),
       // qqq : why join?
+      // aaa : fixed, saved as list
       summary : entry.summary.map( | c | c.content ).clone(),
       categories: ( !categories.is_empty() ).then( || categories ),
       // qqq : why join?
+      // aaa : fixed, saved as list
       published : entry.published.clone(),
       source : entry.source.clone(),
       rights : entry.rights.map( | r | r.content ).clone(),
       media: ( !media.is_empty() ).then( || media ),
       // qqq : why join?
+      // aaa : fixed, saved as list
       language : entry.language.clone(),
       feed_link,
     }
@@ -132,27 +136,46 @@ impl From< Frame > for Vec< ExprNode< 'static > >
     ;
 
     let authors = entry.authors
-    .map( | authors | text(authors[0].clone()))
+    .map( | authors |
+      text
+      (
+        format!( "[{}]", authors.into_iter().map( | a | format!( "\"{}\"", a ) ).collect::< Vec< _ > >().join( ", " ) )
+      )
+    )
     .unwrap_or( null() )
     ;
 
     let content = entry.content
-    .map( | content | text ( content ) )
+    .map( | content | text( content ) )
     .unwrap_or( null() )
     ;
 
     let links = entry.links
-    .map( | links | text ( links.join(", ") ) )
+    .map( | links |
+      text
+      (
+        format!( "[{}]", links.into_iter().map( | link | format!( "\"{}\"", link ) ).collect::< Vec< _ > >().join( ", " ) ) 
+      )
+    )
     .unwrap_or( null() )
     ;
 
     let summary = entry.summary
-    .map( | summary | text ( summary ) )
+    .map( | summary | text( summary ) )
     .unwrap_or( null() )
     ;
 
     let categories = entry.categories
-    .map( | categories | text ( categories.join(", ") ) )
+    .map( | categories |
+      text
+      (
+        format!
+        (
+          "[{}]",
+          categories.into_iter().map( | category | format!( "\"{}\"", category ) ).collect::< Vec< _ > >().join( ", " ),
+        ) 
+      )
+    )
     .unwrap_or( null() )
     ;
 
@@ -164,7 +187,12 @@ impl From< Frame > for Vec< ExprNode< 'static > >
     let source = entry.source.map( | s | text( s ) ).unwrap_or( null() );
     let rights = entry.rights.map( | r | text( r ) ).unwrap_or( null() );
     let media = entry.media
-    .map( | media | text( media.join(", ") ) )
+    .map( | media |
+      text
+      (
+        format!( "[{}]", media.into_iter().map( | media | format!( "\"{}\"", media ) ).collect::< Vec< _ > >().join( ", " ) ) 
+      )
+    )
     .unwrap_or( null() )
     ;
 
diff --git a/module/move/unitore/src/storage.rs b/module/move/unitore/src/storage.rs
index 86295eb4f0..98c0fdd72b 100644
--- a/module/move/unitore/src/storage.rs
+++ b/module/move/unitore/src/storage.rs
@@ -73,15 +73,15 @@ impl FeedStorage< SledStorage >
       [ "id", "TEXT", "A unique identifier for this frame in the feed. " ],
       [ "title", "TEXT", "Title of the frame" ],
       [ "stored_time", "TIMESTAMP", "Time at which this item was fetched from source." ],
-      [ "authors", "TEXT", "List of authors of the frame, optional." ],
+      [ "authors", "LIST", "List of authors of the frame, optional." ],
       [ "content", "TEXT", "The content of the frame in html or plain text, optional." ],
-      [ "links", "TEXT", "List of links associated with this item of related Web page and attachments." ],
+      [ "links", "LIST", "List of links associated with this item of related Web page and attachments." ],
       [ "summary", "TEXT", "Short summary, abstract, or excerpt of the frame item, optional." ],
-      [ "categories", "TEXT", "Specifies a list of categories that the item belongs to." ],
+      [ "categories", "LIST", "Specifies a list of categories that the item belongs to." ],
       [ "published", "TIMESTAMP", "Time at which this item was first published or updated." ],
       [ "source", "TEXT", "Specifies the source feed if the frame was copied from one feed into another feed, optional." ],
       [ "rights", "TEXT", "Conveys information about copyrights over the feed, optional." ],
-      [ "media", "TEXT", "List of media oblects, encountered in the frame, optional." ],
+      [ "media", "LIST", "List of media oblects, encountered in the frame, optional." ],
       [ "language", "TEXT", "The language specified on the item, optional." ],
       [ "feed_link", "TEXT", "Link of feed that contains this frame." ],
     ];

From 595d760bef598c1240d2e178de4d4d3ddba455df Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Tue, 9 Apr 2024 11:49:08 +0300
Subject: [PATCH 22/49] fix config path

---
 module/move/unitore/src/action/config.rs      |  8 +++-
 .../tests/{config_add.rs => config.rs}        | 42 ++++++++++++++++---
 2 files changed, 43 insertions(+), 7 deletions(-)
 rename module/move/unitore/tests/{config_add.rs => config.rs} (50%)

diff --git a/module/move/unitore/src/action/config.rs b/module/move/unitore/src/action/config.rs
index e9d65d176c..4c190fa45c 100644
--- a/module/move/unitore/src/action/config.rs
+++ b/module/move/unitore/src/action/config.rs
@@ -43,9 +43,13 @@ pub async fn config_add( storage : FeedStorage< SledStorage >, args : &wca::Args
   if !path.exists()
   {
     return Err( error_tools::for_app::Error::msg( err_str ) );
-  }  
+  }
 
-  let config = Config::new( path.to_string_lossy().to_string() );
+  //let abs_path = proper_path_tools::path::canonicalize( path )?;
+  let abs_path = path.canonicalize()?;
+  println!("{}", abs_path.to_string_lossy().to_string() );
+
+  let config = Config::new( abs_path.to_string_lossy().to_string() );
   let mut manager = FeedManager::new( storage );
 
   let config_report = manager.storage
diff --git a/module/move/unitore/tests/config_add.rs b/module/move/unitore/tests/config.rs
similarity index 50%
rename from module/move/unitore/tests/config_add.rs
rename to module/move/unitore/tests/config.rs
index c938eb5d99..a30448611b 100644
--- a/module/move/unitore/tests/config_add.rs
+++ b/module/move/unitore/tests/config.rs
@@ -1,23 +1,26 @@
 use std::path::PathBuf;
 
-use gluesql::sled_storage::sled::Config;
+use gluesql::{
+  sled_storage::sled::Config,
+  test_suite::data_type::list,
+  prelude::Payload::Select,
+};
 use unitore::
 {
   executor::FeedManager,
   storage::FeedStorage,
-  entity::feed::FeedStore,
+  entity::{ feed::FeedStore, config::ConfigStore },
   action::config,
 };
 use error_tools::Result;
 
 #[ tokio::test ]
-async fn add_config_file() -> Result< () >
+async fn config_add() -> Result< () >
 {
   let path = PathBuf::from( "./tests/fixtures/test_config.toml" );
-  let path = path.canonicalize().expect( "Invalid path" );
 
   let config = Config::default()
-  .path( "./test".to_owned() )
+  .path( "./test_add".to_owned() )
   .temporary( true )
   ;
 
@@ -39,3 +42,32 @@ async fn add_config_file() -> Result< () >
 
   Ok( () )
 }
+
+#[ tokio::test ]
+async fn config_delete() -> Result< () >
+{
+  let path = PathBuf::from( "./tests/fixtures/test_config.toml" );
+
+  let config = Config::default()
+  .path( "./test_del".to_owned() )
+  .temporary( true )
+  ;
+
+  let mut feed_storage = FeedStorage::init_storage( &config ).await?;
+  config::config_add( feed_storage.clone(), &wca::Args( vec![ wca::Value::Path( path.clone() ) ] ) ).await?;
+
+  config::config_delete( feed_storage.clone(), &wca::Args( vec![ wca::Value::Path( path ) ] ) ).await?;
+
+  let list = feed_storage.config_list().await?;
+
+  if let Select{ labels, rows } = list
+  {
+    assert!( rows.len() == 0 )
+  }
+  else
+  {
+    assert!( false );
+  }
+
+  Ok( () )
+}

From 695992bbf7377cb8315a18ae9480798b70ce2272 Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Tue, 9 Apr 2024 12:16:39 +0300
Subject: [PATCH 23/49] fix

---
 module/move/unitore/src/sled_adapter/frame.rs | 59 -------------------
 1 file changed, 59 deletions(-)

diff --git a/module/move/unitore/src/sled_adapter/frame.rs b/module/move/unitore/src/sled_adapter/frame.rs
index 88f76512f2..325f7f1563 100644
--- a/module/move/unitore/src/sled_adapter/frame.rs
+++ b/module/move/unitore/src/sled_adapter/frame.rs
@@ -71,64 +71,6 @@ impl FrameStore for FeedStorage< SledStorage >
   {
     let entries_rows : Vec< Vec< ExprNode< 'static > > > = frames.into_iter().map( | entry | entry.into() ).collect_vec();
 
-    // let glue = &mut *self.storage.lock().await;
-
-  //     /// Frame id.
-  // pub id : String,
-  // /// Frame title.
-  // pub title : Option< String >,
-  // stored_time : Option< DateTime< Utc > >,
-  // authors : Option< Vec< String > >,
-  // content : Option< String >,
-  // links : Option< Vec< String > >,
-  // summary : Option< String >,
-  // categories : Option< Vec< String > >,
-  // published : Option< DateTime< Utc > >,
-  // source : Option< String >,
-  // rights : Option< String >,
-  // media : Option< Vec< String > >,
-  // language : Option< String >,
-  // feed_link : String,
-
-  // use gluesql::core::ast_builder::text;
-  //   let mut values_str = String::new();
-  //   let null = "NULL".to_string();
-  //   let values_str = frames.into_iter().map(|frame| format!(
-  //     "('{}', {}, '{}', {}, {}, {}, '{}', {}, '{}')", 
-  //     frame.id, 
-  //     frame.title.map(|t|format!("'{}'", t)).unwrap_or( "Null".to_string() ), 
-  //     frame.stored_time.map(|d|d.to_string()).unwrap_or("Null".to_string()),
-  //     frame.authors.map(|authors| {let authors = authors.into_iter().map(|a|format!("'[\"{}\"]'", a)).collect::<Vec<_>>(); authors.join(", ")}).unwrap_or("'[]'".to_string()),
-  //     null.clone(),
-  //     frame.links.map(|links| {let links = links.into_iter().map(|a|format!("\"{}\"", a)).collect::<Vec<_>>(); format!("'[{}]'", &links.join(", "))}).unwrap_or("'[]'".to_string()),
-  //     frame.summary.unwrap_or(null.clone()),
-  //     frame.categories.map(|categories| {let categories = categories.into_iter().map(|a|format!("{}", a)).collect::<Vec<_>>(); dbg!(format!("'[\"{}\"]'", &categories.join(", ")))}).unwrap_or(null.clone()),
-  //     frame.published.map(|d|d.to_string()).unwrap_or(null.clone()),
-      // frame.source.unwrap_or(null.clone()),
-      // frame.rights.unwrap_or(null.clone()),
-      // // frame.media.map(|media| {let media = media.into_iter().map(|a|format!("\"{}\"", a)).collect::<Vec<_>>(); media.join(", ")}).unwrap_or(null.clone()),
-      // frame.language.unwrap_or(null.clone()),
-      // frame.feed_link,
-    // )
-    // )
-    //   .collect::<Vec<_>>();
-
-    // for frame in frames
-    // {
-    //   let frame_str = format!(
-    //     "({}, {}, {})", 
-    //     frame.id, frame.title.unwrap_or( "NULL".to_string() ), frame.stored_time.map(|d|d.to_string()).unwrap_or("NULL".to_string()));
-    //   values_str.push_str(&format!("({}),", frame_str ));
-    // }
-    // let query_str = format!( "INSERT INTO frame(id, title, stored_time, authors, content, links, summary, categories, published) VALUES {};", values_str.join(", ") );
-    //println!("{}", query_str);
-    // let mut payloads = glue.execute( &query_str ).await?;
-
-    // INSERT INTO ListType VALUES
-    // (1, '[1, 2, 3]'),
-    // (2, '["hello", "world", 30, true, [9,8]]'),
-    // (3, '[{ "foo": 100, "bar": [true, 0, [10.5, false] ] }, 10, 20]');
-
     let insert = table( "frame" )
     .insert()
     .columns
@@ -146,7 +88,6 @@ impl FrameStore for FeedStorage< SledStorage >
 
   async fn frames_update( &mut self, feed : Vec< Frame > ) -> Result< () >
   {
-    //let entries_rows : Vec< Vec< ExprNode< 'static > > > = Vec::new();
     let entries_rows : Vec< Vec< ExprNode< 'static > > > = feed.into_iter().map( | entry | entry.into() ).collect_vec();
 
     for entry in entries_rows

From a1385de133ca9aae10c9bfdfdf8cc287ee083546 Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Tue, 9 Apr 2024 13:52:00 +0300
Subject: [PATCH 24/49] add documentation

---
 module/move/unitore/src/action/config.rs      | 20 +++----
 module/move/unitore/src/action/feed.rs        |  6 +--
 module/move/unitore/src/action/frame.rs       | 14 ++---
 module/move/unitore/src/action/query.rs       |  7 ++-
 module/move/unitore/src/action/table.rs       | 14 +++--
 module/move/unitore/src/command/config.rs     |  8 ++-
 module/move/unitore/src/command/feed.rs       |  3 ++
 module/move/unitore/src/command/frame.rs      |  5 +-
 module/move/unitore/src/command/mod.rs        |  2 +
 module/move/unitore/src/command/query.rs      |  5 +-
 module/move/unitore/src/command/table.rs      |  9 +++-
 module/move/unitore/src/entity/frame.rs       | 12 +++++
 module/move/unitore/src/executor.rs           | 53 +------------------
 module/move/unitore/src/feed_config.rs        | 10 +++-
 module/move/unitore/src/lib.rs                |  1 +
 module/move/unitore/src/retriever.rs          |  9 ++++
 .../move/unitore/src/sled_adapter/config.rs   |  2 +-
 module/move/unitore/src/sled_adapter/feed.rs  |  2 +-
 module/move/unitore/src/sled_adapter/frame.rs |  2 +-
 module/move/unitore/src/sled_adapter/mod.rs   |  2 +
 module/move/unitore/src/sled_adapter/table.rs |  2 +-
 module/move/unitore/src/storage.rs            |  1 +
 module/move/unitore/src/tool/mod.rs           |  2 +
 module/move/unitore/tests/basic.rs            |  4 --
 module/move/unitore/tests/config.rs           | 13 ++---
 module/move/unitore/tests/frames_download.rs  | 13 +++--
 26 files changed, 105 insertions(+), 116 deletions(-)

diff --git a/module/move/unitore/src/action/config.rs b/module/move/unitore/src/action/config.rs
index 4c190fa45c..951aabc2a9 100644
--- a/module/move/unitore/src/action/config.rs
+++ b/module/move/unitore/src/action/config.rs
@@ -2,7 +2,6 @@
 
 use crate::*;
 use error_tools::{ err, for_app::Context, BasicError, Result };
-use executor::FeedManager;
 use storage::FeedStorage;
 use entity::
 {
@@ -13,7 +12,7 @@ use action::Report;
 use gluesql::{ prelude::Payload, sled_storage::SledStorage };
 
 /// Add configuration file with subscriptions to storage.
-pub async fn config_add( storage : FeedStorage< SledStorage >, args : &wca::Args ) -> Result< impl Report >
+pub async fn config_add( mut storage : FeedStorage< SledStorage >, args : &wca::Args ) -> Result< impl Report >
 {
   let path : std::path::PathBuf = args
   .get_owned::< wca::Value >( 0 )
@@ -47,12 +46,9 @@ pub async fn config_add( storage : FeedStorage< SledStorage >, args : &wca::Args
 
   //let abs_path = proper_path_tools::path::canonicalize( path )?;
   let abs_path = path.canonicalize()?;
-  println!("{}", abs_path.to_string_lossy().to_string() );
-
   let config = Config::new( abs_path.to_string_lossy().to_string() );
-  let mut manager = FeedManager::new( storage );
 
-  let config_report = manager.storage
+  let config_report = storage
   .config_add( &config )
   .await
   .context( "Added 0 config files.\n Failed to add config file to storage." )?
@@ -64,13 +60,13 @@ pub async fn config_add( storage : FeedStorage< SledStorage >, args : &wca::Args
   .collect::< Vec< _ > >()
   ;
 
-  let new_feeds = manager.storage.feeds_save( feeds ).await?;
+  let new_feeds = storage.feeds_save( feeds ).await?;
 
   Ok( ConfigReport{ payload : config_report, new_feeds : Some( new_feeds ) } )
 }
 
 /// Remove configuration file from storage.
-pub async fn config_delete( storage : FeedStorage< SledStorage >, args : &wca::Args ) -> Result< impl Report >
+pub async fn config_delete( mut storage : FeedStorage< SledStorage >, args : &wca::Args ) -> Result< impl Report >
 {
   let path : std::path::PathBuf = args
   .get_owned::< wca::Value >( 0 )
@@ -81,9 +77,8 @@ pub async fn config_delete( storage : FeedStorage< SledStorage >, args : &wca::A
   let path = path.canonicalize().context( format!( "Invalid path for config file {:?}", path ) )?;
   let config = Config::new( path.to_string_lossy().to_string() );
 
-  let mut manager = FeedManager::new( storage );
   Ok( ConfigReport::new(
-    manager.storage
+    storage
     .config_delete( &config )
     .await
     .context( "Failed to remove config from storage." )?
@@ -91,10 +86,9 @@ pub async fn config_delete( storage : FeedStorage< SledStorage >, args : &wca::A
 }
 
 /// List all files with subscriptions that are currently in storage.
-pub async fn config_list( storage : FeedStorage< SledStorage >, _args : &wca::Args ) -> Result< impl Report >
+pub async fn config_list( mut storage : FeedStorage< SledStorage >, _args : &wca::Args ) -> Result< impl Report >
 {
-  let mut manager = FeedManager::new( storage );
-  Ok( ConfigReport::new( manager.storage.config_list().await? ) )
+  Ok( ConfigReport::new( storage.config_list().await? ) )
 }
 
 /// Information about result of command for subscription config.
diff --git a/module/move/unitore/src/action/feed.rs b/module/move/unitore/src/action/feed.rs
index 6b253ef0a2..ae5aa2152d 100644
--- a/module/move/unitore/src/action/feed.rs
+++ b/module/move/unitore/src/action/feed.rs
@@ -1,7 +1,6 @@
 //! Endpoints and report for feed commands.
 
 use crate::*;
-use executor::FeedManager;
 use action::{ Report, frame::SelectedEntries };
 use storage::FeedStorage;
 use entity::feed::FeedStore;
@@ -10,12 +9,11 @@ use error_tools::Result;
 /// List all feeds from storage.
 pub async fn feeds_list
 (
-  storage : FeedStorage< gluesql::sled_storage::SledStorage >,
+  mut storage : FeedStorage< gluesql::sled_storage::SledStorage >,
   _args : &wca::Args,
 ) -> Result< impl Report >
 {
-  let mut manager = FeedManager::new( storage );
-  manager.storage.feeds_list().await
+  storage.feeds_list().await
 }
 
 const EMPTY_CELL : &'static str = "";
diff --git a/module/move/unitore/src/action/frame.rs b/module/move/unitore/src/action/frame.rs
index 88a445fed7..7e2825ddd5 100644
--- a/module/move/unitore/src/action/frame.rs
+++ b/module/move/unitore/src/action/frame.rs
@@ -1,7 +1,6 @@
 //! Frames commands actions.
 
 use crate::*;
-use executor::FeedManager;
 use storage::FeedStorage;
 use entity::
 {
@@ -19,24 +18,21 @@ use action::Report;
 /// List all frames.
 pub async fn frames_list
 (
-  storage : FeedStorage< SledStorage >,
+  mut storage : FeedStorage< SledStorage >,
   _args : &wca::Args,
 ) -> Result< impl Report >
 {
-    let mut manager = FeedManager::new( storage );
-    manager.storage.frames_list().await
+  storage.frames_list().await
 }
 
 /// Update all frames from config files saved in storage.
 pub async fn frames_download
 (
-  storage : FeedStorage< SledStorage >,
+  mut storage : FeedStorage< SledStorage >,
   _args : &wca::Args,
 ) -> Result< impl Report >
 {
-  let mut manager = FeedManager::new( storage );
-  let payload = manager.storage.config_list().await?;
-
+  let payload = storage.config_list().await?;
   let configs = match &payload
   {
     Payload::Select { labels: _, rows: rows_vec } =>
@@ -76,7 +72,7 @@ pub async fn frames_download
     let feed = client.fetch( subscription.link.clone() ).await?;
     feeds.push( ( feed, subscription.update_period.clone(), subscription.link ) );
   }
-  manager.storage.feeds_process( feeds ).await
+  storage.feeds_process( feeds ).await
 
 }
 
diff --git a/module/move/unitore/src/action/query.rs b/module/move/unitore/src/action/query.rs
index fb004825cb..521a1d8cf6 100644
--- a/module/move/unitore/src/action/query.rs
+++ b/module/move/unitore/src/action/query.rs
@@ -5,14 +5,13 @@
 use crate::*;
 use gluesql::core::executor::Payload;
 use storage::{ FeedStorage, Store };
-use executor::FeedManager;
 use action::Report;
 use error_tools::{ err, BasicError, Result };
 
 /// Execute query specified in query string.
 pub async fn query_execute
 (
-  storage : FeedStorage< gluesql::sled_storage::SledStorage >,
+  mut storage : FeedStorage< gluesql::sled_storage::SledStorage >,
   args : &wca::Args,
 ) -> Result< impl Report >
 {
@@ -22,8 +21,7 @@ pub async fn query_execute
   .join( " " )
   ;
 
-  let mut manager = FeedManager::new( storage );
-  manager.storage.execute_query( query ).await
+  storage.execute_query( query ).await
 }
 
 const EMPTY_CELL : &'static str = "";
@@ -92,3 +90,4 @@ impl Report for QueryReport {}
 
 // qqq : good tests for query action
 // all tables should be touched by these tests
+// aaa : added in https://github.com/Wandalen/wTools/pull/1284
diff --git a/module/move/unitore/src/action/table.rs b/module/move/unitore/src/action/table.rs
index 11a34c21f4..643ff1119b 100644
--- a/module/move/unitore/src/action/table.rs
+++ b/module/move/unitore/src/action/table.rs
@@ -4,7 +4,6 @@ use crate::*;
 use gluesql::prelude::Payload;
 use std::collections::HashMap;
 use action::Report;
-use executor::FeedManager;
 use storage::FeedStorage;
 use entity::table::TableStore;
 use error_tools::Result;
@@ -12,13 +11,13 @@ use error_tools::Result;
 /// Get labels of column for specified table.
 pub async fn table_list
 (
-  storage : FeedStorage< gluesql::sled_storage::SledStorage >,
+  mut storage : FeedStorage< gluesql::sled_storage::SledStorage >,
   args : &wca::Args,
 ) -> Result< impl Report >
 {
   let table_name = args.get_owned::< String >( 0 );
 
-  let mut manager = FeedManager::new( storage );
+  // let mut manager = FeedManager::new( storage );
   let mut table_names = Vec::new();
   if let Some( name ) = table_name
   {
@@ -26,7 +25,7 @@ pub async fn table_list
   }
   else
   {
-    let tables = manager.storage.tables_list().await?;
+    let tables = storage.tables_list().await?;
 
     let names = tables.tables.keys().map( | k | k.clone() ).collect::< Vec< _ > >();
     table_names.extend( names.into_iter() );
@@ -35,7 +34,7 @@ pub async fn table_list
   let mut reports = Vec::new();
   for table_name in table_names
   {
-    let result = manager.storage.table_list( table_name.clone() ).await?;
+    let result = storage.table_list( table_name.clone() ).await?;
 
     let mut table_description = String::new();
     let mut columns = HashMap::new();
@@ -235,12 +234,11 @@ pub async fn table_list
 /// Get information about tables in storage.
 pub async fn tables_list
 (
-  storage : FeedStorage< gluesql::sled_storage::SledStorage >,
+  mut storage : FeedStorage< gluesql::sled_storage::SledStorage >,
   _args : &wca::Args,
 ) -> Result< impl Report >
 {
-  let mut manager = FeedManager::new( storage );
-  manager.storage.tables_list().await
+  storage.tables_list().await
 }
 
 const EMPTY_CELL : &'static str = "";
diff --git a/module/move/unitore/src/command/config.rs b/module/move/unitore/src/command/config.rs
index 3fef800b22..2a09ed0423 100644
--- a/module/move/unitore/src/command/config.rs
+++ b/module/move/unitore/src/command/config.rs
@@ -1,4 +1,4 @@
-//! Feed command.
+//! Config files commands.
 
 use crate::*;
 use gluesql::sled_storage::sled::Config;
@@ -7,13 +7,15 @@ use storage::FeedStorage;
 use action::{ Report, config::{ config_add, config_delete, config_list } };
 use error_tools::Result;
 
+/// Struct that provides commands for config files.
+#[ derive( Debug ) ]
 pub struct ConfigCommand;
 
 impl ConfigCommand
 {
+  /// Create command for adding config.
   pub fn add() -> Result< Command >
   {
-
     let rt  = tokio::runtime::Runtime::new()?;
   
     Ok
@@ -59,6 +61,7 @@ impl ConfigCommand
     )
   }
 
+  /// Create command for deleting config.
   pub fn delete() -> Result< Command >
   {
     let rt  = tokio::runtime::Runtime::new()?;
@@ -98,6 +101,7 @@ impl ConfigCommand
     )
   }
 
+  /// Create command for listing all config files in storage.
   pub fn list() -> Result< Command >
   {
     let rt  = tokio::runtime::Runtime::new()?;
diff --git a/module/move/unitore/src/command/feed.rs b/module/move/unitore/src/command/feed.rs
index c713e8b559..3fc620da3b 100644
--- a/module/move/unitore/src/command/feed.rs
+++ b/module/move/unitore/src/command/feed.rs
@@ -7,10 +7,13 @@ use storage::FeedStorage;
 use action::{ Report, feed::feeds_list };
 use error_tools::Result;
 
+/// Struct that provides commands for feed.
+#[ derive( Debug ) ]
 pub struct FeedCommand;
 
 impl FeedCommand
 {
+  /// Create command that lists all feeds in storage.
   pub fn list() -> Result< Command >
   {
 
diff --git a/module/move/unitore/src/command/frame.rs b/module/move/unitore/src/command/frame.rs
index 75416b1d71..6ed103be34 100644
--- a/module/move/unitore/src/command/frame.rs
+++ b/module/move/unitore/src/command/frame.rs
@@ -7,10 +7,13 @@ use storage::FeedStorage;
 use action::{ Report, frame::{ frames_list, frames_download } };
 use error_tools::Result;
 
+/// Struct that provides commands for frames.
+#[ derive( Debug ) ]
 pub struct FrameCommand;
 
 impl FrameCommand
 {
+  /// Create command that lists all frames in storage.
   pub fn list() -> Result< Command >
   {
     let rt  = tokio::runtime::Runtime::new()?;
@@ -50,9 +53,9 @@ impl FrameCommand
     )
   }
 
+  /// Creates command that downloads frames from feeds specified in config files.
   pub fn download() -> Result< Command >
   {
-
     let rt  = tokio::runtime::Runtime::new()?;
 
     Ok(
diff --git a/module/move/unitore/src/command/mod.rs b/module/move/unitore/src/command/mod.rs
index ea0a44e8a3..5548eb2f17 100644
--- a/module/move/unitore/src/command/mod.rs
+++ b/module/move/unitore/src/command/mod.rs
@@ -1,3 +1,5 @@
+//! Commands for unitore executor.
+
 pub mod table;
 pub mod frame;
 pub mod feed;
diff --git a/module/move/unitore/src/command/query.rs b/module/move/unitore/src/command/query.rs
index 21931d05af..e2c4d08d3e 100644
--- a/module/move/unitore/src/command/query.rs
+++ b/module/move/unitore/src/command/query.rs
@@ -7,11 +7,14 @@ use storage::FeedStorage;
 use action::{ Report, query::query_execute };
 use error_tools::Result;
 
+/// Struct that provides commands for queries.
+#[ derive( Debug ) ]
 pub struct QueryCommand;
 
 impl QueryCommand
 {
-  pub fn list() -> Result< Command >
+  /// Creates command for custom query execution.
+  pub fn execute() -> Result< Command >
   {
     let rt  = tokio::runtime::Runtime::new()?;
   
diff --git a/module/move/unitore/src/command/table.rs b/module/move/unitore/src/command/table.rs
index f40387b4e0..e250af57fa 100644
--- a/module/move/unitore/src/command/table.rs
+++ b/module/move/unitore/src/command/table.rs
@@ -1,4 +1,4 @@
-//! 
+//! Table and columns commands.
 
 use crate::*;
 use gluesql::sled_storage::sled::Config;
@@ -7,13 +7,15 @@ use storage::FeedStorage;
 use action::{ Report, table::{ table_list, tables_list } };
 use error_tools::Result;
 
+/// Struct that provides commands for table information.
+#[ derive( Debug ) ]
 pub struct TableCommand;
 
 impl TableCommand
 {
+  /// Creates command to list info about tables in storage.
   pub fn list() -> Result< Command >
   {
-
     let rt  = tokio::runtime::Runtime::new()?;
   
     Ok
@@ -52,10 +54,13 @@ impl TableCommand
   }
 }
 
+/// Struct that provides commands for table columns information.
+#[ derive( Debug ) ]
 pub struct TablesCommand;
 
 impl TablesCommand
 {
+  /// Creates command to list info about table columns in storage.
   pub fn list() -> Result< Command >
   {
 
diff --git a/module/move/unitore/src/entity/frame.rs b/module/move/unitore/src/entity/frame.rs
index de687ec425..8fb522ad58 100644
--- a/module/move/unitore/src/entity/frame.rs
+++ b/module/move/unitore/src/entity/frame.rs
@@ -16,17 +16,29 @@ pub struct Frame
   pub id : String,
   /// Frame title.
   pub title : Option< String >,
+  /// Time at which this item was fetched from source.
   pub stored_time : Option< DateTime< Utc > >,
+  /// List of authors of the frame.
   pub authors : Option< Vec< String > >,
+  /// The content of the frame in html or plain text.
   pub content : Option< String >,
+  /// List of links associated with this item of related Web page and attachments.
   pub links : Option< Vec< String > >,
+  /// Short summary, abstract, or excerpt of the frame item.
   pub summary : Option< String >,
+  /// A list of categories that the item belongs to.
   pub categories : Option< Vec< String > >,
+  /// Time at which this item was first published or updated.
   pub published : Option< DateTime< Utc > >,
+  /// Specifies the source feed if the frame was copied from one feed into another feed.
   pub source : Option< String >,
+  /// Information about copyrights over the feed.
   pub rights : Option< String >,
+  /// List of media oblects, encountered in the frame.
   pub media : Option< Vec< String > >,
+  /// The language of the frame.
   pub language : Option< String >,
+  /// Link to feed that contains this frame.
   pub feed_link : String,
 }
 
diff --git a/module/move/unitore/src/executor.rs b/module/move/unitore/src/executor.rs
index 94cf1093eb..8010dbd9cc 100644
--- a/module/move/unitore/src/executor.rs
+++ b/module/move/unitore/src/executor.rs
@@ -1,14 +1,9 @@
 //! Execute plan.
 
 use crate::*;
-use feed_config::SubscriptionConfig;
-use storage::Store;
-use entity::{ feed::FeedStore, config::ConfigStore, table::TableStore, frame::FrameStore };
 use wca::{ Dictionary, Executor, Parser, Verifier };
 use error_tools::Result;
 
-use action::Report;
-
 /// Run feed updates.
 pub fn execute() -> Result< (), Box< dyn std::error::Error + Send + Sync > >
 {
@@ -51,7 +46,7 @@ pub fn execute() -> Result< (), Box< dyn std::error::Error + Send + Sync > >
   )
   .command
   (
-    command::query::QueryCommand::list()?
+    command::query::QueryCommand::execute()?
   )
   .form();
   let verifier = Verifier;
@@ -67,49 +62,3 @@ pub fn execute() -> Result< (), Box< dyn std::error::Error + Send + Sync > >
 
   Ok( () )
 }
-
-/// Manages feed subsriptions and updates.
-pub struct FeedManager< S : FeedStore + ConfigStore + FrameStore + Store + Send >
-{
-  /// Subscription configuration with link and update period.
-  pub config : Vec< SubscriptionConfig >,
-  /// Storage for saving feed.
-  pub storage : S,
-}
-
-impl< S : FeedStore + ConfigStore + FrameStore + Store + Send > std::fmt::Debug for FeedManager< S >
-{
-  fn fmt( &self, f: &mut std::fmt::Formatter<'_> ) -> std::fmt::Result
-  {
-    writeln!(f, "Feed manager with storage and client" )
-  }
-}
-
-impl< S : FeedStore + ConfigStore + FrameStore + TableStore + Store + Send > FeedManager< S >
-{
-  /// Create new instance of FeedManager.
-  pub fn new( storage : S ) -> FeedManager< S >
-  {
-    Self
-    {
-      storage,
-      config : Vec::new(),
-    }
-  }
-}
-
-impl< S : FeedStore + ConfigStore + FrameStore + TableStore + Store + Send > FeedManager< S >
-{
-  /// Set configurations for subscriptions.
-  pub fn set_config( &mut self, configs : Vec< SubscriptionConfig > )
-  {
-    self.config = configs;
-  }
-
-  /// Execute custom query, print result.
-  pub async fn execute_custom_query( &mut self, query : String ) -> Result< impl Report >
-  {
-    self.storage.execute_query( query ).await
-  }
-
-}
diff --git a/module/move/unitore/src/feed_config.rs b/module/move/unitore/src/feed_config.rs
index 71d852731f..88b5f8a791 100644
--- a/module/move/unitore/src/feed_config.rs
+++ b/module/move/unitore/src/feed_config.rs
@@ -23,7 +23,15 @@ pub struct Subscriptions
   pub config : Vec< SubscriptionConfig >
 }
 
-/// Reads provided configuration file with list of subscriptions.
+/// Get list of feed subscriptions from provided configuration file.
+///
+/// # Arguments
+///
+/// * `file_path` - Path to the configuration file.
+///
+/// # Returns
+///
+/// Result with list of feed subscriptions serialized as SubscriptionConfig.
 pub fn read( file_path : String ) -> Result< Vec< SubscriptionConfig > >
 {
   let read_file = OpenOptions::new()
diff --git a/module/move/unitore/src/lib.rs b/module/move/unitore/src/lib.rs
index a6b66a5716..88f8adc251 100644
--- a/module/move/unitore/src/lib.rs
+++ b/module/move/unitore/src/lib.rs
@@ -10,3 +10,4 @@ pub mod entity;
 pub mod sled_adapter;
 
 // qqq : src/Readmу.md with file structure please
+// aaa : added Readme.md
diff --git a/module/move/unitore/src/retriever.rs b/module/move/unitore/src/retriever.rs
index 79eea6b407..ac4e94be11 100644
--- a/module/move/unitore/src/retriever.rs
+++ b/module/move/unitore/src/retriever.rs
@@ -20,6 +20,15 @@ pub struct FeedClient;
 
 impl FeedClient
 {
+  /// Fetch feed frames from provided url source.
+  ///
+  /// # Arguments
+  ///
+  /// * `source` - The link to feed source.
+  ///
+  /// # Returns
+  ///
+  /// Result with fetched feed as feed_rs Feed struct.
   pub async fn fetch( &self, source : url::Url ) -> Result< feed_rs::model::Feed >
   {
     let https = HttpsConnector::new();
diff --git a/module/move/unitore/src/sled_adapter/config.rs b/module/move/unitore/src/sled_adapter/config.rs
index 0691eb7d7f..60f16a26a4 100644
--- a/module/move/unitore/src/sled_adapter/config.rs
+++ b/module/move/unitore/src/sled_adapter/config.rs
@@ -1,4 +1,4 @@
-// Config file operation with Sled storage.
+//! Config file operation with Sled storage.
 
 use crate::*;
 use error_tools::{ err, Result };
diff --git a/module/move/unitore/src/sled_adapter/feed.rs b/module/move/unitore/src/sled_adapter/feed.rs
index cabdeddd23..cfa73fdb42 100644
--- a/module/move/unitore/src/sled_adapter/feed.rs
+++ b/module/move/unitore/src/sled_adapter/feed.rs
@@ -1,4 +1,4 @@
-// Feed operation with Sled storage.
+//! Feed operation with Sled storage.
 
 use crate::*;
 use std::time::Duration;
diff --git a/module/move/unitore/src/sled_adapter/frame.rs b/module/move/unitore/src/sled_adapter/frame.rs
index 325f7f1563..5fe7dd1dbd 100644
--- a/module/move/unitore/src/sled_adapter/frame.rs
+++ b/module/move/unitore/src/sled_adapter/frame.rs
@@ -1,4 +1,4 @@
-// Frames operation with Sled storage.
+//! Frames operation with Sled storage.
 
 use crate::*;
 use std::collections::HashMap;
diff --git a/module/move/unitore/src/sled_adapter/mod.rs b/module/move/unitore/src/sled_adapter/mod.rs
index ea5e050ec3..b17aa61c78 100644
--- a/module/move/unitore/src/sled_adapter/mod.rs
+++ b/module/move/unitore/src/sled_adapter/mod.rs
@@ -1,3 +1,5 @@
+//! Operations for using entities with Sled storage.
+
 mod frame;
 mod table;
 mod feed;
diff --git a/module/move/unitore/src/sled_adapter/table.rs b/module/move/unitore/src/sled_adapter/table.rs
index b19b26a5bd..1c32dda965 100644
--- a/module/move/unitore/src/sled_adapter/table.rs
+++ b/module/move/unitore/src/sled_adapter/table.rs
@@ -1,4 +1,4 @@
-// Table and columns info operations from Sled storage.
+//! Table and columns info operations from Sled storage.
 
 use crate::*;
 use error_tools::Result;
diff --git a/module/move/unitore/src/storage.rs b/module/move/unitore/src/storage.rs
index 98c0fdd72b..02d49d0364 100644
--- a/module/move/unitore/src/storage.rs
+++ b/module/move/unitore/src/storage.rs
@@ -22,6 +22,7 @@ pub struct FeedStorage< S : GStore + GStoreMut + Send >
 {
   /// GlueSQL storage.
   pub storage : Arc< Mutex< Glue< S > > >,
+  /// Frame table fields with description.
   pub frame_fields : Vec< [ &'static str; 3 ] >,
 }
 
diff --git a/module/move/unitore/src/tool/mod.rs b/module/move/unitore/src/tool/mod.rs
index 200a9b43be..749ba59a0e 100644
--- a/module/move/unitore/src/tool/mod.rs
+++ b/module/move/unitore/src/tool/mod.rs
@@ -1 +1,3 @@
+//! Tools for additional functionality.
+
 pub mod table_display;
\ No newline at end of file
diff --git a/module/move/unitore/tests/basic.rs b/module/move/unitore/tests/basic.rs
index a5d7b510e1..6e5df1ad4d 100644
--- a/module/move/unitore/tests/basic.rs
+++ b/module/move/unitore/tests/basic.rs
@@ -5,13 +5,9 @@ use error_tools::Result;
 async fn frame() -> Result< () >
 {
   let feed = feed_parser::parse( include_str!( "./fixtures/plain_feed.xml" ).as_bytes() )?;
-
   let frame = unitore::entity::frame::Frame::from( ( feed.entries[ 0 ].clone(), String::new() ) );
 
-
   assert!( frame.id == feed.entries[ 0 ].id );
-  println!( "{:#?}", feed.entries[ 0 ].media );
-  println!( "{:#?}", frame );
 
   Ok( () )
 }
diff --git a/module/move/unitore/tests/config.rs b/module/move/unitore/tests/config.rs
index a30448611b..060078ac4e 100644
--- a/module/move/unitore/tests/config.rs
+++ b/module/move/unitore/tests/config.rs
@@ -1,13 +1,11 @@
 use std::path::PathBuf;
-
-use gluesql::{
+use gluesql::
+{
   sled_storage::sled::Config,
-  test_suite::data_type::list,
   prelude::Payload::Select,
 };
 use unitore::
 {
-  executor::FeedManager,
   storage::FeedStorage,
   entity::{ feed::FeedStore, config::ConfigStore },
   action::config,
@@ -24,11 +22,10 @@ async fn config_add() -> Result< () >
   .temporary( true )
   ;
 
-  let feed_storage = FeedStorage::init_storage( &config ).await?;
+  let mut feed_storage = FeedStorage::init_storage( &config ).await?;
   config::config_add( feed_storage.clone(), &wca::Args( vec![ wca::Value::Path( path ) ] ) ).await?;
 
-  let mut manager = FeedManager::new( feed_storage );
-  let res = manager.storage.feeds_list().await?;
+  let res = feed_storage.feeds_list().await?;
 
   let feeds_links = res.0.selected_rows
   .iter()
@@ -60,7 +57,7 @@ async fn config_delete() -> Result< () >
 
   let list = feed_storage.config_list().await?;
 
-  if let Select{ labels, rows } = list
+  if let Select{ labels : _, rows } = list
   {
     assert!( rows.len() == 0 )
   }
diff --git a/module/move/unitore/tests/frames_download.rs b/module/move/unitore/tests/frames_download.rs
index e97265210a..9922a8c3f5 100644
--- a/module/move/unitore/tests/frames_download.rs
+++ b/module/move/unitore/tests/frames_download.rs
@@ -80,7 +80,12 @@ async fn test_update() -> Result< () >
   // check
   let payload = feed_storage.frames_list().await?;
 
-  let entries = payload.0.iter().map( | val | val.selected_frames.selected_rows.clone() ).flatten().collect::< Vec< _ > >();
+  let entries = payload.0
+  .iter()
+  .map( | val | val.selected_frames.selected_rows.clone() )
+  .flatten()
+  .collect::< Vec< _ > >()
+  ;
 
   let entries = entries.iter().map( | entry |
     {
@@ -105,8 +110,10 @@ async fn test_update() -> Result< () >
   assert_eq!( entries.len(), 10 );
 
   // check date
-  println!( "{:?}", entries );
-  let updated = entries.iter().find( | ( id, _published ) | id == "https://www.nasa.gov/?post_type=image-article&p=631537" );
+  let updated = entries.iter().find
+  (
+    | ( id, _published ) | id == "https://www.nasa.gov/?post_type=image-article&p=631537"
+  );
   assert!( updated.is_some() );
   let _updated = updated.unwrap();
   Ok( () )

From b625f862e0e61e442c936c73e74a38e0c3e04a24 Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Tue, 9 Apr 2024 14:22:54 +0300
Subject: [PATCH 25/49] fix adapter

---
 module/move/unitore/src/action/config.rs      |   2 +-
 module/move/unitore/src/action/feed.rs        |   2 +-
 module/move/unitore/src/action/frame.rs       |   2 +-
 module/move/unitore/src/action/query.rs       |   2 +-
 module/move/unitore/src/action/table.rs       |   2 +-
 module/move/unitore/src/command/config.rs     |   2 +-
 module/move/unitore/src/command/feed.rs       |   2 +-
 module/move/unitore/src/command/frame.rs      |   2 +-
 module/move/unitore/src/command/query.rs      |   2 +-
 module/move/unitore/src/command/table.rs      |   2 +-
 module/move/unitore/src/lib.rs                |   1 -
 .../move/unitore/src/sled_adapter/config.rs   |   3 +-
 module/move/unitore/src/sled_adapter/feed.rs  |   2 +-
 module/move/unitore/src/sled_adapter/frame.rs |   2 +-
 module/move/unitore/src/sled_adapter/mod.rs   | 130 +++++++++++++++++-
 module/move/unitore/src/sled_adapter/table.rs |   2 +-
 module/move/unitore/src/storage.rs            | 127 -----------------
 module/move/unitore/tests/config.rs           |   2 +-
 module/move/unitore/tests/frames_download.rs  |   5 +-
 19 files changed, 145 insertions(+), 149 deletions(-)
 delete mode 100644 module/move/unitore/src/storage.rs

diff --git a/module/move/unitore/src/action/config.rs b/module/move/unitore/src/action/config.rs
index 951aabc2a9..5fd8dd84a9 100644
--- a/module/move/unitore/src/action/config.rs
+++ b/module/move/unitore/src/action/config.rs
@@ -2,7 +2,7 @@
 
 use crate::*;
 use error_tools::{ err, for_app::Context, BasicError, Result };
-use storage::FeedStorage;
+use sled_adapter::FeedStorage;
 use entity::
 {
   feed::{ FeedStore, Feed },
diff --git a/module/move/unitore/src/action/feed.rs b/module/move/unitore/src/action/feed.rs
index ae5aa2152d..a2eed760e9 100644
--- a/module/move/unitore/src/action/feed.rs
+++ b/module/move/unitore/src/action/feed.rs
@@ -2,7 +2,7 @@
 
 use crate::*;
 use action::{ Report, frame::SelectedEntries };
-use storage::FeedStorage;
+use sled_adapter::FeedStorage;
 use entity::feed::FeedStore;
 use error_tools::Result;
 
diff --git a/module/move/unitore/src/action/frame.rs b/module/move/unitore/src/action/frame.rs
index 7e2825ddd5..1374988347 100644
--- a/module/move/unitore/src/action/frame.rs
+++ b/module/move/unitore/src/action/frame.rs
@@ -1,7 +1,7 @@
 //! Frames commands actions.
 
 use crate::*;
-use storage::FeedStorage;
+use sled_adapter::FeedStorage;
 use entity::
 {
   feed::FeedStore,
diff --git a/module/move/unitore/src/action/query.rs b/module/move/unitore/src/action/query.rs
index 521a1d8cf6..c0ae448e0b 100644
--- a/module/move/unitore/src/action/query.rs
+++ b/module/move/unitore/src/action/query.rs
@@ -4,7 +4,7 @@
 // aaa : fixed
 use crate::*;
 use gluesql::core::executor::Payload;
-use storage::{ FeedStorage, Store };
+use sled_adapter::{ FeedStorage, Store };
 use action::Report;
 use error_tools::{ err, BasicError, Result };
 
diff --git a/module/move/unitore/src/action/table.rs b/module/move/unitore/src/action/table.rs
index 643ff1119b..7fecad6115 100644
--- a/module/move/unitore/src/action/table.rs
+++ b/module/move/unitore/src/action/table.rs
@@ -4,7 +4,7 @@ use crate::*;
 use gluesql::prelude::Payload;
 use std::collections::HashMap;
 use action::Report;
-use storage::FeedStorage;
+use sled_adapter::FeedStorage;
 use entity::table::TableStore;
 use error_tools::Result;
 
diff --git a/module/move/unitore/src/command/config.rs b/module/move/unitore/src/command/config.rs
index 2a09ed0423..37bbfb7aaf 100644
--- a/module/move/unitore/src/command/config.rs
+++ b/module/move/unitore/src/command/config.rs
@@ -3,7 +3,7 @@
 use crate::*;
 use gluesql::sled_storage::sled::Config;
 use wca::{ Command, Type, VerifiedCommand };
-use storage::FeedStorage;
+use sled_adapter::FeedStorage;
 use action::{ Report, config::{ config_add, config_delete, config_list } };
 use error_tools::Result;
 
diff --git a/module/move/unitore/src/command/feed.rs b/module/move/unitore/src/command/feed.rs
index 3fc620da3b..9255dbf3a4 100644
--- a/module/move/unitore/src/command/feed.rs
+++ b/module/move/unitore/src/command/feed.rs
@@ -3,7 +3,7 @@
 use crate::*;
 use gluesql::sled_storage::sled::Config;
 use wca::{ Command, VerifiedCommand };
-use storage::FeedStorage;
+use sled_adapter::FeedStorage;
 use action::{ Report, feed::feeds_list };
 use error_tools::Result;
 
diff --git a/module/move/unitore/src/command/frame.rs b/module/move/unitore/src/command/frame.rs
index 6ed103be34..bdfe0d1174 100644
--- a/module/move/unitore/src/command/frame.rs
+++ b/module/move/unitore/src/command/frame.rs
@@ -3,7 +3,7 @@
 use crate::*;
 use gluesql::sled_storage::sled::Config;
 use wca::{ Command, VerifiedCommand };
-use storage::FeedStorage;
+use sled_adapter::FeedStorage;
 use action::{ Report, frame::{ frames_list, frames_download } };
 use error_tools::Result;
 
diff --git a/module/move/unitore/src/command/query.rs b/module/move/unitore/src/command/query.rs
index e2c4d08d3e..b9ebbd67c5 100644
--- a/module/move/unitore/src/command/query.rs
+++ b/module/move/unitore/src/command/query.rs
@@ -3,7 +3,7 @@
 use crate::*;
 use gluesql::sled_storage::sled::Config;
 use wca::{ Command, Type, VerifiedCommand };
-use storage::FeedStorage;
+use sled_adapter::FeedStorage;
 use action::{ Report, query::query_execute };
 use error_tools::Result;
 
diff --git a/module/move/unitore/src/command/table.rs b/module/move/unitore/src/command/table.rs
index e250af57fa..34db044668 100644
--- a/module/move/unitore/src/command/table.rs
+++ b/module/move/unitore/src/command/table.rs
@@ -3,7 +3,7 @@
 use crate::*;
 use gluesql::sled_storage::sled::Config;
 use wca::{ Command, Type, VerifiedCommand };
-use storage::FeedStorage;
+use sled_adapter::FeedStorage;
 use action::{ Report, table::{ table_list, tables_list } };
 use error_tools::Result;
 
diff --git a/module/move/unitore/src/lib.rs b/module/move/unitore/src/lib.rs
index 88f8adc251..f6e0df9632 100644
--- a/module/move/unitore/src/lib.rs
+++ b/module/move/unitore/src/lib.rs
@@ -2,7 +2,6 @@
 pub mod retriever;
 pub mod feed_config;
 pub mod executor;
-pub mod storage;
 pub mod tool;
 pub mod command;
 pub mod action;
diff --git a/module/move/unitore/src/sled_adapter/config.rs b/module/move/unitore/src/sled_adapter/config.rs
index 60f16a26a4..35ad1ae3cd 100644
--- a/module/move/unitore/src/sled_adapter/config.rs
+++ b/module/move/unitore/src/sled_adapter/config.rs
@@ -12,9 +12,10 @@ use gluesql::
   sled_storage::SledStorage,
 };
 use entity::config::{ Config, ConfigStore };
+use sled_adapter::FeedStorage;
 
 #[ async_trait::async_trait( ?Send ) ]
-impl ConfigStore for storage::FeedStorage< SledStorage >
+impl ConfigStore for FeedStorage< SledStorage >
 {
   async fn config_add( &mut self, config : &Config ) -> Result< Payload >
   {
diff --git a/module/move/unitore/src/sled_adapter/feed.rs b/module/move/unitore/src/sled_adapter/feed.rs
index cfa73fdb42..2659657103 100644
--- a/module/move/unitore/src/sled_adapter/feed.rs
+++ b/module/move/unitore/src/sled_adapter/feed.rs
@@ -24,7 +24,7 @@ use action::
   feed::FeedsReport,
   frame::{ UpdateReport, SelectedEntries, FramesReport },
 };
-use storage::FeedStorage;
+use sled_adapter::FeedStorage;
 use wca::wtools::Itertools;
 
 #[ async_trait::async_trait( ?Send ) ]
diff --git a/module/move/unitore/src/sled_adapter/frame.rs b/module/move/unitore/src/sled_adapter/frame.rs
index 5fe7dd1dbd..666db0921f 100644
--- a/module/move/unitore/src/sled_adapter/frame.rs
+++ b/module/move/unitore/src/sled_adapter/frame.rs
@@ -15,7 +15,7 @@ use gluesql::
 };
 use entity::frame::{ FrameStore, Frame };
 use action::frame::{ SelectedEntries, FramesReport, ListReport };
-use storage::FeedStorage;
+use sled_adapter::FeedStorage;
 use wca::wtools::Itertools;
 
 #[ async_trait::async_trait( ?Send ) ]
diff --git a/module/move/unitore/src/sled_adapter/mod.rs b/module/move/unitore/src/sled_adapter/mod.rs
index b17aa61c78..ff73740de2 100644
--- a/module/move/unitore/src/sled_adapter/mod.rs
+++ b/module/move/unitore/src/sled_adapter/mod.rs
@@ -1,6 +1,132 @@
-//! Operations for using entities with Sled storage.
+//! Storage for frames, feeds and config files.
+
+use crate::*;
+use std::sync::Arc;
+use error_tools::{ for_app::Context, Result };
+use tokio::sync::Mutex;
+use gluesql::
+{
+  core::
+  {
+    ast_builder::{ table, Build, Execute },
+    store::{ GStore, GStoreMut },
+  },
+  prelude::Glue,
+  sled_storage::{ sled::Config, SledStorage },
+};
+use action::query::QueryReport;
 
 mod frame;
 mod table;
 mod feed;
-mod config;
\ No newline at end of file
+mod config;
+
+/// Storage for feed frames.
+#[ derive( Clone ) ]
+pub struct FeedStorage< S : GStore + GStoreMut + Send >
+{
+  /// GlueSQL storage.
+  pub storage : Arc< Mutex< Glue< S > > >,
+  /// Frame table fields with description.
+  pub frame_fields : Vec< [ &'static str; 3 ] >,
+}
+
+impl< S : GStore + GStoreMut + Send > std::fmt::Debug for FeedStorage< S >
+{
+  fn fmt( &self, f: &mut std::fmt::Formatter<'_> ) -> std::fmt::Result
+  {
+    writeln!(f, "GlueSQL storage" )
+  }
+}
+
+impl FeedStorage< SledStorage >
+{
+  /// Initialize new storage from configuration, create feed table.
+  pub async fn init_storage( config : &Config ) -> Result< Self >
+  {
+    let storage = SledStorage::try_from( config.clone() )
+    .context( format!( "Failed to initialize storage with config {:?}", config ) )?
+    ;
+
+    let mut glue = Glue::new( storage );
+
+    let sub_table = table( "config" )
+    .create_table_if_not_exists()
+    .add_column( "path TEXT PRIMARY KEY" )
+    .build()?
+    ;
+
+    sub_table.execute( &mut glue ).await?;
+
+    let feed_table = table( "feed" )
+    .create_table_if_not_exists()
+    .add_column( "link TEXT PRIMARY KEY" )
+    .add_column( "type TEXT" )
+    .add_column( "title TEXT" )
+    .add_column( "updated TIMESTAMP" )
+    .add_column( "authors TEXT" )
+    .add_column( "description TEXT" )
+    .add_column( "published TIMESTAMP" )
+    .add_column( "update_period TEXT" )
+    .add_column( "config_file TEXT FOREIGN KEY REFERENCES config(path)" )
+    .build()?
+    ;
+
+    feed_table.execute( &mut glue ).await?;
+
+    let frame_fields = vec!
+    [
+      [ "id", "TEXT", "A unique identifier for this frame in the feed. " ],
+      [ "title", "TEXT", "Title of the frame" ],
+      [ "stored_time", "TIMESTAMP", "Time at which this item was fetched from source." ],
+      [ "authors", "LIST", "List of authors of the frame, optional." ],
+      [ "content", "TEXT", "The content of the frame in html or plain text, optional." ],
+      [ "links", "LIST", "List of links associated with this item of related Web page and attachments." ],
+      [ "summary", "TEXT", "Short summary, abstract, or excerpt of the frame item, optional." ],
+      [ "categories", "LIST", "Specifies a list of categories that the item belongs to." ],
+      [ "published", "TIMESTAMP", "Time at which this item was first published or updated." ],
+      [ "source", "TEXT", "Specifies the source feed if the frame was copied from one feed into another feed, optional." ],
+      [ "rights", "TEXT", "Conveys information about copyrights over the feed, optional." ],
+      [ "media", "LIST", "List of media oblects, encountered in the frame, optional." ],
+      [ "language", "TEXT", "The language specified on the item, optional." ],
+      [ "feed_link", "TEXT", "Link of feed that contains this frame." ],
+    ];
+    let mut table = table( "frame" ).create_table_if_not_exists().add_column( "id TEXT PRIMARY KEY" );
+
+    for column in frame_fields.iter().skip( 1 ).take( frame_fields.len() - 2 )
+    {
+      table = table.add_column( format!( "{} {}", column[ 0 ], column[ 1 ] ).as_str() );
+    }
+
+    let table = table.add_column( "feed_link TEXT FOREIGN KEY REFERENCES feed(link)" )
+    .build()?
+    ;
+
+    table.execute( &mut glue ).await?;
+
+    Ok( Self{ storage : Arc::new( Mutex::new( glue ) ), frame_fields } )
+  }
+}
+
+/// Functionality of feed storage.
+#[ mockall::automock ]
+#[ async_trait::async_trait( ?Send ) ]
+pub trait Store
+{
+  /// Execute custom query passed as String.
+  async fn execute_query( &mut self, query : String ) -> Result< QueryReport >;
+}
+
+#[ async_trait::async_trait( ?Send ) ]
+impl< S : GStore + GStoreMut + Send > Store for FeedStorage< S >
+{
+  async fn execute_query( &mut self, query : String ) -> Result< QueryReport >
+  {
+    let glue = &mut *self.storage.lock().await;
+    let payloads = glue.execute( &query ).await.context( "Failed to execute query" )?;
+
+    let report = QueryReport ( payloads );
+
+    Ok( report )
+  }
+}
diff --git a/module/move/unitore/src/sled_adapter/table.rs b/module/move/unitore/src/sled_adapter/table.rs
index 1c32dda965..ddf0664bfc 100644
--- a/module/move/unitore/src/sled_adapter/table.rs
+++ b/module/move/unitore/src/sled_adapter/table.rs
@@ -9,7 +9,7 @@ use gluesql::
 };
 use entity::table::TableStore;
 use action::table::TablesReport;
-use storage::FeedStorage;
+use sled_adapter::FeedStorage;
 
 #[ async_trait::async_trait( ?Send ) ]
 impl TableStore for FeedStorage< SledStorage >
diff --git a/module/move/unitore/src/storage.rs b/module/move/unitore/src/storage.rs
deleted file mode 100644
index 02d49d0364..0000000000
--- a/module/move/unitore/src/storage.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-//! Storage for frames, feeds and config files.
-
-use crate::*;
-use std::sync::Arc;
-use error_tools::{ for_app::Context, Result };
-use tokio::sync::Mutex;
-use gluesql::
-{
-  core::
-  {
-    ast_builder::{ table, Build, Execute },
-    store::{ GStore, GStoreMut },
-  },
-  prelude::Glue,
-  sled_storage::{ sled::Config, SledStorage },
-};
-use action::query::QueryReport;
-
-/// Storage for feed frames.
-#[ derive( Clone ) ]
-pub struct FeedStorage< S : GStore + GStoreMut + Send >
-{
-  /// GlueSQL storage.
-  pub storage : Arc< Mutex< Glue< S > > >,
-  /// Frame table fields with description.
-  pub frame_fields : Vec< [ &'static str; 3 ] >,
-}
-
-impl< S : GStore + GStoreMut + Send > std::fmt::Debug for FeedStorage< S >
-{
-  fn fmt( &self, f: &mut std::fmt::Formatter<'_> ) -> std::fmt::Result
-  {
-    writeln!(f, "GlueSQL storage" )
-  }
-}
-
-impl FeedStorage< SledStorage >
-{
-  /// Initialize new storage from configuration, create feed table.
-  pub async fn init_storage( config : &Config ) -> Result< Self >
-  {
-    let storage = SledStorage::try_from( config.clone() )
-    .context( format!( "Failed to initialize storage with config {:?}", config ) )?
-    ;
-
-    let mut glue = Glue::new( storage );
-
-    let sub_table = table( "config" )
-    .create_table_if_not_exists()
-    .add_column( "path TEXT PRIMARY KEY" )
-    .build()?
-    ;
-
-    sub_table.execute( &mut glue ).await?;
-
-    let feed_table = table( "feed" )
-    .create_table_if_not_exists()
-    .add_column( "link TEXT PRIMARY KEY" )
-    .add_column( "type TEXT" )
-    .add_column( "title TEXT" )
-    .add_column( "updated TIMESTAMP" )
-    .add_column( "authors TEXT" )
-    .add_column( "description TEXT" )
-    .add_column( "published TIMESTAMP" )
-    .add_column( "update_period TEXT" )
-    .add_column( "config_file TEXT FOREIGN KEY REFERENCES config(path)" )
-    .build()?
-    ;
-
-    feed_table.execute( &mut glue ).await?;
-
-    let frame_fields = vec!
-    [
-      [ "id", "TEXT", "A unique identifier for this frame in the feed. " ],
-      [ "title", "TEXT", "Title of the frame" ],
-      [ "stored_time", "TIMESTAMP", "Time at which this item was fetched from source." ],
-      [ "authors", "LIST", "List of authors of the frame, optional." ],
-      [ "content", "TEXT", "The content of the frame in html or plain text, optional." ],
-      [ "links", "LIST", "List of links associated with this item of related Web page and attachments." ],
-      [ "summary", "TEXT", "Short summary, abstract, or excerpt of the frame item, optional." ],
-      [ "categories", "LIST", "Specifies a list of categories that the item belongs to." ],
-      [ "published", "TIMESTAMP", "Time at which this item was first published or updated." ],
-      [ "source", "TEXT", "Specifies the source feed if the frame was copied from one feed into another feed, optional." ],
-      [ "rights", "TEXT", "Conveys information about copyrights over the feed, optional." ],
-      [ "media", "LIST", "List of media oblects, encountered in the frame, optional." ],
-      [ "language", "TEXT", "The language specified on the item, optional." ],
-      [ "feed_link", "TEXT", "Link of feed that contains this frame." ],
-    ];
-    let mut table = table( "frame" ).create_table_if_not_exists().add_column( "id TEXT PRIMARY KEY" );
-
-    for column in frame_fields.iter().skip( 1 ).take( frame_fields.len() - 2 )
-    {
-      table = table.add_column( format!( "{} {}", column[ 0 ], column[ 1 ] ).as_str() );
-    }
-
-    let table = table.add_column( "feed_link TEXT FOREIGN KEY REFERENCES feed(link)" )
-    .build()?
-    ;
-
-    table.execute( &mut glue ).await?;
-
-    Ok( Self{ storage : Arc::new( Mutex::new( glue ) ), frame_fields } )
-  }
-}
-
-/// Functionality of feed storage.
-#[ mockall::automock ]
-#[ async_trait::async_trait( ?Send ) ]
-pub trait Store
-{
-  /// Execute custom query passed as String.
-  async fn execute_query( &mut self, query : String ) -> Result< QueryReport >;
-}
-
-#[ async_trait::async_trait( ?Send ) ]
-impl< S : GStore + GStoreMut + Send > Store for FeedStorage< S >
-{
-  async fn execute_query( &mut self, query : String ) -> Result< QueryReport >
-  {
-    let glue = &mut *self.storage.lock().await;
-    let payloads = glue.execute( &query ).await.context( "Failed to execute query" )?;
-
-    let report = QueryReport ( payloads );
-
-    Ok( report )
-  }
-}
diff --git a/module/move/unitore/tests/config.rs b/module/move/unitore/tests/config.rs
index 060078ac4e..d56c4fdfdc 100644
--- a/module/move/unitore/tests/config.rs
+++ b/module/move/unitore/tests/config.rs
@@ -6,7 +6,7 @@ use gluesql::
 };
 use unitore::
 {
-  storage::FeedStorage,
+  sled_adapter::FeedStorage,
   entity::{ feed::FeedStore, config::ConfigStore },
   action::config,
 };
diff --git a/module/move/unitore/tests/frames_download.rs b/module/move/unitore/tests/frames_download.rs
index 9922a8c3f5..ad5c3c2ff6 100644
--- a/module/move/unitore/tests/frames_download.rs
+++ b/module/move/unitore/tests/frames_download.rs
@@ -12,7 +12,7 @@ use wca::wtools::Itertools;
 use unitore::
 {
   feed_config::SubscriptionConfig,
-  storage::FeedStorage,
+  sled_adapter::FeedStorage,
   entity::{ frame::FrameStore, feed::FeedStore },
 };
 use error_tools::Result;
@@ -42,9 +42,6 @@ async fn test_save() -> Result< () >
   let entries = feed_storage.frames_list().await?;
 
   let number_of_frames = entries.0[ 0 ].selected_frames.selected_rows.len();
-
-  println!("{:#?}", entries);
-
   assert_eq!( number_of_frames, 10 );
 
   Ok( () )

From 530d27f98cfadf081366220caf48eebef573fbd9 Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Tue, 9 Apr 2024 16:53:03 +0300
Subject: [PATCH 26/49] fix commands

---
 module/move/unitore/Readme.md                 |  2 +-
 module/move/unitore/src/action/config.rs      | 23 ++---
 module/move/unitore/src/action/feed.rs        |  8 +-
 module/move/unitore/src/action/frame.rs       | 11 +--
 module/move/unitore/src/action/query.rs       | 14 +--
 module/move/unitore/src/action/table.rs       | 46 ++++------
 module/move/unitore/src/command/config.rs     | 86 ++++++++++++-------
 module/move/unitore/src/command/feed.rs       |  5 +-
 module/move/unitore/src/command/frame.rs      |  8 +-
 module/move/unitore/src/command/query.rs      | 41 +++++----
 module/move/unitore/src/command/table.rs      |  8 +-
 module/move/unitore/src/sled_adapter/frame.rs | 15 +++-
 module/move/unitore/src/sled_adapter/mod.rs   | 51 +++++------
 module/move/unitore/tests/config.rs           | 70 ---------------
 module/move/unitore/tests/config_add.rs       | 37 ++++++++
 module/move/unitore/tests/config_delete.rs    | 42 +++++++++
 module/move/unitore/tests/table_list.rs       | 45 ++++++++++
 module/move/unitore/tests/tables_list.rs      | 32 +++++++
 18 files changed, 316 insertions(+), 228 deletions(-)
 delete mode 100644 module/move/unitore/tests/config.rs
 create mode 100644 module/move/unitore/tests/config_add.rs
 create mode 100644 module/move/unitore/tests/config_delete.rs
 create mode 100644 module/move/unitore/tests/table_list.rs
 create mode 100644 module/move/unitore/tests/tables_list.rs

diff --git a/module/move/unitore/Readme.md b/module/move/unitore/Readme.md
index 3513ec3729..e631beb82b 100644
--- a/module/move/unitore/Readme.md
+++ b/module/move/unitore/Readme.md
@@ -47,7 +47,7 @@ cargo run .feeds.list
 ```
 To get custom information about feeds or frames run SQL query to storage database using command `.query.execute` with query string:
 ```bash
-cargo run .query.execute \'SELECT title, links, MIN\(published\) FROM frame\'
+cargo run .query.execute 'SELECT title, links, MIN(published) FROM frame'
 ```
 To remove config file from storage use command `.config.delete` with path to config file:
 ```bash
diff --git a/module/move/unitore/src/action/config.rs b/module/move/unitore/src/action/config.rs
index 5fd8dd84a9..49b63a4773 100644
--- a/module/move/unitore/src/action/config.rs
+++ b/module/move/unitore/src/action/config.rs
@@ -1,7 +1,9 @@
-//! Actions and report for commands for config files.
+//! Actions and report for config files.
+
+use std::path::PathBuf;
 
 use crate::*;
-use error_tools::{ err, for_app::Context, BasicError, Result };
+use error_tools::{ for_app::Context, Result };
 use sled_adapter::FeedStorage;
 use entity::
 {
@@ -12,14 +14,8 @@ use action::Report;
 use gluesql::{ prelude::Payload, sled_storage::SledStorage };
 
 /// Add configuration file with subscriptions to storage.
-pub async fn config_add( mut storage : FeedStorage< SledStorage >, args : &wca::Args ) -> Result< impl Report >
+pub async fn config_add( mut storage : FeedStorage< SledStorage >, path : &PathBuf ) -> Result< impl Report >
 {
-  let path : std::path::PathBuf = args
-  .get_owned::< wca::Value >( 0 )
-  .ok_or_else::< BasicError, _ >( || err!( "Cannot get path argument for command .config.add" ) )?
-  .into()
-  ;
-
   let path = proper_path_tools::path::normalize( path );
 
   let mut err_str = format!( "Invalid path for config file {:?}", path );
@@ -66,14 +62,9 @@ pub async fn config_add( mut storage : FeedStorage< SledStorage >, args : &wca::
 }
 
 /// Remove configuration file from storage.
-pub async fn config_delete( mut storage : FeedStorage< SledStorage >, args : &wca::Args ) -> Result< impl Report >
+pub async fn config_delete( mut storage : FeedStorage< SledStorage >, path : &PathBuf ) -> Result< impl Report >
 {
-  let path : std::path::PathBuf = args
-  .get_owned::< wca::Value >( 0 )
-  .ok_or_else::< BasicError, _ >( || err!( "Cannot get path argument for command .config.delete" ) )?
-  .into()
-  ;
-
+  let path = proper_path_tools::path::normalize( path );
   let path = path.canonicalize().context( format!( "Invalid path for config file {:?}", path ) )?;
   let config = Config::new( path.to_string_lossy().to_string() );
 
diff --git a/module/move/unitore/src/action/feed.rs b/module/move/unitore/src/action/feed.rs
index a2eed760e9..f7840a5f55 100644
--- a/module/move/unitore/src/action/feed.rs
+++ b/module/move/unitore/src/action/feed.rs
@@ -1,4 +1,4 @@
-//! Endpoints and report for feed commands.
+//! Feed actions and reports.
 
 use crate::*;
 use action::{ Report, frame::SelectedEntries };
@@ -7,11 +7,7 @@ use entity::feed::FeedStore;
 use error_tools::Result;
 
 /// List all feeds from storage.
-pub async fn feeds_list
-(
-  mut storage : FeedStorage< gluesql::sled_storage::SledStorage >,
-  _args : &wca::Args,
-) -> Result< impl Report >
+pub async fn feeds_list( mut storage : FeedStorage< gluesql::sled_storage::SledStorage > ) -> Result< impl Report >
 {
   storage.feeds_list().await
 }
diff --git a/module/move/unitore/src/action/frame.rs b/module/move/unitore/src/action/frame.rs
index 1374988347..f26d538e20 100644
--- a/module/move/unitore/src/action/frame.rs
+++ b/module/move/unitore/src/action/frame.rs
@@ -1,4 +1,4 @@
-//! Frames commands actions.
+//! Frames actions and reports.
 
 use crate::*;
 use sled_adapter::FeedStorage;
@@ -16,11 +16,7 @@ use action::Report;
 // qqq : review the whole project and make sure all names are consitant: actions, commands, its tests
 
 /// List all frames.
-pub async fn frames_list
-(
-  mut storage : FeedStorage< SledStorage >,
-  _args : &wca::Args,
-) -> Result< impl Report >
+pub async fn frames_list( mut storage : FeedStorage< SledStorage > ) -> Result< impl Report >
 {
   storage.frames_list().await
 }
@@ -28,8 +24,7 @@ pub async fn frames_list
 /// Update all frames from config files saved in storage.
 pub async fn frames_download
 (
-  mut storage : FeedStorage< SledStorage >,
-  _args : &wca::Args,
+  mut storage : FeedStorage< SledStorage >
 ) -> Result< impl Report >
 {
   let payload = storage.config_list().await?;
diff --git a/module/move/unitore/src/action/query.rs b/module/move/unitore/src/action/query.rs
index c0ae448e0b..0f5edd06a7 100644
--- a/module/move/unitore/src/action/query.rs
+++ b/module/move/unitore/src/action/query.rs
@@ -1,4 +1,4 @@
-//! Query command endpoint and report.
+//! Query actions and report.
 
 // qqq : don't use both
 // aaa : fixed
@@ -6,22 +6,16 @@ use crate::*;
 use gluesql::core::executor::Payload;
 use sled_adapter::{ FeedStorage, Store };
 use action::Report;
-use error_tools::{ err, BasicError, Result };
+use error_tools::Result;
 
 /// Execute query specified in query string.
 pub async fn query_execute
 (
   mut storage : FeedStorage< gluesql::sled_storage::SledStorage >,
-  args : &wca::Args,
+  query_str : String,
 ) -> Result< impl Report >
 {
-  let query = args
-  .get_owned::< Vec::< String > >( 0 )
-  .ok_or_else::< BasicError, _ >( || err!( "Cannot get Query argument for command .query.execute" ) )?
-  .join( " " )
-  ;
-
-  storage.execute_query( query ).await
+  storage.execute_query( query_str ).await
 }
 
 const EMPTY_CELL : &'static str = "";
diff --git a/module/move/unitore/src/action/table.rs b/module/move/unitore/src/action/table.rs
index 7fecad6115..5e0c92663b 100644
--- a/module/move/unitore/src/action/table.rs
+++ b/module/move/unitore/src/action/table.rs
@@ -1,4 +1,4 @@
-//! Tables metadata commands actions and reports.
+//! Tables metadata actions and reports.
 
 use crate::*;
 use gluesql::prelude::Payload;
@@ -12,12 +12,9 @@ use error_tools::Result;
 pub async fn table_list
 (
   mut storage : FeedStorage< gluesql::sled_storage::SledStorage >,
-  args : &wca::Args,
+  table_name : Option< String >,
 ) -> Result< impl Report >
 {
-  let table_name = args.get_owned::< String >( 0 );
-
-  // let mut manager = FeedManager::new( storage );
   let mut table_names = Vec::new();
   if let Some( name ) = table_name
   {
@@ -27,7 +24,7 @@ pub async fn table_list
   {
     let tables = storage.tables_list().await?;
 
-    let names = tables.tables.keys().map( | k | k.clone() ).collect::< Vec< _ > >();
+    let names = tables.0.keys().map( | k | k.clone() ).collect::< Vec< _ > >();
     table_names.extend( names.into_iter() );
   }
 
@@ -123,21 +120,24 @@ pub async fn table_list
             },
             "authors" =>
             {
-              columns_desc.insert(
+              columns_desc.insert
+              (
                 label.clone(),
                 String::from( "List of authors of the frame, optional." )
               );
             },
             "content" =>
             {
-              columns_desc.insert(
+              columns_desc.insert
+              (
                 label.clone(),
                 String::from( "The content of the frame in html or plain text, optional." ),
               );
             },
             "links" =>
             {
-              columns_desc.insert(
+              columns_desc.insert
+              (
                 label.clone(),
                 String::from( "List of links associated with this item of related Web page and attachments." ),
               );
@@ -232,11 +232,7 @@ pub async fn table_list
 }
 
 /// Get information about tables in storage.
-pub async fn tables_list
-(
-  mut storage : FeedStorage< gluesql::sled_storage::SledStorage >,
-  _args : &wca::Args,
-) -> Result< impl Report >
+pub async fn tables_list( mut storage : FeedStorage< gluesql::sled_storage::SledStorage > ) -> Result< impl Report >
 {
   storage.tables_list().await
 }
@@ -245,7 +241,7 @@ const EMPTY_CELL : &'static str = "";
 
 /// Information about execution of table columns commands.
 #[ derive( Debug ) ]
-pub struct TablesColumnsReport( Vec< ColumnsReport > );
+pub struct TablesColumnsReport( pub Vec< ColumnsReport > );
 
 impl std::fmt::Display for TablesColumnsReport
 {
@@ -262,7 +258,7 @@ impl std::fmt::Display for TablesColumnsReport
 
 impl Report for TablesColumnsReport {}
 
-/// Information about execution of columns commands.
+/// Information about execution of columns listing action.
 #[ derive( Debug ) ]
 pub struct ColumnsReport
 {
@@ -336,11 +332,9 @@ impl std::fmt::Display for ColumnsReport
 impl Report for ColumnsReport {}
 
 /// Information about execution of tables commands.
+/// Contains tables name, description and list of columns.
 #[ derive( Debug ) ]
-pub struct TablesReport
-{
-  tables : std::collections::HashMap< String, ( String, Vec< String > ) >
-}
+pub struct TablesReport( pub HashMap< String, ( String, Vec< String > ) > );
 
 impl TablesReport
 {
@@ -348,9 +342,8 @@ impl TablesReport
   pub fn new( payload : Vec< Payload > ) -> Self
   {
     let mut result = std::collections::HashMap::new();
-    match &payload[ 0 ]
+    if let Payload::Select { labels: _label_vec, rows: rows_vec } = &payload[ 0 ]
     {
-      Payload::Select { labels: _label_vec, rows: rows_vec } =>
       {
         for row in rows_vec
         {
@@ -367,10 +360,9 @@ impl TablesReport
           .or_insert( ( table_description, vec![ String::from( row[ 1 ].clone() ) ] ) )
           ;
         }
-      },
-      _ => {},
+      }
     }
-    TablesReport{ tables : result }
+    TablesReport( result )
   }
 }
 
@@ -380,7 +372,7 @@ impl std::fmt::Display for TablesReport
   {
     writeln!( f, "Storage tables:" )?;
     let mut rows = Vec::new();
-    for ( table_name, ( desc, columns ) ) in &self.tables
+    for ( table_name, ( desc, columns ) ) in &self.0
     {
       let columns_str = if !columns.is_empty()
       {
@@ -409,7 +401,7 @@ impl std::fmt::Display for TablesReport
       [
         EMPTY_CELL.to_owned(),
         "name".to_owned(),
-       "description".to_owned(),
+        "description".to_owned(),
         "columns".to_owned(),
       ],
       rows,
diff --git a/module/move/unitore/src/command/config.rs b/module/move/unitore/src/command/config.rs
index 37bbfb7aaf..72eb063007 100644
--- a/module/move/unitore/src/command/config.rs
+++ b/module/move/unitore/src/command/config.rs
@@ -1,5 +1,7 @@
 //! Config files commands.
 
+use std::path::PathBuf;
+
 use crate::*;
 use gluesql::sled_storage::sled::Config;
 use wca::{ Command, Type, VerifiedCommand };
@@ -37,25 +39,35 @@ impl ConfigCommand
       .subject().hint( "Path" ).kind( Type::Path ).optional( false ).end()
       .routine( move | o : VerifiedCommand |
       {
-        let res = rt.block_on( async move
-          {
-            let path_to_storage = std::env::var( "UNITORE_STORAGE_PATH" )
-            .unwrap_or( String::from( "./_data" ) )
-            ;
-            
-            let config = Config::default()
-            .path( path_to_storage )
-            ;
-  
-            let feed_storage = FeedStorage::init_storage( &config ).await?;
-            config_add( feed_storage, &o.args ).await
-          });
+        let path_arg = o.args
+        .get_owned::< wca::Value >( 0 );
+
+        if let Some( path ) = path_arg
+        {
+          let path : PathBuf = path.into();
+
+          let res = rt.block_on
+          ( async move
+            {
+              let path_to_storage = std::env::var( "UNITORE_STORAGE_PATH" )
+              .unwrap_or( String::from( "./_data" ) )
+              ;
+              
+              let config = Config::default()
+              .path( path_to_storage )
+              ;
+    
+              let feed_storage = FeedStorage::init_storage( &config ).await?;
+              config_add( feed_storage, &path ).await
+            }
+          );
+
           match res
           {
             Ok( report ) => report.report(),
             Err( err ) => println!( "{:?}", err ),
           }
-        
+        }
       })
       .end()
     )
@@ -76,27 +88,37 @@ impl ConfigCommand
       ))
       .subject().hint( "Path" ).kind( Type::Path ).optional( false ).end()
       .routine( move | o : VerifiedCommand |
-      {
-        let res = rt.block_on( async move
-          {
-            let path_to_storage = std::env::var( "UNITORE_STORAGE_PATH" )
-            .unwrap_or( String::from( "./_data" ) )
-            ;
-            
-            let config = Config::default()
-            .path( path_to_storage )
-            ;
+        {
+          let path_arg = o.args
+          .get_owned::< wca::Value >( 0 );
   
-            let feed_storage = FeedStorage::init_storage( &config ).await?;
-            config_delete( feed_storage, &o.args ).await
-          });
-          match res
+          if let Some( path ) = path_arg
           {
-            Ok( report ) => report.report(),
-            Err( err ) => println!( "{:?}", err ),
+            let path : PathBuf = path.into();
+  
+            let res = rt.block_on
+            ( async move
+              {
+                let path_to_storage = std::env::var( "UNITORE_STORAGE_PATH" )
+                .unwrap_or( String::from( "./_data" ) )
+                ;
+                
+                let config = Config::default()
+                .path( path_to_storage )
+                ;
+      
+                let feed_storage = FeedStorage::init_storage( &config ).await?;
+                config_delete( feed_storage, &path ).await
+              }
+            );
+  
+            match res
+            {
+              Ok( report ) => report.report(),
+              Err( err ) => println!( "{:?}", err ),
+            }
           }
-        
-      })
+        })
       .end()
     )
   }
diff --git a/module/move/unitore/src/command/feed.rs b/module/move/unitore/src/command/feed.rs
index 9255dbf3a4..148d404952 100644
--- a/module/move/unitore/src/command/feed.rs
+++ b/module/move/unitore/src/command/feed.rs
@@ -16,7 +16,6 @@ impl FeedCommand
   /// Create command that lists all feeds in storage.
   pub fn list() -> Result< Command >
   {
-
     let rt  = tokio::runtime::Runtime::new()?;
   
     Ok
@@ -28,7 +27,7 @@ impl FeedCommand
         "List all feeds from storage.\n",
         "    Example: .feeds.list",
       ))
-      .routine( move | o : VerifiedCommand |
+      .routine( move | _o : VerifiedCommand |
       {
         let res = rt.block_on( async move
           {
@@ -41,7 +40,7 @@ impl FeedCommand
             ;
   
             let feed_storage = FeedStorage::init_storage( &config ).await?;
-            feeds_list( feed_storage, &o.args ).await
+            feeds_list( feed_storage ).await
           });
           match res
           {
diff --git a/module/move/unitore/src/command/frame.rs b/module/move/unitore/src/command/frame.rs
index bdfe0d1174..8a4f18a756 100644
--- a/module/move/unitore/src/command/frame.rs
+++ b/module/move/unitore/src/command/frame.rs
@@ -27,7 +27,7 @@ impl FrameCommand
         "List all frames saved in storage.\n",
         "    Example: .frames.list",
       ))
-      .routine( move | o : VerifiedCommand |
+      .routine( move | _o : VerifiedCommand |
       {
         let res = rt.block_on( async move
           {
@@ -40,7 +40,7 @@ impl FrameCommand
             ;
   
             let feed_storage = FeedStorage::init_storage( &config ).await?;
-            frames_list( feed_storage, &o.args ).await
+            frames_list( feed_storage ).await
           });
           match res
           {
@@ -67,7 +67,7 @@ impl FrameCommand
         "Download frames from feed sources provided in config files.\n",
         "    Example: .frames.download",
       ))
-      .routine( move | o : VerifiedCommand |
+      .routine( move | _o : VerifiedCommand |
       {
         let res = rt.block_on( async move
           {
@@ -80,7 +80,7 @@ impl FrameCommand
             ;
 
             let feed_storage = FeedStorage::init_storage( &config ).await?;
-            frames_download( feed_storage, &o.args ).await
+            frames_download( feed_storage ).await
           });
           match res
           {
diff --git a/module/move/unitore/src/command/query.rs b/module/move/unitore/src/command/query.rs
index b9ebbd67c5..24519e1a86 100644
--- a/module/move/unitore/src/command/query.rs
+++ b/module/move/unitore/src/command/query.rs
@@ -24,36 +24,45 @@ impl QueryCommand
       .phrase( "query.execute" )
       .long_hint( concat!
       (
-        "Execute custom query. Subject: query string, with special characters escaped.\n",
+        "Execute custom query. Subject: query string.\n",
         "    Example query:\n",
         "  - select all frames:\n",
-        r#"    .query.execute \'SELECT \* FROM frame\'"#,
+        r#"    .query.execute 'SELECT * FROM frame'"#,
         "\n",
         "  - select title and link to the most recent frame:\n",
-        r#"    .query.execute \'SELECT title, links, MIN\(published\) FROM frame\'"#,
+        r#"    .query.execute 'SELECT title, links, MIN( published ) FROM frame'"#,
         "\n\n",
       ))
       .subject().hint( "Query" ).kind( Type::String ).optional( false ).end()
       .routine( move | o : VerifiedCommand |
       {
-        let res = rt.block_on( async move
-          {
-            let path_to_storage = std::env::var( "UNITORE_STORAGE_PATH" )
-            .unwrap_or( String::from( "./_data" ) )
-            ;
-            
-            let config = Config::default()
-            .path( path_to_storage )
-            ;
-  
-            let feed_storage = FeedStorage::init_storage( &config ).await?;
-            query_execute( feed_storage, &o.args ).await
-          });
+        let query_arg = o.args
+        .get_owned::< String >( 0 )
+        ;
+
+        if let Some( query_str ) = query_arg
+        {
+          let res = rt.block_on
+          ( async move
+            {
+              let path_to_storage = std::env::var( "UNITORE_STORAGE_PATH" )
+              .unwrap_or( String::from( "./_data" ) )
+              ;
+              
+              let config = Config::default()
+              .path( path_to_storage )
+              ;
+    
+              let feed_storage = FeedStorage::init_storage( &config ).await?;
+              query_execute( feed_storage, query_str ).await
+            }
+          );
           match res
           {
             Ok( report ) => report.report(),
             Err( err ) => println!( "{:?}", err ),
           }
+        }
         
       })
       .end()
diff --git a/module/move/unitore/src/command/table.rs b/module/move/unitore/src/command/table.rs
index 34db044668..67c82f23a0 100644
--- a/module/move/unitore/src/command/table.rs
+++ b/module/move/unitore/src/command/table.rs
@@ -30,6 +30,8 @@ impl TableCommand
       .subject().hint( "Path" ).kind( Type::Path ).optional( false ).end()
       .routine( move | o : VerifiedCommand |
       {
+        let table_name_arg = o.args.get_owned::< String >( 0 );
+
         let res = rt.block_on( async move
         {
           let path_to_storage = std::env::var( "UNITORE_STORAGE_PATH" )
@@ -41,7 +43,7 @@ impl TableCommand
           ;
 
           let feed_storage = FeedStorage::init_storage( &config ).await?;
-          table_list( feed_storage, &o.args ).await
+          table_list( feed_storage, table_name_arg ).await
         } );
         match res
         {
@@ -76,7 +78,7 @@ impl TablesCommand
         "    Example: .config.delete ./config/feeds.toml",
       ))
       .subject().hint( "Path" ).kind( Type::Path ).optional( false ).end()
-      .routine( move | o : VerifiedCommand |
+      .routine( move | _o : VerifiedCommand |
       {
         let res = rt.block_on( async move
         {
@@ -89,7 +91,7 @@ impl TablesCommand
           ;
 
           let feed_storage = FeedStorage::init_storage( &config ).await?;
-          tables_list( feed_storage, &o.args ).await
+          tables_list( feed_storage ).await
         } );
         match res
         {
diff --git a/module/move/unitore/src/sled_adapter/frame.rs b/module/move/unitore/src/sled_adapter/frame.rs
index 666db0921f..e2224f4958 100644
--- a/module/move/unitore/src/sled_adapter/frame.rs
+++ b/module/move/unitore/src/sled_adapter/frame.rs
@@ -75,7 +75,20 @@ impl FrameStore for FeedStorage< SledStorage >
     .insert()
     .columns
     (
-      self.frame_fields.iter().map( | field | field[ 0 ] ).join( "," ).as_str()
+      "id,
+      title,
+      stored_time,
+      authors,
+      content,
+      links,
+      summary,
+      categories,
+      published,
+      source,
+      rights,
+      media,
+      language,
+      feed_link"
     )
     .values( entries_rows )
     .execute( &mut *self.storage.lock().await )
diff --git a/module/move/unitore/src/sled_adapter/mod.rs b/module/move/unitore/src/sled_adapter/mod.rs
index ff73740de2..511d866e8e 100644
--- a/module/move/unitore/src/sled_adapter/mod.rs
+++ b/module/move/unitore/src/sled_adapter/mod.rs
@@ -27,8 +27,6 @@ pub struct FeedStorage< S : GStore + GStoreMut + Send >
 {
   /// GlueSQL storage.
   pub storage : Arc< Mutex< Glue< S > > >,
-  /// Frame table fields with description.
-  pub frame_fields : Vec< [ &'static str; 3 ] >,
 }
 
 impl< S : GStore + GStoreMut + Send > std::fmt::Debug for FeedStorage< S >
@@ -50,13 +48,13 @@ impl FeedStorage< SledStorage >
 
     let mut glue = Glue::new( storage );
 
-    let sub_table = table( "config" )
+    let config_table = table( "config" )
     .create_table_if_not_exists()
     .add_column( "path TEXT PRIMARY KEY" )
     .build()?
     ;
 
-    sub_table.execute( &mut glue ).await?;
+    config_table.execute( &mut glue ).await?;
 
     let feed_table = table( "feed" )
     .create_table_if_not_exists()
@@ -74,37 +72,28 @@ impl FeedStorage< SledStorage >
 
     feed_table.execute( &mut glue ).await?;
 
-    let frame_fields = vec!
-    [
-      [ "id", "TEXT", "A unique identifier for this frame in the feed. " ],
-      [ "title", "TEXT", "Title of the frame" ],
-      [ "stored_time", "TIMESTAMP", "Time at which this item was fetched from source." ],
-      [ "authors", "LIST", "List of authors of the frame, optional." ],
-      [ "content", "TEXT", "The content of the frame in html or plain text, optional." ],
-      [ "links", "LIST", "List of links associated with this item of related Web page and attachments." ],
-      [ "summary", "TEXT", "Short summary, abstract, or excerpt of the frame item, optional." ],
-      [ "categories", "LIST", "Specifies a list of categories that the item belongs to." ],
-      [ "published", "TIMESTAMP", "Time at which this item was first published or updated." ],
-      [ "source", "TEXT", "Specifies the source feed if the frame was copied from one feed into another feed, optional." ],
-      [ "rights", "TEXT", "Conveys information about copyrights over the feed, optional." ],
-      [ "media", "LIST", "List of media oblects, encountered in the frame, optional." ],
-      [ "language", "TEXT", "The language specified on the item, optional." ],
-      [ "feed_link", "TEXT", "Link of feed that contains this frame." ],
-    ];
-    let mut table = table( "frame" ).create_table_if_not_exists().add_column( "id TEXT PRIMARY KEY" );
-
-    for column in frame_fields.iter().skip( 1 ).take( frame_fields.len() - 2 )
-    {
-      table = table.add_column( format!( "{} {}", column[ 0 ], column[ 1 ] ).as_str() );
-    }
-
-    let table = table.add_column( "feed_link TEXT FOREIGN KEY REFERENCES feed(link)" )
+    let frame_table = table( "frame" )
+    .create_table_if_not_exists()
+    .add_column( "id TEXT PRIMARY KEY" )
+    .add_column( "title TEXT" )
+    .add_column( "stored_time TIMESTAMP" )
+    .add_column( "authors LIST" )
+    .add_column( "content TEXT" )
+    .add_column( "links LIST" )
+    .add_column( "summary TEXT" )
+    .add_column( "categories LIST" )
+    .add_column( "published TIMESTAMP" )
+    .add_column( "source TEXT" )
+    .add_column( "rights TEXT" )
+    .add_column( "media LIST" )
+    .add_column( "language TEXT" )
+    .add_column( "feed_link TEXT FOREIGN KEY REFERENCES feed(link)" )
     .build()?
     ;
 
-    table.execute( &mut glue ).await?;
+    frame_table.execute( &mut glue ).await?;
 
-    Ok( Self{ storage : Arc::new( Mutex::new( glue ) ), frame_fields } )
+    Ok( Self{ storage : Arc::new( Mutex::new( glue ) ) } )
   }
 }
 
diff --git a/module/move/unitore/tests/config.rs b/module/move/unitore/tests/config.rs
deleted file mode 100644
index d56c4fdfdc..0000000000
--- a/module/move/unitore/tests/config.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-use std::path::PathBuf;
-use gluesql::
-{
-  sled_storage::sled::Config,
-  prelude::Payload::Select,
-};
-use unitore::
-{
-  sled_adapter::FeedStorage,
-  entity::{ feed::FeedStore, config::ConfigStore },
-  action::config,
-};
-use error_tools::Result;
-
-#[ tokio::test ]
-async fn config_add() -> Result< () >
-{
-  let path = PathBuf::from( "./tests/fixtures/test_config.toml" );
-
-  let config = Config::default()
-  .path( "./test_add".to_owned() )
-  .temporary( true )
-  ;
-
-  let mut feed_storage = FeedStorage::init_storage( &config ).await?;
-  config::config_add( feed_storage.clone(), &wca::Args( vec![ wca::Value::Path( path ) ] ) ).await?;
-
-  let res = feed_storage.feeds_list().await?;
-
-  let feeds_links = res.0.selected_rows
-  .iter()
-  .map( | feed | String::from( feed[ 1 ].clone() ) )
-  .collect::< Vec< _ > >()
-  ;
-
-  assert!( feeds_links.len() == 2 );
-  assert!( feeds_links.contains( &format!( "https://feeds.bbci.co.uk/news/world/rss.xml" ) ) );
-  assert!( feeds_links.contains( &format!( "https://rss.nytimes.com/services/xml/rss/nyt/World.xml" ) ) );
-
-  Ok( () )
-}
-
-#[ tokio::test ]
-async fn config_delete() -> Result< () >
-{
-  let path = PathBuf::from( "./tests/fixtures/test_config.toml" );
-
-  let config = Config::default()
-  .path( "./test_del".to_owned() )
-  .temporary( true )
-  ;
-
-  let mut feed_storage = FeedStorage::init_storage( &config ).await?;
-  config::config_add( feed_storage.clone(), &wca::Args( vec![ wca::Value::Path( path.clone() ) ] ) ).await?;
-
-  config::config_delete( feed_storage.clone(), &wca::Args( vec![ wca::Value::Path( path ) ] ) ).await?;
-
-  let list = feed_storage.config_list().await?;
-
-  if let Select{ labels : _, rows } = list
-  {
-    assert!( rows.len() == 0 )
-  }
-  else
-  {
-    assert!( false );
-  }
-
-  Ok( () )
-}
diff --git a/module/move/unitore/tests/config_add.rs b/module/move/unitore/tests/config_add.rs
new file mode 100644
index 0000000000..a3de7479b7
--- /dev/null
+++ b/module/move/unitore/tests/config_add.rs
@@ -0,0 +1,37 @@
+use std::path::PathBuf;
+use gluesql::sled_storage::sled::Config;
+use unitore::
+{
+  sled_adapter::FeedStorage,
+  entity::feed::FeedStore,
+  action::config,
+};
+use error_tools::Result;
+
+#[ tokio::test ]
+async fn config_add() -> Result< () >
+{
+  let path = PathBuf::from( "./tests/fixtures/test_config.toml" );
+
+  let config = Config::default()
+  .path( "./test_add".to_owned() )
+  .temporary( true )
+  ;
+
+  let mut feed_storage = FeedStorage::init_storage( &config ).await?;
+  config::config_add( feed_storage.clone(), &path ).await?;
+
+  let res = feed_storage.feeds_list().await?;
+
+  let feeds_links = res.0.selected_rows
+  .iter()
+  .map( | feed | String::from( feed[ 1 ].clone() ) )
+  .collect::< Vec< _ > >()
+  ;
+
+  assert!( feeds_links.len() == 2 );
+  assert!( feeds_links.contains( &format!( "https://feeds.bbci.co.uk/news/world/rss.xml" ) ) );
+  assert!( feeds_links.contains( &format!( "https://rss.nytimes.com/services/xml/rss/nyt/World.xml" ) ) );
+
+  Ok( () )
+}
diff --git a/module/move/unitore/tests/config_delete.rs b/module/move/unitore/tests/config_delete.rs
new file mode 100644
index 0000000000..95870d4700
--- /dev/null
+++ b/module/move/unitore/tests/config_delete.rs
@@ -0,0 +1,42 @@
+use std::path::PathBuf;
+use gluesql::
+{
+  sled_storage::sled::Config,
+  prelude::Payload::Select,
+};
+use unitore::
+{
+  sled_adapter::FeedStorage,
+  entity::config::ConfigStore,
+  action::config,
+};
+use error_tools::Result;
+
+#[ tokio::test ]
+async fn config_delete() -> Result< () >
+{
+  let path = PathBuf::from( "./tests/fixtures/test_config.toml" );
+
+  let config = Config::default()
+  .path( "./test_del".to_owned() )
+  .temporary( true )
+  ;
+
+  let mut feed_storage = FeedStorage::init_storage( &config ).await?;
+  config::config_add( feed_storage.clone(), &path ).await?;
+
+  config::config_delete( feed_storage.clone(), &path ).await?;
+
+  let list = feed_storage.config_list().await?;
+
+  if let Select{ labels : _, rows } = list
+  {
+    assert!( rows.len() == 0 )
+  }
+  else
+  {
+    assert!( false );
+  }
+
+  Ok( () )
+}
diff --git a/module/move/unitore/tests/table_list.rs b/module/move/unitore/tests/table_list.rs
new file mode 100644
index 0000000000..dc840b3633
--- /dev/null
+++ b/module/move/unitore/tests/table_list.rs
@@ -0,0 +1,45 @@
+use gluesql::
+{
+    sled_storage::sled::Config,
+    prelude::{ Payload, Value::Str },
+};
+use unitore::
+{
+  sled_adapter::FeedStorage,
+  entity::table::TableStore,
+};
+use error_tools::Result;
+
+#[ tokio::test ]
+async fn table_list() -> Result< () >
+{
+  let config = Config::default()
+  .path( "./test_list".to_owned() )
+  .temporary( true )
+  ;
+  let mut feed_storage = FeedStorage::init_storage( &config ).await?;
+
+  let res = feed_storage.table_list( String::from( "feed" ) ).await?;
+
+  if let Payload::Select { labels: _, rows } = &res[ 0 ]
+  {
+    let column_names = rows
+    .iter()
+    .map( | row | row[ 1 ].clone() )
+    .collect::< Vec< _ > >()
+    ;
+  
+    assert_eq!( column_names.len(), 9 );
+    assert!( column_names.contains( &Str( String::from( "published") ) ) );
+    assert!( column_names.contains( &Str( String::from( "authors") ) ) );
+    assert!( column_names.contains( &Str( String::from( "description") ) ) );
+    assert!( column_names.contains( &Str( String::from( "type") ) ) );
+    assert!( column_names.contains( &Str( String::from( "title") ) ) );
+    assert!( column_names.contains( &Str( String::from( "updated") ) ) );
+    assert!( column_names.contains( &Str( String::from( "link") ) ) );
+    assert!( column_names.contains( &Str( String::from( "update_period" ) ) ) );
+    assert!( column_names.contains( &Str( String::from( "config_file" ) ) ) );
+  }
+
+  Ok( () )
+}
diff --git a/module/move/unitore/tests/tables_list.rs b/module/move/unitore/tests/tables_list.rs
new file mode 100644
index 0000000000..6b306b1c19
--- /dev/null
+++ b/module/move/unitore/tests/tables_list.rs
@@ -0,0 +1,32 @@
+use gluesql::sled_storage::sled::Config;
+use unitore::
+{
+  sled_adapter::FeedStorage,
+  entity::table::TableStore,
+};
+use error_tools::Result;
+
+#[ tokio::test ]
+async fn tables_list() -> Result< () >
+{
+  let config = Config::default()
+  .path( "./test_list".to_owned() )
+  .temporary( true )
+  ;
+
+  let mut feed_storage = FeedStorage::init_storage( &config ).await?;
+  let res = feed_storage.tables_list().await?;
+
+  let table_names = res.0
+  .iter()
+  .map( | ( table_name, _info ) | table_name )
+  .collect::< Vec< _ > >()
+  ;
+
+  assert_eq!( table_names.len(), 3 );
+  assert!( table_names.contains( &&String::from( "config") ) );
+  assert!( table_names.contains( &&String::from( "feed" ) ) );
+  assert!( table_names.contains( &&String::from( "frame" ) ) );
+
+  Ok( () )
+}

From 13bf12fe4d3584a55b250459d0e54a813599cb67 Mon Sep 17 00:00:00 2001
From: SupperZum <levchenko.d25@gmail.com>
Date: Wed, 10 Apr 2024 17:01:57 +0300
Subject: [PATCH 27/49] add common

---
 module/core/proper_path_tools/src/path.rs     |  77 ++-
 .../core/proper_path_tools/tests/inc/mod.rs   |   1 +
 .../tests/inc/path_common.rs                  | 490 ++++++++++++++++++
 3 files changed, 567 insertions(+), 1 deletion(-)
 create mode 100644 module/core/proper_path_tools/tests/inc/path_common.rs

diff --git a/module/core/proper_path_tools/src/path.rs b/module/core/proper_path_tools/src/path.rs
index 35560947f7..ce54b3f98d 100644
--- a/module/core/proper_path_tools/src/path.rs
+++ b/module/core/proper_path_tools/src/path.rs
@@ -301,11 +301,86 @@ pub( crate ) mod private
     Ok( format!( "{}_{}_{}_{}", timestamp, pid, tid, count ) )
   }
 
+  /// Finds the common directory path among a collection of paths.
+  ///
+  /// Given an iterator of path strings, this function determines the common directory
+  /// path shared by all paths. If no common directory path exists, it returns `None`.
+  ///
+  /// # Arguments
+  ///
+  /// * `paths` - An iterator of path strings (`&str`).
+  ///
+  /// # Returns
+  ///
+  /// * `Option<String>` - The common directory path shared by all paths, if it exists.
+  ///                      If no common directory path exists, returns `None`.
+  ///
+  /// # Examples
+  ///
+  /// ```
+  /// use proper_path_tools::path::::path_common;
+  ///
+  /// let paths = vec![ "/a/b/c", "/a/b/d", "/a/b/e" ];
+  /// let common_path = path_common( paths.into_iter() );
+  /// assert_eq!( common_path, Some( "/a/b/".to_string() ) );
+  /// ```
+  ///
+  pub fn path_common< 'a, I >( paths : I ) -> Option< String > 
+  where
+    I : Iterator< Item = &'a str >,
+  {
+    use std::collections::HashMap;
+
+    let paths : Vec< String > = paths.map( | path | path.to_string() ).collect();
+
+    if paths.is_empty() 
+    {
+      return None;
+    }
+
+    // Create a map to store directory frequencies
+    let mut dir_freqs : HashMap< String, usize > = HashMap::new();
+
+    // Iterate over paths to count directory frequencies
+    for path in paths.iter() 
+    {
+      // Split path into directories
+      let dirs : Vec< &str > = path.split( '/' ).collect();
+
+      // Iterate over directories
+      for i in 0..dirs.len() 
+      {
+        // Construct directory path
+        let dir_path = dirs[ 0..i + 1 ].join( "/" );
+        if dir_path.is_empty()
+        {
+          continue;
+        }
+        // Increment frequency count
+        *dir_freqs.entry( dir_path ).or_insert( 0 ) += 1;
+      }
+    }
+
+    // Find the directory with the highest frequency
+    let common_dir = dir_freqs
+    .into_iter()
+    .filter( | ( _, freq ) | *freq == paths.len() )
+    .map( | ( dir, _ ) | dir )
+    .max_by_key( | dir | dir.len() )
+    .unwrap_or_default();
+
+    let mut result = common_dir.to_string();
+    //result.push( '/' );
+    Some( result )
+
+
+  }
+
 }
 
 crate::mod_interface!
 {
-
+  protected use path_common;
   protected use is_glob;
   protected use normalize;
   protected use canonicalize;
diff --git a/module/core/proper_path_tools/tests/inc/mod.rs b/module/core/proper_path_tools/tests/inc/mod.rs
index cc74b4a975..c8565805a2 100644
--- a/module/core/proper_path_tools/tests/inc/mod.rs
+++ b/module/core/proper_path_tools/tests/inc/mod.rs
@@ -4,6 +4,7 @@ use super::*;
 mod path_normalize;
 mod path_is_glob;
 mod absolute_path;
+mod path_common;
 
 #[ cfg( feature = "path_unique_folder_name" ) ]
 mod path_unique_folder_name;
diff --git a/module/core/proper_path_tools/tests/inc/path_common.rs b/module/core/proper_path_tools/tests/inc/path_common.rs
new file mode 100644
index 0000000000..2f9dbbd395
--- /dev/null
+++ b/module/core/proper_path_tools/tests/inc/path_common.rs
@@ -0,0 +1,490 @@
+#[ allow( unused_imports ) ]
+use super::*;
+
+
+#[ test ]
+fn test_with_empty_array() 
+{
+  let paths : Vec< &str > = vec![];
+  let got = the_module::path::path_common( paths.into_iter() );
+  assert_eq!( got, None );
+}
+
+#[ test ]
+fn test_array() 
+{
+  let paths = vec![ "/a1/b2", "/a1/b" ];
+  let got = the_module::path::path_common( paths.into_iter() ).unwrap();
+  assert_eq!( got, "/a1/" );
+}
+
+#[ test ]
+fn test_absolute_absolute_have_common_dir() 
+{
+  let got = the_module::path::path_common( vec![ "/a1/b2", "/a1/a" ].into_iter() ).unwrap();
+  assert_eq!( got, "/a1/" );
+}
+
+#[ test ]
+fn test_absolute_absolute_have_common_dir_2() 
+{
+  let got = the_module::path::path_common( vec![ "/a1/b1/c", "/a1/b1/d", "/a1/b2" ].into_iter() ).unwrap();
+  assert_eq!( got, "/a1/" );
+}
+
+#[ test ]
+fn test_absolute_absolute_have_common_dir_and_part_of_name() 
+{
+  let got = the_module::path::path_common( vec![ "/a1/b2", "/a1/b1" ].into_iter() ).unwrap();
+  assert_eq!( got, "/a1/" );
+}
+
+#[ test ]
+fn test_absolute_absolute_one_path_has_dots_identical_paths() 
+{
+  let got = the_module::path::path_common( vec![ "/a1/x/../b1", "/a1/b1" ].into_iter() ).unwrap();
+  assert_eq!( got, "/a1/b1" );
+}
+
+#[ test ]
+fn test_absolute_absolute_more_than_one_dir_in_common_path() 
+{
+  let got = the_module::path::path_common( vec![ "/a1/b1/c1", "/a1/b1/c" ].into_iter() ).unwrap();
+  assert_eq!( got, "/a1/b1/" );
+}
+
+#[ test ]
+fn test_absolute_absolute_one_path_have_dots_no_common_dirs() 
+{
+  let got = the_module::path::path_common( vec![ "/a1/../../b1/c1", "/a1/b1/c1" ].into_iter() ).unwrap();
+  assert_eq!( got, "/" );
+}
+
+#[ test ]
+fn test_absolute_absolute_dir_name_is_part_of_another_dir_name() 
+{
+  let got = the_module::path::path_common( vec![ "/abcd", "/ab" ].into_iter() ).unwrap();
+  assert_eq!( got, "/" );
+}
+
+#[ test ]
+fn test_absolute_absolute_dir_names_has_dots_have_common_path() 
+{
+  let got = the_module::path::path_common( vec![ "/.a./.b./.c.", "/.a./.b./.c" ].into_iter() ).unwrap();
+  assert_eq!( got, "/.a./.b./" );
+}
+
+#[ test ]
+fn test_absolute_absolute_one_path_has_several_slashes_the_other_has_not_not_identical() 
+{
+  let got = the_module::path::path_common( vec![ "//a//b//c", "/a/b" ].into_iter() ).unwrap();
+  assert_eq!( got, "/" );
+}
+
+#[ test ]
+fn test_absolute_absolute_identical_paths_with_several_slashes() 
+{
+  let got = the_module::path::path_common( vec![ "/a//b", "/a//b" ].into_iter() ).unwrap();
+  assert_eq!( got, "/a//b" );
+}
+
+#[ test ]
+fn test_absolute_absolute_identical_paths_with_several_slashes_2() 
+{
+  let got = the_module::path::path_common( vec![ "/a//", "/a//" ].into_iter() ).unwrap();
+  assert_eq!( got, "/a//" );
+}
+
+#[ test ]
+fn test_absolute_absolute_one_path_has_here_token_dirs_identical_paths() 
+{
+  let got = the_module::path::path_common( vec![ "/./a/./b/./c", "/a/b" ].into_iter() ).unwrap();
+  assert_eq!( got, "/a/b" );
+}
+
+#[ test ]
+fn test_absolute_absolute_different_case_in_path_name_not_identical() 
+{
+  let got = the_module::path::path_common( vec![ "/A/b/c", "/a/b/c" ].into_iter() ).unwrap();
+  assert_eq!( got, "/" );
+}
+
+#[ test ]
+fn test_absolute_absolute_one_path_is_root_directory_common_root_directory() 
+{
+  let got = the_module::path::path_common( vec![ "/", "/x" ].into_iter() ).unwrap();
+  assert_eq!( got, "/" );
+}
+
+#[ test ]
+fn test_absolute_absolute_different_paths_in_root_directory_common_root_directory() 
+{
+  let got = the_module::path::path_common( vec![ "/a", "/x" ].into_iter() ).unwrap();
+  assert_eq!( got, "/" );
+}
+
+#[ test ]
+fn test_absolute_absolute_more_than_2_path_in_arguments() 
+{
+  let got = the_module::path::path_common( vec![ "/a/b/c", "/a/b/c", "/a/b/c", "/a/b/c" ].into_iter() ).unwrap();
+  assert_eq!( got, "/a/b/c" );
+}
+
+#[ test ]
+fn test_absolute_absolute_more_than_2_path_in_arguments_variant2() 
+{
+  let got = the_module::path::path_common( vec![ "/a/b/c", "/a/b/c", "/a/b" ].into_iter() ).unwrap();
+  assert_eq!( got, "/a/b" );
+}
+
+#[ test ]
+fn test_absolute_absolute_more_than_2_path_in_arguments_variant3() 
+{
+  let got = the_module::path::path_common( vec![ "/a/b/c", "/a/b/c", "/a/b1" ].into_iter() ).unwrap();
+  assert_eq!( got, "/a/" );
+}
+
+#[ test ]
+fn test_absolute_absolute_more_than_2_path_in_arguments_variant4() 
+{
+  let got = the_module::path::path_common( vec![ "/a/b/c", "/a/b/c", "/a" ].into_iter() ).unwrap();
+  assert_eq!( got, "/a" );
+}
+
+#[ test ]
+fn test_absolute_absolute_more_than_2_path_in_arguments_variant5() 
+{
+  let got = the_module::path::path_common( vec![ "/a/b/c", "/a/b/c", "/x" ].into_iter() ).unwrap();
+  assert_eq!( got, "/" );
+}
+
+#[ test ]
+fn test_absolute_absolute_more_than_2_path_in_arguments_variant6() 
+{
+  let got = the_module::path::path_common( vec![ "/a/b/c", "/a/b/c", "/" ].into_iter() ).unwrap();
+  assert_eq!( got, "/" );
+}
+
+
+
+
+
+
+
+
+
+// absolute-relative 
+
+#[ test ]
+fn test_absolute_relative_root_and_down_token() 
+{
+  let got = the_module::path::path_common( vec![ "/", ".." ].into_iter() ).unwrap();
+  assert_eq!( got, "/" );
+}
+
+#[ test ]
+fn test_absolute_relative_root_and_here_token() 
+{
+  let got = the_module::path::path_common( vec![ "/", "." ].into_iter() ).unwrap();
+  assert_eq!( got, "/" );
+}
+
+#[ test ]
+fn test_absolute_relative_root_and_some_relative_directory() 
+{
+  let got = the_module::path::path_common( vec![ "/", "x" ].into_iter() ).unwrap();
+  assert_eq!( got, "/" );
+}
+
+#[ test ]
+fn test_absolute_relative_root_and_double_down_token_in_path() 
+{
+  let got = the_module::path::path_common( vec![ "/", "../.." ].into_iter() ).unwrap();
+  assert_eq!( got, "/" );
+}
+
+#[ test ]
+fn test_absolute_relative_root_with_here_token_and_down_token() 
+{
+  let got = the_module::path::path_common( vec![ "/.", ".." ].into_iter() ).unwrap();
+  assert_eq!( got, "/" );
+}
+
+#[ test ]
+fn test_absolute_relative_root_with_here_token_and_here_token() 
+{
+  let got = the_module::path::path_common( vec![ "/.", "." ].into_iter() ).unwrap();
+  assert_eq!( got, "/" );
+}
+
+#[ test ]
+fn test_absolute_relative_root_with_here_token_and_some_relative_directory() 
+{
+  let got = the_module::path::path_common( vec![ "/.", "x" ].into_iter() ).unwrap();
+  assert_eq!( got, "/" );
+}
+
+#[ test ]
+fn test_absolute_relative_root_with_here_token_and_double_down_token_in_path() 
+{
+  let got = the_module::path::path_common( vec![ "/.", "../.." ].into_iter() ).unwrap();
+  assert_eq!( got, "/" );
+}
+
+
+
+
+
+
+
+// relative - relative
+#[ test ]
+fn test_relative_relative_common_dir() 
+{
+  let got = the_module::path::path_common( vec![ "a1/b2", "a1/a" ].into_iter() ).unwrap();
+  assert_eq!( got, "a1/" );
+}
+
+#[ test ]
+fn test_relative_relative_common_dir_and_part_of_dir_names() 
+{
+  let got = the_module::path::path_common( vec![ "a1/b2", "a1/b1" ].into_iter() ).unwrap();
+  assert_eq!( got, "a1/" );
+}
+
+#[ test ]
+fn test_relative_relative_one_path_with_down_token_dir_identical_paths() 
+{
+  let got = the_module::path::path_common( vec![ "a1/x/../b1", "a1/b1" ].into_iter() ).unwrap();
+  assert_eq!( got, "a1/b1" );
+}
+
+#[ test ]
+fn test_relative_relative_paths_begins_with_here_token_directory_dots_identical_paths() 
+{
+  let got = the_module::path::path_common( vec![ "./a1/x/../b1", "./a1/b1" ].into_iter() ).unwrap();
+  assert_eq!( got, "a1/b1" );
+}
+
+#[ test ]
+fn test_relative_relative_one_path_begins_with_here_token_dir_another_down_token() 
+{
+  let got = the_module::path::path_common( vec![ "./a1/x/../b1", "../a1/b1" ].into_iter() ).unwrap();
+  assert_eq!( got, ".." );
+}
+
+#[ test ]
+fn test_relative_relative_here_token_and_down_token() 
+{
+  let got = the_module::path::path_common( vec![ ".", ".." ].into_iter() ).unwrap();
+  assert_eq!( got, ".." );
+}
+
+#[ test ]
+fn test_relative_relative_different_paths_start_with_here_token_dir() 
+{
+  let got = the_module::path::path_common( vec![ "./b/c", "./x" ].into_iter() ).unwrap();
+  assert_eq!( got, "." );
+}
+
+
+
+
+//combinations of paths with dots
+
+#[ test ]
+fn test_relative_relative_combinations_of_paths_with_dots() 
+{
+  let got = the_module::path::path_common( vec![ "./././a", "./a/b" ].into_iter() ).unwrap();
+  assert_eq!( got, "a" );
+}
+
+#[ test ]
+fn test_relative_relative_combinations_of_paths_with_dots_variant2() 
+{
+  let got = the_module::path::path_common( vec![ "./a/./b", "./a/b" ].into_iter() ).unwrap();
+  assert_eq!( got, "a/b" );
+}
+
+#[ test ]
+fn test_relative_relative_combinations_of_paths_with_dots_variant3() 
+{
+  let got = the_module::path::path_common( vec![ "./a/./b", "./a/c/../b" ].into_iter() ).unwrap();
+  assert_eq!( got, "a/b" );
+}
+
+#[ test ]
+fn test_relative_relative_combinations_of_paths_with_dots_variant4() 
+{
+  let got = the_module::path::path_common( vec![ "../b/c", "./x" ].into_iter() ).unwrap();
+  assert_eq!( got, ".." );
+}
+
+#[ test ]
+fn test_relative_relative_combinations_of_paths_with_dots_variant5() 
+{
+  let got = the_module::path::path_common( vec![ "../../b/c", "../b" ].into_iter() ).unwrap();
+  assert_eq!( got, "../.." );
+}
+
+#[ test ]
+fn test_relative_relative_combinations_of_paths_with_dots_variant6() 
+{
+  let got = the_module::path::path_common( vec![ "../../b/c", "../../../x" ].into_iter() ).unwrap();
+  assert_eq!( got, "../../.." );
+}
+
+#[ test ]
+fn test_relative_relative_combinations_of_paths_with_dots_variant7() 
+{
+  let got = the_module::path::path_common( vec![ "../../b/c/../../x", "../../../x" ].into_iter() ).unwrap();
+  assert_eq!( got, "../../.." );
+}
+
+#[ test ]
+fn test_relative_relative_combinations_of_paths_with_dots_variant8() 
+{
+  let got = the_module::path::path_common( vec![ "./../../b/c/../../x", "./../../../x" ].into_iter() ).unwrap();
+  assert_eq!( got, "../../.." );
+}
+
+#[ test ]
+fn test_relative_relative_combinations_of_paths_with_dots_variant9() 
+{
+  let got = the_module::path::path_common( vec![ "../../..", "./../../.." ].into_iter() ).unwrap();
+  assert_eq!( got, "../../.." );
+}
+
+#[ test ]
+fn test_relative_relative_combinations_of_paths_with_dots_variant10() 
+{
+  let got = the_module::path::path_common( vec![ "./../../..", "./../../.." ].into_iter() ).unwrap();
+  assert_eq!( got, "../../.." );
+}
+
+#[ test ]
+fn test_relative_relative_combinations_of_paths_with_dots_variant11() 
+{
+  let got = the_module::path::path_common( vec![ "../../..", "../../.." ].into_iter() ).unwrap();
+  assert_eq!( got, "../../.." );
+}
+
+#[ test ]
+fn test_relative_relative_combinations_of_paths_with_dots_variant12() 
+{
+  let got = the_module::path::path_common( vec![ "../b", "../b" ].into_iter() ).unwrap();
+  assert_eq!( got, "../b" );
+}
+
+#[ test ]
+fn test_relative_relative_combinations_of_paths_with_dots_variant13() 
+{
+  let got = the_module::path::path_common( vec![ "../b", "./../b" ].into_iter() ).unwrap();
+  assert_eq!( got, "../b" );
+}
+
+#[ test ]
+fn test_relative_relative_several_relative_paths() 
+{
+  let got = the_module::path::path_common( vec![ "a/b/c", "a/b/c", "a/b/c" ].into_iter() ).unwrap();
+  assert_eq!( got, "a/b/c" );
+}
+
+#[ test ]
+fn test_relative_relative_several_relative_paths_variant2() 
+{
+  let got = the_module::path::path_common( vec![ "a/b/c", "a/b/c", "a/b" ].into_iter() ).unwrap();
+  assert_eq!( got, "a/b" );
+}
+
+#[ test ]
+fn test_relative_relative_several_relative_paths_variant3() 
+{
+  let got = the_module::path::path_common( vec![ "a/b/c", "a/b/c", "a/b1" ].into_iter() ).unwrap();
+  assert_eq!( got, "a/" );
+}
+
+#[ test ]
+fn test_relative_relative_several_relative_paths_variant4() 
+{
+  let got = the_module::path::path_common( vec![ "a/b/c", "a/b/c", "." ].into_iter() ).unwrap();
+  assert_eq!( got, "." );
+}
+
+#[ test ]
+fn test_relative_relative_several_relative_paths_variant5() 
+{
+  let got = the_module::path::path_common( vec![ "a/b/c", "a/b/c", "x" ].into_iter() ).unwrap();
+  assert_eq!( got, "." );
+}
+
+#[ test ]
+fn test_relative_relative_several_relative_paths_variant6() 
+{
+  let got = the_module::path::path_common( vec![ "a/b/c", "a/b/c", "./" ].into_iter() ).unwrap();
+  assert_eq!( got, "." );
+}
+
+#[ test ]
+fn test_relative_relative_several_relative_paths_variant7() 
+{
+  let got = the_module::path::path_common( vec![ "../a/b/c", "a/../b/c", "a/b/../c" ].into_iter() ).unwrap();
+  assert_eq!( got, ".." );
+}
+
+#[ test ]
+fn test_relative_relative_several_relative_paths_variant8() 
+{
+  let got = the_module::path::path_common( vec![ "./a/b/c", "../../a/b/c", "../../../a/b" ].into_iter() ).unwrap();
+  assert_eq!( got, "../../.." );
+}
+
+#[ test ]
+fn test_relative_relative_dot_and_double_up_and_down_tokens() 
+{
+  let got = the_module::path::path_common( vec![ ".", "./", ".." ].into_iter() ).unwrap();
+  assert_eq!( got, ".." );
+}
+
+#[ test ]
+fn test_relative_relative_dot_and_double_up_and_down_tokens_variant2() 
+{
+  let got = the_module::path::path_common( vec![ ".", "./../..", ".." ].into_iter() ).unwrap();
+  assert_eq!( got, "../.." );
+}
+
+/* 
+#[ test ]
+#[ should_panic ]
+fn test_first_path_is_absolute_another_is_dots() 
+{
+  the_module::path::path_common( vec![ "/a", ".."]);
+}
+
+#[ test ]
+#[ should_panic ]
+fn test_first_path_is_dots_and_absolute_path() 
+{
+  the_module::path::path_common( vec![ "..", "../../b/c", "/a"]);
+}
+
+#[ test ]
+#[ should_panic ]
+fn test_first_path_is_dots_and_absolute_path_variant2() 
+{
+  the_module::path::path_common( vec![ "../..", "../../b/c", "/a"]);
+}
+
+#[ test ]
+#[ should_panic ]
+fn test_unknown_path() 
+{
+  the_module::path::path_common( vec![ "/a", "x"]);
+}
+
+#[ test ]
+#[ should_panic ]
+fn test_unknown_path_variant2() 
+{
+  the_module::path::path_common( vec![ "x", "/a/b/c", "/a"]);
+}  */
\ No newline at end of file

From 67e8628bf72c0c17fa0171f2f8ef6da3f84a0e8c Mon Sep 17 00:00:00 2001
From: SRetip <shvayko.p.y@gmail.com>
Date: Thu, 11 Apr 2024 10:58:54 +0300
Subject: [PATCH 28/49] fix

---
 .github/workflows/module_cargo_will_push.yml                | 2 +-
 .github/workflows/module_clone_dyn_meta_push.yml            | 2 +-
 .github/workflows/module_clone_dyn_push.yml                 | 2 +-
 .github/workflows/module_collection_tools_push.yml          | 2 +-
 .github/workflows/module_crates_tools_push.yml              | 2 +-
 .github/workflows/module_data_type_push.yml                 | 2 +-
 .github/workflows/module_derive_tools_meta_push.yml         | 2 +-
 .github/workflows/module_derive_tools_push.yml              | 2 +-
 .github/workflows/module_deterministic_rand_push.yml        | 2 +-
 .github/workflows/module_diagnostics_tools_push.yml         | 2 +-
 .github/workflows/module_error_tools_push.yml               | 2 +-
 .github/workflows/module_exe_tools_push.yml                 | 2 +-
 .github/workflows/module_file_tools_push.yml                | 2 +-
 .github/workflows/module_for_each_push.yml                  | 2 +-
 .github/workflows/module_former_meta_push.yml               | 2 +-
 .github/workflows/module_former_push.yml                    | 2 +-
 .github/workflows/module_fs_tools_push.yml                  | 2 +-
 .github/workflows/module_fundamental_data_type_push.yml     | 2 +-
 .github/workflows/module_graphs_tools_push.yml              | 2 +-
 .github/workflows/module_image_tools_push.yml               | 2 +-
 .github/workflows/module_implements_push.yml                | 2 +-
 .github/workflows/module_impls_index_meta_push.yml          | 2 +-
 .github/workflows/module_impls_index_push.yml               | 2 +-
 .github/workflows/module_include_md_push.yml                | 2 +-
 .github/workflows/module_inspect_type_push.yml              | 2 +-
 .github/workflows/module_instance_of_push.yml               | 2 +-
 .github/workflows/module_interval_adapter_push.yml          | 2 +-
 .github/workflows/module_is_slice_push.yml                  | 2 +-
 .github/workflows/module_iter_tools_push.yml                | 2 +-
 .github/workflows/module_macro_tools_push.yml               | 2 +-
 .github/workflows/module_math_tools_push.yml                | 2 +-
 .github/workflows/module_mem_tools_push.yml                 | 2 +-
 .github/workflows/module_meta_tools_push.yml                | 2 +-
 .github/workflows/module_mod_interface_meta_push.yml        | 2 +-
 .github/workflows/module_mod_interface_push.yml             | 2 +-
 .github/workflows/module_multilayer_push.yml                | 2 +-
 .github/workflows/module_optimization_tools_push.yml        | 2 +-
 .github/workflows/module_plot_interface_push.yml            | 2 +-
 .github/workflows/module_proc_macro_tools_push.yml          | 2 +-
 .github/workflows/module_process_tools_push.yml             | 2 +-
 .github/workflows/module_proper_path_tools_push.yml         | 2 +-
 .github/workflows/module_proper_tools_push.yml              | 2 +-
 .github/workflows/module_refiner_push.yml                   | 2 +-
 .github/workflows/module_reflect_tools_meta_push.yml        | 2 +-
 .github/workflows/module_reflect_tools_push.yml             | 2 +-
 .github/workflows/module_sqlx_query_push.yml                | 2 +-
 .github/workflows/module_strs_tools_push.yml                | 2 +-
 .github/workflows/module_test_experimental_a_push.yml       | 2 +-
 .github/workflows/module_test_experimental_b_push.yml       | 2 +-
 .github/workflows/module_test_experimental_c_push.yml       | 2 +-
 .github/workflows/module_test_tools_push.yml                | 2 +-
 .github/workflows/module_time_tools_push.yml                | 2 +-
 .github/workflows/module_typing_tools_push.yml              | 2 +-
 .github/workflows/module_unitore_push.yml                   | 2 +-
 .github/workflows/module_variadic_from_push.yml             | 2 +-
 .github/workflows/module_w_4_d_push.yml                     | 2 +-
 .github/workflows/module_wca_push.yml                       | 2 +-
 .github/workflows/module_werror_push.yml                    | 2 +-
 .github/workflows/module_willbe_2_push.yml                  | 2 +-
 .github/workflows/module_willbe_old_push.yml                | 2 +-
 .github/workflows/module_willbe_push.yml                    | 2 +-
 .github/workflows/module_winterval_push.yml                 | 2 +-
 .github/workflows/module_wlang_push.yml                     | 2 +-
 .github/workflows/module_wplot_push.yml                     | 2 +-
 .github/workflows/module_wproc_macro_push.yml               | 2 +-
 .github/workflows/module_wstring_tools_push.yml             | 2 +-
 .github/workflows/module_wtest_basic_push.yml               | 2 +-
 .github/workflows/module_wtest_push.yml                     | 2 +-
 .github/workflows/module_wtools_push.yml                    | 2 +-
 .github/workflows/standard_rust_push.yml                    | 6 +++---
 module/move/willbe/template/workflow/module_push.hbs        | 2 +-
 module/move/willbe/template/workflow/standard_rust_push.yml | 6 +++---
 .../willbe/template/workflow/standard_rust_scheduled.yml    | 2 --
 module/move/willbe/tests/inc/action/cicd_renew.rs           | 2 +-
 74 files changed, 77 insertions(+), 79 deletions(-)

diff --git a/.github/workflows/module_cargo_will_push.yml b/.github/workflows/module_cargo_will_push.yml
index 21f10e3bf2..302282174f 100644
--- a/.github/workflows/module_cargo_will_push.yml
+++ b/.github/workflows/module_cargo_will_push.yml
@@ -2,7 +2,7 @@ name : cargo_will
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_clone_dyn_meta_push.yml b/.github/workflows/module_clone_dyn_meta_push.yml
index c7bba8273c..d9d94012f5 100644
--- a/.github/workflows/module_clone_dyn_meta_push.yml
+++ b/.github/workflows/module_clone_dyn_meta_push.yml
@@ -2,7 +2,7 @@ name : clone_dyn_meta
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_clone_dyn_push.yml b/.github/workflows/module_clone_dyn_push.yml
index c317d7a905..d7b480578b 100644
--- a/.github/workflows/module_clone_dyn_push.yml
+++ b/.github/workflows/module_clone_dyn_push.yml
@@ -2,7 +2,7 @@ name : clone_dyn
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_collection_tools_push.yml b/.github/workflows/module_collection_tools_push.yml
index b15ad33e2d..d1325627e2 100644
--- a/.github/workflows/module_collection_tools_push.yml
+++ b/.github/workflows/module_collection_tools_push.yml
@@ -2,7 +2,7 @@ name : collection_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_crates_tools_push.yml b/.github/workflows/module_crates_tools_push.yml
index 7584d03db9..1b06311c6c 100644
--- a/.github/workflows/module_crates_tools_push.yml
+++ b/.github/workflows/module_crates_tools_push.yml
@@ -2,7 +2,7 @@ name : crates_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_data_type_push.yml b/.github/workflows/module_data_type_push.yml
index f97d698bf7..64fa876fc6 100644
--- a/.github/workflows/module_data_type_push.yml
+++ b/.github/workflows/module_data_type_push.yml
@@ -2,7 +2,7 @@ name : data_type
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_derive_tools_meta_push.yml b/.github/workflows/module_derive_tools_meta_push.yml
index 66b6bae97f..4bbc62af5a 100644
--- a/.github/workflows/module_derive_tools_meta_push.yml
+++ b/.github/workflows/module_derive_tools_meta_push.yml
@@ -2,7 +2,7 @@ name : derive_tools_meta
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_derive_tools_push.yml b/.github/workflows/module_derive_tools_push.yml
index 90eaa4abaf..723b900d2d 100644
--- a/.github/workflows/module_derive_tools_push.yml
+++ b/.github/workflows/module_derive_tools_push.yml
@@ -2,7 +2,7 @@ name : derive_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_deterministic_rand_push.yml b/.github/workflows/module_deterministic_rand_push.yml
index 551a13100b..a761d7cb83 100644
--- a/.github/workflows/module_deterministic_rand_push.yml
+++ b/.github/workflows/module_deterministic_rand_push.yml
@@ -2,7 +2,7 @@ name : deterministic_rand
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_diagnostics_tools_push.yml b/.github/workflows/module_diagnostics_tools_push.yml
index f9b78da3ad..cdb337ebd1 100644
--- a/.github/workflows/module_diagnostics_tools_push.yml
+++ b/.github/workflows/module_diagnostics_tools_push.yml
@@ -2,7 +2,7 @@ name : diagnostics_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_error_tools_push.yml b/.github/workflows/module_error_tools_push.yml
index 80c57d84d3..39c342f339 100644
--- a/.github/workflows/module_error_tools_push.yml
+++ b/.github/workflows/module_error_tools_push.yml
@@ -2,7 +2,7 @@ name : error_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_exe_tools_push.yml b/.github/workflows/module_exe_tools_push.yml
index e1ae566533..f340a4bbd6 100644
--- a/.github/workflows/module_exe_tools_push.yml
+++ b/.github/workflows/module_exe_tools_push.yml
@@ -2,7 +2,7 @@ name : exe_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_file_tools_push.yml b/.github/workflows/module_file_tools_push.yml
index 21d3f0b973..f6bc6e7ae6 100644
--- a/.github/workflows/module_file_tools_push.yml
+++ b/.github/workflows/module_file_tools_push.yml
@@ -2,7 +2,7 @@ name : file_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_for_each_push.yml b/.github/workflows/module_for_each_push.yml
index c6ee0c63fb..6b8fb841df 100644
--- a/.github/workflows/module_for_each_push.yml
+++ b/.github/workflows/module_for_each_push.yml
@@ -2,7 +2,7 @@ name : for_each
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_former_meta_push.yml b/.github/workflows/module_former_meta_push.yml
index ef166669ca..48d9ab029c 100644
--- a/.github/workflows/module_former_meta_push.yml
+++ b/.github/workflows/module_former_meta_push.yml
@@ -2,7 +2,7 @@ name : former_meta
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_former_push.yml b/.github/workflows/module_former_push.yml
index 33439f4ffe..f5757ce568 100644
--- a/.github/workflows/module_former_push.yml
+++ b/.github/workflows/module_former_push.yml
@@ -2,7 +2,7 @@ name : former
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_fs_tools_push.yml b/.github/workflows/module_fs_tools_push.yml
index 31d4f31aba..a0a5933d00 100644
--- a/.github/workflows/module_fs_tools_push.yml
+++ b/.github/workflows/module_fs_tools_push.yml
@@ -2,7 +2,7 @@ name : fs_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_fundamental_data_type_push.yml b/.github/workflows/module_fundamental_data_type_push.yml
index 5d22e3e2c7..e1b249f10a 100644
--- a/.github/workflows/module_fundamental_data_type_push.yml
+++ b/.github/workflows/module_fundamental_data_type_push.yml
@@ -2,7 +2,7 @@ name : fundamental_data_type
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_graphs_tools_push.yml b/.github/workflows/module_graphs_tools_push.yml
index e455ddff27..171b256c36 100644
--- a/.github/workflows/module_graphs_tools_push.yml
+++ b/.github/workflows/module_graphs_tools_push.yml
@@ -2,7 +2,7 @@ name : graphs_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_image_tools_push.yml b/.github/workflows/module_image_tools_push.yml
index 4e14f26d7f..ca8bc1059c 100644
--- a/.github/workflows/module_image_tools_push.yml
+++ b/.github/workflows/module_image_tools_push.yml
@@ -2,7 +2,7 @@ name : image_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_implements_push.yml b/.github/workflows/module_implements_push.yml
index 2e5705e763..76efd0b848 100644
--- a/.github/workflows/module_implements_push.yml
+++ b/.github/workflows/module_implements_push.yml
@@ -2,7 +2,7 @@ name : implements
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_impls_index_meta_push.yml b/.github/workflows/module_impls_index_meta_push.yml
index 0b48e4a551..da1fc0c8bd 100644
--- a/.github/workflows/module_impls_index_meta_push.yml
+++ b/.github/workflows/module_impls_index_meta_push.yml
@@ -2,7 +2,7 @@ name : impls_index_meta
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_impls_index_push.yml b/.github/workflows/module_impls_index_push.yml
index 461b3073e6..bffccc6c8e 100644
--- a/.github/workflows/module_impls_index_push.yml
+++ b/.github/workflows/module_impls_index_push.yml
@@ -2,7 +2,7 @@ name : impls_index
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_include_md_push.yml b/.github/workflows/module_include_md_push.yml
index 8c18229ca9..d48608d38e 100644
--- a/.github/workflows/module_include_md_push.yml
+++ b/.github/workflows/module_include_md_push.yml
@@ -2,7 +2,7 @@ name : include_md
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_inspect_type_push.yml b/.github/workflows/module_inspect_type_push.yml
index 4c5052e2d5..79f7219395 100644
--- a/.github/workflows/module_inspect_type_push.yml
+++ b/.github/workflows/module_inspect_type_push.yml
@@ -2,7 +2,7 @@ name : inspect_type
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_instance_of_push.yml b/.github/workflows/module_instance_of_push.yml
index c8854f4644..52403c3004 100644
--- a/.github/workflows/module_instance_of_push.yml
+++ b/.github/workflows/module_instance_of_push.yml
@@ -2,7 +2,7 @@ name : instance_of
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_interval_adapter_push.yml b/.github/workflows/module_interval_adapter_push.yml
index af32acd608..f720644edc 100644
--- a/.github/workflows/module_interval_adapter_push.yml
+++ b/.github/workflows/module_interval_adapter_push.yml
@@ -2,7 +2,7 @@ name : interval_adapter
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_is_slice_push.yml b/.github/workflows/module_is_slice_push.yml
index ea170197e3..469ad60f45 100644
--- a/.github/workflows/module_is_slice_push.yml
+++ b/.github/workflows/module_is_slice_push.yml
@@ -2,7 +2,7 @@ name : is_slice
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_iter_tools_push.yml b/.github/workflows/module_iter_tools_push.yml
index 01a24dcffa..e309b039bb 100644
--- a/.github/workflows/module_iter_tools_push.yml
+++ b/.github/workflows/module_iter_tools_push.yml
@@ -2,7 +2,7 @@ name : iter_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_macro_tools_push.yml b/.github/workflows/module_macro_tools_push.yml
index 99f51d2309..b6bfa53f2c 100644
--- a/.github/workflows/module_macro_tools_push.yml
+++ b/.github/workflows/module_macro_tools_push.yml
@@ -2,7 +2,7 @@ name : macro_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_math_tools_push.yml b/.github/workflows/module_math_tools_push.yml
index d113b1b198..07e965fbf1 100644
--- a/.github/workflows/module_math_tools_push.yml
+++ b/.github/workflows/module_math_tools_push.yml
@@ -2,7 +2,7 @@ name : math_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_mem_tools_push.yml b/.github/workflows/module_mem_tools_push.yml
index abfb7b259f..acca4cac93 100644
--- a/.github/workflows/module_mem_tools_push.yml
+++ b/.github/workflows/module_mem_tools_push.yml
@@ -2,7 +2,7 @@ name : mem_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_meta_tools_push.yml b/.github/workflows/module_meta_tools_push.yml
index 6ab35166ff..8aacc2691f 100644
--- a/.github/workflows/module_meta_tools_push.yml
+++ b/.github/workflows/module_meta_tools_push.yml
@@ -2,7 +2,7 @@ name : meta_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_mod_interface_meta_push.yml b/.github/workflows/module_mod_interface_meta_push.yml
index a66cafb922..c7a1ed7477 100644
--- a/.github/workflows/module_mod_interface_meta_push.yml
+++ b/.github/workflows/module_mod_interface_meta_push.yml
@@ -2,7 +2,7 @@ name : mod_interface_meta
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_mod_interface_push.yml b/.github/workflows/module_mod_interface_push.yml
index ea0077a7bc..2f0bd2f75a 100644
--- a/.github/workflows/module_mod_interface_push.yml
+++ b/.github/workflows/module_mod_interface_push.yml
@@ -2,7 +2,7 @@ name : mod_interface
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_multilayer_push.yml b/.github/workflows/module_multilayer_push.yml
index c0651726fe..a2929d01d9 100644
--- a/.github/workflows/module_multilayer_push.yml
+++ b/.github/workflows/module_multilayer_push.yml
@@ -2,7 +2,7 @@ name : multilayer
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_optimization_tools_push.yml b/.github/workflows/module_optimization_tools_push.yml
index 5083841c3f..8a1c8cf89d 100644
--- a/.github/workflows/module_optimization_tools_push.yml
+++ b/.github/workflows/module_optimization_tools_push.yml
@@ -2,7 +2,7 @@ name : optimization_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_plot_interface_push.yml b/.github/workflows/module_plot_interface_push.yml
index 8a1bb71727..22ed8a9c72 100644
--- a/.github/workflows/module_plot_interface_push.yml
+++ b/.github/workflows/module_plot_interface_push.yml
@@ -2,7 +2,7 @@ name : plot_interface
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_proc_macro_tools_push.yml b/.github/workflows/module_proc_macro_tools_push.yml
index 936b353d90..d9aafa1cbb 100644
--- a/.github/workflows/module_proc_macro_tools_push.yml
+++ b/.github/workflows/module_proc_macro_tools_push.yml
@@ -2,7 +2,7 @@ name : proc_macro_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_process_tools_push.yml b/.github/workflows/module_process_tools_push.yml
index 895457b3b9..217cc648de 100644
--- a/.github/workflows/module_process_tools_push.yml
+++ b/.github/workflows/module_process_tools_push.yml
@@ -2,7 +2,7 @@ name : process_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_proper_path_tools_push.yml b/.github/workflows/module_proper_path_tools_push.yml
index fcff1bb334..e7adc2bbb2 100644
--- a/.github/workflows/module_proper_path_tools_push.yml
+++ b/.github/workflows/module_proper_path_tools_push.yml
@@ -2,7 +2,7 @@ name : proper_path_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_proper_tools_push.yml b/.github/workflows/module_proper_tools_push.yml
index 7e1ff42c3e..798d19b582 100644
--- a/.github/workflows/module_proper_tools_push.yml
+++ b/.github/workflows/module_proper_tools_push.yml
@@ -2,7 +2,7 @@ name : proper_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_refiner_push.yml b/.github/workflows/module_refiner_push.yml
index d05c5b7721..e48de2c4ec 100644
--- a/.github/workflows/module_refiner_push.yml
+++ b/.github/workflows/module_refiner_push.yml
@@ -2,7 +2,7 @@ name : refiner
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_reflect_tools_meta_push.yml b/.github/workflows/module_reflect_tools_meta_push.yml
index a799d1203c..d8319d1eaa 100644
--- a/.github/workflows/module_reflect_tools_meta_push.yml
+++ b/.github/workflows/module_reflect_tools_meta_push.yml
@@ -2,7 +2,7 @@ name : reflect_tools_meta
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_reflect_tools_push.yml b/.github/workflows/module_reflect_tools_push.yml
index 8cd20cba88..7384babc65 100644
--- a/.github/workflows/module_reflect_tools_push.yml
+++ b/.github/workflows/module_reflect_tools_push.yml
@@ -2,7 +2,7 @@ name : reflect_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_sqlx_query_push.yml b/.github/workflows/module_sqlx_query_push.yml
index 8971a72e9c..896a0ebcbd 100644
--- a/.github/workflows/module_sqlx_query_push.yml
+++ b/.github/workflows/module_sqlx_query_push.yml
@@ -2,7 +2,7 @@ name : sqlx_query
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_strs_tools_push.yml b/.github/workflows/module_strs_tools_push.yml
index c78284be32..b62f5d0ff6 100644
--- a/.github/workflows/module_strs_tools_push.yml
+++ b/.github/workflows/module_strs_tools_push.yml
@@ -2,7 +2,7 @@ name : strs_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_test_experimental_a_push.yml b/.github/workflows/module_test_experimental_a_push.yml
index d1c9875c6e..3b8f21e98a 100644
--- a/.github/workflows/module_test_experimental_a_push.yml
+++ b/.github/workflows/module_test_experimental_a_push.yml
@@ -2,7 +2,7 @@ name : test_experimental_a
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_test_experimental_b_push.yml b/.github/workflows/module_test_experimental_b_push.yml
index 64273ba81a..7eb23049bc 100644
--- a/.github/workflows/module_test_experimental_b_push.yml
+++ b/.github/workflows/module_test_experimental_b_push.yml
@@ -2,7 +2,7 @@ name : test_experimental_b
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_test_experimental_c_push.yml b/.github/workflows/module_test_experimental_c_push.yml
index 6357d5a962..8d44763090 100644
--- a/.github/workflows/module_test_experimental_c_push.yml
+++ b/.github/workflows/module_test_experimental_c_push.yml
@@ -2,7 +2,7 @@ name : test_experimental_c
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_test_tools_push.yml b/.github/workflows/module_test_tools_push.yml
index 9a474a75b8..d75629dc41 100644
--- a/.github/workflows/module_test_tools_push.yml
+++ b/.github/workflows/module_test_tools_push.yml
@@ -2,7 +2,7 @@ name : test_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_time_tools_push.yml b/.github/workflows/module_time_tools_push.yml
index fb7cbaf00d..49d89bb2e9 100644
--- a/.github/workflows/module_time_tools_push.yml
+++ b/.github/workflows/module_time_tools_push.yml
@@ -2,7 +2,7 @@ name : time_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_typing_tools_push.yml b/.github/workflows/module_typing_tools_push.yml
index dadb561f77..c3e0040579 100644
--- a/.github/workflows/module_typing_tools_push.yml
+++ b/.github/workflows/module_typing_tools_push.yml
@@ -2,7 +2,7 @@ name : typing_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_unitore_push.yml b/.github/workflows/module_unitore_push.yml
index f783dfab5a..1dca0c370d 100644
--- a/.github/workflows/module_unitore_push.yml
+++ b/.github/workflows/module_unitore_push.yml
@@ -2,7 +2,7 @@ name : unitore
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_variadic_from_push.yml b/.github/workflows/module_variadic_from_push.yml
index eee1477a41..c147ba0aa5 100644
--- a/.github/workflows/module_variadic_from_push.yml
+++ b/.github/workflows/module_variadic_from_push.yml
@@ -2,7 +2,7 @@ name : variadic_from
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_w_4_d_push.yml b/.github/workflows/module_w_4_d_push.yml
index 219c5fd8e5..3f8ff05a50 100644
--- a/.github/workflows/module_w_4_d_push.yml
+++ b/.github/workflows/module_w_4_d_push.yml
@@ -2,7 +2,7 @@ name : w4d
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_wca_push.yml b/.github/workflows/module_wca_push.yml
index 798c576102..e4a77a1e67 100644
--- a/.github/workflows/module_wca_push.yml
+++ b/.github/workflows/module_wca_push.yml
@@ -2,7 +2,7 @@ name : wca
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_werror_push.yml b/.github/workflows/module_werror_push.yml
index 09ad347aa2..563ab2e63f 100644
--- a/.github/workflows/module_werror_push.yml
+++ b/.github/workflows/module_werror_push.yml
@@ -2,7 +2,7 @@ name : werror
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_willbe_2_push.yml b/.github/workflows/module_willbe_2_push.yml
index ae4e87a73c..65631a35b5 100644
--- a/.github/workflows/module_willbe_2_push.yml
+++ b/.github/workflows/module_willbe_2_push.yml
@@ -2,7 +2,7 @@ name : willbe2
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_willbe_old_push.yml b/.github/workflows/module_willbe_old_push.yml
index 6a8e058144..231a5784dd 100644
--- a/.github/workflows/module_willbe_old_push.yml
+++ b/.github/workflows/module_willbe_old_push.yml
@@ -2,7 +2,7 @@ name : willbe_old
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_willbe_push.yml b/.github/workflows/module_willbe_push.yml
index 4cf9a39d0b..701f8cdc2f 100644
--- a/.github/workflows/module_willbe_push.yml
+++ b/.github/workflows/module_willbe_push.yml
@@ -2,7 +2,7 @@ name : willbe
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_winterval_push.yml b/.github/workflows/module_winterval_push.yml
index 7262cf18d6..39c87febbf 100644
--- a/.github/workflows/module_winterval_push.yml
+++ b/.github/workflows/module_winterval_push.yml
@@ -2,7 +2,7 @@ name : winterval
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_wlang_push.yml b/.github/workflows/module_wlang_push.yml
index 02552efea4..ab1bbd2c96 100644
--- a/.github/workflows/module_wlang_push.yml
+++ b/.github/workflows/module_wlang_push.yml
@@ -2,7 +2,7 @@ name : wlang
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_wplot_push.yml b/.github/workflows/module_wplot_push.yml
index 647c12b523..833466e0d0 100644
--- a/.github/workflows/module_wplot_push.yml
+++ b/.github/workflows/module_wplot_push.yml
@@ -2,7 +2,7 @@ name : wplot
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_wproc_macro_push.yml b/.github/workflows/module_wproc_macro_push.yml
index a061484b02..c56d38c188 100644
--- a/.github/workflows/module_wproc_macro_push.yml
+++ b/.github/workflows/module_wproc_macro_push.yml
@@ -2,7 +2,7 @@ name : wproc_macro
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_wstring_tools_push.yml b/.github/workflows/module_wstring_tools_push.yml
index b2e3eae290..fdc4364c33 100644
--- a/.github/workflows/module_wstring_tools_push.yml
+++ b/.github/workflows/module_wstring_tools_push.yml
@@ -2,7 +2,7 @@ name : wstring_tools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_wtest_basic_push.yml b/.github/workflows/module_wtest_basic_push.yml
index f9e978ef45..420736676c 100644
--- a/.github/workflows/module_wtest_basic_push.yml
+++ b/.github/workflows/module_wtest_basic_push.yml
@@ -2,7 +2,7 @@ name : wtest_basic
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_wtest_push.yml b/.github/workflows/module_wtest_push.yml
index 3b4c5618c3..7cc9b8979f 100644
--- a/.github/workflows/module_wtest_push.yml
+++ b/.github/workflows/module_wtest_push.yml
@@ -2,7 +2,7 @@ name : wtest
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/module_wtools_push.yml b/.github/workflows/module_wtools_push.yml
index 2b0ccb4642..fbbf8c7a3f 100644
--- a/.github/workflows/module_wtools_push.yml
+++ b/.github/workflows/module_wtools_push.yml
@@ -2,7 +2,7 @@ name : wtools
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/.github/workflows/standard_rust_push.yml b/.github/workflows/standard_rust_push.yml
index 138307ad81..5e95425a98 100644
--- a/.github/workflows/standard_rust_push.yml
+++ b/.github/workflows/standard_rust_push.yml
@@ -39,7 +39,7 @@ jobs :
     runs-on: ubuntu-latest
     steps:
       - name: Install latest nightly toolchain
-        uses: Wandalen/wretry.action@master
+        uses: Wandalen/wretry.action/main@master
         with:
           action: actions-rs/toolchain@v1
           with: |
@@ -131,7 +131,7 @@ jobs :
     runs-on : ${{ matrix.os }}
     steps :
       - name : Install latest stable toolchain
-        uses : Wandalen/wretry.action@master
+        uses : Wandalen/wretry.action/main@master
         with :
           action : actions-rs/toolchain@v1
           with : |
@@ -140,7 +140,7 @@ jobs :
           attempt_limit : 3
           attempt_delay: 10000
       - name: Install latest nightly toolchain
-        uses: Wandalen/wretry.action@master
+        uses: Wandalen/wretry.action/main@master
         with:
           action: actions-rs/toolchain@v1
           with: |
diff --git a/module/move/willbe/template/workflow/module_push.hbs b/module/move/willbe/template/workflow/module_push.hbs
index eefdf67f9a..c3611bd498 100644
--- a/module/move/willbe/template/workflow/module_push.hbs
+++ b/module/move/willbe/template/workflow/module_push.hbs
@@ -2,7 +2,7 @@ name : {{name}}
 
 on :
   push :
-    branches-ignore :
+    branches :
       - 'alpha'
       - 'beta'
       - 'master'
diff --git a/module/move/willbe/template/workflow/standard_rust_push.yml b/module/move/willbe/template/workflow/standard_rust_push.yml
index 138307ad81..5e95425a98 100644
--- a/module/move/willbe/template/workflow/standard_rust_push.yml
+++ b/module/move/willbe/template/workflow/standard_rust_push.yml
@@ -39,7 +39,7 @@ jobs :
     runs-on: ubuntu-latest
     steps:
       - name: Install latest nightly toolchain
-        uses: Wandalen/wretry.action@master
+        uses: Wandalen/wretry.action/main@master
         with:
           action: actions-rs/toolchain@v1
           with: |
@@ -131,7 +131,7 @@ jobs :
     runs-on : ${{ matrix.os }}
     steps :
       - name : Install latest stable toolchain
-        uses : Wandalen/wretry.action@master
+        uses : Wandalen/wretry.action/main@master
         with :
           action : actions-rs/toolchain@v1
           with : |
@@ -140,7 +140,7 @@ jobs :
           attempt_limit : 3
           attempt_delay: 10000
       - name: Install latest nightly toolchain
-        uses: Wandalen/wretry.action@master
+        uses: Wandalen/wretry.action/main@master
         with:
           action: actions-rs/toolchain@v1
           with: |
diff --git a/module/move/willbe/template/workflow/standard_rust_scheduled.yml b/module/move/willbe/template/workflow/standard_rust_scheduled.yml
index e39dbe1535..ac680e60bd 100644
--- a/module/move/willbe/template/workflow/standard_rust_scheduled.yml
+++ b/module/move/willbe/template/workflow/standard_rust_scheduled.yml
@@ -13,8 +13,6 @@ env :
 jobs :
 
   tested :
-    needs: check
-    if : ${{ needs.check.outputs.should_run == 'true' }}
     uses : Wandalen/wTools/.github/workflows/standard_rust_push.yml@alpha
     with :
       manifest_path : './Cargo.toml'
diff --git a/module/move/willbe/tests/inc/action/cicd_renew.rs b/module/move/willbe/tests/inc/action/cicd_renew.rs
index ddd92bb908..a2da8fec84 100644
--- a/module/move/willbe/tests/inc/action/cicd_renew.rs
+++ b/module/move/willbe/tests/inc/action/cicd_renew.rs
@@ -78,7 +78,7 @@ fn default_case()
       let mut push_map = HashMap::new();
       push_map.insert
       (
-        "branches-ignore".to_string(),
+        "branches".to_string(),
         vec![ "alpha".to_string(), "beta".to_string(), "master".to_string() ],
       );
       map.insert( "push".to_string(), push_map );

From 3187eaa1adf5d6a196135ee8c59359f2ddbcf396 Mon Sep 17 00:00:00 2001
From: SupperZum <levchenko.d25@gmail.com>
Date: Thu, 11 Apr 2024 16:46:32 +0300
Subject: [PATCH 29/49] upd

---
 module/core/proper_path_tools/src/path.rs     | 206 ++++++++++++++++--
 .../core/proper_path_tools/tests/inc/mod.rs   |   1 +
 .../tests/inc/path_common.rs                  |  94 ++++----
 .../tests/inc/rebase_path.rs                  |  57 +++++
 4 files changed, 301 insertions(+), 57 deletions(-)
 create mode 100644 module/core/proper_path_tools/tests/inc/rebase_path.rs

diff --git a/module/core/proper_path_tools/src/path.rs b/module/core/proper_path_tools/src/path.rs
index ce54b3f98d..b74076426f 100644
--- a/module/core/proper_path_tools/src/path.rs
+++ b/module/core/proper_path_tools/src/path.rs
@@ -318,7 +318,7 @@ pub( crate ) mod private
   /// # Examples
   ///
   /// ```
-  /// use proper_path_tools::path::::path_common;
+  /// use proper_path_tools::path::path_common;
   ///
   /// let paths = vec![ "/a/b/c", "/a/b/d", "/a/b/e" ];
   /// let common_path = path_common( paths.into_iter() );
@@ -330,37 +330,44 @@ pub( crate ) mod private
     I : Iterator< Item = &'a str >,
   {
     use std::collections::HashMap;
-
-    let paths : Vec< String > = paths.map( | path | path.to_string() ).collect();
-
-    if paths.is_empty() 
+    let orig_paths : Vec< String > = paths.map( | path | path.to_string() ).collect();
+  
+    if orig_paths.is_empty() 
     {
       return None;
     }
-
+  
     // Create a map to store directory frequencies
     let mut dir_freqs : HashMap< String, usize > = HashMap::new();
-
+  
+    let mut paths = orig_paths.clone();
     // Iterate over paths to count directory frequencies
-    for path in paths.iter() 
+    for path in paths.iter_mut() 
     {
+      path_remove_dots( path );
+      path_remove_double_dots( path );
       // Split path into directories
       let dirs : Vec< &str > = path.split( '/' ).collect();
-
+  
       // Iterate over directories
-      for i in 0..dirs.len() 
+      for i in 0..dirs.len()
       {
+        
         // Construct directory path
-        let dir_path = dirs[ 0..i + 1 ].join( "/" );
-        if dir_path.is_empty()
+        let mut dir_path = dirs[ 0..i + 1 ].join( "/" );
+  
+        
+        // Increment frequency count
+        *dir_freqs.entry( dir_path.clone() ).or_insert( 0 ) += 1;
+  
+        if i != dirs.len() - 1 && !dirs[ i + 1 ].is_empty()
         {
-          continue;
+          dir_path.push( '/' );
+          *dir_freqs.entry( dir_path ).or_insert( 0 ) += 1;
         }
-        // Increment frequency count
-        *dir_freqs.entry( dir_path ).or_insert( 0 ) += 1;
       }
     }
-
+  
     // Find the directory with the highest frequency
     let common_dir = dir_freqs
     .into_iter()
@@ -368,18 +375,181 @@ pub( crate ) mod private
     .map( | ( dir, _ ) | dir )
     .max_by_key( | dir | dir.len() )
     .unwrap_or_default();
-
+  
     let mut result = common_dir.to_string();
-    //result.push( '/' );
+  
+    if result.is_empty() 
+    {
+      if orig_paths.iter().any( | path | path.starts_with( '/' ) )
+      { 
+        result.push( '/' );
+      }
+      else if orig_paths.iter().any( | path | path.starts_with( ".." ) )
+      {
+        result.push_str( ".." );
+      }
+      else
+      {
+        result.push( '.' );
+      }
+  
+    }
+    
     Some( result )
+  
+  
+  }
+
+  /// Removes dot segments (".") from the given path string.
+  ///
+  /// Dot segments in a path represent the current directory and can be safely removed
+  /// without changing the meaning of the path.
+  ///
+  /// # Arguments
+  ///
+  /// * `path` - A mutable reference to a string representing the path to be cleaned.
+  ///
+  fn path_remove_dots( path : &mut String ) 
+  {
+    let mut cleaned_parts = vec![];
+
+    for part in path.split( '/' ) 
+    {
+      if part == "."
+      {
+        continue;
+      }
+
+      cleaned_parts.push( part );
+
+    }
+
+    *path = cleaned_parts.join( "/" );
+
+  }
+
+  /// Removes dot-dot segments ("..") from the given path string.
+  ///
+  /// Dot-dot segments in a path represent the parent directory and can be safely resolved
+  /// to simplify the path.
+  ///
+  /// # Arguments
+  ///
+  /// * `path` - A mutable reference to a string representing the path to be cleaned.
+  ///
+  fn path_remove_double_dots( path : &mut String ) 
+  {
+    
+    let mut cleaned_parts: Vec< &str > = Vec::new();
+    let mut delete_empty_part = false;
+
+    for part in path.split( '/' ) 
+    {
+      if part == ".." 
+      {
+        if let Some( pop ) = cleaned_parts.pop()
+        {
+          if pop.is_empty()
+          {
+            delete_empty_part = true;
+          }
+
+          if pop == ".."
+          {
+            cleaned_parts.push("..");
+            cleaned_parts.push("..");
+          }
+        }
+        else
+        {
+          cleaned_parts.push( ".." );
+        }
+      } 
+      else 
+      {
+        cleaned_parts.push( part );
+      }
+    }
+    if delete_empty_part
+    {
+      *path = format!( "/{}", cleaned_parts.join( "/" ) );
+    }
+    else
+    {
+      *path = cleaned_parts.join( "/" );
+    }
+    
+  }
+
+
+  /// Rebase the file path relative to a new base path, optionally removing a common prefix.
+  ///
+  /// # Arguments
+  ///
+  /// * `file_path` - The original file path to rebase.
+  /// * `new_path` - The new base path to which the file path will be rebased.
+  /// * `old_path` - An optional common prefix to remove from the file path before rebasing.
+  ///
+  /// # Returns
+  ///
+  /// Returns the rebased file path if successful, or None if any error occurs.
+  ///
+  /// # Examples
+  ///
+  /// Rebase a file path to a new base path without removing any common prefix:
+  ///
+  /// ```
+  /// use std::path::PathBuf;
+  ///
+  /// let file_path = "/home/user/documents/file.txt";
+  /// let new_path = "/mnt/storage";
+  /// let rebased_path = proper_path_tools::path::rebase( file_path, new_path, None ).unwrap();
+  /// assert_eq!( rebased_path, PathBuf::from( "/mnt/storage/home/user/documents/file.txt" ) );
+  /// ```
+  ///
+  /// Rebase a file path to a new base path after removing a common prefix:
+  ///
+  /// ```
+  /// use std::path::PathBuf;
+  ///
+  /// let file_path = "/home/user/documents/file.txt";
+  /// let new_path = "/mnt/storage";
+  /// let old_path = "/home/user";
+  /// let rebased_path = proper_path_tools::path::rebase( file_path, new_path, Some( old_path ) ).unwrap();
+  /// assert_eq!( rebased_path, PathBuf::from( "/mnt/storage/documents/file.txt" ) );
+  /// ```
+  ///
+  pub fn rebase< T : AsRef< std::path::Path > >( file_path : T, new_path : T, old_path : Option< T > ) -> Option< std::path::PathBuf > 
+  {
+    use std::path::Path;
+    use std::path::PathBuf;
+
+    let new_path = Path::new( new_path.as_ref() );
+    let mut main_file_path = Path::new( file_path.as_ref() );
+
+    if old_path.is_some()
+    {
+      let common = path_common( vec![ file_path.as_ref().to_str().unwrap(), old_path.unwrap().as_ref().to_str().unwrap() ].into_iter() )?;
+      
+      main_file_path = match main_file_path.strip_prefix( common )
+      {
+        Ok( rel ) => rel,
+        Err( _ ) => return None,
+      };
+    }
 
+    let mut rebased_path = PathBuf::new();
+    rebased_path.push( new_path );
+    rebased_path.push( main_file_path.strip_prefix( "/" ).unwrap_or( main_file_path ) );
 
+    Some( normalize( rebased_path ) )
   }
 
 }
 
 crate::mod_interface!
 {
+  protected use rebase;
   protected use path_common;
   protected use is_glob;
   protected use normalize;
diff --git a/module/core/proper_path_tools/tests/inc/mod.rs b/module/core/proper_path_tools/tests/inc/mod.rs
index c8565805a2..0eea9b62b6 100644
--- a/module/core/proper_path_tools/tests/inc/mod.rs
+++ b/module/core/proper_path_tools/tests/inc/mod.rs
@@ -5,6 +5,7 @@ mod path_normalize;
 mod path_is_glob;
 mod absolute_path;
 mod path_common;
+mod rebase_path;
 
 #[ cfg( feature = "path_unique_folder_name" ) ]
 mod path_unique_folder_name;
diff --git a/module/core/proper_path_tools/tests/inc/path_common.rs b/module/core/proper_path_tools/tests/inc/path_common.rs
index 2f9dbbd395..b491d2106c 100644
--- a/module/core/proper_path_tools/tests/inc/path_common.rs
+++ b/module/core/proper_path_tools/tests/inc/path_common.rs
@@ -10,13 +10,7 @@ fn test_with_empty_array()
   assert_eq!( got, None );
 }
 
-#[ test ]
-fn test_array() 
-{
-  let paths = vec![ "/a1/b2", "/a1/b" ];
-  let got = the_module::path::path_common( paths.into_iter() ).unwrap();
-  assert_eq!( got, "/a1/" );
-}
+// absolute-absolute
 
 #[ test ]
 fn test_absolute_absolute_have_common_dir() 
@@ -123,6 +117,9 @@ fn test_absolute_absolute_different_paths_in_root_directory_common_root_director
   assert_eq!( got, "/" );
 }
 
+
+// more than 2 path in arguments
+
 #[ test ]
 fn test_absolute_absolute_more_than_2_path_in_arguments() 
 {
@@ -320,33 +317,7 @@ fn test_relative_relative_combinations_of_paths_with_dots_variant4()
   assert_eq!( got, ".." );
 }
 
-#[ test ]
-fn test_relative_relative_combinations_of_paths_with_dots_variant5() 
-{
-  let got = the_module::path::path_common( vec![ "../../b/c", "../b" ].into_iter() ).unwrap();
-  assert_eq!( got, "../.." );
-}
-
-#[ test ]
-fn test_relative_relative_combinations_of_paths_with_dots_variant6() 
-{
-  let got = the_module::path::path_common( vec![ "../../b/c", "../../../x" ].into_iter() ).unwrap();
-  assert_eq!( got, "../../.." );
-}
-
-#[ test ]
-fn test_relative_relative_combinations_of_paths_with_dots_variant7() 
-{
-  let got = the_module::path::path_common( vec![ "../../b/c/../../x", "../../../x" ].into_iter() ).unwrap();
-  assert_eq!( got, "../../.." );
-}
 
-#[ test ]
-fn test_relative_relative_combinations_of_paths_with_dots_variant8() 
-{
-  let got = the_module::path::path_common( vec![ "./../../b/c/../../x", "./../../../x" ].into_iter() ).unwrap();
-  assert_eq!( got, "../../.." );
-}
 
 #[ test ]
 fn test_relative_relative_combinations_of_paths_with_dots_variant9() 
@@ -383,6 +354,9 @@ fn test_relative_relative_combinations_of_paths_with_dots_variant13()
   assert_eq!( got, "../b" );
 }
 
+
+// several relative paths
+
 #[ test ]
 fn test_relative_relative_several_relative_paths() 
 {
@@ -432,20 +406,48 @@ fn test_relative_relative_several_relative_paths_variant7()
   assert_eq!( got, ".." );
 }
 
+
+
 #[ test ]
-fn test_relative_relative_several_relative_paths_variant8() 
+fn test_relative_relative_dot_and_double_up_and_down_tokens() 
 {
-  let got = the_module::path::path_common( vec![ "./a/b/c", "../../a/b/c", "../../../a/b" ].into_iter() ).unwrap();
+  let got = the_module::path::path_common( vec![ ".", "./", ".." ].into_iter() ).unwrap();
+  assert_eq!( got, ".." );
+}
+
+
+
+/* 
+
+#[ test ]
+fn test_relative_relative_combinations_of_paths_with_dots_variant5() 
+{
+  let got = the_module::path::path_common( vec![ "../../b/c", "../b" ].into_iter() ).unwrap();
+  assert_eq!( got, "../.." );
+}
+
+#[ test ]
+fn test_relative_relative_combinations_of_paths_with_dots_variant6() 
+{
+  let got = the_module::path::path_common( vec![ "../../b/c", "../../../x" ].into_iter() ).unwrap();
   assert_eq!( got, "../../.." );
 }
 
 #[ test ]
-fn test_relative_relative_dot_and_double_up_and_down_tokens() 
+fn test_relative_relative_combinations_of_paths_with_dots_variant7() 
 {
-  let got = the_module::path::path_common( vec![ ".", "./", ".." ].into_iter() ).unwrap();
-  assert_eq!( got, ".." );
+  let got = the_module::path::path_common( vec![ "../../b/c/../../x", "../../../x" ].into_iter() ).unwrap();
+  assert_eq!( got, "../../.." );
+}
+
+#[ test ]
+fn test_relative_relative_combinations_of_paths_with_dots_variant8() 
+{
+  let got = the_module::path::path_common( vec![ "./../../b/c/../../x", "./../../../x" ].into_iter() ).unwrap();
+  assert_eq!( got, "../../.." );
 }
 
+
 #[ test ]
 fn test_relative_relative_dot_and_double_up_and_down_tokens_variant2() 
 {
@@ -453,7 +455,21 @@ fn test_relative_relative_dot_and_double_up_and_down_tokens_variant2()
   assert_eq!( got, "../.." );
 }
 
-/* 
+#[ test ]
+fn test_relative_relative_several_relative_paths_variant8() 
+{
+  let got = the_module::path::path_common( vec![ "./a/b/c", "../../a/b/c", "../../../a/b" ].into_iter() ).unwrap();
+  assert_eq!( got, "../../.." );
+}
+
+
+
+
+
+
+
+
+
 #[ test ]
 #[ should_panic ]
 fn test_first_path_is_absolute_another_is_dots() 
diff --git a/module/core/proper_path_tools/tests/inc/rebase_path.rs b/module/core/proper_path_tools/tests/inc/rebase_path.rs
new file mode 100644
index 0000000000..7c8db4350c
--- /dev/null
+++ b/module/core/proper_path_tools/tests/inc/rebase_path.rs
@@ -0,0 +1,57 @@
+#[ allow( unused_imports ) ]
+use super::*;
+use std::path::PathBuf;
+
+#[ test ]
+fn test_rebase_without_old_path() 
+{
+  let file_path = "/home/user/documents/file.txt";
+  let new_path = "/mnt/storage";
+  let rebased_path = the_module::path::rebase( &file_path, &new_path, None ).unwrap();
+  assert_eq!
+  (
+    rebased_path,
+    PathBuf::from( "/mnt/storage/home/user/documents/file.txt" )
+  );
+}
+
+#[ test ]
+fn test_rebase_with_old_path() 
+{
+  let file_path = "/home/user/documents/file.txt";
+  let new_path = "/mnt/storage";
+  let old_path = "/home/user";
+  let rebased_path = the_module::path::rebase( &file_path, &new_path, Some( &old_path ) ).unwrap();
+  assert_eq!
+  (
+    rebased_path,
+    PathBuf::from( "/mnt/storage/documents/file.txt" )
+  );
+}
+
+#[ test ]
+fn test_rebase_invalid_old_path() 
+{
+  let file_path = "/home/user/documents/file.txt";
+  let new_path = "/mnt/storage";
+  let old_path = "/tmp"; 
+  let rebased_path = the_module::path::rebase( &file_path, &new_path, Some( &old_path ) ).unwrap();
+  assert_eq!
+  (
+    rebased_path,
+    PathBuf::from( "/mnt/storage/home/user/documents/file.txt" )
+  );
+}
+
+#[ test ]
+fn test_rebase_non_ascii_paths() 
+{
+  let file_path = "/home/пользователь/documents/файл.txt"; // Non-ASCII file path
+  let new_path = "/mnt/存储"; // Non-ASCII new base path
+  let rebased_path = the_module::path::rebase( &file_path, &new_path, None ).unwrap();
+  assert_eq!
+  (
+    rebased_path,
+    PathBuf::from( "/mnt/存储/home/пользователь/documents/файл.txt" )
+  );
+}
\ No newline at end of file

From 20a6e1ddadb4ed516bc6798613ffd64c3c55107e Mon Sep 17 00:00:00 2001
From: SupperZum <levchenko.d25@gmail.com>
Date: Sat, 13 Apr 2024 13:25:58 +0300
Subject: [PATCH 30/49] add path_relative

---
 module/core/proper_path_tools/src/path.rs     | 136 ++++++
 .../core/proper_path_tools/tests/inc/mod.rs   |   1 +
 .../tests/inc/path_relative.rs                | 403 ++++++++++++++++++
 3 files changed, 540 insertions(+)
 create mode 100644 module/core/proper_path_tools/tests/inc/path_relative.rs

diff --git a/module/core/proper_path_tools/src/path.rs b/module/core/proper_path_tools/src/path.rs
index b74076426f..f76bb41aa7 100644
--- a/module/core/proper_path_tools/src/path.rs
+++ b/module/core/proper_path_tools/src/path.rs
@@ -545,10 +545,146 @@ pub( crate ) mod private
     Some( normalize( rebased_path ) )
   }
 
+
+  /// Computes the relative path from one path to another.
+  ///
+  /// This function takes two paths and returns a relative path from the `from` path to the `to` path.
+  /// If the paths have different roots, the function returns the `to` path.
+  ///
+  /// # Arguments
+  ///
+  /// * `from` - The starting path.
+  /// * `to` - The target path.
+  ///
+  /// # Returns
+  ///
+  /// A `std::path::PathBuf` representing the relative path from `from` to `to`.
+  ///
+  /// # Examples
+  ///
+  /// ```
+  /// use std::path::PathBuf;
+  ///
+  /// let from = "/a/b";
+  /// let to = "/a/c/d";
+  /// let relative_path = proper_path_tools::path::path_relative( from, to );
+  /// assert_eq!( relative_path, PathBuf::from( "../c/d" ) );
+  /// ```
+  pub fn path_relative< T : AsRef< std::path::Path > >( from : T, to : T ) -> std::path::PathBuf 
+  {
+    use std::path::PathBuf;
+
+    let mut from = from.as_ref().to_string_lossy().to_string();
+    let mut to = to.as_ref().to_string_lossy().to_string();
+
+    from = from.replace( ':', "" );
+    to = to.replace( ':', "" );
+
+
+    if from == "./"
+    {
+      from.push_str( &to );
+      return PathBuf::from( from )
+    }
+
+    if from == "."
+    {
+      return PathBuf::from( to )
+    }
+
+    path_remove_double_dots( &mut from );
+    path_remove_double_dots( &mut to );
+    path_remove_dots( &mut from );
+    path_remove_dots( &mut to );
+    
+    let mut from_parts: Vec< &str > = from.split( '/' ).collect();
+    let mut to_parts: Vec< &str > = to.split( '/' ).collect();
+
+
+    if from_parts.len() == 1 && from_parts[ 0 ].is_empty()
+    {
+      from_parts.pop();
+    }
+
+    if to_parts.len() == 1 && to_parts[ 0 ].is_empty()
+    {
+      to_parts.pop();
+    }
+
+    let mut common_prefix = 0;
+    for ( idx, ( f, t ) ) in from_parts.iter().zip( to_parts.iter() ).enumerate() 
+    {
+      if f != t 
+      {
+        break;
+      }
+      common_prefix = idx + 1;
+    }
+
+    let mut result = Vec::new();
+
+    // Add ".." for each directory not in common
+    for i in common_prefix..from_parts.len() 
+    {
+      if from_parts[ common_prefix ].is_empty() || 
+      ( 
+        i == from_parts.len() - 1 
+        && from_parts[ i ].is_empty()
+        && !to_parts.last().unwrap_or( &"" ).is_empty() 
+      )
+      {
+        continue;
+      }
+
+      result.push( ".." );
+    }
+
+    // Add the remaining directories from 'to'
+    for part in to_parts.iter().skip( common_prefix ) 
+    {
+      result.push( *part );
+    }
+
+    // Join the parts into a string
+    let mut relative_path = result.join( "/" );
+
+
+
+    // If the relative path is empty or the 'to' path is the same as the 'from' path,
+    // set the relative path to "."
+    if relative_path.is_empty() || from == to 
+    {
+      relative_path = ".".to_string();
+    }
+
+    
+    if to.ends_with( '/' ) && !relative_path.ends_with( '/' ) && to != "/"
+    {
+      relative_path.push( '/' );
+    }
+
+
+    if from.ends_with( '/' ) && to.starts_with( '/' ) && relative_path.starts_with( ".." ) && relative_path != ".."
+    {
+      relative_path.replace_range( ..2 , "." );
+    }
+
+    if from.ends_with( '/' ) && to.starts_with( '/' ) && relative_path == ".."
+    {
+      relative_path = "./..".to_string();
+    }
+
+    PathBuf::from( relative_path )
+  }
+
+
+
+
 }
 
 crate::mod_interface!
 {
+  protected use path_relative;
   protected use rebase;
   protected use path_common;
   protected use is_glob;
diff --git a/module/core/proper_path_tools/tests/inc/mod.rs b/module/core/proper_path_tools/tests/inc/mod.rs
index 0eea9b62b6..051ddf9c27 100644
--- a/module/core/proper_path_tools/tests/inc/mod.rs
+++ b/module/core/proper_path_tools/tests/inc/mod.rs
@@ -6,6 +6,7 @@ mod path_is_glob;
 mod absolute_path;
 mod path_common;
 mod rebase_path;
+mod path_relative;
 
 #[ cfg( feature = "path_unique_folder_name" ) ]
 mod path_unique_folder_name;
diff --git a/module/core/proper_path_tools/tests/inc/path_relative.rs b/module/core/proper_path_tools/tests/inc/path_relative.rs
new file mode 100644
index 0000000000..7c9f6bfbed
--- /dev/null
+++ b/module/core/proper_path_tools/tests/inc/path_relative.rs
@@ -0,0 +1,403 @@
+#[ allow( unused_imports ) ]
+use super::*;
+use std::path::PathBuf;
+
+
+// absolute path relative
+
+#[ test ]
+fn test_absolute_a_minus_b() 
+{
+  let from = "/a";
+  let to = "/b";
+  let expected = "../b";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( PathBuf::from( expected ) ) );
+}
+
+#[ test ]
+fn test_absolute_root_minus_b() 
+{
+  let from = "/";
+  let to = "/b";
+  let expected = "b";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_absolute_same_path() 
+{
+  let from = "/aa/bb/cc";
+  let to = "/aa/bb/cc";
+  let expected = ".";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_absolute_same_path_with_trail() 
+{
+  let from = "/aa/bb/cc";
+  let to = "/aa/bb/cc/";
+  let expected = "./";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_absolute_two_trailed_absolute_paths() 
+{
+  let from = "/a/b/";
+  let to = "/a/b/";
+  let expected = "./";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_absolute_two_absolute_paths_with_trail() 
+{
+  let from = "/a/b";
+  let to = "/a/b/";
+  let expected = "./";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_absolute_two_absolute_paths() 
+{
+  let from = "/a/b/";
+  let to = "/a/b";
+  let expected = ".";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_absolute_same_path_trail_to_not() 
+{
+  let from = "/aa/bb/cc/";
+  let to = "/aa/bb/cc";
+  let expected = ".";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_absolute_a_to_double_slash_b() 
+{
+  let from = "/a";
+  let to = "//b";
+  let expected = "..//b";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+
+#[ test ]
+fn test_absolute_relative_to_nested() 
+{
+  let from = "/foo/bar/baz/asdf/quux";
+  let to = "/foo/bar/baz/asdf/quux/new1";
+  let expected = "new1";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_absolute_out_of_relative_dir() 
+{
+  let from = "/abc";
+  let to = "/a/b/z";
+  let expected = "../a/b/z";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_absolute_relative_root() 
+{
+  let from = "/";
+  let to = "/a/b/z";
+  let expected = "a/b/z";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+
+#[ test ]
+fn test_long_not_direct() 
+{
+  let from = "/a/b/xx/yy/zz";
+  let to = "/a/b/files/x/y/z.txt";
+  let expected = "../../../files/x/y/z.txt";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_absolute_relative_to_parent_directory() 
+{
+  let from = "/aa/bb/cc";
+  let to = "/aa/bb";
+  let expected = "..";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_absolute_relative_to_parent_directory_file_trailed() 
+{
+  let from = "/aa/bb/cc";
+  let to = "/aa/bb/";
+  let expected = "../";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_absolute_relative_root_to_root() 
+{
+  let from = "/";
+  let to = "/";
+  let expected = ".";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_windows_disks() 
+{
+  let from = "d:/";
+  let to = "c:/x/y";
+  let expected = "../c/x/y";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+
+#[ test ]
+fn test_absolute_relative_to_parent_directory_both_trailed() 
+{
+  let from = "/aa/bb/cc/";
+  let to = "/aa/bb/";
+  let expected = "./../";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+
+#[ test ]
+fn test_absolute_a_with_trail_to_double_slash_b_with_trail() 
+{
+  let from = "/a/";
+  let to = "//b/";
+  let expected = "./..//b/";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_absolute_4_down() 
+{
+  let from = "/aa//bb/cc/";
+  let to = "//xx/yy/zz/";
+  let expected = "./../../../..//xx/yy/zz/";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_absolute_same_length_both_trailed() 
+{
+  let from = "/aa//bb/cc/";
+  let to = "//xx/yy/zz/";
+  let expected = "./../../../..//xx/yy/zz/";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_absolute_relative_to_parent_directory_base_trailed() 
+{
+  let from = "/aa/bb/cc/";
+  let to = "/aa/bb";
+  let expected = "./..";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+
+
+
+
+// relative_path_relative
+
+#[ test ]
+fn test_relative_dot_to_dot() 
+{
+  let from = ".";
+  let to = ".";
+  let expected = ".";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_relative_a_to_b() 
+{
+  let from = "a";
+  let to = "b";
+  let expected = "../b";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_relative_a_b_to_b_c() 
+{
+  let from = "a/b";
+  let to = "b/c";
+  let expected = "../../b/c";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_relative_a_b_to_a_b_c() 
+{
+  let from = "a/b";
+  let to = "a/b/c";
+  let expected = "c";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_relative_a_b_c_to_a_b() 
+{
+  let from = "a/b/c";
+  let to = "a/b";
+  let expected = "..";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_relative_a_b_c_d_to_a_b_d_c() 
+{
+  let from = "a/b/c/d";
+  let to = "a/b/d/c";
+  let expected = "../../d/c";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_relative_a_to_dot_dot_a() 
+{
+  let from = "a";
+  let to = "../a";
+  let expected = "../../a";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_relative_a_slash_slash_b_to_a_slash_slash_c() 
+{
+  let from = "a//b";
+  let to = "a//c";
+  let expected = "../c";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_relative_a_dot_slash_b_to_a_dot_slash_c() 
+{
+  let from = "a/./b";
+  let to = "a/./c";
+  let expected = "../c";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_relative_a_dot_dot_slash_b_to_b() 
+{
+  let from = "a/../b";
+  let to = "b";
+  let expected = ".";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_relative_b_to_b_dot_dot_slash_b() 
+{
+  let from = "b";
+  let to = "b/../b";
+  let expected = ".";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_relative_dot_to_dot_dot() 
+{
+  let from = ".";
+  let to = "..";
+  let expected = "..";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_relative_dot_to_dot_dot_dot() 
+{
+  let from = ".";
+  let to = "../..";
+  let expected = "../..";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_relative_dot_dot_to_dot_dot() 
+{
+  let from = "..";
+  let to = "../..";
+  let expected = "..";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_relative_dot_dot_to_dot_dot_dot() 
+{
+  let from = "..";
+  let to = "..";
+  let expected = ".";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_relative_dot_dot_a_b_to_dot_dot_c_d() 
+{
+  let from = "../a/b";
+  let to = "../c/d";
+  let expected = "../../c/d";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_relative_dot_to_b() 
+{
+  let from = ".";
+  let to = "b";
+  let expected = "b";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_relative_dot_slash_to_b() 
+{
+  let from = "./";
+  let to = "b";
+  let expected = "./b";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_relative_dot_to_b_slash() 
+{
+  let from = ".";
+  let to = "b/";
+  let expected = "b/";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_relative_dot_slash_to_b_slash() 
+{
+  let from = "./";
+  let to = "b/";
+  let expected = "./b/";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
+
+#[ test ]
+fn test_relative_a_dot_dot_to_b_dot_dot() 
+{
+  let from = "a/../b/..";
+  let to = "b";
+  let expected = "b";
+  assert_eq!( the_module::path::path_relative( from, to ), PathBuf::from( expected ) );
+}
\ No newline at end of file

From 8420eb9f712df95c11175df0065c5b67366829af Mon Sep 17 00:00:00 2001
From: Barsik <bogdan.balushkin5@gmail.com>
Date: Mon, 15 Apr 2024 15:35:34 +0300
Subject: [PATCH 31/49] Extend publish_diff to handle multiple crates

The publish_diff function has been extended to handle multiple crates, enhancing the diffs' reporting capabilities. Additional structures and functions are added to store and display the diffs for each version of the crate. Now, it allows the visualization of changes in different versions of a package and its dependencies by generating a comprehensive report.
---
 module/move/willbe/src/action/publish_diff.rs | 122 +++++++++++++++---
 1 file changed, 104 insertions(+), 18 deletions(-)

diff --git a/module/move/willbe/src/action/publish_diff.rs b/module/move/willbe/src/action/publish_diff.rs
index 010d9c7ead..6d5b71159a 100644
--- a/module/move/willbe/src/action/publish_diff.rs
+++ b/module/move/willbe/src/action/publish_diff.rs
@@ -4,11 +4,16 @@ mod private
   use crate::*;
 
   use std::path::PathBuf;
+  use std::collections::HashMap;
+  use std::fmt::Formatter;
+  use colored::Colorize;
   use crates_tools::CrateArchive;
 
+  use action::list::{ ListReport, ListNodeReport };
   use _path::AbsolutePath;
   use wtools::error::for_app::Result;
   use diff::{ DiffReport, crate_diff };
+  use error_tools::for_app::format_err;
 
   /// Options for `publish_diff` command
   #[ derive( Debug, former::Former ) ]
@@ -17,38 +22,119 @@ mod private
     path : PathBuf,
     keep_archive : Option< PathBuf >,
   }
+  
+  #[ derive( Debug ) ]
+  pub struct PublishDiffReport
+  {
+    pub diffs : HashMap< AbsolutePath, DiffReport >,
+    pub root_path : AbsolutePath,
+    pub tree : ListNodeReport,
+  }
+  
+  impl std::fmt::Display for PublishDiffReport
+  {
+    fn fmt( &self, f : &mut Formatter< '_ > ) -> std::fmt::Result
+    {
+      let mut tree = self.tree.clone();
+      let root_path = tree.path.as_ref().unwrap().clone();
+      let root_name = tree.name.clone();
+      let root_version = tree.version.as_ref().unwrap().clone();
+      
+      fn modify( diffs : &HashMap< AbsolutePath, DiffReport >, tree : &mut ListNodeReport )
+      {
+        let path = tree.path.take().unwrap();
+        let path = path.as_path().to_string_lossy();
+        let path = path.strip_suffix( "Cargo.toml" ).unwrap_or( &path );
+        let root = AbsolutePath::try_from( path ).unwrap();
+
+        let diff = diffs.get( &root ).unwrap();
+
+        let has_changes = diff.has_changes();
+        tree.name = if has_changes { format!( "{}", tree.name.yellow() ) } else { tree.name.clone() };
+        tree.version.as_mut().map( | v | *v = format!( "{} {}", if has_changes { v.yellow() } else { v.as_str().into() }, if has_changes { "MODIFIED" } else { "" } ) );
+        
+        for dep in &mut tree.normal_dependencies
+        {
+          modify( diffs, dep )
+        }
+      }
+      modify( &self.diffs, &mut tree );
+
+      let path = root_path.as_path().to_string_lossy();
+      let path = path.strip_suffix( "Cargo.toml" ).unwrap_or( &path );
+      let root = AbsolutePath::try_from( path ).unwrap();
+      let diff = self.diffs.get( &root ).unwrap();
+      
+      write!( f, "Tree:\n{}\nChanges in `{root_name} {root_version}`:\n{}", tree, diff )?;
+      
+      Ok( () )
+    }
+  }
 
   /// Return the differences between a local and remote package versions.
   #[ cfg_attr( feature = "tracing", tracing::instrument ) ]
-  pub fn publish_diff( o : PublishDiffOptions ) -> Result< DiffReport >
+  pub fn publish_diff( o : PublishDiffOptions ) -> Result< PublishDiffReport >
   {
     let path = AbsolutePath::try_from( o.path )?;
-    let dir = CrateDir::try_from( path )?;
+    let dir = CrateDir::try_from( path.clone() )?;
+    
+    let list = action::list
+    (
+      action::list::ListOptions::former()
+      .path_to_manifest( dir )
+      .format( action::list::ListFormat::Tree )
+      .info([ action::list::PackageAdditionalInfo::Version, action::list::PackageAdditionalInfo::Path ])
+      .dependency_sources([ action::list::DependencySource::Local ])
+      .dependency_categories([ action::list::DependencyCategory::Primary ])
+      .form()
+    )
+    .unwrap();
+    let ListReport::Tree( mut tree ) = list else { return Err( format_err!( "Logical error. Unexpected list format" ) ) };
+    let mut tasks = vec![ tree[ 0 ].clone() ];
+    let mut diffs = HashMap::new();
+    let mut current_idx = 0;
+    while current_idx < tasks.len()
+    {
+      let path = tasks[ current_idx ].path.as_ref().unwrap().to_string_lossy();
+      let path = path.strip_suffix( "Cargo.toml" ).unwrap_or( &path );
+      let path = AbsolutePath::try_from( path )?;
+      let dir = CrateDir::try_from( path.clone() )?;
 
-    let package = package::Package::try_from( dir.clone() )?;
-    let name = &package.name()?;
-    let version = &package.version()?;
+      let package = package::Package::try_from( dir.clone() )?;
+      let name = &package.name()?;
+      let version = &package.version()?;
 
-    _ = cargo::pack( cargo::PackOptions::former().path( dir.as_ref() ).dry( false ).form() )?;
-    let l = CrateArchive::read( packed_crate::local_path( name, version, dir )? )?;
-    let r = CrateArchive::download_crates_io( name, version ).unwrap();
+      _ = cargo::pack( cargo::PackOptions::former().path( dir.as_ref() ).dry( false ).form() )?;
+      let l = CrateArchive::read( packed_crate::local_path( name, version, dir.clone() )? )?;
+      let r = CrateArchive::download_crates_io( name, version ).unwrap();
 
-    if let Some( out_path ) = o.keep_archive
-    {
-      _ = std::fs::create_dir_all( &out_path );
-      for path in r.list()
+      if let Some( out_path ) = &o.keep_archive
       {
-        let local_path = out_path.join( path );
-        let folder = local_path.parent().unwrap();
-        _ = std::fs::create_dir_all( folder );
+        _ = std::fs::create_dir_all( &out_path );
+        for path in r.list()
+        {
+          let local_path = out_path.join( path );
+          let folder = local_path.parent().unwrap();
+          _ = std::fs::create_dir_all( folder );
 
-        let content = r.content_bytes( path ).unwrap();
+          let content = r.content_bytes( path ).unwrap();
 
-        std::fs::write( local_path, content )?;
+          std::fs::write( local_path, content )?;
+        }
       }
+      diffs.insert( path, crate_diff( &l, &r ).exclude( diff::PUBLISH_IGNORE_LIST ) );
+      tasks.extend( tasks[ current_idx ].normal_dependencies.clone() );
+      
+      current_idx += 1;
     }
+    let report = PublishDiffReport
+    {
+      root_path : path.clone(),
+      diffs,
+      tree : tree.remove( 0 ),
+    };
 
-    Ok( crate_diff( &l, &r ).exclude( diff::PUBLISH_IGNORE_LIST ) )
+    Ok( report )
   }
 }
 

From f4ce67255ef120022d6cda5c19f6f4435d3f15c2 Mon Sep 17 00:00:00 2001
From: Barsik <bogdan.balushkin5@gmail.com>
Date: Mon, 15 Apr 2024 16:00:36 +0300
Subject: [PATCH 32/49] Replace Eddie library with TextDistance for command
 suggestion

Replaced the Eddie library with the TextDistance library for suggesting commands whenever an unknown command is encountered by the system. TextDistance's JaroWinkler algorithm is now being used to find the similarity between the entered command and the available ones. Also updated the related dependencies in Cargo.toml.
---
 module/move/wca/Cargo.toml                  | 4 ++--
 module/move/wca/src/ca/verifier/verifier.rs | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/move/wca/Cargo.toml b/module/move/wca/Cargo.toml
index 781a98da4a..edabb9d0d6 100644
--- a/module/move/wca/Cargo.toml
+++ b/module/move/wca/Cargo.toml
@@ -31,7 +31,7 @@ full = [ "enabled", "on_unknown_suggest" ]
 enabled = []
 
 # This configuration suggests an action to be done when the command is unknown. In this case, when an unknown command is encountered, the system might suggest alternatives
-on_unknown_suggest = [ "eddie" ]
+on_unknown_suggest = [ "dep:textdistance" ]
 
 [[bench]]
 name = "bench"
@@ -49,7 +49,7 @@ former = { workspace = true, features = [ "default" ] }
 ## external
 log = "0.4"
 #closure = "0.3"
-eddie = { version = "0.4", optional = true } # fuzzy commands search
+textdistance = { version = "1.0", optional = true } # fuzzy commands search
 
 [dev-dependencies]
 test_tools = { workspace = true }
diff --git a/module/move/wca/src/ca/verifier/verifier.rs b/module/move/wca/src/ca/verifier/verifier.rs
index bb0cfa242d..3c51962e47 100644
--- a/module/move/wca/src/ca/verifier/verifier.rs
+++ b/module/move/wca/src/ca/verifier/verifier.rs
@@ -99,11 +99,12 @@ pub( crate ) mod private
     #[ cfg( feature = "on_unknown_suggest" ) ]
     fn suggest_command< 'a >( dictionary : &'a Dictionary, user_input: &str ) -> Option< &'a str >
     {
-      let jaro = eddie::JaroWinkler::new();
+      use textdistance::{ Algorithm, JaroWinkler };
+      let jaro = JaroWinkler::default();
       let sim = dictionary
       .commands
       .iter()
-      .map( |( name, c )| ( jaro.similarity( name, user_input ), c ) )
+      .map( |( name, c )| ( jaro.for_str( name, user_input ).nsim(), c ) )
       .max_by( |( s1, _ ), ( s2, _ )| s1.total_cmp( s2 ) );
       if let Some(( sim, variant )) = sim
       {

From a1d1cabea9d225f7c4b8ae243b0cb1ad67f7b424 Mon Sep 17 00:00:00 2001
From: Barsik <bogdan.balushkin5@gmail.com>
Date: Tue, 16 Apr 2024 09:15:50 +0300
Subject: [PATCH 33/49] Refactor publish action to use a publication plan

The publish action has been modified to be handle via a publication plan. This adds an intermediary step where the publication steps are defined first in a plan before execution. This change also removed the 'wanted_to_publish' attribute from the PublishReport struct. Displaying as a tree is now also based on roots within the plan.
---
 module/move/willbe/src/action/publish.rs | 73 ++++++++++++++----------
 module/move/willbe/src/entity/package.rs |  8 ++-
 2 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/module/move/willbe/src/action/publish.rs b/module/move/willbe/src/action/publish.rs
index 94a6e940c6..d2db37f2f4 100644
--- a/module/move/willbe/src/action/publish.rs
+++ b/module/move/willbe/src/action/publish.rs
@@ -18,8 +18,6 @@ mod private
   {
     /// Represents the absolute path to the root directory of the workspace.
     pub workspace_root_dir : Option< AbsolutePath >,
-    /// Represents a collection of packages that are roots of the trees.
-    pub wanted_to_publish : Vec< CrateDir >,
     pub plan : Option< package::PublishPlan >,
     /// Represents a collection of packages and their associated publishing reports.
     pub packages : Vec<( AbsolutePath, package::PublishReport )>
@@ -36,8 +34,8 @@ mod private
       }
       if let Some( plan ) = &self.plan
       {
-        write!( f, "Tree{} :\n", if self.wanted_to_publish.len() > 1 { "s" } else { "" } )?;
-        plan.display_as_tree( f, &self.wanted_to_publish )?;
+        write!( f, "Tree{} :\n", if plan.roots.len() > 1 { "s" } else { "" } )?;
+        plan.display_as_tree( f )?;
 
         writeln!( f, "The following packages are pending for publication :" )?;
         plan.display_as_list( f )?;
@@ -63,61 +61,55 @@ mod private
     }
   }
 
+  /// Publishes packages based on the specified patterns.
   ///
-  /// Publish packages.
+  /// # Arguments
+  /// * `patterns` - A vector of patterns specifying the folders to search for packages.
+  /// * `dry` - A boolean value indicating whether to perform a dry run.
+  /// * `temp` - A boolean value indicating whether to use a temporary directory.
   ///
-
+  /// # Returns
+  /// A Result containing a `PublishPlan` if successful, or an `Error` otherwise.
   #[ cfg_attr( feature = "tracing", tracing::instrument ) ]
-  pub fn publish( patterns : Vec< String >, dry : bool, temp : bool ) -> Result< PublishReport, ( PublishReport, Error ) >
+  pub fn publish_plan( patterns : Vec< String >, dry : bool, temp : bool  ) -> Result< package::PublishPlan, Error >
   {
-    let mut report = PublishReport::default();
-
     let mut paths = HashSet::new();
     // find all packages by specified folders
     for pattern in &patterns
     {
-      let current_path = AbsolutePath::try_from( std::path::PathBuf::from( pattern ) ).err_with( || report.clone() )?;
+      let current_path = AbsolutePath::try_from( std::path::PathBuf::from( pattern ) )?;
       // let current_paths = files::find( current_path, &[ "Cargo.toml" ] );
       paths.extend( Some( current_path ) );
     }
 
     let mut metadata = if paths.is_empty()
     {
-      Workspace::from_current_path().err_with( || report.clone() )?
+      Workspace::from_current_path()?
     }
     else
     {
       // FIX : patterns can point to different workspaces. Current solution take first random path from list
       let current_path = paths.iter().next().unwrap().clone();
-      let dir = CrateDir::try_from( current_path ).err_with( || report.clone() )?;
+      let dir = CrateDir::try_from( current_path )?;
 
-      Workspace::with_crate_dir( dir ).err_with( || report.clone() )?
+      Workspace::with_crate_dir( dir )?
     };
     let workspace_root_dir : AbsolutePath = metadata
-    .workspace_root()
-    .err_with( || report.clone() )?
-    .try_into()
-    .err_with( || report.clone() )?;
-    report.workspace_root_dir = Some( workspace_root_dir.clone() );
-    let packages = metadata.load().err_with( || report.clone() )?.packages().err_with( || report.clone() )?;
+    .workspace_root()?
+    .try_into()?;
+    let packages = metadata.load()?.packages()?;
     let packages_to_publish : Vec< _ > = packages
     .iter()
     .filter( | &package | paths.contains( &AbsolutePath::try_from( package.manifest_path().as_std_path().parent().unwrap() ).unwrap() ) )
     .map( | p | p.name().clone() )
     .collect();
     let package_map = packages.into_iter().map( | p | ( p.name().clone(), Package::from( p.clone() ) ) ).collect::< HashMap< _, _ > >();
-    {
-      for node in &packages_to_publish
-      {
-        report.wanted_to_publish.push( package_map.get( node ).unwrap().crate_dir() );
-      }
-    }
 
     let graph = metadata.graph();
     let subgraph_wanted = graph::subgraph( &graph, &packages_to_publish );
     let tmp = subgraph_wanted.map( | _, n | graph[ *n ].clone(), | _, e | graph[ *e ].clone() );
 
-    let mut unique_name = format!( "temp_dir_for_publish_command_{}", path_tools::path::unique_folder_name().err_with( || report.clone() )? );
+    let mut unique_name = format!( "temp_dir_for_publish_command_{}", path_tools::path::unique_folder_name()? );
 
     let dir = if temp
     {
@@ -125,11 +117,11 @@ mod private
 
       while temp_dir.exists()
       {
-        unique_name = format!( "temp_dir_for_publish_command_{}", path_tools::path::unique_folder_name().err_with( || report.clone() )? );
+        unique_name = format!( "temp_dir_for_publish_command_{}", path_tools::path::unique_folder_name()? );
         temp_dir = env::temp_dir().join( unique_name );
       }
 
-      fs::create_dir( &temp_dir ).err_with( || report.clone() )?;
+      fs::create_dir( &temp_dir )?;
       Some( temp_dir )
     }
     else
@@ -142,12 +134,29 @@ mod private
 
     let queue = graph::toposort( subgraph ).unwrap().into_iter().map( | n | package_map.get( &n ).unwrap() ).cloned().collect::< Vec< _ > >();
 
+    let roots = packages_to_publish.iter().map( | p | package_map.get( p ).unwrap().crate_dir() ).collect::< Vec< _ > >();
+    
     let plan = package::PublishPlan::former()
     .workspace_dir( CrateDir::try_from( workspace_root_dir ).unwrap() )
     .option_base_temp_dir( dir.clone() )
     .dry( dry )
+    .roots( roots )
     .packages( queue )
     .form();
+    
+    Ok( plan )
+  }
+
+  ///
+  /// Publish packages.
+  ///
+
+  #[ cfg_attr( feature = "tracing", tracing::instrument ) ]
+  pub fn publish( plan : package::PublishPlan ) -> Result< PublishReport, ( PublishReport, Error ) >
+  {
+    let mut report = PublishReport::default();
+    let temp = plan.base_temp_dir.clone();
+
     report.plan = Some( plan.clone() );
     for package_report in package::perform_packages_publish( plan ).err_with( || report.clone() )?
     {
@@ -155,9 +164,9 @@ mod private
       report.packages.push(( AbsolutePath::try_from( path ).unwrap(), package_report ));
     }
 
-    if temp
+    if let Some( dir ) = temp
     {
-      fs::remove_dir_all( dir.unwrap() ).err_with( || report.clone() )?;
+      fs::remove_dir_all( dir ).err_with( || report.clone() )?;
     }
 
     Ok( report )
@@ -188,6 +197,8 @@ mod private
 
 crate::mod_interface!
 {
-  /// Publish package.
+  /// Create a plan for publishing packages
+  orphan use publish_plan;
+  /// Execute the publication plan
   orphan use publish;
 }
diff --git a/module/move/willbe/src/entity/package.rs b/module/move/willbe/src/entity/package.rs
index 4fb858191e..9f5fdf5703 100644
--- a/module/move/willbe/src/entity/package.rs
+++ b/module/move/willbe/src/entity/package.rs
@@ -471,6 +471,9 @@ mod private
     #[ default( true ) ]
     pub dry : bool,
 
+    /// Required for tree view only
+    pub roots : Vec< CrateDir >,
+
     /// `plans` - This is a vector containing the instructions for publishing each package. Each item
     /// in the `plans` vector indicates a `PackagePublishInstruction` set for a single package. It outlines
     /// how to build and where to publish the package amongst other instructions. The `#[setter( false )]`
@@ -487,19 +490,18 @@ mod private
     /// # Arguments
     ///
     /// * `f` - A mutable reference to a `Formatter` used for writing the output.
-    /// * `roots` - A slice of `CrateDir` representing the root crates to display.
     ///
     /// # Errors
     ///
     /// Returns a `std::fmt::Error` if there is an error writing to the formatter.
-    pub fn display_as_tree( &self, f : &mut Formatter< '_ >, roots : &[ CrateDir ] ) -> std::fmt::Result
+    pub fn display_as_tree( &self, f : &mut Formatter< '_ > ) -> std::fmt::Result
     {
       let name_bump_report = self
       .plans
       .iter()
       .map( | x | ( &x.package_name, ( x.version_bump.old_version.to_string(), x.version_bump.new_version.to_string() ) ) )
       .collect::< HashMap< _, _ > >();
-      for wanted in roots
+      for wanted in &self.roots
       {
         let list = action::list
         (

From b989df549b8c995b67b63f953bd9c896a67bc1df Mon Sep 17 00:00:00 2001
From: Barsik <bogdan.balushkin5@gmail.com>
Date: Tue, 16 Apr 2024 12:09:43 +0300
Subject: [PATCH 34/49] Update publish action and refactoring functions

Modified the publish action in publish.rs to add a verification check for packages before publication. Code refactoring was also done for the functions display_as_tree and display_as_list in package.rs to use "write" instead of "display". Minor updates were also added in the command publish.rs.
---
 module/move/willbe/src/action/publish.rs  | 55 +++++++++++++++++++----
 module/move/willbe/src/command/publish.rs | 17 ++++++-
 module/move/willbe/src/entity/package.rs  |  8 +++-
 3 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/module/move/willbe/src/action/publish.rs b/module/move/willbe/src/action/publish.rs
index d2db37f2f4..fd00818594 100644
--- a/module/move/willbe/src/action/publish.rs
+++ b/module/move/willbe/src/action/publish.rs
@@ -32,16 +32,8 @@ mod private
         write!( f, "Nothing to publish" )?;
         return Ok( () );
       }
-      if let Some( plan ) = &self.plan
-      {
-        write!( f, "Tree{} :\n", if plan.roots.len() > 1 { "s" } else { "" } )?;
-        plan.display_as_tree( f )?;
 
-        writeln!( f, "The following packages are pending for publication :" )?;
-        plan.display_as_list( f )?;
-      }
-
-      writeln!( f, "\nActions :" )?;
+      writeln!( f, "Actions :" )?;
       for ( path, report ) in &self.packages
       {
         let report = report.to_string().replace("\n", "\n  ");
@@ -56,6 +48,51 @@ mod private
         };
         write!( f, "Publishing crate by `{}` path\n  {report}", path.display() )?;
       }
+      if let Some( plan ) = &self.plan
+      {
+        if !plan.dry
+        {
+          let expected_to_publish = plan
+          .plans
+          .iter()
+          .map( | p | ( p.version_bump.crate_dir.absolute_path(), p.package_name.clone(), p.version_bump.clone() ) )
+          .collect::< Vec< _ > >();
+          let mut actually_published = self.packages.iter()
+          .filter_map
+          (
+            |( path, repo )|
+            if repo.publish.as_ref().is_some_and( | r | r.error.is_ok() )
+            {
+              Some( path.clone() )
+            }
+            else
+            {
+              None
+            }
+          )
+          .collect::< Vec< _ > >();
+
+          writeln!( f, "Status :" )?;
+          for ( path, name, version )  in expected_to_publish
+          {
+            if let Some( pos ) = actually_published.iter().position( | p | p == &path )
+            {
+              write!( f, "✅ {name} {}", version.new_version )?;
+              // want to check that only expected packages actually published
+              _ = actually_published.remove( pos );
+            }
+            else
+            {
+              write!( f, "❌ {name} {}", version.old_version )?;
+            }
+          }
+          if !actually_published.is_empty()
+          {
+            writeln!( f, "Logical error. Published unexpected packages" )?;
+            return Err( std::fmt::Error );
+          }
+        }
+      }
 
       Ok( () )
     }
diff --git a/module/move/willbe/src/command/publish.rs b/module/move/willbe/src/command/publish.rs
index e8d7d5aabf..d591f56fe3 100644
--- a/module/move/willbe/src/command/publish.rs
+++ b/module/move/willbe/src/command/publish.rs
@@ -5,8 +5,9 @@ mod private
   use colored::Colorize;
 
   use wca::VerifiedCommand;
-  use wtools::error::Result;
+  use wtools::error::{ Result, for_app::Context };
   use former::Former;
+  use std::fmt::Write;
 
   #[ derive( Former ) ]
   struct PublishProperties
@@ -29,8 +30,20 @@ mod private
     let patterns : Vec< _ > = o.args.get_owned( 0 ).unwrap_or_else( || vec![ "./".into() ] );
 
     let PublishProperties { dry, temp } = o.props.try_into()?;
+    let plan = action::publish_plan( patterns, dry, temp ).context( "Failed to plan the publication process" )?;
 
-    match action::publish( patterns, dry, temp )
+    let mut formatted_plan = String::new();
+    writeln!( &mut formatted_plan, "Tree :" )?;
+    plan.write_as_tree( &mut formatted_plan )?;
+    
+    if !plan.plans.is_empty()
+    {
+      writeln!( &mut formatted_plan, "The following packages are pending for publication :" )?;
+      plan.write_as_list( &mut formatted_plan )?;
+    }
+    println!( "{formatted_plan}" );
+
+    match action::publish( plan )
     {
       Ok( report ) =>
       {
diff --git a/module/move/willbe/src/entity/package.rs b/module/move/willbe/src/entity/package.rs
index 9f5fdf5703..81adf13f76 100644
--- a/module/move/willbe/src/entity/package.rs
+++ b/module/move/willbe/src/entity/package.rs
@@ -494,7 +494,9 @@ mod private
     /// # Errors
     ///
     /// Returns a `std::fmt::Error` if there is an error writing to the formatter.
-    pub fn display_as_tree( &self, f : &mut Formatter< '_ > ) -> std::fmt::Result
+    pub fn write_as_tree< W >( &self, f : &mut W ) -> std::fmt::Result
+    where
+      W : std::fmt::Write
     {
       let name_bump_report = self
       .plans
@@ -545,7 +547,9 @@ mod private
     /// # Errors
     ///
     /// Returns a `std::fmt::Error` if there is an error writing to the formatter.
-    pub fn display_as_list( &self, f : &mut Formatter< '_ > ) -> std::fmt::Result
+    pub fn write_as_list< W >( &self, f : &mut W ) -> std::fmt::Result
+    where
+      W : std::fmt::Write
     {
       for ( idx, package ) in self.plans.iter().enumerate()
       {

From df1e42c9b79623bb59412b92e86fd957d8608f57 Mon Sep 17 00:00:00 2001
From: Barsik <bogdan.balushkin5@gmail.com>
Date: Tue, 16 Apr 2024 19:00:51 +0300
Subject: [PATCH 35/49] Fix incorrect slash usage in file paths

This commit resolves an issue where file path delimiters were incorrectly handled when transitioning between Linux and Windows environments. The code now accurately replaces backslashes with forward slashes before URL encoding, thereby ensuring the filename is correctly split and presented.
---
 module/move/willbe/src/action/readme_health_table_renew.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/move/willbe/src/action/readme_health_table_renew.rs b/module/move/willbe/src/action/readme_health_table_renew.rs
index 4649b80a9c..e9a9bb72e6 100644
--- a/module/move/willbe/src/action/readme_health_table_renew.rs
+++ b/module/move/willbe/src/action/readme_health_table_renew.rs
@@ -388,8 +388,9 @@ mod private
       // let path = table_parameters.base_path.
       let example = if let Some( name ) = find_example_file( p.as_path(), &module_name )
       {
-        let path = path.to_string_lossy().replace( "/", "\\" ).replace( "\\", "%2F" );
-        let file_name = name.split( "\\" ).last().unwrap();
+        let path = path.to_string_lossy().replace( '\\', "/" ).replace( "/", "%2F" );
+        let tmp = name.replace( '\\', "/" );
+        let file_name = tmp.split( '/' ).last().unwrap();
         let name = file_name.strip_suffix( ".rs" ).unwrap();
         format!( "[![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE={path}%2Fexamples%2F{file_name},RUN_POSTFIX=--example%20{name}/{})", parameters.core_url )
       }

From 79de26266b11d64eae5f7b56f9371011af888c8e Mon Sep 17 00:00:00 2001
From: Barsik <bogdan.balushkin5@gmail.com>
Date: Mon, 22 Apr 2024 16:34:09 +0300
Subject: [PATCH 36/49] Add duplicate flag and restructure dependency reporting

A 'duplicate' flag was added to the 'ListNodeReport' struct to indicate a node is a duplicate. The process of dependency reporting was restructured with a focus to handle such duplicates more effectively. Also added new functions that merge development dependencies and rearrange duplicates to ensure correct dependency relationships are visualized in reports.
---
 module/move/willbe/src/action/list.rs | 98 +++++++++++++++++++++++++--
 1 file changed, 91 insertions(+), 7 deletions(-)

diff --git a/module/move/willbe/src/action/list.rs b/module/move/willbe/src/action/list.rs
index b8b25c9369..a709a0f218 100644
--- a/module/move/willbe/src/action/list.rs
+++ b/module/move/willbe/src/action/list.rs
@@ -176,7 +176,7 @@ mod private
   /// It holds essential information about the project dependencies. It is also capable
   /// of holding any nested dependencies in a recursive manner, allowing the modeling
   /// of complex dependency structures.
-  #[ derive( Debug, Clone ) ]
+  #[ derive( Debug, Clone, Eq, PartialEq ) ]
   pub struct ListNodeReport
   {
     /// This could be the name of the library or crate.
@@ -186,6 +186,8 @@ mod private
     /// The path to the node's source files in the local filesystem. This is
     /// optional as not all nodes may have a local presence (e.g., nodes representing remote crates).
     pub path : Option< PathBuf >,
+    /// This field is a flag indicating whether the Node is a duplicate or not.
+    pub duplicate : bool,
     /// A list that stores normal dependencies.
     /// Each element in the list is also of the same 'ListNodeReport' type to allow
     /// storage of nested dependencies.
@@ -218,6 +220,7 @@ mod private
       write!( f, "{}", self.name )?;
       if let Some( version ) = &self.version { write!( f, " {version}" )? }
       if let Some( path ) = &self.path { write!( f, " {}", path.display() )? }
+      if self.duplicate { write!( f, "(*)" )? }
       write!( f, "\n" )?;
 
       let mut new_spacer = format!( "{spacer}{}  ", if self.normal_dependencies.len() < 2 { " " } else { UTF8_SYMBOLS.down } );
@@ -336,6 +339,7 @@ mod private
       name : dep.name().clone(),
       version : if args.info.contains( &PackageAdditionalInfo::Version ) { Some( dep.req().to_string() ) } else { None },
       path : if args.info.contains( &PackageAdditionalInfo::Path ) { dep.path().as_ref().map( | p | p.clone().into_std_path_buf() ) } else { None },
+      duplicate : false,
       normal_dependencies : vec![],
       dev_dependencies : vec![],
       build_dependencies : vec![],
@@ -345,7 +349,7 @@ mod private
     // if this is a cycle (we have visited this node before)
     if visited.contains( &dep_id )
     {
-      dep_rep.name = format!( "{} (*)", dep_rep.name );
+      dep_rep.duplicate = true;
 
       return dep_rep;
     }
@@ -404,6 +408,7 @@ mod private
         name : package.name().to_string(),
         version : if args.info.contains( &PackageAdditionalInfo::Version ) { Some( package.version().to_string() ) } else { None },
         path : if args.info.contains( &PackageAdditionalInfo::Path ) { Some( package.manifest_path().as_std_path().to_path_buf() ) } else { None },
+        duplicate : false,
         normal_dependencies : vec![],
         dev_dependencies : vec![],
         build_dependencies : vec![],
@@ -413,9 +418,9 @@ mod private
 
       *report = match report
       {
-        ListReport::Tree(ref mut v ) => ListReport::Tree( { v.extend([ package_report ]); v.clone() } ),
+        ListReport::Tree( ref mut v ) => ListReport::Tree( { v.extend([ package_report ]); v.clone() } ),
         ListReport::Empty => ListReport::Tree( vec![ package_report ] ),
-        ListReport::List(_ ) => unreachable!(),
+        ListReport::List( _ ) => unreachable!(),
       };
     };
     match args.format
@@ -423,7 +428,10 @@ mod private
       ListFormat::Tree if is_package =>
       {
         let mut visited = HashSet::new();
-        tree_package_report( manifest.manifest_path, &mut report, &mut visited )
+        tree_package_report( manifest.manifest_path, &mut report, &mut visited );
+        let ListReport::Tree( tree ) = report else { unreachable!() };
+        let tree = rearrange_duplicates( merge_dev_dependencies( tree ) );
+        report = ListReport::Tree( tree );
       }
       ListFormat::Tree =>
       {
@@ -433,6 +441,9 @@ mod private
         {
           tree_package_report( package.manifest_path().as_std_path().try_into().unwrap(), &mut report, &mut visited )
         }
+        let ListReport::Tree( tree ) = report else { unreachable!() };
+        let tree = rearrange_duplicates( merge_dev_dependencies( tree ) );
+        report = ListReport::Tree( tree );
       }
       ListFormat::Topological =>
       {
@@ -461,7 +472,7 @@ mod private
         let packages_map =  packages::filter
         (
           packages.as_slice(),
-          FilterMapOptions{ dependency_filter : Some( Box::new( dep_filter ) ), ..Default::default() }
+          FilterMapOptions { dependency_filter : Some( Box::new( dep_filter ) ), ..Default::default() }
         );
 
         let graph = graph::construct( &packages_map );
@@ -504,7 +515,7 @@ mod private
           let node = graph.node_indices().find( | n | graph.node_weight( *n ).unwrap() == &&root_crate ).unwrap();
           let mut dfs = Dfs::new( &graph, node );
           let mut subgraph = Graph::new();
-          let mut node_map = std::collections::HashMap::new();
+          let mut node_map = HashMap::new();
           while let Some( n )= dfs.next( &graph )
           {
             node_map.insert( n, subgraph.add_node( graph[ n ] ) );
@@ -547,6 +558,79 @@ mod private
 
     Ok( report )
   }
+  
+  fn merge_dev_dependencies( mut report: Vec< ListNodeReport > ) -> Vec< ListNodeReport >
+  {
+    let mut dev_dependencies = vec![];
+    for node_report in &mut report
+    {
+      dev_dependencies = merge_dev_dependencies_impl( node_report, dev_dependencies );
+    }
+    if let Some( last_report ) = report.last_mut()
+    {
+      last_report.dev_dependencies = dev_dependencies;
+    }
+    
+    report
+  }
+  
+  fn merge_dev_dependencies_impl( report : &mut ListNodeReport, mut dev_deps_acc : Vec< ListNodeReport > ) -> Vec< ListNodeReport >
+  {
+    for dep in report.normal_dependencies.iter_mut()
+    .chain( report.dev_dependencies.iter_mut() )
+    .chain( report.build_dependencies.iter_mut() )
+    {
+      dev_deps_acc = merge_dev_dependencies_impl( dep, dev_deps_acc );
+    }
+    
+    for dep in std::mem::take( &mut report.dev_dependencies )
+    {
+      if !dev_deps_acc.contains( &dep )
+      {
+        dev_deps_acc.push( dep );
+      }
+    }
+    
+    dev_deps_acc
+  }
+  
+  fn rearrange_duplicates( mut report : Vec< ListNodeReport > ) -> Vec< ListNodeReport >
+  {
+    let mut required_normal : HashMap< usize, Vec< ListNodeReport > > = HashMap::new();
+    for i in 0 .. report.len()
+    {
+      let ( required, exist ) : ( Vec< _ >, Vec< _ > ) = std::mem::take( &mut report[ i ].normal_dependencies ).into_iter().partition( | d | d.duplicate );
+      report[ i ].normal_dependencies = exist;
+      required_normal.insert( i, required );
+    }
+    
+    rearrange_duplicates_resolver( &mut report, &mut required_normal );
+    for ( i, deps ) in required_normal
+    {
+      report[ i ].normal_dependencies.extend( deps );
+    }
+    
+    report
+  }
+  
+  fn rearrange_duplicates_resolver( report : &mut [ ListNodeReport ], required : &mut HashMap< usize, Vec< ListNodeReport > > )
+  {
+    for node in report
+    {
+      rearrange_duplicates_resolver( &mut node.normal_dependencies, required );
+      rearrange_duplicates_resolver( &mut node.dev_dependencies, required );
+      rearrange_duplicates_resolver( &mut node.build_dependencies, required );
+      
+      if !node.duplicate
+      {
+        if let Some( r ) = required.iter_mut().flat_map( |( _, v )| v )
+        .find( | r | r.name == node.name && r.version == node.version && r.path == node.path )
+        {
+          std::mem::swap( r, node );
+        }
+      }
+    }
+  }
 }
 
 //

From 2d4aceaa4369c3399e76fd1327b8ece71a4cb2a1 Mon Sep 17 00:00:00 2001
From: Sakapoi <yuhnon@mail.ru>
Date: Tue, 23 Apr 2024 00:29:36 +0300
Subject: [PATCH 37/49] fixed links

---
 Readme.md                                    | 2 +-
 module/move/willbe/src/action/main_header.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Readme.md b/Readme.md
index 3da4efac70..75ed5a22ca 100644
--- a/Readme.md
+++ b/Readme.md
@@ -4,7 +4,7 @@
 
 <!--{ generate.main_header }-->
 
-[![alpha](https://img.shields.io/github/actions/workflow/status/Wandalen/wTools/StandardRustScheduled.yml?branch=master&label=alpha&logo=github)](https://github.com/Wandalen/wTools/actions/workflows/StandardRustStatus.yml)
+[![alpha](https://img.shields.io/github/actions/workflow/status/Wandalen/wTools/StandardRustScheduled.yml?branch=master&label=alpha&logo=github)](https://github.com/Wandalen/wTools/actions)
 [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 [![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=sample%2Frust%2Fwtools_trivial_sample%2Fsrc%2Fmain.rs,RUN_POSTFIX=--example%20wtools_trivial_sample/https://github.com/Wandalen/wTools)
 [![docs.rs](https://raster.shields.io/static/v1?label=docs&message=online&color=eee&logo=docsdotrs&logoColor=eee)](https://docs.rs/wtools)
diff --git a/module/move/willbe/src/action/main_header.rs b/module/move/willbe/src/action/main_header.rs
index 288aa78cba..8ad4d8ce6a 100644
--- a/module/move/willbe/src/action/main_header.rs
+++ b/module/move/willbe/src/action/main_header.rs
@@ -78,7 +78,7 @@ mod private
       (
         format!
         (
-          r#"[![{}](https://img.shields.io/github/actions/workflow/status/{}/StandardRustScheduled.yml?branch=master&label={}&logo=github)](https://github.com/{}/actions/workflows/StandardRustStatus.yml){}
+          r#"[![{}](https://img.shields.io/github/actions/workflow/status/{}/StandardRustScheduled.yml?branch=master&label={}&logo=github)](https://github.com/{}/actions){}
 [![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=sample%2Frust%2F{}_trivial%2Fsrc%2Fmain.rs,RUN_POSTFIX=--example%20{}_trivial/https://github.com/{})
 [![docs.rs](https://raster.shields.io/static/v1?label=docs&message=online&color=eee&logo=docsdotrs&logoColor=eee)](https://docs.rs/{})"#,
           self.master_branch, url::git_info_extract( &self.repository_url )?, self.master_branch, url::git_info_extract( &self.repository_url )?,

From 5170adf46b8db27d8081f47b9cafdf96d9a32546 Mon Sep 17 00:00:00 2001
From: Sakapoi <yuhnon@mail.ru>
Date: Tue, 23 Apr 2024 01:05:07 +0300
Subject: [PATCH 38/49] fixed bages

---
 module/alias/cargo_will/Readme.md                           | 2 +-
 module/alias/file_tools/Readme.md                           | 2 +-
 module/alias/fundamental_data_type/Readme.md                | 2 +-
 module/alias/instance_of/Readme.md                          | 2 +-
 module/alias/multilayer/Readme.md                           | 2 +-
 module/alias/proc_macro_tools/Readme.md                     | 2 +-
 module/alias/proper_tools/Readme.md                         | 2 +-
 module/alias/werror/Readme.md                               | 2 +-
 module/alias/willbe2/Readme.md                              | 2 +-
 module/alias/winterval/Readme.md                            | 2 +-
 module/alias/wproc_macro/Readme.md                          | 2 +-
 module/alias/wstring_tools/Readme.md                        | 2 +-
 module/alias/wtest/Readme.md                                | 2 +-
 module/alias/wtest_basic/Readme.md                          | 2 +-
 module/blank/exe_tools/Readme.md                            | 2 +-
 module/blank/image_tools/Readme.md                          | 2 +-
 module/blank/math_tools/Readme.md                           | 2 +-
 module/blank/w4d/Readme.md                                  | 2 +-
 module/blank/willbe_old/Readme.md                           | 2 +-
 module/blank/wlang/Readme.md                                | 2 +-
 module/core/clone_dyn/Readme.md                             | 2 +-
 module/core/clone_dyn_meta/Readme.md                        | 2 +-
 module/core/collection_tools/Readme.md                      | 2 +-
 module/core/data_type/Readme.md                             | 2 +-
 module/core/derive_tools/Readme.md                          | 2 +-
 module/core/derive_tools_meta/Readme.md                     | 2 +-
 module/core/diagnostics_tools/Readme.md                     | 2 +-
 module/core/error_tools/Readme.md                           | 2 +-
 module/core/for_each/Readme.md                              | 2 +-
 module/core/former/Readme.md                                | 2 +-
 module/core/former_meta/Readme.md                           | 2 +-
 module/core/fs_tools/Readme.md                              | 2 +-
 module/core/implements/Readme.md                            | 2 +-
 module/core/impls_index/Readme.md                           | 2 +-
 module/core/impls_index_meta/Readme.md                      | 2 +-
 module/core/include_md/Readme.md                            | 2 +-
 module/core/inspect_type/Readme.md                          | 2 +-
 module/core/interval_adapter/Readme.md                      | 2 +-
 module/core/is_slice/Readme.md                              | 2 +-
 module/core/iter_tools/Readme.md                            | 2 +-
 module/core/macro_tools/Readme.md                           | 2 +-
 module/core/mem_tools/Readme.md                             | 2 +-
 module/core/meta_tools/Readme.md                            | 2 +-
 module/core/mod_interface/Readme.md                         | 2 +-
 module/core/mod_interface_meta/Readme.md                    | 2 +-
 module/core/process_tools/Readme.md                         | 2 +-
 module/core/proper_path_tools/Readme.md                     | 2 +-
 module/core/reflect_tools/Readme.md                         | 2 +-
 module/core/reflect_tools_meta/Readme.md                    | 2 +-
 module/core/strs_tools/Readme.md                            | 2 +-
 module/core/test_tools/Readme.md                            | 2 +-
 module/core/time_tools/Readme.md                            | 2 +-
 module/core/typing_tools/Readme.md                          | 2 +-
 module/core/variadic_from/Readme.md                         | 2 +-
 module/core/wtools/Readme.md                                | 2 +-
 module/move/crates_tools/Readme.md                          | 2 +-
 module/move/deterministic_rand/Readme.md                    | 2 +-
 module/move/graphs_tools/Readme.md                          | 2 +-
 module/move/optimization_tools/Readme.md                    | 2 +-
 module/move/plot_interface/Readme.md                        | 2 +-
 module/move/refiner/Readme.md                               | 2 +-
 module/move/sqlx_query/Readme.md                            | 2 +-
 module/move/unitore/Readme.md                               | 2 +-
 module/move/wca/Readme.md                                   | 2 +-
 module/move/willbe/Readme.md                                | 2 +-
 .../move/willbe/src/action/readme_modules_headers_renew.rs  | 6 +++---
 module/move/wplot/Readme.md                                 | 2 +-
 module/test/a/Readme.md                                     | 2 +-
 module/test/b/Readme.md                                     | 2 +-
 module/test/c/Readme.md                                     | 2 +-
 70 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/module/alias/cargo_will/Readme.md b/module/alias/cargo_will/Readme.md
index 10c35c5726..92c298a0e1 100644
--- a/module/alias/cargo_will/Readme.md
+++ b/module/alias/cargo_will/Readme.md
@@ -1,6 +1,6 @@
 # Module :: cargo_will
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_cargo_will_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_cargo_will_push.yml) [![docs.rs](https://img.shields.io/docsrs/cargo_will?color=e3e8f0&logo=docs.rs)](https://docs.rs/cargo_will) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_cargo_will_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_cargo_will_push.yml)[![docs.rs](https://img.shields.io/docsrs/cargo_will?color=e3e8f0&logo=docs.rs)](https://docs.rs/cargo_will) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 Utility to publish multi-crate and multi-workspace environments and maintain their consistency.
 
diff --git a/module/alias/file_tools/Readme.md b/module/alias/file_tools/Readme.md
index 2d47fabbab..27cb2c969f 100644
--- a/module/alias/file_tools/Readme.md
+++ b/module/alias/file_tools/Readme.md
@@ -1,5 +1,5 @@
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_file_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_file_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/file_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/file_tools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_file_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_file_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/file_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/file_tools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 # Module :: file_tools
 
diff --git a/module/alias/fundamental_data_type/Readme.md b/module/alias/fundamental_data_type/Readme.md
index 6bc40755ec..b77f3bee6b 100644
--- a/module/alias/fundamental_data_type/Readme.md
+++ b/module/alias/fundamental_data_type/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: fundamental_data_type
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_fundamental_data_type_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_fundamental_data_type_push.yml) [![docs.rs](https://img.shields.io/docsrs/fundamental_data_type?color=e3e8f0&logo=docs.rs)](https://docs.rs/fundamental_data_type) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_fundamental_data_type_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_fundamental_data_type_push.yml)[![docs.rs](https://img.shields.io/docsrs/fundamental_data_type?color=e3e8f0&logo=docs.rs)](https://docs.rs/fundamental_data_type) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 A collection of derive macros designed to enhance STD.
diff --git a/module/alias/instance_of/Readme.md b/module/alias/instance_of/Readme.md
index b926167a84..d65fbac36e 100644
--- a/module/alias/instance_of/Readme.md
+++ b/module/alias/instance_of/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: instance_of
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_instance_of_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_instance_of_push.yml) [![docs.rs](https://img.shields.io/docsrs/instance_of?color=e3e8f0&logo=docs.rs)](https://docs.rs/instance_of) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_instance_of_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_instance_of_push.yml)[![docs.rs](https://img.shields.io/docsrs/instance_of?color=e3e8f0&logo=docs.rs)](https://docs.rs/instance_of) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Macro to answer the question: does it implement a trait?
diff --git a/module/alias/multilayer/Readme.md b/module/alias/multilayer/Readme.md
index 2ce79f6c18..33f7abc301 100644
--- a/module/alias/multilayer/Readme.md
+++ b/module/alias/multilayer/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: multilayer
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_multilayer_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_multilayer_push.yml) [![docs.rs](https://img.shields.io/docsrs/multilayer?color=e3e8f0&logo=docs.rs)](https://docs.rs/multilayer) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_multilayer_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_multilayer_push.yml)[![docs.rs](https://img.shields.io/docsrs/multilayer?color=e3e8f0&logo=docs.rs)](https://docs.rs/multilayer) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Protocol of modularity unifying interface of a module and introducing layers.
diff --git a/module/alias/proc_macro_tools/Readme.md b/module/alias/proc_macro_tools/Readme.md
index 6fc3b5b314..578d41ea0e 100644
--- a/module/alias/proc_macro_tools/Readme.md
+++ b/module/alias/proc_macro_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: proc_macro_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_proc_macro_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_proc_macro_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/proc_macro_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/proc_macro_tools) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Falias%2Fproc_macro_tools%2Fexamples%2Fproc_macro_tools_trivial.rs,RUN_POSTFIX=--example%20proc_macro_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_proc_macro_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_proc_macro_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/proc_macro_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/proc_macro_tools)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/alias/proc_macro_tools/examples/proc_macro_tools_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/alias/proc_macro_tools/examples/proc_macro_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Tools for writing procedural macros.
diff --git a/module/alias/proper_tools/Readme.md b/module/alias/proper_tools/Readme.md
index 745078fa5b..5e33526028 100644
--- a/module/alias/proper_tools/Readme.md
+++ b/module/alias/proper_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: proper_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_proper_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_proper_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/proper_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/proper_tools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_proper_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_proper_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/proper_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/proper_tools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Collection of general purpose tools for solving problems. Fundamentally extend the language without spoiling, so may be used solely or in conjunction with another module of such kind.
diff --git a/module/alias/werror/Readme.md b/module/alias/werror/Readme.md
index bc677dc4bc..bbe867f034 100644
--- a/module/alias/werror/Readme.md
+++ b/module/alias/werror/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: werror
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_werror_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_werror_push.yml) [![docs.rs](https://img.shields.io/docsrs/werror?color=e3e8f0&logo=docs.rs)](https://docs.rs/werror) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Falias%2Fwerror%2Fexamples%2Fwerror_tools_trivial.rs,RUN_POSTFIX=--example%20werror_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_werror_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_werror_push.yml)[![docs.rs](https://img.shields.io/docsrs/werror?color=e3e8f0&logo=docs.rs)](https://docs.rs/werror)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/alias/werror/examples/werror_tools_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/alias/werror/examples/werror_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Basic exceptions handling mechanism.
diff --git a/module/alias/willbe2/Readme.md b/module/alias/willbe2/Readme.md
index 544acb7210..43106a1c7e 100644
--- a/module/alias/willbe2/Readme.md
+++ b/module/alias/willbe2/Readme.md
@@ -1,6 +1,6 @@
 # Module :: willbe2
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_willbe_2_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_willbe_2_push.yml) [![docs.rs](https://img.shields.io/docsrs/willbe2?color=e3e8f0&logo=docs.rs)](https://docs.rs/willbe2) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_willbe_2_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_willbe_2_push.yml)[![docs.rs](https://img.shields.io/docsrs/willbe2?color=e3e8f0&logo=docs.rs)](https://docs.rs/willbe2) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Utility to publish multi-crate and multi-workspace environments and maintain their consistency.
diff --git a/module/alias/winterval/Readme.md b/module/alias/winterval/Readme.md
index c66c90be19..530aa1d196 100644
--- a/module/alias/winterval/Readme.md
+++ b/module/alias/winterval/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: winterval
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_winterval_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_winterval_push.yml) [![docs.rs](https://img.shields.io/docsrs/winterval?color=e3e8f0&logo=docs.rs)](https://docs.rs/winterval) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Falias%2Fwinterval%2Fexamples%2Fwinterval_trivial.rs,RUN_POSTFIX=--example%20winterval_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_winterval_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_winterval_push.yml)[![docs.rs](https://img.shields.io/docsrs/winterval?color=e3e8f0&logo=docs.rs)](https://docs.rs/winterval)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/alias/winterval/examples/winterval_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/alias/winterval/examples/winterval_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Integer interval adapter for both Range and RangeInclusive.
diff --git a/module/alias/wproc_macro/Readme.md b/module/alias/wproc_macro/Readme.md
index f3eef99bf7..2fbb9e5478 100644
--- a/module/alias/wproc_macro/Readme.md
+++ b/module/alias/wproc_macro/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: wproc_macro
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_wproc_macro_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_wproc_macro_push.yml) [![docs.rs](https://img.shields.io/docsrs/wproc_macro?color=e3e8f0&logo=docs.rs)](https://docs.rs/wproc_macro) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_wproc_macro_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_wproc_macro_push.yml)[![docs.rs](https://img.shields.io/docsrs/wproc_macro?color=e3e8f0&logo=docs.rs)](https://docs.rs/wproc_macro) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Tools for writing procedural macros.
diff --git a/module/alias/wstring_tools/Readme.md b/module/alias/wstring_tools/Readme.md
index 35afe6fa30..c0b8efdefd 100644
--- a/module/alias/wstring_tools/Readme.md
+++ b/module/alias/wstring_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: wstring_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_wstring_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_wstring_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/wstring_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/wstring_tools) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Falias%2Fwstring_tools%2Fexamples%2Fwstring_toolst_trivial_sample.rs,RUN_POSTFIX=--example%20wstring_toolst_trivial_sample/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_wstring_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_wstring_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/wstring_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/wstring_tools)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/alias/wstring_tools/examples/wstring_toolst_trivial_sample.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/alias/wstring_tools/examples/wstring_toolst_trivial_sample/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Tools to manipulate strings.
diff --git a/module/alias/wtest/Readme.md b/module/alias/wtest/Readme.md
index 5cc01e524f..ddb8591d2e 100644
--- a/module/alias/wtest/Readme.md
+++ b/module/alias/wtest/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: wtest
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_wtest_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_wtest_push.yml) [![docs.rs](https://img.shields.io/docsrs/wtest?color=e3e8f0&logo=docs.rs)](https://docs.rs/wtest) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Falias%2Fwtest%2Fexamples%2Fwtest_trivial_sample.rs,RUN_POSTFIX=--example%20wtest_trivial_sample/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_wtest_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_wtest_push.yml)[![docs.rs](https://img.shields.io/docsrs/wtest?color=e3e8f0&logo=docs.rs)](https://docs.rs/wtest)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/alias/wtest/examples/wtest_trivial_sample.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/alias/wtest/examples/wtest_trivial_sample/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Tools for writing and running tests.
diff --git a/module/alias/wtest_basic/Readme.md b/module/alias/wtest_basic/Readme.md
index bcc5d8e56f..77916765fa 100644
--- a/module/alias/wtest_basic/Readme.md
+++ b/module/alias/wtest_basic/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: wtest_basic
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_wtest_basic_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_wtest_basic_push.yml) [![docs.rs](https://img.shields.io/docsrs/wtest_basic?color=e3e8f0&logo=docs.rs)](https://docs.rs/wtest_basic) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_wtest_basic_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_wtest_basic_push.yml)[![docs.rs](https://img.shields.io/docsrs/wtest_basic?color=e3e8f0&logo=docs.rs)](https://docs.rs/wtest_basic) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Tools for writing and running tests. The most basic things.
diff --git a/module/blank/exe_tools/Readme.md b/module/blank/exe_tools/Readme.md
index 4125d2ee58..bf3e6b9108 100644
--- a/module/blank/exe_tools/Readme.md
+++ b/module/blank/exe_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: exe_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_exe_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_exe_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/exe_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/exe_tools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_exe_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_exe_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/exe_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/exe_tools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Collection of algorithms and structures to handle execution properly.
diff --git a/module/blank/image_tools/Readme.md b/module/blank/image_tools/Readme.md
index c670c5a0e2..ecb1f070c0 100644
--- a/module/blank/image_tools/Readme.md
+++ b/module/blank/image_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: image_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_image_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_image_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/image_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/image_tools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_image_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_image_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/image_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/image_tools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Collections of algorithms and structures to process images.
diff --git a/module/blank/math_tools/Readme.md b/module/blank/math_tools/Readme.md
index 3e314ebc9c..207cfa08b5 100644
--- a/module/blank/math_tools/Readme.md
+++ b/module/blank/math_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: math_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_math_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_math_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/math_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/math_tools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_math_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_math_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/math_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/math_tools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 To be done.
diff --git a/module/blank/w4d/Readme.md b/module/blank/w4d/Readme.md
index 09648e3f1c..168b1796e0 100644
--- a/module/blank/w4d/Readme.md
+++ b/module/blank/w4d/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: math_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_w_4_d_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_w_4_d_push.yml) [![docs.rs](https://img.shields.io/docsrs/w4d?color=e3e8f0&logo=docs.rs)](https://docs.rs/w4d) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_w_4_d_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_w_4_d_push.yml)[![docs.rs](https://img.shields.io/docsrs/w4d?color=e3e8f0&logo=docs.rs)](https://docs.rs/w4d) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 To be done.
diff --git a/module/blank/willbe_old/Readme.md b/module/blank/willbe_old/Readme.md
index 7028ba383c..c7eb0a70bc 100644
--- a/module/blank/willbe_old/Readme.md
+++ b/module/blank/willbe_old/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: willbe
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_willbe_old_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_willbe_old_push.yml) [![docs.rs](https://img.shields.io/docsrs/willbe_old?color=e3e8f0&logo=docs.rs)](https://docs.rs/willbe_old) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_willbe_old_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_willbe_old_push.yml)[![docs.rs](https://img.shields.io/docsrs/willbe_old?color=e3e8f0&logo=docs.rs)](https://docs.rs/willbe_old) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 ___
diff --git a/module/blank/wlang/Readme.md b/module/blank/wlang/Readme.md
index cccb1180b6..18d0751a02 100644
--- a/module/blank/wlang/Readme.md
+++ b/module/blank/wlang/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: wlang
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_wlang_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_wlang_push.yml) [![docs.rs](https://img.shields.io/docsrs/wlang?color=e3e8f0&logo=docs.rs)](https://docs.rs/wlang) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_wlang_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_wlang_push.yml)[![docs.rs](https://img.shields.io/docsrs/wlang?color=e3e8f0&logo=docs.rs)](https://docs.rs/wlang) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Wlang.
diff --git a/module/core/clone_dyn/Readme.md b/module/core/clone_dyn/Readme.md
index 195a7692a6..5d6bae48fd 100644
--- a/module/core/clone_dyn/Readme.md
+++ b/module/core/clone_dyn/Readme.md
@@ -1,7 +1,7 @@
 <!-- {{# generate.module_header{} #}} -->
 # Module :: clone_dyn
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_clone_dyn_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_clone_dyn_push.yml) [![docs.rs](https://img.shields.io/docsrs/clone_dyn?color=e3e8f0&logo=docs.rs)](https://docs.rs/clone_dyn) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fcore%2Fclone_dyn%2Fexamples%2Fclone_dyn_trivial.rs,RUN_POSTFIX=--example%20clone_dyn_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_clone_dyn_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_clone_dyn_push.yml)[![docs.rs](https://img.shields.io/docsrs/clone_dyn?color=e3e8f0&logo=docs.rs)](https://docs.rs/clone_dyn)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/clone_dyn/examples/clone_dyn_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/clone_dyn/examples/clone_dyn_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Derive to clone dyn structures.
diff --git a/module/core/clone_dyn_meta/Readme.md b/module/core/clone_dyn_meta/Readme.md
index bb46445c85..68ce5da980 100644
--- a/module/core/clone_dyn_meta/Readme.md
+++ b/module/core/clone_dyn_meta/Readme.md
@@ -1,7 +1,7 @@
 <!-- {{# generate.module_header{} #}} -->
 # Module :: clone_dyn_meta
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_clone_dyn_meta_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_clone_dyn_meta_push.yml) [![docs.rs](https://img.shields.io/docsrs/clone_dyn_meta?color=e3e8f0&logo=docs.rs)](https://docs.rs/clone_dyn_meta) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_clone_dyn_meta_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_clone_dyn_meta_push.yml)[![docs.rs](https://img.shields.io/docsrs/clone_dyn_meta?color=e3e8f0&logo=docs.rs)](https://docs.rs/clone_dyn_meta) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Derive to clone dyn structures.
diff --git a/module/core/collection_tools/Readme.md b/module/core/collection_tools/Readme.md
index 056efb70e2..07d278c6b1 100644
--- a/module/core/collection_tools/Readme.md
+++ b/module/core/collection_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: collection_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_collection_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_collection_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/collection_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/collection_tools) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fcore%2Fcollection_tools%2Fexamples%2Fcollection_tools_trivial.rs,RUN_POSTFIX=--example%20collection_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_collection_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_collection_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/collection_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/collection_tools)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/collection_tools/examples/collection_tools_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/collection_tools/examples/collection_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Collection of general purpose tools to manipulate collections( containers like Vec/HashMap/HashSet... ).
diff --git a/module/core/data_type/Readme.md b/module/core/data_type/Readme.md
index c49292af1a..2ac9b48d78 100644
--- a/module/core/data_type/Readme.md
+++ b/module/core/data_type/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: data_type
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_data_type_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_data_type_push.yml) [![docs.rs](https://img.shields.io/docsrs/data_type?color=e3e8f0&logo=docs.rs)](https://docs.rs/data_type) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_data_type_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_data_type_push.yml)[![docs.rs](https://img.shields.io/docsrs/data_type?color=e3e8f0&logo=docs.rs)](https://docs.rs/data_type)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/data_type/examples/data_type_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/data_type/examples/data_type_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Collection of primal data types.
diff --git a/module/core/derive_tools/Readme.md b/module/core/derive_tools/Readme.md
index 3897df166b..2016cb2bc1 100644
--- a/module/core/derive_tools/Readme.md
+++ b/module/core/derive_tools/Readme.md
@@ -2,7 +2,7 @@
 
 <!--{ generate.module_header{} }-->
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_derive_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_derive_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/derive_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/derive_tools) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fcore%2Fderive_tools%2Fexamples%2Fderive_tools_trivial.rs,RUN_POSTFIX=--example%20derive_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_derive_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_derive_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/derive_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/derive_tools)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/derive_tools/examples/derive_tools_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/derive_tools/examples/derive_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 ### Basic use-case
diff --git a/module/core/derive_tools_meta/Readme.md b/module/core/derive_tools_meta/Readme.md
index 53f7fba9f0..d03d556919 100644
--- a/module/core/derive_tools_meta/Readme.md
+++ b/module/core/derive_tools_meta/Readme.md
@@ -1,7 +1,7 @@
 <!-- {{# generate.module_header{} #}} -->
 # Module :: derive_tools_meta
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_derive_tools_meta_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_derive_tools_meta_push.yml) [![docs.rs](https://img.shields.io/docsrs/derive_tools_meta?color=e3e8f0&logo=docs.rs)](https://docs.rs/derive_tools_meta) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_derive_tools_meta_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_derive_tools_meta_push.yml)[![docs.rs](https://img.shields.io/docsrs/derive_tools_meta?color=e3e8f0&logo=docs.rs)](https://docs.rs/derive_tools_meta) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Collection of derives which extend STD. Its meta module.
diff --git a/module/core/diagnostics_tools/Readme.md b/module/core/diagnostics_tools/Readme.md
index a64e0abf55..3c074e2f9f 100644
--- a/module/core/diagnostics_tools/Readme.md
+++ b/module/core/diagnostics_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: diagnostics_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_diagnostics_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_diagnostics_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/diagnostics_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/diagnostics_tools) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fcore%2Fdiagnostics_tools%2Fexamples%2Fdiagnostics_tools_trivial.rs,RUN_POSTFIX=--example%20diagnostics_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_diagnostics_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_diagnostics_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/diagnostics_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/diagnostics_tools)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/diagnostics_tools/examples/diagnostics_tools_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/diagnostics_tools/examples/diagnostics_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Diagnostics tools.
diff --git a/module/core/error_tools/Readme.md b/module/core/error_tools/Readme.md
index ba4bbd1504..51b8fec57b 100644
--- a/module/core/error_tools/Readme.md
+++ b/module/core/error_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: error_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_error_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_error_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/error_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/error_tools) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fcore%2Ferror_tools%2Fexamples%2Ferror_tools_trivial.rs,RUN_POSTFIX=--example%20error_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_error_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_error_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/error_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/error_tools)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/error_tools/examples/error_tools_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/error_tools/examples/error_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Basic exceptions handling mechanism.
diff --git a/module/core/for_each/Readme.md b/module/core/for_each/Readme.md
index 3d4bbbe07b..253c9e3b57 100644
--- a/module/core/for_each/Readme.md
+++ b/module/core/for_each/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: for_each
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_for_each_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_for_each_push.yml) [![docs.rs](https://img.shields.io/docsrs/for_each?color=e3e8f0&logo=docs.rs)](https://docs.rs/for_each) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fcore%2Ffor_each%2Fexamples%2Ffor_each_map_style_sample.rs,RUN_POSTFIX=--example%20for_each_map_style_sample/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_for_each_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_for_each_push.yml)[![docs.rs](https://img.shields.io/docsrs/for_each?color=e3e8f0&logo=docs.rs)](https://docs.rs/for_each)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/for_each/examples/for_each_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/for_each/examples/for_each_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Apply a macro for each element of a list.
diff --git a/module/core/former/Readme.md b/module/core/former/Readme.md
index 05fe71c859..7971dc9d9c 100644
--- a/module/core/former/Readme.md
+++ b/module/core/former/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: former
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_former_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_former_push.yml) [![docs.rs](https://img.shields.io/docsrs/former?color=e3e8f0&logo=docs.rs)](https://docs.rs/former) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fcore%2Fformer%2Fexamples%2Fformer_trivial.rs,RUN_POSTFIX=--example%20former_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_former_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_former_push.yml)[![docs.rs](https://img.shields.io/docsrs/former?color=e3e8f0&logo=docs.rs)](https://docs.rs/former)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/former/examples/former_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/former/examples/former_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 A flexible and extensible implementation of the builder pattern.
diff --git a/module/core/former_meta/Readme.md b/module/core/former_meta/Readme.md
index e7eeaec814..46a5d3608d 100644
--- a/module/core/former_meta/Readme.md
+++ b/module/core/former_meta/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: former_meta
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_former_meta_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_former_meta_push.yml) [![docs.rs](https://img.shields.io/docsrs/former_meta?color=e3e8f0&logo=docs.rs)](https://docs.rs/former_meta) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_former_meta_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_former_meta_push.yml)[![docs.rs](https://img.shields.io/docsrs/former_meta?color=e3e8f0&logo=docs.rs)](https://docs.rs/former_meta) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Former - a variation of builder pattern. Implementation of its derive macro. Should not be used independently, instead use module::former which relies on the module.
diff --git a/module/core/fs_tools/Readme.md b/module/core/fs_tools/Readme.md
index a443261de2..ce008b31cc 100644
--- a/module/core/fs_tools/Readme.md
+++ b/module/core/fs_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: fs_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_fs_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_fs_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/fs_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/fs_tools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_fs_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_fs_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/fs_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/fs_tools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Tools to manipulate files.
diff --git a/module/core/implements/Readme.md b/module/core/implements/Readme.md
index 4d21299b3d..dc6a629314 100644
--- a/module/core/implements/Readme.md
+++ b/module/core/implements/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: implements
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_implements_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_implements_push.yml) [![docs.rs](https://img.shields.io/docsrs/implements?color=e3e8f0&logo=docs.rs)](https://docs.rs/implements) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fcore%2Fimplements%2Fexamples%2Fimplements_trivial_sample.rs,RUN_POSTFIX=--example%20implements_trivial_sample/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_implements_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_implements_push.yml)[![docs.rs](https://img.shields.io/docsrs/implements?color=e3e8f0&logo=docs.rs)](https://docs.rs/implements)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/implements/examples/implements_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/implements/examples/implements_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Macro to answer the question: does it implement a trait?
diff --git a/module/core/impls_index/Readme.md b/module/core/impls_index/Readme.md
index 7d71921027..5235c56ec0 100644
--- a/module/core/impls_index/Readme.md
+++ b/module/core/impls_index/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: impls_index
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_impls_index_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_impls_index_push.yml) [![docs.rs](https://img.shields.io/docsrs/impls_index?color=e3e8f0&logo=docs.rs)](https://docs.rs/impls_index) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_impls_index_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_impls_index_push.yml)[![docs.rs](https://img.shields.io/docsrs/impls_index?color=e3e8f0&logo=docs.rs)](https://docs.rs/impls_index)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/impls_index/examples/impls_index_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/impls_index/examples/impls_index_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Several of macros to put each function under a named macro to index every function in a class.
diff --git a/module/core/impls_index_meta/Readme.md b/module/core/impls_index_meta/Readme.md
index 30f90c0634..26f078af7c 100644
--- a/module/core/impls_index_meta/Readme.md
+++ b/module/core/impls_index_meta/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: impls_index_meta
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_impls_index_meta_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_impls_index_meta_push.yml) [![docs.rs](https://img.shields.io/docsrs/impls_index_meta?color=e3e8f0&logo=docs.rs)](https://docs.rs/impls_index_meta) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_impls_index_meta_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_impls_index_meta_push.yml)[![docs.rs](https://img.shields.io/docsrs/impls_index_meta?color=e3e8f0&logo=docs.rs)](https://docs.rs/impls_index_meta) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Several of macros to put each function under a named macro to index every function in a class.
diff --git a/module/core/include_md/Readme.md b/module/core/include_md/Readme.md
index eebef4e63f..4820d1776f 100644
--- a/module/core/include_md/Readme.md
+++ b/module/core/include_md/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: include_md
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_include_md_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_include_md_push.yml) [![docs.rs](https://img.shields.io/docsrs/include_md?color=e3e8f0&logo=docs.rs)](https://docs.rs/include_md) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_include_md_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_include_md_push.yml)[![docs.rs](https://img.shields.io/docsrs/include_md?color=e3e8f0&logo=docs.rs)](https://docs.rs/include_md) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Include markdown file or its section.
diff --git a/module/core/inspect_type/Readme.md b/module/core/inspect_type/Readme.md
index 397701e3b9..4bb4ef449a 100644
--- a/module/core/inspect_type/Readme.md
+++ b/module/core/inspect_type/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: inspect_type
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_inspect_type_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_inspect_type_push.yml) [![docs.rs](https://img.shields.io/docsrs/inspect_type?color=e3e8f0&logo=docs.rs)](https://docs.rs/inspect_type) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fcore%2Finspect_type%2Fexamples%2Finspect_type_trivial.rs,RUN_POSTFIX=--example%20inspect_type_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_inspect_type_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_inspect_type_push.yml)[![docs.rs](https://img.shields.io/docsrs/inspect_type?color=e3e8f0&logo=docs.rs)](https://docs.rs/inspect_type)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/inspect_type/examples/inspect_type_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/inspect_type/examples/inspect_type_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Diagnostic-purpose tools to inspect type of a variable and its size.
diff --git a/module/core/interval_adapter/Readme.md b/module/core/interval_adapter/Readme.md
index f4e7196ef1..9c86678ec4 100644
--- a/module/core/interval_adapter/Readme.md
+++ b/module/core/interval_adapter/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: interval_adapter
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_interval_adapter_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_interval_adapter_push.yml) [![docs.rs](https://img.shields.io/docsrs/interval_adapter?color=e3e8f0&logo=docs.rs)](https://docs.rs/interval_adapter) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fcore%2Finterval_adapter%2Fexamples%2Finterval_adapter_trivial.rs,RUN_POSTFIX=--example%20interval_adapter_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_interval_adapter_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_interval_adapter_push.yml)[![docs.rs](https://img.shields.io/docsrs/interval_adapter?color=e3e8f0&logo=docs.rs)](https://docs.rs/interval_adapter)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/interval_adapter/examples/interval_adapter_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/interval_adapter/examples/interval_adapter_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Integer interval adapter for both Range and RangeInclusive.
diff --git a/module/core/is_slice/Readme.md b/module/core/is_slice/Readme.md
index 9b1148c6f5..f5fef2c388 100644
--- a/module/core/is_slice/Readme.md
+++ b/module/core/is_slice/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: is_slice
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_is_slice_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_is_slice_push.yml) [![docs.rs](https://img.shields.io/docsrs/is_slice?color=e3e8f0&logo=docs.rs)](https://docs.rs/is_slice) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fcore%2Fis_slice%2Fexamples%2Fis_slice_trivial_sample.rs,RUN_POSTFIX=--example%20is_slice_trivial_sample/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_is_slice_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_is_slice_push.yml)[![docs.rs](https://img.shields.io/docsrs/is_slice?color=e3e8f0&logo=docs.rs)](https://docs.rs/is_slice)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/is_slice/examples/is_slice_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/is_slice/examples/is_slice_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Macro to answer the question: is it a slice?
diff --git a/module/core/iter_tools/Readme.md b/module/core/iter_tools/Readme.md
index 3a8eb19d94..9ccc97ac40 100644
--- a/module/core/iter_tools/Readme.md
+++ b/module/core/iter_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: iter_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_iter_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_iter_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/iter_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/iter_tools) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fcore%2Fiter_tools%2Fexamples%2Fiter_tools_trivial.rs,RUN_POSTFIX=--example%20iter_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_iter_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_iter_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/iter_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/iter_tools)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/iter_tools/examples/iter_tools_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/iter_tools/examples/iter_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Collection of general purpose tools to iterate. Currently it simply reexports itertools.
diff --git a/module/core/macro_tools/Readme.md b/module/core/macro_tools/Readme.md
index 374937d1f2..1eb57f9c4e 100644
--- a/module/core/macro_tools/Readme.md
+++ b/module/core/macro_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: proc_macro_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_macro_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_macro_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/macro_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/macro_tools) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fcore%2Fmacro_tools%2Fexamples%2Fmacro_tools_trivial.rs,RUN_POSTFIX=--example%20macro_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_macro_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_macro_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/macro_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/macro_tools)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/macro_tools/examples/macro_tools_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/macro_tools/examples/macro_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Tools for writing procedural macros.
diff --git a/module/core/mem_tools/Readme.md b/module/core/mem_tools/Readme.md
index f9f03be836..8d58be1864 100644
--- a/module/core/mem_tools/Readme.md
+++ b/module/core/mem_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: mem_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_mem_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_mem_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/mem_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/mem_tools) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fcore%2Fmem_tools%2Fexamples%2Fmem_tools_trivial_sample.rs,RUN_POSTFIX=--example%20mem_tools_trivial_sample/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_mem_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_mem_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/mem_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/mem_tools)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/mem_tools/examples/mem_tools_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/mem_tools/examples/mem_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Collection of tools to manipulate memory.
diff --git a/module/core/meta_tools/Readme.md b/module/core/meta_tools/Readme.md
index 7ebb1efcee..4cbb135d6c 100644
--- a/module/core/meta_tools/Readme.md
+++ b/module/core/meta_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: meta_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_meta_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_meta_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/meta_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/meta_tools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_meta_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_meta_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/meta_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/meta_tools)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/meta_tools/examples/meta_tools_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/meta_tools/examples/meta_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Collection of general purpose meta tools.
diff --git a/module/core/mod_interface/Readme.md b/module/core/mod_interface/Readme.md
index 1115dea469..eb8321e391 100644
--- a/module/core/mod_interface/Readme.md
+++ b/module/core/mod_interface/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: mod_interface
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_mod_interface_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_mod_interface_push.yml) [![docs.rs](https://img.shields.io/docsrs/mod_interface?color=e3e8f0&logo=docs.rs)](https://docs.rs/mod_interface) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_mod_interface_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_mod_interface_push.yml)[![docs.rs](https://img.shields.io/docsrs/mod_interface?color=e3e8f0&logo=docs.rs)](https://docs.rs/mod_interface) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Protocol of modularity unifying interface of a module and introducing layers.
diff --git a/module/core/mod_interface_meta/Readme.md b/module/core/mod_interface_meta/Readme.md
index d9b2a9bd8b..feee51ecc5 100644
--- a/module/core/mod_interface_meta/Readme.md
+++ b/module/core/mod_interface_meta/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: mod_interface_meta
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_mod_interface_meta_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_mod_interface_meta_push.yml) [![docs.rs](https://img.shields.io/docsrs/mod_interface_meta?color=e3e8f0&logo=docs.rs)](https://docs.rs/mod_interface_meta) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_mod_interface_meta_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_mod_interface_meta_push.yml)[![docs.rs](https://img.shields.io/docsrs/mod_interface_meta?color=e3e8f0&logo=docs.rs)](https://docs.rs/mod_interface_meta) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Protocol of modularity unifying interface of a module and introducing layers.
diff --git a/module/core/process_tools/Readme.md b/module/core/process_tools/Readme.md
index 97f7c673ea..8a42257372 100644
--- a/module/core/process_tools/Readme.md
+++ b/module/core/process_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: process_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_process_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_process_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/process_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/process_tools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_process_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_process_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/process_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/process_tools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Collection of algorithms and structures to handle processes properly.
diff --git a/module/core/proper_path_tools/Readme.md b/module/core/proper_path_tools/Readme.md
index d142018019..e9d7fc5a0d 100644
--- a/module/core/proper_path_tools/Readme.md
+++ b/module/core/proper_path_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: proper_path_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_proper_path_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_proper_path_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/proper_path_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/proper_path_tools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_proper_path_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_proper_path_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/proper_path_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/proper_path_tools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Collection of algorithms and structures to handle paths properly.
diff --git a/module/core/reflect_tools/Readme.md b/module/core/reflect_tools/Readme.md
index ce2d2b5857..a70cb4661d 100644
--- a/module/core/reflect_tools/Readme.md
+++ b/module/core/reflect_tools/Readme.md
@@ -2,7 +2,7 @@
 
 <!--{ generate.module_header{} }-->
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_reflect_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_reflect_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/reflect_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/reflect_tools) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fcore%2Freflect_tools%2Fexamples%2Freflect_tools_trivial.rs,RUN_POSTFIX=--example%20reflect_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_reflect_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_reflect_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/reflect_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/reflect_tools)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/reflect_tools/examples/reflect_tools_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/reflect_tools/examples/reflect_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 ### Basic use-case
diff --git a/module/core/reflect_tools_meta/Readme.md b/module/core/reflect_tools_meta/Readme.md
index 9d7ee04fc9..054c0aafd1 100644
--- a/module/core/reflect_tools_meta/Readme.md
+++ b/module/core/reflect_tools_meta/Readme.md
@@ -1,7 +1,7 @@
 <!-- {{# generate.module_header{} #}} -->
 # Module :: reflect_tools_meta
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_reflect_tools_meta_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_reflect_tools_meta_push.yml) [![docs.rs](https://img.shields.io/docsrs/reflect_tools_meta?color=e3e8f0&logo=docs.rs)](https://docs.rs/reflect_tools_meta) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_reflect_tools_meta_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_reflect_tools_meta_push.yml)[![docs.rs](https://img.shields.io/docsrs/reflect_tools_meta?color=e3e8f0&logo=docs.rs)](https://docs.rs/reflect_tools_meta) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Collection of mechanisms for reflection. Its meta module. Don't use directly.
diff --git a/module/core/strs_tools/Readme.md b/module/core/strs_tools/Readme.md
index 5ccd962558..daf87daf13 100644
--- a/module/core/strs_tools/Readme.md
+++ b/module/core/strs_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: strs_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_strs_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_strs_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/strs_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/strs_tools) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fcore%2Fstrs_tools%2Fexamples%2Fstr_toolst_trivial_sample.rs,RUN_POSTFIX=--example%20str_toolst_trivial_sample/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_strs_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_strs_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/strs_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/strs_tools)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/strs_tools/examples/strs_tools_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/strs_tools/examples/strs_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Tools to manipulate strings.
diff --git a/module/core/test_tools/Readme.md b/module/core/test_tools/Readme.md
index e43b56fb0d..10ca951ec2 100644
--- a/module/core/test_tools/Readme.md
+++ b/module/core/test_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: test_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_test_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_test_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/test_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/test_tools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_test_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_test_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/test_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/test_tools)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/test_tools/examples/test_tools_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/test_tools/examples/test_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Tools for writing and running tests.
diff --git a/module/core/time_tools/Readme.md b/module/core/time_tools/Readme.md
index b0ae0810e3..e22aec8ed7 100644
--- a/module/core/time_tools/Readme.md
+++ b/module/core/time_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: time_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_time_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_time_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/time_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/time_tools) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fcore%2Ftime_tools%2Fexamples%2Ftime_tools_trivial_sample.rs,RUN_POSTFIX=--example%20time_tools_trivial_sample/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_time_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_time_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/time_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/time_tools)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/time_tools/examples/time_tools_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/time_tools/examples/time_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Collection of general purpose time tools.
diff --git a/module/core/typing_tools/Readme.md b/module/core/typing_tools/Readme.md
index 550268d6c5..4a93671cd3 100644
--- a/module/core/typing_tools/Readme.md
+++ b/module/core/typing_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: typing_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_typing_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_typing_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/typing_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/typing_tools) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fcore%2Ftyping_tools%2Fexamples%2Ftyping_tools_trivial_sample.rs,RUN_POSTFIX=--example%20typing_tools_trivial_sample/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_typing_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_typing_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/typing_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/typing_tools)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/typing_tools/examples/typing_tools_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/typing_tools/examples/typing_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Collection of general purpose tools for type checking.
diff --git a/module/core/variadic_from/Readme.md b/module/core/variadic_from/Readme.md
index f6bd50aa1c..41c122b9ef 100644
--- a/module/core/variadic_from/Readme.md
+++ b/module/core/variadic_from/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: variadic_from
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_variadic_from_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_variadic_from_push.yml) [![docs.rs](https://img.shields.io/docsrs/variadic_from?color=e3e8f0&logo=docs.rs)](https://docs.rs/variadic_from) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fcore%2Fvariadic_from%2Fexamples%2Fvariadic_from_trivial.rs,RUN_POSTFIX=--example%20variadic_from_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_variadic_from_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_variadic_from_push.yml)[![docs.rs](https://img.shields.io/docsrs/variadic_from?color=e3e8f0&logo=docs.rs)](https://docs.rs/variadic_from)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/variadic_from/examples/variadic_from_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/variadic_from/examples/variadic_from_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Variadic from
diff --git a/module/core/wtools/Readme.md b/module/core/wtools/Readme.md
index 4bbcf3b77b..9d4af5985b 100644
--- a/module/core/wtools/Readme.md
+++ b/module/core/wtools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: wtools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_wtools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_wtools_push.yml) [![docs.rs](https://img.shields.io/docsrs/wtools?color=e3e8f0&logo=docs.rs)](https://docs.rs/wtools) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fcore%2Fwtools%2Fexamples%2Fmain.rs,RUN_POSTFIX=--example%20main/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_wtools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_wtools_push.yml)[![docs.rs](https://img.shields.io/docsrs/wtools?color=e3e8f0&logo=docs.rs)](https://docs.rs/wtools)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/core/wtools/examples/wtools_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/core/wtools/examples/wtools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Collection of general purpose tools for solving problems. Fundamentally extend the language without spoiling, so may be used solely or in conjunction with another module of such kind.
diff --git a/module/move/crates_tools/Readme.md b/module/move/crates_tools/Readme.md
index 60adb924c6..273b2fc1e2 100644
--- a/module/move/crates_tools/Readme.md
+++ b/module/move/crates_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: crates_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_crates_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_crates_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/crates_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/crates_tools) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fmove%2Fcrates_tools%2Fexamples%2Fshow_crate_content.rs,RUN_POSTFIX=--example%20show_crate_content/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_crates_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_crates_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/crates_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/crates_tools)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/move/crates_tools/examples/crates_tools_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/move/crates_tools/examples/crates_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Tools to analyse crate files.
diff --git a/module/move/deterministic_rand/Readme.md b/module/move/deterministic_rand/Readme.md
index e8aff37b69..db8314280d 100644
--- a/module/move/deterministic_rand/Readme.md
+++ b/module/move/deterministic_rand/Readme.md
@@ -2,7 +2,7 @@
 
 <!-- {{# generate.module_header{} #}} -->
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_deterministic_rand_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_deterministic_rand_push.yml) [![docs.rs](https://img.shields.io/docsrs/deterministic_rand?color=e3e8f0&logo=docs.rs)](https://docs.rs/deterministic_rand) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fmove%2Fdeterministic_rand%2Fexamples%2Fsample_deterministic_rand_rayon.rs,RUN_POSTFIX=--example%20sample_deterministic_rand_rayon/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_deterministic_rand_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_deterministic_rand_push.yml)[![docs.rs](https://img.shields.io/docsrs/deterministic_rand?color=e3e8f0&logo=docs.rs)](https://docs.rs/deterministic_rand)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/move/deterministic_rand/examples/deterministic_rand_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/move/deterministic_rand/examples/deterministic_rand_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Hierarchical random number generators for concurrent simulations with switchable determinism.
diff --git a/module/move/graphs_tools/Readme.md b/module/move/graphs_tools/Readme.md
index c5bedce0b1..ffde219648 100644
--- a/module/move/graphs_tools/Readme.md
+++ b/module/move/graphs_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: graphs_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_graphs_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_graphs_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/graphs_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/graphs_tools) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fmove%2Fgraphs_tools%2Fexamples%2Fgraphs_tools_trivial_sample.rs,RUN_POSTFIX=--example%20graphs_tools_trivial_sample/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_graphs_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_graphs_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/graphs_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/graphs_tools)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/move/graphs_tools/examples/graphs_tools_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/move/graphs_tools/examples/graphs_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Graphs tools.
diff --git a/module/move/optimization_tools/Readme.md b/module/move/optimization_tools/Readme.md
index 0075cf7470..c29601bf7d 100644
--- a/module/move/optimization_tools/Readme.md
+++ b/module/move/optimization_tools/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: optimization_tools
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_optimization_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_optimization_tools_push.yml) [![docs.rs](https://img.shields.io/docsrs/optimization_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/optimization_tools) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fmove%2Foptimization_tools%2Fexamples%2Fcustom_problem.rs,RUN_POSTFIX=--example%20custom_problem/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_optimization_tools_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_optimization_tools_push.yml)[![docs.rs](https://img.shields.io/docsrs/optimization_tools?color=e3e8f0&logo=docs.rs)](https://docs.rs/optimization_tools)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/move/optimization_tools/examples/optimization_tools_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/move/optimization_tools/examples/optimization_tools_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 # Hybrid optimization using Simulated Annealing and Genetic Algorithm
diff --git a/module/move/plot_interface/Readme.md b/module/move/plot_interface/Readme.md
index 0e604acfb8..ff4e519cdf 100644
--- a/module/move/plot_interface/Readme.md
+++ b/module/move/plot_interface/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: plot_interface
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_plot_interface_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_plot_interface_push.yml) [![docs.rs](https://img.shields.io/docsrs/plot_interface?color=e3e8f0&logo=docs.rs)](https://docs.rs/plot_interface) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_plot_interface_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_plot_interface_push.yml)[![docs.rs](https://img.shields.io/docsrs/plot_interface?color=e3e8f0&logo=docs.rs)](https://docs.rs/plot_interface) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Plot interface.
diff --git a/module/move/refiner/Readme.md b/module/move/refiner/Readme.md
index e6455c5205..4c922a5e7b 100644
--- a/module/move/refiner/Readme.md
+++ b/module/move/refiner/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: refiner
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_refiner_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_refiner_push.yml) [![docs.rs](https://img.shields.io/docsrs/refiner?color=e3e8f0&logo=docs.rs)](https://docs.rs/refiner) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_refiner_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_refiner_push.yml)[![docs.rs](https://img.shields.io/docsrs/refiner?color=e3e8f0&logo=docs.rs)](https://docs.rs/refiner) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Utility to operate files from a command line.
diff --git a/module/move/sqlx_query/Readme.md b/module/move/sqlx_query/Readme.md
index d576a121fa..85147969c6 100644
--- a/module/move/sqlx_query/Readme.md
+++ b/module/move/sqlx_query/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: sqlx_query
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_sqlx_query_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_sqlx_query_push.yml) [![docs.rs](https://img.shields.io/docsrs/sqlx_query?color=e3e8f0&logo=docs.rs)](https://docs.rs/sqlx_query) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_sqlx_query_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_sqlx_query_push.yml)[![docs.rs](https://img.shields.io/docsrs/sqlx_query?color=e3e8f0&logo=docs.rs)](https://docs.rs/sqlx_query) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 The tool to make CLI ( commands user interface ). It is able to aggregate external binary applications, as well as functions, which are written in your language.
diff --git a/module/move/unitore/Readme.md b/module/move/unitore/Readme.md
index e631beb82b..cd7d0174f7 100644
--- a/module/move/unitore/Readme.md
+++ b/module/move/unitore/Readme.md
@@ -1,7 +1,7 @@
 
 # Module :: unitore
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_unitore_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_unitore_push.yml) [![docs.rs](https://img.shields.io/docsrs/unitore?color=e3e8f0&logo=docs.rs)](https://docs.rs/unitore) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_unitore_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_unitore_push.yml)[![docs.rs](https://img.shields.io/docsrs/unitore?color=e3e8f0&logo=docs.rs)](https://docs.rs/unitore) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Feed reader with the ability to set updates frequency.
diff --git a/module/move/wca/Readme.md b/module/move/wca/Readme.md
index bce9baaf40..d106e2e866 100644
--- a/module/move/wca/Readme.md
+++ b/module/move/wca/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: wca
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_wca_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_wca_push.yml) [![docs.rs](https://img.shields.io/docsrs/wca?color=e3e8f0&logo=docs.rs)](https://docs.rs/wca) [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module%2Fmove%2Fwca%2Fexamples%2Fwca_trivial.rs,RUN_POSTFIX=--example%20wca_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_wca_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_wca_push.yml)[![docs.rs](https://img.shields.io/docsrs/wca?color=e3e8f0&logo=docs.rs)](https://docs.rs/wca)[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE=module/move/wca/examples/wca_trivial.rs,RUN_POSTFIX=--example%20/home/sakapoi/Документи/wTools_fork/module/move/wca/examples/wca_trivial/https://github.com/Wandalen/wTools) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 The tool to make CLI ( commands user interface ). It is able to aggregate external binary applications, as well as functions, which are written in your language.
diff --git a/module/move/willbe/Readme.md b/module/move/willbe/Readme.md
index b387b877c6..768a66fd0e 100644
--- a/module/move/willbe/Readme.md
+++ b/module/move/willbe/Readme.md
@@ -2,7 +2,7 @@
 
 # Module:: willbe
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_willbe_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_willbe_push.yml) [![docs.rs](https://img.shields.io/docsrs/willbe?color=e3e8f0&logo=docs.rs)](https://docs.rs/willbe) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_willbe_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_willbe_push.yml)[![docs.rs](https://img.shields.io/docsrs/willbe?color=e3e8f0&logo=docs.rs)](https://docs.rs/willbe) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Utility to publish multi-crate and multi-workspace environments and maintain their consistency.
diff --git a/module/move/willbe/src/action/readme_modules_headers_renew.rs b/module/move/willbe/src/action/readme_modules_headers_renew.rs
index 2be1eab6a8..7da9457727 100644
--- a/module/move/willbe/src/action/readme_modules_headers_renew.rs
+++ b/module/move/willbe/src/action/readme_modules_headers_renew.rs
@@ -75,7 +75,7 @@ mod private
       {
         let p = name.strip_prefix( workspace_path ).unwrap().get( 1.. ).unwrap().replace( "\\","%2F" );
         let name = name.split( "\\" ).last().unwrap().split( "." ).next().unwrap();
-        format!( " [![Open in Gitpod](https://raster.shields.io/static/v1?label=&message=try&color=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE={p},RUN_POSTFIX=--example%20{}/https://github.com/{})", name, repo_url )
+        format!( "[![Open in Gitpod](https://raster.shields.io/static/v1?label=try&message=online&color=eee&logo=gitpod&logoColor=eee)](https://gitpod.io/#RUN_PATH=.,SAMPLE_FILE={p},RUN_POSTFIX=--example%20{}/https://github.com/{})", name, repo_url )
       }
       else
       {
@@ -83,8 +83,8 @@ mod private
       };
       Ok( format!
       (
-        "{} \
-        [![rust-status](https://github.com/{}/actions/workflows/module_{}_push.yml/badge.svg)](https://github.com/{}/actions/workflows/module_{}_push.yml) \
+        "{}\
+        [![rust-status](https://github.com/{}/actions/workflows/module_{}_push.yml/badge.svg)](https://github.com/{}/actions/workflows/module_{}_push.yml)\
         [![docs.rs](https://img.shields.io/docsrs/{}?color=e3e8f0&logo=docs.rs)](https://docs.rs/{}){}{}",
         stability_generate( &self.stability ),
         repo_url, self.module_name.to_case( Case::Snake ), repo_url, self.module_name.to_case( Case::Snake ),
diff --git a/module/move/wplot/Readme.md b/module/move/wplot/Readme.md
index 7819424b13..a6002876cb 100644
--- a/module/move/wplot/Readme.md
+++ b/module/move/wplot/Readme.md
@@ -2,7 +2,7 @@
 
 # Module :: wplot
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_wplot_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_wplot_push.yml) [![docs.rs](https://img.shields.io/docsrs/wplot?color=e3e8f0&logo=docs.rs)](https://docs.rs/wplot) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_wplot_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_wplot_push.yml)[![docs.rs](https://img.shields.io/docsrs/wplot?color=e3e8f0&logo=docs.rs)](https://docs.rs/wplot) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
 
 Plot interface.
diff --git a/module/test/a/Readme.md b/module/test/a/Readme.md
index 15883cfdfa..f490337b10 100644
--- a/module/test/a/Readme.md
+++ b/module/test/a/Readme.md
@@ -1,3 +1,3 @@
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_test_experimental_a_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_test_experimental_a_push.yml) [![docs.rs](https://img.shields.io/docsrs/test_experimental_a?color=e3e8f0&logo=docs.rs)](https://docs.rs/test_experimental_a) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_test_experimental_a_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_test_experimental_a_push.yml)[![docs.rs](https://img.shields.io/docsrs/test_experimental_a?color=e3e8f0&logo=docs.rs)](https://docs.rs/test_experimental_a) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
diff --git a/module/test/b/Readme.md b/module/test/b/Readme.md
index 2be10ffb69..29cf4ecf7a 100644
--- a/module/test/b/Readme.md
+++ b/module/test/b/Readme.md
@@ -1,3 +1,3 @@
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_test_experimental_b_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_test_experimental_b_push.yml) [![docs.rs](https://img.shields.io/docsrs/test_experimental_b?color=e3e8f0&logo=docs.rs)](https://docs.rs/test_experimental_b) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_test_experimental_b_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_test_experimental_b_push.yml)[![docs.rs](https://img.shields.io/docsrs/test_experimental_b?color=e3e8f0&logo=docs.rs)](https://docs.rs/test_experimental_b) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->
diff --git a/module/test/c/Readme.md b/module/test/c/Readme.md
index 89ea49aafc..2e21930fc3 100644
--- a/module/test/c/Readme.md
+++ b/module/test/c/Readme.md
@@ -1,3 +1,3 @@
 <!--{ generate.module_header.start() }-->
- [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental) [![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_test_experimental_c_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_test_experimental_c_push.yml) [![docs.rs](https://img.shields.io/docsrs/test_experimental_c?color=e3e8f0&logo=docs.rs)](https://docs.rs/test_experimental_c) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
+ [![experimental](https://raster.shields.io/static/v1?label=&message=experimental&color=orange)](https://github.com/emersion/stability-badges#experimental)[![rust-status](https://github.com/Wandalen/wTools/actions/workflows/module_test_experimental_c_push.yml/badge.svg)](https://github.com/Wandalen/wTools/actions/workflows/module_test_experimental_c_push.yml)[![docs.rs](https://img.shields.io/docsrs/test_experimental_c?color=e3e8f0&logo=docs.rs)](https://docs.rs/test_experimental_c) [![discord](https://img.shields.io/discord/872391416519737405?color=eee&logo=discord&logoColor=eee&label=ask)](https://discord.gg/m3YfbXpUUY)
 <!--{ generate.module_header.end }-->

From 54cf22236daa9145e707ed2c22af82dc9c848d1d Mon Sep 17 00:00:00 2001
From: Barsik <bogdan.balushkin5@gmail.com>
Date: Tue, 23 Apr 2024 09:40:36 +0300
Subject: [PATCH 39/49] Remove unnecessary rearrangement of duplicates

The rearrangement of duplicates function on file `list.rs` has been removed to simplify the dependency reporting method. Development dependencies will now directly merged without handling duplicates, this allows for cleaner, more straightforward code and potentially better performance. The whitespace inconsistencies across the file have also been fixed.
---
 module/move/willbe/src/action/list.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/module/move/willbe/src/action/list.rs b/module/move/willbe/src/action/list.rs
index a709a0f218..ce9dcfb901 100644
--- a/module/move/willbe/src/action/list.rs
+++ b/module/move/willbe/src/action/list.rs
@@ -442,7 +442,7 @@ mod private
           tree_package_report( package.manifest_path().as_std_path().try_into().unwrap(), &mut report, &mut visited )
         }
         let ListReport::Tree( tree ) = report else { unreachable!() };
-        let tree = rearrange_duplicates( merge_dev_dependencies( tree ) );
+        let tree = merge_dev_dependencies( tree );
         report = ListReport::Tree( tree );
       }
       ListFormat::Topological =>
@@ -558,7 +558,7 @@ mod private
 
     Ok( report )
   }
-  
+
   fn merge_dev_dependencies( mut report: Vec< ListNodeReport > ) -> Vec< ListNodeReport >
   {
     let mut dev_dependencies = vec![];
@@ -570,10 +570,10 @@ mod private
     {
       last_report.dev_dependencies = dev_dependencies;
     }
-    
+
     report
   }
-  
+
   fn merge_dev_dependencies_impl( report : &mut ListNodeReport, mut dev_deps_acc : Vec< ListNodeReport > ) -> Vec< ListNodeReport >
   {
     for dep in report.normal_dependencies.iter_mut()
@@ -582,7 +582,7 @@ mod private
     {
       dev_deps_acc = merge_dev_dependencies_impl( dep, dev_deps_acc );
     }
-    
+
     for dep in std::mem::take( &mut report.dev_dependencies )
     {
       if !dev_deps_acc.contains( &dep )
@@ -590,7 +590,7 @@ mod private
         dev_deps_acc.push( dep );
       }
     }
-    
+
     dev_deps_acc
   }
   
@@ -620,7 +620,7 @@ mod private
       rearrange_duplicates_resolver( &mut node.normal_dependencies, required );
       rearrange_duplicates_resolver( &mut node.dev_dependencies, required );
       rearrange_duplicates_resolver( &mut node.build_dependencies, required );
-      
+
       if !node.duplicate
       {
         if let Some( r ) = required.iter_mut().flat_map( |( _, v )| v )

From a0b9753ac5332a322e687492783f3246db96f3ff Mon Sep 17 00:00:00 2001
From: Barsik <bogdan.balushkin5@gmail.com>
Date: Tue, 23 Apr 2024 09:49:15 +0300
Subject: [PATCH 40/49] Merge build dependencies in reporting methods
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The merge_build_dependencies function has been integrated into the overall dependency reporting method in `list.rs`. This change aims to provide a more comprehensive overview of all dependencies – normal, dev, and build – in a single report. The function merge_build_dependencies_impl has also been added to support recursive merging for complex project structures.
---
 module/move/willbe/src/action/list.rs | 39 +++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/module/move/willbe/src/action/list.rs b/module/move/willbe/src/action/list.rs
index ce9dcfb901..6e4bd01dc0 100644
--- a/module/move/willbe/src/action/list.rs
+++ b/module/move/willbe/src/action/list.rs
@@ -430,7 +430,7 @@ mod private
         let mut visited = HashSet::new();
         tree_package_report( manifest.manifest_path, &mut report, &mut visited );
         let ListReport::Tree( tree ) = report else { unreachable!() };
-        let tree = rearrange_duplicates( merge_dev_dependencies( tree ) );
+        let tree = rearrange_duplicates( merge_dev_dependencies( merge_build_dependencies( tree ) ) );
         report = ListReport::Tree( tree );
       }
       ListFormat::Tree =>
@@ -442,7 +442,7 @@ mod private
           tree_package_report( package.manifest_path().as_std_path().try_into().unwrap(), &mut report, &mut visited )
         }
         let ListReport::Tree( tree ) = report else { unreachable!() };
-        let tree = merge_dev_dependencies( tree );
+        let tree = merge_dev_dependencies( merge_build_dependencies( tree ) );
         report = ListReport::Tree( tree );
       }
       ListFormat::Topological =>
@@ -559,6 +559,41 @@ mod private
     Ok( report )
   }
 
+  fn merge_build_dependencies( mut report: Vec< ListNodeReport > ) -> Vec< ListNodeReport >
+  {
+    let mut build_dependencies = vec![];
+    for node_report in &mut report
+    {
+      build_dependencies = merge_build_dependencies_impl( node_report, build_dependencies );
+    }
+    if let Some( last_report ) = report.last_mut()
+    {
+      last_report.build_dependencies = build_dependencies;
+    }
+
+    report
+  }
+  
+  fn merge_build_dependencies_impl( report : &mut ListNodeReport, mut build_deps_acc : Vec< ListNodeReport > ) -> Vec< ListNodeReport >
+  {
+    for dep in report.normal_dependencies.iter_mut()
+      .chain( report.dev_dependencies.iter_mut() )
+      .chain( report.build_dependencies.iter_mut() )
+    {
+      build_deps_acc = merge_build_dependencies_impl(dep, build_deps_acc );
+    }
+
+    for dep in std::mem::take( &mut report.build_dependencies )
+    {
+      if !build_deps_acc.contains( &dep )
+      {
+        build_deps_acc.push( dep );
+      }
+    }
+
+    build_deps_acc
+  }
+  
   fn merge_dev_dependencies( mut report: Vec< ListNodeReport > ) -> Vec< ListNodeReport >
   {
     let mut dev_dependencies = vec![];

From 6e220b9e9e368106fba63257ed09d5b2488a7a52 Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Thu, 25 Apr 2024 14:45:57 +0300
Subject: [PATCH 41/49] fix +test

---
 module/move/optimization_tools/Cargo.toml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/module/move/optimization_tools/Cargo.toml b/module/move/optimization_tools/Cargo.toml
index a9fb722248..3f2473242e 100644
--- a/module/move/optimization_tools/Cargo.toml
+++ b/module/move/optimization_tools/Cargo.toml
@@ -48,15 +48,16 @@ rand = "0.8.5"
 statrs = "0.16.0"
 faer = { version = "0.16.0", features = [ "ndarray" ] }
 ndarray = "0.15.6"
-plotters = { version = "0.3.5", default-features=false, features = [
-  "bitmap_encoder",
-  "ttf",
-  "area_series",
-  "point_series",
-  "line_series",
-  "full_palette",
-  "bitmap_backend",
-] }
+plotters = { git = "https://github.com/plotters-rs/plotters.git" }
+# plotters = { version = "0.3.5", default-features=false, features = [
+#   "bitmap_encoder",
+#   "ttf",
+#   "area_series",
+#   "point_series",
+#   "line_series",
+#   "full_palette",
+#   "bitmap_backend",
+# ] }
 plotters-backend = { version = "0.3.5", optional = true }
 piston_window = { version = "0.120.0", optional = true }
 exmex = { version = "0.18.0", features = [ "partial" ], optional = true }

From 8d68ce672fca6abd41a85f9029d150522b108091 Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Thu, 25 Apr 2024 16:52:16 +0300
Subject: [PATCH 42/49] fix tests path

---
 module/move/unitore/src/action/config.rs       |  5 ++---
 module/move/unitore/src/action/feed.rs         |  2 +-
 module/move/unitore/src/action/frame.rs        |  8 ++++----
 module/move/unitore/src/action/table.rs        |  4 ++--
 module/move/unitore/src/sled_adapter/config.rs |  6 +++---
 module/move/unitore/src/sled_adapter/feed.rs   |  8 ++++----
 module/move/unitore/src/sled_adapter/frame.rs  |  6 +++---
 module/move/unitore/src/sled_adapter/mod.rs    | 14 +++++---------
 module/move/unitore/src/sled_adapter/table.rs  |  4 ++--
 module/move/unitore/tests/config_add.rs        |  3 ++-
 module/move/unitore/tests/config_delete.rs     |  3 ++-
 module/move/unitore/tests/frames_download.rs   | 10 +++++++---
 module/move/unitore/tests/table_list.rs        |  6 ++++--
 module/move/unitore/tests/tables_list.rs       |  4 +++-
 14 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/module/move/unitore/src/action/config.rs b/module/move/unitore/src/action/config.rs
index 49b63a4773..fae3bcf67d 100644
--- a/module/move/unitore/src/action/config.rs
+++ b/module/move/unitore/src/action/config.rs
@@ -40,7 +40,6 @@ pub async fn config_add( mut storage : FeedStorage< SledStorage >, path : &PathB
     return Err( error_tools::for_app::Error::msg( err_str ) );
   }
 
-  //let abs_path = proper_path_tools::path::canonicalize( path )?;
   let abs_path = path.canonicalize()?;
   let config = Config::new( abs_path.to_string_lossy().to_string() );
 
@@ -101,7 +100,7 @@ impl ConfigReport
 
 impl std::fmt::Display for ConfigReport
 {
-  fn fmt( &self, f : &mut std::fmt::Formatter<'_> ) -> std::fmt::Result
+  fn fmt( &self, f : &mut std::fmt::Formatter< '_ > ) -> std::fmt::Result
   {
     const EMPTY_CELL : &'static str = "";
 
@@ -112,7 +111,7 @@ impl std::fmt::Display for ConfigReport
         writeln!( f, "Added {} config file(s)", number )?;
         writeln!(
           f,
-          "Added {} feeds",
+          "Added {} feed(s)",
           self.new_feeds
           .as_ref()
           .and_then( | payload |
diff --git a/module/move/unitore/src/action/feed.rs b/module/move/unitore/src/action/feed.rs
index f7840a5f55..70063de854 100644
--- a/module/move/unitore/src/action/feed.rs
+++ b/module/move/unitore/src/action/feed.rs
@@ -29,7 +29,7 @@ impl FeedsReport
 
 impl std::fmt::Display for FeedsReport
 {
-  fn fmt( &self, f : &mut std::fmt::Formatter<'_> ) -> std::fmt::Result
+  fn fmt( &self, f : &mut std::fmt::Formatter< '_ > ) -> std::fmt::Result
   {
     writeln!( f, "Selected feeds:" )?;
     if !self.0.selected_rows.is_empty()
diff --git a/module/move/unitore/src/action/frame.rs b/module/move/unitore/src/action/frame.rs
index f26d538e20..2acb4cd168 100644
--- a/module/move/unitore/src/action/frame.rs
+++ b/module/move/unitore/src/action/frame.rs
@@ -111,7 +111,7 @@ impl FramesReport
 
 impl std::fmt::Display for FramesReport
 {
-  fn fmt( &self, f : &mut std::fmt::Formatter<'_> ) -> std::fmt::Result
+  fn fmt( &self, f : &mut std::fmt::Formatter< '_ > ) -> std::fmt::Result
   {
     let initial = vec![ vec![ format!( "Feed title: {}", self.feed_link ) ] ];
     let table = tool::table_display::table_with_headers( initial[ 0 ].clone(), Vec::new() );
@@ -192,7 +192,7 @@ impl SelectedEntries
 
 impl std::fmt::Display for SelectedEntries
 {
-  fn fmt( &self, f : &mut std::fmt::Formatter<'_> ) -> std::fmt::Result
+  fn fmt( &self, f : &mut std::fmt::Formatter< '_ > ) -> std::fmt::Result
   {
     if !self.selected_columns.is_empty()
     {
@@ -216,7 +216,7 @@ pub struct UpdateReport( pub Vec< FramesReport > );
 
 impl std::fmt::Display for UpdateReport
 {
-  fn fmt( &self, f : &mut std::fmt::Formatter<'_> ) -> std::fmt::Result
+  fn fmt( &self, f : &mut std::fmt::Formatter< '_ > ) -> std::fmt::Result
   {
     for report in &self.0
     {
@@ -244,7 +244,7 @@ pub struct ListReport( pub Vec< FramesReport > );
 
 impl std::fmt::Display for ListReport
 {
-  fn fmt( &self, f : &mut std::fmt::Formatter<'_> ) -> std::fmt::Result
+  fn fmt( &self, f : &mut std::fmt::Formatter< '_ > ) -> std::fmt::Result
   {
     for report in &self.0
     {
diff --git a/module/move/unitore/src/action/table.rs b/module/move/unitore/src/action/table.rs
index 5e0c92663b..ce9a4e756f 100644
--- a/module/move/unitore/src/action/table.rs
+++ b/module/move/unitore/src/action/table.rs
@@ -245,7 +245,7 @@ pub struct TablesColumnsReport( pub Vec< ColumnsReport > );
 
 impl std::fmt::Display for TablesColumnsReport
 {
-  fn fmt( &self, f : &mut std::fmt::Formatter<'_> ) -> std::fmt::Result
+  fn fmt( &self, f : &mut std::fmt::Formatter< '_ > ) -> std::fmt::Result
   {
     for report in &self.0
     {
@@ -283,7 +283,7 @@ impl ColumnsReport
 
 impl std::fmt::Display for ColumnsReport
 {
-  fn fmt( &self, f : &mut std::fmt::Formatter<'_> ) -> std::fmt::Result
+  fn fmt( &self, f : &mut std::fmt::Formatter< '_ > ) -> std::fmt::Result
   {
     writeln!( f, "Table name: {}", self.table_name )?;
     writeln!( f, "Description: {}", self.table_description )?;
diff --git a/module/move/unitore/src/sled_adapter/config.rs b/module/move/unitore/src/sled_adapter/config.rs
index 35ad1ae3cd..a3b0cc73d8 100644
--- a/module/move/unitore/src/sled_adapter/config.rs
+++ b/module/move/unitore/src/sled_adapter/config.rs
@@ -26,7 +26,7 @@ impl ConfigStore for FeedStorage< SledStorage >
       "path",
     )
     .values( vec![ vec![ text( config.path() ) ] ] )
-    .execute( &mut *self.storage.lock().await )
+    .execute( &mut *self.0.lock().await )
     .await;
 
     Ok( res? )
@@ -37,7 +37,7 @@ impl ConfigStore for FeedStorage< SledStorage >
     let res = table( "config" )
     .delete()
     .filter( col( "path" ).eq( format!( "'{}'", config.path() ) ) )
-    .execute( &mut *self.storage.lock().await )
+    .execute( &mut *self.0.lock().await )
     .await?;
 
     if res == Payload::Delete( 0 )
@@ -50,7 +50,7 @@ impl ConfigStore for FeedStorage< SledStorage >
 
   async fn config_list( &mut self ) -> Result< Payload >
   {
-    let res = table( "config" ).select().execute( &mut *self.storage.lock().await ).await?;
+    let res = table( "config" ).select().execute( &mut *self.0.lock().await ).await?;
     Ok( res )
   }
 }
diff --git a/module/move/unitore/src/sled_adapter/feed.rs b/module/move/unitore/src/sled_adapter/feed.rs
index 2659657103..fb38e02075 100644
--- a/module/move/unitore/src/sled_adapter/feed.rs
+++ b/module/move/unitore/src/sled_adapter/feed.rs
@@ -35,7 +35,7 @@ impl FeedStore for FeedStorage< SledStorage >
     let res = table( "feed" )
     .select()
     .project( "title, link, update_period, config_file" )
-    .execute( &mut *self.storage.lock().await )
+    .execute( &mut *self.0.lock().await )
     .await?
     ;
   
@@ -74,7 +74,7 @@ impl FeedStore for FeedStorage< SledStorage >
         feed.published.map( | d | timestamp( d.to_rfc3339_opts( SecondsFormat::Millis, true ) ) ).unwrap_or( null() ),
       )
       .filter( col( "link" ).eq( feed.link.to_string() ) )
-      .execute( &mut *self.storage.lock().await )
+      .execute( &mut *self.0.lock().await )
       .await
       .context( "Failed to insert feed" )?
       ;
@@ -101,7 +101,7 @@ impl FeedStore for FeedStorage< SledStorage >
       .select()
       .filter( col( "feed_link" ).eq( text( feed.2.to_string() ) ) )
       .project( "id, published" )
-      .execute( &mut *self.storage.lock().await )
+      .execute( &mut *self.0.lock().await )
       .await
       .context( "Failed to get existing frames while saving new frames" )?
       ;
@@ -187,7 +187,7 @@ impl FeedStore for FeedStorage< SledStorage >
       config_file",
     )
     .values( feeds_rows )
-    .execute( &mut *self.storage.lock().await )
+    .execute( &mut *self.0.lock().await )
     .await
     .context( "Failed to insert feeds" )?
     ;
diff --git a/module/move/unitore/src/sled_adapter/frame.rs b/module/move/unitore/src/sled_adapter/frame.rs
index e2224f4958..84d4687bf4 100644
--- a/module/move/unitore/src/sled_adapter/frame.rs
+++ b/module/move/unitore/src/sled_adapter/frame.rs
@@ -23,7 +23,7 @@ impl FrameStore for FeedStorage< SledStorage >
 {
   async fn frames_list( &mut self ) -> Result< ListReport >
   {
-    let res = table( "frame" ).select().execute( &mut *self.storage.lock().await ).await?;
+    let res = table( "frame" ).select().execute( &mut *self.0.lock().await ).await?;
 
     let mut reports = Vec::new();
     let all_frames = 
@@ -91,7 +91,7 @@ impl FrameStore for FeedStorage< SledStorage >
       feed_link"
     )
     .values( entries_rows )
-    .execute( &mut *self.storage.lock().await )
+    .execute( &mut *self.0.lock().await )
     .await
     .context( "Failed to insert frames" )?
     ;
@@ -114,7 +114,7 @@ impl FrameStore for FeedStorage< SledStorage >
       .set( "published", entry[ 8 ].to_owned() )
       .set( "media", entry[ 9 ].to_owned() )
       .filter( col( "id" ).eq( entry[ 0 ].to_owned() ) )
-      .execute( &mut *self.storage.lock().await )
+      .execute( &mut *self.0.lock().await )
       .await
       .context( "Failed to update frames" )?
       ;
diff --git a/module/move/unitore/src/sled_adapter/mod.rs b/module/move/unitore/src/sled_adapter/mod.rs
index 511d866e8e..885d5b9889 100644
--- a/module/move/unitore/src/sled_adapter/mod.rs
+++ b/module/move/unitore/src/sled_adapter/mod.rs
@@ -23,17 +23,13 @@ mod config;
 
 /// Storage for feed frames.
 #[ derive( Clone ) ]
-pub struct FeedStorage< S : GStore + GStoreMut + Send >
-{
-  /// GlueSQL storage.
-  pub storage : Arc< Mutex< Glue< S > > >,
-}
+pub struct FeedStorage< S : GStore + GStoreMut + Send >( Arc< Mutex< Glue< S > > > );
 
 impl< S : GStore + GStoreMut + Send > std::fmt::Debug for FeedStorage< S >
 {
-  fn fmt( &self, f: &mut std::fmt::Formatter<'_> ) -> std::fmt::Result
+  fn fmt( &self, f : &mut std::fmt::Formatter< '_ > ) -> std::fmt::Result
   {
-    writeln!(f, "GlueSQL storage" )
+    writeln!( f, "GlueSQL storage" )
   }
 }
 
@@ -93,7 +89,7 @@ impl FeedStorage< SledStorage >
 
     frame_table.execute( &mut glue ).await?;
 
-    Ok( Self{ storage : Arc::new( Mutex::new( glue ) ) } )
+    Ok( Self( Arc::new( Mutex::new( glue ) ) ) )
   }
 }
 
@@ -111,7 +107,7 @@ impl< S : GStore + GStoreMut + Send > Store for FeedStorage< S >
 {
   async fn execute_query( &mut self, query : String ) -> Result< QueryReport >
   {
-    let glue = &mut *self.storage.lock().await;
+    let glue = &mut *self.0.lock().await;
     let payloads = glue.execute( &query ).await.context( "Failed to execute query" )?;
 
     let report = QueryReport ( payloads );
diff --git a/module/move/unitore/src/sled_adapter/table.rs b/module/move/unitore/src/sled_adapter/table.rs
index ddf0664bfc..71763918ee 100644
--- a/module/move/unitore/src/sled_adapter/table.rs
+++ b/module/move/unitore/src/sled_adapter/table.rs
@@ -16,7 +16,7 @@ impl TableStore for FeedStorage< SledStorage >
 {
   async fn tables_list( &mut self ) -> Result< TablesReport >
   {
-    let glue = &mut *self.storage.lock().await;
+    let glue = &mut *self.0.lock().await;
     let payloads = glue.execute( "SELECT * FROM GLUE_TABLE_COLUMNS" ).await?;
 
     let report = TablesReport::new( payloads );
@@ -26,7 +26,7 @@ impl TableStore for FeedStorage< SledStorage >
 
   async fn table_list( &mut self, table_name : String ) -> Result< Vec< Payload > >
   {
-    let glue = &mut *self.storage.lock().await;
+    let glue = &mut *self.0.lock().await;
     let query_str = format!( "SELECT * FROM GLUE_TABLE_COLUMNS WHERE TABLE_NAME='{}'", table_name );
     let payloads = glue.execute( &query_str ).await?;
 
diff --git a/module/move/unitore/tests/config_add.rs b/module/move/unitore/tests/config_add.rs
index a3de7479b7..d1a2dca5da 100644
--- a/module/move/unitore/tests/config_add.rs
+++ b/module/move/unitore/tests/config_add.rs
@@ -12,9 +12,10 @@ use error_tools::Result;
 async fn config_add() -> Result< () >
 {
   let path = PathBuf::from( "./tests/fixtures/test_config.toml" );
+  let temp_path = proper_path_tools::path::unique_folder_name().unwrap();
 
   let config = Config::default()
-  .path( "./test_add".to_owned() )
+  .path( format!( "./{}", temp_path ) )
   .temporary( true )
   ;
 
diff --git a/module/move/unitore/tests/config_delete.rs b/module/move/unitore/tests/config_delete.rs
index 95870d4700..d35c5bab7c 100644
--- a/module/move/unitore/tests/config_delete.rs
+++ b/module/move/unitore/tests/config_delete.rs
@@ -16,9 +16,10 @@ use error_tools::Result;
 async fn config_delete() -> Result< () >
 {
   let path = PathBuf::from( "./tests/fixtures/test_config.toml" );
+  let temp_path = proper_path_tools::path::unique_folder_name().unwrap();
 
   let config = Config::default()
-  .path( "./test_del".to_owned() )
+  .path( format!( "./{}", temp_path ) )
   .temporary( true )
   ;
 
diff --git a/module/move/unitore/tests/frames_download.rs b/module/move/unitore/tests/frames_download.rs
index ad5c3c2ff6..ae8119a71d 100644
--- a/module/move/unitore/tests/frames_download.rs
+++ b/module/move/unitore/tests/frames_download.rs
@@ -20,8 +20,10 @@ use error_tools::Result;
 #[ tokio::test ]
 async fn test_save() -> Result< () >
 {
-  let config = gluesql::sled_storage::sled::Config::default()
-  .path( "./test_save".to_owned() )
+  let temp_path = proper_path_tools::path::unique_folder_name().unwrap();
+
+  let config = Config::default()
+  .path( format!( "./{}", temp_path ) )
   .temporary( true )
   ;
 
@@ -50,8 +52,10 @@ async fn test_save() -> Result< () >
 #[ tokio::test ]
 async fn test_update() -> Result< () >
 {
+  let temp_path = proper_path_tools::path::unique_folder_name().unwrap();
+
   let config = Config::default()
-  .path( "./test_update".to_owned() )
+  .path( format!( "./{}", temp_path ) )
   .temporary( true )
   ;
 
diff --git a/module/move/unitore/tests/table_list.rs b/module/move/unitore/tests/table_list.rs
index dc840b3633..188d1a3131 100644
--- a/module/move/unitore/tests/table_list.rs
+++ b/module/move/unitore/tests/table_list.rs
@@ -13,12 +13,14 @@ use error_tools::Result;
 #[ tokio::test ]
 async fn table_list() -> Result< () >
 {
+  let temp_path = proper_path_tools::path::unique_folder_name().unwrap();
+
   let config = Config::default()
-  .path( "./test_list".to_owned() )
+  .path( format!( "./{}", temp_path ) )
   .temporary( true )
   ;
-  let mut feed_storage = FeedStorage::init_storage( &config ).await?;
 
+  let mut feed_storage = FeedStorage::init_storage( &config ).await?;
   let res = feed_storage.table_list( String::from( "feed" ) ).await?;
 
   if let Payload::Select { labels: _, rows } = &res[ 0 ]
diff --git a/module/move/unitore/tests/tables_list.rs b/module/move/unitore/tests/tables_list.rs
index 6b306b1c19..0972041704 100644
--- a/module/move/unitore/tests/tables_list.rs
+++ b/module/move/unitore/tests/tables_list.rs
@@ -9,8 +9,10 @@ use error_tools::Result;
 #[ tokio::test ]
 async fn tables_list() -> Result< () >
 {
+  let temp_path = proper_path_tools::path::unique_folder_name().unwrap();
+
   let config = Config::default()
-  .path( "./test_list".to_owned() )
+  .path( format!( "./{}", temp_path ) )
   .temporary( true )
   ;
 

From b2f878d85dd1ea7080c4e80c2143c14c1456646b Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Thu, 25 Apr 2024 18:01:45 +0300
Subject: [PATCH 43/49] fix path

---
 module/move/unitore/src/action/query.rs      |  2 +-
 module/move/unitore/tests/config_add.rs      |  3 ++-
 module/move/unitore/tests/config_delete.rs   |  6 +++---
 module/move/unitore/tests/frames_download.rs | 10 +++++++---
 module/move/unitore/tests/query_execute.rs   | 17 +++++++++--------
 module/move/unitore/tests/table_list.rs      |  6 ++++--
 module/move/unitore/tests/tables_list.rs     |  4 +++-
 7 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/module/move/unitore/src/action/query.rs b/module/move/unitore/src/action/query.rs
index a01b89129d..d9f4180384 100644
--- a/module/move/unitore/src/action/query.rs
+++ b/module/move/unitore/src/action/query.rs
@@ -4,7 +4,7 @@
 // aaa : fixed
 use crate::*;
 use gluesql::core::executor::Payload;
-use sled_adapter::{ FeedStorage, Store };
+use sled_adapter::Store;
 use action::Report;
 use error_tools::Result;
 
diff --git a/module/move/unitore/tests/config_add.rs b/module/move/unitore/tests/config_add.rs
index ba0b8e4e8a..455a77dbd4 100644
--- a/module/move/unitore/tests/config_add.rs
+++ b/module/move/unitore/tests/config_add.rs
@@ -12,9 +12,10 @@ use error_tools::Result;
 async fn config_add() -> Result< () >
 {
   let path = PathBuf::from( "./tests/fixtures/test_config.toml" );
+  let temp_path = proper_path_tools::path::unique_folder_name().unwrap();
 
   let config = Config::default()
-  .path( "./test_add".to_owned() )
+  .path( format!( "./{}", temp_path ) )
   .temporary( true )
   ;
 
diff --git a/module/move/unitore/tests/config_delete.rs b/module/move/unitore/tests/config_delete.rs
index 95870d4700..336d2627b5 100644
--- a/module/move/unitore/tests/config_delete.rs
+++ b/module/move/unitore/tests/config_delete.rs
@@ -1,4 +1,3 @@
-use std::path::PathBuf;
 use gluesql::
 {
   sled_storage::sled::Config,
@@ -15,10 +14,11 @@ use error_tools::Result;
 #[ tokio::test ]
 async fn config_delete() -> Result< () >
 {
-  let path = PathBuf::from( "./tests/fixtures/test_config.toml" );
+  let path = std::path::PathBuf::from( "./tests/fixtures/test_config.toml" );
+  let temp_path = proper_path_tools::path::unique_folder_name().unwrap();
 
   let config = Config::default()
-  .path( "./test_del".to_owned() )
+  .path( format!( "./{}", temp_path ) )
   .temporary( true )
   ;
 
diff --git a/module/move/unitore/tests/frames_download.rs b/module/move/unitore/tests/frames_download.rs
index ad5c3c2ff6..ae8119a71d 100644
--- a/module/move/unitore/tests/frames_download.rs
+++ b/module/move/unitore/tests/frames_download.rs
@@ -20,8 +20,10 @@ use error_tools::Result;
 #[ tokio::test ]
 async fn test_save() -> Result< () >
 {
-  let config = gluesql::sled_storage::sled::Config::default()
-  .path( "./test_save".to_owned() )
+  let temp_path = proper_path_tools::path::unique_folder_name().unwrap();
+
+  let config = Config::default()
+  .path( format!( "./{}", temp_path ) )
   .temporary( true )
   ;
 
@@ -50,8 +52,10 @@ async fn test_save() -> Result< () >
 #[ tokio::test ]
 async fn test_update() -> Result< () >
 {
+  let temp_path = proper_path_tools::path::unique_folder_name().unwrap();
+
   let config = Config::default()
-  .path( "./test_update".to_owned() )
+  .path( format!( "./{}", temp_path ) )
   .temporary( true )
   ;
 
diff --git a/module/move/unitore/tests/query_execute.rs b/module/move/unitore/tests/query_execute.rs
index 46b5586bc4..7741575322 100644
--- a/module/move/unitore/tests/query_execute.rs
+++ b/module/move/unitore/tests/query_execute.rs
@@ -1,10 +1,9 @@
-use async_trait::async_trait;
 use feed_rs::parser as feed_parser;
 use unitore::
 {
   feed_config::SubscriptionConfig,
   sled_adapter::{ FeedStorage, Store, MockStore },
-  entity::{ config::{ Config, ConfigStore }, feed::FeedStore },
+  entity::{ config::ConfigStore, feed::FeedStore },
   action::{ query::{ self, QueryReport }, config },
   command::query::QueryCommand,
 };
@@ -85,10 +84,10 @@ fn query_execute() -> Result< () >
 async fn query_feeds() -> Result< () >
 {
   let path = PathBuf::from( "./tests/fixtures/test_config.toml" );
-  let path = path.canonicalize().expect( "Invalid path" );
+  let temp_path = proper_path_tools::path::unique_folder_name().unwrap();
 
   let config = sled::Config::default()
-  .path( "./test_feeds".to_owned() )
+  .path( format!( "./{}", temp_path ) )
   .temporary( true )
   ;
 
@@ -115,8 +114,10 @@ async fn query_feeds() -> Result< () >
 #[ tokio::test ]
 async fn query_frames() -> Result< () >
 {
-  let config = gluesql::sled_storage::sled::Config::default()
-  .path( "./test_frames".to_owned() )
+  let temp_path = proper_path_tools::path::unique_folder_name().unwrap();
+
+  let config = sled::Config::default()
+  .path( format!( "./{}", temp_path ) )
   .temporary( true )
   ;
 
@@ -159,10 +160,10 @@ async fn query_frames() -> Result< () >
 async fn query_configs() -> Result< () >
 {
   let path = PathBuf::from( "./tests/fixtures/test_config.toml" );
-  let path = path.canonicalize().expect( "Invalid path" );
+  let temp_path = proper_path_tools::path::unique_folder_name().unwrap();
 
   let config = sled::Config::default()
-  .path( "./test_config".to_owned() )
+  .path( format!( "./{}", temp_path ) )
   .temporary( true )
   ;
 
diff --git a/module/move/unitore/tests/table_list.rs b/module/move/unitore/tests/table_list.rs
index dc840b3633..188d1a3131 100644
--- a/module/move/unitore/tests/table_list.rs
+++ b/module/move/unitore/tests/table_list.rs
@@ -13,12 +13,14 @@ use error_tools::Result;
 #[ tokio::test ]
 async fn table_list() -> Result< () >
 {
+  let temp_path = proper_path_tools::path::unique_folder_name().unwrap();
+
   let config = Config::default()
-  .path( "./test_list".to_owned() )
+  .path( format!( "./{}", temp_path ) )
   .temporary( true )
   ;
-  let mut feed_storage = FeedStorage::init_storage( &config ).await?;
 
+  let mut feed_storage = FeedStorage::init_storage( &config ).await?;
   let res = feed_storage.table_list( String::from( "feed" ) ).await?;
 
   if let Payload::Select { labels: _, rows } = &res[ 0 ]
diff --git a/module/move/unitore/tests/tables_list.rs b/module/move/unitore/tests/tables_list.rs
index 6b306b1c19..0972041704 100644
--- a/module/move/unitore/tests/tables_list.rs
+++ b/module/move/unitore/tests/tables_list.rs
@@ -9,8 +9,10 @@ use error_tools::Result;
 #[ tokio::test ]
 async fn tables_list() -> Result< () >
 {
+  let temp_path = proper_path_tools::path::unique_folder_name().unwrap();
+
   let config = Config::default()
-  .path( "./test_list".to_owned() )
+  .path( format!( "./{}", temp_path ) )
   .temporary( true )
   ;
 

From 898836a7dca9465423704d693dfce168e75c292c Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Fri, 26 Apr 2024 10:26:01 +0300
Subject: [PATCH 44/49] change plotters

---
 module/move/optimization_tools/Cargo.toml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/module/move/optimization_tools/Cargo.toml b/module/move/optimization_tools/Cargo.toml
index 3f2473242e..e39d547e20 100644
--- a/module/move/optimization_tools/Cargo.toml
+++ b/module/move/optimization_tools/Cargo.toml
@@ -48,16 +48,16 @@ rand = "0.8.5"
 statrs = "0.16.0"
 faer = { version = "0.16.0", features = [ "ndarray" ] }
 ndarray = "0.15.6"
-plotters = { git = "https://github.com/plotters-rs/plotters.git" }
-# plotters = { version = "0.3.5", default-features=false, features = [
-#   "bitmap_encoder",
-#   "ttf",
-#   "area_series",
-#   "point_series",
-#   "line_series",
-#   "full_palette",
-#   "bitmap_backend",
-# ] }
+# plotters = { git = "https://github.com/plotters-rs/plotters.git" }
+plotters = { version = "0.3.5", default-features=false, features = [
+  "bitmap_encoder",
+  "ttf",
+  "area_series",
+  "point_series",
+  "line_series",
+  "full_palette",
+  "bitmap_backend",
+] }
 plotters-backend = { version = "0.3.5", optional = true }
 piston_window = { version = "0.120.0", optional = true }
 exmex = { version = "0.18.0", features = [ "partial" ], optional = true }

From 1dbc3e17fcaf44085ca0b8aabb81ff7d732fd1fd Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Fri, 26 Apr 2024 11:06:31 +0300
Subject: [PATCH 45/49] fix +test

---
 module/move/optimization_tools/Cargo.toml       | 1 -
 module/move/optimization_tools/tests/simplex.rs | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/move/optimization_tools/Cargo.toml b/module/move/optimization_tools/Cargo.toml
index e39d547e20..a9fb722248 100644
--- a/module/move/optimization_tools/Cargo.toml
+++ b/module/move/optimization_tools/Cargo.toml
@@ -48,7 +48,6 @@ rand = "0.8.5"
 statrs = "0.16.0"
 faer = { version = "0.16.0", features = [ "ndarray" ] }
 ndarray = "0.15.6"
-# plotters = { git = "https://github.com/plotters-rs/plotters.git" }
 plotters = { version = "0.3.5", default-features=false, features = [
   "bitmap_encoder",
   "ttf",
diff --git a/module/move/optimization_tools/tests/simplex.rs b/module/move/optimization_tools/tests/simplex.rs
index b0a66c1b18..7310f74d39 100644
--- a/module/move/optimization_tools/tests/simplex.rs
+++ b/module/move/optimization_tools/tests/simplex.rs
@@ -112,6 +112,8 @@ fn problem_5_vars()
   assert_eq!( solution[ 0 ].point, vec![ 300.0, 400.0, 300.0, 0.0, 0.0 ] )
 }
 
+// for issue https://github.com/plotters-rs/plotters/issues/573
+#[ cfg( not( all( debug_assertions, target_os = "linux" ) ) ) ]
 #[ test ]
 fn problem_draw() 
 {

From 5ec88fe01c5587c8325660d24b5cb0c814ab9db7 Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Fri, 26 Apr 2024 12:39:36 +0300
Subject: [PATCH 46/49] fix tests

---
 module/move/graphs_tools/Cargo.toml               |  1 +
 module/move/graphs_tools/src/abs/identity.rs      |  2 +-
 .../move/graphs_tools/src/canonical/identity.rs   | 15 ++++++++++-----
 .../move/graphs_tools/tests/inc/identity_test.rs  | 14 +++++++-------
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/module/move/graphs_tools/Cargo.toml b/module/move/graphs_tools/Cargo.toml
index a6a4e8f6f5..64e17ebbd0 100644
--- a/module/move/graphs_tools/Cargo.toml
+++ b/module/move/graphs_tools/Cargo.toml
@@ -42,6 +42,7 @@ meta_tools = { workspace = true, features = [ "default" ] }
 iter_tools = { workspace = true, features = [ "default" ] }
 data_type = { workspace = true, features = [ "default" ] }
 strs_tools = { workspace = true, features = [ "default" ] }
+derive_tools = { workspace = true, features = [ "default" ] }
 # type_constructor ={ workspace = true, features = [ "default" ] }
 
 [dev-dependencies]
diff --git a/module/move/graphs_tools/src/abs/identity.rs b/module/move/graphs_tools/src/abs/identity.rs
index 05fb1a1d05..806096847e 100644
--- a/module/move/graphs_tools/src/abs/identity.rs
+++ b/module/move/graphs_tools/src/abs/identity.rs
@@ -57,7 +57,7 @@ pub( crate ) mod private
 //   }
 
   ///
-  /// Interface to identify an instance of somthing with ability to increase it to generate a new one.
+  /// Interface to identify an instance of something with ability to increase it to generate a new one.
   ///
 
   pub trait IdentityGeneratorInterface< Id >
diff --git a/module/move/graphs_tools/src/canonical/identity.rs b/module/move/graphs_tools/src/canonical/identity.rs
index 8c5ecd9128..d95c774912 100644
--- a/module/move/graphs_tools/src/canonical/identity.rs
+++ b/module/move/graphs_tools/src/canonical/identity.rs
@@ -114,12 +114,17 @@ pub( crate ) mod private
   // =
   //
 
-  type_constructor::types!
-  {
+  // type_constructor::types!
+  // {
+  //   /// Identify an instance by integer.
+  //   #[ derive( PartialEq, Eq, Copy, Clone, Hash ) ]
+  //   pub single IdentityWithInt : isize;
+  // }
+
+
     /// Identify an instance by integer.
-    #[ derive( PartialEq, Eq, Copy, Clone, Hash ) ]
-    pub single IdentityWithInt : isize;
-  }
+    #[ derive( PartialEq, Eq, Copy, Clone, Hash, derive_tools::From, derive_tools::Deref ) ]
+    pub struct IdentityWithInt( isize );
 
   ///
   /// Interface to to generate a new IDs for IdentityWithInt
diff --git a/module/move/graphs_tools/tests/inc/identity_test.rs b/module/move/graphs_tools/tests/inc/identity_test.rs
index a4f9296b86..aa85003e52 100644
--- a/module/move/graphs_tools/tests/inc/identity_test.rs
+++ b/module/move/graphs_tools/tests/inc/identity_test.rs
@@ -56,13 +56,13 @@ tests_impls!
     // }
 
     /* test.case( "from x2 tupple" ) */
-    {
-      use type_constructor::VectorizedInto;
-      let src = ( 1, 3 );
-      let got : ( IdentityWithInt, IdentityWithInt ) = src.vectorized_into();
-      let exp = ( IdentityWithInt::from( 1 ), IdentityWithInt::from( 3 ) );
-      a_id!( got, exp );
-    }
+    // {
+    //   //use type_constructor::VectorizedInto;
+    //   let src = ( 1, 3 );
+    //   let got : ( IdentityWithInt, IdentityWithInt ) = src.into();
+    //   let exp = ( IdentityWithInt::from( 1 ), IdentityWithInt::from( 3 ) );
+    //   a_id!( got, exp );
+    // }
 
     // /* test.case( "from x3 tupple" ) */
     // {

From 7e6d66d655b15eedcc25d24f75507729efdac55a Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Fri, 26 Apr 2024 13:05:26 +0300
Subject: [PATCH 47/49] fix tests

---
 module/core/reflect_tools/tests/tests.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/core/reflect_tools/tests/tests.rs b/module/core/reflect_tools/tests/tests.rs
index 8bbcd66a9d..b8bdcf97f4 100644
--- a/module/core/reflect_tools/tests/tests.rs
+++ b/module/core/reflect_tools/tests/tests.rs
@@ -4,5 +4,6 @@ use reflect_tools as the_module;
 #[ allow( unused_imports ) ]
 use test_tools::exposed::*;
 
+#[ cfg( feature = "enabled" ) ]
 mod inc;
 

From 69eb2b5580d67c475b366e37c03e61efb28340d7 Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Fri, 26 Apr 2024 14:51:45 +0300
Subject: [PATCH 48/49] fix tests

---
 module/core/impls_index/tests/inc/impls3_test.rs | 4 ++--
 module/core/impls_index/tests/inc/mod.rs         | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/module/core/impls_index/tests/inc/impls3_test.rs b/module/core/impls_index/tests/inc/impls3_test.rs
index 5c58b895ac..860acd126a 100644
--- a/module/core/impls_index/tests/inc/impls3_test.rs
+++ b/module/core/impls_index/tests/inc/impls3_test.rs
@@ -1,5 +1,5 @@
-use super::the_module;
-use the_module::*;
+use super::*;
+use the_module::prelude::impls3;
 
 //
 
diff --git a/module/core/impls_index/tests/inc/mod.rs b/module/core/impls_index/tests/inc/mod.rs
index 15243b4c92..d7b9687e2f 100644
--- a/module/core/impls_index/tests/inc/mod.rs
+++ b/module/core/impls_index/tests/inc/mod.rs
@@ -10,8 +10,6 @@ mod impls3_test;
 mod index_test;
 mod tests_index_test;
 
-use crate::only_for_terminal_module;
-
 only_for_terminal_module!
 {
 

From 837018b71634af13055d7ac82c2ae4ccefa78b3a Mon Sep 17 00:00:00 2001
From: YuliaProkopovych <yuliaprokopovych@gmail.com>
Date: Mon, 29 Apr 2024 11:39:43 +0300
Subject: [PATCH 49/49] +test

---
 .../src/optimal_params_search/nelder_mead.rs                 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/module/move/optimization_tools/src/optimal_params_search/nelder_mead.rs b/module/move/optimization_tools/src/optimal_params_search/nelder_mead.rs
index c379c7441f..cf90936c8b 100644
--- a/module/move/optimization_tools/src/optimal_params_search/nelder_mead.rs
+++ b/module/move/optimization_tools/src/optimal_params_search/nelder_mead.rs
@@ -4,7 +4,10 @@
 
 use std::
 {
-  collections::HashMap, fs::{ File, OpenOptions }, ops::{ Bound, RangeBounds }, sync::{ Arc, Mutex }
+  collections::HashMap,
+  fs::{ File, OpenOptions },
+  ops::{ Bound, RangeBounds },
+  sync::{ Arc, Mutex },
 };
 use deterministic_rand::{ Hrng, Seed, Rng };
 use iter_tools::Itertools;