feat(zinkc): embed cli in zinkc

cli/cli/README.md

@@ -1,24 +1,6 @@
-# `zinkup`
+# `ccli`
 
-The zink components are gathered here, you can install all of the
-components directly with:
-
-```bash
-cargo install zinkup
-```
-
-For installing only specified binaries:
-
-```bash
-cargo install zinkup --features elko,zinkc
-```
-
-Available binaries:
-
-| Name    | Description             |
-| ------- | ----------------------- |
-| `elko`  | Zink\'s package manager |
-| `zinkc` | The zink compiler       |
+Common command line interface.
 
 ## LICENSE
 

cli/cli/src/lib.rs

@@ -1,4 +1,4 @@
-//! Common command line inteface.
+//! Common command line interface.
 
 use anyhow::Error;
 pub use clap::{self, Parser};

cli/elko/Cargo.toml

@@ -21,4 +21,4 @@ thiserror.workspace = true
 toml.workspace = true
 tracing.workspace = true
 wasm-opt.workspace = true
-zinkc.workspace = true
+zinkc = { workspace = true, features = [ "cli" ] }

cli/elko/src/bin/elko.rs

@@ -1,14 +1,15 @@
-//! Zink's package manager
+//! The package manager of zink.
 #![deny(missing_docs)]
 
 use ccli::{clap::Subcommand, App, Parser, Result};
-use elko::{Build, New};
+use elko::{Build, Compile, New};
 
 /// Elko commands
 #[derive(Debug, Subcommand)]
 enum Command {
     New(New),
     Build(Build),
+    Compile(Compile),
 }
 
 /// The package manager of zink.
@@ -31,6 +32,7 @@ impl App for Elko {
         match &self.command {
             Command::Build(build) => build.run(),
             Command::New(new) => new.run(),
+            Command::Compile(compile) => compile.run(),
         }
     }
 }

cli/elko/src/lib.rs

@@ -5,3 +5,4 @@ mod new;
 pub mod utils;
 
 pub use self::{build::Build, new::New};
+pub use zinkc::cli::Compile;

compiler/Cargo.toml

@@ -9,6 +9,10 @@ license.workspace = true
 homepage.workspace = true
 repository.workspace = true
 
+[[bin]]
+name = "zinkc"
+required-features = [ "cli" ]
+
 [dependencies]
 anyhow.workspace = true
 thiserror.workspace = true

compiler/src/bin/zinkc.rs

@@ -0,0 +1,32 @@
+//! Zink compiler.
+#![deny(missing_docs)]
+#![cfg(feature = "cli")]
+
+use ccli::{clap, App, Parser, Result};
+use zinkc::cli::Compile;
+
+/// The Zink Compiler.
+#[derive(Debug, Parser)]
+#[command(name = "zinkc", version, arg_required_else_help(true))]
+pub struct Zinkc {
+    #[clap(flatten)]
+    command: Compile,
+    /// Verbose mode (-v, -vv, -vvv, etc.)
+    #[clap(short, long, action = clap::ArgAction::Count)]
+    verbose: u8,
+}
+
+impl App for Zinkc {
+    fn verbose(&self) -> u8 {
+        self.verbose
+    }
+
+    fn run(&self) -> anyhow::Result<()> {
+        self.command.run()
+    }
+}
+
+/// The main function.
+fn main() -> Result<()> {
+    Zinkc::start()
+}

compiler/src/cli.rs

@@ -2,17 +2,16 @@
 #![cfg(feature = "cli")]
 
 use crate::Compiler;
-use ccli::{Parser, Result};
+use ccli::{clap, Parser};
 use std::{env, fs, path::PathBuf};
 
 /// Compile WASM to EVM bytecode.
 #[derive(Debug, Parser)]
-#[command(name = "build", version)]
 pub struct Compile {
     /// The path of the wasm file.
     #[clap(value_name = "INPUT")]
     input: PathBuf,
-    /// Write output to \<filename\>
+    /// Write output to <filename>
     #[clap(short, long)]
     output: Option<PathBuf>,
     /// If enable dispatcher.

compiler/src/lib.rs

@@ -7,6 +7,7 @@ pub use crate::{
     result::{Error, Result},
 };
 
+pub mod cli;
 mod compiler;
 mod config;
 mod parser;