fix: use mod_interface

module/move/willbe/src/willbe/commands/init.rs

@@ -94,12 +94,14 @@ pub( crate ) mod private
 
   pub fn executor_form() -> HashMap< String, Routine >
   {
+    use crate::commands::*;
+
     HashMap::from
     ([
-      ( "publish".to_owned(), Routine::new( crate::commands::publish::publish ) ),
-      ( "workspace.publish".to_owned(), Routine::new( crate::commands::publish::workspace_publish ) ),
-      ( "list".to_owned(), Routine::new( crate::commands::list::list ) ),
-      ( "workspace.list".to_owned(), Routine::new( crate::commands::list::workspace_list ) ),
+      ( "publish".to_owned(), Routine::new( publish::cli::publish ) ),
+      ( "workspace.publish".to_owned(), Routine::new( publish::cli::workspace_publish ) ),
+      ( "list".to_owned(), Routine::new( list::cli::list ) ),
+      ( "workspace.list".to_owned(), Routine::new( list::cli::workspace_list ) ),
     ])
   }
 }

module/move/willbe/src/willbe/commands/list.rs

@@ -1,218 +1,9 @@
-/// Internal namespace.
-pub( crate ) mod private
-{
-  use std::collections::HashMap;
-  use crate::tools::*;
-  use std::env;
-  use wca::{ Args, Props };
-  use wtools::error::{ Result, err };
-  use cargo_metadata::
-  {
-    DependencyKind,
-    Metadata,
-    MetadataCommand,
-    Package,
-  };
-  use petgraph::
-  {
-    graph::Graph,
-    algo::toposort,
-    algo::has_path_connecting,
-  };
-
-  pub mod cli
-  {
-    use super::*;
-
-    ///
-    /// List packages.
-    ///
-
-    pub fn list( ( args, _ ) : ( Args, Props ) ) -> Result< () >
-    {
-      let patterns = args.get_owned( 0 ).unwrap_or_default();
-
-      endpoint::list( patterns )
-    }
-
-    ///
-    /// List workspace packages.
-    ///
-
-    pub fn workspace_list( ( args, properties ) : ( Args, Props ) ) -> Result< () >
-    {
-      let path_to_workspace = args.get_owned( 0 ).unwrap_or_default();
-
-      let root_crate = properties.get_owned( "root_module" ).unwrap_or_default();
-      let list_type = properties.get_owned( "type" ).unwrap_or( "tree" );
-
-      if list_type != "tree" && list_type != "topsort" {
-        return Err(err!( format!( "Unknown option 'type:{}'", list_type ) ) );
-      }
-
-      endpoint::workspace_list( path_to_workspace, root_crate, list_type )
-    }
-  }
-
-  mod endpoint
-  {
-    use super::*;
-    use super::logic::*;
-
-    use std::path::PathBuf;
-
-    pub fn list(patterns : Vec< String > ) -> Result< () >
-    {
-      let current_path = env::current_dir().unwrap();
-
-      let paths = files::find( current_path, patterns.as_slice() );
-      let paths = paths.iter().filter_map( | s | if s.ends_with( "Cargo.toml" ) { Some( s ) } else { None } );
-
-      for path in paths
-      {
-        let manifest = manifest_get( path );
-        if manifest.package_is()
-        {
-          let local_is = manifest.local_is();
-          let remote = if local_is { "local" } else { "remote" };
-          let data = manifest.manifest_data.as_ref().unwrap();
-          println!( "{} - {:?}, {}", data[ "package" ][ "name" ].to_string().trim(), path.parent().unwrap(), remote );
-        }
-      }
-
-      Ok( () )
-    }
-
-    //
-
-    pub fn workspace_list( path_to_workspace : PathBuf, root_crate : &str, list_type : &str ) -> Result< () >
-    {
-      let mut manifest = manifest::Manifest::new();
-      let manifest_path = manifest.manifest_path_from_str( &path_to_workspace ).unwrap();
-      let package_metadata = MetadataCommand::new()
-      .manifest_path( &manifest_path )
-      .no_deps()
-      .exec()
-      .unwrap();
-
-      let packages_map = packages_filter( &package_metadata );
-      let graph = graph_build( &packages_map );
-      let sorted = toposort( &graph, None ).unwrap();
-
-      if list_type == "tree" {
-        if root_crate.is_empty() {
-          let mut names = vec![ sorted[ 0 ] ];
-          for node in sorted.iter().skip( 1 )
-          {
-            if names.iter().all( | name | !has_path_connecting( &graph, *name, *node, None ) ) && !names.contains( node )
-            {
-              names.push( *node );
-            }
-          }
-          names.iter().for_each( | n | ptree::graph::print_graph( &graph, *n ).unwrap() );
-        }
-        else
-        {
-          sorted
-          .iter()
-          .filter_map( | idx | if graph.node_weight( *idx ).unwrap() == &root_crate { Some( *idx ) } else { None } )
-          .for_each( | e | ptree::graph::print_graph(&graph, e ).unwrap() );
-        }
-      }
-      else
-      {
-        let names = sorted
-        .iter()
-        .rev()
-        .map( | dep_idx | graph.node_weight( *dep_idx ).unwrap().to_string() )
-        .collect::< Vec< String > >();
-
-        names.iter().enumerate().for_each( | ( i, e ) | println!( "{i}) {e}" ) );
-      }
-
-      Ok( () )
-    }
-  }
-
-  mod logic
-  {
-    use super::*;
-
-    // duplicates publish.rs
-    pub fn packages_filter( metadata : &Metadata ) -> HashMap< String, &Package >
-    {
-      let mut packages_map = HashMap::new();
-
-      let _packages = metadata.packages.iter().filter( | package |
-      {
-        if package.publish.is_none()
-        {
-          packages_map.insert( package.name.clone(), *package );
-
-          return true;
-        }
-
-        false
-      }).collect::< Vec< _ > >();
-
-      packages_map
-    }
-
-    //
-
-    // duplicates publish.rs
-    pub fn manifest_get( path : &std::path::Path ) -> manifest::Manifest
-    {
-      let mut manifest = manifest::Manifest::new();
-      manifest.manifest_path_from_str( path ).unwrap();
-      manifest.load().unwrap();
-
-      manifest
-    }
-
-    //
-
-    pub fn graph_build< 'a >( packages : &'a HashMap< String, &Package > ) -> Graph< &'a str, &'a str >
-    {
-      let mut deps = Graph::< &str, &str >::new();
-      let _update_graph = packages.iter().map( | ( _name, package ) |
-      {
-        let root_node = if let Some( node ) = deps.node_indices().find( | i | deps[ *i ] == package.name )
-        {
-          node
-        }
-        else
-        {
-          deps.add_node( &package.name )
-        };
-
-        for dep in &package.dependencies
-        {
-          if dep.path.is_some() && dep.kind != DependencyKind::Development
-          {
-            let dep_node = if let Some( node ) = deps.node_indices().find( | i | deps[ *i ] == dep.name )
-            {
-              node
-            }
-            else
-            {
-              deps.add_node( &dep.name )
-            };
-
-            deps.add_edge( root_node, dep_node, &package.name );
-          }
-        }
-      }).collect::< Vec< _ > >();
-
-      deps
-    }
-  }
-}
-
-//
-
 crate::mod_interface!
 {
-  prelude use cli::list;
-  prelude use cli::workspace_list;
-}
+  /// Command Line Interface.
+  layer cli;
+  /// Commands endpoints.
+  layer endpoint;
+  /// Additional logic required by commands.
+  layer logic;
+}

module/move/willbe/src/willbe/commands/list/cli.rs

@@ -0,0 +1,47 @@
+/// Internal namespace.
+mod private
+{
+  use crate::list::endpoint;
+
+  use wca::{ Args, Props };
+  use wtools::error::{ Result, err };
+
+  ///
+  /// List packages.
+  ///
+
+  pub fn list( ( args, _ ) : ( Args, Props ) ) -> Result< () >
+  {
+    let patterns = args.get_owned( 0 ).unwrap_or_default();
+
+    endpoint::list( patterns )
+  }
+
+  ///
+  /// List workspace packages.
+  ///
+
+  pub fn workspace_list( ( args, properties ) : ( Args, Props ) ) -> Result< () >
+  {
+    let path_to_workspace = args.get_owned( 0 ).unwrap_or_default();
+
+    let root_crate = properties.get_owned( "root_module" ).unwrap_or_default();
+    let list_type = properties.get_owned( "type" ).unwrap_or( "tree" );
+
+    if list_type != "tree" && list_type != "topsort" {
+      return Err(err!( format!( "Unknown option 'type:{}'", list_type ) ) );
+    }
+
+    endpoint::workspace_list( path_to_workspace, root_crate, list_type )
+  }
+}
+
+//
+
+crate::mod_interface!
+{
+  /// List packages.
+  prelude use list;
+  /// List workspace packages.
+  prelude use workspace_list;
+}